[MediaWiki-commits] [Gerrit] bug 61760 get the largest size ( not just the last transcode... - change (mediawiki...TimedMediaHandler)

[Mdale (Code Review)]

Mdale has uploaded a new change for review.

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

Change subject: bug 61760 get the largest size ( not just the last transcode in 
the list )
..

bug 61760 get the largest size ( not just the last transcode in the list )

Change-Id: I942a439d67fc3619571c9f11e878e9e086802cc3
---
M WebVideoTranscode/WebVideoTranscode.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index 829ff9d..8179b3d 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -319,7 +319,10 @@
$maxSize = 0;
foreach( $wgEnabledTranscodeSet as $transcodeKey ){
if( isset( 
self::$derivativeSettings[$transcodeKey]['videoBitrate'] ) ){
-   $maxSize = 
self::$derivativeSettings[$transcodeKey]['maxSize'];
+   $currentSize = 
self::$derivativeSettings[$transcodeKey]['maxSize'];
+   if( $currentSize  $maxSize ){
+   $maxSize = $currentSize;
+   }
}
}
return $maxSize;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I942a439d67fc3619571c9f11e878e9e086802cc3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Mdale md...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [OpenStackManager] Make one more key optional - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [OpenStackManager] Make one more key optional
..


[OpenStackManager] Make one more key optional

Suggeted by Liuxinyu970226
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Prefs-openstack/en

Change-Id: I414c7fdb64a5bbb1a77ef59f6549897b584ccc05
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 89d3f40..ed38da4 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1051,7 +1051,7 @@
 
 Open Stack Manager
 aliasfile = OpenStackManager/OpenStackManager.alias.php
-optional = openstackmanager-puppetdoclink
+optional = openstackmanager-puppetdoclink, prefs-openstack
 
 Oracle Text Search
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I414c7fdb64a5bbb1a77ef59f6549897b584ccc05
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [OpenStackManager] Make one more key optional - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [OpenStackManager] Make one more key optional
..

[OpenStackManager] Make one more key optional

Suggeted by Liuxinyu970226
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Prefs-openstack/en

Change-Id: I414c7fdb64a5bbb1a77ef59f6549897b584ccc05
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/19/114919/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 89d3f40..ed38da4 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1051,7 +1051,7 @@
 
 Open Stack Manager
 aliasfile = OpenStackManager/OpenStackManager.alias.php
-optional = openstackmanager-puppetdoclink
+optional = openstackmanager-puppetdoclink, prefs-openstack
 
 Oracle Text Search
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I414c7fdb64a5bbb1a77ef59f6549897b584ccc05
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] Make padding consistent for extract and timestamp - change (mediawiki...Popups)

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review.

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

Change subject: Make padding consistent for extract and timestamp
..

Make padding consistent for extract and timestamp

Change-Id: I3dc9fa9631a9ab17953195cd51eb192b0b009dca
---
M resources/ext.popups.core.less
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/resources/ext.popups.core.less b/resources/ext.popups.core.less
index 1eee112..957c09a 100644
--- a/resources/ext.popups.core.less
+++ b/resources/ext.popups.core.less
@@ -25,8 +25,8 @@
}
 
 div {
-   padding: 1.28em;
-   padding-bottom: 3.84em;
+   padding: 16px;
+   padding-bottom: 48px;
 
h3 {
margin-top: 0;
@@ -66,7 +66,7 @@
}
 
 div.mwe-popups-timestamp-older, 
div.mwe-popups-timestamp-recent{
-   padding: 1.28em;
+   padding: 16px;
margin: 0;
font-size: 0.85em;
position: absolute;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dc9fa9631a9ab17953195cd51eb192b0b009dca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 22/02/2014 10:00 - change (mediawiki...Wikidata)

[Anonymous Coward (Code Review)]

wikidata-servi...@wikimedia.de has uploaded a new change for review.

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

Change subject: New Wikidata Build - 22/02/2014 10:00
..

New Wikidata Build - 22/02/2014 10:00

Change-Id: I45a752b5947ef315dae32f2f8b281aadb2f4e781
---
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/lib/resources/wikibase.js
M 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
M extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php
M extensions/Wikibase/repo/includes/view/TermBoxView.php
M extensions/Wikibase/repo/resources/Resources.php
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js
M extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
M extensions/Wikibase/tests/browser/features/support/env.rb
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
16 files changed, 132 insertions(+), 76 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/21/114921/1

diff --git a/composer.lock b/composer.lock
index e5d146c..227ad5e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -850,12 +850,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 67527c788112d3700d0d11a9a7b9cc7c1716024b
+reference: d6fd3692c2f03bc5435390846df923638432b006
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/67527c788112d3700d0d11a9a7b9cc7c1716024b;,
-reference: 67527c788112d3700d0d11a9a7b9cc7c1716024b,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d6fd3692c2f03bc5435390846df923638432b006;,
+reference: d6fd3692c2f03bc5435390846df923638432b006,
 shasum: 
 },
 require: {
@@ -914,7 +914,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2014-02-20 21:07:52
+time: 2014-02-21 23:04:40
 }
 ],
 packages-dev: [
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index be8c318..a8b6201 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -96,7 +96,7 @@
//   between toolbars should be managed via 
the toolbar controller.
var originToolbars = null;
if ( options ) {
-   if ( typeof options.exclusive === 
'boolean'  !options.exclusive ) {
+   if ( options.exclusive === false ) {
originToolbars = findToolbars( 
$( origin ) );
} else if ( typeof options.exclusive 
=== 'string' ) {
originToolbars = $( origin 
).find( options.exclusive );
@@ -142,21 +142,32 @@
] );
} )
.on( 'referenceviewafterstartediting', function( event ) {
-   $( wb ).trigger(
-   'startItemPageEditMode',
-   [ event.target, { exclusive: false, 
wbCopyrightWarningGravity: 'sw' } ]
-   );
+   $( wb ).trigger( 'startItemPageEditMode', [
+   event.target,
+   {
+   exclusive: false,
+   wbCopyrightWarningGravity: 'sw'
+   }
+   ] );
} )
.on( 'snakviewstopediting', function( event, dropValue ) {
// snak view got already removed from the DOM on 
snakviewafterstopediting
if ( dropValue ) {
-   $( wb ).trigger( 'stopItemPageEditMode', 
[event.target] );
+   // Return true on dropValue === false as well 
as dropValue === undefined
+   $( wb ).trigger( 'stopItemPageEditMode', [
+   event.target,
+ 

[MediaWiki-commits] [Gerrit] New Wikidata Build - 22/02/2014 10:00 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 22/02/2014 10:00
..


New Wikidata Build - 22/02/2014 10:00

Change-Id: I45a752b5947ef315dae32f2f8b281aadb2f4e781
---
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/lib/resources/wikibase.js
M 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
M extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php
M extensions/Wikibase/repo/includes/view/TermBoxView.php
M extensions/Wikibase/repo/resources/Resources.php
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js
M extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
M extensions/Wikibase/tests/browser/features/support/env.rb
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
16 files changed, 132 insertions(+), 76 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index e5d146c..227ad5e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -850,12 +850,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 67527c788112d3700d0d11a9a7b9cc7c1716024b
+reference: d6fd3692c2f03bc5435390846df923638432b006
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/67527c788112d3700d0d11a9a7b9cc7c1716024b;,
-reference: 67527c788112d3700d0d11a9a7b9cc7c1716024b,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d6fd3692c2f03bc5435390846df923638432b006;,
+reference: d6fd3692c2f03bc5435390846df923638432b006,
 shasum: 
 },
 require: {
@@ -914,7 +914,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2014-02-20 21:07:52
+time: 2014-02-21 23:04:40
 }
 ],
 packages-dev: [
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index be8c318..a8b6201 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -96,7 +96,7 @@
//   between toolbars should be managed via 
the toolbar controller.
var originToolbars = null;
if ( options ) {
-   if ( typeof options.exclusive === 
'boolean'  !options.exclusive ) {
+   if ( options.exclusive === false ) {
originToolbars = findToolbars( 
$( origin ) );
} else if ( typeof options.exclusive 
=== 'string' ) {
originToolbars = $( origin 
).find( options.exclusive );
@@ -142,21 +142,32 @@
] );
} )
.on( 'referenceviewafterstartediting', function( event ) {
-   $( wb ).trigger(
-   'startItemPageEditMode',
-   [ event.target, { exclusive: false, 
wbCopyrightWarningGravity: 'sw' } ]
-   );
+   $( wb ).trigger( 'startItemPageEditMode', [
+   event.target,
+   {
+   exclusive: false,
+   wbCopyrightWarningGravity: 'sw'
+   }
+   ] );
} )
.on( 'snakviewstopediting', function( event, dropValue ) {
// snak view got already removed from the DOM on 
snakviewafterstopediting
if ( dropValue ) {
-   $( wb ).trigger( 'stopItemPageEditMode', 
[event.target] );
+   // Return true on dropValue === false as well 
as dropValue === undefined
+   $( wb ).trigger( 'stopItemPageEditMode', [
+   event.target,
+   { save: dropValue !== true }
+

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...MultimediaViewer)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

Bug: 61778
Change-Id: I5fb37946bbb15cb1b70045f85aa11ba48ecd2260
---
M tests/browser/Gemfile.lock
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/22/114922/1

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 48eface..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.2)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fb37946bbb15cb1b70045f85aa11ba48ecd2260
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add unit test for Statue __wakeup - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add unit test for Statue __wakeup
..

Add unit test for Statue __wakeup

Change-Id: I5f116bc7df5932d6f5aeed7b81680cc08e243d0f
---
M tests/phpunit/includes/StatusTest.php
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/114923/1

diff --git a/tests/phpunit/includes/StatusTest.php 
b/tests/phpunit/includes/StatusTest.php
index 2ba804f..9cafe2c 100644
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -519,4 +519,16 @@
$this-assertEquals( $error, $errors[0]['message'] );
}
 
+   /**
+* @covers Status::__wakeup
+*/
+   public function testWakeUpSanitizesCallback() {
+   $status = new Status();
+   $status-cleanCallback = function( $value ) {
+   return '-' . $value . '-';
+   };
+   $status-__wakeup();
+   $this-assertEquals( false, $status-cleanCallback );
+   }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f116bc7df5932d6f5aeed7b81680cc08e243d0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...TwnMainPage)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/tmp/

Bug: 61778
Change-Id: I5ef4812f849f8fbbd6f76fda4a80b40f9599738f
---
M tests/browser/Gemfile.lock
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 48eface..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.2)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ef4812f849f8fbbd6f76fda4a80b40f9599738f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add test to complete coverage of getStatusArray - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add test to complete coverage of getStatusArray
..

Add test to complete coverage of getStatusArray

Change-Id: Ia2f9b5a723d85d19ee7a24fcf9b132d0289705f0
---
M tests/phpunit/includes/StatusTest.php
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/25/114925/1

diff --git a/tests/phpunit/includes/StatusTest.php 
b/tests/phpunit/includes/StatusTest.php
index 9cafe2c..209b54c 100644
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -531,4 +531,29 @@
$this-assertEquals( false, $status-cleanCallback );
}
 
+   /**
+* @dataProvider provideNonObjectMessages
+* @covers Status::getStatusArray
+*/
+   public function testGetStatusArrayWithNonObjectMessages( $nonObjMsg ) {
+   $status = new Status();
+   if( !array_key_exists( 1, $nonObjMsg ) ) {
+   $status-warning( $nonObjMsg[0] );
+   } else {
+   $status-warning( $nonObjMsg[0], $nonObjMsg[1] );
+   }
+
+   $array = $status-getWarningsArray(); // We use 
getWarningsArray to access getStatusArray
+
+   $this-assertEquals( 1, count( $array ) );
+   $this-assertEquals( $nonObjMsg, $array[0] );
+   }
+
+   public static function provideNonObjectMessages() {
+   return array(
+   array( array( 'ImaString', array( 'param1' = 'value1' 
) ) ),
+   array( array( 'ImaString' ) ),
+   );
+   }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2f9b5a723d85d19ee7a24fcf9b132d0289705f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...Translate)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/tr/

Bug: 61778
Change-Id: Ice2b9e5718d1381ab7551b5b75528a8897527d90
---
M tests/browser/Gemfile.lock
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/26/114926/1

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 48eface..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.2)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice2b9e5718d1381ab7551b5b75528a8897527d90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Link http(s) messages when RichMessages is off - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has uploaded a new change for review.

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

Change subject: Link http(s) messages when RichMessages is off
..

Link http(s) messages when RichMessages is off

Change-Id: Ia12dd9a4bd4c28a75ba7f6780f34db054492a0cd
---
M MediaWikiChat.php
M MediaWikiChatClass.php
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/27/114927/1

diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index e568e63..c90a871 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
-   'version' = '2.6.4',
+   'version' = '2.6.5',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index f204828..914d161 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -207,6 +207,8 @@
$message = trim( $message );
} else {
$message = htmlentities($message);
+
+   $message = preg_replace( '#(http[s]?\:\/\/[^ \n]+)#', 
'a target=_blank href=$1$1/a', $message );
}
 
$message = str_replace( 'nbsp;', ' ', str_replace( '#160;', ' 
', $message ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia12dd9a4bd4c28a75ba7f6780f34db054492a0cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com

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

[MediaWiki-commits] [Gerrit] Handle 'error' event for connection - change (mediawiki...parsoid)

[Konarak (Code Review)]

Konarak has uploaded a new change for review.

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

Change subject: Handle 'error' event for connection
..

Handle 'error' event for connection

Bug: 57593
Change-Id: I1b8b49c2092a9ebc43d282be9f7d2f6c4ce887a9
---
M api/ParsoidService.js
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/28/114928/1

diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index a733cab..033053f 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -733,6 +733,15 @@
}
});
 
+   app.on('error', function(err) {
+   if (err.errno == EADDRINUSE) {
+   console.error(The specified address is already in use. 
Exiting.);
+   cluster.worker.disconnect();
+   } else {
+   console.error(err.message);
+   }
+   });
+
 
