[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceBlog[master]: removed BSDebug::logVar()

2017-12-06 Thread Dvogel hallowelt (Code Review)
Dvogel hallowelt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395932 )

Change subject: removed BSDebug::logVar()
..

removed BSDebug::logVar()

Change-Id: Ie82140d0d0ba173bf20d5c81eb9680acc31689be
---
M Blog.class.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/Blog.class.php b/Blog.class.php
index 6953652..76fbe12 100644
--- a/Blog.class.php
+++ b/Blog.class.php
@@ -749,7 +749,6 @@
$oTitle = Title::newFromText( 'Blog', $iNS );
if( $oTitle && $oTitle instanceof Title ) {
$aSubpages = $oTitle->getSubpages();
-   BSDebug::logVar($aSubpages);
}
 
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie82140d0d0ba173bf20d5c81eb9680acc31689be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceBlog
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: [WIP] build: Use svgo of 'grunt-image'

2017-12-06 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395931 )

Change subject: [WIP] build: Use svgo of 'grunt-image'
..

[WIP] build: Use svgo of 'grunt-image'

Using SVGO for further optimization based on
MediaWiki's SVG Coding Conventions.

Change-Id: I88e83c0a183b38679978b8c75f5ffd6dee9b09ec
---
M Gruntfile.js
1 file changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/31/395931/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 2d98d29..b5131a0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -347,10 +347,17 @@
pngout: true,
optipng: true,
advpng: true,
-   pngcrush: true
+   pngcrush: true,
+   svgo: [
+   '--pretty',
+   '--enable',
+   
'sortAttrs,removeRasterImages,removeTitle,removeViewBox,removeXMLProcInst',
+   '--disable',
+   'cleanupIDs,removeDesc'
+   ]
},
expand: true,
-   src: 'dist/**/*.png'
+   src: 'dist/**/*.{png,svg}'
}
},
cssmin: {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88e83c0a183b38679978b8c75f5ffd6dee9b09ec
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Reduce noise in mocha testing by bumping the logger level to...

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395678 )

Change subject: Reduce noise in mocha testing by bumping the logger level to 
warn
..


Reduce noise in mocha testing by bumping the logger level to warn

Change-Id: Iee25de77fe6118786c31fa683ccfdffcf5b0a055
---
M tests/serviceWrapper.js
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/tests/serviceWrapper.js b/tests/serviceWrapper.js
index 43076db..bf4e087 100644
--- a/tests/serviceWrapper.js
+++ b/tests/serviceWrapper.js
@@ -99,9 +99,6 @@
// service-runner doesn't actually call close on the 
worker.
num_workers: 1,
worker_heartbeat_timeout: 2 * 60 * 1000,
-   logging: {
-   level: 'info',  // Default is 'warn'
-   },
services: services,
})
.then(function() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee25de77fe6118786c31fa683ccfdffcf5b0a055
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1098:331{6, 7}

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395929 )

Change subject: db-eqiad,db-codfw.php: Pool db1098:331{6,7}
..


db-eqiad,db-codfw.php: Pool db1098:331{6,7}

db1098 is a multi-instance slave which will be serving in s6 and s7 as
recentchanges.

Pool it slowly

Bug: T178359
Change-Id: Ic230f0bdc57c3a6c085fec43bed69a7848cc0cd4
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 16 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index e6cf582..4983e7c 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -597,7 +597,8 @@
'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
-   'db1098' => '10.64.16.83', # do not remove or comment out
+   'db1098:3316' => '10.64.16.83:3316', # do not remove or comment out
+   'db1098:3317' => '10.64.16.83:3317', # do not remove or comment out
'db1099:3311' => '10.64.16.84:3311', # do not remove or comment out
'db1099:3318' => '10.64.16.84:3318', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 25e5824..a107ab9 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -158,7 +158,7 @@
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 1, # D2 3.6TB 512GB #temporary recentchanges 
#T178359
'db1096:3316' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6
-   # 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T178359
+   'db1098:3316' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
@@ -168,6 +168,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
+   'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
@@ -431,22 +432,27 @@
'watchlist' => [
'db1093' => 1,
'db1096:3316' => 1,
+   'db1098:3316' => 1,
],
'recentchanges' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
'recentchangeslinked' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
'contributions' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
'logpager' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
],
's7' => [
@@ -462,22 +468,27 @@
],
'watchlist' => [
'db1034' => 1,
+   'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'contributions' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'logpager' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
],
@@ -576,7 +587,8 @@
'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
-   'db1098' => '10.64.16.83', # do not remove or comment out
+   'db1098:3316' => '10.64.16.83:3316', # do not remove or comment out
+   'db1098:3317' => '10.64.16.83:3317', # do not remove or comment out
'db1099:3311' => '10.64.16.84:3311', # do not remove 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: placeholder-message for html form should be ->text() not ->p...

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395910 )

Change subject: placeholder-message for html form should be ->text() not 
->parse()
..


placeholder-message for html form should be ->text() not ->parse()

placeholder is an html attribute, it does not support arbitrary
html, so ->text() is most appropriate, not full parse.

Follow up d3cd609e

Change-Id: Ia2aa5a001e19ee90e99936ef4f0dc879f182999f
---
M includes/htmlform/fields/HTMLTextAreaField.php
M includes/htmlform/fields/HTMLTextField.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/htmlform/fields/HTMLTextAreaField.php 
b/includes/htmlform/fields/HTMLTextAreaField.php
index e6963d5..466a251 100644
--- a/includes/htmlform/fields/HTMLTextAreaField.php
+++ b/includes/htmlform/fields/HTMLTextAreaField.php
@@ -16,7 +16,7 @@
parent::__construct( $params );
 
if ( isset( $params['placeholder-message'] ) ) {
-   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->parse();
+   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->text();
} elseif ( isset( $params['placeholder'] ) ) {
$this->mPlaceholder = $params['placeholder'];
}
diff --git a/includes/htmlform/fields/HTMLTextField.php 
b/includes/htmlform/fields/HTMLTextField.php
index 1c5a43d..b2e4f2a 100644
--- a/includes/htmlform/fields/HTMLTextField.php
+++ b/includes/htmlform/fields/HTMLTextField.php
@@ -31,7 +31,7 @@
parent::__construct( $params );
 
if ( isset( $params['placeholder-message'] ) ) {
-   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->parse();
+   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->text();
} elseif ( isset( $params['placeholder'] ) ) {
$this->mPlaceholder = $params['placeholder'];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2aa5a001e19ee90e99936ef4f0dc879f182999f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: db1098.yaml: Enable notifications

2017-12-06 Thread Marostegui (Code Review)
Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395930 )

Change subject: db1098.yaml: Enable notifications
..


db1098.yaml: Enable notifications

The host is ready to be pooled, enabling its notifications

Bug: T178359
Change-Id: I6599f6368291a4b374038ba20ea9cbec93cb5fbb
---
M hieradata/hosts/db1098.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db1098.yaml b/hieradata/hosts/db1098.yaml
index 410a00a..1f679d1 100644
--- a/hieradata/hosts/db1098.yaml
+++ b/hieradata/hosts/db1098.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s6: '185G'
 profile::mariadb::core_multiinstance::s7: '185G'
-profile::base::notifications_enabled: '0'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6599f6368291a4b374038ba20ea9cbec93cb5fbb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: db1098.yaml: Enable notifications

2017-12-06 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395930 )

Change subject: db1098.yaml: Enable notifications
..

db1098.yaml: Enable notifications

The host is ready to be pooled, enabling its notifications

Bug: T178359
Change-Id: I6599f6368291a4b374038ba20ea9cbec93cb5fbb
---
M hieradata/hosts/db1098.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/395930/1

diff --git a/hieradata/hosts/db1098.yaml b/hieradata/hosts/db1098.yaml
index 410a00a..1f679d1 100644
--- a/hieradata/hosts/db1098.yaml
+++ b/hieradata/hosts/db1098.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s6: '185G'
 profile::mariadb::core_multiinstance::s7: '185G'
-profile::base::notifications_enabled: '0'

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Partially fix class-file name mismatch sniffs

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395889 )

Change subject: Partially fix class-file name mismatch sniffs
..


Partially fix class-file name mismatch sniffs

Fix one instance of bad code that triggers both 
MediaWiki.Files.ClassMatchesFilename.NotMatch
and MediaWiki.Files.OneClassPerFile.MultipleFound. One more set of errors 
remains.

Bug: T170583
Change-Id: I45c237b4366477954726a0116fb2d56256276693
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 9 insertions(+), 18 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index eb819f8..20dfe3d 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -10,23 +10,6 @@
 use Title;
 use Wikimedia\TestingAccessWrapper;
 
-class ApiPageSetStub extends ApiPageSet {
-
-   public function __construct( $goodTitles, $missingTitlesByNamespace ) {
-   $this->goodTitles = $goodTitles;
-   $this->missingTitlesByNamespace = $missingTitlesByNamespace;
-   }
-
-   public function getGoodTitles() {
-   return $this->goodTitles;
-   }
-
-   public function getMissingTitlesByNamespace() {
-   return $this->missingTitlesByNamespace;
-   }
-
-}
-
 class ApiQueryPageImagesProxy extends ApiQueryPageImages {
 
public function __construct( ApiPageSet $pageSet ) {
@@ -134,7 +117,15 @@
 * @dataProvider provideGetTitles
 */
public function testGetTitles( $titles, $missingTitlesByNamespace, 
$expected ) {
-   $pageSet = new ApiPageSetStub( $titles, 
$missingTitlesByNamespace );
+   $pageSet = $this->getMockBuilder( 'ApiPageSet' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $pageSet->expects( $this->any() )
+   ->method( 'getGoodTitles' )
+   ->will( $this->returnValue( $titles ) );
+   $pageSet->expects( $this->any() )
+   ->method( 'getMissingTitlesByNamespace' )
+   ->will( $this->returnValue( $missingTitlesByNamespace ) 
);
$queryPageImages = new ApiQueryPageImagesProxy( $pageSet );
 
$this->assertEquals( $expected, $queryPageImages->getTitles() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45c237b4366477954726a0116fb2d56256276693
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Pppery 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1098:331{6, 7}

2017-12-06 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395929 )

Change subject: db-eqiad,db-codfw.php: Pool db1098:331{6,7}
..

db-eqiad,db-codfw.php: Pool db1098:331{6,7}

db1098 is a multi-instance slave which will be serving in s6 and s7 as
recentchanges.

Pool it slowly

Bug: T178359
Change-Id: Ic230f0bdc57c3a6c085fec43bed69a7848cc0cd4
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 16 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index e6cf582..4983e7c 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -597,7 +597,8 @@
'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
-   'db1098' => '10.64.16.83', # do not remove or comment out
+   'db1098:3316' => '10.64.16.83:3316', # do not remove or comment out
+   'db1098:3317' => '10.64.16.83:3317', # do not remove or comment out
'db1099:3311' => '10.64.16.84:3311', # do not remove or comment out
'db1099:3318' => '10.64.16.84:3318', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 25e5824..a107ab9 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -158,7 +158,7 @@
'db1088' => 500, # C2 3.6TB 512GB
'db1093' => 1, # D2 3.6TB 512GB #temporary recentchanges 
#T178359
'db1096:3316' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6
-   # 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T178359
+   'db1098:3316' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
@@ -168,6 +168,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
+   'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
@@ -431,22 +432,27 @@
'watchlist' => [
'db1093' => 1,
'db1096:3316' => 1,
+   'db1098:3316' => 1,
],
'recentchanges' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
'recentchangeslinked' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
'contributions' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
'logpager' => [
'db1093' => 1,
'db1096:3316' => 1,
+   # 'db1098:3316' => 1,
],
],
's7' => [
@@ -462,22 +468,27 @@
],
'watchlist' => [
'db1034' => 1,
+   'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'contributions' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'logpager' => [
'db1034' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
],
@@ -576,7 +587,8 @@
'db1096:3316' => '10.64.0.163:3316', # do not remove or comment out
'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
-   'db1098' => '10.64.16.83', # do not remove or comment out
+   'db1098:3316' => '10.64.16.83:3316', # do not remove or comment out
+   'db1098:3317' => '10.64.16.83:3317', # do not remove or comment out
'db1099:3311' => '10.64.16.84:3311', # 

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: DB_SLAVE -> DB_REPLICA

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394658 )

Change subject: DB_SLAVE -> DB_REPLICA
..


DB_SLAVE -> DB_REPLICA

Extension already required 1.27

Change-Id: I34f1aaf00cca167efd3e913e004bd68cb0da251a
---
M includes/PF_AutocompleteAPI.php
M includes/PF_FormEditAction.php
M includes/PF_FormLinker.php
M includes/PF_Utils.php
M includes/PF_ValuesUtils.php
M includes/forminputs/PF_Tree.php
M specials/PF_CreateForm.php
7 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/includes/PF_AutocompleteAPI.php b/includes/PF_AutocompleteAPI.php
index b57bd77..ff5501a 100644
--- a/includes/PF_AutocompleteAPI.php
+++ b/includes/PF_AutocompleteAPI.php
@@ -187,7 +187,7 @@
global $smwgDefaultStore;
 
$values = array();
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
$sqlOptions = array();
$sqlOptions['LIMIT'] = $wgPageFormsMaxAutocompleteValues;
 
diff --git a/includes/PF_FormEditAction.php b/includes/PF_FormEditAction.php
index 9d6f93e..c68d566 100644
--- a/includes/PF_FormEditAction.php
+++ b/includes/PF_FormEditAction.php
@@ -225,7 +225,7 @@
 * (hopefully) pretty rare.
 */
static function getNumPagesPerForm() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
array( 'category', 'page', 'page_props' ),
array( 'pp_value', 'SUM(cat_pages) AS total_pages' ),
diff --git a/includes/PF_FormLinker.php b/includes/PF_FormLinker.php
index 8f6a731..a25bb53 100644
--- a/includes/PF_FormLinker.php
+++ b/includes/PF_FormLinker.php
@@ -21,7 +21,7 @@
}
 
$pageID = $title->getArticleID();
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'page_props',
array(
'pp_value'
diff --git a/includes/PF_Utils.php b/includes/PF_Utils.php
index 81b6c5f..00574f7 100644
--- a/includes/PF_Utils.php
+++ b/includes/PF_Utils.php
@@ -234,7 +234,7 @@
 * Returns an array of all form names on this wiki.
*/
public static function getAllForms() {
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select( 'page',
'page_title',
array( 'page_namespace' => PF_NS_FORM,
diff --git a/includes/PF_ValuesUtils.php b/includes/PF_ValuesUtils.php
index e806a4b..a6cb598 100644
--- a/includes/PF_ValuesUtils.php
+++ b/includes/PF_ValuesUtils.php
@@ -51,7 +51,7 @@
 */
public static function getCategoriesForPage( $title = null ) {
$categories = array();
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
$conditions = null;
if ( !is_null( $title ) ) {
$titlekey = $title->getArticleID();
@@ -149,7 +149,7 @@
}
global $wgPageFormsMaxAutocompleteValues, 
$wgPageFormsUseDisplayTitle;
 
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
$top_category = str_replace( ' ', '_', $top_category );
$categories = array( $top_category );
$checkcategories = array( $top_category );
@@ -392,7 +392,7 @@
return wfMessage( 'pf-missingnamespace', 
wfEscapeWikiText( $namespace_name ) );
}
 
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
$tables = array( 'page' );
$columns = array( 'page_title' );
$conditions = array();
@@ -540,7 +540,7 @@
public static function getSQLConditionForAutocompleteInColumn( $column, 
$substring, $replaceSpaces = true ) {
global $wgDBtype, $wgPageFormsAutocompleteOnAllChars;
 
-   $db = wfGetDB( DB_SLAVE );
+   $db = wfGetDB( DB_REPLICA );
 
// CONVERT() is also supported in PostgreSQL, but it doesn't
// seem to work the same way.
diff --git a/includes/forminputs/PF_Tree.php b/includes/forminputs/PF_Tree.php
index aae7e64..c29378a 100644
--- a/includes/forminputs/PF_Tree.php
+++ b/includes/forminputs/PF_Tree.php
@@ -85,7 +85,7 @@
 * @return array
 */
private static function getSubcategories( $categoryName ) {
-   $dbr = wfGetDb( DB_SLAVE );
+   $dbr = wfGetDb( DB_REPLICA );
 
$tables = array( 'page', 'categorylinks' );
$fields = array( 'page_id', 'page_namespace', 'page_title',
diff --git 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Pool db1099:3311

2017-12-06 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395928 )

Change subject: db-eqiad.php: Pool db1099:3311
..

db-eqiad.php: Pool db1099:3311

db1099 finished compression on s1, so starting to pool it in s1 as
recentchanges

Bug: T178359
Change-Id: I538b84bd34c4a556ab4270961812fa9dbd4ad08a
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 25e5824..ae5a15d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -113,6 +113,7 @@
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
'db1089' => 500, # C3 3.6TB 512GB
+   'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
's2' => [
@@ -264,22 +265,27 @@
's1' => [
'watchlist' => [
'db1055' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
'db1055' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
'db1055' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
'db1055' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
'db1055' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'dump' => [

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

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

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1074

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395927 )

Change subject: db-eqiad.php: Depool db1074
..


db-eqiad.php: Depool db1074

Needs alter table.
Pool db1076 in API to help temporarily

Bug: T174569
Change-Id: Id8ab98e8640308a1e7feddda3d3ffb8db8e5e306
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index bfd5e4c..25e5824 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -119,8 +119,8 @@
'db1054' => 0,   # A3 2.8TB  96GB, master
'db1053' => 0,   # A2 2.8TB  96GB, vslow, dump
'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743
-   'db1074' => 300, # A2 3.6TB 512GB, api
-   'db1076' => 500, # B1 3.6TB 512GB
+   # 'db1074' => 300, # A2 3.6TB 512GB, api #T174569
+   'db1076' => 300, # B1 3.6TB 512GB #temporary API #T174569
'db1090' => 500, # C3 3.6TB 512GB
'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
'db1105:3312' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
@@ -303,7 +303,7 @@
],
'api' => [
'db1060' => 2,
-   'db1074' => 1,
+   'db1076' => 1,
],
'watchlist' => [
'db1103:3312' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8ab98e8640308a1e7feddda3d3ffb8db8e5e306
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1074

2017-12-06 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395927 )

Change subject: db-eqiad.php: Depool db1074
..

db-eqiad.php: Depool db1074

Needs alter table.
Pool db1076 in API to help temporarily

Bug: T174569
Change-Id: Id8ab98e8640308a1e7feddda3d3ffb8db8e5e306
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index bfd5e4c..25e5824 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -119,8 +119,8 @@
'db1054' => 0,   # A3 2.8TB  96GB, master
'db1053' => 0,   # A2 2.8TB  96GB, vslow, dump
'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743
-   'db1074' => 300, # A2 3.6TB 512GB, api
-   'db1076' => 500, # B1 3.6TB 512GB
+   # 'db1074' => 300, # A2 3.6TB 512GB, api #T174569
+   'db1076' => 300, # B1 3.6TB 512GB #temporary API #T174569
'db1090' => 500, # C3 3.6TB 512GB
'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
'db1105:3312' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
@@ -303,7 +303,7 @@
],
'api' => [
'db1060' => 2,
-   'db1074' => 1,
+   'db1076' => 1,
],
'watchlist' => [
'db1103:3312' => 1,

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: LocalSettingsGenerator: Fix typo in exception message

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395926 )

Change subject: LocalSettingsGenerator: Fix typo in exception message
..


LocalSettingsGenerator: Fix typo in exception message

Change-Id: I61fe67468eec659f312fb9aa4c20ec9bf083e78b
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/installer/LocalSettingsGenerator.php 
b/includes/installer/LocalSettingsGenerator.php
index bdaeaca..b4ef49d 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -185,7 +185,7 @@
$jsonFile = 'skin.json';
$function = 'wfLoadSkin';
} else {
-   throw new InvalidArgumentException( '$dir was not 
"extensions" or "skins' );
+   throw new InvalidArgumentException( '$dir was not 
"extensions" or "skins"' );
}
 
$encName = self::escapePhpString( $name );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61fe67468eec659f312fb9aa4c20ec9bf083e78b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cocoa 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix typo miss in LocalSettingsGenerator.php

2017-12-06 Thread Cocoa (Code Review)
Cocoa has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395926 )

Change subject: Fix typo miss in LocalSettingsGenerator.php
..

Fix typo miss in LocalSettingsGenerator.php

Change-Id: I61fe67468eec659f312fb9aa4c20ec9bf083e78b
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/395926/1

diff --git a/includes/installer/LocalSettingsGenerator.php 
b/includes/installer/LocalSettingsGenerator.php
index bdaeaca..b4ef49d 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -185,7 +185,7 @@
$jsonFile = 'skin.json';
$function = 'wfLoadSkin';
} else {
-   throw new InvalidArgumentException( '$dir was not 
"extensions" or "skins' );
+   throw new InvalidArgumentException( '$dir was not 
"extensions" or "skins"' );
}
 
$encName = self::escapePhpString( $name );

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Always return a string from Language::formatNum()

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395878 )

Change subject: Always return a string from Language::formatNum()
..


Always return a string from Language::formatNum()

It says it returns a string, and so it should.

Bug: T182277
Change-Id: Ic68c65c634c2557a1d07281623cd6c971b000323
---
M languages/Language.php
M tests/phpunit/languages/LanguageTest.php
2 files changed, 28 insertions(+), 1 deletion(-)

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



diff --git a/languages/Language.php b/languages/Language.php
index 81564ab..8d3984d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3268,7 +3268,7 @@
}
}
 
-   return $number;
+   return (string)$number;
}
 
/**
diff --git a/tests/phpunit/languages/LanguageTest.php 
b/tests/phpunit/languages/LanguageTest.php
index cd52366..e39f57e 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1630,6 +1630,33 @@
}
 
/**
+* @dataProvider testFormatNumProvider
+* @covers Language::formatNum
+*/
+   public function testFormatNum(
+   $translateNumerals, $langCode, $number, $nocommafy, $expected
+   ) {
+   $this->setMwGlobals( [ 'wgTranslateNumerals' => 
$translateNumerals ] );
+   $lang = Language::factory( $langCode );
+   $formattedNum = $lang->formatNum( $number, $nocommafy );
+   $this->assertType( 'string', $formattedNum );
+   $this->assertEquals( $expected, $formattedNum );
+   }
+
+   public function testFormatNumProvider() {
+   return [
+   [ true, 'en', 100, false, '100' ],
+   [ true, 'en', 101, true, '101' ],
+   [ false, 'en', 103, false, '103' ],
+   [ false, 'en', 104, true, '104' ],
+   [ true, 'en', '105', false, '105' ],
+   [ true, 'en', '106', true, '106' ],
+   [ false, 'en', '107', false, '107' ],
+   [ false, 'en', '108', true, '108' ],
+   ];
+   }
+
+   /**
 * @dataProvider parseFormattedNumberProvider
 */
public function testParseFormattedNumber( $langCode, $number ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic68c65c634c2557a1d07281623cd6c971b000323
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...SecurityCheckPlugin[master]: Make README prettier

2017-12-06 Thread BryanDavis (Code Review)
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395925 )

Change subject: Make README prettier
..

Make README prettier

Make the README a bit nicer introduction to the functionality provided
by the plugin by converting to Markdown and adding some headings and
formatting.

Change-Id: I4b02a95c7b00b04c96915f6d94b3f715460f643c
---
D README
A README.md
2 files changed, 180 insertions(+), 144 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/tools/phan/SecurityCheckPlugin 
refs/changes/25/395925/1

diff --git a/README b/README
deleted file mode 100644
index 6b6a965..000
--- a/README
+++ /dev/null
@@ -1,144 +0,0 @@
-This is a plugin to Phan to try and detect security issues
-(such as XSS). It keeps track of any time a user can modify
-a variable, and checks to see that such variables are
-escaped before being output as html or used as an sql query, etc.
-
-It is primarily intended for scanning MediaWiki extensions,
-however it supports a generic mode which should work with
-any PHP project.
-
-This plugin should be considered beta quality. Generic mode isn't
-well tested yet.
-
-Requirements:
-* php >= 7.0
-* Phan 0.8.0 [This has not been tested on any other version of phan]
-* Lots of memory. Scanning MediaWiki seems to take about 3 minutes
-and use about 2 GB of memory. Running out of memory may be a real issue
-if you try and scan something from within a VM that has limited
-memory.
-
-== How to use ==
-=== via composer (recommended) ===
-[This doesn't actually work yet, as package not in packagist]
-
-* Run (from the root directory of your project)
-
-$ composer require --dev wikimedia/security-check-plugin
-
-* For mediawiki extension, add the following to composer.json
-
-"scripts": {
-   "seccheck": "seccheck-mwext"
-   "seccheck-fast": "seccheck-fast-mwext"
-},
-
-* For a generic php project add
-
-"scripts": {
-   "seccheck": "seccheck-generic"
-},
-
-* For mediawiki core add
-
-"scripts": {
-   "seccheck": "seccheck-mw"
-},
-
-You can then run:
-$ composer seccheck
-
-to run the security check. Note that false positives are disabled by default.
-For mediawiki extensions, this assumes the extension is installed in the normal
-extension directory, and thus MediaWiki is in ../../. If this is not the case,
-then you need to specify the MW_INSTALL_PATH environment variable.
-
-This plugin also provides variants seccheck-fast-mwext (Doesn't analyse 
mediawiki
-core. May miss some stuff related to hooks) and seccheck-slow-mwext (Also 
analyzes vendor). seccheck-mwext will generally take about 3 minutes, where 
seccheck-fast-mwext
-takes only about half a minute.
-
-Additionally, if you want to do a really quick check, you can run the 
seccheck-generic script from a mediawiki extension which will ignore all 
MediaWiki stuff,
-making the check much faster (but misses many issues).
-
-If you want to do custom configuration (to say exclude some directories), 
follow the instructions below unser Manually.
-=== Manually ===
-
-For MediaWiki mode, add MediaWikiSecurityCheckPlugin.php to the
-list of plugins in your phan config.php file.
-
-For generic mode, add GenericSecurityCheckPlugin.php to the list
-of plugins in your phan config.php file.
-
-Then run phan as you normally would:
-$ php7.0 /path/to/phan/phan -p
-
-== Using the plugin ==
-
-The plugin will output various issue types depending on what it
-detects. The issue types it outputs are:
-
-* SecurityCheckMulti - For when there are multiple types of security issues 
involved
-* SecurityCheck-XSS
-* SecurityCheck-SQLInjection
-* SecurityCheck-ShellInjection
-* SecurityCheck-PHPSerializeInjection - For when someone does unserialize( 
$_GET['d'] ); This issue type seems to have a high false positive rate 
currently.
-* SecurityCheck-CUSTOM1 - To allow people to have custom taint types
-* SecurityCheck-CUSTOM2 - ditto
-* SecurityCheck-OTHER - At the moment, this corresponds to things that don't 
have an escaping function to make input safe. e.g. eval( $_GET['foo'] ); 
require $_GET['bar'];
-* SecurityCheck-LikelyFalsePositive - A potential issue, but probably not. 
Mostly happens when the plugin gets confused.
-
-The severity field is usually marked as Issue::SEVERITY_NORMAL (5). False 
positives
-get Issue::SEVERITY_LOW (0). Issues that may result in server compromise
-(as opposed to just end user compromise) such as shell or sql injection are
-marked as Issue::SEVERITY_CRITICAL (10). SerializationInjection would normally
-be "critical" but its currently denoted as a severity of NORMAL because the 
check
-seems to have a high false positive rate at the moment.
-
-You can use the -y command line option of phan to filter by severity.
-
-=== Limitations ===
-There's much more than listed here, but some notable limitations/bugs:
-
-* When an issue is output, the plugin tries to include details about what
-line originally caused the 

[MediaWiki-commits] [Gerrit] labs/striker[master]: Update for diffusion.repository.search API change

2017-12-06 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395924 )

Change subject: Update for diffusion.repository.search API change
..

Update for diffusion.repository.search API change

The field is no longer called "name", it is now "query".

Bug: T182142
Change-Id: I860d5f3d241a1b37b842d676d3d2bc9ccab7d23d
---
M striker/phabricator.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker 
refs/changes/24/395924/1

diff --git a/striker/phabricator.py b/striker/phabricator.py
index 72c3704..5b367b1 100644
--- a/striker/phabricator.py
+++ b/striker/phabricator.py
@@ -157,7 +157,7 @@
 """Lookup information on a diffusion repository by name."""
 r = self.post('diffusion.repository.search', {
 'constraints': {
-'name': name,
+'query': name,
 },
 'attachments': {
 'uris': True,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I860d5f3d241a1b37b842d676d3d2bc9ccab7d23d
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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


[MediaWiki-commits] [Gerrit] operations...cdh[master]: Enable more accurate smaps based rss checking

2017-12-06 Thread EBernhardson (Code Review)
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395923 )

Change subject: Enable more accurate smaps based rss checking
..

Enable more accurate smaps based rss checking

Training xgboost models in the hadoop cluster is running into some
issues where yarn regularly kills containers, but only some of them.
Based on review of yarn's code it appears this is because we are using
the default RSS calculation which is documented as less accurate.
Specifically it includes pages that the kernel is free to evict, and
double(triple, etc) counts read only memory shared by many processes.

A custom implementation of that algorithm was injected into a background
task of training mlr models and found that the more accurate algorithm
shows a constant memory usage. Enabling this will allow us to stop
over-allocating memory to account for this discrepency, and require
250Gb less memory for the 9 hour training process.

Bug: T182276
Change-Id: I0f8223db4d4abc26eb9d04ff106b7e49602f504e
---
M templates/hadoop/yarn-site.xml.erb
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/templates/hadoop/yarn-site.xml.erb 
b/templates/hadoop/yarn-site.xml.erb
index 5657577..913a028 100644
--- a/templates/hadoop/yarn-site.xml.erb
+++ b/templates/hadoop/yarn-site.xml.erb
@@ -169,6 +169,12 @@
 org.apache.spark.network.yarn.YarnShuffleService
   
 
+  
+RSS usage of a process computed via /proc/pid/stat is not 
very accurate as it includes shared pages of a process. /proc/pid/smaps 
provides useful information like Private_Dirty, Private_Clean, Shared_Dirty, 
Shared_Clean which can be used for computing more accurate RSS. When this flag 
is enabled, RSS is computed as Min(Shared_Dirty, Pss) + Private_Clean + 
Private_Dirty. It excludes read-only shared mappings in RSS 
computation.
+
yarn.nodemanager.container-monitor.procfs-tree.smaps-based-rss.enabled
+true
+  
+
 <% if @datanode_mounts -%>
   
 List of directories to store localized files in.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f8223db4d4abc26eb9d04ff106b7e49602f504e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Remove unreachable page name clear

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395677 )

Change subject: Remove unreachable page name clear
..


Remove unreachable page name clear

 * pageName is always set.  If this were a useful feature, it could be
   implemented w/ titleMissing, but it's not, the page is always parsed
   in the context of a name.

Change-Id: I0df7d6204f01c0f73070ae370b9d66a879ef08bb
---
M lib/api/routes.js
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/lib/api/routes.js b/lib/api/routes.js
index 7ca157f..f7969db 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -344,11 +344,6 @@
startTimers.set('wt2html.wt.parse', 
Date.now());
metrics.timing('wt2html.wt.size.input', 
wikitext.length);
}
-
-   if (!res.locals.pageName) {
-   // clear default page name
-   env.page.name = '';
-   }
} else if (oldid) {
envOptions.pageWithOldid = true;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0df7d6204f01c0f73070ae370b9d66a879ef08bb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Reject lint requests if linting isn't enabled

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395676 )

Change subject: Reject lint requests if linting isn't enabled
..


Reject lint requests if linting isn't enabled

Change-Id: I41cf86d45466db75b07fb09ceffcacc72bc3f620
---
M lib/api/routes.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/lib/api/routes.js b/lib/api/routes.js
index d830061..7ca157f 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -43,8 +43,11 @@
 
var validGets = new Set(['wikitext', 'html', 'pagebundle']);
 
+   var wikitextTransforms = ['html', 'pagebundle'];
+   if (parsoidConfig.linting) { wikitextTransforms.push('lint'); }
+
var validTransforms = new Map(Object.entries({
-   'wikitext': ['html', 'pagebundle', 'lint'],
+   'wikitext': wikitextTransforms,
'html': ['wikitext'],
'pagebundle': ['wikitext', 'pagebundle'],
}));

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41cf86d45466db75b07fb09ceffcacc72bc3f620
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Slowly start to wean us off using parser env in http api routes

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395583 )

Change subject: Slowly start to wean us off using parser env in http api routes
..


Slowly start to wean us off using parser env in http api routes

Change-Id: I55cb78bb09198cf419409c4802f8492adac25aea
---
M lib/api/apiUtils.js
M lib/api/internal.js
M lib/api/routes.js
M lib/parse.js
4 files changed, 22 insertions(+), 23 deletions(-)

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



diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js
index c919a76..bdc85d2 100644
--- a/lib/api/apiUtils.js
+++ b/lib/api/apiUtils.js
@@ -166,9 +166,9 @@
env.log('fatal/request', err);
 };
 
-apiUtils.logTime = function(env, res, str) {
-   env.log('info', util.format(
-   'completed %s in %s ms', str, Date.now() - res.locals.start
+apiUtils.logTime = function(processLogger, res, str) {
+   processLogger.log('info', util.format(
+   'completed %s in %sms', str, Date.now() - res.locals.start
));
 };
 
diff --git a/lib/api/internal.js b/lib/api/internal.js
index 2bfb57e..0823b83 100644
--- a/lib/api/internal.js
+++ b/lib/api/internal.js
@@ -48,7 +48,7 @@
 
 var rtResponse = function(env, req, res, data) {
apiUtils.renderResponse(res, 'roundtrip', data);
-   apiUtils.logTime(env, res, 'parsing');
+   env.log('info', 'completed in ' + (Date.now() - res.locals.start) + 
'ms');
 };
 
 module.exports = function(parsoidConfig, processLogger) {
diff --git a/lib/api/routes.js b/lib/api/routes.js
index 260185f..d830061 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -198,7 +198,7 @@
 
// Validate and set the content version
if (!apiUtils.validateAndSetContentVersion(res, 
acceptableTypes)) {
-   if (env.conf.parsoid.strictAcceptCheck) {
+   if (parsoidConfig.strictAcceptCheck) {
var text = 
env.availableVersions.reduce(function(prev, curr) {
return prev + apiUtils[opts.format + 
'ContentType'](env, curr) + '\n';
}, 'Not acceptable.\n');
@@ -283,15 +283,9 @@
});
}
 
-   p = p.tap(function() {
-   env.bumpParserResourceUse('wikitextSize',
-   (typeof wt !== 'string' ? env.page.src : 
wt).length);
-   });
-
var doSubst = (typeof wt === 'string' && res.locals.subst);
if (doSubst) {
p = p.then(function(wikitext) {
-   // FIXME: reset limits after subst'ing
return apiUtils.substTopLevelTemplates(env, 
target, wikitext);
});
}
@@ -306,7 +300,7 @@
}
 
// Follow redirects if asked
-   if (env.conf.parsoid.devAPI && 
req.query.follow_redirects) {
+   if (parsoidConfig.devAPI && req.query.follow_redirects) 
{
// Get localized redirect matching regexp
var reSrc = 
env.conf.wiki.getMagicWordMatcher('redirect').source;
reSrc = '^[ \\t\\n\\r\\0\\x0b]*' +
@@ -321,7 +315,7 @@
}
}
 
-   env.log('info', 'started parsing');
+   processLogger.log('info', 'started parsing');
 
var envOptions = Object.assign({
pageBundle: pageBundle,
@@ -407,7 +401,7 @@
}
metrics.endTiming('wt2html.total', 
startTimers.get('wt2html.total'));
}
-   apiUtils.logTime(env, res, 'parsing');
+   apiUtils.logTime(processLogger, res, 'parsing');
});
});
});
@@ -423,8 +417,7 @@
// Performance Timing options
var startTimers = new Map();
 
