date:20170614

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Add comment to db1018 status

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359092 )

Change subject: db-eqiad.php: Add comment to db1018 status
..


db-eqiad.php: Add comment to db1018 status

db1018 is going to start an alter table that will take 2 days,
specifiying it on the config just in case it needs to be pooled

Bug: T166205
Change-Id: Ie7a1c166d436b6cc699dfcea5ea37d1731af717b
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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 0198c19..31c95dd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -108,7 +108,7 @@
],
's2' => [
'db1054' => 0,   # A3 2.8TB  96GB, master
-#  'db1018' => 0,   # B1 1.4TB  64GB, old master 2
+#  'db1018' => 0,   # B1 1.4TB  64GB, old master 2 #Alter table 
running - #T166205
'db1021' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1036' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1060' => 1,   # C2 2.8TB  96GB, api

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7a1c166d436b6cc699dfcea5ea37d1731af717b
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: Add comment to db1018 status

2017-06-14 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359092 )

Change subject: db-eqiad.php: Add comment to db1018 status
..

db-eqiad.php: Add comment to db1018 status

db1018 is going to start an alter table that will take 2 days,
specifiying it on the config just in case it needs to be pooled

Bug: T166205
Change-Id: Ie7a1c166d436b6cc699dfcea5ea37d1731af717b
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0198c19..31c95dd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -108,7 +108,7 @@
],
's2' => [
'db1054' => 0,   # A3 2.8TB  96GB, master
-#  'db1018' => 0,   # B1 1.4TB  64GB, old master 2
+#  'db1018' => 0,   # B1 1.4TB  64GB, old master 2 #Alter table 
running - #T166205
'db1021' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1036' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1060' => 1,   # C2 2.8TB  96GB, api

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7a1c166d436b6cc699dfcea5ea37d1731af717b
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...CollaborationKit[master]: Fixing typos in function documentation.

2017-06-14 Thread Harej (Code Review)

Harej has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359091 )

Change subject: Fixing typos in function documentation.
..

Fixing typos in function documentation.

Change-Id: I7550a59064d02f3fbdac40fff2a7bb2b71f9a0e0
---
M includes/content/CollaborationKitImage.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/91/359091/1

diff --git a/includes/content/CollaborationKitImage.php 
b/includes/content/CollaborationKitImage.php
index ed083bb..ac7f39d 100644
--- a/includes/content/CollaborationKitImage.php
+++ b/includes/content/CollaborationKitImage.php
@@ -26,12 +26,12 @@
 *  instead of HTML? Defaults to false.
 * @param string $options['label'] Label to put under image; used for 
ToC icons
 * @param string $options['fallback'] If the specified image is null or
-*  doesn't exist. Validoptions are none', a valid icon ID, or an 
arbitrary
+*  doesn't exist. Valid options are 'none', a valid icon ID, or an 
arbitrary
 *  string to use a seed. (Note: if you specify a label, then that will
 *  serve as the fallback.)
 * @param bool $options['optimizeForSquare'] Fetch an image such that 
it's
 *  ideal for shoving into a square frame. Default is false. Images with
-*  labels always get optimzed for squares.
+*  labels always get optimzied for squares.
 * @return string HTML elements or wikitext, depending on
 *  $options['renderAsWikitext']
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7550a59064d02f3fbdac40fff2a7bb2b71f9a0e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Make the edit textboxes use monospace text.

2017-06-14 Thread Harej (Code Review)

Harej has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359090 )

Change subject: Make the edit textboxes use monospace text.
..

Make the edit textboxes use monospace text.

Change-Id: I25513f17f340a3fe79eede37b07c86874d4fbc35
---
M modules/ext.CollaborationKit.edit.styles.less
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/90/359090/1

diff --git a/modules/ext.CollaborationKit.edit.styles.less 
b/modules/ext.CollaborationKit.edit.styles.less
index e20f551..9854168 100644
--- a/modules/ext.CollaborationKit.edit.styles.less
+++ b/modules/ext.CollaborationKit.edit.styles.less
@@ -8,6 +8,9 @@
max-width: 100%;
}
 }
+.mw-collabkit-modifiededitform textarea {
+   font-family: monospace !important;
+}
 .mw-htmlform-ooui-wrapper,
 .mw-collabkit-modifiededitform {
.oo-ui-fieldLayout-header label.oo-ui-labelElement-label,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25513f17f340a3fe79eede37b07c86874d4fbc35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

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

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358966 )

Change subject: Revert "db-eqiad.php: Depool db1036"
..


Revert "db-eqiad.php: Depool db1036"

This reverts commit ed828ef8eaed0931e656066cd18281fcb8da6c37.

Change-Id: I211ff5088b09683481eab8d59a7958125116b753
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 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 b62b2ff..0198c19 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -110,10 +110,10 @@
'db1054' => 0,   # A3 2.8TB  96GB, master
 #  'db1018' => 0,   # B1 1.4TB  64GB, old master 2
'db1021' => 0,   # B1 1.4TB  64GB, vslow, dump
-#  'db1036' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager #T166205
+   'db1036' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1060' => 1,   # C2 2.8TB  96GB, api
'db1074' => 300, # A2 3.6TB 512GB, api
-   'db1076' => 1, # B1 3.6TB 512GB #temporary rc service
+   'db1076' => 500, # B1 3.6TB 512GB
'db1090' => 500, # C3 3.6TB 512GB
],
/* s3 */ 'DEFAULT' => [
@@ -278,19 +278,19 @@
'db1074' => 1,
],
'watchlist' => [
-   'db1076' => 1,
+   'db1036' => 1,
],
'recentchanges' => [
-   'db1076' => 1,
+   'db1036' => 1,
],
'recentchangeslinked' => [
-   'db1076' => 1,
+   'db1036' => 1,
],
'contributions' => [
-   'db1076' => 1,
+   'db1036' => 1,
],
'logpager' => [
-   'db1076' => 1,
+   'db1036' => 1,
],
],
/* s3 */ 'DEFAULT' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I211ff5088b09683481eab8d59a7958125116b753
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
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] mediawiki...PageTriage[master]: Don't show the 'Possible issues' section in the info flyout ...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359082 )

Change subject: Don't show the 'Possible issues' section in the info flyout if 
it is empty
..


Don't show the 'Possible issues' section in the info flyout if it is empty

Bug: T147220
Change-Id: Ia716cb76fd6630dde394c9f3aa73fa93480b8030
---
M PageTriage.hooks.php
M i18n/bho.json
M i18n/br.json
M i18n/cs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/et.json
M i18n/fa.json
M i18n/fi.json
M i18n/fr.json
M i18n/gl.json
M i18n/he.json
M i18n/hsb.json
M i18n/ia.json
M i18n/id.json
M i18n/is.json
M i18n/it.json
M i18n/ja.json
M i18n/ko.json
M i18n/lb.json
M i18n/mk.json
M i18n/nb.json
M i18n/nl.json
M i18n/pms.json
M i18n/pt.json
M i18n/qqq.json
M i18n/ro.json
M i18n/ru.json
M i18n/sv.json
M i18n/ta.json
M i18n/tl.json
M i18n/tr.json
M i18n/uk.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
37 files changed, 8 insertions(+), 46 deletions(-)

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



diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 6970e83..ec725e8 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -631,7 +631,6 @@
'pagetriage-info-history-header',
'pagetriage-info-history-show-full',
'pagetriage-info-help',
-   'pagetriage-info-no-problems',
'pagetriage-info-problem-non-autoconfirmed',

'pagetriage-info-problem-non-autoconfirmed-desc',
'pagetriage-info-problem-blocked',
diff --git a/i18n/bho.json b/i18n/bho.json
index 88fb7b4..2a1344b 100644
--- a/i18n/bho.json
+++ b/i18n/bho.json
@@ -146,7 +146,6 @@
"pagetriage-info-history-header": "इतिहास",
"pagetriage-info-history-show-full": "पूरा इतिहास देखाईं",
"pagetriage-info-help": "मदद",
-   "pagetriage-info-no-problems": "अभिन ले ए पन्ना पर कौनों समस्या नइखे 
मिलल।",
"pagetriage-info-problem-non-autoconfirmed": "नया संपादक",
"pagetriage-info-problem-blocked": "ब्लाक कइल सदस्य सभ",
"pagetriage-info-problem-no-categories": "बिना श्रेणी के पन्ना",
diff --git a/i18n/br.json b/i18n/br.json
index d52ef2f..407b249 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -94,7 +94,6 @@
"pagetriage-info-history-header": "Istor",
"pagetriage-info-history-show-full": "diskouez an istor klok",
"pagetriage-info-help": "skoazell",
-   "pagetriage-info-no-problems": "N'eus bet kavet kudenn ebet war ar 
bajenn-mañ betek-henn.",
"pagetriage-info-problem-non-autoconfirmed": "Aozer nevez",
"pagetriage-info-problem-blocked": "Implijer stanket",
"pagetriage-info-problem-blocked-desc": "Krouet e oa bet ar bajenn-mañ 
gant un implijer stanket.",
diff --git a/i18n/cs.json b/i18n/cs.json
index c908e29..f3019f1 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -65,7 +65,6 @@
"pagetriage-js-required": "Toto rozšíření vyžaduje prohlížeč se 
zapnutým JavaScriptem.",
"pagetriage-tags-param-free-yes-label": "Ano",
"pagetriage-tags-param-free-no-label": "Ne",
-   "pagetriage-info-no-problems": "U této stránky zatím nebyly nalezeny 
žádné problémy.",
"pagetriage-info-problem-non-autoconfirmed": "Nový uživatel",
"pagetriage-info-problem-non-autoconfirmed-desc": "Tuto stránku založil 
uživatel, který dosud nebyl automaticky schválen.",
"pagetriage-info-problem-blocked": "Zablokovaný uživatel",
diff --git a/i18n/de.json b/i18n/de.json
index 546c251..2145729 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -313,7 +313,6 @@
"pagetriage-info-history-header": "Versionsgeschichte",
"pagetriage-info-history-show-full": "vollständige Versionsgeschichte 
anzeigen",
"pagetriage-info-help": "Hilfe",
-   "pagetriage-info-no-problems": "Zu dieser Seite wurden bisher keine 
Probleme ermittelt.",
"pagetriage-info-problem-non-autoconfirmed": "Neuer Autor",
"pagetriage-info-problem-non-autoconfirmed-desc": "Dieser Artikel wurde 
von einem unbestätigten Benutzer erstellt.",
"pagetriage-info-problem-blocked": "Gesperrter Autor",
diff --git a/i18n/en.json b/i18n/en.json
index b248854..4ae79d3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -319,7 +319,6 @@
"pagetriage-info-history-header": "History",
"pagetriage-info-history-show-full": "show full history",
"pagetriage-info-help": "help",
-   "pagetriage-info-no-problems": "No problems have been found for this 
page so far.",
"pagetriage-info-problem-non-autoconfirmed": "New editor",
"pagetriage-info-problem-non-autoconfirmed-desc": "This page was 
created by a non-autoconfirmed editor.",

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Forward MultiWriteBagOStuff::makeKey to primary...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358999 )

Change subject: objectcache: Forward MultiWriteBagOStuff::makeKey to primary 
backend
..


objectcache: Forward MultiWriteBagOStuff::makeKey to primary backend

Similar to what WANObjectCache and CachedBagOStuff are already doing.

Also add missing tests for WANObjectCache (similar to those for 
CachedBagOStuff).

Bug: T167465
Change-Id: I1a0c9324726aa6a1b221def985773b1b819181fd
---
M includes/libs/objectcache/MultiWriteBagOStuff.php
M tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
3 files changed, 79 insertions(+), 0 deletions(-)

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



diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php 
b/includes/libs/objectcache/MultiWriteBagOStuff.php
index 9dcfa7c..687c67c 100644
--- a/includes/libs/objectcache/MultiWriteBagOStuff.php
+++ b/includes/libs/objectcache/MultiWriteBagOStuff.php
@@ -226,4 +226,12 @@
 
return $ret;
}
+
+   public function makeKey() {
+   return call_user_func_array( [ $this->caches[0], __FUNCTION__ 
], func_get_args() );
+   }
+
+   public function makeGlobalKey() {
+   return call_user_func_array( [ $this->caches[0], __FUNCTION__ 
], func_get_args() );
+   }
 }
diff --git 
a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
index 38d63e3..775709f 100644
--- a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
@@ -98,4 +98,39 @@
// Set in tier 2
$this->assertEquals( $value, $this->cache2->get( $key ), 
'Written to tier 2' );
}
+
+   /**
+* @covers MultiWriteBagOStuff::makeKey
+*/
+   public function testMakeKey() {
+   $cache1 = $this->getMockBuilder( HashBagOStuff::class )
+   ->setMethods( [ 'makeKey' ] )->getMock();
+   $cache1->expects( $this->once() )->method( 'makeKey' )
+   ->willReturn( 'special' );
+
+   $cache2 = $this->getMockBuilder( HashBagOStuff::class )
+   ->setMethods( [ 'makeKey' ] )->getMock();
+   $cache2->expects( $this->never() )->method( 'makeKey' );
+
+   $cache = new MultiWriteBagOStuff( [ 'caches' => [ $cache1, 
$cache2 ] ] );
+   $this->assertSame( 'special', $cache->makeKey( 'a', 'b' ) );
+   }
+
+   /**
+* @covers MultiWriteBagOStuff::makeGlobalKey
+*/
+   public function testMakeGlobalKey() {
+   $cache1 = $this->getMockBuilder( HashBagOStuff::class )
+   ->setMethods( [ 'makeGlobalKey' ] )->getMock();
+   $cache1->expects( $this->once() )->method( 'makeGlobalKey' )
+   ->willReturn( 'special' );
+
+   $cache2 = $this->getMockBuilder( HashBagOStuff::class )
+   ->setMethods( [ 'makeGlobalKey' ] )->getMock();
+   $cache2->expects( $this->never() )->method( 'makeGlobalKey' );
+
+   $cache = new MultiWriteBagOStuff( [ 'caches' => [ $cache1, 
$cache2 ] ] );
+
+   $this->assertSame( 'special', $cache->makeGlobalKey( 'a', 'b' ) 
);
+   }
 }
diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 
b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index 728e671..2b04366 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -1191,4 +1191,40 @@
[ null, 86400, 800, .2, 800 ]
];
}
+
+   /**
+* @covers WANObjectCache::makeKey
+*/
+   public function testMakeKey() {
+   $backend = $this->getMockBuilder( HashBagOStuff::class )
+   ->setMethods( [ 'makeKey' ] )->getMock();
+   $backend->expects( $this->once() )->method( 'makeKey' )
+   ->willReturn( 'special' );
+
+   $wanCache = new WANObjectCache( [
+   'cache' => $backend,
+   'pool' => 'testcache-hash',
+   'relayer' => new EventRelayerNull( [] )
+   ] );
+
+   $this->assertSame( 'special', $wanCache->makeKey( 'a', 'b' ) );
+   }
+
+   /**
+* @covers WANObjectCache::makeGlobalKey
+*/
+   public function testMakeGlobalKey() {
+   $backend = $this->getMockBuilder( HashBagOStuff::class )
+   ->setMethods( [ 'makeGlobalKey'

[MediaWiki-commits] [Gerrit] operations/puppet[production]: releases: add new role/profile, add backups, install jenkins

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359089 )

Change subject: releases: add new role/profile, add backups, install jenkins
..

releases: add new role/profile, add backups, install jenkins

Add new role class for new releases server.

Add new profile for mediawiki::releases and include it in new role.

Add jenkins install in new profile, as requested by Chad on
Ie12ac955618d41.

Add backup::host to prepare Bacula backups of releases files.
Move standard and firewall into role class.

Bug: T164030
Change-Id: Iaa6ae686144a7b911cbc82d26346cba2db201478
---
R hieradata/role/common/releases.yaml
M manifests/site.pp
A modules/profile/manifests/releases/mediawiki.pp
A modules/role/manifests/releases.pp
4 files changed, 25 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/359089/1

diff --git a/hieradata/hosts/releases1001.yaml 
b/hieradata/role/common/releases.yaml
similarity index 100%
rename from hieradata/hosts/releases1001.yaml
rename to hieradata/role/common/releases.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 60e82c6..3337eca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2364,8 +2364,7 @@
 
 # upcoming VM for releases (mwreleases and other)
 node 'releases1001.eqiad.wmnet' {
-include ::standard
-include ::base::firewall
+role(releases)
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/profile/manifests/releases/mediawiki.pp 
b/modules/profile/manifests/releases/mediawiki.pp
new file mode 100644
index 000..f2feae9
--- /dev/null
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -0,0 +1,12 @@
+# server hosting Mediawiki releases
+# https://releases.wikimedia.org/mediawiki/
+class profile::releases::mediawiki {
+
+class { '::jenkins':
+access_log => true,
+http_port  => '8080',
+prefix => '/jenkins',
+umask  => '0002',
+}
+
+}
diff --git a/modules/role/manifests/releases.pp 
b/modules/role/manifests/releases.pp
new file mode 100644
index 000..13114df
--- /dev/null
+++ b/modules/role/manifests/releases.pp
@@ -0,0 +1,12 @@
+class role::releases {
+
+system::role { 'releases':
+ensure  => 'present',
+description => 'Wikimedia Software Releases Server',
+}
+
+include ::standard
+include ::base::firewall
+include ::profile::backup::host
+include ::profile::releases::mediawiki
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa6ae686144a7b911cbc82d26346cba2db201478
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...parsoid[master]: T167933: Use mediawiki-title to resolve the template namespace

2017-06-14 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359088 )

Change subject: T167933: Use mediawiki-title to resolve the template namespace
..

T167933: Use mediawiki-title to resolve the template namespace

Change-Id: I3d232bc43a128a48a9ebe3f7c6c52f909880f542
---
M lib/wt2html/tt/TemplateHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 31 insertions(+), 20 deletions(-)


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

diff --git a/lib/wt2html/tt/TemplateHandler.js 
b/lib/wt2html/tt/TemplateHandler.js
index fba99e1..6351962 100644
--- a/lib/wt2html/tt/TemplateHandler.js
+++ b/lib/wt2html/tt/TemplateHandler.js
@@ -443,8 +443,6 @@
}
 
var normalizeTarget = function(txt) {
-   // Without a trim(), we get bug T147742 because the prefix === 
target
-   // check further below fails!
txt = txt.trim();
// safesubst found in content should be treated as if no 
modifier were
// present.  See 
https://en.wikipedia.org/wiki/Help:Substitution#The_safesubst:_modifier
@@ -511,17 +509,13 @@
};
}
 
-   if (!isTemplate) {
-   return null;
-   }
+   if (!isTemplate) { return null; }
 
-   // FIXME: resolveTitle adds namespace prefix when it resolves
-   // fragments and relative titles. Maybe we should add a flag to
-   // have it do in all cases.
-   if (prefix === target && !/^[#\/\.]/.test(target)) {
-   var namespaceId = wiki.canonicalNamespaces.template;
-   target = wiki.namespaceNames[namespaceId] + ':' + target;
-   }
+   // `resolveTitle()` adds the namespace prefix when it resolves fragments
+   // and relative titles, and a leading colon should resolve to a template
+   // from the main namespace, hence we omit a default when making a title
+   var namespaceId = /^[:#\/\.]/.test(target) ?
+   undefined : wiki.canonicalNamespaces.template;
 
// Resolve a possibly relative link and
// normalize the target before template processing.
@@ -535,7 +529,7 @@
 
// Entities in transclusions aren't decoded in the PHP parser
// So, treat the title as a url-decoded string!
-   title = env.makeTitleFromURLDecodedStr(title, undefined, true);
+   title = env.makeTitleFromURLDecodedStr(title, namespaceId, true);
if (!title) {
// Invalid template target!
return null;
@@ -549,7 +543,6 @@
magicWordType: null,
target: title.getPrefixedDBKey(),
};
-
 };
 
 TemplateHandler.prototype.convertAttribsToString = function(state, attribs, 
cb) {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 6e29cb7..ec04048 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -190,7 +190,7 @@
 add("wt2html", "HTML with raw HTML ($wgRawHtml==true)", "html>script>alert(1);/script>/html>");
 add("wt2html", "Parents of subpages, one level up, not named", "Subpage_test/L1/L2");
 add("wt2html", "Parents of subpages, two levels up, with lots of extra 
trailing slashes.", "Subpage_test/L1");
-add("wt2html", "RAW magic word", "{{RAW:QUERTY}}");
+add("wt2html", "RAW magic word", "{{RAW:QUERTY}}");
 add("wt2html", "Out-of-order TOC heading levels", "2\n6\n3\n1\n5\n2");
 add("wt2html", "anchorencode", "foo 
bar©#%n");
 add("wt2html", "anchorencode trims spaces", "__pretty__please__");
@@ -253,8 +253,8 @@
 add("wt2html", "Bad images - T18039: text after bad image disappears", "Foo bar\n\nBar
 foo");
 add("wt2html", "T33098 Template which includes system messages which includes 
the template", "Parser
 function implementation for pf_int missing in Parsoid.\nParser function 
implementation for pf_int missing in Parsoid.");
 add("wt2html", "T33490 Turkish: ucfirst 'ix'", "Ix");
-add("wt2html", "T33490 Turkish: ucfırst (with a dotless i)", "{{ucfırst:blah}}");
-add("wt2html", "T33490 ucfırst (with a dotless i) with English language", "{{ucfırst:blah}}");
+add("wt2html", "T33490 Turkish: ucfırst (with a dotless i)", "{{ucfırst:blah}}");
+add("wt2html", "T33490 ucfırst (with a dotless i) with English language", "{{ucfırst:blah}}");
 add("wt2html", "T34057: Title needed when expanding  nodes.", "Parser
 function implementation for pf_int missing in Parsoid.");
 add("wt2html", "Check noCommafy in formatNum", "123456.78\n123456.78");
 add("wt2html", "Wrong option for formatNum (T58199)", "1,234.56\n1,234.56\n1234.56");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 372f830..5f24bbc 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -278,6 +278,12 @@
 {{CircularRef}}
 !! endarticle
 
+!! article
+Template:With: Colon
+!! text
+Template with colon
+!! endarticle
+
 ###
 ###

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: switch releases1001 to stretch

2017-06-14 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359087 )

Change subject: install_server: switch releases1001 to stretch
..


install_server: switch releases1001 to stretch

We might as well do stretch here right away, release is
imminent in like 3 days.

Bug: T164030
Change-Id: I348a02a6b249d7b3b69dcffc604c918d31ea40ed
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 2e22094..6f25e0b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -259,6 +259,8 @@
 host releases1001 {
 hardware ethernet aa:00:00:11:7b:19;
 fixed-address releases1001.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host roentgenium {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I348a02a6b249d7b3b69dcffc604c918d31ea40ed
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
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]: install_server: switch releases1001 to stretch

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359087 )

Change subject: install_server: switch releases1001 to stretch
..

install_server: switch releases1001 to stretch

We might as well do stretch here right away, release is
imminent in like 3 days.

Bug: T164030
Change-Id: I348a02a6b249d7b3b69dcffc604c918d31ea40ed
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 2e22094..6f25e0b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -259,6 +259,8 @@
 host releases1001 {
 hardware ethernet aa:00:00:11:7b:19;
 fixed-address releases1001.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host roentgenium {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I348a02a6b249d7b3b69dcffc604c918d31ea40ed
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]: install_server: update MAC address of releases1001

2017-06-14 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359086 )

Change subject: install_server: update MAC address of releases1001
..


install_server: update MAC address of releases1001

This used to be mwreleases1001 but was reinstalled as
releases1001. MAC address changed since old VM was destroyed.
This is the new one.

Bug: T164030
Change-Id: I1de759007882532ab87cd2acbc2b54801b2deab8
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 523ed73..2e22094 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -257,7 +257,7 @@
 }
 
 host releases1001 {
-hardware ethernet aa:00:00:75:ee:6d;
+hardware ethernet aa:00:00:11:7b:19;
 fixed-address releases1001.eqiad.wmnet;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1de759007882532ab87cd2acbc2b54801b2deab8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: install_server: update MAC address of releases1001

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359086 )

Change subject: install_server: update MAC address of releases1001
..

install_server: update MAC address of releases1001

This used to be mwreleases1001 but was reinstalled as
releases1001. MAC address changed since old VM was destroyed.
This is the new one.

Bug: T164030
Change-Id: I1de759007882532ab87cd2acbc2b54801b2deab8
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 523ed73..2e22094 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -257,7 +257,7 @@
 }
 
 host releases1001 {
-hardware ethernet aa:00:00:75:ee:6d;
+hardware ethernet aa:00:00:11:7b:19;
 fixed-address releases1001.eqiad.wmnet;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1de759007882532ab87cd2acbc2b54801b2deab8
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]: Add | to error message about invalid change tag characters

2017-06-14 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359085 )

Change subject: Add | to error message about invalid change tag characters
..

Add | to error message about invalid change tag characters

Pipe itself is already not allowed.

Bug: T92956
Change-Id: Icb98b5e8040fa91685adcdfdb46e1173162f2b9e
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/85/359085/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index bcb9f2d..70664af 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3813,7 +3813,7 @@
"tags-create-reason": "Reason:",
"tags-create-submit": "Create",
"tags-create-no-name": "You must specify a tag name.",
-   "tags-create-invalid-chars": "Tag names must not contain commas 
(,) or forward slashes (/).",
+   "tags-create-invalid-chars": "Tag names must not contain commas 
(,), pipes (|), or forward slashes (/).",
"tags-create-invalid-title-chars": "Tag names must not contain 
characters that cannot be used in page titles.",
"tags-create-already-exists": "The tag \"$1\" already exists.",
"tags-create-warnings-above": "The following {{PLURAL:$2|warning 
was|warnings were}} encountered when attempting to create the tag \"$1\":",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add releases1001.eqiad.wmnet to site.pp

2017-06-14 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359080 )

Change subject: add releases1001.eqiad.wmnet to site.pp
..


add releases1001.eqiad.wmnet to site.pp

This VM is going to host Mediawiki releases
and other releases, like parsoid, that are currently
on bromine.

It has been renamed from mwreleases1001.

Add standard, firewall and IPv6. (role will follow)

Bug: T164030
Change-Id: I06341af2efd66d4d4aecae1fd8b1eafae61bf46f
---
M manifests/site.pp
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 6bb3122..60e82c6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2362,6 +2362,13 @@
 role(jobqueue_redis::slave)
 }
 
+# upcoming VM for releases (mwreleases and other)
+node 'releases1001.eqiad.wmnet' {
+include ::standard
+include ::base::firewall
+interface::add_ip6_mapped { 'main': }
+}
+
 node /^relforge100[1-2]\.eqiad\.wmnet/ {
 role(elasticsearch::relforge)
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06341af2efd66d4d4aecae1fd8b1eafae61bf46f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: RobH 
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]: base/puppet: use "false" instead of "no" with "daemonize" op...

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359084 )

Change subject: base/puppet: use "false" instead of "no" with "daemonize" option
..

base/puppet: use "false" instead of "no" with "daemonize" option

I saw that host dumpsdata1001 had a CRIT systemd state in Icinga.

I checked which unit was failed and it was puppet, and i saw

"Invalid value '"no"' for boolean parameter: daemonize" .. ugh :/

It seemed to be just fine on another host. Need to figure out if that
means "false" will just work with any version, since it says it's a
boolean parameter.

Change-Id: I07cd89ddf568a93086244b00db72dc0d68232afb
---
M modules/base/templates/puppet.conf.d/10-main.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/base/templates/puppet.conf.d/10-main.conf.erb 
b/modules/base/templates/puppet.conf.d/10-main.conf.erb
index 8a475b4..4745959 100644
--- a/modules/base/templates/puppet.conf.d/10-main.conf.erb
+++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb
@@ -20,7 +20,7 @@
 <%- end -%>
 <% if @certname %>certname = <%= @certname %><% end %>
 <% if @dns_alt_names %>dns_alt_names = <%= @dns_alt_names %><% end %>
-daemonize = no
+daemonize = false
 configtimeout = 960
 usecacheonfailure = false
 splay = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07cd89ddf568a93086244b00db72dc0d68232afb
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...PageAssessments[master]: List Special:PageAssessments under Page tools

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/357859 )

Change subject: List Special:PageAssessments under Page tools
..


List Special:PageAssessments under Page tools

