[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: remove dup define in postgresql check

[Dzahn (Code Review)]

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

Change subject: ganglia: remove dup define in postgresql check
..


ganglia: remove dup define in postgresql check

Found using newer version of flake8.

Change-Id: I30350a4e0cc74e95c09692d3dc78088a543e1c3f
---
M modules/postgresql/files/ganglia/postgresql.py
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/modules/postgresql/files/ganglia/postgresql.py 
b/modules/postgresql/files/ganglia/postgresql.py
index 0e948d4..fbd732b 100644
--- a/modules/postgresql/files/ganglia/postgresql.py
+++ b/modules/postgresql/files/ganglia/postgresql.py
@@ -217,13 +217,6 @@
 "query": "SELECT sum(tidx_blks_hit) as tidx_blks_hit FROM " +
  "pg_statio_all_tables;",
 },
-"pg_tidx_blks_hit": {
-"description": "Toast index blocks hit",
-"slope": "positive",
-"units": "blocks",
-"query": "SELECT sum(tidx_blks_hit) as tidx_blks_hit FROM " +
- "pg_statio_all_tables;",
-},
 "pg_bgwriter_buffers_checkpoint": {
 "description": "Buffers written at checkpoint",
 "slope": "positive",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Fix for missing blog segment on Special:RSS_Feeder

[jenkins-bot (Code Review)]

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

Change subject: Fix for missing blog segment on Special:RSS_Feeder
..


Fix for missing blog segment on Special:RSS_Feeder

On Special:RSS_Feeder there should be "Blog", this wasnt working because
wrong function is passed to registerFeed to create it

Its strange to me that evidently this functionality existed it the past,
but i had to implement js part all over again. I wonder if this
functionality was removed intentionaly, or planned to reimplement in a
different way

I hope the german message is ok

ERM: #6407

Needs cherry-picking to REL1_27 and REL1_23

Change-Id: I08d509bf2e98203bbe9271d2dcee78c94d1e9d79
---
M Blog/Blog.class.php
M Blog/extension.json
M Blog/i18n/de.json
M Blog/i18n/en.json
M Blog/i18n/qqq.json
A Blog/resources/bluespice.blog.rssfeeder.integration.js
6 files changed, 32 insertions(+), 7 deletions(-)

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



diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 197ec38..375144c 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -128,7 +128,11 @@
 * @return bool
 */
public function onBeforePageDisplay( &$oOutputPage, &$oSkin ) {
-   $oOutputPage->addModuleStyles( 'ext.bluespice.blog' );
+   $oOutputPage->addModuleStyles( 'ext.bluespice.blog.styles' );
+
+   if( $oOutputPage->getTitle()->isSpecial( 'RSSFeeder' ) ) {
+   $oOutputPage->addModules( 
'ext.bluespice.blog.rssfeeder.integration' );
+   }
 
return true;
}
@@ -687,7 +691,7 @@
$this,
'buildRssNsBlog',
null,
-   'buildRssNsBlog'
+   'buildLinksNs'
);
return true;
}
@@ -724,7 +728,7 @@
 
$oChannel = RSSCreator::createChannel(
RSSCreator::xmlEncode( $wgSitename . ' - ' . $sPageName 
),
-   'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], 
wfMessage( 'bs-rssstandards-description_page' )->plain()
+   'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], 
wfMessage( 'bs-blog-rss-desc-blog' )->plain()
);
 
$oTitle = Title::makeTitle( $iNSid , 'Blog' );
diff --git a/Blog/extension.json b/Blog/extension.json
index 9e4d03f..cd63579 100644
--- a/Blog/extension.json
+++ b/Blog/extension.json
@@ -34,7 +34,13 @@
"SpecialBlog": "includes/specials/SpecialBlog.class.php"
},
"ResourceModules": {
-   "ext.bluespice.blog": {
+   "ext.bluespice.blog.rssfeeder.integration": {
+   "scripts": "bluespice.blog.rssfeeder.integration.js",
+   "dependencies": [
+   "ext.bluespice.extjs"
+   ]
+   },
+   "ext.bluespice.blog.styles": {
"styles": "bluespice.blog.less"
}
},
diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
index 8528c52..83f9968 100644
--- a/Blog/i18n/de.json
+++ b/Blog/i18n/de.json
@@ -36,5 +36,6 @@
"bs-blog-tag-blogtime-desc": "Fügt einen selbstdefinierten Zeitstempel 
zur Anzeige und Sortierung in Blogbeiträgen ein. Das Format ist MMTTSSmm.",
"bs-blog-tag-blogtime-err": "Das Format ist MMDDHHmm, d. h. für den 
12. Jan. 2013 15:43 muss der Zeitstempel wie folgt angegeben sein: 
201301121543",
"bs-tag-blog": "das Blog-Tag",
-   "action-blog-viewspecialpage": "die Spezialseite „{{int:bs-blog-blog}}“ 
anzusehen"
+   "action-blog-viewspecialpage": "die Spezialseite „{{int:bs-blog-blog}}“ 
anzusehen",
+   "bs-blog-rss-desc-blog": "Überblick über die Blogeinträge"
 }
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
index a0777a9..7667ea4 100644
--- a/Blog/i18n/en.json
+++ b/Blog/i18n/en.json
@@ -34,5 +34,6 @@
"bs-blog-tag-blogtime-desc": "Inserts a self defined time stamp for 
display and sorting in blog posts. The format is MMDDHHmm.",
"bs-blog-tag-blogtime-err": "The format has to be MMDDHHmm i.e. for 
12. Jan. 2013 15:43 the timestamps looks like: 201301121543",
"bs-tag-blog": "the blog tag",
-   "action-blog-viewspecialpage":"view the special page 
\"{{int:bs-blog-blog}}\""
+   "action-blog-viewspecialpage":"view the special page 
\"{{int:bs-blog-blog}}\"",
+   "bs-blog-rss-desc-blog": "Feed with an overview over the blog entries"
 }
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
index bd51246..716da02 100644
--- a/Blog/i18n/qqq.json
+++ b/Blog/i18n/qqq.json
@@ -38,5 +38,6 @@
"bs-blog-tag-blogtime-desc": "Used in InsertMagic extension, tag 
description for setting blog timestamp on every 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Fix for missing blog segment on Special:RSS_Feeder

[jenkins-bot (Code Review)]

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

Change subject: Fix for missing blog segment on Special:RSS_Feeder
..


Fix for missing blog segment on Special:RSS_Feeder

On Special:RSS_Feeder there should be "Blog", this wasnt working because
wrong function is passed to registerFeed to create it

Its strange to me that evidently this functionality existed it the past,
but i had to implement js part all over again. I wonder if this
functionality was removed intentionaly, or planned to reimplement in a
different way

I hope the german message is ok

ERM: #6407

Needs cherry-picking to REL1_27 and REL1_23

Change-Id: I08d509bf2e98203bbe9271d2dcee78c94d1e9d79
---
M Blog/Blog.class.php
M Blog/extension.json
M Blog/i18n/de.json
M Blog/i18n/en.json
M Blog/i18n/qqq.json
A Blog/resources/bluespice.blog.rssfeeder.integration.js
6 files changed, 32 insertions(+), 7 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  Raimond Spekking: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 197ec38..375144c 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -128,7 +128,11 @@
 * @return bool
 */
public function onBeforePageDisplay( &$oOutputPage, &$oSkin ) {
-   $oOutputPage->addModuleStyles( 'ext.bluespice.blog' );
+   $oOutputPage->addModuleStyles( 'ext.bluespice.blog.styles' );
+
+   if( $oOutputPage->getTitle()->isSpecial( 'RSSFeeder' ) ) {
+   $oOutputPage->addModules( 
'ext.bluespice.blog.rssfeeder.integration' );
+   }
 
return true;
}
@@ -687,7 +691,7 @@
$this,
'buildRssNsBlog',
null,
-   'buildRssNsBlog'
+   'buildLinksNs'
);
return true;
}
@@ -724,7 +728,7 @@
 
$oChannel = RSSCreator::createChannel(
RSSCreator::xmlEncode( $wgSitename . ' - ' . $sPageName 
),
-   'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], 
wfMessage( 'bs-rssstandards-description_page' )->plain()
+   'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], 
wfMessage( 'bs-blog-rss-desc-blog' )->plain()
);
 
$oTitle = Title::makeTitle( $iNSid , 'Blog' );
diff --git a/Blog/extension.json b/Blog/extension.json
index 53837a5..afe2b32 100644
--- a/Blog/extension.json
+++ b/Blog/extension.json
@@ -34,7 +34,13 @@
"SpecialBlog": "includes/specials/SpecialBlog.class.php"
},
"ResourceModules": {
-   "ext.bluespice.blog": {
+   "ext.bluespice.blog.rssfeeder.integration": {
+   "scripts": "bluespice.blog.rssfeeder.integration.js",
+   "dependencies": [
+   "ext.bluespice.extjs"
+   ]
+   },
+   "ext.bluespice.blog.styles": {
"styles": "bluespice.blog.less"
}
},
diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
index 8528c52..83f9968 100644
--- a/Blog/i18n/de.json
+++ b/Blog/i18n/de.json
@@ -36,5 +36,6 @@
"bs-blog-tag-blogtime-desc": "Fügt einen selbstdefinierten Zeitstempel 
zur Anzeige und Sortierung in Blogbeiträgen ein. Das Format ist MMTTSSmm.",
"bs-blog-tag-blogtime-err": "Das Format ist MMDDHHmm, d. h. für den 
12. Jan. 2013 15:43 muss der Zeitstempel wie folgt angegeben sein: 
201301121543",
"bs-tag-blog": "das Blog-Tag",
-   "action-blog-viewspecialpage": "die Spezialseite „{{int:bs-blog-blog}}“ 
anzusehen"
+   "action-blog-viewspecialpage": "die Spezialseite „{{int:bs-blog-blog}}“ 
anzusehen",
+   "bs-blog-rss-desc-blog": "Überblick über die Blogeinträge"
 }
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
index a0777a9..7667ea4 100644
--- a/Blog/i18n/en.json
+++ b/Blog/i18n/en.json
@@ -34,5 +34,6 @@
"bs-blog-tag-blogtime-desc": "Inserts a self defined time stamp for 
display and sorting in blog posts. The format is MMDDHHmm.",
"bs-blog-tag-blogtime-err": "The format has to be MMDDHHmm i.e. for 
12. Jan. 2013 15:43 the timestamps looks like: 201301121543",
"bs-tag-blog": "the blog tag",
-   "action-blog-viewspecialpage":"view the special page 
\"{{int:bs-blog-blog}}\""
+   "action-blog-viewspecialpage":"view the special page 
\"{{int:bs-blog-blog}}\"",
+   "bs-blog-rss-desc-blog": "Feed with an overview over the blog entries"
 }
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
index 5f8e71d..66bbcfb 100644
--- a/Blog/i18n/qqq.json
+++ b/Blog/i18n/qqq.json
@@ -39,5 +39,6 @@
"bs-blog-tag-blogtime-desc": "Used in InsertMagic 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Fix for missing blog segment on Special:RSS_Feeder

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356331 )

Change subject: Fix for missing blog segment on Special:RSS_Feeder
..

Fix for missing blog segment on Special:RSS_Feeder

On Special:RSS_Feeder there should be "Blog", this wasnt working because
wrong function is passed to registerFeed to create it

Its strange to me that evidently this functionality existed it the past,
but i had to implement js part all over again. I wonder if this
functionality was removed intentionaly, or planned to reimplement in a
different way

I hope the german message is ok

ERM: #6407

Needs cherry-picking to REL1_27 and REL1_23

Change-Id: I08d509bf2e98203bbe9271d2dcee78c94d1e9d79
---
M Blog/Blog.class.php
M Blog/extension.json
M Blog/i18n/de.json
M Blog/i18n/en.json
M Blog/i18n/qqq.json
A Blog/resources/bluespice.blog.rssfeeder.integration.js
6 files changed, 32 insertions(+), 7 deletions(-)


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

diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 197ec38..375144c 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -128,7 +128,11 @@
 * @return bool
 */
public function onBeforePageDisplay( &$oOutputPage, &$oSkin ) {
-   $oOutputPage->addModuleStyles( 'ext.bluespice.blog' );
+   $oOutputPage->addModuleStyles( 'ext.bluespice.blog.styles' );
+
+   if( $oOutputPage->getTitle()->isSpecial( 'RSSFeeder' ) ) {
+   $oOutputPage->addModules( 
'ext.bluespice.blog.rssfeeder.integration' );
+   }
 
return true;
}
@@ -687,7 +691,7 @@
$this,
'buildRssNsBlog',
null,
-   'buildRssNsBlog'
+   'buildLinksNs'
);
return true;
}
@@ -724,7 +728,7 @@
 
$oChannel = RSSCreator::createChannel(
RSSCreator::xmlEncode( $wgSitename . ' - ' . $sPageName 
),
-   'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], 
wfMessage( 'bs-rssstandards-description_page' )->plain()
+   'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], 
wfMessage( 'bs-blog-rss-desc-blog' )->plain()
);
 
$oTitle = Title::makeTitle( $iNSid , 'Blog' );
diff --git a/Blog/extension.json b/Blog/extension.json
index 9e4d03f..cd63579 100644
--- a/Blog/extension.json
+++ b/Blog/extension.json
@@ -34,7 +34,13 @@
"SpecialBlog": "includes/specials/SpecialBlog.class.php"
},
"ResourceModules": {
-   "ext.bluespice.blog": {
+   "ext.bluespice.blog.rssfeeder.integration": {
+   "scripts": "bluespice.blog.rssfeeder.integration.js",
+   "dependencies": [
+   "ext.bluespice.extjs"
+   ]
+   },
+   "ext.bluespice.blog.styles": {
"styles": "bluespice.blog.less"
}
},
diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
index 8528c52..83f9968 100644
--- a/Blog/i18n/de.json
+++ b/Blog/i18n/de.json
@@ -36,5 +36,6 @@
"bs-blog-tag-blogtime-desc": "Fügt einen selbstdefinierten Zeitstempel 
zur Anzeige und Sortierung in Blogbeiträgen ein. Das Format ist MMTTSSmm.",
"bs-blog-tag-blogtime-err": "Das Format ist MMDDHHmm, d. h. für den 
12. Jan. 2013 15:43 muss der Zeitstempel wie folgt angegeben sein: 
201301121543",
"bs-tag-blog": "das Blog-Tag",
-   "action-blog-viewspecialpage": "die Spezialseite „{{int:bs-blog-blog}}“ 
anzusehen"
+   "action-blog-viewspecialpage": "die Spezialseite „{{int:bs-blog-blog}}“ 
anzusehen",
+   "bs-blog-rss-desc-blog": "Überblick über die Blogeinträge"
 }
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
index a0777a9..7667ea4 100644
--- a/Blog/i18n/en.json
+++ b/Blog/i18n/en.json
@@ -34,5 +34,6 @@
"bs-blog-tag-blogtime-desc": "Inserts a self defined time stamp for 
display and sorting in blog posts. The format is MMDDHHmm.",
"bs-blog-tag-blogtime-err": "The format has to be MMDDHHmm i.e. for 
12. Jan. 2013 15:43 the timestamps looks like: 201301121543",
"bs-tag-blog": "the blog tag",
-   "action-blog-viewspecialpage":"view the special page 
\"{{int:bs-blog-blog}}\""
+   "action-blog-viewspecialpage":"view the special page 
\"{{int:bs-blog-blog}}\"",
+   "bs-blog-rss-desc-blog": "Feed with an overview over the blog entries"
 }
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
index bd51246..716da02 100644
--- a/Blog/i18n/qqq.json
+++ b/Blog/i18n/qqq.json
@@ -38,5 +38,6 @@
"bs-blog-tag-blogtime-desc": "Used in InsertMagic extension, tag 
description for setting blog 

[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Reducde maximum limit from 5000 to 50

[Nikerabbit (Code Review)]

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

Change subject: Reducde maximum limit from 5000 to 50
..

Reducde maximum limit from 5000 to 50

It is very slow, so small maximum limit must be enforced to avoid
timeouts.

Bug: T155265
Follow-up: I9ed476fe208ea3
Change-Id: I1e036f9ea2314442c51ff02a972a21f5fe47070e
---
M pages/TalkpageView.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads 
refs/changes/30/356330/1

diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index 11bab19..818634b 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -439,14 +439,14 @@
 
parent::__construct();
 
-   $this->setLimit( $this->getPageLimit() );
+   $this->setLimit( min( 50, $this->getPageLimit() ) );
}
 