-   env.bumpSerializerResourceUse('htmlSize', html.length);
-   env.log('info', 'started serializing');
+   processLogger.log('info', 'started serializing');
 
if (metrics) {
startTimers.set('html2wt.init', Date.now());
@@ -524,7 +517,7 @@
//clean round-tripping of HTML retrieved earlier with"
// So, no oldid => no selser
var hasOldId = !!res.locals.oldid;
-   var useSelser = hasOldId && env.conf.parsoid.useSelser;
+   var useSelser = hasOldId && parsoidConfig.useSelser;
 
var selser;

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WikiPageTest: Fix typo in @covers

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395922 )

Change subject: WikiPageTest: Fix typo in @covers
..


WikiPageTest: Fix typo in @covers

Change-Id: I3f3a3b2a1f5e5aed61cd71db17ae6a6a01fe2ecb
---
M tests/phpunit/includes/page/WikiPageDbTestBase.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/phpunit/includes/page/WikiPageDbTestBase.php 
b/tests/phpunit/includes/page/WikiPageDbTestBase.php
index c4ec4dd..b8480dd 100644
--- a/tests/phpunit/includes/page/WikiPageDbTestBase.php
+++ b/tests/phpunit/includes/page/WikiPageDbTestBase.php
@@ -1447,8 +1447,8 @@
 
