date:20150717

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3d6af45..0e5a6ac - change (mediawiki/extensions)

2015-07-17 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225525

Change subject: Syncronize VisualEditor: 3d6af45..0e5a6ac
..

Syncronize VisualEditor: 3d6af45..0e5a6ac

Change-Id: I3a7340f5087f9d08fa48c99df2251286dfe2ab28
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/25/225525/1

diff --git a/VisualEditor b/VisualEditor
index 3d6af45..0e5a6ac 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3d6af458ddc2376a2dfa6185c981594eec9978d2
+Subproject commit 0e5a6aca32131cc7eaa84f8351ae717ac962757d

-- 
To view, visit https://gerrit.wikimedia.org/r/225525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a7340f5087f9d08fa48c99df2251286dfe2ab28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3d6af45..0e5a6ac - change (mediawiki/extensions)

2015-07-17 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 3d6af45..0e5a6ac
..


Syncronize VisualEditor: 3d6af45..0e5a6ac

Change-Id: I3a7340f5087f9d08fa48c99df2251286dfe2ab28
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 3d6af45..0e5a6ac 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3d6af458ddc2376a2dfa6185c981594eec9978d2
+Subproject commit 0e5a6aca32131cc7eaa84f8351ae717ac962757d

-- 
To view, visit https://gerrit.wikimedia.org/r/225525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a7340f5087f9d08fa48c99df2251286dfe2ab28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't set browser-prefixed transition CSS classes - change (mediawiki...VisualEditor)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Don't set browser-prefixed transition CSS classes
..


Don't set browser-prefixed transition CSS classes

jQuery will take care of this automatically: .

Follows up bf56f56f3e5.

Change-Id: I4db46fc70a5446a9ffc9f6d4375fae3b53609ee0
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 897c8ac..5fe454a 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -66,13 +66,7 @@
 
function setLoadingProgress( target, duration ) {
var $bar = init.$loading.find( 
'.ve-init-mw-viewPageTarget-progress-bar' ).stop();
-   $bar.css( {
-   '-webkit-transition': 'width ' + duration + 'ms 
ease-in',
-   '-moz-transition': 'width ' + duration + 'ms ease-in',
-   '-ms-transition': 'width ' + duration + 'ms ease-in',
-   '-o-transition': 'width ' + duration + 'ms ease-in',
-   transition: 'width ' + duration + 'ms ease-in'
-   } );
+   $bar.css( 'transition', 'width ' + duration + 'ms ease-in' );
setTimeout( function () {
$bar.css( 'width', target + '%' );
} );

-- 
To view, visit https://gerrit.wikimedia.org/r/225488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4db46fc70a5446a9ffc9f6d4375fae3b53609ee0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2db8d33..3d6af45 - change (mediawiki/extensions)

2015-07-17 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 2db8d33..3d6af45
..


Syncronize VisualEditor: 2db8d33..3d6af45

Change-Id: Ib7561b4e817d9d2425c5c57b0cc5fd73f963699f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 2db8d33..3d6af45 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2db8d335f8e399a4eae027458e543b9d887b8a45
+Subproject commit 3d6af458ddc2376a2dfa6185c981594eec9978d2

-- 
To view, visit https://gerrit.wikimedia.org/r/225524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7561b4e817d9d2425c5c57b0cc5fd73f963699f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2db8d33..3d6af45 - change (mediawiki/extensions)

2015-07-17 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225524

Change subject: Syncronize VisualEditor: 2db8d33..3d6af45
..

Syncronize VisualEditor: 2db8d33..3d6af45

Change-Id: Ib7561b4e817d9d2425c5c57b0cc5fd73f963699f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/24/225524/1

diff --git a/VisualEditor b/VisualEditor
index 2db8d33..3d6af45 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2db8d335f8e399a4eae027458e543b9d887b8a45
+Subproject commit 3d6af458ddc2376a2dfa6185c981594eec9978d2

-- 
To view, visit https://gerrit.wikimedia.org/r/225524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7561b4e817d9d2425c5c57b0cc5fd73f963699f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ve.init.mw.TargetLoader: Error when RESTbase load call fails - change (mediawiki...VisualEditor)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ve.init.mw.TargetLoader: Error when RESTbase load call fails
..


ve.init.mw.TargetLoader: Error when RESTbase load call fails

No retry right now, but we should at least stop failing silently. Doing this
in a window.alert() for now, as OOUI isn't available at this part of the
page load just yet (that will be coming soon).

Bug: T97041
Change-Id: Iacb195667215ee69d3991e4c41651ab6042243c5
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/ve.init.mw.TargetLoader.js
4 files changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 9f92ff7..8c7eb9b 100644
--- a/extension.json
+++ b/extension.json
@@ -272,6 +272,10 @@
"ext.visualEditor.track",
"mediawiki.api"
],
+   "messages": [
+   "visualeditor-loaderror-title",
+   "visualeditor-loaderror-message"
+   ],
"targets": [
"desktop",
"mobile"
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 30ad5ae..b0a4271 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -245,6 +245,8 @@
"visualeditor-linkinspector-illegal-title": "Invalid page title",
"visualeditor-linknodeinspector-add-label": "Add label",
"visualeditor-linknodeinspector-title": "Simple link",
+   "visualeditor-loaderror-message": "Error loading data from server: $1.",
+   "visualeditor-loaderror-title": "The editor could not load",
"visualeditor-loadwarning": "Error loading data from server: $1. Would 
you like to retry?",
"visualeditor-loadwarning-token": "Error loading edit token from 
server: $1. Would you like to retry?",
"visualeditor-mainnamespacepagelink": "Project:Main namespace",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index b3a5a51..fdea544 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -254,6 +254,8 @@
"visualeditor-linkinspector-illegal-title": "Warning that the entered 
text is not a valid page title.",
"visualeditor-linknodeinspector-add-label": "Label of button that 
converts an auto-numbered, external, labelless link into a labeled external 
link",
"visualeditor-linknodeinspector-title": "Title of inspector for editing 
auto-numbered, external, labelless links.\n\nSee also:\n* 
{{msg-mw|Visualeditor-annotationbutton-linknode-tooltip}}",
+   "visualeditor-loaderror-message": "Text shown in a message box when the 
editor fails to load properly due to a RESTBase call failing.\n\nParameters:\n* 
$1 - an error message",
+   "visualeditor-loaderror-title": "Text shown as the title of a message 
box when the editor fails to load properly for some reason.",
"visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the 
editor fails to load properly.\n\nParameters:\n* $1 - the error message from 
the server, in English. e.g. \"parsoidserver-http-err\"",
"visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown 
when the editor fails to load properly.\n\nParameters:\n* $1 - the error 
message from the server.",
"visualeditor-mainnamespacepagelink": "Name of a page describing the 
main namespace (NS0) in this project.\n{{doc-important|Do not translate 
\"Project\"; it is automatically converted to the wiki's project namespace.}}",
diff --git a/modules/ve-mw/init/ve.init.mw.TargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
index 54e084c..10149d0 100644
--- a/modules/ve-mw/init/ve.init.mw.TargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
@@ -144,7 +144,9 @@
// Page does not exist, 
so let the user start with a blank document.
return 
$.Deferred().resolve( '' ).promise();
} else {
-   mw.log.warn( 'One of 
the load requests failed (unhandled).' );
+   window.alert( mw.msg( 
'visualeditor-loaderror-message', 'HTTP ' + response.status ) );
+
+   mw.log.warn( 'RESTBase 
load failed: ' + response.statusText );
}
}
);

-- 
To view, visit https://gerrit.wikimedia.org/r/221748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-

[MediaWiki-commits] [Gerrit] ores: Fix stupid typo - change (operations/puppet)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Fix stupid typo
..


ores: Fix stupid typo

Change-Id: I8ce682d20158fb0f4799ba4211ffed58ff1ad1f9
---
M manifests/role/labsores.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 08b9689..b3615df 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -1,5 +1,5 @@
 class role::labs::ores::web {
-inlcude ::ores::base
+include ::ores::base
 include ::ores::web
 
 class { '::ores::redisproxy':

-- 
To view, visit https://gerrit.wikimedia.org/r/225522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ce682d20158fb0f4799ba4211ffed58ff1ad1f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ores: Fix stupid typo - change (operations/puppet)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Fix stupid typo
..


ores: Fix stupid typo

Change-Id: Ie33c4fdfbc73ef030c0c0d5c0535429542468d4a
---
M manifests/role/labsores.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index b3615df..248b1e1 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -8,7 +8,7 @@
 }
 
 class role::labs::ores::worker {
-inlcude ::ores::base
+include ::ores::base
 include ::ores::worker
 
 class { '::ores::redisproxy':

-- 
To view, visit https://gerrit.wikimedia.org/r/225523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie33c4fdfbc73ef030c0c0d5c0535429542468d4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ores: Fix stupid typo - change (operations/puppet)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225523

Change subject: ores: Fix stupid typo
..

ores: Fix stupid typo

Change-Id: Ie33c4fdfbc73ef030c0c0d5c0535429542468d4a
---
M manifests/role/labsores.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/225523/1

diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index b3615df..248b1e1 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -8,7 +8,7 @@
 }
 
 class role::labs::ores::worker {
-inlcude ::ores::base
+include ::ores::base
 include ::ores::worker
 
 class { '::ores::redisproxy':

-- 
To view, visit https://gerrit.wikimedia.org/r/225523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie33c4fdfbc73ef030c0c0d5c0535429542468d4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ores: Fix stupid typo - change (operations/puppet)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225522

Change subject: ores: Fix stupid typo
..

ores: Fix stupid typo

Change-Id: I8ce682d20158fb0f4799ba4211ffed58ff1ad1f9
---
M manifests/role/labsores.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/225522/1

diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 08b9689..b3615df 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -1,5 +1,5 @@
 class role::labs::ores::web {
-inlcude ::ores::base
+include ::ores::base
 include ::ores::web
 
 class { '::ores::redisproxy':

-- 
To view, visit https://gerrit.wikimedia.org/r/225522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ce682d20158fb0f4799ba4211ffed58ff1ad1f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ores: Install spanish dictionaries as well - change (operations/puppet)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225521

Change subject: ores: Install spanish dictionaries as well
..

ores: Install spanish dictionaries as well

Change-Id: I8829d72266d114194da0c3d87b5b92ba4371e81b
---
M modules/ores/manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/225521/1

diff --git a/modules/ores/manifests/base.pp b/modules/ores/manifests/base.pp
index 7aec60b..d6d9dc9 100644
--- a/modules/ores/manifests/base.pp
+++ b/modules/ores/manifests/base.pp
@@ -24,7 +24,7 @@
 # Spellcheck packages for supported languages
 require_package('myspell-pt', 'myspell-fa', 'myspell-en-au',
 'myspell-en-gb', 'myspell-en-us',
-'myspell-en-za', 'myspell-fr',
+'myspell-en-za', 'myspell-fr', 'myspell-es',
 'aspell-id')
 
 file { '/srv':

-- 
To view, visit https://gerrit.wikimedia.org/r/225521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8829d72266d114194da0c3d87b5b92ba4371e81b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ores: Install spanish dictionaries as well - change (operations/puppet)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Install spanish dictionaries as well
..


ores: Install spanish dictionaries as well

Change-Id: I8829d72266d114194da0c3d87b5b92ba4371e81b
---
M modules/ores/manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/ores/manifests/base.pp b/modules/ores/manifests/base.pp
index 7aec60b..d6d9dc9 100644
--- a/modules/ores/manifests/base.pp
+++ b/modules/ores/manifests/base.pp
@@ -24,7 +24,7 @@
 # Spellcheck packages for supported languages
 require_package('myspell-pt', 'myspell-fa', 'myspell-en-au',
 'myspell-en-gb', 'myspell-en-us',
-'myspell-en-za', 'myspell-fr',
+'myspell-en-za', 'myspell-fr', 'myspell-es',
 'aspell-id')
 
 file { '/srv':

-- 
To view, visit https://gerrit.wikimedia.org/r/225521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8829d72266d114194da0c3d87b5b92ba4371e81b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Enable most PHPCS PSR2 sniffs - change (mediawiki...Wikibase)

2015-07-17 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225520

Change subject: Enable most PHPCS PSR2 sniffs
..

Enable most PHPCS PSR2 sniffs

These are all PRS2 sniffs from the MediaWiki rule set plus a few more
that do not trigger any error in our code base (or almost none in
case of the newlines at the end of the file).

Change-Id: I3b3de98d8831c398c8dda911cef2e272d6cf9769
---
M Wikibase.php
M lib/includes/serializers/Serializer.php
M phpcs.xml
M repo/includes/LanguageFallbackLabelDescriptionLookupFactory.php
M repo/includes/actions/EditPropertyAction.php
M repo/includes/specials/SpecialListProperties.php
M repo/tests/phpunit/includes/CopyrightMessageBuilderTest.php
M 
repo/tests/phpunit/includes/LanguageFallbackLabelDescriptionLookupFactoryTest.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
M repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
M repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
11 files changed, 5 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/20/225520/1

diff --git a/Wikibase.php b/Wikibase.php
index f449ed0..c0bcf18 100644
--- a/Wikibase.php
+++ b/Wikibase.php
@@ -37,4 +37,3 @@
 if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) || 
$GLOBALS['wgEnableWikibaseClient'] ) {
require_once __DIR__ . '/client/WikibaseClient.php';
 }
-
diff --git a/lib/includes/serializers/Serializer.php 
b/lib/includes/serializers/Serializer.php
index 802b236..fb0b76d 100644
--- a/lib/includes/serializers/Serializer.php
+++ b/lib/includes/serializers/Serializer.php
@@ -51,4 +51,3 @@
public function getOptions();
 
 }
-
diff --git a/phpcs.xml b/phpcs.xml
index 6cf41d9..c547890 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -57,9 +57,13 @@
tests*phpunit*Test*\.php

 
-   
+   

+   
+   

+   
+   
 


DataAccess*Scribunto*Scribunto_LuaWikibase*Library
diff --git a/repo/includes/LanguageFallbackLabelDescriptionLookupFactory.php 
b/repo/includes/LanguageFallbackLabelDescriptionLookupFactory.php
index acf467d..471a5f6 100644
--- a/repo/includes/LanguageFallbackLabelDescriptionLookupFactory.php
+++ b/repo/includes/LanguageFallbackLabelDescriptionLookupFactory.php
@@ -93,4 +93,3 @@
}
 
 }
-
diff --git a/repo/includes/actions/EditPropertyAction.php 
b/repo/includes/actions/EditPropertyAction.php
index 85f3192..9702e31 100644
--- a/repo/includes/actions/EditPropertyAction.php
+++ b/repo/includes/actions/EditPropertyAction.php
@@ -13,4 +13,3 @@
 class EditPropertyAction extends EditEntityAction {
 
 }
-
diff --git a/repo/includes/specials/SpecialListProperties.php 
b/repo/includes/specials/SpecialListProperties.php
index 8ce4177..940cf50 100644
--- a/repo/includes/specials/SpecialListProperties.php
+++ b/repo/includes/specials/SpecialListProperties.php
@@ -218,4 +218,3 @@
}
 
 }
-
diff --git a/repo/tests/phpunit/includes/CopyrightMessageBuilderTest.php 
b/repo/tests/phpunit/includes/CopyrightMessageBuilderTest.php
index 5397cae..968f39f 100644
--- a/repo/tests/phpunit/includes/CopyrightMessageBuilderTest.php
+++ b/repo/tests/phpunit/includes/CopyrightMessageBuilderTest.php
@@ -53,4 +53,3 @@
}
 
 }
-
diff --git 
a/repo/tests/phpunit/includes/LanguageFallbackLabelDescriptionLookupFactoryTest.php
 
b/repo/tests/phpunit/includes/LanguageFallbackLabelDescriptionLookupFactoryTest.php
index 1d2ef82..c74716c 100644
--- 
a/repo/tests/phpunit/includes/LanguageFallbackLabelDescriptionLookupFactoryTest.php
+++ 
b/repo/tests/phpunit/includes/LanguageFallbackLabelDescriptionLookupFactoryTest.php
@@ -67,4 +67,3 @@
}
 
 }
-
diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php 
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 1db6ef9..ef1261b 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -17,7 +17,6 @@
 use Wikibase\Test\MockRepository;
 use Wikibase\Lib\Store\EntityRedirect;
 
-
 /**
  * @covers Wikibase\Repo\Api\MergeItems
  *
diff --git a/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php 
b/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
index f5a0b2c..922fbad 100644
--- a/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
@@ -159,4 +159,3 @@
}
 
 }
-
diff --git 
a/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php 
b/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
index 8369cf2..3ba298a 100644
--- a/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialPageCopyrightViewTest.php
@@ -59,4 +59,3 @@
}
 
 }
-

-- 
To view, visit htt

[MediaWiki-commits] [Gerrit] Defer user_newtalk updates in clearNotification() to post-send - change (mediawiki/core)

2015-07-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has submitted this change and it was merged.

Change subject: Defer user_newtalk updates in clearNotification() to post-send
..


Defer user_newtalk updates in clearNotification() to post-send

* Also only issue DELETE if notifications exist. Previously,
  this would issue a DELETE for all self talk page views.

Bug: T92007
Change-Id: Ifef11c9e5175d68d9615e59e2ed7de2f2c57bde1
---
M includes/User.php
1 file changed, 17 insertions(+), 12 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/User.php b/includes/User.php
index bd0d30b..d627a6d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3385,19 +3385,24 @@
return;
}
 
-   $nextid = $oldid ? $title->getNextRevisionID( $oldid ) 
: null;
-
-   if ( !$oldid || !$nextid ) {
-   // If we're looking at the latest revision, we 
should definitely clear it
-   $this->setNewtalk( false );
-   } else {
-   // Otherwise we should update its revision, if 
it's present
-   if ( $this->getNewtalk() ) {
-   // Naturally the other one won't clear 
by itself
-   $this->setNewtalk( false );
-   $this->setNewtalk( true, 
Revision::newFromId( $nextid ) );
+   $that = $this;
+   // Try to update the DB post-send and only if needed...
+   DeferredUpdates::addCallableUpdate( function() use ( 
$that, $title, $oldid ) {
+   if ( !$that->getNewtalk() ) {
+   return; // no notifications to clear
}
-   }
+
+   // Delete the last notifications (they stack up)
+   $that->setNewtalk( false );
+
+   // If there is a new, unseen, revision, use its 
timestamp
+   $nextid = $oldid
+   ? $title->getNextRevisionID( $oldid, 
Title::GAID_FOR_UPDATE )
+   : null;
+   if ( $nextid ) {
+   $that->setNewtalk( true, 
Revision::newFromId( $nextid ) );
+   }
+   } );
}
 
if ( !$wgUseEnotif && !$wgShowUpdatedMarker ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef11c9e5175d68d9615e59e2ed7de2f2c57bde1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add an option to only migrate a maximum number of revisions ... - change (mediawiki...Oversight)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add an option to only migrate a maximum number of revisions at 
a time
..


Add an option to only migrate a maximum number of revisions at a time

Bug: T62373
Change-Id: I77610ba84e22161beb0a111cb8aabf2458395fbb
---
M migrateToRevDel.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/migrateToRevDel.php b/migrateToRevDel.php
index 6f9f525..0cc38ca 100644
--- a/migrateToRevDel.php
+++ b/migrateToRevDel.php
@@ -41,6 +41,7 @@
$this->setBatchSize( 20 );
$this->mDescription = "Migrate revisions hidden with the 
Oversight extension to revdel.";
$this->addOption( 'migrate', "Turn off dry-run mode and 
actually insert OS data into revision/archive table." );
+   $this->addOption( 'max', "Maximum number of revisions to 
migrate at a time.", true );
}
 
/**
@@ -266,7 +267,7 @@
$dbw->insert( 'logging', $insertLoggingData, 
__METHOD__ );
$dbw->commit();
}
-   } while ( $hiddenRows->numRows() === $this->mBatchSize );
+   } while ( $hiddenRows->numRows() === $this->mBatchSize && 
$count < $this->getOption( 'max' ) );
 
$this->output( "Done! $count oversighted revision(s) are now 
converted to suppressed revisions.\n" );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/225504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77610ba84e22161beb0a111cb8aabf2458395fbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Oversight
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add rollbacker to arwikisource and autopatrolled+rollbacker ... - change (operations/mediawiki-config)

2015-07-17 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225519

Change subject: Add rollbacker to arwikisource and autopatrolled+rollbacker to 
arwiktionary
..

Add rollbacker to arwikisource and autopatrolled+rollbacker to arwiktionary

Bug: T97271
Change-Id: Ifb6485cf877bfbaddb3b279709d92ac29fbef42a
---
M wmf-config/InitialiseSettings.php
1 file changed, 13 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/19/225519/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3a8ca35..cf04964 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7047,6 +7047,11 @@
'+arwikisource' => array(
'autopatrolled' => array( 'autopatrol' => true ),
'patroller' => array( 'patrol' => true ),
+   'rollbacker' => array( 'rollback' => true ),
+   ),
+   '+arwiktionary' => array(
+   'autopatrolled' => array( 'autopatrol' => true ),
+   'rollbacker' => array( 'rollback' => true ),
),
'bnwiki' => array(
'user' => array( 'patrol' => false ),
@@ -8373,7 +8378,10 @@
'sysop' => array( 'uploader', 'reviewer', 'confirmed', 
'rollbacker', 'abusefilter', ),
),
'+arwikisource' => array(
-   'sysop' => array( 'patroller', 'autopatrolled', ),
+   'sysop' => array( 'patroller', 'autopatrolled', 'rollbacker' ),
+   ),
+   '+arwiktionary' => array(
+   'sysop' => array( 'autopatrolled', 'rollbacker' ),
),
'+bewiki' => array(
'sysop' => array( 'autoeditor' ),
@@ -8993,7 +9001,10 @@
'sysop' => array( 'uploader', 'reviewer', 'confirmed', 
'rollbacker', 'abusefilter', 'patroller', 'autopatrolled', ),
),
'+arwikisource' => array(
-   'sysop' => array( 'patroller', 'autopatrolled', ),
+   'sysop' => array( 'patroller', 'autopatrolled', 'rollbacker' ),
+   ),
+   '+arwiktionary' => array(
+   'sysop' => array( 'autopatrolled', 'rollbacker' ),
),
'+bawiki' => array(
'bureaucrat' => array( 'sysop' ),

-- 
To view, visit https://gerrit.wikimedia.org/r/225519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb6485cf877bfbaddb3b279709d92ac29fbef42a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] T105430: canonicalize language codes - change (mediawiki...Wikibase)

2015-07-17 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225518

Change subject: T105430: canonicalize language codes
..

T105430: canonicalize language codes

Change-Id: I92533ca9689ddd660d34a56e20cf59c15e64aaf7
---
M repo/config/Wikibase.default.php
M repo/includes/rdf/RdfVocabulary.php
M repo/includes/rdf/SimpleValueRdfBuilder.php
M repo/includes/rdf/SiteLinksRdfBuilder.php
4 files changed, 49 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/18/225518/1

diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index e36..ef0e16c 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -131,6 +131,19 @@
// This is both a repo and client setting, and should be set to 
the same value in
// repo and clients for multiwiki setups.
'sharedCacheType' => $GLOBALS['wgMainCacheType'],
+
+   // Special non-canonical languages and their BCP 47 mappings
+   // Based on: 
https://meta.wikimedia.org/wiki/Special_language_codes
+   'languageCanonicalNames' => array(
+   'simple'  => 'en-x-simple',
+   'crh' => 'crh-Latn',
+   'cbk-zam' => 'cbk-x-zam',
+   "map-bms" => "jv-x-bms",
+   "nrm" => "fr-x-nrm",
+   "roa-tara"=> "it-x-tara",
+   "de-formal"   => "de-x-formal",
+   "nl-informal" => "nl-x-informal",
+   ),
);
 
return $defaults;
diff --git a/repo/includes/rdf/RdfVocabulary.php 
b/repo/includes/rdf/RdfVocabulary.php
index 5bc5d06..3a2843e 100644
--- a/repo/includes/rdf/RdfVocabulary.php
+++ b/repo/includes/rdf/RdfVocabulary.php
@@ -6,6 +6,7 @@
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Statement\Statement;
 use DataValues\DataValue;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * RDF vocabulary for use in mapping for wikibase data model.
@@ -91,6 +92,11 @@
 * @var string
 */
private $dataUri;
+   /**
+* List of non-standard language codes with standard equivalents
+* @var array
+*/
+   private $languageCanonicalNames;
 
/**
 * @param string $baseUri Base URI for entity concept URIs.
@@ -137,6 +143,8 @@
self::NS_GEO => self::GEO_URI,
self::NS_PROV => self::PROV_URI,
);
+
+   $this->languageCanonicalNames = 
WikibaseRepo::getDefaultInstance()->getSettings()->getSetting( 
'languageCanonicalNames' );
}
 
/**
@@ -215,4 +223,28 @@
return self::COMMONS_URI . rawurlencode( $file );
}
 
+   /**
+* Return canonical language name from internal Wikibase one
+* @param string $langName
+* @return string
+*/
+   public function getCanonicalLanguage( $langName ) {
+   // Wikibase list goes first in case we want to override
+   // Like "simple" goes to en-x-simple not en
+   if( !empty($this->languageCanonicalNames[$langName]) ) {
+   return $this->languageCanonicalNames[$langName];
+   }
+
+   if( !empty($GLOBALS['wgDummyLanguageCodes'][$langName]) ) {
+   return $GLOBALS['wgDummyLanguageCodes'][$langName];
+   }
+
+   if( strchr( $langName, "-" ) == FALSE) {
+   // If no -, then no need to normalize
+   return $langName;
+   }
+
+   return wfBCP47( $langName );
+   }
+
 }
diff --git a/repo/includes/rdf/SimpleValueRdfBuilder.php 
b/repo/includes/rdf/SimpleValueRdfBuilder.php
index a5de19a..5c22971 100644
--- a/repo/includes/rdf/SimpleValueRdfBuilder.php
+++ b/repo/includes/rdf/SimpleValueRdfBuilder.php
@@ -250,7 +250,8 @@
$dataType,
MonolingualTextValue $value
) {
-   $writer->say( $propertyValueNamespace, $propertyValueLName 
)->text( $value->getText(), $value->getLanguageCode() );
+   $writer->say( $propertyValueNamespace, $propertyValueLName 
)->text( $value->getText(),
+   $this->vocabulary->getCanonicalLanguage( 
$value->getLanguageCode() ) );
}
 