app.use( express.static( __dirname + '/scripts' ) );
app.use( express.limit( '15mb' ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b8b49c2092a9ebc43d282be9f7d2f6c4ce887a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Konarak konarak...@gmail.com

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

[MediaWiki-commits] [Gerrit] Link http(s) messages when RichMessages is off - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has submitted this change and it was merged.

Change subject: Link http(s) messages when RichMessages is off
..


Link http(s) messages when RichMessages is off

Change-Id: Ia12dd9a4bd4c28a75ba7f6780f34db054492a0cd
---
M MediaWikiChat.php
M MediaWikiChatClass.php
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index e568e63..c90a871 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
-   'version' = '2.6.4',
+   'version' = '2.6.5',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index f204828..914d161 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -207,6 +207,8 @@
$message = trim( $message );
} else {
$message = htmlentities($message);
+
+   $message = preg_replace( '#(http[s]?\:\/\/[^ \n]+)#', 
'a target=_blank href=$1$1/a', $message );
}
 
$message = str_replace( 'nbsp;', ' ', str_replace( '#160;', ' 
', $message ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia12dd9a4bd4c28a75ba7f6780f34db054492a0cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
Gerrit-Reviewer: UltrasonicNXT adamr_car...@btinternet.com

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

[MediaWiki-commits] [Gerrit] Fix the thrown exception so the Styled* views can be properl... - change (apps...wikipedia)

[Nicole (Code Review)]

Nicole has uploaded a new change for review.

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

Change subject: Fix the thrown exception so the Styled* views can be properly 
previewed in Intellij
..

Fix the thrown exception so the Styled* views can be properly previewed in 
Intellij

Change-Id: Ia0efc0e9b63ea9332c66efb2c5c1a7d664881218
---
M wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
M wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
M wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
M wikipedia/src/main/java/org/wikipedia/styledviews/StylizedEditText.java
4 files changed, 36 insertions(+), 12 deletions(-)


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

diff --git 
a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java 
b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
index a30afa8..adb245a 100644
--- a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
+++ b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
@@ -8,16 +8,22 @@
 public class StyledCheckBox extends CheckBox {
 public StyledCheckBox(Context context) {
 super(context);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledCheckBox(Context context, AttributeSet attrs) {
 super(context, attrs);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledCheckBox(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java 
b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
index f9583d8..8d110da 100644
--- a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
+++ b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
@@ -8,16 +8,22 @@
 public class StyledTextView extends TextView {
 public StyledTextView(Context context) {
 super(context);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledTextView(Context context, AttributeSet attrs) {
 super(context, attrs);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledTextView(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java 
b/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
index 037fd0a..fc399ac 100644
--- a/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
+++ b/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
@@ -8,16 +8,22 @@
 public class StylizedButton extends Button {
 public StylizedButton(Context context) {
 super(context);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StylizedButton(Context context, AttributeSet attrs) {
 super(context, attrs);
-setTypeface(((WikipediaApp) 
context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StylizedButton(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
-setTypeface(((WikipediaApp) 
context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+

[MediaWiki-commits] [Gerrit] Add getMessage tests with Short and Long Contexts - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add getMessage tests with Short and Long Contexts
..

Add getMessage tests with Short and Long Contexts

Change-Id: Ib5a1a225b7244490fe9d3a5631d3757614174453
---
M tests/phpunit/includes/StatusTest.php
1 file changed, 54 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/114930/1

diff --git a/tests/phpunit/includes/StatusTest.php 
b/tests/phpunit/includes/StatusTest.php
index 209b54c..294508e 100644
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -371,11 +371,20 @@
/**
 * @dataProvider provideGetMessage
 * @covers Status::getMessage
-* @todo test long and short context messages generated through this 
method
+* @todo test with multiple messages at once
 */
-   public function testGetMessage( Status $status, $expectedParams = 
array(), $expectedKey ) {
-   $message = $status-getMessage();
+   public function testGetMessage( Status $status, $expectedParams = 
array(), $expectedKey, $shortContext = false, $longContext = false ) {
+   $message = $status-getMessage( $shortContext, $longContext );
$this-assertInstanceOf( 'Message', $message );
+
+   // Loop through until we get to the appropriate depth for the 
message
+   $loops = $shortContext ? 1 : ( $longContext ? 2 : 0 );
+   for( $i = 1; $i = $loops; $i++ ) {
+   $params = $message-getParams();
+   $this-assertInstanceOf( 'Message', $params[0] );
+   $message = $params[0];
+   }
+
$this-assertEquals( $expectedParams, $message-getParams() );
$this-assertEquals( $expectedKey, $message-getKey() );
}
@@ -400,6 +409,21 @@
$status,
array( Status::getMessage: Invalid result object: no 
error text but not OK\n ),
'internalerror_info'
+   );
+
+   $testCases[ 'GoodButNoErrorShortContext' ] = array(
+   $status,
+   array( Status::getMessage: Invalid result object: no 
error text but not OK\n ),
+   'internalerror_info',
+   true
+   );
+
+   $testCases[ 'GoodButNoErrorLongContext' ] = array(
+   $status,
+   array( Status::getMessage: Invalid result object: no 
error text but not OK\n ),
+   'internalerror_info',
+   false,
+   true
);
 
$status = new Status();
@@ -438,6 +462,33 @@
 // ,
 // );
 
+   $status = new Status();
+   $status-error( new Message( 'fooBar!', array( 'foo', 'bar' )  
) );
+   $testCases[ '1MessageError' ] = array(
+   $status,
+   array( 'foo', 'bar' ),
+   fooBar!,
+   );
+
+   $status = new Status();
+   $status-error( new Message( 'fooBar!', array( 'foo', 'bar' )  
) );
+   $testCases[ '1MessageErrorShortContext' ] = array(
+   $status,
+   array( 'foo', 'bar' ),
+   fooBar!,
+   true,
+   );
+
+   $status = new Status();
+   $status-error( new Message( 'fooBar!', array( 'foo', 'bar' )  
) );
+   $testCases[ '1MessageErrorLongContext' ] = array(
+   $status,
+   array( 'foo', 'bar' ),
+   fooBar!,
+   false,
+   true,
+   );
+
return $testCases;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5a1a225b7244490fe9d3a5631d3757614174453
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...UniversalLanguageSelector)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/tr/

Bug: 61778
Change-Id: Idc36a03291497fefa8aa4464004f423c7a07c90e
---
M tests/browser/Gemfile.lock
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/31/114931/1

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 2d53996..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.3)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -34,7 +34,7 @@
 mime-types (2.1)
 multi_json (1.8.4)
 multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
 page-object (0.9.6)
   page_navigation (= 0.9)
   selenium-webdriver (= 2.39.0)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc36a03291497fefa8aa4464004f423c7a07c90e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...TwnMainPage)

[jenkins-bot (Code Review)]

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..


Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/tmp/

Bug: 61778
Change-Id: I5ef4812f849f8fbbd6f76fda4a80b40f9599738f
---
M tests/browser/Gemfile.lock
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 48eface..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.2)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ef4812f849f8fbbd6f76fda4a80b40f9599738f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...ZeroRatedMobileAccess)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/zero/

Bug: 61778
Change-Id: Ia7c4b50add2877b849dd54918c28096d6346acc4
---
M tests/browser/Gemfile.lock
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess 
refs/changes/32/114932/1

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 63523e8..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.2)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.4)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7c4b50add2877b849dd54918c28096d6346acc4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
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 JS hash to URL to allow consistent hashing via Varnish, ... - change (mediawiki...Minifier)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Add JS hash to URL to allow consistent hashing via Varnish, 
support multiple hosts
..

Add JS hash to URL to allow consistent hashing via Varnish, support multiple 
hosts

Change-Id: If5b9af0ab9bb1b76f12cf8ede6d7efcdb49c03a3
---
M Minifier.body.php
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Minifier 
refs/changes/33/114933/1

diff --git a/Minifier.body.php b/Minifier.body.php
index ec4a2f1..893e925 100644
--- a/Minifier.body.php
+++ b/Minifier.body.php
@@ -11,7 +11,8 @@
 
public function filter( $js ) {
wfProfileIn( __METHOD__ );
-   $req = $this-getRequest();
+   $md5 = md5( $js );
+   $req = $this-getRequest( ?id=$md5 );
$req-setData( array(
'code' = 'minify',
'text' = $js,
@@ -28,12 +29,13 @@
}
 
/**
+* @param string $params
 * @return MWHttpRequest
 */
-   private function getRequest() {
+   private function getRequest( $params = '' ) {
global $wgMinifierHosts;
 
-   // @todo:
-   return MWHttpRequest::factory( http://{$wgMinifierHosts[0]}/;, 
$this-options );
+   $host = ArrayUtils::pickRandom( $wgMinifierHosts );
+   return MWHttpRequest::factory( http://$host/$params;, 
$this-options );
}
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5b9af0ab9bb1b76f12cf8ede6d7efcdb49c03a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...UploadWizard)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/uw/

Bug: 61778
Change-Id: Iedfa713fc04ea67017264fb56e6e46908b065485
---
M tests/browser/Gemfile.lock
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/34/114934/1

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 1ddc40b..20e2d29 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 chunky_png (1.3.0)
 cucumber (1.3.10)
@@ -23,7 +23,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.2)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -47,13 +47,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedfa713fc04ea67017264fb56e6e46908b065485
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] BROWSER_LABEL environment variable is renamed to BROWSER - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: BROWSER_LABEL environment variable is renamed to BROWSER
..

BROWSER_LABEL environment variable is renamed to BROWSER

Bug: 61067
Change-Id: I58500c5ca678412706a7596ddfb73d7e0bf38358
---
M tests/browser/features/step_definitions/page_edit_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/35/114935/1

diff --git a/tests/browser/features/step_definitions/page_edit_steps.rb 
b/tests/browser/features/step_definitions/page_edit_steps.rb
index 47484e4..8bbabb5 100644
--- a/tests/browser/features/step_definitions/page_edit_steps.rb
+++ b/tests/browser/features/step_definitions/page_edit_steps.rb
@@ -20,7 +20,7 @@
 end
 
 Then(/^Edit controls should be there$/) do
-  if ENV[BROWSER_LABEL] == internet_explorer_6 or ENV[BROWSER_LABEL] == 
phantomjs
+  if ENV[BROWSER] == internet_explorer_6 or ENV[BROWSER] == phantomjs
 edit_page = EditPageIE6
   else
 edit_page = EditPage

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58500c5ca678412706a7596ddfb73d7e0bf38358
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Improve error handling in PHP part - change (mediawiki...Minifier)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Improve error handling in PHP part
..

Improve error handling in PHP part

Change-Id: Iea5978e3a76194de63148386c0281af29477fb6d
---
M Minifier.body.php
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Minifier 
refs/changes/36/114936/1

diff --git a/Minifier.body.php b/Minifier.body.php
index ec4a2f1..81c552d 100644
--- a/Minifier.body.php
+++ b/Minifier.body.php
@@ -17,14 +17,21 @@
'text' = $js,
) );
$status = $req-execute();
+   $err = '';
if ( !$status-isGood() ) {
-   throw new MWException( Error requesting minification: 
{$status-getMessage()} );
+   $err = Error requesting minification: 
{$status-getMessage()};
}
-   if ( $req-getStatus() != 200 ) {
-   throw new MWException( 'Shit hit fan' );
+   $statusCode = $req-getStatus();
+   $returnedText = $req-getContent();
+   if ( $statusCode != 200 ) {
+   $err = Request to minifier ended with code 
$statusCode: $returnedText;
}
wfProfileOut( __METHOD__ );
-   return $req-getContent();
+   if ( $err ) {
+   wfDebugLog( 'minifier', $err );
+   throw new MWException( $err );
+   }
+   return $returnedText;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea5978e3a76194de63148386c0281af29477fb6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..


Cloudbees Jenkins jobs are now created using Jenkins Job Builder

All Jenkins jobs will fail until this commit is merged:

https://wmf.ci.cloudbees.com/view/uls/

Bug: 61778
Change-Id: Idc36a03291497fefa8aa4464004f423c7a07c90e
---
M tests/browser/Gemfile.lock
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 2d53996..48f5741 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -2,7 +2,7 @@
   remote: https://rubygems.org/
   specs:
 builder (3.2.2)
-childprocess (0.4.0)
+childprocess (0.5.1)
   ffi (~ 1.0, = 1.0.11)
 cucumber (1.3.10)
   builder (= 2.1.2)
@@ -22,7 +22,7 @@
 headless (1.0.1)
 i18n (0.6.9)
 json (1.8.1)
-mediawiki_selenium (0.2.3)
+mediawiki_selenium (0.2.7)
   cucumber (~ 1.3, = 1.3.10)
   headless (~ 1.0, = 1.0.1)
   json (~ 1.8, = 1.8.1)
@@ -34,7 +34,7 @@
 mime-types (2.1)
 multi_json (1.8.4)
 multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
 page-object (0.9.6)
   page_navigation (= 0.9)
   selenium-webdriver (= 2.39.0)
@@ -46,13 +46,13 @@
 rspec-expectations (2.14.5)
   diff-lcs (= 1.1.3,  2.0)
 rubyzip (1.1.0)
-selenium-webdriver (2.39.0)
-  childprocess (= 0.2.5)
+selenium-webdriver (2.40.0)
+  childprocess (= 0.5.0)
   multi_json (~ 1.0)
   rubyzip (~ 1.0)
   websocket (~ 1.0.4)
 syntax (1.2.0)
-watir-webdriver (0.6.7)
+watir-webdriver (0.6.8)
   selenium-webdriver (= 2.18.0)
 websocket (1.0.7)
 yml_reader (0.2)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc36a03291497fefa8aa4464004f423c7a07c90e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert Added the $wgPFEnableStringFunctions = true in Parse... - change (mediawiki...ParserFunctions)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Revert Added the $wgPFEnableStringFunctions = true in 
ParserFunctions tests
..

Revert Added the $wgPFEnableStringFunctions = true in ParserFunctions tests

Uses variable not set in core or this extension resulting in udefined variable 
warnings.

This reverts commit 187ae0cd02fae5936b5b8eef02b860b156e3c015.

Change-Id: Ib4114ffbbe3960510a7aa1acd006213b63c8ff0e
---
M ParserFunctions.php
1 file changed, 0 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserFunctions 
refs/changes/37/114937/1

diff --git a/ParserFunctions.php b/ParserFunctions.php
index d7f9c6c..53153b6 100644
--- a/ParserFunctions.php
+++ b/ParserFunctions.php
@@ -29,16 +29,6 @@
  */
 $wgPFEnableStringFunctions = false;
 
-/**
-  * Enable string functions, when running Wikimedia Jenkins unit tests.
-  *
-  * Running Jenkins unit tests without setting $wgPFEnableStringFunctions = 
true;
-  * will cause all the parser tests for string functions to be skipped.
-  */
-if ( $wgWikimediaJenkinsCI === true ) {
-   $wgPFEnableStringFunctions = true ;
-}
-
 /** REGISTRATION */
 $wgExtensionCredits['parserhook'][] = array(
'path' = __FILE__,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4114ffbbe3960510a7aa1acd006213b63c8ff0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] new mw version 1.23wmf14 - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: new mw version 1.23wmf14
..

new mw version 1.23wmf14

Change-Id: If193524dec5c350e3c37e76849b7f27724ab7a99
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/38/114938/1

diff --git a/pywikibot/family.py b/pywikibot/family.py
index a426b46..da92ada 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1065,7 +1065,7 @@
 Return Wikimedia projects version number as a string.
 # Don't use this, use versionnumber() instead. This only exists
 # to not break family files.
-return '1.23wmf13'
+return '1.23wmf14'
 
 def shared_image_repository(self, code):
 return ('commons', 'commons')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If193524dec5c350e3c37e76849b7f27724ab7a99
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] new mw version 1.23wmf14 - change (pywikibot/compat)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: new mw version 1.23wmf14
..

new mw version 1.23wmf14

Change-Id: I9f8e24625eec2244cf0c805def9bde9ecc89ce92
---
M family.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/39/114939/1

diff --git a/family.py b/family.py
index 739e63a..dec7ae7 100644
--- a/family.py
+++ b/family.py
@@ -4944,7 +4944,7 @@
 Return Wikimedia projects version number as a string.
 # Don't use this, use versionnumber() instead. This only exists
 # to not break family files.
-return '1.23wmf13'
+return '1.23wmf14'
 
 def shared_image_repository(self, code):
 return ('commons', 'commons')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f8e24625eec2244cf0c805def9bde9ecc89ce92
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] update namespace aliases - change (pywikibot/compat)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: update namespace aliases
..

update namespace aliases

Change-Id: If56f1a48a3e35f96dca910d02214ba6bfed3d552
---
M families/wikipedia_family.py
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/40/114940/1

diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index bcc8eee..a1759be 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -89,7 +89,7 @@
 'als': u'Wikipedia',
 'am': u'ውክፔዲያ',
 'an': u'Wikipedia',
-'ang': [u'Wikipǣdia', u'Wikipaedia', u'Wikipedia'],
+'ang': [u'Wikipǣdia', u'Wicipaedia', u'Wicipædia', u'Wicipǣdia', 
u'Wikipaedia', u'Wikipedia', u'Wikipædia', u'Ƿicipaedia', u'Ƿicipædia', 
u'Ƿicipǣdia', u'Ƿikipaedia', u'Ƿikipædia', u'Ƿikipǣdia'],
 'ar': [u'ويكيبيديا', u'وب'],
 'arc': [u'ܘܝܩܝܦܕܝܐ', u'Wikipedia'],
 'arz': u'ويكيبيديا',
@@ -369,7 +369,7 @@
 'als': u'Wikipedia Diskussion',
 'am': u'ውክፔዲያ ውይይት',
 'an': u'Descusión Wikipedia',
-'ang': [u'Wikipǣdiamōtung', u'Wikipaediamotung', 
u'Wikipædiamotung'],
+'ang': [u'Wikipǣdiamōtung', u'Wicipaediamotung', 
u'Wicipædiamotung', u'Wicipǣdiamōtung', u'Wikipaediamotung', u'Wikipedia talk', 
u'Wikipædiamotung', u'Ƿicipaediamotung', u'Ƿicipædiamotung', 
u'Ƿicipǣdiamōtung', u'Ƿikipaediamotung', u'Ƿikipædiamotung', 
u'Ƿikipǣdiamōtung'],
 'ar': [u'نقاش ويكيبيديا', u'نو'],
 'arc': u'ܡܡܠܠܐ ܕܘܝܩܝܦܕܝܐ',
 'arz': u'نقاش ويكيبيديا',
@@ -1036,6 +1036,7 @@
 'fa': u'برنامه آموزشی',
 'he': u'הוראה',
 'mk': u'Образовен програм',
+'nl': u'Onderwijsprogramma',
 'pt': u'Ensino',
 'sv': u'Education Program',
 }
@@ -1049,6 +1050,7 @@
 'fa': u'بحث برنامه آموزشی',
 'he': u'שיחת הוראה',
 'mk': u'Разговор за Образовен програм',
+'nl': u'Overleg onderwijsprogramma',
 'pt': u'Ensino Discussão',
 'sv': u'Education Program talk',
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If56f1a48a3e35f96dca910d02214ba6bfed3d552
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] new mw version 1.23wmf14 - change (pywikibot/compat)

[jenkins-bot (Code Review)]

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

Change subject: new mw version 1.23wmf14
..


new mw version 1.23wmf14

Change-Id: I9f8e24625eec2244cf0c805def9bde9ecc89ce92
---
M family.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/family.py b/family.py
index 739e63a..dec7ae7 100644
--- a/family.py
+++ b/family.py
@@ -4944,7 +4944,7 @@
 Return Wikimedia projects version number as a string.
 # Don't use this, use versionnumber() instead. This only exists
 # to not break family files.
-return '1.23wmf13'
+return '1.23wmf14'
 
 def shared_image_repository(self, code):
 return ('commons', 'commons')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f8e24625eec2244cf0c805def9bde9ecc89ce92
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
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 namespace aliases - change (pywikibot/compat)

[Xqt (Code Review)]

Xqt has submitted this change and it was merged.

Change subject: update namespace aliases
..


update namespace aliases

Change-Id: If56f1a48a3e35f96dca910d02214ba6bfed3d552
---
M families/wikipedia_family.py
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Xqt: Looks good to me, approved



diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index bcc8eee..a1759be 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -89,7 +89,7 @@
 'als': u'Wikipedia',
 'am': u'ውክፔዲያ',
 'an': u'Wikipedia',
-'ang': [u'Wikipǣdia', u'Wikipaedia', u'Wikipedia'],
+'ang': [u'Wikipǣdia', u'Wicipaedia', u'Wicipædia', u'Wicipǣdia', 
u'Wikipaedia', u'Wikipedia', u'Wikipædia', u'Ƿicipaedia', u'Ƿicipædia', 
u'Ƿicipǣdia', u'Ƿikipaedia', u'Ƿikipædia', u'Ƿikipǣdia'],
 'ar': [u'ويكيبيديا', u'وب'],
 'arc': [u'ܘܝܩܝܦܕܝܐ', u'Wikipedia'],
 'arz': u'ويكيبيديا',
@@ -369,7 +369,7 @@
 'als': u'Wikipedia Diskussion',
 'am': u'ውክፔዲያ ውይይት',
 'an': u'Descusión Wikipedia',
-'ang': [u'Wikipǣdiamōtung', u'Wikipaediamotung', 
u'Wikipædiamotung'],
+'ang': [u'Wikipǣdiamōtung', u'Wicipaediamotung', 
u'Wicipædiamotung', u'Wicipǣdiamōtung', u'Wikipaediamotung', u'Wikipedia talk', 
u'Wikipædiamotung', u'Ƿicipaediamotung', u'Ƿicipædiamotung', 
u'Ƿicipǣdiamōtung', u'Ƿikipaediamotung', u'Ƿikipædiamotung', 
u'Ƿikipǣdiamōtung'],
 'ar': [u'نقاش ويكيبيديا', u'نو'],
 'arc': u'ܡܡܠܠܐ ܕܘܝܩܝܦܕܝܐ',
 'arz': u'نقاش ويكيبيديا',
@@ -1036,6 +1036,7 @@
 'fa': u'برنامه آموزشی',
 'he': u'הוראה',
 'mk': u'Образовен програм',
+'nl': u'Onderwijsprogramma',
 'pt': u'Ensino',
 'sv': u'Education Program',
 }
@@ -1049,6 +1050,7 @@
 'fa': u'بحث برنامه آموزشی',
 'he': u'שיחת הוראה',
 'mk': u'Разговор за Образовен програм',
+'nl': u'Overleg onderwijsprogramma',
 'pt': u'Ensino Discussão',
 'sv': u'Education Program talk',
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If56f1a48a3e35f96dca910d02214ba6bfed3d552
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
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 mw version 1.23wmf14 - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: new mw version 1.23wmf14
..


new mw version 1.23wmf14

Change-Id: If193524dec5c350e3c37e76849b7f27724ab7a99
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pywikibot/family.py b/pywikibot/family.py
index a426b46..da92ada 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1065,7 +1065,7 @@
 Return Wikimedia projects version number as a string.
 # Don't use this, use versionnumber() instead. This only exists
 # to not break family files.
-return '1.23wmf13'
+return '1.23wmf14'
 
 def shared_image_repository(self, code):
 return ('commons', 'commons')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If193524dec5c350e3c37e76849b7f27724ab7a99
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.de
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 a couple more compute nodes to eqiad labs. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Add a couple more compute nodes to eqiad labs.
..

Add a couple more compute nodes to eqiad labs.

Change-Id: I8e9ca18faf947d58690471bd2c706f11d3387092
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/114941/1

diff --git a/manifests/site.pp b/manifests/site.pp
index e1bdf678..02354dd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2883,7 +2883,7 @@
 }
 }
 
-node /virt100[1-2].eqiad.wmnet/ {
+node /virt100[1-4].eqiad.wmnet/ {
 $cluster = 'virt'
 $openstack_version = 'havana'
 $use_neutron = false
@@ -2895,7 +2895,7 @@
 }
 }
 
-node /virt100[3-9].eqiad.wmnet/ {
+node /virt100[5-9].eqiad.wmnet/ {
 $cluster = 'virt'
 include admins::labs
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e9ca18faf947d58690471bd2c706f11d3387092
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Create Parser::stripInline to avoid code duplication - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Create Parser::stripInline to avoid code duplication
..

Create Parser::stripInline to avoid code duplication

We've had the logic for p/ stripping in three separate places.

https://www.mail-archive.com/mediawiki-api@lists.wikimedia.org/msg03188.html

Change-Id: I6bb3597898324556df912a23a7ffc9ff250b8f58
---
M includes/GlobalFunctions.php
M includes/Message.php
M includes/OutputPage.php
M includes/parser/Parser.php
4 files changed, 19 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/114942/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6785d0c..6de346a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1707,10 +1707,7 @@
}
 
if ( $parseInline ) {
-   $m = array();
-   if ( preg_match( '/^p(.*)\n?\/p\n?$/sU', $string, 
$m ) ) {
-   $string = $m[1];
-   }
+   $string = Parser::stripInline( $string );
}
} elseif ( in_array( 'parsemag', $options, true ) ) {
$string = $messageCache-transform( $string,
diff --git a/includes/Message.php b/includes/Message.php
index dd22844..02841f0 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -582,10 +582,7 @@
# Maybe transform using the full parser
if ( $this-format === 'parse' ) {
$string = $this-parseText( $string );
-   $m = array();
-   if ( preg_match( '/^p(.*)\n?\/p\n?$/sU', $string, 
$m ) ) {
-   $string = $m[1];
-   }
+   $string = Parser::stripInline( $string );
} elseif ( $this-format === 'block-parse' ) {
$string = $this-parseText( $string );
} elseif ( $this-format === 'text' ) {
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index efcd838..2ed57ba 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1683,13 +1683,7 @@
 */
public function parseInline( $text, $linestart = true, $interface = 
false ) {
$parsed = $this-parse( $text, $linestart, $interface );
-
-   $m = array();
-   if ( preg_match( '/^p(.*)\n?\/p\n?/sU', $parsed, $m ) ) {
-   $parsed = $m[1];
-   }
-
-   return $parsed;
+   return Parser::stripInline( $parsed );
}
 
/**
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 340f462..6460ab7 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -6122,4 +6122,20 @@
}
return $parsedWidthParam;
}
+
+   /**
+* Strip outer p/p tag from a parsed single paragraph HTML.
+* Returns original HTML if there's no wrapping p tag.
+*
+* @param string $html
+* @return string
+*/
+   public static function stripInline( $html ) {
+   $m = array();
+   if ( preg_match( '/^p(.*)\n?\/p\n?/sU', $html, $m ) ) {
+   $html = $m[1];
+   }
+
+   return $html;
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bb3597898324556df912a23a7ffc9ff250b8f58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] Add a couple more compute nodes to eqiad labs. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Add a couple more compute nodes to eqiad labs.
..


Add a couple more compute nodes to eqiad labs.

Change-Id: I8e9ca18faf947d58690471bd2c706f11d3387092
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index e1bdf678..02354dd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2883,7 +2883,7 @@
 }
 }
 
-node /virt100[1-2].eqiad.wmnet/ {
+node /virt100[1-4].eqiad.wmnet/ {
 $cluster = 'virt'
 $openstack_version = 'havana'
 $use_neutron = false
@@ -2895,7 +2895,7 @@
 }
 }
 
-node /virt100[3-9].eqiad.wmnet/ {
+node /virt100[5-9].eqiad.wmnet/ {
 $cluster = 'virt'
 include admins::labs
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e9ca18faf947d58690471bd2c706f11d3387092
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Don't show edit summary preview if it's blank - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Don't show edit summary preview if it's blank
..


Don't show edit summary preview if it's blank

Bug: 61716
Change-Id: I6cd7ee0ad947dcac24a50b6df61316fde74edb43
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index f8c3e47..03cb1dc 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -154,13 +154,20 @@
}
this.lastEditSummaryWikitext = 
currentEditSummaryWikitext;
this.$reviewEditSummary.empty()
-   .parent().addClass( 'mw-ajax-loader' );
+   .parent().show().addClass( 
'mw-ajax-loader' );
this.editSummaryXhr = new mw.Api().post( {
action: 'parse',
summary: currentEditSummaryWikitext
} ).done( function ( result ) {
-   dialog.$reviewEditSummary.html( ve.msg( 
'parentheses', result.parse.parsedsummary['*'] ) )
-   .parent().removeClass( 
'mw-ajax-loader' );
+   if ( result.parse.parsedsummary['*'] 
=== '' ) {
+   
dialog.$reviewEditSummary.parent().hide();
+   } else {
+   dialog.$reviewEditSummary.html( 
ve.msg( 'parentheses', result.parse.parsedsummary['*'] ) );
+   }
+   } ).fail( function () {
+   
dialog.$reviewEditSummary.parent().hide();
+   } ).always( function () {
+   
dialog.$reviewEditSummary.parent().removeClass( 'mw-ajax-loader' );
} );
}
/* falls through */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cd7ee0ad947dcac24a50b6df61316fde74edb43
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
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: 11125da..0d3e4ea - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 11125da..0d3e4ea
..


Syncronize VisualEditor: 11125da..0d3e4ea

Change-Id: Ib01dc9a7773b365bb9843a95e8b643244a21b182
---
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 11125da..0d3e4ea 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 11125dacfe9cb87eac52a8d0d759174a60cdb9d2
+Subproject commit 0d3e4ea355ba3ed7d453b32b8a182b01cd868c1a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01dc9a7773b365bb9843a95e8b643244a21b182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 11125da..0d3e4ea - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 11125da..0d3e4ea
..

Syncronize VisualEditor: 11125da..0d3e4ea

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/43/114943/1

diff --git a/VisualEditor b/VisualEditor
index 11125da..0d3e4ea 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 11125dacfe9cb87eac52a8d0d759174a60cdb9d2
+Subproject commit 0d3e4ea355ba3ed7d453b32b8a182b01cd868c1a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib01dc9a7773b365bb9843a95e8b643244a21b182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Prevent Special:Diff from processing empty string - change (mediawiki/core)

[Nullzero (Code Review)]

Nullzero has uploaded a new change for review.

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

Change subject: Prevent Special:Diff from processing empty string
..

Prevent Special:Diff from processing empty string

Umherirrender found that I77fdaf8e has a flaw. Currently it is possible
to go to index.php?title=Special:Diff (without any trailing string),
and the page will be redirected to index.php?diff= which is the last diff
of the main page. However, the intended way to deal with this case is to
raise ErrorPageError. This patch fixes the problem.

Change-Id: I3ff0b11671f27e77d9068930338ec8bbb674a89f
---
M includes/specials/SpecialDiff.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/114944/1

diff --git a/includes/specials/SpecialDiff.php 
b/includes/specials/SpecialDiff.php
index bc0d7e3..77d2317 100644
--- a/includes/specials/SpecialDiff.php
+++ b/includes/specials/SpecialDiff.php
@@ -46,7 +46,7 @@
$parts = explode( '/', $subpage );
 
// Try to parse the values given, generating somewhat pretty 
URLs if possible
-   if ( count( $parts ) === 1 ) {
+   if ( count( $parts ) === 1  $parts[0] !== '' ) {
$this-mAddedRedirectParams['diff'] = $parts[0];
} elseif ( count( $parts ) === 2 ) {
$this-mAddedRedirectParams['oldid'] = $parts[0];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ff0b11671f27e77d9068930338ec8bbb674a89f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nullzero nullzero.f...@gmail.com

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

[MediaWiki-commits] [Gerrit] enable autopatrolled group on itwikiquote per community requ... - change (operations/mediawiki-config)

[Ricordisamoa (Code Review)]

Ricordisamoa has uploaded a new change for review.

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

Change subject: enable autopatrolled group on itwikiquote per community 
request: https://it.wikiquote.org/w/index.php?oldid=623905#Votazione (just as 
it is on itwiki)
..

enable autopatrolled group on itwikiquote
per community request:
https://it.wikiquote.org/w/index.php?oldid=623905#Votazione
(just as it is on itwiki)

Change-Id: I62b32888b1b5c7d4ad58a62488513ef384e2640e
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cc877f0..0120528 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7009,6 +7009,7 @@
'itwikinews' = array( 'autoconfirmed' = array( 'patrol' = true ) ),
'itwikiquote' = array(
'autoconfirmed' = array( 'patrol' = true ),
+   'autopatrolled' = array( 'autopatrol' = true ),
'sysop' = array( 'autopatrol' = true ),
),
'itwikivoyage' = array(
@@ -7918,6 +7919,9 @@
'+itwikibooks' = array(
'sysop' = array( 'autopatrolled', 'patroller' ),
),
+   '+itwikiquote' = array(
+   'sysop' = array( 'autopatrolled' ),
+   ),
'+itwikivoyage' = array(
'sysop' = array( 'autopatrolled', 'patroller' ),  // 
Bug 43327 and 45638
),
@@ -8404,6 +8408,9 @@
'+itwikibooks' = array(
'sysop' = array( 'autopatrolled', 'patroller', 'flooder' ), // 
Flooder added per bug 39569
),
+   '+itwikiquote' = array(
+   'bureaucrat' = array( 'autopatrolled' ),
+   ),
'+itwikisource' = array(
'bureaucrat' = array( 'flood' ), // Bug 36600
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62b32888b1b5c7d4ad58a62488513ef384e2640e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@live.it

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

[MediaWiki-commits] [Gerrit] Prevent Special:Diff from processing empty string - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Prevent Special:Diff from processing empty string
..


Prevent Special:Diff from processing empty string

Umherirrender found that I77fdaf8e has a flaw. Currently it is possible
to go to index.php?title=Special:Diff (without any trailing string),
and the page will be redirected to index.php?diff= which is the last diff
of the main page. However, the intended way to deal with this case is to
raise ErrorPageError. This patch fixes the problem.

Change-Id: I3ff0b11671f27e77d9068930338ec8bbb674a89f
---
M includes/specials/SpecialDiff.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialDiff.php 
b/includes/specials/SpecialDiff.php
index bc0d7e3..77d2317 100644
--- a/includes/specials/SpecialDiff.php
+++ b/includes/specials/SpecialDiff.php
@@ -46,7 +46,7 @@
$parts = explode( '/', $subpage );
 
// Try to parse the values given, generating somewhat pretty 
URLs if possible
-   if ( count( $parts ) === 1 ) {
+   if ( count( $parts ) === 1  $parts[0] !== '' ) {
$this-mAddedRedirectParams['diff'] = $parts[0];
} elseif ( count( $parts ) === 2 ) {
$this-mAddedRedirectParams['oldid'] = $parts[0];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ff0b11671f27e77d9068930338ec8bbb674a89f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nullzero nullzero.f...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jérémie Roquet jroq...@arkanosis.net
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] CSSJanus: Account for attribute selectors in brace lookahead - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: CSSJanus: Account for attribute selectors in brace lookahead
..


CSSJanus: Account for attribute selectors in brace lookahead

Recognize selectors of the forms [attr=val], [attr*=val], [attr~=val]
and [attr^=val], optionally with single-quoted values.

Because these selectors previously weren't recognized, trying to
apply /* @noflip */ to one of them would be recognized as a
single-property noflip rather than a rule-wide noflip, and so only
the first property in the rule would be noflipped.

The (simplified) input that triggered this bug was:

/* @noflip */ figure[typeof*='mw:Image'].mw-halign-left { clear: left; float: 
left; }

which became { clear: left; float: right; } when run through CSSJanus.

See also I4cddce80397d8 which is a workaround for this issue

Bug: 50910
Change-Id: If424a1df26bb7a5a18cee4b0318b029392528fc0
---
M includes/libs/CSSJanus.php
M tests/phpunit/includes/libs/CSSJanusTest.php
2 files changed, 25 insertions(+), 3 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/libs/CSSJanus.php b/includes/libs/CSSJanus.php
index 5a52fc7..0063a9b 100644
--- a/includes/libs/CSSJanus.php
+++ b/includes/libs/CSSJanus.php
@@ -102,7 +102,7 @@
$patterns['possibly_negative_quantity'] = 
((?:-?{$patterns['quantity']})|(?:inherit|auto));
$patterns['color'] = 
(#?{$patterns['nmchar']}+|(?:rgba?|hsla?)\([ \d.,%-]+\));
$patterns['url_chars'] = 
(?:{$patterns['url_special_chars']}|{$patterns['nonAscii']}|{$patterns['escape']})*;
-   $patterns['lookahead_not_open_brace'] = 
(?!({$patterns['nmchar']}|\r?\n|\s|#|\:|\.|\,|\+||\(|\))*?{);
+   $patterns['lookahead_not_open_brace'] = 
(?!({$patterns['nmchar']}|\r?\n|\s|#|\:|\.|\,|\+||\(|\)|\[|\]|=|\*=|~=|\^=|'[^']*'])*?{);
$patterns['lookahead_not_closing_paren'] = 
(?!{$patterns['url_chars']}?{$patterns['valid_after_uri_chars']}\));
$patterns['lookahead_for_closing_paren'] = 
(?={$patterns['url_chars']}?{$patterns['valid_after_uri_chars']}\));
$patterns['noflip_single'] = 
/({$patterns['noflip_annotation']}{$patterns['lookahead_not_open_brace']}[^;}]+;?)/i;
diff --git a/tests/phpunit/includes/libs/CSSJanusTest.php 
b/tests/phpunit/includes/libs/CSSJanusTest.php
index 5a3c161..c8b20d2 100644
--- a/tests/phpunit/includes/libs/CSSJanusTest.php
+++ b/tests/phpunit/includes/libs/CSSJanusTest.php
@@ -31,8 +31,10 @@
 * @dataProvider provideTransformAdvancedCases
 */
public function testTransformAdvanced( $code, $expectedOutput, $options 
= array() ) {
-   $swapLtrRtlInURL = isset( $options['swapLtrRtlInURL'] ) ? 
$options['swapLtrRtlInURL'] : false;
-   $swapLeftRightInURL = isset( $options['swapLeftRightInURL'] ) ? 
$options['swapLeftRightInURL'] : false;
+   $swapLtrRtlInURL = isset( $options['swapLtrRtlInURL'] ) ?
+   $options['swapLtrRtlInURL'] : false;
+   $swapLeftRightInURL = isset( $options['swapLeftRightInURL'] ) ?
+   $options['swapLeftRightInURL'] : false;
 
$flipped = CSSJanus::transform( $code, $swapLtrRtlInURL, 
$swapLeftRightInURL );
 
@@ -437,6 +439,26 @@
'div { float: left; /* @noflip */ text-align: 
left; }',
'div { float: right; /* @noflip */ text-align: 
left; }'
),
+   array(
+   // before a *= attribute selector with multiple 
properties
+   '/* @noflip */ div.foo[bar*=baz] { float:left; 
clear: left; }'
+   ),
+   array(
+   // before a ^= attribute selector with multiple 
properties
+   '/* @noflip */ div.foo[bar^=baz] { float:left; 
clear: left; }'
+   ),
+   array(
+   // before a ~= attribute selector with multiple 
properties
+   '/* @noflip */ div.foo[bar~=baz] { float:left; 
clear: left; }'
+   ),
+   array(
+   // before a = attribute selector with multiple 
properties
+   '/* @noflip */ div.foo[bar=baz] { float:left; 
clear: left; }'
+   ),
+   array(
+   // before a quoted attribute selector with 
multiple properties
+   '/* @noflip */ div.foo[bar=\'baz{quux\'] { 
float:left; clear: left; }'
+   ),
 
// Guard against css3 stuff
  

[MediaWiki-commits] [Gerrit] Cloudbees Jenkins jobs are now created using Jenkins Job Bui... - change (mediawiki/selenium)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Cloudbees Jenkins jobs are now created using Jenkins Job Builder
..

Cloudbees Jenkins jobs are now created using Jenkins Job Builder

Bug: 61778
Change-Id: I4dcb15133297f7d39fbe9a07a679679d78f2
---
D docs/UploadWizard.md
D docs/job.md
D docs/jobs.md
D docs/template.md
R jenkins/jenkins.md
R jenkins/mail.template
R jenkins/view.md
7 files changed, 5 insertions(+), 688 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/46/114946/1

diff --git a/docs/UploadWizard.md b/docs/UploadWizard.md
deleted file mode 100644
index 6f578a2..000
--- a/docs/UploadWizard.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# UploadWizard-commons.wikimedia.org
-
-- Jenkins  New Job
-  - Job name: UploadWizard-commons.wikimedia.org
-  - Build a free-style software project
-  - OK
-- Jenkins  Job  Configure
-  - Source Code Management  Git  Repositories  Repository URL: 
https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard
-  - Build Triggers  Build periodically  Schedule: H */6 * * * (every 6 hours)
-  - Build  Add build step  Execute shell
-
---
-
-set -e
-export 
MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
-virtualenv --distribute DEV
-DEV/bin/pip install -rtests/api/requirements.txt
-DEV/bin/python tests/api/upload-wizard_tests.py --username Selenium_user 
--api_url https://commons.wikimedia.org/w/api.php;
-DEV/bin/python tests/api/upload-wizard_tests.py --gen_new_image --username 
Selenium_user --api_url https://commons.wikimedia.org/w/api.php;
-
---
-
-  - Add post-build action
-- E-mail Notification  Recipients  aarcos.w...@gmail.com 
cmcma...@wikimedia.org gti...@wikimedia.org zfili...@wikimedia.org
-- IRC Notification (notifies #wikimedia-qa by default)
-
-
-
-# UploadWizard-commons.wikimedia.beta.wmflabs.org
-
-- Jenkins  New Job
-  - Job name: UploadWizard-commons.wikimedia.beta.wmflabs.org
-  - Build a free-style software project
-  - OK
-- Jenkins  Job  Configure
-  - Source Code Management  Git  Repositories  Repository URL: 
https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard
-  - Build Triggers  Build periodically  Schedule: H */6 * * * (every 6 hours)
-  - Build Triggers  Poll SCM  Schedule  * * * * * (every minute)
-  - Build  Add build step  Execute shell
-
---
-
-set -e
-export 
MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
-virtualenv --distribute DEV
-DEV/bin/pip install -rtests/api/requirements.txt
-DEV/bin/python tests/api/upload-wizard_tests.py --username Selenium_user 
--api_url http://commons.wikimedia.beta.wmflabs.org/w/api.php;
-DEV/bin/python tests/api/upload-wizard_tests.py --gen_new_image --username 
Selenium_user --api_url http://commons.wikimedia.beta.wmflabs.org/w/api.php;
-
---
-
-  - Add post-build action
-- E-mail Notification  Recipients  aarcos.w...@gmail.com 
cmcma...@wikimedia.org gti...@wikimedia.org zfili...@wikimedia.org
-- IRC Notification (notifies #wikimedia-qa by default)
diff --git a/docs/job.md b/docs/job.md
deleted file mode 100644
index 8c7d63a..000
--- a/docs/job.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Job
-
-- Jenkins  New Job
-  - Job name: (name)
-  - Build a free-style software project
-  - OK
-- Jenkins  Job  Configure
-  - Project name: (name)
-  - Source Code Management  Git  Repositories  Repository URL: (repository)
-  - Build  Add build step  Execute shell
-
---
-
-export MEDIAWIKI_USER=${MEDIAWIKI_USER}
-export MEDIAWIKI_PASSWORD_VARIABLE=${MEDIAWIKI_PASSWORD_VARIABLE}
-
-export BROWSER=${browser}
-export MEDIAWIKI_URL=http://${MEDIAWIKI_URL}/wiki/
-
-curl -s -o use-ruby 
https://repository-cloudbees.forge.cloudbees.com/distributions/ci-addons/ruby/use-ruby
-RUBY_VERSION=2.1.0 \
-  source ./use-ruby
-
-gem install bundler --no-ri --no-rdoc
-if [ -d ${FOLDER} ]; then cd ${FOLDER}; fi
-bundle install
-bundle exec ${BUNDLE_EXEC}
-
---
-
-  - Post-build Actions  Add post-build action
-- Publish JUnit test result report  Test report XMLs: reports/junit/*.xml
-- E-mail Notification  Recipients: (recipients)
-- IRC Notification
diff --git a/docs/jobs.md b/docs/jobs.md
deleted file mode 100644
index 430d7aa..000
--- a/docs/jobs.md
+++ /dev/null
@@ -1,287 +0,0 @@
-# all jobs
-- Browser Label:
-- bundle exec cucumber:
-- Recipients:
-- MediaWiki URL:
-- Folder: tests/browser/ (if not stated differently)
-- Repository URL:
-- MediaWiki user:
-- MediaWiki password variable:
-- Build schedule: 0 3,18 * * * (if not stated differently)
-
-
-
-# browsertests
-- Recipients: cmcma...@wikimedia.org zfili...@wikimedia.org
-- Repository URL: browsertests
-- MediaWiki user: Selenium_user
-
-
-# browsertests-en.wikipedia.beta.wmflabs.org
-- bundle exec cucumber: --tags 

[MediaWiki-commits] [Gerrit] Tool Labs: Fixes for eqiad support - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: Fixes for eqiad support
..

Tool Labs: Fixes for eqiad support

Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f
---
M modules/toollabs/manifests/init.pp
1 file changed, 13 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/114947/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 244ce54..b0f6960 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -16,22 +16,25 @@
 $store = '/data/project/.system/store'
 $repo  = '/data/project/.system/deb'
 
-  #
-  # The $store is an incredibly horrid workaround the fact that we cannot
-  # use exported resources in our puppet setup: individual instances store
-  # information in a shared filesystem that are collected locally into
-  # files to finish up the configuration.
-  #
-  # Case in point here: SSH host keys distributed around the project for
-  # known_hosts and HBA of the execution nodes.
-  #
+#
+# The $store is an incredibly horrid workaround the fact that we cannot
+# use exported resources in our puppet setup: individual instances store
+# information in a shared filesystem that are collected locally into
+# files to finish up the configuration.
+#
+# Case in point here: SSH host keys distributed around the project for
+# known_hosts and HBA of the execution nodes.
+#
 
 file { $store:
 ensure  = directory,
 owner   = 'root',
 group   = 'root',
 mode= '0755',
-require = Service['autofs'],
+require = $::site? {
+'eqiad' =  Mount['/data/project'],
+default =  Service['autofs'],
+},
 }
 
 file { ${store}/hostkey-${::fqdn}:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: Fixes for eqiad support - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: Fixes for eqiad support
..


Tool Labs: Fixes for eqiad support

Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f
---
M modules/toollabs/manifests/init.pp
1 file changed, 13 insertions(+), 10 deletions(-)

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



diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 244ce54..b0f6960 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -16,22 +16,25 @@
 $store = '/data/project/.system/store'
 $repo  = '/data/project/.system/deb'
 
-  #
-  # The $store is an incredibly horrid workaround the fact that we cannot
-  # use exported resources in our puppet setup: individual instances store
-  # information in a shared filesystem that are collected locally into
-  # files to finish up the configuration.
-  #
-  # Case in point here: SSH host keys distributed around the project for
-  # known_hosts and HBA of the execution nodes.
-  #
+#
+# The $store is an incredibly horrid workaround the fact that we cannot
+# use exported resources in our puppet setup: individual instances store
+# information in a shared filesystem that are collected locally into
+# files to finish up the configuration.
+#
+# Case in point here: SSH host keys distributed around the project for
+# known_hosts and HBA of the execution nodes.
+#
 
 file { $store:
 ensure  = directory,
 owner   = 'root',
 group   = 'root',
 mode= '0755',
-require = Service['autofs'],
+require = $::site? {
+'eqiad' =  Mount['/data/project'],
+default =  Service['autofs'],
+},
 }
 
 file { ${store}/hostkey-${::fqdn}:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Tool Labs: support eqiad grid master - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: support eqiad grid master
..

Tool Labs: support eqiad grid master

Change-Id: I65b6227ac602b4110ebf1a2d2187fe7e523f8e56
---
M manifests/role/labstools.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/114948/1

diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index e5c622e..18f20ed 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -4,7 +4,10 @@
   class config {
 include role::labsnfs::client # temporary measure
 
-$grid_master = tools-master.pmtpa.wmflabs
+$grid_master = $::site? {
+'eqiad' =  tools-master.eqiad.wmflabs,
+default =  tools-master.pmtpa.wmflabs,
+}
   }
 
   class bastion inherits role::labs::tools::config {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65b6227ac602b4110ebf1a2d2187fe7e523f8e56
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: support eqiad grid master - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: support eqiad grid master
..


Tool Labs: support eqiad grid master

Change-Id: I65b6227ac602b4110ebf1a2d2187fe7e523f8e56
---
M manifests/role/labstools.pp
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index e5c622e..18f20ed 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -4,7 +4,10 @@
   class config {
 include role::labsnfs::client # temporary measure
 
-$grid_master = tools-master.pmtpa.wmflabs
+$grid_master = $::site? {
+'eqiad' =  tools-master.eqiad.wmflabs,
+default =  tools-master.pmtpa.wmflabs,
+}
   }
 
   class bastion inherits role::labs::tools::config {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65b6227ac602b4110ebf1a2d2187fe7e523f8e56
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Replace usages of the deprecated Settings class in client - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Replace usages of the deprecated Settings class in client
..


Replace usages of the deprecated Settings class in client

(whenever possible)

Change-Id: I0478ab26ed1aa1bca76695367a3a0fa304b0d1d5
---
M client/WikibaseClient.hooks.php
M client/includes/ChangeHandler.php
M client/includes/NamespaceChecker.php
M client/includes/api/ApiClientInfo.php
M client/includes/modules/SiteModule.php
M client/includes/parserhooks/NoLangLinkHandler.php
M client/includes/parserhooks/PropertyParserFunction.php
M client/includes/recentchanges/RecentChangesFilterOptions.php
M client/includes/specials/SpecialUnconnectedPages.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/ChangeHandlerTest.php
M client/tests/phpunit/includes/UpdateRepoOnMoveTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M 
client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTest.php
M 
client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
M lib/tests/phpunit/NoBadDependencyUsageTest.php
17 files changed, 136 insertions(+), 93 deletions(-)

Approvals:
  WikidataJenkins: Verified
  Jeroen De Dauw: Looks good to me, approved



diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 492b189..d92fab2 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -151,12 +151,13 @@
 */
public static function onSpecialMovepageAfterMove( MovePageForm 
$movePage, Title $oldTitle,
Title $newTitle ) {
-   $siteLinkLookup = 
WikibaseClient::getDefaultInstance()-getStore()-getSiteLinkTable();
-   $repoLinker = 
WikibaseClient::getDefaultInstance()-newRepoLinker();
+   $wikibaseClient = WikibaseClient::getDefaultInstance();
+   $siteLinkLookup = 
$wikibaseClient-getStore()-getSiteLinkTable();
+   $repoLinker = $wikibaseClient-newRepoLinker();
 
$movePageNotice = new MovePageNotice(
$siteLinkLookup,
-   Settings::get( 'siteGlobalID' ),
+   $wikibaseClient-getSettings()-getSetting( 
'siteGlobalID' ),
$repoLinker
);
 
@@ -182,7 +183,8 @@
 * @return bool
 */
public static function onScribuntoExternalLibraries( $engine, array 
$extraLibraries ) {
-   if ( $engine == 'lua'  Settings::get( 'allowDataTransclusion' 
) === true ) {
+   $allowDataTransclusion = 
WikibaseClient::getDefaultInstance()-getSettings()-getSetting( 
'allowDataTransclusion' );
+   if ( $engine == 'lua'  $allowDataTransclusion === true ) {
$extraLibraries['mw.wikibase'] = 
'Scribunto_LuaWikibaseLibrary';
$extraLibraries['mw.wikibase.entity'] = 
'Scribunto_LuaWikibaseEntityLibrary';
}
@@ -239,7 +241,10 @@
wfProfileIn( __METHOD__ );
 
if ( $rc-getAttribute( 'rc_type' ) == RC_EXTERNAL ) {
-   $changeFactory = new ExternalChangeFactory( 
Settings::get( 'repoSiteId' ) );
+   $wikibaseClient = WikibaseClient::getDefaultInstance();
+   $changeFactory = new ExternalChangeFactory(
+   $wikibaseClient-getSettings()-getSetting( 
'repoSiteId' )
+   );
 
try {
$externalChange = 
$changeFactory-newFromRecentChange( $rc );
@@ -255,7 +260,7 @@
$formatter = new ChangeLineFormatter(
$changesList-getUser(),
$changesList-getLanguage(),
-   
WikibaseClient::getDefaultInstance()-newRepoLinker()
+   $wikibaseClient-newRepoLinker()
);
 
$flag = $changesList-recentChangesFlags( array( 
'wikibase-edit' = true ), '' );
@@ -354,13 +359,16 @@
return true;
}
 
+   $wikibaseClient = WikibaseClient::getDefaultInstance();
+   $settings = $wikibaseClient-getSettings();
+
$langLinkHandler = new LangLinkHandler(
-   Settings::get( 'siteGlobalID' ),
-   Settings::get( 'namespaces' ),
-   Settings::get( 'excludeNamespaces' ),
-   
WikibaseClient::getDefaultInstance()-getStore()-getSiteLinkTable(),
+   $settings-getSetting( 'siteGlobalID' ),
+   $settings-getSetting( 'namespaces' ),
+   $settings-getSetting( 'excludeNamespaces' ),
+

[MediaWiki-commits] [Gerrit] Prevent SetReferenceTest from (indirectly) leaking into wb_i... - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Prevent SetReferenceTest from (indirectly) leaking into 
wb_id_counters
..


Prevent SetReferenceTest from (indirectly) leaking into wb_id_counters

Change-Id: Ib7616a694c66f68111874f56db4bb57edf04da86
---
M repo/tests/phpunit/includes/api/SetReferenceTest.php
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  WikidataJenkins: Verified
  Jeroen De Dauw: Looks good to me, approved



diff --git a/repo/tests/phpunit/includes/api/SetReferenceTest.php 
b/repo/tests/phpunit/includes/api/SetReferenceTest.php
index fc03e0b..300ddcf 100644
--- a/repo/tests/phpunit/includes/api/SetReferenceTest.php
+++ b/repo/tests/phpunit/includes/api/SetReferenceTest.php
@@ -319,8 +319,7 @@
}
 
public function invalidClaimProvider() {
-   $propertyContent = PropertyContent::newEmpty();
-   $invalidId = PropertyId::newFromNumber( 
$propertyContent-grabFreshId() );
+   $invalidId = new PropertyId( 'P347894353458984658' );
 
$snak = new PropertyValueSnak( $invalidId, new StringValue( 
'abc') );
$snakHash = $snak-getHash();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7616a694c66f68111874f56db4bb57edf04da86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
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 and rewrite PageGenerator's query string - change (pywikibot/core)

[Nullzero (Code Review)]

Nullzero has uploaded a new change for review.

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

Change subject: Fix and rewrite PageGenerator's query string
..

Fix and rewrite PageGenerator's query string

The old code has a flaw when, for example, iiprop is in kwargs. Instead of
xxx|timestamp|..., the query string will be xxxtimestamp|...
which is wrong. This patch fixes the problem and remove redundancy
of the code.

Change-Id: I7d496a612d32c70ccb53d2cdcf95cc036944d808
---
M pywikibot/data/api.py
1 file changed, 11 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/49/114949/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index a574935..45c5d04 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -769,27 +769,20 @@
 version of each Page (default False)
 
 
+def appendParams(params, key, value):
+if key in params:
+params[key] += '|' + value
+else:
+params[key] = value
 # get some basic information about every page generated
-if 'prop' in kwargs:
-kwargs['prop'] += |info|imageinfo|categoryinfo
-else:
-kwargs['prop'] = 'info|imageinfo|categoryinfo'
+appendParams(kwargs, 'prop', 'info|imageinfo|categoryinfo')
 if g_content:
 # retrieve the current revision
-kwargs['prop'] += |revisions
-if rvprop in kwargs:
-kwargs[rvprop] += ids|timestamp|flags|comment|user|content
-else:
-kwargs[rvprop] = ids|timestamp|flags|comment|user|content
-if inprop in kwargs:
-if protection not in kwargs[inprop]:
-kwargs[inprop] += |protection
-else:
-kwargs['inprop'] = 'protection'
-if iiprop in kwargs:
-kwargs[iiprop] += 'timestamp|user|comment|url|size|sha1|metadata'
-else:
-kwargs['iiprop'] = 'timestamp|user|comment|url|size|sha1|metadata'
+appendParams(kwargs, 'prop', 'revisions')
+appendParams(kwargs, 'rvprop', 
'ids|timestamp|flags|comment|user|content')
+if not ('inprop' in kwargs and 'protection' in kwargs['inprop']):
+appendParams(kwargs, 'inprop', 'protection')
+appendParams(kwargs, 'iiprop', 
'timestamp|user|comment|url|size|sha1|metadata')
 QueryGenerator.__init__(self, generator=generator, **kwargs)
 self.resultkey = pages  # element to look for in result
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d496a612d32c70ccb53d2cdcf95cc036944d808
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Nullzero nullzero.f...@gmail.com

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

[MediaWiki-commits] [Gerrit] Tool Labs: - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs:
..

Tool Labs:

Omnibus patch to fix gridengine support for eqiad

Change-Id: I01592d50cc17a4acb25fd2d4b70881f450ad88cd
---
M modules/gridengine/manifests/exec_host.pp
M modules/gridengine/manifests/exec_submit_host.pp
M modules/gridengine/manifests/master.pp
M modules/gridengine/manifests/shadow_master.pp
M modules/gridengine/manifests/submit_host.pp
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/execnode.pp
A modules/toollabs/manifests/gridnode.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/master.pp
M modules/toollabs/manifests/shadow.pp
M modules/toollabs/manifests/webnode.pp
M modules/toollabs/manifests/webserver.pp
13 files changed, 91 insertions(+), 90 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/114950/1

diff --git a/modules/gridengine/manifests/exec_host.pp 
b/modules/gridengine/manifests/exec_host.pp
index f12415a..c81091d 100644
--- a/modules/gridengine/manifests/exec_host.pp
+++ b/modules/gridengine/manifests/exec_host.pp
@@ -5,11 +5,9 @@
 gridmaster = $gridmaster,
 }
 
-package { 'gridengine-exec':
-ensure = latest,
-}
-
-# Not actually possible in the labs
-#   Sshkey | tag == sshkey-$grid_master |
+package { 'gridengine-exec':
+ensure  = latest,
+require = Package['gridengine-common'],
+}
 }
 
diff --git a/modules/gridengine/manifests/exec_submit_host.pp 
b/modules/gridengine/manifests/exec_submit_host.pp
index d8003dd..d9fd780 100644
--- a/modules/gridengine/manifests/exec_submit_host.pp
+++ b/modules/gridengine/manifests/exec_submit_host.pp
@@ -8,7 +8,8 @@
 }
 
 package { 'gridengine-exec':
-ensure = latest,
+ensure  = latest,
+require = Package['gridengine-common'],
 }
 
 package { [ 'gridengine-client', 'jobutils' ]:
@@ -19,14 +20,5 @@
 ensure = link,
 target = '/data/project/.system/accounting',
 }
-
-# Not actually possible in the labs
-#   @@sshkey { $fqdn:
-#   ensure = present,
-#   type = 'ssh-dss',
-#   key = $sshdsakey,
-#   tag = sshkey-$grid_master,
-#   }
-
 }
 
diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index 8e11933..0109b7d 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -6,7 +6,8 @@
 }
 
 package { 'gridengine-master':
-ensure = latest,
+ensure  = latest,
+require = Package['gridengine-common'],
 }
 
 class monitoring {
@@ -21,15 +22,8 @@
 command = '/usr/local/sbin/grid-ganglia-report',
 user= 'root',
 require = File['/usr/local/sbin/grid-ganglia-report'],
-}
 }
+}
 
 include monitoring
-
-cron { 'push-accounting-to-shared':
-ensure  = present,
-command = 'cp -f /var/lib/gridengine/default/common/accounting 
/data/project/.system/accounting.tmp  mv -f 
/data/project/.system/accounting.tmp /data/project/.system/accounting',
-user= 'root',
-minute  = [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55],
-}
 }
diff --git a/modules/gridengine/manifests/shadow_master.pp 
b/modules/gridengine/manifests/shadow_master.pp
index 1a77edb..1634df4 100644
--- a/modules/gridengine/manifests/shadow_master.pp
+++ b/modules/gridengine/manifests/shadow_master.pp
@@ -6,15 +6,9 @@
 gridmaster = $gridmaster,
 }
 
-package { 'gridengine-master':
-ensure = latest,
-}
+package { 'gridengine-master':
+ensure = latest,
+require = Package['gridengine-common'],
+}
 
-# Not actually possible in the labs
-#   @@sshkey { $fqdn:
-#   ensure = present,
-#   type = 'ssh-dss',
-#   key = $sshdsakey,
-#   tag = sshkey-$grid_master,
-#   }
 }
diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index 53ec502..0054ac1 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -6,44 +6,18 @@
 gridmaster = $gridmaster,
 }
 