/**
 * @dataProvider provideTestInsertProtectNullRevision
-* @covers WikiPge::insertProtectNullRevision
-* @covers WikiPge::protectDescription
+* @covers WikiPage::insertProtectNullRevision
+* @covers WikiPage::protectDescription
 *
 * @param string $revCommentMsg
 * @param array $limit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f3a3b2a1f5e5aed61cd71db17ae6a6a01fe2ecb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Handle long lines in news-sites.js consistently

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395921 )

Change subject: Hygiene: Handle long lines in news-sites.js consistently
..


Hygiene: Handle long lines in news-sites.js consistently

Change-Id: I9ca4adc7c287cea25ce079c31019576a8ad4132d
---
M etc/feed/news-sites.js
1 file changed, 6 insertions(+), 11 deletions(-)

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



diff --git a/etc/feed/news-sites.js b/etc/feed/news-sites.js
index ea32f50..15b5c43 100644
--- a/etc/feed/news-sites.js
+++ b/etc/feed/news-sites.js
@@ -44,30 +44,25 @@
 const TOPIC_SELECTOR_LINK = 'a[rel="mw:WikiLink"]:nth-of-type(1)';
 const TOPIC_SELECTOR_BOLD_LINK = 'b:nth-of-type(1) a[rel="mw:WikiLink"]';
 
+/* eslint-disable max-len */
 /**
- * @type {{Object.}} A map of Wikipedia site languages codes
- * to NewsSites
+ * @type {{Object.}} A map of Wikipedia site languages codes 
to NewsSites
  */
 module.exports = {
-da: new NewsSite('Skabelon:Forside_aktuelle_begivenheder', 'div > li',
-TOPIC_SELECTOR_BOLD_LINK),
+da: new NewsSite('Skabelon:Forside_aktuelle_begivenheder', 'div > li', 
TOPIC_SELECTOR_BOLD_LINK),
 de: new NewsSite('Wikipedia:Hauptseite/Aktuelles', 'li', 
TOPIC_SELECTOR_LINK),
 el: new NewsSite('Πύλη:Τρέχοντα_γεγονότα/Επικεφαλίδες', 'li', 
TOPIC_SELECTOR_LINK),
 en: new NewsSite('Template:In_the_news', 'ul[id^=mw] li', 
TOPIC_SELECTOR_BOLD_LINK),
-es: new NewsSite('Portal:Actualidad',
-'table:nth-of-type(1) > tbody > tr > td > ul:nth-of-type(1) > li', 
TOPIC_SELECTOR_LINK),
+es: new NewsSite('Portal:Actualidad', 'table:nth-of-type(1) > tbody > tr > 
td > ul:nth-of-type(1) > li', TOPIC_SELECTOR_LINK),
 fi: new NewsSite('Malline:Uutisissa', 'body > ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 fr: new NewsSite('Modèle:Accueil_actualité', 'div ul[id^=mw] > li', 
TOPIC_SELECTOR_BOLD_LINK),
 he: new NewsSite('תבנית:חדשות_ואקטואליה', 'body > ul > li', 
TOPIC_SELECTOR_LINK),
 ko: new NewsSite('틀:새로_들어온_소식', 'body > ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 no: new NewsSite('Mal:Aktuelt', 'ul > li', TOPIC_SELECTOR_BOLD_LINK),
 pl: new NewsSite('Szablon:Aktualności', 'ul:last-of-type > li', 
TOPIC_SELECTOR_BOLD_LINK),
-pt: new NewsSite('Portal:Eventos_atuais', 'table:nth-child(3) ul > li',
-TOPIC_SELECTOR_BOLD_LINK),
-// eslint-disable-next-line max-len
+pt: new NewsSite('Portal:Eventos_atuais', 'table:nth-child(3) ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 ru: new NewsSite('Шаблон:Текущие_события_на_заглавной_странице', 'body > 
ul > li', TOPIC_SELECTOR_BOLD_LINK),
 sco: new NewsSite('Template:In_the_news', 'ul[id^=mw] li', 
TOPIC_SELECTOR_BOLD_LINK), // see en
-sv: new NewsSite('Portal:Huvudsida/Aktuella händelser', 'body > ul > li',
-TOPIC_SELECTOR_BOLD_LINK),
+sv: new NewsSite('Portal:Huvudsida/Aktuella händelser', 'body > ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 vi: new NewsSite('Bản_mẫu:Tin_tức', 'ul > li', TOPIC_SELECTOR_BOLD_LINK)
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ca4adc7c287cea25ce079c31019576a8ad4132d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WikiPageTest: Fix typo in @covers

2017-12-06 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395922 )

Change subject: WikiPageTest: Fix typo in @covers
..

WikiPageTest: Fix typo in @covers

Change-Id: I3f3a3b2a1f5e5aed61cd71db17ae6a6a01fe2ecb
---
M tests/phpunit/includes/page/WikiPageDbTestBase.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/395922/1

diff --git a/tests/phpunit/includes/page/WikiPageDbTestBase.php 
b/tests/phpunit/includes/page/WikiPageDbTestBase.php
index c4ec4dd..b8480dd 100644
--- a/tests/phpunit/includes/page/WikiPageDbTestBase.php
+++ b/tests/phpunit/includes/page/WikiPageDbTestBase.php
@@ -1447,8 +1447,8 @@
 
/**
 * @dataProvider provideTestInsertProtectNullRevision
-* @covers WikiPge::insertProtectNullRevision
-* @covers WikiPge::protectDescription
+* @covers WikiPage::insertProtectNullRevision
+* @covers WikiPage::protectDescription
 *
 * @param string $revCommentMsg
 * @param array $limit

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Handle long lines in news-sites.js consistently

2017-12-06 Thread Mholloway (Code Review)
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395921 )

Change subject: Hygiene: Handle long lines in news-sites.js consistently
..

Hygiene: Handle long lines in news-sites.js consistently

Change-Id: I9ca4adc7c287cea25ce079c31019576a8ad4132d
---
M etc/feed/news-sites.js
1 file changed, 6 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/21/395921/1

diff --git a/etc/feed/news-sites.js b/etc/feed/news-sites.js
index ea32f50..15b5c43 100644
--- a/etc/feed/news-sites.js
+++ b/etc/feed/news-sites.js
@@ -44,30 +44,25 @@
 const TOPIC_SELECTOR_LINK = 'a[rel="mw:WikiLink"]:nth-of-type(1)';
 const TOPIC_SELECTOR_BOLD_LINK = 'b:nth-of-type(1) a[rel="mw:WikiLink"]';
 
+/* eslint-disable max-len */
 /**
- * @type {{Object.}} A map of Wikipedia site languages codes
- * to NewsSites
+ * @type {{Object.}} A map of Wikipedia site languages codes 
to NewsSites
  */
 module.exports = {
-da: new NewsSite('Skabelon:Forside_aktuelle_begivenheder', 'div > li',
-TOPIC_SELECTOR_BOLD_LINK),
+da: new NewsSite('Skabelon:Forside_aktuelle_begivenheder', 'div > li', 
TOPIC_SELECTOR_BOLD_LINK),
 de: new NewsSite('Wikipedia:Hauptseite/Aktuelles', 'li', 
TOPIC_SELECTOR_LINK),
 el: new NewsSite('Πύλη:Τρέχοντα_γεγονότα/Επικεφαλίδες', 'li', 
TOPIC_SELECTOR_LINK),
 en: new NewsSite('Template:In_the_news', 'ul[id^=mw] li', 
TOPIC_SELECTOR_BOLD_LINK),
-es: new NewsSite('Portal:Actualidad',
-'table:nth-of-type(1) > tbody > tr > td > ul:nth-of-type(1) > li', 
TOPIC_SELECTOR_LINK),
+es: new NewsSite('Portal:Actualidad', 'table:nth-of-type(1) > tbody > tr > 
td > ul:nth-of-type(1) > li', TOPIC_SELECTOR_LINK),
 fi: new NewsSite('Malline:Uutisissa', 'body > ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 fr: new NewsSite('Modèle:Accueil_actualité', 'div ul[id^=mw] > li', 
TOPIC_SELECTOR_BOLD_LINK),
 he: new NewsSite('תבנית:חדשות_ואקטואליה', 'body > ul > li', 
TOPIC_SELECTOR_LINK),
 ko: new NewsSite('틀:새로_들어온_소식', 'body > ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 no: new NewsSite('Mal:Aktuelt', 'ul > li', TOPIC_SELECTOR_BOLD_LINK),
 pl: new NewsSite('Szablon:Aktualności', 'ul:last-of-type > li', 
TOPIC_SELECTOR_BOLD_LINK),
-pt: new NewsSite('Portal:Eventos_atuais', 'table:nth-child(3) ul > li',
-TOPIC_SELECTOR_BOLD_LINK),
-// eslint-disable-next-line max-len
+pt: new NewsSite('Portal:Eventos_atuais', 'table:nth-child(3) ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 ru: new NewsSite('Шаблон:Текущие_события_на_заглавной_странице', 'body > 
ul > li', TOPIC_SELECTOR_BOLD_LINK),
 sco: new NewsSite('Template:In_the_news', 'ul[id^=mw] li', 
TOPIC_SELECTOR_BOLD_LINK), // see en
-sv: new NewsSite('Portal:Huvudsida/Aktuella händelser', 'body > ul > li',
-TOPIC_SELECTOR_BOLD_LINK),
+sv: new NewsSite('Portal:Huvudsida/Aktuella händelser', 'body > ul > li', 
TOPIC_SELECTOR_BOLD_LINK),
 vi: new NewsSite('Bản_mẫu:Tin_tức', 'ul > li', TOPIC_SELECTOR_BOLD_LINK)
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ca4adc7c287cea25ce079c31019576a8ad4132d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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


[MediaWiki-commits] [Gerrit] mediawiki...JSBreadCrumbs[master]: Fix plural in i18n messages

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394515 )

Change subject: Fix plural in i18n messages
..


Fix plural in i18n messages

Change-Id: I911cd2b8bed9d676e65833106465abdd0505cdbf
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index a0f70c8..d87b3ea 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,8 +8,8 @@
},
"jsbreadcrumbs-desc": "Adds a trail of bread crumbs below the tab bar",
"jsbreadcrumbs-horizontal-separator": "»",
-   "jsbreadcrumbs-intro-horizontal": "Last $1 Pages Viewed: ",
-   "jsbreadcrumbs-intro-vertical": "Last $1 Pages Viewed",
+   "jsbreadcrumbs-intro-horizontal": "Last {{PLURAL:$1|Page|$1 Pages}} 
Viewed: ",
+   "jsbreadcrumbs-intro-vertical": "Last {{PLURAL:$1|Page|$1 Pages}} 
Viewed",
"prefs-jsbreadcrumbs": "Bread Crumbs",
"prefs-jsbreadcrumbs-showaction": "Show action bread crumbs",
"prefs-jsbreadcrumbs-showcrumbs": "Display bread crumbs",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 795eafe..e8066cf 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,8 +11,8 @@
},
"jsbreadcrumbs-desc": "{{desc|name=JS Bread 
Crumbs|url=https://www.mediawiki.org/wiki/Extension:JSBreadCrumbs}};,
"jsbreadcrumbs-horizontal-separator": "{{optional}}",
-   "jsbreadcrumbs-intro-horizontal": "Used as bread crumb description when 
the bread crumbs are horizontal.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by \":\" and bread crumbs 
(\"»\"-separated links).",
-   "jsbreadcrumbs-intro-vertical": "Used as bread crumb description when 
the bread crumbs are vertical.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by \":\" and bread crumbs 
(\"»\"-separated links).",
+   "jsbreadcrumbs-intro-horizontal": "Used as bread crumb description when 
the bread crumbs are horizontal.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by bread crumbs separated by 
jsbreadcrumbs-horizontal-separator).",
+   "jsbreadcrumbs-intro-vertical": "Used as bread crumb description when 
the bread crumbs are vertical.\n\nThis message includes a parameter for the 
number of crumbs shown and is followed by bread crumbs on separate lines).",
"prefs-jsbreadcrumbs": "This is the name of the extension JS Bread 
Crumbs (https://www.mediawiki.org/wiki/Extension:JSBreadCrumbs). The expression 
\"Bread Crumbs\" designates a kind of navigation bar (see 
https://en.wiktionary.org/wiki/breadcrumbs).",
"prefs-jsbreadcrumbs-showaction": "Used as checkbox label in 
[[Special:Preferences]].",
"prefs-jsbreadcrumbs-showcrumbs": "Used as checkbox label in 
[[Special:Preferences]].",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I911cd2b8bed9d676e65833106465abdd0505cdbf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/JSBreadCrumbs
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Kghbln 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...DisplayTitle[master]: Handle integers passed as link text

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394755 )

Change subject: Handle integers passed as link text
..


Handle integers passed as link text

This issue occurs on the Special:Log page when viewing the patrol
log in MW 1.30+. This also fixes a bug introduced in
I2e5dfb586e5169dd7c3b0c4ffdca84974c2163c8 that causes self links to
be wrapped in HtmlArmor. And, unnecessary hook return statements are
removed. Upgraded manifest version. Requires MediaWiki 1.29+.

Bug: T181669
Change-Id: I997224257dc62284469168c9752f72367d0496e1
---
M extension.json
M includes/DisplayTitleHooks.php
2 files changed, 17 insertions(+), 24 deletions(-)

Approvals:
  Kghbln: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Samwilson: Looks good to me, but someone else must approve



diff --git a/extension.json b/extension.json
index 3775ed5..257ae37 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "DisplayTitle",
-   "version": "1.5.3",
+   "version": "2.0.0",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]",
"[https://www.semantic-mediawiki.org/wiki/User:Oetterer Tobias 
Oetterer]"
@@ -31,7 +31,9 @@
"SelfLinkBegin": "DisplayTitleHooks::onSelfLinkBegin"
},
"config": {
-   "DisplayTitleHideSubtitle": false
+   "DisplayTitleHideSubtitle": {
+   "value": false
+   }
},
-   "manifest_version": 1
+   "manifest_version": 2
 }
diff --git a/includes/DisplayTitleHooks.php b/includes/DisplayTitleHooks.php
index c03add4..975814c 100644
--- a/includes/DisplayTitleHooks.php
+++ b/includes/DisplayTitleHooks.php
@@ -10,12 +10,10 @@
 * See https://www.mediawiki.org/wiki/Manual:Hooks/ParserFirstCallInit
 * @since 1.0
 * @param Parser &$parser the Parser object
-* @return bool continue checking hooks
 */
public static function onParserFirstCallInit( &$parser ) {
$parser->setFunctionHook( 'getdisplaytitle',
'DisplayTitleHooks::getdisplaytitleParserFunction' );
-   return true;
}
 
/**
@@ -69,13 +67,12 @@
 * @param array &$extraAttribs the HTML attributes that the  tag 
should have
 * @param string &$query the query string to add to the generated URL
 * @param string &$ret the value to return if the hook returns false
-* @return bool continue checking hooks
 */
public static function onHtmlPageLinkRendererBegin(
LinkRenderer $linkRenderer, LinkTarget $target, &$text, 
&$extraAttribs,
&$query, &$ret ) {
$title = Title::newFromLinkTarget( $target );
-   return self::handleLink( $title, $text );
+   self::handleLink( $title, $text, true );
}
 
/**
@@ -89,11 +86,10 @@
 * @param string &$trail Text after link
 * @param string &$prefix Text before link
 * @param string &$ret the value to return if the hook returns false
-* @return bool continue checking hooks
 */
public static function onSelfLinkBegin( Title $nt, &$html, &$trail,
&$prefix, &$ret ) {
-   return self::handleLink( $nt, $html );
+   self::handleLink( $nt, $html, false );
}
 
/**
@@ -107,36 +103,37 @@
 * @since 1.3
 * @param Title $target the Title object that the link is pointing to
 * @param string|HtmlArmor &$html the HTML of the link text
-* @return bool continue checking hooks
+* @param boolean $wrap whether to wrap result in HtmlArmor
 */
-   private static function handleLink( Title $target, &$html ) {
+   private static function handleLink( Title $target, &$html, $wrap ) {
if ( isset( $html ) ) {
$title = null;
$text = null;
if ( is_string( $html ) ) {
$text = $html;
-   } elseif ( get_class( $html ) == 'HtmlArmor' ) {
+   } elseif ( is_integer( $html ) ) {
+   $text = (string)$html;
+   } elseif ( $html instanceof HtmlArmor ) {
$text = HtmlArmor::getHtml( $html );
}
-   if ( $text !== null ) {
+   if ( !is_null( $text ) ) {
$title = Title::newFromText( $text );
if ( !is_null( $title ) ) {
if ( $target->getSubjectNsText() === '' 
) {
if ( 

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Improve query plan for getListsByPage

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395885 )

Change subject: Improve query plan for getListsByPage
..


Improve query plan for getListsByPage

Bug: T182053
Change-Id: I62c7d73ce7f30a4cfaa3ecb0fb11b9197657b9bc
---
M src/ReadingListRepository.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index edcac9d..fe1d315 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -694,10 +694,14 @@
$conditions,
__METHOD__,
[
-   'GROUP BY' => $this->getListFields(),
+   // Grouping by rle_rl_id can be done 
efficiently with the same index used for
+   // the conditions. All other fields are 
functionally dependent on it; MySQL 5.7.5+
+   // can detect that ( 
https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html );
+   // MariaDB needs the other fields for 
ONLY_FULL_GROUP_BY compliance, but they don't
+   // seem to negatively affect the query plan.
+   'GROUP BY' => array_merge( [ 'rle_rl_id' ], 
$this->getListFields() ),
'ORDER BY' => 'rle_rl_id ASC',
'LIMIT' => (int)$limit,
-
]
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62c7d73ce7f30a4cfaa3ecb0fb11b9197657b9bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Limit paging size

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395886 )

Change subject: Limit paging size
..


Limit paging size

Per the DBA recommendation in T164990#3264314 / T168984#3659998,
limit paging sizes to 10 lists / 100 entries at a time.

For most queries this limits the number of rows scanned as well.
getListEntriesByDateUpdated is the only exception: it also scans
entries of deleted lists, which could result in an arbitrary
number of rows scanned. Fixing that is left to a separate patch.

Change-Id: I7c144fabcf5d7510a6b81ca85e623705daf01ccd
---
M src/Api/ApiQueryTrait.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/src/Api/ApiQueryTrait.php b/src/Api/ApiQueryTrait.php
index f090fa0..b95ea54 100644
--- a/src/Api/ApiQueryTrait.php
+++ b/src/Api/ApiQueryTrait.php
@@ -121,8 +121,9 @@
self::PARAM_DFLT => 10,
self::PARAM_TYPE => 'limit',
self::PARAM_MIN => 1,
-   self::PARAM_MAX => self::LIMIT_BIG1,
-   self::PARAM_MAX2 => self::LIMIT_BIG2,
+   // Temporarily limit paging sizes per 
T164990#3264314 / T168984#3659998
+   self::PARAM_MAX => self::$prefix === 'rl' ? 10 
: 100,
+   self::PARAM_MAX2 => null,
],
'continue' => [
self::PARAM_TYPE => 'string',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c144fabcf5d7510a6b81ca85e623705daf01ccd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix blurry text on PanelLayout promoted to GPU in Safari

2017-12-06 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395920 )

Change subject: Fix blurry text on PanelLayout promoted to GPU in Safari
..

Fix blurry text on PanelLayout promoted to GPU in Safari

Fixing blurry text in Safari on element promoted to GPU composite layer
through `.oo-ui-force-gpu-composite-layer()` by applying
a `background-color`.

Bug: T176837
Change-Id: Iaefb4670371a4a48d7cf7c69aacaafc4be905524
---
M src/themes/apex/layouts.less
M src/themes/wikimediaui/layouts.less
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/20/395920/1

diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index 4f13a2b..795eb5e 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -190,6 +190,13 @@
&-padded&-framed {
margin: 1em 0;
}
+
+   // Support Safari (Webkit): When promoted to GPU composite layer through
+   // `.oo-ui-force-gpu-composite-layer()` while not applying a 
`background-color`
+   // results in blurry text, see T176837
+   &-scrollable {
+   background-color: @background-color-main;
+   }
 }
 
 .theme-oo-ui-tabPanelLayout () {}
diff --git a/src/themes/wikimediaui/layouts.less 
b/src/themes/wikimediaui/layouts.less
index 8a4f8a2..677da7f 100644
--- a/src/themes/wikimediaui/layouts.less
+++ b/src/themes/wikimediaui/layouts.less
@@ -254,6 +254,13 @@
&-padded&-framed {
margin: 1em 0;
}
+
+   // Support Safari (Webkit): When promoted to GPU composite layer through
+   // `.oo-ui-force-gpu-composite-layer()` while not applying a 
`background-color`
+   // results in blurry text, see T176837
+   &-scrollable {
+   background-color: @background-color-base;
+   }
 }
 
 .theme-oo-ui-tabPanelLayout () {}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaefb4670371a4a48d7cf7c69aacaafc4be905524
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Rm all past throttle overrides in throttle.php

2017-12-06 Thread Zppix (Code Review)
Zppix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395918 )

Change subject: Rm all past throttle overrides in throttle.php
..

Rm all past throttle overrides in throttle.php

Change-Id: Id29b4a27e6de9fa3e0c2539f107b7b8570d73275
---
M wmf-config/throttle.php
1 file changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/18/395918/2

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 9824020..4fda250 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -28,28 +28,12 @@
 # ];
 ## Add throttling definitions below.
 
-$wmgThrottlingExceptions[] = [ // T181360
-   'from' => '2017-11-29T16:00 +1:00',
-   'to' => '2017-11-29T20:00 +1:00',
-   'IP' => '81.246.2.2',
-   'dbname' => [ 'frwiki' ],
-   'value' => 30,
-];
-
 $wmgThrottlingExceptions[] = [ // T180046
'from' => '2017-12-11T07:00 -0:00',
'to' => '2017-12-11T19:00 -0:00',
'range' => '139.18.1.5',
'dbname' => [ 'dewiki' ],
'value' => 35, // 30 expected
-];
-
-$wmgThrottlingExceptions[] = [ // T181367
-   'from' => '2017-12-01T17:00 -0:00',
-   'to' => '2017-12-01T20:00 -0:00',
-   'range' => [ '86.49.24.0/21', '86.49.32.0/20', '86.49.48.0/24' ],
-   'dbname' => [ 'cswiki', 'wikidatawiki' ],
-   'value' => 15 // 10 expected
 ];
 
 ## Add throttling definitions above.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id29b4a27e6de9fa3e0c2539f107b7b8570d73275
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Don't execute commands twice

2017-12-06 Thread Divec (Code Review)
Divec has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395919 )

Change subject: Don't execute commands twice
..

Don't execute commands twice

Bug: T182270
Change-Id: Iecc15a744d9a4606f8e1c9a1d2641d0fe8191049
---
M src/ui/ve.ui.Tool.js
1 file changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/19/395919/1

diff --git a/src/ui/ve.ui.Tool.js b/src/ui/ve.ui.Tool.js
index 0a63bd1..c07290c 100644
--- a/src/ui/ve.ui.Tool.js
+++ b/src/ui/ve.ui.Tool.js
@@ -114,7 +114,6 @@
contextClosePromise = 
surface.context.inspector.close().closed;
} else {
contextClosePromise = $.Deferred().resolve().promise();
-   command.execute( surface );
}
}
if ( this.constructor.static.deactivateOnSelect ) {
@@ -123,12 +122,16 @@
// if the promise is slow.
this.setActive( false );
}
-   contextClosePromise.done( function () {
-   if ( !command.execute( surface ) ) {
-   // If the command fails, ensure the tool is not active
-   tool.setActive( false );
-   }
-   } );
+   if ( contextClosePromise ) {
+   // N.B. If contextClosePromise is already resolved, then the 
handler is called
+   // before the call to .done returns
+   contextClosePromise.done( function () {
+   if ( !command.execute( surface ) ) {
+   // If the command fails, ensure the tool is not 
active
+   tool.setActive( false );
+   }
+   } );
+   }
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecc15a744d9a4606f8e1c9a1d2641d0fe8191049
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add and link readme pages for analytics datasets

2017-12-06 Thread Milimetric (Code Review)
Milimetric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395917 )

Change subject: Add and link readme pages for analytics datasets
..

Add and link readme pages for analytics datasets

Bug: T167033
Change-Id: Icf47d81cde07bee94b54fdb4241fbc912c84966e
---
A index.html
M modules/dumps/files/web/html/analytics_index.html
A modules/dumps/files/web/html/mediacounts_readme.html
A modules/dumps/files/web/html/pageviews_readme.html
A modules/dumps/files/web/html/unique_devices_readme.html
M modules/dumps/manifests/web/html.pp
6 files changed, 220 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/395917/1

diff --git a/index.html b/index.html
new file mode 100644
index 000..1945db2
--- /dev/null
+++ b/index.html
@@ -0,0 +1,60 @@
+
+
+
+ 
+ 
+ 
+ Directory Tree
+ 
+  
+ 
+
+
+   Directory Tree
+   .
+   ├── conftool-data
+   ├── doc
+   ├── environments
+   ├── files
+   ├── Gemfile
+   ├── hieradata
+   ├── index.html
+   ├── manifests
+   ├── modules
+   ├── Rakefile
+   ├── rake_modules
+   ├── README
+   ├── tox.ini
+   ├── typos
+   └── utils
+   
+   
+   
+   
+   
+   
+   
+tree v1.7.0 © 1996 - 2014 by Steve Baker and Thomas Moore 
+HTML output hacked and copyleft © 1998 by Francesc Rocher 
+JSON output hacked and copyleft © 2014 by Florian Sesser 
+Charsets / OS/2 support © 2001 by Kyosuke Tokoro
+   
+
+
diff --git a/modules/dumps/files/web/html/analytics_index.html 
b/modules/dumps/files/web/html/analytics_index.html
index b137939..e1d4d7a 100644
--- a/modules/dumps/files/web/html/analytics_index.html
+++ b/modules/dumps/files/web/html/analytics_index.html
@@ -16,11 +16,11 @@
 
 Pageviews: statistics compiled using the 
current https://meta.wikimedia.org/wiki/Research:Page_view; 
target="_blank">Pageview Definition.  Available as:
 
-Pageview/projectview data 
filtered to what we believe is only human traffic.  Available since May 
2015.
+Pageview/projectview data filtered to what 
we believe is only human traffic.  Available since May 2015.
 
 Pageview/projectview 
data, highly compressed and corrected for outages.  This dataset was 
historically computed using the best source available at the time:
 
-Dec 2015 - now: compressing and correcting the 
pageviews dataset
+Dec 2015 - now: compressing and correcting the 
pageviews dataset
 2007 - Dec 2015: compressing and correcting 
the pagecounts-raw dataset
 
 
@@ -31,14 +31,14 @@
 
 Mediacounts: statistics from all projects on 
media file access.  Available as:
 
-Request counts for the 
upload domain (pictures, movies, audio files)
+Request 
counts for the upload domain (pictures, movies, audio files)
 
 
 
 
 Unique Devices: statistics from all projects 
on unique devices.  Available as:
 
-Estimate of unique 
devices based on a privacy-sensitive last access cookie.
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Changed Instances of rawParams() to plaintextParams()

2017-12-06 Thread Ryan10145 (Code Review)
Ryan10145 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395916 )

Change subject: Changed Instances of rawParams() to plaintextParams()
..

Changed Instances of rawParams() to plaintextParams()

Bug: T182213
Change-Id: Ibf24dee5ea19092e8a38e57f34c98f513d4c9b21
---
M includes/content/ContentHandler.php
M includes/content/WikitextContent.php
M includes/widget/search/FullSearchResultWidget.php
M includes/widget/search/SimpleSearchResultWidget.php
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/395916/1

diff --git a/includes/content/ContentHandler.php 
b/includes/content/ContentHandler.php
index a7b97a5..50cc9b5 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -855,7 +855,7 @@
);
 
return wfMessage( 'autoredircomment', 
$newTarget->getFullText() )
-   ->rawParams( $truncatedtext 
)->inContentLanguage()->text();
+   ->plaintextParams( $truncatedtext 
)->inContentLanguage()->text();
case 'changed-redirect-target':
$oldTarget = $oldContent->getRedirectTarget();
$newTarget = $newContent->getRedirectTarget();
diff --git a/includes/content/WikitextContent.php 
b/includes/content/WikitextContent.php
index 942390f..bc20aa0 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -87,7 +87,7 @@
if ( $sectionId === 'new' ) {
# Inserting a new section
$subject = $sectionTitle ? wfMessage( 
'newsectionheaderdefaultlevel' )
-   ->rawParams( $sectionTitle 
)->inContentLanguage()->text() . "\n\n" : '';
+   ->plaintextParams( $sectionTitle 
)->inContentLanguage()->text() . "\n\n" : '';
if ( Hooks::run( 'PlaceNewSection', [ $this, $oldtext, 
$subject, &$text ] ) ) {
$text = strlen( trim( $oldtext ) ) > 0
? "{$oldtext}\n\n{$subject}{$text}"
diff --git a/includes/widget/search/FullSearchResultWidget.php 
b/includes/widget/search/FullSearchResultWidget.php
index 5e45c63..2b385de 100644
--- a/includes/widget/search/FullSearchResultWidget.php
+++ b/includes/widget/search/FullSearchResultWidget.php
@@ -163,7 +163,7 @@
: $this->linkRenderer->makeLink( $title, $text ? new 
HtmlArmor( $text ) : null );
 
return "" .
-   $this->specialPage->msg( $msgKey )->rawParams( 
$inner )->text()
+   $this->specialPage->msg( $msgKey 
)->plaintextParams( $inner )->text()
. "";
}
 
diff --git a/includes/widget/search/SimpleSearchResultWidget.php 
b/includes/widget/search/SimpleSearchResultWidget.php
index 8190442..d35cb49 100644
--- a/includes/widget/search/SimpleSearchResultWidget.php
+++ b/includes/widget/search/SimpleSearchResultWidget.php
@@ -49,7 +49,7 @@
}
$redirect =
"" .
-   $this->specialSearch->msg( 
'search-redirect' )->rawParams(
+   $this->specialSearch->msg( 
'search-redirect' )->plaintextParams(
$this->linkRenderer->makeLink( 
$redirectTitle, $redirectText )
)->text() .
"";

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.11]: RCLFilters: Make 'target' and 'to/from' sticky

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395899 )

Change subject: RCLFilters: Make 'target' and 'to/from' sticky
..


RCLFilters: Make 'target' and 'to/from' sticky

Make these parameters sticky to exclude them
from Saved Queries and related features
(empty, restoreDefaults).

Bug: T172161
Bug: T182268
Change-Id: Ib8b3ecd34c6af9e0983573586485a9a9f503c060
(cherry picked from commit 55d735f16af8c241aed7c72cbc85cd58a0145fc1)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 1950b93..f4cdae3 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -786,7 +786,7 @@
var state = {};
 
this.getItems().forEach( function ( filterItem ) {
-   state[ filterItem.getName() ] = filterItem.isSelected();
+   state[ filterItem.getName() ] = filterItem.getValue();
} );
 