Change-Id: I3a59ca290971e60ac520f09f81d4316345625221
---
M src/SpecialPage.php
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/src/SpecialPage.php b/src/SpecialPage.php
index 9f42305..f2fbe3a 100644
--- a/src/SpecialPage.php
+++ b/src/SpecialPage.php
@@ -28,12 +28,11 @@
}
 
/**
-* Do not include this one in the list of special pages at 
Special:SpecialPages, at least until
-* it's more functional that it currently is.
-* @return bool False.
+* List the page under "Page tools" at Special:SpecialPages
+* @return string
 */
-   public function isListed() {
-   return false;
+   protected function getGroupName() {
+   return 'pagetools';
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a59ca290971e60ac520f09f81d4316345625221
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
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]: [wip] RCFilters: Change to the new views redesign

2017-06-14 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359083 )

Change subject: [wip] RCFilters: Change to the new views redesign
..

[wip] RCFilters: Change to the new views redesign

Bug: T167384
Change-Id: I9fd0243f88f92ddacb4c912ff974f7d325f32f5d
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
3 files changed, 125 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/359083/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index 66e6d96..ca837ca 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -15,19 +15,31 @@
margin-top: 1.6em;
}
 
-   .mw-rcfilters-ui-table {
-   margin-top: 0.3em;
-   }
-
-   &-wrapper-content {
-   &-title {
-   font-weight: bold;
-   color: #54595d;
+   &-wrapper {
+   .mw-rcfilters-ui-table {
+   margin-top: 0.3em;
}
 
-   &-savedQueryTitle {
-   color: #72777d;
-   margin-left: 1em;
+   &-content {
+   &-title {
+   font-weight: bold;
+   color: #54595d;
+   }
+
+   &-savedQueryTitle {
+   color: #72777d;
+   margin-left: 1em;
+   }
+   }
+   }
+
+   &-views {
+   &-input {
+   width: 100%;
+   }
+
+   &-select {
+   width: 1em;
}
}
 
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 ed17ea7..ea63ffc 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -126,6 +126,48 @@
);
}
 
+   if ( mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
+   // Add a selector at the right of the input
+   this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
+   classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
+   items: [
+   new OO.ui.ButtonOptionWidget( {
+   data: 'namespaces',
+   icon: 'article',
+   title: mw.msg( 'namespaces' )
+   } ),
+   new OO.ui.ButtonOptionWidget( {
+   data: 'tags',
+   icon: 'tag',
+   title: mw.msg( 
'rcfilters-view-tags' )
+   } )
+   ]
+   } );
+
+   // Rearrange the UI so the select widget is at the 
right of the input
+   this.$element.append(
+   $( '' )
+   .addClass( 'mw-rcfilters-ui-table' )
+   .append(
+   $( '' )
+   .addClass( 
'mw-rcfilters-ui-row' )
+   .append(
+   $( '' )
+   
.addClass( 'mw-rcfilters-ui-cell' )
+   
.addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-input' )
+   
.append( this.input.$element ),
+   $( '' )
+   
.addClass( 'mw-rcfilters-ui-cell' )
+

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Don't show the 'Possible issues' section in the info flyout ...

2017-06-14 Thread MusikAnimal (Code Review)

MusikAnimal has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359082 )

Change subject: Don't show the 'Possible issues' section in the info flyout if 
it is empty
..

Don't show the 'Possible issues' section in the info flyout if it is empty

Bug: T147220
Change-Id: Ia716cb76fd6630dde394c9f3aa73fa93480b8030
---
M PageTriage.hooks.php
M i18n/bho.json
M i18n/br.json
M i18n/cs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/et.json
M i18n/fa.json
M i18n/fi.json
M i18n/fr.json
M i18n/gl.json
M i18n/he.json
M i18n/hsb.json
M i18n/ia.json
M i18n/id.json
M i18n/is.json
M i18n/it.json
M i18n/ja.json
M i18n/ko.json
M i18n/lb.json
M i18n/mk.json
M i18n/nb.json
M i18n/nl.json
M i18n/pms.json
M i18n/pt.json
M i18n/qqq.json
M i18n/ro.json
M i18n/ru.json
M i18n/sv.json
M i18n/ta.json
M i18n/tl.json
M i18n/tr.json
M i18n/uk.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.html
37 files changed, 8 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage 
refs/changes/82/359082/1

diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 6970e83..ec725e8 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -631,7 +631,6 @@
'pagetriage-info-history-header',
'pagetriage-info-history-show-full',
'pagetriage-info-help',
-   'pagetriage-info-no-problems',
'pagetriage-info-problem-non-autoconfirmed',

'pagetriage-info-problem-non-autoconfirmed-desc',
'pagetriage-info-problem-blocked',
diff --git a/i18n/bho.json b/i18n/bho.json
index 88fb7b4..2a1344b 100644
--- a/i18n/bho.json
+++ b/i18n/bho.json
@@ -146,7 +146,6 @@
"pagetriage-info-history-header": "इतिहास",
"pagetriage-info-history-show-full": "पूरा इतिहास देखाईं",
"pagetriage-info-help": "मदद",
-   "pagetriage-info-no-problems": "अभिन ले ए पन्ना पर कौनों समस्या नइखे 
मिलल।",
"pagetriage-info-problem-non-autoconfirmed": "नया संपादक",
"pagetriage-info-problem-blocked": "ब्लाक कइल सदस्य सभ",
"pagetriage-info-problem-no-categories": "बिना श्रेणी के पन्ना",
diff --git a/i18n/br.json b/i18n/br.json
index d52ef2f..407b249 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -94,7 +94,6 @@
"pagetriage-info-history-header": "Istor",
"pagetriage-info-history-show-full": "diskouez an istor klok",
"pagetriage-info-help": "skoazell",
-   "pagetriage-info-no-problems": "N'eus bet kavet kudenn ebet war ar 
bajenn-mañ betek-henn.",
"pagetriage-info-problem-non-autoconfirmed": "Aozer nevez",
"pagetriage-info-problem-blocked": "Implijer stanket",
"pagetriage-info-problem-blocked-desc": "Krouet e oa bet ar bajenn-mañ 
gant un implijer stanket.",
diff --git a/i18n/cs.json b/i18n/cs.json
index c908e29..f3019f1 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -65,7 +65,6 @@
"pagetriage-js-required": "Toto rozšíření vyžaduje prohlížeč se 
zapnutým JavaScriptem.",
"pagetriage-tags-param-free-yes-label": "Ano",
"pagetriage-tags-param-free-no-label": "Ne",
-   "pagetriage-info-no-problems": "U této stránky zatím nebyly nalezeny 
žádné problémy.",
"pagetriage-info-problem-non-autoconfirmed": "Nový uživatel",
"pagetriage-info-problem-non-autoconfirmed-desc": "Tuto stránku založil 
uživatel, který dosud nebyl automaticky schválen.",
"pagetriage-info-problem-blocked": "Zablokovaný uživatel",
diff --git a/i18n/de.json b/i18n/de.json
index 546c251..2145729 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -313,7 +313,6 @@
"pagetriage-info-history-header": "Versionsgeschichte",
"pagetriage-info-history-show-full": "vollständige Versionsgeschichte 
anzeigen",
"pagetriage-info-help": "Hilfe",
-   "pagetriage-info-no-problems": "Zu dieser Seite wurden bisher keine 
Probleme ermittelt.",
"pagetriage-info-problem-non-autoconfirmed": "Neuer Autor",
"pagetriage-info-problem-non-autoconfirmed-desc": "Dieser Artikel wurde 
von einem unbestätigten Benutzer erstellt.",
"pagetriage-info-problem-blocked": "Gesperrter Autor",
diff --git a/i18n/en.json b/i18n/en.json
index b248854..4ae79d3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -319,7 +319,6 @@
"pagetriage-info-history-header": "History",
"pagetriage-info-history-show-full": "show full history",
"pagetriage-info-help": "help",
-   "pagetriage-info-no-problems": "No problems have been found for this 
page so far.",
"pagetriage-info-problem-non-autoconfirmed": "New editor",
"pagetriage-info-problem-non-autoconfirmed-desc": "This page was 
created by a non-autoconfirmed editor.",

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Add atj.wikipedia to whitelist

2017-06-14 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359081 )

Change subject: Add atj.wikipedia to whitelist
..


Add atj.wikipedia to whitelist

Change-Id: I1c3d51e7d296fd108e4fb81868f6722aaf8ee2af
---
M static_data/pageview/whitelist/whitelist.tsv
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/static_data/pageview/whitelist/whitelist.tsv 
b/static_data/pageview/whitelist/whitelist.tsv
index d686d74..8f6c4f2 100644
--- a/static_data/pageview/whitelist/whitelist.tsv
+++ b/static_data/pageview/whitelist/whitelist.tsv
@@ -44,6 +44,7 @@
 projectas.wikipedia2015-10-12 00:00:00
 projectas.wikisource   2015-10-12 00:00:00
 projectas.wiktionary   2015-10-12 00:00:00
+projectatj.wikipedia   2017-06-14 00:00:00
 projectav.wikipedia2015-10-12 00:00:00
 projectav.wiktionary   2015-10-12 00:00:00
 projectay.wikibooks2015-10-12 00:00:00

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c3d51e7d296fd108e4fb81868f6722aaf8ee2af
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Add atj.wikipedia to whitelist

2017-06-14 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359081 )

Change subject: Add atj.wikipedia to whitelist
..

Add atj.wikipedia to whitelist

Change-Id: I1c3d51e7d296fd108e4fb81868f6722aaf8ee2af
---
M static_data/pageview/whitelist/whitelist.tsv
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/81/359081/1

diff --git a/static_data/pageview/whitelist/whitelist.tsv 
b/static_data/pageview/whitelist/whitelist.tsv
index d686d74..8f6c4f2 100644
--- a/static_data/pageview/whitelist/whitelist.tsv
+++ b/static_data/pageview/whitelist/whitelist.tsv
@@ -44,6 +44,7 @@
 projectas.wikipedia2015-10-12 00:00:00
 projectas.wikisource   2015-10-12 00:00:00
 projectas.wiktionary   2015-10-12 00:00:00
+projectatj.wikipedia   2017-06-14 00:00:00
 projectav.wikipedia2015-10-12 00:00:00
 projectav.wiktionary   2015-10-12 00:00:00
 projectay.wikibooks2015-10-12 00:00:00

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c3d51e7d296fd108e4fb81868f6722aaf8ee2af
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Use short array syntax - includes

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358050 )

Change subject: Use short array syntax - includes
..


Use short array syntax - includes

Done by phpcbf over composer fix

Change-Id: Icdc4f74595a7fa25976340f18c97caf5aeb1269b
---
M includes/AllocationCalculator.php
M includes/Banner.php
M includes/BannerMessage.php
M includes/BannerMessageGroup.php
M includes/BannerRenderer.php
M includes/CNBannerPager.php
M includes/CNCampaignPager.php
M includes/CNChoiceDataResourceLoaderModule.php
M includes/CNDatabase.php
M includes/CNDeviceTarget.php
M includes/Campaign.php
M includes/CampaignLog.php
M includes/ChoiceDataProvider.php
M includes/GeoTarget.php
M includes/MixinController.php
15 files changed, 404 insertions(+), 404 deletions(-)

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



diff --git a/includes/AllocationCalculator.php 
b/includes/AllocationCalculator.php
index f4a5919..b6d40e3 100644
--- a/includes/AllocationCalculator.php
+++ b/includes/AllocationCalculator.php
@@ -49,7 +49,7 @@
 */
public static function filterChoiceData( &$choiceData, $country, 
$status, $device ) {
 
-   $filteredChoiceData = array();
+   $filteredChoiceData = [];
 
foreach ( $choiceData as $campaign ) {
 
@@ -110,7 +110,7 @@
// and higher integers represent higher priority. These values 
are
// defined by class constants in CentralNotice.
 
-   $campaignsByPriority = array();
+   $campaignsByPriority = [];
foreach ( $filteredChoiceData as &$campaign ) {
$priority = $campaign['preferred'];
$campaignsByPriority[$priority][] = &$campaign;
@@ -206,7 +206,7 @@
 */
public static function makePossibleBanners( $campaign, $bucket, 
$status, $device ) {
 
-   $banners = array();
+   $banners = [];
 
foreach ( $campaign['banners'] as $banner ) {
 
@@ -294,7 +294,7 @@
 
// Go through all campaings to make a flat list of banners from 
all of
// them, and calculate overall relative allocations.
-   $possibleBannersAllCampaigns = array();
+   $possibleBannersAllCampaigns = [];
foreach ( $campaigns as $campaign ) {
 
$possibleBanners = 
AllocationCalculator::makePossibleBanners(
diff --git a/includes/Banner.php b/includes/Banner.php
index e9b0d90..8403179 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -48,14 +48,14 @@
 *
 * @var null|bool[]
 */
-   protected $dirtyFlags = array(
+   protected $dirtyFlags = [
'content' => null,
'messages' => null,
'basic' => null,
'devices' => null,
'mixins' => null,
'prioritylang' => null,
-   );
+   ];
 
// 
// !!! NOTE !!! It is not recommended to use directly. It is almost 
always more
@@ -81,13 +81,13 @@
 
/** @var string[] Devices this banner should be allocated to in the form
 * {Device ID => Device header name} */
-   protected $devices = array();
+   protected $devices = [];
 
/** @var string[] Names of enabled mixins  */
-   protected $mixins = array();
+   protected $mixins = [];
 
/** @var string[] Language codes considered a priority for translation. 
 */
-   protected $priorityLanguages = array();
+   protected $priorityLanguages = [];
 
/** @var string Wikitext content of the banner */
protected $bodyContent = '';
@@ -262,10 +262,10 @@
'tmp_category',
'',
__METHOD__,
-   array( 'DISTINCT', 'ORDER BY tmp_category ASC' )
+   [ 'DISTINCT', 'ORDER BY tmp_category ASC' ]
);
 
-   $categories = array();
+   $categories = [];
foreach ( $res as $row ) {
$categories[$row->tmp_category] = $row->tmp_category;
}
@@ -309,24 +309,24 @@
 
// What are we using to select on?
if ( $this->name !== null ) {
-   $selector = array( 'tmp_name' => $this->name );
+   $selector = [ 'tmp_name' => $this->name ];
} elseif ( $this->id !== null ) {
-   $selector = array( 'tmp_id' => $this->id );
+   $selector = [ 'tmp_id' => $this->id ];
} else {
throw new BannerDataException( 'Cannot retrieve banner 
data without name or ID.' );
}
 
// Query!
$rowRes = $db->select(
-   array(

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Use short array syntax

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358052 )

Change subject: Use short array syntax
..


Use short array syntax

Done by phpcbf over composer fix

Change-Id: I5d7e139e4ff21c5a3fdd9d497c33ef82a0dedd88
---
M CentralNotice.hooks.php
M CentralNoticeBannerLogPager.php
M CentralNoticeCampaignLogPager.php
M CentralNoticePageLogPager.php
M CentralNoticePager.php
M TemplatePager.php
M includes/HtmlFormElements/HTMLCentralNoticeBanner.php
M includes/HtmlFormElements/HTMLCentralNoticeBannerMessage.php
M maintenance/CleanCNTranslateMetadata.php
M patches/CNDatabasePatcher.php
10 files changed, 227 insertions(+), 227 deletions(-)

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



diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index 1ba1ab4..3c4183e 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -105,8 +105,8 @@
global $wgNoticeInfrastructure;
if ( $wgNoticeInfrastructure ) {
// array( tableName, idField, textField )
-   $updateFields[] = array( 'cn_notice_log', 
'notlog_user_id' );
-   $updateFields[] = array( 'cn_template_log', 
'tmplog_user_id' );
+   $updateFields[] = [ 'cn_notice_log', 'notlog_user_id' ];
+   $updateFields[] = [ 'cn_template_log', 'tmplog_user_id' 
];
}
return true;
}
@@ -231,7 +231,7 @@
if ( $wgUser->isAllowed( 'bot' ) ) {
$userData = false;
} else {
-   $userData = array();
+   $userData = [];
 
// Add the user's registration date 
(MediaWiki timestamp)
$registrationDate = 
$wgUser->getRegistration() ? $wgUser->getRegistration() : 0;
@@ -362,9 +362,9 @@
 
// Set up test fixtures module, which is added as a dependency 
for all QUnit
// tests.
-   $testModules['qunit']['ext.centralNotice.testFixtures'] = array(
+   $testModules['qunit']['ext.centralNotice.testFixtures'] = [
'class' => 'CNTestFixturesResourceLoaderModule'
-   );
+   ];
 
// These classes are only used here or in phpunit tests
$wgAutoloadClasses['CNTestFixturesResourceLoaderModule'] =
@@ -373,10 +373,10 @@
$wgAutoloadClasses['CentralNoticeTestFixtures'] =
__DIR__ . '/tests/CentralNoticeTestFixtures.php';
 
-   $testModuleBoilerplate = array(
+   $testModuleBoilerplate = [
'localBasePath' => __DIR__,
'remoteExtPath' => 'CentralNotice',
-   );
+   ];
 
// find test files for every RL module
$prefix = 'ext.centralNotice';
@@ -385,7 +385,7 @@
if ( substr( $key, 0, strlen( $prefix ) ) ===
$prefix && isset( $module['scripts'] ) ) {
 
-   $testFiles = array();
+   $testFiles = [];
 
foreach ( ( ( array ) $module['scripts'] ) as 
$script ) {
 
@@ -403,12 +403,12 @@
if ( count( $testFiles ) > 0 ) {
 
$testModules['qunit']["$key.tests"] = 
$testModuleBoilerplate +
-   array(
+   [
'dependencies' =>
-   array( $key, 
'ext.centralNotice.testFixtures' ),
+   [ $key, 
'ext.centralNotice.testFixtures' ],
 
'scripts' => $testFiles,
-   );
+   ];
}
}
}
diff --git a/CentralNoticeBannerLogPager.php b/CentralNoticeBannerLogPager.php
index bbe2147..f8822d5 100644
--- a/CentralNoticeBannerLogPager.php
+++ b/CentralNoticeBannerLogPager.php
@@ -19,10 +19,10 @@
 * Pull log entries from the database
 */
function getQueryInfo() {
-   return array(
-   'tables' => array( 'template_log' => 'cn_template_log' 
),
+   return [
+   'tables' => [ 'template_log' => 'cn_template_log' ],
'fields' => '*',
-   );
+   ];
}

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add releases1001.eqiad.wmnet to site.pp

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359080 )

Change subject: add releases1001.eqiad.wmnet to site.pp
..

add releases1001.eqiad.wmnet to site.pp

This VM is going to host Mediawiki releases
and other releases, like parsoid, that are currently
on bromine.

It has been renamed from mwreleases1001.

Add standard, firewall and IPv6. (role will follow)

Bug: T164030
Change-Id: I06341af2efd66d4d4aecae1fd8b1eafae61bf46f
---
M manifests/site.pp
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/359080/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6bb3122..60e82c6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2362,6 +2362,13 @@
 role(jobqueue_redis::slave)
 }
 
+# upcoming VM for releases (mwreleases and other)
+node 'releases1001.eqiad.wmnet' {
+include ::standard
+include ::base::firewall
+interface::add_ip6_mapped { 'main': }
+}
+
 node /^relforge100[1-2]\.eqiad\.wmnet/ {
 role(elasticsearch::relforge)
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06341af2efd66d4d4aecae1fd8b1eafae61bf46f
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]: New language variant 'en-x-piglatin' for easier variant testing

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/72053 )

Change subject: New language variant 'en-x-piglatin' for easier variant testing
..


New language variant 'en-x-piglatin' for easier variant testing

Guarded by the $wgUsePigLatinVariant variable, off by default.

Pig Latin is a language game where words in English are altered
according to the following rules:

* Words starting with a vowel have a '-way' suffix appended.
* Words starting with a consonant have the initial consonants (or 'qu'
  group) moved to the end and an '-ay' suffix appended.

https://en.wikipedia.org/wiki/Pig_Latin

* Added 'en-x-piglatin' as a language name.
* Added 'en' to LanguageConverter::$languagesWithVariants.
* Added LanguageEn class and its corresponding EnConverter which
  provides one-way translation from English to Pig Latin.
* Some minor internal changes in code that assumed that English
  doesn't have a language class or converter.

Bug: T45547
Depends-On: I1d9691c784032669979f8109c9a5f65cbf4122c9
Change-Id: I7fa2d85d6364958c5138366e8b4504a2697a8731
---
M RELEASE-NOTES-1.30
M autoload.php
M includes/DefaultSettings.php
M languages/Language.php
M languages/LanguageConverter.php
A languages/classes/LanguageEn.php
M languages/data/Names.php
M tests/phpunit/includes/auth/AuthManagerTest.php
M tests/phpunit/languages/LanguageTest.php
9 files changed, 114 insertions(+), 8 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index f2cb871..0f5cb47 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -27,6 +27,7 @@
   ParserOptions would pollute the parser cache. Callers should use
   WikiPage::makeParserOptions() to create the ParserOptions object and only
   change options that affect the parser cache key.
+* (T45547) $wgUsePigLatinVariant added (off by default).
 
 === New features in 1.30 ===
 * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@ -36,6 +37,10 @@
   specific tags to be added by users.
 * Added a 'ParserOptionsRegister' hook to allow extensions to register
   additional parser options.
+* (T45547) Included Pig Latin, a language game in English, as a
+  LanguageConverter variant.  This allows English-speaking developers
+  to develop and test LanguageConverter more easily.  Pig Latin can be
+  enabled by setting $wgUsePigLatinVariant to true.
 
 === Languages updated in 1.30 ===
 
@@ -76,6 +81,11 @@
 
 * …
 
+ Pig Latin added 
+* (T45547) Added Pig Latin, a made-up English variant (en-x-piglatin),
+  for easier variant development and testing. Disabled by default. It can be
+  enabled by setting $wgUsePigLatinVariant to true.
+
 === Other changes in 1.30 ===
 * The use of an associative array for $wgProxyList, where the IP address is in
   the key instead of the value, is deprecated (e.g. [ '127.0.0.1' => 'value' 
]).
diff --git a/autoload.php b/autoload.php
index 6c5aff5..849df4d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -426,6 +426,7 @@
'EmailNotification' => __DIR__ . '/includes/mail/EmailNotification.php',
'EmaillingJob' => __DIR__ . '/includes/jobqueue/jobs/EmaillingJob.php',
'EmptyBagOStuff' => __DIR__ . 
'/includes/libs/objectcache/EmptyBagOStuff.php',
+   'EnConverter' => __DIR__ . '/languages/classes/LanguageEn.php',
'EncryptedPassword' => __DIR__ . 
'/includes/password/EncryptedPassword.php',
'EnhancedChangesList' => __DIR__ . 
'/includes/changes/EnhancedChangesList.php',
'EnotifNotifyJob' => __DIR__ . 
'/includes/jobqueue/jobs/EnotifNotifyJob.php',
@@ -701,6 +702,7 @@
'LanguageConverter' => __DIR__ . '/languages/LanguageConverter.php',
'LanguageCu' => __DIR__ . '/languages/classes/LanguageCu.php',
'LanguageDsb' => __DIR__ . '/languages/classes/LanguageDsb.php',
+   'LanguageEn' => __DIR__ . '/languages/classes/LanguageEn.php',
'LanguageEs' => __DIR__ . '/languages/classes/LanguageEs.php',
'LanguageEt' => __DIR__ . '/languages/classes/LanguageEt.php',
'LanguageFi' => __DIR__ . '/languages/classes/LanguageFi.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9436aa6..920e2e8 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3057,6 +3057,12 @@
 $wgDefaultLanguageVariant = false;
 
 /**
+ * Whether to enable the pig latin variant of English (en-x-piglatin),
+ * used to ease variant development work.
+ */
+$wgUsePigLatinVariant = false;
+
+/**
  * Disabled variants array of language variant conversion.
  *
  * @par Example:
diff --git a/languages/Language.php b/languages/Language.php
index fb45cf7..f84e21e 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -203,10 +203,11 @@
/**
 * Create a language object for a given language code
 * @param

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rename mwreleases1001 to releases1001

2017-06-14 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359077 )

Change subject: rename mwreleases1001 to releases1001
..


rename mwreleases1001 to releases1001

We talked about this on IRC and came to the conclusion
that we want to use this new VM for not just mediawiki
releases but all releases and combine the current role
on bromine with jenkins on here.

Bromine will stay a host for static websites as originally intended.

So we'll rename this from mwreleases1001 to releases1001 and reinstall.

Bug: T164030
Change-Id: I3e5ad945cb9661f28462cfb53e86a46ab8a4a878
---
R hieradata/hosts/releases1001.yaml
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/hosts/mwreleases1001.yaml 
b/hieradata/hosts/releases1001.yaml
similarity index 100%
rename from hieradata/hosts/mwreleases1001.yaml
rename to hieradata/hosts/releases1001.yaml
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 0f2b842..12f38d3 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -77,7 +77,7 @@
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
-
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|mwreleases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
+
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
 francium|tegmen) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index db88e75..523ed73 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -195,11 +195,6 @@
 fixed-address mwdebug1002.eqiad.wmnet;
 }
 
-host mwreleases1001 {
-hardware ethernet aa:00:00:75:ee:6d;
-fixed-address mwreleases1001.eqiad.wmnet;
-}
-
 host mx1001 {
 hardware ethernet aa:00:00:b2:f5:b7;
 fixed-address mx1001.wikimedia.org;
@@ -261,6 +256,11 @@
 fixed-address pybal-test2003.codfw.wmnet;
 }
 
+host releases1001 {
+hardware ethernet aa:00:00:75:ee:6d;
+fixed-address releases1001.eqiad.wmnet;
+}
+
 host roentgenium {
 hardware ethernet aa:00:00:d9:85:e2;
 fixed-address roentgenium.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e5ad945cb9661f28462cfb53e86a46ab8a4a878
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: RobH 
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/dns[master]: rename mwreleases1001 to releases1001

2017-06-14 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359073 )

Change subject: rename mwreleases1001 to releases1001
..


rename mwreleases1001 to releases1001

After talking with Chad, we want to use the new VM for both
Mediawiki and other releases and move the existing role from
bromine to this too. So we rename it from mwreleases to releases,
while bromine will stay just a web server for static websites.

Bug: T164030
Change-Id: I46739399e9a03a7d2675a7bcb194223f23d29ef4
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index fa3f783..ad19f71 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -879,7 +879,7 @@
 223 1H IN PTR   ms-be1034.eqiad.wmnet.
 224 1H IN PTR   ms-be1035.eqiad.wmnet.
 225 1H IN PTR   ms-be1036.eqiad.wmnet.
-226 1H IN PTR   mwreleases1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
+226 1H IN PTR   releases1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 227 1H IN PTR   db1061.eqiad.wmnet.
 228 1H IN PTR   db1063.eqiad.wmnet.
 229 1H IN PTR   wtp1037.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f47d5c4..b653018 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -720,7 +720,6 @@
 mw1306  1H  IN A10.64.16.106
 mwdebug1001 1H  IN A10.64.32.123 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 mwdebug1002 1H  IN A10.64.32.124 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
-mwreleases1001  1H  IN A10.64.32.226 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 neodymium   1H  IN A10.64.32.20
 neodymium   1H  IN  2620:0:861:103:10:64:32:20
 neon1H  IN A10.64.32.27 ; VM on ganeti01.svc.eqiad.wmnet
@@ -775,6 +774,7 @@
 rdb1006 1H  IN A10.64.48.55
 rdb1007 1H  IN A10.64.32.18
 rdb1008 1H  IN A10.64.32.19
+releases10011H  IN A10.64.32.226 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 relforge10011H  IN A10.64.4.13
 relforge10021H  IN A10.64.37.21
 restbase10071H  IN A10.64.0.223

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46739399e9a03a7d2675a7bcb194223f23d29ef4
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
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] wikimedia...SmashPig[master]: WIP get provider config dir from global config

2017-06-14 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359079 )

Change subject: WIP get provider config dir from global config
..

WIP get provider config dir from global config

Little more boilerplate setting up provider config, but it should
make sure everyone's looking in the same directory

Bug: T147503
Change-Id: If06d9b8d64fd95336a42c1409c5d1e44f4f978ab
---
M Core/Context.php
M Core/Http/RequestHandler.php
M Core/ProviderConfiguration.php
M Maintenance/MaintenanceBase.php
M PaymentProviders/Adyen/Tests/AdyenTestConfiguration.php
A PaymentProviders/Adyen/Tests/BaseAdyenTestCase.php
M PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
M PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php
M PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
M PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
M PaymentProviders/Adyen/Tests/phpunit/ReportAvailableTest.php
M PaymentProviders/Adyen/Tests/phpunit/RequeueMessageTest.php
M PaymentProviders/Amazon/Tests/AmazonTestCase.php
M PaymentProviders/Amazon/Tests/AmazonTestConfiguration.php
M PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
M PaymentProviders/PayPal/Tests/PayPalTestConfiguration.php
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M Tests/BaseSmashPigUnitTestCase.php
M Tests/TestingContext.php
M config/main.yaml
20 files changed, 98 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/79/359079/1

diff --git a/Core/Context.php b/Core/Context.php
index 4f3a9c1..e1ecc1c 100644
--- a/Core/Context.php
+++ b/Core/Context.php
@@ -26,7 +26,7 @@
public static function init( GlobalConfiguration $config, 
$providerConfig = null ) {
if ( !Context::$instance ) {
if ( !$providerConfig ) {
-   $providerConfig = 
ProviderConfiguration::createDefault();
+   $providerConfig = 
ProviderConfiguration::createDefault( $config );
}
Context::$instance = new Context();
Context::$instance->setGlobalConfiguration( $config );
diff --git a/Core/Http/RequestHandler.php b/Core/Http/RequestHandler.php
index 11e0c9b..b2fdec0 100644
--- a/Core/Http/RequestHandler.php
+++ b/Core/Http/RequestHandler.php
@@ -48,7 +48,7 @@
 
// --- Initialize core services ---
$config = GlobalConfiguration::create();
-   $providerConfig = ProviderConfiguration::createForProvider( 
$view );
+   $providerConfig = ProviderConfiguration::createForProvider( 
$view, $config );
Context::init( $config, $providerConfig );
// FIXME: let's always initialize this with the context
Logger::init(
diff --git a/Core/ProviderConfiguration.php b/Core/ProviderConfiguration.php
index d5c9006..3fa4c33 100644
--- a/Core/ProviderConfiguration.php
+++ b/Core/ProviderConfiguration.php
@@ -6,18 +6,27 @@
 class ProviderConfiguration extends Configuration {
 
const NO_PROVIDER = 'no_provider';
-
protected $provider;
+   protected $machinewideBaseDirectory;
+
+   protected function __construct( GlobalConfiguration $globalConfig ) {
+   $baseDir = $globalConfig->val( 
'provider-configuration-directory' );
+   $this->machinewideBaseDirectory = $baseDir;
+   }
 
/**
-* @param string $provider
+* @param string $provider identifier of payment provider
+* @param GlobalConfiguration $globalConfig
 * @return static
 */
-   public static function createForProvider( $provider ) {
+   public static function createForProvider(
+   $provider,
+   GlobalConfiguration $globalConfig
+   ) {
// FIXME: transitional code, remove when everything points to 
new names
$provider = self::remapProvider( $provider );
 
-   $config = new static();
+   $config = new static( $globalConfig );
$config->provider = $provider;
$config->loadDefaultConfig();
 
@@ -27,13 +36,18 @@
/**
 * @param string $provider
 * @param string|array $overridePath
+* @param GlobalConfiguration $globalConfig
 * @return static
 */
-   public static function createForProviderWithOverrideFile( $provider, 
$overridePath ) {
+   public static function createForProviderWithOverrideFile(
+   $provider,
+   $overridePath,
+   GlobalConfiguration $globalConfig
+   ) {
// FIXME: transitional code, remove when everything points to 
new names
$provider = self::remapProvider( $provider );
 
-   $config = new static();
+   $config

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Revert "Allow specifying configuration dir with environment ...

2017-06-14 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359078 )

Change subject: Revert "Allow specifying configuration dir with environment 
vars"
..

Revert "Allow specifying configuration dir with environment vars"

This reverts commit 5586bc122dc7107d722df283240dcddc909ebcfc.

Change-Id: If5419bf85b8d085b869c076629c9f500d597f9b9
---
M Core/Configuration.php
M Core/GlobalConfiguration.php
M Core/ProviderConfiguration.php
M README
4 files changed, 6 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/78/359078/1

diff --git a/Core/Configuration.php b/Core/Configuration.php
index 6d66207..3923c7a 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -276,14 +276,6 @@
// Feeling lucky.
return true;
}
-
-   static protected function getBaseDirFromEnv( $envVar, $default ) {
-   $baseDir = getenv( $envVar );
-   if ( !$baseDir ) {
-   $baseDir = $default;
-   }
-   return rtrim( $baseDir, DIRECTORY_SEPARATOR );
-   }
 }
 
 /**
diff --git a/Core/GlobalConfiguration.php b/Core/GlobalConfiguration.php
index b85ad73..345f866 100644
--- a/Core/GlobalConfiguration.php
+++ b/Core/GlobalConfiguration.php
@@ -6,9 +6,6 @@
  */
 class GlobalConfiguration extends Configuration {
 
-   const DIR_VAR = 'SMASHPIG_GLOBAL_CONFDIR';
-   const DEFAULT_BASEDIR = '/etc/smashpig';
-
/**
 * Creates a GlobalConfiguration object
 *
@@ -42,12 +39,11 @@
protected function getDefaultSearchPath() {
$searchPath = array();
 
-   $baseDir = self::getBaseDirFromEnv( self::DIR_VAR, 
self::DEFAULT_BASEDIR );
if ( isset( $_SERVER['HOME'] ) ) {
// FIXME: But I don't understand why this key is 
missing during testing.
$searchPath[] =  
"{$_SERVER['HOME']}/.smashpig/main.yaml";
}
-   $searchPath[] = "$baseDir/main.yaml";
+   $searchPath[] = '/etc/smashpig/main.yaml';
$searchPath[] = __DIR__ . '/../config/main.yaml';
return $searchPath;
}
diff --git a/Core/ProviderConfiguration.php b/Core/ProviderConfiguration.php
index c0ab62d..d5c9006 100644
--- a/Core/ProviderConfiguration.php
+++ b/Core/ProviderConfiguration.php
@@ -6,8 +6,6 @@
 class ProviderConfiguration extends Configuration {
 
const NO_PROVIDER = 'no_provider';
-   const DIR_VAR = 'SMASHPIG_PROVIDER_CONFDIR';
-   const DEFAULT_BASEDIR = '/etc/smashpig';
 
protected $provider;
 
@@ -71,18 +69,17 @@
}
 
protected function getDefaultSearchPath() {
-   $baseDir = self::getBaseDirFromEnv( self::DIR_VAR, 
self::DEFAULT_BASEDIR );
if ( $this->provider !== self::NO_PROVIDER ) {
if ( isset( $_SERVER['HOME'] ) ) {
$searchPath[] = 
"{$_SERVER['HOME']}/.smashpig/{$this->provider}/main.yaml";
}
-   $searchPath[] = "$baseDir/{$this->provider}/main.yaml";
+   $searchPath[] = 
"/etc/smashpig/{$this->provider}/main.yaml";
$searchPath[] = __DIR__ . 
"/../config/{$this->provider}/main.yaml";
}
if ( isset( $_SERVER['HOME'] ) ) {
$searchPath[] = 
"{$_SERVER['HOME']}/.smashpig/provider-defaults.yaml";
}
-   $searchPath[] = "$baseDir/provider-defaults.yaml";
+   $searchPath[] = '/etc/smashpig/provider-defaults.yaml';
$searchPath[] = __DIR__ . '/../config/provider-defaults.yaml';
return $searchPath;
}
diff --git a/README b/README
index 6ee581d..3b23a55 100644
--- a/README
+++ b/README
@@ -1,17 +1,9 @@
 This project uses Composer [https://getcomposer.org] to manage dependencies.
 Upon first install and any upgrade please run composer install.
 
-Configuration settings are read from multiple directories. The highest priority
-is given to user-specific settings in ~/.smashpig, then machine-specific 
settings
-in /etc/smashpig, then defaults read from this project's 'config' directory.
-
-Within these folder, global settings like database and queue connections are 
read
-from main.yaml. Settings that can be overridden per provider are read from 
main.yaml
-files in subdirectories named for the provider, with common defaults in
-provider-defaults.yaml.
-
-To make SmashPig look in an location other than /etc/smashpig for 
machine-specific
-settings, set environment variables SMASHPIG_GLOBAL_CONFDIR or 
SMASHPIG_PROVIDER_CONFDIR.
+Default configuration values are located in config/main.yaml. These are
+overridden by values in /etc/smashpig/main.yaml, then by values in

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rename mwreleases1001 to releases1001

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359077 )

Change subject: rename mwreleases1001 to releases1001
..

rename mwreleases1001 to releases1001

We talked about this on IRC and came to the conclusion
that we want to use this new VM for not just mediawiki
releases but all releases and combine the current role
on bromine with jenkins on here.

Bromine will stay a host for static websites as originally intended.

So we'll rename this from mwreleases1001 to releases1001 and reinstall.

Bug: T164030
Change-Id: I3e5ad945cb9661f28462cfb53e86a46ab8a4a878
---
R hieradata/hosts/releases1001.yaml
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/359077/1

diff --git a/hieradata/hosts/mwreleases1001.yaml 
b/hieradata/hosts/releases1001.yaml
similarity index 100%
rename from hieradata/hosts/mwreleases1001.yaml
rename to hieradata/hosts/releases1001.yaml
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 0f2b842..12f38d3 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -77,7 +77,7 @@
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
-
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|mwreleases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
+
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
 francium|tegmen) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index db88e75..523ed73 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -195,11 +195,6 @@
 fixed-address mwdebug1002.eqiad.wmnet;
 }
 
-host mwreleases1001 {
-hardware ethernet aa:00:00:75:ee:6d;
-fixed-address mwreleases1001.eqiad.wmnet;
-}
-
 host mx1001 {
 hardware ethernet aa:00:00:b2:f5:b7;
 fixed-address mx1001.wikimedia.org;
@@ -261,6 +256,11 @@
 fixed-address pybal-test2003.codfw.wmnet;
 }
 
+host releases1001 {
+hardware ethernet aa:00:00:75:ee:6d;
+fixed-address releases1001.eqiad.wmnet;
+}
+
 host roentgenium {
 hardware ethernet aa:00:00:d9:85:e2;
 fixed-address roentgenium.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e5ad945cb9661f28462cfb53e86a46ab8a4a878
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...BlueSpiceExtensions[master]: BSExtendedSearch: ApiFeedExtendedSearch phpunit test

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358947 )

Change subject: BSExtendedSearch: ApiFeedExtendedSearch phpunit test
..


BSExtendedSearch: ApiFeedExtendedSearch phpunit test

=> Follow up of: I1f87a94b8538ea01e4ece55e002db4d9faa3
=> ApiFeedExtendedSearch is not testable due to external dependencies.
Also it returns rss wich is not easy to handle in tests

Change-Id: I51fac3727a8a8f8ea4d7078222fb7cbf8dc0b20b
---
A ExtendedSearch/tests/phpunit/ApiFeedExtendedSearchTest.php
1 file changed, 21 insertions(+), 0 deletions(-)

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



diff --git a/ExtendedSearch/tests/phpunit/ApiFeedExtendedSearchTest.php 
b/ExtendedSearch/tests/phpunit/ApiFeedExtendedSearchTest.php
new file mode 100644
index 000..03304ee
--- /dev/null
+++ b/ExtendedSearch/tests/phpunit/ApiFeedExtendedSearchTest.php
@@ -0,0 +1,21 @@
+markTestSkipped( "Not testable - External dependency 
required" );
+   }
+
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51fac3727a8a8f8ea4d7078222fb7cbf8dc0b20b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
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]: Revert "Test elastic2020 does not fall out of cluster"

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359007 )

Change subject: Revert "Test elastic2020 does not fall out of cluster"
..


Revert "Test elastic2020 does not fall out of cluster"

Send search traffic back to eqiad now that we have validated the robustness
of elastic2020.

This reverts commit eedfec36b892ac8dd9120c9d1b58af8c9b089960.

Bug: T149006
Change-Id: I356dd20af3bc5dada81bf1a81b8ec2b698d1228a
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 638b555..042ac91 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -10,7 +10,7 @@
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster', 
$config );
-   $this->assertEquals( 'codfw', 
$config['wgCirrusSearchDefaultCluster'] );
+   $this->assertEquals( 'unittest', 
$config['wgCirrusSearchDefaultCluster'] );
$this->assertCount( 2, $config['wgCirrusSearchClusters'] );
 
// testwiki writes to eqiad and codfw
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f05d8d7..e66922c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17680,8 +17680,7 @@
 // $wgTranslateTranslationDefaultService in CommonSettings.php if you plan to
 // bring down a specific cluster.
 'wmgCirrusSearchDefaultCluster' => [
-   // T149006: Test elastic2020 does not fall out of cluster
-   'default' => 'codfw',
+   'default' => 'local',
 ],
 
 'wmgCirrusSearchClusterOverrides' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I356dd20af3bc5dada81bf1a81b8ec2b698d1228a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
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...Modern[master]: CSS optimization

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358617 )

Change subject: CSS optimization
..


CSS optimization

Use $wgResourceModuleSkinStyles to load CSS specific to redirect pages and
Special:Preferences only on those pages.

Also converted the Special:Preferences CSS to LESS.

Change-Id: Id7642234b8513b66c0a3b750cc95092141bcffb7
---
M resources/main.css
M skin.json
A skinStyles/mediawiki.action.view.redirectPage.css
A skinStyles/mediawiki.special.preferences.styles.less
4 files changed, 70 insertions(+), 66 deletions(-)

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



diff --git a/resources/main.css b/resources/main.css
index e4d8be7..f08fb0e 100644
--- a/resources/main.css
+++ b/resources/main.css
@@ -363,67 +363,6 @@
overflow: hidden;
 }
 
-#preftoc {
-   width: 100%;
-   margin: 0 0 0 0;
-   padding: 0 0 0 0;
-   height: 1.5em;
-   clear: right;
-}
-
-#preftoc li {
-   margin: 0 0.5em 0 0.5em;
-   padding: 0 0.2em 0 0.2em;
-   display: block;
-   float: left;
-   height: 1.5em;
-   text-transform: lowercase;
-}
-
-#preferences {
-   margin: 0 0 0 0;
-   padding: 0 1em 1em 1em;
-   border: solid 1px #bbb;
-   clear: left; /* Multi-line toc should not push data to horizontally */
-}
-
-#preferences fieldset {
-   margin-top: 0;
-   border: 0;
-}
-
-.mainLegend {
-   display: none;
-}
-
-.htmlform-tip {
-   font-size: x-small;
-   padding: 0.2em 2em;
-   color: #666;
-}
-
-.prefsection legend {
-   font-weight: bold;
-}
-
-#preftoc li.selected {
-   background-color: #bbb;
-}
-
-#preftoc li a,
-#preftoc li a:hover,
-#preftoc li a:visited {
-   text-decoration: underline;
-   color: #036;
-}
-
-#preftoc li.selected a,
-#preftoc li.selected a:hover,
-#preftoc li.selected a:visited {
-   text-decoration: none;
-   color: #fff;
-}
-
 #mw_content a.external {
/* @embed */
background: url( images/external.png ) center right no-repeat;
@@ -695,11 +634,6 @@
 
 #mw_content a.external {
color: #36b;
-}
-
-.redirectText {
-   font-size: 150%;
-   margin: 5px;
 }
 
 .printfooter {
diff --git a/skin.json b/skin.json
index 777abbc..fa2c541 100644
--- a/skin.json
+++ b/skin.json
@@ -41,5 +41,11 @@
"SkinModern": "SkinModern.php",
"ModernTemplate": "SkinModern.php"
},
+   "ResourceModuleSkinStyles": {
+   "modern": {
+   "+mediawiki.action.view.redirectPage": 
"skinStyles/mediawiki.action.view.redirectPage.css",
+   "+mediawiki.special.preferences.styles": 
"skinStyles/mediawiki.special.preferences.styles.less"
+   }
+   },
"manifest_version": 1
 }