-package { [ 'gridengine-client', 'jobutils' ]:
-ensure = latest,
-}
+package { [ 'jobutils' ]:
+ensure = latest,
+}
 
-cron { 'pull-accounting-from-shared':
-ensure = absent,
-}
+package { 'gridengine-client':
+ensure = latest,
+require = Package['gridengine-common'],
+}
 
-file { '/var/lib/gridengine/default/common/accounting':
-ensure = link,
-target = '/data/project/.system/accounting',
-}
-
-# Temporary hack to manage obsolete files in /usr/local/bin.
-# TODO: Remove 

[MediaWiki-commits] [Gerrit] Tool Labs: Omnibus fix to gridengine for eqiad - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: Omnibus fix to gridengine for eqiad
..


Tool Labs: Omnibus fix to gridengine for eqiad

Change-Id: I01592d50cc17a4acb25fd2d4b70881f450ad88cd
---
M modules/gridengine/manifests/exec_host.pp
M modules/gridengine/manifests/exec_submit_host.pp
M modules/gridengine/manifests/master.pp
M modules/gridengine/manifests/shadow_master.pp
M modules/gridengine/manifests/submit_host.pp
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/execnode.pp
A modules/toollabs/manifests/gridnode.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/master.pp
M modules/toollabs/manifests/shadow.pp
M modules/toollabs/manifests/webnode.pp
M modules/toollabs/manifests/webserver.pp
13 files changed, 91 insertions(+), 90 deletions(-)

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