/**
diff --git a/repo/includes/rdf/SiteLinksRdfBuilder.php 
b/repo/includes/rdf/SiteLinksRdfBuilder.php
index 512d5a5..d5624ed 100644
--- a/repo/includes/rdf/SiteLinksRdfBuilder.php
+++ b/repo/includes/rdf/SiteLinksRdfBuilder.php
@@ -93,7 +93,8 @@
$this->writer->about( $url )
->a( RdfVocabulary::

[MediaWiki-commits] [Gerrit] Update donation-interface - change (wikimedia...vendor)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Update donation-interface
..


Update donation-interface

Recurring GlobalCollect codepath fixes

Change-Id: I5e040c82a027f58166adc6575c327da0c4da8db4
---
M composer/installed.json
M wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
M wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
M wikimedia/donation-interface/tests/Adapter/GlobalCollect/RecurringTest.php
A 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/DO_PAYMENT_recurring-NOK.testresponse
M 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
M 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
M 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
8 files changed, 104 insertions(+), 56 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/composer/installed.json b/composer/installed.json
index 2989cb1..65c2ad3 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -809,7 +809,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
+"reference": "899be810fa33ae02e09f606ca5669b6d6890b236"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",
@@ -818,7 +818,7 @@
 "psr/log": "1.0.0",
 "zordius/lightncandy": "0.18"
 },
-"time": "2015-07-17 19:58:45",
+"time": "2015-07-17 22:38:02",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git 
a/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php 
b/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
index c915850..35b56ac 100644
--- a/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
+++ b/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
@@ -25,11 +25,9 @@
return 'localhost';
}
 
-   /**
-* @throws BadMethodCallException
-*/
static function formatMessage( $message_identifier ) {
-   throw new BadMethodCallException( "Not implemented" );
+   // TODO: Use the i18n logic in wmf_communication
+   return $message_identifier;
}
 