diff --git a/skinStyles/mediawiki.action.view.redirectPage.css 
b/skinStyles/mediawiki.action.view.redirectPage.css
new file mode 100644
index 000..2a446c4
--- /dev/null
+++ b/skinStyles/mediawiki.action.view.redirectPage.css
@@ -0,0 +1,4 @@
+.redirectText {
+   font-size: 150%;
+   margin: 5px;
+}
diff --git a/skinStyles/mediawiki.special.preferences.styles.less 
b/skinStyles/mediawiki.special.preferences.styles.less
new file mode 100644
index 000..2f2a324
--- /dev/null
+++ b/skinStyles/mediawiki.special.preferences.styles.less
@@ -0,0 +1,60 @@
+#preftoc {
+   width: 100%;
+   margin: 0;
+   padding: 0;
+   height: 1.5em;
+   clear: right;
+
+   li {
+   margin: 0 0.5em 0 0.5em;
+   padding: 0 0.2em 0 0.2em;
+   display: block;
+   float: left;
+   height: 1.5em;
+   text-transform: lowercase;
+   }
+
+   li a,
+   li a:hover,
+   li a:visited {
+   text-decoration: underline;
+   color: #036;
+   }
+
+   li.selected {
+   background-color: #bbb;
+   }
+
+   li.selected a,
+   li.selected a:hover,
+   li.selected a:visited {
+   text-decoration: none;
+   color: #fff;
+   }
+}
+
+#preferences {
+   margin: 0;
+   padding: 0 1em 1em 1em;
+   border: solid 1px #bbb;
+   clear: left; /* Multi-line toc should not push data to horizontally */
+
+   fieldset {
+   margin-top: 0;
+   border: 0;
+   }
+}
+
+.mainLegend {
+   display: none;
+}
+
+.htmlform-tip {
+   font-size: x-small;
+   padding: 0.2em 2em;
+   color: #666;
+}
+
+.prefsection legend {
+   font-weight: bold;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7642234b8513b66c0a3b750cc95092141bcffb7
Gerrit-PatchSet: 2
Gerrit-Project:

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: Optimization: don't load .redirectText CSS outside redirect ...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358606 )

Change subject: Optimization: don't load .redirectText CSS outside redirect 
pages
..


Optimization: don't load .redirectText CSS outside redirect pages

Change-Id: I5a12b60cff731c9b5c2492daa3aa67169e53a041
---
M main.css
M skin.json
A skinStyles/mediawiki.action.view.redirectPage.css
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/main.css b/main.css
index 0b68bc1..bf5a6c4 100644
--- a/main.css
+++ b/main.css
@@ -552,11 +552,6 @@
position: relative;
 }
 
-.redirectText {
-   font-size: 150%;
-   margin: 5px;
-}
-
 div.patrollink {
clear: both;
 }
diff --git a/skin.json b/skin.json
index 878d0ee..7fde2df 100644
--- a/skin.json
+++ b/skin.json
@@ -39,6 +39,7 @@
},
"ResourceModuleSkinStyles": {
"monobook": {
+   "+mediawiki.action.view.redirectPage": 
"skinStyles/mediawiki.action.view.redirectPage.css",
"+mediawiki.special.preferences.styles": 
"skinStyles/mediawiki.special.preferences.styles.less",
"+mediawiki.notification": 
"skinStyles/mediawiki.notification.less"
}
diff --git a/skinStyles/mediawiki.action.view.redirectPage.css 
b/skinStyles/mediawiki.action.view.redirectPage.css
new file mode 100644
index 000..2a446c4
--- /dev/null
+++ b/skinStyles/mediawiki.action.view.redirectPage.css
@@ -0,0 +1,4 @@
+.redirectText {
+   font-size: 150%;
+   margin: 5px;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a12b60cff731c9b5c2492daa3aa67169e53a041
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: SamanthaNguyen 
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...BlueSpiceFoundation[master]: Unittests: Cherrypicking from REL1_27

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359076 )

Change subject: Unittests: Cherrypicking from REL1_27
..


Unittests: Cherrypicking from REL1_27

This test works with REL1_27

Change-Id: Id169ef909aac7839c8f2f6f81c7c897a7fba3d10
---
M tests/api/BSApiCategoryTreeStoreTest.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/tests/api/BSApiCategoryTreeStoreTest.php 
b/tests/api/BSApiCategoryTreeStoreTest.php
index 37c5ef0..f9a7f15 100644
--- a/tests/api/BSApiCategoryTreeStoreTest.php
+++ b/tests/api/BSApiCategoryTreeStoreTest.php
@@ -11,6 +11,7 @@
  */
 class BSApiCategoryTreeStoreTest extends BSApiExtJSStoreTestBase {
protected $iFixtureTotal = 2;
+   protected $tablesUsed = [ 'category', 'categorylinks', 'page' ];
 
protected function getStoreSchema() {
return [
@@ -26,8 +27,9 @@
];
}
 
-   protected function createStoreFixtureData() {
-   $oDbw = wfGetDB( DB_MASTER );
+   protected function setUp() {
+   parent::setUp();
+   $oDbw = $this->db;
$oDbw->insert( 'category', array(
'cat_title' => "Dummy test",
'cat_pages' => 3,
@@ -48,7 +50,9 @@
'page_title' => "Dummy test 2",
'page_namespace' => NS_CATEGORY
) );
+   }
 
+   protected function createStoreFixtureData() {
return 2;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id169ef909aac7839c8f2f6f81c7c897a7fba3d10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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[wmf/1.30.0-wmf.5]: Revert "ChangesList: Expose basic properties of lines as dat...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359070 )

Change subject: Revert "ChangesList: Expose basic properties of lines as data 
attributes"
..


Revert "ChangesList: Expose basic properties of lines as data attributes"

This is breaking watchlist highlighting in production.
Only reverting it in wmf5 for now, not in master yet.

This reverts commit 016452cd09f4b32100f4fa3740168c5fc161d496.

Bug: T167922
Change-Id: I308a60a4664e313bc26fa4d186344827a3238391
---
M RELEASE-NOTES-1.30
M docs/hooks.txt
M includes/GlobalFunctions.php
M includes/Sanitizer.php
M includes/actions/HistoryAction.php
M includes/changes/ChangesList.php
M includes/changes/EnhancedChangesList.php
M includes/changes/OldChangesList.php
M includes/logging/LogEventsList.php
M includes/specials/SpecialNewpages.php
M includes/specials/pagers/ContribsPager.php
M includes/specials/pagers/DeletedContribsPager.php
M includes/templates/EnhancedChangesListGroup.mustache
D tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
M tests/phpunit/includes/SanitizerTest.php
M tests/phpunit/includes/changes/EnhancedChangesListTest.php
M tests/phpunit/includes/changes/OldChangesListTest.php
17 files changed, 32 insertions(+), 262 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index f2cb871..b6e79a0 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -96,13 +96,6 @@
   or wikilinks.
 * (T163966) Page moves are now counted as edits for the purposes of
   autopromotion, i.e., they increment the user_editcount field in the database.
-* Two new hooks, LogEventsListLineEnding and NewPagesLineEnding were added for
-  manipulating Special:Log and Special:NewPages lines.
-* The OldChangesListRecentChangesLine, EnhancedChangesListModifyLineData,
-  PageHistoryLineEnding, ContributionsLineEnding and 
DeletedContributionsLineEnding
-  hooks have an additional parameter, for manipulating HTML data attributes of
-  RC/history lines. EnhancedChangesListModifyBlockLineData can do that via the
-  $data['attribs'] subarray.
 * (T130632) The OutputPage::enableTOC() method was removed.
 
 == Compatibility ==
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 3d310c3..0e8b508 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1155,9 +1155,6 @@
 &$ret: the HTML line
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'ContributionsToolLinks': Change tool links above Special:Contributions
 $id: User identifier
@@ -1203,9 +1200,6 @@
 &$ret: the HTML line
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'DifferenceEngineAfterLoadNewText': called in DifferenceEngine::loadNewText()
 after the new revision's content has been loaded into the class member variable
@@ -1518,9 +1512,6 @@
 $block: An array of RecentChange objects in that block
 $rc: The RecentChange object for this line
 &$classes: An array of classes to change
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'EnhancedChangesListModifyBlockLineData': to alter data used to build
 a non-grouped recent change line in EnhancedChangesList.
@@ -2008,16 +1999,6 @@
 &$attribs: the attributes to be applied
 &$ret: the value to return if your hook returns false
 
-'LogEventsListLineEnding': Called before a Special:Log line is finished
-$page: the LogEventsList object
-&$ret: the HTML line
-$entry: the DatabaseLogEntry object for this row
-&$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
-
-
 'HtmlPageLinkRendererBegin':
 Used when generating internal and interwiki links in
 LinkRenderer, before processing starts.  Return false to skip default
@@ -2303,16 +2284,6 @@
 $old: the ?old= param value from the url
 $new: the ?new= param value from the url
 
-'NewPagesLineEnding': Called before a NewPages line is finished.
-$page: the SpecialNewPages object
-&$ret: the HTML line
-$row: the database row for this page (the recentchanges record and a few 
extras - see
-  NewPagesPager::getQueryInfo)
-&$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Unittests: cherrypicking changes from REL1_27

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359072 )

Change subject: Unittests: cherrypicking changes from REL1_27
..


Unittests: cherrypicking changes from REL1_27

This test works with REL1_27

Change-Id: I9cad7142d854762936b3348ca14eed83424df40b
---
M tests/api/BSApiCategoryStoreTest.php
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/tests/api/BSApiCategoryStoreTest.php 
b/tests/api/BSApiCategoryStoreTest.php
index 5792978..d8e4973 100644
--- a/tests/api/BSApiCategoryStoreTest.php
+++ b/tests/api/BSApiCategoryStoreTest.php
@@ -39,8 +39,9 @@
];
}
 
-   protected function createStoreFixtureData() {
-   $oDbw = wfGetDB( DB_MASTER );
+   protected function setUp() {
+   parent::setUp();
+   $oDbw = $this->db;
$oDbw->insert( 'category', array(
'cat_title' => "Dummy test",
'cat_pages' => 3,
@@ -61,7 +62,9 @@
'page_title' => "Dummy test 2",
'page_namespace' => NS_CATEGORY
) );
+   }
 
+   protected function createStoreFixtureData() {
return 2;
}
 
@@ -96,5 +99,4 @@
]
];
}
-}
-
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cad7142d854762936b3348ca14eed83424df40b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...Modern[master]: Optimization: removed old & unused #searchTarget* rules

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358624 )

Change subject: Optimization: removed old & unused #searchTarget* rules
..


Optimization: removed old & unused #searchTarget* rules

They were related to the old AJAX search, which was removed from core in
r39717, in August 2008.

Change-Id: I1057b5517c5a61f3ca5f2904e2079f715e703e2b
---
M resources/main.css
1 file changed, 0 insertions(+), 30 deletions(-)

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



diff --git a/resources/main.css b/resources/main.css
index e4d8be7..5d282a8 100644
--- a/resources/main.css
+++ b/resources/main.css
@@ -769,36 +769,6 @@
color: #000;
 }
 
-div#searchTargetContainer {
-   left: 10px;
-   top: 10px;
-   width: 90%;
-   background: #fff;
-}
-
-div#searchTarget {
-   padding: 3px;
-   margin: 5px;
-   background: #f0f0f0;
-   border: solid 1px #00f;
-}
-
-div#searchTarget ul li {
-   list-style: none;
-}
-
-div#searchTarget ul li:before {
-   color: #ffa500;
-   content: '\00BB \0020';
-}
-
-div#searchTargetHide {
-   float: right;
-   border: solid 1px #000;
-   background: #dcdcdc;
-   padding: 2px;
-}
-
 div.multipageimagenavbox {
border: solid 1px #c0c0c0;
padding: 4px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1057b5517c5a61f3ca5f2904e2079f715e703e2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: SamanthaNguyen 
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...MonoBook[master]: Optimization: removed old & unused #searchTarget* rules

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358623 )

Change subject: Optimization: removed old & unused #searchTarget* rules
..


Optimization: removed old & unused #searchTarget* rules

They were related to the old AJAX search, which was removed from core in
r39717, in August 2008.

Change-Id: I3983897b00f5f6ba338b37b0b76c8a245bd1b9d6
---
M main.css
1 file changed, 0 insertions(+), 31 deletions(-)

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



diff --git a/main.css b/main.css
index 0b68bc1..91b1a4b 100644
--- a/main.css
+++ b/main.css
@@ -603,37 +603,6 @@
color: #000;
 }
 