diff --git a/modules/gridengine/manifests/exec_host.pp 
b/modules/gridengine/manifests/exec_host.pp
index f12415a..c81091d 100644
--- a/modules/gridengine/manifests/exec_host.pp
+++ b/modules/gridengine/manifests/exec_host.pp
@@ -5,11 +5,9 @@
 gridmaster = $gridmaster,
 }
 
-package { 'gridengine-exec':
-ensure = latest,
-}
-
-# Not actually possible in the labs
-#   Sshkey | tag == sshkey-$grid_master |
+package { 'gridengine-exec':
+ensure  = latest,
+require = Package['gridengine-common'],
+}
 }
 
diff --git a/modules/gridengine/manifests/exec_submit_host.pp 
b/modules/gridengine/manifests/exec_submit_host.pp
index d8003dd..d9fd780 100644
--- a/modules/gridengine/manifests/exec_submit_host.pp
+++ b/modules/gridengine/manifests/exec_submit_host.pp
@@ -8,7 +8,8 @@
 }
 
 package { 'gridengine-exec':
-ensure = latest,
+ensure  = latest,
+require = Package['gridengine-common'],
 }
 
 package { [ 'gridengine-client', 'jobutils' ]:
@@ -19,14 +20,5 @@
 ensure = link,
 target = '/data/project/.system/accounting',
 }