return state;
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index c1ffde2..032ae94 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -195,7 +195,7 @@
type: 'any_value',
title: '',
hidden: true,
-   isSticky: false,
+   sticky: true,
filters: [
{
name: 'target',
@@ -208,7 +208,7 @@
type: 'boolean',
title: '',
hidden: true,
-   isSticky: false,
+   sticky: true,
filters: [
{
name: 'showlinkedto',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8b3ecd34c6af9e0983573586485a9a9f503c060
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.11
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] search/xgboost[master]: [DNM] more debugging of RssFile explosion

2017-12-06 Thread EBernhardson (Code Review)
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395915 )

Change subject: [DNM] more debugging of RssFile explosion
..

[DNM] more debugging of RssFile explosion

Change-Id: Ia5cdb36f31dd4512b048de74f2b2d769d2fa7acf
---
M 
jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
M 
jvm-packages/xgboost4j-spark/src/test/scala/ml/dmlc/xgboost4j/scala/spark/XGBoostGeneralSuite.scala
2 files changed, 117 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/xgboost 
refs/changes/15/395915/1

diff --git 
a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
 
b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
index 22ed87c..e8f55b4 100644
--- 
a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
+++ 
b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
@@ -16,13 +16,15 @@
 
 package ml.dmlc.xgboost4j.scala.spark
 
+import java.io.{BufferedReader, File, FileReader}
 import java.lang.management.ManagementFactory
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.regex.Pattern
 
 import org.apache.commons.logging.LogFactory
 
 import scala.concurrent.duration.Duration
-import scala.io.Source
+import scala.io.{BufferedSource, Source}
 
 class ResourceMonitorThread(reportEvery: Duration) extends Thread {
   super.setDaemon(true)
@@ -37,18 +39,120 @@
   return
 }
 while (keepChecking.get()) {
-  report()
+  report().foreach(logger.info)
   Thread.sleep(reportEvery.toMillis)
 }
   }
 
   def stopChecking(): Unit = keepChecking.set(false)
 
-  private def report(): Unit = {
+  def report(): Seq[String] = {
 val rss = Source.fromFile(s"/proc/$pid/status").getLines()
   .filter(_.startsWith("Rss"))
   .mkString(", ")
-logger.info(rss)
-logger.info(memoryBean.getHeapMemoryUsage)
+Seq(rss,
+  memoryBean.getHeapMemoryUsage.toString,
+  // 5 largest contributors to RSSFile
+  collectSMapInfo().take(5).map({ info =>
+s"${info.mem()}: ${info.name}"
+  }).mkString("\n")
+).filter(_.length > 0)
   }
+
+  private val ADDRESS_PATTERN = 
raw"^([a-f0-9]*)-([a-f0-9]*)(\s)*([rxwps\-]*).*".r
+  private val MEM_INFO_PATTERN = raw"^([A-Z].*):[\s ]*(.*).*".r
+  private val KB = "kB"
+  private val READ_ONLY_WITH_SHARED_PERMISSION = "r--s"
+  private val READ_EXECUTE_WITH_SHARED_PERMISSION = "r-xs"
+
+  val file = new File(s"/proc/$pid/smaps")
+
+  private def collectSMapInfo(): List[ProcessSmapMemoryInfo] = {
+if (!file.exists()) {
+  return Nil
+}
+val lines = Source.fromFile(s"/proc/$pid/smaps").getLines()
+lines.map(_.trim).foldLeft(List[ProcessSmapMemoryInfo]()) { (acc, line) =>
+  line match {
+case ADDRESS_PATTERN(startAddr, endAddr, space, permission) =>
+  new ProcessSmapMemoryInfo(line, permission) :: acc
+case MEM_INFO_PATTERN(key, value) =>
+  acc match {
+case memInfo :: xs => memInfo.setMemInfo(key.trim, 
value.replace(KB, "").trim) :: xs
+case Nil => Nil
+  }
+case _ => acc
+  }
+}.filter { memInfo =>
+  
!memInfo.permission.trim.equalsIgnoreCase(READ_ONLY_WITH_SHARED_PERMISSION) &&
+  
!memInfo.permission.trim.equalsIgnoreCase(READ_EXECUTE_WITH_SHARED_PERMISSION)
+}.sortBy(_.mem()).reverse
+  }
+}
+
+class ProcessSmapMemoryInfo(val name: String, val permission: String) {
+  var size: Int = 0
+  var rss: Int = 0
+  var pss: Int = 0
+  var sharedClean: Int = 0
+  var sharedDirty: Int = 0
+  var privateClean: Int = 0
+  var privateDirty: Int = 0
+  var referenced: Int = 0
+  var regionName: String = ""
+
+  def setMemInfo(key: String, value: String): ProcessSmapMemoryInfo = {
+try {
+  val intval = value.trim.toInt
+  MemInfo(key) match {
+case MemInfo.SIZE => size = intval
+case MemInfo.RSS => rss = intval
+case MemInfo.PSS => pss = intval
+case MemInfo.SHARED_CLEAN => sharedClean = intval
+case MemInfo.SHARED_DIRTY => sharedDirty = intval
+case MemInfo.PRIVATE_CLEAN => privateClean = intval
+case MemInfo.PRIVATE_DIRTY => privateDirty = intval
+case MemInfo.REFERENCED => referenced = intval
+case _ => None
+  }
+} catch {
+  case e: NumberFormatException => Nil
+}
+this
+  }
+
+  def mem(): Int = {
+// Math.min(sharedDirty, pss) + privateDirty + privateClean
+rss
+  }
+}
+
+object MemInfo {
+  sealed abstract class MemInfoVal(val name: String) {
+override def toString: String = name
+  }
+
+  def apply(name: String): MemInfoVal = {
+values.collectFirst { case i if i.name.equalsIgnoreCase(name.trim) => i 

[MediaWiki-commits] [Gerrit] integration/config[master]: HTTPS_PROXY_REQUEST_FULLURI=false for composer

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395913 )

Change subject: HTTPS_PROXY_REQUEST_FULLURI=false for composer
..


HTTPS_PROXY_REQUEST_FULLURI=false for composer

Unclear why this is all of a sudden needed; however, this seems to fix
T182266. Found via: https://github.com/composer/composer/issues/1839

Bug: T182266
Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2
---
M jjb/macro.yaml
1 file changed, 12 insertions(+), 3 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Gergő Tisza: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index cbe79eb..ffb4db0 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -417,10 +417,12 @@
  - shell: |
 #!/bin/bash -eu
 # Load require-dev packages on top of vendor (T92605, T112895)
-set -o pipefail
+set -xo pipefail
 # Set --ignore-platform-reqs to prevent composer from evaluating 
unrelated dependencies
 # already present in composer.json (needed for 
operations/mediawiki-config due to
 # https://github.com/perftools/xhgui/issues/192).
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 node 
/srv/deployment/integration/slave-scripts/tools/composer-dev-args.js 
"$(pwd)/composer.json" | xargs --verbose composer require --dev --ansi 
--no-progress --ignore-platform-reqs --prefer-dist -v
 
 - builder:
@@ -567,24 +569,31 @@
 name: composer-update
 builders:
  - shell: |
-set -u
+set -ux
 cd "{dir}"
 [[ -f "composer.json" ]] || exit 0
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 composer update --ansi --no-progress --prefer-dist --profile -v
 
 - builder:
 name: composer-install
 builders:
  - shell: |
-set -u
+set -ux
 cd "{dir}"
 [[ -f "composer.json" ]] || exit 0
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 composer install --ansi --no-progress --prefer-dist --profile -v
 
 - builder:
 name: composer-update-no-dev
 builders:
  - shell: |
+set -x
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 composer update --ansi --no-progress --prefer-dist --profile --no-dev
 
 - builder:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] RunningStat[master]: Use short array syntax in README.md

2017-12-06 Thread Reedy (Code Review)
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395914 )

Change subject: Use short array syntax in README.md
..

Use short array syntax in README.md

Requires PHP >= 5.5.9

Change-Id: I33a543b30480f9417b462d0c37d5430903b8e197
---
M README.md
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/RunningStat refs/changes/14/395914/1

diff --git a/README.md b/README.md
index 082b6d2..93927e1 100644
--- a/README.md
+++ b/README.md
@@ -29,12 +29,12 @@
 use Wikimedia\RunningStat;
 
 $rstat = new RunningStat();
-foreach ( array(
+foreach ( [
   49.7168, 74.3804,  7.0115, 96.5769, 34.9458,
   36.9947, 33.8926, 89.0774, 23.7745, 73.5154,
   86.1322, 53.2124, 16.2046, 73.5130, 10.4209,
   42.7299, 49.3330, 47.0215, 34.9950, 18.2914,
-) as $sample ) {
+] as $sample ) {
   $rstat->addObservation( $sample );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33a543b30480f9417b462d0c37d5430903b8e197
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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


[MediaWiki-commits] [Gerrit] integration/config[master]: HTTPS_PROXY_REQUEST_FULLURI=false for composer

2017-12-06 Thread Thcipriani (Code Review)
Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395913 )

Change subject: HTTPS_PROXY_REQUEST_FULLURI=false for composer
..

HTTPS_PROXY_REQUEST_FULLURI=false for composer

Unclear why this is all of a sudden needed; however, this seems to fix
T182266. Found via: https://github.com/composer/composer/issues/1839

Bug: T182266
Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2
---
M jjb/macro.yaml
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/13/395913/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index cbe79eb..ffb4db0 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -417,10 +417,12 @@
  - shell: |
 #!/bin/bash -eu
 # Load require-dev packages on top of vendor (T92605, T112895)
-set -o pipefail
+set -xo pipefail
 # Set --ignore-platform-reqs to prevent composer from evaluating 
unrelated dependencies
 # already present in composer.json (needed for 
operations/mediawiki-config due to
 # https://github.com/perftools/xhgui/issues/192).
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 node 
/srv/deployment/integration/slave-scripts/tools/composer-dev-args.js 
"$(pwd)/composer.json" | xargs --verbose composer require --dev --ansi 
--no-progress --ignore-platform-reqs --prefer-dist -v
 
 - builder:
@@ -567,24 +569,31 @@
 name: composer-update
 builders:
  - shell: |
-set -u
+set -ux
 cd "{dir}"
 [[ -f "composer.json" ]] || exit 0
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 composer update --ansi --no-progress --prefer-dist --profile -v
 
 - builder:
 name: composer-install
 builders:
  - shell: |
-set -u
+set -ux
 cd "{dir}"
 [[ -f "composer.json" ]] || exit 0
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 composer install --ansi --no-progress --prefer-dist --profile -v
 
 - builder:
 name: composer-update-no-dev
 builders:
  - shell: |
+set -x
+export HTTP_PROXY_REQUEST_FULLURI=false
+export HTTPS_PROXY_REQUEST_FULLURI=false
 composer update --ansi --no-progress --prefer-dist --profile --no-dev
 
 - builder:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a7b0c6f5519d07fc4678a5e71c17d5c5fd350e2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 

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


[MediaWiki-commits] [Gerrit] WrappedString[master]: Use short array syntax in README.md

2017-12-06 Thread Reedy (Code Review)
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395912 )

Change subject: Use short array syntax in README.md
..

Use short array syntax in README.md

Requires PHP >= 5.5.9

Change-Id: I3f83b42eecda44b90de70b8e62a5cd12ca20cf67
---
M README.md
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/WrappedString 
refs/changes/12/395912/1

diff --git a/README.md b/README.md
index b3c2f0e..b828e6f 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,10 @@
 
 use Wikimedia\WrappedString;
 
-$buffer = array(
+$buffer = [
new WrappedString( '[foo]', '[', ']' ),
new WrappedString( '[bar]', '[', ']' ),
-);
+];
 $output = WrappedString::join( "\n", $buffer );
 // Result: '[foobar]'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f83b42eecda44b90de70b8e62a5cd12ca20cf67
Gerrit-PatchSet: 1
Gerrit-Project: WrappedString
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix "Save current filter settings" menu and legend overlap

2017-12-06 Thread Petar.petkovic (Code Review)
Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395911 )

Change subject: Fix "Save current filter settings" menu and legend overlap
..

Fix "Save current filter settings" menu and legend overlap

Pass overlay to SaveFiltersPopupButtonWidget, so it gets onto same
stacking context as the rest of popup widgets.

Bug: T182269
Change-Id: I2c45f82840f651c39a0e572e003c82cbbd8c1c2e
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/395911/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index a7054e9..91a2d5f 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -88,7 +88,10 @@
if ( !mw.user.isAnon() ) {
this.saveQueryButton = new 
mw.rcfilters.ui.SaveFiltersPopupButtonWidget(
this.controller,
-   this.queriesModel
+   this.queriesModel,
+   {
+   $overlay: this.$overlay
+   }
);
 
this.saveQueryButton.$element.on( 'mousedown', function 
( e ) { e.stopPropagation(); } );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c45f82840f651c39a0e572e003c82cbbd8c1c2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 

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


[MediaWiki-commits] [Gerrit] mediawiki...MassAction[master]: Internationalize hardcoded strings from View Task

2017-12-06 Thread Brian Wolff (Code Review)
Brian Wolff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395817 )

Change subject: Internationalize hardcoded strings from View Task
..


Internationalize hardcoded strings from View Task

Bug: T96418
Change-Id: I4129f57f465dc7fad40d8883e207b7456db3ddd7
---
M i18n/en.json
M i18n/qqq.json
M src/MassActionSpecialPage.php
3 files changed, 64 insertions(+), 25 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/i18n/en.json b/i18n/en.json
index 7b0ae63..1d7a682 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,5 +27,23 @@
"massaction-regexreplace-desc": "Performs a regex replace on the 
content using the pattern",
"massaction-titleregexmatcher-desc": "Matches pages with titles 
matching regex \"$1\"",
"massaction-titleregexmatcher-enabled": "Title regex matcher enabled?",
-   "massaction-titleregexmatcher-label": "Title regex"
+   "massaction-titleregexmatcher-label": "Title regex",
+   "massaction-task-id": "Task Id",
+   "massaction-view-task-submit": "View Task",
+   "massaction-view-task-title": "View Task",
+   "massaction-view-task-no-tasks": "No task exists with the id: $1",
+   "massaction-view-task-id": "Task $1",
+   "massaction-view-task-summary": "Summary: $1",
+   "massaction-view-task-user": "User: {{GENDER:$1|$1}}",
+   "massaction-view-task-target-type": "Target Type: $1",
+   "massaction-view-task-date-created": "Date Created: $1",
+   "massaction-view-task-state": "State: $1",
+   "massaction-view-task-actions": "{{PLURAL:$1|Action (1)|Actions ($1)}}",
+   "massaction-view-task-matchers": "{{PLURAL:$1|Matcher (1)|Matchers 
($1)}}",
+   "massaction-view-task-targets": "{{PLURAL:$1|Target (1)|Targets ($1)}}",
+   "massaction-view-task-save-all": "Save All",
+   "massaction-view-task-target-identifier": "Identifier",
+   "massaction-view-task-target-name": "Name",
+   "massaction-view-task-target-state": "State",
+   "massaction-view-task-target-save": "Save"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 856145a..53b2535 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -29,5 +29,23 @@
"massaction-regexreplace-desc": "Description for the action that 
replaces the following regex pattern",
"massaction-titleregexmatcher-desc": "Description for the matcher that 
matches the following regex pattern in titles. Parameters:\n* $1 - the regex 
pattern that is being matched",
"massaction-titleregexmatcher-enabled": "Label for whether or not the 
matcher for title regex is enabled",
-   "massaction-titleregexmatcher-label": "Label for the title regex 
matcher"
+   "massaction-titleregexmatcher-label": "Label for the title regex 
matcher",
+   "massaction-task-id": "Placeholder for task id",
+   "massaction-view-task-submit": "Text displayed in submit button",
+   "massaction-view-task-title": "Title for page displaing tasks",
+   "massaction-view-task-no-tasks": "Text displayed when no tasks can be 
displayed for given id. Parameters:\n* $1 - given task id",
+   "massaction-view-task-id": "Title for page displaying task with given 
id. Parameters:\n* $1 - given task id",
+   "massaction-view-task-summary": "Text that shows summary of task. 
Parameters:\n* $1 - task summary",
+   "massaction-view-task-user": "Text that shows user of task. 
Parameters:\n* $1 - task user name",
+   "massaction-view-task-target-type": "Text that shows target type of 
task. Parameters:\n* $1 - task target type",
+   "massaction-view-task-date-created": "Text that shows creation date of 
task. Parameters:\n* $ - task creation date",
+   "massaction-view-task-state": "Text that shows state of task. 
Parameters:\n* $1 - task state",
+   "massaction-view-task-actions": "Title for actions with their count. 
Parameters:\n* $1 - actions count",
+   "massaction-view-task-matchers": "Title for matchers with their count. 
Parameters:\n* $1 - matchers count",
+   "massaction-view-task-targets": "Title for targets with their count. 
Parameters:\n* $1 - targets count",
+   "massaction-view-task-save-all": "Text that shows in submit button for 
saving all targets changes",
+   "massaction-view-task-target-identifier": "Text that shows in table 
heading for target identifier",
+   "massaction-view-task-target-name": "Text that shows in table heading 
for target name",
+   "massaction-view-task-target-state": "Text that shows in table heading 
for target state",
+   "massaction-view-task-target-save": "Text that shows in submit button 
for saving target changes"
 }
diff --git a/src/MassActionSpecialPage.php b/src/MassActionSpecialPage.php
index ece1dc1..51e650d 100644
--- a/src/MassActionSpecialPage.php
+++ b/src/MassActionSpecialPage.php
@@ -84,11 +84,11 @@
$formDescriptor 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: placeholder-message for html form should be ->text() not ->p...

2017-12-06 Thread Brian Wolff (Code Review)
Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395910 )

Change subject: placeholder-message for html form should be ->text() not 
->parse()
..

placeholder-message for html form should be ->text() not ->parse()

placeholder is an html attribute, it does not support arbitrary
html, so ->text() is most appropriate, not full parse.

Follow up d3cd609e

Change-Id: Ia2aa5a001e19ee90e99936ef4f0dc879f182999f
---
M includes/htmlform/fields/HTMLTextAreaField.php
M includes/htmlform/fields/HTMLTextField.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/htmlform/fields/HTMLTextAreaField.php 
b/includes/htmlform/fields/HTMLTextAreaField.php
index e6963d5..466a251 100644
--- a/includes/htmlform/fields/HTMLTextAreaField.php
+++ b/includes/htmlform/fields/HTMLTextAreaField.php
@@ -16,7 +16,7 @@
parent::__construct( $params );
 
if ( isset( $params['placeholder-message'] ) ) {
-   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->parse();
+   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->text();
} elseif ( isset( $params['placeholder'] ) ) {
$this->mPlaceholder = $params['placeholder'];
}
diff --git a/includes/htmlform/fields/HTMLTextField.php 
b/includes/htmlform/fields/HTMLTextField.php
index 1c5a43d..b2e4f2a 100644
--- a/includes/htmlform/fields/HTMLTextField.php
+++ b/includes/htmlform/fields/HTMLTextField.php
@@ -31,7 +31,7 @@
parent::__construct( $params );
 
if ( isset( $params['placeholder-message'] ) ) {
-   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->parse();
+   $this->mPlaceholder = $this->getMessage( 
$params['placeholder-message'] )->text();
} elseif ( isset( $params['placeholder'] ) ) {
$this->mPlaceholder = $params['placeholder'];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2aa5a001e19ee90e99936ef4f0dc879f182999f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: fix syntax error in sudo privs for maint-log-readers

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395908 )

Change subject: admins: fix syntax error in sudo privs for maint-log-readers
..


admins: fix syntax error in sudo privs for maint-log-readers

follow-up to Ia7ce36079b04e629aa0a8, fix syntax error
in sudo privileges lines, causing puppet issue on terbium/wasat.

Bug: T179317
Change-Id: Ibbf6efa3b752ad0ba46a604f453df037f64b06dd
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 3af3423..ca88681 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -648,7 +648,7 @@
 members: [hoo]
 privileges: ['ALL = NOPASSWD: /bin/journalctl *',
  'ALL = NOPASSWD: /bin/dmesg *',
- '(syslog) NOPASSWD: ALL']
+ 'ALL = (syslog) NOPASSWD: ALL']
 
 users:
   rush:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbf6efa3b752ad0ba46a604f453df037f64b06dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update targetSdk and compileSdk to 27

2017-12-06 Thread Cooltey (Code Review)
Cooltey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395909 )

Change subject: Update targetSdk and compileSdk to 27
..

Update targetSdk and compileSdk to 27

Bug: T182236
Change-Id: Ia41a57abfe3bdfe9e36defeaefd3acd4ebd8ba34
---
M app/build.gradle
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index a3be82a..a4f9fe9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_8
 android {
 // Keep version in sync with /project.properties
-compileSdkVersion 26
+compileSdkVersion 27
 buildToolsVersion '27.0.1'
 
 compileOptions {
@@ -54,7 +54,7 @@
 defaultConfig {
 applicationId 'org.wikipedia'
 minSdkVersion 19
-targetSdkVersion 26
+targetSdkVersion 27
 versionCode 220
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
@@ -168,7 +168,7 @@
 String okHttpVersion = '3.9.1' // When updating this version, resync file 
copies under
// app/src/main/java/okhttp3
 String retrofitVersion = '2.3.0'
-String supportVersion = '26.0.2'
+String supportVersion = '27.0.2'
 String espressoVersion = '2.2.2'
 String butterKnifeVersion = '8.8.1'
 String frescoVersion = '1.5.0' // When updating this version, resync file 
copies under
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java 
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index 9cf0710..074f675 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -16,7 +16,7 @@
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.R;

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: fix syntax error in sudo privs for maint-log-readers

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395908 )

Change subject: admins: fix syntax error in sudo privs for maint-log-readers
..

admins: fix syntax error in sudo privs for maint-log-readers

follow-up to Ia7ce36079b04e629aa0a8, fix syntax error
in sudo privileges lines, causing puppet issue on terbium/wasat.

Bug: T179317
Change-Id: Ibbf6efa3b752ad0ba46a604f453df037f64b06dd
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/395908/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 3af3423..ca88681 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -648,7 +648,7 @@
 members: [hoo]
 privileges: ['ALL = NOPASSWD: /bin/journalctl *',
  'ALL = NOPASSWD: /bin/dmesg *',
- '(syslog) NOPASSWD: ALL']
+ 'ALL = (syslog) NOPASSWD: ALL']
 
 users:
   rush:

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

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

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apex theme: Apply `opacity` button transition and ensure Chr...

2017-12-06 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395907 )

Change subject: Apex theme: Apply `opacity` button transition and ensure Chrome 
support
..

Apex theme: Apply `opacity` button transition and ensure Chrome support

With `.oo-ui-force-gpu-composite-layer()` support we are able to
provide `opacity` transition now.
Follow-up to Ied6debd7fae5a545736492776a1fd4a9e85f1f62.

Change-Id: I54e548020f5c82c60461dd552a694155fce0a811
---
M src/themes/apex/elements.less
1 file changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/07/395907/1

diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index 02850c0..7124f1e 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -39,9 +39,15 @@
 