-div#searchTargetContainer {
-   left: 10px;
-   top: 10px;
-   width: 90%;
-   background: #fff;
-}
-
-div#searchTarget {
-   padding: 3px;
-   margin: 5px;
-   background: #f0f0f0;
-   border: solid 1px #00f;
-}
-
-div#searchTarget ul li {
-   list-style-type: none;
-   list-style-image: none;
-}
-
-div#searchTarget ul li:before {
-   color: #ffa500;
-   content: '\00BB \0020';
-}
-
-div#searchTargetHide {
-   float: right;
-   border: solid 1px #000;
-   background: #dcdcdc;
-   padding: 2px;
-}
-
 #powersearch p {
margin-top: 0;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3983897b00f5f6ba338b37b0b76c8a245bd1b9d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: SamanthaNguyen 
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]: Cleanup ORES config: Alphasort wmgUseORES

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359075 )

Change subject: Cleanup ORES config: Alphasort wmgUseORES
..


Cleanup ORES config: Alphasort wmgUseORES

Alphasorting the list of those wikis which have the extension, as we
do normally (grouped by family), for easier diffs in future.

Change-Id: I24ebabcd5fd81d72e8862f761a219abf0e544981
---
M wmf-config/InitialiseSettings.php
1 file changed, 11 insertions(+), 9 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2124b1f..f05d8d7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18426,19 +18426,21 @@
 ],
 'wmgUseORES' => [
'default' => false,
-   'fawiki' => true, // T130211
-   'wikidatawiki' => true, // T130212
-   'nlwiki' => true, // T139432
-   'ruwiki' => true, // T139541
-   'ptwiki' => true, // T139692
-   'trwiki' => true, // T139992
-   'plwiki' => true, // T140005
-   'enwiki' => true, // T140003
+
'cswiki' => true, // T151611
+   'enwiki' => true, // T140003
'etwiki' => true, // T159609
-   'hewiki' => true, // T161621
+   'fawiki' => true, // T130211
'fiwiki' => true, // T163011
'frwiki' => true, // T165044
+   'hewiki' => true, // T161621
+   'nlwiki' => true, // T139432
+   'plwiki' => true, // T140005
+   'ptwiki' => true, // T139692
+   'ruwiki' => true, // T139541
+   'trwiki' => true, // T139992
+
+   'wikidatawiki' => true, // T130212
 ],
 'wgOresModels' => [
'default' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24ebabcd5fd81d72e8862f761a219abf0e544981
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
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]: Cleanup ORES config: Drop wgOresExtensionStatus (default)

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/354732 )

Change subject: Cleanup ORES config: Drop wgOresExtensionStatus (default)
..


Cleanup ORES config: Drop wgOresExtensionStatus (default)

We don't set wgOresExtensionStatus to anything other than 'on' which is
(a) the extension default and (b) going away soon as it's pointless, so
let's just clean it up.

Change-Id: I160d81a06bbdb07209b20bb043f0c32363cc3442
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index bef27a9..8873bc9 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -430,10 +430,6 @@
'default' => false,
'wikipedia' => true, // T127661
],
-   'wgOresExtensionStatus' => [
-   'cawiki' => 'on',
-   'ruwiki' => 'on',
-   ],
'wgOresModels' => [
'default' => [
'damaging' => true,
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6e3e648..2124b1f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18440,9 +18440,6 @@
'fiwiki' => true, // T163011
'frwiki' => true, // T165044
 ],
-'wgOresExtensionStatus' => [
-   'default' => 'on',
-],
 'wgOresModels' => [
'default' => [
'damaging' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I160d81a06bbdb07209b20bb043f0c32363cc3442
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
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...BlueSpiceFoundation[master]: Unittests: Cherrypicking from REL1_27

2017-06-14 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359076 )

Change subject: Unittests: Cherrypicking from REL1_27
..

Unittests: Cherrypicking from REL1_27

This test works with REL1_27

Change-Id: Id169ef909aac7839c8f2f6f81c7c897a7fba3d10
---
M tests/api/BSApiCategoryTreeStoreTest.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/76/359076/1

diff --git a/tests/api/BSApiCategoryTreeStoreTest.php 
b/tests/api/BSApiCategoryTreeStoreTest.php
index 37c5ef0..f9a7f15 100644
--- a/tests/api/BSApiCategoryTreeStoreTest.php
+++ b/tests/api/BSApiCategoryTreeStoreTest.php
@@ -11,6 +11,7 @@
  */
 class BSApiCategoryTreeStoreTest extends BSApiExtJSStoreTestBase {
protected $iFixtureTotal = 2;
+   protected $tablesUsed = [ 'category', 'categorylinks', 'page' ];
 
protected function getStoreSchema() {
return [
@@ -26,8 +27,9 @@
];
}
 
-   protected function createStoreFixtureData() {
-   $oDbw = wfGetDB( DB_MASTER );
+   protected function setUp() {
+   parent::setUp();
+   $oDbw = $this->db;
$oDbw->insert( 'category', array(
'cat_title' => "Dummy test",
'cat_pages' => 3,
@@ -48,7 +50,9 @@
'page_title' => "Dummy test 2",
'page_namespace' => NS_CATEGORY
) );
+   }
 
+   protected function createStoreFixtureData() {
return 2;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id169ef909aac7839c8f2f6f81c7c897a7fba3d10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Cleanup ORES config: Alphasort wmgUseORES

2017-06-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359075 )

Change subject: Cleanup ORES config: Alphasort wmgUseORES
..

Cleanup ORES config: Alphasort wmgUseORES

Alphasorting the list of those wikis which have the extension, as we
do normally (grouped by family), for easier diffs in future.

Change-Id: I24ebabcd5fd81d72e8862f761a219abf0e544981
---
M wmf-config/InitialiseSettings.php
1 file changed, 11 insertions(+), 9 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f31f9c5..8519efe 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18094,19 +18094,21 @@
 ],
 'wmgUseORES' => [
'default' => false,
-   'fawiki' => true, // T130211
-   'wikidatawiki' => true, // T130212
-   'nlwiki' => true, // T139432
-   'ruwiki' => true, // T139541
-   'ptwiki' => true, // T139692
-   'trwiki' => true, // T139992
-   'plwiki' => true, // T140005
-   'enwiki' => true, // T140003
+
'cswiki' => true, // T151611
+   'enwiki' => true, // T140003
'etwiki' => true, // T159609
-   'hewiki' => true, // T161621
+   'fawiki' => true, // T130211
'fiwiki' => true, // T163011
'frwiki' => true, // T165044
+   'hewiki' => true, // T161621
+   'nlwiki' => true, // T139432
+   'plwiki' => true, // T140005
+   'ptwiki' => true, // T139692
+   'ruwiki' => true, // T139541
+   'trwiki' => true, // T139992
+
+   'wikidatawiki' => true, // T130212
 ],
 'wgOresModels' => [
'default' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable $wgStructuredChangeEnableExperimentalViews in beta labs

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359071 )

Change subject: Enable $wgStructuredChangeEnableExperimentalViews in beta labs
..


Enable $wgStructuredChangeEnableExperimentalViews in beta labs

Also remove $wgStructuredChangeFiltersEnableSaving from the config
since it defaults to true now.

Bug: T164130
Change-Id: I6e0ccd7707a509fcdc44f255dfce05855307a19f
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 4c0abc5..7972232 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -335,7 +335,7 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
-$wgStructuredChangeFiltersEnableSaving = true;
+$wgStructuredChangeFiltersEnableExperimentalViews = true;
 
 $wgMessageCacheType = CACHE_ACCEL;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e0ccd7707a509fcdc44f255dfce05855307a19f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
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...VisualEditor[master]: Use Parsoid data for template names rather than detect from ...

2017-06-14 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359074 )

Change subject: Use Parsoid data for template names rather than detect from 
wikitext
..

Use Parsoid data for template names rather than detect from wikitext

We were incorrectly handling transclusions with trailing
newlines after the template name.

This also improves handling of non-template transclusions,
e.g. parser functions like `{{int:mainpage}}`, which are
no longer mangled as if they were page names.

ve.dm.MWTransclusionNode#isSingleTemplate will now match
a template even if it's name is itself template-generated.

Logic for turning Parsoid's hrefs into page names stolen
from ve.dm.MWImageNode.prototype.getFilename.

Bug: T167613
Change-Id: Ibecf71338eb37bb3da81a7372e4ed41140a9af57
---
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 21 insertions(+), 19 deletions(-)


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

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index bf2c9b8..5a37a5f 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -50,17 +50,22 @@
  * Get a list of descriptions of template parts in a transclusion node
  *
  * @static
- * @param {ve.dm.Node} model Node model
+ * @param {ve.dm.MWTransclusionNode} model Node model
  * @return {string[]} List of template part descriptions
  */
 ve.ce.MWTransclusionNode.static.getTemplatePartDescriptions = function ( model 
) {
-   var i, len, part,
+   var i, len, part, title,
parts = model.getPartsList(),
words = [];
 
for ( i = 0, len = parts.length; i < len; i++ ) {
part = parts[ i ];
-   if ( part.template ) {
+   // Ignore parts that are just content
+   if ( part.templatePage ) {
+   title = mw.Title.newFromText( part.templatePage );
+   words.push( title.getRelativeText( mw.config.get( 
'wgNamespaceIds' ).template ) );
+   } else if ( part.template ) {
+   // Not actually a template, but e.g. a parser function
words.push( part.template );
}
}
@@ -73,14 +78,6 @@
  */
 ve.ce.MWTransclusionNode.static.getDescription = function ( model ) {
return this.getTemplatePartDescriptions( model )
-   .map( function ( template ) {
-   var title = mw.Title.newFromText( template, 
mw.config.get( 'wgNamespaceIds' ).template );
-   if ( title ) {
-   return title.getRelativeText( mw.config.get( 
'wgNamespaceIds' ).template );
-   } else {
-   return template;
-   }
-   } )
.join( ve.msg( 'comma-separator' ) );
 };
 
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index d45c284..7119f8b 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -357,8 +357,8 @@
}
for ( i = 0, len = templates.length; i < len; i++ ) {
if (
-   partsList[ 0 ].template &&
-   normalizeTitle( partsList[ 0 ].template ) === 
normalizeTitle( templates[ i ] )
+   partsList[ 0 ].templatePage &&
+   partsList[ 0 ].templatePage === normalizeTitle( 
templates[ i ] )
) {
return true;
}
@@ -372,18 +372,23 @@
  * @return {Object[]} List of objects with either template or content 
properties
  */
 ve.dm.MWTransclusionNode.prototype.getPartsList = function () {
-   var i, len, part, content;
+   var i, len, href, page, part, content;
 
if ( !this.partsList ) {
this.partsList = [];
content = this.getAttribute( 'mw' );
for ( i = 0, len = content.parts.length; i < len; i++ ) {
part = content.parts[ i ];
-   this.partsList.push(
-   part.template ?
-   { template: part.template.target.wt } :
-   { content: part }
-   );
+   if ( part.template ) {
+   href = part.template.target.href;
+   page = href ? 
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.+\/)*/, '' ) ): null;
+   this.partsList.push( {
+

[MediaWiki-commits] [Gerrit] operations/dns[master]: rename mwreleases1001 to releases1001

2017-06-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359073 )

Change subject: rename mwreleases1001 to releases1001
..

rename mwreleases1001 to releases1001

After talking with Chad, we want to use the new VM for both
Mediawiki and other releases and move the existing role from
bromine to this too. So we rename it from mwreleases to releases,
while bromine will stay just a web server for static websites.

Change-Id: I46739399e9a03a7d2675a7bcb194223f23d29ef4
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/73/359073/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 30b3b22..2e6ad17 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -859,7 +859,7 @@
 223 1H IN PTR   ms-be1034.eqiad.wmnet.
 224 1H IN PTR   ms-be1035.eqiad.wmnet.
 225 1H IN PTR   ms-be1036.eqiad.wmnet.
-226 1H IN PTR   mwreleases1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
+226 1H IN PTR   releases1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 227 1H IN PTR   db1061.eqiad.wmnet.
 228 1H IN PTR   db1063.eqiad.wmnet.
 
diff --git a/templates/wmnet b/templates/wmnet
index c8f5b60..c4d1950 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -702,7 +702,6 @@
 mw1306  1H  IN A10.64.16.106
 mwdebug1001 1H  IN A10.64.32.123 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 mwdebug1002 1H  IN A10.64.32.124 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
-mwreleases1001  1H  IN A10.64.32.226 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 neodymium   1H  IN A10.64.32.20
 neodymium   1H  IN  2620:0:861:103:10:64:32:20
 nitrogen1H  IN A10.64.32.199 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
@@ -755,6 +754,7 @@
 rdb1006 1H  IN A10.64.48.55
 rdb1007 1H  IN A10.64.32.18
 rdb1008 1H  IN A10.64.32.19
+releases10011H  IN A10.64.32.226 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 relforge10011H  IN A10.64.4.13
 relforge10021H  IN A10.64.37.21
 restbase10071H  IN A10.64.0.223

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46739399e9a03a7d2675a7bcb194223f23d29ef4
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
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]: RCFilters: Add 'views' concept and a namespace view to RCFil...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/353201 )

Change subject: RCFilters: Add 'views' concept and a namespace view to RCFilters
..


RCFilters: Add 'views' concept and a namespace view to RCFilters

Enhanced RCFilters: Add the ability to filter by namespaces to RCFilters.
      

- Add the ability to separate groups of filters by 'views'
- Add the first views as 'default' (for predefined filters)
  and 'namespace' as the list of namespaces.
- Add 'nsinvert' to namespace group
- Allow highlighting namespaces
- Allow searching on either view, depending on prefix
- Add a way to switch views by typing prefix, clicking the
  'Namespaces' button or clicking a tag (either namespace
  or filter tag, changes the view accordingly, and adds
  or removes the prefix from the input to stay consistent)
- Add an optional wrapper text for tags, so we can represent
  them with their respective prefixes and (if needed) with
  a special message for inverted state.
- Add unit tests and make pass
- Bonus: Fix issue with URL not updating (and not being updated)
  the inverted and highlight enabled states.

Bug: T159942
Bug: T163521
Bug: T164130
Change-Id: I7e83f0800cbeb289dfd3461c1c5a197c053147ca
---
M includes/DefaultSettings.php
M includes/changes/ChangesList.php
M includes/specials/SpecialRecentchanges.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
M tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
24 files changed, 707 insertions(+), 96 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9436aa6..191787e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6768,6 +6768,12 @@
 $wgStructuredChangeFiltersEnableSaving = true;
 
 /**
+ * Whether to show the new experimental views (like namespaces, tags, and 
users) in
+ * RecentChanges filters
+ */
+$wgStructuredChangeFiltersEnableExperimentalViews = false;
+
+/**
  * Use new page patrolling to check new pages on Special:Newpages
  */
 $wgUseNPPatrol = true;
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 00d842f..5aa693d 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -177,6 +177,8 @@
} else {
$classes[] = Sanitizer::escapeClass( 
self::CSS_CLASS_PREFIX . 'ns' .
$rc->mAttribs['rc_namespace'] . '-' . 
$rc->mAttribs['rc_title'] );
+   $classes[] = Sanitizer::escapeClass( 
self::CSS_CLASS_PREFIX . 'ns-' .
+   $rc->mAttribs['rc_namespace'] );
}
 
// Indicate watched status on the line to allow for more
diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index acfc1c0..cbf2e37 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -138,7 +138,8 @@
 * @param string $subpage
 */
public function execute( $subpage ) {
-   global $wgStructuredChangeFiltersEnableSaving;
+   global $wgStructuredChangeFiltersEnableSaving,
+   $wgStructuredChangeFiltersEnableExperimentalViews;
 
// Backwards-compatibility: redirect to new feed URLs
$feedFormat = $this->getRequest()->getVal( 'feed' );
@@ -184,6 +185,10 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs dnsrecursor: add atjwiki

2017-06-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358412 )

Change subject: labs dnsrecursor: add atjwiki
..


labs dnsrecursor: add atjwiki

Bug: T167714
Change-Id: I634a76217e7a9ccb835470ed33bf7c8e8e0b5f76
---
M modules/role/manifests/labs/dnsrecursor.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/dnsrecursor.pp 
b/modules/role/manifests/labs/dnsrecursor.pp
index b922a68..441fab2 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -104,7 +104,7 @@
 'arwikiquote', 'arwikisource', 'arwikiversity',
 'arwiktionary', 'arzwiki', 'astwiki', 'astwikibooks',
 'astwikiquote', 'astwiktionary', 'aswiki', 'aswikibooks',
-'aswikisource', 'aswiktionary', 'avwiki', 'avwiktionary',
+'aswikisource', 'aswiktionary', 'atjwiki', 'avwiki', 'avwiktionary',
 'aywiki', 'aywikibooks', 'aywiktionary', 'azwiki', 'azbwiki',
 'azwikibooks', 'azwikiquote', 'azwikisource', 'azwiktionary',
 'barwiki', 'bat_smgwiki', 'bawiki', 'bawikibooks', 'bclwiki',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I634a76217e7a9ccb835470ed33bf7c8e8e0b5f76
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
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...BlueSpiceFoundation[master]: Unittests: cherrypicking changes from REL1_27

2017-06-14 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359072 )

Change subject: Unittests: cherrypicking changes from REL1_27
..

Unittests: cherrypicking changes from REL1_27

This test works with REL1_27

Change-Id: I9cad7142d854762936b3348ca14eed83424df40b
---
M tests/api/BSApiCategoryStoreTest.php
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/72/359072/1

diff --git a/tests/api/BSApiCategoryStoreTest.php 
b/tests/api/BSApiCategoryStoreTest.php
index 5792978..d8e4973 100644
--- a/tests/api/BSApiCategoryStoreTest.php
+++ b/tests/api/BSApiCategoryStoreTest.php
@@ -39,8 +39,9 @@
];
}
 
-   protected function createStoreFixtureData() {
-   $oDbw = wfGetDB( DB_MASTER );
+   protected function setUp() {
+   parent::setUp();
+   $oDbw = $this->db;
$oDbw->insert( 'category', array(
'cat_title' => "Dummy test",
'cat_pages' => 3,
@@ -61,7 +62,9 @@
'page_title' => "Dummy test 2",
'page_namespace' => NS_CATEGORY
) );
+   }
 
+   protected function createStoreFixtureData() {
return 2;
}
 
@@ -96,5 +99,4 @@
]
];
}
-}
-
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cad7142d854762936b3348ca14eed83424df40b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable $wgStructuredChangeEnableExperimentalViews in beta labs

2017-06-14 Thread Catrope (Code Review)

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359071 )

Change subject: Enable $wgStructuredChangeEnableExperimentalViews in beta labs
..

Enable $wgStructuredChangeEnableExperimentalViews in beta labs

Also remove $wgStructuredChangeFiltersEnableSaving from the config
since it defaults to true now.

Bug: T164130
Change-Id: I6e0ccd7707a509fcdc44f255dfce05855307a19f
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 4c0abc5..7972232 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -335,7 +335,7 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
-$wgStructuredChangeFiltersEnableSaving = true;
+$wgStructuredChangeFiltersEnableExperimentalViews = true;
 
 $wgMessageCacheType = CACHE_ACCEL;
 

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...dashboard[master]: Deploy

2017-06-14 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359069 )

Change subject: Deploy
..


Deploy

Change-Id: I85e53dd258a8ab14ad9a5009f9e1704c00709001
---
M shiny-server/external
M shiny-server/metrics
M shiny-server/portal
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/shiny-server/external b/shiny-server/external
index a9627fc..c245f79 16
--- a/shiny-server/external
+++ b/shiny-server/external
@@ -1 +1 @@
-Subproject commit a9627fc557d9671b5fae9d9b62fc64e8b372998d
+Subproject commit c245f7958e1300b0cf48d9c30e627679a663bd72
diff --git a/shiny-server/metrics b/shiny-server/metrics
index 494ea7b..a831a38 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
@@ -1 +1 @@
-Subproject commit 494ea7b1fe2c4e30f80191fe34865adbdf4c
+Subproject commit a831a3805bbb905f6745ca9cc5b4c3c2bf573856
diff --git a/shiny-server/portal b/shiny-server/portal
index fa78f60..5b3a67d 16
--- a/shiny-server/portal
+++ b/shiny-server/portal
@@ -1 +1 @@
-Subproject commit fa78f60f4734432e4fd3c5f8e61803f5a870a024
+Subproject commit 5b3a67de6ad43d89ea7e06a20b58da76d128e5d4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85e53dd258a8ab14ad9a5009f9e1704c00709001
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.5]: Revert "ChangesList: Expose basic properties of lines as dat...

2017-06-14 Thread Catrope (Code Review)

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359070 )

Change subject: Revert "ChangesList: Expose basic properties of lines as data 
attributes"
..

Revert "ChangesList: Expose basic properties of lines as data attributes"

This is breaking watchlist highlighting in production.
Only reverting it in wmf5 for now, not in master yet.

This reverts commit 016452cd09f4b32100f4fa3740168c5fc161d496.

Bug: T167922
Change-Id: I308a60a4664e313bc26fa4d186344827a3238391
---
M RELEASE-NOTES-1.30
M docs/hooks.txt
M includes/GlobalFunctions.php
M includes/Sanitizer.php
M includes/actions/HistoryAction.php
M includes/changes/ChangesList.php
M includes/changes/EnhancedChangesList.php
M includes/changes/OldChangesList.php
M includes/logging/LogEventsList.php
M includes/specials/SpecialNewpages.php
M includes/specials/pagers/ContribsPager.php
M includes/specials/pagers/DeletedContribsPager.php
M includes/templates/EnhancedChangesListGroup.mustache
D tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
M tests/phpunit/includes/SanitizerTest.php
M tests/phpunit/includes/changes/EnhancedChangesListTest.php
M tests/phpunit/includes/changes/OldChangesListTest.php
17 files changed, 32 insertions(+), 262 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/359070/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index f2cb871..b6e79a0 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -96,13 +96,6 @@
   or wikilinks.
 * (T163966) Page moves are now counted as edits for the purposes of
   autopromotion, i.e., they increment the user_editcount field in the database.
-* Two new hooks, LogEventsListLineEnding and NewPagesLineEnding were added for
-  manipulating Special:Log and Special:NewPages lines.
-* The OldChangesListRecentChangesLine, EnhancedChangesListModifyLineData,
-  PageHistoryLineEnding, ContributionsLineEnding and 
DeletedContributionsLineEnding
-  hooks have an additional parameter, for manipulating HTML data attributes of
-  RC/history lines. EnhancedChangesListModifyBlockLineData can do that via the
-  $data['attribs'] subarray.
 * (T130632) The OutputPage::enableTOC() method was removed.
 
 == Compatibility ==
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 3d310c3..0e8b508 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1155,9 +1155,6 @@
 &$ret: the HTML line
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'ContributionsToolLinks': Change tool links above Special:Contributions
 $id: User identifier
@@ -1203,9 +1200,6 @@
 &$ret: the HTML line
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'DifferenceEngineAfterLoadNewText': called in DifferenceEngine::loadNewText()
 after the new revision's content has been loaded into the class member variable
@@ -1518,9 +1512,6 @@
 $block: An array of RecentChange objects in that block
 $rc: The RecentChange object for this line
 &$classes: An array of classes to change
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'EnhancedChangesListModifyBlockLineData': to alter data used to build
 a non-grouped recent change line in EnhancedChangesList.
@@ -2008,16 +1999,6 @@
 &$attribs: the attributes to be applied
 &$ret: the value to return if your hook returns false
 
-'LogEventsListLineEnding': Called before a Special:Log line is finished
-$page: the LogEventsList object
-&$ret: the HTML line
-$entry: the DatabaseLogEntry object for this row
-&$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
-
-
 'HtmlPageLinkRendererBegin':
 Used when generating internal and interwiki links in
 LinkRenderer, before processing starts.  Return false to skip default
@@ -2303,16 +2284,6 @@
 $old: the ?old= param value from the url
 $new: the ?new= param value from the url
 
-'NewPagesLineEnding': Called before a NewPages line is finished.
-$page: the SpecialNewPages object
-&$ret: the HTML line
-$row: the database row for this page (the recentchanges record and a few 
extras - see
-  NewPagesPager::getQueryInfo)
-&$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved

[MediaWiki-commits] [Gerrit] mediawiki...PrivateDomains[master]: Version 1.6.0: show the customized error page to anons on ac...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359065 )

Change subject: Version 1.6.0: show the customized error page to anons on 
action=edit
..


Version 1.6.0: show the customized error page to anons on action=edit

Change-Id: If13c2997343879e4ec207b943766fe3f1a510365
---
M PrivateDomainsHooks.php
M extension.json
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/PrivateDomainsHooks.php b/PrivateDomainsHooks.php
index 7978536..0ec8296 100644
--- a/PrivateDomainsHooks.php
+++ b/PrivateDomainsHooks.php
@@ -17,6 +17,7 @@
global $wgUser;
$groups = $wgUser->getEffectiveGroups();
if (
+   $wgUser->isAnon() ||
$wgUser->isLoggedIn() && !in_array( 'privatedomains', 
$groups ) &&
!in_array( 'staff', $groups ) && !in_array( 
'bureaucrat', $groups )
)
diff --git a/extension.json b/extension.json
index d2ec519..0df24b9 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PrivateDomains",
-   "version": "1.5.0",
+   "version": "1.6.0",
"author": [
"Inez Korczyński",
"Jack Phoenix"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If13c2997343879e4ec207b943766fe3f1a510365
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PrivateDomains
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
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...WikimediaMaintenance[wmf/1.30.0-wmf.5]: Remove AccountAudit

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359068 )

Change subject: Remove AccountAudit
..


Remove AccountAudit

Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
(cherry picked from commit 37bb51af0f12309913f5dae8af0e27fce6219e6f)
---
M addWiki.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/addWiki.php b/addWiki.php
index bbd86be..9d12e41 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -100,7 +100,6 @@
$dbw->sourceFile( 
"$IP/extensions/TimedMediaHandler/TimedMediaHandler.sql" );
$dbw->sourceFile( 
"$IP/maintenance/archives/patch-filejournal.sql" );
$dbw->sourceFile( 
"$IP/extensions/GeoData/sql/externally-backed.sql" ); // Not actually enabled 
everywhere, but this is easier
-   $dbw->sourceFile( 
"$IP/extensions/AccountAudit/accountaudit.sql" );
$dbw->sourceFile( 
"$IP/extensions/BetaFeatures/sql/create_counts.sql" );
$dbw->sourceFile( "$IP/extensions/SecurePoll/SecurePoll.sql" );
$dbw->sourceFile( "$IP/extensions/Linter/linter.sql" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.30.0-wmf.5
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...dashboard[master]: Deploy

2017-06-14 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359069 )

Change subject: Deploy
..

Deploy

Change-Id: I85e53dd258a8ab14ad9a5009f9e1704c00709001
---
M shiny-server/external
M shiny-server/metrics
M shiny-server/portal
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/69/359069/1

diff --git a/shiny-server/external b/shiny-server/external
index a9627fc..c245f79 16
--- a/shiny-server/external
+++ b/shiny-server/external
@@ -1 +1 @@
-Subproject commit a9627fc557d9671b5fae9d9b62fc64e8b372998d
+Subproject commit c245f7958e1300b0cf48d9c30e627679a663bd72
diff --git a/shiny-server/metrics b/shiny-server/metrics
index 494ea7b..a831a38 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
@@ -1 +1 @@
-Subproject commit 494ea7b1fe2c4e30f80191fe34865adbdf4c
+Subproject commit a831a3805bbb905f6745ca9cc5b4c3c2bf573856
diff --git a/shiny-server/portal b/shiny-server/portal
index fa78f60..5b3a67d 16
--- a/shiny-server/portal
+++ b/shiny-server/portal
@@ -1 +1 @@
-Subproject commit fa78f60f4734432e4fd3c5f8e61803f5a870a024
+Subproject commit 5b3a67de6ad43d89ea7e06a20b58da76d128e5d4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85e53dd258a8ab14ad9a5009f9e1704c00709001
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[wmf/1.30.0-wmf.5]: Remove AccountAudit

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359068 )

Change subject: Remove AccountAudit
..

Remove AccountAudit

Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
(cherry picked from commit 37bb51af0f12309913f5dae8af0e27fce6219e6f)
---
M addWiki.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/68/359068/1