-
-# Not actually possible in the labs
-#   @@sshkey { $fqdn:
-#   ensure = present,
-#   type = 'ssh-dss',
-#   key = $sshdsakey,
-#   tag = sshkey-$grid_master,
-#   }
-
 }
 
diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index 8e11933..0109b7d 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -6,7 +6,8 @@
 }
 
 package { 'gridengine-master':
-ensure = latest,
+ensure  = latest,
+require = Package['gridengine-common'],
 }
 
 class monitoring {
@@ -21,15 +22,8 @@
 command = '/usr/local/sbin/grid-ganglia-report',
 user= 'root',
 require = File['/usr/local/sbin/grid-ganglia-report'],
-}
 }
+}
 
 include monitoring
-
-cron { 'push-accounting-to-shared':
-ensure  = present,
-command = 'cp -f /var/lib/gridengine/default/common/accounting 
/data/project/.system/accounting.tmp  mv -f 
/data/project/.system/accounting.tmp /data/project/.system/accounting',
-user= 'root',
-minute  = [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55],
-}
 }
diff --git a/modules/gridengine/manifests/shadow_master.pp 
b/modules/gridengine/manifests/shadow_master.pp
index 1a77edb..1634df4 100644
--- a/modules/gridengine/manifests/shadow_master.pp
+++ b/modules/gridengine/manifests/shadow_master.pp
@@ -6,15 +6,9 @@
 gridmaster = $gridmaster,
 }
 