function getPageLimit() {
$article = $this->article;
 
global $wgRequest;
-   $requestedLimit = $wgRequest->getVal( 'limit', null );
+   $requestedLimit = $wgRequest->getInt( 'limit', null );
if ( $requestedLimit ) {
return $requestedLimit;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e036f9ea2314442c51ff02a972a21f5fe47070e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Define no tools for ImageTranslationUnit

[Santhosh (Code Review)]

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

Change subject: CX2: Define no tools for ImageTranslationUnit
..

CX2: Define no tools for ImageTranslationUnit

Inheriting all tools from section translation unit does not make sense
for images. However, image caption, will be a section translation unit
and will get all tools.

Change-Id: Icb07302900a531afbb1a6730589dfe63e38c40b5
---
M modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/29/356329/1

diff --git a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js 
b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
index d236dae..e4fd820 100644
--- a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
@@ -21,6 +21,7 @@
 mw.cx.ui.ImageTranslationUnit.static.tags = [ 'figure' ];
 mw.cx.ui.ImageTranslationUnit.static.matchRdfaTypes = [ 'mw:Image/Thumb' ];
 mw.cx.ui.ImageTranslationUnit.static.highlightClass = 'cx-image-highlight';
+mw.cx.ui.ImageTranslationUnit.static.tools = {};
 
 mw.cx.ui.ImageTranslationUnit.prototype.adapt = function () {
this.model.adapt();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb07302900a531afbb1a6730589dfe63e38c40b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Correct the data value for InstructionsTool

[Santhosh (Code Review)]

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

Change subject: CX2: Correct the data value for InstructionsTool
..

CX2: Correct the data value for InstructionsTool

The InstructionsTool does not have any model associated. So
calling model.getId will throw error. Set the data value
as instructions::1

Change-Id: I6c3b24e0e019afa0b4c518e0e92b4bea342f92ff
---
M modules/tools/mw.cx.tools.InstructionsTool.js
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/28/356328/1

diff --git a/modules/tools/mw.cx.tools.InstructionsTool.js 
b/modules/tools/mw.cx.tools.InstructionsTool.js
index 361fc98..29b9cf0 100644
--- a/modules/tools/mw.cx.tools.InstructionsTool.js
+++ b/modules/tools/mw.cx.tools.InstructionsTool.js
@@ -91,5 +91,9 @@
return $content;
 };
 
+mw.cx.tools.InstructionsTool.prototype.getData = function () {
+   return this.constructor.static.name + '::' + 1;
+};
+
 /* Register */
 mw.cx.tools.translationToolFactory.register( mw.cx.tools.InstructionsTool );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c3b24e0e019afa0b4c518e0e92b4bea342f92ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Set the data attribute for TranslationToolWidget

[Santhosh (Code Review)]

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

Change subject: CX2: Set the data attribute for TranslationToolWidget
..

CX2: Set the data attribute for TranslationToolWidget

This is required when we want to check for duplicates in the tools
container.

Change-Id: If99d24c8d213f7ea15f36e504c37e570f8355c88
---
M modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js 
b/modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
index 7993169..10d0d4d 100644
--- a/modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
+++ b/modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
@@ -11,13 +11,15 @@
  * @cfg {string} title The tool title
  */
 mw.cx.widgets.TranslationToolWidget = function CXTranslationToolWidget( 
translationTool, config ) {
+   this.translationTool = translationTool;
config = $.extend( {}, config, {
classes: [ 'cx-card', 'cx-card-' + config.name ],
expanded: false,
framed: true,
-   padded: false
+   padded: false,
+   data: this.translationTool.getData()
} );
-   this.translationTool = translationTool;
+
// Parent constructor
mw.cx.widgets.TranslationToolWidget.parent.call( this, config );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If99d24c8d213f7ea15f36e504c37e570f8355c88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Guard against duplicate cards in the tools column

[Santhosh (Code Review)]

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

Change subject: CX2: Guard against duplicate cards in the tools column
..

CX2: Guard against duplicate cards in the tools column

Since we defined multiple triggers for a single tool, if both
triggers happen at once, duplicate cards can appear in tools column.

For example,  'click', 'focus' can happen together.

Prevent duplicate cards appearing in translation column by checking
the data value of each cards.

Change-Id: I6a83a51aec7ba7c376dfe9785aeeb1a55fc73e33
---
M modules/ui/mw.cx.ui.ToolsColumn.js
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/modules/ui/mw.cx.ui.ToolsColumn.js 
b/modules/ui/mw.cx.ui.ToolsColumn.js
index 79609a3..11ba651 100644
--- a/modules/ui/mw.cx.ui.ToolsColumn.js
+++ b/modules/ui/mw.cx.ui.ToolsColumn.js
@@ -89,11 +89,15 @@
 };
 
 /**
- * Show a single tool in tools container
+ * Show a single tool in tools container.
+ * Avoid duplicates by checking if the tool is already in the container.
+ *
  * @param {mw.cx.tools.TranslationTool} tool The translation tool instance
  */
 mw.cx.ui.ToolsColumn.prototype.showTool = function ( tool ) {
-   this.toolContainer.addItems( [ tool.getCard() ] );
+   if ( !this.toolContainer.getItemsFromData( tool.getData() ).length ) {
+   this.toolContainer.addItems( [ tool.getCard() ] );
+   }
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a83a51aec7ba7c376dfe9785aeeb1a55fc73e33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Define the data for TranslationTool independent of data...

[Santhosh (Code Review)]

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

Change subject: CX2: Define the data for TranslationTool independent of data 
model
..

CX2: Define the data for TranslationTool independent of data model

The model.getId method adds model name to the output.
A tool can be initiated from multiple models, So, for the tools,
the data need not contain model name.

Change-Id: I7ce8994c6cf11503d8ae509ab63976fb2d4e2cf8
---
M modules/tools/mw.cx.tools.TranslationTool.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/tools/mw.cx.tools.TranslationTool.js 
b/modules/tools/mw.cx.tools.TranslationTool.js
index 805310d..f974785 100644
--- a/modules/tools/mw.cx.tools.TranslationTool.js
+++ b/modules/tools/mw.cx.tools.TranslationTool.js
@@ -91,7 +91,7 @@
 };
 
 mw.cx.tools.TranslationTool.prototype.getData = function () {
-   return this.constructor.static.name + '::' + this.model.getId();
+   return this.constructor.static.name + '::' + this.model.getSectionId();
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ce8994c6cf11503d8ae509ab63976fb2d4e2cf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update documentation URL

[jenkins-bot (Code Review)]

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

Change subject: Update documentation URL
..


Update documentation URL

Change-Id: I6a32689c5d224674fe96ad631b073f9efba47e3f
---
M includes/mail/EmailNotification.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/mail/EmailNotification.php 
b/includes/mail/EmailNotification.php
index d66e7e3..932797a 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -43,7 +43,8 @@
  * of sending out bulk mails (bcc:user1,user2...) for all these users having 
the
  * same timeoffset in their preferences.
  *
- * Visit the documentation pages under http://meta.wikipedia.com/Enotif
+ * Visit the documentation pages under
+ * https://www.mediawiki.org/wiki/Help:Watching_pages
  */
 class EmailNotification {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a32689c5d224674fe96ad631b073f9efba47e3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
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] operations/puppet[production]: monitoring/base: add nagios sudo privs for IPMI sensors

[Dzahn (Code Review)]

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

Change subject: monitoring/base: add nagios sudo privs for IPMI sensors
..


monitoring/base: add nagios sudo privs for IPMI sensors

The nagios user needs to be able to run ipmi-sel and ipmi-sensors with root
orivs to be able to run IPMI temperature checks, otherwise Iefd4e699302a7adc155
would not work yet and get UNKNOWNS.

From check_ipmi_sensors:

 64For \"-H localhost\" or if no host is specified (local computer) the
 65Nagios/Icinga user must be allowed to run
 66ipmimonitoring/ipmi-sensors/ipmi-sel/[ipmi-fru] with root privileges
 67or via sudo (ipmimonitoring/ipmi-sensors/ipmi-sel/[ipmi-fru] must be
 68able to access the IPMI devices via the IPMI system interface).

This is like for some other existing nagios checks in base, like 
check_puppet_run etc.

Bug: T125205
Change-Id: Ifbefd75a3f82654f8fd0f6b6917cb111b81a6a2a
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 8cc3e64..db6a9f3 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -158,6 +158,12 @@
 
 # check temperature sensors via IPMI, unless VM (T125205)
 if str2bool($facts['is_virtual']) == false {
+
+::sudo::user { 'nagios_ipmi_temp':
+user   => 'nagios',
+privileges => ['ALL = NOPASSWD: /usr/sbin/ipmi-sel, 
/usr/sbin/ipmi-sensors'],
+}
+
 nrpe::monitor_service { 'check_ipmi_temp':
 description  => 'IPMI Temperature',
 nrpe_command => '/usr/local/lib/nagios/plugins/check_ipmi_sensor 
--noentityabsent -T Temperature -ST Temperature',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbefd75a3f82654f8fd0f6b6917cb111b81a6a2a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Volans 
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]: monitoring/base: add nagios sudo privs for IPMI sensors

[Dzahn (Code Review)]

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

Change subject: monitoring/base: add nagios sudo privs for IPMI sensors
..

monitoring/base: add nagios sudo privs for IPMI sensors

The nagios user needs to be able to run ipmi-sel and ipmi-sensors
to be able to run IPMI temperature checks, otherwise Iefd4e699302a7adc155
would not work yet and get UNKNOWNS.

From check_ipmi_sensors:

 64For \"-H localhost\" or if no host is specified (local computer) the
 65Nagios/Icinga user must be allowed to run
 66ipmimonitoring/ipmi-sensors/ipmi-sel/[ipmi-fru] with root privileges
 67or via sudo (ipmimonitoring/ipmi-sensors/ipmi-sel/[ipmi-fru] must be
 68able to access the IPMI devices via the IPMI system interface).

This is like for some other existing nagios checks in base, like 
check_puppet_run etc.

Bug: T125205
Change-Id: Ifbefd75a3f82654f8fd0f6b6917cb111b81a6a2a
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/356324/1

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 8cc3e64..db6a9f3 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -158,6 +158,12 @@
 
 # check temperature sensors via IPMI, unless VM (T125205)
 if str2bool($facts['is_virtual']) == false {
+
+::sudo::user { 'nagios_ipmi_temp':
+user   => 'nagios',
+privileges => ['ALL = NOPASSWD: /usr/sbin/ipmi-sel, 
/usr/sbin/ipmi-sensors'],
+}
+
 nrpe::monitor_service { 'check_ipmi_temp':
 description  => 'IPMI Temperature',
 nrpe_command => '/usr/local/lib/nagios/plugins/check_ipmi_sensor 
--noentityabsent -T Temperature -ST Temperature',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbefd75a3f82654f8fd0f6b6917cb111b81a6a2a
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]: Update documentation URL

[MarkAHershberger (Code Review)]

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

Change subject: Update documentation URL
..

Update documentation URL

Change-Id: I6a32689c5d224674fe96ad631b073f9efba47e3f
---
M includes/mail/EmailNotification.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/mail/EmailNotification.php 
b/includes/mail/EmailNotification.php
index d66e7e3..932797a 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -43,7 +43,8 @@
  * of sending out bulk mails (bcc:user1,user2...) for all these users having 
the
  * same timeoffset in their preferences.
  *
- * Visit the documentation pages under http://meta.wikipedia.com/Enotif
+ * Visit the documentation pages under
+ * https://www.mediawiki.org/wiki/Help:Watching_pages
  */
 class EmailNotification {
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: monitoring/base: add temperature monitoring via NRPE

[Dzahn (Code Review)]

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

Change subject: monitoring/base: add temperature monitoring via NRPE
..


monitoring/base: add temperature monitoring via NRPE

Adds an Icinga check on all non-virtual hosts, to check the
temperature via IPMI and NRPE.

The check_ipmi_sensors plugin can check different IPMI sensor
types. This limits it to temperature.

  [-T ]
   limit sensors to query based on IPMI sensor type.
   Examples for IPMI sensor types are 'Fan', 'Temperature', 'Voltage', ...
   See the output of the FreeIPMI command 'ipmi-sensors -L' and chapter
   '42.2 Sensor Type Codes and Data' of the IPMI 2.0 spec for a full list
   of possible sensor types. The available types depend on your particular
   server and the available sensors there.

Bug: T125205
Change-Id: Iefd4e699302a7adc15537cdbdb71bcaa0dced18c
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 6d19fe1..8cc3e64 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -155,4 +155,12 @@
 nrpe_command => '/usr/local/lib/nagios/plugins/check_cpufreq 600',
 }
 }
+
+# check temperature sensors via IPMI, unless VM (T125205)
+if str2bool($facts['is_virtual']) == false {
+nrpe::monitor_service { 'check_ipmi_temp':
+description  => 'IPMI Temperature',
+nrpe_command => '/usr/local/lib/nagios/plugins/check_ipmi_sensor 
--noentityabsent -T Temperature -ST Temperature',
+}
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefd4e699302a7adc15537cdbdb71bcaa0dced18c
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up 8c94697f: Actually commit the icon changes I had l...

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 8c94697f: Actually commit the icon changes I had 
locally
..


Follow-up 8c94697f: Actually commit the icon changes I had locally

Change-Id: I64e9953803690f54891cca8be4963128aa4b75c5
---
M .jsduck/eg-iframe.html
M build/modules.json
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/minimal-rtl.html
M demos/ve/minimal.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M demos/ve/ve.demo.SurfaceContainer.js
M src/ui/contextitems/ve.ui.LinearContextItem.js
M src/ui/contextitems/ve.ui.TableLineContextItem.js
M src/ui/tools/ve.ui.AuthorListPopupTool.js
12 files changed, 56 insertions(+), 4 deletions(-)

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



diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 37b7208..21fde0b 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -6,6 +6,10 @@
 


+   
+   
+   
+   



diff --git a/build/modules.json b/build/modules.json
index 2ea4c8d..cc13c8f 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -64,6 +64,10 @@
],
"styles": [
"lib/oojs-ui/oojs-ui-apex.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-alerts.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-interactions.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-moderation.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-user.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-core.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css",
@@ -79,6 +83,10 @@
],
"styles": [
"lib/oojs-ui/oojs-ui-wikimediaui.css",
+   "lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css",
+   
"lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css",
+   "lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css",
+   "lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css",

"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css",

"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css",

"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css",
diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html
index 4ab2d96..f48a7d1 100644
--- a/demos/ve/desktop-dist.html
+++ b/demos/ve/desktop-dist.html
@@ -15,6 +15,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index da8e2d8..1a01671 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -18,6 +18,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git a/demos/ve/minimal-rtl.html b/demos/ve/minimal-rtl.html
index 2bc64ce..3d2b6a0 100644
--- a/demos/ve/minimal-rtl.html
+++ b/demos/ve/minimal-rtl.html
@@ -14,6 +14,10 @@
 


+   
+   
+   
+   



diff --git a/demos/ve/minimal.html b/demos/ve/minimal.html
index b195623..e91f2b0 100644
--- a/demos/ve/minimal.html
+++ b/demos/ve/minimal.html
@@ -14,6 +14,10 @@
 


+   
+   
+   
+   



diff --git a/demos/ve/mobile-dist.html b/demos/ve/mobile-dist.html
index 7556448..39ea874 100644
--- a/demos/ve/mobile-dist.html
+++ b/demos/ve/mobile-dist.html
@@ -15,6 +15,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index d524e0b..c12f345 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -18,6 +18,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up 8c94697f: Actually commit the icon changes I had l...

[Jforrester (Code Review)]

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

Change subject: Follow-up 8c94697f: Actually commit the icon changes I had 
locally
..

Follow-up 8c94697f: Actually commit the icon changes I had locally

Change-Id: I64e9953803690f54891cca8be4963128aa4b75c5
---
M .jsduck/eg-iframe.html
M build/modules.json
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/minimal-rtl.html
M demos/ve/minimal.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M demos/ve/ve.demo.SurfaceContainer.js
M src/ui/contextitems/ve.ui.LinearContextItem.js
M src/ui/contextitems/ve.ui.TableLineContextItem.js
M src/ui/tools/ve.ui.AuthorListPopupTool.js
12 files changed, 56 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/22/356322/1

diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 37b7208..21fde0b 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -6,6 +6,10 @@
 


+   
+   
+   
+   



diff --git a/build/modules.json b/build/modules.json
index 2ea4c8d..cc13c8f 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -64,6 +64,10 @@
],
"styles": [
"lib/oojs-ui/oojs-ui-apex.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-alerts.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-interactions.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-moderation.css",
+   "lib/oojs-ui/oojs-ui-apex-icons-user.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-core.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css",
"lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css",
@@ -79,6 +83,10 @@
],
"styles": [
"lib/oojs-ui/oojs-ui-wikimediaui.css",
+   "lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css",
+   
"lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css",
+   "lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css",
+   "lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css",

"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css",

"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css",

"lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css",
diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html
index 4ab2d96..f48a7d1 100644
--- a/demos/ve/desktop-dist.html
+++ b/demos/ve/desktop-dist.html
@@ -15,6 +15,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index da8e2d8..1a01671 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -18,6 +18,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git a/demos/ve/minimal-rtl.html b/demos/ve/minimal-rtl.html
index 2bc64ce..3d2b6a0 100644
--- a/demos/ve/minimal-rtl.html
+++ b/demos/ve/minimal-rtl.html
@@ -14,6 +14,10 @@
 


+   
+   
+   
+   



diff --git a/demos/ve/minimal.html b/demos/ve/minimal.html
index b195623..e91f2b0 100644
--- a/demos/ve/minimal.html
+++ b/demos/ve/minimal.html
@@ -14,6 +14,10 @@
 


+   
+   
+   
+   



diff --git a/demos/ve/mobile-dist.html b/demos/ve/mobile-dist.html
index 7556448..39ea874 100644
--- a/demos/ve/mobile-dist.html
+++ b/demos/ve/mobile-dist.html
@@ -15,6 +15,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index d524e0b..c12f345 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -18,6 +18,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



diff 

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix user talk exception for blacklist

[jenkins-bot (Code Review)]

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

Change subject: Fix user talk exception for blacklist
..


Fix user talk exception for blacklist

There was a null-dereference for events without titles.

Also, it should only whitelist their own user talk space, not e.g.
mentions on someone else's user talk space.

Bug: T150419
Bug: T166627
Change-Id: If7d9cad4eb33ce1f1e6b7d86244332ad5dece954
---
M includes/controller/NotificationController.php
1 file changed, 13 insertions(+), 1 deletion(-)

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



diff --git a/includes/controller/NotificationController.php 
b/includes/controller/NotificationController.php
index 66ced23..1706bcb 100644
--- a/includes/controller/NotificationController.php
+++ b/includes/controller/NotificationController.php
@@ -433,7 +433,19 @@
 
// Apply blacklists and whitelists.
$notify->addFilter( function ( $user ) use ( $event ) {
-   if ( self::isBlacklistedByUser( $event, $user ) && 
$event->getTitle()->getNamespace() !== NS_USER_TALK ) {
+   $title = $event->getTitle();
+
+   if ( self::isBlacklistedByUser( $event, $user ) &&
+   (
+   $title === null ||
+   !(
+   // Still notify for posts 
anywhere in
+   // user's talk space
+   $title->getRootText() === 
$user->getName() &&
+   $title->getNamespace() === 
NS_USER_TALK
+   )
+   )
+   ) {
return self::isWhitelistedByUser( $event, $user 
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7d9cad4eb33ce1f1e6b7d86244332ad5dece954
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Depend on OOjs v2.1.0, up from v2.0.0

[Jforrester (Code Review)]

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

Change subject: [BREAKING CHANGE] Depend on OOjs v2.1.0, up from v2.0.0
..

[BREAKING CHANGE] Depend on OOjs v2.1.0, up from v2.0.0

This is a breaking change as it alters the requirements on downstream
users of the library to provide an environment with the new version.

Change-Id: I47a312631004bf2d9ecfa8302b9554dd59317b1f
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/21/356321/1

diff --git a/package.json b/package.json
index 15eed0d..9fd2bf0 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
 "jquery": "3.2.1",
-"oojs": "2.0.0"
+"oojs": "2.1.0"
   },
   "devDependencies": {
 "eslint-config-wikimedia": "0.4.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47a312631004bf2d9ecfa8302b9554dd59317b1f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] VisualEditor/VisualEditor[master]: Update OOjs to v2.1.0

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs to v2.1.0
..


Update OOjs to v2.1.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJS/browse/master/History.md;v2.1.0

Change-Id: I26f75fad8b4a0dcee7ff9cf29e1cede5ee9e0baa
---
M bin/update-oojs.sh
M lib/oojs/AUTHORS.txt
A lib/oojs/LICENSE-MIT
M lib/oojs/oojs.jquery.js
4 files changed, 78 insertions(+), 24 deletions(-)

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



diff --git a/bin/update-oojs.sh b/bin/update-oojs.sh
index 69e31a6..9c4b041 100755
--- a/bin/update-oojs.sh
+++ b/bin/update-oojs.sh
@@ -38,6 +38,9 @@
 
 # Copy file(s)
 rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/AUTHORS.txt "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/LICENSE-MIT "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/README.md "$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"
diff --git a/lib/oojs/AUTHORS.txt b/lib/oojs/AUTHORS.txt
index f5bce10..97fee0a 100644
--- a/lib/oojs/AUTHORS.txt
+++ b/lib/oojs/AUTHORS.txt
@@ -1,7 +1,9 @@
 Bartosz Dziewoński 
+C. Scott Ananian 
 David Chan 
 Ed Sanders 
 James D. Forrester 
+Moriel Schottlender 
 Ori Livneh 
 Roan Kattouw 
 Timo Tijhof 
diff --git a/lib/oojs/LICENSE-MIT b/lib/oojs/LICENSE-MIT
new file mode 100644
index 000..c6bbee2
--- /dev/null
+++ b/lib/oojs/LICENSE-MIT
@@ -0,0 +1,20 @@
+Copyright 2011-2017 OOjs Team and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/oojs/oojs.jquery.js b/lib/oojs/oojs.jquery.js
index f93051c..8cc6f11 100644
--- a/lib/oojs/oojs.jquery.js
+++ b/lib/oojs/oojs.jquery.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs v2.0.0 optimised for jQuery
+ * OOjs v2.1.0 optimised for jQuery
  * https://www.mediawiki.org/wiki/OOjs
  *
  * Copyright 2011-2017 OOjs Team and other contributors.
  * Released under the MIT license
  * https://oojs.mit-license.org
  *
- * Date: 2017-04-05T02:18:04Z
+ * Date: 2017-05-30T22:56:52Z
  */
 ( function ( global ) {
 
@@ -683,6 +683,24 @@
}
}
 
+   /**
+* @private
+* @param {OO.EventEmitter} ee
+* @param {Function|string} method Function or method name
+* @param {Object} binding
+*/
+   function addBinding( ee, event, binding ) {
+   var bindings;
+   // Auto-initialize bindings list
+   if ( hasOwn.call( ee.bindings, event ) ) {
+   bindings = ee.bindings[ event ];
+   } else {
+   bindings = ee.bindings[ event ] = [];
+   }
+   // Add binding
+   bindings.push( binding );
+   }
+
/* Methods */
 
/**
@@ -699,21 +717,14 @@
 * @chainable
 */
oo.EventEmitter.prototype.on = function ( event, method, args, context 
) {
-   var bindings;
-
validateMethod( method, context );
 
-   if ( hasOwn.call( this.bindings, event ) ) {
-   bindings = this.bindings[ event ];
-   } else {
-   // Auto-initialize bindings list
-   bindings = this.bindings[ event ] = [];
-   }
-   // Add binding
-   bindings.push( {
+   // Ensure consistent object shape (optimisation)
+   addBinding( this, event, {
method: method,
args: args,
-   context: ( arguments.length < 4 ) ? null : context
+   context: ( 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.22.0

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.22.0
..


Update OOjs UI to v0.22.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.0

Change-Id: I93b66d5339e6766f46dfcc5b22abaeadd74d8da0
---
M .jsduck/categories.json
M Gruntfile.js
M build/modules.json
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
A lib/oojs-ui/AUTHORS.txt
A lib/oojs-ui/LICENSE-MIT
A lib/oojs-ui/README.md
M lib/oojs-ui/i18n/id.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
A lib/oojs-ui/oojs-ui-apex-icons-user.css
A lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-core-wikimediaui.css
A lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
D lib/oojs-ui/oojs-ui-images-mediawiki.css
D lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-images-wikimediaui.css
A lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.js.map
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
A lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-toolbars.js.map
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
A lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
A 

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix user talk exception for blacklist

[Mattflaschen (Code Review)]

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

Change subject: Fix user talk exception for blacklist
..

Fix user talk exception for blacklist

There was a null-dereference for events without titles.

Also, it should only whitelist their own user talk space, not e.g.
mentions on someone else's user talk space.

Bug: T150419
Bug: T166627
Change-Id: If7d9cad4eb33ce1f1e6b7d86244332ad5dece954
---
M includes/controller/NotificationController.php
1 file changed, 13 insertions(+), 1 deletion(-)


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

diff --git a/includes/controller/NotificationController.php 
b/includes/controller/NotificationController.php
index 66ced23..1706bcb 100644
--- a/includes/controller/NotificationController.php
+++ b/includes/controller/NotificationController.php
@@ -433,7 +433,19 @@
 
// Apply blacklists and whitelists.
$notify->addFilter( function ( $user ) use ( $event ) {
-   if ( self::isBlacklistedByUser( $event, $user ) && 
$event->getTitle()->getNamespace() !== NS_USER_TALK ) {
+   $title = $event->getTitle();
+
+   if ( self::isBlacklistedByUser( $event, $user ) &&
+   (
+   $title === null ||
+   !(
+   // Still notify for posts 
anywhere in
+   // user's talk space
+   $title->getRootText() === 
$user->getName() &&
+   $title->getNamespace() === 
NS_USER_TALK
+   )
+   )
+   ) {
return self::isWhitelistedByUser( $event, $user 
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7d9cad4eb33ce1f1e6b7d86244332ad5dece954
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] VisualEditor/VisualEditor[master]: Update OOjs to v2.1.0

[Jforrester (Code Review)]

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

Change subject: Update OOjs to v2.1.0
..

Update OOjs to v2.1.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJS/browse/master/History.md;v2.1.0

Change-Id: I26f75fad8b4a0dcee7ff9cf29e1cede5ee9e0baa
---
M bin/update-oojs.sh
M lib/oojs/AUTHORS.txt
A lib/oojs/LICENSE-MIT
M lib/oojs/oojs.jquery.js
4 files changed, 78 insertions(+), 24 deletions(-)


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

diff --git a/bin/update-oojs.sh b/bin/update-oojs.sh
index 69e31a6..9c4b041 100755
--- a/bin/update-oojs.sh
+++ b/bin/update-oojs.sh
@@ -38,6 +38,9 @@
 
 # Copy file(s)
 rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/AUTHORS.txt "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/LICENSE-MIT "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/README.md "$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"
diff --git a/lib/oojs/AUTHORS.txt b/lib/oojs/AUTHORS.txt
index f5bce10..97fee0a 100644
--- a/lib/oojs/AUTHORS.txt
+++ b/lib/oojs/AUTHORS.txt
@@ -1,7 +1,9 @@
 Bartosz Dziewoński 
+C. Scott Ananian 
 David Chan 
 Ed Sanders 
 James D. Forrester 
+Moriel Schottlender 
 Ori Livneh 
 Roan Kattouw 
 Timo Tijhof 
diff --git a/lib/oojs/LICENSE-MIT b/lib/oojs/LICENSE-MIT
new file mode 100644
index 000..c6bbee2
--- /dev/null
+++ b/lib/oojs/LICENSE-MIT
@@ -0,0 +1,20 @@
+Copyright 2011-2017 OOjs Team and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/oojs/oojs.jquery.js b/lib/oojs/oojs.jquery.js
index f93051c..8cc6f11 100644
--- a/lib/oojs/oojs.jquery.js
+++ b/lib/oojs/oojs.jquery.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs v2.0.0 optimised for jQuery
+ * OOjs v2.1.0 optimised for jQuery
  * https://www.mediawiki.org/wiki/OOjs
  *
  * Copyright 2011-2017 OOjs Team and other contributors.
  * Released under the MIT license
  * https://oojs.mit-license.org
  *
- * Date: 2017-04-05T02:18:04Z
+ * Date: 2017-05-30T22:56:52Z
  */
 ( function ( global ) {
 
@@ -683,6 +683,24 @@
}
}
 
+   /**
+* @private
+* @param {OO.EventEmitter} ee
+* @param {Function|string} method Function or method name
+* @param {Object} binding
+*/
+   function addBinding( ee, event, binding ) {
+   var bindings;
+   // Auto-initialize bindings list
+   if ( hasOwn.call( ee.bindings, event ) ) {
+   bindings = ee.bindings[ event ];
+   } else {
+   bindings = ee.bindings[ event ] = [];
+   }
+   // Add binding
+   bindings.push( binding );
+   }
+
/* Methods */
 
/**
@@ -699,21 +717,14 @@
 * @chainable
 */
oo.EventEmitter.prototype.on = function ( event, method, args, context 
) {
-   var bindings;
-
validateMethod( method, context );
 
-   if ( hasOwn.call( this.bindings, event ) ) {
-   bindings = this.bindings[ event ];
-   } else {
-   // Auto-initialize bindings list
-   bindings = this.bindings[ event ] = [];
-   }
-   // Add binding
-   bindings.push( {
+   // Ensure consistent object shape (optimisation)
+   addBinding( this, event, {
method: method,
args: args,
-   context: ( arguments.length < 4 ) ? null : context
+   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs to v2.1.0

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs to v2.1.0
..


Update OOjs to v2.1.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJS/browse/master/History.md;v2.1.0

Change-Id: I63fb9c2145e1c3e63ce1acf5f020e9208ca21f04
---
M maintenance/resources/update-oojs.sh
A resources/lib/oojs/AUTHORS.txt
A resources/lib/oojs/LICENSE-MIT
A resources/lib/oojs/README.md
M resources/lib/oojs/oojs.jquery.js
5 files changed, 184 insertions(+), 24 deletions(-)

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



diff --git a/maintenance/resources/update-oojs.sh 
b/maintenance/resources/update-oojs.sh
index d3e778c..267bd96 100755
--- a/maintenance/resources/update-oojs.sh
+++ b/maintenance/resources/update-oojs.sh
@@ -38,6 +38,9 @@
 
 # Copy file(s)
 rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/AUTHORS.txt "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/LICENSE-MIT "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/README.md "$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"
diff --git a/resources/lib/oojs/AUTHORS.txt b/resources/lib/oojs/AUTHORS.txt
new file mode 100644
index 000..97fee0a
--- /dev/null
+++ b/resources/lib/oojs/AUTHORS.txt
@@ -0,0 +1,10 @@
+Bartosz Dziewoński 
+C. Scott Ananian 
+David Chan 
+Ed Sanders 
+James D. Forrester 
+Moriel Schottlender 
+Ori Livneh 
+Roan Kattouw 
+Timo Tijhof 
+Trevor Parscal 
diff --git a/resources/lib/oojs/LICENSE-MIT b/resources/lib/oojs/LICENSE-MIT
new file mode 100644
index 000..c6bbee2
--- /dev/null
+++ b/resources/lib/oojs/LICENSE-MIT
@@ -0,0 +1,20 @@
+Copyright 2011-2017 OOjs Team and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/resources/lib/oojs/README.md b/resources/lib/oojs/README.md
new file mode 100644
index 000..ec14576
--- /dev/null
+++ b/resources/lib/oojs/README.md
@@ -0,0 +1,98 @@
+[![npm](https://img.shields.io/npm/v/oojs.svg?style=flat)](https://www.npmjs.com/package/oojs)
 
[![David](https://img.shields.io/david/dev/wikimedia/oojs.svg?style=flat)](https://david-dm.org/wikimedia/oojs#info=devDependencies)
+
+OOjs
+=
+
+OOjs is a JavaScript library for working with objects.
+
+Key features include inheritance, mixins and utilities for working with 
objects.
+
+
+/* Example */
+( function ( oo ) {
+function Animal() {}
+function Magic() {}
+function Unicorn() {
+Animal.call( this );
+Magic.call( this );
+}
+oo.inheritClass( Unicorn, Animal );
+oo.mixinClass( Unicorn, Magic );
+}( OO ) );
+
+
+Quick start
+--
+
+This library is available as an [npm](https://npmjs.org/) package! Install it 
right away:
+
+npm install oojs
+
+
+Or clone the repo, `git clone 
https://phabricator.wikimedia.org/diffusion/GOJS/oojs.git`.
+
+ECMAScript 5
+--
+
+OOjs requires a modern ECMAScript 5 environment. It is not necessarily 
compatible with ES3 engines (such as for IE 6-8). For ES3 environments, the old 
1.x releases are available but not recommended.
+
+jQuery
+--
+
+If your project uses jQuery, use the optimised `oojs.jquery.js` build instead.
+
+This build assumes jQuery is present and omits various chunks of code in 
favour of references to jQuery.
+
+jQuery 3.0.0 or higher is required.
+
+Versioning
+--
+
+We use the Semantic Versioning guidelines as much as possible.
+
+Releases will be numbered in the following format:
+
+`..`
+
+For more information on SemVer, please visit http://semver.org/.
+
+Bug tracker
+---
+
+Found a bug? 

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Add config and test config for payments-init queue

[Ejegg (Code Review)]

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

Change subject: Add config and test config for payments-init queue
..

Add config and test config for payments-init queue

Change-Id: I52d5e4fcdb738cb99a9f12c68730bfab090a535f
---
M Tests/data/test_global.yaml
M config/main.yaml
2 files changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/18/356318/1

diff --git a/Tests/data/test_global.yaml b/Tests/data/test_global.yaml
index 1c2f2e6..fe2fa31 100644
--- a/Tests/data/test_global.yaml
+++ b/Tests/data/test_global.yaml
@@ -21,6 +21,13 @@
 connection_string: 'sqlite::memory:'
 queue: payments_antifraud
 
+payments-init:
+class: PHPQueue\Backend\PDO
+constructor-parameters:
+-
+connection_string: 'sqlite::memory:'
+queue: payments_init
+
 pending:
 <<: *QUEUE
 
diff --git a/config/main.yaml b/config/main.yaml
index 661a1bf..1751969 100644
--- a/config/main.yaml
+++ b/config/main.yaml
@@ -20,6 +20,12 @@
 <<: *REDIS
 queue: payments-antifraud
 
+payments-init:
+class: PHPQueue\Backend\Predis
+constructor-parameters:
+-
+<<: *REDIS
+
 pending:
 class: PHPQueue\Backend\Predis
 constructor-parameters:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Compare states instead of params when switchin...

[jenkins-bot (Code Review)]

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

Change subject: RCFilters UI: Compare states instead of params when switching 
URL
..


RCFilters UI: Compare states instead of params when switching URL

For empty url (initial load) and for cases where the URL is
minimized (upcoming) the method should check filter states
to recognize whether there's a difference between current and
requested URL.

Bug: T166347
Change-Id: I9dcc82ce7dbc0ad7c6cf3169cee7269234c95298
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 19 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index aec2922..e1694f6 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -14,6 +14,7 @@
this.requestCounter = 0;
this.baseFilterState = {};
this.emptyParameterState = {};
+   this.initializing = false;
};
 
/* Initialization */
@@ -72,6 +73,7 @@
// There are parameters in the url, update model state
this.updateStateBasedOnUrl();
} else {
+   this.initializing = true;
// No valid parameters are given, load defaults
this._updateModelState(
$.extend(
@@ -86,6 +88,7 @@
)
);
this.updateChangesList();
+   this.initializing = false;
}
 
// Update the changes list with the existing data
@@ -615,7 +618,7 @@
 * @param {Object} [params] Extra parameters to add to the API call
 */
mw.rcfilters.Controller.prototype._updateURL = function ( params ) {
-   var updatedUri,
+   var currentFilterState, updatedFilterState, updatedUri,
notEquivalent = function ( obj1, obj2 ) {
var keys = Object.keys( obj1 ).concat( 
Object.keys( obj2 ) );
return keys.some( function ( key ) {
@@ -628,8 +631,21 @@
updatedUri = this._getUpdatedUri();
updatedUri.extend( params );
 
-   if ( notEquivalent( updatedUri.query, new mw.Uri().query ) ) {
-   window.history.pushState( { tag: 'rcfilters' }, 
document.title, updatedUri.toString() );
+   // Compare states instead of parameters
+   // This will allow us to always have a proper check of whether
+   // the requested new url is one to change or not, regardless of
+   // actual parameter visibility/representation in the URL
+   currentFilterState = 
this.filtersModel.getFiltersFromParameters( new mw.Uri().query );
+   updatedFilterState = 
this.filtersModel.getFiltersFromParameters( updatedUri.query );
+
+   if ( notEquivalent( currentFilterState, updatedFilterState ) ) {
+   if ( this.initializing ) {
+   // Initially, when we just build the first page 
load
+   // out of defaults, we want to replace the 
history
+   window.history.replaceState( { tag: 'rcfilters' 
}, document.title, updatedUri.toString() );
+   } else {
+   window.history.pushState( { tag: 'rcfilters' }, 
document.title, updatedUri.toString() );
+   }
}
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9dcc82ce7dbc0ad7c6cf3169cee7269234c95298
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
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] mediawiki/core[master]: Update OOjs to v2.1.0

[Jforrester (Code Review)]

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

Change subject: Update OOjs to v2.1.0
..

Update OOjs to v2.1.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJS/browse/master/History.md;v2.1.0

Change-Id: I63fb9c2145e1c3e63ce1acf5f020e9208ca21f04
---
M maintenance/resources/update-oojs.sh
A resources/lib/oojs/AUTHORS.txt
A resources/lib/oojs/LICENSE-MIT
A resources/lib/oojs/README.md
M resources/lib/oojs/oojs.jquery.js
5 files changed, 184 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/356317/1

diff --git a/maintenance/resources/update-oojs.sh 
b/maintenance/resources/update-oojs.sh
index d3e778c..267bd96 100755
--- a/maintenance/resources/update-oojs.sh
+++ b/maintenance/resources/update-oojs.sh
@@ -38,6 +38,9 @@
 
 # Copy file(s)
 rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/AUTHORS.txt "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/LICENSE-MIT "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/dist/README.md "$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"
diff --git a/resources/lib/oojs/AUTHORS.txt b/resources/lib/oojs/AUTHORS.txt
new file mode 100644
index 000..97fee0a
--- /dev/null
+++ b/resources/lib/oojs/AUTHORS.txt
@@ -0,0 +1,10 @@
+Bartosz Dziewoński 
+C. Scott Ananian 
+David Chan 
+Ed Sanders 
+James D. Forrester 
+Moriel Schottlender 
+Ori Livneh 
+Roan Kattouw 
+Timo Tijhof 
+Trevor Parscal 
diff --git a/resources/lib/oojs/LICENSE-MIT b/resources/lib/oojs/LICENSE-MIT
new file mode 100644
index 000..c6bbee2
--- /dev/null
+++ b/resources/lib/oojs/LICENSE-MIT
@@ -0,0 +1,20 @@
+Copyright 2011-2017 OOjs Team and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/resources/lib/oojs/README.md b/resources/lib/oojs/README.md
new file mode 100644
index 000..ec14576
--- /dev/null
+++ b/resources/lib/oojs/README.md
@@ -0,0 +1,98 @@
+[![npm](https://img.shields.io/npm/v/oojs.svg?style=flat)](https://www.npmjs.com/package/oojs)
 
[![David](https://img.shields.io/david/dev/wikimedia/oojs.svg?style=flat)](https://david-dm.org/wikimedia/oojs#info=devDependencies)
+
+OOjs
+=
+
+OOjs is a JavaScript library for working with objects.
+
+Key features include inheritance, mixins and utilities for working with 
objects.
+
+
+/* Example */
+( function ( oo ) {
+function Animal() {}
+function Magic() {}
+function Unicorn() {
+Animal.call( this );
+Magic.call( this );
+}
+oo.inheritClass( Unicorn, Animal );
+oo.mixinClass( Unicorn, Magic );
+}( OO ) );
+
+
+Quick start
+--
+
+This library is available as an [npm](https://npmjs.org/) package! Install it 
right away:
+
+npm install oojs
+
+
+Or clone the repo, `git clone 
https://phabricator.wikimedia.org/diffusion/GOJS/oojs.git`.
+
+ECMAScript 5
+--
+
+OOjs requires a modern ECMAScript 5 environment. It is not necessarily 
compatible with ES3 engines (such as for IE 6-8). For ES3 environments, the old 
1.x releases are available but not recommended.
+
+jQuery
+--
+
+If your project uses jQuery, use the optimised `oojs.jquery.js` build instead.
+
+This build assumes jQuery is present and omits various chunks of code in 
favour of references to jQuery.
+
+jQuery 3.0.0 or higher is required.
+
+Versioning
+--
+
+We use the Semantic Versioning guidelines as much as possible.
+
+Releases will be numbered in the following format:
+
+`..`
+
+For more information on SemVer, please visit http://semver.org/.
+
+Bug tracker
+---
+
+Found a 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Page images can come outside the lead for all projects excep...

[jenkins-bot (Code Review)]

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

Change subject: Page images can come outside the lead for all projects except 
Wikipedia
..


Page images can come outside the lead for all projects except Wikipedia

On non-wikipedia projects it is quite common for lead sections to
have no images so no page image is registered for a page.

Bug: T166493
Change-Id: Ib0a0ba70dfb0c8afb7cd66eb58182349e6c9974c
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4a7ce51..82c255c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17245,11 +17245,11 @@
'loginwiki' => false,
'votewiki' => false,
 ],
-// T152115
 'wgPageImagesLeadSectionOnly' => [
-   'default' => true,
-   // T166251
-   'wikivoyage' => false,
+   // T166251 & T166493
+   'default' => false,
+   // T152115
+   'wikipedia' => true,
 ],
 'wmgPageImagesExpandOpenSearchXml' => [
'default' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0a0ba70dfb0c8afb7cd66eb58182349e6c9974c
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add Wikipedia wordmark in Serbian/Macedonian

[jenkins-bot (Code Review)]

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

Change subject: Add Wikipedia wordmark in Serbian/Macedonian
..


Add Wikipedia wordmark in Serbian/Macedonian

Source: https://commons.wikimedia.org/wiki/File:Wikipedia_wordmark_sr.svg
File prepared by Srdjan m.

The logo is also updated for Macedonian Wikipedia for which the logo
is the same.

Bug: T165896
Change-Id: Id0421fd1bcbd8de73ed6da8cff05522217f4150d
---
A static/images/mobile/copyright/wikipedia-wordmark-sr.svg
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/static/images/mobile/copyright/wikipedia-wordmark-sr.svg 
b/static/images/mobile/copyright/wikipedia-wordmark-sr.svg
new file mode 100644
index 000..784fe3d
--- /dev/null
+++ b/static/images/mobile/copyright/wikipedia-wordmark-sr.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg; viewBox="0 0 99.82605 17.999615" id="svg2" 
width="99.826" height="18">
\ No newline at end of file
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 18ca11b..4a7ce51 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15181,6 +15181,16 @@
'copyright-width' => 75,
'copyright-height' => 18,
],
+   'mkwiki' => [ // T165896
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-sr.svg',
+   'copyright-width' => 100,
+   'copyright-height' => 18,
+   ],
+   'srwiki' => [ // T165896
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-sr.svg',
+   'copyright-width' => 100,
+   'copyright-height' => 18,
+   ],
'wikivoyage' => [
'copyright' => 
'/static/images/mobile/copyright/wikivoyage-wordmark-en.svg',
'copyright-width' => 96,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0421fd1bcbd8de73ed6da8cff05522217f4150d
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.22.0

[Jforrester (Code Review)]

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

Change subject: Update OOjs UI to v0.22.0
..

Update OOjs UI to v0.22.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.0

Change-Id: I93b66d5339e6766f46dfcc5b22abaeadd74d8da0
---
M Gruntfile.js
M build/modules.json
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
A lib/oojs-ui/AUTHORS.txt
A lib/oojs-ui/LICENSE-MIT
A lib/oojs-ui/README.md
M lib/oojs-ui/i18n/id.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
A lib/oojs-ui/oojs-ui-apex-icons-user.css
A lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-core-wikimediaui.css
A lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
D lib/oojs-ui/oojs-ui-images-mediawiki.css
D lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-images-wikimediaui.css
A lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
D lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.js.map
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
A lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-toolbars.js.map
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
A lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
A lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
A lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
A 

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add mgmt and production DNS for labtestvirt2003

[Dzahn (Code Review)]

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

Change subject: DNS: Add mgmt and production DNS for labtestvirt2003
..


DNS: Add mgmt and production DNS for labtestvirt2003

Bug:T166237
Change-Id: Ib084085e1306056b17f0669f15fa9a28fc5888ce
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 7 insertions(+), 1 deletion(-)

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 5dc14e1..30b3b22 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3082,6 +3082,7 @@
 5   1H IN PTR   labtestnet2001.codfw.wmnet.
 6   1H IN PTR   labtestvirt2001.codfw.wmnet.
 7   1H IN PTR   labtestvirt2002.codfw.wmnet.
+8   1H IN PTR   labtestvirt2003.codfw.wmnet.
 
 ; 10.192.21.0/24 - labs-support1-b-codfw
 $ORIGIN 21.192.{{ zonename }}.
@@ -3532,6 +3533,8 @@
 31  1H IN PTR  wmf5819.mgmt.codfw.wmnet.
 32  1H IN PTR  baham.mgmt.codfw.wmnet.
 32  1H IN PTR  wmf5820.mgmt.codfw.wmnet.
+33  1H IN PTR  labtestvirt2003.mgmt.codfw.wmnet.
+33  1H IN PTR  wmf6571.mgmt.codfw.wmnet.
 
 37  1H IN PTR  ms-be2001.mgmt.codfw.wmnet.
 37  1H IN PTR  wmf5919.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index e093a4f..c32ed44 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2634,7 +2634,8 @@
 labtestneutron2001  1H  IN A10.192.20.4
 labtestnet2001  1H  IN A10.192.20.5
 labtestvirt2001 1H  IN A10.192.20.6
-labtestvirt20021H  IN A10.192.20.7
+labtestvirt2002 1H  IN A10.192.20.7
+labtestvirt2003 1H  IN A10.192.20.8
 lvs2001 1H  IN A10.192.1.1
 lvs2002 1H  IN A10.192.1.2
 lvs2003 1H  IN A10.192.1.3
@@ -3360,6 +3361,7 @@
 labtestneutron20011H  IN A10.193.1.20
 labtestservices2001   1H  IN A10.193.1.21
 labtestvirt2001   1H  IN A10.193.1.19
+labtestvirt2003   1H  IN A10.193.1.33
 lvs2001 1H  IN A10.193.1.1
 lvs2002 1H  IN A10.193.1.2
 lvs2003 1H  IN A10.193.1.3
@@ -4186,6 +4188,7 @@
 wmf6568 1H  IN A10.193.1.196
 wmf6569 1H  IN A10.193.2.135
 wmf6570 1H  IN A10.193.2.136
+wmf6571 1H  IN A10.193.1.33
 
 ;
 ; ESAMS

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib084085e1306056b17f0669f15fa9a28fc5888ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Papaul 
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] oojs/core[master]: package.json: Tag v2.1.0

[jenkins-bot (Code Review)]

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

Change subject: package.json: Tag v2.1.0
..


package.json: Tag v2.1.0

Change-Id: I0b0cedf78d9707de0414ac7f995bb0e4aca31334
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index 275365a..687bd38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Power for object oriented JavaScript libraries.",
   "keywords": [
 "oo",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b0cedf78d9707de0414ac7f995bb0e4aca31334
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: package.json: Tag v2.1.0

[Krinkle (Code Review)]

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

Change subject: package.json: Tag v2.1.0
..

package.json: Tag v2.1.0

Change-Id: I0b0cedf78d9707de0414ac7f995bb0e4aca31334
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/15/356315/1

diff --git a/package.json b/package.json
index 275365a..687bd38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Power for object oriented JavaScript libraries.",
   "keywords": [
 "oo",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b0cedf78d9707de0414ac7f995bb0e4aca31334
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.22.0

[Jforrester (Code Review)]

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

Change subject: Update OOjs UI to v0.22.0
..

Update OOjs UI to v0.22.0

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.0

Change-Id: I93b66d5339e6766f46dfcc5b22abaeadd74d8da0
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M oojs/oojs-ui/.mailmap
M oojs/oojs-ui/AUTHORS.txt
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/generate-JSPHP-for-karma.php
M oojs/oojs-ui/bin/testsuitegenerator.rb
M oojs/oojs-ui/demos/classes/CapsuleNumberPopupMultiselectWidget.js
M oojs/oojs-ui/demos/classes/NumberLookupTextInputWidget.js
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/demos.php
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/demos/styles/demo.css
M oojs/oojs-ui/i18n/id.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/themes/MediaWikiTheme.php
A oojs/oojs-ui/php/themes/WikimediaUITheme.php
M oojs/oojs-ui/php/widgets/CheckboxInputWidget.php
A oojs/oojs-ui/php/widgets/HiddenInputWidget.php
M oojs/oojs-ui/php/widgets/InputWidget.php
M oojs/oojs-ui/php/widgets/RadioInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
28 files changed, 1,679 insertions(+), 1,045 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/13/356313/1

diff --git a/composer.json b/composer.json
index 069e0a1..bd33908 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "1.22.1",
"mustangostang/spyc": "0.6.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.21.4",
+   "oojs/oojs-ui": "0.22.0",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 8baa3b0..09a7ae4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "c718138a0d49641945b13ec3d33e43c4",
+"content-hash": "b11c2cf5cde1b9f593e047ef0f5ceba7",
 "packages": [
 {
 "name": "composer/semver",
@@ -516,16 +516,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.21.4",
+"version": "v0.22.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "ed5dd92664b765a160e68e46ec0337e75451b0ad"
+"reference": "7266f93803bafb52df22925fda743cbe35a84b98"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/ed5dd92664b765a160e68e46ec0337e75451b0ad;,
-"reference": "ed5dd92664b765a160e68e46ec0337e75451b0ad",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/7266f93803bafb52df22925fda743cbe35a84b98;,
+"reference": "7266f93803bafb52df22925fda743cbe35a84b98",
 "shasum": ""
 },
 "require": {
@@ -591,7 +591,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-05-16T22:09:22+00:00"
+"time": "2017-05-30T22:02:38+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index eebf93e..f67b0ac 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -534,6 +534,7 @@
 'OOUI\\FlaggedElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/FlaggedElement.php',
 'OOUI\\FormLayout' => $vendorDir . 
'/oojs/oojs-ui/php/layouts/FormLayout.php',
 'OOUI\\GroupElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/GroupElement.php',
+'OOUI\\HiddenInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/HiddenInputWidget.php',
 'OOUI\\HorizontalLayout' => $vendorDir . 
'/oojs/oojs-ui/php/layouts/HorizontalLayout.php',
 'OOUI\\HtmlSnippet' => $vendorDir . '/oojs/oojs-ui/php/HtmlSnippet.php',
 'OOUI\\IconElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/IconElement.php',
@@ -555,6 +556,7 @@
 'OOUI\\Theme' => $vendorDir . '/oojs/oojs-ui/php/Theme.php',
 'OOUI\\TitledElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/TitledElement.php',
 'OOUI\\Widget' => $vendorDir . '/oojs/oojs-ui/php/Widget.php',
+'OOUI\\WikimediaUITheme' => $vendorDir . 

[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Add README/AUTHORS/LICENCE to dist

[jenkins-bot (Code Review)]

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

Change subject: build: Add README/AUTHORS/LICENCE to dist
..


build: Add README/AUTHORS/LICENCE to dist

Change-Id: I05c14afad66996c17c2d50445af6311dcd98c84e
---
M Gruntfile.js
M package.json
2 files changed, 13 insertions(+), 1 deletion(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 5b0d6a9..4b00c8a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,6 +28,7 @@
 
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-concat' );
+   grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-eslint' );
@@ -71,6 +72,16 @@
'src/export.js',
'src/outro.js.txt'
]
+   }
+   },
+   copy: {
+   dist: {
+   src: [
+   'AUTHORS.txt',
+   'LICENSE-MIT',
+   'README.md'
+   ],
+   dest: 'dist/'
}
},
eslint: {
@@ -193,7 +204,7 @@
} );
} );
 
-   grunt.registerTask( 'build', [ 'clean', 'concat:oojs', 'concat:jquery', 
'uglify' ] );
+   grunt.registerTask( 'build', [ 'clean', 'concat:oojs', 'concat:jquery', 
'copy:dist', 'uglify' ] );
grunt.registerTask( '_test', [ 'git-build', 'clean', 'concat:test', 
'concat:jquery', 'eslint:dev', 'karma:main', 'karma:jquery', 'karma:other' ] );
grunt.registerTask( 'ci', [ '_test', 'karma:ci' ] );
 
diff --git a/package.json b/package.json
index eb8d949..275365a 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
 "grunt": "1.0.1",
 "grunt-contrib-clean": "1.0.0",
 "grunt-contrib-concat": "1.0.1",
+"grunt-contrib-copy": "1.0.0",
 "grunt-contrib-uglify": "2.3.0",
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05c14afad66996c17c2d50445af6311dcd98c84e
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: Tag v2.1.0

[jenkins-bot (Code Review)]

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

Change subject: Tag v2.1.0
..


Tag v2.1.0

Change-Id: I71ef211f05e2ac4bb3342a68094cd5b54aca0ecf
---
M History.md
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/History.md b/History.md
index fac32bc..1073a3e 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,15 @@
 # OOjs Release History
 
+## v2.1.0 / 2017-05-31
+* EmitterList: Fix moving an item to a lower index (Andrew Green)
+* EventEmitter: Document disconnect() behaviour regarding array matching (Timo 
Tijhof)
+* EventEmitter: Support passing once() handler to off() (Timo Tijhof)
+* util: Simplify isPlainObject and fix two false positives (Timo Tijhof)
+* tests: Complete code coverage by tests (Timo Tijhof)
+* tests: Update to jQuery 3 (Timo Tijhof)
+* build: Clean the coverage directory on test (James D. Forrester)
+* build: Add README/AUTHORS/LICENCE to dist (James D. Forrester)
+
 ## v2.0.0 / 2017-04-04
 
 This release drops support for ES3 environments. Where previously OOjs was

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71ef211f05e2ac4bb3342a68094cd5b54aca0ecf
Gerrit-PatchSet: 2
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T136653: Handle VE-style interwiki shortcuts

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356312 )

Change subject: T136653: Handle VE-style interwiki shortcuts
..

T136653: Handle VE-style interwiki shortcuts

* VE generates "de%3AFoo" style shortcuts,
  not "./de:Foo" style shortcuts.

  Updated tests.

* Also added an explicit expectation that "de:Foo" style hrefs
  aren't recognized as an interwiki shortcut since the "de"
  should be recognized as a potential url protocol.

  Right now, Parsoid's html2wt output is buggy since we generate
  language link syntax for "de:Foo" style hrefs if we have a
  'mw:WikiLink' rel attribute.

  So, that is neither here (interwiki) nor there (url protocol).

Change-Id: Ie8d709e72a6a0621ee7b03e2d6643290bc24694c
---
M lib/config/WikiConfig.js
M tests/parserTests.txt
2 files changed, 27 insertions(+), 2 deletions(-)


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

diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index a86f8b9..9f9c79c 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -252,11 +252,16 @@
);
 
if (val.local !== undefined) {
-   // interwiki-prefix:title style shortcuts
+   // ./$interwikiPrefix:$title and
+   // $interwikiPrefix%3A$title shortcuts
// are recognized and the local wiki forwards
// these shortcuts to the remote wiki
+
keys.push(key);
patterns.push('^\\.\\/' + val.prefix + 
':(.*?)');
+
+   keys.push(key);
+   patterns.push('^' + val.prefix + '%3A(.*?)');
}
});
var reString = '^(?:' + patterns.join('|') + ')$';
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 37e86cb..a411049 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -25916,13 +25916,33 @@
 !! options
 parsoid=html2wt
 !! html/parsoid
+
 Foo
 Foo
-Foo
+Foo
+
+Foo
+Foo
+Foo
+
+Foo
+Foo
+Foo
 !! wikitext
+
 [[:fr:Foo|Foo]]
 [[:fr:Foo|Foo]]
 [[:fr:Foo|Foo]]
+
+
+[[:fr:Foo|Foo]]
+[[:fr:Foo|Foo]]
+[[:fr:Foo|Foo]]
+
+
+[[fr:Foo|Foo]]
+[fr:Foo Foo]
+[fr:Foo Foo]
 !! end
 
 # See T93839

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8d709e72a6a0621ee7b03e2d6643290bc24694c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Rename payments-init to payments-initial

[Ejegg (Code Review)]

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

Change subject: Rename payments-init to payments-initial
..

Rename payments-init to payments-initial

To match the SmashPig configuration.

DEPLOYMENT NOTE: needs config change if QueueWrapper patch is not also
pushed out.

Bug: T95647
Change-Id: Ifd81b7cb707a8545471abdb32a8292d29f399b44
---
M README.txt
M adyen_gateway/adyen.adapter.php
M extension.json
M gateway_common/gateway.adapter.php
4 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/README.txt b/README.txt
index a6d2af3..17f722f 100644
--- a/README.txt
+++ b/README.txt
@@ -367,7 +367,7 @@
'payments-antifraud' => array(),
 
// These are shoved into the payments-initial database.
-   'payments-init' => array(),
+   'payments-initial' => array(),
 
// Banner history log ID-contribution tracking ID associations that go 
in
// Drupal in banner_history_contribution_associations. See
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index c86adb5..ea23db9 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -268,7 +268,7 @@
// FIXME: need to keep action ranges in sync between DI 
and listener.
$action = 
Gateway_Extras_CustomFilters::determineStoredAction( $this );
if ( $action === 'process' ) {
-   $this->logger->info( "User came back as pending 
or authorised, placing in payments-init queue" );
+   $this->logger->info( "User came back as pending 
or authorised, placing in payments-initial queue" );
$this->finalizeInternalStatus( 
FinalStatus::PENDING );
$paymentResult = PaymentResult::newSuccess();
} else {
diff --git a/extension.json b/extension.json
index f24f131..aacfafc 100644
--- a/extension.json
+++ b/extension.json
@@ -380,7 +380,7 @@
"donations": [],
"pending": [],
"payments-antifraud": [],
-   "payments-init": [],
+   "payments-initial": [],
"banner-history": [],
"_merge_strategy": "array_plus"
},
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index a6263d6..83c4bbc 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -2056,7 +2056,7 @@
}
 
/**
-* Build and send a message to the payments-init queue, once the 
initial workflow is complete.
+* Build and send a message to the payments-initial queue, once the 
initial workflow is complete.
 */
public function sendFinalStatusMessage( $status ) {
$transaction = array(
@@ -2065,7 +2065,7 @@
'payments_final_status' => $status,
);
 
-   //add more keys here if you want it in the db equivalent of the 
payments-init queue.
+   //add more keys here if you want it in the db equivalent of the 
payments-initial queue.
//for now, though, just taking the ones that make it to the 
logs.
$keys = array(
'payment_submethod',
@@ -2084,10 +2084,10 @@
try {
// FIXME: Dispatch "freeform" messages transparently as 
well.
// TODO: write test
-   $this->logger->info( 'Pushing transaction to 
payments-init queue.' );
-   DonationQueue::instance()->push( $transaction, 
'payments-init' );
+   $this->logger->info( 'Pushing transaction to 
payments-initial queue.' );
+   DonationQueue::instance()->push( $transaction, 
'payments-initial' );
} catch ( Exception $e ) {
-   $this->logger->error( 'Unable to send payments-init 
message' );
+   $this->logger->error( 'Unable to send payments-initial 
message' );
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Minimize url string

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Minimize url string
..


RCFilters: Minimize url string

In order to minimize the URL query, we use a base representation of the
parameters as if they were all '0' or '' and internally expand on it.

- Only display parameters with a value that is not empty or '0' in the
  URI. Any parameter that is missing from the URI is presumed to have
  an empty value.
- Stop pushing defaultParameters everywhere. Default parameters should
  only be considered either on load (when/if needed) or when the user
  actively requests for them.
- Minimize parameters to the URL, and expand when reading into the model.

Similar to using base filters, we can use a representation of base
parameters to make the URL small but the representation all-encompassing.

Bug: T165445
Change-Id: I1d21c38137fde51fcd561e2de24592722bf532c6
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
3 files changed, 148 insertions(+), 36 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 88ce33c..402dbf9 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -405,9 +405,13 @@
mw.rcfilters.dm.FiltersViewModel.prototype.getDefaultParams = function 
() {
var result = {};
 
+   // Get default filter state
$.each( this.groups, function ( name, model ) {
result = $.extend( true, {}, result, 
model.getDefaultParams() );
} );
+
+   // Get default highlight state
+   result = $.extend( true, {}, result, 
this.getHighlightParameters() );
 
return result;
};
@@ -505,11 +509,13 @@
 *  are the selected highlight colors.
 */
mw.rcfilters.dm.FiltersViewModel.prototype.getHighlightParameters = 
function () {
-   var result = { highlight: Number( this.isHighlightEnabled() ) };
+   var result = {};
 
this.getItems().forEach( function ( filterItem ) {
-   result[ filterItem.getName() + '_color' ] = 
filterItem.getHighlightColor();
+   result[ filterItem.getName() + '_color' ] = 
filterItem.getHighlightColor() || null;
} );
+   result.highlight = String( Number( this.isHighlightEnabled() ) 
);
+
return result;
};
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index e9274f5..aec2922 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -12,7 +12,8 @@
this.changesListModel = changesListModel;
this.savedQueriesModel = savedQueriesModel;
this.requestCounter = 0;
-   this.baseState = {};
+   this.baseFilterState = {};
+   this.emptyParameterState = {};
};
 
/* Initialization */
@@ -24,12 +25,22 @@
 * @param {Array} filterStructure Filter definition and structure for 
the model
 */
mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure ) {
-   var parsedSavedQueries,
+   var parsedSavedQueries, validParameterNames,
+   uri = new mw.Uri(),
$changesList = $( '.mw-changeslist' 
).first().contents();
+
// Initialize the model
this.filtersModel.initializeFilters( filterStructure );
 
this._buildBaseFilterState();
+   this._buildEmptyParameterState();
+   validParameterNames = Object.keys( 
this._getEmptyParameterState() )
+   .filter( function ( param ) {
+   // Remove 'highlight' parameter from this check;
+   // if it's the only parameter in the URL we 
still
+   // want to consider the URL 'empty' for 
defaults to load
+   return param !== 'highlight';
+   } );
 
try {
parsedSavedQueries = JSON.parse( mw.user.options.get( 
'rcfilters-saved-queries' ) || '{}' );
@@ -42,10 +53,40 @@
// can normalize them per each query item

[MediaWiki-commits] [Gerrit] oojs/core[master]: Tag v2.1.0

[Krinkle (Code Review)]

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

Change subject: Tag v2.1.0
..

Tag v2.1.0

Change-Id: I71ef211f05e2ac4bb3342a68094cd5b54aca0ecf
---
M History.md
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/10/356310/1

diff --git a/History.md b/History.md
index fac32bc..1d48a76 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,14 @@
 # OOjs Release History
 
+## v2.1.0 / 2017-05-31
+* EmitterList: Fix moving an item to a lower index (Andrew Green)
+* EventEmitter: Document disconnect() behaviour regarding array matching (Timo 
Tijhof)
+* EventEmitter: Support passing once() handler to off() (Timo Tijhof)
+* util: Simplify isPlainObject and fix two false positives (Timo Tijhof)
+* tests: Complete code coverage by tests (Timo Tijhof)
+* tests: Update to jQuery 3 (Timo Tijhof)
+* build: Clean the coverage directory on test (James D. Forrester)
+
 ## v2.0.0 / 2017-04-04
 
 This release drops support for ES3 environments. Where previously OOjs was

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71ef211f05e2ac4bb3342a68094cd5b54aca0ecf
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: give permissions to run commands to herron

[Dzahn (Code Review)]

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

Change subject: icinga: give permissions to run commands to herron
..

icinga: give permissions to run commands to herron

Bug: T166587
Change-Id: I2bc06fd8cd9df7a23e6c7b362846c9ec4ab92e1f
---
M modules/icinga/files/cgi.cfg
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/356309/1

diff --git a/modules/icinga/files/cgi.cfg b/modules/icinga/files/cgi.cfg
index 7a8abf0..6996653 100644
--- a/modules/icinga/files/cgi.cfg
+++ b/modules/icinga/files/cgi.cfg
@@ -131,7 +131,7 @@
 # not use authorization.  You may use an asterisk (*) to
 # authorize any user who has authenticated to the web server.
 
-authorized_for_system_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
+authorized_for_system_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron
 
 
 # CONFIGURATION INFORMATION ACCESS
@@ -142,7 +142,7 @@
 # an asterisk (*) to authorize any user who has authenticated
 # to the web server.
 
-authorized_for_configuration_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
+authorized_for_configuration_information=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron
 
 
 
@@ -155,7 +155,7 @@
 # You may use an asterisk (*) to authorize any user who has
 # authenticated to the web server.
 
-authorized_for_system_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
+authorized_for_system_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron
 
 
 # GLOBAL HOST/SERVICE VIEW ACCESS
@@ -181,8 +181,8 @@
 # authorization).  You may use an asterisk (*) to authorize any
 # user who has authenticated to the web server.
 
-authorized_for_all_service_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
-authorized_for_all_host_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi
+authorized_for_all_service_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 
horn,catrope,alexandros kosiaris,ori.livneh,andrew 
bogott,ottomata,rush,Giuseppe Lavagetto,Filippo 
Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron
+authorized_for_all_host_commands=tim starling,robh,mark 
bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie 

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: ktest 1st commit

[Ktrang (Code Review)]

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

Change subject: ktest 1st commit
..

ktest 1st commit

ktest 2nd commit

Change-Id: Ia3490e8228e6e86e5061df3dbec3a6c36c36fcea
---
M SpecialIncludable.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/SpecialIncludable.php b/SpecialIncludable.php
index 9c13e9a..c5e2f1b 100644
--- a/SpecialIncludable.php
+++ b/SpecialIncludable.php
@@ -12,6 +12,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
+
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'Includable',
@@ -41,3 +42,4 @@
$this->getOutput()->addWikiText( $out );
}
 }
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3490e8228e6e86e5061df3dbec3a6c36c36fcea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Ktrang 

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

[MediaWiki-commits] [Gerrit] analytics...source[master]: Memoize host normalization

[Nuria (Code Review)]

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

Change subject: Memoize host normalization
..

Memoize host normalization

Adding small cache to not repeat computations regarding
normalization of hosts

Change-Id: Ic57d331ba445b37c4e5afc7903d16e607998284c
---
M 
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Webrequest.java
1 file changed, 40 insertions(+), 25 deletions(-)


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

diff --git 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Webrequest.java
 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Webrequest.java
index c2b78d3..f39e320 100644
--- 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Webrequest.java
+++ 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Webrequest.java
@@ -98,6 +98,12 @@
  */
 private Utilities.LRUCache agentTypeCache = new 
Utilities.LRUCache<>(1);
 
+
+/**
+ * Used to speed up "normalization of hosts"
+ */
+private Utilities.LRUCache localCache = new 
Utilities.LRUCache<>(1000);
+
 /**
  * Pattern for automatically-added subdomains that indicate zero,
  * or some similar portal-based interface to MW.
@@ -237,41 +243,50 @@
  * @return A NormalizedHostInfo object with project_class, project, 
qualifiers and tld values set.
  */
 public NormalizedHostInfo normalizeHost(String uriHost) {
+
+// use LRU cache to not repeat computations
 NormalizedHostInfo result = new NormalizedHostInfo();
+
 if ((uriHost == null) || (uriHost.isEmpty())) return result;
 
-// Remove port if any
-int portIdx = uriHost.indexOf(":");
-uriHost = uriHost.substring(0, ((portIdx < 0) ? uriHost.length() : 
portIdx));
+if (localCache.containsKey(uriHost.toLowerCase())){
 
-// Replace multiple dots by only one
-uriHost = uriHost.replaceAll("[//.]+", ".");
+result = (NormalizedHostInfo)localCache.get(uriHost.toLowerCase());
 
-// Split by the dots
-String[] uriParts = uriHost.toLowerCase().split("\\.");
+}  else {
+// Remove port if any
+int portIdx = uriHost.indexOf(":");
+uriHost = uriHost.substring(0, ((portIdx < 0) ? uriHost.length() : 
portIdx));
 
-// If no splitted part, return empty
-if (uriParts.length == 0) return result;
+// Replace multiple dots by only one
+uriHost = uriHost.replaceAll("[//.]+", ".");
 
-// Handle special case where TLD is numeric --> assume IP address, 
don't normalize
-// Length is > 0 because of previous check, so no error case
-if (uriParts[uriParts.length - 1].matches("[0-9]+")) return result;
+// Split by the dots
+String[] uriParts = uriHost.toLowerCase().split("\\.");
 
-if (uriParts.length > 1) {
-// project_class and TLD normalization
-result.setProjectClass(uriParts[uriParts.length - 2]);
-result.setTld(uriParts[uriParts.length - 1]);
-}
-// project normalization
-if ((uriParts.length > 2) && (! uriParts[0].equals("www")))
-result.setProject(uriParts[0]);
-// qualifiers normalization: xx.[q1.q2.q3].wikixxx.xx
-if (uriParts.length > 3) {
-for (int i = 1; i < uriParts.length - 2; i++) {
-result.addQualifier(uriParts[i]);
+// If no splitted part, return empty
+if (uriParts.length == 0) return result;
+
+// Handle special case where TLD is numeric --> assume IP address, 
don't normalize
+// Length is > 0 because of previous check, so no error case
+if (uriParts[uriParts.length - 1].matches("[0-9]+")) return result;
+
+if (uriParts.length > 1) {
+// project_class and TLD normalization
+result.setProjectClass(uriParts[uriParts.length - 2]);
+result.setTld(uriParts[uriParts.length - 1]);
 }
+// project normalization
+if ((uriParts.length > 2) && (!uriParts[0].equals("www")))
+result.setProject(uriParts[0]);
+// qualifiers normalization: xx.[q1.q2.q3].wikixxx.xx
+if (uriParts.length > 3) {
+for (int i = 1; i < uriParts.length - 2; i++) {
+result.addQualifier(uriParts[i]);
+}
+}
+localCache.put(uriHost.toLowerCase(),result);
 }
-
 return result;
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic57d331ba445b37c4e5afc7903d16e607998284c

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Remove math script from Wikibase client styles queue

[jenkins-bot (Code Review)]

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

Change subject: Remove math script from Wikibase client styles queue
..


Remove math script from Wikibase client styles queue

Follows-up 946a18d1, which accidentally added a scripts module
to the styles queue (which is a no-op) and fcdfc316 which removes
it from the repo.

Fixes the following debug warning:
> Unexpected general module "ext.math.scripts" in styles queue.

Bug: T158376
Change-Id: I432e724d5f84887f4aecb56db607d189db12c329
---
M MathWikidataHook.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/MathWikidataHook.php b/MathWikidataHook.php
index ff19b3c..cc14635 100644
--- a/MathWikidataHook.php
+++ b/MathWikidataHook.php
@@ -70,8 +70,7 @@
'value-type' => 'string',
'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
global $wgOut;
-   $styles = [ 'ext.math.scripts', 
'ext.math.styles' ];
-   $wgOut->addModuleStyles( $styles );
+   $wgOut->addModuleStyles( [ 'ext.math.styles' ] 
);
return new MathFormatter( $format );
},
];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I432e724d5f84887f4aecb56db607d189db12c329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Krinkle 
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]: admin: add herron to ops group

[Herron (Code Review)]

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

Change subject: admin: add herron to ops group
..


admin: add herron to ops group

Keith Herron is a new Operations Engineer
with root access.

Bug: T166587
Change-Id: I82d2e65c291081d647108d14fc71f016fa692ef3
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index cfd2f6d..a86ba80 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -25,7 +25,8 @@
 description: include everywhere ops folks
 members: _members [filippo, jgreen, bblack, andrew, faidon, rush, 
oblivian, yuvipanda,
   dzahn, akosiaris, mark, ariel, cmjohnson, otto, robh, tstarling,
-  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui, ayounsi]
+  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui,
+  ayounsi, herron]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82d2e65c291081d647108d14fc71f016fa692ef3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Herron 
Gerrit-Reviewer: Mark Bergsma 
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]: Make Flow default in all talk namespaces on cawikiquote

[jenkins-bot (Code Review)]

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

Change subject: Make Flow default in all talk namespaces on cawikiquote
..


Make Flow default in all talk namespaces on cawikiquote

Bug: T165497
Change-Id: Ie1bf57a16d0a5e51a6c73d0431a67b57b2991e71
---
M wmf-config/InitialiseSettings.php
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ccb200e..18ca11b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16690,6 +16690,19 @@
2301, // Gadget_talk from Gadgets
2303, // Gadget_definition_talk from Gadgets
],
+   'cawikiquote' => [
+   NS_TALK,
+   NS_USER_TALK,
+   NS_PROJECT_TALK,
+   NS_FILE_TALK,
+   NS_MEDIAWIKI_TALK,
+   NS_TEMPLATE_TALK,
+   NS_HELP_TALK,
+   NS_CATEGORY_TALK,
+   829, // Module_talk from Scribunto
+   2301, // Gadget_talk from Gadgets
+   2303, // Gadget_definition_talk from Gadgets
+   ],
 ],
 
 // Enable editing other users posts by autoconfirmed

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1bf57a16d0a5e51a6c73d0431a67b57b2991e71
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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]: Make Flow default in all talk namespaces on cawikiquote

[Catrope (Code Review)]

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

Change subject: Make Flow default in all talk namespaces on cawikiquote
..

Make Flow default in all talk namespaces on cawikiquote

Bug: T165497
Change-Id: Ie1bf57a16d0a5e51a6c73d0431a67b57b2991e71
---
M wmf-config/InitialiseSettings.php
1 file changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ccb200e..18ca11b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16690,6 +16690,19 @@
2301, // Gadget_talk from Gadgets
2303, // Gadget_definition_talk from Gadgets
],
+   'cawikiquote' => [
+   NS_TALK,
+   NS_USER_TALK,
+   NS_PROJECT_TALK,
+   NS_FILE_TALK,
+   NS_MEDIAWIKI_TALK,
+   NS_TEMPLATE_TALK,
+   NS_HELP_TALK,
+   NS_CATEGORY_TALK,
+   829, // Module_talk from Scribunto
+   2301, // Gadget_talk from Gadgets
+   2303, // Gadget_definition_talk from Gadgets
+   ],
 ],
 
 // Enable editing other users posts by autoconfirmed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1bf57a16d0a5e51a6c73d0431a67b57b2991e71
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] mediawiki/core[master]: objectcache: respect process cache in getMultiWithSetCallback()

[jenkins-bot (Code Review)]

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

Change subject: objectcache: respect process cache in getMultiWithSetCallback()
..


objectcache: respect process cache in getMultiWithSetCallback()

Backend cache queries are now avoided if they are fresh in memory.

Also factor out some code into private methods for clarity.

Change-Id: Ib343fde3dbf63f39e8cb09eca6278811a7d9738b
---
M includes/libs/objectcache/WANObjectCache.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
2 files changed, 88 insertions(+), 27 deletions(-)

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



diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index cb1be95..ff59854 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -267,7 +267,7 @@
 * @param array $checkKeys List of check keys to apply to all $keys. 
May also apply "check"
 *  keys to specific cache keys only by using cache keys as keys in the 
$checkKeys array.
 * @param float[] &$asOfs Map of (key =>  UNIX timestamp of cached 
value; null on failure)
-* @return array Map of (key => value) for keys that exist
+* @return array Map of (key => value) for keys that exist and are not 
tombstoned
 */
final public function getMulti(
array $keys, &$curTTLs = [], array $checkKeys = [], array 
&$asOfs = []
@@ -1049,7 +1049,7 @@
}
 
/**
-* Method to fetch/regenerate multiple cache keys at once
+* Method to fetch multiple cache keys at once with regeneration
 *
 * This works the same as getWithSetCallback() except:
 *   - a) The $keys argument expects the result of 
WANObjectCache::makeMultiKeys()
@@ -1108,39 +1108,24 @@
final public function getMultiWithSetCallback(
ArrayIterator $keyedIds, $ttl, callable $callback, array $opts 
= []
) {
+   $valueKeys = array_keys( iterator_to_array( $keyedIds, true ) );
$checkKeys = isset( $opts['checkKeys'] ) ? $opts['checkKeys'] : 
[];
 
-   $keysWarmUp = [];
-   // Get all the value keys to fetch...
-   foreach ( $keyedIds as $key => $id ) {
-   $keysWarmUp[] = self::VALUE_KEY_PREFIX . $key;
-   }
-   // Get all the check keys to fetch...
-   foreach ( $checkKeys as $i => $checkKeyOrKeys ) {
-   if ( is_int( $i ) ) {
-   // Single check key that applies to all value 
keys
-   $keysWarmUp[] = self::TIME_KEY_PREFIX . 
$checkKeyOrKeys;
-   } else {
-   // List of check keys that apply to value key $i
-   $keysWarmUp = array_merge(
-   $keysWarmUp,
-   self::prefixCacheKeys( $checkKeyOrKeys, 
self::TIME_KEY_PREFIX )
-   );
-   }
-   }
-
-   $this->warmupCache = $this->cache->getMulti( $keysWarmUp );
-   $this->warmupCache += array_fill_keys( $keysWarmUp, false );
+   // Load required keys into process cache in one go
+   $this->warmupCache = $this->getRawKeysForWarmup(
+   $this->getNonProcessCachedKeys( $valueKeys, $opts ),
+   $checkKeys
+   );
$this->warmupKeyMisses = 0;
 
// Wrap $callback to match the getWithSetCallback() format 
while passing $id to $callback
-   $id = null;
-   $func = function ( $oldValue, &$ttl, array &$setOpts, $oldAsOf 
) use ( $callback, &$id ) {
+   $id = null; // current entity ID
+   $func = function ( $oldValue, &$ttl, &$setOpts, $oldAsOf ) use 
( $callback, &$id ) {
return $callback( $id, $oldValue, $ttl, $setOpts, 
$oldAsOf );
};
 
$values = [];
-   foreach ( $keyedIds as $key => $id ) {
+   foreach ( $keyedIds as $key => $id ) { // preserve order
$values[$key] = $this->getWithSetCallback( $key, $ttl, 
$func, $opts );
}
 
@@ -1503,7 +1488,7 @@
 *
 * @param array|string|bool $wrapped
 * @param float $now Unix Current timestamp (preferrably pre-query)
-* @return array (mixed; false if absent/invalid, current time left)
+* @return array (mixed; false if absent/tombstoned/invalid, current 
time left)
 */
protected function unwrap( $wrapped, $now ) {
// Check if the value is a tombstone
@@ -1598,4 +1583,59 @@
 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.22.0

[jenkins-bot (Code Review)]

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

Change subject: Tag v0.22.0
..


Tag v0.22.0

Change-Id: I38c6b23a534cdfb16ff74d37d35b4cd5f7fc60d4
---
M History.md
M package.json
2 files changed, 58 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index 43652e2..8ea366a 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,61 @@
 # OOjs UI Release History
+## v0.22.0 / 2017-05-30
+### Breaking changes
+* [BREAKING CHANGE] TextInputWidget: Remove search related methods (Prateek 
Saxena)
+* [BREAKING CHANGE] icons: Drop the core icon pack (James D. Forrester)
+* [BREAKING CHANGE] icons: Remove unused 'bookmark' icon (Volker E.)
+
+### Deprecations
+* [DEPRECATING CHANGE] Rename the 'MediaWiki' theme to 'WikimediaUI' (James D. 
Forrester)
+* [DEPRECATING CHANGE] WindowManager: Deprecate using 
`openWindow`/`closeWindow` returns as promises (Bartosz Dziewoński)
+
+### Features
+* Add HiddenInputWidget to generate hidden input (Victor Barbu)
+* InputWidget: Introduce `#setInputId` and `inputId` config option (Bartosz 
Dziewoński)
+* MenuTagMultiselectWidget: Clear text field after adding an item from it 
(Bartosz Dziewoński)
+* MenuTagMultiselectWidget: Handle the 'selected' config option (Bartosz 
Dziewoński)
+* NumberInputWidget: Use icons instead of labels (Volker E.)
+* PopupButtonWidget: Handle empty configuration (Bartosz Dziewoński)
+* PopupWidget: Position close button in head absolutely (David Lynch)
+* PopupWidget: Sensibly position anchor-less popups (Roan Kattouw)
+* WindowManager: Add `WindowInstance` - a Promise-based lifecycle object (Timo 
Tijhof)
+* WindowManager: Handle errors better in `#closeWindow` (Bartosz Dziewoński)
+
+* Allow *even more* widgets to be focussed programatically (Bartosz Dziewoński)
+* Only cancel mouse down event if tool in toolgroup clicked on (Ed Sanders)
+* Re-introduce `.simulateLabelClick()` as a separate method from .focus() 
(Bartosz Dziewoński)
+
+### Styles
+* themes: Field*Layout help position perfectly aligned (Volker E.)
+* themes: Improve frameless button in size and behaviour (Volker E.)
+* themes: Increase FieldsetLayout header's `font-size` (Volker E.)
+* Apex theme: Ensure vertical centering of ButtonElement's icon (Volker E.)
+* Apex theme: Make OptionWidget icon override more specific (Moriel 
Schottlender)
+* Apex theme: Start Apex's 'user' icon pack, with just 'userAvatar' for now 
(Ed Sanders)
+* WikimediaUI theme: Align `@background-color-destructive` to WikimediaUI Base 
(Volker E.)
+* WikimediaUI theme: Align ButtonInputWidget's `line-height` to ButtonWidget 
(Volker E.)
+* WikimediaUI theme: Align inline label's position (Volker E.)
+* WikimediaUI theme: Ensure icon aligns in dropdown menu (Volker E.)
+* WikimediaUI theme: Remove incorrect comments (Volker E.)
+
+### Code
+* MenuTagMultiselectWidget: Add test for 'selected' config option (Bartosz 
Dziewoński)
+* windows: Add tests for OO.ui.alert/confirm/prompt (Timo Tijhof)
+* AUTHORS: Update for the past two years' work (James D. Forrester)
+* build: Add the README/AUTHORS/LICENCE files to dist (James D. Forrester)
+* demos: Add TextInputWidget examples with inline labels but no indicators (Ed 
Sanders)
+* demos: Add viewport meta tag to PHP demo too (Volker E.)
+* demos: Avoid inline CSS for the overlay (Bartosz Dziewoński)
+* demos: Fix code generation for more complicated cases (Bartosz Dziewoński)
+* demos: Fix up a couple of minor things in demo widgets (Bartosz Dziewoński)
+* demos: Fix `z-index` with fixed demo header (Volker E.)
+* demos: Increase and strengthen responsive support (Volker E.)
+* demos: Indicate widgets clearer by sections (Volker E.)
+* demos: Make disabled progress bar in demo determinate (Ed Sanders)
+* demos: Show code that can be used to create the widget (Prateek Saxena)
+* testsuitegenerator: Handle classes with no constructor (Bartosz Dziewoński)
+
+
 ## v0.21.4 / 2017-05-16
 ### Features
 * Allow more widgets to be focussed programatically (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 720c282..15eed0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.21.4",
+  "version": "0.22.0",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38c6b23a534cdfb16ff74d37d35b4cd5f7fc60d4
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Chunk page ids in internal API call to avoid too-many-pageid...

[jenkins-bot (Code Review)]

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

Change subject: Chunk page ids in internal API call to avoid 
too-many-pageids-for-query
..


Chunk page ids in internal API call to avoid too-many-pageids-for-query

One of many reasons that internal API calls are bad.

Bug: T41936
Change-Id: I338b444087c7570e455469e2c0fad8f5ca46644e
---
M includes/PageImages.php
1 file changed, 26 insertions(+), 23 deletions(-)

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



diff --git a/includes/PageImages.php b/includes/PageImages.php
index 4a8004b..0f90aff 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -163,32 +163,35 @@
 * @return array[]
 */
private static function getImages( array $pageIds, $size = 0 ) {
-   $request = [
-   'action' => 'query',
-   'prop' => 'pageimages',
-   'piprop' => 'name',
-   'pageids' => implode( '|', $pageIds ),
-   'pilimit' => 'max',
-   ];
+   $ret = [];
+   foreach ( array_chunk( $pageIds, ApiBase::LIMIT_SML1 ) as 
$chunk ) {
+   $request = [
+   'action' => 'query',
+   'prop' => 'pageimages',
+   'piprop' => 'name',
+   'pageids' => implode( '|', $chunk ),
+   'pilimit' => 'max',
+   ];
 
-   if ( $size ) {
-   $request['piprop'] = 'thumbnail';
-   $request['pithumbsize'] = $size;
-   }
-
-   $api = new ApiMain( new FauxRequest( $request ) );
-   $api->execute();
-
-   if ( defined( 'ApiResult::META_CONTENT' ) ) {
-   return (array)$api->getResult()->getResultData( [ 
'query', 'pages' ],
-   [ 'Strip' => 'base' ] );
-   } else {
-   $data = $api->getResultData();
-   if ( isset( $data['query']['pages'] ) ) {
-   return $data['query']['pages'];
+   if ( $size ) {
+   $request['piprop'] = 'thumbnail';
+   $request['pithumbsize'] = $size;
}
-   return [];
+
+   $api = new ApiMain( new FauxRequest( $request ) );
+   $api->execute();
+
+   if ( defined( 'ApiResult::META_CONTENT' ) ) {
+   $ret += 
(array)$api->getResult()->getResultData( [ 'query', 'pages' ],
+   [ 'Strip' => 'base' ] );
+   } else {
+   $data = $api->getResultData();
+   if ( isset( $data['query']['pages'] ) ) {
+   $ret += $data['query']['pages'];
+   }
+   }
}
+   return $ret;
}
 
public static function onRegistration() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I338b444087c7570e455469e2c0fad8f5ca46644e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
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...TextExtracts[master]: Chunk page ids in internal API call to avoid too-many-pageid...

[jenkins-bot (Code Review)]

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

Change subject: Chunk page ids in internal API call to avoid 
too-many-pageids-for-query
..


Chunk page ids in internal API call to avoid too-many-pageids-for-query

One of many reasons that internal API calls are bad.

Bug: T41936
Change-Id: I3d2cf2b4f619f590e74a88fa4a78832b8be8495e
---
M includes/Hooks.php
1 file changed, 22 insertions(+), 20 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 36f8905..7c88f30 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -2,6 +2,7 @@
 
 namespace TextExtracts;
 
+use ApiBase;
 use ApiMain;
 use ApiResult;
 use FauxRequest;
@@ -19,26 +20,27 @@
if ( !$config->get( 'ExtractsExtendOpenSearchXml' ) || !count( 
$results ) ) {
return true;
}
-   $pageIds = array_keys( $results );
-   $api = new ApiMain( new FauxRequest(
-   [
-   'action' => 'query',
-   'prop' => 'extracts',
-   'explaintext' => true,
-   'exintro' => true,
-   'exlimit' => count( $results ),
-   'pageids' => implode( '|', $pageIds ),
-   ] )
-   );
-   $api->execute();
-   $data = $api->getResult()->getResultData( [ 'query', 'pages' ] 
);
-   foreach ( $pageIds as $id ) {
-   $contentKey = isset( 
$data[$id]['extract'][ApiResult::META_CONTENT] )
-   ? $data[$id]['extract'][ApiResult::META_CONTENT]
-   : '*';
-   if ( isset( $data[$id]['extract'][$contentKey] ) ) {
-   $results[$id]['extract'] = 
$data[$id]['extract'][$contentKey];
-   $results[$id]['extract trimmed'] = false;
+   foreach ( array_chunk( array_keys( $results ), 
ApiBase::LIMIT_SML1 ) as $pageIds ) {
+   $api = new ApiMain( new FauxRequest(
+   [
+   'action' => 'query',
+   'prop' => 'extracts',
+   'explaintext' => true,
+   'exintro' => true,
+   'exlimit' => count( $pageIds ),
+   'pageids' => implode( '|', $pageIds ),
+   ] )
+   );
+   $api->execute();
+   $data = $api->getResult()->getResultData( [ 'query', 
'pages' ] );
+   foreach ( $pageIds as $id ) {
+   $contentKey = isset( 
$data[$id]['extract'][ApiResult::META_CONTENT] )
+   ? 
$data[$id]['extract'][ApiResult::META_CONTENT]
+   : '*';
+   if ( isset( $data[$id]['extract'][$contentKey] 
) ) {
+   $results[$id]['extract'] = 
$data[$id]['extract'][$contentKey];
+   $results[$id]['extract trimmed'] = 
false;
+   }
}
}
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d2cf2b4f619f590e74a88fa4a78832b8be8495e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
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...GeoData[master]: Use canonical ParserOptions for WikiPage::getParserOutput()

[jenkins-bot (Code Review)]

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

Change subject: Use canonical ParserOptions for WikiPage::getParserOutput()
..


Use canonical ParserOptions for WikiPage::getParserOutput()

As it is, this could pollute parser caches with a version lacking tidy
and the limit report if it's not already cached. MediaWiki core change
I7fb9ffca9 is going to make that be an error.

Bug: T110269
Change-Id: I4070a8f51927121f690469716625db4a1064dea5
---
M includes/Hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index f7ca72a..09e8255 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -210,8 +210,10 @@
 * @param LocalFile $file
 */
public static function onFileUpload( LocalFile $file ) {
+   global $wgUser;
+
$wp = WikiPage::factory( $file->getTitle() );
-   $po = new ParserOptions();
+   $po = $wp->makeParserOptions( $wgUser );
$pout = $wp->getParserOutput( $po );
if ( !$pout ) {
wfDebugLog( 'mobile', __METHOD__ . "(): no parser 
output returned for file {$file->getName()}" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4070a8f51927121f690469716625db4a1064dea5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
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]: Convenience functions to initialize test datastores

[Ejegg (Code Review)]

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

Change subject: Convenience functions to initialize test datastores
..

Convenience functions to initialize test datastores

Change-Id: I8fc43379cc5aff32fb8d3d95e92deff2191e4bf1
---
M Core/Context.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/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M Tests/BaseSmashPigUnitTestCase.php
M Tests/DamagedDatabaseTest.php
M Tests/PaymentsInitialDatabaseTest.php
M Tests/PendingDatabaseTest.php
M Tests/PendingQueueConsumerTest.php
M Tests/QueueConsumerTest.php
M Tests/SmashPigDatabaseTest.php
M Tests/TestingContext.php
M Tests/TestingDatabase.php
17 files changed, 30 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/04/356304/1

diff --git a/Core/Context.php b/Core/Context.php
index d7d4670..2be82d2 100644
--- a/Core/Context.php
+++ b/Core/Context.php
@@ -35,7 +35,7 @@
 
/**
 * Obtains the current context object
-* @return Context
+* @return static
 */
public static function get() {
return Context::$instance;
diff --git a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
index 0a76f47..ef6a192 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/CaptureJobTest.php
@@ -36,7 +36,6 @@
$this->config = 
AdyenTestConfiguration::createWithSuccessfulApi();
Context::get()->setProviderConfiguration( $this->config );
$this->pendingDatabase = PendingDatabase::get();
-   $this->pendingDatabase->createTable();
$this->pendingMessage = json_decode(
file_get_contents( __DIR__ . '/../Data/pending.json' ) 
, true
);
diff --git a/PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php
index 2e114a3..195cc7e 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php
@@ -26,7 +26,6 @@
 
$this->jobQueue = $context->getGlobalConfiguration()
->object( 'data-store/jobs-adyen' );
-   $this->jobQueue->createTable( 'jobs-adyen' );
}
 
public function testSuccessfulCapture() {
diff --git a/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
index b7bdbe2..9667abc 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
@@ -23,7 +23,6 @@
Context::get()->setProviderConfiguration( $providerConfig );
$globalConfig = Context::get()->getGlobalConfiguration();
$this->jobQueue = $globalConfig->object( 
'data-store/jobs-adyen' );
-   $this->jobQueue->createTable( 'jobs-adyen' );
}
 
public function testSuccessfulAuth() {
diff --git a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
index 3b0345d..09d4aa8 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/RecordCaptureJobTest.php
@@ -30,7 +30,6 @@
$this->config = 
AdyenTestConfiguration::createWithSuccessfulApi();
Context::get()->setProviderConfiguration( $this->config );
$this->pendingDatabase = PendingDatabase::get();
-   $this->pendingDatabase->createTable();
$this->pendingMessage = json_decode(
file_get_contents( __DIR__ . '/../Data/pending.json' ) 
, true
);
@@ -45,8 +44,6 @@
 
public function testRecordCapture() {
$donationsQueue = QueueWrapper::getQueue( 'donations' );
-   $donationsQueue->createTable( 'donations' );
-
$capture = JsonSerializableObject::fromJsonProxy(

'SmashPig\PaymentProviders\Adyen\ExpatriatedMessages\Capture',
file_get_contents( __DIR__ . '/../Data/capture.json' )
diff --git a/PaymentProviders/Adyen/Tests/phpunit/ReportAvailableTest.php 
b/PaymentProviders/Adyen/Tests/phpunit/ReportAvailableTest.php
index 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Test wgLogoHD keys

[jenkins-bot (Code Review)]

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

Change subject: Test wgLogoHD keys
..


Test wgLogoHD keys

When a value is defined, keys MUST be 1.5x and 2x.

Bug: T161416
Change-Id: I41196e2756eff07cdcecedcde06b141b77621789
---
A tests/InitialiseSettingsTest.php
1 file changed, 22 insertions(+), 0 deletions(-)

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



diff --git a/tests/InitialiseSettingsTest.php b/tests/InitialiseSettingsTest.php
new file mode 100644
index 000..986e296
--- /dev/null
+++ b/tests/InitialiseSettingsTest.php
@@ -0,0 +1,22 @@
+getRequiredLogoHDKeys();
+   $wgConf = $this->loadWgConf( 'unittest' );
+
+   foreach ( $wgConf->settings['wgLogoHD'] as $db => $entry ) {
+   $keys = array_keys( $entry );
+   $this->assertEquals( $requiredKeys, $keys, "Unexpected 
keys for $db", 0.0, 10, true ); // canonicalize
+   }
+   }
+
+   public function getRequiredLogoHDKeys () {
+   return [ '1.5x', '2x' ];
+   }
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41196e2756eff07cdcecedcde06b141b77621789
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Urbanecm 
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]: test: factor out wgConf loading

[jenkins-bot (Code Review)]

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

Change subject: test: factor out wgConf loading
..


test: factor out wgConf loading

Several tests attempts to load $wgConf from InitialiseSettings.php.
Factor out common code to WgConfTestCase::loadWgConf()
Remove calls to restoreGlobals() which are no more needed.

This make it rather trivial to add tests for a given setting.

Change-Id: I41e797745a2ba3c24a043e9ee93ac8f33946388c
---
M tests/WgConfTestCase.php
M tests/cirrusTest.php
M tests/loggingTest.php
3 files changed, 40 insertions(+), 53 deletions(-)

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



diff --git a/tests/WgConfTestCase.php b/tests/WgConfTestCase.php
index 03a45d1..c5e6b14 100644
--- a/tests/WgConfTestCase.php
+++ b/tests/WgConfTestCase.php
@@ -8,6 +8,8 @@
  * @file
  */
 
+require_once __DIR__ . '/SiteConfiguration.php';
+
 class WgConfTestCase extends PHPUnit_Framework_TestCase {
 
protected $globals = array();
@@ -58,4 +60,40 @@
}
}
 
+   /**
+* Load $wgConf from InitialiseSettings.php
+*
+* Example usage:
+*
+* $wgLogoHD = $this->loadWgConf( 'production' 
)->settings['wgLogoHD'];
+*
+* @param string $wmfRealm Realm to use for example: 'labs' or 
'production'
+* @return SiteConfiguration
+*/
+   final protected function loadWgConf( $wmfRealm ) {
+   // Variables required for wgConf.php
+   $wmfConfigDir = __DIR__ . "/../wmf-config";
+
+   require "{$wmfConfigDir}/wgConf.php";
+
+   // InitialiseSettings.php explicitly declares these as global, 
so we must too
+   $this->setGlobals( array(
+   'wmfUdp2logDest' => 'localhost',
+   'wmfDatacenter' => 'unittest',
+   'wmfMasterDatacenter' => 'unittest',
+   'wmfRealm' => $wmfRealm,
+   'wmfConfigDir' => $wmfConfigDir,
+   'wgConf' => $wgConf,
+   ) );
+
+   require __DIR__ . '/TestServices.php';
+   require "{$wmfConfigDir}/InitialiseSettings.php";
+
+   $ret = $wgConf;
+   // Make sure globals are restored, else they will be serialized 
on each
+   // test run which slow the test run dramatically.
+   $this->restoreGlobals();
+   return $ret;
+   }
+
 }
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 4c8265d..65c4f13 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -76,28 +76,6 @@
}
}
 
-   private function loadWgConf( $wmfRealm ) {
-   // Variables required for wgConf.php
-   $wmfConfigDir = __DIR__ . "/../wmf-config";
-
-   require "{$wmfConfigDir}/wgConf.php";
-
-   // InitialiseSettings.php explicitly declares these as global, 
so we must too
-   $this->setGlobals( array(
-   'wmfUdp2logDest' => 'localhost',
-   'wmfDatacenter' => 'unittest',
-   'wmfMasterDatacenter' => 'unittest',
-   'wmfRealm' => $wmfRealm,
-   'wmfConfigDir' => $wmfConfigDir,
-   'wgConf' => $wgConf,
-   ) );
-
-   require __DIR__ . '/TestServices.php';
-   require "{$wmfConfigDir}/InitialiseSettings.php";
-
-   return $wgConf;
-   }
-
private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
$wmfConfigDir = __DIR__ . "/../wmf-config";
require __DIR__ . '/../private/PrivateSettings.php.example';
@@ -148,7 +126,6 @@
require "{$wmfConfigDir}/CirrusSearch-common.php";
 
$ret = compact( array_keys( get_defined_vars() ) );
-   $this->restoreGlobals();
return $ret;
}
 
@@ -227,7 +204,6 @@
}
}
 
-   $this->restoreGlobals();
return $tests;
}
 
diff --git a/tests/loggingTest.php b/tests/loggingTest.php
index 6e7e701..146d505 100644
--- a/tests/loggingTest.php
+++ b/tests/loggingTest.php
@@ -84,25 +84,12 @@
}
 
public function provideAvroSchemas() {
-   $wgConf = new stdClass;
-   $wmfConfigDir = __DIR__ . '/../wmf-config';
-
-   $this->setGlobals( array(
-   'wmfUdp2logDest' => 'localhost',
-   'wmfDatacenter' => 'unittest',
-   'wmfRealm' => 'production',
-   'wmfConfigDir' => $wmfConfigDir,
-  

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: phpunit: factor out logic to handle globals vars

[jenkins-bot (Code Review)]

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

Change subject: phpunit: factor out logic to handle globals vars
..


phpunit: factor out logic to handle globals vars

loggingTest data providers loads $wgConf in global scope. With PHPUnit
backing up globals on each test, that slow down the test run.  The class
has logic to restore the globals in the data provider so tests get run
with a clean global scope.

cirrusTest has the same need. Hence factor out global handling code to a
new PHPUnit_FrameWork_TestCase: WgConfTestCase.

Switch loggingTest to it.
Port cirrusTest.

When setting globals with setGlobals(), we want to make sure they are
restored with restoreGlobals().  Thus throw an exception whenever the
test case object is descruted but globals have not been restored, that
will prevent unintentional leaks.

Test runs for cirrusTest goes from 7s to 3s.

Later on WgConfTestCase can be extended to load a $wgConf object. That
seems to be a common behavior of loggingTest and cirrusTest.

Change-Id: I7a86e856881da69431c29b81cf1005070e029a0b
---
A tests/WgConfTestCase.php
M tests/bootstrap.php
M tests/cirrusTest.php
M tests/loggingTest.php
4 files changed, 76 insertions(+), 40 deletions(-)

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



diff --git a/tests/WgConfTestCase.php b/tests/WgConfTestCase.php
new file mode 100644
index 000..03a45d1
--- /dev/null
+++ b/tests/WgConfTestCase.php
@@ -0,0 +1,61 @@
+
+ * @copyright Copyright © 2015, Erik Bernhardson 
+ * @file
+ */
+
+class WgConfTestCase extends PHPUnit_Framework_TestCase {
+
+   protected $globals = array();
+
+   protected function restoreGlobals() {
+   foreach ( $this->globals as $key => $value ) {
+   $GLOBALS[$key] = $value;
+   }
+   $this->globals = array();
+   }
+
+   protected function setGlobals( $pairs, $value = null ) {
+   if ( is_string( $pairs ) ) {
+   $pairs = array( $pairs => $value );
+   }
+   foreach ( $pairs as $key => $value ) {
+   // only set value in $this->globals on first call
+   if ( !array_key_exists( $key, $this->globals ) ) {
+   if ( isset( $GLOBALS[$key] ) ) {
+   // break any object references
+   try {
+   $this->globals[$key] = 
unserialize( serialize( $GLOBALS[$key] ) );
+   } catch ( \Exception $e ) {
+   $this->globals[$key] = 
$GLOBALS[$key];
+   }
+   } else {
+   $this->globals[$key] = null;
+   }
+   }
+   $GLOBALS[$key] = $value;
+   }
+   }
+
+   /**
+* Make sure global scope is left in a sane state.
+*
+* data providers have to mess up with the global scope in order to load
+* $wgConf.  If one forget to restore the globals from the data 
provider,
+* the global scope is saved/restored for each tests.  That slows down 
the
+* test run dramatically.
+*
+* We have to ensure global scope has been restored BEFORE the test run,
+* the only way to achieve that is when leaving the data provider scope.
+*/
+   function __destruct() {
+   if ( ! empty( $this->globals ) ) {
+   throw new Exception( __CLASS__ . ': setGlobals() used 
without restoreGlobals()' );
+   }
+   }
+
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d111b5d..31c9e2e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,3 +3,4 @@
 // Load the shared utilities classes from here!
 require_once __DIR__ . "/DBList.php";
 require_once __DIR__ . "/Defines.php";
+require_once __DIR__ . "/WgConfTestCase.php";
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index 1e47099..4c8265d 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . '/../multiversion/MWMultiVersion.php';
 require_once __DIR__ . '/SiteConfiguration.php';
 
-class cirrusTests extends PHPUnit_Framework_TestCase {
+class cirrusTests extends WgConfTestCase {
public function testClusterConfigurationForProdTestwiki() {
$wmfDatacenter = 'unittest';
$config = $this->loadCirrusConfig( 'production', 'testwiki', 
'wiki' );
@@ -83,12 +83,14 @@
require "{$wmfConfigDir}/wgConf.php";
 
// 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Remove unused grammar forms for Polish

[jenkins-bot (Code Review)]

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

Change subject: Remove unused grammar forms for Polish
..


Remove unused grammar forms for Polish

The declensions for the following words are certainly unused:

* "użytkownik"   (=user)
* "wikipedysta"  (=Wikipedian, member of Wikipedia community)
* "wikireporter" (=wiki-reporter, member of Wikinews community)
* "wikiskryba"   (=wiki-scribe, member of Wikisource community)

I don't see how they would ever be used – the word "user"
("użytkownik") is never used as a message parameter or output
by parser functions, as far as I know, so you'd have to
literally write something like "{{GRAMMAR:użytkownik|D.lp}}"
in a message, in which case why not just write 'użytkownika'?
Searching through existing translations reveals no usages.

Other languages don't seem to have these. I only see a similar
grammar form in the definition for Czech 'cs', which is probably
also unused, but I'm not familiar with the language so I'm not
touching it.

The "lm" forms, used for plural declension ("lm" stands for
"liczba mnoga" = "plural number"), make even less sense – why
write the equivalent of "{{GRAMMAR:user|D.lm}}" when you could
instead write "{{GRAMMAR:users|D}}"? Alas, the redundant "lp"
("liczba pojedyncza" = "singular number") in grammar form names
needs to remain, since it's used in existing translations.

Change-Id: I2c4ed2ddb0d12c1a3d1f153f52752740b994abcf
---
M WikimediaMessages.hooks.php
1 file changed, 0 insertions(+), 66 deletions(-)

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



diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 44a1dda..6a11392 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -997,109 +997,43 @@
 
$wgGrammarForms['pl'] = [
'D.lp' => [
-   'wikipedysta'  => 'wikipedysty',
'Wikicytaty'   => 'Wikicytatów',
'Wikipedia'=> 'Wikipedii',
'Wikipodróże'  => 'Wikipodróży',
'Wikisłownik'  => 'Wikisłownika',
'Wikiźródła'   => 'Wikiźródeł',
-   'użytkownik'   => 'użytkownika',
-   'wikireporter' => 'wikireportera',
-   'wikiskryba'   => 'wikiskryby',
'Wikidane' => 'Wikidanych',
],
'C.lp' => [
-   'wikipedysta'  => 'wikipedyście',
'Wikicytaty'   => 'Wikicytatom',
'Wikipedia'=> 'Wikipedii',
'Wikipodróże'  => 'Wikipodróżom',
'Wikisłownik'  => 'Wikisłownikowi',
'Wikiźródła'   => 'Wikiźródłom',
-   'użytkownik'   => 'użytkownikowi',
-   'wikireporter' => 'wikireporterowi',
-   'wikiskryba'   => 'wikiskrybie',
'Wikidane' => 'Wikidanym',
],
'B.lp' => [
-   'wikipedysta'  => 'wikipedystę',
'Wikipedia'=> 'Wikipedię',
-   'użytkownik'   => 'użytkownika',
-   'wikireporter' => 'wikireportera',
-   'wikiskryba'   => 'wikiskrybę',
],
'N.lp' => [
-   'wikipedysta'  => 'wikipedystą',
'Wikicytaty'   => 'Wikicytatami',
'Wikipedia'=> 'Wikipedią',
'Wikipodróże'  => 'Wikipodróżami',
'Wikisłownik'  => 'Wikisłownikiem',
'Wikiźródła'   => 'Wikiźródłami',
-   'użytkownik'   => 'użytkownikiem',
-   'wikireporter' => 'wikireporterem',
-   'wikiskryba'   => 'wikiskrybą',
'Wikidane' => 'Wikidanymi',
],
'MS.lp' => [
-   'wikipedysta'  => 'wikipedyście',
'Wikicytaty'   => 'Wikicytatach',
'Wikipedia'=> 'Wikipedii',
'Wikipodróże'  => 'Wikipodróżach',
'Wikisłownik'  => 'Wikisłowniku',
'Wikiźródła'   => 'Wikiźródłach',
-   'użytkownik'   => 'użytkowniku',
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: add herron to ops group

[Dzahn (Code Review)]

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

Change subject: admin: add herron to ops group
..

admin: add herron to ops group

Keith Herron is a new Operations Engineer
with root access.

Bug: T166587
Change-Id: I82d2e65c291081d647108d14fc71f016fa692ef3
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index cbc2045..160f9d4 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -25,7 +25,8 @@
 description: include everywhere ops folks
 members: _members [filippo, jgreen, bblack, andrew, faidon, rush, 
oblivian, yuvipanda,
   dzahn, akosiaris, mark, ariel, cmjohnson, otto, robh, tstarling,
-  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui, ayounsi]
+  ori, midom, jmm, jynus, aaron, ema, elukey, gehel, volans, 
madhuvishy, marostegui,
+  ayounsi, herron]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82d2e65c291081d647108d14fc71f016fa692ef3
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/dns[master]: DNS: Add mgmt and production DNS for labtestvirt2003

[Papaul (Code Review)]

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

Change subject: DNS: Add mgmt and production DNS for labtestvirt2003
..

DNS: Add mgmt and production DNS for labtestvirt2003

Bug:T166237
Change-Id: Ib084085e1306056b17f0669f15fa9a28fc5888ce
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/02/356302/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0b2d479..fafd8d8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3074,6 +3074,7 @@
 5   1H IN PTR   labtestnet2001.codfw.wmnet.
 6   1H IN PTR   labtestvirt2001.codfw.wmnet.
 7   1H IN PTR   labtestvirt2002.codfw.wmnet.
+8   1H IN PTR   labtestvirt2003.codfw.wmnet.
 
 ; 10.192.21.0/24 - labs-support1-b-codfw
 $ORIGIN 21.192.{{ zonename }}.
@@ -3524,6 +3525,8 @@
 31  1H IN PTR  wmf5819.mgmt.codfw.wmnet.
 32  1H IN PTR  baham.mgmt.codfw.wmnet.
 32  1H IN PTR  wmf5820.mgmt.codfw.wmnet.
+33  1H IN PTR  labtestvirt2003.mgmt.codfw.wmnet.
+33  1H IN PTR  wmf6571.mgmt.codfw.wmnet.
 
 37  1H IN PTR  ms-be2001.mgmt.codfw.wmnet.
 37  1H IN PTR  wmf5919.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index cb9a8ea..79b2f3f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2626,7 +2626,8 @@
 labtestneutron2001  1H  IN A10.192.20.4
 labtestnet2001  1H  IN A10.192.20.5
 labtestvirt2001 1H  IN A10.192.20.6
-labtestvirt20021H  IN A10.192.20.7
+labtestvirt2002 1H  IN A10.192.20.7
+labtestvirt2003 1H  IN A10.192.20.8
 lvs2001 1H  IN A10.192.1.1
 lvs2002 1H  IN A10.192.1.2
 lvs2003 1H  IN A10.192.1.3
@@ -3352,6 +3353,7 @@
 labtestneutron20011H  IN A10.193.1.20
 labtestservices2001   1H  IN A10.193.1.21
 labtestvirt2001   1H  IN A10.193.1.19
+labtestvirt2003   1H  IN A10.193.1.33
 lvs2001 1H  IN A10.193.1.1
 lvs2002 1H  IN A10.193.1.2
 lvs2003 1H  IN A10.193.1.3
@@ -4178,6 +4180,7 @@
 wmf6568 1H  IN A10.193.1.196
 wmf6569 1H  IN A10.193.2.135
 wmf6570 1H  IN A10.193.2.136
+wmf6571 1H  IN A10.193.1.33
 
 ;
 ; ESAMS

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib084085e1306056b17f0669f15fa9a28fc5888ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Papaul 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use currentTarget rather than target in ref link click handler

[Jdlrobson (Code Review)]

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

Change subject: Use currentTarget rather than target in ref link click handler
..

Use currentTarget rather than target in ref link click handler

event.target identifies the element on which the event occurred
not the element on which it has been triggered. Here we only care
about where it has been triggered.

Bug: T166548
Change-Id: I15207f439ed86089f57c5d00f90c6596167854cc
---
M resources/skins.minerva.scripts/references.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/skins.minerva.scripts/references.js 
b/resources/skins.minerva.scripts/references.js
index 91d8233..e1f6614 100644
--- a/resources/skins.minerva.scripts/references.js
+++ b/resources/skins.minerva.scripts/references.js
@@ -41,7 +41,7 @@
 */
function showReference( ev, drawer, page ) {
var urlComponents,
-   $dest = $( ev.target ),
+   $dest = $( ev.currentTarget ),
href = $dest.attr( 'href' );
 
ev.preventDefault();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15207f439ed86089f57c5d00f90c6596167854cc
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] mediawiki...citoid[master]: Switch to single request for ISBN

[Mobrovac (Code Review)]

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

Change subject: Switch to single request for ISBN
..


Switch to single request for ISBN

* Put worldCat request functions in its own
class
* Switch ISBN requests to requests for a single
record; this is more accurate and reduces the
unpredictability of the ISBN tests as well

Change-Id: I95fa8a99986ef4199ebf35b379a789eedbf736ac
---
M lib/CitoidService.js
M lib/Exporter.js
M lib/Scraper.js
A lib/WorldCatService.js
M lib/XMLReader.js
M test/features/scraping/isbn.js
6 files changed, 380 insertions(+), 188 deletions(-)

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



diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index ac149bc..ea310d2 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -19,6 +19,7 @@
 var AddressError = require('./hostIsAllowed').AddressError;
 var pubMedRequest = require('./pubMedRequest.js');
 var unshorten = require('./unshorten.js');
+var WorldCatService = require('./WorldCatService.js');
 var ZoteroService = require('./ZoteroService.js');
 
 var Translator = require('./Translator.js');
@@ -45,18 +46,22 @@
 
 this.exporter = new Exporter(app); // Exports internal format (zotero) to 
other formats (i.e., mediawiki)
 this.translator = new Translator(app); // Provides translation functions 
for following Objs
-this.scraper = new Scraper(app, this.translator); // Loads html and 
scrapes it
+this.scraper = new Scraper(app, this.translator, this.exporter); // Loads 
html and scrapes it
 
-// Only create isbn scrapers if configured to
+// Create worldcat service if using either isbn service
+if (this.conf.xisbn || this.conf.wskey){
+this.worldCatService = new WorldCatService(app, this.translator);
+}
+
+// Only create xisbn scrapers if configured to
 if (this.conf.xisbn) {
 this.json = new JSONReader(app, this.translator); // Translates from 
xisbn services
 }
-if (this.conf.wskey) {
-this.xml = new XMLReader(app, this.translator); // Translates from 
worldcat search API utilising services
-}
 
-// Create circular references
-this.scraper.exporter = this.exporter;
+// WorldCat services that require wskey
+if (this.conf.wskey) {
+this.xml = new XMLReader(app, this.translator, this.worldCatService);
+}
 
 // Only create circular references for zoteroService if configured to
 if (this.conf.zotero) {
@@ -203,136 +208,11 @@
 }
 }
 
-// Assume url if no other matches are made
+// Case: Unknown input
+// try url
 return foundURI(url);
 
 });
-
-/**
- * Promise of requested citation metadata from an ISBN. Uses worldcat xISBN 
service.
- * @param  {Object}   cr CitoidRequest object with new functions added to 
getResults Array
- * @return {Object}  BBPromise object for modified CitoidRequest 
object from input
- */
-CitoidService.prototype.requestToXISBN = function(citation, cr) {
-this.logger.log('debug/CitoidService', "requestToXISBN method");
-citation.format = cr.format;
-citation.doi = cr.doi;
-
-var isbnLink = 'http://xisbn.worldcat.org/webservices/xid/isbn/'+ 
citation.isbn;
-var citoidService = this;
-
-var query = { // Basic query parameters
-method: 'getMetadata',
-format: 'json',
-fl:'*'
-};
-
-var requestOptions = {
-uri : isbnLink,
-headers: {
-'User-Agent': this.userAgent
-},
-qs: query
-};
-
-// Set responses if below is rejected
-function reject(cit){
-var message = 'Unable to retrieve data from ISBN ' + cit.isbn;
-var error = {Error: message};
-citoidService.logger.log('debug/ISBN', message);
-
-cit.error = error;
-cit.responseCode = 404;
-
-return cr;
-}
-
-// Make request to WorldCat xisbn service
-return preq(requestOptions).then(
-function (res) {
-res.body = JSON.parse(res.body);
-if (res && res.status === 200 && res.body.stat === 'ok') {
-// Add oclc number to the request object
-if (res.body.list && res.body.list[0] && 
res.body.list[0].oclcnum &&
-res.body.list[0].oclcnum[0] && typeof 
res.body.list[0].oclcnum[0] === 'string') {
-cr.oclc = res.body.list[0].oclcnum[0];
-citation.oclc = res.body.list[0].oclcnum[0];
-}
-// Add WorldCat as a source of the metadata
-citation.source.push('WorldCat');
-
-return citoidService.scrapeJSON(citation, cr, res.body);
-} else {
-return reject(citation);
-}
-},
-// Preq rejection handler
-function(res){
-return reject(citation);
-}
-   

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Show watchlist feed instead of a-z if the user is an editor

[jenkins-bot (Code Review)]

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

Change subject: Show watchlist feed instead of a-z if the user is an editor
..


Show watchlist feed instead of a-z if the user is an editor

Per our discussion with Jon in the hackathon.
The problem is editors want to see their watchlist feed
and readers mistake watchlist with "Reading list".
We can "fix" this by showing different things to readers and editors

Bug: T88270
Change-Id: I5319ed7ff76b7d466ee63f16e1859d53cd8e7406
---
M extension.json
M includes/specials/SpecialMobileWatchlist.php
A tests/browser/features/special_watchlist_editors.feature
3 files changed, 21 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 329af48..efb348f 100644
--- a/extension.json
+++ b/extension.json
@@ -1876,7 +1876,8 @@
"MFEnableManifest": true,
"MFManifestThemeColor": "#252525",
"MFManifestBackgroundColor": "#FF",
-   "MFLogWrappedInfoboxes": true
+   "MFLogWrappedInfoboxes": true,
+   "MFWatchlistEditCountThreshold": 10
},
"manifest_version": 1
 }
diff --git a/includes/specials/SpecialMobileWatchlist.php 
b/includes/specials/SpecialMobileWatchlist.php
index 060f397..4d60af9 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -70,7 +70,12 @@
'mobile.pagesummary.styles',
] );
$req = $this->getRequest();
-   $this->view = $req->getVal( 'watchlistview', 'a-z' );
+
+   # Show watchlist feed if that person is an editor
+   $watchlistEditCountThreshold = $this->getConfig()->get( 
'MFWatchlistEditCountThreshold' );
+   $defaultView = $this->getUser()->getEditCount() > 
$watchlistEditCountThreshold  ? 'feed' : 'a-z';
+   $this->view = $req->getVal( 'watchlistview', $defaultView );
+
$this->filter = $req->getVal( 'filter', 'all' );
$this->fromPageTitle = Title::newFromText( $req->getVal( 
'from', false ) );
 
diff --git a/tests/browser/features/special_watchlist_editors.feature 
b/tests/browser/features/special_watchlist_editors.feature
new file mode 100644
index 000..6e3aa9c
--- /dev/null
+++ b/tests/browser/features/special_watchlist_editors.feature
@@ -0,0 +1,13 @@
+@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @integration 
@test2.m.wikipedia.org @vagrant @login
+Feature: Editor watchlist
+
+  Background:
+Given I am using the mobile site
+  And I am logged in as a user with a > 10 edit count
+  And I have recently edited pages on my watchlist
+  And I am on the "Special:Watchlist" page
+
+  Scenario: Default view for seasoned editors is the feed view
+Then I should see a list of diff summary links
+  And the modified button should be selected
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5319ed7ff76b7d466ee63f16e1859d53cd8e7406
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Fix `z-index` with fixed demo header

[jenkins-bot (Code Review)]

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

Change subject: demos: Fix `z-index` with fixed demo header
..


demos: Fix `z-index` with fixed demo header

Increasing dialog `z-index` for demo header use case,
stacking logic as follows:

1. Widgets values remain between `-1` & `3`,
2. menus and popups values remain at `4`,
3. assigning demo header and similar elements `5` and
4. increasing dialogs in demos only to `6`.

Bug: T166523
Change-Id: I24393ea2ba212baf2af142aadf0487ca1ed465bc
---
M demos/styles/demo.css
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index 27d76e4..73ae333 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -17,7 +17,7 @@
 }
 
 .demo-menu {
-   min-width: 320px; /* Let's not pretend it works on anything lower then 
that */
+   min-width: 320px; /* Let's not pretend it works on anything lower than 
that */
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@@ -307,7 +307,7 @@
border-bottom: 1px solid #a2a9b1;
padding-top: 1em;
box-shadow: 0 4px 4px -4px rgba( 0, 0, 0, 0.25 );
-   z-index: 99;
+   z-index: 5;
}
 
/* This needs extra specificity to beat PanelLayout styles */
@@ -317,6 +317,11 @@
border-radius: 2px;
box-shadow: none;
}
+
+   .oo-ui-windowManager-modal > .oo-ui-dialog,
+   .oo-ui-processDialog-errors {
+   z-index: 6;
+   }
 }
 
 /* Media Queries */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24393ea2ba212baf2af142aadf0487ca1ed465bc
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.22.0

[Jforrester (Code Review)]

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

Change subject: Tag v0.22.0
..

Tag v0.22.0

Change-Id: I38c6b23a534cdfb16ff74d37d35b4cd5f7fc60d4
---
M History.md
M package.json
2 files changed, 58 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/00/356300/1

diff --git a/History.md b/History.md
index 43652e2..09dd44c 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,61 @@
 # OOjs UI Release History
+## v0.22.0 / 2017-05-30
+### Breaking changes
+* [BREAKING CHANGE] TextInputWidget: Remove search related methods (Prateek 
Saxena)
+* [BREAKING CHANGE] icons: Drop the core icon pack (James D. Forrester)
+* [BREAKING CHANGE] icons: Remove unused 'bookmark' icon (Volker E.)
+
+### Deprecations
+* [DEPRECATING CHANGE] Rename the 'MediaWiki' theme to 'WikimediaUI' (James D. 
Forrester)
+* [DEPRECATING CHANGE] WindowManager: Deprecate using 
`openWindow`/`closeWindow` returns as promises (Bartosz Dziewoński)
+
+### Features
+* Add HiddenInputWidget to generate hidden input (Victor Barbu)
+* InputWidget: Introduce `#setInputId` and `inputId` config option (Bartosz 
Dziewoński)
+* MenuTagMultiselectWidget: Clear text field after adding an item from it 
(Bartosz Dziewoński)
+* MenuTagMultiselectWidget: Handle the 'selected' config option (Bartosz 
Dziewoński)
+* NumberInputWidget: Use icons instead of labels (Volker E.)
+* PopupButtonWidget: Handle empty configuration (Bartosz Dziewoński)
+* PopupWidget head: position close button absolutely (David Lynch)
+* PopupWidget: Sensibly position anchor-less popups (Roan Kattouw)
+* WindowManager: Add WindowInstance - a Promise-based lifecycle object (Timo 
Tijhof)
+* WindowManager: Handle errors better in `#closeWindow` (Bartosz Dziewoński)
+
+* Allow *even more* widgets to be focussed programatically (Bartosz Dziewoński)
+* Only cancel mouse down event if tool in toolgroup clicked on (Ed Sanders)
+* Re-introduce .simulateLabelClick() as a separate method from .focus() 
(Bartosz Dziewoński)
+
+### Styles
+* themes: Field*Layout help position perfectly aligned (Volker E.)
+* themes: Improve frameless button in size and behaviour (Volker E.)
+* themes: Increase FieldsetLayout header's `font-size` (Volker E.)
+* Apex theme: Ensure vertical centering of ButtonElement's icon (Volker E.)
+* Apex theme: Make OptionWidget icon override more specific (Moriel 
Schottlender)
+* Apex theme: Start Apex's 'user' icon pack, with just 'userAvatar' for now 
(Ed Sanders)
+* WikimediaUI theme: Align `@background-color-destructive` to WikimediaUI Base 
(Volker E.)
+* WikimediaUI theme: Align ButtonInputWidget's `line-height` to ButtonWidget 
(Volker E.)
+* WikimediaUI theme: Align inline label's position (Volker E.)
+* WikimediaUI theme: Ensure icon aligns in dropdown menu (Volker E.)
+* WikimediaUI theme: Remove incorrect comments (Volker E.)
+
+### Code
+* MenuTagMultiselectWidget: Add test for 'selected' config option (Bartosz 
Dziewoński)
+* windows: Add tests for OO.ui.alert/confirm/prompt (Timo Tijhof)
+* AUTHORS: Update for the past two years' work (James D. Forrester)
+* build: Add the README/AUTHORS/LICENCE files to dist (James D. Forrester)
+* demos: Add TextInputWidget examples with inline labels but no indicators (Ed 
Sanders)
+* demos: Add viewport meta tag to PHP demo too (Volker E.)
+* demos: Avoid inline CSS for the overlay (Bartosz Dziewoński)
+* demos: Fix code generation for more complicated cases (Bartosz Dziewoński)
+* demos: Fix up a couple of minor things in demo widgets (Bartosz Dziewoński)
+* demos: Fix `z-index` with fixed demo header (Volker E.)
+* demos: Increase and strengthen responsive support (Volker E.)
+* demos: Indicate widgets clearer by sections (Volker E.)
+* demos: Make disabled progress bar in demo determinate (Ed Sanders)
+* demos: Show code that can be used to create the widget (Prateek Saxena)
+* testsuitegenerator: Handle classes with no constructor (Bartosz Dziewoński)
+
+
 ## v0.21.4 / 2017-05-16
 ### Features
 * Allow more widgets to be focussed programatically (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 720c282..15eed0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.21.4",
+  "version": "0.22.0",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c6b23a534cdfb16ff74d37d35b4cd5f7fc60d4
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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/puppet[production]: admins: create shell account for Keith Herron

[Dzahn (Code Review)]

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

Change subject: admins: create shell account for Keith Herron
..


admins: create shell account for Keith Herron

Creates a new shell account for new ops member
Keith Herron.

Key as pasted on P5508 / T166587#3302076.

UID matching the user in LDAP with @wikimedia.org email.

Adding the user to groups will be a follow-up change.

Bug: T166587
Change-Id: Ib0b6b75a66a99d41ff2a1116c01e27194fcc33bc
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 6d9fdb2..cfd2f6d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2485,6 +2485,15 @@
   - ssh-rsa 
B3NzaC1yc2EBIwAAAQEAweEnau/EYh0Hdyon4KoT/WRnEUBwdh8Cw+1Mvs1wOxSzBqPg2M9U5JADm20WG+SfyeCyrMXlIDjG5SyBTfALKwez4ExonQ5FyGvt8v4ipQRx+U+tdewIu9n2aAdmZia+0pS1ZgbyhkJtwNO8D95axlmeOab46HyQqZs0BVxPPdXM4ysPUgPZpSIyQ3rfFVerrVClLBNxqHvi7ZuyKH1zBAxSURhT60oRRNGI74G0+78nAA1c/cTeY/DbEKsJNpo7VK5slh9XQNUS2/6X4mgYg5IUK3AtaXIDnA6H5HCgghba0pZN4AmVR4dwVmILWeb8HpMInlLowQUQ5jNXM+hnYQ==
 xionox@laptop
 uid: 16756
 email: ayou...@wikimedia.org
+  herron:
+ensure: present
+gid: 500
+name: herron
+realname: Keith Herron
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDjuVAhEH0j3RgCiVI8iWK0TIx7wR1ITXQbb92WizSNS7bufl6LksGS87u2fJc0QmfMQMvNYgTfj6ie9wnekARRJ/shIVLx2C44PXV8/veg5yZtOt07vRfqGmE0rdU/7GKB2h3688yB3uecNYkTatqVUH9hG2Z4C/zC3XRWJ6SWXy2FUhBqAsUXKvpfoQgx1jNLm1TWKBbbKYT2VjAYuXbtRhAhTXfz4oCHDZeNnOKg57rIEnen+FKXr4cMpL8pJMQNAk+jSDOJyyBdmDN3fnNY0Rdp7eFn3l6PhoTEqDUicVj6OH+zye+q5oK6S0EoGocCV1nHsP8t1ZFLkXY7oWMzKlbj9G7eG/Tf/p+xgRYL3F9wegLGwyBb6g5btS1CRb4FPE8OF1AZOU+9B9c+qL+Q33rAC3XfUb0Dqzv1OInZYFkkKoWpblpAiG6S9y1KaKOIeFYGJioCvs0dI89hjjxGZWR5EMIfclyvpdrWVitoLcZ6iVvVF73CsR0OpiHNwBGXX3fOw6IlP5T0lXOoPQImPEqlAZoaChvrH+GMCAmW6bEgMvW4iwsE8ajKKT/2riql2ZtTdUwiQCcSYCjAzhQCgsn43K0o/P5RME8dQTiprKC1rqQYYZSJryqZ7cUoBeE5nB+p3wpF4jPqcrKXuCrAuRvXEmWPX1y0e0qBZJNjlQ==
 kher...@wikimedia.org
+uid: 17187
+email: kher...@wikimedia.org
 ldap_only_users:
   abartov:
 ensure: present

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WindowManager: Deprecate using returns of openWindow/closeWi...

[jenkins-bot (Code Review)]

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

Change subject: WindowManager: Deprecate using returns of 
openWindow/closeWindow as promises
..


WindowManager: Deprecate using returns of openWindow/closeWindow as promises

The return value is now a WindowInstance object. Rather than using the
"nested promises" to wait for window to open/close, you should instace
use its properties (opening, opened, closing, closed) to wait for the
given step of window lifecycle.

Updated OO.ui.alert/confirm/prompt not to use the now-deprecated method.

Bug: T95923
Change-Id: Id1087428b2ac80bb1223793fbd66024be80bcf1d
---
M src/WindowManager.js
M src/windows.js
2 files changed, 29 insertions(+), 25 deletions(-)

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



diff --git a/src/WindowManager.js b/src/WindowManager.js
index 1cc73ef..41bd349 100644
--- a/src/WindowManager.js
+++ b/src/WindowManager.js
@@ -358,7 +358,13 @@
 
// Turn lifecycle into a Thenable for backwards-compatibility with
// the deprecated nested-promise behaviour (T163510).
-   lifecycle.then = compatOpening.then;
+   lifecycle.then = function () {
+   OO.ui.warnDeprecation(
+   'Using the return value of openWindow as a promise is 
deprecated. ' +
+   'Use .openWindow( ... ).opening.then( ... ) instead.'
+   );
+   return compatOpening.then.apply( this, arguments );
+   };
 
// Argument handling
if ( typeof win === 'string' ) {
@@ -459,7 +465,13 @@
 
// Turn lifecycle into a Thenable for backwards-compatibility with
// the deprecated nested-promise behaviour (T163510).
-   lifecycle.then = compatClosing.then;
+   lifecycle.then = function () {
+   OO.ui.warnDeprecation(
+   'Using the return value of closeWindow as a promise is 
deprecated. ' +
+   'Use .closeWindow( ... ).closing.then( ... ) instead.'
+   );
+   return compatClosing.then.apply( this, arguments );
+   };
 
// Error handling
if ( !win ) {
diff --git a/src/windows.js b/src/windows.js
index cdc60e6..b4c398e 100644
--- a/src/windows.js
+++ b/src/windows.js
@@ -40,12 +40,8 @@
return OO.ui.getWindowManager().openWindow( 'message', $.extend( {
message: text,
actions: [ OO.ui.MessageDialog.static.actions[ 0 ] ]
-   }, options ) ).then( function ( opened ) {
-   return opened.then( function ( closing ) {
-   return closing.then( function () {
-   return $.Deferred().resolve();
-   } );
-   } );
+   }, options ) ).closed.then( function () {
+   return undefined;
} );
 };
 
@@ -75,12 +71,8 @@
 OO.ui.confirm = function ( text, options ) {
return OO.ui.getWindowManager().openWindow( 'message', $.extend( {
message: text
-   }, options ) ).then( function ( opened ) {
-   return opened.then( function ( closing ) {
-   return closing.then( function ( data ) {
-   return $.Deferred().resolve( !!( data && 
data.action === 'accept' ) );
-   } );
-   } );
+   }, options ) ).closed.then( function ( data ) {
+   return !!( data && data.action === 'accept' );
} );
 };
 
@@ -109,27 +101,27 @@
  *  resolve to `null`.
  */
 OO.ui.prompt = function ( text, options ) {
-   var manager = OO.ui.getWindowManager(),
+   var instance,
+   manager = OO.ui.getWindowManager(),
textInput = new OO.ui.TextInputWidget( ( options && 
options.textInput ) || {} ),
textField = new OO.ui.FieldLayout( textInput, {
align: 'top',
label: text
} );
 
-   // TODO: This is a little hacky, and could be done by extending 
MessageDialog instead.
-
-   return manager.openWindow( 'message', $.extend( {
+   instance = manager.openWindow( 'message', $.extend( {
message: textField.$element
-   }, options ) ).then( function ( opened ) {
-   // After ready
+   }, options ) );
+
+   // TODO: This is a little hacky, and could be done by extending 
MessageDialog instead.
+   instance.opened.then( function () {
textInput.on( 'enter', function () {
manager.getCurrentWindow().close( { action: 'accept' } 
);
} );
textInput.focus();
-   return opened.then( function ( closing ) {
-   return closing.then( function ( data ) {
-   return $.Deferred().resolve( data && 
data.action 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WindowManager: Handle errors better in #closeWindow

[jenkins-bot (Code Review)]

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

Change subject: WindowManager: Handle errors better in #closeWindow
..


WindowManager: Handle errors better in #closeWindow

* If no window is currently opened, don't throw internal exceptions.
  Generate a fake window instance and pretend it failed to close.
* Actually, we should probably do the same for all other error cases,
  to avoid clobbering the state of the actually open window instance.

Bug: T166527
Change-Id: I15e1115185a02b9244a5f691610e5bc822e844dd
---
M src/WindowManager.js
1 file changed, 25 insertions(+), 27 deletions(-)

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



diff --git a/src/WindowManager.js b/src/WindowManager.js
index 1cc73ef..bb190f5 100644
--- a/src/WindowManager.js
+++ b/src/WindowManager.js
@@ -445,7 +445,8 @@
  * @fires closing
  */
 OO.ui.WindowManager.prototype.closeWindow = function ( win, data ) {
-   var manager = this,
+   var error,
+   manager = this,
compatClosing = $.Deferred(),
lifecycle = this.lifecycle,
compatOpened;
@@ -457,36 +458,33 @@
win = null;
}
 
+   // Error handling
+   if ( !lifecycle ) {
+   error = 'Cannot close window: no window is currently open';
+   } else if ( !win ) {
+   error = 'Cannot close window: window is not attached to 
manager';
+   } else if ( win !== this.currentWindow ) {
+   error = 'Cannot close window: window already closed with 
different data';
+   } else if ( this.preparingToClose || this.closing ) {
+   error = 'Cannot close window: window already closing with 
different data';
+   }
+
+   if ( error ) {
+   // This function was called for the wrong window and we don't 
want to mess with the current
+   // window's state.
+   lifecycle = new OO.ui.WindowInstance();
+   // Pretend the window has been opened, so that we can pretend 
to fail to close it.
+   lifecycle.state.opening.resolve( {} );
+   lifecycle.state.opened.resolve( {} );
+   }
+
// Turn lifecycle into a Thenable for backwards-compatibility with
// the deprecated nested-promise behaviour (T163510).
lifecycle.then = compatClosing.then;
 
-   // Error handling
-   if ( !win ) {
-   compatClosing.reject( new OO.ui.Error(
-   'Cannot close window: window is not attached to manager'
-   ) );
-   lifecycle.state.closing.reject( new OO.ui.Error(
-   'Cannot close window: window is not attached to manager'
-   ) );
-   return lifecycle;
-   }
-   if ( win !== this.currentWindow ) {
-   compatClosing.reject( new OO.ui.Error(
-   'Cannot close window: window already closed with 
different data'
-   ) );
-   lifecycle.state.closing.reject( new OO.ui.Error(
-   'Cannot close window: window already closed with 
different data'
-   ) );
-   return lifecycle;
-   }
-   if ( this.preparingToClose || this.closing ) {
-   compatClosing.reject( new OO.ui.Error(
-   'Cannot close window: window already closing with 
different data'
-   ) );
-   lifecycle.state.closing.reject( new OO.ui.Error(
-   'Cannot close window: window already closing with 
different data'
-   ) );
+   if ( error ) {
+   compatClosing.reject( new OO.ui.Error( error ) );
+   lifecycle.state.closing.reject( new OO.ui.Error( error ) );
return lifecycle;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15e1115185a02b9244a5f691610e5bc822e844dd
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: VolkerE 
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...citoid[master]: Update tests for translators update I6e901585b

[Mobrovac (Code Review)]

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

Change subject: Update tests for translators update I6e901585b
..


Update tests for translators update I6e901585b

* Fix test which was erroneously excluding DOI
(test previously expected a bookChapter for
which the field is invalid and was changed in last
translators update but this part was not)

* Fix bibtex export as update to bibtex translator
changes how nullauthors affect the export of the
citation.

Please merge and deploy with
I6e901585b79f2564747f5b19c8b0c87aa0813bed

Bug: T166292
Change-Id: I4b118f634fb3746adf837d41213a051dda5e
---
M test/features/scraping/export.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/test/features/scraping/export.js b/test/features/scraping/export.js
index c0e6462..c1e6505 100644
--- a/test/features/scraping/export.js
+++ b/test/features/scraping/export.js
@@ -16,7 +16,7 @@
 it('bibtex from scraper', function() {
 return server.query('http://example.com', 
'bibtex').then(function(res) {
 assert.status(res, 200);
-assert.checkBibtex(res, '\n@misc{_example_???');
+assert.checkBibtex(res, '\n@misc{noauthor_exa');
 });
 });
 
@@ -44,7 +44,7 @@
 assert.deepEqual(!!res.body[0].accessDate, true, 'No 
accessDate present');
 assert.notDeepEqual(res.body[0].accessDate, 
'CURRENT_TIMESTAMP', 'Access date uncorrected');
 assert.ok(res.body[0].creators);
-assert.deepEqual(res.body[0].DOI, undefined, 'DOI is invalid 
field for type conferencePaper');
+assert.deepEqual(res.body[0].DOI, '10.1007/11926078_68');
 assert.deepEqual(res.body[0].itemType, 'conferencePaper', 
'Wrong itemType; expected conferencePaper, got' + res.body[0].itemType);
 });
 });

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b118f634fb3746adf837d41213a051dda5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz 
Gerrit-Reviewer: Mobrovac 
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]: RCFilters: Hide server-side 'empty results' message

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Hide server-side 'empty results' message
..


RCFilters: Hide server-side 'empty results' message

RCFilters uses its own empty-results message that also relates to
the reason of why the results are empty (in case of conflicts, etc).
We want to make sure the server-side message is hidden and gone
while we load, and manage the empty-results message ourselves.

Bug: T163577
Change-Id: I1d0f07068653f369dea181f5c4f9964fd6d7cd58
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
2 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index d47346c..844e41c 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -26,6 +26,13 @@
min-height: 100px;
margin: 0;
}
+
+   .mw-changeslist-empty {
+   // Hide the 'empty' message when we load rcfilters
+   // since we replace it anyways with a specific
+   // message of our own
+   display: none;
+   }
 }
 
 .mw-rcfilters-staticfilters-selected {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index f4a1807..c7754be 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -39,7 +39,10 @@
update: 'onModelUpdate'
} );
 
-   this.$element.addClass( 
'mw-rcfilters-ui-changesListWrapperWidget' );
+   this.$element
+   .addClass( 'mw-rcfilters-ui-changesListWrapperWidget' )
+   // We handle our own display/hide of the empty results 
message
+   .removeClass( 'mw-changeslist-empty' );
 
// Set up highlight containers
this.setupHighlightContainers( this.$element );
@@ -92,7 +95,6 @@
isEmpty = $changesListContent === 'NO_RESULTS';
 
this.$element.toggleClass( 'mw-changeslist', !isEmpty );
-   this.$element.toggleClass( 'mw-changeslist-empty', isEmpty );
if ( isEmpty ) {
this.$changesListContent = null;
this.$element.empty();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d0f07068653f369dea181f5c4f9964fd6d7cd58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
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] mediawiki/core[master]: RCFilters: Blur input on 'escape' key

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Blur input on 'escape' key
..


RCFilters: Blur input on 'escape' key

Bug: T161493
Change-Id: Iae8f1e5dc5653f04708da74e137e35bd46cbf232
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
1 file changed, 11 insertions(+), 0 deletions(-)

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



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 78f3a08..2cffde3 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -216,6 +216,17 @@
};
 
/**
+* @inheritdoc
+*/
+   mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.doInputEscape = 
function () {
+   // Parent
+   
mw.rcfilters.ui.FilterTagMultiselectWidget.parent.prototype.doInputEscape.call( 
this );
+
+   // Blur the input
+   this.input.$input.blur();
+   };
+
+   /**
 * @inheridoc
 */
mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onChangeTags = 
function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae8f1e5dc5653f04708da74e137e35bd46cbf232
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
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/puppet[production]: admins: create shell account for Keith Herron

[Dzahn (Code Review)]

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

Change subject: admins: create shell account for Keith Herron
..

admins: create shell account for Keith Herron

Creates a new shell account for new ops member
Keith Herron.

Key as pasted on P5508 / T166587#3302076.

UID matching the user in LDAP with @wikimedia.org email.

Adding the user to groups will be a follow-up change.

Bug: T166587
Change-Id: Ib0b6b75a66a99d41ff2a1116c01e27194fcc33bc
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index b06e497..cbc2045 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2485,6 +2485,15 @@
   - ssh-rsa 
B3NzaC1yc2EBIwAAAQEAweEnau/EYh0Hdyon4KoT/WRnEUBwdh8Cw+1Mvs1wOxSzBqPg2M9U5JADm20WG+SfyeCyrMXlIDjG5SyBTfALKwez4ExonQ5FyGvt8v4ipQRx+U+tdewIu9n2aAdmZia+0pS1ZgbyhkJtwNO8D95axlmeOab46HyQqZs0BVxPPdXM4ysPUgPZpSIyQ3rfFVerrVClLBNxqHvi7ZuyKH1zBAxSURhT60oRRNGI74G0+78nAA1c/cTeY/DbEKsJNpo7VK5slh9XQNUS2/6X4mgYg5IUK3AtaXIDnA6H5HCgghba0pZN4AmVR4dwVmILWeb8HpMInlLowQUQ5jNXM+hnYQ==
 xionox@laptop
 uid: 16756
 email: ayou...@wikimedia.org
+  herron:
+ensure: present
+gid: 500
+name: herron
+realname: Keith Herron
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDjuVAhEH0j3RgCiVI8iWK0TIx7wR1ITXQbb92WizSNS7bufl6LksGS87u2fJc0QmfMQMvNYgTfj6ie9wnekARRJ/shIVLx2C44PXV8/veg5yZtOt07vRfqGmE0rdU/7GKB2h3688yB3uecNYkTatqVUH9hG2Z4C/zC3XRWJ6SWXy2FUhBqAsUXKvpfoQgx1jNLm1TWKBbbKYT2VjAYuXbtRhAhTXfz4oCHDZeNnOKg57rIEnen+FKXr4cMpL8pJMQNAk+jSDOJyyBdmDN3fnNY0Rdp7eFn3l6PhoTEqDUicVj6OH+zye+q5oK6S0EoGocCV1nHsP8t1ZFLkXY7oWMzKlbj9G7eG/Tf/p+xgRYL3F9wegLGwyBb6g5btS1CRb4FPE8OF1AZOU+9B9c+qL+Q33rAC3XfUb0Dqzv1OInZYFkkKoWpblpAiG6S9y1KaKOIeFYGJioCvs0dI89hjjxGZWR5EMIfclyvpdrWVitoLcZ6iVvVF73CsR0OpiHNwBGXX3fOw6IlP5T0lXOoPQImPEqlAZoaChvrH+GMCAmW6bEgMvW4iwsE8ajKKT/2riql2ZtTdUwiQCcSYCjAzhQCgsn43K0o/P5RME8dQTiprKC1rqQYYZSJryqZ7cUoBeE5nB+p3wpF4jPqcrKXuCrAuRvXEmWPX1y0e0qBZJNjlQ==
 kher...@wikimedia.org
+uid: 17187
+email: kher...@wikimedia.org
 ldap_only_users:
   abartov:
 ensure: present

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0b6b75a66a99d41ff2a1116c01e27194fcc33bc
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]: RCFilters: Unify 'highlight' and 'selected' items

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Unify 'highlight' and 'selected' items
..


RCFilters: Unify 'highlight' and 'selected' items

When moving with the arrows, we don't want a distinction between
the 'selected' and 'highlighted' states, since those don't quite
make sense in RCFilters system. We unify those by always using
'selected' state; this also means that when searching AND when
opening the popup, the first item is 'selected' so the user can
hit 'enter' and add it in, or hit the up/down arrow keys and
move up and down in the list.

Bug: T159768
Change-Id: Ife62e6e7241b96d846d8c5851b173a09a1f45fa4
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
1 file changed, 47 insertions(+), 14 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
index 0dfbb4d..91de969 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js
@@ -86,7 +86,7 @@
 */
mw.rcfilters.ui.MenuSelectWidget.prototype.updateItemVisibility = 
function () {
var i,
-   itemWasHighlighted = false,
+   itemWasSelected = false,
inputVal = this.$input.val(),
items = this.getItems();
 
@@ -96,22 +96,20 @@
// Parent method

mw.rcfilters.ui.MenuSelectWidget.parent.prototype.updateItemVisibility.call( 
this );
 
-   if ( inputVal !== '' ) {
-   // Highlight the first item in the list
-   for ( i = 0; i < items.length; i++ ) {
-   if (
-   !( items[ i ] instanceof 
OO.ui.MenuSectionOptionWidget ) &&
-   items[ i ].isVisible()
-   ) {
-   itemWasHighlighted = true;
-   this.highlightItem( items[ i ] 
);
-   break;
-   }
+   // Select the first item in the list
+   for ( i = 0; i < items.length; i++ ) {
+   if (
+   !( items[ i ] instanceof 
OO.ui.MenuSectionOptionWidget ) &&
+   items[ i ].isVisible()
+   ) {
+   itemWasSelected = true;
+   this.selectItem( items[ i ] );
+   break;
}
}
 
-   if ( !itemWasHighlighted ) {
-   this.highlightItem( null );
+   if ( !itemWasSelected ) {
+   this.selectItem( null );
}
 
// Cache value
@@ -135,6 +133,41 @@
};
 
/**
+* @inheritdoc
+*/
+   mw.rcfilters.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) {
+   var nextItem,
+   currentItem = this.getHighlightedItem() || 
this.getSelectedItem();
+
+   // Call parent
+   
mw.rcfilters.ui.MenuSelectWidget.parent.prototype.onKeyDown.call( this, e );
+
+   // We want to select the item on arrow movement
+   // rather than just highlight it, like the menu
+   // does by default
+   if ( !this.isDisabled() && this.isVisible() ) {
+   switch ( e.keyCode ) {
+   case OO.ui.Keys.UP:
+   case OO.ui.Keys.LEFT:
+   // Get the next item
+   nextItem = 
this.getRelativeSelectableItem( currentItem, -1 );
+   break;
+   case OO.ui.Keys.DOWN:
+   case OO.ui.Keys.RIGHT:
+   // Get the next item
+   nextItem = 
this.getRelativeSelectableItem( currentItem, 1 );
+   break;
+   }
+
+   nextItem = nextItem && 
nextItem.constructor.static.selectable ?
+   nextItem : null;
+
+   // Select the next item
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Show total number of autoblocks on top of Special:AutoblockList

[jenkins-bot (Code Review)]

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

Change subject: Show total number of autoblocks on top of Special:AutoblockList
..


Show total number of autoblocks on top of Special:AutoblockList

Bug: T163172
Change-Id: I51b1b7675c2f4ed68ccb725230ffecf3583cf65f
---
M includes/specials/SpecialAutoblockList.php
M includes/specials/pagers/BlockListPager.php
M languages/i18n/en.json
M languages/i18n/qqq.json
4 files changed, 37 insertions(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialAutoblockList.php 
b/includes/specials/SpecialAutoblockList.php
index dcb2444..bf13865 100644
--- a/includes/specials/SpecialAutoblockList.php
+++ b/includes/specials/SpecialAutoblockList.php
@@ -78,6 +78,7 @@
->prepareForm()
->displayForm( false );
 
+   $this->showTotal( $pager );
$this->showList( $pager );
}
 
@@ -98,6 +99,20 @@
}
 
/**
+* Show total number of autoblocks on top of the table
+*
+* @param BlockListPager $pager The BlockListPager instance for this 
page
+*/
+   protected function showTotal( BlockListPager $pager ) {
+   $out = $this->getOutput();
+   $out->addHTML(
+   Html::element( 'div', [ 'style' => 'font-weight: bold;' 
],
+   $this->msg( 'autoblocklist-total-autoblocks', 
$pager->getTotalAutoblocks() )->parse() )
+   . "\n"
+   );
+   }
+
+   /**
 * Show the list of blocked accounts matching the actual filter.
 * @param BlockListPager $pager The BlockListPager instance for this 
page
 */
diff --git a/includes/specials/pagers/BlockListPager.php 
b/includes/specials/pagers/BlockListPager.php
index 9a447ef..51e446d 100644
--- a/includes/specials/pagers/BlockListPager.php
+++ b/includes/specials/pagers/BlockListPager.php
@@ -246,6 +246,26 @@
return $info;
}
 
+   /**
+* Get total number of autoblocks at any given time
+*
+* @return int Total number of unexpired active autoblocks
+*/
+   function getTotalAutoblocks() {
+   $dbr = $this->getDatabase();
+   $res = $dbr->selectField( 'ipblocks',
+   [ 'COUNT(*) AS totalautoblocks' ],
+   [
+   'ipb_auto' => '1',
+   'ipb_expiry >= ' . $dbr->addQuotes( 
$dbr->timestamp() ),
+   ]
+   );
+   if ( $res ) {
+   return $res;
+   }
+   return 0; // We found nothing
+   }
+
protected function getTableClass() {
return parent::getTableClass() . ' mw-blocklist';
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index cc60432..a0efd05 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2497,6 +2497,7 @@
"autoblocklist-submit": "Search",
"autoblocklist-legend": "List autoblocks",
"autoblocklist-localblocks": "Local {{PLURAL:$1|autoblock|autoblocks}}",
+   "autoblocklist-total-autoblocks": "Total number of autoblocks: $1",
"autoblocklist-empty": "The autoblock list is empty.",
"autoblocklist-otherblocks": "Other {{PLURAL:$1|autoblock|autoblocks}}",
"ipblocklist": "Blocked users",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 694ef74..7b7f27f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2686,6 +2686,7 @@
"autoblocklist-legend": "Used as legend of the form in 
[[Special:AutoblockList]].\n\nSee also:\n* {{msg-mw|Autoblocklist-legend}}\n* 
{{msg-mw|Autoblocklist-submit}}",
"autoblocklist-localblocks": "[[File:Special AutoBlockList 
new.png|thumb|Example]]\nUsed on [[Special:AutoblockList]] as header when 
global autoblocks exists too.",
"autoblocklist-empty": "Used in [[Special:AutoblockList]].",
+   "autoblocklist-total-autoblocks": "Shows the total number of active 
autoblocks on [[Special:AutoblockList]]. Parameters:\n* $1 - number of 
autoblocks",
"autoblocklist-otherblocks": "[[File:Special AutoBlockList 
new.png|thumb|Example]]\nUsed on [[Special:AutoblockList]] as header for other 
blocks, i.e. from GlobalBlocking or TorBlocks.\n\nParameters:\n* $1 - number of 
blocks",
"ipblocklist": "Title of [[Special:Ipblocklist]].",
"ipblocklist-legend": "Used as legend of the form in 
[[Special:BlockList]].\n\nSee also:\n* {{msg-mw|Ipblocklist-legend}}\n* 
{{msg-mw|Ipblocklist-submit}}",

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

Gerrit-MessageType: 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use PHP DateInputWidget in Contribs and use for range filtering

[jenkins-bot (Code Review)]

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

Change subject: Use PHP DateInputWidget in Contribs and use for range filtering
..


Use PHP DateInputWidget in Contribs and use for range filtering

* Add two DateInputWidgets to Special:Contributions, one for start and
  one for end
** If start input is empty but end input is not, display edits up to end
   input, and vice versa
** If both inputs are specified, display edits between the two dates
** If both inputs are empty, no date range is used
* Legacy options (year=/month=) are converted to use for the end
  timestamp, so URLs with them should still work.
* Unit tests!

Bug: T120733
Change-Id: Id15f2b2ce2954fe98dfbbb7b0e86c0e4e5713f5e
---
M includes/specials/SpecialContributions.php
M includes/specials/pagers/ContribsPager.php
M resources/Resources.php
A resources/src/mediawiki.special/mediawiki.special.contributions.js
A tests/phpunit/includes/specials/SpecialContributionsTest.php
5 files changed, 160 insertions(+), 22 deletions(-)

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



diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 167a025..cc399b6 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -40,8 +40,11 @@
$out->addModuleStyles( [
'mediawiki.special',
'mediawiki.special.changeslist',
+   'mediawiki.widgets.DateInputWidget',
] );
+   $out->addModules( 'mediawiki.special.contributions' );
$this->addHelpLink( 'Help:User contributions' );
+   $out->enableOOUI();
 
$this->opts = [];
$request = $this->getRequest();
@@ -130,8 +133,12 @@
$this->opts['year'] = '';
$this->opts['month'] = '';
} else {
-   $this->opts['year'] = $request->getIntOrNull( 'year' );
-   $this->opts['month'] = $request->getIntOrNull( 'month' 
);
+   $this->opts['year'] = $request->getVal( 'year' );
+   $this->opts['month'] = $request->getVal( 'month' );
+
+   $this->opts['start'] = $request->getVal( 'start' );
+   $this->opts['end'] = $request->getVal( 'end' );
+   $this->opts = SpecialContributions::processDateFilter( 
$this->opts );
}
 
$feedType = $request->getVal( 'feed' );
@@ -190,8 +197,8 @@
'contribs' => $this->opts['contribs'],
'namespace' => $this->opts['namespace'],
'tagfilter' => $this->opts['tagfilter'],
-   'year' => $this->opts['year'],
-   'month' => $this->opts['month'],
+   'start' => $this->opts['start'],
+   'end' => $this->opts['end'],
'deletedOnly' => $this->opts['deletedOnly'],
'topOnly' => $this->opts['topOnly'],
'newOnly' => $this->opts['newOnly'],
@@ -432,12 +439,12 @@
$this->opts['contribs'] = 'user';
}
 
-   if ( !isset( $this->opts['year'] ) ) {
-   $this->opts['year'] = '';
+   if ( !isset( $this->opts['start'] ) ) {
+   $this->opts['start'] = '';
}
 
-   if ( !isset( $this->opts['month'] ) ) {
-   $this->opts['month'] = '';
+   if ( !isset( $this->opts['end'] ) ) {
+   $this->opts['end'] = '';
}
 
if ( $this->opts['contribs'] == 'newbie' ) {
@@ -478,6 +485,8 @@
'contribs',
'year',
'month',
+   'start',
+   'end',
'topOnly',
'newOnly',
'hideMinor',
@@ -652,15 +661,32 @@
implode( '', $filters )
);
 
-   $dateSelectionAndSubmit = Xml::tags( 'div', [],
-   Xml::dateMenu(
-   $this->opts['year'] === '' ? 
MWTimestamp::getInstance()->format( 'Y' ) : $this->opts['year'],
-   $this->opts['month']
-   ) . ' ' .
-   Html::submitButton(
-   $this->msg( 'sp-contributions-submit' 
)->text(),
-   [ 

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Purge formulae on action=purge

[jenkins-bot (Code Review)]

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

Change subject: Purge formulae on action=purge
..


Purge formulae on action=purge

Previously, the 'action=purge' parameter could not be
accessed by the math extension, since 'action=purge' caused a reload
of the page, even before the math extension was called. However,
before MediaWiki 1.29.+ additional GET request parameter were
forwarded to the next page and could be evaluated by the math
extension. Thus, an additional parameter 'mathpurge=true' was added
to re-render formulae. However, it seems that this additional GET
parameter is no longer being forwarded.

This change reads the refer header to check if 'action=purge' was
passed. This makes the mathpurge parameter obsolete.

Bug: T74537
Change-Id: Ia09c039de3a7232a28bfdd5a97daf1029e5d7c40
---
M MathRenderer.php
1 file changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/MathRenderer.php b/MathRenderer.php
index b6916eb..99216f8 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -522,17 +522,15 @@
if ( $this->purge ) {
return true;
}
-   $request = RequestContext::getMain()->getRequest();
-   // TODO: Figure out if ?action=purge
-   // $action = $request->getText('action'); //always returns ''
-   // until this issue is resolved we use ?mathpurge=true instead
-   $mathpurge = $request->getBool( 'mathpurge', false );
-   if ( $mathpurge ) {
-   LoggerFactory::getInstance( 'Math' )->debug( 
'Re-Rendering on user request' );
-   return true;
-   } else {
-   return false;
+   $refererHeader = 
RequestContext::getMain()->getRequest()->getHeader( 'REFERER' );
+   if ( $refererHeader ) {
+   parse_str( parse_url( $refererHeader, PHP_URL_QUERY ), 
$refererParam );
+   if ( isset( $refererParam['action'] ) && 
$refererParam['action'] === 'purge' ) {
+   LoggerFactory::getInstance( 'Math' )->debug( 
'Re-Rendering on user request' );
+   return true;
+   }
}
+   return false;
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia09c039de3a7232a28bfdd5a97daf1029e5d7c40
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: FullSearchArticlesTask retrofit follow-up

[Mholloway (Code Review)]

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

Change subject: Hygiene: FullSearchArticlesTask retrofit follow-up
..

Hygiene: FullSearchArticlesTask retrofit follow-up

* Delete FullSearchArticlesTask[Test]
* Update a comment

Change-Id: I87e10c71278c4a16e7b6262ca7b2e75e5cbd495d
---
D app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
D app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M app/src/main/java/org/wikipedia/search/SearchResults.java
3 files changed, 1 insertion(+), 243 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java 
b/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
deleted file mode 100644
index 4712f27..000
--- 
a/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.wikipedia.search;
-
-
-import org.junit.Test;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.testlib.TestLatch;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
-
-/**
- * Tests for full text search.
- * TODO: Remove.
- */
-public class FullSearchArticlesTaskTest {
-private static final int BATCH_SIZE = 12;
-private static final WikiSite WIKI = WikiSite.forLanguageCode("en");
-
-/** Have to use enwiki since I don't think there are any Wikidata 
descriptions for testwiki. */
-@Test public void testFullTextSearchWithResults() throws Throwable {
-final TestLatch latch = new TestLatch();
-runOnMainSync(new Runnable() {
-@Override
-public void run() {
-WikipediaApp app = WikipediaApp.getInstance();
-new FullSearchArticlesTask(app.getAPIForSite(WIKI), WIKI, 
"test", BATCH_SIZE, null, false) {
-@Override
-public void onFinish(SearchResults results) {
-assertThat(results, notNullValue());
-assertThat(results.getResults().size(), 
is(BATCH_SIZE));
-assertThat(results.getSuggestion(), is(""));
-assertThat(results.getContinuation(), notNullValue());
-
-for (SearchResult result : results.getResults()) {
-if 
(result.getPageTitle().getPrefixedText().equals("Test")) {
-
assertThat(result.getPageTitle().getDescription(), is("Wikipedia disambiguation 
page"));
-}
-}
-latch.countDown();
-}
-}.execute();
-}
-});
-latch.await();
-}
-
-// TODO: move to TitleSearchTest once we have it
-
-//@Test public void testFullTextSearchWithSuggestion() throws Throwable {
-//startActivity(new Intent(), null, null);
-//final CountDownLatch completionLatch = new CountDownLatch(1);
-//runTestOnUiThread(new Runnable() {
-//@Override
-//public void run() {
-//WikipediaApp app = WikipediaApp.getInstance();
-//new FullSearchArticlesTask(app.getAPIForSite(WIKI), WIKI, 
"teest", BATCH_SIZE, null) { // small typo should produce a suggestion
-//@Override
-//public void onFinish(SearchResults results) {
-//assertNotNull(results);
-//assertEquals(results.getSuggestion(), "test");
-//completionLatch.countDown();
-//}
-//}.execute();
-//}
-//});
-//assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
-//}
-
-@Test public void testEmptyResults() throws Throwable {
-final TestLatch latch = new TestLatch();
-runOnMainSync(new Runnable() {
-@Override
-public void run() {
-WikipediaApp app = WikipediaApp.getInstance();
-new FullSearchArticlesTask(app.getAPIForSite(WIKI), WIKI, 
"jkfsdfpefdsfwoirpoik", BATCH_SIZE, null, false) { // total gibberish, should 
not exist on enwiki
-@Override
-public void onFinish(SearchResults results) {
-assertThat(results, notNullValue());
-assertThat(results.getResults().size(), is(0));
-assertThat(results.getSuggestion(), is(""));
-

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Use …->assertArrayHasKey() instead of isset()

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356281 )

Change subject: Use …->assertArrayHasKey() instead of isset()
..

Use …->assertArrayHasKey() instead of isset()

… as well as update a line of documentation I had stashed. I think this
does not need it's own patch, or does it?

Change-Id: I99eee1f7b5ec96c1c75e73d66200bc41807452fa
---
M includes/MediaWikiGadgetsDefinitionRepo.php
M tests/phpunit/GadgetTest.php
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets 
refs/changes/81/356281/1

diff --git a/includes/MediaWikiGadgetsDefinitionRepo.php 
b/includes/MediaWikiGadgetsDefinitionRepo.php
index 06e0760..c0ae3e0 100644
--- a/includes/MediaWikiGadgetsDefinitionRepo.php
+++ b/includes/MediaWikiGadgetsDefinitionRepo.php
@@ -135,7 +135,7 @@
 * Generates a structured list of Gadget objects from a definition
 *
 * @param string $definition
-* @return array Array( name => Gadget )
+* @return Gadget[] List of Gadget objects indexed by the gadget's name.
 */
private function listFromDefinition( $definition ) {
$definition = preg_replace( '//s', '', $definition );
diff --git a/tests/phpunit/GadgetTest.php b/tests/phpunit/GadgetTest.php
index 25f1ef7..1229281 100644
--- a/tests/phpunit/GadgetTest.php
+++ b/tests/phpunit/GadgetTest.php
@@ -163,9 +163,10 @@
$this->assertTrue( GadgetHooks::getPreferences( new User, 
$prefs ), 'GetPrefences hook should return true' );
 
$options = $prefs['gadgets']['options'];
-   $this->assertFalse( isset( 
$options['⧼gadget-section-remove-section⧽'] ), 'Must not show empty sections' );
-   $this->assertTrue( isset( 
$options['⧼gadget-section-keep-section1⧽'] ) );
-   $this->assertTrue( isset( 
$options['⧼gadget-section-keep-section2⧽'] ) );
+   $this->assertArrayNotHasKey( '⧼gadget-section-remove-section⧽', 
$options,
+   'Must not show empty sections' );
+   $this->assertArrayHasKey( '⧼gadget-section-keep-section1⧽', 
$options );
+   $this->assertArrayHasKey( '⧼gadget-section-keep-section2⧽', 
$options ) );
}
 
public function tearDown() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99eee1f7b5ec96c1c75e73d66200bc41807452fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Remove incomplete PHPDoc @param tags

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356277 )

Change subject: Remove incomplete PHPDoc @param tags
..

Remove incomplete PHPDoc @param tags

Plus:
* Add a missing "array" type hint.
* Use more specific assert… functions instead of isset().

Change-Id: Iaa423620d493b4bee11bf89f627d0420a645a8de
---
M tests/phpunit/LinksUpdateHookHandlerTest.php
1 file changed, 3 insertions(+), 8 deletions(-)


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

diff --git a/tests/phpunit/LinksUpdateHookHandlerTest.php 
b/tests/phpunit/LinksUpdateHookHandlerTest.php
index 619d589..7148b73 100644
--- a/tests/phpunit/LinksUpdateHookHandlerTest.php
+++ b/tests/phpunit/LinksUpdateHookHandlerTest.php
@@ -115,11 +115,8 @@
/**
 * @dataProvider provideDoLinksUpdate
 * @covers LinksUpdateHookHandler::doLinksUpdate
-* @param $images
-* @param $expectedFreeFileName
-* @param $expectedNonFreeFileName
 */
-   public function testDoLinksUpdate( $images, $expectedFreeFileName, 
$expectedNonFreeFileName ) {
+   public function testDoLinksUpdate( array $images, 
$expectedFreeFileName, $expectedNonFreeFileName ) {
$linksUpdate = $this->getLinksUpdate( $images );
$mock = TestingAccessWrapper::newFromObject(
$this->getMockBuilder( 
LinksUpdateHookHandler::class )
@@ -147,12 +144,12 @@
 
$this->assertTrue( property_exists( $linksUpdate, 'mProperties' 
), 'precondition' );
if ( is_null( $expectedFreeFileName ) ) {
-   $this->assertFalse( isset( 
$linksUpdate->mProperties[PageImages::PROP_NAME_FREE] ) );
+   $this->assertArrayNotHasKey( 
PageImages::PROP_NAME_FREE, $linksUpdate->mProperties );
} else {
$this->assertSame( $expectedFreeFileName, 
$linksUpdate->mProperties[PageImages::PROP_NAME_FREE] );
}
if ( is_null( $expectedNonFreeFileName ) ) {
-   $this->assertFalse( isset( 
$linksUpdate->mProperties[PageImages::PROP_NAME] ) );
+   $this->assertArrayNotHasKey( PageImages::PROP_NAME, 
$linksUpdate->mProperties );
} else {
$this->assertSame( $expectedNonFreeFileName, 
$linksUpdate->mProperties[PageImages::PROP_NAME] );
}
@@ -324,8 +321,6 @@
 
/**
 * @dataProvider provideIsFreeImage
-* @param $fileName
-* @param $metadata
 * @covers LinksUpdateHookHandler::isImageFree
 */
public function testIsFreeImage( $fileName, $metadata, $expected ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa423620d493b4bee11bf89f627d0420a645a8de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

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

[Umherirrender (Code Review)]

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

Change subject: Add phpcs and make pass
..

Add phpcs and make pass

Change-Id: Ia2e962db11f4733a275e648ff378d5254c9e620c
---
M CreateAccountTestWiki.php
M InfoPage.php
M ListUsersTestWiki.php
M SpecialIncubatorFirstSteps.php
M SpecialRandomByTest.php
M SpecialSearchWiki.php
M SpecialViewUserLang.php
M WikimediaIncubator.class.php
M composer.json
A phpcs.xml
10 files changed, 108 insertions(+), 43 deletions(-)


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

diff --git a/CreateAccountTestWiki.php b/CreateAccountTestWiki.php
index eafb14b..8ea9b27 100644
--- a/CreateAccountTestWiki.php
+++ b/CreateAccountTestWiki.php
@@ -21,7 +21,9 @@
global $wgRequest, $wmincProjects;
$projectvalue = strtolower( $wgRequest->getVal( 
'testwikiproject', '' ) );
$codevalue = strtolower( $wgRequest->getVal( 'testwikicode', '' 
) );
-   if ( WikimediaIncubator::validateLanguageCode( $codevalue ) && 
isset( $wmincProjects[$projectvalue] ) ) {
+   if ( WikimediaIncubator::validateLanguageCode( $codevalue )
+   && isset( $wmincProjects[$projectvalue] )
+   ) {
$template->set( 'header',
Html::hidden( 'testwiki-project', $projectvalue 
) .
Html::hidden( 'testwiki-code', $codevalue )
@@ -38,7 +40,9 @@
global $wgRequest, $wmincProjects, $wmincPref;
$projectvalue = $wgRequest->getVal( 'testwiki-project' );
$codevalue = $wgRequest->getVal( 'testwiki-code' );
-   if ( WikimediaIncubator::validateLanguageCode( $codevalue ) && 
isset( $wmincProjects[$projectvalue] ) ) {
+   if ( WikimediaIncubator::validateLanguageCode( $codevalue )
+   && isset( $wmincProjects[$projectvalue] )
+   ) {
$user->setOption( $wmincPref . '-project', 
$projectvalue );
$user->setOption( $wmincPref . '-code', $codevalue );
$user->saveSettings();
diff --git a/InfoPage.php b/InfoPage.php
index d4474cc..76c95d0 100644
--- a/InfoPage.php
+++ b/InfoPage.php
@@ -7,11 +7,15 @@
  * 'incubator' showIncubatingWiki()
  *'open': This is a new Incubator wiki that is not yet verified by the 
language committee.
  *'eligible': This Incubator wiki has been marked as eligible by the 
language committee.
- *'imported': This Incubator wiki has been imported from 
xyz.wikiproject.org after that wiki was closed.
- *'approved': This Incubator wiki has been approved by the language 
committee and will soon be created.
+ *'imported': This Incubator wiki has been imported from 
xyz.wikiproject.org after that wiki
+ *   was closed.
+ *'approved': This Incubator wiki has been approved by the language 
committee and will soon
+ *   be created.
  * 'existing' showExistingWiki()
- *'created': This project has been approved by the language committee and 
is now available at xyz.wikiproject.org.
- *'beforeincubator': This project was created before Wikimedia Incubator 
started and is available at xyz.wikiproject.org.
+ *'created': This project has been approved by the language committee and 
is now available at
+ *   xyz.wikiproject.org.
+ *'beforeincubator': This project was created before Wikimedia Incubator 
started and is
+ *   available at xyz.wikiproject.org.
  *
  * @file
  * @ingroup Extensions
@@ -41,11 +45,14 @@
$name = Language::fetchLanguageName( $this->mLangCode, 
$wgLang->getCode(), 'all' );
$this->mLangName = $name ? $name :
Language::fetchLanguageName( $this->mLangCode, 'en', 
'all' );
-   $titleParam = $this->mLangName ? $this->mLangName : wfMessage( 
'quotation-marks', $this->mLangCode )->text(); # Name, else code
+   $titleParam = $this->mLangName ? $this->mLangName
+   : wfMessage( 'quotation-marks', $this->mLangCode 
)->text(); # Name, else code
# Give grep a chance to find the usages:
-   # wminc-infopage-title-p, wminc-infopage-title-b, 
wminc-infopage-title-t, wminc-infopage-title-q,
-   # wminc-infopage-title-n, wminc-infopage-title-s, 
wminc-infopage-title-v, wminc-infopage-title-y
-   $this->mFormatTitle = wfMessage( 'wminc-infopage-title-' . 
$this->mProjectCode, $titleParam )->escaped();
+   # wminc-infopage-title-p, wminc-infopage-title-b, 
wminc-infopage-title-t,
+   # wminc-infopage-title-q, wminc-infopage-title-n, 
wminc-infopage-title-s,
+   # wminc-infopage-title-v, wminc-infopage-title-y
+   $this->mFormatTitle = 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ezachte's new ssh key

[Ottomata (Code Review)]

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

Change subject: Add ezachte's new ssh key
..


Add ezachte's new ssh key

We verified this key over a google video hangout

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

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 9c9aeda..6d9fdb2 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1220,7 +1220,7 @@
 gid: 500
 name: ezachte
 realname: Erik Zachte
-ssh_keys: []
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EBJQAAAQEAk/AEZRNX8meVm3hOdid1mU4uIYXREvdEmzumZUzovZ2cD441GWkL/jnpAkzAzb225HeXnad0p+bfAjFuANX4RRB3kF8HutG2xxJOPdjVanJeDqigfzFIU8782HoNu0XJomJVREglP8/+X5EQZlQnISXp5kMqNpqswB23uSKx0hYM3+vrKOzPLET87F1kQ+ZhvELY1AZXdbP0MPwLAp0m73QLiGhV+Df8x2wLB5L6TdFVQfksvzzs9F/tf/TKUxN4arZ4KxNrCW7BkLr8+biqpTgTCPy/zRUaSSDivpCnjGVfn+MF3hp4BIVXQwHDIOT143frGXmqHzxnVE9D4lSlQQ==
 ezachte wmf rsa-key-20170529]
 uid: 523
 email: ezac...@wikimedia.org
   jamesur:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ezachte's new ssh key

[Ottomata (Code Review)]

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

Change subject: Add ezachte's new ssh key
..

Add ezachte's new ssh key

We verified this key over a google video hangout

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/356267/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 9c9aeda..6d9fdb2 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1220,7 +1220,7 @@
 gid: 500
 name: ezachte
 realname: Erik Zachte
-ssh_keys: []
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EBJQAAAQEAk/AEZRNX8meVm3hOdid1mU4uIYXREvdEmzumZUzovZ2cD441GWkL/jnpAkzAzb225HeXnad0p+bfAjFuANX4RRB3kF8HutG2xxJOPdjVanJeDqigfzFIU8782HoNu0XJomJVREglP8/+X5EQZlQnISXp5kMqNpqswB23uSKx0hYM3+vrKOzPLET87F1kQ+ZhvELY1AZXdbP0MPwLAp0m73QLiGhV+Df8x2wLB5L6TdFVQfksvzzs9F/tf/TKUxN4arZ4KxNrCW7BkLr8+biqpTgTCPy/zRUaSSDivpCnjGVfn+MF3hp4BIVXQwHDIOT143frGXmqHzxnVE9D4lSlQQ==
 ezachte wmf rsa-key-20170529]
 uid: 523
 email: ezac...@wikimedia.org
   jamesur:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Update python.pp to support stretch

[Paladox (Code Review)]

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

Change subject: contint: Update python.pp to support stretch
..

contint: Update python.pp to support stretch

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/356246/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7f39a2e50cd8dd1b3e7fbfcbf2b6b9777cf27ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Use eslint to lint JavaScript instead of jscs and jshint

[jenkins-bot (Code Review)]

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

Change subject: Use eslint to lint JavaScript instead of jscs and jshint
..


Use eslint to lint JavaScript instead of jscs and jshint

Bug: T165843
Change-Id: I45354d6849276b21be9d4ae34af7d993846f5351
---
R .eslintignore
A .eslintrc.json
D .jscsrc
D .jshintrc
M .travis.yml
M Gruntfile.js
M lib/jquery.ui/jquery.ui.languagesuggester.js
M lib/jquery.ui/jquery.ui.unitsuggester.js
M lib/jquery/jquery.AnimationEvent.js
M lib/jquery/jquery.inputautoexpand.js
M package.json
A tests/.eslintrc.json
M tests/lib/jquery.event/jquery.event.special.eachchange.tests.js
M tests/lib/jquery/jquery.PurposedCallbacks.tests.js
M tests/src/ExpertExtender/ExpertExtender.CalendarHint.tests.js
M tests/src/jquery.valueview.ExpertStore.tests.js
16 files changed, 62 insertions(+), 178 deletions(-)

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



diff --git a/.jshintignore b/.eslintignore
similarity index 63%
rename from .jshintignore
rename to .eslintignore
index c2658d7..7e5da87 100644
--- a/.jshintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
 node_modules/
+vendor/
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..8922209
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,29 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "dataValues": false,
+   "globeCoordinate": false,
+   "mediaWiki": false,
+   "util": false,
+   "valueFormatters": false,
+   "valueParsers": false
+   },
+   "rules": {
+   "array-bracket-spacing": "off",
+   "comma-spacing": "off",
+   "computed-property-spacing": "off",
+   "indent": "off",
+   "no-underscore-dangle": "off",
+   "no-unused-vars": "off",
+   "one-var": "off",
+   "operator-linebreak": "off",
+   "space-before-function-paren": "off",
+   "valid-jsdoc": "off",
+   "vars-on-top": "off",
+   "wrap-iife": "off"
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index fd10385..000
--- a/.jscsrc
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-   // 
-   // This is a copy of the wikimedia preset so we can disable some of the 
rules
-
-   "requireCurlyBraces": [
-   "if",
-   "else",
-   "for",
-   "while",
-   "do",
-   "try",
-   "catch"
-   ],
-   "requireSpaceBeforeKeywords": true,
-   "requireSpaceBeforeBlockStatements": true,
-   "requireParenthesesAroundIIFE": true,
-   "requireSpacesInConditionalExpression": true,
-   "disallowSpacesInNamedFunctionExpression": {
-   "beforeOpeningRoundBrace": true
-   },
-   "disallowSpacesInFunctionDeclaration": {
-   "beforeOpeningRoundBrace": true
-   },
-   "disallowSpacesInCallExpression": true,
-   "requireBlocksOnNewline": 1,
-   "disallowEmptyBlocks": true,
-   "requireSpacesInsideObjectBrackets": "all",
-   "requireSpacesInsideParentheses": "all",
-   "disallowQuotedKeysInObjects": "allButReserved",
-   "disallowSpaceAfterObjectKeys": true,
-   "requireSpaceBeforeObjectValues": true,
-   "requireCommaBeforeLineBreak": true,
-   "disallowSpaceAfterPrefixUnaryOperators": true,
-   "disallowSpaceBeforePostfixUnaryOperators": true,
-   "disallowSpaceBeforeBinaryOperators": [
-   ","
-   ],
-   "requireSpaceBeforeBinaryOperators": true,
-   "requireSpaceAfterBinaryOperators": true,
-   "disallowImplicitTypeConversion": [
-   "binary",
-   "string"
-   ],
-   "requireCamelCaseOrUpperCaseIdentifiers": true,
-   "disallowKeywords": [
-   "with"
-   ],
-   "disallowMixedSpacesAndTabs": true,
-   "disallowMultipleLineBreaks": true,
-   "disallowOperatorBeforeLineBreak": [
-   "."
-   ],
-   "disallowTrailingWhitespace": true,
-   "disallowTrailingComma": true,
-   "disallowKeywordsOnNewLine": [
-   "else",
-   "catch"
-   ],
-   "requireLineBreakAfterVariableAssignment": true,
-   "requireLineFeedAtFileEnd": true,
-   "requireCapitalizedConstructors": true,
-   "requireDotNotation": true,
-   "disallowYodaConditions": true,
-   "requireSpaceAfterLineComment": true,
-   "disallowNewlineBeforeBlockStatements": true,
-   "validateLineBreaks": "LF",
-   "validateQuoteMarks": "'",
-
-   // 
-   // Rules from wikimedia preset we don't follow
-
-   // "validateIndentation": "\t",
-   // 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (9cd18424b)

[jenkins-bot (Code Review)]

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

Change subject: Update VE core submodule to master (9cd18424b)
..


Update VE core submodule to master (9cd18424b)

New changes:
e2015a75c tests: Cover ve.util#isUnattachedCombiningMark
ae96355e0 Prevent massive loop by binding to the wrong method
e0b9a8100 Localisation updates from https://translatewiki.net.
57976e7a3 tests: Cover ve.util#sparseSplice edge case
1e95414a6 tests: Cover ve.util#getCommonAncestor zero node case
adc4aa750 tests: Cover ve.util#getCommonStartSequenceLength zero sequences case
9cd18424b tests: Cover ve.utils#isUriComponentValid and #safeDecodeUriComponent

Change-Id: I14b8c193d66ed2a23b27336e6a10aa0ecd44e1c3
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index c78bd8d..9cd1842 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit c78bd8d9b3142b2d29ce979fce709846265cd4b4
+Subproject commit 9cd18424bf77a191a9735ff2bfc5f75e7b54b7e3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14b8c193d66ed2a23b27336e6a10aa0ecd44e1c3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
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]: Update VE core submodule to master (c78bd8d9b)

[jenkins-bot (Code Review)]

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

Change subject: Update VE core submodule to master (c78bd8d9b)
..


Update VE core submodule to master (c78bd8d9b)

New changes:
b611769cd describeChange can be null
59a76fbcd dm.Change: Update store length tracking when adding to history
8f4b2339a dm.AnnotationSet: Throw an exception when constructing with missing 
indexes
df2319c4e Don't add transactions to stack until they've had a chance to fail

Bug: T159384
Change-Id: Iaed05c9b08c92f8a7488ab24bc139b99e3913819
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index 0c24383..c78bd8d 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 0c243838f526bfb4ad07f011e9bddfde89ea5cc4
+Subproject commit c78bd8d9b3142b2d29ce979fce709846265cd4b4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaed05c9b08c92f8a7488ab24bc139b99e3913819
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
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...release[master]: Stop branching AccountAudit, it's undeployed and read-only

[jenkins-bot (Code Review)]

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

Change subject: Stop branching AccountAudit, it's undeployed and read-only
..


Stop branching AccountAudit, it's undeployed and read-only

Bug: T163791
Change-Id: I99ef107f8eedb6652351d8a97e47110f7aa88fc4
---
M make-wmf-branch/config.json
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 71688c5..1ef82ed 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -1,7 +1,6 @@
 {
"extensions": [
"AbuseFilter",
-   "AccountAudit",
"ActiveAbstract",
"AntiSpoof",
"ApiFeatureUsage",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99ef107f8eedb6652351d8a97e47110f7aa88fc4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jenkins: Install java 8 onto of java 7

[Paladox (Code Review)]

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

Change subject: jenkins: Install java 8 onto of java 7
..

jenkins: Install java 8 onto of java 7

Also only install java 7 if you are on trusty or jessie, stretch does not have 
java 7

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/356243/1


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Stop branching AccountAudit, it's undeployed and read-only

[Jforrester (Code Review)]

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

Change subject: Stop branching AccountAudit, it's undeployed and read-only
..

Stop branching AccountAudit, it's undeployed and read-only

Bug: T163791
Change-Id: I99ef107f8eedb6652351d8a97e47110f7aa88fc4
---
M make-wmf-branch/config.json
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/42/356242/1

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 71688c5..1ef82ed 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -1,7 +1,6 @@
 {
"extensions": [
"AbuseFilter",
-   "AccountAudit",
"ActiveAbstract",
"AntiSpoof",
"ApiFeatureUsage",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99ef107f8eedb6652351d8a97e47110f7aa88fc4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
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/puppet[production]: contint: Only install java 7 on trusty and jessie

[Paladox (Code Review)]

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

Change subject: contint: Only install java 7 on trusty and jessie
..

contint: Only install java 7 on trusty and jessie

stretch does not have the package java 7.

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


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


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

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

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

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

[Umherirrender (Code Review)]

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

Change subject: Add phpcs and make pass
..

Add phpcs and make pass

Change-Id: I129fd23a375b4f7de893d3b98f67fdd8de89b4bd
---
M composer.json
M includes/ApiQueryPageImages.php
M includes/Job/InitImageDataJob.php
M includes/PageImages.php
M maintenance/initImageData.php
A phpcs.xml
M tests/phpunit/ApiQueryPageImagesTest.php
M tests/phpunit/LinksUpdateHookHandlerTest.php
8 files changed, 77 insertions(+), 34 deletions(-)


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

diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
+   "fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor"
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
]
}
 }
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index bd89f38..9d957f8 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -216,13 +216,14 @@
// DEPRECATED: The original image URL 
was originally provided as a property of
// the "thumbnail" object, but we now 
provide the original image info in its own
// object on the same level as the 
thumbnail.
-   //
// Remove this functionality, and the 
warning, after a reasonable amount of time
// has passed since December 2016.
if ( is_callable( [ $this, 'addWarning' 
] ) ) {
$this->addWarning( 
'apiwarn-query+pageimages-original-in-thumbnail-deprecated' );
} else {
-   $this->setWarning( "The 
original image's source URL is now provided with its dimensions in its own 
property for the page object. It will be removed from the 'thumbnail' property 
in a future release." );
+   $this->setWarning( "The 
original image's source URL is now provided with " .
+   "its dimensions in its 
own property for the page object. It will be " .
+   "removed from the 
'thumbnail' property in a future release." );
}
$vals['thumbnail']['original'] = 
$original_url;
}
diff --git a/includes/Job/InitImageDataJob.php 
b/includes/Job/InitImageDataJob.php
index a6ec772..238732e 100644
--- a/includes/Job/InitImageDataJob.php
+++ b/includes/Job/InitImageDataJob.php
@@ -20,7 +20,7 @@
try {
RefreshLinks::fixLinksFromArticle( $id );
$lbFactory->waitForReplication();
-   } catch (\Exception $e) {
+   } catch ( \Exception $e ) {
// There are some broken pages out there that 
just don't parse.
// Log it and keep on trucking.
MWExceptionHandler::logException( $e );
diff --git a/includes/PageImages.php b/includes/PageImages.php
index 4a8004b..51d37c5 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -50,7 +50,10 @@
$dbr = wfGetDB( DB_SLAVE );
$fileName = $dbr->selectField( 'page_props',
[ 'pp_value' ],
-   [ 'pp_page' => $title->getArticleID(), 'pp_propname' => 
[ self::PROP_NAME, self::PROP_NAME_FREE ] ],
+   [
+   'pp_page' => $title->getArticleID(),
+   'pp_propname' => [ self::PROP_NAME, 
self::PROP_NAME_FREE ]
+   ],
__METHOD__,
[ 'ORDER BY' => 'pp_propname' ]
);
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 53e104d..69d6bab 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -4,7 +4,7 @@
 if ( $IP === false ) {
$IP = __DIR__ . '/../../..';
 }
-require_once ( 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Make author list a ListPopupTool

[jenkins-bot (Code Review)]

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

Change subject: Make author list a ListPopupTool
..


Make author list a ListPopupTool

Change-Id: I6180216e04747e4d230bdf782422643f61e01574
---
M build/modules.json
M rebaser/demo.js
M rebaser/views/editor.ejs
A src/ui/styles/widgets/ve.ui.AuthorItemWidget.css
D src/ui/styles/widgets/ve.ui.AuthorListWidget.css
A src/ui/tools/ve.ui.AuthorListPopupTool.js
A src/ui/widgets/ve.ui.AuthorItemWidget.js
D src/ui/widgets/ve.ui.AuthorListWidget.js
M tests/index.html
9 files changed, 274 insertions(+), 155 deletions(-)

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



diff --git a/build/modules.json b/build/modules.json
index 23d662a..8d99674 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -631,10 +631,11 @@
"src/dm/ve.dm.RebaseServer.js",
"src/dm/ve.dm.RebaseClient.js",
"src/dm/ve.dm.SurfaceSynchronizer.js",
-   "src/ui/widgets/ve.ui.AuthorListWidget.js"
+   "src/ui/widgets/ve.ui.AuthorItemWidget.js",
+   "src/ui/tools/ve.ui.AuthorListPopupTool.js"
],
"styles": [
-   "src/ui/styles/widgets/ve.ui.AuthorListWidget.css"
+   "src/ui/styles/widgets/ve.ui.AuthorItemWidget.css"
],
"dependencies": [
"dompurify",
diff --git a/rebaser/demo.js b/rebaser/demo.js
index b5553f5..537511a 100644
--- a/rebaser/demo.js
+++ b/rebaser/demo.js
@@ -4,21 +4,45 @@
  * @copyright 2011-2017 VisualEditor Team and others; see 
http://ve.mit-license.org
  */
 
-new ve.init.sa.Platform( ve.messagePaths ).initialize().done( function () {
-   var synchronizer, authorList,
-   $editor = $( '.ve-demo-editor' ),
-   $menu = $( '.ve-pad-menu' ),
-   // eslint-disable-next-line new-cap
-   target = new ve.demo.target();
+( function () {
+   function RebaserTarget() {
+   RebaserTarget.super.apply( this, arguments );
+   }
 
-   $editor.append( target.$element );
+   OO.inheritClass( RebaserTarget, ve.init.sa.Target );
 
-   target.addSurface( ve.dm.converter.getModelFromDom( 
ve.createDocumentFromHtml( '' ) ) );
-   synchronizer = new ve.dm.SurfaceSynchronizer( target.surface.model, 
ve.docName );
-   target.surface.view.setSynchronizer( synchronizer );
-   target.surface.view.focus();
+   RebaserTarget.static.actionGroups = ve.copy( 
RebaserTarget.static.actionGroups );
+   RebaserTarget.static.actionGroups.unshift(
+   { include: [ 'authorList' ] }
+   );
 
-   authorList = new ve.ui.AuthorListWidget( synchronizer );
+   RebaserTarget.prototype.setSurface = function ( surface ) {
+   var synchronizer, surfaceView;
 
-   $menu.append( authorList.$element );
-} );
+   if ( surface !== this.surface ) {
+   surfaceView = surface.getView();
+
+   synchronizer = new ve.dm.SurfaceSynchronizer(
+   surface.getModel(),
+   ve.docName,
+   { server: this.rebaserUrl }
+   );
+
+   surfaceView.setSynchronizer( synchronizer );
+   }
+
+   // Parent method
+   RebaserTarget.super.prototype.setSurface.apply( this, arguments 
);
+   };
+
+   new ve.init.sa.Platform( ve.messagePaths ).initialize().done( function 
() {
+   var $editor = $( '.ve-demo-editor' ),
+   // eslint-disable-next-line new-cap
+   target = new RebaserTarget();
+
+   $editor.append( target.$element );
+
+   target.addSurface( ve.dm.converter.getModelFromDom( 
ve.createDocumentFromHtml( '' ) ) );
+   target.surface.view.focus();
+   } );
+}() );
diff --git a/rebaser/views/editor.ejs b/rebaser/views/editor.ejs
index 6914128..60526f4 100644
--- a/rebaser/views/editor.ejs
+++ b/rebaser/views/editor.ejs
@@ -40,7 +40,6 @@



-   


 
diff --git a/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css 
b/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css
new file mode 100644
index 000..f6713ed
--- /dev/null
+++ b/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css
@@ -0,0 +1,23 @@
+/*!
+ * VisualEditor AuthorInterface AuthorItemWidget styles.
+ *
+ * @copyright 2011-2017 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+.ve-ui-authorItemWidget {
+   position: relative;
+   margin: 0.2em 0;
+   padding-left: 2.5em;
+   line-height: 2em;
+}
+
+.ve-ui-authorItemWidget-color {
+   position: 

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: formatter.py: remove unused 'inspect'

[jenkins-bot (Code Review)]

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

Change subject: formatter.py: remove unused 'inspect'
..


formatter.py: remove unused 'inspect'

Remove unused inspect.stack().

Bug: T166484
Change-Id: I7b2921d2406882736b0072b18d5562fbcac3f366
---
M pywikibot/tools/formatter.py
1 file changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py
index 94a4d95..149454b 100644
--- a/pywikibot/tools/formatter.py
+++ b/pywikibot/tools/formatter.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Module containing various formatting related utilities."""
 #
-# (C) Pywikibot team, 2015-2016
+# (C) Pywikibot team, 2015-2017
 #
 # Distributed under the terms of the MIT license.
 #
@@ -9,7 +9,6 @@
 
 __version__ = '$Id$'
 
-import inspect
 import math
 
 from string import Formatter
@@ -71,11 +70,6 @@
 # Dot.product of colors to create all possible combinations of foreground
 # and background colors.
 colors |= set('%s;%s' % (c1, c2) for c1 in colors for c2 in colors)
-
-def __init__(self):
-"""Create new instance and store the stack depth."""
-super(_ColorFormatter, self).__init__()
-self._depth = len(inspect.stack())
 
 def get_value(self, key, args, kwargs):
 """Get value, filling in 'color' when it is a valid color."""

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b2921d2406882736b0072b18d5562fbcac3f366
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Xqt 
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...Wikibase[master]: [WIP] Allow EntityContent to contain no EntityHolder

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356239 )

Change subject: [WIP] Allow EntityContent to contain no EntityHolder
..

[WIP] Allow EntityContent to contain no EntityHolder

This is an alternative proposal instead of doing I028a80d. Lets see
which tests fail.

Change-Id: Ie62bd0676c4c42012d4a5d23c518a36438fc3791
---
M repo/includes/Content/EntityContent.php
M repo/includes/Content/EntityHandler.php
M repo/includes/Content/ItemContent.php
M repo/includes/Content/PropertyContent.php
4 files changed, 13 insertions(+), 9 deletions(-)


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

diff --git a/repo/includes/Content/EntityContent.php 
b/repo/includes/Content/EntityContent.php
index b6e5eda..c7ff149 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -104,7 +104,7 @@
 * Returns a holder for the entity contained in this EntityContent 
object.
 *
 * @throws MWException when it's a redirect (targets will never be 
resolved)
-* @return EntityHolder
+* @return EntityHolder|null
 */
abstract protected function getEntityHolder();
 
diff --git a/repo/includes/Content/EntityHandler.php 
b/repo/includes/Content/EntityHandler.php
index 1d9204a..1f6dee7 100644
--- a/repo/includes/Content/EntityHandler.php
+++ b/repo/includes/Content/EntityHandler.php
@@ -227,12 +227,11 @@
/**
 * @see ContentHandler::makeEmptyContent
 *
-* @throws MWException Always. EntityContent cannot be empty.
 * @return EntityContent
 */
public function makeEmptyContent() {
-   $empty = $this->makeEmptyEntity();
-   return $this->makeEntityContent( new EntityInstanceHolder( 
$empty ) );
+   $contentClass = $this->getContentClass();
+   return new $contentClass();
}
 
/**
diff --git a/repo/includes/Content/ItemContent.php 
b/repo/includes/Content/ItemContent.php
index 5f9d42e..5e18508 100644
--- a/repo/includes/Content/ItemContent.php
+++ b/repo/includes/Content/ItemContent.php
@@ -159,7 +159,7 @@
/**
 * @see EntityContent::getEntityHolder
 *
-* @return EntityHolder
+* @return EntityHolder|null
 */
protected function getEntityHolder() {
return $this->itemHolder;
diff --git a/repo/includes/Content/PropertyContent.php 
b/repo/includes/Content/PropertyContent.php
index b9330d7..6829db6 100644
--- a/repo/includes/Content/PropertyContent.php
+++ b/repo/includes/Content/PropertyContent.php
@@ -3,6 +3,7 @@
 namespace Wikibase;
 
 use InvalidArgumentException;
+use LogicException;
 use Wikibase\Content\EntityHolder;
 use Wikibase\Content\EntityInstanceHolder;
 use Wikibase\DataModel\Entity\Property;
@@ -17,7 +18,7 @@
 class PropertyContent extends EntityContent {
 
/**
-* @var EntityHolder
+* @var EntityHolder|null
 */
private $propertyHolder;
 
@@ -33,10 +34,10 @@
 * @param EntityHolder $propertyHolder
 * @throws InvalidArgumentException
 */
-   public function __construct( EntityHolder $propertyHolder ) {
+   public function __construct( EntityHolder $propertyHolder = null ) {
parent::__construct( CONTENT_MODEL_WIKIBASE_PROPERTY );
 
-   if ( $propertyHolder->getEntityType() !== Property::ENTITY_TYPE 
) {
+   if ( $propertyHolder && $propertyHolder->getEntityType() !== 
Property::ENTITY_TYPE ) {
throw new InvalidArgumentException( '$propertyHolder 
must contain a Property entity!' );
}
 
@@ -60,6 +61,10 @@
 * @return Property
 */
public function getProperty() {
+   if ( !$this->propertyHolder ) {
+   throw new LogicException( 'This content object is 
empty!' );
+   }
+
return $this->propertyHolder->getEntity( Property::class );
}
 
@@ -82,7 +87,7 @@
/**
 * @see EntityContent::getEntityHolder
 *
-* @return EntityHolder
+* @return EntityHolder|null
 */
public function getEntityHolder() {
return $this->propertyHolder;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie62bd0676c4c42012d4a5d23c518a36438fc3791
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Make author list a ListPopupTool

[Esanders (Code Review)]

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

Change subject: Make author list a ListPopupTool
..

Make author list a ListPopupTool

Change-Id: I6180216e04747e4d230bdf782422643f61e01574
---
M build/modules.json
M rebaser/demo.js
M rebaser/views/editor.ejs
A src/ui/styles/widgets/ve.ui.AuthorItemWidget.css
D src/ui/styles/widgets/ve.ui.AuthorListWidget.css
A src/ui/tools/ve.ui.AuthorListPopupTool.js
A src/ui/widgets/ve.ui.AuthorItemWidget.js
D src/ui/widgets/ve.ui.AuthorListWidget.js
M tests/index.html
9 files changed, 274 insertions(+), 155 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/38/356238/1

diff --git a/build/modules.json b/build/modules.json
index 23d662a..8d99674 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -631,10 +631,11 @@
"src/dm/ve.dm.RebaseServer.js",
"src/dm/ve.dm.RebaseClient.js",
"src/dm/ve.dm.SurfaceSynchronizer.js",
-   "src/ui/widgets/ve.ui.AuthorListWidget.js"
+   "src/ui/widgets/ve.ui.AuthorItemWidget.js",
+   "src/ui/tools/ve.ui.AuthorListPopupTool.js"
],
"styles": [
-   "src/ui/styles/widgets/ve.ui.AuthorListWidget.css"
+   "src/ui/styles/widgets/ve.ui.AuthorItemWidget.css"
],
"dependencies": [
"dompurify",
diff --git a/rebaser/demo.js b/rebaser/demo.js
index b5553f5..537511a 100644
--- a/rebaser/demo.js
+++ b/rebaser/demo.js
@@ -4,21 +4,45 @@
  * @copyright 2011-2017 VisualEditor Team and others; see 
http://ve.mit-license.org
  */
 
-new ve.init.sa.Platform( ve.messagePaths ).initialize().done( function () {
-   var synchronizer, authorList,
-   $editor = $( '.ve-demo-editor' ),
-   $menu = $( '.ve-pad-menu' ),
-   // eslint-disable-next-line new-cap
-   target = new ve.demo.target();
+( function () {
+   function RebaserTarget() {
+   RebaserTarget.super.apply( this, arguments );
+   }
 
-   $editor.append( target.$element );
+   OO.inheritClass( RebaserTarget, ve.init.sa.Target );
 
-   target.addSurface( ve.dm.converter.getModelFromDom( 
ve.createDocumentFromHtml( '' ) ) );
-   synchronizer = new ve.dm.SurfaceSynchronizer( target.surface.model, 
ve.docName );
-   target.surface.view.setSynchronizer( synchronizer );
-   target.surface.view.focus();
+   RebaserTarget.static.actionGroups = ve.copy( 
RebaserTarget.static.actionGroups );
+   RebaserTarget.static.actionGroups.unshift(
+   { include: [ 'authorList' ] }
+   );
 
-   authorList = new ve.ui.AuthorListWidget( synchronizer );
+   RebaserTarget.prototype.setSurface = function ( surface ) {
+   var synchronizer, surfaceView;
 
-   $menu.append( authorList.$element );
-} );
+   if ( surface !== this.surface ) {
+   surfaceView = surface.getView();
+
+   synchronizer = new ve.dm.SurfaceSynchronizer(
+   surface.getModel(),
+   ve.docName,
+   { server: this.rebaserUrl }
+   );
+
+   surfaceView.setSynchronizer( synchronizer );
+   }
+
+   // Parent method
+   RebaserTarget.super.prototype.setSurface.apply( this, arguments 
);
+   };
+
+   new ve.init.sa.Platform( ve.messagePaths ).initialize().done( function 
() {
+   var $editor = $( '.ve-demo-editor' ),
+   // eslint-disable-next-line new-cap
+   target = new RebaserTarget();
+
+   $editor.append( target.$element );
+
+   target.addSurface( ve.dm.converter.getModelFromDom( 
ve.createDocumentFromHtml( '' ) ) );
+   target.surface.view.focus();
+   } );
+}() );
diff --git a/rebaser/views/editor.ejs b/rebaser/views/editor.ejs
index 6914128..60526f4 100644
--- a/rebaser/views/editor.ejs
+++ b/rebaser/views/editor.ejs
@@ -40,7 +40,6 @@



-   


 
diff --git a/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css 
b/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css
new file mode 100644
index 000..f6713ed
--- /dev/null
+++ b/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css
@@ -0,0 +1,23 @@
+/*!
+ * VisualEditor AuthorInterface AuthorItemWidget styles.
+ *
+ * @copyright 2011-2017 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+.ve-ui-authorItemWidget {
+   position: relative;
+   margin: 0.2em 0;
+   padding-left: 2.5em;
+   line-height: 2em;
+}
+
+.ve-ui-authorItemWidget-color {
+   

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Add annotations for debugging

[jenkins-bot (Code Review)]

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

Change subject: Add annotations for debugging
..


Add annotations for debugging

Change-Id: I14477c25761b27a29af7a97f198f742d552c3050
---
A tests/browser/features/step_definitions/generic.rb
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/generic.rb 
b/tests/browser/features/step_definitions/generic.rb
new file mode 100644
index 000..7f7cf99
--- /dev/null
+++ b/tests/browser/features/step_definitions/generic.rb
@@ -0,0 +1,8 @@
+AfterStep('@pause') do
+  print "Press Return to continue ..."
+  STDIN.getc
+end
+
+AfterStep('@slow') do
+  sleep 2
+end
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14477c25761b27a29af7a97f198f742d552c3050
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
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]: contint: Fix stretch support in package_builder

[Paladox (Code Review)]

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

Change subject: contint: Fix stretch support in package_builder
..

contint: Fix stretch support in package_builder

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/356237/1


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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add py3.6 to pypi programming language categories

[jenkins-bot (Code Review)]

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

Change subject: Add py3.6 to pypi programming language categories
..


Add py3.6 to pypi programming language categories

- py3.6 is in tests matrix since https://gerrit.wikimedia.org/r/#/c/331940/

Change-Id: I078de07df2458b40b8ae08ab425fb74751414eb3
---
M setup.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/setup.py b/setup.py
index fb19347..bf0055e 100644
--- a/setup.py
+++ b/setup.py
@@ -232,6 +232,7 @@
 'Programming Language :: Python :: 3.3',
 'Programming Language :: Python :: 3.4',
 'Programming Language :: Python :: 3.5',
+'Programming Language :: Python :: 3.6',
 ],
 use_2to3=False
 )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I078de07df2458b40b8ae08ab425fb74751414eb3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Merlijn van Deen 
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]: flake8 fixes for E305

[BryanDavis (Code Review)]

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

Change subject: flake8 fixes for E305
..

flake8 fixes for E305

Fix "E305 expected 2 blank lines after class or function definition"
warnings in preparation for flake8 upgrade in tox tests.

Change-Id: I75425fc791f8745e02f5663aa0c73a6f057ecf2e
---
M modules/admin/data/data_admin.py
M modules/admin/data/data_test.py
M modules/apt/files/apt2xml.py
M modules/authdns/files/authdns-gen-zones.py
M modules/base/files/firewall/check_conntrack.py
M modules/base/files/labs/notify_maintainers.py
M modules/base/files/monitoring/check-fresh-files-in-dir.py
M modules/beta/files/wmf-beta-update-databases.py
M modules/confd/files/confd-lint-wrap.py
M modules/drac/files/drac.py
M modules/dynamicproxy/files/invisible-unicorn.py
M modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
M modules/elasticsearch/files/nagios/check_elasticsearch_test.py
M modules/etcd/files/etcd-backup.py
M modules/ganglia/files/plugins/diskstat.py
M modules/ganglia/files/plugins/nginx_status.py
M modules/ganglia/files/plugins/udp2log_socket.py
M modules/hhvm/files/debug/printers.py
M modules/hhvm/files/monitoring/hhvm_tc_space.py
M modules/icinga/files/check_legal_html.py
M modules/icinga/files/check_ripe_atlas.py
M modules/icinga/files/purge-nagios-resources.py
M modules/labstore/files/block_sync.py
M modules/librenms/files/purge.py
M modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py
M modules/memcached/files/ganglia/gmond_memcached.py
M modules/mw_rc_irc/files/udpmxircecho.py
M modules/nodepool/files/check_nodepool_states.py
M modules/openstack/files/check_keystone_projects.py
M modules/openstack/files/kilo/virtscripts/logstat.py
M modules/openstack/files/liberty/horizon/overrides.py
M modules/openstack/files/liberty/virtscripts/logstat.py
M modules/openstack/files/mitaka/horizon/overrides.py
M modules/openstack/files/mitaka/virtscripts/logstat.py
M modules/openstack/files/monitor_labs_salt_keys.py
M modules/osm/files/ganglia/osm.py
M modules/phabricator/files/phab_epipe.py
M modules/postgresql/files/ganglia/postgresql.py
M modules/pybal/files/pybal-eval-check.py
M modules/redis/files/ganglia/redis_monitoring.py
M modules/role/files/labs/db/views/maintain-meta_p.py
M modules/role/files/labs/puppet-enc.py
M modules/tlsproxy/files/utils/cipher_sim.py
M modules/toollabs/files/gridscripts/runninggridtasks.py
M modules/toollabs/files/kube2proxy.py
M modules/toollabs/files/proxylistener.py
M modules/varnish/files/varnishlog.py
M modules/varnish/files/zerofetch.py
M modules/wdqs/files/monitor/blazegraph.py
M modules/zuul/files/zuul-test-repo.py
M utils/new_wmf_service.py
A utils/vagrant/private
52 files changed, 62 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/356234/1

diff --git a/modules/admin/data/data_admin.py b/modules/admin/data/data_admin.py
index 551e092..993f011 100644
--- a/modules/admin/data/data_admin.py
+++ b/modules/admin/data/data_admin.py
@@ -22,5 +22,6 @@
 print yaml.dump({'groups': dict_sort(admins['groups'])})
 print yaml.dump({'users': dict_sort(admins['users'])})
 
+
 if __name__ == '__main__':
 main()
diff --git a/modules/admin/data/data_test.py b/modules/admin/data/data_test.py
index d5476ca..e343973 100644
--- a/modules/admin/data/data_test.py
+++ b/modules/admin/data/data_test.py
@@ -21,5 +21,6 @@
 dupes = [k for k, v in Counter(gids).items() if v > 1]
 self.assertEqual([], dupes, 'Duplicate group GIDs: %r' % dupes)
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/modules/apt/files/apt2xml.py b/modules/apt/files/apt2xml.py
index d746296..6cce25d 100644
--- a/modules/apt/files/apt2xml.py
+++ b/modules/apt/files/apt2xml.py
@@ -74,5 +74,6 @@
 
 return doc.toxml().replace('\n', '')
 
+
 if __name__ == '__main__':
 print getUpdates()
diff --git a/modules/authdns/files/authdns-gen-zones.py 
b/modules/authdns/files/authdns-gen-zones.py
index 1726532..f3b06f5 100644
--- a/modules/authdns/files/authdns-gen-zones.py
+++ b/modules/authdns/files/authdns-gen-zones.py
@@ -114,6 +114,7 @@
 if errors:
 sys.exit(1)
 
+
 if __name__ == '__main__':
 main()
 
diff --git a/modules/base/files/firewall/check_conntrack.py 
b/modules/base/files/firewall/check_conntrack.py
index 3a7b895..d38463e 100644
--- a/modules/base/files/firewall/check_conntrack.py
+++ b/modules/base/files/firewall/check_conntrack.py
@@ -49,5 +49,6 @@
 print("UNKNOWN: error reading nf_conntrack")
 sys.exit(3)
 
+
 if __name__ == '__main__':
 main()
diff --git a/modules/base/files/labs/notify_maintainers.py 
b/modules/base/files/labs/notify_maintainers.py
index 5450961..a404bc1 100644
--- a/modules/base/files/labs/notify_maintainers.py
+++ b/modules/base/files/labs/notify_maintainers.py
@@ -90,5 +90,6 @@
 
 email_admins(args.s, 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: flake8: upgrade to 3.3.0

[BryanDavis (Code Review)]

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

Change subject: flake8: upgrade to 3.3.0
..

flake8: upgrade to 3.3.0

Upgrade to the latest stable version of flake8. This version has some
new checks that have been fixed in earlier patches. It also supports
multiline 'ignore' and 'exclude' statements in the tox.ini file which
are now used to connect comments with exclusions.

Change-Id: Ifff8ab1cedf5b0f4362f7c3efe697489bcc67aa3
---
M tox.ini
1 file changed, 26 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/356236/1

diff --git a/tox.ini b/tox.ini
index 7dc30a36..e92b42e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,13 +6,31 @@
 
 [flake8]
 max-line-length = 100
-# E123/E133, E226 and E241/E242 are default ignores
-# E402: module level import not at top of file
-# W503: ignore operators after line break until pep8 is upgraded
-ignore = E123,E133,E226,E241,E242,E402,W503
-# Upstream files that don't pass flake8 but should not be locally modified
-# jupyterhub_config.py/nchp_config.py are config files & hence won't pass pep8
-exclude = 
modules/letsencrypt/files/acme_tiny.py,modules/varnish/files/varnishapi.py,modules/postgresql/files/check_postgres_replication_lag.py,modules/jupyterhub/files/jupyterhub_config.py,modules/jupyterhub/files/nchp_config.py
+ignore =
+# E123: closing bracket does not match indentation of opening bracket’s 
line
+E123,
+# E133: closing bracket is missing indentation
+E133,
+# E226: missing whitespace around arithmetic operator
+E226,
+# E241: multiple spaces after ‘,’
+E241,
+# E242: tab after ‘,’
+E242,
+# E402: module level import not at top of file
+E402,
+# W503: ignore operators after line break until pep8 is upgraded
+W503
+exclude =
+# Do not lint the tox runtime directory
+.tox,
+# Upstream files that don't pass flake8 but should not be locally modified
+modules/jupyterhub/files/jupyterhub_config.py,
+modules/jupyterhub/files/nchp_config.py,
+modules/letsencrypt/files/acme_tiny.py,
+modules/mailman/files/mm_cfg.py,
+modules/postgresql/files/check_postgres_replication_lag.py,
+modules/varnish/files/varnishapi.py
 
 [testenv]
 deps =
@@ -21,5 +39,5 @@
 commands = nosetests modules/admin/data 
modules/mediawiki/files/apache/sites/redirects
 
 [testenv:pep8]
-deps = flake8==2.5.5
+deps = flake8==3.3.0
 commands = flake8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifff8ab1cedf5b0f4362f7c3efe697489bcc67aa3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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]: ganglia: remove dup define in postgresql check

[BryanDavis (Code Review)]

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

Change subject: ganglia: remove dup define in postgresql check
..

ganglia: remove dup define in postgresql check

Found using newer version of flake8.

Change-Id: I30350a4e0cc74e95c09692d3dc78088a543e1c3f
---
M modules/postgresql/files/ganglia/postgresql.py
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/356235/1

diff --git a/modules/postgresql/files/ganglia/postgresql.py 
b/modules/postgresql/files/ganglia/postgresql.py
index 52bfd5f..e879ce1 100644
--- a/modules/postgresql/files/ganglia/postgresql.py
+++ b/modules/postgresql/files/ganglia/postgresql.py
@@ -218,13 +218,6 @@
 "query": "SELECT sum(tidx_blks_hit) as tidx_blks_hit FROM " +
  "pg_statio_all_tables;",
 },
-"pg_tidx_blks_hit": {
-"description": "Toast index blocks hit",
-"slope": "positive",
-"units": "blocks",
-"query": "SELECT sum(tidx_blks_hit) as tidx_blks_hit FROM " +
- "pg_statio_all_tables;",
-},
 "pg_bgwriter_buffers_checkpoint": {
 "description": "Buffers written at checkpoint",
 "slope": "positive",

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

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

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