diff --git a/addWiki.php b/addWiki.php
index bbd86be..9d12e41 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -100,7 +100,6 @@
$dbw->sourceFile( 
"$IP/extensions/TimedMediaHandler/TimedMediaHandler.sql" );
$dbw->sourceFile( 
"$IP/maintenance/archives/patch-filejournal.sql" );
$dbw->sourceFile( 
"$IP/extensions/GeoData/sql/externally-backed.sql" ); // Not actually enabled 
everywhere, but this is easier
-   $dbw->sourceFile( 
"$IP/extensions/AccountAudit/accountaudit.sql" );
$dbw->sourceFile( 
"$IP/extensions/BetaFeatures/sql/create_counts.sql" );
$dbw->sourceFile( "$IP/extensions/SecurePoll/SecurePoll.sql" );
$dbw->sourceFile( "$IP/extensions/Linter/linter.sql" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.30.0-wmf.5
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]: Revert "ChangesList: Expose basic properties of lines as dat...

2017-06-14 Thread Catrope (Code Review)

Hello Daniel Kinzler, Gergő Tisza, Mattflaschen, Addshore, Legoktm, 20after4, 
jenkins-bot, Thiemo Mättig (WMDE), Jforrester, Ladsgroup, Sbisson, Brion 
VIBBER, Anomie, Mooeypoo,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "ChangesList: Expose basic properties of lines as data 
attributes"
..

Revert "ChangesList: Expose basic properties of lines as data attributes"

This is breaking watchlist highlighting in production.
Only reverting it in wmf5 for now, not in master yet.

This reverts commit 016452cd09f4b32100f4fa3740168c5fc161d496.

Bug: T167922
Change-Id: I308a60a4664e313bc26fa4d186344827a3238391
---
M RELEASE-NOTES-1.30
M docs/hooks.txt
M includes/GlobalFunctions.php
M includes/Sanitizer.php
M includes/actions/HistoryAction.php
M includes/changes/ChangesList.php
M includes/changes/EnhancedChangesList.php
M includes/changes/OldChangesList.php
M includes/logging/LogEventsList.php
M includes/specials/SpecialNewpages.php
M includes/specials/pagers/ContribsPager.php
M includes/specials/pagers/DeletedContribsPager.php
M includes/templates/EnhancedChangesListGroup.mustache
D tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
M tests/phpunit/includes/SanitizerTest.php
M tests/phpunit/includes/changes/EnhancedChangesListTest.php
M tests/phpunit/includes/changes/OldChangesListTest.php
17 files changed, 32 insertions(+), 262 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/359067/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index cd800da..343c296 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -99,13 +99,6 @@
   or wikilinks.
 * (T163966) Page moves are now counted as edits for the purposes of
   autopromotion, i.e., they increment the user_editcount field in the database.
-* Two new hooks, LogEventsListLineEnding and NewPagesLineEnding were added for
-  manipulating Special:Log and Special:NewPages lines.
-* The OldChangesListRecentChangesLine, EnhancedChangesListModifyLineData,
-  PageHistoryLineEnding, ContributionsLineEnding and 
DeletedContributionsLineEnding
-  hooks have an additional parameter, for manipulating HTML data attributes of
-  RC/history lines. EnhancedChangesListModifyBlockLineData can do that via the
-  $data['attribs'] subarray.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 3d310c3..0e8b508 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1155,9 +1155,6 @@
 &$ret: the HTML line
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'ContributionsToolLinks': Change tool links above Special:Contributions
 $id: User identifier
@@ -1203,9 +1200,6 @@
 &$ret: the HTML line
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'DifferenceEngineAfterLoadNewText': called in DifferenceEngine::loadNewText()
 after the new revision's content has been loaded into the class member variable
@@ -1518,9 +1512,6 @@
 $block: An array of RecentChange objects in that block
 $rc: The RecentChange object for this line
 &$classes: An array of classes to change
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
 
 'EnhancedChangesListModifyBlockLineData': to alter data used to build
 a non-grouped recent change line in EnhancedChangesList.
@@ -2008,16 +1999,6 @@
 &$attribs: the attributes to be applied
 &$ret: the value to return if your hook returns false
 
-'LogEventsListLineEnding': Called before a Special:Log line is finished
-$page: the LogEventsList object
-&$ret: the HTML line
-$entry: the DatabaseLogEntry object for this row
-&$classes: the classes to add to the surrounding 
-&$attribs: associative array of other HTML attributes for the  element.
-  Currently only data attributes reserved to MediaWiki are allowed
-  (see Sanitizer::isReservedDataAttribute).
-
-
 'HtmlPageLinkRendererBegin':
 Used when generating internal and interwiki links in
 LinkRenderer, before processing starts.  Return false to skip default
@@ -2303,16 +2284,6 @@
 $old: the ?old= param value from the url
 $new: the ?new= param value from the url
 
-'NewPagesLineEnding': Called before a NewPages line is finished.
-$page: the SpecialNewPages object
-&$ret: the HTML line
-$row: the database row for this page (the

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add atjwiki meta namespace talk

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359066 )

Change subject: Add atjwiki meta namespace talk
..


Add atjwiki meta namespace talk

Bug: T167714
Change-Id: Iced62eaf0591488d5a7dcd5951c2c4329f4c1ad7
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 21a33f5..6e3e648 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2753,6 +2753,7 @@
'arwikiversity' => 'نقاش_ويكي_الجامعة',
'aswiki' => 'ৱিকিপিডিয়া_বাৰ্তা',
'aswikisource' => 'ৱিকিউ স_বাৰ্তা', // T45129
+   'atjwiki' => 'Ke_ici_aimihitonaniwok_Wikipetcia', // T167714
'aywiki' => 'Wikipidiyan_Aruskipäwi',
'azbwiki' => 'ویکی‌پدیا_دانیشیغی', // T106305
'bat_smgwiki' => 'Vikipedėjės_aptarėms',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iced62eaf0591488d5a7dcd5951c2c4329f4c1ad7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
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]: Add atjwiki meta namespace talk

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359066 )

Change subject: Add atjwiki meta namespace talk
..

Add atjwiki meta namespace talk

Bug: T167714
Change-Id: Iced62eaf0591488d5a7dcd5951c2c4329f4c1ad7
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 21a33f5..6e3e648 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2753,6 +2753,7 @@
'arwikiversity' => 'نقاش_ويكي_الجامعة',
'aswiki' => 'ৱিকিপিডিয়া_বাৰ্তা',
'aswikisource' => 'ৱিকিউ স_বাৰ্তা', // T45129
+   'atjwiki' => 'Ke_ici_aimihitonaniwok_Wikipetcia', // T167714
'aywiki' => 'Wikipidiyan_Aruskipäwi',
'azbwiki' => 'ویکی‌پدیا_دانیشیغی', // T106305
'bat_smgwiki' => 'Vikipedėjės_aptarėms',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iced62eaf0591488d5a7dcd5951c2c4329f4c1ad7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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...PrivateDomains[master]: Version 1.6.0: show the customized error page to anons on ac...

2017-06-14 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359065 )

Change subject: Version 1.6.0: show the customized error page to anons on 
action=edit
..

Version 1.6.0: show the customized error page to anons on action=edit

Change-Id: If13c2997343879e4ec207b943766fe3f1a510365
---
M PrivateDomainsHooks.php
M extension.json
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PrivateDomains 
refs/changes/65/359065/1

diff --git a/PrivateDomainsHooks.php b/PrivateDomainsHooks.php
index 7978536..0ec8296 100644
--- a/PrivateDomainsHooks.php
+++ b/PrivateDomainsHooks.php
@@ -17,6 +17,7 @@
global $wgUser;
$groups = $wgUser->getEffectiveGroups();
if (
+   $wgUser->isAnon() ||
$wgUser->isLoggedIn() && !in_array( 'privatedomains', 
$groups ) &&
!in_array( 'staff', $groups ) && !in_array( 
'bureaucrat', $groups )
)
diff --git a/extension.json b/extension.json
index d2ec519..0df24b9 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PrivateDomains",
-   "version": "1.5.0",
+   "version": "1.6.0",
"author": [
"Inez Korczyński",
"Jack Phoenix"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If13c2997343879e4ec207b943766fe3f1a510365
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PrivateDomains
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Add atjwiki

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359061 )

Change subject: Add atjwiki
..


Add atjwiki

Bug: T167714
Change-Id: I957ae57686185f7e39ee0b6cbfe8b983543fb04d
---
M lib/config/sitematrix.json
1 file changed, 294 insertions(+), 281 deletions(-)

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