-package { 'gridengine-master':
-ensure = latest,
-}
+package { 'gridengine-master':
+ensure = latest,
+require = Package['gridengine-common'],
+}
 
-# Not actually possible in the labs
-#   @@sshkey { $fqdn:
-#   ensure = present,
-#   type = 'ssh-dss',
-#   key = $sshdsakey,
-#   tag = sshkey-$grid_master,
-#   }
 }
diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index 53ec502..0054ac1 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -6,44 +6,18 @@
 gridmaster = $gridmaster,
 }
 
-package { [ 'gridengine-client', 'jobutils' ]:
-ensure = latest,
-}
+package { [ 'jobutils' ]:
+ensure = latest,
+}
 
-cron { 'pull-accounting-from-shared':
-ensure = absent,
-}
+package { 'gridengine-client':
+ensure = latest,
+require = Package['gridengine-common'],
+}
 
-file { '/var/lib/gridengine/default/common/accounting':
-ensure = link,
-target = '/data/project/.system/accounting',
-}
-
-# Temporary hack to manage obsolete files in /usr/local/bin.
-# TODO: Remove when no longer needed.
- 

[MediaWiki-commits] [Gerrit] Tool Labs: typo fix in master.pp - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: typo fix in master.pp
..

Tool Labs: typo fix in master.pp

... although I wish they'd supoprt an endure = parameter
for stuff you really would rather wish you could uninstall.  :-)

Change-Id: I130096daa985a994cfd60ac4e9f3b225d4206eea
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/114951/1

diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index 004fd0c..f9a598b 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -13,7 +13,7 @@
 if $::site == 'eqiad' {
 
 file { ${sysdir}/gridengine:
-endure  = directory,
+ensure  = directory,
 require = File[$sysdir],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I130096daa985a994cfd60ac4e9f3b225d4206eea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: typo fix in master.pp - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: typo fix in master.pp
..


Tool Labs: typo fix in master.pp

... although I wish they'd supoprt an endure = parameter
for stuff you really would rather wish you could uninstall.  :-)

Change-Id: I130096daa985a994cfd60ac4e9f3b225d4206eea
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index 004fd0c..f9a598b 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -13,7 +13,7 @@
 if $::site == 'eqiad' {
 
 file { ${sysdir}/gridengine:
-endure  = directory,
+ensure  = directory,
 require = File[$sysdir],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I130096daa985a994cfd60ac4e9f3b225d4206eea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Tool Labs: more eqiad fixes - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: more eqiad fixes
..

Tool Labs: more eqiad fixes

Change-Id: I640b44ff3b8e51fd1da629a6f2ce045421d70d4c
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/114952/1

diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index f9a598b..a6d26c8 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -20,7 +20,7 @@
 file { '/var/lib/gridengine':
 ensure  = link,
 target  = ${sysdir}/gridengine,
-require = ${sysdir}/gridengine,
+require = File[${sysdir}/gridengine],
 before  = Package['gridengine-common'],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I640b44ff3b8e51fd1da629a6f2ce045421d70d4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: more eqiad fixes - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: more eqiad fixes
..


Tool Labs: more eqiad fixes

Change-Id: I640b44ff3b8e51fd1da629a6f2ce045421d70d4c
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index f9a598b..a6d26c8 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -20,7 +20,7 @@
 file { '/var/lib/gridengine':
 ensure  = link,
 target  = ${sysdir}/gridengine,
-require = ${sysdir}/gridengine,
+require = File[${sysdir}/gridengine],
 before  = Package['gridengine-common'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I640b44ff3b8e51fd1da629a6f2ce045421d70d4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
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 using and deprecate jquery.delayedBind - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Stop using and deprecate jquery.delayedBind
..

Stop using and deprecate jquery.delayedBind

Reasons:
* It provides the same functionality as jquery.throttle-debounce, but
  in a hackier and less flexible way
* It's (to my knowledge) not used outside of core, while
  jquery.throttle-debounce is - deciding on one can lower the payload
  size a little bit
* It's a custom library and we have too many of those

Only two modules in core were using it:
* jquery.expandableField: It was, in fact, used incorrently, the code
  needs a simple setTimeout / clearTimeout pair with no debouncing.
  The bug made it possible to keep focus on a field while it was
  unexpanded (by quickly triggering blur and focus events in order).
* skins.vector.js: Straightforwardly converted the usage to a
  $.debounce call. Also fixed a bug where the window resize handler
  was bound for each $.fn.collapsibleTabs call instead of once.

Change-Id: I83ba37a9568a171d9f3654f6bfdb6064e0e65bd4
---
M RELEASE-NOTES-1.23
M resources/Resources.php
M resources/jquery/jquery.delayedBind.js
M resources/jquery/jquery.expandableField.js
M skins/vector/collapsibleTabs.js
5 files changed, 23 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/114953/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 2350b8e..72509ed 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -248,6 +248,8 @@
   was removed.
 * A user_password_expires column has been added to the user table. The User
   object expects this column to exist. Use update.php to create this new field.
+* The jquery.delayedBind ResourceLoader module was deprecated in favor of the
+  jquery.throttle-debounce module.
 
  Removed classes 
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/resources/Resources.php b/resources/Resources.php
index 7f5b75a..f8c6114 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -150,7 +150,7 @@
'vector/vector.js',
),
'position' = 'top',
-   'dependencies' = 'jquery.delayedBind',
+   'dependencies' = 'jquery.throttle-debounce',
'remoteBasePath' = $GLOBALS['wgStylePath'],
'localBasePath' = $GLOBALS['wgStyleDirectory'],
),
@@ -238,7 +238,6 @@
),
'jquery.expandableField' = array(
'scripts' = 'resources/jquery/jquery.expandableField.js',
-   'dependencies' = 'jquery.delayedBind',
),
'jquery.farbtastic' = array(
'scripts' = 'resources/jquery/jquery.farbtastic.js',
diff --git a/resources/jquery/jquery.delayedBind.js 
b/resources/jquery/jquery.delayedBind.js
index 40f3d44..874c111 100644
--- a/resources/jquery/jquery.delayedBind.js
+++ b/resources/jquery/jquery.delayedBind.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function ( mw, $ ) {
 /**
  * Function that escapes spaces in event names. This is needed because
  * _delayedBind-foo bar-1000 refers to two events
@@ -73,4 +73,11 @@
}
 } );
 
-}( jQuery ) );
+mw.log.deprecate( $.fn, 'delayedBind', $.fn.delayedBind,
+   'Use the jquery.throttle-debounce module instead' );
+mw.log.deprecate( $.fn, 'delayedBindCancel', $.fn.delayedBindCancel,
+   'Use the jquery.throttle-debounce module instead' );
+mw.log.deprecate( $.fn, 'delayedBindUnbind', $.fn.delayedBindUnbind,
+   'Use the jquery.throttle-debounce module instead' );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/jquery/jquery.expandableField.js 
b/resources/jquery/jquery.expandableField.js
index 9e532e5..732cc6e 100644
--- a/resources/jquery/jquery.expandableField.js
+++ b/resources/jquery/jquery.expandableField.js
@@ -56,7 +56,7 @@
args = arguments;
 
$( this ).each( function () {
-   var key, context;
+   var key, context, timeout;
 
/* Construction / Loading */
 
@@ -122,10 +122,13 @@
$( this )
.addClass( 'expandableField' )
.focus( function ( e ) {
+   clearTimeout( timeout );
$.expandableField.expandField( 
e, context );
} )
-   .delayedBind( 250, 'blur', function ( e 
) {
-   
$.expandableField.condenseField( e, context );
+   .blur( function ( e ) {
+   timeout = setTimeout( function 
() {
+   

[MediaWiki-commits] [Gerrit] Tool Labs: use bind mount for /var/lib/gridengine - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: use bind mount for /var/lib/gridengine
..

Tool Labs: use bind mount for /var/lib/gridengine

Because dpkg doesn't like a symlink at its target

Change-Id: I01296ac77eb0357c4e9616d45b79cd710aa2e891
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/114954/1

diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index a6d26c8..da81025 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -17,9 +17,12 @@
 require = File[$sysdir],
 }
 
-file { '/var/lib/gridengine':
-ensure  = link,
-target  = ${sysdir}/gridengine,
+mount { '/var/lib/gridengine':
+ensure  = mounted,
+atboot  = False,
+device  = ${sysdir}/gridengine,
+fstype  = none,
+options = 'rw.bind',
 require = File[${sysdir}/gridengine],
 before  = Package['gridengine-common'],
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01296ac77eb0357c4e9616d45b79cd710aa2e891
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: use bind mount for /var/lib/gridengine - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: use bind mount for /var/lib/gridengine
..


Tool Labs: use bind mount for /var/lib/gridengine

Because dpkg doesn't like a symlink at its target

Change-Id: I01296ac77eb0357c4e9616d45b79cd710aa2e891
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index a6d26c8..da81025 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -17,9 +17,12 @@
 require = File[$sysdir],
 }
 
-file { '/var/lib/gridengine':
-ensure  = link,
-target  = ${sysdir}/gridengine,
+mount { '/var/lib/gridengine':
+ensure  = mounted,
+atboot  = False,
+device  = ${sysdir}/gridengine,
+fstype  = none,
+options = 'rw.bind',
 require = File[${sysdir}/gridengine],
 before  = Package['gridengine-common'],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01296ac77eb0357c4e9616d45b79cd710aa2e891
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove jquery.delayedBind - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Remove jquery.delayedBind
..

Remove jquery.delayedBind

As promised, removing the module deprecated in 1.23.

Change-Id: Ifc84b09a78007a6a0ea5676b0f12a38937dca2e7
---
A RELEASE-NOTES-1.24
M resources/Resources.php
D resources/jquery/jquery.delayedBind.js
M tests/qunit/QUnitTestResources.php
D tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
5 files changed, 2 insertions(+), 125 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/114955/1

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
new file mode 100644
index 000..9439bd6
--- /dev/null
+++ b/RELEASE-NOTES-1.24
@@ -0,0 +1,2 @@
+=== Other changes in 1.24 ===
+* The deprecated jquery.delayedBind ResourceLoader module was removed.
diff --git a/resources/Resources.php b/resources/Resources.php
index f8c6114..c489a2d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -233,9 +233,6 @@
'scripts' = 'resources/jquery/jquery.cookie.js',
'targets' = array( 'desktop', 'mobile' ),
),
-   'jquery.delayedBind' = array(
-   'scripts' = 'resources/jquery/jquery.delayedBind.js',
-   ),
'jquery.expandableField' = array(
'scripts' = 'resources/jquery/jquery.expandableField.js',
),
diff --git a/resources/jquery/jquery.delayedBind.js 
b/resources/jquery/jquery.delayedBind.js
deleted file mode 100644
index 874c111..000
--- a/resources/jquery/jquery.delayedBind.js
+++ /dev/null
@@ -1,83 +0,0 @@
-( function ( mw, $ ) {
-/**
- * Function that escapes spaces in event names. This is needed because
- * _delayedBind-foo bar-1000 refers to two events
- */
-function encodeEvent( event ) {
-   return event.replace( /-/g, '--' ).replace( / /g, '-' );
-}
-
-$.fn.extend( {
-   /**
-* Bind a callback to an event in a delayed fashion.
-* In detail, this means that the callback will be called a certain
-* time after the event fires, but the timer is reset every time
-* the event fires.
-* @param timeout Number of milliseconds to wait
-* @param event Name of the event (string)
-* @param data Data to pass to the event handler (optional)
-* @param callback Function to call
-*/
-   delayedBind: function ( timeout, event, data, callback ) {
-   if ( arguments.length === 3 ) {
-   // Shift optional parameter down
-   callback = data;
-   data = undefined;
-   }
-   var encEvent = encodeEvent( event );
-   return this.each( function () {
-   var that = this;
-   // Bind the top half
-   // Do this only once for every (event, timeout) pair
-   if (  !( $(this).data( '_delayedBindBound-' + encEvent 
+ '-' + timeout ) ) ) {
-   $(this).data( '_delayedBindBound-' + encEvent + 
'-' + timeout, true );
-   $(this).bind( event, function () {
-   var timerID = $(this).data( 
'_delayedBindTimerID-' + encEvent + '-' + timeout );
-   // Cancel the running timer
-   if ( timerID !== null ) {
-   clearTimeout( timerID );
-   }
-   timerID = setTimeout( function () {
-   $(that).trigger( 
'_delayedBind-' + encEvent + '-' + timeout );
-   }, timeout );
-   $(this).data( '_delayedBindTimerID-' + 
encEvent + '-' + timeout, timerID );
-   } );
-   }
-
-   // Bottom half
-   $(this).bind( '_delayedBind-' + encEvent + '-' + 
timeout, data, callback );
-   } );
-   },
-
-   /**
-* Cancel the timers for delayed events on the selected elements.
-*/
-   delayedBindCancel: function ( timeout, event ) {
-   var encEvent = encodeEvent( event );
-   return this.each( function () {
-   var timerID = $(this).data( '_delayedBindTimerID-' + 
encEvent + '-' + timeout );
-   if ( timerID !== null ) {
-   clearTimeout( timerID );
-   }
-   } );
-   },
-
-   /**
-* Unbind an event bound with delayedBind()
-*/
-   delayedBindUnbind: function ( timeout, event, callback ) {
-   var encEvent = encodeEvent( event );
-   return 

[MediaWiki-commits] [Gerrit] Tool Labs: make the /var/lib/gridengine mountpoint - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: make the /var/lib/gridengine mountpoint
..

Tool Labs: make the /var/lib/gridengine mountpoint

Also, typo fix.

Change-Id: I29e6efba694ec10a9200264d62976eb0cba80ccc
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/114956/1

diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index da81025..c7fa3dd 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -17,13 +17,17 @@
 require = File[$sysdir],
 }
 
+file { '/var/lib/gridengine':
+ensure  = directory,
+}
+
 mount { '/var/lib/gridengine':
 ensure  = mounted,
 atboot  = False,
 device  = ${sysdir}/gridengine,
 fstype  = none,
-options = 'rw.bind',
-require = File[${sysdir}/gridengine],
+options = 'rw,bind',
+require = File[${sysdir}/gridengine, '/var/lib/gridengine'],
 before  = Package['gridengine-common'],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29e6efba694ec10a9200264d62976eb0cba80ccc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: make the /var/lib/gridengine mountpoint - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: make the /var/lib/gridengine mountpoint
..


Tool Labs: make the /var/lib/gridengine mountpoint

Also, typo fix.

Change-Id: I29e6efba694ec10a9200264d62976eb0cba80ccc
---
M modules/toollabs/manifests/gridnode.pp
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/modules/toollabs/manifests/gridnode.pp 
b/modules/toollabs/manifests/gridnode.pp
index da81025..c7fa3dd 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -17,13 +17,17 @@
 require = File[$sysdir],
 }
 
+file { '/var/lib/gridengine':
+ensure  = directory,
+}
+
 mount { '/var/lib/gridengine':
 ensure  = mounted,
 atboot  = False,
 device  = ${sysdir}/gridengine,
 fstype  = none,
-options = 'rw.bind',
-require = File[${sysdir}/gridengine],
+options = 'rw,bind',
+require = File[${sysdir}/gridengine, '/var/lib/gridengine'],
 before  = Package['gridengine-common'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29e6efba694ec10a9200264d62976eb0cba80ccc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fixe the duplicate entry SQL errors in unit tests - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has submitted this change and it was merged.

Change subject: Fixe the duplicate entry SQL errors in unit tests
..


Fixe the duplicate entry SQL errors in unit tests

Change-Id: I37ec742b4605e80653a247853fe23930d0d6a31d
---
M repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  WikidataJenkins: Verified
  Addshore: Looks good to me, approved



diff --git a/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php 
b/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
index 4db598f..1057f4d 100644
--- a/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
+++ b/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
@@ -92,7 +92,15 @@
$dbw = wfGetDB( DB_MASTER );
 
foreach ( $rows as $row ) {
-   $dbw-insert( $table, array_combine( $fields, $row ), 
__METHOD__ );
+   $dbw-insert(
+   $table,
+   array_combine( $fields, $row ),
+   __METHOD__,
+   // Just ignore insertation errors... if similar 
data already is in the DB
+   // it's probably good enough for the tests (as 
this is only testing for UNIQUE
+   // fields anyway).
+   array( 'IGNORE' )
+   );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37ec742b4605e80653a247853fe23930d0d6a31d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Text properties, semantic query results, optional hide subti... - change (mediawiki...SemanticTitle)

[Cicalese (Code Review)]

Cicalese has uploaded a new change for review.

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

Change subject: Text properties, semantic query results, optional hide subtitle.
..

Text properties, semantic query results, optional hide subtitle.

Change-Id: I26ced08b95df64507247eb40c3d11baf727bed60
---
M SemanticTitle.class.php
1 file changed, 15 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTitle 
refs/changes/57/114957/1

diff --git a/SemanticTitle.class.php b/SemanticTitle.class.php
index 53d4e32..a8f0923 100644
--- a/SemanticTitle.class.php
+++ b/SemanticTitle.class.php
@@ -48,7 +48,8 @@
$values = $data-getPropertyValues( $property );
if ( count( $values )  0 ) {
$value = array_shift( $values );
-   if ( $value-getDIType() == 
SMWDataItem::TYPE_STRING ) {
+   if ( $value-getDIType() == 
SMWDataItem::TYPE_STRING ||
+   $value-getDIType() == 
SMWDataItem::TYPE_BLOB ) {
$name = $value-getString();
if ( $name != '' ) {
return $name;
@@ -76,7 +77,10 @@
// Hmm... Sometimes `$text' is not a string but an 
object of class `Message'...
if ( is_string( $text ) ) {
$title = Title::newFromText( $text );
-   if ( $title != null  
$title-getPrefixedText() == $target-getPrefixedText() ) {
+   if ( $title != null 
+   ( $title-getText() == 
$target-getText() 
+   ( ( $title-getSubjectNsText() == 
$target-getSubjectNsText() ||
+   $title-getSubjectNsText() == '' ) ) ) 
) {
$semantic = self::getText( $target );
}; // if
}; // if
@@ -107,10 +111,14 @@
}; // if
 
$out-setPageTitle( $semantic );
-   $out-setSubtitle(
-   $title-getPrefixedText() .
-   ( $out-getSubtitle() == '' ? '' : ' ' . 
$out-getSubtitle() )
-   );
+   global $egSemanticTitle_HideSubtitle;
+   if ( !isset( $egSemanticTitle_HideSubtitle ) ||
+   !$egSemanticTitle_HideSubtitle ) {
+   $out-setSubtitle(
+   $title-getPrefixedText() .
+   ( $out-getSubtitle() == '' ? '' : ' ' . 
$out-getSubtitle() )
+   );
+   }
 
return true;
 
@@ -178,7 +186,7 @@
}; // if
}
return $res;
-   } // function hookSenabticTitle
+   } // function hookSemanticTitle
 
 
 } // class SemanticTitle

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26ced08b95df64507247eb40c3d11baf727bed60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Cicalese cical...@mitre.org

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

[MediaWiki-commits] [Gerrit] eqiad should not include role::labsnfs::client - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: eqiad should not include role::labsnfs::client
..

eqiad should not include role::labsnfs::client

Change-Id: I7d0a46d67ee1703799ba1f379b1e92e88e5ec265
---
M manifests/role/labstools.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/114958/1

diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 18f20ed..82558d0 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -2,7 +2,9 @@
 class role::labs::tools {
 
   class config {
-include role::labsnfs::client # temporary measure
+if $::site != 'eqiad' {
+include role::labsnfs::client # temporary measure
+}
 
 $grid_master = $::site? {
 'eqiad' =  tools-master.eqiad.wmflabs,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d0a46d67ee1703799ba1f379b1e92e88e5ec265
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] eqiad should not include role::labsnfs::client - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: eqiad should not include role::labsnfs::client
..


eqiad should not include role::labsnfs::client

Change-Id: I7d0a46d67ee1703799ba1f379b1e92e88e5ec265
---
M manifests/role/labstools.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 18f20ed..82558d0 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -2,7 +2,9 @@
 class role::labs::tools {
 
   class config {
-include role::labsnfs::client # temporary measure
+if $::site != 'eqiad' {
+include role::labsnfs::client # temporary measure
+}
 
 $grid_master = $::site? {
 'eqiad' =  tools-master.eqiad.wmflabs,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d0a46d67ee1703799ba1f379b1e92e88e5ec265
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] control for wgArticlePath setting in WikibaseValueFormatterB... - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: control for wgArticlePath setting in 
WikibaseValueFormatterBuildersTest
..


control for wgArticlePath setting in WikibaseValueFormatterBuildersTest

Change-Id: Ida346e972eaa9fb050968369af451504ca87a27b
---
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
1 file changed, 10 insertions(+), 2 deletions(-)

Approvals:
  WikidataJenkins: Verified
  Jeroen De Dauw: Looks good to me, approved



diff --git 
a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php 
b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
index ccfde58..d56effc 100644
--- a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
+++ b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
@@ -32,7 +32,15 @@
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
  */
-class WikibaseValueFormatterBuildersTest extends \PHPUnit_Framework_TestCase {
+class WikibaseValueFormatterBuildersTest extends \MediaWikiTestCase {
+
+   protected function setUp() {
+   parent::setUp();
+
+   $this-setMwGlobals( array(
+   'wgArticlePath' = '/wiki/$1'
+   ) );
+   }
 
/**
 * @param string $propertyType The property data type to use for all 
properties.
@@ -107,7 +115,7 @@
SnakFormatter::FORMAT_HTML_WIDGET,
$options,
new EntityIdValue( new ItemId( 'Q5' ) ),
-   '@^a href=.*/index.php/Q5Label for 
Q5/a$@', // compare mock object created in newBuilders()
+   '@^a href=.*/wiki/Q5Label for Q5/a$@', // 
compare mock object created in newBuilders()
'wikibase-item'
),
'diff url' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida346e972eaa9fb050968369af451504ca87a27b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
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 unit test for Status __wakeup - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add unit test for Status __wakeup
..


Add unit test for Status __wakeup

Change-Id: I5f116bc7df5932d6f5aeed7b81680cc08e243d0f
---
M tests/phpunit/includes/StatusTest.php
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/StatusTest.php 
b/tests/phpunit/includes/StatusTest.php
index 2ba804f..9cafe2c 100644
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -519,4 +519,16 @@
$this-assertEquals( $error, $errors[0]['message'] );
}
 
+   /**
+* @covers Status::__wakeup
+*/
+   public function testWakeUpSanitizesCallback() {
+   $status = new Status();
+   $status-cleanCallback = function( $value ) {
+   return '-' . $value . '-';
+   };
+   $status-__wakeup();
+   $this-assertEquals( false, $status-cleanCallback );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f116bc7df5932d6f5aeed7b81680cc08e243d0f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] jquery.byteLimit: Restore caret position after limiting - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: jquery.byteLimit: Restore caret position after limiting
..

jquery.byteLimit: Restore caret position after limiting

Bug: 61450
Change-Id: I85423de5bc93b59f0d925cb715d32fe04b170d48
---
M resources/jquery/jquery.byteLimit.js
1 file changed, 21 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/114959/1

diff --git a/resources/jquery/jquery.byteLimit.js 
b/resources/jquery/jquery.byteLimit.js
index a8c0b06..b536c4f 100644
--- a/resources/jquery/jquery.byteLimit.js
+++ b/resources/jquery/jquery.byteLimit.js
@@ -209,20 +209,35 @@
// See 
http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboard-event-order for
// the order and characteristics of the key events.
$el.on( eventKeys, function () {
-   var res = trimValForByteLength(
+   var res, positionFromEnd;
+
+   res = trimValForByteLength(
prevSafeVal,
this.value,
elLimit,
fn
);
 
-   // Only set value property if it was trimmed, 
because whenever the
-   // value property is set, the browser needs to 
re-initiate the text context,
-   // which moves the cursor at the end the input, 
moving it away from wherever it was.
-   // This is a side-effect of limiting after the 
fact.
+   // Only set 'value' property if it was trimmed.
+   //
+   // Whenever the 'value' property is set, the 
browser needs to re-initiate the text context,
+   // which moves the cursor to the end of the 
input, moving it away from wherever it was. This
+   // is a side-effect of limiting after the fact.
+   //
+   // If we're running on a browser that supports 
the 'selectionStart' and 'selectionEnd'
+   // properties (everything other than IE=8), 
restore the caret position afterwards;
+   // otherwise we can't do much. We could try 
using IE-only APIs to do this, but meh. We
+   // calculate the position from the end as we're 
usually trimming the text from the end.
if ( res.trimmed === true ) {
-   this.value = res.newVal;
+   if ( 'selectionStart' in this ) {
+   positionFromEnd = 
this.value.length - this.selectionStart;
+   this.value = res.newVal;
+   this.selectionStart = 
this.selectionEnd = this.value.length - positionFromEnd;
+   } else {
+   this.value = res.newVal;
+   }
}
+
// Always adjust prevSafeVal to reflect the 
input value. Not doing this could cause
// trimValForByteLength to compare the new 
value to an empty string instead of the
// old value, resulting in trimming always from 
the end (bug 40850).

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85423de5bc93b59f0d925cb715d32fe04b170d48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] Add test to complete coverage of getStatusArray - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add test to complete coverage of getStatusArray
..


Add test to complete coverage of getStatusArray

Change-Id: Ia2f9b5a723d85d19ee7a24fcf9b132d0289705f0
---
M tests/phpunit/includes/StatusTest.php
1 file changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/StatusTest.php 
b/tests/phpunit/includes/StatusTest.php
index 9cafe2c..209b54c 100644
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -531,4 +531,29 @@
$this-assertEquals( false, $status-cleanCallback );
}
 
+   /**
+* @dataProvider provideNonObjectMessages
+* @covers Status::getStatusArray
+*/
+   public function testGetStatusArrayWithNonObjectMessages( $nonObjMsg ) {
+   $status = new Status();
+   if( !array_key_exists( 1, $nonObjMsg ) ) {
+   $status-warning( $nonObjMsg[0] );
+   } else {
+   $status-warning( $nonObjMsg[0], $nonObjMsg[1] );
+   }
+
+   $array = $status-getWarningsArray(); // We use 
getWarningsArray to access getStatusArray
+
+   $this-assertEquals( 1, count( $array ) );
+   $this-assertEquals( $nonObjMsg, $array[0] );
+   }
+
+   public static function provideNonObjectMessages() {
+   return array(
+   array( array( 'ImaString', array( 'param1' = 'value1' 
) ) ),
+   array( array( 'ImaString' ) ),
+   );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2f9b5a723d85d19ee7a24fcf9b132d0289705f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Tool Labs: eqiad tweaks to master.pp - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Tool Labs: eqiad tweaks to master.pp
..

Tool Labs: eqiad tweaks to master.pp

Change-Id: I7721b7308034a6dfa179d61f2f04bfb605401fde
---
M modules/toollabs/manifests/master.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/114960/1

diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index 82db732..9f756bc 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -29,7 +29,7 @@
 owner   = 'local-admin',
 group   = 'local-admin',
 mode= '0755',
-require = Service['autofs'],
+require = File[$sysdir],
 }
 
 file { ${repo}/update-repo.sh:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7721b7308034a6dfa179d61f2f04bfb605401fde
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Tool Labs: eqiad tweaks to master.pp - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Tool Labs: eqiad tweaks to master.pp
..


Tool Labs: eqiad tweaks to master.pp

Change-Id: I7721b7308034a6dfa179d61f2f04bfb605401fde
---
M modules/toollabs/manifests/master.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index 82db732..9f756bc 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -29,7 +29,7 @@
 owner   = 'local-admin',
 group   = 'local-admin',
 mode= '0755',
-require = Service['autofs'],
+require = File[$sysdir],
 }
 
 file { ${repo}/update-repo.sh:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7721b7308034a6dfa179d61f2f04bfb605401fde
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
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 _version api and remove _bugs - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Add _version api and remove _bugs
..


Add _version api and remove _bugs

 * Remove _bugs after seeing the note in Maria's review.

 * Add _version and docs from Hashar's patch
   https://gerrit.wikimedia.org/r/#/c/112900

Change-Id: I7c57ee1d063a71be65db2d93b8a4b2375d05ebb9
---
M api/ParsoidService.js
M guides/apiuse/README.md
2 files changed, 42 insertions(+), 31 deletions(-)

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



diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index a733cab..31a14ff 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -15,11 +15,11 @@
// memwatch = require('memwatch'),
jsDiff = require('diff'),
childProc = require('child_process'),
-   spawn = childProc.spawn,
cluster = require('cluster'),
fs = require('fs'),
path = require('path'),
-   util = require('util');
+   util = require('util'),
+   pkg = require('../package.json');
 
 // local includes
 var mp = '../lib/';
@@ -441,27 +441,6 @@
res.end( );
});
 
-   // Bug report posts
-   app.post( /^\/_bugs\//, function ( req, res ) {
-   console.log( '_bugs', req.body.data );
-   try {
-   var data = JSON.parse( req.body.data ),
-   filename = '/mnt/bugs/' +
-   new Date().toISOString() +
-   '-' + encodeURIComponent(data.title);
-   console.log( filename, data );
-   fs.writeFile(filename, req.body.data, function(err) {
-   if(err) {
-   console.error(err);
-   } else {
-   console.log(The file  + filename +  
was saved!);
-   }
-   });
-   } catch ( e ) {
-   }
-   res.end( );
-   });
-
function action( res ) {
return [ , res.local('iwp'), res.local('pageName') ].join( 
/ );
}
@@ -733,6 +712,34 @@
}
});
 
+   var version = {
+   name: pkg.name,
+   version: pkg.version
+   };
+
+   function gitVersion( cb ) {
+   fs.exists( path.join( __dirname, '/../.git' ), function ( 
exists ) {
+   if ( !exists ) {
+   cb();
+   return;
+   }
+   childProc.exec(
+   'git rev-parse HEAD',
+   function ( error, stdout, stderr ) {
+   if ( !error ) {
+   version.sha = stdout.slice(0, 
-1);
+   }
+   cb();
+   });
+   });
+   }
+
+   /**
+   * Return Parsoid version based on package.json + git sha1 if available
+   */
+   app.get( /_version, function ( req, res ) {
+   res.json( version );
+   });
 
app.use( express.static( __dirname + '/scripts' ) );
app.use( express.limit( '15mb' ) );
@@ -742,9 +749,11 @@
var port = process.env.VCAP_APP_PORT || process.env.PORT || 8000;
var host = process.env.INTERFACE;  // default bind all
 
-   app.listen( port, host );
+   gitVersion( function () {
+   app.listen( port, host );
+   console.log( ' - ' + instanceName + ' ready' );
+   });
 
-   console.log( ' - ' + instanceName + ' ready' );
 }
 
 module.exports = {
diff --git a/guides/apiuse/README.md b/guides/apiuse/README.md
index 1c5a6d6..b149670 100644
--- a/guides/apiuse/README.md
+++ b/guides/apiuse/README.md
@@ -43,11 +43,13 @@
 round-tripping of existing, potentially modified versions of existing
 wiki pages.
 
-## /_bugs/
+## /_version/
 
-### POST
+### GET
 
-If you POST to the /_bugs/ URI, you'll be able to report a bug to the system
-administrators running the instance of Parsoid that you're accessing. You
-might use this to allow users to submit Parsoid bug reports, or even to report
-bugs you expose through your use of the Parsoid service automatically.
+Yield JSON object of the daemon name and version from package.json. If running
+from a git repository, it would add the sha of the HEAD commit (git rev-parse
+HEAD). Example:
+
+$ curl http://localhost:8000/_version
+
{name:mediawiki-parsoid,version:0.0.1,sha:63a778a1ffc1e9bd0dbb3a7571fe40bfb0a6d699}

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

Gerrit-MessageType: 

[MediaWiki-commits] [Gerrit] Fix the thrown exception so the Styled* views can be properl... - change (apps...wikipedia)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Fix the thrown exception so the Styled* views can be properly 
previewed in Intellij
..


Fix the thrown exception so the Styled* views can be properly previewed in 
Intellij

Change-Id: Ia0efc0e9b63ea9332c66efb2c5c1a7d664881218
---
M wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
M wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
M wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
M wikipedia/src/main/java/org/wikipedia/styledviews/StylizedEditText.java
4 files changed, 36 insertions(+), 12 deletions(-)

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



diff --git 
a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java 
b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
index a30afa8..adb245a 100644
--- a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
+++ b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledCheckBox.java
@@ -8,16 +8,22 @@
 public class StyledCheckBox extends CheckBox {
 public StyledCheckBox(Context context) {
 super(context);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledCheckBox(Context context, AttributeSet attrs) {
 super(context, attrs);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledCheckBox(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java 
b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
index f9583d8..8d110da 100644
--- a/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
+++ b/wikipedia/src/main/java/org/wikipedia/styledviews/StyledTextView.java
@@ -8,16 +8,22 @@
 public class StyledTextView extends TextView {
 public StyledTextView(Context context) {
 super(context);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledTextView(Context context, AttributeSet attrs) {
 super(context, attrs);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StyledTextView(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java 
b/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
index 037fd0a..fc399ac 100644
--- a/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
+++ b/wikipedia/src/main/java/org/wikipedia/styledviews/StylizedButton.java
@@ -8,16 +8,22 @@
 public class StylizedButton extends Button {
 public StylizedButton(Context context) {
 super(context);
-
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StylizedButton(Context context, AttributeSet attrs) {
 super(context, attrs);
-setTypeface(((WikipediaApp) 
context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 
 public StylizedButton(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
-setTypeface(((WikipediaApp) 
context.getApplicationContext()).getPrimaryType());
+if (!isInEditMode()) {
+
setTypeface(((WikipediaApp)context.getApplicationContext()).getPrimaryType());
+}
 }
 }
diff --git 

[MediaWiki-commits] [Gerrit] Add 'centralauth-admin-title' message, adding username to HT... - change (mediawiki...CentralAuth)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Add 'centralauth-admin-title' message, adding username to HTML 
title of Special:CentralAuth/Username
..

Add 'centralauth-admin-title' message, adding username to HTML title of 
Special:CentralAuth/Username

* Since CentralAuth accounts have no gender, this just depends on the GENDER on 
the wiki you view. If this is not the right approach, please tell me so.

Bug: 47991
Change-Id: I566fd92111b9159b494266ee953092f8134dff0f
---
M CentralAuth.i18n.php
M specials/SpecialCentralAuth.php
2 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/61/114961/1

diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php
index e2a7fad..e19f56d 100644
--- a/CentralAuth.i18n.php
+++ b/CentralAuth.i18n.php
@@ -212,6 +212,7 @@
'centralauth-admin-suppressreason' = 'Globally suppressed by $1 
for following reason: $2',
'centralauth-admin-not-authorized' = 'You do not have permissions 
to perform this action',
'centralauth-admin-too-many-edits' = 'The global account 
nowiki$1/nowiki has over $2 {{PLURAL:$2|edit|edits}} and cannot be 
hidden.',
+   'centralauth-admin-title'  = 'Global account manager for 
$1',
 
// List of global users
'globalusers'= 'Global accounts list',
@@ -760,6 +761,15 @@
 Parameters:
 * $1 - username
 * $2 - number of edits',
+   'centralauth-admin-title' = '{{Gender}}
+The page title in your browser bar, but not the page title.
+
+Parameters:
+* $1 - the username
+See also:
+* {{msg-mw|Contributions-title}}
+* {{msg-mw|Centralauth}}',
+
'globalusers' = '{{doc-special|GlobalUsers}}
 See example: [[w:Special:GlobalUsers]] and [[w:Special:SpecialPages]]',
'centralauth-listusers-locked' = This message is used as user's info:
diff --git a/specials/SpecialCentralAuth.php b/specials/SpecialCentralAuth.php
index e57f1d4..2fde565 100644
--- a/specials/SpecialCentralAuth.php
+++ b/specials/SpecialCentralAuth.php
@@ -58,6 +58,12 @@
return;
}
 
+   // per bug 47991
+   $this-getOutput()-setHTMLTitle( $this-msg(
+   'pagetitle',
+   $this-msg( 'centralauth-admin-title', $this-mUserName 
)-plain()
+   )-inContentLanguage() );
+
$this-mGlobalUser = $globalUser = new CentralAuthUser( 
$this-mUserName );
 
if ( !$globalUser-exists() ||

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I566fd92111b9159b494266ee953092f8134dff0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Support insertables with numbers in the end - change (mediawiki...Translate)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Support insertables with numbers in the end
..

Support insertables with numbers in the end

Change-Id: Ic339bd2db56b510f74ebf2858edd18f2a6a4af62
---
M insertables/TranslatablePageInsertablesSuggester.php
M tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/62/114962/1

diff --git a/insertables/TranslatablePageInsertablesSuggester.php 
b/insertables/TranslatablePageInsertablesSuggester.php
index 02a3ea7..25d9644 100644
--- a/insertables/TranslatablePageInsertablesSuggester.php
+++ b/insertables/TranslatablePageInsertablesSuggester.php
@@ -17,7 +17,8 @@
// allowed in a variable name, but here we are stricter to 
avoid too many
// false positives.
$matches = array();
-   preg_match_all( '/\$([a-zA-Z0-9-])+/', $text, $matches, 
PREG_SET_ORDER );
+   preg_match_all( '/\$([a-zA-Z0-9-]+)/', $text, $matches, 
PREG_SET_ORDER );
+
$new = array_map( function ( $match ) {
// Numerical ones are already handled by parent
if ( ctype_digit( $match[1] ) ) {
diff --git 
a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php 
b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
index 81a5326..6392898 100644
--- a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
+++ b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
@@ -18,11 +18,12 @@
 
public function getInsertablesProvider() {
return array(
-   array( 'Hi $1, I am $myname $my-middle-name 
$myLastName.', array(
+   array( 'Hi $1, I am $myname $my-middle-name 
$myLastName. $insertables2014 are better than ever.', array(
new Insertable( '$1', '$1', '' ),
new Insertable( '$myname', '$myname', '' ),
new Insertable( '$my-middle-name', 
'$my-middle-name', '' ),
new Insertable( '$myLastName', '$myLastName', 
'' ),
+   new Insertable( '$insertables2014', 
'$insertables2014', '' ),
) ),
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic339bd2db56b510f74ebf2858edd18f2a6a4af62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

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

[MediaWiki-commits] [Gerrit] Open up ssh for wikitech hosts. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Open up ssh for wikitech hosts.
..

Open up ssh for wikitech hosts.

Change-Id: I243400cab5e6ac4fc55180f518979f51507f94b2
---
M manifests/openstack.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/114963/1

diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index f2c63f3..1d5c237 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -12,6 +12,11 @@
 $other_master = '208.80.152.32'
 }
 
+# Wikitech ssh
+ferm::rule { 'ssh_public':
+rule = 'saddr (0.0.0.0/0) proto tcp dport (ssh) ACCEPT;',
+}
+
 # Wikitech HTTP/HTTPS
 ferm::rule { 'http_public':
 rule = 'saddr (0.0.0.0/0) proto tcp dport (http https) ACCEPT;',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I243400cab5e6ac4fc55180f518979f51507f94b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Open up ssh for wikitech hosts. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Open up ssh for wikitech hosts.
..


Open up ssh for wikitech hosts.

Change-Id: I243400cab5e6ac4fc55180f518979f51507f94b2
---
M manifests/openstack.pp
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index f2c63f3..1d5c237 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -12,6 +12,11 @@
 $other_master = '208.80.152.32'
 }
 
+# Wikitech ssh
+ferm::rule { 'ssh_public':
+rule = 'saddr (0.0.0.0/0) proto tcp dport (ssh) ACCEPT;',
+}
+
 # Wikitech HTTP/HTTPS
 ferm::rule { 'http_public':
 rule = 'saddr (0.0.0.0/0) proto tcp dport (http https) ACCEPT;',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I243400cab5e6ac4fc55180f518979f51507f94b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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