static function runHooks( $func, $args ) {
diff --git 
a/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php 
b/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
index 2b86107..4907dc4 100644
--- 
a/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
+++ 
b/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
@@ -1423,17 +1423,24 @@
 * Process a non-initial effort_id charge.
 */
protected function transactionRecurring_Charge() {
-   $result = $this->do_transaction('DO_PAYMENT');
-   if ( $result->getCommunicationStatus() ) {
-   $result = $this->do_transaction('GET_ORDERSTATUS');
+   $response = $this->do_transaction( 'DO_PAYMENT' );
+   $result = PaymentResult::fromResults(
+   $response,
+   $this->getFinalStatus()
+   );
+   if ( $response->getCommunicationStatus()
+&& !$result->isFailed()
+&& !$result->getErrors()
+  ) {
+   $response = $this->do_transaction( 'GET_ORDERSTATUS' );
$data = $this->getTransactionData();
$orderStatus = $this->findCodeAction( 
'GET_ORDERSTATUS', 'STATUSID', $data['STATUSID'] );
if ( $this->getTransactionStatus() && $orderStatus === 
FinalStatus::PENDING_POKE ) {

$this->transactions['SET_PAYMENT']['values']['PAYMENTPRODUCTID'] = 
$data['PAYMENTPRODUCTID'];
-   $result = $this->do_transaction('SET_PAYMENT');
+   $response = 
$this->do_transaction('SET_PAYMENT');
}
}
-   return $result;
+   return $response;
}
 
 protected function transactionDirect_Debit() {
@@ -1595,7 +1602,7 @@
$data = $this->xmlChildrenToArray( $response, 
'ROW' );
break;
case 'DO_PAYMENT':
-   $data = $this->xmlChildrenToArray( $response, 
'STATUS' );
+   $data = $this->xmlChildrenToArray( $response, 
'ROW' );

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

Updating donation-interface library

Change-Id: Iaf173e1fd81d54022385ce7f7e13797b3926a6cc
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/vendor b/vendor
index 56f9d36..914b390 16
--- a/vendor
+++ b/vendor
-Subproject commit 56f9d36ee33a8e5794778f4fc833b3e9acd9a4ab
+Subproject commit 914b3901120140add1b9470c34e589392c39e624

-- 
To view, visit https://gerrit.wikimedia.org/r/225517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf173e1fd81d54022385ce7f7e13797b3926a6cc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225517

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Updating donation-interface library

Change-Id: Iaf173e1fd81d54022385ce7f7e13797b3926a6cc
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/17/225517/1

diff --git a/vendor b/vendor
index 56f9d36..914b390 16
--- a/vendor
+++ b/vendor
-Subproject commit 56f9d36ee33a8e5794778f4fc833b3e9acd9a4ab
+Subproject commit 914b3901120140add1b9470c34e589392c39e624

-- 
To view, visit https://gerrit.wikimedia.org/r/225517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf173e1fd81d54022385ce7f7e13797b3926a6cc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update donation-interface for recurring GC - change (wikimedia...crm)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Update donation-interface for recurring GC
..


Update donation-interface for recurring GC

Change-Id: I57c22de6d1258d297c9402a70e546a881f7fd72f
---
M composer.lock
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index 401017e..38ed5ee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -693,7 +693,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
+"reference": "899be810fa33ae02e09f606ca5669b6d6890b236"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",

-- 
To view, visit https://gerrit.wikimedia.org/r/225516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I57c22de6d1258d297c9402a70e546a881f7fd72f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update donation-interface for recurring GC - change (wikimedia...crm)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225516

Change subject: Update donation-interface for recurring GC
..

Update donation-interface for recurring GC

Change-Id: I57c22de6d1258d297c9402a70e546a881f7fd72f
---
M composer.lock
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/16/225516/1

diff --git a/composer.lock b/composer.lock
index 401017e..38ed5ee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -693,7 +693,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
+"reference": "899be810fa33ae02e09f606ca5669b6d6890b236"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",

-- 
To view, visit https://gerrit.wikimedia.org/r/225516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57c22de6d1258d297c9402a70e546a881f7fd72f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix fdcwiki's wgMetaNamespace to not be Wikipedia - change (operations/mediawiki-config)

2015-07-17 Thread Matanya (Code Review)

Matanya has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225515

Change subject: Fix fdcwiki's wgMetaNamespace to not be Wikipedia
..

Fix fdcwiki's wgMetaNamespace to not be Wikipedia

bug: T106188
Change-Id: Ica855e4db4133a1d6fffe9b82476dfebd52460e5
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/15/225515/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3a8ca35..5883688 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2078,6 +2078,7 @@
'fawikisource' => 'ویکی‌نبشته',
'fawikivoyage' => 'ویکی‌سفر', // T73382
'fawiktionary' => 'ویکی‌واژه',
+   'fdcwiki' => 'Project',
'fiwikibooks' => 'Wikikirjasto',
'fiwikinews' => 'Wikiuutiset',
'fiwikiquote' => 'Wikisitaatit',

-- 
To view, visit https://gerrit.wikimedia.org/r/225515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica855e4db4133a1d6fffe9b82476dfebd52460e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matanya 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update donation-interface - change (wikimedia...vendor)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225514

Change subject: Update donation-interface
..

Update donation-interface

Recurring GlobalCollect codepath fixes

Change-Id: I5e040c82a027f58166adc6575c327da0c4da8db4
---
M composer/installed.json
M wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
M wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
M wikimedia/donation-interface/tests/Adapter/GlobalCollect/RecurringTest.php
A 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/DO_PAYMENT_recurring-NOK.testresponse
M 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
M 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
M 
wikimedia/donation-interface/tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
8 files changed, 104 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/14/225514/1

diff --git a/composer/installed.json b/composer/installed.json
index 2989cb1..65c2ad3 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -809,7 +809,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
+"reference": "899be810fa33ae02e09f606ca5669b6d6890b236"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",
@@ -818,7 +818,7 @@
 "psr/log": "1.0.0",
 "zordius/lightncandy": "0.18"
 },
-"time": "2015-07-17 19:58:45",
+"time": "2015-07-17 22:38:02",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git 
a/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php 
b/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
index c915850..35b56ac 100644
--- a/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
+++ b/wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
@@ -25,11 +25,9 @@
return 'localhost';
}
 
-   /**
-* @throws BadMethodCallException
-*/
static function formatMessage( $message_identifier ) {
-   throw new BadMethodCallException( "Not implemented" );
+   // TODO: Use the i18n logic in wmf_communication
+   return $message_identifier;
}
 
static function runHooks( $func, $args ) {
diff --git 
a/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php 
b/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
index 2b86107..4907dc4 100644
--- 
a/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
+++ 
b/wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
@@ -1423,17 +1423,24 @@
 * Process a non-initial effort_id charge.
 */
protected function transactionRecurring_Charge() {
-   $result = $this->do_transaction('DO_PAYMENT');
-   if ( $result->getCommunicationStatus() ) {
-   $result = $this->do_transaction('GET_ORDERSTATUS');
+   $response = $this->do_transaction( 'DO_PAYMENT' );
+   $result = PaymentResult::fromResults(
+   $response,
+   $this->getFinalStatus()
+   );
+   if ( $response->getCommunicationStatus()
+&& !$result->isFailed()
+&& !$result->getErrors()
+  ) {
+   $response = $this->do_transaction( 'GET_ORDERSTATUS' );
$data = $this->getTransactionData();
$orderStatus = $this->findCodeAction( 
'GET_ORDERSTATUS', 'STATUSID', $data['STATUSID'] );
if ( $this->getTransactionStatus() && $orderStatus === 
FinalStatus::PENDING_POKE ) {

$this->transactions['SET_PAYMENT']['values']['PAYMENTPRODUCTID'] = 
$data['PAYMENTPRODUCTID'];
-   $result = $this->do_transaction('SET_PAYMENT');
+   $response = 
$this->do_transaction('SET_PAYMENT');
}
}
-   return $result;
+   return $response;
}
 
 protected function transactionDirect_Debit() {
@@ -1595,7 +1602,7 @@
$data = $this->xmlChildrenToArray( $response, 
'ROW' );
break;
case 'DO_PAYMENT':
-   $data = $this->xmlChildrenToArray( $response, 
'STATUS' );
+

[MediaWiki-commits] [Gerrit] Use Node.ELEMENT_NODE and Node.TEXT_NODE constants instead o... - change (mediawiki/core)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Use Node.ELEMENT_NODE and Node.TEXT_NODE constants instead of 
magic numbers
..


Use Node.ELEMENT_NODE and Node.TEXT_NODE constants instead of magic numbers

Updating all non-third-party scripts to depend on 'dom-level2-shim'
and use the constants.

* jquery.highlightText
* jquery.tablesorter
* mediawiki.api.upload
* test.mediawiki.qunit.testrunner

Change-Id: Ib07dded9fa18c749b3c064ab90326852146567b2
---
M resources/Resources.php
M resources/src/jquery/jquery.highlightText.js
M resources/src/jquery/jquery.tablesorter.js
M resources/src/mediawiki.api/mediawiki.api.upload.js
M tests/qunit/QUnitTestResources.php
M tests/qunit/data/testrunner.js
6 files changed, 20 insertions(+), 15 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/Resources.php b/resources/Resources.php
index 3217503..704805b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -247,7 +247,10 @@
),
'jquery.highlightText' => array(
'scripts' => 'resources/src/jquery/jquery.highlightText.js',
-   'dependencies' => 'mediawiki.RegExp',
+   'dependencies' => array(
+   'mediawiki.RegExp',
+   'dom-level2-shim',
+   ),
'targets' => array( 'desktop', 'mobile' ),
),
'jquery.hoverIntent' => array(
@@ -309,6 +312,7 @@
'styles' => 'resources/src/jquery/jquery.tablesorter.css',
'messages' => array( 'sort-descending', 'sort-ascending' ),
'dependencies' => array(
+   'dom-level2-shim',
'mediawiki.RegExp',
'mediawiki.language.months',
),
@@ -857,7 +861,12 @@
),
'mediawiki.api.upload' => array(
'scripts' => 
'resources/src/mediawiki.api/mediawiki.api.upload.js',
-   'dependencies' => array( 'mediawiki.api', 'mediawiki.api.edit', 
'json' ),
+   'dependencies' => array(
+   'dom-level2-shim',
+   'mediawiki.api',
+   'mediawiki.api.edit',
+   'json',
+   ),
),
'mediawiki.api.watch' => array(
'scripts' => 
'resources/src/mediawiki.api/mediawiki.api.watch.js',
diff --git a/resources/src/jquery/jquery.highlightText.js 
b/resources/src/jquery/jquery.highlightText.js
index 8deb669..1ec4db0 100644
--- a/resources/src/jquery/jquery.highlightText.js
+++ b/resources/src/jquery/jquery.highlightText.js
@@ -23,8 +23,7 @@
// scans a node looking for the pattern and wraps a span around 
each match
innerHighlight: function ( node, pat ) {
var i, match, pos, spannode, middlebit, middleclone;
-   // if this is a text node
-   if ( node.nodeType === 3 ) {
+   if ( node.nodeType === Node.TEXT_NODE ) {
// TODO - need to be smarter about the 
character matching here.
// non latin characters can make regex think a 
new word has begun: do not use \b
// 
http://stackoverflow.com/questions/3787072/regex-wordwrap-with-utf8-characters-in-js
@@ -46,8 +45,8 @@
// replace the matched node, with our 
span-wrapped clone of the matched node
middlebit.parentNode.replaceChild( 
spannode, middlebit );
}
-   // if this is an element with childnodes, and not a 
script, style or an element we created
-   } else if ( node.nodeType === 1
+   } else if ( node.nodeType === Node.ELEMENT_NODE
+   // element with childnodes, and not a script, 
style or an element we created
&& node.childNodes
&& !/(script|style)/i.test( node.tagName )
&& !( node.tagName.toLowerCase() === 'span'
diff --git a/resources/src/jquery/jquery.tablesorter.js 
b/resources/src/jquery/jquery.tablesorter.js
index c8e3cb3..8efbb1c 100644
--- a/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@ -95,8 +95,7 @@
return $node.attr( 'alt' ) || ''; // handle 
undefined alt
} else {
return $.map( $.makeArray( node.childNodes ), 
function ( elem ) {
-   // 1 is for document.ELEMENT_NODE (the 
constant is undefined on old browsers)
-   if ( elem.nodeType === 1 ) {
+

[MediaWiki-commits] [Gerrit] Check for any content of MediaWiki namespace titles before p... - change (mediawiki/core)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Check for any content of MediaWiki namespace titles before 
passing it through ContentHandler
..


Check for any content of MediaWiki namespace titles before passing it through 
ContentHandler

Follows up I302d7915

Change-Id: I484bc45681d2a916aaa1e174e9235515aea62930
---
M includes/page/Article.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/page/Article.php b/includes/page/Article.php
index f213f6a..e58ffc8 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1256,7 +1256,7 @@
 
# Show error message
$oldid = $this->getOldID();
-   if ( !$oldid && $title->getNamespace() === NS_MEDIAWIKI ) {
+   if ( !$oldid && $title->getNamespace() === NS_MEDIAWIKI && 
$title->hasSourceText() ) {
$outputPage->addParserOutput( 
$this->getContentObject()->getParserOutput( $title ) );
} else {
if ( $oldid ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I484bc45681d2a916aaa1e174e9235515aea62930
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Avoid using trigger_error() in addMissingMetadata() - change (mediawiki/core)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Avoid using trigger_error() in addMissingMetadata()
..


Avoid using trigger_error() in addMissingMetadata()

* Just use the normal swift log instead

Bug: T105810
Change-Id: Ifa463e6298a1b57ab6a8d92f9defc744619d9fb6
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 9bae2ae..2ccafe4 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -666,8 +666,9 @@
return $objHdrs; // nothing to do
}
 
+   /** @noinspection PhpUnusedLocalVariableInspection */
$ps = Profiler::instance()->scopedProfileIn( __METHOD__ . 
"-{$this->name}" );
-   trigger_error( "$path was not stored with SHA-1 metadata.", 
E_USER_WARNING );
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ": $path was not 
stored with SHA-1 metadata." );
 
$auth = $this->getAuthentication();
if ( !$auth ) {
@@ -677,6 +678,7 @@
}
 
$status = Status::newGood();
+   /** @noinspection PhpUnusedLocalVariableInspection */
$scopeLockS = $this->getScopedFileLocks( array( $path ), 
LockManager::LOCK_UW, $status );
if ( $status->isOK() ) {
$tmpFile = $this->getLocalCopy( array( 'src' => $path, 
'latest' => 1 ) );
@@ -696,7 +698,8 @@
}
}
}
-   trigger_error( "Unable to set SHA-1 metadata for $path", 
E_USER_WARNING );
+
+   wfDebugLog( 'SwiftBackend', __METHOD__ . ": unable to set SHA-1 
metadata for $path" );
$objHdrs['x-object-meta-sha1base36'] = false;
 
return $objHdrs; // failed

-- 
To view, visit https://gerrit.wikimedia.org/r/225471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa463e6298a1b57ab6a8d92f9defc744619d9fb6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Check for any content of MediaWiki namespace titles before p... - change (mediawiki/core)

2015-07-17 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225513

Change subject: Check for any content of MediaWiki namespace titles before 
passing it through ContentHandler
..

Check for any content of MediaWiki namespace titles before passing it through 
ContentHandler

Change-Id: I484bc45681d2a916aaa1e174e9235515aea62930
---
M includes/page/Article.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/225513/1

diff --git a/includes/page/Article.php b/includes/page/Article.php
index f213f6a..e58ffc8 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1256,7 +1256,7 @@
 
# Show error message
$oldid = $this->getOldID();
-   if ( !$oldid && $title->getNamespace() === NS_MEDIAWIKI ) {
+   if ( !$oldid && $title->getNamespace() === NS_MEDIAWIKI && 
$title->hasSourceText() ) {
$outputPage->addParserOutput( 
$this->getContentObject()->getParserOutput( $title ) );
} else {
if ( $oldid ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I484bc45681d2a916aaa1e174e9235515aea62930
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] T105824: drop generic Value class, only use specific classes - change (mediawiki...Wikibase)

2015-07-17 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225512

Change subject: T105824: drop generic Value class, only use specific classes
..

T105824: drop generic Value class, only use specific classes

Change-Id: I1e43079255b959ed705a0dcf7d4acbd5f76a623a
---
M repo/includes/rdf/ComplexValueRdfBuilder.php
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
M repo/tests/phpunit/data/rdf/Q4_claims.nt
M repo/tests/phpunit/data/rdf/Q4_values.nt
M repo/tests/phpunit/data/rdf/Q6_qualifiers.nt
M repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
M repo/tests/phpunit/data/rdf/Q7_references.nt
M repo/tests/phpunit/data/rdf/Q8_baddates.nt
M repo/tests/phpunit/data/rdf/dump_refs.nt
10 files changed, 0 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/12/225512/1

diff --git a/repo/includes/rdf/ComplexValueRdfBuilder.php 
b/repo/includes/rdf/ComplexValueRdfBuilder.php
index 9ca12ba..ccedc4f 100644
--- a/repo/includes/rdf/ComplexValueRdfBuilder.php
+++ b/repo/includes/rdf/ComplexValueRdfBuilder.php
@@ -121,8 +121,6 @@
return $valueLName;
}
 
-   $this->valueWriter->about( RdfVocabulary::NS_VALUE, $valueLName 
)->a( RdfVocabulary::NS_ONTOLOGY, 'Value' );
-
$this->valueWriter->a( RdfVocabulary::NS_ONTOLOGY, 
$this->vocabulary->getValueTypeName( $value ) );
 
foreach ( $props as $prop => $type ) {
diff --git a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt 
b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
index db992de..39d7b77 100644
--- a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
+++ b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
@@ -59,17 +59,14 @@
 

  
 .
 

  
 .
 

  
 .
- 
 
 .
  
 
"+19.768682121026329696178436279296875"^^
 .
  
 
"+19.766459987520822323858737945556640625"^^
 .
  
 "1" .
  
 
"+19.768999835154085303656756877899169921875"^^
 .
- 
 
 .
  
  .
  
 
"12.345"^^ .
  
 
"67.89"^^ .
  
 
"0.01"^^ .
- 
 
 .
  
 
 .
  
 
"9"^^ .
  
 
"-0200-01-01T00:00:00Z"^^ .
diff --git a/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt 
b/repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
index 8201647..878180b 100644
--- a/repo/tests/php

[MediaWiki-commits] [Gerrit] Stop exceptioning in drupal formatMessage stub - change (mediawiki...DonationInterface)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Stop exceptioning in drupal formatMessage stub
..


Stop exceptioning in drupal formatMessage stub

Not actually translating yet, but this should let us turn recurring
GlobalCollect back on.

Bug: T105848
Change-Id: Iec9195982c737ae30622db14d753de86ce94f49b
---
M gateway_common/WmfFramework.drupal.php
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Cdentinger: Looks good to me, approved
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gateway_common/WmfFramework.drupal.php 
b/gateway_common/WmfFramework.drupal.php
index c915850..35b56ac 100644
--- a/gateway_common/WmfFramework.drupal.php
+++ b/gateway_common/WmfFramework.drupal.php
@@ -25,11 +25,9 @@
return 'localhost';
}
 
-   /**
-* @throws BadMethodCallException
-*/
static function formatMessage( $message_identifier ) {
-   throw new BadMethodCallException( "Not implemented" );
+   // TODO: Use the i18n logic in wmf_communication
+   return $message_identifier;
}
 
static function runHooks( $func, $args ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec9195982c737ae30622db14d753de86ce94f49b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix recurring GC false success report - change (mediawiki...DonationInterface)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix recurring GC false success report
..


Fix recurring GC false success report

This was kinda messed up all along (looking at wrong XML tag in
DO_PAYMENT response), but I screwed this up more in my
PaymentTransactionResponse refactor.  We need to bail out if the
first do_transaction result has errors or sets final status to failed.

Bug: T105848
Change-Id: Ibc7461df00e3388b0596e0fa60b94066f1e8d280
---
M globalcollect_gateway/globalcollect.adapter.php
M tests/Adapter/GlobalCollect/RecurringTest.php
A tests/includes/Responses/globalcollect/DO_PAYMENT_recurring-NOK.testresponse
M tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
M tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
M tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
6 files changed, 100 insertions(+), 50 deletions(-)

Approvals:
  Cdentinger: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index 2b86107..4907dc4 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1423,17 +1423,24 @@
 * Process a non-initial effort_id charge.
 */
protected function transactionRecurring_Charge() {
-   $result = $this->do_transaction('DO_PAYMENT');
-   if ( $result->getCommunicationStatus() ) {
-   $result = $this->do_transaction('GET_ORDERSTATUS');
+   $response = $this->do_transaction( 'DO_PAYMENT' );
+   $result = PaymentResult::fromResults(
+   $response,
+   $this->getFinalStatus()
+   );
+   if ( $response->getCommunicationStatus()
+&& !$result->isFailed()
+&& !$result->getErrors()
+  ) {
+   $response = $this->do_transaction( 'GET_ORDERSTATUS' );
$data = $this->getTransactionData();
$orderStatus = $this->findCodeAction( 
'GET_ORDERSTATUS', 'STATUSID', $data['STATUSID'] );
if ( $this->getTransactionStatus() && $orderStatus === 
FinalStatus::PENDING_POKE ) {

$this->transactions['SET_PAYMENT']['values']['PAYMENTPRODUCTID'] = 
$data['PAYMENTPRODUCTID'];
-   $result = $this->do_transaction('SET_PAYMENT');
+   $response = 
$this->do_transaction('SET_PAYMENT');
}
}
-   return $result;
+   return $response;
}
 
 protected function transactionDirect_Debit() {
@@ -1595,7 +1602,7 @@
$data = $this->xmlChildrenToArray( $response, 
'ROW' );
break;
case 'DO_PAYMENT':
-   $data = $this->xmlChildrenToArray( $response, 
'STATUS' );
+   $data = $this->xmlChildrenToArray( $response, 
'ROW' );
if ( isset( $data['STATUSID'] ) ) {
$this->finalizeInternalStatus( 
$this->findCodeAction( 'GET_ORDERSTATUS', 'STATUSID', $data['STATUSID'] ) );
} else {
diff --git a/tests/Adapter/GlobalCollect/RecurringTest.php 
b/tests/Adapter/GlobalCollect/RecurringTest.php
index b756cbf..1f5e8ff 100644
--- a/tests/Adapter/GlobalCollect/RecurringTest.php
+++ b/tests/Adapter/GlobalCollect/RecurringTest.php
@@ -21,6 +21,7 @@
  * @group Fundraising
  * @group DonationInterface
  * @group GlobalCollect
+ * @group Recurring
  */
 class DonationInterface_Adapter_GlobalCollect_RecurringTest extends 
DonationInterfaceTestCase {
 
@@ -70,4 +71,27 @@
$this->assertTrue( $result->getCommunicationStatus() );
$this->assertRegExp( '/SET_PAYMENT/', $result->getRawResponse() 
);
}
+
+   /**
+* Can make a recurring payment
+*
+* @covers GlobalCollectAdapter::transactionRecurring_Charge
+*/
+   public function testDeclinedRecurringCharge() {
+   $init = array(
+   'amount' => '2345',
+   'effort_id' => 2,
+   'order_id' => '9998890004',
+   'currency_code' => 'EUR',
+   'payment_product' => '',
+   );
+   $gateway = $this->getFreshGatewayObject( $init );
+
+   $gateway->setDummyGatewayResponseCode( 'recurring-NOK' );
+
+   $result = $gateway->do_transaction( 'Recurring_Charge' );
+
+   $this->assertEquals( 1, count( $gateway->curled ), 'Should not 
make another req

[MediaWiki-commits] [Gerrit] maps: give login rights to postgres users - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225511

Change subject: maps: give login rights to postgres users
..

maps: give login rights to postgres users

postgres CREATE ROLE does not give login rights by default. Amend the
commands to allow users to login

Change-Id: Ic29991061cdac50b2b3fe27825ff764801f50381
---
M templates/maps/grants.sql.erb
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/225511/1

diff --git a/templates/maps/grants.sql.erb b/templates/maps/grants.sql.erb
index b57c038..97e6f9e 100644
--- a/templates/maps/grants.sql.erb
+++ b/templates/maps/grants.sql.erb
@@ -1,6 +1,6 @@
-CREATE ROLE tilerator WITH PASSWORD '<%= @tilerator_pass %>';
-CREATE ROLE osmupdater WITH PASSWORD '<%= @osmupdater_pass %>';
-CREATE ROLE osmimporter WITH PASSWORD '<%= @osmimporter_pass %>';
+CREATE ROLE tilerator  WITH LOGIN PASSWORD '<%= @tilerator_pass %>';
+CREATE ROLE osmupdater WITH LOGIN PASSWORD '<%= @osmupdater_pass %>';
+CREATE ROLE osmimporter WITH LOGIN PASSWORD '<%= @osmimporter_pass %>';
 
 GRANT SELECT ON ALL TABLES IN SCHEMA public TO tilerator;
 GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA public TO osmupdater;

-- 
To view, visit https://gerrit.wikimedia.org/r/225511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic29991061cdac50b2b3fe27825ff764801f50381
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix name of Western and Southern Balochi - change (mediawiki/core)

2015-07-17 Thread Mjbmr (Code Review)

Mjbmr has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225510

Change subject: Fix name of Western and Southern Balochi
..

Fix name of Western and Southern Balochi

Current names are Persian and not equal to Western. and Southern,
changed to native values equal to Southern and Western.

Change-Id: Ie30acda8535042ece4c11c246c3c18fd7156fc54
---
M languages/Names.php
M languages/messages/MessagesBcc.php
M languages/messages/MessagesBgn.php
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/225510/1

diff --git a/languages/Names.php b/languages/Names.php
index 6d537d3..6bfb71c 100644
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -71,13 +71,13 @@
'bat-smg' => 'žemaitėška', # Samogitian (deprecated code, 'sgs' in ISO 
693-3 since 2010-06-30 )
'bbc' => 'Batak Toba', # Batak Toba (falls back to bbc-latn)
'bbc-latn' => 'Batak Toba', # Batak Toba
-   'bcc' => 'بلوچی مکرانی', # Southern Balochi
+   'bcc' => 'جهلسری بلوچی', # Southern Balochi
'bcl' => 'Bikol Central', # Bikol: Central Bicolano language
'be' => 'беларуская',   #  Belarusian normative
'be-tarask' => "беларуская (тарашкевіца)\xE2\x80\x8E",  # Belarusian in 
Taraskievica orthography
'be-x-old' => "беларуская (тарашкевіца)\xE2\x80\x8E",   # (be-tarask 
compat)
'bg' => 'български',# Bulgarian
-   'bgn' => 'بلوچی رخشانی', # Western Balochi
+   'bgn' => 'روچ کپتین بلوچی', # Western Balochi
'bh' => 'भोजपुरी',  # Bihari macro language. Falls back to Bhojpuri 
(bho)
'bho' => 'भोजपुरी', # Bhojpuri
'bi' => 'Bislama',  # Bislama
diff --git a/languages/messages/MessagesBcc.php 
b/languages/messages/MessagesBcc.php
index f5ade22..f9ee1be 100644
--- a/languages/messages/MessagesBcc.php
+++ b/languages/messages/MessagesBcc.php
@@ -1,5 +1,5 @@
 https://translatewiki.net
  *
diff --git a/languages/messages/MessagesBgn.php 
b/languages/messages/MessagesBgn.php
index cb52c1a..0c9fa26 100644
--- a/languages/messages/MessagesBgn.php
+++ b/languages/messages/MessagesBgn.php
@@ -1,5 +1,5 @@
 https://translatewiki.net
  *

-- 
To view, visit https://gerrit.wikimedia.org/r/225510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie30acda8535042ece4c11c246c3c18fd7156fc54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mjbmr 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add basic contact form for stewards - change (operations/mediawiki-config)

2015-07-17 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225509

Change subject: Add basic contact form for stewards
..

Add basic contact form for stewards

Bug: T98625
Change-Id: I4aee996a34f93563f0129b07726e3887f148d697
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/09/225509/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 6d4970c..212c595 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -798,6 +798,12 @@
if ( $wgDBname === 'metawiki' ) {
include( "$wmfConfigDir/LegalContactPages.php" );
include( "$wmfConfigDir/AffComContactPages.php" );
+   $wgContactConfig['stewards'] = array(
+   'RecipientUser' => 'Wikimedia Stewards',
+   'SenderEmail' => $wmgNotificationSender,
+   'RequireDetails' => true,
+   'IncludeIP' => true
+   );
}
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/225509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aee996a34f93563f0129b07726e3887f148d697
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: Use the correct classes in hiera - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: Use the correct classes in hiera
..


maps: Use the correct classes in hiera

Master and slave respectively instead of server

Change-Id: I1061951d0312bfa47a6d54662238cefd7ec293b8
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index cfe8be2..0a95bb5 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,7 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
-postgresql::server::datadir: /srv/postgresql/9.4/main
+postgresql::master::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index e46de5e..2924d76 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,6 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
-postgresql::server::datadir: /srv/postgresql/9.4/main
+postgresql::slave::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4

-- 
To view, visit https://gerrit.wikimedia.org/r/225507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1061951d0312bfa47a6d54662238cefd7ec293b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Stop exceptioning in drupal formatMessage stub - change (mediawiki...DonationInterface)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225508

Change subject: Stop exceptioning in drupal formatMessage stub
..

Stop exceptioning in drupal formatMessage stub

Not actually translating yet, but this should let us turn recurring
GlobalCollect back on.

Bug: T105848
Change-Id: Iec9195982c737ae30622db14d753de86ce94f49b
---
M gateway_common/WmfFramework.drupal.php
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/08/225508/1

diff --git a/gateway_common/WmfFramework.drupal.php 
b/gateway_common/WmfFramework.drupal.php
index 79508cb..3626fd5 100644
--- a/gateway_common/WmfFramework.drupal.php
+++ b/gateway_common/WmfFramework.drupal.php
@@ -21,11 +21,9 @@
return 'localhost';
}
 
-   /**
-* @throws BadMethodCallException
-*/
static function formatMessage( $message_identifier ) {
-   throw new BadMethodCallException( "Not implemented" );
+   // TODO: Use the i18n logic in wmf_communication
+   return $message_identifier;
}
 
static function runHooks( $func, $args ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec9195982c737ae30622db14d753de86ce94f49b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: Use the correct classes in hiera - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225507

Change subject: maps: Use the correct classes in hiera
..

maps: Use the correct classes in hiera

Master and slave respectively instead of server

Change-Id: I1061951d0312bfa47a6d54662238cefd7ec293b8
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/225507/1

diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index cfe8be2..0a95bb5 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,7 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
-postgresql::server::datadir: /srv/postgresql/9.4/main
+postgresql::master::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index e46de5e..2924d76 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,6 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
-postgresql::server::datadir: /srv/postgresql/9.4/main
+postgresql::slave::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4

-- 
To view, visit https://gerrit.wikimedia.org/r/225507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1061951d0312bfa47a6d54662238cefd7ec293b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] T105933: Update LabelService for 1.5.2 API - change (wikidata...rdf)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: T105933: Update LabelService for 1.5.2 API
..


T105933: Update LabelService for 1.5.2 API

Change-Id: Id719f48917577e989621d6e2ed7909981005cc59
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/PrefixDelegatingServiceFactory.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseOptimizers.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelServicePlacementOptimizer.java
M 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
M pom.xml
8 files changed, 133 insertions(+), 29 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/PrefixDelegatingServiceFactory.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/PrefixDelegatingServiceFactory.java
index 45daf08..0ab3552 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/PrefixDelegatingServiceFactory.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/PrefixDelegatingServiceFactory.java
@@ -2,6 +2,7 @@
 
 import org.openrdf.model.URI;
 
+import com.bigdata.rdf.sparql.ast.eval.AbstractServiceFactoryBase;
 import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
 import com.bigdata.rdf.sparql.ast.service.ServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
@@ -13,7 +14,7 @@
  * defaultService so some prefixes can be reserved for different types of
  * services.
  */
-public class PrefixDelegatingServiceFactory implements ServiceFactory {
+public class PrefixDelegatingServiceFactory extends AbstractServiceFactoryBase 
{
 /**
  * Service factory to use if the prefix doesn't match.
  */
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
index a29a5fa..61a3eb9 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
@@ -5,10 +5,10 @@
 import org.wikidata.query.rdf.blazegraph.label.LabelService;
 
 import com.bigdata.rdf.sail.webapp.BigdataRDFServletContextListener;
+import com.bigdata.rdf.sparql.ast.eval.AbstractServiceFactoryBase;
 import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
 import com.bigdata.rdf.sparql.ast.service.ServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
-import com.bigdata.rdf.sparql.ast.service.ServiceFactory;
 import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
 
 /**
@@ -33,7 +33,7 @@
 /**
  * Service factory that disables remote access.
  */
-private static final class DisableRemotesServiceFactory implements 
ServiceFactory {
+private static final class DisableRemotesServiceFactory extends 
AbstractServiceFactoryBase {
 
 @Override
 public IServiceOptions getServiceOptions() {
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseOptimizers.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseOptimizers.java
index cc4a7e4..b96a817 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseOptimizers.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseOptimizers.java
@@ -1,6 +1,7 @@
 package org.wikidata.query.rdf.blazegraph;
 
 import org.wikidata.query.rdf.blazegraph.label.EmptyLabelServiceOptimizer;
+import org.wikidata.query.rdf.blazegraph.label.LabelServicePlacementOptimizer;
 
 import com.bigdata.rdf.sparql.ast.optimizers.DefaultOptimizerList;
 
@@ -12,5 +13,6 @@
 
 public WikibaseOptimizers() {
 add(new EmptyLabelServiceOptimizer());
+add(new LabelServicePlacementOptimizer());
 }
 }
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java
index 113413b..a2c238f 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java
@@ -8,6 +8,7 @@
 import org.wikidata.query.rdf.common.uri.Ontology;
 import org.wikidata.query.rdf.common.uri.SchemaDotOrg;
 
+import com.bigdata.bop.BOp;
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.ICons

[MediaWiki-commits] [Gerrit] Enable more PHPCS sniffs from the MediaWiki rule set - change (mediawiki...Wikibase)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Enable more PHPCS sniffs from the MediaWiki rule set
..


Enable more PHPCS sniffs from the MediaWiki rule set

These sniffs are all copied from the MediaWiki rule set.

Change-Id: I423e431af337f043f9c28b994a97a394bb742fa0
---
M client/WikibaseClient.php
M client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
M lib/WikibaseLib.php
M phpcs.xml
M repo/includes/api/CreateClaim.php
M repo/includes/api/EditEntity.php
M repo/includes/api/ModifyEntity.php
M repo/includes/rdf/RdfProducer.php
M repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php
M tests/bootstrap.php
10 files changed, 27 insertions(+), 16 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 43e2d2b..6fb840c 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -119,7 +119,7 @@
$wgHooks['LoadExtensionSchemaUpdates'][] = 
'\Wikibase\Client\Usage\Sql\SqlUsageTrackerSchemaUpdater::onSchemaUpdate';
 
// extension hooks
-   $wgHooks['WikibaseDeleteData'][]= 
'\Wikibase\ClientHooks::onWikibaseDeleteData';
+   $wgHooks['WikibaseDeleteData'][] = 
'\Wikibase\ClientHooks::onWikibaseDeleteData';
 
// api modules
$wgAPIMetaModules['wikibase'] = array(
diff --git 
a/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php 
b/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
index 54bd655..d99b4d7 100644
--- a/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
@@ -200,7 +200,7 @@
SettingsArray $settings,
SiteLinkLookup $siteLinkLookup
) {
-   return  new OtherProjectsSidebarGeneratorFactory(
+   return new OtherProjectsSidebarGeneratorFactory(
$settings,
$siteLinkLookup,
$this->getSiteStore()
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 228c345..14a540a 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -70,7 +70,7 @@
define( 'SUMMARY_MAX_LENGTH', 250 );
 
// i18n
-   $wgMessagesDirs['WikibaseLib']   = __DIR__ . '/i18n';
+   $wgMessagesDirs['WikibaseLib'] = __DIR__ . '/i18n';
 
$wgJobClasses['ChangeNotification'] = 'Wikibase\ChangeNotificationJob';
 
diff --git a/phpcs.xml b/phpcs.xml
index e4ea35a..6cf41d9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,6 +5,10 @@
 -->
 
 
+   
+   
+   
+

 

@@ -23,6 +27,10 @@

 

+   
+   
+   0
+   
 


@@ -33,7 +41,9 @@



+   

+   
 


@@ -64,6 +74,7 @@



+   



diff --git a/repo/includes/api/CreateClaim.php 
b/repo/includes/api/CreateClaim.php
index 0805506..a058530 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -95,7 +95,7 @@
 * @params array $params
 */
private function validateParameters( array $params ) {
-   if ( $params['snaktype'] === 'value' XOR isset( 
$params['value'] ) ) {
+   if ( $params['snaktype'] === 'value' xor isset( 
$params['value'] ) ) {
if ( $params['snaktype'] === 'value' ) {
$this->errorReporter->dieError(
'A value needs to be provided when 
creating a claim with PropertyValueSnak snak',
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index a94a3c9..77d59dd 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -167,7 +167,7 @@
$hasSiteLink = isset( $params['site'] ) && isset( 
$params['title'] );
$hasSiteLinkPart = isset( $params['site'] ) || isset( 
$params['title'] );
 
-   if ( !( $hasId XOR $hasSiteLink XOR $hasNew ) ) {
+   if ( !( $hasId xor $hasSiteLink xor $hasNew ) ) {
$this->errorReporter->dieError(
'Either provide the item "id" or pairs of 
"site" and "title" or a "new" type for'
. ' an entity',
@@ -243,7 +243,7 @@
//TODO: Construct a nice and meaningful summary from the 
changes that get applied!
//  Perhaps that could be based on the resulting diff?]
$summary = $this->createSummary( $params );
-   if ( isset( $params['id'] ) XOR ( isset( $params['site'] ) && 
isset( $params['title'] ) ) ) {
+

[MediaWiki-commits] [Gerrit] Decrease PHPCS line length limit to 140 - change (mediawiki...Wikibase)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Decrease PHPCS line length limit to 140
..


Decrease PHPCS line length limit to 140

I suggest to stop here for now. We all know 100 is prefered. A hard
limit at 120 or 140 seems sensible to me. You know I do not like it
if a tool blocks a patch for reasons that are more a matter of taste.
So this is what happens now:
* More than 140? Bad dev. Please fix it first before asking a reviewer.
* More than 100? Be aware that a reviewer may complain, but this should
not stop reviewers from doing an actual code review.

Change-Id: Iae36e60b69afdb9f997455d0483abc65d9d16828
---
M 
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
M client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
M client/tests/phpunit/includes/api/PageTermsTest.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/formatters/DispatchingSnakFormatterTest.php
M lib/tests/phpunit/store/PropertyInfoStoreTestHelper.php
M phpcs.xml
M purtle/tests/phpunit/UnicodeEscaperTest.php
M repo/Wikibase.php
M repo/includes/UpdateRepo/UpdateRepoJob.php
M repo/includes/api/RemoveClaims.php
M repo/includes/rdf/SimpleValueRdfBuilder.php
M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/SummaryFormatterTest.php
M repo/tests/phpunit/includes/actions/EditEntityActionTest.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
M repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
21 files changed, 291 insertions(+), 108 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
index 8bb7fcb..125478c 100644
--- 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
@@ -163,7 +163,11 @@
 
$snakListFinder->expects( $this->any() )
->method( 'findSnaks' )
-   ->will( $this->returnCallback( function ( 
StatementListProvider $statementListProvider, PropertyId $propertyId, 
$acceptableRanks = null ) {
+   ->will( $this->returnCallback( function(
+   StatementListProvider $statementListProvider,
+   PropertyId $propertyId,
+   $acceptableRanks = null
+   ) {
return array(
new PropertyValueSnak( $propertyId, new 
EntityIdValue( new ItemId( 'Q7' ) ) )
);
diff --git a/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php 
b/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
index da5e5ec..c9aa924 100644
--- a/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
+++ b/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
@@ -97,7 +97,8 @@
23 => new PageEntityUsages( 23, array( $u3l, 
$u4l ) ),
42 => new PageEntityUsages( 42, array( $u4l ) ),
),
-   iterator_to_array( $this->lookup->getPagesUsing( array( 
$q4, $q3 ), array( EntityUsage::makeAspectKey( EntityUsage::LABEL_USAGE, 'de' ) 
) ) ),
+   iterator_to_array( $this->lookup->getPagesUsing( array( 
$q4, $q3 ),
+   array( EntityUsage::makeAspectKey( 
EntityUsage::LABEL_USAGE, 'de' ) ) ) ),
'Pages using "label" on Q4 or Q3'
);
 
diff --git a/client/tests/phpunit/includes/api/PageTermsTest.php 
b/client/tests/phpunit/includes/api/PageTermsTest.php
index 1fbf442..ad8b04a 100644
--- a/client/tests/phpunit/includes/api/PageTermsTest.php
+++ b/client/tests/phpunit/includes/api/PageTermsTest.php
@@ -146,7 +146,12 @@
 *
 * @return TermIndexEntry[]
 */
-   public function getTermsOfEntities( array $termObjectsByEntityId, array 
$entityIds, array $termTypes = null, array $languageCodes = null ) {
+   public function getTermsOfEntities(
+   array $termObjectsByEntityId,
+   array $entityIds,
+   array $termTypes = null,
+   array $languageCodes = null
+   ) {
$result = arr

[MediaWiki-commits] [Gerrit] Decrease PHPCS line length limit to 145 - change (mediawiki...Wikibase)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Decrease PHPCS line length limit to 145
..


Decrease PHPCS line length limit to 145

Now in steps of 5, to make the patches small and easy to review.

Change-Id: Iaa75d9a0a642ddd7a6f13cc27f7b0c8c513e1f1f
---
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
M lib/tests/phpunit/StringNormalizerTest.php
M lib/tests/phpunit/store/EntityInfoBuilderTest.php
M phpcs.xml
M repo/includes/rdf/SimpleValueRdfBuilder.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M 
repo/tests/phpunit/includes/Localizer/ChangeOpValidationExceptionLocalizerTest.php
M repo/tests/phpunit/includes/actions/EditEntityActionTest.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
12 files changed, 158 insertions(+), 47 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php 
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index 3402b6f..d3e0e61 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -193,30 +193,36 @@
),
'sitelink usage' => array(
array( EntityUsage::SITELINK_USAGE ),
-   array( ChangeHandler::LINKS_UPDATE_ACTION, 
ChangeHandler::PARSER_PURGE_ACTION, ChangeHandler::WEB_PURGE_ACTION, 
ChangeHandler::RC_ENTRY_ACTION ),
+   array( ChangeHandler::LINKS_UPDATE_ACTION, 
ChangeHandler::PARSER_PURGE_ACTION,
+   ChangeHandler::WEB_PURGE_ACTION, 
ChangeHandler::RC_ENTRY_ACTION ),
),
'label usage' => array(
array( EntityUsage::LABEL_USAGE ),
-   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION, ChangeHandler::RC_ENTRY_ACTION ),
+   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION,
+   ChangeHandler::RC_ENTRY_ACTION ),
array( ChangeHandler::LINKS_UPDATE_ACTION )
),
'title usage' => array(
array( EntityUsage::TITLE_USAGE ),
-   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION, ChangeHandler::RC_ENTRY_ACTION ),
+   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION,
+   ChangeHandler::RC_ENTRY_ACTION ),
array( ChangeHandler::LINKS_UPDATE_ACTION )
),
'other usage' => array(
array( EntityUsage::OTHER_USAGE ),
-   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION, ChangeHandler::RC_ENTRY_ACTION ),
+   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION,
+   ChangeHandler::RC_ENTRY_ACTION ),
array( ChangeHandler::LINKS_UPDATE_ACTION )
),
'all usage' => array(
array( EntityUsage::ALL_USAGE ),
-   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION, ChangeHandler::RC_ENTRY_ACTION ),
+   array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION,
+   ChangeHandler::RC_ENTRY_ACTION ),
),
'sitelink and other usage (does links update)' => array(
array( EntityUsage::SITELINK_USAGE, 
EntityUsage::OTHER_USAGE ),
-   array( ChangeHandler::LINKS_UPDATE_ACTION, 
ChangeHandler::PARSER_PURGE_ACTION, ChangeHandler::WEB_PURGE_ACTION, 
ChangeHandler::RC_ENTRY_ACTION ),
+   array( ChangeHandler::LINKS_UPDATE_ACTION, 
ChangeHandler::PARSER_PURGE_ACTION,
+   ChangeHandler::WEB_PURGE_ACTION, 
ChangeHandler::RC_ENTRY_ACTION ),
),
);
}
diff --git a/client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php 
b/client/tests/phpunit/includes/DataAccess/SnaksFinderTest.php
index 77eb3e1..a882514 100644
--- a/client/tests/phpunit/includes/DataAccess/SnaksFin

[MediaWiki-commits] [Gerrit] maps: Include osm in role class - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: Include osm in role class
..


maps: Include osm in role class

Used to get the osm2pgsql and osmosis utilities

Change-Id: I9ceafebfd8704df8ef422942449e45c4376d785c
---
M manifests/role/maps.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 5fe0d7b..626f337 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -2,6 +2,7 @@
 include standard
 include ::postgresql::master
 include ::postgresql::postgis
+include ::osm
 include ::cassandra
 postgresql::spatialdb { 'gis':
 require => Class['::postgresql::postgis'],

-- 
To view, visit https://gerrit.wikimedia.org/r/225503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ceafebfd8704df8ef422942449e45c4376d785c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added FIXME to default Database replace() implementation - change (mediawiki/core)

2015-07-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225505

Change subject: Added FIXME to default Database replace() implementation
..

Added FIXME to default Database replace() implementation

Change-Id: I3ec0ec066248ee733b41f9c70d40382d96898613
---
M includes/db/Database.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/225505/1

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 2f1155d..04b3edd 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2873,6 +2873,7 @@
$rows = array( $rows );
}
 
+   // @FXIME: this is not atomic, but a trx would break 
affectedRows()
foreach ( $rows as $row ) {
# Delete rows which collide
if ( $uniqueIndexes ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ec0ec066248ee733b41f9c70d40382d96898613
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add an option to only migrate a maximum number of revisions ... - change (mediawiki...Oversight)

2015-07-17 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225504

Change subject: Add an option to only migrate a maximum number of revisions at 
a time
..

Add an option to only migrate a maximum number of revisions at a time

Bug: T62373
Change-Id: I77610ba84e22161beb0a111cb8aabf2458395fbb
---
M migrateToRevDel.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Oversight 
refs/changes/04/225504/1

diff --git a/migrateToRevDel.php b/migrateToRevDel.php
index 6f9f525..0cc38ca 100644
--- a/migrateToRevDel.php
+++ b/migrateToRevDel.php
@@ -41,6 +41,7 @@
$this->setBatchSize( 20 );
$this->mDescription = "Migrate revisions hidden with the 
Oversight extension to revdel.";
$this->addOption( 'migrate', "Turn off dry-run mode and 
actually insert OS data into revision/archive table." );
+   $this->addOption( 'max', "Maximum number of revisions to 
migrate at a time.", true );
}
 
/**
@@ -266,7 +267,7 @@
$dbw->insert( 'logging', $insertLoggingData, 
__METHOD__ );
$dbw->commit();
}
-   } while ( $hiddenRows->numRows() === $this->mBatchSize );
+   } while ( $hiddenRows->numRows() === $this->mBatchSize && 
$count < $this->getOption( 'max' ) );
 
$this->output( "Done! $count oversighted revision(s) are now 
converted to suppressed revisions.\n" );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/225504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77610ba84e22161beb0a111cb8aabf2458395fbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Oversight
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix js user menu, make arrows point right and then go down w... - change (mediawiki...GreyStuff)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix js user menu, make arrows point right and then go down when 
opened
..


Fix js user menu, make arrows point right and then go down when opened

Change-Id: I6c3141624f8ab9ebe2baa7acbd0216b2822250ec
---
M GreyStuffTemplate.php
A resources/images/arrow-right.png
A resources/images/arrow-right.svg
M resources/main.js
M resources/main.less
M resources/screen-full.less
6 files changed, 83 insertions(+), 14 deletions(-)

Approvals:
  Isarra: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/GreyStuffTemplate.php b/GreyStuffTemplate.php
old mode 100755
new mode 100644
index 25b91d4..3e0d0f7
--- a/GreyStuffTemplate.php
+++ b/GreyStuffTemplate.php
@@ -217,11 +217,11 @@
// Display status, and make a dropdown if logged in
if ( $user->isLoggedIn() ) {
?>
-   
+   
' . 
$user->getName() . '' )->parse();
?>
-   
+   


+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   id="svg2"
+   height="16"
+   width="22"
+   version="1.1">
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+
+  
+
diff --git a/resources/main.js b/resources/main.js
index 6189bce..34cd857 100644
--- a/resources/main.js
+++ b/resources/main.js
@@ -11,6 +11,7 @@
e.stopPropagation(); // stop hiding it!
if ( !wasOpen ) {
$( this ).next( '.dropdown' ).fadeIn( 300 );
+   $( this ).closest( 'h3' ).addClass( 'menu-down-arrow' );
}
} );
$( document ).click( function( e ) {
@@ -26,6 +27,8 @@
// Close all dropdowns
$( '#p-personal, #header-navigation .navigation .mw-portlet, 
#p-toolbox' ).children( '.dropdown' ).each( function() {
if ( $( this ).is( ':visible' ) ) {
+   // .closest() doesn't work here like it does above...
+   $( this ).parent().children( 'h3' ).removeClass( 
'menu-down-arrow' );
$( this ).fadeOut( 300 );
}
} );
diff --git a/resources/main.less b/resources/main.less
index caa1ef7..b96f766 100644
--- a/resources/main.less
+++ b/resources/main.less
@@ -15,11 +15,17 @@
 * otherwise some stupid display: none; somewhere overrides it. Yay for
 * cascading!
 */
-   #header-container {
+   div#header-container {
/* Allow the menus to remain usable even when JS isn't 
available/enabled */
-   #p-personal {
-   &:hover .dropdown {
-   display: block;
+   div#p-personal {
+   &:hover {
+   .dropdown {
+   display: block;
+   }
+   h3 {
+   background-position: 100% 60%;
+   
.background-image-svg('images/arrow-down.svg', 'images/arrow-down.png');
+   }
}
}
}
@@ -179,11 +185,19 @@
display: none;
}
#p-welcome {
+   margin: .25em 0;
+   font-size: 1em;
+   line-height: 1.3;
background-repeat: no-repeat;
-   background-position: 100% 40%;
-   .background-image-svg('images/arrow-down.svg', 
'images/arrow-down.png');
+   background-position: 100% 0%;
+   .background-image-svg('images/arrow-right.svg', 
'images/arrow-right.png');
padding: 0 1.75em .3em 0;
 
+   &.menu-down-arrow {
+   background-position: 100% 60%;
+   .background-image-svg('images/arrow-down.svg', 
'images/arrow-down.png');
+   }
+
/* Dropdown stuff */
&:hover {
cursor: pointer;
diff --git a/resources/screen-full.less b/resources/screen-full.less
index 3dec036..df71a67 100644
--- a/resources/screen-full.less
+++ b/resources/screen-full.less
@@ -9,10 +9,16 @@
 .client-nojs {
#header-navigation {
.mw-portlet {
-   &.mw-portlet:hover .p-body {
-   tran

[MediaWiki-commits] [Gerrit] maps: Include osm in role class - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225503

Change subject: maps: Include osm in role class
..

maps: Include osm in role class

Used to get the osm2pgsql and osmosis utilities

Change-Id: I9ceafebfd8704df8ef422942449e45c4376d785c
---
M manifests/role/maps.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/225503/1

diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 5fe0d7b..626f337 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -2,6 +2,7 @@
 include standard
 include ::postgresql::master
 include ::postgresql::postgis
+include ::osm
 include ::cassandra
 postgresql::spatialdb { 'gis':
 require => Class['::postgresql::postgis'],

-- 
To view, visit https://gerrit.wikimedia.org/r/225503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ceafebfd8704df8ef422942449e45c4376d785c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implement UserInputWidget in OOUI/MW Widgets - change (mediawiki/core)

2015-07-17 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225502

Change subject: Implement UserInputWidget in OOUI/MW Widgets
..

Implement UserInputWidget in OOUI/MW Widgets

To use OOUI for forms with user name autocomplete, the new widget
UserInputWidget interacts like the jQuery pendant (working with css
class "mw-autocomplete-user").

It is also available in HTMLForm as "user".

Example usage: Iaeff912e6437d6ebef0d5b1919ce8cf53a7fd5f1

Change-Id: I9501c85f4288c255bbe3a5284e99b57b6169916f
---
M autoload.php
M includes/htmlform/HTMLForm.php
A includes/htmlform/HTMLUserTextField.php
A includes/widget/UserInputWidget.php
M resources/Resources.php
A resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
6 files changed, 206 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/225502/1

diff --git a/autoload.php b/autoload.php
index fd75c8a..734aa6a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -510,6 +510,7 @@
'HTMLTextField' => __DIR__ . '/includes/htmlform/HTMLTextField.php',
'HTMLTextFieldWithButton' => __DIR__ . 
'/includes/htmlform/HTMLTextFieldWithButton.php',
'HTMLTitleTextField' => __DIR__ . 
'/includes/htmlform/HTMLTitleTextField.php',
+   'HTMLUserTextField' => __DIR__ . 
'/includes/htmlform/HTMLUserTextField.php',
'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php',
'HashBagOStuff' => __DIR__ . 
'/includes/libs/objectcache/HashBagOStuff.php',
'HashConfig' => __DIR__ . '/includes/config/HashConfig.php',
@@ -756,6 +757,7 @@
'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . 
'/includes/widget/NamespaceInputWidget.php',
'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . 
'/includes/widget/TitleInputWidget.php',
+   'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . 
'/includes/widget/UserInputWidget.php',
'MemCachedClientforWiki' => __DIR__ . 
'/includes/objectcache/MemcachedClient.php',
'MemcLockManager' => __DIR__ . 
'/includes/filebackend/lockmanager/MemcLockManager.php',
'MemcachedBagOStuff' => __DIR__ . 
'/includes/objectcache/MemcachedBagOStuff.php',
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index d49963d..47200d9 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -154,6 +154,7 @@
'password' => 'HTMLTextField',
'url' => 'HTMLTextField',
'title' => 'HTMLTitleTextField',
+   'user' => 'HTMLUserTextField',
);
 
public $mFieldData;
diff --git a/includes/htmlform/HTMLUserTextField.php 
b/includes/htmlform/HTMLUserTextField.php
new file mode 100644
index 000..82b5189
--- /dev/null
+++ b/includes/htmlform/HTMLUserTextField.php
@@ -0,0 +1,41 @@
+ false,
+   );
+
+   parent::__construct( $params );
+   }
+
+   public function validate( $value, $alldata ) {
+   // check, if a user exists with the given username
+   $user = User::newFromName( $value );
+
+   if ( $this->mParams['exists'] && ( !$user || $user->getId() === 
0 ) ) {
+   return $this->msg( 'htmlform-user-not-exists', 
$user->getName() )->parse();
+   }
+
+   return parent::validate( $value, $alldata );
+   }
+
+   protected function getInputWidget( $params ) {
+   $this->mParent->getOutput()->addModules( 'mediawiki.widgets' );
+
+   return new UserInputWidget( $params );
+   }
+}
diff --git a/includes/widget/UserInputWidget.php 
b/includes/widget/UserInputWidget.php
new file mode 100644
index 000..4147fca
--- /dev/null
+++ b/includes/widget/UserInputWidget.php
@@ -0,0 +1,30 @@
+ true ) ) );
+
+   // Initialization
+   $this->addClasses( array( 'mw-widget-userInputWidget' ) );
+   }
+
+   protected function getJavaScriptClassName() {
+   return 'mw.widgets.UserInputWidget';
+   }
+}
diff --git a/resources/Resources.php b/resources/Resources.php
index 0c37ae8..c2e809b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1749,6 +1749,7 @@

'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',

'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
+   
'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
),
'skinStyles' => array(
'default' => array(
diff --git a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.UserInput

[MediaWiki-commits] [Gerrit] WIP: Use UserInputWidget for manage special page - change (mediawiki...GoogleLogin)

2015-07-17 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225501

Change subject: WIP: Use UserInputWidget for manage special page
..

WIP: Use UserInputWidget for manage special page

Depends on: I9501c85f4288c255bbe3a5284e99b57b6169916f

Change-Id: Iaeff912e6437d6ebef0d5b1919ce8cf53a7fd5f1
---
M includes/specials/SpecialManageGoogleLogin.php
1 file changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin 
refs/changes/01/225501/1

diff --git a/includes/specials/SpecialManageGoogleLogin.php 
b/includes/specials/SpecialManageGoogleLogin.php
index bab2a92..5536324 100644
--- a/includes/specials/SpecialManageGoogleLogin.php
+++ b/includes/specials/SpecialManageGoogleLogin.php
@@ -28,18 +28,21 @@
$out->addModules( 'mediawiki.userSuggest' );
$formFields = array(
'username' => array(
-   'type' => 'text',
+   'type' => 'user',
'name' => 'username',
'label-message' => 
'googlelogin-username',
'id' => 'mw-gl-username',
-   'cssclass' => 
'mw-autocomplete-user',
'autofocus' => true,
-   )
+   ),
+   'submit' => array(
+   'type' => 'submit',
+   'default' => $this->msg( 
'googlelogin-manage-usersubmit' )->text(),
+   'flags' => array( 
'progressive', 'primary' ),
+   ),
);
-   $htmlForm = new HTMLForm( $formFields, 
$this->getContext(), 'googlelogin-manage' );
+   $htmlForm = HTMLForm::factory( 'ooui', 
$formFields, $this->getContext(), 'googlelogin-manage' );
$htmlForm->setWrapperLegendMsg( $this->msg( 
'googlelogin-managelegend' ) );
-   $htmlForm->setSubmitText( $this->msg( 
'googlelogin-manage-usersubmit' )->text() );
-   $htmlForm->setSubmitProgressive();
+   $htmlForm->suppressDefaultSubmit();
$htmlForm->setSubmitCallback( array( $this, 
'submitUserName' ) );
$htmlForm->show();
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/225501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeff912e6437d6ebef0d5b1919ce8cf53a7fd5f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: fix just another typo - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225500

Change subject: maps: fix just another typo
..

maps: fix just another typo

missing semicolon

Change-Id: I1bc8e0833504be1bcdf5f4027451527069ef60f2
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/225500/1

diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index 829a5f1..cfe8be2 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,7 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
-postgresql::server:datadir: /srv/postgresql/9.4/main
+postgresql::server::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index b9dd440..e46de5e 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,6 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
-postgresql::server:datadir: /srv/postgresql/9.4/main
+postgresql::server::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4

-- 
To view, visit https://gerrit.wikimedia.org/r/225500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bc8e0833504be1bcdf5f4027451527069ef60f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: fix just another typo - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: fix just another typo
..


maps: fix just another typo

missing semicolon

Change-Id: I1bc8e0833504be1bcdf5f4027451527069ef60f2
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index 829a5f1..cfe8be2 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,7 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
-postgresql::server:datadir: /srv/postgresql/9.4/main
+postgresql::server::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index b9dd440..e46de5e 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,6 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
-postgresql::server:datadir: /srv/postgresql/9.4/main
+postgresql::server::datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4

-- 
To view, visit https://gerrit.wikimedia.org/r/225500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bc8e0833504be1bcdf5f4027451527069ef60f2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] A few style updates + some docs - change (operations/puppet)

2015-07-17 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225499

Change subject: A few style updates + some docs
..

A few style updates + some docs

Change-Id: I7b68e31c11cb5741eb83a0d77950e1321a588c39
---
M modules/openstack/files/icehouse/virtscripts/cold-migrate
1 file changed, 27 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/225499/1

diff --git a/modules/openstack/files/icehouse/virtscripts/cold-migrate 
b/modules/openstack/files/icehouse/virtscripts/cold-migrate
index f1330d4..c363873 100755
--- a/modules/openstack/files/icehouse/virtscripts/cold-migrate
+++ b/modules/openstack/files/icehouse/virtscripts/cold-migrate
@@ -1,10 +1,31 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///modules/openstack/icehouse/virtscripts/cold-migrate
+###
+###  cold-migrate is a not-very-smart wrapper around the standard
+###  'nova migrate' feature.  As documented, nova migration requires
+###  several steps, each of which includes 'wait until status is...'
+###  so it's not especially useful for batch applications.  This
+###  script should be reliable for running multiple migrations
+###  in sequence.
+###
+###  cold-migrate performs the following steps, polling for a proper
+###  instance status after each:
+###
+###   - Stop instance
+###   - Migrate instance
+###   - Confirm migration (oddly called 'confirm resize' in nova parlance)
+###   - Restart instance (optional)
+###
+#
 #!/usr/bin/python
 
 import argparse
-from novaclient.v1_1 import client
 import time
 
-class novaInstance:
+from novaclient.v1_1 import client
+
+class NovaInstance(object):
 def __init__(self, novaclient, instance_id):
 self.novaclient = novaclient
 self.instance_id = instance_id
@@ -15,9 +36,9 @@
 
 
 def wait_for_status(self, desiredstatus):
-oldstatus=""
+oldstatus = ""
 
-while (self.instance.status != desiredstatus):
+while self.instance.status != desiredstatus:
 if self.instance.status != oldstatus:
 oldstatus = self.instance.status
 print "Current status is %s; waiting for it to change to %s." 
% (
@@ -26,7 +47,7 @@
 time.sleep(1)
 self.refresh_instance()
 
-def migrate(self, leavestopped=False):
+def migrate(self, leave_stopped=False):
 print "Instance %s is now on host %s with state %s" % (
 self.instance_id,
 self.instance._info['OS-EXT-SRV-ATTR:host'],
@@ -54,7 +75,7 @@
 print "Failed to confirm migrate, aborting."
 exit(1)
 
-if not leavestopped:
+if not leave_stopped:
 self.instance.start()
 self.wait_for_status('ACTIVE')
 

-- 
To view, visit https://gerrit.wikimedia.org/r/225499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b68e31c11cb5741eb83a0d77950e1321a588c39
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wmf4: patch to stop all threads on SIGUSR1 - change (operations...nodepool)

2015-07-17 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: wmf4: patch to stop all threads on SIGUSR1
..


wmf4: patch to stop all threads on SIGUSR1

Maintained via gbp pq at https://gerrit.wikimedia.org/r/#/c/225410/

Sent upstream for review: https://review.openstack.org/#/c/203232/

Change-Id: Idc89e2d9da829f24aace98a0891775c210156a4d
---
M debian/changelog
A debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch
M debian/patches/series
3 files changed, 127 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index c54b913..a70f4b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nodepool (0.0.1-104-gddd6003-wmf4) jessie-wikimedia; urgency=medium
+
+  * Include patch pending review
+[Stop all threads on SIGUSR1]
+https://gerrit.wikimedia.org/r/#/c/225410/
+https://review.openstack.org/#/c/203232/
+
+ -- Antoine Musso   Fri, 17 Jul 2015 22:40:37 +0200
+
 nodepool (0.0.1-104-gddd6003-wmf3) jessie-wikimedia; urgency=low
 
   * Depends on parted package
diff --git a/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch 
b/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch
new file mode 100644
index 000..8b6de8b
--- /dev/null
+++ b/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch
@@ -0,0 +1,117 @@
+From: Antoine Musso 
+Date: Fri, 17 Jul 2015 22:05:15 +0200
+Subject: Stop all threads on SIGUSR1
+
+I noticed SIGUSR1 is supposed to gracefully stop nodepool. Unfortunately
+a lot of threads are never stopped and thus never stop.
+
+[nodepoold.py]
+Ignore SIGUSR1 while it is being dealt with. I had some side effect when
+sending it twice in a row.
+
+Teach the main loop to return whenever the pool is stopped after a
+signal else nodepool never leaves when I we run it in non daemon mode
+with 'nodepoold -d'.
+
+[nodepool.py]
+
+DiskImageBuilder can now be stopped. It seems it should inherit
+TaskManager but I felt it is a different topic.
+
+When Nodepool stop, also stop:
+* Jenkins managers
+* Cloud providers
+* Gearman client
+
+Add a bunch of debug log to notice what is going on.
+
+Change-Id: Ic20f919df3fab834fb1a29df5c77a4af79e740a6
+---
+ nodepool/cmd/nodepoold.py |  3 +++
+ nodepool/nodepool.py  | 29 +
+ 2 files changed, 32 insertions(+)
+
+diff --git a/nodepool/cmd/nodepoold.py b/nodepool/cmd/nodepoold.py
+index d8ee3c4..3ee95bb 100644
+--- a/nodepool/cmd/nodepoold.py
 b/nodepool/cmd/nodepoold.py
+@@ -110,6 +110,7 @@ class NodePoolDaemon(object):
+'%(message)s')
+ 
+ def exit_handler(self, signum, frame):
++signal.signal(signal.SIGUSR1, signal.SIG_IGN)
+ self.pool.stop()
+ 
+ def term_handler(self, signum, frame):
+@@ -129,6 +130,8 @@ class NodePoolDaemon(object):
+ while True:
+ try:
+ signal.pause()
++if self.pool._stopped:
++return 0
+ except KeyboardInterrupt:
+ return self.exit_handler(signal.SIGINT, None)
+ 
+diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py
+index cec2dc8..b2745b2 100644
+--- a/nodepool/nodepool.py
 b/nodepool/nodepool.py
+@@ -732,13 +732,23 @@ class DiskImageBuilder(threading.Thread):
+ 
+ def __init__(self, nodepool):
+ threading.Thread.__init__(self, name='DiskImageBuilder queue')
++self._running = True
+ self.nodepool = nodepool
+ self.queue = nodepool._image_builder_queue
+ 
++def stop(self):
++self.log.info("Stopping...")
++self._running = False
++self.queue.put(None)
++
+ def run(self):
+ while True:
+ # grabs image id from queue
+ image_id = self.queue.get()
++if not image_id:
++if not self._running:
++break
++continue
+ try:
+ self.buildImage(image_id)
+ except Exception:
+@@ -1175,15 +1185,34 @@ class NodePool(threading.Thread):
+ self._image_builder_thread = None
+ 
+ def stop(self):
++self.log.info("Stopping Nodepool...")
+ self._stopped = True
++self.log.debug("Stopping DiskImageBuilder")
++self._image_builder_thread.stop()
++
+ if self.config:
++self.log.debug("Stopping zmq publishers")
+ for z in self.config.zmq_publishers.values():
+ z.listener.stop()
+ z.listener.join()
++self.log.debug("Stopping Jenkins managers")
++for j in self.config.jenkins_managers.values():
++j.stop()
++self.log.debug("Stopping cloud providers")
++for p in self.config.provider_managers.values():
++p.stop()
++
++if self.gearman_client:
++self.log.debug("Stopping Gearman clie

[MediaWiki-commits] [Gerrit] maps: Fix typo - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: Fix typo
..


maps: Fix typo

Remove underscore

Change-Id: Ie69c3339cb79e3ba4cc240a19e4a2d1d2dc422c5
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index 532a11f..829a5f1 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,7 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
-postgresql::server:data_dir: /srv/postgresql/9.4/main
+postgresql::server:datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index 9d52aea..b9dd440 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,6 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
-postgresql::server:data_dir: /srv/postgresql/9.4/main
+postgresql::server:datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4

-- 
To view, visit https://gerrit.wikimedia.org/r/225498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69c3339cb79e3ba4cc240a19e4a2d1d2dc422c5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: Fix typo - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225498

Change subject: maps: Fix typo
..

maps: Fix typo

Remove underscore

Change-Id: Ie69c3339cb79e3ba4cc240a19e4a2d1d2dc422c5
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/225498/1

diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index 532a11f..829a5f1 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,7 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
-postgresql::server:data_dir: /srv/postgresql/9.4/main
+postgresql::server:datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index 9d52aea..b9dd440 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,6 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
-postgresql::server:data_dir: /srv/postgresql/9.4/main
+postgresql::server:datadir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4

-- 
To view, visit https://gerrit.wikimedia.org/r/225498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie69c3339cb79e3ba4cc240a19e4a2d1d2dc422c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make the User Timing API safe to use in MediaWiki - change (mediawiki/core)

2015-07-17 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225497

Change subject: Make the User Timing API safe to use in MediaWiki
..

Make the User Timing API safe to use in MediaWiki

Allow JavaScript code to be annotated via the User Timing API without having to
repeatedly ensure that the API exists by declaring a no-op stub for browsers
that don't implement it. Do it in the startup module so we can use
performance.mark() early. Add an initial performance.mark() call as a use-case.

Task: T105389
Change-Id: Id686073da5baf3fcae36f296e6e50d648a543249
---
M .jshintrc
M resources/src/startup.js
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/225497/1

diff --git a/.jshintrc b/.jshintrc
index d72c31d..b84d276 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -22,6 +22,7 @@
"mediaWiki": true,
"JSON": true,
"OO": true,
+   "performance": true,
"jQuery": false,
"QUnit": false,
"sinon": false
diff --git a/resources/src/startup.js b/resources/src/startup.js
index 80cc7d9..c6857ec 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -6,6 +6,15 @@
 
 var mediaWikiLoadStart = ( new Date() ).getTime();
 
+if ( !window.performance ) {
+   window.performance = {};
+}
+if ( !performance.mark ) {
+   performance.mark = function () {};
+}
+performance.mark( 'mediaWikiStartUp' );
+
+
 /**
  * Returns false for Grade C supported browsers.
  *

-- 
To view, visit https://gerrit.wikimedia.org/r/225497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id686073da5baf3fcae36f296e6e50d648a543249
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor submodule

Change-Id: Ifcbd9a9713335fe8dea753df2fa19788b1969b20
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/vendor b/vendor
index 2ae091d..56f9d36 16
--- a/vendor
+++ b/vendor
-Subproject commit 2ae091d276061a0f282cb00497493c011f3b18c3
+Subproject commit 56f9d36ee33a8e5794778f4fc833b3e9acd9a4ab

-- 
To view, visit https://gerrit.wikimedia.org/r/225496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcbd9a9713335fe8dea753df2fa19788b1969b20
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)

2015-07-17 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225495

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: I57738a25e7c777a8bbe030c92df014c69c8e092a
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/95/225495/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index ca0e8ee..48681fb 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -30,7 +30,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 10
 targetSdkVersion 22
-versionCode 105
+versionCode 106
 testApplicationId 'org.wikipedia.test'
 }
 signingConfigs {

-- 
To view, visit https://gerrit.wikimedia.org/r/225495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57738a25e7c777a8bbe030c92df014c69c8e092a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225496

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Change-Id: Ifcbd9a9713335fe8dea753df2fa19788b1969b20
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/96/225496/1


-- 
To view, visit https://gerrit.wikimedia.org/r/225496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcbd9a9713335fe8dea753df2fa19788b1969b20
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update donation-interface dependency - change (wikimedia...vendor)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Update donation-interface dependency
..


Update donation-interface dependency

Change-Id: I18d792280922c1971cf41869449e16f49d5a752f
---
M composer/installed.json
M wikimedia/donation-interface/DonationInterface.php
D wikimedia/donation-interface/adyen_gateway/adyen_gateway.i18n.php
D wikimedia/donation-interface/amazon_gateway/amazon_gateway.i18n.php
M wikimedia/donation-interface/astropay_gateway/astropay.adapter.php
D wikimedia/donation-interface/astropay_gateway/astropay_gateway.i18n.php
M wikimedia/donation-interface/donationinterface_langonly.php
M wikimedia/donation-interface/gateway_common/CurrencyRates.php
M wikimedia/donation-interface/gateway_common/GatewayPage.php
M wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
M wikimedia/donation-interface/gateway_common/WmfFramework.mediawiki.php
M wikimedia/donation-interface/gateway_common/WmfFrameworkLogHandler.php
D wikimedia/donation-interface/gateway_common/canada-provinces.i18n.php
D wikimedia/donation-interface/gateway_common/countries.i18n.php
D wikimedia/donation-interface/gateway_common/country.specific.i18n.php
M wikimedia/donation-interface/gateway_common/i18n/interface/bs.json
M wikimedia/donation-interface/gateway_common/i18n/interface/es.json
M wikimedia/donation-interface/gateway_common/i18n/interface/hu.json
M wikimedia/donation-interface/gateway_common/i18n/interface/sl.json
D wikimedia/donation-interface/gateway_common/interface.i18n.php
D wikimedia/donation-interface/gateway_common/us-states.i18n.php
M wikimedia/donation-interface/gateway_forms/Mustache.php
M wikimedia/donation-interface/gateway_forms/mustache/forms.css
M 
wikimedia/donation-interface/gateway_forms/mustache/payment_method.html.mustache
D 
wikimedia/donation-interface/globalcollect_gateway/globalcollect_gateway.i18n.php
M wikimedia/donation-interface/globalcollect_gateway/scripts/orphans.php
D wikimedia/donation-interface/paypal_gateway/paypal_gateway.i18n.php
A wikimedia/donation-interface/worldpay_gateway/i18n/be-tarask.json
D wikimedia/donation-interface/worldpay_gateway/worldpay_gateway.i18n.php
29 files changed, 123 insertions(+), 742 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/composer/installed.json b/composer/installed.json
index 7334280..2989cb1 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -642,44 +642,6 @@
 ]
 },
 {
-"name": "wikimedia/donation-interface",
-"version": "dev-master",
-"version_normalized": "999-dev",
-"source": {
-"type": "git",
-"url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "a4fc38c376a5d404aa45157c86b8d55cf47c48c3"
-},
-"require": {
-"coderkungfu/php-queue": "dev-master",
-"fusesource/stomp-php": "2.1.*",
-"monolog/monolog": "1.12.0",
-"psr/log": "1.0.0",
-"zordius/lightncandy": "0.18"
-},
-"time": "2015-07-06 19:45:20",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"classmap": [
-"adyen_gateway",
-"amazon_gateway",
-"gateway_common",
-"globalcollect_gateway",
-"paypal_gateway",
-"worldpay_gateway"
-],
-"files": [
-"gateway_common/WmfFramework.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/";,
-"license": [
-"GPL-2.0"
-],
-"description": "Wikimedia Foundation payment processing library"
-},
-{
 "name": "symfony/http-foundation",
 "version": "v2.3.30",
 "version_normalized": "2.3.30.0",
@@ -839,5 +801,43 @@
 "donations",
 "payments"
 ]
+},
+{
+"name": "wikimedia/donation-interface",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
+"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
+},
+"require": {
+"coderkungfu/php-queue": "dev-master",
+"fusesource/stomp-php": "2.1.*",
+"monolog/monolog": "1.12.0",
+"psr/log": "1.0.0",
+"zordius/lightncandy": "0.18"
+},
+"time": "2015-07-17 19:58:45",
+"type": "library",
+"installation-source": "source",
+"autoload": {
+"classmap": [
+"adyen_gateway",
+"amazon_gateway",
+"gateway_common",
+"globalcollect_gateway",
+

[MediaWiki-commits] [Gerrit] WIP: Add languagemtpairs support - change (mediawiki...cxserver)

2015-07-17 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225494

Change subject: WIP: Add languagemtpairs support
..

WIP: Add languagemtpairs support

So that we can get list of languages with MT support.
Change-Id: Ic5198966b3e70afa6342fedc2db27df2d0f4fdd4
---
M registry/index.js
M routes/v1.js
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/94/225494/1

diff --git a/registry/index.js b/registry/index.js
index 985ef4f..baa4959 100644
--- a/registry/index.js
+++ b/registry/index.js
@@ -13,6 +13,12 @@
};
 }
 
+function getMTPairs() {
+   return {
+   mt: registry.mt
+   };
+}
+
 /**
  * Get the available toolset for the given language pair
  * @param {string} from source language
@@ -83,6 +89,7 @@
 
 module.exports = {
getLanguagePairs: getLanguagePairs,
+   getMTPairs: getMTPairs,
getToolSet: getToolSet,
getValidProvider: getValidProvider
 };
diff --git a/routes/v1.js b/routes/v1.js
index f782c7b..03fc331 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -185,6 +185,10 @@
res.json( registry.getLanguagePairs() );
 } );
 
+app.get( '/languagemtpairs', function ( req, res ) {
+   res.json( registry.getMTPairs() );
+} );
+
 app.get( '/version', function ( req, res ) {
var version = {
name: pkg.name,

-- 
To view, visit https://gerrit.wikimedia.org/r/225494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5198966b3e70afa6342fedc2db27df2d0f4fdd4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update donation-interface dependency - change (wikimedia...vendor)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225493

Change subject: Update donation-interface dependency
..

Update donation-interface dependency

Change-Id: I18d792280922c1971cf41869449e16f49d5a752f
---
M composer/installed.json
M wikimedia/donation-interface/DonationInterface.php
D wikimedia/donation-interface/adyen_gateway/adyen_gateway.i18n.php
D wikimedia/donation-interface/amazon_gateway/amazon_gateway.i18n.php
M wikimedia/donation-interface/astropay_gateway/astropay.adapter.php
D wikimedia/donation-interface/astropay_gateway/astropay_gateway.i18n.php
M wikimedia/donation-interface/donationinterface_langonly.php
M wikimedia/donation-interface/gateway_common/CurrencyRates.php
M wikimedia/donation-interface/gateway_common/GatewayPage.php
M wikimedia/donation-interface/gateway_common/WmfFramework.drupal.php
M wikimedia/donation-interface/gateway_common/WmfFramework.mediawiki.php
M wikimedia/donation-interface/gateway_common/WmfFrameworkLogHandler.php
D wikimedia/donation-interface/gateway_common/canada-provinces.i18n.php
D wikimedia/donation-interface/gateway_common/countries.i18n.php
D wikimedia/donation-interface/gateway_common/country.specific.i18n.php
M wikimedia/donation-interface/gateway_common/i18n/interface/bs.json
M wikimedia/donation-interface/gateway_common/i18n/interface/es.json
M wikimedia/donation-interface/gateway_common/i18n/interface/hu.json
M wikimedia/donation-interface/gateway_common/i18n/interface/sl.json
D wikimedia/donation-interface/gateway_common/interface.i18n.php
D wikimedia/donation-interface/gateway_common/us-states.i18n.php
M wikimedia/donation-interface/gateway_forms/Mustache.php
M wikimedia/donation-interface/gateway_forms/mustache/forms.css
M 
wikimedia/donation-interface/gateway_forms/mustache/payment_method.html.mustache
D 
wikimedia/donation-interface/globalcollect_gateway/globalcollect_gateway.i18n.php
M wikimedia/donation-interface/globalcollect_gateway/scripts/orphans.php
D wikimedia/donation-interface/paypal_gateway/paypal_gateway.i18n.php
A wikimedia/donation-interface/worldpay_gateway/i18n/be-tarask.json
D wikimedia/donation-interface/worldpay_gateway/worldpay_gateway.i18n.php
29 files changed, 123 insertions(+), 742 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/93/225493/1

diff --git a/composer/installed.json b/composer/installed.json
index 7334280..2989cb1 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -642,44 +642,6 @@
 ]
 },
 {
-"name": "wikimedia/donation-interface",
-"version": "dev-master",
-"version_normalized": "999-dev",
-"source": {
-"type": "git",
-"url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "a4fc38c376a5d404aa45157c86b8d55cf47c48c3"
-},
-"require": {
-"coderkungfu/php-queue": "dev-master",
-"fusesource/stomp-php": "2.1.*",
-"monolog/monolog": "1.12.0",
-"psr/log": "1.0.0",
-"zordius/lightncandy": "0.18"
-},
-"time": "2015-07-06 19:45:20",
-"type": "library",
-"installation-source": "source",
-"autoload": {
-"classmap": [
-"adyen_gateway",
-"amazon_gateway",
-"gateway_common",
-"globalcollect_gateway",
-"paypal_gateway",
-"worldpay_gateway"
-],
-"files": [
-"gateway_common/WmfFramework.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/";,
-"license": [
-"GPL-2.0"
-],
-"description": "Wikimedia Foundation payment processing library"
-},
-{
 "name": "symfony/http-foundation",
 "version": "v2.3.30",
 "version_normalized": "2.3.30.0",
@@ -839,5 +801,43 @@
 "donations",
 "payments"
 ]
+},
+{
+"name": "wikimedia/donation-interface",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
+"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
+},
+"require": {
+"coderkungfu/php-queue": "dev-master",
+"fusesource/stomp-php": "2.1.*",
+"monolog/monolog": "1.12.0",
+"psr/log": "1.0.0",
+"zordius/lightncandy": "0.18"
+},
+"time": "2015-07-17 19:58:45",
+"type": "library",
+"installation-source": "source",
+"autoload": {
+"classmap": [
+"adyen_gateway",
+"amazon_gateway",
+

[MediaWiki-commits] [Gerrit] amend update to fix Direct Mail Appeal custom field - change (wikimedia...crm)

2015-07-17 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225492

Change subject: amend update to fix Direct Mail Appeal custom field
..

amend update to fix Direct Mail Appeal custom field

it is missing its option group after initial install

this also pulls the logic to do so out into a helper function because
the exact same thing happens 3 times.  i suspect some utilities for
general idempotent custom/option group/field/value create/update would
come in handy but i would like to explore what the civi api already
offers before reinventing it.

Change-Id: I1c8efefa4eb4525a0e416947d391401889e6962c
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 90 insertions(+), 144 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/225492/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index b1af519..a6ce79e 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -41,6 +41,82 @@
 }
 
 /**
+ * Helper creates a new option group and links an
+ * existing custom field in the Gift_Data custom group.
+ *
+ * TODO this is not a handy generalization, just a way
+ * to have a little less copypasta in this file.  I also
+ * suspect there's a better place for it to live.
+ */
+function _link_gift_data_field_to_new_group ( $field_name, $group_name, 
$values )
+{
+$api = wmf_civicrm_bootstrap_civi();
+
+// Get the custom group.
+$success = $api->CustomGroup->get( array(
+'name' => 'Gift_Data',
+) );
+if ( !$success || !count( $api->values ) ) {
+throw new Exception( $api->errorMsg() );
+}
+$custom_group_id = $api->values[0]->id;
+
+// Get the field.
+$success = $api->CustomField->get( array(
+'custom_group_id' => $custom_group_id,
+'name' => $field_name,
+) );
+if ( !$success || !count( $api->values ) ) {
+throw new Exception( $api->errorMsg() );
+}
+$custom_field_id = $api->values[0]->id;
+
+// Make the options.
+$success = $api->OptionGroup->get( array(
+'name' => $group_name,
+) );
+if ( !$success || !count( $api->values ) ) {
+$success = $api->OptionGroup->create( array(
+'is_active' => 1,
+'is_reserved' => 1,
+'name' => $group_name,
+'title' => $field_name,
+) );
+if ( !$success ) {
+throw new Exception( $api->errorMsg() );
+}
+}
+$option_group_id = $api->values[0]->id;
+
+foreach ( $values as $value ) {
+$success = $api->OptionValue->get( array(
+'group_id' => $option_group_id,
+'value' => $value,
+) );
+if ( !$success || !count( $api->values ) ) {
+$success = $api->OptionValue->create( array(
+'option_group_id' => $option_group_id,
+'label' => ts( $value ),
+'value' => $value,
+'weight' => 'next',
+) );
+if ( !$success ) {
+throw new Exception( $api->errorMsg() );
+}
+}
+}
+
+// Link the options to this field.
+$success = $api->CustomField->create( array(
+'id' => $custom_field_id,
+'option_group_id' => $option_group_id,
+) );
+if ( !$success ) {
+throw new Exception( $api->errorMsg() );
+}
+}
+
+/**
  * Add contribution types and payment instruments
  */
 function wmf_civicrm_update_7000()
@@ -1314,93 +1390,18 @@
 }
 
 /**
- * Link Restrictions and Gift Source options to custom fields.
+ * Link Restrictions, Gift Source, Appeal options to custom fields.
  */
 function wmf_civicrm_update_7032() {
-$restriction_values = array(
+
+_link_gift_data_field_to_new_group( 'Fund', 'fund_20080709173248', array(
 'Unrestricted - General',
 'Restricted - Foundation',
 'Restricted - Program',
 'Restricted - Fiscal Sponsorship',
-);
+));
 
-$api = wmf_civicrm_bootstrap_civi();
-
-// Get the custom group.
-$success = $api->CustomGroup->get( array(
-'name' => 'Gift_Data',
-) );
-if ( !$success || !count( $api->values ) ) {
-throw new Exception( $api->errorMsg() );
-}
-$custom_group_id = $api->values[0]->id;
-
-// Get the field.
-$success = $api->CustomField->get( array(
-'custom_group_id' => $custom_group_id,
-'name' => 'Fund',
-) );
-if ( !$success || !count( $api->values ) ) {
-throw new Exception( $api->errorMsg() );
-}
-$custom_field_id = $api->values[0]->id;
-
-// Make the options.
-$success = $api->OptionGroup->get( array(
-'name' => 'fund_20080709173248',
-) );
-if ( !$success || !count( $api->values ) ) {
-$success = $api->

[MediaWiki-commits] [Gerrit] maps: Set postgres/cassandra data directories - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: Set postgres/cassandra data directories
..


maps: Set postgres/cassandra data directories

Use the 1TB LV

Change-Id: Ib7e2491e6ff6fe84317a8ab84a4bd16b9d1d1974
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index 52cbda0..532a11f 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,6 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
+postgresql::server:data_dir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
@@ -21,5 +22,8 @@
 cassandra::cluster_name: maps
 cassandra::seeds: [ 10.192.16.34, 10.192.16.35, 10.192.0.128, 10.192.0.129 ]
 cassandra::dc: codfw
+cassandra::data_file_directories: [/srv/cassandra/data]
+cassandra::commitlog_directory: /srv/cassandra/commitlog
+cassandra::saved_caches_directory: /srv/cassandra/saved_caches
 admin::groups:
   - maps-admins
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index 53f6a18..9d52aea 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,5 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
+postgresql::server:data_dir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4
@@ -7,5 +8,8 @@
 cassandra::cluster_name: maps
 cassandra::seeds: [ 10.192.16.34, 10.192.16.35, 10.192.0.128, 10.192.0.129 ]
 cassandra::dc: codfw
+cassandra::data_file_directories: [/srv/cassandra/data]
+cassandra::commitlog_directory: /srv/cassandra/commitlog
+cassandra::saved_caches_directory: /srv/cassandra/saved_caches
 admin::groups:
   - maps-admins

-- 
To view, visit https://gerrit.wikimedia.org/r/225490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7e2491e6ff6fe84317a8ab84a4bd16b9d1d1974
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update DI lib for logging fixes - change (wikimedia...crm)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Update DI lib for logging fixes
..


Update DI lib for logging fixes

Change-Id: I43d98ab2b27f9ff82d1125e53a6fec9e13eee575
---
M composer.lock
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Cdentinger: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index 499a677..401017e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -379,7 +379,6 @@
 "phpseclib/Crypt/Random.php"
 ]
 },
-"notification-url": "https://packagist.org/downloads/";,
 "include-path": [
 "phpseclib/"
 ],
@@ -429,6 +428,10 @@
 "x.509",
 "x509"
 ],
+"support": {
+"source": "https://github.com/phpseclib/phpseclib/tree/0.3.7";,
+"issues": "https://github.com/phpseclib/phpseclib/issues";
+},
 "time": "2014-07-05 16:36:21"
 },
 {
@@ -690,7 +693,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "a4fc38c376a5d404aa45157c86b8d55cf47c48c3"
+"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",
@@ -718,7 +721,7 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library",
-"time": "2015-07-06 19:45:20"
+"time": "2015-07-17 19:58:45"
 },
 {
 "name": "wikimedia/smash-pig",

-- 
To view, visit https://gerrit.wikimedia.org/r/225491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I43d98ab2b27f9ff82d1125e53a6fec9e13eee575
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update DI lib for logging fixes - change (wikimedia...crm)

2015-07-17 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225491

Change subject: Update DI lib for logging fixes
..

Update DI lib for logging fixes

Change-Id: I43d98ab2b27f9ff82d1125e53a6fec9e13eee575
---
M composer.lock
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/91/225491/1

diff --git a/composer.lock b/composer.lock
index 499a677..401017e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -379,7 +379,6 @@
 "phpseclib/Crypt/Random.php"
 ]
 },
-"notification-url": "https://packagist.org/downloads/";,
 "include-path": [
 "phpseclib/"
 ],
@@ -429,6 +428,10 @@
 "x.509",
 "x509"
 ],
+"support": {
+"source": "https://github.com/phpseclib/phpseclib/tree/0.3.7";,
+"issues": "https://github.com/phpseclib/phpseclib/issues";
+},
 "time": "2014-07-05 16:36:21"
 },
 {
@@ -690,7 +693,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "a4fc38c376a5d404aa45157c86b8d55cf47c48c3"
+"reference": "80f1e488856d9c5ba9c5f8cc204e39691050bc56"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",
@@ -718,7 +721,7 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library",
-"time": "2015-07-06 19:45:20"
+"time": "2015-07-17 19:58:45"
 },
 {
 "name": "wikimedia/smash-pig",

-- 
To view, visit https://gerrit.wikimedia.org/r/225491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43d98ab2b27f9ff82d1125e53a6fec9e13eee575
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add timesince to published queries as well - change (analytics...web)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Add timesince to published queries as well
..


Add timesince to published queries as well

Change-Id: Ifd68e0fa0bf27e1d3823caddf11df1d346afa6fe
---
M quarry/web/templates/user.html
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved



diff --git a/quarry/web/templates/user.html b/quarry/web/templates/user.html
index 522e179..b0dc30a 100644
--- a/quarry/web/templates/user.html
+++ b/quarry/web/templates/user.html
@@ -24,6 +24,7 @@
 {% for query in published_queries %}
 
 {{query.title}}
+{{query.last_touched|timesince}}
 
 {% else %}
 This user has not published any of their queries yet.

-- 
To view, visit https://gerrit.wikimedia.org/r/225489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd68e0fa0bf27e1d3823caddf11df1d346afa6fe
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add timesince to published queries as well - change (analytics...web)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225489

Change subject: Add timesince to published queries as well
..

Add timesince to published queries as well

Change-Id: Ifd68e0fa0bf27e1d3823caddf11df1d346afa6fe
---
M quarry/web/templates/user.html
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web 
refs/changes/89/225489/1

diff --git a/quarry/web/templates/user.html b/quarry/web/templates/user.html
index 522e179..b0dc30a 100644
--- a/quarry/web/templates/user.html
+++ b/quarry/web/templates/user.html
@@ -24,6 +24,7 @@
 {% for query in published_queries %}
 
 {{query.title}}
+{{query.last_touched|timesince}}
 
 {% else %}
 This user has not published any of their queries yet.

-- 
To view, visit https://gerrit.wikimedia.org/r/225489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd68e0fa0bf27e1d3823caddf11df1d346afa6fe
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: Set postgres/cassandra data directories - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225490

Change subject: maps: Set postgres/cassandra data directories
..

maps: Set postgres/cassandra data directories

Use the 1TB LV

Change-Id: Ib7e2491e6ff6fe84317a8ab84a4bd16b9d1d1974
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/225490/1

diff --git a/hieradata/role/codfw/maps/master.yaml 
b/hieradata/role/codfw/maps/master.yaml
index 52cbda0..30907fc 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -1,6 +1,7 @@
 postgresql::postgis::pgversion: 9.4
 postgresql::spatialdb::postgis_version: 2.1
 postgresql::master::pgversion: 9.4
+postgresql::server:data_dir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::master::postgres_slaves:
 #  replication@maps-test2002-v4:
@@ -21,5 +22,8 @@
 cassandra::cluster_name: maps
 cassandra::seeds: [ 10.192.16.34, 10.192.16.35, 10.192.0.128, 10.192.0.129 ]
 cassandra::dc: codfw
+cassandra::data_file_directories: ['/srv/cassandra/data']
+cassandra::commitlog_directory: '/srv/cassandra/commitlog'
+cassandra::saved_caches_directory: '/srv/cassandra/saved_caches'
 admin::groups:
   - maps-admins
diff --git a/hieradata/role/codfw/maps/slave.yaml 
b/hieradata/role/codfw/maps/slave.yaml
index 53f6a18..47e7525 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -1,5 +1,6 @@
 postgresql::slave::pgversion: 9.4
 postgresql::slave::master_server: maps-test2001.codfw.wmnet
+postgresql::server:data_dir: /srv/postgresql/9.4/main
 # Defined in the private repo
 #postgresql::slave::replication_pass: justapass
 postgresql::postgis::pgversion: 9.4
@@ -7,5 +8,8 @@
 cassandra::cluster_name: maps
 cassandra::seeds: [ 10.192.16.34, 10.192.16.35, 10.192.0.128, 10.192.0.129 ]
 cassandra::dc: codfw
+cassandra::data_file_directories: ['/srv/cassandra/data']
+cassandra::commitlog_directory: '/srv/cassandra/commitlog'
+cassandra::saved_caches_directory: '/srv/cassandra/saved_caches'
 admin::groups:
   - maps-admins

-- 
To view, visit https://gerrit.wikimedia.org/r/225490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7e2491e6ff6fe84317a8ab84a4bd16b9d1d1974
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] New, python-based migrate script. - change (operations/puppet)

2015-07-17 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: New, python-based migrate script.
..


New, python-based migrate script.

This uses actual nova migration facilities rather than scp.
Maybe better?

Change-Id: I4f051862ce55887b23ad418908330c70a9f5994f
---
M modules/openstack/files/icehouse/virtscripts/cold-migrate
1 file changed, 108 insertions(+), 110 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openstack/files/icehouse/virtscripts/cold-migrate 
b/modules/openstack/files/icehouse/virtscripts/cold-migrate
index 1f64726..f1330d4 100755
--- a/modules/openstack/files/icehouse/virtscripts/cold-migrate
+++ b/modules/openstack/files/icehouse/virtscripts/cold-migrate
@@ -1,117 +1,115 @@
-#!/bin/bash
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/openstack/icehouse/virtscripts/cold-migrate
-#
-ssh-add -l > /dev/null
-if [ "$?" != "0" ]
-then
-   echo "You must have a forwarded agent to use this script"
-   exit 1
-fi
-if [ "$#" -ne 2 ]; then
-   echo "Usage:  $0  "
-   exit 1
-fi
-INSTANCE=$1
-TOHOST=$2
-echo "testing that instance exists."
-nova show ${INSTANCE}
-if [ "$?" != "0" ]
-then
-echo "Instance not found."
-exit 1
-fi
-FROMHOST=`nova show ${INSTANCE} | grep 'OS-EXT-SRV-ATTR:host' | awk '{ print 
$4 }'`
-INSTANCENAME=`nova show ${INSTANCE} | grep ' name ' | awk '{ print $4 }'`
-echo "Migrating $INSTANCE from $FROMHOST to $TOHOST"
-echo ""
-echo "Testing host keys"
-echo ""
-ssh $FROMHOST.eqiad.wmnet "true"
-if [ "$?" != "0" ]
-then
-echo "hostkey check failed for $FROMHOST"
-exit 1
-fi
-ssh $TOHOST.eqiad.wmnet "true"
-if [ "$?" != "0" ]
-then
-echo "hostkey check failed for $TOHOST"
-exit 1
-fi
-ssh -A $FROMHOST.eqiad.wmnet "ssh ${TOHOST}.eqiad.wmnet true"
-if [ "$?" != "0" ]
-then
-echo "hostkey check failed for connection from $FROMHOST to $TOHOST"
-exit 1
-fi
+#!/usr/bin/python
+
+import argparse
+from novaclient.v1_1 import client
+import time
+
+class novaInstance:
+def __init__(self, novaclient, instance_id):
+self.novaclient = novaclient
+self.instance_id = instance_id
+self.refresh_instance()
+
+def refresh_instance(self):
+self.instance = self.novaclient.servers.get(self.instance_id)
 
 
-ssh $FROMHOST.eqiad.wmnet "test -f /var/lib/nova/instances/${INSTANCE}/disk"
-if [ $? -eq 0 ]
-then
-echo "Verifying availability of backing file"
-BACKINGFILE=`ssh ${FROMHOST}.eqiad.wmnet "qemu-img info 
/var/lib/nova/instances/${INSTANCE}/disk | grep 'backing file'" | awk '{ print 
$3 }'`
-if [ -z $BACKINGFILE ]
-then
-echo "Backing file not found."
-exit 1
-fi
-ssh $TOHOST.eqiad.wmnet "test -e ${BACKINGFILE}"
-if [ "$?" != "0" ]
-then
-echo "Copying backing file ${BACKINGFILE} to ${TOHOST}"
-echo ""
-ssh -A $FROMHOST.eqiad.wmnet "rsync -S -av --bwlimit 4 
${BACKINGFILE} ${TOHOST}.eqiad.wmnet:${BACKINGFILE}"
-fi
-fi
+def wait_for_status(self, desiredstatus):
+oldstatus=""
 
-echo ""
-echo "Destroying instance on $FROMHOST"
-echo ""
-ssh $FROMHOST.eqiad.wmnet "virsh destroy ${INSTANCE}"
-echo ""
-echo "Rsyncing instance from $FROMHOST to $TOHOST"
-echo ""
-ssh -A $FROMHOST.eqiad.wmnet "rsync -S -av --bwlimit 4 
/var/lib/nova/instances/${INSTANCE} 
${TOHOST}.eqiad.wmnet:/var/lib/nova/instances/"
+while (self.instance.status != desiredstatus):
+if self.instance.status != oldstatus:
+oldstatus = self.instance.status
+print "Current status is %s; waiting for it to change to %s." 
% (
+self.instance.status, desiredstatus)
 
-# optional shrinking logic, generally not useful
-#ssh $TOHOST.eqiad.wmnet "test -f /var/lib/nova/instances/${INSTANCE}/disk"
-#if [ $? -eq 0 ]
-#then
-#echo ""
-#echo "Shrinking the instance on $TOHOST"
-#echo ""
+time.sleep(1)
+self.refresh_instance()
 
-#ssh $TOHOST.eqiad.wmnet "mv /var/lib/nova/instances/${INSTANCE}/disk 
/var/lib/nova/instances/${INSTANCE}/disk.bak"
-#ssh $TOHOST.eqiad.wmnet "qemu-img convert -f qcow2 -O qcow2 
/var/lib/nova/instances/${INSTANCE}/disk.bak 
/var/lib/nova/instances/${INSTANCE}/disk"
+def migrate(self, leavestopped=False):
+print "Instance %s is now on host %s with state %s" % (
+self.instance_id,
+self.instance._info['OS-EXT-SRV-ATTR:host'],
+self.instance.status)
 
-# If something went wrong, we still want there to be a 'disk' file.
-#ssh $TOHOST.eqiad.wmnet "test -f /var/lib/nova/instances/${INSTANCE}/disk"
-#if [ $? -ne 0 ]
-#then
-#echo ""
-#echo "Shrink faile

[MediaWiki-commits] [Gerrit] Revert "Set up a keypair for cold migration" and all followups. - change (operations/puppet)

2015-07-17 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Revert "Set up a keypair for cold migration" and all followups.
..


Revert "Set up a keypair for cold migration" and all followups.

I'm going to try this via proper nova calls rather than our
current duct-tape-and-chewing-gum approach.

Change-Id: Icf249e79c0608cd368952619b0e180d1c7220d6c
---
M manifests/role/nova.pp
M modules/openstack/files/icehouse/virtscripts/cold-migrate
M modules/openstack/manifests/adminscripts.pp
D modules/openstack/manifests/nova/migrate.pp
4 files changed, 20 insertions(+), 95 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 5d72faa..603a1db4e 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -429,11 +429,6 @@
 class { 'openstack::spreadcheck':
 novaconfig => $novaconfig
 }
-
-class { 'openstack::nova::migrate':
-novaconfig => $novaconfig,
-is_controller => true,
-}
 }
 
 class role::nova::api {
@@ -582,10 +577,6 @@
 ensure => link,
 target => '/usr/bin/qemu-system-x86_64',
 }
-}
-
-class { 'openstack::nova::migrate':
-novaconfig => $novaconfig
 }
 }
 
diff --git a/modules/openstack/files/icehouse/virtscripts/cold-migrate 
b/modules/openstack/files/icehouse/virtscripts/cold-migrate
index 00866b5..1f64726 100755
--- a/modules/openstack/files/icehouse/virtscripts/cold-migrate
+++ b/modules/openstack/files/icehouse/virtscripts/cold-migrate
@@ -3,16 +3,15 @@
 ### THIS FILE IS MANAGED BY PUPPET
 ### puppet:///modules/openstack/icehouse/virtscripts/cold-migrate
 #
-if [ `whoami` != 'novamigrate' ]; then
-echo "This script must be run as user 'novamigrate'"
-exit 1
+ssh-add -l > /dev/null
+if [ "$?" != "0" ]
+then
+   echo "You must have a forwarded agent to use this script"
+   exit 1
 fi
-
-source ~/novaenv.sh
-
 if [ "$#" -ne 2 ]; then
-echo "Usage:  $0  "
-exit 1
+   echo "Usage:  $0  "
+   exit 1
 fi
 INSTANCE=$1
 TOHOST=$2
@@ -116,7 +115,3 @@
 echo "Rebooting the instance"
 echo ""
 nova start ${INSTANCE}
-echo "  note  ---  "
-echo "For safety, the instance files on the old host (${FROMHOST}) have not 
been removed."
-echo "After verifying that the migration has completed safely, ssh to 
${FROMHOST} and"
-echo "  rm -rf /var/lib/nova/instances/${INSTANCE}"
diff --git a/modules/openstack/manifests/adminscripts.pp 
b/modules/openstack/manifests/adminscripts.pp
index 8f43f10..a350dec 100644
--- a/modules/openstack/manifests/adminscripts.pp
+++ b/modules/openstack/manifests/adminscripts.pp
@@ -17,10 +17,21 @@
 
 # Script to cold-migrate instances between compute nodes
 file { '/root/cold-migrate':
-ensure => absent,
+ensure => present,
+source => 
"puppet:///modules/openstack/${openstack_version}/virtscripts/cold-migrate",
+mode   => '0755',
+owner  => 'root',
+group  => 'root',
 }
+
+# Script to migrate instance from one dc to another
+# (specifically, pmtpa to eqiad)
 file { '/root/dc-migrate':
-ensure => absent,
+ensure => present,
+source => 
"puppet:///modules/openstack/${openstack_version}/virtscripts/dc-migrate",
+mode   => '0755',
+owner  => 'root',
+group  => 'root',
 }
 
 # Log analysis tool
diff --git a/modules/openstack/manifests/nova/migrate.pp 
b/modules/openstack/manifests/nova/migrate.pp
deleted file mode 100644
index 17160fb..000
--- a/modules/openstack/manifests/nova/migrate.pp
+++ /dev/null
@@ -1,72 +0,0 @@
-class openstack::nova::migrate(
-$is_controller=false,
-$novaconfig,
-$openstack_version=$::openstack::version,
-){
-# Set up users and scripts to permit cold-migration between compute nodes.
-# This requires a keypair for scp
-user { 'novamigrate':
-ensure => present,
-name   => 'novamigrate',
-shell  => '/bin/sh',
-comment=> 'nova user for cold-migration',
-gid=> 'nova',
-managehome => true,
-require=> Package['nova-common'],
-system => true,
-}
-ssh::userkey { 'novamigrate':
-content  => secret('novamigrate/novamigrate.pub'),
-require  => user['novamigrate'],
-ensure   => present,
-}
-file { '/home/novamigrate/.ssh':
-ensure  => directory,
-owner   => 'novamigrate',
-group   => 'nova',
-mode=> '0700',
-require => user['novamigrate'],
-}
-
-file { '/home/novamigrate/.ssh/id_rsa':
-content => secret('novamigrate/novamigrate'),
-owner   => 'novamigrate',
-group   => 'nova',
-mode=> '0600',
-require => File['/hom

[MediaWiki-commits] [Gerrit] Share A Fact onboarding design tweaks - change (apps...wikipedia)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Share A Fact onboarding design tweaks
..


Share A Fact onboarding design tweaks

- Update Share A Fact onboaring tip icons.
- Remove share icon onboarding animation.

SVGs supplied by design, recut at 48px square and centered.

Bug: T89985
Change-Id: Ic723ed6e94f234553e14d8544eaacc07076cd79c
---
D art/social-network-logos/facebook/FB-fLogo-online-broadcast.ai
D art/social-network-logos/g+/eps/g+icon_white.eps
D art/social-network-logos/twitter/eps/TwitterLogo_white.eps
A icon-svgs/24/facebook.svg
A icon-svgs/24/messaging.svg
A icon-svgs/24/twitter.svg
A wikipedia/res/drawable-hdpi/facebook.png
D wikipedia/res/drawable-hdpi/facebook_logo.png
A wikipedia/res/drawable-hdpi/messaging.png
D wikipedia/res/drawable-hdpi/plus_logo.png
A wikipedia/res/drawable-hdpi/twitter.png
D wikipedia/res/drawable-hdpi/twitter_logo.png
A wikipedia/res/drawable-ldpi/facebook.png
D wikipedia/res/drawable-ldpi/facebook_logo.png
A wikipedia/res/drawable-ldpi/messaging.png
D wikipedia/res/drawable-ldpi/plus_logo.png
A wikipedia/res/drawable-ldpi/twitter.png
D wikipedia/res/drawable-ldpi/twitter_logo.png
A wikipedia/res/drawable-ldrtl-hdpi/facebook.png
A wikipedia/res/drawable-ldrtl-hdpi/messaging.png
A wikipedia/res/drawable-ldrtl-hdpi/twitter.png
A wikipedia/res/drawable-ldrtl-ldpi/facebook.png
A wikipedia/res/drawable-ldrtl-ldpi/messaging.png
A wikipedia/res/drawable-ldrtl-ldpi/twitter.png
A wikipedia/res/drawable-ldrtl-mdpi/facebook.png
A wikipedia/res/drawable-ldrtl-mdpi/messaging.png
A wikipedia/res/drawable-ldrtl-mdpi/twitter.png
A wikipedia/res/drawable-ldrtl-xhdpi/facebook.png
A wikipedia/res/drawable-ldrtl-xhdpi/messaging.png
A wikipedia/res/drawable-ldrtl-xhdpi/twitter.png
A wikipedia/res/drawable-ldrtl-xxhdpi/facebook.png
A wikipedia/res/drawable-ldrtl-xxhdpi/messaging.png
A wikipedia/res/drawable-ldrtl-xxhdpi/twitter.png
A wikipedia/res/drawable-mdpi/facebook.png
D wikipedia/res/drawable-mdpi/facebook_logo.png
A wikipedia/res/drawable-mdpi/messaging.png
D wikipedia/res/drawable-mdpi/plus_logo.png
A wikipedia/res/drawable-mdpi/twitter.png
D wikipedia/res/drawable-mdpi/twitter_logo.png
A wikipedia/res/drawable-xhdpi/facebook.png
D wikipedia/res/drawable-xhdpi/facebook_logo.png
A wikipedia/res/drawable-xhdpi/messaging.png
D wikipedia/res/drawable-xhdpi/plus_logo.png
A wikipedia/res/drawable-xhdpi/twitter.png
D wikipedia/res/drawable-xhdpi/twitter_logo.png
A wikipedia/res/drawable-xxhdpi/facebook.png
D wikipedia/res/drawable-xxhdpi/facebook_logo.png
A wikipedia/res/drawable-xxhdpi/messaging.png
D wikipedia/res/drawable-xxhdpi/plus_logo.png
A wikipedia/res/drawable-xxhdpi/twitter.png
D wikipedia/res/drawable-xxhdpi/twitter_logo.png
D wikipedia/res/drawable-xxxhdpi/facebook_logo.png
D wikipedia/res/drawable-xxxhdpi/plus_logo.png
D wikipedia/res/drawable-xxxhdpi/twitter_logo.png
M wikipedia/res/layout/inflate_tool_tip_share.xml
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
A wikipedia/src/main/java/org/wikipedia/drawable/DrawableUtil.java
D 
wikipedia/src/main/java/org/wikipedia/drawable/ExposedPorterDuffColorFilter.java
D 
wikipedia/src/main/java/org/wikipedia/drawable/ExposedPorterDuffColorFilterDrawableProperty.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
60 files changed, 191 insertions(+), 1,844 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/224528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic723ed6e94f234553e14d8544eaacc07076cd79c
Gerrit-PatchSet: 5
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] New, python-based migrate script. - change (operations/puppet)

2015-07-17 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225487

Change subject: New, python-based migrate script.
..

New, python-based migrate script.

This uses actual nova migration facilities rather than scp.
Maybe better?

Change-Id: I4f051862ce55887b23ad418908330c70a9f5994f
---
M modules/openstack/files/icehouse/virtscripts/cold-migrate
1 file changed, 108 insertions(+), 110 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/225487/1

diff --git a/modules/openstack/files/icehouse/virtscripts/cold-migrate 
b/modules/openstack/files/icehouse/virtscripts/cold-migrate
index 1f64726..f1330d4 100755
--- a/modules/openstack/files/icehouse/virtscripts/cold-migrate
+++ b/modules/openstack/files/icehouse/virtscripts/cold-migrate
@@ -1,117 +1,115 @@
-#!/bin/bash
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/openstack/icehouse/virtscripts/cold-migrate
-#
-ssh-add -l > /dev/null
-if [ "$?" != "0" ]
-then
-   echo "You must have a forwarded agent to use this script"
-   exit 1
-fi
-if [ "$#" -ne 2 ]; then
-   echo "Usage:  $0  "
-   exit 1
-fi
-INSTANCE=$1
-TOHOST=$2
-echo "testing that instance exists."
-nova show ${INSTANCE}
-if [ "$?" != "0" ]
-then
-echo "Instance not found."
-exit 1
-fi
-FROMHOST=`nova show ${INSTANCE} | grep 'OS-EXT-SRV-ATTR:host' | awk '{ print 
$4 }'`
-INSTANCENAME=`nova show ${INSTANCE} | grep ' name ' | awk '{ print $4 }'`
-echo "Migrating $INSTANCE from $FROMHOST to $TOHOST"
-echo ""
-echo "Testing host keys"
-echo ""
-ssh $FROMHOST.eqiad.wmnet "true"
-if [ "$?" != "0" ]
-then
-echo "hostkey check failed for $FROMHOST"
-exit 1
-fi
-ssh $TOHOST.eqiad.wmnet "true"
-if [ "$?" != "0" ]
-then
-echo "hostkey check failed for $TOHOST"
-exit 1
-fi
-ssh -A $FROMHOST.eqiad.wmnet "ssh ${TOHOST}.eqiad.wmnet true"
-if [ "$?" != "0" ]
-then
-echo "hostkey check failed for connection from $FROMHOST to $TOHOST"
-exit 1
-fi
+#!/usr/bin/python
+
+import argparse
+from novaclient.v1_1 import client
+import time
+
+class novaInstance:
+def __init__(self, novaclient, instance_id):
+self.novaclient = novaclient
+self.instance_id = instance_id
+self.refresh_instance()
+
+def refresh_instance(self):
+self.instance = self.novaclient.servers.get(self.instance_id)
 
 
-ssh $FROMHOST.eqiad.wmnet "test -f /var/lib/nova/instances/${INSTANCE}/disk"
-if [ $? -eq 0 ]
-then
-echo "Verifying availability of backing file"
-BACKINGFILE=`ssh ${FROMHOST}.eqiad.wmnet "qemu-img info 
/var/lib/nova/instances/${INSTANCE}/disk | grep 'backing file'" | awk '{ print 
$3 }'`
-if [ -z $BACKINGFILE ]
-then
-echo "Backing file not found."
-exit 1
-fi
-ssh $TOHOST.eqiad.wmnet "test -e ${BACKINGFILE}"
-if [ "$?" != "0" ]
-then
-echo "Copying backing file ${BACKINGFILE} to ${TOHOST}"
-echo ""
-ssh -A $FROMHOST.eqiad.wmnet "rsync -S -av --bwlimit 4 
${BACKINGFILE} ${TOHOST}.eqiad.wmnet:${BACKINGFILE}"
-fi
-fi
+def wait_for_status(self, desiredstatus):
+oldstatus=""
 
-echo ""
-echo "Destroying instance on $FROMHOST"
-echo ""
-ssh $FROMHOST.eqiad.wmnet "virsh destroy ${INSTANCE}"
-echo ""
-echo "Rsyncing instance from $FROMHOST to $TOHOST"
-echo ""
-ssh -A $FROMHOST.eqiad.wmnet "rsync -S -av --bwlimit 4 
/var/lib/nova/instances/${INSTANCE} 
${TOHOST}.eqiad.wmnet:/var/lib/nova/instances/"
+while (self.instance.status != desiredstatus):
+if self.instance.status != oldstatus:
+oldstatus = self.instance.status
+print "Current status is %s; waiting for it to change to %s." 
% (
+self.instance.status, desiredstatus)
 
-# optional shrinking logic, generally not useful
-#ssh $TOHOST.eqiad.wmnet "test -f /var/lib/nova/instances/${INSTANCE}/disk"
-#if [ $? -eq 0 ]
-#then
-#echo ""
-#echo "Shrinking the instance on $TOHOST"
-#echo ""
+time.sleep(1)
+self.refresh_instance()
 
-#ssh $TOHOST.eqiad.wmnet "mv /var/lib/nova/instances/${INSTANCE}/disk 
/var/lib/nova/instances/${INSTANCE}/disk.bak"
-#ssh $TOHOST.eqiad.wmnet "qemu-img convert -f qcow2 -O qcow2 
/var/lib/nova/instances/${INSTANCE}/disk.bak 
/var/lib/nova/instances/${INSTANCE}/disk"
+def migrate(self, leavestopped=False):
+print "Instance %s is now on host %s with state %s" % (
+self.instance_id,
+self.instance._info['OS-EXT-SRV-ATTR:host'],
+self.instance.status)
 
-# If something went wrong, we still want there to be a 'disk' file.
-#ssh $TOHOST.eqiad.wmnet "test -f /var/lib/nova/instances/${INSTANCE}/disk"
-#if [ $? -ne 0 ]
-#then
-

[MediaWiki-commits] [Gerrit] Don't set browser-prefixed transition CSS classes - change (mediawiki...VisualEditor)

2015-07-17 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225488

Change subject: Don't set browser-prefixed transition CSS classes
..

Don't set browser-prefixed transition CSS classes

jQuery will take care of this automatically: .

Follows up bf56f56f3e5.

Change-Id: I4db46fc70a5446a9ffc9f6d4375fae3b53609ee0
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/88/225488/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 897c8ac..5fe454a 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -66,13 +66,7 @@
 
function setLoadingProgress( target, duration ) {
var $bar = init.$loading.find( 
'.ve-init-mw-viewPageTarget-progress-bar' ).stop();
-   $bar.css( {
-   '-webkit-transition': 'width ' + duration + 'ms 
ease-in',
-   '-moz-transition': 'width ' + duration + 'ms ease-in',
-   '-ms-transition': 'width ' + duration + 'ms ease-in',
-   '-o-transition': 'width ' + duration + 'ms ease-in',
-   transition: 'width ' + duration + 'ms ease-in'
-   } );
+   $bar.css( 'transition', 'width ' + duration + 'ms ease-in' );
setTimeout( function () {
$bar.css( 'width', target + '%' );
} );

-- 
To view, visit https://gerrit.wikimedia.org/r/225488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4db46fc70a5446a9ffc9f6d4375fae3b53609ee0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Set up a keypair for cold migration" and all followups. - change (operations/puppet)

2015-07-17 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225486

Change subject: Revert "Set up a keypair for cold migration" and all followups.
..

Revert "Set up a keypair for cold migration" and all followups.

I'm going to try this via proper nova calls rather than our
current duct-tape-and-chewing-gum approach.

Change-Id: Icf249e79c0608cd368952619b0e180d1c7220d6c
---
M manifests/role/nova.pp
M modules/openstack/files/icehouse/virtscripts/cold-migrate
M modules/openstack/manifests/adminscripts.pp
D modules/openstack/manifests/nova/migrate.pp
4 files changed, 20 insertions(+), 95 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/225486/1

diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 5d72faa..603a1db4e 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -429,11 +429,6 @@
 class { 'openstack::spreadcheck':
 novaconfig => $novaconfig
 }
-
-class { 'openstack::nova::migrate':
-novaconfig => $novaconfig,
-is_controller => true,
-}
 }
 
 class role::nova::api {
@@ -582,10 +577,6 @@
 ensure => link,
 target => '/usr/bin/qemu-system-x86_64',
 }
-}
-
-class { 'openstack::nova::migrate':
-novaconfig => $novaconfig
 }
 }
 
diff --git a/modules/openstack/files/icehouse/virtscripts/cold-migrate 
b/modules/openstack/files/icehouse/virtscripts/cold-migrate
index 00866b5..1f64726 100755
--- a/modules/openstack/files/icehouse/virtscripts/cold-migrate
+++ b/modules/openstack/files/icehouse/virtscripts/cold-migrate
@@ -3,16 +3,15 @@
 ### THIS FILE IS MANAGED BY PUPPET
 ### puppet:///modules/openstack/icehouse/virtscripts/cold-migrate
 #
-if [ `whoami` != 'novamigrate' ]; then
-echo "This script must be run as user 'novamigrate'"
-exit 1
+ssh-add -l > /dev/null
+if [ "$?" != "0" ]
+then
+   echo "You must have a forwarded agent to use this script"
+   exit 1
 fi
-
-source ~/novaenv.sh
-
 if [ "$#" -ne 2 ]; then
-echo "Usage:  $0  "
-exit 1
+   echo "Usage:  $0  "
+   exit 1
 fi
 INSTANCE=$1
 TOHOST=$2
@@ -116,7 +115,3 @@
 echo "Rebooting the instance"
 echo ""
 nova start ${INSTANCE}
-echo "  note  ---  "
-echo "For safety, the instance files on the old host (${FROMHOST}) have not 
been removed."
-echo "After verifying that the migration has completed safely, ssh to 
${FROMHOST} and"
-echo "  rm -rf /var/lib/nova/instances/${INSTANCE}"
diff --git a/modules/openstack/manifests/adminscripts.pp 
b/modules/openstack/manifests/adminscripts.pp
index 8f43f10..a350dec 100644
--- a/modules/openstack/manifests/adminscripts.pp
+++ b/modules/openstack/manifests/adminscripts.pp
@@ -17,10 +17,21 @@
 
 # Script to cold-migrate instances between compute nodes
 file { '/root/cold-migrate':
-ensure => absent,
+ensure => present,
+source => 
"puppet:///modules/openstack/${openstack_version}/virtscripts/cold-migrate",
+mode   => '0755',
+owner  => 'root',
+group  => 'root',
 }
+
+# Script to migrate instance from one dc to another
+# (specifically, pmtpa to eqiad)
 file { '/root/dc-migrate':
-ensure => absent,
+ensure => present,
+source => 
"puppet:///modules/openstack/${openstack_version}/virtscripts/dc-migrate",
+mode   => '0755',
+owner  => 'root',
+group  => 'root',
 }
 
 # Log analysis tool
diff --git a/modules/openstack/manifests/nova/migrate.pp 
b/modules/openstack/manifests/nova/migrate.pp
deleted file mode 100644
index 17160fb..000
--- a/modules/openstack/manifests/nova/migrate.pp
+++ /dev/null
@@ -1,72 +0,0 @@
-class openstack::nova::migrate(
-$is_controller=false,
-$novaconfig,
-$openstack_version=$::openstack::version,
-){
-# Set up users and scripts to permit cold-migration between compute nodes.
-# This requires a keypair for scp
-user { 'novamigrate':
-ensure => present,
-name   => 'novamigrate',
-shell  => '/bin/sh',
-comment=> 'nova user for cold-migration',
-gid=> 'nova',
-managehome => true,
-require=> Package['nova-common'],
-system => true,
-}
-ssh::userkey { 'novamigrate':
-content  => secret('novamigrate/novamigrate.pub'),
-require  => user['novamigrate'],
-ensure   => present,
-}
-file { '/home/novamigrate/.ssh':
-ensure  => directory,
-owner   => 'novamigrate',
-group   => 'nova',
-mode=> '0700',
-require => user['novamigrate'],
-}
-
-file { '/home/novamigrate/.ssh/id_rsa':
-content => secret('novamigrate/novamigrate'),
-owner   => 'novamigrate',
-group   => 'nova',
-mode

[MediaWiki-commits] [Gerrit] POC for Realtime Trending Pageviews - change (analytics...source)

2015-07-17 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225485

Change subject: POC for Realtime Trending Pageviews
..

POC for Realtime Trending Pageviews

This job was originally developed at https://gerrit.wikimedia.org/r/#/c/201474/
It was modified to use spark 1.3.0 Kafka Direct Stream API

To run spark streaming job:

```
spark-submit \
--master yarn \
--num-executors 12 \
--class org.wikimedia.analytics.refinery.job.RealtimeTrendingPages \
refinery-job/target/refinery-job-0.0.15-SNAPSHOT.jar \
10 600 10 otto-pagecounts-spark-streaming-$(date +%s) webrequest_text  \
> /tmp/topPageViews.out
```

To run Visualization:

```
cd realtime_trending_viz
npm install
nodejs index.js
```

To view visualization from stat1002:

```
ssh -N bast1001.wikimedia.org -L 3000:stat1002.eqiad.wmnet:3000
```

Then browse to http://localhost:3000

Change-Id: I62b50f052cdc66144854a16696389a439b2c31e2
---
A realtime_trending_viz/index.html
A realtime_trending_viz/index.js
A realtime_trending_viz/static/cloud.js
A realtime_trending_viz/static/d3.layout.cloud.js
M refinery-job/pom.xml
A 
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/RealtimeTrendingPages.scala
6 files changed, 946 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/85/225485/1

diff --git a/realtime_trending_viz/index.html b/realtime_trending_viz/index.html
new file mode 100644
index 000..03f3c95
--- /dev/null
+++ b/realtime_trending_viz/index.html
@@ -0,0 +1,127 @@
+
+
+  
+Wikimedia Pageviews
+
+
+
+  * { margin: 0; padding: 0; }
+  html, body { width: 100%; height: 100%; }
+  .top, .bottom { width: 100%; height: 100%; left: 0; right: 0; position: 
fixed; }
+  .top { height: 52%; top: 8%; }
+  .bottom { height: 40%; bottom: 0; }
+
+  .header { position: fixed; top: 10px; left: 20px; }
+  .header span:nth-child(1) { font-size: 18pt; }
+  .header span:nth-child(2) { color: #777; }
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var topTitle = 'Top 10 Articles';
+var topSubtitle = 'all wikis, last 10 minutes';
+var topTitleColor = '#2ca02c';
+var vm = {
+hoverText: ko.observable(topTitle),
+hoverInfo: ko.observable(topSubtitle),
+articleColor: ko.observable(topTitleColor)
+};
+ko.applyBindings(vm);
+
+var socket = io();
+
+socket.on('total', function(newTotal){
+graph.series.addData({ one: +newTotal });
+graph.render();
+});
+
+// Total count of all pageviews graph
+var graph = new Rickshaw.Graph( {
+element: $('.total')[0],
+width: $('.bottom').innerWidth(),
+height: $('.bottom').innerHeight(),
+renderer: 'line',
+series: new Rickshaw.Series.FixedDuration([{
+name: 'Total Pageviews'
+}], undefined, {
+timeInterval: 1000,
+maxDataPoints: 100
+})
+} );
+graph.series[0].color = topTitleColor;
+
+var xAxis = new Rickshaw.Graph.Axis.Time({ graph: graph });
+var yAxis = new Rickshaw.Graph.Axis.Y({
+graph: graph,
+orientation: 'right',
+tickFormat: Rickshaw.Fixtures.Number.formatKMBT
+});
+
+var hoverDetail = new Rickshaw.Graph.HoverDetail( {
+graph: graph
+} );
+
+graph.render();
+xAxis.render();
+yAxis.render();
+
+
+// render the top 10 cloud
+var top10cloud = cloudLayout(
+'.cloud',
+12, 60,
+$('.top').innerWidth(), $('.top').innerHeight(),
+function (d) {
+vm.hoverText(d.text);
+vm.articleColor(top10cloud.fillScale(d.article));
+vm.hoverInfo(d.count + ' views, last 10 minutes');
+},
+function (d) {
+vm.hoverText(topTitle);
+vm.articleColor(topTitleColor);
+vm.hoverInfo(topSubtitle);
+}
+);
+
+socket.on('tops', function(articles){
+var words = articles.split(';').map(function (article){
+var a = article.split('=');
+return {article: decodeURIComponent(a[0]).replace(/_/g,' '), 
count: a[1]};
+});
+var counts = words.map(function(a){ return +a.count; });
+top10cloud.fontSizeScale.domain(d3.extent(counts));
+
+top10cloud.stop().words(words).start();
+});
+
+// really cool:
+function downloadSVG() {
+d3.select(this).attr("href", 
"data:image/svg+xml;charset=utf-8;base64," + btoa(unescape(encodeURIComponent(
+

[MediaWiki-commits] [Gerrit] Hygiene: bump version to v1.3.3-SNAPSHOT - change (apps...java-mwapi)

2015-07-17 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225484

Change subject: Hygiene: bump version to v1.3.3-SNAPSHOT
..

Hygiene: bump version to v1.3.3-SNAPSHOT

Change-Id: I1b43ee04a19e55e9058da89f27800fa841c2da76
---
M lib/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/84/225484/1

diff --git a/lib/build.gradle b/lib/build.gradle
index 8e61ff4..a3a46cc 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -4,7 +4,7 @@
 
 group = 'org.mediawiki.api'
 archivesBaseName = 'json'
-version = '1.3.2'
+version = '1.3.3-SNAPSHOT'
 
 dependencies {
 compile 'org.json:json:20140107'

-- 
To view, visit https://gerrit.wikimedia.org/r/225484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b43ee04a19e55e9058da89f27800fa841c2da76
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Upgrade java-mwapi to v1.3.2 - change (apps...wikipedia)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Upgrade java-mwapi to v1.3.2
..


Upgrade java-mwapi to v1.3.2

Upgrade java-mwapi to version 1.3.2. This new version should be
functionally identical to the previous. This upgrade ensures the latest
changes to the build scripts cause no harm.

Change-Id: I7348a2908d590471f1872c8eaaed33a0e630372e
---
M wikipedia/build.gradle
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index 46b1ddc..ca0e8ee 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -107,7 +107,7 @@
 }
 
 dependencies {
-compileSubprojectOrModule ':java-mwapi:json', 
'org.mediawiki.api:json:1.3.2-SNAPSHOT', 'org.json', 'json'
+compileSubprojectOrModule ':java-mwapi:json', 
'org.mediawiki.api:json:1.3.2', 'org.json', 'json'
 
 // To keep the Maven Central dependencies up-to-date
 // use http://gradleplease.appspot.com/ or http://search.maven.org/.
@@ -157,4 +157,4 @@
 } else {
 System.err.println propFile.toString() + ' not found'
 android.buildTypes.release.signingConfig = null
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/225476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7348a2908d590471f1872c8eaaed33a0e630372e
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Upgrade swift repository - change (operations...plugins)

2015-07-17 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225483

Change subject: Upgrade swift repository
..

Upgrade swift repository

Change-Id: I1e18d5715380f97db0e0369825309161d15cb12d
---
D swift-repository-plugin/swift-repository-plugin-0.6.jar
A swift-repository-plugin/swift-repository-plugin-1.6.0.jar
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/elasticsearch/plugins 
refs/changes/83/225483/1

diff --git a/swift-repository-plugin/swift-repository-plugin-0.6.jar 
b/swift-repository-plugin/swift-repository-plugin-0.6.jar
deleted file mode 100644
index ca414fd..000
--- a/swift-repository-plugin/swift-repository-plugin-0.6.jar
+++ /dev/null
@@ -1 +0,0 @@
-#$# git-fat 79b4fb3c7b10548c2c26fd8ffa1779f30d64d85918268
diff --git a/swift-repository-plugin/swift-repository-plugin-1.6.0.jar 
b/swift-repository-plugin/swift-repository-plugin-1.6.0.jar
new file mode 100644
index 000..1b2c3dc
--- /dev/null
+++ b/swift-repository-plugin/swift-repository-plugin-1.6.0.jar
@@ -0,0 +1 @@
+#$# git-fat 878da93b288464e65338a8204d9145ac7a624a7716276

-- 
To view, visit https://gerrit.wikimedia.org/r/225483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e18d5715380f97db0e0369825309161d15cb12d
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/elasticsearch/plugins
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix edit pencil position when switching from RTL to LTR. - change (apps...wikipedia)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix edit pencil position when switching from RTL to LTR.
..


Fix edit pencil position when switching from RTL to LTR.

The content-rtl and content-ltr classes weren't being cleared prior to
setting the new class, causing the WebView to become confused.

Also, removed unnecessary call to setupDirectionality in our
PageLoadStrategy, since it already gets called in
loadPageOnWebViewReady().

Bug: T102046
Change-Id: I3d5c5e818fc304e94ef9dda4dcdf224cb29a9c98
---
M wikipedia/assets/bundle.js
M wikipedia/assets/preview.js
M wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M www/js/rtlsupport.js
4 files changed, 20 insertions(+), 5 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  Niedzielski: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 7835b9a..fc3f2be 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -373,6 +373,12 @@
 bridge.registerListener( "setDirectionality", function( payload ) {
 window.directionality = payload.contentDirection;
 var html = document.getElementsByTagName( "html" )[0];
+// first, remove all the possible directionality classes...
+html.classList.remove( "content-rtl" );
+html.classList.remove( "content-ltr" );
+html.classList.remove( "ui-rtl" );
+html.classList.remove( "ui-ltr" );
+// and then set the correct class based on our payload.
 html.classList.add( "content-" + window.directionality );
 html.classList.add( "ui-" + payload.uiDirection );
 } );
@@ -418,8 +424,8 @@
 return text;
 }
 
-// Returns any currently-highlighted text.
-// If no text is highlighted, returns the text of the first paragraph.
+// Returns currently highlighted text.
+// If fewer than two characters are highlighted, returns the text of the first 
paragraph.
 bridge.registerListener( "getTextSelection", function( payload ) {
 var text = window.getSelection().toString().trim();
 if (text.length < 2) {
diff --git a/wikipedia/assets/preview.js b/wikipedia/assets/preview.js
index dd266e5..753bdb2 100644
--- a/wikipedia/assets/preview.js
+++ b/wikipedia/assets/preview.js
@@ -277,6 +277,12 @@
 bridge.registerListener( "setDirectionality", function( payload ) {
 window.directionality = payload.contentDirection;
 var html = document.getElementsByTagName( "html" )[0];
+// first, remove all the possible directionality classes...
+html.classList.remove( "content-rtl" );
+html.classList.remove( "content-ltr" );
+html.classList.remove( "ui-rtl" );
+html.classList.remove( "ui-ltr" );
+// and then set the correct class based on our payload.
 html.classList.add( "content-" + window.directionality );
 html.classList.add( "ui-" + payload.uiDirection );
 } );
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java 
b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 8645ce0..036b206 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -552,9 +552,6 @@
 bridge.sendMessage("displayLeadSection", leadSectionPayload);
 Log.d(TAG, "Sent message 'displayLeadSection' for page: " + 
page.getDisplayTitle());
 
-
Utils.setupDirectionality(model.getTitle().getSite().getLanguageCode(),
-Locale.getDefault().getLanguage(), bridge);
-
 // Hide edit pencils if anon editing is disabled by remote 
killswitch or if this is a file page
 JSONObject miscPayload = new JSONObject();
 boolean isAnonEditingDisabled = app.getRemoteConfig().getConfig()
diff --git a/www/js/rtlsupport.js b/www/js/rtlsupport.js
index d6b6a91..5199bec 100644
--- a/www/js/rtlsupport.js
+++ b/www/js/rtlsupport.js
@@ -3,6 +3,12 @@
 bridge.registerListener( "setDirectionality", function( payload ) {
 window.directionality = payload.contentDirection;
 var html = document.getElementsByTagName( "html" )[0];
+// first, remove all the possible directionality classes...
+html.classList.remove( "content-rtl" );
+html.classList.remove( "content-ltr" );
+html.classList.remove( "ui-rtl" );
+html.classList.remove( "ui-ltr" );
+// and then set the correct class based on our payload.
 html.classList.add( "content-" + window.directionality );
 html.classList.add( "ui-" + payload.uiDirection );
 } );

-- 
To view, visit https://gerrit.wikimedia.org/r/225323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d5c5e818fc304e94ef9dda4dcdf224cb29a9c98
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Bea

[MediaWiki-commits] [Gerrit] Fix build script path conversion - change (apps...wikipedia)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix build script path conversion
..


Fix build script path conversion

* Fix build script path conversion bugs:
  ** Check module hierarchy length before indexing.
  ** Escape the file separator string.

Change-Id: I4fa03f09ae258c18c255c45897e84b4f72dd39b8
---
M settings.gradle
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/settings.gradle b/settings.gradle
index d738c4d..bd25c51 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,13 @@
+import java.util.regex.Matcher
+
 def fileExists = {String filename ->
 new File(filename).exists()
 }
 
 def hierarchyToFilename = { String hierarchy ->
-return hierarchy ? hierarchy.substring(1).replaceAll(':', File.separator) 
: hierarchy
+return hierarchy && hierarchy.length() > 0 ?
+hierarchy.substring(1).replaceAll(':', 
Matcher.quoteReplacement(File.separator)) :
+hierarchy
 }
 
 def includeExists = { String projectPath, String name ->

-- 
To view, visit https://gerrit.wikimedia.org/r/225341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fa03f09ae258c18c255c45897e84b4f72dd39b8
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update to 1.7.0 - change (search/repository-swift)

2015-07-17 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225482

Change subject: Update to 1.7.0
..

Update to 1.7.0

Change-Id: I41ba89cac6842077a6f47694df15b6d077d930a0
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/82/225482/1

diff --git a/pom.xml b/pom.xml
index d4663e3..2e6cedd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-1.6.1-SNAPSHOT
+1.7.0-SNAPSHOT
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift
@@ -37,7 +37,7 @@
 
 
 UTF-8
-1.6.0
+1.7.0
 
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/225482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41ba89cac6842077a6f47694df15b6d077d930a0
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Localisation updates from https://translatewiki.net.
..


Localisation updates from https://translatewiki.net.

Change-Id: I7779de063ff4ebd380e48b123f004a38342b4e60
---
M wikipedia/res/values-af/strings.xml
M wikipedia/res/values-bn/strings.xml
M wikipedia/res/values-br/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-gu/strings.xml
M wikipedia/res/values-iw/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-zh/strings.xml
12 files changed, 48 insertions(+), 13 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/res/values-af/strings.xml 
b/wikipedia/res/values-af/strings.xml
index 3f4144f..810dfbd 100644
--- a/wikipedia/res/values-af/strings.xml
+++ b/wikipedia/res/values-af/strings.xml
@@ -10,7 +10,7 @@
   Wat was u besig om te doen toe die 
breek plaasgevind het?
   Soek in Wikipedia
   Geskiedenis
-  Daar is geen 
netwerkverbinding :(
+  Daar is geen netwerkverbinding 
nie.
   Netwerkfout. Kliek om weer te 
probeer.
   Daar was \'n probleem met die hantering 
van u versoek.
   Bediener statuskode 
onbeskikbaar.
@@ -273,4 +273,6 @@
   Maak skakel oop
   Open in nuwe oortjie
   Stoor vir later
+  Boodskap: 
\"%s\"
+  Kode:\"%s\"
 
diff --git a/wikipedia/res/values-bn/strings.xml 
b/wikipedia/res/values-bn/strings.xml
index 294b61e..1b195bc 100644
--- a/wikipedia/res/values-bn/strings.xml
+++ b/wikipedia/res/values-bn/strings.xml
@@ -130,6 +130,7 @@
   পরবর্তী
   অ্যাকাউন্ট তৈরি করুন
   সাধারণ
+  উইকিপিডিয়া অ্যাপ প্রাজিপ্র
   উইকিপিডিয়া জিরো নিষ্ক্রিয়
   অন্যান্য নিবন্ধ দেখার জন্য 
ডাটা চার্জ প্রযোজ্য হতে পারে।
   উইকিপিডিয়া জিরো অনুসন্ধান
@@ -233,6 +234,7 @@
   শেয়ার করা যাচ্ছে না: %s
   সংরক্ষন করুন
   সংরক্ষণ করা যাচ্ছে না: %s
+  মিডিয়া সংগ্রহে চিত্র আমদানি 
করতে ব্যর্থ
   ছবিটি সফলভাবে সংরক্ষণ করা 
হয়েছে।
   ভিডিওটি চালু হচ্ছেনা।
   ফাইলটি সংরক্ষণ করা যাচ্ছে না
@@ -242,7 +244,9 @@
   লেখা হিসাবে ভাগ করুন
   চিত্র প্রাকদর্শন
   ক্রিয়েটিভ কমন্স লাইসেন্স
+  ক্যাপচা চিত্র
   বৈধ ব্যবহার
+  আপলোডকারী অজানা
   আপনার সম্পাদনা সংরক্ষণ করা যায়নি: 
%s
   ট্যাবসমূহ দেখান
   নতুন ট্যাব
@@ -251,7 +255,7 @@
   নতুন ট্যাবে খুলুন
   পরবর্তীকালের  জন্য সংরক্ষণ করুন
   অনুলিপি তৈরি বা ভাগ করার জন্য এটি 
আলোকপাতের জন্য লেখার যেকোন জায়গায় চাপ দিয়ে ধরে রাখুন।
-  ব্রাউজারে দেখুন
+  ব্রাউজারে পাতা দেখুন
   যেকোন সময় এই বোতাম টোকা দিয়ে, বা পর্দার 
ডান প্রান্ত থেকে টেনে আনার দ্বারা টেবিলের বিষয়বস্তু দেখুন।
   সার্ভার অনুরোধটি সম্পূর্ণ করতে 
পারেনি।
   একটি অজানা ত্রুটি দেখা দিয়েছে।
diff --git a/wikipedia/res/values-br/strings.xml 
b/wikipedia/res/values-br/strings.xml
index 505d128..09f7f2b 100644
--- a/wikipedia/res/values-br/strings.xml
+++ b/wikipedia/res/values-br/strings.xml
@@ -273,4 +273,5 @@
   Digeriñ al liamm
   Digeriñ en un ivinell nevez
   Enrollañ diwezhatoc\'h
+  Gwelet ar bajenn er merdeer
 
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 5661d65..d0d7270 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -277,7 +277,7 @@
   Für später speichern
   Drücke und halte irgendwo im Text, um 
ihn hervorzuheben zum Kopieren und Teilen.
   Versuche, eine interessante Tatsache nach dem 
Hervorheben auf deinen Lieblingsnetzwerken zu teilen!
-  Im Browser ansehen
+  Seite im Browser ansehen
   Sieh dir jederzeit das Inhaltsverzeichnis 
an durch das Tippen auf diesen Button oder wische von der rechten 
Bildschirmkante.
   Der Server konnte die Anfrage nicht 
abschließen.
   Die Antwort vom Server ist nicht 
korrekt formatiert.
diff --git a/wikipedia/res/values-es/strings.xml 
b/wikipedia/res/values-es/strings.xml
index 709b110..5df5e4f 100644
--- a/wikipedia/res/values-es/strings.xml
+++ b/wikipedia/res/values-es/strings.xml
@@ -277,7 +277,7 @@
   Guardar para después
   Pulsa y mantén pulsado en cualquier 
parte del texto para resaltarlo, para poder copiar y compartir.
   Después de resaltar un hecho interesante, 
prueba compartirlo en tus redes favoritas.
-  Ver en el navegador
+  Ver página en el navegador
   Despliega la tabla de contenidos en 
cualquier momento pulsando este botón, o deslizando desde el borde derecho de 
la pantalla.
   El servidor no pudo completar la 
solicitud.
   La respuesta del servidor no se ha 
formateado correctamente.
diff --git a/wikipedia/res/values-fr/strings.xml 
b/wikipedia/res/values-fr/strings.xml
index f327c7e..6bc08d2 100644
--- a/wikipedia/res/values-fr/strings.xml
+++ b/wikipedia/res/values-fr/strings.xml
@@ -277,7 +277,7 @@
   Enregistrer pour plus tard
   Cliquez et maintenez appuyé n’importe où 
dans le texte pour le surligner afin de le copier et le partager.
   Après avoir surlig

[MediaWiki-commits] [Gerrit] Implement Memory cache for articles - change (apps...wikipedia)

2015-07-17 Thread Fjalapeno (Code Review)

Fjalapeno has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225481

Change subject: Implement Memory cache for articles
..

Implement Memory cache for articles

T105819

Adding NSCache to the datastore, setting cache size to 50
Note: NSCache is thread safe and locks itself.
Caching when an article is saved
Checking memory cache, then, disk, then create if needed
Moved from article fetched notification -> article saved notification (more 
like core data)

Change-Id: I0042dbf2bc7097cd3b4698216178cbe59ac4e30e
---
M MediaWikiKit/MediaWikiKit/MWKDataStore.h
M MediaWikiKit/MediaWikiKit/MWKDataStore.m
M Wikipedia/UI-V5/WMFArticleFetcher.h
M Wikipedia/UI-V5/WMFArticleFetcher.m
M Wikipedia/UI-V5/WMFArticleViewController.m
5 files changed, 35 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/81/225481/1

diff --git a/MediaWikiKit/MediaWikiKit/MWKDataStore.h 
b/MediaWikiKit/MediaWikiKit/MWKDataStore.h
index 84f9645..ea2c610 100644
--- a/MediaWikiKit/MediaWikiKit/MWKDataStore.h
+++ b/MediaWikiKit/MediaWikiKit/MWKDataStore.h
@@ -22,6 +22,9 @@
  */
 extern NSString* MWKCreateImageURLWithPath(NSString* path);
 
+extern NSString* const MWKArticleSavedNotification;
+extern NSString* const MWKArticleKey;
+
 @interface MWKDataStore : NSObject
 
 @property (readonly, copy, nonatomic) NSString* basePath;
diff --git a/MediaWikiKit/MediaWikiKit/MWKDataStore.m 
b/MediaWikiKit/MediaWikiKit/MWKDataStore.m
index 3ba71b0..72139db 100644
--- a/MediaWikiKit/MediaWikiKit/MWKDataStore.m
+++ b/MediaWikiKit/MediaWikiKit/MWKDataStore.m
@@ -7,8 +7,10 @@
 
 #import 
 
-
+NSString* const MWKArticleSavedNotification  = 
@"MWKArticleSavedNotification";
+NSString* const MWKArticleKey= @"MWKArticleKey";
 NSString* const MWKDataStoreValidImageSitePrefix = @"//upload.wikimedia.org/";
+
 NSString* MWKCreateImageURLWithPath(NSString* path) {
 return [MWKDataStoreValidImageSitePrefix stringByAppendingString:path];
 }
@@ -18,6 +20,7 @@
 @interface MWKDataStore ()
 
 @property (readwrite, copy, nonatomic) NSString* basePath;
+@property (nonatomic, strong) NSCache* articleCache;
 
 @end
 
@@ -36,7 +39,9 @@
 - (instancetype)initWithBasePath:(NSString*)basePath {
 self = [super init];
 if (self) {
-self.basePath = basePath;
+self.basePath= basePath;
+self.articleCache= [[NSCache alloc] init];
+self.articleCache.countLimit = 50;
 }
 return self;
 }
@@ -193,9 +198,14 @@
 }
 
 - (void)saveArticle:(MWKArticle*)article {
+if (article.title.text == nil) {
+return;
+}
 NSString* path   = [self pathForArticle:article];
 NSDictionary* export = [article dataExport];
 [self saveDictionary:export path:path name:@"Article.plist"];
+[self.articleCache setObject:article forKey:article.title];
+[[NSNotificationCenter defaultCenter] 
postNotificationName:MWKArticleSavedNotification object:self 
userInfo:@{MWKArticleKey: article}];
 }
 
 - (void)saveSection:(MWKSection*)section {
@@ -266,6 +276,10 @@
 
 #pragma mark - load methods
 
+- (MWKArticle*)memoryCachedArticleWithTitle:(MWKTitle*)title {
+return [self.articleCache objectForKey:title];
+}
+
 - (MWKArticle*)existingArticleWithTitle:(MWKTitle*)title {
 NSString* path = [self pathForTitle:title];
 NSString* filePath = [path 
stringByAppendingPathComponent:@"Article.plist"];
@@ -274,7 +288,19 @@
 }
 
 - (MWKArticle*)articleWithTitle:(MWKTitle*)title {
-return [self existingArticleWithTitle:title] ? : [[MWKArticle alloc] 
initWithTitle:title dataStore:self];
+MWKArticle* article = [self memoryCachedArticleWithTitle:title];
+
+if (!article) {
+article = [self existingArticleWithTitle:title];
+if (!article) {
+article = [[MWKArticle alloc] initWithTitle:title dataStore:self];
+}
+if (article) {
+[self.articleCache setObject:article forKey:article.title];
+}
+}
+
+return article;
 }
 
 - (MWKSection*)sectionWithId:(NSUInteger)sectionId 
article:(MWKArticle*)article {
diff --git a/Wikipedia/UI-V5/WMFArticleFetcher.h 
b/Wikipedia/UI-V5/WMFArticleFetcher.h
index bdce398..72b3ead 100644
--- a/Wikipedia/UI-V5/WMFArticleFetcher.h
+++ b/Wikipedia/UI-V5/WMFArticleFetcher.h
@@ -7,12 +7,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSString* const WMFArticleFetchedNotification;
-extern NSString* const WMFArticleFetchedKey;
-
-extern NSString* const WMFArticleFetchedNotification;
-extern NSString* const WMFArticleFetchedKey;
-
 @interface WMFArticleFetcher : NSObject
 
 @property (nonatomic, strong, readonly) MWKDataStore* dataStore;
diff --git a/Wikipedia/UI-V5/WMFArticleFetcher.m 
b/Wikipedia/UI-V5/WMFArticleFetcher.m
index e5c23c0..94faf33 100644
--- a/Wikipedia/UI-V5/WMFArticleFetcher.m
+++ b/Wikipedia/UI-V5/WMFArticleFetcher.m
@@ -7,8 +7,6 @@
 
 NS_

[MediaWiki-commits] [Gerrit] [WIP] Parallelize eventlogging processor - change (mediawiki...EventLogging)

2015-07-17 Thread Madhuvishy (Code Review)

Madhuvishy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225480

Change subject: [WIP] Parallelize eventlogging processor
..

[WIP] Parallelize eventlogging processor

- Using PyKafka BalancedConsumer

Bug: T104226
Change-Id: If3470ca80740e820c89432c390354ab2494fd2bf
---
M server/bin/eventlogging-processor
M server/eventlogging/handlers.py
M server/setup.py
3 files changed, 27 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging 
refs/changes/80/225480/1

diff --git a/server/bin/eventlogging-processor 
b/server/bin/eventlogging-processor
index 5e87fd6..823071d 100755
--- a/server/bin/eventlogging-processor
+++ b/server/bin/eventlogging-processor
@@ -125,4 +125,4 @@
 
 else:
 for w in writers_list:
-w.send(event)
+w.send(event)
\ No newline at end of file
diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py
index 28d5680..4879b8a 100644
--- a/server/eventlogging/handlers.py
+++ b/server/eventlogging/handlers.py
@@ -24,6 +24,7 @@
 from kafka import SimpleProducer
 from kafka.producer.base import Producer
 from kafka.common import KafkaTimeoutError
+from pykafka import KafkaClient as PyKafkaClient
 
 import logging
 import logging.handlers
@@ -384,6 +385,7 @@
 def kafka_reader(
 path,
 topic='eventlogging',
+consumer_group='eventlogging-group',
 identity='eventlogging',
 raw=False,
 **kafka_consumer_args
@@ -392,11 +394,14 @@
 Reads events from Kafka.
 
 Kafka URIs look like:
-kafka:///b1:9092,b2:9092?topic=topic_name&auto_commit_enable=True&...
+kafka:///b1:9092,b2:9092?topic=topic_name&consumer_group=group_name&
+auto_commit_enable=True&...
 
-This reader uses the kafka-python KafkaConsumer.  You may pass
-any configs that KafkaConsumer takes as keyword arguments via
+This reader uses the pykafka BalancedConsumer.  You may pass
+any configs that BalancedConsumer takes as keyword arguments via
 the kafka URI query params.
+
+FIXME: This stuff should be worked out for the BalancedConsumer:
 
 If auto_commit_enable is True, then messages will be
 marked as done as soon as they are read.  This has the
@@ -408,29 +413,36 @@
 will have to fix this problem somehow.  Perhaps a callback?
 """
 # Brokers should be in the uri path
-brokers = path.strip('/')
+brokers = path.strip('/').encode('ascii', 'ignore')
 
+# FIXME: Dont think this will work for Balanced Consumer
 # remove non KafkaConsumer args from kafka_consumer_args
 kafka_consumer_args = {
 k: v for k, v in items(kafka_consumer_args)
-if k in kafka.DEFAULT_CONSUMER_CONFIG
+if k in inspect.getargspec(PyKafkaClient.__init__).args
 }
 
-consumer = KafkaConsumer(
-topic,
-group_id=identity,
-bootstrap_servers=brokers,
-**kafka_consumer_args
-)
+kafka_client = PyKafkaClient(hosts=brokers)
+kafka_topic = kafka_client.topics[topic]
+
+consumer = kafka_topic.get_balanced_consumer(
+consumer_group=consumer_group,
+**kafka_consumer_args)
+
+def get_message_stream(consumer):
+while True:
+yield consumer.consume()
 
 # No need to bother calling task_done() if we aren't going to commit.
+"""
 if consumer._config['auto_commit_enable']:
 return stream(
 (_ack_kafka_message(consumer, message) for message in consumer),
 raw
 )
 else:
-return stream((message.value for message in consumer), raw)
+"""
+return stream((message.value for message in get_message_stream(consumer)), 
raw)
 
 
 def _ack_kafka_message(consumer, message):
diff --git a/server/setup.py b/server/setup.py
index 8b1514b..d37903e 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -58,6 +58,7 @@
 "pygments>=1.5",
 "pyzmq>=2.1",
 "sqlalchemy>=0.7",
-"kafka-python>=0.9.3"
+"kafka-python>=0.9.3",
+"pykafka>=1.0.3"
 )
 )

-- 
To view, visit https://gerrit.wikimedia.org/r/225480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3470ca80740e820c89432c390354ab2494fd2bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Madhuvishy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update BaseX client to NTCIR result format - change (mediawiki...MathSearch)

2015-07-17 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225479

Change subject: Update BaseX client to NTCIR result format
..

Update BaseX client to NTCIR result format

Change-Id: Ic2822336ef75aee664199abeff1d855229c4f475
---
M includes/engines/MathEngineBaseX.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/79/225479/1

diff --git a/includes/engines/MathEngineBaseX.php 
b/includes/engines/MathEngineBaseX.php
index b1fa234..145d04b 100644
--- a/includes/engines/MathEngineBaseX.php
+++ b/includes/engines/MathEngineBaseX.php
@@ -49,7 +49,7 @@
 * @param SimpleXMLElement $xmlRoot
 */
function processMathResults( $xmlRoot ) {
-   foreach ( $xmlRoot->children( )->children() as $page ) {
+   foreach ( $xmlRoot->run->result->children() as $page ) {
$attrs = $page->attributes();
$uri = explode( "#", $attrs["id"] );
if ( sizeof($uri) != 2 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/225479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2822336ef75aee664199abeff1d855229c4f475
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: lint the role - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: lint the role
..


maps: lint the role

And remove the templates string

Change-Id: I07db729f4b1eff9a56fafdbcabf10ff02b0dcea3
---
M manifests/role/maps.pp
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 57294ff..5fe0d7b 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -22,10 +22,10 @@
 $osmimporter_pass = hiera('postgresql::master::osmimporter_pass')
 $osmupdater_pass = hiera('postgresql::master::osmupdater_pass')
 file { '/usr/local/bin/maps-grants.sql':
-owner => 'root',
-group => 'root',
-mode  => '0400',
-content => template('templates/maps/grants.sql.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0400',
+content => template('maps/grants.sql.erb'),
 }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/225478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I07db729f4b1eff9a56fafdbcabf10ff02b0dcea3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: lint the role - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225478

Change subject: maps: lint the role
..

maps: lint the role

And remove the templates string

Change-Id: I07db729f4b1eff9a56fafdbcabf10ff02b0dcea3
---
M manifests/role/maps.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/225478/1

diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 57294ff..5fe0d7b 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -22,10 +22,10 @@
 $osmimporter_pass = hiera('postgresql::master::osmimporter_pass')
 $osmupdater_pass = hiera('postgresql::master::osmupdater_pass')
 file { '/usr/local/bin/maps-grants.sql':
-owner => 'root',
-group => 'root',
-mode  => '0400',
-content => template('templates/maps/grants.sql.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0400',
+content => template('maps/grants.sql.erb'),
 }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/225478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07db729f4b1eff9a56fafdbcabf10ff02b0dcea3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps: populate postgres granting SQL script - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: maps: populate postgres granting SQL script
..


maps: populate postgres granting SQL script

A script for populating the required users in the maps PostgreSQL
database

Change-Id: I27a3d942170db410fbd92643b2f63b34bdc5bb4e
---
M manifests/role/maps.pp
A templates/maps/grants.sql.erb
2 files changed, 26 insertions(+), 0 deletions(-)

Approvals:
  Yurik: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index fea8a5e..57294ff 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -16,6 +16,17 @@
 if $postgres_slaves {
 create_resources(postgresql::user, $postgres_slaves)
 }
+
+# Grants
+$tilerator_pass = hiera('postgresql::master::tilerator_pass')
+$osmimporter_pass = hiera('postgresql::master::osmimporter_pass')
+$osmupdater_pass = hiera('postgresql::master::osmupdater_pass')
+file { '/usr/local/bin/maps-grants.sql':
+owner => 'root',
+group => 'root',
+mode  => '0400',
+content => template('templates/maps/grants.sql.erb'),
+}
 }
 
 class role::maps::slave {
diff --git a/templates/maps/grants.sql.erb b/templates/maps/grants.sql.erb
new file mode 100644
index 000..b57c038
--- /dev/null
+++ b/templates/maps/grants.sql.erb
@@ -0,0 +1,15 @@
+CREATE ROLE tilerator WITH PASSWORD '<%= @tilerator_pass %>';
+CREATE ROLE osmupdater WITH PASSWORD '<%= @osmupdater_pass %>';
+CREATE ROLE osmimporter WITH PASSWORD '<%= @osmimporter_pass %>';
+
+GRANT SELECT ON ALL TABLES IN SCHEMA public TO tilerator;
+GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA public TO osmupdater;
+GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA public TO 
osmimporter;
+GRANT CREATE,TEMPORARY ON DATABASE gis TO osmimporter;
+
+ALTER DATABASE gis OWNER TO osmimporter;
+ALTER TABLE geography_columns OWNER to osmimporter;
+ALTER TABLE geometry_columns OWNER to osmimporter;
+ALTER TABLE raster_columns OWNER to osmimporter;
+ALTER TABLE raster_overviews OWNER to osmimporter;
+ALTER TABLE spatial_ref_sys OWNER to osmimporter;

-- 
To view, visit https://gerrit.wikimedia.org/r/225401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I27a3d942170db410fbd92643b2f63b34bdc5bb4e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)

2015-07-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225477

Change subject: Localisation updates from https://translatewiki.net.
..

Localisation updates from https://translatewiki.net.

Change-Id: I7779de063ff4ebd380e48b123f004a38342b4e60
---
M wikipedia/res/values-af/strings.xml
M wikipedia/res/values-bn/strings.xml
M wikipedia/res/values-br/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-gu/strings.xml
M wikipedia/res/values-iw/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-zh/strings.xml
12 files changed, 48 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/77/225477/1

diff --git a/wikipedia/res/values-af/strings.xml 
b/wikipedia/res/values-af/strings.xml
index 3f4144f..5bbc48e 100644
--- a/wikipedia/res/values-af/strings.xml
+++ b/wikipedia/res/values-af/strings.xml
@@ -10,7 +10,7 @@
   Wat was u besig om te doen toe die 
breek plaasgevind het?
   Soek in Wikipedia
   Geskiedenis
-  Daar is geen 
netwerkverbinding :(
+  Daar is geen netwerkverbinding 
nie.
   Netwerkfout. Kliek om weer te 
probeer.
   Daar was \'n probleem met die hantering 
van u versoek.
   Bediener statuskode 
onbeskikbaar.
@@ -273,4 +273,6 @@
   Maak skakel oop
   Open in nuwe oortjie
   Stoor vir later
+  Boodskap: 
\"%S\"
+  Kode:\"%S\"
 
diff --git a/wikipedia/res/values-bn/strings.xml 
b/wikipedia/res/values-bn/strings.xml
index 294b61e..1b195bc 100644
--- a/wikipedia/res/values-bn/strings.xml
+++ b/wikipedia/res/values-bn/strings.xml
@@ -130,6 +130,7 @@
   পরবর্তী
   অ্যাকাউন্ট তৈরি করুন
   সাধারণ
+  উইকিপিডিয়া অ্যাপ প্রাজিপ্র
   উইকিপিডিয়া জিরো নিষ্ক্রিয়
   অন্যান্য নিবন্ধ দেখার জন্য 
ডাটা চার্জ প্রযোজ্য হতে পারে।
   উইকিপিডিয়া জিরো অনুসন্ধান
@@ -233,6 +234,7 @@
   শেয়ার করা যাচ্ছে না: %s
   সংরক্ষন করুন
   সংরক্ষণ করা যাচ্ছে না: %s
+  মিডিয়া সংগ্রহে চিত্র আমদানি 
করতে ব্যর্থ
   ছবিটি সফলভাবে সংরক্ষণ করা 
হয়েছে।
   ভিডিওটি চালু হচ্ছেনা।
   ফাইলটি সংরক্ষণ করা যাচ্ছে না
@@ -242,7 +244,9 @@
   লেখা হিসাবে ভাগ করুন
   চিত্র প্রাকদর্শন
   ক্রিয়েটিভ কমন্স লাইসেন্স
+  ক্যাপচা চিত্র
   বৈধ ব্যবহার
+  আপলোডকারী অজানা
   আপনার সম্পাদনা সংরক্ষণ করা যায়নি: 
%s
   ট্যাবসমূহ দেখান
   নতুন ট্যাব
@@ -251,7 +255,7 @@
   নতুন ট্যাবে খুলুন
   পরবর্তীকালের  জন্য সংরক্ষণ করুন
   অনুলিপি তৈরি বা ভাগ করার জন্য এটি 
আলোকপাতের জন্য লেখার যেকোন জায়গায় চাপ দিয়ে ধরে রাখুন।
-  ব্রাউজারে দেখুন
+  ব্রাউজারে পাতা দেখুন
   যেকোন সময় এই বোতাম টোকা দিয়ে, বা পর্দার 
ডান প্রান্ত থেকে টেনে আনার দ্বারা টেবিলের বিষয়বস্তু দেখুন।
   সার্ভার অনুরোধটি সম্পূর্ণ করতে 
পারেনি।
   একটি অজানা ত্রুটি দেখা দিয়েছে।
diff --git a/wikipedia/res/values-br/strings.xml 
b/wikipedia/res/values-br/strings.xml
index 505d128..09f7f2b 100644
--- a/wikipedia/res/values-br/strings.xml
+++ b/wikipedia/res/values-br/strings.xml
@@ -273,4 +273,5 @@
   Digeriñ al liamm
   Digeriñ en un ivinell nevez
   Enrollañ diwezhatoc\'h
+  Gwelet ar bajenn er merdeer
 
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 5661d65..d0d7270 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -277,7 +277,7 @@
   Für später speichern
   Drücke und halte irgendwo im Text, um 
ihn hervorzuheben zum Kopieren und Teilen.
   Versuche, eine interessante Tatsache nach dem 
Hervorheben auf deinen Lieblingsnetzwerken zu teilen!
-  Im Browser ansehen
+  Seite im Browser ansehen
   Sieh dir jederzeit das Inhaltsverzeichnis 
an durch das Tippen auf diesen Button oder wische von der rechten 
Bildschirmkante.
   Der Server konnte die Anfrage nicht 
abschließen.
   Die Antwort vom Server ist nicht 
korrekt formatiert.
diff --git a/wikipedia/res/values-es/strings.xml 
b/wikipedia/res/values-es/strings.xml
index 709b110..5df5e4f 100644
--- a/wikipedia/res/values-es/strings.xml
+++ b/wikipedia/res/values-es/strings.xml
@@ -277,7 +277,7 @@
   Guardar para después
   Pulsa y mantén pulsado en cualquier 
parte del texto para resaltarlo, para poder copiar y compartir.
   Después de resaltar un hecho interesante, 
prueba compartirlo en tus redes favoritas.
-  Ver en el navegador
+  Ver página en el navegador
   Despliega la tabla de contenidos en 
cualquier momento pulsando este botón, o deslizando desde el borde derecho de 
la pantalla.
   El servidor no pudo completar la 
solicitud.
   La respuesta del servidor no se ha 
formateado correctamente.
diff --git a/wikipedia/res/values-fr/strings.xml 
b/wikipedia/res/values-fr/strings.xml
index f327c7e..6bc08d2 100644
--- a/wikipedia/res/values-fr/strings.xml
+++ b/wikipedia/res/values-fr/strings.xml
@@ -277,7 +277,7 @@
   Enregistrer pour plus tard
   Cliquez et maintenez appuyé n’importe où 
dans le texte pour le surligner afin de

[MediaWiki-commits] [Gerrit] Upgrade java-mwapi to v1.3.2 - change (apps...wikipedia)

2015-07-17 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225476

Change subject: Upgrade java-mwapi to v1.3.2
..

Upgrade java-mwapi to v1.3.2

Upgrade java-mwapi to version 1.3.2. This new version should be
functionally identical to the previous. This upgrade ensures the latest
changes to the build scripts cause no harm.

Change-Id: I7348a2908d590471f1872c8eaaed33a0e630372e
---
M wikipedia/build.gradle
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/76/225476/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index 46b1ddc..ca0e8ee 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -107,7 +107,7 @@
 }
 
 dependencies {
-compileSubprojectOrModule ':java-mwapi:json', 
'org.mediawiki.api:json:1.3.2-SNAPSHOT', 'org.json', 'json'
+compileSubprojectOrModule ':java-mwapi:json', 
'org.mediawiki.api:json:1.3.2', 'org.json', 'json'
 
 // To keep the Maven Central dependencies up-to-date
 // use http://gradleplease.appspot.com/ or http://search.maven.org/.
@@ -157,4 +157,4 @@
 } else {
 System.err.println propFile.toString() + ' not found'
 android.buildTypes.release.signingConfig = null
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/225476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7348a2908d590471f1872c8eaaed33a0e630372e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wmf4: patch to stop all threads on SIGUSR1 - change (operations...nodepool)

2015-07-17 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225475

Change subject: wmf4: patch to stop all threads on SIGUSR1
..

wmf4: patch to stop all threads on SIGUSR1

Maintained via gbp pq at https://gerrit.wikimedia.org/r/#/c/225410/

Sent upstream for review: https://review.openstack.org/#/c/203232/

Change-Id: Idc89e2d9da829f24aace98a0891775c210156a4d
---
M debian/changelog
A debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch
M debian/patches/series
3 files changed, 127 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/nodepool 
refs/changes/75/225475/1

diff --git a/debian/changelog b/debian/changelog
index c54b913..a70f4b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nodepool (0.0.1-104-gddd6003-wmf4) jessie-wikimedia; urgency=medium
+
+  * Include patch pending review
+[Stop all threads on SIGUSR1]
+https://gerrit.wikimedia.org/r/#/c/225410/
+https://review.openstack.org/#/c/203232/
+
+ -- Antoine Musso   Fri, 17 Jul 2015 22:40:37 +0200
+
 nodepool (0.0.1-104-gddd6003-wmf3) jessie-wikimedia; urgency=low
 
   * Depends on parted package
diff --git a/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch 
b/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch
new file mode 100644
index 000..8b6de8b
--- /dev/null
+++ b/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch
@@ -0,0 +1,117 @@
+From: Antoine Musso 
+Date: Fri, 17 Jul 2015 22:05:15 +0200
+Subject: Stop all threads on SIGUSR1
+
+I noticed SIGUSR1 is supposed to gracefully stop nodepool. Unfortunately
+a lot of threads are never stopped and thus never stop.
+
+[nodepoold.py]
+Ignore SIGUSR1 while it is being dealt with. I had some side effect when
+sending it twice in a row.
+
+Teach the main loop to return whenever the pool is stopped after a
+signal else nodepool never leaves when I we run it in non daemon mode
+with 'nodepoold -d'.
+
+[nodepool.py]
+
+DiskImageBuilder can now be stopped. It seems it should inherit
+TaskManager but I felt it is a different topic.
+
+When Nodepool stop, also stop:
+* Jenkins managers
+* Cloud providers
+* Gearman client
+
+Add a bunch of debug log to notice what is going on.
+
+Change-Id: Ic20f919df3fab834fb1a29df5c77a4af79e740a6
+---
+ nodepool/cmd/nodepoold.py |  3 +++
+ nodepool/nodepool.py  | 29 +
+ 2 files changed, 32 insertions(+)
+
+diff --git a/nodepool/cmd/nodepoold.py b/nodepool/cmd/nodepoold.py
+index d8ee3c4..3ee95bb 100644
+--- a/nodepool/cmd/nodepoold.py
 b/nodepool/cmd/nodepoold.py
+@@ -110,6 +110,7 @@ class NodePoolDaemon(object):
+'%(message)s')
+ 
+ def exit_handler(self, signum, frame):
++signal.signal(signal.SIGUSR1, signal.SIG_IGN)
+ self.pool.stop()
+ 
+ def term_handler(self, signum, frame):
+@@ -129,6 +130,8 @@ class NodePoolDaemon(object):
+ while True:
+ try:
+ signal.pause()
++if self.pool._stopped:
++return 0
+ except KeyboardInterrupt:
+ return self.exit_handler(signal.SIGINT, None)
+ 
+diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py
+index cec2dc8..b2745b2 100644
+--- a/nodepool/nodepool.py
 b/nodepool/nodepool.py
+@@ -732,13 +732,23 @@ class DiskImageBuilder(threading.Thread):
+ 
+ def __init__(self, nodepool):
+ threading.Thread.__init__(self, name='DiskImageBuilder queue')
++self._running = True
+ self.nodepool = nodepool
+ self.queue = nodepool._image_builder_queue
+ 
++def stop(self):
++self.log.info("Stopping...")
++self._running = False
++self.queue.put(None)
++
+ def run(self):
+ while True:
+ # grabs image id from queue
+ image_id = self.queue.get()
++if not image_id:
++if not self._running:
++break
++continue
+ try:
+ self.buildImage(image_id)
+ except Exception:
+@@ -1175,15 +1185,34 @@ class NodePool(threading.Thread):
+ self._image_builder_thread = None
+ 
+ def stop(self):
++self.log.info("Stopping Nodepool...")
+ self._stopped = True
++self.log.debug("Stopping DiskImageBuilder")
++self._image_builder_thread.stop()
++
+ if self.config:
++self.log.debug("Stopping zmq publishers")
+ for z in self.config.zmq_publishers.values():
+ z.listener.stop()
+ z.listener.join()
++self.log.debug("Stopping Jenkins managers")
++for j in self.config.jenkins_managers.values():
++j.stop()
++self.log.debug("Stopping cloud providers")
++for p in self.config.provider_managers.values():
++p.stop()
++
++if sel

[MediaWiki-commits] [Gerrit] etherpad: switch to HTTPS-only (redirect, HSTS) - change (operations/puppet)

2015-07-17 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: etherpad: switch to HTTPS-only (redirect, HSTS)
..


etherpad: switch to HTTPS-only (redirect, HSTS)

Change-Id: If1f411b733f9d85b38d76f3f4c37bd479b774c00
---
M templates/misc/etherpad.wikimedia.org.erb
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/templates/misc/etherpad.wikimedia.org.erb 
b/templates/misc/etherpad.wikimedia.org.erb
index 8a5b2f8..75946f4 100644
--- a/templates/misc/etherpad.wikimedia.org.erb
+++ b/templates/misc/etherpad.wikimedia.org.erb
@@ -14,8 +14,7 @@
 ProxyPass / http://<%= @etherpad_ip %>:<%= @etherpad_port %>/ retry=15
 ProxyPassReverse / http://<%= @etherpad_ip %>:<%= @etherpad_port %>/
 ProxyPreserveHost On
-RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule /p/*$ https://<%= @etherpad_host %>/ [NC,L]
+
 RewriteCond %{REQUEST_URI} !^/locales/
 RewriteCond %{REQUEST_URI} !^/locales.json
 RewriteCond %{REQUEST_URI} !^/admin
@@ -37,6 +36,12 @@
 RewriteCond %{HTTP_HOST} !<%= @etherpad_host %>
 RewriteRule ^/+(.+)$ https://<%= @etherpad_host %>/$1 [R=301,L]
 
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteCond %{REQUEST_URI} !^/status$
+RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} 
[R=301,E=ProtoRedirect]
+Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
+Header always set Strict-Transport-Security "max-age=604800"
+
 
 Options FollowSymLinks MultiViews
 AllowOverride All

-- 
To view, visit https://gerrit.wikimedia.org/r/224823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1f411b733f9d85b38d76f3f4c37bd479b774c00
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add devs to POM - change (apps...java-mwapi)

2015-07-17 Thread BearND (Code Review)

BearND has submitted this change and it was merged.

Change subject: Add devs to POM
..


Add devs to POM

The promotion requirements mandate devs appear in the POM file.

Change-Id: I0c1213ce27fb156934d1c38e8b986d460a38b534
---
M deploy.gradle
1 file changed, 23 insertions(+), 0 deletions(-)

Approvals:
  BearND: Verified; Looks good to me, approved



diff --git a/deploy.gradle b/deploy.gradle
index c05758b..f1c3d9b 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -20,5 +20,28 @@
 distribution 'repo'
 }
 }
+
+developers {
+developer {
+id 'bsitzmann_wmf'
+name 'Bernd Sitzmann'
+email 'be...@wikimedia.org'
+}
+developer {
+id 'dmitrybrant'
+name 'Dmitry Brant'
+email 'dbr...@wikimedia.org'
+}
+developer {
+id 'mholloway'
+name 'Michael Holloway'
+email 'mhollo...@wikimedia.org'
+}
+developer {
+id 'niedzielski'
+name 'Stephen Niedzielski'
+email 'step...@niedzielski.com'
+}
+}
 }
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/225387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c1213ce27fb156934d1c38e8b986d460a38b534
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Introduce a RestrictedEntityLookup for client DataAccess - change (mediawiki...Wikibase)

2015-07-17 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225474

Change subject: Introduce a RestrictedEntityLookup for client DataAccess
..

Introduce a RestrictedEntityLookup for client DataAccess

Which has the ability to throw an Exception in case a given
limit is reached.
That is not yet being made use of, but we already report how
many entities have been loaded in the parser limit report.

Bug: T93885
Change-Id: I6a2bb05954aba33cd4dad278e61c981425d207f0
---
M client/WikibaseClient.php
M client/i18n/en.json
M client/i18n/qqq.json
A client/includes/DataAccess/EntityAccessLimitException.php
A client/includes/DataAccess/RestrictedEntityLookup.php
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
A client/includes/Hooks/ParserLimitHookHandlers.php
M client/includes/WikibaseClient.php
A client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
A client/tests/phpunit/includes/Hooks/ParserLimitHookHandlersTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
12 files changed, 452 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/74/225474/1

diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 43e2d2b..dbfc2bf 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -114,6 +114,8 @@
$wgHooks['GetBetaFeaturePreferences'][] = 
'\Wikibase\ClientHooks::onGetBetaFeaturePreferences';
$wgHooks['ArticleDeleteComplete'][] = 
'\Wikibase\Client\Hooks\UpdateRepoHookHandlers::onArticleDeleteComplete';
$wgHooks['ArticleDeleteAfterSuccess'][] = 
'\Wikibase\ClientHooks::onArticleDeleteAfterSuccess';
+   $wgHooks['ParserLimitReportFormat'][] = 
'\Wikibase\Client\Hooks\ParserLimitHookHandlers::onParserLimitReportFormat';
+   $wgHooks['ParserLimitReportPrepare'][] = 
'\Wikibase\Client\Hooks\ParserLimitHookHandlers::onParserLimitReportPrepare';
 
// update hooks
$wgHooks['LoadExtensionSchemaUpdates'][] = 
'\Wikibase\Client\Usage\Sql\SqlUsageTrackerSchemaUpdater::onSchemaUpdate';
diff --git a/client/i18n/en.json b/client/i18n/en.json
index 4daec07..68c261b 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -50,6 +50,7 @@
"wikibase-linkitem-not-loggedin-title": "You need to be logged in",
"wikibase-linkitem-not-loggedin": "You need to be logged in on this 
wiki and in the [$1 central data repository] to use this feature.",
"wikibase-linkitem-success-link": "The pages have successfully been 
linked. You can find the item containing the links in our [$1 central data 
repository].",
+   "wikibase-limitreport-entities-accessed": "Number of Wikibase entities 
loaded",
"wikibase-property-notfound": "$1 property not found.",
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "Hide",
diff --git a/client/i18n/qqq.json b/client/i18n/qqq.json
index d590f37..558942c 100644
--- a/client/i18n/qqq.json
+++ b/client/i18n/qqq.json
@@ -61,6 +61,7 @@
"wikibase-linkitem-not-loggedin-title": "Title of the dialog telling 
the user that he needs to login on both the repo and client to use this 
feature.",
"wikibase-linkitem-not-loggedin": "This messages informs the user that 
he needs to be logged in on both this wiki and the repository to use this 
feature.\n\nParameters:\n* $1 - the URI to the login form of the repository",
"wikibase-linkitem-success-link": "Success message after the page the 
user currently is on has been linked with an item. $1 holds a URL pointing to 
the item.",
+   "wikibase-limitreport-entities-accessed": "Value shown in the Parser 
limit report telling the user how many Wikibase entities have been loaded 
during the parse of the current page.",
"wikibase-property-notfound": "Message for property parser function 
when a property is not found. Parameters:\n* $1 - the name of the property",
"wikibase-rc-hide-wikidata": "This refers to a toggle to hide or show 
edits (revisions) that come from Wikidata. If set to \"hide\", it hides edits 
made to the connected item in the Wikidata repository.\n\nParameters:\n* $1 - a 
link with the text {{msg-mw|wikibase-rc-hide-wikidata-show}} or 
{{msg-mw|wikibase-rc-hide-wikidata-hide}}\n* {{WBREPONAME}} - 
expanded to {{msg-mw|wikibase-repo-name}}",
"wikibase-rc-hide-wikidata-hide": "{{doc-actionlink}}\nOption text in 
[[Special:RecentChanges]] in conjunction with 
{{msg-mw|wikibase-rc-hide-wikidata}}.\n\nSee also:\n* 
{{msg-mw|wikibase-rc-hide-wikidata-show}}\n{{Identical|Hide}}",
diff --git a/client/includes/DataAccess/EntityAccessLimitException.php 
b/client/includes/DataAccess/EntityAccessLimitException.php
new file mode 100644
index 000..8f371e8
--- /dev/null
+++ b/client/incl

[MediaWiki-commits] [Gerrit] Do not limit number of queries displayed on user pages - change (analytics...web)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Do not limit number of queries displayed on user pages
..


Do not limit number of queries displayed on user pages

Faster than pagination atm!

Bug: T77948
Change-Id: Ie44f600d49389de3e37ec8c381da3edea77392c2
---
M quarry/web/user.py
1 file changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/quarry/web/user.py b/quarry/web/user.py
index 352c7f4..8356d5a 100644
--- a/quarry/web/user.py
+++ b/quarry/web/user.py
@@ -44,18 +44,15 @@
 draft_queries = g.conn.session.query(Query) \
 .filter(Query.user_id == user.id) \
 .filter_by(published=False) \
-.order_by(desc(Query.last_touched)) \
-.limit(10)
+.order_by(desc(Query.last_touched))
 published_queries = g.conn.session.query(Query)\
 .filter(Query.user_id == user.id)\
 .filter_by(published=True)\
-.order_by(desc(Query.last_touched))\
-.limit(10)
+.order_by(desc(Query.last_touched))
 stars = g.conn.session.query(Star).join(Star.query) \
 .options(joinedload(Star.query))\
 .filter(Star.user_id == user.id) \
-.order_by(desc(Star.timestamp))\
-.limit(10)
+.order_by(desc(Star.timestamp))
 return render_template(
 "user.html",
 display_user=user,

-- 
To view, visit https://gerrit.wikimedia.org/r/225473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie44f600d49389de3e37ec8c381da3edea77392c2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Do not limit number of queries displayed on user pages - change (analytics...web)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225473

Change subject: Do not limit number of queries displayed on user pages
..

Do not limit number of queries displayed on user pages

Faster than pagination atm!

Bug: T77948
Change-Id: Ie44f600d49389de3e37ec8c381da3edea77392c2
---
M quarry/web/user.py
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web 
refs/changes/73/225473/1

diff --git a/quarry/web/user.py b/quarry/web/user.py
index 352c7f4..8356d5a 100644
--- a/quarry/web/user.py
+++ b/quarry/web/user.py
@@ -44,18 +44,15 @@
 draft_queries = g.conn.session.query(Query) \
 .filter(Query.user_id == user.id) \
 .filter_by(published=False) \
-.order_by(desc(Query.last_touched)) \
-.limit(10)
+.order_by(desc(Query.last_touched))
 published_queries = g.conn.session.query(Query)\
 .filter(Query.user_id == user.id)\
 .filter_by(published=True)\
-.order_by(desc(Query.last_touched))\
-.limit(10)
+.order_by(desc(Query.last_touched))
 stars = g.conn.session.query(Star).join(Star.query) \
 .options(joinedload(Star.query))\
 .filter(Star.user_id == user.id) \
-.order_by(desc(Star.timestamp))\
-.limit(10)
+.order_by(desc(Star.timestamp))
 return render_template(
 "user.html",
 display_user=user,

-- 
To view, visit https://gerrit.wikimedia.org/r/225473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie44f600d49389de3e37ec8c381da3edea77392c2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make published field of query not null and default to False - change (analytics...web)

2015-07-17 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Make published field of query not null and default to False
..


Make published field of query not null and default to False

Otherwise it was NULL in some cases and 0 in some cases causing
problems with querying it

Change-Id: Ie60833f26466321b937fcbbb02f158688f4d9aa5
---
M quarry/web/models/query.py
M tables.sql
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/quarry/web/models/query.py b/quarry/web/models/query.py
index 4445fd6..a8b9325 100644
--- a/quarry/web/models/query.py
+++ b/quarry/web/models/query.py
@@ -13,7 +13,7 @@
 last_touched = Column(DateTime)
 parent_id = Column(Integer)
 latest_rev_id = Column(Integer, ForeignKey('query_revision.id'))
-published = Column(Boolean)
+published = Column(Boolean, default=False)
 description = Column(UnicodeText)
 
 # Stick with "rev" as common language.
diff --git a/tables.sql b/tables.sql
index 924d7d1..2dfadbf 100644
--- a/tables.sql
+++ b/tables.sql
@@ -23,7 +23,7 @@
 title VARCHAR(1024) BINARY,
 latest_rev_id INT UNSIGNED,
 last_touched TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE 
CURRENT_TIMESTAMP,
-published SMALLINT DEFAULT 0,
+published SMALLINT DEFAULT 0 NOT NULL,
 description TEXT BINARY,
 parent_id INT UNSIGNED
 );

-- 
To view, visit https://gerrit.wikimedia.org/r/225377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie60833f26466321b937fcbbb02f158688f4d9aa5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move user related code out into a separate blueprint - change (analytics...web)

2015-07-17 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Move user related code out into a separate blueprint
..


Move user related code out into a separate blueprint

Change-Id: I4ea0283f443a36435538df2b1a34c2c52c303635
---
M quarry/web/app.py
A quarry/web/user.py
2 files changed, 70 insertions(+), 63 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/quarry/web/app.py b/quarry/web/app.py
index d293b39..6e334d0 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -1,5 +1,4 @@
-from flask import Flask, render_template, redirect, session, g, request, 
url_for, Response
-from models.user import User, UserGroup
+from flask import Flask, render_template, redirect, g, request, url_for, 
Response
 from models.query import Query
 from models.queryrevision import QueryRevision
 from models.queryrun import QueryRun
@@ -13,13 +12,13 @@
 import output
 import os
 from sqlalchemy import desc, func
-from sqlalchemy.orm import joinedload
 from redissession import RedisSessionInterface
 from connections import Connections
 from utils.pagination import RangeBasedPagination
 import worker
 
 from login import auth
+from user import user_blueprint, get_user
 from webhelpers import templatehelpers
 
 __dir__ = os.path.dirname(__file__)
@@ -34,13 +33,13 @@
 app.config['DEBUG'] = True
 
 app.register_blueprint(auth)
+app.register_blueprint(user_blueprint)
 app.register_blueprint(templatehelpers)
 
 app.session_interface = RedisSessionInterface()
 
 
 class QueriesRangeBasedPagination(RangeBasedPagination):
-
 def get_page_link(self, page_key, limit):
 get_params = dict(request.args)
 get_params.update({
@@ -69,16 +68,6 @@
 QueryRun.id < from_qrun_id)
 
 
-def get_user():
-if 'user_id' in session:
-if not hasattr(g, '_user'):
-g._user = g.conn.session.query(User).filter(User.id == 
session['user_id']).one()
-return g._user
-else:
-user = None
-return user
-
-
 @app.before_request
 def setup_context():
 g.conn = Connections(app.config)
@@ -92,55 +81,6 @@
 @app.route("/")
 def index():
 return render_template("landing.html", user=get_user())
-
-
-@app.route("/sudo/")
-def sudo(username):
-user = get_user()
-if user is None:
-return 'Authorization required', 403
-if g.conn.session.query(UserGroup).filter(UserGroup.user_id == user.id)\
-.filter(UserGroup.group_name == 'sudo').first() is not None:
-new_user = g.conn.session.query(User).filter(User.username == 
username).first()
-session['user_id'] = new_user.id
-return redirect('/')
-else:
-return 'You do not have the sudo right', 403
-
-
-@app.route('/')
-def user_page(user_name):
-# Munge the user_name, and hope
-user_name = user_name.replace('_', ' ').lower()
-user = g.conn.session.query(User).filter(func.lower(User.username) == 
user_name).one()
-stats = {
-'query_count': 
g.conn.session.query(func.count(Query.id)).filter(Query.user_id == 
user.id).scalar(),
-'stars_count': 
g.conn.session.query(func.count(Star.id)).filter(Star.user_id == 
user.id).scalar()
-}
-draft_queries = g.conn.session.query(Query) \
-.filter(Query.user_id == user.id) \
-.filter_by(published=False) \
-.order_by(desc(Query.last_touched)) \
-.limit(10)
-published_queries = g.conn.session.query(Query)\
-.filter(Query.user_id == user.id)\
-.filter_by(published=True)\
-.order_by(desc(Query.last_touched))\
-.limit(10)
-stars = g.conn.session.query(Star).join(Star.query) \
-.options(joinedload(Star.query))\
-.filter(Star.user_id == user.id) \
-.order_by(desc(Star.timestamp))\
-.limit(10)
-return render_template(
-"user.html",
-display_user=user,
-user=get_user(),
-stats=stats,
-draft_queries=draft_queries,
-published_queries=published_queries,
-stars=stars
-)
 
 
 @app.route("/api/query/unstar", methods=["POST"])
diff --git a/quarry/web/user.py b/quarry/web/user.py
new file mode 100644
index 000..352c7f4
--- /dev/null
+++ b/quarry/web/user.py
@@ -0,0 +1,67 @@
+from flask import Blueprint, session, redirect, g, render_template
+from sqlalchemy.orm import joinedload
+from sqlalchemy import desc, func
+from models.user import User, UserGroup
+from models.star import Star
+from models.query import Query
+
+user_blueprint = Blueprint('user', __name__)
+
+
+def get_user():
+if 'user_id' in session:
+if not hasattr(g, '_user'):
+g._user = g.conn.session.query(User).filter(User.id == 
session['user_id']).one()
+return g._user
+else:
+user = None
+return user
+
+
+@user_blueprint.route("/sudo/")
+def sudo(username):
+user = get_user()
+if user is None:
+return 'Au

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8b7b20b..2db8d33 - change (mediawiki/extensions)

2015-07-17 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 8b7b20b..2db8d33
..


Syncronize VisualEditor: 8b7b20b..2db8d33

Change-Id: I59c9b518bb73acd58f8557af36f9ff9a0b29a4a3
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 8b7b20b..2db8d33 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 8b7b20b934f56ae16637d837c9052e73115ac86e
+Subproject commit 2db8d335f8e399a4eae027458e543b9d887b8a45

-- 
To view, visit https://gerrit.wikimedia.org/r/225472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59c9b518bb73acd58f8557af36f9ff9a0b29a4a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8b7b20b..2db8d33 - change (mediawiki/extensions)

2015-07-17 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225472

Change subject: Syncronize VisualEditor: 8b7b20b..2db8d33
..

Syncronize VisualEditor: 8b7b20b..2db8d33

Change-Id: I59c9b518bb73acd58f8557af36f9ff9a0b29a4a3
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/72/225472/1

diff --git a/VisualEditor b/VisualEditor
index 8b7b20b..2db8d33 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 8b7b20b934f56ae16637d837c9052e73115ac86e
+Subproject commit 2db8d335f8e399a4eae027458e543b9d887b8a45

-- 
To view, visit https://gerrit.wikimedia.org/r/225472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59c9b518bb73acd58f8557af36f9ff9a0b29a4a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 >

1 - 100 of 258 matches

Mail list logo