&-frameless {
> .oo-ui-buttonElement-button {
-   // Don't animate `.oo-ui-iconElement-icon` `opacity` 
for now,
-   // causes wiggling in Chrome, see T65020
-   // `.oo-ui-transition( opacity @medium-ease );`
+   > .oo-ui-iconElement-icon {
+   .oo-ui-transition( opacity @medium-ease );
+   // Support Webkit/Blink: `opacity` < 1 causes 
wiggling, see T65020
+   .oo-ui-force-gpu-composite-layer();
+   }
+
+   > .oo-ui-labelElement-label {
+   color: @color-base;
+   }
 
&:hover,
&:focus {
@@ -52,10 +58,6 @@
> .oo-ui-labelElement-label {
color: #000;
}
-   }
-
-   > .oo-ui-labelElement-label {
-   color: @color-base;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54e548020f5c82c60461dd552a694155fce0a811
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update targetSdk and compileSdk to 27

2017-12-06 Thread Cooltey (Code Review)
Cooltey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395906 )

Change subject: Update targetSdk and compileSdk to 27
..

Update targetSdk and compileSdk to 27

Bug: T182236
Change-Id: I05c0093811f471c4c3da57f3289b7f0c4b15eec4
---
M app/build.gradle
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
2 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index e6f4d2e..caade4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_8
 android {
 // Keep version in sync with /project.properties
-compileSdkVersion 26
+compileSdkVersion 27
 buildToolsVersion '27.0.1'
 
 compileOptions {
@@ -54,7 +54,7 @@
 defaultConfig {
 applicationId 'org.wikipedia'
 minSdkVersion 19
-targetSdkVersion 26
+targetSdkVersion 27
 versionCode 208
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
@@ -168,7 +168,7 @@
 String okHttpVersion = '3.9.1' // When updating this version, resync file 
copies under
// app/src/main/java/okhttp3
 String retrofitVersion = '2.3.0'
-String supportVersion = '26.0.2'
+String supportVersion = '27.0.2'
 String espressoVersion = '2.2.2'
 String butterKnifeVersion = '8.8.1'
 String frescoVersion = '1.5.0' // When updating this version, resync file 
copies under
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java 
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index 9cf0710..972fb27 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -14,9 +14,9 @@
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.NotificationCompat;
 
 import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.R;
@@ -275,7 +275,7 @@
 }
 
 private NotificationCompat.Builder createNotification(@NonNull Context 
context) {
-return (NotificationCompat.Builder) new 
NotificationCompat.Builder(context)
+return new NotificationCompat.Builder(context)
 .setDefaults(NotificationCompat.DEFAULT_ALL)
 .setPriority(NotificationCompat.PRIORITY_MAX)
 
.setContentTitle(context.getString(R.string.zero_wikipedia_zero_heading))

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

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

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: Extend `.oo-ui-force-gpu-composite-layer()` mixin by `will-c...

2017-12-06 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395905 )

Change subject: Extend `.oo-ui-force-gpu-composite-layer()` mixin by 
`will-change`
..

Extend `.oo-ui-force-gpu-composite-layer()` mixin by `will-change`

Extending `.oo-ui-force-gpu-composite-layer()` mixin by `will-change`
to be future-proof.
Example usage `.oo-ui-force-gpu-composite-layer( opacity, top; )`.

Bug: T154460
Change-Id: I81d551a7f13b25c802f2b3b0e436a6f37d16e6e4
---
M src/styles/common.less
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/395905/1

diff --git a/src/styles/common.less b/src/styles/common.less
index ac96d2e..035c219 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -36,9 +36,10 @@
 // Can be used in order to help establish smooth, jank-free scrolling
 // in connection with CSS animations or tame `opacity` bug. Use sparely & 
wisely!
 // See T154460 & T182257
-.oo-ui-force-gpu-composite-layer() {
+.oo-ui-force-gpu-composite-layer( @properties: auto; ... ) {
-webkit-transform: translateZ( 0 );
transform: translateZ( 0 );
+   will-change: @properties;
 }
 
 .oo-ui-animation( @value1, @value2: X, ... ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81d551a7f13b25c802f2b3b0e436a6f37d16e6e4
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: Clarify `.oo-ui-force-gpu-composite-layer()` mixin comment

2017-12-06 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395904 )

Change subject: Clarify `.oo-ui-force-gpu-composite-layer()` mixin comment
..

Clarify `.oo-ui-force-gpu-composite-layer()` mixin comment

Clarifying and being more explicit about
`.oo-ui-force-gpu-composite-layer()` mixins usage and adding
usage as workaround for Chrome `opacity` bug.

Bug: T182257
Change-Id: Id826d1b09fce2ba0e0b0b04f08ca921714a3d252
---
M src/styles/common.less
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/04/395904/1

diff --git a/src/styles/common.less b/src/styles/common.less
index c3b6d69..ac96d2e 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -32,10 +32,10 @@
.oo-ui-background-image-svg-internal( @svg, @fallback );
 }
 
-// Only Webkit/Blink: Force element on own GPU composite layer
+// Support Webkit/Blink: Force element on own GPU composite layer
 // Can be used in order to help establish smooth, jank-free scrolling
-// in connection with CSS animations. Use sparely & wisely!
-// See T154460
+// in connection with CSS animations or tame `opacity` bug. Use sparely & 
wisely!
+// See T154460 & T182257
 .oo-ui-force-gpu-composite-layer() {
-webkit-transform: translateZ( 0 );
transform: translateZ( 0 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id826d1b09fce2ba0e0b0b04f08ca921714a3d252
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: add hoo to mw-testers, varnish/maintenance-log-readers

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395903 )

Change subject: admins: add hoo to mw-testers,varnish/maintenance-log-readers
..


admins: add hoo to mw-testers,varnish/maintenance-log-readers

follow-up to Ia7ce36079b04e629a which created the new groups,
now adding Hoo to them as requested and approved on ticket.

Bug: T179317
Change-Id: I646048af2dc92417304b4ba5fdaafbf286d17f3e
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 8166856..3af3423 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -633,19 +633,19 @@
   mediawiki-testers:
 description: People who can strace and tcpdump on canary appservers for 
testing mediawiki
 gid: 797
-members: []
+members: [hoo]
 privileges: ['ALL = NOPASSWD: /usr/bin/strace *',
  'ALL = NOPASSWD: /usr/sbin/tcpdump *']
   varnish-log-readers:
 description: People who can read Varnish logs for debugging
 gid: 798
-members: []
+members: [hoo]
 privileges: ['ALL = NOPASSWD: /usr/bin/varnishncsa *',
  'ALL = NOPASSWD: /usr/bin/varnishlog *']
   maintenance-log-readers:
 description: People who can read syslog and dmesg on mediawiki maintenance 
servers
 gid: 799
-members: []
+members: [hoo]
 privileges: ['ALL = NOPASSWD: /bin/journalctl *',
  'ALL = NOPASSWD: /bin/dmesg *',
  '(syslog) NOPASSWD: ALL']

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I646048af2dc92417304b4ba5fdaafbf286d17f3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: add hoo to mw-testers, varnish/maintenance-log-readers

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395903 )

Change subject: admins: add hoo to mw-testers,varnish/maintenance-log-readers
..

admins: add hoo to mw-testers,varnish/maintenance-log-readers

follow-up to Ia7ce36079b04e629a which created the new groups,
now adding Hoo to them as requested and approved on ticket.

Bug: T179317
Change-Id: I646048af2dc92417304b4ba5fdaafbf286d17f3e
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 8166856..3af3423 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -633,19 +633,19 @@
   mediawiki-testers:
 description: People who can strace and tcpdump on canary appservers for 
testing mediawiki
 gid: 797
-members: []
+members: [hoo]
 privileges: ['ALL = NOPASSWD: /usr/bin/strace *',
  'ALL = NOPASSWD: /usr/sbin/tcpdump *']
   varnish-log-readers:
 description: People who can read Varnish logs for debugging
 gid: 798
-members: []
+members: [hoo]
 privileges: ['ALL = NOPASSWD: /usr/bin/varnishncsa *',
  'ALL = NOPASSWD: /usr/bin/varnishlog *']
   maintenance-log-readers:
 description: People who can read syslog and dmesg on mediawiki maintenance 
servers
 gid: 799
-members: []
+members: [hoo]
 privileges: ['ALL = NOPASSWD: /bin/journalctl *',
  'ALL = NOPASSWD: /bin/dmesg *',
  '(syslog) NOPASSWD: ALL']

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

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

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


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix an external link issue after setup "always" while openin...

2017-12-06 Thread Cooltey (Code Review)
Cooltey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395902 )

Change subject: Fix an external link issue after setup "always" while opening 
deep links
..

Fix an external link issue after setup "always" while opening deep links

  - Add a method to get default brower app's package name (either Chrome or 
Browser)
  - Try one more time to open external link before showing error toast

Bug: T181459
Change-Id: I28920a8790a86888e7dc1b89d94d7bbfd29ce015
---
M app/src/main/java/org/wikipedia/util/DeviceUtil.java
M app/src/main/java/org/wikipedia/util/UriUtil.java
2 files changed, 35 insertions(+), 5 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/util/DeviceUtil.java 
b/app/src/main/java/org/wikipedia/util/DeviceUtil.java
index a6d3569..2a7f260 100644
--- a/app/src/main/java/org/wikipedia/util/DeviceUtil.java
+++ b/app/src/main/java/org/wikipedia/util/DeviceUtil.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -33,6 +34,24 @@
 return resInfo.size() > 0;
 }
 
+public static String getBrowserAppPackageName(Context context) {
+PackageManager packageManager = context.getPackageManager();
+
+// com.android.chrome => for device >= Android 7.0
+// com.android.browser => for device < Android 7.0
+String[] browserApps = {"com.android.chrome", "com.android.browser"};
+
+for (String app : browserApps) {
+try {
+packageManager.getPackageInfo(app, 0);
+return app;
+} catch (Exception e) {
+continue;
+}
+}
+return null;
+}
+
 /**
  * Attempt to display the Android keyboard.
  *
diff --git a/app/src/main/java/org/wikipedia/util/UriUtil.java 
b/app/src/main/java/org/wikipedia/util/UriUtil.java
index f196172..5a970a2 100644
--- a/app/src/main/java/org/wikipedia/util/UriUtil.java
+++ b/app/src/main/java/org/wikipedia/util/UriUtil.java
@@ -63,12 +63,23 @@
  * @param uri URI to open in an external browser
  */
 public static void visitInExternalBrowser(final Context context, Uri uri) {
-Intent chooserIntent = ShareUtil.createChooserIntent(new 
Intent(Intent.ACTION_VIEW, uri),
-null, context);
+
+Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+Intent chooserIntent = ShareUtil.createChooserIntent(intent, null, 
context);
+
 if (chooserIntent == null) {
-// This means that there was no way to handle this link.
-// We will just show a toast now. FIXME: Make this more visible?
-ShareUtil.showUnresolvableIntentMessage(context);
+String browserPackageName = 
DeviceUtil.getBrowserAppPackageName(context);
+if (browserPackageName != null) {
+// Try to to open the external browser instead of showing 
error toast.
+// TODO: update DeviceUtil.getBrowserAppPackageName() if 
Google changes their built-in browser app
+intent.setPackage(browserPackageName);
+intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+context.startActivity(intent);
+} else {
+// This means that there was no way to handle this link.
+// We will just show a toast now. FIXME: Make this more 
visible?
+ShareUtil.showUnresolvableIntentMessage(context);
+}
 } else {
 chooserIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 context.startActivity(chooserIntent);

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Set up conditional views for RCLinked

2017-12-06 Thread Mooeypoo (Code Review)
Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395901 )

Change subject: RCFilters: Set up conditional views for RCLinked
..

RCFilters: Set up conditional views for RCLinked

The views that are only meant for specific pages should be set up
conditionally only when we are in that specific page, to prevent
issues with saved queries or param overload.

Change-Id: Id0bf89ce397ff8a54ce0a30d1ba7d8f9bbdd14a3
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
2 files changed, 39 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/395901/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index c1ffde2..392092d 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -44,12 +44,12 @@
 * @param {Object} [namespaceStructure] Namespace definition
 * @param {Object} [tagList] Tag definition
 */
-   mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure, namespaceStructure, tagList ) {
+   mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure, namespaceStructure, tagList, conditionalViews ) {
var parsedSavedQueries, pieces,
displayConfig = mw.config.get( 
'StructuredChangeFiltersDisplayConfig' ),
defaultSavedQueryExists = mw.config.get( 
'wgStructuredChangeFiltersDefaultSavedQueryExists' ),
controller = this,
-   views = {},
+   views = $.extend( true, {}, conditionalViews ),
items = [],
uri = new mw.Uri();
 
@@ -182,37 +182,6 @@
{
name: 'enhanced',
'default': String( 
mw.user.options.get( 'usenewrc', 0 ) )
-   }
-   ]
-   }
-   ]
-   };
-
-   views.recentChangesLinked = {
-   groups: [
-   {
-   name: 'page',
-   type: 'any_value',
-   title: '',
-   hidden: true,
-   isSticky: false,
-   filters: [
-   {
-   name: 'target',
-   'default': ''
-   }
-   ]
-   },
-   {
-   name: 'toOrFrom',
-   type: 'boolean',
-   title: '',
-   hidden: true,
-   isSticky: false,
-   filters: [
-   {
-   name: 'showlinkedto',
-   'default': false
}
]
}
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 6ec1200..7322d58 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -12,6 +12,7 @@
topSection,
$watchlistDetails,
namespaces,
+   conditionalViews = {},
savedQueriesPreferenceName = mw.config.get( 
'wgStructuredChangeFiltersSavedQueriesPreferenceName' ),
daysPreferenceName = mw.config.get( 
'wgStructuredChangeFiltersDaysPreferenceName' ),
limitPreferenceName = mw.config.get( 
'wgStructuredChangeFiltersLimitPreferenceName' ),
@@ -36,6 +37,40 @@
specialPage = mw.config.get( 
'wgCanonicalSpecialPageName' ),
$changesListRoot = $( '.mw-changeslist, 
.mw-changeslist-empty, .mw-changeslist-timeout' );
 
+   if ( specialPage 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: new groups for reading varnish/mw logs, debugging

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394102 )

Change subject: admins: new groups for reading varnish/mw logs, debugging
..


admins: new groups for reading varnish/mw logs, debugging

Per T179317, create 3 new admin groups for the needs of
Wikidata infrastructure admins (currently this translates
to Hoo).

To cover the requests from T179317#3788865:

Create these groups:

- varnish-log-readers on all varnish servers (except misc,
upload/text/canary like perf-roots)
-- with sudo privs: varnishlog *, varnishncsa *

- mediawiki-testers on canary appservers (mediawiki::canary_appserver)
-- with sudo privs: strace *, tcpdump *

- maintenance-log-readers on mediawiki_maintenance (terbium/wasat)
-- with sudo privs: journalctl *, all as syslog, dmesg *

Adding Hoo as member will be a second change.

Bug: T179317
Change-Id: Ia7ce36079b04e629aa0a8464074c255680c2d31b
---
M hieradata/role/common/cache/canary.yaml
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
M hieradata/role/common/mediawiki/canary_appserver.yaml
M hieradata/role/common/mediawiki_maintenance.yaml
M modules/admin/data/data.yaml
6 files changed, 24 insertions(+), 0 deletions(-)

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/hieradata/role/common/cache/canary.yaml 
b/hieradata/role/common/cache/canary.yaml
index cc92afc..5303524 100644
--- a/hieradata/role/common/cache/canary.yaml
+++ b/hieradata/role/common/cache/canary.yaml
@@ -7,6 +7,7 @@
 standard::has_ganglia: false
 admin::groups:
   - perf-roots
+  - varnish-log-readers
 prometheus::node_exporter::collectors_extra:
   - qdisc
   - meminfo_numa
diff --git a/hieradata/role/common/cache/text.yaml 
b/hieradata/role/common/cache/text.yaml
index a50aa85..1061525 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -3,6 +3,7 @@
 cache::lua_support: true
 admin::groups:
   - perf-roots
+  - varnish-log-readers
 prometheus::node_exporter::collectors_extra:
   - qdisc
   - meminfo_numa
diff --git a/hieradata/role/common/cache/upload.yaml 
b/hieradata/role/common/cache/upload.yaml
index 88606de..60d8bc3 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -3,6 +3,7 @@
 cache::lua_support: true
 admin::groups:
   - perf-roots
+  - varnish-log-readers
 prometheus::node_exporter::collectors_extra:
   - qdisc
   - meminfo_numa
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml 
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index 10e7a9e..1e3ba0b 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -7,6 +7,7 @@
 admin::groups:
   - deployment
   - perf-roots
+  - mediawiki-testers
 hhvm::extra::fcgi:
   hhvm:
 mysql:
diff --git a/hieradata/role/common/mediawiki_maintenance.yaml 
b/hieradata/role/common/mediawiki_maintenance.yaml
index e80536d..115b099 100644
--- a/hieradata/role/common/mediawiki_maintenance.yaml
+++ b/hieradata/role/common/mediawiki_maintenance.yaml
@@ -2,6 +2,7 @@
   - restricted
   - deployment
   - ldap-admins
+  - maintenance-log-readers
 profile::base::domain_search:
   - wikimedia.org
   - eqiad.wmnet
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7d92b62..8166856 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -630,6 +630,25 @@
 members: [mobrovac, ppchelko, eevans]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service cpjobqueue *',
  'ALL = (cpjobqueue) NOPASSWD: ALL']
+  mediawiki-testers:
+description: People who can strace and tcpdump on canary appservers for 
testing mediawiki
+gid: 797
+members: []
+privileges: ['ALL = NOPASSWD: /usr/bin/strace *',
+ 'ALL = NOPASSWD: /usr/sbin/tcpdump *']
+  varnish-log-readers:
+description: People who can read Varnish logs for debugging
+gid: 798
+members: []
+privileges: ['ALL = NOPASSWD: /usr/bin/varnishncsa *',
+ 'ALL = NOPASSWD: /usr/bin/varnishlog *']
+  maintenance-log-readers:
+description: People who can read syslog and dmesg on mediawiki maintenance 
servers
+gid: 799
+members: []
+privileges: ['ALL = NOPASSWD: /bin/journalctl *',
+ 'ALL = NOPASSWD: /bin/dmesg *',
+ '(syslog) NOPASSWD: ALL']
 
 users:
   rush:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7ce36079b04e629aa0a8464074c255680c2d31b
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetcompiler1001: add role(test)

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395900 )

Change subject: puppetcompiler1001: add role(test)
..


puppetcompiler1001: add role(test)

Please give all servers in site.pp a role.

If there is currently no specific role just use
"role(test)" or "role(spare::system)". They are made
for these and they also add "standard" and firewall.

It avoids a couple issues like not getting security upgrades or
Ganglia not being removed by default as part of decom etc.

Bug: T177843
Bug: T177225
Change-Id: I9f67ac2c39836f34281ce4b1c15fe2aba4d8fa93
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a4ac2af..b715b89 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1977,8 +1977,7 @@
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {
-include ::standard
-include ::base::firewall
+role(test)
 interface::add_ip6_mapped { 'main': }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f67ac2c39836f34281ce4b1c15fe2aba4d8fa93
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Herron 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetcompiler1001: add role(test)

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395900 )

Change subject: puppetcompiler1001: add role(test)
..

puppetcompiler1001: add role(test)

Please give all servers in site.pp a role.

If there is currently no specific role just use
"role(test)" or "role(spare::system)". They are made
for these.

It avoids a couple issues like not getting security upgrades,
Ganglia not being removed by default as part of decom etc.

Bug: T177843
Bug: T177225
Change-Id: I9f67ac2c39836f34281ce4b1c15fe2aba4d8fa93
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index a4ac2af..b715b89 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1977,8 +1977,7 @@
 }
 
 node 'puppetcompiler1001.eqiad.wmnet' {
-include ::standard
-include ::base::firewall
+role(test)
 interface::add_ip6_mapped { 'main': }
 }
 

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.11]: RCLFilters: Make 'target' and 'to/from' sticky

2017-12-06 Thread Catrope (Code Review)
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395899 )

Change subject: RCLFilters: Make 'target' and 'to/from' sticky
..

RCLFilters: Make 'target' and 'to/from' sticky

Make these parameters sticky to exclude them
from Saved Queries and related features
(empty, restoreDefaults).

Bug: T172161
Change-Id: Ib8b3ecd34c6af9e0983573586485a9a9f503c060
(cherry picked from commit 55d735f16af8c241aed7c72cbc85cd58a0145fc1)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/395899/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 1950b93..f4cdae3 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -786,7 +786,7 @@
var state = {};
 
this.getItems().forEach( function ( filterItem ) {
-   state[ filterItem.getName() ] = filterItem.isSelected();
+   state[ filterItem.getName() ] = filterItem.getValue();
} );
 
return state;
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index c1ffde2..032ae94 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -195,7 +195,7 @@
type: 'any_value',
title: '',
hidden: true,
-   isSticky: false,
+   sticky: true,
filters: [
{
name: 'target',
@@ -208,7 +208,7 @@
type: 'boolean',
title: '',
hidden: true,
-   isSticky: false,
+   sticky: true,
filters: [
{
name: 'showlinkedto',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8b3ecd34c6af9e0983573586485a9a9f503c060
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.11
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Sbisson 

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


[MediaWiki-commits] [Gerrit] integration/composer[master]: Update composer to 1.4.3

2017-12-06 Thread Paladox (Code Review)
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395898 )

Change subject: Update composer to 1.4.3
..

Update composer to 1.4.3

This is the latest 1.4 release, 1.5 seems a little buggy so will do 1.4
then 1.5 once it is more stable.

Bug: T125343
Change-Id: Ia1414ee822ef22e7d4141d81e78dffc01b3597e0
---
M composer.json
M composer.lock
M vendor/composer/ClassLoader.php
M vendor/composer/LICENSE
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_static.php
M vendor/composer/ca-bundle/README.md
M vendor/composer/ca-bundle/composer.json
M vendor/composer/ca-bundle/res/cacert.pem
M vendor/composer/ca-bundle/src/CaBundle.php
M vendor/composer/composer/.gitattributes
M vendor/composer/composer/.github/CONTRIBUTING.md
M vendor/composer/composer/.github/ISSUE_TEMPLATE.md
M vendor/composer/composer/.php_cs
M vendor/composer/composer/.travis.yml
M vendor/composer/composer/CHANGELOG.md
M vendor/composer/composer/LICENSE
M vendor/composer/composer/README.md
M vendor/composer/composer/appveyor.yml
M vendor/composer/composer/bin/composer
M vendor/composer/composer/composer.json
M vendor/composer/composer/composer.lock
M vendor/composer/composer/doc/00-intro.md
M vendor/composer/composer/doc/01-basic-usage.md
M vendor/composer/composer/doc/02-libraries.md
M vendor/composer/composer/doc/03-cli.md
M vendor/composer/composer/doc/04-schema.md
M vendor/composer/composer/doc/05-repositories.md
M vendor/composer/composer/doc/06-config.md
M vendor/composer/composer/doc/07-community.md
A vendor/composer/composer/doc/articles/autoloader-optimization.md
M vendor/composer/composer/doc/articles/custom-installers.md
M vendor/composer/composer/doc/articles/handling-private-packages-with-satis.md
M vendor/composer/composer/doc/articles/plugins.md
M vendor/composer/composer/doc/articles/scripts.md
M vendor/composer/composer/doc/articles/troubleshooting.md
M vendor/composer/composer/doc/articles/versions.md
A vendor/composer/composer/doc/faqs/how-to-install-composer-programmatically.md
A vendor/composer/composer/doc/faqs/how-to-install-untrusted-packages-safely.md
M 
vendor/composer/composer/doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md
M 
vendor/composer/composer/doc/faqs/why-can't-composer-load-repositories-recursively.md
M vendor/composer/composer/doc/fixtures/fixtures.md
D 
vendor/composer/composer/doc/fixtures/repo-composer-with-includes/include/all$5fa86b937f0502d92f776072cd49c002dca742b9.json
D 
vendor/composer/composer/doc/fixtures/repo-composer-with-includes/packages.json
A vendor/composer/composer/res/composer-repository-schema.json
M vendor/composer/composer/res/composer-schema.json
M vendor/composer/composer/src/Composer/Autoload/AutoloadGenerator.php
M vendor/composer/composer/src/Composer/Autoload/ClassLoader.php
M vendor/composer/composer/src/Composer/Autoload/ClassMapGenerator.php
M vendor/composer/composer/src/Composer/Cache.php
M vendor/composer/composer/src/Composer/Command/AboutCommand.php
M vendor/composer/composer/src/Composer/Command/ArchiveCommand.php
M vendor/composer/composer/src/Composer/Command/BaseCommand.php
M vendor/composer/composer/src/Composer/Command/ConfigCommand.php
M vendor/composer/composer/src/Composer/Command/CreateProjectCommand.php
M vendor/composer/composer/src/Composer/Command/DependsCommand.php
M vendor/composer/composer/src/Composer/Command/DiagnoseCommand.php
M vendor/composer/composer/src/Composer/Command/DumpAutoloadCommand.php
M vendor/composer/composer/src/Composer/Command/ExecCommand.php
M vendor/composer/composer/src/Composer/Command/GlobalCommand.php
M vendor/composer/composer/src/Composer/Command/HomeCommand.php
M vendor/composer/composer/src/Composer/Command/InitCommand.php
M vendor/composer/composer/src/Composer/Command/InstallCommand.php
M vendor/composer/composer/src/Composer/Command/LicensesCommand.php
M vendor/composer/composer/src/Composer/Command/OutdatedCommand.php
M vendor/composer/composer/src/Composer/Command/ProhibitsCommand.php
M vendor/composer/composer/src/Composer/Command/RemoveCommand.php
M vendor/composer/composer/src/Composer/Command/RequireCommand.php
M vendor/composer/composer/src/Composer/Command/RunScriptCommand.php
M vendor/composer/composer/src/Composer/Command/SearchCommand.php
M vendor/composer/composer/src/Composer/Command/SelfUpdateCommand.php
M vendor/composer/composer/src/Composer/Command/ShowCommand.php
M vendor/composer/composer/src/Composer/Command/StatusCommand.php
M vendor/composer/composer/src/Composer/Command/SuggestsCommand.php
M vendor/composer/composer/src/Composer/Command/UpdateCommand.php
M vendor/composer/composer/src/Composer/Command/ValidateCommand.php
M vendor/composer/composer/src/Composer/Composer.php
M vendor/composer/composer/src/Composer/Config.php
M vendor/composer/composer/src/Composer/Config/JsonConfigSource.php
M vendor/composer/composer/src/Composer/Console/Application.php
A 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia/labpuppetmaster: fix typo in hieradata path

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395897 )

Change subject: ganglia/labpuppetmaster: fix typo in hieradata path
..

ganglia/labpuppetmaster: fix typo in hieradata path

To remove ganglia, follow-up Ia47e43d7c20a0a1c.

"wmc" vs "wmcs" typo meant it did not match the role name.

Change-Id: Idd1899582871cd3658aad8b3673a6a2947b5e532
---
R hieradata/role/common/wmcs/openstack/main/puppetmaster/backend.yaml
R hieradata/role/common/wmcs/openstack/main/puppetmaster/frontend.yaml
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/395897/1

diff --git a/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml 
b/hieradata/role/common/wmcs/openstack/main/puppetmaster/backend.yaml
similarity index 100%
rename from hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
rename to hieradata/role/common/wmcs/openstack/main/puppetmaster/backend.yaml
diff --git 
a/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml 
b/hieradata/role/common/wmcs/openstack/main/puppetmaster/frontend.yaml
similarity index 100%
rename from hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
rename to hieradata/role/common/wmcs/openstack/main/puppetmaster/frontend.yaml

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia/labpuppetmaster: fix typo in hieradata path

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395897 )

Change subject: ganglia/labpuppetmaster: fix typo in hieradata path
..


ganglia/labpuppetmaster: fix typo in hieradata path

To remove ganglia, follow-up Ia47e43d7c20a0a1c.

"wmc" vs "wmcs" typo meant it did not match the role name.

Change-Id: Idd1899582871cd3658aad8b3673a6a2947b5e532
---
R hieradata/role/common/wmcs/openstack/main/puppetmaster/backend.yaml
R hieradata/role/common/wmcs/openstack/main/puppetmaster/frontend.yaml
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml 
b/hieradata/role/common/wmcs/openstack/main/puppetmaster/backend.yaml
similarity index 100%
rename from hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
rename to hieradata/role/common/wmcs/openstack/main/puppetmaster/backend.yaml
diff --git 
a/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml 
b/hieradata/role/common/wmcs/openstack/main/puppetmaster/frontend.yaml
similarity index 100%
rename from hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
rename to hieradata/role/common/wmcs/openstack/main/puppetmaster/frontend.yaml

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors, poolcounter, tendril, tor, labpuppetmaster, openldap::la...

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395896 )

Change subject: mirrors,poolcounter,tendril,tor,labpuppetmaster,openldap::lab: 
rm ganglia
..


mirrors,poolcounter,tendril,tor,labpuppetmaster,openldap::lab: rm ganglia

Bug: T177225
Change-Id: Ia47e43d7c20a0a1cf6b21a9dd5c59b94624ed207
---
M hieradata/role/common/dumps/generation/worker/testbed.yaml
A hieradata/role/common/mirrors.yaml
A hieradata/role/common/openldap/labs.yaml
A hieradata/role/common/poolcounter/server.yaml
A hieradata/role/common/tendril.yaml
A hieradata/role/common/tor_relay.yaml
A hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
A hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
8 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/dumps/generation/worker/testbed.yaml 
b/hieradata/role/common/dumps/generation/worker/testbed.yaml
index d65cd67..acda036 100644
--- a/hieradata/role/common/dumps/generation/worker/testbed.yaml
+++ b/hieradata/role/common/dumps/generation/worker/testbed.yaml
@@ -2,3 +2,4 @@
   - udp2log-users
   - deployment
   - snapshot-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mirrors.yaml 
b/hieradata/role/common/mirrors.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/mirrors.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/openldap/labs.yaml 
b/hieradata/role/common/openldap/labs.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/openldap/labs.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/poolcounter/server.yaml 
b/hieradata/role/common/poolcounter/server.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/poolcounter/server.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/tendril.yaml 
b/hieradata/role/common/tendril.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/tendril.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/tor_relay.yaml 
b/hieradata/role/common/tor_relay.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/tor_relay.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml 
b/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git 
a/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml 
b/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: mirrors, poolcounter, tendril, tor, labpuppetmaster, openldap::la...

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395896 )

Change subject: mirrors,poolcounter,tendril,tor,labpuppetmaster,openldap::lab: 
rm ganglia
..

mirrors,poolcounter,tendril,tor,labpuppetmaster,openldap::lab: rm ganglia

Bug: T177225
Change-Id: Ia47e43d7c20a0a1cf6b21a9dd5c59b94624ed207
---
M hieradata/role/common/dumps/generation/worker/testbed.yaml
A hieradata/role/common/mirrors.yaml
A hieradata/role/common/openldap/labs.yaml
A hieradata/role/common/poolcounter/server.yaml
A hieradata/role/common/tendril.yaml
A hieradata/role/common/tor_relay.yaml
A hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
A hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
8 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/395896/1

diff --git a/hieradata/role/common/dumps/generation/worker/testbed.yaml 
b/hieradata/role/common/dumps/generation/worker/testbed.yaml
index d65cd67..acda036 100644
--- a/hieradata/role/common/dumps/generation/worker/testbed.yaml
+++ b/hieradata/role/common/dumps/generation/worker/testbed.yaml
@@ -2,3 +2,4 @@
   - udp2log-users
   - deployment
   - snapshot-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mirrors.yaml 
b/hieradata/role/common/mirrors.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/mirrors.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/openldap/labs.yaml 
b/hieradata/role/common/openldap/labs.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/openldap/labs.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/poolcounter/server.yaml 
b/hieradata/role/common/poolcounter/server.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/poolcounter/server.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/tendril.yaml 
b/hieradata/role/common/tendril.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/tendril.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/tor_relay.yaml 
b/hieradata/role/common/tor_relay.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/tor_relay.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml 
b/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/wmc/openstack/main/puppetmaster/backend.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git 
a/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml 
b/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/wmc/openstack/main/puppetmaster/frontend.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false

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

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

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


[MediaWiki-commits] [Gerrit] integration/config[master]: Archive mediawiki/extensions/Wikidata

2017-12-06 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395895 )

Change subject: Archive mediawiki/extensions/Wikidata
..

Archive mediawiki/extensions/Wikidata

Bug: T181838
Change-Id: I73e2b27bb1c0585d2422dee2e57ac1cacbc46d39
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/95/395895/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6a2bd45..dbd1bc2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7188,14 +7188,7 @@
 
   - name: mediawiki/extensions/Wikidata
 template:
-  - name: extension-unittests-generic
-  - name: extension-qunit-generic
-  - name: extension-gate
-test:
-  - mwext-testextension-hhvm-jessie
-gate-and-submit: 
-  - mwext-testextension-hhvm-jessie
-gate-and-submit-swat: *mediawiki-extensions-wikidata-gate-and-submit
+  - name: archived
 
   - name: mediawiki/extensions/Wikidata.org
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73e2b27bb1c0585d2422dee2e57ac1cacbc46d39
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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


[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Stop suppressing RESTBase redirect handling when requesting ...

2017-12-06 Thread Mholloway (Code Review)
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395893 )

Change subject: Stop suppressing RESTBase redirect handling when requesting HTML
..

Stop suppressing RESTBase redirect handling when requesting HTML

Wiki pages occasionally move, and there's no reason not to let RESTBase
handle redirects for us when requesting page HTML. This will make the
service more resilient and improve the stability of our tests.

Updates getMetadataActionApi to return whether the page is a redirect,
so that the summary endpoint can continue to return 204s for redirect
pages per the spec. (Previously, we were relying on the redirect response
not having any results when querying for selector 'body > p'.)

Change-Id: Id42b6aa3c9fe751de74e6cafedfd622811b0c232
---
M lib/mobile-util.js
M lib/mwapi.js
M lib/parsoid-access.js
3 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/93/395893/1

diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 46a6c66..087c63a 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -202,6 +202,7 @@
 const isContentModelWikitext = meta.contentmodel === 'wikitext';
 const isWhiteListedNamespace = 
mUtil.SUMMARY_NS_WHITELIST.includes(meta.ns);
 const isMainPage = meta.mainpage;
+const isRedirect = meta.redirect;
 
 if (!isContentModelWikitext) {
 return { code: 204 };
@@ -215,6 +216,10 @@
 return { code: 204 };
 }
 
+if (isRedirect) {
+return { code: 204 };
+}
+
 const leadText = domino.createDocument(page.sections[0].text);
 const intro = transforms.extractLeadIntroduction(leadText);
 
diff --git a/lib/mwapi.js b/lib/mwapi.js
index 80f7bcb..103cc01 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -168,7 +168,7 @@
 piprop: 'thumbnail|original|name',
 pithumbsize: mwapi.LEAD_IMAGE_XL,
 wbptterms: 'description',
-inprop: ['protection'].join('|'),
+inprop: 'protection',
 rvprop: ['ids', 'timestamp', 'user', 'contentmodel'].join('|'),
 titles: req.params.title,
 prop: props.join('|')
@@ -207,12 +207,8 @@
 const displayTitle = pageprops && pageprops.displaytitle;
 const title = page.title;
 const thumbUrl = page.thumbnail && page.thumbnail.source;
-const thumb = thumbUrl ? {
-url: thumbUrl.replace('https:', '')
-} : undefined;
-const image = page.pageimage ? {
-file: page.pageimage
-} : undefined;
+const thumb = thumbUrl ? { url: thumbUrl.replace('https:', '') } : 
undefined;
+const image = page.pageimage ? { file: page.pageimage } : undefined;
 const protection = page.protection && 
mwapi.simplifyProtectionObject(page.protection);
 const modifier = revision && revision.anon !== undefined ? { anon: 
true } : {};
 modifier.user = revision && revision.user;
@@ -222,6 +218,7 @@
 const talkNsText = page.ns % 2 === 0 ? res.siteinfo.namespaces[page.ns 
+ 1]
 && new Namespace(page.ns + 1, res.siteinfo).getNormalizedText() : 
undefined;
 const mobileHost = res.siteinfo.general.mobileserver;
+const redirect = page.redirect;
 
 return {
 geo,
@@ -249,7 +246,8 @@
 mainpage,
 revision: revision && revision.revid,
 description: page.terms && page.terms.description[0],
-mobileHost
+mobileHost,
+redirect
 };
 });
 }
diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index 027a156..8f7aeaf 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -38,10 +38,7 @@
 return mwapi.getDbTitle(app, req, req.params.title)
 .then((title) => {
 const path = `page/html/${encodeURIComponent(title)}${suffix}`;
-const restReq = {
-query: { redirect: 'false' },
-headers: { accept: PARSOID_ACCEPT_HEADER }
-};
+const restReq = { headers: { accept: PARSOID_ACCEPT_HEADER } };
 
 return api.restApiGet(app, domain, path, restReq);
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id42b6aa3c9fe751de74e6cafedfd622811b0c232
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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


[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Wikidata build extension

2017-12-06 Thread Umherirrender (Code Review)
Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395892 )

Change subject: Remove Wikidata build extension
..


Remove Wikidata build extension

Bug: T181838
Change-Id: Ie1eec1fe1c242a4c9d6fe007f7b287326eb87364
---
M .gitmodules
D Wikidata
2 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index d14a58d..02cf8f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2978,10 +2978,6 @@
path = WikibaseQualityExternalValidation
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation
branch = .
-[submodule "Wikidata"]
-   path = Wikidata
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata
-   branch = .
 [submodule "Wikidata.org"]
path = Wikidata.org
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org
diff --git a/Wikidata b/Wikidata
deleted file mode 16
index e7ee91b..000
--- a/Wikidata
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e7ee91b863ad6058c7fa31da4039413de312de27

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1eec1fe1c242a4c9d6fe007f7b287326eb87364
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Umherirrender 

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


[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Wikidata build extension

2017-12-06 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395892 )

Change subject: Remove Wikidata build extension
..

Remove Wikidata build extension

Bug: T181838
Change-Id: Ie1eec1fe1c242a4c9d6fe007f7b287326eb87364
---
M .gitmodules
D Wikidata
2 files changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/92/395892/2

diff --git a/.gitmodules b/.gitmodules
index d14a58d..02cf8f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2978,10 +2978,6 @@
path = WikibaseQualityExternalValidation
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation
branch = .
-[submodule "Wikidata"]
-   path = Wikidata
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata
-   branch = .
 [submodule "Wikidata.org"]
path = Wikidata.org
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org
diff --git a/Wikidata b/Wikidata
deleted file mode 16
index e7ee91b..000
--- a/Wikidata
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e7ee91b863ad6058c7fa31da4039413de312de27

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1eec1fe1c242a4c9d6fe007f7b287326eb87364
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: [WIP] Add hidden developer setting to create reading lists

2017-12-06 Thread Sharvaniharan (Code Review)
Sharvaniharan has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395891 )

Change subject: [WIP] Add hidden developer setting to create reading lists
..

[WIP] Add hidden developer setting to create reading lists

- UI created to add :
- Articles to a test list
- Test Reading Lists

Bug: T182250
Change-Id: I16be3c73c8da59fb6340863e3a017898582c6a52
---
M 
app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
M app/src/main/res/values/dev_settings_strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/xml/developer_preferences.xml
4 files changed, 53 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
 
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
index 54288da..c955c16 100644
--- 
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
+++ 
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
@@ -87,6 +87,8 @@
 setUpCrashButton(findPreference(getCrashButtonKey()));
 setUpUserOptionButton(findPreference(getUserOptionButtonKey()));
 
setUpRemoteLogButton(findPreference(R.string.preference_key_remote_log));
+setUpAddArticles(findPreference(R.string.preference_key_add_articles));
+
setUpAddLists(findPreference(R.string.preference_key_add_reading_lists));
 }
 
 
@@ -183,6 +185,34 @@
 
button.setOnPreferenceChangeListener(buildRemoteLogPreferenceChangeListener());
 }
 
+private void setUpAddArticles(Preference button) {
+
button.setOnPreferenceChangeListener(buildAddArticlesPreferenceChangeListener());
+}
+
+private Preference.OnPreferenceChangeListener 
buildAddArticlesPreferenceChangeListener() {
+return new Preference.OnPreferenceChangeListener() {
+@Override
+public boolean onPreferenceChange(Preference preference, Object 
newValue) {
+
+return true;
+}
+};
+}
+
+private void setUpAddLists(Preference button) {
+
button.setOnPreferenceChangeListener(buildAddListsPreferenceChangeListener());
+}
+
+private Preference.OnPreferenceChangeListener 
buildAddListsPreferenceChangeListener() {
+return new Preference.OnPreferenceChangeListener() {
+@Override
+public boolean onPreferenceChange(Preference preference, Object 
newValue) {
+
+return true;
+}
+};
+}
+
 private Preference.OnPreferenceChangeListener 
buildRemoteLogPreferenceChangeListener() {
 return new Preference.OnPreferenceChangeListener() {
 @Override
diff --git a/app/src/main/res/values/dev_settings_strings.xml 
b/app/src/main/res/values/dev_settings_strings.xml
index 8ad2421..d10e529 100644
--- a/app/src/main/res/values/dev_settings_strings.xml
+++ b/app/src/main/res/values/dev_settings_strings.xml
@@ -25,4 +25,10 @@
 Tap here to show 
user options
 User options
 Sync all
+Reading 
Lists
+Add articles
+Add reading lists
+Type the 
number of articles
+Type 
the number of lists
+
 
diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 4c21551..9fe5b32 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -68,4 +68,6 @@
 feedCardsOrder
 feedCardsEnabled
 feedCustomizeOnboardingCardEnabled
+addArticles
+addReadingLists
 
diff --git a/app/src/main/res/xml/developer_preferences.xml 
b/app/src/main/res/xml/developer_preferences.xml
index 88af7e3..cc14073 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -6,6 +6,21 @@
 
 
 
+
+
+
+
+
+
+
 
 
 https://gerrit.wikimedia.org/r/395891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: delete views for kafkatee, hadoop, varnishkafka

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395890 )

Change subject: ganglia: delete views for kafkatee, hadoop, varnishkafka
..

ganglia: delete views for kafkatee, hadoop, varnishkafka

Can these Ganglia views be removed?

The one for kafkatee
is still working, the other 2 are already turned off as part
of decom'ing Ganglia across the fleet.

Without deleting the kafkatee view i get puppet errors on oxygen
when trying to remove Ganglia.

Just wanted to confirm these can go and you are using Grafana or
something else.  Thanks.

kafkatee view:
https://ganglia.wikimedia.org/latest/?r=hour===cpu_report=by+name==v==false

hadoop view:
https://ganglia.wikimedia.org/latest/?r=hour===cpu_report=by+name==v==false

kafka view:
https://ganglia.wikimedia.org/latest/?r=hour===cpu_report=by+name==v==false

Bug: T177225
Change-Id: I57ed4b0a2bf772d7ad05083c543745df505aadfe
---
D modules/ganglia/manifests/views/hadoop.pp
D modules/ganglia/manifests/views/kafkatee.pp
D modules/ganglia/manifests/views/varnishkafka.pp
3 files changed, 0 insertions(+), 214 deletions(-)


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

diff --git a/modules/ganglia/manifests/views/hadoop.pp 
b/modules/ganglia/manifests/views/hadoop.pp
deleted file mode 100644
index b49d1cf..000
--- a/modules/ganglia/manifests/views/hadoop.pp
+++ /dev/null
@@ -1,93 +0,0 @@
-class ganglia::views::hadoop(
-$master,
-$worker_regex,
-$ensure = 'present') {
-
-ganglia::web::view { 'hadoop':
-ensure => $ensure,
-graphs => [
-# ResourceManager active applications
-{
-'host_regex'   => $master,
-'metric_regex' => 
'Hadoop.ResourceManager.QueueMetrics.*ActiveApplications',
-'type' => 'stack',
-},
-# ResourceManager failed applications
-{
-'host_regex'   => $master,
-'metric_regex' => 
'Hadoop.ResourceManager.QueueMetrics.*AppsFailed',
-'type' => 'stack',
-},
-# NodeManager containers running
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
'Hadoop.NodeManager.NodeManagerMetrics.ContainersRunning',
-'type' => 'stack',
-},
-# NodeManager Allocated Memeory GB
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
'Hadoop.NodeManager.NodeManagerMetrics.AllocatedGB',
-'type' => 'stack',
-},
-# Worker Node bytes_in
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'bytes_in',
-'type' => 'stack',
-},
-# Worker Node bytes_out
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'bytes_out',
-'type' => 'stack',
-},
-# Primary NameNode File activity
-{
-'host_regex'   => $master,
-'metric_regex' => 
'Hadoop.NameNode.NameNodeActivity.Files(Created|Deleted|Renamed|Appended)',
-'type' => 'line',
-},
-# Worker Node /proc/diskstat bytes written per second
-{
-# FIXME - top-scope var without namespace ($worker_regex), will 
break in puppet 2.8
-# lint:ignore:variable_scope
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_write_bytes_per_sec",
-'type' => 'stack',
-},
-# /proc/diskstat bytes read per second
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_read_bytes_per_sec",
-'type' => 'stack',
-},
-# Worker Node /proc/diskstat disk utilization %
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_percent_io_time",
-'type' => 'line',
-},
-# Worker Node /proc/diskstat IO time
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_io_time",
-'type' => 'line',
-},
-# lint:endignore
-# Worker Node 15 minute load average
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'load_fifteen',
-'type' => 'line',
-},
-# Worker Node IO wait
-{
-'host_regex'   => $worker_regex,

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Partially fix class-file name mismatch sniffs

2017-12-06 Thread Pppery (Code Review)
Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395889 )

Change subject: Partially fix class-file name mismatch sniffs
..

Partially fix class-file name mismatch sniffs

Fix one instance of bad code that triggers both 
MediaWiki.Files.ClassMatchesFilename.NotMatch
and MediaWiki.Files.ClassMatchesFilename.WrongCase. One more set of errors 
remains.

Bug: T170583
Change-Id: I45c237b4366477954726a0116fb2d56256276693
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 9 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/89/395889/1

diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index eb819f8..e1b7cc2 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -10,23 +10,6 @@
 use Title;
 use Wikimedia\TestingAccessWrapper;
 
-class ApiPageSetStub extends ApiPageSet {
-
-   public function __construct( $goodTitles, $missingTitlesByNamespace ) {
-   $this->goodTitles = $goodTitles;
-   $this->missingTitlesByNamespace = $missingTitlesByNamespace;
-   }
-
-   public function getGoodTitles() {
-   return $this->goodTitles;
-   }
-
-   public function getMissingTitlesByNamespace() {
-   return $this->missingTitlesByNamespace;
-   }
-
-}
-
 class ApiQueryPageImagesProxy extends ApiQueryPageImages {
 
public function __construct( ApiPageSet $pageSet ) {
@@ -134,7 +117,15 @@
 * @dataProvider provideGetTitles
 */
public function testGetTitles( $titles, $missingTitlesByNamespace, 
$expected ) {
-   $pageSet = new ApiPageSetStub( $titles, 
$missingTitlesByNamespace );
+   $pageSet = $this->getMockBuilder( 'ApiPageSet' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $pageSet->expects( $this->once() )
+   ->method( 'getGoodTitles' )
+   ->will( $this->returnValue( $titles ) );
+   $pageSet->expects( $this->once() )
+   ->method( 'getMissingTitlesByNamespace' )
+   ->will( $this->returnValue( $missingTitlesByNamespace ) 
);
$queryPageImages = new ApiQueryPageImagesProxy( $pageSet );
 
$this->assertEquals( $expected, $queryPageImages->getTitles() );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45c237b4366477954726a0116fb2d56256276693
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery 

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


[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Use preg_replace instead of str_replace for replacing extension

2017-12-06 Thread Divadsn (Code Review)
Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395888 )

Change subject: Use preg_replace instead of str_replace for replacing extension
..

Use preg_replace instead of str_replace for replacing extension

Bug: T166684
Change-Id: I233be410486276f30b08034180eb54cb08e04076
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/88/395888/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 62cd5be..ea4625b 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -56,7 +56,7 @@
if ( isset( $customLogos['copyright-fallback'] 
) ) {
$attributes['src'] = 
$customLogos['copyright-fallback'];
} else {
-   $attributes['src'] = str_replace( 
'.svg', '.png', $customLogos['copyright'] );
+   $attributes['src'] = preg_replace( 
'"\.svg$"', '.png', $customLogos['copyright'] );
}
}
if ( isset( $customLogos['copyright-height'] ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I233be410486276f30b08034180eb54cb08e04076
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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


[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Allow Organization merge to resolve casing on organization_name

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395882 )

Change subject: Allow Organization merge to resolve casing on organization_name
..


Allow Organization merge to resolve casing on organization_name

Bug: T18108
Change-Id: I31f9cd0cb539f7e9dcbd2f1921906a9d7ca6d5a5
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6e07755..746c901 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2546,7 +2546,7 @@
  * @return bool
  */
 function _wmf_civicrm_merge_resolve_casing_conflict($fieldName, 
&$moveFieldValue, &$valueToKeep, &$valueToOverwrite) {
-  $fieldsToResolveCasingFor = array('last_name', 'first_name');
+  $fieldsToResolveCasingFor = array('last_name', 'first_name', 
'organization_name');
   if (!in_array(str_replace('move_', '', $fieldName), 
$fieldsToResolveCasingFor)) {
 return FALSE;
   }

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

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

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


[MediaWiki-commits] [Gerrit] analytics...deploy[master]: Improvements to deployment scripts

2017-12-06 Thread Ottomata (Code Review)
Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395887 )

Change subject: Improvements to deployment scripts
..

Improvements to deployment scripts

Added superset_database_exists.py to help with initialization phase.

Bug: T166689
Change-Id: Id57ed06a397aa5051bd15c43098835df3b331abe
---
M build_wheels.sh
M create_virtualenv.sh
M init_superset.sh
M profile.sh
A superset_database_exists.py
5 files changed, 43 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/superset/deploy 
refs/changes/87/395887/1

diff --git a/build_wheels.sh b/build_wheels.sh
index ce54dc2..6e259a5 100755
--- a/build_wheels.sh
+++ b/build_wheels.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install all dependencies into artifacts/$dist.  This should only be run
 # on a build server.
 
diff --git a/create_virtualenv.sh b/create_virtualenv.sh
index 80d25a9..01a1d68 100755
--- a/create_virtualenv.sh
+++ b/create_virtualenv.sh
@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -ex
+
 # source common variables
 source $(dirname $0)/profile.sh
 
diff --git a/init_superset.sh b/init_superset.sh
index eedb2ba..83f5a17 100755
--- a/init_superset.sh
+++ b/init_superset.sh
@@ -1,15 +1,21 @@
+#!/bin/bash
+
+# Initialize superset.
+# See: https://superset.incubator.apache.org/installation.html
+
+set -ex
+
 # source common variables
 source $(dirname $0)/profile.sh
 
 admin_user=${1:-admin}
 admin_pass=${2:-admin}
 
-# If /etc/superset exists, assume that superset configs are here.
-# Putting this directory in PYTHONPATH will make superset use them.
+# If /etc/superset exists, set PYTHONPATH so superset will load 
superset_config.py
 test -e /etc/superset && export PYTHONPATH=/etc/superset
+# SUPERSET_HOME should be /var/lib/superset if it exists.
+test -e /var/lib/superset && export SUPERSET_HOME=/var/lib/superset
 
-# Initialize superset.
-# See: https://superset.incubator.apache.org/installation.html
 
 # Create a Flask admin user.
 $venv/bin/fabmanager create-admin --app superset --username $admin_user 
--password $admin_pass --firstname Admin --lastname User --email 
analytics-ale...@wikimedia.org 
diff --git a/profile.sh b/profile.sh
index ba38b9f..5aa7b76 100644
--- a/profile.sh
+++ b/profile.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Common variables for build and deploy scripts.
 
 deploy_dir=$(dirname $0)
diff --git a/superset_database_exists.py b/superset_database_exists.py
new file mode 100644
index 000..5d1487a
--- /dev/null
+++ b/superset_database_exists.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+"""
+Exit 0 if the configured superset database exists, exit 1 otherwise.
+
+Usage:
+
+export PYTHONPATH=/etc/superset
+python superset_database_exists.py
+
+"""
+
+import sys
+import sqlalchemy, sqlalchemy.exc
+
+from superset.config import SQLALCHEMY_DATABASE_URI
+
+try:
+db = sqlalchemy.create_engine(SQLALCHEMY_DATABASE_URI)
+if not db.dialect.has_table(db.connect(), 'dashboards'):
+sys.exit(1)
+except sqlalchemy.exc.OperationalError:
+sys.exit(1)
+
+sys.exit(0)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id57ed06a397aa5051bd15c43098835df3b331abe
Gerrit-PatchSet: 1
Gerrit-Project: analytics/superset/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: oxygen: revert removing ganglia

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395884 )

Change subject: oxygen: revert removing ganglia
..


oxygen: revert removing ganglia

There is a special Ganglia view for kafkatee at

https://ganglia.wikimedia.org/latest/?r=hour===cpu_report=by+name==v==false

That view is in modules/ganglia/manifests/views/kafkatee.pp.

As long as we don't remove that as well there will be a puppet conflict
on oxygen.

Revert until it's confirmed that view can be removed.

Bug: T177225
Change-Id: I2792c8843efa1d9b47c75346084e1f55db8321a4
---
M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml 
b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
index 4e99e3c..7d7a879 100644
--- a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
+++ b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
@@ -1,3 +1,2 @@
-standard::has_ganglia: false
 role::logging::kafkatee::webrequest::ops::logstash_host: 
logstash.svc.eqiad.wmnet
 role::logging::kafkatee::webrequest::ops::logstash_port: 11514

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Limit paging size

2017-12-06 Thread Code Review
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395886 )

Change subject: Limit paging size
..

Limit paging size

Per the DBA recommendation in T164990#3264314 / T168984#3659998,
limit paging sizes to 10 lists / 100 entries at a time.

For most queries this limits the number of rows scanned as well.
getListEntriesByDateUpdated is the only exception: it also scans
entries of deleted lists, which could result in an arbitrary
number of rows scanned. Fixing that is left to a separate patch.

Change-Id: I7c144fabcf5d7510a6b81ca85e623705daf01ccd
---
M src/Api/ApiQueryTrait.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists 
refs/changes/86/395886/1

diff --git a/src/Api/ApiQueryTrait.php b/src/Api/ApiQueryTrait.php
index f090fa0..b95ea54 100644
--- a/src/Api/ApiQueryTrait.php
+++ b/src/Api/ApiQueryTrait.php
@@ -121,8 +121,9 @@
self::PARAM_DFLT => 10,
self::PARAM_TYPE => 'limit',
self::PARAM_MIN => 1,
-   self::PARAM_MAX => self::LIMIT_BIG1,
-   self::PARAM_MAX2 => self::LIMIT_BIG2,
+   // Temporarily limit paging sizes per 
T164990#3264314 / T168984#3659998
+   self::PARAM_MAX => self::$prefix === 'rl' ? 10 
: 100,
+   self::PARAM_MAX2 => null,
],
'continue' => [
self::PARAM_TYPE => 'string',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c144fabcf5d7510a6b81ca85e623705daf01ccd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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


[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Improve query plan for getListsByPage

2017-12-06 Thread Code Review
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395885 )

Change subject: Improve query plan for getListsByPage
..

Improve query plan for getListsByPage

Bug: T182053
Change-Id: I62c7d73ce7f30a4cfaa3ecb0fb11b9197657b9bc
---
M src/ReadingListRepository.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists 
refs/changes/85/395885/1

diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index edcac9d..fe1d315 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -694,10 +694,14 @@
$conditions,
__METHOD__,
[
-   'GROUP BY' => $this->getListFields(),
+   // Grouping by rle_rl_id can be done 
efficiently with the same index used for
+   // the conditions. All other fields are 
functionally dependent on it; MySQL 5.7.5+
+   // can detect that ( 
https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html );
+   // MariaDB needs the other fields for 
ONLY_FULL_GROUP_BY compliance, but they don't
+   // seem to negatively affect the query plan.
+   'GROUP BY' => array_merge( [ 'rle_rl_id' ], 
$this->getListFields() ),
'ORDER BY' => 'rle_rl_id ASC',
'LIMIT' => (int)$limit,
-
]
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62c7d73ce7f30a4cfaa3ecb0fb11b9197657b9bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: oxygen: revert removing ganglia

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395884 )

Change subject: oxygen: revert removing ganglia
..

oxygen: revert removing ganglia

There is a special Ganglia view for kafkatee at

https://ganglia.wikimedia.org/latest/?r=hour===cpu_report=by+name==v==false

That view is in modules/ganglia/manifests/views/kafkatee.pp.

As long as we don't remove that as well there will be a puppet conflict
on oxygen.

Revert until it's confirmed that view can be removed.

Bug: T177225
Change-Id: I2792c8843efa1d9b47c75346084e1f55db8321a4
---
M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/395884/1

diff --git a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml 
b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
index 4e99e3c..7d7a879 100644
--- a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
+++ b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
@@ -1,3 +1,2 @@
-standard::has_ganglia: false
 role::logging::kafkatee::webrequest::ops::logstash_host: 
logstash.svc.eqiad.wmnet
 role::logging::kafkatee::webrequest::ops::logstash_port: 11514

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Check if $responseData['responses'] is set before use

2017-12-06 Thread Umherirrender (Code Review)
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395883 )

Change subject: Check if $responseData['responses'] is set before use
..

Check if $responseData['responses'] is set before use

When not set assume always an invalid count

Bug: T161283
Change-Id: Id17e04ff73707830be390ef4306845403859861e
---
M includes/MultiSearchRequestLog.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/83/395883/1

diff --git a/includes/MultiSearchRequestLog.php 
b/includes/MultiSearchRequestLog.php
index ea1382e..6075979 100644
--- a/includes/MultiSearchRequestLog.php
+++ b/includes/MultiSearchRequestLog.php
@@ -72,7 +72,9 @@
$requestData = array_chunk( $lines, 2 );
$responseData = $this->response->getData();
 
-   if ( count( $requestData ) !== count( 
$responseData['responses'] ) ) {
+   if ( !isset( $responseData['responses'] ) ||
+   count( $requestData ) !== count( 
$responseData['responses'] )
+   ) {
// The world has ended...:(
// @todo add more context.
throw new \RuntimeException( 'Request and response data 
does not match' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id17e04ff73707830be390ef4306845403859861e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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


[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Allow Organization merge to resolve casing on organization_name

2017-12-06 Thread Eileen (Code Review)
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395882 )

Change subject: Allow Organization merge to resolve casing on organization_name
..

Allow Organization merge to resolve casing on organization_name

Bug: T18108
Change-Id: I31f9cd0cb539f7e9dcbd2f1921906a9d7ca6d5a5
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/395882/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6e07755..746c901 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2546,7 +2546,7 @@
  * @return bool
  */
 function _wmf_civicrm_merge_resolve_casing_conflict($fieldName, 
&$moveFieldValue, &$valueToKeep, &$valueToOverwrite) {
-  $fieldsToResolveCasingFor = array('last_name', 'first_name');
+  $fieldsToResolveCasingFor = array('last_name', 'first_name', 
'organization_name');
   if (!in_array(str_replace('move_', '', $fieldName), 
$fieldsToResolveCasingFor)) {
 return FALSE;
   }

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

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

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


[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Promote icons page Indicator to GPU layer

2017-12-06 Thread VolkerE (Code Review)
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395881 )

Change subject: demos: Promote icons page Indicator to GPU layer
..

demos: Promote icons page Indicator to GPU layer

Support Chrome by promoting layer to GPU when `opacity` is set.

Bug: T182257
Change-Id: I43e306843514347ac0856f30eb9f6b0767e78387
---
M demos/styles/demo.css
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/395881/1

diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index cc8d70e..d7af77d 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -284,6 +284,9 @@
 .demo-icons .oo-ui-fieldLayout .oo-ui-iconElement:not( 
.oo-ui-image-progressive ):not( .oo-ui-image-destructive ),
 .demo-icons .oo-ui-fieldLayout .oo-ui-indicatorElement {
opacity: 0.87; /* brings icons/indicators closer to text color */
+   /* Support Chrome by promoting layer to GPU, see T182257 */
+   -webkit-transform: translateZ( 0 );
+   transform: translateZ( 0 );
 }
 /* stylelint-enable indentation */
 .demo-icons .oo-ui-fieldLayout:hover .oo-ui-labelElement-label {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43e306843514347ac0856f30eb9f6b0767e78387
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix accepting a posted original title

2017-12-06 Thread Arlolra (Code Review)
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395879 )

Change subject: Fix accepting a posted original title
..

Fix accepting a posted original title

 * This was broken in 37f5c20

Change-Id: Ie492b4c15eb5ba2c90c873f58e49e65cbced3f70
---
M lib/api/routes.js
M tests/mocha/api.js
2 files changed, 24 insertions(+), 8 deletions(-)


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

diff --git a/lib/api/routes.js b/lib/api/routes.js
index 4253180..607eecd 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -91,14 +91,6 @@
}
res.locals.iwp = iwp;
 
-   res.locals.envOptions = {
-   prefix: res.locals.iwp,
-   pageName: res.locals.pageName,
-   cookie: req.headers.cookie,
-   reqId: req.headers['x-request-id'],
-   userAgent: req.headers['user-agent'],
-   };
-
// "subst" flag to perform {{subst:}} template expansion
res.locals.subst = !!(req.query.subst || req.body.subst);
// This is only supported for the html format
@@ -117,6 +109,14 @@
}
}
 
+   res.locals.envOptions = {
+   prefix: res.locals.iwp,
+   pageName: res.locals.pageName,
+   cookie: req.headers.cookie,
+   reqId: req.headers['x-request-id'],
+   userAgent: req.headers['user-agent'],
+   };
+
res.locals.opts = opts;
next();
};
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 6a1c2d7..7965320 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -672,6 +672,22 @@
.end(done);
});
 
+   it('should accept an original title, other than main', 
function(done) {
+   request(api)
+   .post(mockDomain + '/v3/transform/wikitext/to/html/')
+   .send({
+   original: {
+   title: 'Lint Page',
+   },
+   })
+   .expect(302)  // no revid or wikitext source provided
+   .expect(function(res) {
+   res.headers.should.have.property('location');
+   res.headers.location.should.equal('/' + 
mockDomain + '/v3/page/html/Lint_Page/102');
+   })
+   .end(done);
+   });
+
it('should not require a title when empty wikitext is provided 
(html)', function(done) {
request(api)
.post(mockDomain + '/v3/transform/wikitext/to/html/')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie492b4c15eb5ba2c90c873f58e49e65cbced3f70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T169006: Preserve request method when redirecting to oldid

2017-12-06 Thread Arlolra (Code Review)
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395880 )

Change subject: T169006: Preserve request method when redirecting to oldid
..

T169006: Preserve request method when redirecting to oldid

Change-Id: Ifab6e8d003a5e2afa11ca4077d2beafb684ca1a5
---
M lib/api/apiUtils.js
M tests/mocha/api.js
2 files changed, 42 insertions(+), 33 deletions(-)


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

diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js
index bdc85d2..d2a5b13 100644
--- a/lib/api/apiUtils.js
+++ b/lib/api/apiUtils.js
@@ -369,7 +369,7 @@
});
 };
 
-apiUtils._redirect = function(req, res, target, processRedirect) {
+apiUtils._redirect = function(req, res, target, httpStatus, processRedirect) {
var locals = res.locals;
var path = processRedirect([
'',
@@ -382,7 +382,7 @@
 
// Don't cache redirect requests
apiUtils.setHeader(res, 'Cache-Control', 'private,no-cache,s-maxage=0');
-   apiUtils.relativeRedirect(res, path);
+   apiUtils.relativeRedirect(res, path, httpStatus);
 };
 
 /**
@@ -392,26 +392,24 @@
  */
 apiUtils.redirectToOldid = function(req, res) {
var env = res.locals.env;
-   return this._redirect(
-   req,
-   res,
-   env.normalizeAndResolvePageTitle(),
-   function(redirPath) {
-   var revid = env.page.meta.revision.revid;
-   redirPath += '/' + revid;
-   if (Object.keys(req.query).length > 0) {
-   redirPath += '?' + qs.stringify(req.query);
-   }
-   var format = res.locals.opts.format;
-   env.log('info', 'redirecting to revision', revid, 
'for', format);
-   var metrics = env.conf.parsoid.metrics;
-   if (metrics) {
-   metrics.increment('redirectToOldid.' + 
format.toLowerCase());
-   }
-   return redirPath;
+   var target = env.normalizeAndResolvePageTitle();
+   // Preserve the request method since we currently don't allow GETing the
+   // "lint" format.  See T169006
+   var httpStatus = (req.method === 'GET') ? 302 : 307;
+   return this._redirect(req, res, target, httpStatus, function(redirPath) 
{
+   var revid = env.page.meta.revision.revid;
+   redirPath += '/' + revid;
+   if (Object.keys(req.query).length > 0) {
+   redirPath += '?' + qs.stringify(req.query);
}
-   );
-
+   var format = res.locals.opts.format;
+   env.log('info', 'redirecting to revision', revid, 'for', 
format);
+   var metrics = env.conf.parsoid.metrics;
+   if (metrics) {
+   metrics.increment('redirectToOldid.' + 
format.toLowerCase());
+   }
+   return redirPath;
+   });
 };
 
 /**
@@ -421,15 +419,10 @@
  * @param {Response} res
  */
 apiUtils._redirectToPage = function(title, req, res) {
-   return this._redirect(
-   req,
-   res,
-   title,
-   function(path) {
-   res.locals.env.log('info', 'redirecting to ', path);
-   return path;
-   }
-   );
+   return this._redirect(req, res, title, undefined, function(path) {
+   res.locals.env.log('info', 'redirecting to ', path);
+   return path;
+   });
 };
 
 /**
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 7965320..46a8df0 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -466,6 +466,22 @@
.end(done);
});
 
+   it('should redirect title to latest revision (lint)', 
function(done) {
+   request(api)
+   .post(mockDomain + '/v3/transform/wikitext/to/lint/')
+   .send({
+   original: {
+   title: 'Lint_Page',
+   },
+   })
+   .expect(307)  // no revid or wikitext source provided
+   .expect(function(res) {
+   res.headers.should.have.property('location');
+   res.headers.location.should.equal('/' + 
mockDomain + '/v3/page/lint/Lint_Page/102');
+   })
+   .end(done);
+   });
+
});
 
describe("wt2html", function() {
@@ -648,7 +664,7 @@
title: 'Main_Page',
},
})
-   .expect(302)  // no 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Always return a string from Language::formatNum()

2017-12-06 Thread Samwilson (Code Review)
Samwilson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395878 )

Change subject: Always return a string from Language::formatNum()
..

Always return a string from Language::formatNum()

It says it returns a string, and so it should.

Change-Id: Ic68c65c634c2557a1d07281623cd6c971b000323
---
M languages/Language.php
M tests/phpunit/languages/LanguageTest.php
2 files changed, 27 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/395878/1

diff --git a/languages/Language.php b/languages/Language.php
index 81564ab..8d3984d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3268,7 +3268,7 @@
}
}
 
-   return $number;
+   return (string)$number;
}
 
/**
diff --git a/tests/phpunit/languages/LanguageTest.php 
b/tests/phpunit/languages/LanguageTest.php
index cd52366..9abe45b 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1630,6 +1630,32 @@
}
 
/**
+* @dataProvider testFormatNumProvider
+*/
+   public function testFormatNum(
+   $translateNumerals, $langCode, $number, $nocommafy, $expected
+   ) {
+   $this->setMwGlobals( [ 'wgTranslateNumerals' => 
$translateNumerals ] );
+   $lang = Language::factory( $langCode );
+   $formattedNum = $lang->formatNum( $number, $nocommafy );
+   $this->assertType( 'string', $formattedNum );
+   $this->assertEquals( $expected, $formattedNum );
+   }
+
+   public function testFormatNumProvider() {
+   return [
+   [ true, 'en', 100, false, '100' ],
+   [ true, 'en', 101, true, '101' ],
+   [ false, 'en', 103, false, '103' ],
+   [ false, 'en', 104, true, '104' ],
+   [ true, 'en', '105', false, '105' ],
+   [ true, 'en', '106', true, '106' ],
+   [ false, 'en', '107', false, '107' ],
+   [ false, 'en', '108', true, '108' ],
+   ];
+   }
+
+   /**
 * @dataProvider parseFormattedNumberProvider
 */
public function testParseFormattedNumber( $langCode, $number ) {

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Update change-propagation to a6fe93d

2017-12-06 Thread Ppchelko (Code Review)
Ppchelko has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395877 )

Change subject: Update change-propagation to a6fe93d
..


Update change-propagation to a6fe93d

List of changes:
be193eb Separate individual delay metric from the total chain delay metrics
a6fe93d Updated restbase example config

Change-Id: I0e24d5febe7f57dbe20660c7191763184712fb98
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src b/src
index 62f7bf2..a6fe93d 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 62f7bf21f53154322e619c86d8c9e0c26b5f3134
+Subproject commit a6fe93dcb82322e458d70d7dbc1b2945ae16c464

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e24d5febe7f57dbe20660c7191763184712fb98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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


[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.Commenting.FunctionComment.MissingDocum...

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395875 )

Change subject: Re-enable 
"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" sniff
..


Re-enable "MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" 
sniff

Bug: T170583
Change-Id: I33b56a824d26feb208492e8623c3c654a1372c47
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
M includes/Job/InitImageDataJob.php
M includes/PageImages.php
M maintenance/initImageData.php
5 files changed, 35 insertions(+), 1 deletion(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..86b3495 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@



-   



diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..0a36408 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -70,6 +70,11 @@
return $titles;
}
 
+   /**
+* Evaluates the parameters, performs the requested retrieval of page 
images,
+* and sets up the result
+* @return null
+*/
public function execute() {
$params = $this->extractRequestParams();
$prop = array_flip( $params['prop'] );
@@ -170,6 +175,12 @@
return [ PageImages::getPropName( true ), 
PageImages::getPropName( false ) ];
}
 
+   /**
+* Get the cache mode for the data generated by this module
+*
+* @param array $params Ignored parameters
+* @return string Always returns "public"
+*/
public function getCacheMode( $params ) {
return 'public';
}
@@ -228,6 +239,10 @@
return 'Returns information about images on the page such as 
thumbnail and presence of photos.';
}
 
+   /**
+* Return an array describing all possible parameters to this module
+* @return array
+*/
public function getAllowedParams() {
return [
'prop' => [
@@ -290,6 +305,10 @@
];
}
 
+   /**
+* @see ApiBase::getHelpUrls()
+* @return string
+*/
public function getHelpUrls() {
return 
"https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:PageImages#API;;
}
diff --git a/includes/Job/InitImageDataJob.php 
b/includes/Job/InitImageDataJob.php
index 238732e..2d91d77 100644
--- a/includes/Job/InitImageDataJob.php
+++ b/includes/Job/InitImageDataJob.php
@@ -9,10 +9,18 @@
 use Title;
 
 class InitImageDataJob extends Job {
+   /**
+* @param Title $title Title object associated with this job
+* @param array|bool $params Parameters to the job, containing an array 
of
+* page ids representing which pages to process
+*/
public function __construct( Title $title, array $params ) {
parent::__construct( 'InitImageDataJob', $title, $params );
}
 
+   /**
+* @inheritDoc
+*/
public function run() {
$lbFactory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 
diff --git a/includes/PageImages.php b/includes/PageImages.php
index bb412ae..36d89bb 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -197,6 +197,10 @@
return $ret;
}
 
+   /**
+* Hook function called after the extension is loaded to define 
PAGE_IMAGES_INSTALLED
+* @return null
+*/
public static function onRegistration() {
define( 'PAGE_IMAGES_INSTALLED', true );
}
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 776d55a..329b525 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -27,6 +27,10 @@
$this->setBatchSize( 100 );
}
 
+   /**
+* Do the actual work of filling out page images
+* @return null
+*/
public function execute() {
global $wgPageImagesNamespaces;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33b56a824d26feb208492e8623c3c654a1372c47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Update change-propagation to a6fe93d

2017-12-06 Thread Ppchelko (Code Review)
Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395877 )

Change subject: Update change-propagation to a6fe93d
..

Update change-propagation to a6fe93d

List of changes:
be193eb Separate individual delay metric from the total chain delay metrics
a6fe93d Updated restbase example config

Change-Id: I0e24d5febe7f57dbe20660c7191763184712fb98
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy
 refs/changes/77/395877/1

diff --git a/src b/src
index 62f7bf2..a6fe93d 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 62f7bf21f53154322e619c86d8c9e0c26b5f3134
+Subproject commit a6fe93dcb82322e458d70d7dbc1b2945ae16c464

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e24d5febe7f57dbe20660c7191763184712fb98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: fix another "spare" -> "spare::system" mistake

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395876 )

Change subject: site: fix another "spare" -> "spare::system" mistake
..


site: fix another "spare" -> "spare::system" mistake

follow-up I100af592e91696c235e9e

The role is called "spare::system", not just "spare".

Change-Id: I28d2e51160f48cd95c313c99660f4c5617ab4e89
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 13456f0..a4ac2af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2185,7 +2185,7 @@
 
 # to be decom'ed (T175150#3818319)
 node 'stat1003.eqiad.wmnet' {
-role(spare)
+role(spare::system)
 }
 # stat1004 contains all the tools and libraries to access
 # the Analytics Cluster services, but should not be used

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

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

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: fix another "spare" -> "spare::system" mistake

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395876 )

Change subject: site: fix another "spare" -> "spare::system" mistake
..

site: fix another "spare" -> "spare::system" mistake

follow-up I100af592e91696c235e9e

The role is called "spare::system", not just "spare".

Change-Id: I28d2e51160f48cd95c313c99660f4c5617ab4e89
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/395876/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 13456f0..a4ac2af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2185,7 +2185,7 @@
 
 # to be decom'ed (T175150#3818319)
 node 'stat1003.eqiad.wmnet' {
-role(spare)
+role(spare::system)
 }
 # stat1004 contains all the tools and libraries to access
 # the Analytics Cluster services, but should not be used

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCLFilters: Make 'target' and 'to/from' sticky

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395861 )

Change subject: RCLFilters: Make 'target' and 'to/from' sticky
..


RCLFilters: Make 'target' and 'to/from' sticky

Make these parameters sticky to exclude them
from Saved Queries and related features
(empty, restoreDefaults).

Bug: T172161
Change-Id: Ib8b3ecd34c6af9e0983573586485a9a9f503c060
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 1950b93..f4cdae3 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -786,7 +786,7 @@
var state = {};
 
this.getItems().forEach( function ( filterItem ) {
-   state[ filterItem.getName() ] = filterItem.isSelected();
+   state[ filterItem.getName() ] = filterItem.getValue();
} );
 
return state;
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 8d5b815..eec4f4b 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -195,7 +195,7 @@
type: 'any_value',
title: '',
hidden: true,
-   isSticky: false,
+   sticky: true,
filters: [
{
name: 'target',
@@ -208,7 +208,7 @@
type: 'boolean',
title: '',
hidden: true,
-   isSticky: false,
+   sticky: true,
filters: [
{
name: 'showlinkedto',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8b3ecd34c6af9e0983573586485a9a9f503c060
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T182170: Linter: Detect multiple-unclosed-formatting-tags li...

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395689 )

Change subject: T182170: Linter: Detect multiple-unclosed-formatting-tags lint 
errors
..


T182170: Linter: Detect multiple-unclosed-formatting-tags lint errors

* Works on itwiki:Hubert_H._Humphrey_Metrodome
* Added mocha tests to verify expectations.

---
[info/lint/multiple-unclosed-formatting-tag][itwiki/Hubert_H._Humphrey_Metrodome?oldid=93017491]
{"type":"multiple-unclosed-formatting-tag","params":{"name":"small"},"dsr":[4999,5046,7,0]}
---

Change-Id: I334738c77b3677b59c91792b9dc2e7ec8fa829e5
---
M lib/wt2html/DOMPostProcessor.js
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/linter.js
3 files changed, 74 insertions(+), 2 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index b291406..e2d3840 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -33,7 +33,7 @@
return require('./pp/handlers/' + file + '.js');
 };
 
-var logWikitextFixup = requireHandlers('linter').logWikitextFixups;
+var linter = requireHandlers('linter');
 var CleanUp = requireHandlers('cleanup');
 var headings = requireHandlers('headings');
 var unpackDOMFragments = 
requireHandlers('unpackDOMFragments').unpackDOMFragments;
@@ -179,7 +179,7 @@
 
if (env.conf.parsoid.linting) {
domVisitor = new DOMTraverser(env);
-   domVisitor.addHandler(null, logWikitextFixup);
+   domVisitor.addHandler(null, linter.logWikitextFixups);
addPP('linter', domVisitor.traverse.bind(domVisitor));
}
 
@@ -536,6 +536,9 @@
if (psd.dumpFlags && psd.dumpFlags.indexOf('wt2html:limits') 
!== -1) {
env.printParserResourceUsage({ 'HTML Size': 
document.outerHTML.length });
}
+   if (env.conf.parsoid.linting) {
+   linter.postProcessLints(env.lintLogger.buffer);
+   }
}
 
this.emit('document', document);
diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index aa20ff9..aa38650 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -778,6 +778,50 @@
markProcessedNodes();
 }
 
+function detectMultipleUnclosedFormattingTags(lints) {
+   // Detect multiple-unclosed-formatting-tags errors.
+   //
+   // Since unclosed  and  tags accumulate their effects
+   // in HTML5 parsers (unlike in Tidy where it seems to suppress
+   // multiple unclosed elements of the same name), such pages will
+   // break pretty spectacularly with Remex.
+   //
+   // Ex: 
https://it.wikipedia.org/wiki/Hubert_H._Humphrey_Metrodome?oldid=93017491#Note
+   var firstUnclosedTag = {
+   small: null,
+   big: null,
+   };
+   var multiUnclosedTagName = null;
+   lints.find(function(item) {
+   if (item.type === 'missing-end-tag') {
+   if (item.params.name === 'small' || item.params.name 
=== 'big') {
+   var tagName = item.params.name;
+   if (!firstUnclosedTag[tagName]) {
+   firstUnclosedTag[tagName] = item;
+   } else {
+   multiUnclosedTagName = tagName;
+   return true;
+   }
+   }
+   }
+   return false;
+   });
+
+   if (multiUnclosedTagName) {
+   var item = firstUnclosedTag[multiUnclosedTagName];
+   lints.push({
+   type: 'multiple-unclosed-formatting-tags',
+   params: item.params,
+   dsr: item.dsr,
+   templateInfo: item.templateInfo,
+   });
+   }
+}
+
+function postProcessLints(lints) {
+   detectMultipleUnclosedFormattingTags(lints);
+}
+
 function logWikitextFixups(node, env, atTopLevel, tplInfo) {
// For now, don't run linter in subpipelines.
// Only on the final DOM for the top-level page.
@@ -826,4 +870,5 @@
 
 if (typeof module === "object") {
module.exports.logWikitextFixups = logWikitextFixups;
+   module.exports.postProcessLints = postProcessLints;
 }
diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js
index ab8bb5b..45f36b5 100644
--- a/tests/mocha/linter.js
+++ b/tests/mocha/linter.js
@@ -801,4 +801,28 @@
});
});
});
+
+   describe('MULTIPLE UNCLOSED FORMATTING TAGS', function() {
+   it('should detect multiple unclosed small tags', function() {
+   return 

[MediaWiki-commits] [Gerrit] search/xgboost[master]: Add background resource monitor task to training executors

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395592 )

Change subject: Add background resource monitor task to training executors
..


Add background resource monitor task to training executors

We have executors getting killed by overrunning their memory
allocations, but no clue why that is happening. Training an entire 35M
observation set on a single jvm (local spark mode) needs only 10GB for
both heap and overhead (total rss reported by linux). Creating a DMatrix
and running training with the 35M observations only increases memory use
as reported by the os by ~3GB. But training that 35M observation set in
yarn split between three executors with 9GB of memory overhead each
typically works but sometimes yarn comes out and kills our process.
Intuitively we should be able to get by with much less memory overhead,
and leave significantly more memory out there for other hadoop processes
to use.

Add a thread on executors that perform training to regularly report
both heap usage and Rss info from /proc/$pid/status. While this wont
tell us exactly what is happening, it will at least hopefully give
some insight into how memory usage develops over time up to the point
that yarn decides to kiil our executors.

This intentionally is implemented in a "once per jvm" way which is a bit
odd but provides us the most information. Basically the first time an
executor performs training the thread is spun up and that thread keeps
running after the current task is complete, up until the executor itself
exits.

Change-Id: I71c121055ea94b997bc018da4fc0d4d86d63bf66
---
A 
jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
M 
jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala
2 files changed, 70 insertions(+), 1 deletion(-)

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



diff --git 
a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
 
b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
new file mode 100644
index 000..22ed87c
--- /dev/null
+++ 
b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/ResourceMonitorThread.scala
@@ -0,0 +1,54 @@
+/*
+ Copyright (c) 2014 by Contributors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package ml.dmlc.xgboost4j.scala.spark
+
+import java.lang.management.ManagementFactory
+import java.util.concurrent.atomic.AtomicBoolean
+
+import org.apache.commons.logging.LogFactory
+
+import scala.concurrent.duration.Duration
+import scala.io.Source
+
+class ResourceMonitorThread(reportEvery: Duration) extends Thread {
+  super.setDaemon(true)
+
+  private val keepChecking = new AtomicBoolean(true)
+  private val pid = 
ManagementFactory.getRuntimeMXBean.getName.split('@')(0).toInt
+  private val memoryBean = ManagementFactory.getMemoryMXBean
+  private val logger = LogFactory.getLog(this.getClass)
+
+  override def run(): Unit = {
+if (!logger.isInfoEnabled) {
+  return
+}
+while (keepChecking.get()) {
+  report()
+  Thread.sleep(reportEvery.toMillis)
+}
+  }
+
+  def stopChecking(): Unit = keepChecking.set(false)
+
+  private def report(): Unit = {
+val rss = Source.fromFile(s"/proc/$pid/status").getLines()
+  .filter(_.startsWith("Rss"))
+  .mkString(", ")
+logger.info(rss)
+logger.info(memoryBean.getHeapMemoryUsage)
+  }
+}
diff --git 
a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala
 
b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala
index 2f64e15..ea18ff2 100644
--- 
a/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala
+++ 
b/jvm-packages/xgboost4j-spark/src/main/scala/ml/dmlc/xgboost4j/scala/spark/XGBoost.scala
@@ -17,8 +17,10 @@
 package ml.dmlc.xgboost4j.scala.spark
 
 import java.io.ByteArrayInputStream
+import java.util.concurrent.TimeUnit
 
 import scala.collection.mutable
+import scala.concurrent.duration.Duration
 import scala.util.Random
 import ml.dmlc.xgboost4j.java.{IRabitTracker, Rabit, XGBoostError, 
RabitTracker => PyRabitTracker}
 import ml.dmlc.xgboost4j.scala.rabit.RabitTracker
@@ -30,6 +32,7 @@
 import org.apache.spark.sql.Dataset
 import 

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.Commenting.FunctionComment.MissingDocum...

2017-12-06 Thread Pppery (Code Review)
Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395875 )

Change subject: Re-enable 
"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" sniff
..

Re-enable "MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" 
sniff

Bug: T170583
Change-Id: I33b56a824d26feb208492e8623c3c654a1372c47
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
M includes/Job/InitImageDataJob.php
M includes/PageImages.php
M maintenance/initImageData.php
5 files changed, 35 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/75/395875/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..86b3495 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@



-   



diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..0a36408 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -70,6 +70,11 @@
return $titles;
}
 
+   /**
+* Evaluates the parameters, performs the requested retrieval of page 
images,
+* and sets up the result
+* @return null
+*/
public function execute() {
$params = $this->extractRequestParams();
$prop = array_flip( $params['prop'] );
@@ -170,6 +175,12 @@
return [ PageImages::getPropName( true ), 
PageImages::getPropName( false ) ];
}
 
+   /**
+* Get the cache mode for the data generated by this module
+*
+* @param array $params Ignored parameters
+* @return string Always returns "public"
+*/
public function getCacheMode( $params ) {
return 'public';
}
@@ -228,6 +239,10 @@
return 'Returns information about images on the page such as 
thumbnail and presence of photos.';
}
 
+   /**
+* Return an array describing all possible parameters to this module
+* @return array
+*/
public function getAllowedParams() {
return [
'prop' => [
@@ -290,6 +305,10 @@
];
}
 
+   /**
+* @see ApiBase::getHelpUrls()
+* @return string
+*/
public function getHelpUrls() {
return 
"https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:PageImages#API;;
}
diff --git a/includes/Job/InitImageDataJob.php 
b/includes/Job/InitImageDataJob.php
index 238732e..2d91d77 100644
--- a/includes/Job/InitImageDataJob.php
+++ b/includes/Job/InitImageDataJob.php
@@ -9,10 +9,18 @@
 use Title;
 
 class InitImageDataJob extends Job {
+   /**
+* @param Title $title Title object associated with this job
+* @param array|bool $params Parameters to the job, containing an array 
of
+* page ids representing which pages to process
+*/
public function __construct( Title $title, array $params ) {
parent::__construct( 'InitImageDataJob', $title, $params );
}
 
+   /**
+* @inheritDoc
+*/
public function run() {
$lbFactory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 
diff --git a/includes/PageImages.php b/includes/PageImages.php
index bb412ae..36d89bb 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -197,6 +197,10 @@
return $ret;
}
 
+   /**
+* Hook function called after the extension is loaded to define 
PAGE_IMAGES_INSTALLED
+* @return null
+*/
public static function onRegistration() {
define( 'PAGE_IMAGES_INSTALLED', true );
}
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 776d55a..329b525 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -27,6 +27,10 @@
$this->setBatchSize( 100 );
}
 
+   /**
+* Do the actual work of filling out page images
+* @return null
+*/
public function execute() {
global $wgPageImagesNamespaces;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33b56a824d26feb208492e8623c3c654a1372c47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery 

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: add stat1003 ghost back to site

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395874 )

Change subject: site: add stat1003 ghost back to site
..


site: add stat1003 ghost back to site

stat1003 was gone from site, gone from Icinga but
still up and running.

We are trying to avoid this situation since then hosts
don't get security upgrades anymore and are invisible
while also not being fully down and decom'ed yet.

Per server lifecycle page, add back to site
with role(spare) until final decom.

I am noticing and doing this because i am currently removing
Ganglia from everything but hosts without roles don't get it removed
and still show up in Ganglia web UI (but nowhere else).

Bug: T175150
Bug: T177225
Change-Id: I100af592e91696c235e9ea73ed7aa23d706ac1b2
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 5bcd9c6..13456f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2183,6 +2183,10 @@
 role(failoid)
 }
 
+# to be decom'ed (T175150#3818319)
+node 'stat1003.eqiad.wmnet' {
+role(spare)
+}
 # stat1004 contains all the tools and libraries to access
 # the Analytics Cluster services, but should not be used
 # for local data processing.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I100af592e91696c235e9ea73ed7aa23d706ac1b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Cmjohnson 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: various misc roles: remove ganglia

2017-12-06 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395873 )

Change subject: various misc roles: remove ganglia
..


various misc roles: remove ganglia

Bug: T177225
Change-Id: I44cf70be0027b1ad31d3a103355db1c5381f5038
---
M hieradata/hosts/eventlog1001.yaml
A hieradata/role/common/analytics_cluster/hadoop/client.yaml
M hieradata/role/common/backup.yaml
A hieradata/role/common/bastionhost/twofa.yaml
M hieradata/role/common/ci/master.yaml
M hieradata/role/common/cluster/management.yaml
A hieradata/role/common/dmarc.yaml
M hieradata/role/common/docker/registry.yaml
A hieradata/role/common/dumps/public/server.yaml
A hieradata/role/common/dumps/web/xmldumps_fallback.yaml
A hieradata/role/common/failoid.yaml
M hieradata/role/common/graphite/production.yaml
A hieradata/role/common/icinga.yaml
M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
A hieradata/role/common/microsites/peopleweb.yaml
M hieradata/role/common/ores/redis.yaml
A hieradata/role/common/puppetmaster/puppetdb.yaml
A hieradata/role/common/rancid.yaml
M hieradata/role/common/striker/web.yaml
M hieradata/role/common/syslog/centralserver.yaml
20 files changed, 21 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/hosts/eventlog1001.yaml 
b/hieradata/hosts/eventlog1001.yaml
index d6909c8..c1326fe 100644
--- a/hieradata/hosts/eventlog1001.yaml
+++ b/hieradata/hosts/eventlog1001.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - eventlogging-admins
-  - eventlogging-roots
\ No newline at end of file
+  - eventlogging-roots
+standard::has_ganglia: false
diff --git a/hieradata/role/common/analytics_cluster/hadoop/client.yaml 
b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/backup.yaml 
b/hieradata/role/common/backup.yaml
index 8a7ca26..1b4c54a 100644
--- a/hieradata/role/common/backup.yaml
+++ b/hieradata/role/common/backup.yaml
@@ -3,3 +3,4 @@
 profile::backup::director::offsite_sd: heze
 profile::backup::director::database: m1-master.eqiad.wmnet
 #profile::backup::director::dbpass: In the private repo
+standard::has_ganglia: false
diff --git a/hieradata/role/common/bastionhost/twofa.yaml 
b/hieradata/role/common/bastionhost/twofa.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/bastionhost/twofa.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index d1173c1..4acdf78 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -3,6 +3,7 @@
   - contint-admins
   - contint-roots
 cluster: misc
+standard::has_ganglia: false
 contactgroups: 'admins,contint'
 
 profile::ci::jenkins::prefix: '/ci'
diff --git a/hieradata/role/common/cluster/management.yaml 
b/hieradata/role/common/cluster/management.yaml
index c9f0069..a0ea981 100644
--- a/hieradata/role/common/cluster/management.yaml
+++ b/hieradata/role/common/cluster/management.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - datacenter-ops
 monitor_screens: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dmarc.yaml b/hieradata/role/common/dmarc.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dmarc.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/docker/registry.yaml 
b/hieradata/role/common/docker/registry.yaml
index fe94f33..dcb2418 100644
--- a/hieradata/role/common/docker/registry.yaml
+++ b/hieradata/role/common/docker/registry.yaml
@@ -1,3 +1,4 @@
+standard::has_ganglia: false
 profile::docker::registry::image_builders:
   - '10.64.0.36' #boron.eqiad.wmnet
   - '208.80.154.17' # contint1001
diff --git a/hieradata/role/common/dumps/public/server.yaml 
b/hieradata/role/common/dumps/public/server.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/public/server.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/web/xmldumps_fallback.yaml 
b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/failoid.yaml 
b/hieradata/role/common/failoid.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/failoid.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/graphite/production.yaml 
b/hieradata/role/common/graphite/production.yaml
index 3238b42..63af869 100644
--- a/hieradata/role/common/graphite/production.yaml
+++ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: add stat1003 ghost back to site

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395874 )

Change subject: site: add stat1003 ghost back to site
..

site: add stat1003 ghost back to site

stat1003 was gone from site, gone from Icinga but
still up and running.

We are trying to avoid this situation since then hosts
don't get security upgrades anymore and are invisible
while also not being fully down and decom'ed yet.

Per server lifecycle page, add back to site
with role(spare) until final decom.

I am noticing and doing this because i am currently removing
Ganglia from everything but hosts without roles don't get it removed
and still show up in Ganglia web UI (but nowhere else).

Bug: T175150
Bug: T177225
Change-Id: I100af592e91696c235e9ea73ed7aa23d706ac1b2
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/395874/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 5bcd9c6..13456f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2183,6 +2183,10 @@
 role(failoid)
 }
 
+# to be decom'ed (T175150#3818319)
+node 'stat1003.eqiad.wmnet' {
+role(spare)
+}
 # stat1004 contains all the tools and libraries to access
 # the Analytics Cluster services, but should not be used
 # for local data processing.

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

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

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


[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Update how we calculate if-unmodified-since for tra...

2017-12-06 Thread Mobrovac (Code Review)
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395864 )

Change subject: [Config] Update how we calculate if-unmodified-since for 
transclusions
..


[Config] Update how we calculate if-unmodified-since for transclusions

See https://github.com/wikimedia/change-propagation/pull/218

Bug: T182216
Change-Id: Ibd39791543a51fa364280fff54aadcec7599014b
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 8f3356c..bca8e38 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -354,7 +354,7 @@
   uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{{match.meta.uri.title}}'
   headers:
 cache-control: no-cache
-if-unmodified-since: '{{date(message.meta.dt)}}'
+if-unmodified-since: '{{date(message.root_event.dt)}}'
 x-restbase-mode: '{{message.tags[1]}}'
   query:
 redirect: false
@@ -411,7 +411,7 @@
   uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{{match.meta.uri.title}}'
   headers:
 cache-control: no-cache
-if-unmodified-since: '{{date(message.meta.dt)}}'
+if-unmodified-since: '{{date(message.root_event.dt)}}'
 x-restbase-mode: '{{message.tags[1]}}'
   query:
 redirect: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd39791543a51fa364280fff54aadcec7599014b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 

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


[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Fix class name typo

2017-12-06 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395871 )

Change subject: Fix class name typo
..


Fix class name typo

Change-Id: I3608eea69820dfab37eb0c003b7b51f5498e2c0d
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 1d2e414..043c533 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -208,7 +208,7 @@
if ( !$cmr ) {
$this->showError(
wfMessage( 
'mwoauth-bad-request-invalid-action',
-   
\Linked::makeExternalLink(
+   
\Linker::makeExternalLink(

'https://www.mediawiki.org/wiki/Help:OAuth/Errors#E002',
'E002',
true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3608eea69820dfab37eb0c003b7b51f5498e2c0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: various misc roles: remove ganglia

2017-12-06 Thread Dzahn (Code Review)
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395873 )

Change subject: various misc roles: remove ganglia
..

various misc roles: remove ganglia

Bug: T177225
Change-Id: I44cf70be0027b1ad31d3a103355db1c5381f5038
---
M hieradata/hosts/eventlog1001.yaml
A hieradata/role/common/analytics_cluster/hadoop/client.yaml
M hieradata/role/common/backup.yaml
A hieradata/role/common/bastionhost/twofa.yaml
M hieradata/role/common/ci/master.yaml
M hieradata/role/common/cluster/management.yaml
A hieradata/role/common/dmarc.yaml
M hieradata/role/common/docker/registry.yaml
A hieradata/role/common/dumps/public/server.yaml
A hieradata/role/common/dumps/web/xmldumps_fallback.yaml
A hieradata/role/common/failoid.yaml
M hieradata/role/common/graphite/production.yaml
A hieradata/role/common/icinga.yaml
M hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
A hieradata/role/common/microsites/peopleweb.yaml
M hieradata/role/common/ores/redis.yaml
A hieradata/role/common/puppetmaster/puppetdb.yaml
A hieradata/role/common/rancid.yaml
M hieradata/role/common/striker/web.yaml
M hieradata/role/common/syslog/centralserver.yaml
20 files changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/395873/1

diff --git a/hieradata/hosts/eventlog1001.yaml 
b/hieradata/hosts/eventlog1001.yaml
index d6909c8..c1326fe 100644
--- a/hieradata/hosts/eventlog1001.yaml
+++ b/hieradata/hosts/eventlog1001.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - eventlogging-admins
-  - eventlogging-roots
\ No newline at end of file
+  - eventlogging-roots
+standard::has_ganglia: false
diff --git a/hieradata/role/common/analytics_cluster/hadoop/client.yaml 
b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/backup.yaml 
b/hieradata/role/common/backup.yaml
index 8a7ca26..1b4c54a 100644
--- a/hieradata/role/common/backup.yaml
+++ b/hieradata/role/common/backup.yaml
@@ -3,3 +3,4 @@
 profile::backup::director::offsite_sd: heze
 profile::backup::director::database: m1-master.eqiad.wmnet
 #profile::backup::director::dbpass: In the private repo
+standard::has_ganglia: false
diff --git a/hieradata/role/common/bastionhost/twofa.yaml 
b/hieradata/role/common/bastionhost/twofa.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/bastionhost/twofa.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index d1173c1..4acdf78 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -3,6 +3,7 @@
   - contint-admins
   - contint-roots
 cluster: misc
+standard::has_ganglia: false
 contactgroups: 'admins,contint'
 
 profile::ci::jenkins::prefix: '/ci'
diff --git a/hieradata/role/common/cluster/management.yaml 
b/hieradata/role/common/cluster/management.yaml
index c9f0069..a0ea981 100644
--- a/hieradata/role/common/cluster/management.yaml
+++ b/hieradata/role/common/cluster/management.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - datacenter-ops
 monitor_screens: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dmarc.yaml b/hieradata/role/common/dmarc.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dmarc.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/docker/registry.yaml 
b/hieradata/role/common/docker/registry.yaml
index fe94f33..dcb2418 100644
--- a/hieradata/role/common/docker/registry.yaml
+++ b/hieradata/role/common/docker/registry.yaml
@@ -1,3 +1,4 @@
+standard::has_ganglia: false
 profile::docker::registry::image_builders:
   - '10.64.0.36' #boron.eqiad.wmnet
   - '208.80.154.17' # contint1001
diff --git a/hieradata/role/common/dumps/public/server.yaml 
b/hieradata/role/common/dumps/public/server.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/public/server.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/web/xmldumps_fallback.yaml 
b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/dumps/web/xmldumps_fallback.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/failoid.yaml 
b/hieradata/role/common/failoid.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/failoid.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/graphite/production.yaml 
b/hieradata/role/common/graphite/production.yaml
index 3238b42..63af869 100644
--- a/hieradata/role/common/graphite/production.yaml

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: [WIP] prepare replacement of selenium-CirrusSearch job

2017-12-06 Thread DCausse (Code Review)
DCausse has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395872 )

Change subject: [WIP] prepare replacement of selenium-CirrusSearch job
..

[WIP] prepare replacement of selenium-CirrusSearch job

Add a new config for running the smoke test on the beta cluster.
Added a small flag to disable all hooks.

Bug: T175179
Change-Id: I81afeb437f238dda0e7221953dd5cb745cea1062
---
M Gruntfile.js
M package.json
A tests/integration/config/wdio.conf.beta.smoke.js
D tests/integration/config/wdio.conf.jenkins.js
M tests/integration/config/wdio.conf.js
M tests/integration/features/support/hooks.js
M tests/integration/features/support/world.js
7 files changed, 41 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/72/395872/1

diff --git a/Gruntfile.js b/Gruntfile.js
index b3841f7..c9323af 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,8 +17,8 @@
 
var WebdriverIOconfigFile;
 
-   if ( process.env.JENKINS_HOME ) {
-   WebdriverIOconfigFile = 
'./tests/integration/config/wdio.conf.jenkins.js';
+   if ( process.env.CIRRUS_BETA_SMOKE_TEST ) {
+   WebdriverIOconfigFile = 
'./tests/integration/config/wdio.conf.beta.smoke.js';
} else {
WebdriverIOconfigFile = 
'./tests/integration/config/wdio.conf.js';
}
diff --git a/package.json b/package.json
index cf4a6b3..e20472c 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
 "stylelint": "7.8.0",
 "stylelint-config-wikimedia": "0.4.1",
 "wdio-cucumber-framework": "^1.0.1",
+"wdio-junit-reporter": "^0.3.1",
 "webdriverio": "^4.8.0",
 "restify": "^6.3.4",
 "request": "^2.83.0",
diff --git a/tests/integration/config/wdio.conf.beta.smoke.js 
b/tests/integration/config/wdio.conf.beta.smoke.js
new file mode 100644
index 000..26579d5
--- /dev/null
+++ b/tests/integration/config/wdio.conf.beta.smoke.js
@@ -0,0 +1,28 @@
+/*jshint esversion: 6,  node:true */
+
+/* eslint no-undef: "error" */
+/* eslint-env node */
+'use strict';
+const wdioConf = require( './wdio.conf.js' );
+
+// Overwrite default settings
+let config = wdioConf.config;
+
+config.disableHooks = true;
+config.wikis = {
+   default: 'beta',
+   beta: {
+   apiUrl: 'https://en.wikipedia.beta.wmflabs.org/w/api.php',
+   baseUrl: 'https://en.wikipedia.beta.wmflabs.org'
+   }
+};
+config.screenshotPath = '../log/';
+config.reporters = [ 'spec', 'junit' ];
+config.reporterOptions= {
+   junit: {
+   outputDir: '../log/'
+   }
+};
+config.specs = [ wdioConf.relPath( './integration/features/smoke.feature' ) ];
+
+exports.config = config;
diff --git a/tests/integration/config/wdio.conf.jenkins.js 
b/tests/integration/config/wdio.conf.jenkins.js
deleted file mode 100644
index 451b1c0..000
--- a/tests/integration/config/wdio.conf.jenkins.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*jshint esversion: 6,  node:true */
-
-/* eslint no-undef: "error" */
-/* eslint-env node */
-'use strict';
-var merge = require( 'deepmerge' ),
-   wdioConf = require( './wdio.conf.js' );
-
-// Overwrite default settings
-exports.config = merge( wdioConf.config, {
-   username: 'WikiAdmin',
-   password: 'testpass',
-   screenshotPath: '../log/',
-   baseUrl: process.env.MW_SERVER + process.env.MW_SCRIPT_PATH,
-
-   reporters: [ 'spec', 'junit' ],
-   reporterOptions: {
-   junit: {
-   outputDir: '../log/'
-   }
-   }
-} );
diff --git a/tests/integration/config/wdio.conf.js 
b/tests/integration/config/wdio.conf.js
index 3f537ef..d61bf3b 100644
--- a/tests/integration/config/wdio.conf.js
+++ b/tests/integration/config/wdio.conf.js
@@ -14,6 +14,8 @@
return path.resolve( __dirname, '../..', foo );
 }
 
+exports.relPath = relPath;
+
 let forkedTracker;
 let unixSocket;
 
@@ -36,6 +38,8 @@
password: process.env.MEDIAWIKI_PASSWORD === undefined ?
'vagrant' :
process.env.MEDIAWIKI_PASSWORD,
+   // set to true to not perform any update on the target wiki
+   disableHooks: false,
wikis: {
default: 'cirrustest',
cirrustest: {
diff --git a/tests/integration/features/support/hooks.js 
b/tests/integration/features/support/hooks.js
index 3f79285..7b7e8b0 100644
--- a/tests/integration/features/support/hooks.js
+++ b/tests/integration/features/support/hooks.js
@@ -11,6 +11,9 @@
 defineSupportCode( function( { After, Before } ) {
const BeforeOnce = function ( options, fn ) {
Before( options, Promise.coroutine( function* () {
+   if ( this.config.disableHooks ) {
+   return;
+   }
const response = yield this.tags.check( options.tags );
if 

  1   2   3   4   5   >