diff --git a/lib/config/sitematrix.json b/lib/config/sitematrix.json
index e583a3c..60cd824 100644
--- a/lib/config/sitematrix.json
+++ b/lib/config/sitematrix.json
@@ -393,6 +393,19 @@
"localname": "Asturian"
},
"15": {
+   "code": "atj",
+   "name": "Atikamekw",
+   "site": [
+   {
+   "url": "https://atj.wikipedia.org;,
+   "dbname": "atjwiki",
+   "code": "wiki",
+   "sitename": "Wikipetcia"
+   }
+   ],
+   "localname": "Atikamekw"
+   },
+   "16": {
"code": "av",
"name": "авар",
"site": [
@@ -412,7 +425,7 @@
],
"localname": "Avaric"
},
-   "16": {
+   "17": {
"code": "ay",
"name": "Aymar aru",
"site": [
@@ -438,7 +451,7 @@
],
"localname": "Aymara"
},
-   "17": {
+   "18": {
"code": "az",
"name": "azərbaycanca",
"site": [
@@ -475,7 +488,7 @@
],
"localname": "Azerbaijani"
},
-   "18": {
+   "19": {
"code": "azb",
"name": "تۆرکجه",
"site": [
@@ -488,7 +501,7 @@
],
"localname": "تۆرکجه"
},
-   "19": {
+   "20": {
"code": "ba",
"name": "башҡортса",
"site": [
@@ -508,7 +521,7 @@
],
"localname": "Bashkir"
},
-   "20": {
+   "21": {
"code": "bar",
"name": "Boarisch",
"site": [
@@ -521,7 +534,7 @@
],
"localname": "Bavarian"
},
-   "21": {
+   "22": {
"code": "bat-smg",
"name": "žemaitėška",
"site": [
@@ -534,7 +547,7 @@
],
"localname": "Samogitian"
},
-   "22": {
+   "23": {
"code": "bcl",
"name": "Bikol Central",
"site": [
@@ -547,7 +560,7 @@
],
"localname": "Bikol Central"
},
-   "23": {
+   "24": {
"code": "be",
"name": "беларуская",
"site": [
@@ -584,7 +597,7 @@
],
"localname": "Belarusian"
},
-   "24": {
+   "25": {
"code": "be-x-old",
"name": "беларуская (тарашкевіца)‎",
"site": [
@@ -597,7 +610,7 @@
],
"localname": "беларуская (тарашкевіца)‎"
},
-   "25": {
+   "26": {
"code": "bg",
"name": "български",
"site": [
@@ -640,7 +653,7 @@
],
"localname": "Bulgarian"
},
-   "26": {
+   "27": {
"code": "bh",
"name": "भोजपुरी",
"site": [
@@ -660,7 +673,7 @@
],
"localname": "भोजपुरी"
},
-   "27": {
+   "28": {
"code": "bi",
"name": "Bislama",
"site": [
@@ -687,7 +700,7 @@
],
"localname": "Bislama"
},
-   "28": {
+   "29": {
"code": "bjn",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labspuppetbackend: Set port 8100 to read-only and 8101 read...

2017-06-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359064 )

Change subject: labspuppetbackend:  Set port 8100 to read-only and 8101 
read/write
..


labspuppetbackend:  Set port 8100 to read-only and 8101 read/write

This should keep all those self-hosted puppetmasters happy without
us having to change them all one by one.

Change-Id: I11eed2ce5e1648f1038cc02318c5bf7363d5908c
---
M modules/labspuppetbackend/files/labspuppetbackendgetter.conf
M modules/labspuppetbackend/manifests/init.pp
M modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
M modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
M modules/openstack/templates/mitaka/horizon/local_settings.py.erb
M modules/role/manifests/labs/puppetmaster.pp
7 files changed, 14 insertions(+), 14 deletions(-)

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



diff --git a/modules/labspuppetbackend/files/labspuppetbackendgetter.conf 
b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
index d3d0132..f77a7dc 100644
--- a/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
+++ b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
@@ -1,9 +1,9 @@
 server {
-listen 8101;
+listen 8100;
 
 # Wrap the normal API but only allow GETs.
 location / {
-proxy_pass http://127.0.0.1:8100;
+proxy_pass http://127.0.0.1:8101;
 
 limit_except GET {
 deny all;
diff --git a/modules/labspuppetbackend/manifests/init.pp 
b/modules/labspuppetbackend/manifests/init.pp
index 9616f00..a89c002 100644
--- a/modules/labspuppetbackend/manifests/init.pp
+++ b/modules/labspuppetbackend/manifests/init.pp
@@ -27,7 +27,7 @@
 'wsgi-file' => 
'/usr/local/lib/python3.4/dist-packages/labspuppetbackend.py',
 callable=> 'app',
 master  => true,
-http-socket => '0.0.0.0:8100',
+http-socket => '0.0.0.0:8101',
 env => [
 "MYSQL_HOST=${mysql_host}",
 "MYSQL_DB=${mysql_db}",
@@ -51,7 +51,7 @@
 subscribe => 
File['/usr/local/lib/python3.4/dist-packages/labspuppetbackend.py'],
 }
 
-# This is a GET-only front end that sits on port 8101.  We can
+# This is a GET-only front end that sits on port 8100.  We can
 #  open this up to the public even though the actual API has no
 #  auth protections.
 nginx::site { 'labspuppetbackendgetter':
diff --git a/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py 
b/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
index 1565e93..7e2c5ca 100644
--- a/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
+++ b/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
@@ -33,7 +33,7 @@
 self.tenant_id = tenant_id
 self.apiurl = getattr(settings,
   "PUPPET_CONFIG_BACKEND",
-  "http://labcontrol1001.wikimedia.org:8100/v1;
+  "http://labcontrol1001.wikimedia.org:8101/v1;
   )
 self.refresh()
 
@@ -189,7 +189,7 @@
 def delete_prefix(tenant_id, prefix):
 apiurl = getattr(settings,
  "PUPPET_CONFIG_BACKEND",
- "http://labcontrol1001.wikimedia.org:8100/v1;)
+ "http://labcontrol1001.wikimedia.org:8101/v1;)
 prefixurl = "%s/%s/prefix/%s" % (apiurl, tenant_id, prefix)
 req = requests.delete(prefixurl, verify=False)
 req.raise_for_status()
@@ -198,7 +198,7 @@
 def get_prefixes(tenant_id):
 apiurl = getattr(settings,
  "PUPPET_CONFIG_BACKEND",
- "http://labcontrol1001.wikimedia.org:8100/v1;)
+ "http://labcontrol1001.wikimedia.org:8101/v1;)
 prefixurl = "%s/%s/prefix" % (apiurl, tenant_id)
 req = requests.get(prefixurl, verify=False)
 if req.status_code == 404:
diff --git a/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py 
b/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
index 1565e93..7e2c5ca 100644
--- a/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
+++ b/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
@@ -33,7 +33,7 @@
 self.tenant_id = tenant_id
 self.apiurl = getattr(settings,
   "PUPPET_CONFIG_BACKEND",
-  "http://labcontrol1001.wikimedia.org:8100/v1;
+  "http://labcontrol1001.wikimedia.org:8101/v1;
   )
 self.refresh()
 
@@ -189,7 +189,7

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labspuppetbackend: Set port 8100 to read-only and 8101 read...

2017-06-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359064 )

Change subject: labspuppetbackend:  Set port 8100 to read-only and 8101 
read/write
..

labspuppetbackend:  Set port 8100 to read-only and 8101 read/write

This should keep all those self-hosted puppetmasters happy without
us having to change them all one by one.

Change-Id: I11eed2ce5e1648f1038cc02318c5bf7363d5908c
---
M modules/labspuppetbackend/files/labspuppetbackendgetter.conf
M modules/labspuppetbackend/manifests/init.pp
M modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
M modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
M modules/openstack/templates/mitaka/horizon/local_settings.py.erb
M modules/role/manifests/labs/puppetmaster.pp
7 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/359064/1

diff --git a/modules/labspuppetbackend/files/labspuppetbackendgetter.conf 
b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
index d3d0132..f77a7dc 100644
--- a/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
+++ b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
@@ -1,9 +1,9 @@
 server {
-listen 8101;
+listen 8100;
 
 # Wrap the normal API but only allow GETs.
 location / {
-proxy_pass http://127.0.0.1:8100;
+proxy_pass http://127.0.0.1:8101;
 
 limit_except GET {
 deny all;
diff --git a/modules/labspuppetbackend/manifests/init.pp 
b/modules/labspuppetbackend/manifests/init.pp
index 9616f00..a89c002 100644
--- a/modules/labspuppetbackend/manifests/init.pp
+++ b/modules/labspuppetbackend/manifests/init.pp
@@ -27,7 +27,7 @@
 'wsgi-file' => 
'/usr/local/lib/python3.4/dist-packages/labspuppetbackend.py',
 callable=> 'app',
 master  => true,
-http-socket => '0.0.0.0:8100',
+http-socket => '0.0.0.0:8101',
 env => [
 "MYSQL_HOST=${mysql_host}",
 "MYSQL_DB=${mysql_db}",
@@ -51,7 +51,7 @@
 subscribe => 
File['/usr/local/lib/python3.4/dist-packages/labspuppetbackend.py'],
 }
 
-# This is a GET-only front end that sits on port 8101.  We can
+# This is a GET-only front end that sits on port 8100.  We can
 #  open this up to the public even though the actual API has no
 #  auth protections.
 nginx::site { 'labspuppetbackendgetter':
diff --git a/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py 
b/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
index 1565e93..7e2c5ca 100644
--- a/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
+++ b/modules/openstack/files/liberty/horizon/puppettab/puppet_config.py
@@ -33,7 +33,7 @@
 self.tenant_id = tenant_id
 self.apiurl = getattr(settings,
   "PUPPET_CONFIG_BACKEND",
-  "http://labcontrol1001.wikimedia.org:8100/v1;
+  "http://labcontrol1001.wikimedia.org:8101/v1;
   )
 self.refresh()
 
@@ -189,7 +189,7 @@
 def delete_prefix(tenant_id, prefix):
 apiurl = getattr(settings,
  "PUPPET_CONFIG_BACKEND",
- "http://labcontrol1001.wikimedia.org:8100/v1;)
+ "http://labcontrol1001.wikimedia.org:8101/v1;)
 prefixurl = "%s/%s/prefix/%s" % (apiurl, tenant_id, prefix)
 req = requests.delete(prefixurl, verify=False)
 req.raise_for_status()
@@ -198,7 +198,7 @@
 def get_prefixes(tenant_id):
 apiurl = getattr(settings,
  "PUPPET_CONFIG_BACKEND",
- "http://labcontrol1001.wikimedia.org:8100/v1;)
+ "http://labcontrol1001.wikimedia.org:8101/v1;)
 prefixurl = "%s/%s/prefix" % (apiurl, tenant_id)
 req = requests.get(prefixurl, verify=False)
 if req.status_code == 404:
diff --git a/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py 
b/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
index 1565e93..7e2c5ca 100644
--- a/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
+++ b/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
@@ -33,7 +33,7 @@
 self.tenant_id = tenant_id
 self.apiurl = getattr(settings,
   "PUPPET_CONFIG_BACKEND",
-  "http://labcontrol1001.wikimedia.org:8100/v1;
+  "http://labcontrol1001.wikimedia.org:8101/v1;
   )
 self.refresh()
 
@@ -189,7 +189,7

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Add atj

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359063 )

Change subject: Add atj
..

Add atj

Bug: T167720
Change-Id: I5ee28c215e59eb5e4c88f3da614418f707266f8e
---
M registry.wikimedia.yaml
M registry.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/63/359063/2

diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml
index e263cf9..3f15b84 100644
--- a/registry.wikimedia.yaml
+++ b/registry.wikimedia.yaml
@@ -12,6 +12,7 @@
   - arz
   - ast
   - as
+  - atj
   - av
   - ay
   - az
diff --git a/registry.yaml b/registry.yaml
index 889433a..cf5c363 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -12,6 +12,7 @@
   - arz
   - ast
   - as
+  - atj
   - av
   - ay
   - az

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ee28c215e59eb5e4c88f3da614418f707266f8e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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/refinery[master]: Add atjwiki

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359062 )

Change subject: Add atjwiki
..

Add atjwiki

Bug: T167720
Change-Id: I888cf3dd4729768795f4904dd6f2a5c3b4903fe9
---
M static_data/pageview/whitelist/whitelist.tsv
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/62/359062/2

diff --git a/static_data/pageview/whitelist/whitelist.tsv 
b/static_data/pageview/whitelist/whitelist.tsv
index d686d74..3ee0760 100644
--- a/static_data/pageview/whitelist/whitelist.tsv
+++ b/static_data/pageview/whitelist/whitelist.tsv
@@ -44,6 +44,7 @@
 projectas.wikipedia2015-10-12 00:00:00
 projectas.wikisource   2015-10-12 00:00:00
 projectas.wiktionary   2015-10-12 00:00:00
+projectatj.wikipedia   2017-05-14 00:00:00
 projectav.wikipedia2015-10-12 00:00:00
 projectav.wiktionary   2015-10-12 00:00:00
 projectay.wikibooks2015-10-12 00:00:00

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I888cf3dd4729768795f4904dd6f2a5c3b4903fe9
Gerrit-PatchSet: 2
Gerrit-Project: analytics/refinery
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...parsoid[master]: Add atjwiki

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359061 )

Change subject: Add atjwiki
..

Add atjwiki

Bug: T167714
Change-Id: I957ae57686185f7e39ee0b6cbfe8b983543fb04d
---
M lib/config/sitematrix.json
1 file changed, 294 insertions(+), 281 deletions(-)


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

diff --git a/lib/config/sitematrix.json b/lib/config/sitematrix.json
index e583a3c..60cd824 100644
--- a/lib/config/sitematrix.json
+++ b/lib/config/sitematrix.json
@@ -393,6 +393,19 @@
"localname": "Asturian"
},
"15": {
+   "code": "atj",
+   "name": "Atikamekw",
+   "site": [
+   {
+   "url": "https://atj.wikipedia.org;,
+   "dbname": "atjwiki",
+   "code": "wiki",
+   "sitename": "Wikipetcia"
+   }
+   ],
+   "localname": "Atikamekw"
+   },
+   "16": {
"code": "av",
"name": "авар",
"site": [
@@ -412,7 +425,7 @@
],
"localname": "Avaric"
},
-   "16": {
+   "17": {
"code": "ay",
"name": "Aymar aru",
"site": [
@@ -438,7 +451,7 @@
],
"localname": "Aymara"
},
-   "17": {
+   "18": {
"code": "az",
"name": "azərbaycanca",
"site": [
@@ -475,7 +488,7 @@
],
"localname": "Azerbaijani"
},
-   "18": {
+   "19": {
"code": "azb",
"name": "تۆرکجه",
"site": [
@@ -488,7 +501,7 @@
],
"localname": "تۆرکجه"
},
-   "19": {
+   "20": {
"code": "ba",
"name": "башҡортса",
"site": [
@@ -508,7 +521,7 @@
],
"localname": "Bashkir"
},
-   "20": {
+   "21": {
"code": "bar",
"name": "Boarisch",
"site": [
@@ -521,7 +534,7 @@
],
"localname": "Bavarian"
},
-   "21": {
+   "22": {
"code": "bat-smg",
"name": "žemaitėška",
"site": [
@@ -534,7 +547,7 @@
],
"localname": "Samogitian"
},
-   "22": {
+   "23": {
"code": "bcl",
"name": "Bikol Central",
"site": [
@@ -547,7 +560,7 @@
],
"localname": "Bikol Central"
},
-   "23": {
+   "24": {
"code": "be",
"name": "беларуская",
"site": [
@@ -584,7 +597,7 @@
],
"localname": "Belarusian"
},
-   "24": {
+   "25": {
"code": "be-x-old",
"name": "беларуская (тарашкевіца)‎",
"site": [
@@ -597,7 +610,7 @@
],
"localname": "беларуская (тарашкевіца)‎"
},
-   "25": {
+   "26": {
"code": "bg",
"name": "български",
"site": [
@@ -640,7 +653,7 @@
],
"localname": "Bulgarian"
},
-   "26": {
+   "27": {
"code": "bh",
"name": "भोजपुरी",
"site": [
@@ -660,7 +673,7 @@
],
"localname": "भोजपुरी"
},
-   "27": {
+   "28": {
"code": "bi",
"name": "Bislama",
"site": [
@@ -687,7 +700,7 @@
],
"localname": "Bislama"
},
-   "28": {
+   "29": {
"code":

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Tests for diffs

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359060 )

Change subject: Tests for diffs
..

Tests for diffs

Bug: T154227
Change-Id: I5de74baac742c01a53b492c1aa904943114a8a55
---
M tests/phpunit/specials/SpecialMobileDiffTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/60/359060/1

diff --git a/tests/phpunit/specials/SpecialMobileDiffTest.php 
b/tests/phpunit/specials/SpecialMobileDiffTest.php
index cb9f39c..3522ac8 100644
--- a/tests/phpunit/specials/SpecialMobileDiffTest.php
+++ b/tests/phpunit/specials/SpecialMobileDiffTest.php
@@ -70,6 +70,9 @@
// this makes no sense but this is the url for newly 
created pages (oldid but no diff)
[ [ 'oldid' => 5 ], 'Special:MobileDiff/5' ],
[ [ 'diff' => 123 ], 'Special:MobileDiff/123' ],
+   // T154227
+   [ [ 'diff' => 14286854, 'oldid' => 14265839 ], 
'Special:MobileDiff/14265839...14286854' ],
+   [ [ 'diff' => 164584307, 'title' => 'Page title' ], 
'Special:MobileDiff/164584307' ]
// some more complicated cases...
[ [ 'oldid' => 90, 'diff' => 100 ], 
'Special:MobileDiff/90...100' ],
[ [ 'oldid' => 123, 'diff' => 'next' ], 
'Special:MobileDiff/123...124' ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5de74baac742c01a53b492c1aa904943114a8a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labspuppetbackend: Add an alternative read-only port for qu...

2017-06-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359057 )

Change subject: labspuppetbackend:  Add an alternative read-only port for 
queries
..


labspuppetbackend:  Add an alternative read-only port for queries

Change-Id: I13861fae4874ad205e35b028326a2c12433f573f
---
A modules/labspuppetbackend/files/labspuppetbackendgetter.conf
M modules/labspuppetbackend/manifests/init.pp
M modules/role/manifests/labs/puppetmaster.pp
3 files changed, 23 insertions(+), 1 deletion(-)

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



diff --git a/modules/labspuppetbackend/files/labspuppetbackendgetter.conf 
b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
new file mode 100644
index 000..d3d0132
--- /dev/null
+++ b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
@@ -0,0 +1,12 @@
+server {
+listen 8101;
+
+# Wrap the normal API but only allow GETs.
+location / {
+proxy_pass http://127.0.0.1:8100;
+
+limit_except GET {
+deny all;
+}
+}
+}
diff --git a/modules/labspuppetbackend/manifests/init.pp 
b/modules/labspuppetbackend/manifests/init.pp
index 510918c..9616f00 100644
--- a/modules/labspuppetbackend/manifests/init.pp
+++ b/modules/labspuppetbackend/manifests/init.pp
@@ -50,4 +50,11 @@
 },
 subscribe => 
File['/usr/local/lib/python3.4/dist-packages/labspuppetbackend.py'],
 }
+
+# This is a GET-only front end that sits on port 8101.  We can
+#  open this up to the public even though the actual API has no
+#  auth protections.
+nginx::site { 'labspuppetbackendgetter':
+source => 
'puppet:///modules/labspuppetbackend/labspuppetbackendgetter.conf',
+}
 }
diff --git a/modules/role/manifests/labs/puppetmaster.pp 
b/modules/role/manifests/labs/puppetmaster.pp
index 070250f..ac8d76d 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -45,7 +45,10 @@
 rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
 },
 puppetbackend => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
+},
+puppetbackendgetter => {
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8101 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13861fae4874ad205e35b028326a2c12433f573f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
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...MobileFrontend[master]: Hygiene: Only use what you need

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359059 )

Change subject: Hygiene: Only use what you need
..

Hygiene: Only use what you need

Don't import files unless they are used.
Note, CI will complain if a variable is not available.

Change-Id: I7cbdec09b5aa78427d52f643663c42def17c577a
---
M resources/mobile.ajax.styles/spinner.less
M resources/mobile.backtotop/backtotop.less
M resources/mobile.categories.overlays/categories.less
M resources/mobile.editor.common/editor.less
M resources/mobile.editor.ve/VisualEditorOverlay.less
M resources/mobile.gallery/gallery.less
M resources/mobile.issues/issues.less
M resources/mobile.languages.structured/LanguageOverlay.less
M resources/mobile.mediaViewer/mediaViewer.less
M resources/mobile.messageBox.styles/messageBox.less
M resources/mobile.notifications.filter.overlay/NotificationsFilterOverlay.less
M resources/mobile.notifications.overlay/NotificationsOverlay.less
M resources/mobile.pagelist.styles/pagelist.less
M resources/mobile.pagesummary.styles/pagesummary.less
M resources/mobile.references/references.less
M resources/mobile.search/SearchOverlay.less
M resources/mobile.special.mobilediff.styles/mobilediff.less
M resources/mobile.special.mobileoptions.styles/mobileoptions.less
M resources/mobile.special.nearby.styles/specialNearby.less
M resources/mobile.special.pagefeed.styles/pagefeed.less
M resources/mobile.startup/Overlay.less
M resources/mobile.startup/drawer.less
M resources/mobile.startup/panel.less
M resources/mobile.toc/toc.less
M resources/mobile.watchstar/watchstar.less
M resources/skins.minerva.base.styles/images.less
26 files changed, 34 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/59/359059/1

diff --git a/resources/mobile.ajax.styles/spinner.less 
b/resources/mobile.ajax.styles/spinner.less
index a4d5297..57aba9f 100644
--- a/resources/mobile.ajax.styles/spinner.less
+++ b/resources/mobile.ajax.styles/spinner.less
@@ -1,5 +1,3 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
 @import 'mediawiki.mixins.less';
 
 // FIXME: Standardise on a loading class (update ConfirmEdit extension)
diff --git a/resources/mobile.backtotop/backtotop.less 
b/resources/mobile.backtotop/backtotop.less
index 49537bb..8978469 100644
--- a/resources/mobile.backtotop/backtotop.less
+++ b/resources/mobile.backtotop/backtotop.less
@@ -1,5 +1,5 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
+@import 'mobile.variables';
+@import 'mediawiki.mixins.less';
 
 .backtotop {
/* initially hide the element */
diff --git a/resources/mobile.categories.overlays/categories.less 
b/resources/mobile.categories.overlays/categories.less
index 0e8c6f7..d0225b7 100644
--- a/resources/mobile.categories.overlays/categories.less
+++ b/resources/mobile.categories.overlays/categories.less
@@ -1,5 +1,4 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
+@import 'mediawiki.ui/variables';
 
 .category-suggestions {
button {
diff --git a/resources/mobile.editor.common/editor.less 
b/resources/mobile.editor.common/editor.less
index e1c39f4..5b897b2 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -1,5 +1,5 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
+@import 'mobile.variables';
+@import 'mediawiki.mixins.less';
 
 .editor-overlay {
.box-sizing( border-box );
diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.less 
b/resources/mobile.editor.ve/VisualEditorOverlay.less
index 301979f..4d97435 100644
--- a/resources/mobile.editor.ve/VisualEditorOverlay.less
+++ b/resources/mobile.editor.ve/VisualEditorOverlay.less
@@ -1,5 +1,5 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
+@import 'mobile.variables';
+@import 'mediawiki.mixins.less';
 
 .editor-overlay-ve {
.content {
diff --git a/resources/mobile.gallery/gallery.less 
b/resources/mobile.gallery/gallery.less
index 78083d0..c4445a4 100644
--- a/resources/mobile.gallery/gallery.less
+++ b/resources/mobile.gallery/gallery.less
@@ -1,5 +1,4 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
+@import 'mobile.variables';
 
 .image-list {
margin: 20px @contentMargin 0;
diff --git a/resources/mobile.issues/issues.less 
b/resources/mobile.issues/issues.less
index d7013d3..6779eff 100644
--- a/resources/mobile.issues/issues.less
+++ b/resources/mobile.issues/issues.less
@@ -1,6 +1,4 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
-@import 'mediawiki.mixins';
+@import 'mobile.variables';
 
 @smallIconSize: 24px;
 @largeIconSize: 50px;
diff --git a/resources/mobile.languages.structured/LanguageOverlay.less 
b/resources/mobile.languages.structured/LanguageOverlay.less
index ad93305..1625cb1 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.less
+++

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Introduce mobile.variables

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359058 )

Change subject: Hygiene: Introduce mobile.variables
..

Hygiene: Introduce mobile.variables

This will allow us to determine which variables to upstream  into core
and which belong explicitly to Minerva.

Changes:
* Remove unused m-background-image mixin (thanks Baha!)

Change-Id: I612cc2f95f52b249a4ed02a69aca3d9cf6216bb1
---
M includes/Minerva.hooks.php
M includes/MobileFrontend.hooks.php
M minerva.less/minerva.mixins.less
M minerva.less/minerva.variables.less
A mobile.less/mobile.mixins.less
A mobile.less/mobile.variables.less
6 files changed, 64 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/58/359058/1

diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index 7083002..ab4899e 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -31,6 +31,19 @@
}
 
/**
+* Skin registration callback.
+*/
+   public static function onRegistration() {
+   // Set LESS importpath
+   global $wgResourceLoaderLESSImportPaths;
+   $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/minerva.less/";
+
+   if ( !ExtensionRegistry::getInstance()->isLoaded( 
'MobileFrontend' ) ) {
+   die( 'This version of the MobileFrontend extension 
requires MediaWiki 1.25+' );
+   }
+   }
+
+   /**
 * ResourceLoaderTestModules hook handler
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules
 *
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 9c70e21..aea4b46 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1303,6 +1303,7 @@
 */
public static function onRegistration() {
global $wgResourceLoaderLESSImportPaths, $wgDisableAuthManager;
+   $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/mobile.less/";
 
// modify login/registration form
if ( class_exists( AuthManager::class ) && 
!$wgDisableAuthManager ) {
@@ -1312,8 +1313,9 @@
Hooks::register( 'UserCreateForm', 
'MobileFrontendHooks::onUserCreateForm' );
}
 
-   // Set LESS importpath
-   $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . 
"/minerva.less/";
+   if ( class_exists( 'MinervaHooks' ) ) {
+   MinervaHooks::onRegistration();
+   }
}
 
/**
diff --git a/minerva.less/minerva.mixins.less b/minerva.less/minerva.mixins.less
index 4e41da1..6d7c916 100644
--- a/minerva.less/minerva.mixins.less
+++ b/minerva.less/minerva.mixins.less
@@ -1,15 +1,4 @@
 @import 'mediawiki.mixins.less';
-@import 'mediawiki.mixins.animation.less';
-
-// FIXME: This mixin should not be necessary and only exists because of
-// https://phabricator.wikimedia.org/T142532
-// Please do not use it.
-.m-background-image( @url ) {
-   &:after,
-   &:before {
-   .background-image( @url );
-   }
-}
 
 // Generic mixin for applying styles to text that accompanies/adds context to 
workflows
 .secondary-text() {
diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index d39c222..a67bef7 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -1,4 +1,6 @@
 @import 'mediawiki.ui/variables';
+// FIXME: Remove this dependency. Should not depend on mobile.variables
+@import 'mobile.variables.less';
 
 @skinContentBgColor: #fff;
 
@@ -28,20 +30,11 @@
 @titleSectionSpacingTop: 20px;
 @titleSectionSpacingBottom: 25px;
 
-@grayDark: @colorGray2;
-@grayMediumDark: @colorGray5;
-@grayMedium: @colorGray7;
-@grayMediumLight: @colorGray10;
-@grayLight: @colorGray12;
-@grayLightest: @colorGray14;
-
 // colors
 @chromeColor: @grayLightest;
 @chromeContentSeparator: @colorGray13;
 @semiTransparent: rgba( 0, 0, 0, 0.8 );
-// note this is also used for red links
-@redBase: @colorErrorText;
-@colorTutorial: #2e76ff;
+
 @linkColor: #002bb8;
 @lastModifiedBarActiveBackgroundColor: #00af89;
 @toastNotificationColor: @colorGray2;
@@ -53,23 +46,17 @@
 @colorWarningBackground: #feb;
 @colorWarningBorder: #fde29b;
 @colorWarningText: #850;
-@colorSuccessBackground: #e1fddf;
 @colorSuccessBorder: #b7fdb5;
-@colorSuccessText: #009000;
 @colorErrorBackground: #fae3e3;
 @colorErrorBorder: #fac5c5;
 
 // typography
-@fontFamily: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 
'Liberation Sans', sans-serif;
 @fontFamilyHeading: 'Linux Libertine', 'Georgia', 'Times', serif;
 @fontScalingFactor: 1;
 @contentLineHeight: 1.65;
 
 @headingMargin: 0.5em;
 @sectionIconWidth: 30px;
-
-// information messages,

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labspuppetbackend: Add an alternative read-only port for qu...

2017-06-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359057 )

Change subject: labspuppetbackend:  Add an alternative read-only port for 
queries
..

labspuppetbackend:  Add an alternative read-only port for queries

Change-Id: I13861fae4874ad205e35b028326a2c12433f573f
---
A modules/labspuppetbackend/files/labspuppetbackendgetter.conf
M modules/labspuppetbackend/manifests/init.pp
M modules/role/manifests/labs/puppetmaster.pp
3 files changed, 23 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/359057/1

diff --git a/modules/labspuppetbackend/files/labspuppetbackendgetter.conf 
b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
new file mode 100644
index 000..d3d0132
--- /dev/null
+++ b/modules/labspuppetbackend/files/labspuppetbackendgetter.conf
@@ -0,0 +1,12 @@
+server {
+listen 8101;
+
+# Wrap the normal API but only allow GETs.
+location / {
+proxy_pass http://127.0.0.1:8100;
+
+limit_except GET {
+deny all;
+}
+}
+}
diff --git a/modules/labspuppetbackend/manifests/init.pp 
b/modules/labspuppetbackend/manifests/init.pp
index 510918c..9616f00 100644
--- a/modules/labspuppetbackend/manifests/init.pp
+++ b/modules/labspuppetbackend/manifests/init.pp
@@ -50,4 +50,11 @@
 },
 subscribe => 
File['/usr/local/lib/python3.4/dist-packages/labspuppetbackend.py'],
 }
+
+# This is a GET-only front end that sits on port 8101.  We can
+#  open this up to the public even though the actual API has no
+#  auth protections.
+nginx::site { 'labspuppetbackendgetter':
+source => 
'puppet:///modules/labspuppetbackend/labspuppetbackendgetter.conf',
+}
 }
diff --git a/modules/role/manifests/labs/puppetmaster.pp 
b/modules/role/manifests/labs/puppetmaster.pp
index 070250f..ac8d76d 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -45,7 +45,10 @@
 rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
 },
 puppetbackend => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
+},
+puppetbackendgetter => {
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8101 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Add generic deduplication mechanism to resource_change event.

2017-06-14 Thread Ppchelko (Code Review)

Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359056 )

Change subject: Add generic deduplication mechanism to resource_change event.
..

Add generic deduplication mechanism to resource_change event.

The JobQueue events will need a generic deduplication mechanism
based on the root job signature and timestamp. To prepare to that,
we need to switch our custom deduplication for the transclusion
related resource_change evens to the generic mechanism.

Change-Id: I631d6de252195eed2e9413286cb6c91ebe34234b
---
M jsonschema/resource_change/1.yaml
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas 
refs/changes/56/359056/1

diff --git a/jsonschema/resource_change/1.yaml 
b/jsonschema/resource_change/1.yaml
index 2f0ea25..d2dbeec 100644
--- a/jsonschema/resource_change/1.yaml
+++ b/jsonschema/resource_change/1.yaml
@@ -54,5 +54,15 @@
 description: >
   comma-separated list of event descriptions in `:` format,
   that represent a chain of events that caused this event to be emitted.
+
+  # Deduplication information
+  rootJobTimestamp:
+description: the timestamp of the root event that caused this event to be 
created
+type: string
+format: date-time
+
+  rootJobSignature:
+description: the unique signature of root event that caused this event to 
be created
+
 required:
   - meta

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I631d6de252195eed2e9413286cb6c91ebe34234b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
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] mediawiki/vendor[master]: Add Purtle library for RDF generation

2017-06-14 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359055 )

Change subject: Add Purtle library for RDF generation
..

Add Purtle library for RDF generation

Bug: T157676
Change-Id: I16d29c8f2a4f47ef3ddb4f6ace1790c549a72fe6
---
M composer.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/55/359055/1

diff --git a/composer.json b/composer.json
index 7671414..305abc4 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,7 @@
"wikimedia/html-formatter": "1.0.1",
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.3",
+"wikimedia/purtle": "~1.0",
"wikimedia/relpath": "1.0.3",
"wikimedia/running-stat": "1.1.0",
"wikimedia/textcat": "1.1.3",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16d29c8f2a4f47ef3ddb4f6ace1790c549a72fe6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update interwiki.php, at atkwiki

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359054 )

Change subject: Update interwiki.php, at atkwiki
..


Update interwiki.php, at atkwiki

Bug: T167714
Change-Id: Ib9edd5b2b8f15a7e2541e73f3b630d1e802d40c7
---
M wmf-config/interwiki.php
1 file changed, 40 insertions(+), 21 deletions(-)

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



diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index 71ec73f..131d601 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,14 +1,14 @@
  '0 
http://www.acronymfinder.com/af-query.asp?String=exact=$1',
+   '__global:acronym' => '0 https://www.acronymfinder.com/$1.html',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
'__global:advogato' => '0 http://www.advogato.org/$1',
-   '__global:aew' => '0 http://wiki.arabeyes.org/$1',
+   '__global:aew' => '0 https://wiki.arabeyes.org/$1',
'__global:appropedia' => '0 http://www.appropedia.org/$1',
'__global:aquariumwiki' => '0 http://www.theaquariumwiki.com/$1',
'__global:arborwiki' => '0 https://localwiki.org/ann-arbor/$1',
-   '__global:arxiv' => '0 http://arxiv.org/abs/$1',
+   '__global:arxiv' => '0 https://arxiv.org/abs/$1',
'__global:atmwiki' => '0 http://www.otterstedt.de/wiki/index.php/$1',
'__global:baden' => '0 http://www.stadtwiki-baden-baden.de/wiki/$1/',
'__global:battlestarwiki' => '0 http://en.battlestarwiki.org/wiki/$1',
@@ -92,7 +92,7 @@
'__global:foundation' => '1 https://wikimediafoundation.org/wiki/$1',
'__global:foxwiki' => '0 http://fox.wikis.com/wc.dll?Wiki~$1',
'__global:freebio' => '0 http://freebiology.org/wiki/$1',
-   '__global:freebsdman' => '0 
http://www.FreeBSD.org/cgi/man.cgi?apropos=1=$1',
+   '__global:freebsdman' => '0 
https://www.FreeBSD.org/cgi/man.cgi?apropos=1=$1',
'__global:freeculturewiki' => '0 
http://wiki.freeculture.org/index.php/$1',
'__global:freedomdefined' => '0 http://freedomdefined.org/$1',
'__global:freefeel' => '0 http://freefeel.org/wiki/$1',
@@ -188,10 +188,10 @@
'__global:mozillazinekb' => '0 http://kb.mozillazine.org/$1',
'__global:musicbrainz' => '0 http://musicbrainz.org/doc/$1',
'__global:mediawikiwiki' => '1 https://www.mediawiki.org/wiki/$1',
-   '__global:mwod' => '0 
http://www.merriam-webster.com/cgi-bin/dictionary?book=Dictionary=$1',
-   '__global:mwot' => '0 
http://www.merriam-webster.com/cgi-bin/thesaurus?book=Thesaurus=$1',
+   '__global:mwod' => '0 https://www.merriam-webster.com/dictionary/$1',
+   '__global:mwot' => '0 https://www.merriam-webster.com/thesaurus/$1',
'__global:nkcells' => '0 http://www.nkcells.info/index.php?title=$1',
-   '__global:nara' => '0 http://research.archives.gov/description/$1',
+   '__global:nara' => '0 https://catalog.archives.gov/id/$1',
'__global:nosmoke' => '0 http://no-smok.net/nsmk/$1',
'__global:nost' => '1 https://nostalgia.wikipedia.org/wiki/$1',
'__global:nostalgia' => '1 https://nostalgia.wikipedia.org/wiki/$1',
@@ -258,7 +258,7 @@
'__global:senseislibrary' => '0 http://senseis.xmp.net/?$1',
'__global:sharemap' => '0 http://sharemap.org/$1',
'__global:silcode' => '0 
http://www.sil.org/iso639-3/documentation.asp?id=$1',
-   '__global:slashdot' => '0 http://slashdot.org/article.pl?sid=$1',
+   '__global:slashdot' => '0 https://slashdot.org/article.pl?sid=$1',
'__global:sourceforge' => '0 https://sourceforge.net/$1',
'__global:spcom' => '1 https://spcom.wikimedia.org/wiki/$1',
'__global:species' => '1 https://species.wikimedia.org/wiki/$1',
@@ -303,7 +303,7 @@
'__global:usability' => '1 https://usability.wikimedia.org/wiki/$1',
'__global:utrs' => '0 https://utrs.wmflabs.org/appeal.php?id=$1',
'__global:vikidia' => '0 //fr.vikidia.org/wiki/$1',
-   '__global:vlos' => '0 http://www.thuvienkhoahoc.com/tusach/$1',
+   '__global:vlos' => '0 https://tusach.thuvienkhoahoc.com/wiki/$1',
'__global:vkol' => '0 http://kol.coldfront.net/thekolwiki/index.php/$1',
'__global:voipinfo' => '0 http://www.voip-info.org/wiki/view/$1',
'__global:votewiki' => '1 https://vote.wikimedia.org/wiki/$1',
@@ -377,7 +377,7 @@
'__global:wmid' => '0 http://www.wikimedia.or.id/wiki/$1',
'__global:wmil' => '1 http://www.wikimedia.org.il/$1',
'__global:wmin' => '0 http://wiki.wikimedia.in/$1',
-   '__global:wmit' => '0 http://wiki.wikimedia.it/wiki/$1',
+   '__global:wmit' => '0 https://wiki.wikimedia.it/wiki/$1',
'__global:wmke' => '0 http://wikimedia.or.ke/$1',
'__global:wmmk' => '1 https://mk.wikimedia.org/wiki/$1',
'__global:wmmx' => '1 https://mx.wikimedia.org/wiki/$1',
@@

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update interwiki.php, at atkwiki

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359054 )

Change subject: Update interwiki.php, at atkwiki
..

Update interwiki.php, at atkwiki

Bug: T167714
Change-Id: Ib9edd5b2b8f15a7e2541e73f3b630d1e802d40c7
---
M wmf-config/interwiki.php
1 file changed, 40 insertions(+), 21 deletions(-)


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

diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php
index 71ec73f..131d601 100644
--- a/wmf-config/interwiki.php
+++ b/wmf-config/interwiki.php
@@ -1,14 +1,14 @@
  '0 
http://www.acronymfinder.com/af-query.asp?String=exact=$1',
+   '__global:acronym' => '0 https://www.acronymfinder.com/$1.html',
'__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1',
'__global:advogato' => '0 http://www.advogato.org/$1',
-   '__global:aew' => '0 http://wiki.arabeyes.org/$1',
+   '__global:aew' => '0 https://wiki.arabeyes.org/$1',
'__global:appropedia' => '0 http://www.appropedia.org/$1',
'__global:aquariumwiki' => '0 http://www.theaquariumwiki.com/$1',
'__global:arborwiki' => '0 https://localwiki.org/ann-arbor/$1',
-   '__global:arxiv' => '0 http://arxiv.org/abs/$1',
+   '__global:arxiv' => '0 https://arxiv.org/abs/$1',
'__global:atmwiki' => '0 http://www.otterstedt.de/wiki/index.php/$1',
'__global:baden' => '0 http://www.stadtwiki-baden-baden.de/wiki/$1/',
'__global:battlestarwiki' => '0 http://en.battlestarwiki.org/wiki/$1',
@@ -92,7 +92,7 @@
'__global:foundation' => '1 https://wikimediafoundation.org/wiki/$1',
'__global:foxwiki' => '0 http://fox.wikis.com/wc.dll?Wiki~$1',
'__global:freebio' => '0 http://freebiology.org/wiki/$1',
-   '__global:freebsdman' => '0 
http://www.FreeBSD.org/cgi/man.cgi?apropos=1=$1',
+   '__global:freebsdman' => '0 
https://www.FreeBSD.org/cgi/man.cgi?apropos=1=$1',
'__global:freeculturewiki' => '0 
http://wiki.freeculture.org/index.php/$1',
'__global:freedomdefined' => '0 http://freedomdefined.org/$1',
'__global:freefeel' => '0 http://freefeel.org/wiki/$1',
@@ -188,10 +188,10 @@
'__global:mozillazinekb' => '0 http://kb.mozillazine.org/$1',
'__global:musicbrainz' => '0 http://musicbrainz.org/doc/$1',
'__global:mediawikiwiki' => '1 https://www.mediawiki.org/wiki/$1',
-   '__global:mwod' => '0 
http://www.merriam-webster.com/cgi-bin/dictionary?book=Dictionary=$1',
-   '__global:mwot' => '0 
http://www.merriam-webster.com/cgi-bin/thesaurus?book=Thesaurus=$1',
+   '__global:mwod' => '0 https://www.merriam-webster.com/dictionary/$1',
+   '__global:mwot' => '0 https://www.merriam-webster.com/thesaurus/$1',
'__global:nkcells' => '0 http://www.nkcells.info/index.php?title=$1',
-   '__global:nara' => '0 http://research.archives.gov/description/$1',
+   '__global:nara' => '0 https://catalog.archives.gov/id/$1',
'__global:nosmoke' => '0 http://no-smok.net/nsmk/$1',
'__global:nost' => '1 https://nostalgia.wikipedia.org/wiki/$1',
'__global:nostalgia' => '1 https://nostalgia.wikipedia.org/wiki/$1',
@@ -258,7 +258,7 @@
'__global:senseislibrary' => '0 http://senseis.xmp.net/?$1',
'__global:sharemap' => '0 http://sharemap.org/$1',
'__global:silcode' => '0 
http://www.sil.org/iso639-3/documentation.asp?id=$1',
-   '__global:slashdot' => '0 http://slashdot.org/article.pl?sid=$1',
+   '__global:slashdot' => '0 https://slashdot.org/article.pl?sid=$1',
'__global:sourceforge' => '0 https://sourceforge.net/$1',
'__global:spcom' => '1 https://spcom.wikimedia.org/wiki/$1',
'__global:species' => '1 https://species.wikimedia.org/wiki/$1',
@@ -303,7 +303,7 @@
'__global:usability' => '1 https://usability.wikimedia.org/wiki/$1',
'__global:utrs' => '0 https://utrs.wmflabs.org/appeal.php?id=$1',
'__global:vikidia' => '0 //fr.vikidia.org/wiki/$1',
-   '__global:vlos' => '0 http://www.thuvienkhoahoc.com/tusach/$1',
+   '__global:vlos' => '0 https://tusach.thuvienkhoahoc.com/wiki/$1',
'__global:vkol' => '0 http://kol.coldfront.net/thekolwiki/index.php/$1',
'__global:voipinfo' => '0 http://www.voip-info.org/wiki/view/$1',
'__global:votewiki' => '1 https://vote.wikimedia.org/wiki/$1',
@@ -377,7 +377,7 @@
'__global:wmid' => '0 http://www.wikimedia.or.id/wiki/$1',
'__global:wmil' => '1 http://www.wikimedia.org.il/$1',
'__global:wmin' => '0 http://wiki.wikimedia.in/$1',
-   '__global:wmit' => '0 http://wiki.wikimedia.it/wiki/$1',
+   '__global:wmit' => '0 https://wiki.wikimedia.it/wiki/$1',
'__global:wmke' => '0 http://wikimedia.or.ke/$1',
'__global:wmmk' => '1 https://mk.wikimedia.org/wiki/$1',
'__global:wmmx' => '1

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Add newline

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359052 )

Change subject: Add newline
..


Add newline

Change-Id: I3ed5c6c8e4dc28f146f8886d60297af77ea9cd0c
---
M addWiki.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/addWiki.php b/addWiki.php
index 9d12e41..968e6e4 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -277,7 +277,7 @@
"A new wiki was created by $user at $time for a $ucsite 
in $name ($lang).\nOnce the wiki is fully set up, it'll be visible at 
https://$domain;
);
 
-   $this->output( "Done. sync the config as in 
https://wikitech.wikimedia.org/wiki/Add_a_wiki#MediaWiki_configuration; );
+   $this->output( "Done. sync the config as in 
https://wikitech.wikimedia.org/wiki/Add_a_wiki#MediaWiki_configuration\n; );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ed5c6c8e4dc28f146f8886d60297af77ea9cd0c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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...RelatedArticles[master]: Remove CardsGateway (unused)

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359031 )

Change subject: Remove CardsGateway (unused)
..


Remove CardsGateway (unused)

Bug: T167647
Change-Id: I7e2aa5f28991d77deab520a55d3bd242104b
---
M extension.json
M includes/Hooks.php
D resources/ext.relatedArticles.cards/CardsGateway.js
D tests/qunit/ext.relatedArticles.cards/CardsGateway.js
4 files changed, 1 insertion(+), 231 deletions(-)

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



diff --git a/extension.json b/extension.json
index fdb7471..b256e7b 100644
--- a/extension.json
+++ b/extension.json
@@ -83,8 +83,7 @@
"resources/ext.relatedArticles.cards/init.js",

"resources/ext.relatedArticles.cards/CardModel.js",

"resources/ext.relatedArticles.cards/CardView.js",
-   
"resources/ext.relatedArticles.cards/CardListView.js",
-   
"resources/ext.relatedArticles.cards/CardsGateway.js"
+   
"resources/ext.relatedArticles.cards/CardListView.js"
],
"styles": [

"resources/ext.relatedArticles.cards/styles.less"
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 2b86ac9..8362df4 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -97,7 +97,6 @@
],
'scripts' => [
'ext.relatedArticles.cards/CardModel.js',
-   'ext.relatedArticles.cards/CardsGateway.js',
'ext.relatedArticles.cards/CardView.js',
]
];
diff --git a/resources/ext.relatedArticles.cards/CardsGateway.js 
b/resources/ext.relatedArticles.cards/CardsGateway.js
deleted file mode 100644
index 9ea8dda..000
--- a/resources/ext.relatedArticles.cards/CardsGateway.js
+++ /dev/null
@@ -1,105 +0,0 @@
-( function ( $, mw ) {
-   'use strict';
-
-   /**
-* Default thumbnail width in pixels: 80px
-* @readonly
-*/
-   var THUMB_WIDTH = 80,
-   CardModel = mw.cards.CardModel,
-   CardView = mw.cards.CardView,
-   CardListView = mw.cards.CardListView;
-
-   /**
-* @ignore
-* @param {Object} thumb
-* @return {string}
-*/
-   function isValidThumbnail( thumb ) {
-   return thumb.source.substr( 0, 7 ) === 'http://' || 
thumb.source.substr( 0, 8 ) === 'https://';
-   }
-
-   /**
-* Gateway for interacting with an API
-* It can be used to retrieve information about article(s). In the 
future
-* it can also be used to update that information in the server.
-*
-* @class mw.cards.CardsGateway
-* @param {Object} options
-* @param {mw.Api} options.api an Api to use.
-*/
-   function CardsGateway( options ) {
-   this.api = options.api;
-   }
-   OO.initClass( CardsGateway );
-
-   /**
-* Fetch information about articleTitles from the API
-* How to use:
-*
-* @example
-* var gateway = new mw.cards.CardsGateway( { api: new mw.Api() } );
-*
-* // '1' and '2' are page titles, while 200 is the desired 
thumbnail width
-* gateway.getCards( ['1', '2'], 200 ).done( function( cards ) {
-* $( '#bodyContent' ).append( cards.$el );
-* } );
-*
-* @param {string[]} articleTitles array of article titles
-* @param {number} [thumbWidth] Thumbnail width in pixels. Defaults to
-*  {@link THUMB_WIDTH}
-* @return {jQuery.Deferred} the result resolves with a
-*  {@link mw.cards.CardListView card list}
-*/
-   CardsGateway.prototype.getCards = function ( articleTitles, thumbWidth 
) {
-   var article,
-   cardViews = [],
-   result = $.Deferred();
-
-   if ( !articleTitles.length ) {
-   result.resolve( new CardListView( cardViews ) );
-   return result;
-   }
-
-   this.api.get( {
-   action: 'query',
-   prop: 'extracts|pageimages',
-   explaintext: true,
-   exlimit: articleTitles.length,
-   exintro: true,
-   exsentences: 1,
-   pithumbsize: thumbWidth || THUMB_WIDTH,
-   titles: articleTitles.join( '|' ),
-   'continue': '',
-   formatversion: 2
-   } ).done( function ( data ) {
-   if ( data.query &&

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: TEST

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359053 )

Change subject: TEST
..

TEST

Change-Id: I04f13928ef1c5f97970c5e03e15bc1f82defcdb6
---
M src/specials/SpecialElectronPdf.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/53/359053/1

diff --git a/src/specials/SpecialElectronPdf.php 
b/src/specials/SpecialElectronPdf.php
index 9496cfa..6052dbd 100644
--- a/src/specials/SpecialElectronPdf.php
+++ b/src/specials/SpecialElectronPdf.php
@@ -7,6 +7,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use SpecialPage;
 
 class SpecialElectronPdf extends SpecialPage {
 
@@ -16,7 +17,6 @@
public $config;
 
public function __construct() {
-   /** @suppress PhanUndeclaredClassMethod TODO: figure out why 
failing. */
parent::__construct( 'ElectronPdf', '', false );
$this->config = 
MediaWikiServices::getInstance()->getMainConfig();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04f13928ef1c5f97970c5e03e15bc1f82defcdb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Add newline

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359052 )

Change subject: Add newline
..

Add newline

Change-Id: I3ed5c6c8e4dc28f146f8886d60297af77ea9cd0c
---
M addWiki.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/52/359052/2

diff --git a/addWiki.php b/addWiki.php
index 9d12e41..968e6e4 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -277,7 +277,7 @@
"A new wiki was created by $user at $time for a $ucsite 
in $name ($lang).\nOnce the wiki is fully set up, it'll be visible at 
https://$domain;
);
 
-   $this->output( "Done. sync the config as in 
https://wikitech.wikimedia.org/wiki/Add_a_wiki#MediaWiki_configuration; );
+   $this->output( "Done. sync the config as in 
https://wikitech.wikimedia.org/wiki/Add_a_wiki#MediaWiki_configuration\n; );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ed5c6c8e4dc28f146f8886d60297af77ea9cd0c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
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...WikimediaMaintenance[wmf/1.30.0-wmf.4]: Remove AccountAudit

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359050 )

Change subject: Remove AccountAudit
..


Remove AccountAudit

Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
---
M addWiki.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/addWiki.php b/addWiki.php
index bbd86be..9d12e41 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -100,7 +100,6 @@
$dbw->sourceFile( 
"$IP/extensions/TimedMediaHandler/TimedMediaHandler.sql" );
$dbw->sourceFile( 
"$IP/maintenance/archives/patch-filejournal.sql" );
$dbw->sourceFile( 
"$IP/extensions/GeoData/sql/externally-backed.sql" ); // Not actually enabled 
everywhere, but this is easier
-   $dbw->sourceFile( 
"$IP/extensions/AccountAudit/accountaudit.sql" );
$dbw->sourceFile( 
"$IP/extensions/BetaFeatures/sql/create_counts.sql" );
$dbw->sourceFile( "$IP/extensions/SecurePoll/SecurePoll.sql" );
$dbw->sourceFile( "$IP/extensions/Linter/linter.sql" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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...WikimediaMaintenance[master]: Remove AccountAudit

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359049 )

Change subject: Remove AccountAudit
..


Remove AccountAudit

Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
---
M addWiki.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/addWiki.php b/addWiki.php
index bbd86be..9d12e41 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -100,7 +100,6 @@
$dbw->sourceFile( 
"$IP/extensions/TimedMediaHandler/TimedMediaHandler.sql" );
$dbw->sourceFile( 
"$IP/maintenance/archives/patch-filejournal.sql" );
$dbw->sourceFile( 
"$IP/extensions/GeoData/sql/externally-backed.sql" ); // Not actually enabled 
everywhere, but this is easier
-   $dbw->sourceFile( 
"$IP/extensions/AccountAudit/accountaudit.sql" );
$dbw->sourceFile( 
"$IP/extensions/BetaFeatures/sql/create_counts.sql" );
$dbw->sourceFile( "$IP/extensions/SecurePoll/SecurePoll.sql" );
$dbw->sourceFile( "$IP/extensions/Linter/linter.sql" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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...WikimediaMaintenance[wmf/1.30.0-wmf.4]: Remove AccountAudit

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359050 )

Change subject: Remove AccountAudit
..

Remove AccountAudit

Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
---
M addWiki.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/50/359050/1

diff --git a/addWiki.php b/addWiki.php
index bbd86be..9d12e41 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -100,7 +100,6 @@
$dbw->sourceFile( 
"$IP/extensions/TimedMediaHandler/TimedMediaHandler.sql" );
$dbw->sourceFile( 
"$IP/maintenance/archives/patch-filejournal.sql" );
$dbw->sourceFile( 
"$IP/extensions/GeoData/sql/externally-backed.sql" ); // Not actually enabled 
everywhere, but this is easier
-   $dbw->sourceFile( 
"$IP/extensions/AccountAudit/accountaudit.sql" );
$dbw->sourceFile( 
"$IP/extensions/BetaFeatures/sql/create_counts.sql" );
$dbw->sourceFile( "$IP/extensions/SecurePoll/SecurePoll.sql" );
$dbw->sourceFile( "$IP/extensions/Linter/linter.sql" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.ui.MWEducationPopupTool: Remove unnecessary manual popup ...

2017-06-14 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359051 )

Change subject: ve.ui.MWEducationPopupTool: Remove unnecessary manual popup 
positioning
..

ve.ui.MWEducationPopupTool: Remove unnecessary manual popup positioning

OOjs UI Popups position themselves automatically relative to their
$floatableContainer these days.

Also added explicit `$floatableContainer: this.$element` in the config
(although not strictly needed, since the parent node is used by
default, this makes the code more robust in case we move the popup
somewhere else in the DOM).

Bug: T167751
Change-Id: Id4267fce6499a4c217f7dc1d18871c02dd078aee
---
M modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
1 file changed, 1 insertion(+), 4 deletions(-)


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

diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
index c610ae2..ecc2424 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
@@ -55,6 +55,7 @@
);
 
this.popup = new OO.ui.PopupWidget( {
+   $floatableContainer: this.$element,
$content: $popupContent,
padded: true,
width: 300
@@ -79,10 +80,6 @@
tool.$pulsatingDot.hide();
tool.$stillDot.hide();
tool.popup.toggle( true );
-   tool.popup.$element.css( {
-   left: tool.$element.width() / 2,
-   top: tool.$element.height()
-   } );
$shield.remove();
}
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4267fce6499a4c217f7dc1d18871c02dd078aee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace deprecated $wgDummyLanguageCodes in WebInstallerLang...

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358018 )

Change subject: Replace deprecated $wgDummyLanguageCodes in 
WebInstallerLanguage.php
..


Replace deprecated $wgDummyLanguageCodes in WebInstallerLanguage.php

The internal language codes of the reserved for local use area 'qqq' and 'qqx'
are not in Language::fetchLanguageNames().

The check for deprecated language codes can removed, when they are removed
from Language::fetchLanguageNames().

Change-Id: I5d67ac3f9fbf341ee6bd84094fb671e97e512dd4
---
M includes/installer/WebInstallerLanguage.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/includes/installer/WebInstallerLanguage.php 
b/includes/installer/WebInstallerLanguage.php
index cfd4a86..bce07d3 100644
--- a/includes/installer/WebInstallerLanguage.php
+++ b/includes/installer/WebInstallerLanguage.php
@@ -98,17 +98,19 @@
 * @return string
 */
public function getLanguageSelector( $name, $label, $selectedCode, 
$helpHtml = '' ) {
-   global $wgDummyLanguageCodes;
+   global $wgExtraLanguageCodes;
 
$output = $helpHtml;
 
$select = new XmlSelect( $name, $name, $selectedCode );
$select->setAttribute( 'tabindex', 
$this->parent->nextTabIndex() );
 
+   $unwantedLanguageCodes = $wgExtraLanguageCodes +
+   LanguageCode::getDeprecatedCodeMapping();
$languages = Language::fetchLanguageNames();
ksort( $languages );
foreach ( $languages as $code => $lang ) {
-   if ( isset( $wgDummyLanguageCodes[$code] ) ) {
+   if ( isset( $unwantedLanguageCodes[$code] ) ) {
continue;
}
$select->addOption( "$code - $lang", $code );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Remove AccountAudit

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359049 )

Change subject: Remove AccountAudit
..

Remove AccountAudit

Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
---
M addWiki.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/49/359049/2

diff --git a/addWiki.php b/addWiki.php
index bbd86be..9d12e41 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -100,7 +100,6 @@
$dbw->sourceFile( 
"$IP/extensions/TimedMediaHandler/TimedMediaHandler.sql" );
$dbw->sourceFile( 
"$IP/maintenance/archives/patch-filejournal.sql" );
$dbw->sourceFile( 
"$IP/extensions/GeoData/sql/externally-backed.sql" ); // Not actually enabled 
everywhere, but this is easier
-   $dbw->sourceFile( 
"$IP/extensions/AccountAudit/accountaudit.sql" );
$dbw->sourceFile( 
"$IP/extensions/BetaFeatures/sql/create_counts.sql" );
$dbw->sourceFile( "$IP/extensions/SecurePoll/SecurePoll.sql" );
$dbw->sourceFile( "$IP/extensions/Linter/linter.sql" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2644f4a158fdeca7603fe8480752a6ff509fe405
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
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] operations/mediawiki-config[master]: Add atjwiki

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359035 )

Change subject: Add atjwiki
..


Add atjwiki

Bug: T167714
Change-Id: I4ebf0b7cb522087f0bbbd6914b9117b23b12b5c9
---
M dblists/all.dblist
M dblists/flow.dblist
M dblists/s3.dblist
M dblists/small.dblist
M dblists/wikidataclient.dblist
M dblists/wikipedia.dblist
M langlist
A static/images/project-logos/atjwiki-1.5x.png
A static/images/project-logos/atjwiki-2x.png
A static/images/project-logos/atjwiki.png
M wikiversions.json
M wmf-config/InitialiseSettings.php
12 files changed, 14 insertions(+), 1 deletion(-)

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



diff --git a/dblists/all.dblist b/dblists/all.dblist
index dd37493..c0333b4 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -50,6 +50,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 auditcomwiki
 avwiki
 avwiktionary
diff --git a/dblists/flow.dblist b/dblists/flow.dblist
index 7572fa3..b319316 100644
--- a/dblists/flow.dblist
+++ b/dblists/flow.dblist
@@ -45,6 +45,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 avwiki
 avwiktionary
 aywiki
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index 0da0603..b9b99d3 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -49,6 +49,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 auditcomwiki
 avwiki
 avwiktionary
diff --git a/dblists/small.dblist b/dblists/small.dblist
index febba09..bd0586f 100644
--- a/dblists/small.dblist
+++ b/dblists/small.dblist
@@ -32,6 +32,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 auditcomwiki
 avwiki
 avwiktionary
@@ -493,4 +494,4 @@
 zh_min_nanwikisource
 zuwiki
 zuwikibooks
-zuwiktionary
\ No newline at end of file
+zuwiktionary
diff --git a/dblists/wikidataclient.dblist b/dblists/wikidataclient.dblist
index 64a64b3..2ea195d 100644
--- a/dblists/wikidataclient.dblist
+++ b/dblists/wikidataclient.dblist
@@ -32,6 +32,7 @@
 aswiki
 aswikibooks
 aswikisource
+atjwiki
 avwiki
 aywiki
 aywikibooks
diff --git a/dblists/wikipedia.dblist b/dblists/wikipedia.dblist
index 5b58172..ff4c833 100644
--- a/dblists/wikipedia.dblist
+++ b/dblists/wikipedia.dblist
@@ -18,6 +18,7 @@
 arzwiki
 astwiki
 aswiki
+atjwiki
 avwiki
 aywiki
 azwiki
diff --git a/langlist b/langlist
index c19c26d..e276d52 100644
--- a/langlist
+++ b/langlist
@@ -13,6 +13,7 @@
 arz
 as
 ast
+atj
 av
 ay
 az
diff --git a/static/images/project-logos/atjwiki-1.5x.png 
b/static/images/project-logos/atjwiki-1.5x.png
new file mode 100644
index 000..2a87172
--- /dev/null
+++ b/static/images/project-logos/atjwiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/atjwiki-2x.png 
b/static/images/project-logos/atjwiki-2x.png
new file mode 100644
index 000..1debdc6
--- /dev/null
+++ b/static/images/project-logos/atjwiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/atjwiki.png 
b/static/images/project-logos/atjwiki.png
new file mode 100644
index 000..1cd930f
--- /dev/null
+++ b/static/images/project-logos/atjwiki.png
Binary files differ
diff --git a/wikiversions.json b/wikiversions.json
index 0cf7c2f..6c47fd6 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -51,6 +51,7 @@
 "aswikibooks": "php-1.30.0-wmf.5",
 "aswikisource": "php-1.30.0-wmf.5",
 "aswiktionary": "php-1.30.0-wmf.5",
+"atjwiki": "php-1.30.0-wmf.4",
 "auditcomwiki": "php-1.30.0-wmf.5",
 "avwiki": "php-1.30.0-wmf.4",
 "avwiktionary": "php-1.30.0-wmf.5",
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e070459..21a33f5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -257,6 +257,7 @@
'arbcom_nlwiki' => 'Europe/Berlin',
'alswiktionary' => 'Europe/Berlin',
'aswikisource' => 'Asia/Kolkata', // T45129
+   'atjwiki' => 'America/Montreal', // T167714
'barwiki' => 'Europe/Berlin',
'bat_smgwiki' => 'Europe/Vilnius',
'bdwikimedia' => 'Asia/Dhaka', // T150252
@@ -503,6 +504,7 @@
'arzwiki' => '/static/images/project-logos/arzwiki.png',
'aswiki' => '/static/images/project-logos/aswiki.png',
'astwiki' => '/static/images/project-logos/astwiki.png',  // T42285, 
T131247
+   'atjwiki' => '/static/images/project-logos/atjwiki.png', // T167714
'avwiki' => '/static/images/project-logos/avwiki.png',  // T48589
'aywiki' => '/static/images/project-logos/aywiki.png',
'azwiki' => '/static/images/project-logos/azwiki.png',  // T50397
@@ -1200,6 +1202,7 @@
'alswiki' => [ '1.5x' => 
'/static/images/project-logos/alswiki-1.5x.png', '2x' => 
'/static/images/project-logos/alswiki-2x.png' ], // T150618
'amwiki' => [ '1.5x' => '/static/images/project-logos/amwiki-1.5x.png', 
'2x' => '/static/images/project-logos/amwiki-2x.png' ], // T150618
'angwiki' => [ '1.5x' =>

[MediaWiki-commits] [Gerrit] mediawiki...Cards[master]: Empty for real

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359048 )

Change subject: Empty for real
..

Empty for real

Bug: T167452
Change-Id: I481b7099d9b7b0af15840ba7d158842fcc2cfc99
---
D CODE_OF_CONDUCT.md
D Gruntfile.js
D HISTORY
D README.md
A UNMAINTAINED
D composer.json
D extension.json
D i18n/ast.json
D i18n/ba.json
D i18n/be-tarask.json
D i18n/br.json
D i18n/de.json
D i18n/diq.json
D i18n/en-gb.json
D i18n/en.json
D i18n/es.json
D i18n/fi.json
D i18n/fr.json
D i18n/gl.json
D i18n/hsb.json
D i18n/it.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/lij.json
D i18n/mg.json
D i18n/mk.json
D i18n/mr.json
D i18n/nb.json
D i18n/nl.json
D i18n/oc.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/sv.json
D i18n/uk.json
D i18n/zh-hans.json
D includes/Cards.hooks.php
D package.json
D phpcs.xml
42 files changed, 4 insertions(+), 443 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cards 
refs/changes/48/359048/1

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 35cd0ce..000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-env node */
-
-module.exports = function ( grunt ) {
-   grunt.loadNpmTasks( 'grunt-jsonlint' );
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
-
-   grunt.initConfig( {
-   banana: {
-   all: 'i18n/'
-   },
-   jsonlint: {
-   all: [
-   '**/*.json',
-   '.stylelintrc',
-   '!node_modules/**'
-   ]
-   },
-   jsduck: {
-   all: {
-   src: [
-   '<%= files.js %>'
-   ],
-   dest: 'docs',
-   options: {
-   title: 'Cards',
-   external: [
-   'mw.Api',
-   'jQuery.Deferred',
-   'jQuery',
-   'OO.EventEmitter'
-   ],
-   warnings: [
-   '-nodoc(class,public)',
-   '-dup_member',
-   '-link_ambiguous'
-   ]
-   }
-   }
-   }
-   } );
-
-   grunt.registerTask( 'lint', [ 'jsonlint', 'banana' ] );
-   grunt.registerTask( 'test', [ 'lint' ] );
-   grunt.registerTask( 'default', 'test' );
-};
diff --git a/HISTORY b/HISTORY
deleted file mode 100644
index 814f1bf..000
--- a/HISTORY
+++ /dev/null
@@ -1,17 +0,0 @@
-==Cards 0.3.0==
-b43afab Use background-size:cover for thumbnails
-==Cards 0.2.0==
-5a9080c Add the extension boilerplate
-535bcbc Add jshint and jscs support
-5b392e8 Add a module that renders cards
-756386b Generate documentation with JSDuck
-8f50393 Fix link style and text colors
-3340caf Fix card heading font-family.
-08be488 Tools: Allow dangling underscores in JSCS
-468b393 Add Model
-04b3574 Simplify the modules
-ac482a5 Design tweaks of Cards
-2600eec Sanitize/escape thumbnail URLs
-8e70ba8 Display cards in desktop view too
-eac5d60 Don't encode the thumbnail URL before escaping it
-9249c2d Update documentation
diff --git a/README.md b/README.md
deleted file mode 100644
index ff74385..000
--- a/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-Cards Extension
-
-
-The Cards extension receives a list of articles and outputs standardized
-(across extensions) cards.
-
-Rationale
-
-
-We - the Reading Web team found ourselves displaying page titles and their
-descriptions in multiple extensions 
-([MobileFrontend](https://www.mediawiki.org/wiki/Extension:MobileFrontend) -
-watchlist, search results,
-[RelatedArticles](https://www.mediawiki.org/wiki/Extension:RelatedArticles) -
-read more, 
-[Gather](https://www.mediawiki.org/wiki/Extension:Gather), etc.)
-and decided to create this extension
-to ease our development and maintenance of this feature. Currently the Cards
-extension is used by the RelatedArticles extension, but we plan on making this
-extension to serve multiple purposes and be useful in different parts of the
-reading

[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove Cards from translatewiki

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359046 )

Change subject: Remove Cards from translatewiki
..

Remove Cards from translatewiki

Bug: T167452
Change-Id: I71997f78105d1662d6c8a2d0e2239b1ad8990dd0
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/46/359046/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 5fab8dd..28e16fd 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -560,8 +560,6 @@
 
 Capiunto
 
-Cards
-
 Cargo
 magicfile = Cargo/Cargo.i18n.magic.php
 aliasfile = Cargo/Cargo.alias.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71997f78105d1662d6c8a2d0e2239b1ad8990dd0
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add phpcs and make pass

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358792 )

Change subject: Add phpcs and make pass
..


Add phpcs and make pass

Short array syntax will be used in follow ups
to keep this patch set small
Long lines will be break in follow ups

Change-Id: Ifa3487ba24dd5bb27b98171d5b3efd90b0a5d4d9
---
M CirrusSearch.php
M composer.json
A phpcs.xml
3 files changed, 568 insertions(+), 380 deletions(-)

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



diff --git a/CirrusSearch.php b/CirrusSearch.php
index c2e6fc2..5d0d067 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -43,284 +43,345 @@
  * Please update docs/settings.txt if you add new values!
  */
 
-// Default cluster for read operations. This is an array key
-// mapping into $wgCirrusSearchClusters. When running multiple
-// clusters this should be pointed to the closest cluster, and
-// can be pointed at an alternate cluster during downtime.
-//
-// As a form of backwards compatibility the existence of
-// $wgCirrusSearchServers will override all cluster configuration.
+/**
+ * Default cluster for read operations. This is an array key
+ * mapping into $wgCirrusSearchClusters. When running multiple
+ * clusters this should be pointed to the closest cluster, and
+ * can be pointed at an alternate cluster during downtime.
+ *
+ * As a form of backwards compatibility the existence of
+ * $wgCirrusSearchServers will override all cluster configuration.
+ */
 $wgCirrusSearchDefaultCluster = 'default';
 
-// Each key is the name of an elasticsearch cluster. The value is
-// a list of addresses to connect to. If no port is specified it
-// defaults to 9200.
-//
-// All writes will be processed in all configured clusters by the
-// ElasticaWrite job, unless $wgCirrusSearchWriteClusters is
-// configured (see below).
-//
-// $wgCirrusSearchClusters = array(
-// 'eqiad' => array( 'es01.eqiad.wmnet', 'es02.eqiad.wmnet' ),
-// 'codfw' => array( 'es01.codfw.wmnet', 'es02.codfw.wmnet' ),
-// );
+/**
+ * Each key is the name of an elasticsearch cluster. The value is
+ * a list of addresses to connect to. If no port is specified it
+ * defaults to 9200.
+ *
+ * All writes will be processed in all configured clusters by the
+ * ElasticaWrite job, unless $wgCirrusSearchWriteClusters is
+ * configured (see below).
+ *
+ * $wgCirrusSearchClusters = array(
+ * 'eqiad' => array( 'es01.eqiad.wmnet', 'es02.eqiad.wmnet' ),
+ * 'codfw' => array( 'es01.codfw.wmnet', 'es02.codfw.wmnet' ),
+ * );
+ */
 $wgCirrusSearchClusters = [
'default' => [ 'localhost' ],
 ];
 
-// List of clusters that can be used for writing. Must be a subset of keys
-// from $wgCirrusSearchClusters.
-// By default or when set to null, all keys of $wgCirrusSearchClusters are
-// available for writing.
+/**
+ * List of clusters that can be used for writing. Must be a subset of keys
+ * from $wgCirrusSearchClusters.
+ * By default or when set to null, all keys of $wgCirrusSearchClusters are
+ * available for writing.
+ */
 $wgCirrusSearchWriteClusters = null;
 
-// How many times to attempt connecting to a given server
-// If you're behind LVS and everything looks like one server,
-// you may want to reattempt 2 or 3 times.
+/**
+ * How many times to attempt connecting to a given server
+ * If you're behind LVS and everything looks like one server,
+ * you may want to reattempt 2 or 3 times.
+ */
 $wgCirrusSearchConnectionAttempts = 1;
 
-// Number of shards for each index
-// You can also set this setting for each cluster:
-// $wgCirrusSearchShardCount = array(
-//  'cluster1' => array( 'content' => 2, 'general' => 2 ),
-//  'cluster2' => array( 'content' => 3, 'general' => 3 ),
-//);
+/**
+ * Number of shards for each index
+ * You can also set this setting for each cluster:
+ * $wgCirrusSearchShardCount = array(
+ *  'cluster1' => array( 'content' => 2, 'general' => 2 ),
+ *  'cluster2' => array( 'content' => 3, 'general' => 3 ),
+ * );
+ */
 $wgCirrusSearchShardCount = [ 'content' => 4, 'general' => 4, 'titlesuggest' 
=> 4 ];
 
-// Number of replicas Elasticsearch can expand or contract to. This allows for
-// easy development and deployment to a single node (0 replicas) to scale up to
-// higher levels of replication. You if you need more redundancy you could
-// adjust this to '0-10' or '0-all' or even 'false' (string, not boolean) to
-// disable the behavior entirely. The default should be fine for most people.
-// You can also set this setting for each cluster:
-// $wgCirrusSearchReplicas = array(
-//  'cluster1' => array( 'content' => '0-1', 'general' => '0-2' ),
-//  'cluster2' => array( 'content' => '0-2', 'general' => '0-3' ),
-//);
+/**
+ * Number of replicas Elasticsearch can expand or contract to. This allows for
+ * easy development and deployment to a single node (0 replicas)

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix changes list data attribute sanitizing

2017-06-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359047 )

Change subject: Fix changes list data attribute sanitizing
..

Fix changes list data attribute sanitizing

The attribute sanitizer should disallow reserved attributes,
not keep only those.

Bug: T167922
Change-Id: Ic24400382a9dcbb990e12dfddae4ab7db14553cc
---
M includes/Sanitizer.php
M includes/actions/HistoryAction.php
M includes/changes/EnhancedChangesList.php
M includes/changes/OldChangesList.php
M includes/logging/LogEventsList.php
M includes/specials/SpecialNewpages.php
M includes/specials/pagers/ContribsPager.php
M includes/specials/pagers/DeletedContribsPager.php
8 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/359047/1

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 8920e92..224dfae1 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -787,7 +787,7 @@
#   colons.
if ( !preg_match( '/^data-[^:]*$/i', $attribute )
&& !isset( $whitelist[$attribute] )
-   || self::isReservedDataAttribute( $attribute )
+   || !self::isSafeDataAttribute( $attribute )
) {
continue;
}
@@ -856,13 +856,13 @@
}
 
/**
-* Given an attribute name, checks whether it is a reserved data 
attribute
+* Given an attribute name, checks that it is not a reserved data 
attribute
 * (such as data-mw-foo) which is unavailable to user-generated HTML so 
MediaWiki
 * core and extension code can safely use it to communicate with 
frontend code.
 * @param string $attr Attribute name.
 * @return bool
 */
-   public static function isReservedDataAttribute( $attr ) {
+   public static function isSafeDataAttribute( $attr ) {
// data-ooui is reserved for ooui.
// data-mw and data-parsoid are reserved for parsoid.
// data-mw- is reserved for extensions (or core) if
@@ -870,7 +870,7 @@
// sure that it isn't coming from an untrusted user.
// We ignore the possibility of namespaces since user-generated 
HTML
// can't use them anymore.
-   return (bool)preg_match( '/^data-(ooui|mw|parsoid)/i', $attr );
+   return !(bool)preg_match( '/^data-(ooui|mw|parsoid)/i', $attr );
}
 
/**
diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index 7460340..dbeaf73 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -783,7 +783,7 @@
$attribs = [ 'data-mw-revid' => $rev->getId() ];
 
Hooks::run( 'PageHistoryLineEnding', [ $this, &$row, &$s, 
&$classes, &$attribs ] );
-   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
+   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isSafeDataAttribute' ] );
 
if ( $classes ) {
$attribs['class'] = implode( ' ', $classes );
diff --git a/includes/changes/EnhancedChangesList.php 
b/includes/changes/EnhancedChangesList.php
index 03f63f6..3436e06 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -456,7 +456,7 @@
// skip entry if hook aborted it
return [];
}
-   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
+   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isSafeDataAttribute' ] );
 
$lineParams['recentChangesFlagsRaw'] = [];
if ( isset( $data['recentChangesFlags'] ) ) {
@@ -686,7 +686,7 @@
}
$attribs = $data['attribs'];
unset( $data['attribs'] );
-   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
+   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isSafeDataAttribute' ] );
 
$line = Html::openElement( 'table', $attribs ) . 
Html::openElement( 'tr' );
$line .= '';
diff --git a/includes/changes/OldChangesList.php 
b/includes/changes/OldChangesList.php
index 2a53d66..da963c9 100644
--- a/includes/changes/OldChangesList.php
+++ b/includes/changes/OldChangesList.php
@@ -59,7 +59,7 @@
) {
return false;
}
-   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
+   $attribs = wfArrayFilterByKey( $attribs, [

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove Cards from the cluster

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359045 )

Change subject: Remove Cards from the cluster
..

Remove Cards from the cluster

Bug: T167452
Change-Id: Icc4fed68bbbddb7f133b4cb4c139d4463357db59
---
M multiversion/submodules.json
M wmf-config/CommonSettings.php
M wmf-config/extension-list
3 files changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/multiversion/submodules.json b/multiversion/submodules.json
index d2b7fca..87e2fe0 100644
--- a/multiversion/submodules.json
+++ b/multiversion/submodules.json
@@ -43,10 +43,6 @@
 "action": "branch",
 "ref": "."
 },
-"extensions/Cards": {
-"action": "branch",
-"ref": "."
-},
 "extensions/CategoryTree": {
 "action": "branch",
 "ref": "."
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2fade02..12d8e9c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2897,7 +2897,6 @@
 if ( $wmgUseRelatedArticles ) {
wfLoadExtension( 'RelatedArticles' );
if ( $wmgRelatedArticlesShowInFooter ) {
-   wfLoadExtension( 'Cards' );
$wgRelatedArticlesShowInSidebar = false;
$wgRelatedArticlesShowInFooter = true;
$wgRelatedArticlesLoggingSamplingRate = 0.01;
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index c42f196..7fe4f24 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -7,7 +7,6 @@
 $IP/extensions/Calendar/extension.json
 $IP/extensions/Campaigns/extension.json
 $IP/extensions/Capiunto/extension.json
-$IP/extensions/Cards/extension.json
 $IP/extensions/CategoryTree/extension.json
 $IP/extensions/CentralAuth/extension.json
 $IP/extensions/CentralNotice/extension.json

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Remove Cards from CI

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359044 )

Change subject: Remove Cards from CI
..

Remove Cards from CI

Bug: T167452
Change-Id: I0bedebf1ba5f7b7b0142ebe5b70356dd637e85ce
---
M zuul/layout.yaml
M zuul/parameter_functions.py
2 files changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/44/359044/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c8458b2..5f634b6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2602,11 +2602,6 @@
   - name: extension-unittests-generic
   - name: mwgate-npm
 
-  - name: mediawiki/extensions/Cards
-template:
-  - name: extension-gate
-  - name: mwgate-npm
-
   - name: mediawiki/extensions/CategoryTagSorter
 template:
   - name: extension-unittests-generic
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 798d67a..53f560d 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -208,7 +208,7 @@
 'PropertySuggester': ['Wikibase'],
 'QuickSurveys': ['EventLogging'],
 'QuizGame': ['SocialProfile'],
-'RelatedArticles': ['BetaFeatures', 'Cards', 'MobileFrontend'],
+'RelatedArticles': ['BetaFeatures', 'MobileFrontend'],
 'Score': ['VisualEditor'],
 'SemanticImageInput': ['SemanticMediaWiki'],
 'SemanticSifter': ['SemanticMediaWiki'],
@@ -337,7 +337,6 @@
 gatedextensions = [
 'AbuseFilter',
 'Babel',
-'Cards',
 'CheckUser',
 'CirrusSearch',
 'Cite',

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove dead config variables

2017-06-14 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359043 )

Change subject: Remove dead config variables
..

Remove dead config variables

MinervaPrintStyles feature flag was temporary.

Bug: T166408
Change-Id: Idfcec2c06f2662a6c4ced0cc634fe611d1432654
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e070459..ff5b070 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15143,14 +15143,6 @@
'wikitech' => true, // Not behind Varnish
 ],
 
-// T163287
-'wgMinervaPrintStyles' => [
-   'default' => [
-   'base' => true,
-   'beta' => true,
-   ],
-],
-
 'wgMinervaCustomLogos' => [
'default' => [],
'wikipedia' => [

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

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

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

[MediaWiki-commits] [Gerrit] labs/striker[master]: Change #wikimedia-labs to #wikimedia-cloud

2017-06-14 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359042 )

Change subject: Change #wikimedia-labs to #wikimedia-cloud
..

Change #wikimedia-labs to #wikimedia-cloud

Bug: T166420
Change-Id: I7807036db63f08926fc2f7634f858f742600779d
---
M striker/templates/400.html
M striker/templates/403.html
M striker/templates/500.html
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker 
refs/changes/42/359042/1

diff --git a/striker/templates/400.html b/striker/templates/400.html
index 369b93d..3fb744f 100644
--- a/striker/templates/400.html
+++ b/striker/templates/400.html
@@ -17,7 +17,7 @@
   
 
   Your client has made an invalid request for the URI {{ request_path 
}}.
-  You may be able to get further information in the #wikimedia-labs channel on 
the Freenode IRC network.
+  You may be able to get further information in the #wikimedia-cloud channel on 
the Freenode IRC network.
 
   
 If you report this error, please include the details below.
diff --git a/striker/templates/403.html b/striker/templates/403.html
index 8164b96..a92527a 100644
--- a/striker/templates/403.html
+++ b/striker/templates/403.html
@@ -16,7 +16,7 @@
   
 
   You are not currently authorized to view the URI {{ request_path 
}}.
-  You may be able to get further information in the #wikimedia-labs channel on 
the Freenode IRC network.
+  You may be able to get further information in the #wikimedia-cloud channel on 
the Freenode IRC network.
 
   
 If you report this error, please include the details below.
diff --git a/striker/templates/500.html b/striker/templates/500.html
index 94877f2..6922f45 100644
--- a/striker/templates/500.html
+++ b/striker/templates/500.html
@@ -17,7 +17,7 @@
   
 
   An unexpected technical problem has occured while handing the requested 
URI {{ request_path }}. This is probably temporary and should be 
fixed soon. Please try again later.
-  You may be able to get further information in the #wikimedia-labs channel on 
the Freenode IRC network.
+  You may be able to get further information in the #wikimedia-cloud channel on 
the Freenode IRC network.
 
   
 If you report this error, please include the details below.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labspuppetbackend: add api methods to query by role

2017-06-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359041 )

Change subject: labspuppetbackend: add api methods to query by role
..

labspuppetbackend: add api methods to query by role

Bug: T151522
Change-Id: I1eaeddb4953c8f86573f87c9217913fb1d418894
---
M modules/labspuppetbackend/files/labspuppetbackend.py
1 file changed, 50 insertions(+), 0 deletions(-)


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

diff --git a/modules/labspuppetbackend/files/labspuppetbackend.py 
b/modules/labspuppetbackend/files/labspuppetbackend.py
index e159f4d..8d77880 100644
--- a/modules/labspuppetbackend/files/labspuppetbackend.py
+++ b/modules/labspuppetbackend/files/labspuppetbackend.py
@@ -262,6 +262,56 @@
 cur.close()
 
 
+@statsd.timer('get_prefixes_for_project_and_role')
+@app.route('/v1//prefix/', methods=['GET'])
+def get_prefixes_for_project_and_role(project, role):
+cur = g.db.cursor()
+try:
+cur.execute("""
+SELECT prefix.prefix FROM prefix, roleassignment
+WHERE prefix.project = %s AND
+  roleassignment.role = %s AND
+  prefix.id = roleassignemnt.prefix_id
+""", (project, role))
+# Do the inverse of _preprocess_prefix, so callers get a consistent 
view
+return Response(
+yaml.safe_dump({
+'prefixes':
+['_' if r[0] == b'' or r[0] == ''
+ else r[0] for r in cur.fetchall()]}),
+status=200,
+mimetype='application/x-yaml'
+)
+finally:
+cur.close()
+
+
+@statsd.timer('get_prefixes_for_role')
+@app.route('/v1/prefix/', methods=['GET'])
+def get_prefixes_for_role(role):
+cur = g.db.cursor()
+try:
+cur.execute("""
+SELECT prefix.project, prefix.prefix FROM prefix, roleassignment
+WHERE roleassignment.role = %s AND
+  prefix.id = roleassignemnt.prefix_id
+""", (role))
+# Return a list of project dicts with '_' meaning 'everything':
+rdict = {}
+for r in cur.fetchall():
+project = r[0]
+prefix = r[1]
+if project not in rdict:
+rdict[project] = {'prefixes': []}
+rdict[project]['prefixes'].append('_' if prefix == b''
+  or prefix == '' else r[0])
+return Response(yaml.safe_dump(rdict),
+status=200,
+mimetype='application/x-yaml')
+finally:
+cur.close()
+
+
 @statsd.timer('delete_prefix')
 @app.route('/v1//prefix/', methods=['DELETE'])
 def delete_prefix(project, prefix):

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Make phpcs pass - includes

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358791 )

Change subject: Make phpcs pass - includes
..


Make phpcs pass - includes

Change-Id: I09a0cda4cfa3caeeb5afb7639a1925414a10724f
---
M includes/BulkUpdateRequestLog.php
M includes/CirrusConfigInterwikiResolver.php
M includes/CirrusSearch.php
M includes/CompletionRequestLog.php
M includes/CompletionSuggester.php
M includes/DataSender.php
M includes/ElasticaErrorHandler.php
M includes/ExplainPrinter.php
M includes/HTMLCompletionProfileSettings.php
M includes/Hooks.php
M includes/InterwikiSearcher.php
M includes/OtherIndexes.php
M includes/RequestLogger.php
M includes/SearchConfig.php
M includes/SearchRequestLog.php
M includes/Searcher.php
M includes/SiteMatrixInterwikiResolver.php
M includes/Updater.php
M includes/UserTesting.php
M includes/Util.php
M profiles/PhraseSuggesterProfiles.php
21 files changed, 98 insertions(+), 100 deletions(-)

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



diff --git a/includes/BulkUpdateRequestLog.php 
b/includes/BulkUpdateRequestLog.php
index 8be199a..b14b577 100644
--- a/includes/BulkUpdateRequestLog.php
+++ b/includes/BulkUpdateRequestLog.php
@@ -94,6 +94,6 @@
 * @return array[]
 */
public function getRequests() {
-   return [$this->getLogVariables()];
+   return [ $this->getLogVariables() ];
}
 }
diff --git a/includes/CirrusConfigInterwikiResolver.php 
b/includes/CirrusConfigInterwikiResolver.php
index 43f0fb3..d03e9c4 100644
--- a/includes/CirrusConfigInterwikiResolver.php
+++ b/includes/CirrusConfigInterwikiResolver.php
@@ -35,7 +35,7 @@
 
protected function loadMatrix() {
$sisterProjects = $this->config->get( 
'CirrusSearchInterwikiSources' );
-   if ( is_null ( $sisterProjects ) ) {
+   if ( is_null( $sisterProjects ) ) {
$sisterProjects = [];
}
$languageMap = $this->config->get( 
'CirrusSearchLanguageToWikiMap' );
@@ -43,7 +43,7 @@
$languageMap = [];
}
$crossLanguage = $this->config->get( 
'CirrusSearchWikiToNameMap' );
-   if ( is_null ( $crossLanguage ) ) {
+   if ( is_null( $crossLanguage ) ) {
$crossLanguage = [];
}
$crossLanguage = array_filter( $crossLanguage, function( $entry 
) {
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 2416298..b43ed27 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -203,7 +203,7 @@
 
}
$detector = new $klass();
-   if( !( $detector instanceof 
\CirrusSearch\LanguageDetector\Detector ) ) {
+   if ( !( $detector instanceof 
\CirrusSearch\LanguageDetector\Detector ) ) {
LoggerFactory::getInstance( 'CirrusSearch' 
)->info(
"Bad detector class for {name}: 
{class}",
[
@@ -236,7 +236,7 @@
break;
}
}
-   if ( is_array( $detected  ) ) {
+   if ( is_array( $detected ) ) {
// Report language detection with search metrics
// TODO: do we still need this metric? (see T151796)
$this->extraSearchMetrics['wgCirrusSearchAltLanguage'] 
= $detected;
@@ -307,7 +307,7 @@
// This comes after the actual query is 
run so we can collect metrics about
// users in the control buckets, and 
provide them the same latency as users
// in the test bucket.
-   if ( 
$GLOBALS['wgCirrusSearchEnableAltLanguage'] && $numRows > 0) {
+   if ( 
$GLOBALS['wgCirrusSearchEnableAltLanguage'] && $numRows > 0 ) {

$oldResult->addInterwikiResults( $matches, SearchResultSet::INLINE_RESULTS, 
$altWikiId );
}
}
@@ -412,7 +412,7 @@
// If we are dumping we need to convert into an 
array that can be appended to
$recallMetrics = [];
if ( $iwSearch->isReturnRaw() ) {
-   $result = [$result];
+   $result = [ $result ];
}
foreach ( $interwikiResults as $interwiki => 
$interwikiResult ) {
$recallMetrics[$interwiki] =

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Make phpcs pass - maintenance

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358788 )

Change subject: Make phpcs pass - maintenance
..


Make phpcs pass - maintenance

Change-Id: Ib9754c2dfeef064b2375aadcc26b3d487c9d6826
---
M includes/Maintenance/AnalysisConfigBuilder.php
M includes/Maintenance/ChunkBuilder.php
M includes/Maintenance/ConfigUtils.php
M includes/Maintenance/Maintenance.php
M includes/Maintenance/MappingConfigBuilder.php
M includes/Maintenance/MetaStoreIndex.php
M includes/Maintenance/OrderedStreamingForkController.php
M includes/Maintenance/Reindexer.php
M includes/Maintenance/SuggesterAnalysisConfigBuilder.php
M includes/Maintenance/SuggesterMappingConfigBuilder.php
M includes/Maintenance/Validators/IndexAllAliasValidator.php
M includes/Maintenance/Validators/SpecificAliasValidator.php
M includes/Maintenance/Validators/Validator.php
M maintenance/checkIndexes.php
M maintenance/cirrusNeedsToBeBuilt.php
M maintenance/copySearchIndex.php
M maintenance/dumpIndex.php
M maintenance/forceSearchIndex.php
M maintenance/freezeWritesToCluster.php
M maintenance/indexNamespaces.php
M maintenance/metastore.php
M maintenance/runSearch.php
M maintenance/saneitize.php
M maintenance/saneitizeJobs.php
M maintenance/updateOneSearchIndexConfig.php
M maintenance/updateSearchIndexConfig.php
M maintenance/updateSuggesterIndex.php
M maintenance/updateVersionIndex.php
28 files changed, 155 insertions(+), 154 deletions(-)

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



diff --git a/includes/Maintenance/AnalysisConfigBuilder.php 
b/includes/Maintenance/AnalysisConfigBuilder.php
index 6af8d98..86bbf83 100644
--- a/includes/Maintenance/AnalysisConfigBuilder.php
+++ b/includes/Maintenance/AnalysisConfigBuilder.php
@@ -91,7 +91,7 @@
}
}
$this->icu = in_array( 'analysis-icu', $plugins );
-   if ( is_null ( $config ) ) {
+   if ( is_null( $config ) ) {
$config = MediaWikiServices::getInstance()
->getConfigFactory()
->makeConfig( 'CirrusSearch' );
@@ -124,7 +124,7 @@
if ( $in_config === false ) {
$in_config = 'no';
}
-   switch( $in_config ) {
+   switch ( $in_config ) {
case 'yes':
return true;
case 'no':
@@ -148,7 +148,7 @@
return false;
}
$in_config = $this->config->get( 'CirrusSearchUseIcuTokenizer' 
);
-   switch( $in_config ) {
+   switch ( $in_config ) {
case 'yes':
return true;
case 'no':
@@ -197,7 +197,7 @@
 * @return mixed[] update config
 */
public function enableICUTokenizer( array $config ) {
-   foreach( $config['analyzer'] as $name => &$value ) {
+   foreach ( $config['analyzer'] as $name => &$value ) {
if ( isset( $value['type'] ) && $value['type'] != 
'custom' ) {
continue;
}
@@ -232,7 +232,7 @@
];
 
$newfilters = [];
-   foreach( $config['analyzer'] as $name => $value ) {
+   foreach ( $config['analyzer'] as $name => $value ) {
if ( isset( $value['type'] ) && $value['type'] != 
'custom' ) {
continue;
}
@@ -247,12 +247,12 @@
}
}
 
-   foreach( $newfilters as $name => $filters ) {
+   foreach ( $newfilters as $name => $filters ) {
$config['analyzer'][$name]['filter'] = $filters;
}
// Explicitly enable icu_folding on plain analyzers if it's not
// already enabled
-   foreach( ['plain'] as $analyzer ) {
+   foreach ( [ 'plain' ] as $analyzer ) {
if ( !isset( $config['analyzer'][$analyzer] ) ) {
continue;
}
@@ -325,7 +325,7 @@
if ( $this->config->get( 
'CirrusSearchICUFoldingUnicodeSetFilter' ) !== null ) {
return $this->config->get( 
'CirrusSearchICUFoldingUnicodeSetFilter' );
}
-   switch( $this->language ) {
+   switch ( $this->language ) {
// @todo: complete the default filters per language
// For Swedish (sv), see 
https://www.mediawiki.org/wiki/User:TJones_(WMF)/T160562
case 'fi':
@@ -423,7 +423,7 @@
'token_reverse' => [
'type' => 'custom',

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove $stdlogo comments

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359037 )

Change subject: Remove $stdlogo comments
..

Remove $stdlogo comments

We don't use it anymore

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e070459..2be2b43 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -470,8 +470,6 @@
 # @} end of wgLocaltimezone
 
 # wgLogo @{
-// $stdlogo gives the path to the local copy of Wiki.png on the relevant wiki,
-// e.g. for simplewiktionary: 
'//upload.wikimedia.org/wiktionary/simple/b/bc/Wiki.png'
 'wgLogo' => [
// Projects
'default' => '/static/images/project-logos/default.png',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief0ea01f4b234fb98c82bc75743e64589c58300c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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...FlaggedRevs[master]: Kill all i18n.php entry points

2017-06-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358899 )

Change subject: Kill all i18n.php entry points
..


Kill all i18n.php entry points

Back compat is for < 1.23 and 1.23 is EOL

Change-Id: I0f5c06d021856bce1bb9bd56841987820b8a7c2f
---
M FlaggedRevs.php
D frontend/language/ConfiguredPages.i18n.php
D frontend/language/FlaggedRevs.i18n.php
D frontend/language/PendingChanges.i18n.php
D frontend/language/ProblemChanges.i18n.php
D frontend/language/QualityOversight.i18n.php
D frontend/language/ReviewedPages.i18n.php
D frontend/language/ReviewedVersions.i18n.php
D frontend/language/RevisionReview.i18n.php
D frontend/language/Stabilization.i18n.php
D frontend/language/StablePages.i18n.php
D frontend/language/UnreviewedPages.i18n.php
D frontend/language/ValidationStatistics.i18n.php
13 files changed, 0 insertions(+), 432 deletions(-)

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



diff --git a/FlaggedRevs.php b/FlaggedRevs.php
index e35dbcb..9295be3 100644
--- a/FlaggedRevs.php
+++ b/FlaggedRevs.php
@@ -265,7 +265,6 @@
 ### Presentation classes ###
 # Main i18n file and special page alias file
 $wgMessagesDirs['FlaggedRevs'] = __DIR__ . '/i18n/flaggedrevs';
-$wgExtensionMessagesFiles['FlaggedRevs'] = "$langDir/FlaggedRevs.i18n.php";
 $wgExtensionMessagesFiles['FlaggedRevsMagic'] = 
"$langDir/FlaggedRevs.i18n.magic.php";
 $wgExtensionMessagesFiles['FlaggedRevsAliases'] = 
"$langDir/FlaggedRevs.alias.php";
 # UI setup, forms, and HTML elements
@@ -279,54 +278,43 @@
 # Revision review UI
 $wgAutoloadClasses['RevisionReview'] = "$spActionDir/RevisionReview_body.php";
 $wgMessagesDirs['RevisionReview'] = __DIR__ . '/i18n/revisionreview';
-$wgExtensionMessagesFiles['RevisionReview'] = 
"$langDir/RevisionReview.i18n.php";
 # Stable version config UI
 $wgAutoloadClasses['Stabilization'] = "$spActionDir/Stabilization_body.php";
 $wgMessagesDirs['Stabilization'] = __DIR__ . '/i18n/stabilization';
-$wgExtensionMessagesFiles['Stabilization'] = "$langDir/Stabilization.i18n.php";
 # Reviewed versions list
 $wgAutoloadClasses['ReviewedVersions'] = 
"$spReportDir/ReviewedVersions_body.php";
 $wgAutoloadClasses['ReviewedVersionsPager'] = 
"$spReportDir/ReviewedVersions_body.php";
 $wgMessagesDirs['ReviewedVersions'] = __DIR__ . '/i18n/reviewedversions';
-$wgExtensionMessagesFiles['ReviewedVersions'] = 
"$langDir/ReviewedVersions.i18n.php";
 # Unreviewed pages list
 $wgAutoloadClasses['UnreviewedPages'] = 
"$spReportDir/UnreviewedPages_body.php";
 $wgAutoloadClasses['UnreviewedPagesPager'] = 
"$spReportDir/UnreviewedPages_body.php";
 $wgMessagesDirs['UnreviewedPages'] = __DIR__ . '/i18n/unreviewedpages';
-$wgExtensionMessagesFiles['UnreviewedPages'] = 
"$langDir/UnreviewedPages.i18n.php";
 # Pages with pending changes list
 $wgAutoloadClasses['PendingChanges'] = "$spReportDir/PendingChanges_body.php";
 $wgAutoloadClasses['PendingChangesPager'] = 
"$spReportDir/PendingChanges_body.php";
 $wgMessagesDirs['PendingChanges'] = __DIR__ . '/i18n/pendingchanges';
-$wgExtensionMessagesFiles['PendingChanges'] = 
"$langDir/PendingChanges.i18n.php";
 # Pages with tagged pending changes list
 $wgAutoloadClasses['ProblemChanges'] = "$spReportDir/ProblemChanges_body.php";
 $wgAutoloadClasses['ProblemChangesPager'] = 
"$spReportDir/ProblemChanges_body.php";
 $wgMessagesDirs['ProblemChanges'] = __DIR__ . '/i18n/problemchanges';
-$wgExtensionMessagesFiles['ProblemChanges'] = 
"$langDir/ProblemChanges.i18n.php";
 # Reviewed pages list
 $wgAutoloadClasses['ReviewedPages'] = "$spReportDir/ReviewedPages_body.php";
 $wgAutoloadClasses['ReviewedPagesPager'] = 
"$spReportDir/ReviewedPages_body.php";
 $wgMessagesDirs['ReviewedPages'] = __DIR__ . '/i18n/reviewedpages';
-$wgExtensionMessagesFiles['ReviewedPages'] = "$langDir/ReviewedPages.i18n.php";
 # Stable pages list (for protection config)
 $wgAutoloadClasses['StablePages'] = "$spReportDir/StablePages_body.php";
 $wgAutoloadClasses['StablePagesPager'] = "$spReportDir/StablePages_body.php";
 $wgMessagesDirs['StablePages'] = __DIR__ . '/i18n/stablepages';
-$wgExtensionMessagesFiles['StablePages'] = "$langDir/StablePages.i18n.php";
 # Configured pages list (non-protection config)
 $wgAutoloadClasses['ConfiguredPages'] = 
"$spReportDir/ConfiguredPages_body.php";
 $wgAutoloadClasses['ConfiguredPagesPager'] = 
"$spReportDir/ConfiguredPages_body.php";
 $wgMessagesDirs['ConfiguredPages'] = __DIR__ . '/i18n/configuredpages';
-$wgExtensionMessagesFiles['ConfiguredPages'] = 
"$langDir/ConfiguredPages.i18n.php";
 # Filterable review log page to oversee reviews
 $wgAutoloadClasses['QualityOversight'] = 
"$spReportDir/QualityOversight_body.php";
 $wgMessagesDirs['QualityOversight'] = __DIR__ . '/i18n/qualityoversight';
-$wgExtensionMessagesFiles['QualityOversight'] = 
"$langDir/QualityOversight.i18n.php";
 #

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [WIP] Add atjwiki

2017-06-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359035 )

Change subject: [WIP] Add atjwiki
..

[WIP] Add atjwiki

Bug: T167714
Change-Id: I4ebf0b7cb522087f0bbbd6914b9117b23b12b5c9
---
M dblists/all.dblist
M dblists/s3.dblist
M dblists/small.dblist
M dblists/wikidataclient.dblist
M dblists/wikipedia.dblist
M langlist
A static/images/project-logos/atjwiki.png
M wikiversions.json
M wmf-config/InitialiseSettings.php
9 files changed, 12 insertions(+), 1 deletion(-)


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

diff --git a/dblists/all.dblist b/dblists/all.dblist
index dd37493..c0333b4 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -50,6 +50,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 auditcomwiki
 avwiki
 avwiktionary
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index 0da0603..b9b99d3 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -49,6 +49,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 auditcomwiki
 avwiki
 avwiktionary
diff --git a/dblists/small.dblist b/dblists/small.dblist
index febba09..bd0586f 100644
--- a/dblists/small.dblist
+++ b/dblists/small.dblist
@@ -32,6 +32,7 @@
 aswikibooks
 aswikisource
 aswiktionary
+atjwiki
 auditcomwiki
 avwiki
 avwiktionary
@@ -493,4 +494,4 @@
 zh_min_nanwikisource
 zuwiki
 zuwikibooks
-zuwiktionary
\ No newline at end of file
+zuwiktionary
diff --git a/dblists/wikidataclient.dblist b/dblists/wikidataclient.dblist
index 64a64b3..2ea195d 100644
--- a/dblists/wikidataclient.dblist
+++ b/dblists/wikidataclient.dblist
@@ -32,6 +32,7 @@
 aswiki
 aswikibooks
 aswikisource
+atjwiki
 avwiki
 aywiki
 aywikibooks
diff --git a/dblists/wikipedia.dblist b/dblists/wikipedia.dblist
index 5b58172..ff4c833 100644
--- a/dblists/wikipedia.dblist
+++ b/dblists/wikipedia.dblist
@@ -18,6 +18,7 @@
 arzwiki
 astwiki
 aswiki
+atjwiki
 avwiki
 aywiki
 azwiki
diff --git a/langlist b/langlist
index c19c26d..e276d52 100644
--- a/langlist
+++ b/langlist
@@ -13,6 +13,7 @@
 arz
 as
 ast
+atj
 av
 ay
 az
diff --git a/static/images/project-logos/atjwiki.png 
b/static/images/project-logos/atjwiki.png
new file mode 100644
index 000..1cd930f
--- /dev/null
+++ b/static/images/project-logos/atjwiki.png
Binary files differ
diff --git a/wikiversions.json b/wikiversions.json
index 0cf7c2f..6c47fd6 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -51,6 +51,7 @@
 "aswikibooks": "php-1.30.0-wmf.5",
 "aswikisource": "php-1.30.0-wmf.5",
 "aswiktionary": "php-1.30.0-wmf.5",
+"atjwiki": "php-1.30.0-wmf.4",
 "auditcomwiki": "php-1.30.0-wmf.5",
 "avwiki": "php-1.30.0-wmf.4",
 "avwiktionary": "php-1.30.0-wmf.5",
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e070459..de09e4b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -257,6 +257,7 @@
'arbcom_nlwiki' => 'Europe/Berlin',
'alswiktionary' => 'Europe/Berlin',
'aswikisource' => 'Asia/Kolkata', // T45129
+   'atjwiki' => 'America/Montreal', //T167714
'barwiki' => 'Europe/Berlin',
'bat_smgwiki' => 'Europe/Vilnius',
'bdwikimedia' => 'Asia/Dhaka', // T150252
@@ -503,6 +504,7 @@
'arzwiki' => '/static/images/project-logos/arzwiki.png',
'aswiki' => '/static/images/project-logos/aswiki.png',
'astwiki' => '/static/images/project-logos/astwiki.png',  // T42285, 
T131247
+   'atjwiki' => '/static/images/project-logos/atjwiki.png', //T167714
'avwiki' => '/static/images/project-logos/avwiki.png',  // T48589
'aywiki' => '/static/images/project-logos/aywiki.png',
'azwiki' => '/static/images/project-logos/azwiki.png',  // T50397
@@ -1827,6 +1829,7 @@
'arzwiki' => 'ويكيبيديا',
'astwiktionary' => 'Wikcionariu', // T99315
'aswiki' => 'অসমীয়া ৱিকিপিডিয়া',
+   'atjwiki' => 'Wikipetcia', // T167714
'aswikisource' => 'ৱিকিউৎস', // T45129
'auditcomwiki' => 'Audit Committee',
'azwiki' => 'Vikipediya',
@@ -2324,6 +2327,7 @@
'astwiktionary' => 'Wikcionariu', // T99315
'aswiki' => 'ৱিকিপিডিয়া',
'aswikisource' => 'ৱিকিউৎস', // T45129
+   'atjwiki' => 'Wikipetcia', // T167714
'auditcomwiki' => 'Project',
'avwiki' => 'Википедия', // T155321
'aywiki' => 'Wikipidiya',

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

1 2 3 4 5 >

1 - 100 of 426 matches

Mail list logo