[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSExtensions: Fixed HideTitle breaking javascript with inlin...

[jenkins-bot (Code Review)]

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

Change subject: BSExtensions: Fixed HideTitle breaking javascript with inline 
script
..


BSExtensions: Fixed HideTitle breaking javascript with inline script

PatchSet2:
* Completley removed the removal of the dom element .firstHeader, as it
is not really needed

Change-Id: If32f5a28096c90dd7d5e4e16be363a349fd16749
---
M HideTitle/HideTitle.class.php
M HideTitle/extension.json
A HideTitle/resources/bluespice.hideTitle.css
3 files changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/HideTitle/HideTitle.class.php b/HideTitle/HideTitle.class.php
index 823ae3f..7022a0d 100644
--- a/HideTitle/HideTitle.class.php
+++ b/HideTitle/HideTitle.class.php
@@ -25,7 +25,7 @@
  * @author Markus Glaser 
  * @version2.23.1
  * @packageBlueSpice_Extensions
- * @subpackage StateBar
+ * @subpackage HideTitle
  * @copyright  Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
  * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
  * @filesource
@@ -35,7 +35,7 @@
 
protected $bHideTitle = false;
 
-protected function initExt() {
+   protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
// Hooks
$this->setHook( 'BeforePageDisplay' );
@@ -56,7 +56,7 @@
$sHideTitlePageProp = BsArticleHelper::getInstance( $oTitle 
)->getPageProp( 'bs_hidetitle' );
if( $sHideTitlePageProp === '' ) {
$oOutputPage->mPagetitle = '';
-   $oOutputPage->addInlineScript( 
"$('.firstHeading').remove()" );
+   $oOutputPage->addModuleStyles( 
'ext.bluespice.hidetitle.styles' );
}
 
return true;
diff --git a/HideTitle/extension.json b/HideTitle/extension.json
index d17c601..62181ef 100644
--- a/HideTitle/extension.json
+++ b/HideTitle/extension.json
@@ -22,5 +22,16 @@
"AutoloadClasses": {
"HideTitle": "HideTitle.class.php"
},
+   "ResourceModules": {
+   "ext.bluespice.hidetitle.styles": {
+   "styles": "bluespice.hideTitle.css",
+   "position": "top",
+   "targets": [ "desktop", "mobile" ]
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceExtensions/HideTitle/resources"
+   },
"manifest_version": 1
 }
diff --git a/HideTitle/resources/bluespice.hideTitle.css 
b/HideTitle/resources/bluespice.hideTitle.css
new file mode 100644
index 000..ef6ec38
--- /dev/null
+++ b/HideTitle/resources/bluespice.hideTitle.css
@@ -0,0 +1,4 @@
+
+#content h1.firstHeading {
+   display: none;
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If32f5a28096c90dd7d5e4e16be363a349fd16749
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensions: Fixed HideTitle breaking javascript with inlin...

[jenkins-bot (Code Review)]

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

Change subject: BSExtensions: Fixed HideTitle breaking javascript with inline 
script
..


BSExtensions: Fixed HideTitle breaking javascript with inline script

PatchSet2:
* Completley removed the removal of the dom element .firstHeader, as it
is not really needed

Change-Id: If32f5a28096c90dd7d5e4e16be363a349fd16749
---
M HideTitle/HideTitle.class.php
M HideTitle/extension.json
A HideTitle/resources/bluespice.hideTitle.css
3 files changed, 19 insertions(+), 4 deletions(-)

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



diff --git a/HideTitle/HideTitle.class.php b/HideTitle/HideTitle.class.php
index 823ae3f..7022a0d 100644
--- a/HideTitle/HideTitle.class.php
+++ b/HideTitle/HideTitle.class.php
@@ -25,7 +25,7 @@
  * @author Markus Glaser 
  * @version2.23.1
  * @packageBlueSpice_Extensions
- * @subpackage StateBar
+ * @subpackage HideTitle
  * @copyright  Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
  * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
  * @filesource
@@ -35,7 +35,7 @@
 
protected $bHideTitle = false;
 
-protected function initExt() {
+   protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
// Hooks
$this->setHook( 'BeforePageDisplay' );
@@ -56,7 +56,7 @@
$sHideTitlePageProp = BsArticleHelper::getInstance( $oTitle 
)->getPageProp( 'bs_hidetitle' );
if( $sHideTitlePageProp === '' ) {
$oOutputPage->mPagetitle = '';
-   $oOutputPage->addInlineScript( 
"$('.firstHeading').remove()" );
+   $oOutputPage->addModuleStyles( 
'ext.bluespice.hidetitle.styles' );
}
 
return true;
diff --git a/HideTitle/extension.json b/HideTitle/extension.json
index 1c093b1..62181ef 100644
--- a/HideTitle/extension.json
+++ b/HideTitle/extension.json
@@ -1,6 +1,6 @@
 {
"name": "HideTitle",
-   "version": "2.27.1-alpha",
+   "version": "2.27.2",
"url": "https://help.bluespice.com/index.php/HideTitle;,
"author": "Markus Glaser",
"descriptionmsg": "bs-hidetitle-desc",
@@ -22,5 +22,16 @@
"AutoloadClasses": {
"HideTitle": "HideTitle.class.php"
},
+   "ResourceModules": {
+   "ext.bluespice.hidetitle.styles": {
+   "styles": "bluespice.hideTitle.css",
+   "position": "top",
+   "targets": [ "desktop", "mobile" ]
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceExtensions/HideTitle/resources"
+   },
"manifest_version": 1
 }
diff --git a/HideTitle/resources/bluespice.hideTitle.css 
b/HideTitle/resources/bluespice.hideTitle.css
new file mode 100644
index 000..ef6ec38
--- /dev/null
+++ b/HideTitle/resources/bluespice.hideTitle.css
@@ -0,0 +1,4 @@
+
+#content h1.firstHeading {
+   display: none;
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If32f5a28096c90dd7d5e4e16be363a349fd16749
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: Fix for loader bar position

[jenkins-bot (Code Review)]

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

Change subject: Fix for loader bar position
..


Fix for loader bar position

If loader bar background is set to be behind the Ext grid, its not always
covered by it, instead it stays visible always

Moved it to the top, to make sure grid will always have sufficient height
to cover it

Change-Id: Ieb6d10eaad436d5c8b026087d3fe477bdadf05d6
ERM: #7057
---
M resources/bluespice/bluespice.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index 1a8e6c9..d7f5425 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -126,5 +126,5 @@
min-height: 300px;
background-image: url( 'images/bs-ajax-loader-bar-blue.gif' );
background-repeat: no-repeat;
-   background-position: center center;
+   background-position: top center;
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb6d10eaad436d5c8b026087d3fe477bdadf05d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: ItSpiderman 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Fix for loader bar position

[jenkins-bot (Code Review)]

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

Change subject: Fix for loader bar position
..


Fix for loader bar position

If loader bar background is set to be behind the Ext grid, its not always
covered by it, instead it stays visible always

Moved it to the top, to make sure grid will always have sufficient height
to cover it

Change-Id: Ieb6d10eaad436d5c8b026087d3fe477bdadf05d6
ERM: #7057
---
M resources/bluespice/bluespice.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index ae59e31..5939067 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -127,5 +127,5 @@
/* @embed */
background-image: url("images/bs-ajax-loader-bar-blue.gif");
background-repeat: no-repeat;
-   background-position: center center;
+   background-position: top center;
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb6d10eaad436d5c8b026087d3fe477bdadf05d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSExtensions: Fixed HideTitle breaking javascript with inlin...

[Robert Vogel (Code Review)]

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

Change subject: BSExtensions: Fixed HideTitle breaking javascript with inline 
script
..

BSExtensions: Fixed HideTitle breaking javascript with inline script

PatchSet2:
* Completley removed the removal of the dom element .firstHeader, as it
is not really needed

Change-Id: If32f5a28096c90dd7d5e4e16be363a349fd16749
---
M HideTitle/HideTitle.class.php
M HideTitle/extension.json
A HideTitle/resources/bluespice.hideTitle.css
3 files changed, 18 insertions(+), 3 deletions(-)


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

diff --git a/HideTitle/HideTitle.class.php b/HideTitle/HideTitle.class.php
index 823ae3f..7022a0d 100644
--- a/HideTitle/HideTitle.class.php
+++ b/HideTitle/HideTitle.class.php
@@ -25,7 +25,7 @@
  * @author Markus Glaser 
  * @version2.23.1
  * @packageBlueSpice_Extensions
- * @subpackage StateBar
+ * @subpackage HideTitle
  * @copyright  Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
  * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
  * @filesource
@@ -35,7 +35,7 @@
 
protected $bHideTitle = false;
 
-protected function initExt() {
+   protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
// Hooks
$this->setHook( 'BeforePageDisplay' );
@@ -56,7 +56,7 @@
$sHideTitlePageProp = BsArticleHelper::getInstance( $oTitle 
)->getPageProp( 'bs_hidetitle' );
if( $sHideTitlePageProp === '' ) {
$oOutputPage->mPagetitle = '';
-   $oOutputPage->addInlineScript( 
"$('.firstHeading').remove()" );
+   $oOutputPage->addModuleStyles( 
'ext.bluespice.hidetitle.styles' );
}
 
return true;
diff --git a/HideTitle/extension.json b/HideTitle/extension.json
index d17c601..62181ef 100644
--- a/HideTitle/extension.json
+++ b/HideTitle/extension.json
@@ -22,5 +22,16 @@
"AutoloadClasses": {
"HideTitle": "HideTitle.class.php"
},
+   "ResourceModules": {
+   "ext.bluespice.hidetitle.styles": {
+   "styles": "bluespice.hideTitle.css",
+   "position": "top",
+   "targets": [ "desktop", "mobile" ]
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceExtensions/HideTitle/resources"
+   },
"manifest_version": 1
 }
diff --git a/HideTitle/resources/bluespice.hideTitle.css 
b/HideTitle/resources/bluespice.hideTitle.css
new file mode 100644
index 000..ef6ec38
--- /dev/null
+++ b/HideTitle/resources/bluespice.hideTitle.css
@@ -0,0 +1,4 @@
+
+#content h1.firstHeading {
+   display: none;
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If32f5a28096c90dd7d5e4e16be363a349fd16749
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Pwirth 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: Fix for loader bar position

[Robert Vogel (Code Review)]

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

Change subject: Fix for loader bar position
..

Fix for loader bar position

If loader bar background is set to be behind the Ext grid, its not always
covered by it, instead it stays visible always

Moved it to the top, to make sure grid will always have sufficient height
to cover it

Change-Id: Ieb6d10eaad436d5c8b026087d3fe477bdadf05d6
ERM: #7057
---
M resources/bluespice/bluespice.css
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index 1a8e6c9..d7f5425 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -126,5 +126,5 @@
min-height: 300px;
background-image: url( 'images/bs-ajax-loader-bar-blue.gif' );
background-repeat: no-repeat;
-   background-position: center center;
+   background-position: top center;
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb6d10eaad436d5c8b026087d3fe477bdadf05d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: ItSpiderman 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Enable jsduck for resources/src/mediawiki.rcfilters and make...

[jenkins-bot (Code Review)]

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

Change subject: Enable jsduck for resources/src/mediawiki.rcfilters and make 
pass
..


Enable jsduck for resources/src/mediawiki.rcfilters and make pass

Change-Id: I2a29689e2697108a5c5206cc61b36b5fb838182f
---
M jsduck.json
M maintenance/jsduck/categories.json
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitButtonWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js
18 files changed, 31 insertions(+), 14 deletions(-)

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



diff --git a/jsduck.json b/jsduck.json
index f7771d1..cbd4676 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -16,6 +16,7 @@
"resources/src/mediawiki.action",
"resources/src/mediawiki.language",
"resources/src/mediawiki.messagePoster",
+   "resources/src/mediawiki.rcfilters",
"resources/src/mediawiki.special",
"resources/src/mediawiki.toolbar",
"resources/src/mediawiki.widgets",
diff --git a/maintenance/jsduck/categories.json 
b/maintenance/jsduck/categories.json
index 2c8c8b0..899d80d 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -66,7 +66,8 @@
"mw.Upload*",
"mw.ForeignUpload",
"mw.ForeignStructuredUpload*",
-   "mw.GallerySlideshow"
+   "mw.GallerySlideshow",
+   "mw.rcfilters*"
]
},
{
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 3281735..4ea1e03 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -634,7 +634,7 @@
/**
 * Get the highlight parameters based on current filter configuration
 *
-* @return {Object} Object where keys are "_color" and 
values
+* @return {Object} Object where keys are `_color` and 
values
 *  are the selected highlight colors.
 */
mw.rcfilters.dm.FiltersViewModel.prototype.getHighlightParameters = 
function () {
@@ -656,7 +656,7 @@
 *
 * @param {Object} representation Object containing representation of
 *  some or all highlight values
-* @return {Object} Object where keys are "_color" and 
values
+* @return {Object} Object where keys are `_color` and 
values
 *  are the selected highlight colors. The returned 
object
 *  contains all available filters either with a color 
value
 *  or with null.
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 8536570..29134a5 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -2,6 +2,7 @@
/**
 * View model for saved queries
 *
+* @class
 * @mixins OO.EventEmitter
 * @mixins OO.EmitterList
 *
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
index 729aee3..c066a1f 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Remove duplicate(!!) method mw.rcfilters.Contr...

[jenkins-bot (Code Review)]

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

Change subject: RCFilters UI: Remove duplicate(!!) method 
mw.rcfilters.Controller#_getDefaultParams
..


RCFilters UI: Remove duplicate(!!) method 
mw.rcfilters.Controller#_getDefaultParams

Change-Id: Id26f4e9716d2276123881c3c74f908265dd1a52f
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 0 insertions(+), 37 deletions(-)

Approvals:
  Krinkle: 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 45e3046..82213ea 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -778,43 +778,6 @@
}
} );
 
-   return $.extend( true, {}, savedParams, 
savedHighlights, { invert: data.invert } );
-   }
-
-   return $.extend(
-   { highlight: '0' },
-   this.filtersModel.getDefaultParams()
-   );
-   };
-
-   /**
-* Get an object representing the default parameter state, whether
-* it is from the model defaults or from the saved queries.
-*
-* @return {Object} Default parameters
-*/
-   mw.rcfilters.Controller.prototype._getDefaultParams = function () {
-   var data, queryHighlights,
-   savedParams = {},
-   savedHighlights = {},
-   defaultSavedQueryItem = 
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
-
-   if ( mw.config.get( 'wgStructuredChangeFiltersEnableSaving' ) &&
-   defaultSavedQueryItem ) {
-
-   data = defaultSavedQueryItem.getData();
-
-   queryHighlights = data.highlights || {};
-   savedParams = 
this.filtersModel.getParametersFromFilters( data.filters || {} );
-
-   // Translate highlights to parameters
-   savedHighlights.highlight = String( Number( 
queryHighlights.highlight ) );
-   $.each( queryHighlights, function ( filterName, color ) 
{
-   if ( filterName !== 'highlights' ) {
-   savedHighlights[ filterName + '_color' 
] = color;
-   }
-   } );
-
return $.extend( true, {}, savedParams, savedHighlights 
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id26f4e9716d2276123881c3c74f908265dd1a52f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: phpunit: Exclude /languages/messages from coverage report

[jenkins-bot (Code Review)]

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

Change subject: phpunit: Exclude /languages/messages from coverage report
..


phpunit: Exclude /languages/messages from coverage report

Indexing these files takes about 5-10% of the run time when generating
code coverage reports for core. It has no coverage at the moment and
probably won't any time soon given it's just variable declarations.

At least for now, exclude it to significantly speed up generating of
coverage reports.

Change-Id: I0357e004e96d4f4b19036474c8353ddb778e31f3
---
M tests/phpunit/suite.xml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index 251a4a2..e8256ef 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -68,6 +68,9 @@
../../includes
../../languages
../../maintenance
+   
+   ../../languages/messages
+   


 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0357e004e96d4f4b19036474c8353ddb778e31f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: BryanDavis 
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/core[master]: resourceloader: Fix @covers for CSSMin tests

[Krinkle (Code Review)]

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

Change subject: resourceloader: Fix @covers for CSSMin tests
..

resourceloader: Fix @covers for CSSMin tests

Change-Id: Idb451d244fbdfbb218a56c2953298b7fe29ed3d4
---
M includes/libs/CSSMin.php
M tests/phpunit/includes/libs/CSSMinTest.php
2 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/368348/1

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 4c672f4..cd80066 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -384,6 +384,9 @@
return false;
}
 
+   /**
+* @codeCoverageIgnore
+*/
private static function getUrlRegex() {
static $urlRegex;
if ( $urlRegex === null ) {
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php 
b/tests/phpunit/includes/libs/CSSMinTest.php
index 1a15c26..7d9a420 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -24,6 +24,7 @@
 
/**
 * @dataProvider mimeTypeProvider
+* @covers CSSMin::getMimeType
 */
public function testGetMimeType( $fileContents, $fileExtension, 
$expected ) {
$fileName = wfTempDir() . DIRECTORY_SEPARATOR . uniqid( 
'MW_PHPUnit_CSSMinTest_' ) . '.'
@@ -167,7 +168,7 @@
 
/**
 * @dataProvider provideIsRemoteUrl
-* @cover CSSMin::isRemoteUrl
+* @covers CSSMin::isRemoteUrl
 */
public function testIsRemoteUrl( $expect, $url ) {
$this->assertEquals( CSSMinTestable::isRemoteUrl( $url ), 
$expect );
@@ -184,18 +185,19 @@
 
/**
 * @dataProvider provideIsLocalUrls
-* @cover CSSMin::isLocalUrl
+* @covers CSSMin::isLocalUrl
 */
public function testIsLocalUrl( $expect, $url ) {
$this->assertEquals( CSSMinTestable::isLocalUrl( $url ), 
$expect );
}
 
/**
-* This tests funky parameters to CSSMin::remap. testRemapRemapping 
tests
-* the basic functionality.
+* This test tests funky parameters to CSSMin::remap.
 *
+* @see testRemapRemapping for testing of the basic functionality
 * @dataProvider provideRemapCases
 * @covers CSSMin::remap
+* @covers CSSMin::remapOne
 */
public function testRemap( $message, $params, $expectedOutput ) {
$remapped = call_user_func_array( 'CSSMin::remap', $params );
@@ -246,10 +248,11 @@
}
 
/**
-* This tests basic functionality of CSSMin::remap. testRemapRemapping 
tests funky parameters.
+* This tests the basic functionality of CSSMin::remap.
 *
+* @see testRemap for testing of funky parameters
 * @dataProvider provideRemapRemappingCases
-* @covers CSSMin::remap
+* @covers CSSMin
 */
public function testRemapRemapping( $message, $input, $expectedOutput ) 
{
$localPath = __DIR__ . '/../../data/cssmin';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb451d244fbdfbb218a56c2953298b7fe29ed3d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/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]: labs puppetmaster: simplify allow_from rules

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster: simplify allow_from rules
..


labs puppetmaster: simplify allow_from rules

Change-Id: Ibeae4132661b7629d20715a165c0d7aa0dcb73ea
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 7e22835..27595cb 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -14,7 +14,7 @@
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # Only allow puppet access from the instances
-$allow_from = flatten([$labs_instance_range, '208.80.154.14', 
'208.80.155.119', '208.80.153.74', $horizon_host_ip, $labs_metal])
+$allow_from = flatten([$labs_instance_range, $labs_metal, 
'.wikimedia.org'])
 
 include ::standard
 include ::base::firewall
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index e8e946a..feecdae 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -14,7 +14,7 @@
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # Only allow puppet access from the instances
-$allow_from = flatten([$labs_instance_range, '208.80.154.14', 
'208.80.155.119', '208.80.153.74', $horizon_host_ip, $labs_metal])
+$allow_from = flatten([$labs_instance_range, $labs_metal, 
'.wikimedia.org'])
 
 include ::base::firewall
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeae4132661b7629d20715a165c0d7aa0dcb73ea
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: labs puppetmaster: simplify allow_from rules

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster: simplify allow_from rules
..

labs puppetmaster: simplify allow_from rules

Change-Id: Ibeae4132661b7629d20715a165c0d7aa0dcb73ea
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 7e22835..3821ba9 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -14,7 +14,7 @@
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # Only allow puppet access from the instances
-$allow_from = flatten([$labs_instance_range, '208.80.154.14', 
'208.80.155.119', '208.80.153.74', $horizon_host_ip, $labs_metal])
+$allow_from = flatten([$labs_instance_range, $labs_metal, 
".wikimedia.org"])
 
 include ::standard
 include ::base::firewall
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index e8e946a..ff4b69c 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -14,7 +14,7 @@
 $designate_host_ip = ipresolve(hiera('labs_designate_hostname'), 4)
 
 # Only allow puppet access from the instances
-$allow_from = flatten([$labs_instance_range, '208.80.154.14', 
'208.80.155.119', '208.80.153.74', $horizon_host_ip, $labs_metal])
+$allow_from = flatten([$labs_instance_range, $labs_metal, 
".wikimedia.org"])
 
 include ::base::firewall
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rdbms: Complete coverage for Database::selectSQLText()

[Krinkle (Code Review)]

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

Change subject: rdbms: Complete coverage for Database::selectSQLText()
..

rdbms: Complete coverage for Database::selectSQLText()

Only missing cases where 'USE INDEX' and 'IGNORE INDEX'.
The test doesn't do much since the underlying methods are no-ops
by default, but at least it ensures there are no PHP errors from
these branches.

We can later re-use some of these test cases in tests specific
to one backend.

Change-Id: Id004a2ae41efaa7a367f964013e25d98ecc591ff
---
M tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/368346/1

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index f519772..9518df9 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -31,6 +31,8 @@
 * @covers Wikimedia\Rdbms\Database::select
 * @covers Wikimedia\Rdbms\Database::selectSQLText
 * @covers Wikimedia\Rdbms\Database::tableNamesWithIndexClauseOrJOIN
+* @covers Wikimedia\Rdbms\Database::useIndexClause
+* @covers Wikimedia\Rdbms\Database::ignoreIndexClause
 * @covers Wikimedia\Rdbms\Database::makeSelectOptions
 * @covers Wikimedia\Rdbms\Database::makeOrderBy
 * @covers Wikimedia\Rdbms\Database::makeGroupByWithHaving
@@ -155,6 +157,24 @@
[
'tables' => 'table',
'fields' => [ 'field' ],
+   'options' => [ 'USE INDEX' => [ 'X' ] ],
+   ],
+   // No-op by default
+   "SELECT field FROM table"
+   ],
+   [
+   [
+   'tables' => 'table',
+   'fields' => [ 'field' ],
+   'options' => [ 'IGNORE INDEX' => [ 'X' 
] ],
+   ],
+   // No-op by default
+   "SELECT field FROM table"
+   ],
+   [
+   [
+   'tables' => 'table',
+   'fields' => [ 'field' ],
'options' => [ 'DISTINCT', 'LOCK IN 
SHARE MODE' ],
],
"SELECT DISTINCT field FROM table  LOCK IN 
SHARE MODE"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id004a2ae41efaa7a367f964013e25d98ecc591ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/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]: define puppetmaster::servers for labpuppetmaster1002

[Andrew Bogott (Code Review)]

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

Change subject: define puppetmaster::servers for labpuppetmaster1002
..


define puppetmaster::servers for labpuppetmaster1002

Change-Id: Ia6dbf46b7aba5748615547cc7d641b5ed71ee5ac
---
M hieradata/hosts/labpuppetmaster1002.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labpuppetmaster1002.yaml 
b/hieradata/hosts/labpuppetmaster1002.yaml
index fd513c5..4f96ca5 100644
--- a/hieradata/hosts/labpuppetmaster1002.yaml
+++ b/hieradata/hosts/labpuppetmaster1002.yaml
@@ -1,3 +1,8 @@
 puppetmaster::ca_server: labpuppetmaster1001.wikimedia.org
 
 labs_puppet_master: labs-puppetmaster.wikimedia.org
+
+puppetmaster::servers:
+  labpuppetmaster1001.wikimedia.org:
+- { worker: labpuppetmaster1001.wikimedia.org, loadfactor: 10 }
+- { worker: labpuppetmaster1002.wikimedia.org, loadfactor: 20 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6dbf46b7aba5748615547cc7d641b5ed71ee5ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: define puppetmaster::servers for labpuppetmaster1002

[Andrew Bogott (Code Review)]

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

Change subject: define puppetmaster::servers for labpuppetmaster1002
..

define puppetmaster::servers for labpuppetmaster1002

Change-Id: Ia6dbf46b7aba5748615547cc7d641b5ed71ee5ac
---
M hieradata/hosts/labpuppetmaster1002.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/368345/1

diff --git a/hieradata/hosts/labpuppetmaster1002.yaml 
b/hieradata/hosts/labpuppetmaster1002.yaml
index fd513c5..4f96ca5 100644
--- a/hieradata/hosts/labpuppetmaster1002.yaml
+++ b/hieradata/hosts/labpuppetmaster1002.yaml
@@ -1,3 +1,8 @@
 puppetmaster::ca_server: labpuppetmaster1001.wikimedia.org
 
 labs_puppet_master: labs-puppetmaster.wikimedia.org
+
+puppetmaster::servers:
+  labpuppetmaster1001.wikimedia.org:
+- { worker: labpuppetmaster1001.wikimedia.org, loadfactor: 10 }
+- { worker: labpuppetmaster1002.wikimedia.org, loadfactor: 20 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: phpunit: Exclude /languages/messages from coverage report

[Krinkle (Code Review)]

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

Change subject: phpunit: Exclude /languages/messages from coverage report
..

phpunit: Exclude /languages/messages from coverage report

Indexing these files takes about 5-10% of the run time when generating
code coverage reports for core. It has no coverage at the moment and
probably won't any time soon given it's just variable declarations.

At least for now, exclude it to significantly speed up generating of
coverage reports.

Change-Id: I0357e004e96d4f4b19036474c8353ddb778e31f3
---
M tests/phpunit/suite.xml
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index 251a4a2..e8256ef 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -68,6 +68,9 @@
../../includes
../../languages
../../maintenance
+   
+   ../../languages/messages
+   


 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0357e004e96d4f4b19036474c8353ddb778e31f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/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]: labs puppetmasters: Let the puppetmasters talk to each other...

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmasters: Let the puppetmasters talk to each other on 
8141
..


labs puppetmasters: Let the puppetmasters talk to each other on 8141

Change-Id: Ibdb2e1da87dfe949472e047a8e6305843c486438
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 5eb50b4..7e22835 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -60,4 +60,12 @@
 },
 }
 create_resources (ferm::rule, $fwrules)
+
+# Let the puppetmasters talk to each other as well
+$puppetmasters_ferm = inline_template('<%= 
scope.function_hiera([\'puppetmaster::servers\']).values.flatten(1).map { |p| 
p[\'worker\'] }.sort.join(\' \')%>')
+ferm::service { 'puppetdb':
+proto  => 'tcp',
+port   => 8141,
+srange => "@resolve((${puppetmasters_ferm}))",
+}
 }
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index 40fc51e..e8e946a 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -68,4 +68,12 @@
 },
 }
 create_resources (ferm::rule, $fwrules)
+
+# Let the puppetmasters talk to each other as well
+$puppetmasters_ferm = inline_template('<%= 
scope.function_hiera([\'puppetmaster::servers\']).values.flatten(1).map { |p| 
p[\'worker\'] }.sort.join(\' \')%>')
+ferm::service { 'puppetdb':
+proto  => 'tcp',
+port   => 8141,
+srange => "@resolve((${puppetmasters_ferm}))",
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdb2e1da87dfe949472e047a8e6305843c486438
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmasters: Let the puppetmasters talk to each other...

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmasters: Let the puppetmasters talk to each other on 
8141
..

labs puppetmasters: Let the puppetmasters talk to each other on 8141

Change-Id: Ibdb2e1da87dfe949472e047a8e6305843c486438
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 5eb50b4..87f2606 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -60,4 +60,12 @@
 },
 }
 create_resources (ferm::rule, $fwrules)
+
+# Let the puppetmasters talk to each other as well
+$puppetmasters_ferm = inline_template('<%= 
scope.function_hiera([\'puppetmaster::servers\']).values.flatten(1).map { |p| 
p[\'worker\'] }.sort.join(\' \')%>')
+ferm::service { 'puppetdb':
+proto   => 'tcp',
+port=> 8141,
+srange  => "@resolve((${puppetmasters_ferm}))",
+}
 }
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index 40fc51e..882fc96 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -68,4 +68,12 @@
 },
 }
 create_resources (ferm::rule, $fwrules)
+
+# Let the puppetmasters talk to each other as well
+$puppetmasters_ferm = inline_template('<%= 
scope.function_hiera([\'puppetmaster::servers\']).values.flatten(1).map { |p| 
p[\'worker\'] }.sort.join(\' \')%>')
+ferm::service { 'puppetdb':
+proto   => 'tcp',
+port=> 8141,
+srange  => "@resolve((${puppetmasters_ferm}))",
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmaster backend: open firewall on 8141

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster backend: open firewall on 8141
..


labs puppetmaster backend: open firewall on 8141

Change-Id: Ib711ec8f9fab8ac2146d5695316a137ee4056e3d
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 6cc8408..5eb50b4 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -50,7 +50,7 @@
 $monitoring = '208.80.154.14 208.80.155.119 208.80.153.74'
 $fwrules = {
 puppetmaster => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8141 ACCEPT;",
 },
 puppetbackend => {
 rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index b5a8b0a..40fc51e 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -54,9 +54,12 @@
 $monitoring = '208.80.154.14 208.80.155.119 208.80.153.74'
 
 $fwrules = {
-puppetmaster => {
+puppetmaster_balancer => {
 rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
 },
+puppetmaster => {
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8141 ACCEPT;",
+},
 puppetbackend => {
 rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib711ec8f9fab8ac2146d5695316a137ee4056e3d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmaster backend: open firewall on 8141

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster backend: open firewall on 8141
..

labs puppetmaster backend: open firewall on 8141

Change-Id: Ib711ec8f9fab8ac2146d5695316a137ee4056e3d
---
M modules/role/manifests/labs/puppetmaster/backend.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/368342/1

diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 6cc8408..5eb50b4 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -50,7 +50,7 @@
 $monitoring = '208.80.154.14 208.80.155.119 208.80.153.74'
 $fwrules = {
 puppetmaster => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8141 ACCEPT;",
 },
 puppetbackend => {
 rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Add feedbackDisplay class to feedback( correction ) in quiz ...

[Harjotsingh (Code Review)]

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

Change subject: Add feedbackDisplay class to feedback( correction ) in quiz to 
hide/show feedback
..

Add feedbackDisplay class to feedback( correction ) in quiz to hide/show 
feedback

This change adds feedbackDisplay class which can be used to hide/show feedback 
on all quizzes
by using CSS in Common.css

Bug: T159952
Change-Id: I0e89cd2c3c5ecf2a0d9c5d7fcd583f35c483d5ac
---
M Question.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/41/368341/1

diff --git a/Question.php b/Question.php
index 4868061..577606d 100644
--- a/Question.php
+++ b/Question.php
@@ -276,7 +276,7 @@
} elseif ( preg_match( $this->mCorrectionPattern, $raw, 
$matches ) &&
$this->mBeingCorrected
) {
-   $rawClass = 'correction';
+   $rawClass = 'correction feedbackDisplay';
$text = array_pop( $matches );
$signesOutput = '';
// Hacks to avoid counting the number of signes.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e89cd2c3c5ecf2a0d9c5d7fcd583f35c483d5ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Harjotsingh 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster profiles: add prevent_cherrypicks param

[Andrew Bogott (Code Review)]

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

Change subject: puppetmaster profiles: add prevent_cherrypicks param
..


puppetmaster profiles: add prevent_cherrypicks param

I want to set this to 'false' for labs puppetmasters

Change-Id: I9a4a7d7897fa6d556770c3def934f8ce35a8d0aa
---
M hieradata/role/common/labs/puppetmaster/backend.yaml
M hieradata/role/common/labs/puppetmaster/frontend.yaml
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
4 files changed, 17 insertions(+), 11 deletions(-)

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



diff --git a/hieradata/role/common/labs/puppetmaster/backend.yaml 
b/hieradata/role/common/labs/puppetmaster/backend.yaml
index 5f56466..db7e535 100644
--- a/hieradata/role/common/labs/puppetmaster/backend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/backend.yaml
@@ -6,6 +6,7 @@
   autosign: true
 
 profile::puppetmaster::backend::secure_private: false
+profile::puppetmaster::backend::prevent_cherrypicks: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
diff --git a/hieradata/role/common/labs/puppetmaster/frontend.yaml 
b/hieradata/role/common/labs/puppetmaster/frontend.yaml
index 4f35aa5..d2b8565 100644
--- a/hieradata/role/common/labs/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/frontend.yaml
@@ -6,6 +6,7 @@
   autosign: true
 
 profile::puppetmaster::frontend::secure_private: false
+profile::puppetmaster::frontend::prevent_cherrypicks: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
diff --git a/modules/profile/manifests/puppetmaster/backend.pp 
b/modules/profile/manifests/puppetmaster/backend.pp
index 41d4a7a..77d5562 100644
--- a/modules/profile/manifests/puppetmaster/backend.pp
+++ b/modules/profile/manifests/puppetmaster/backend.pp
@@ -3,6 +3,7 @@
 class profile::puppetmaster::backend(
 $config = hiera('profile::puppetmaster::backend::config', {}),
 $secure_private = hiera('profile::puppetmaster::backend::config', true),
+$prevent_cherrypicks = 
hiera('profile::puppetmaster::backend::prevent_cherrypicks', true),
 $allow_from = [
   '*.wikimedia.org',
   '*.eqiad.wmnet',
@@ -24,10 +25,11 @@
 }
 
 class { '::puppetmaster':
-server_type=> 'backend',
-config => $::profile::puppetmaster::common::config,
-secure_private => $secure_private,
-allow_from => $allow_from,
+server_type => 'backend',
+config  => $::profile::puppetmaster::common::config,
+secure_private  => $secure_private,
+prevent_cherrypicks => $prevent_cherrypicks,
+allow_from  => $allow_from,
 }
 
 $puppetmaster_frontend_ferm = join(keys(hiera('puppetmaster::servers')), ' 
')
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index 0fb84cd..9ccd5a8 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -4,6 +4,7 @@
 $config = hiera('profile::puppetmaster::frontend::config', {}),
 $secure_private = hiera('profile::puppetmaster::frontend::config', true),
 $web_hostname = hiera('profile::puppetmaster::frontend::web_hostname', 
'puppet'),
+$prevent_cherrypicks = 
hiera('profile::puppetmaster::frontend::prevent_cherrypicks', true),
 $allow_from = [
   '*.wikimedia.org',
   '*.eqiad.wmnet',
@@ -43,13 +44,14 @@
 }
 
 class { '::puppetmaster':
-bind_address   => '*',
-server_type=> 'frontend',
-is_git_master  => true,
-workers=> $workers,
-config => $::profile::puppetmaster::common::config,
-secure_private => $secure_private,
-allow_from => $allow_from,
+bind_address=> '*',
+server_type => 'frontend',
+is_git_master   => true,
+workers => $workers,
+config  => $::profile::puppetmaster::common::config,
+secure_private  => $secure_private,
+prevent_cherrypicks => $prevent_cherrypicks,
+allow_from  => $allow_from,
 }
 
 # Main site to respond to

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a4a7d7897fa6d556770c3def934f8ce35a8d0aa
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster profiles: add prevent_cherrypicks param

[Andrew Bogott (Code Review)]

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

Change subject: puppetmaster profiles: add prevent_cherrypicks param
..

puppetmaster profiles: add prevent_cherrypicks param

I want to set this to 'false' for labs puppetmasters

Change-Id: I9a4a7d7897fa6d556770c3def934f8ce35a8d0aa
---
M hieradata/role/common/labs/puppetmaster/backend.yaml
M hieradata/role/common/labs/puppetmaster/frontend.yaml
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
4 files changed, 17 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/368340/1

diff --git a/hieradata/role/common/labs/puppetmaster/backend.yaml 
b/hieradata/role/common/labs/puppetmaster/backend.yaml
index 5f56466..db7e535 100644
--- a/hieradata/role/common/labs/puppetmaster/backend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/backend.yaml
@@ -6,6 +6,7 @@
   autosign: true
 
 profile::puppetmaster::backend::secure_private: false
+profile::puppetmaster::backend::prevent_cherrypicks: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
diff --git a/hieradata/role/common/labs/puppetmaster/frontend.yaml 
b/hieradata/role/common/labs/puppetmaster/frontend.yaml
index 4f35aa5..d2b8565 100644
--- a/hieradata/role/common/labs/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/frontend.yaml
@@ -6,6 +6,7 @@
   autosign: true
 
 profile::puppetmaster::frontend::secure_private: false
+profile::puppetmaster::frontend::prevent_cherrypicks: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
diff --git a/modules/profile/manifests/puppetmaster/backend.pp 
b/modules/profile/manifests/puppetmaster/backend.pp
index 41d4a7a..198fe41 100644
--- a/modules/profile/manifests/puppetmaster/backend.pp
+++ b/modules/profile/manifests/puppetmaster/backend.pp
@@ -3,6 +3,7 @@
 class profile::puppetmaster::backend(
 $config = hiera('profile::puppetmaster::backend::config', {}),
 $secure_private = hiera('profile::puppetmaster::backend::config', true),
+$prevent_cherrypicks = 
hiera('profile::puppetmaster::backend::prevent_cherry-picks', true)
 $allow_from = [
   '*.wikimedia.org',
   '*.eqiad.wmnet',
@@ -24,10 +25,11 @@
 }
 
 class { '::puppetmaster':
-server_type=> 'backend',
-config => $::profile::puppetmaster::common::config,
-secure_private => $secure_private,
-allow_from => $allow_from,
+server_type => 'backend',
+config  => $::profile::puppetmaster::common::config,
+secure_private  => $secure_private,
+prevent_cherrypicks => $prevent_cherrypicks,
+allow_from  => $allow_from,
 }
 
 $puppetmaster_frontend_ferm = join(keys(hiera('puppetmaster::servers')), ' 
')
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index 0fb84cd..9c13304 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -4,6 +4,7 @@
 $config = hiera('profile::puppetmaster::frontend::config', {}),
 $secure_private = hiera('profile::puppetmaster::frontend::config', true),
 $web_hostname = hiera('profile::puppetmaster::frontend::web_hostname', 
'puppet'),
+$prevent_cherrypicks = 
hiera('profile::puppetmaster::frontend::prevent_cherry-picks', true),
 $allow_from = [
   '*.wikimedia.org',
   '*.eqiad.wmnet',
@@ -43,13 +44,14 @@
 }
 
 class { '::puppetmaster':
-bind_address   => '*',
-server_type=> 'frontend',
-is_git_master  => true,
-workers=> $workers,
-config => $::profile::puppetmaster::common::config,
-secure_private => $secure_private,
-allow_from => $allow_from,
+bind_address=> '*',
+server_type => 'frontend',
+is_git_master   => true,
+workers => $workers,
+config  => $::profile::puppetmaster::common::config,
+secure_private  => $secure_private,
+prevent_cherrypicks => $prevent_cherrypicks,
+allow_from  => $allow_from,
 }
 
 # Main site to respond to

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

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

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmaster: rebase from gerrit once per minute

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster: rebase from gerrit once per minute
..

labs puppetmaster: rebase from gerrit once per minute

Change-Id: I744b94762392debdb03d2dc8ddaa720aba02cd0c
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/368339/1

diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 9182f2f..6cc8408 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -37,6 +37,13 @@
 allow_from => $allow_from,
 }
 
+# Update git checkout.  This is done via a cron
+#  rather than via puppet_merge to increase isolation
+#  between these puppetmasters and the production ones.
+class { 'puppetmaster::gitsync':
+run_every_minutes => '1',
+}
+
 require ::profile::conftool::client
 
 $labs_vms = $novaconfig['fixed_range']
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index a963af9..b5a8b0a 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -34,6 +34,13 @@
 secure_private => false,
 }
 
+# Update git checkout.  This is done via a cron
+#  rather than via puppet_merge to increase isolation
+#  between these puppetmasters and the production ones.
+class { 'puppetmaster::gitsync':
+run_every_minutes => '1',
+}
+
 include ::profile::conftool::client
 include ::profile::conftool::master
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs puppetmaster: rebase from gerrit once per minute

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster: rebase from gerrit once per minute
..


labs puppetmaster: rebase from gerrit once per minute

Change-Id: I744b94762392debdb03d2dc8ddaa720aba02cd0c
---
M modules/role/manifests/labs/puppetmaster/backend.pp
M modules/role/manifests/labs/puppetmaster/frontend.pp
2 files changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/labs/puppetmaster/backend.pp 
b/modules/role/manifests/labs/puppetmaster/backend.pp
index 9182f2f..6cc8408 100644
--- a/modules/role/manifests/labs/puppetmaster/backend.pp
+++ b/modules/role/manifests/labs/puppetmaster/backend.pp
@@ -37,6 +37,13 @@
 allow_from => $allow_from,
 }
 
+# Update git checkout.  This is done via a cron
+#  rather than via puppet_merge to increase isolation
+#  between these puppetmasters and the production ones.
+class { 'puppetmaster::gitsync':
+run_every_minutes => '1',
+}
+
 require ::profile::conftool::client
 
 $labs_vms = $novaconfig['fixed_range']
diff --git a/modules/role/manifests/labs/puppetmaster/frontend.pp 
b/modules/role/manifests/labs/puppetmaster/frontend.pp
index a963af9..b5a8b0a 100644
--- a/modules/role/manifests/labs/puppetmaster/frontend.pp
+++ b/modules/role/manifests/labs/puppetmaster/frontend.pp
@@ -34,6 +34,13 @@
 secure_private => false,
 }
 
+# Update git checkout.  This is done via a cron
+#  rather than via puppet_merge to increase isolation
+#  between these puppetmasters and the production ones.
+class { 'puppetmaster::gitsync':
+run_every_minutes => '1',
+}
+
 include ::profile::conftool::client
 include ::profile::conftool::master
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I744b94762392debdb03d2dc8ddaa720aba02cd0c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: m5-master: allow labspuppet@labpuppetmaster1001 and 1002 to ...

[Andrew Bogott (Code Review)]

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

Change subject: m5-master: allow labspuppet@labpuppetmaster1001 and 1002 to 
labspuppet
..


m5-master: allow labspuppet@labpuppetmaster1001 and 1002 to labspuppet

Change-Id: If1dfbe4507382b4a8bc4c2e2615338e64ea9c88e
---
M modules/role/templates/mariadb/grants/production-m5.sql.erb
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/templates/mariadb/grants/production-m5.sql.erb 
b/modules/role/templates/mariadb/grants/production-m5.sql.erb
index ffb62c3..a7eb66e 100644
--- a/modules/role/templates/mariadb/grants/production-m5.sql.erb
+++ b/modules/role/templates/mariadb/grants/production-m5.sql.erb
@@ -143,6 +143,14 @@
 IDENTIFIED BY '<%= @labspuppet_pass %>';
 
 GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
+ON `labspuppet`.* TO 'labspuppet'@'208.80.154.158'
+IDENTIFIED BY '<%= @labspuppet_pass %>';
+
+GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
+ON `labspuppet`.* TO 'labspuppet'@'208.80.155.120'
+IDENTIFIED BY '<%= @labspuppet_pass %>';
+
+GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
 ON `labspuppet`.* TO 'labspuppet'@'10.64.16.155'
 IDENTIFIED BY '<%= @labspuppet_pass %>';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1dfbe4507382b4a8bc4c2e2615338e64ea9c88e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Add enumeration class to question id field

[Harjotsingh (Code Review)]

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

Change subject: Add enumeration class to question id field
..

Add enumeration class to question id field

Adding enumeration class to question id field will enable showing/hiding
question numbers by changing CSS.Admins can change Common.css accordingly.
The default behaviour is to show question number.

Bug: T170852
Change-Id: Ic67aae5489bc8ca5e94f9b6b3c70799caa40c42b
---
M templates/Question.mustache
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/38/368338/1

diff --git a/templates/Question.mustache b/templates/Question.mustache
index 6c66951..66cb68f 100644
--- a/templates/Question.mustache
+++ b/templates/Question.mustache
@@ -1,7 +1,7 @@
 

{{#if question.numdis }}
-   {{ question.id }}
+   {{ question.id 
}}
{{/if}}
{{{ question.text }}}

@@ -10,4 +10,4 @@
{{{ question.answers }}}


-
\ No newline at end of file
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic67aae5489bc8ca5e94f9b6b3c70799caa40c42b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Harjotsingh 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Don't generate RC entries for filterable log types

[GeoffreyT2000 (Code Review)]

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

Change subject: Don't generate RC entries for filterable log types
..

Don't generate RC entries for filterable log types

This change is needed so that filterable log types (e.g. patrol) will not get 
corresponding recent changes entries after running rebuildrecentchanges.php.

Bug: T20364
Change-Id: Id18364599b44d16f867f1042e1dc7e8f51b1b369
---
M maintenance/rebuildrecentchanges.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/368337/1

diff --git a/maintenance/rebuildrecentchanges.php 
b/maintenance/rebuildrecentchanges.php
index 458dacf..dd2669c 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -292,9 +292,9 @@
'log_timestamp > ' . $dbw->addQuotes( 
$dbw->timestamp( $this->cutoffFrom ) ),
'log_timestamp < ' . $dbw->addQuotes( 
$dbw->timestamp( $this->cutoffTo ) ),
'log_user=user_id',
-   // Some logs don't go in RC since they are 
private.
+   // Some logs don't go in RC since they are 
private, or can be filtered out.
// @FIXME: core/extensions also have spammy 
logs that don't go in RC.
-   'log_type' => array_diff( $wgLogTypes, 
array_keys( $wgLogRestrictions ) ),
+   'log_type' => array_diff( $wgLogTypes, 
array_keys( array_merge( $wgLogRestrictions, $wgFilterLogTypes ) ) ),
],
__METHOD__,
[ 'ORDER BY' => 'log_timestamp DESC' ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id18364599b44d16f867f1042e1dc7e8f51b1b369
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_29
Gerrit-Owner: GeoffreyT2000 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't generate RC entries for filterable log types

[GeoffreyT2000 (Code Review)]

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

Change subject: Don't generate RC entries for filterable log types
..

Don't generate RC entries for filterable log types

This change is needed so that filterable log types (e.g. patrol) will not get 
corresponding recent changes entries after running rebuildrecentchanges.php.

Bug: T20364
Change-Id: Id18364599b44d16f867f1042e1dc7e8f51b1b369
---
M maintenance/rebuildrecentchanges.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/368336/1

diff --git a/maintenance/rebuildrecentchanges.php 
b/maintenance/rebuildrecentchanges.php
index 142a4e5..bc5cb0f 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -293,9 +293,9 @@
'log_timestamp > ' . $dbw->addQuotes( 
$dbw->timestamp( $this->cutoffFrom ) ),
'log_timestamp < ' . $dbw->addQuotes( 
$dbw->timestamp( $this->cutoffTo ) ),
'log_user=user_id',
-   // Some logs don't go in RC since they are 
private.
+   // Some logs don't go in RC since they are 
private, or can be filtered out.
// @FIXME: core/extensions also have spammy 
logs that don't go in RC.
-   'log_type' => array_diff( $wgLogTypes, 
array_keys( $wgLogRestrictions ) ),
+   'log_type' => array_diff( $wgLogTypes, 
array_keys( array_merge( $wgLogRestrictions, $wgFilterLogTypes ) ),
],
__METHOD__,
[ 'ORDER BY' => 'log_timestamp DESC' ],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Set debug_level on icinga"

[Dzahn (Code Review)]

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

Change subject: Revert "Set debug_level on icinga"
..


Revert "Set debug_level on icinga"

This reverts commit d783dc079e55405dd01d133a2e9906cad41934cc.

Change-Id: I198fc951b2e589f0f84a676c5c4360fa5175cf9d
---
M modules/icinga/templates/icinga.cfg.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/icinga/templates/icinga.cfg.erb 
b/modules/icinga/templates/icinga.cfg.erb
index 658eaf3..8bb493f 100644
--- a/modules/icinga/templates/icinga.cfg.erb
+++ b/modules/icinga/templates/icinga.cfg.erb
@@ -1391,7 +1391,7 @@
 #  1024 = Comments
 #  2048 = Macros
 
-debug_level=512
+debug_level=0
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I198fc951b2e589f0f84a676c5c4360fa5175cf9d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Jcrespo 
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]: install_server: add install2001 to DHCP, partman

[Dzahn (Code Review)]

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

Change subject: install_server: add install2001 to DHCP, partman
..


install_server: add install2001 to DHCP, partman

Bug: T171917
Change-Id: If52c2b09a8546042ab5885faf9dde3f4acc7bb45
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
2 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index d7eadf2..4be78bc 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -77,7 +77,7 @@
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 
labcontrol100[34]|labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat100[56])
 echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
-
acrab|acrux|actinium|alcyone|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|netmon1003|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
+
acrab|acrux|actinium|alcyone|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|netmon1003|releases[12]001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 diadem|dysprosium) echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 5f03db7..14d60e8 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -295,6 +295,12 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host releases2001 {
+hardware ethernet aa:00:00:ae:36:40;
+fixed-address releases2001.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
 host roentgenium {
 hardware ethernet aa:00:00:d9:85:e2;
 fixed-address roentgenium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: WIP: AbuseLog details page should link to the triggered vers...

[Huji (Code Review)]

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

Change subject: WIP: AbuseLog details page should link to the triggered version 
of the filter
..

WIP: AbuseLog details page should link to the triggered version of the filter

Bug: T52806
Change-Id: Idf745db264ece2ef2d8ef900a5a6aef4676958d2
---
M special/SpecialAbuseLog.php
1 file changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/35/368335/1

diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 853424b..35789dc 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -562,7 +562,19 @@
->numParams( $globalIndex )->escaped();
$filterLink = Linker::makeExternalLink( 
$globalURL, $linkText );
} else {
-   $title = SpecialPage::getTitleFor( 
'AbuseFilter', $row->afl_filter );
+   // Which version of the filter was in use at 
the time of the logged action?
+   $dbr = wfGetDB( DB_SLAVE );
+   $triggeredRev = $dbr->selectRow(
+   [ 'abuse_filter_history' ],
+   'MAX(afh_id) AS item',
+   [
+   'afh_filter' => 
$row->afl_filter,
+   'afh_timestamp <' . 
$dbr->addQuotes( $row->afl_timestamp ),
+   ],
+   __METHOD__
+   );
+
+   $title = SpecialPage::getTitleFor( 
'AbuseFilter', $row->afl_filter . '/item/' . $triggeredRev->item);
$linkText = $this->msg( 
'abusefilter-log-detailedentry-local' )
->numParams( $row->afl_filter )->text();
$filterLink = $linkRenderer->makeKnownLink( 
$title, $linkText );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf745db264ece2ef2d8ef900a5a6aef4676958d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: add install2001 to DHCP, partman

[Dzahn (Code Review)]

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

Change subject: install_server: add install2001 to DHCP, partman
..

install_server: add install2001 to DHCP, partman

Bug: T171917
Change-Id: If52c2b09a8546042ab5885faf9dde3f4acc7bb45
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
2 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/368334/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 45df17f..c74a76f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -77,7 +77,7 @@
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 
labcontrol100[34]|labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat100[56])
 echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
-
acrab|acrux|actinium|alcyone|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|netmon1003|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
+
acrab|acrux|actinium|alcyone|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|netmon1003|releases[12]001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 diadem|dysprosium) echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 5f03db7..14d60e8 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -295,6 +295,12 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host releases2001 {
+hardware ethernet aa:00:00:ae:36:40;
+fixed-address releases2001.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
 host roentgenium {
 hardware ethernet aa:00:00:d9:85:e2;
 fixed-address roentgenium.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If52c2b09a8546042ab5885faf9dde3f4acc7bb45
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]: Assign internal IPs to pfw3-codfw<->pfw3-eqiad ipsec link

[Ayounsi (Code Review)]

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

Change subject: Assign internal IPs to pfw3-codfw<->pfw3-eqiad ipsec link
..


Assign internal IPs to pfw3-codfw<->pfw3-eqiad ipsec link

Bug: T169643
Change-Id: Ia79c30eb14f4d746f767ed7532a5e4114214b1ca
---
M templates/10.in-addr.arpa
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 40b55b7..a547c05 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -4576,7 +4576,7 @@
 32  1H IN PTR  wmf6576.mgmt.codfw.wmnet.
 33  1H IN PTR  wmf6577.mgmt.codfw.wmnet.
 
-; 10.195.0.0/25 - frack.codfw subnets
+; 10.195.0.0/24 - frack.codfw subnets
 $ORIGIN 0.195.{{ zonename }}.
 
 ; 10.195.0.0/27 - frack-payments-codfw
@@ -4623,6 +4623,13 @@
 111 1H IN PTR  betelgeuse.mgmt.frack.codfw.wmnet.
 112 1H IN PTR  frbackup2001.mgmt.frack.codfw.wmnet.
 
+; 10.195.0.248/29 - reserved for frack infra
+
+; 10.195.0.248/31 (pfw3-eqiad:st0 <--> pfw3-codfw:st0)
+248 1H  IN PTR  st0.pfw3-codfw.frack.codfw.wmnet.
+249 1H  IN PTR  st0.pfw3-codfw.frack.codfw.wmnet.
+
+
 ; codfw labs realm
 
 ; 10.196.0.0/24 - labs-instances1-a-codfw

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia79c30eb14f4d746f767ed7532a5e4114214b1ca
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Faidon Liambotis 
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]: releases: rsync reprepro data, set active server in Hiera

[Dzahn (Code Review)]

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

Change subject: releases: rsync reprepro data, set active server in Hiera
..

releases: rsync reprepro data, set active server in Hiera

Bug: T164030
Change-Id: Ibbe147a5993e3421e7993d64cbd1887e176c6c47
---
M hieradata/common.yaml
M modules/role/manifests/releases.pp
2 files changed, 15 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/368333/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e45ce54..971da0f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -466,6 +466,9 @@
 
 netmon_server: netmon1002.wikimedia.org
 
+releases_server: releases1001.eqiad.wmnet
+releases_server: releases2001.codfw.wmnet
+
 # Etcd client global configuration
 etcd_client_srv_domain: "conftool.%{::site}.wmnet"
 etcd_host: ''
diff --git a/modules/role/manifests/releases.pp 
b/modules/role/manifests/releases.pp
index 28e91ec..510e8ab 100644
--- a/modules/role/manifests/releases.pp
+++ b/modules/role/manifests/releases.pp
@@ -14,10 +14,20 @@
 include ::profile::releases::mediawiki
 include ::profile::releases::reprepro
 
+$active_server = hiera('releases_server', 'releases1001.eqiad.wmnet')
+$passive_server = hiera('releases_server_failover', 
'releases2001.codfw.wmnet')
+
 rsync::quickdatacopy { 'srv-org-wikimedia-releases':
   ensure  => present,
-  source_host => 'bromine.eqiad.wmnet',
-  dest_host   => 'releases1001.eqiad.wmnet',
+  source_host => $active_server,
+  dest_host   => $passive_server,
   module_path => '/srv/org/wikimedia/releases',
 }
+
+rsync::quickdatacopy { 'srv-org-wikimedia-reprepro':
+  ensure  => present,
+  source_host => $active_server,
+  dest_host   => $passive_server
+  module_path => '/srv/org/wikimedia/reprepro',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "openstack: move openstack::repo to new model"

[Rush (Code Review)]

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

Change subject: Revert "openstack: move openstack::repo to new model"
..


Revert "openstack: move openstack::repo to new model"

This reverts commit 9411cf80dcd43efd4e40a15e6da3a70de2238054.

Change-Id: I56be86825582ff578b161a2a394a3a5a6df7411c
---
M hieradata/common.yaml
M hieradata/hosts/californium.yaml
M hieradata/hosts/labstore1004.yaml
M hieradata/hosts/labstore1005.yaml
M hieradata/hosts/labtestweb2001.yaml
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M manifests/site.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/clientlib.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/network.pp
M modules/openstack/manifests/nova/scheduler.pp
M modules/openstack/manifests/nova/spiceproxy.pp
M modules/openstack/manifests/queue_server.pp
D modules/openstack2/manifests/cloudrepo.pp
D modules/profile/manifests/openstack/base/cloudrepo.pp
D modules/profile/manifests/openstack/labtest/cloudrepo.pp
D modules/profile/manifests/openstack/labtestn/cloudrepo.pp
D modules/profile/manifests/openstack/main/cloudrepo.pp
A modules/role/manifests/wmcloud/openstack/control.pp
D modules/role/manifests/wmcs/openstack/labtest/control.pp
D modules/role/manifests/wmcs/openstack/labtest/net.pp
D modules/role/manifests/wmcs/openstack/labtest/services.pp
D modules/role/manifests/wmcs/openstack/labtest/virt.pp
D modules/role/manifests/wmcs/openstack/labtest/web.pp
D modules/role/manifests/wmcs/openstack/labtestn/control.pp
D modules/role/manifests/wmcs/openstack/labtestn/net.pp
D modules/role/manifests/wmcs/openstack/labtestn/services.pp
D modules/role/manifests/wmcs/openstack/labtestn/virt.pp
D modules/role/manifests/wmcs/openstack/labtestn/web.pp
D modules/role/manifests/wmcs/openstack/main/control.pp
D modules/role/manifests/wmcs/openstack/main/horizon.pp
D modules/role/manifests/wmcs/openstack/main/net.pp
D modules/role/manifests/wmcs/openstack/main/net_secondary.pp
D modules/role/manifests/wmcs/openstack/main/services.pp
D modules/role/manifests/wmcs/openstack/main/virt.pp
D modules/role/manifests/wmcs/openstack/main/web.pp
D modules/role/manifests/wmcs/openstack/main/wikitech.pp
47 files changed, 57 insertions(+), 191 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 98ef81f..e45ce54 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -319,10 +319,6 @@
 
 # LABS
 
-profile::openstack::main::version: 'liberty'
-profile::openstack::labtest::version: 'liberty'
-profile::openstack::labtestn::version: 'liberty'
-
 labs_tld: "wmflabs"
 labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
 labs_designate_hostname:  "labservices1001.wikimedia.org"
diff --git a/hieradata/hosts/californium.yaml b/hieradata/hosts/californium.yaml
index 467d0ed..2c0c74d 100644
--- a/hieradata/hosts/californium.yaml
+++ b/hieradata/hosts/californium.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
 openstack::version: 'mitaka'
diff --git a/hieradata/hosts/labstore1004.yaml 
b/hieradata/hosts/labstore1004.yaml
index e81a0b5..6bcecbc 100644
--- a/hieradata/hosts/labstore1004.yaml
+++ b/hieradata/hosts/labstore1004.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml 
b/hieradata/hosts/labstore1005.yaml
index e81a0b5..6bcecbc 100644
--- a/hieradata/hosts/labstore1005.yaml
+++ b/hieradata/hosts/labstore1005.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labtestweb2001.yaml 
b/hieradata/hosts/labtestweb2001.yaml
index 2d42e1a..0f588af 100644
--- a/hieradata/hosts/labtestweb2001.yaml
+++ b/hieradata/hosts/labtestweb2001.yaml
@@ -3,6 +3,5 @@
 
 apache::logrotate::rotate: 12
 
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
 profile::backup::host::enable: false
diff --git a/hieradata/role/common/labs/nfs/primary.yaml 
b/hieradata/role/common/labs/nfs/primary.yaml
index 49afc31..628bdfa 100644
--- a/hieradata/role/common/labs/nfs/primary.yaml
+++ b/hieradata/role/common/labs/nfs/primary.yaml
@@ -14,7 +14,6 @@
   debdeploy-labsnfs:
 value: standard
 
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
 
 admin::groups:
diff --git a/hieradata/role/common/labs/nfs/secondary.yaml 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "openstack: move openstack::repo to new model"

[Rush (Code Review)]

Hello Giuseppe Lavagetto, Alex Monk, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "openstack: move openstack::repo to new model"
..

Revert "openstack: move openstack::repo to new model"

This reverts commit 9411cf80dcd43efd4e40a15e6da3a70de2238054.

Change-Id: I56be86825582ff578b161a2a394a3a5a6df7411c
---
M hieradata/common.yaml
M hieradata/hosts/californium.yaml
M hieradata/hosts/labstore1004.yaml
M hieradata/hosts/labstore1005.yaml
M hieradata/hosts/labtestweb2001.yaml
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M manifests/site.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/clientlib.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/network.pp
M modules/openstack/manifests/nova/scheduler.pp
M modules/openstack/manifests/nova/spiceproxy.pp
M modules/openstack/manifests/queue_server.pp
D modules/openstack2/manifests/cloudrepo.pp
D modules/profile/manifests/openstack/base/cloudrepo.pp
D modules/profile/manifests/openstack/labtest/cloudrepo.pp
D modules/profile/manifests/openstack/labtestn/cloudrepo.pp
D modules/profile/manifests/openstack/main/cloudrepo.pp
A modules/role/manifests/wmcloud/openstack/control.pp
D modules/role/manifests/wmcs/openstack/labtest/control.pp
D modules/role/manifests/wmcs/openstack/labtest/net.pp
D modules/role/manifests/wmcs/openstack/labtest/services.pp
D modules/role/manifests/wmcs/openstack/labtest/virt.pp
D modules/role/manifests/wmcs/openstack/labtest/web.pp
D modules/role/manifests/wmcs/openstack/labtestn/control.pp
D modules/role/manifests/wmcs/openstack/labtestn/net.pp
D modules/role/manifests/wmcs/openstack/labtestn/services.pp
D modules/role/manifests/wmcs/openstack/labtestn/virt.pp
D modules/role/manifests/wmcs/openstack/labtestn/web.pp
D modules/role/manifests/wmcs/openstack/main/control.pp
D modules/role/manifests/wmcs/openstack/main/horizon.pp
D modules/role/manifests/wmcs/openstack/main/net.pp
D modules/role/manifests/wmcs/openstack/main/net_secondary.pp
D modules/role/manifests/wmcs/openstack/main/services.pp
D modules/role/manifests/wmcs/openstack/main/virt.pp
D modules/role/manifests/wmcs/openstack/main/web.pp
D modules/role/manifests/wmcs/openstack/main/wikitech.pp
47 files changed, 57 insertions(+), 191 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/368332/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 98ef81f..e45ce54 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -319,10 +319,6 @@
 
 # LABS
 
-profile::openstack::main::version: 'liberty'
-profile::openstack::labtest::version: 'liberty'
-profile::openstack::labtestn::version: 'liberty'
-
 labs_tld: "wmflabs"
 labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
 labs_designate_hostname:  "labservices1001.wikimedia.org"
diff --git a/hieradata/hosts/californium.yaml b/hieradata/hosts/californium.yaml
index 467d0ed..2c0c74d 100644
--- a/hieradata/hosts/californium.yaml
+++ b/hieradata/hosts/californium.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
 openstack::version: 'mitaka'
diff --git a/hieradata/hosts/labstore1004.yaml 
b/hieradata/hosts/labstore1004.yaml
index e81a0b5..6bcecbc 100644
--- a/hieradata/hosts/labstore1004.yaml
+++ b/hieradata/hosts/labstore1004.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml 
b/hieradata/hosts/labstore1005.yaml
index e81a0b5..6bcecbc 100644
--- a/hieradata/hosts/labstore1005.yaml
+++ b/hieradata/hosts/labstore1005.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labtestweb2001.yaml 
b/hieradata/hosts/labtestweb2001.yaml
index 2d42e1a..0f588af 100644
--- a/hieradata/hosts/labtestweb2001.yaml
+++ b/hieradata/hosts/labtestweb2001.yaml
@@ -3,6 +3,5 @@
 
 apache::logrotate::rotate: 12
 
-profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
 profile::backup::host::enable: false
diff --git a/hieradata/role/common/labs/nfs/primary.yaml 
b/hieradata/role/common/labs/nfs/primary.yaml
index 49afc31..628bdfa 100644
--- a/hieradata/role/common/labs/nfs/primary.yaml
+++ b/hieradata/role/common/labs/nfs/primary.yaml
@@ -14,7 +14,6 @@
   debdeploy-labsnfs:
 value: standard
 
-profile::openstack::main::version: 'mitaka'
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split minoredit into minoredit and enotif_minoredit

[jenkins-bot (Code Review)]

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

Change subject: Split minoredit into minoredit and enotif_minoredit
..


Split minoredit into minoredit and enotif_minoredit

This allows minoredit to have links, while enotif_minoredit can
not.

Change-Id: I7aff9e5a5e6d460f6fce7da36a32e4717b247e4c
---
M includes/mail/EmailNotification.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/mail/EmailNotification.php 
b/includes/mail/EmailNotification.php
index 932797a..2931d9d 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -343,7 +343,7 @@
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalURL();
$keys['$PAGEMINOREDIT'] = $this->minorEdit ?
-   wfMessage( 'minoredit' )->inContentLanguage()->text() : 
'';
+   wfMessage( 'enotif_minoredit' 
)->inContentLanguage()->text() : '';
$keys['$UNWATCHURL'] = $this->title->getCanonicalURL( 
'action=unwatch' );
 
if ( $this->editor->isAnon() ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 6fec714..2f09573 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2236,6 +2236,7 @@
"enotif_lastdiff": "To view this change, see $1",
"enotif_anon_editor": "anonymous user $1",
"enotif_body": "Dear $WATCHINGUSERNAME,\n\n$PAGEINTRO 
$NEWPAGE\n\nEditor's summary: $PAGESUMMARY $PAGEMINOREDIT\n\nContact the 
editor:\nmail: $PAGEEDITOR_EMAIL\nwiki: $PAGEEDITOR_WIKI\n\nThere will be no 
other notifications in case of further activity unless you visit this page 
while logged in. You could also reset the notification flags for all your 
watched pages on your watchlist.\n\nYour friendly {{SITENAME}} notification 
system\n\n--\nTo change your email notification settings, 
visit\n{{canonicalurl:{{#special:Preferences\n\nTo change your watchlist 
settings, visit\n{{canonicalurl:{{#special:EditWatchlist\n\nTo delete the 
page from your watchlist, visit\n$UNWATCHURL\n\nFeedback and further 
assistance:\n$HELPPAGE",
+   "enotif_minoredit": "This is a minor edit",
"created": "created",
"changed": "changed",
"deletepage": "Delete page",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index eae1eac..c0d6ad5 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2426,6 +2426,7 @@
"enotif_lastdiff": "Email notification text to the latest page 
differences. Parameters:\n* $1 - a link which points to a diff, shown as a 
plain link\nSee also:\n* {{msg-mw|Enotif lastvisited}}",
"enotif_anon_editor": "User name in an email notification when 
referring to an anonymous user. Parameters:\n* $1 - the anonymous user name 
(i.e. an IP address).",
"enotif_body": "Text of a notification email sent when a watched page 
has been edited or 
deleted.\n[[File:Screenshot_MediaWiki_e-mail_notifier.PNG|150px|right]]\n\nRefers
 to {{msg-mw|Helppage}}.\n\nParameters:\n*$WATCHINGUSERNAME is the username of 
the user receiving the notification.\n*$PAGEINTRO is the first line of the 
message, saying what happened. It currently can be either 
of:\n**{{msg-mw|Enotif body intro deleted}}\n**{{msg-mw|Enotif body intro 
created}}\n**{{msg-mw|Enotif body intro moved}}\n**{{msg-mw|Enotif body intro 
restored}}\n**{{msg-mw|Enotif body intro changed}} (for all the other 
cases).\n*$NEWPAGE consists of either\n**if the page is new (in older 
releases), {{msg-mw|Enotif newpagetext}}\n**if the page has a previous 
revision,\n***{{msg-mw|Enotif lastdiff}}\n***a newline\n***{{msg-mw|Enotif 
lastvisited}}\n*$PAGEEDITOR_EMAIL and $PAGEEDITOR_WIKI are links respectively 
to the email user special page and user page for the user who performed the 
action.\n*$PAGEEDITOR is the username of the user who performed the 
action.\n*$HELPPAGE is the full URL to the help page, defined by 
{{msg-mw|helppage}}.\n\nThe subject of the email is one of the following 
messages:\n*{{msg-mw|Enotif subject deleted}}\n*{{msg-mw|Enotif subject 
created}}\n*{{msg-mw|Enotif subject moved}}\n*{{msg-mw|Enotif subject 
restored}}\n*{{msg-mw|Enotif subject changed}}",
+   "enotif_minoredit": "Possible value (it's empty string for non-minor 
edits) in the {{msg-mw|Enotify body}} message.  This can use magic words like 
{{GRAMMAR}}.  However, it will not be parsed, so you can not use wikitext (e.g. 
links) that generates HTML.\n{{Identical|minoredit}}",
"created": "{{Optional}}\nPossible value for $CHANGEDORCREATED in the 
following messages:\n* {{msg-mw|enotif_subject}}\n* 
{{msg-mw|enotif_body}}\n{{Identical|Created}}",

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split minoredit into minoredit and enotif_minoredit

[Mattflaschen (Code Review)]

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

Change subject: Split minoredit into minoredit and enotif_minoredit
..

Split minoredit into minoredit and enotif_minoredit

This allows minoredit to have links, while enotif_minoredit can
not.

Change-Id: I7aff9e5a5e6d460f6fce7da36a32e4717b247e4c
---
M includes/mail/EmailNotification.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/368331/1

diff --git a/includes/mail/EmailNotification.php 
b/includes/mail/EmailNotification.php
index 932797a..2931d9d 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -343,7 +343,7 @@
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalURL();
$keys['$PAGEMINOREDIT'] = $this->minorEdit ?
-   wfMessage( 'minoredit' )->inContentLanguage()->text() : 
'';
+   wfMessage( 'enotif_minoredit' 
)->inContentLanguage()->text() : '';
$keys['$UNWATCHURL'] = $this->title->getCanonicalURL( 
'action=unwatch' );
 
if ( $this->editor->isAnon() ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 6fec714..2f09573 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2236,6 +2236,7 @@
"enotif_lastdiff": "To view this change, see $1",
"enotif_anon_editor": "anonymous user $1",
"enotif_body": "Dear $WATCHINGUSERNAME,\n\n$PAGEINTRO 
$NEWPAGE\n\nEditor's summary: $PAGESUMMARY $PAGEMINOREDIT\n\nContact the 
editor:\nmail: $PAGEEDITOR_EMAIL\nwiki: $PAGEEDITOR_WIKI\n\nThere will be no 
other notifications in case of further activity unless you visit this page 
while logged in. You could also reset the notification flags for all your 
watched pages on your watchlist.\n\nYour friendly {{SITENAME}} notification 
system\n\n--\nTo change your email notification settings, 
visit\n{{canonicalurl:{{#special:Preferences\n\nTo change your watchlist 
settings, visit\n{{canonicalurl:{{#special:EditWatchlist\n\nTo delete the 
page from your watchlist, visit\n$UNWATCHURL\n\nFeedback and further 
assistance:\n$HELPPAGE",
+   "enotif_minoredit": "This is a minor edit",
"created": "created",
"changed": "changed",
"deletepage": "Delete page",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index eae1eac..c0d6ad5 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2426,6 +2426,7 @@
"enotif_lastdiff": "Email notification text to the latest page 
differences. Parameters:\n* $1 - a link which points to a diff, shown as a 
plain link\nSee also:\n* {{msg-mw|Enotif lastvisited}}",
"enotif_anon_editor": "User name in an email notification when 
referring to an anonymous user. Parameters:\n* $1 - the anonymous user name 
(i.e. an IP address).",
"enotif_body": "Text of a notification email sent when a watched page 
has been edited or 
deleted.\n[[File:Screenshot_MediaWiki_e-mail_notifier.PNG|150px|right]]\n\nRefers
 to {{msg-mw|Helppage}}.\n\nParameters:\n*$WATCHINGUSERNAME is the username of 
the user receiving the notification.\n*$PAGEINTRO is the first line of the 
message, saying what happened. It currently can be either 
of:\n**{{msg-mw|Enotif body intro deleted}}\n**{{msg-mw|Enotif body intro 
created}}\n**{{msg-mw|Enotif body intro moved}}\n**{{msg-mw|Enotif body intro 
restored}}\n**{{msg-mw|Enotif body intro changed}} (for all the other 
cases).\n*$NEWPAGE consists of either\n**if the page is new (in older 
releases), {{msg-mw|Enotif newpagetext}}\n**if the page has a previous 
revision,\n***{{msg-mw|Enotif lastdiff}}\n***a newline\n***{{msg-mw|Enotif 
lastvisited}}\n*$PAGEEDITOR_EMAIL and $PAGEEDITOR_WIKI are links respectively 
to the email user special page and user page for the user who performed the 
action.\n*$PAGEEDITOR is the username of the user who performed the 
action.\n*$HELPPAGE is the full URL to the help page, defined by 
{{msg-mw|helppage}}.\n\nThe subject of the email is one of the following 
messages:\n*{{msg-mw|Enotif subject deleted}}\n*{{msg-mw|Enotif subject 
created}}\n*{{msg-mw|Enotif subject moved}}\n*{{msg-mw|Enotif subject 
restored}}\n*{{msg-mw|Enotif subject changed}}",
+   "enotif_minoredit": "Possible value (it's empty string for non-minor 
edits) in the {{msg-mw|Enotify body}} message.  This can use magic words like 
{{GRAMMAR}}.  However, it will not be parsed, so you can not use wikitext (e.g. 
links) that generates HTML.\n{{Identical|minoredit}}",
"created": "{{Optional}}\nPossible value for $CHANGEDORCREATED in the 
following messages:\n* {{msg-mw|enotif_subject}}\n* 
{{msg-mw|enotif_body}}\n{{Identical|Created}}",

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Allow filter UI to be turned off

[jenkins-bot (Code Review)]

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

Change subject: Allow filter UI to be turned off
..


Allow filter UI to be turned off

Add $wgOresUiEnabled, defaulting to true. Setting it to false
disables both the structured filters integration, the basic
ORES integration and the preferences group.

Bug: T167908
Change-Id: I6471e0cc693b87c55ba07ffb3f153d86235cdbca
---
M extension.json
M includes/Hooks.php
M includes/Hooks/PreferencesHookHandler.php
3 files changed, 20 insertions(+), 13 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5bdaabc..f7e857b 100644
--- a/extension.json
+++ b/extension.json
@@ -123,6 +123,7 @@
},
"config": {
"OresExtensionStatus": "on",
+   "OresUiEnabled": true,
"OresBaseUrl": "https://ores.wikimedia.org/;,
"OresExcludeBots": true,
"OresModels": {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index a60ac5c..a2108b3 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -99,7 +99,7 @@
ChangesListSpecialPage $clsp
) {
// ORES is disabled on Recentchangeslinked: T163063
-   if ( !self::oresEnabled( $clsp->getUser() ) || $clsp->getName() 
=== 'Recentchangeslinked' ) {
+   if ( !self::oresUiEnabled( $clsp->getUser() ) || 
$clsp->getName() === 'Recentchangeslinked' ) {
return;
}
 
@@ -365,7 +365,7 @@
global $wgUser;
 
// ORES is disabled on Recentchangeslinked: T163063
-   if ( !self::oresEnabled( $wgUser ) || $name === 
'Recentchangeslinked' ) {
+   if ( !self::oresUiEnabled( $wgUser ) || $name === 
'Recentchangeslinked' ) {
return;
}
 
@@ -405,7 +405,7 @@
RCCacheEntry $rcObj,
array &$classes
) {
-   if ( !self::oresEnabled( $ecl->getUser() ) ) {
+   if ( !self::oresUiEnabled( $ecl->getUser() ) ) {
return;
}
 
@@ -424,7 +424,7 @@
array &$data,
RCCacheEntry $rcObj
) {
-   if ( !self::oresEnabled( $ecl->getUser() ) ) {
+   if ( !self::oresUiEnabled( $ecl->getUser() ) ) {
return;
}
 
@@ -448,7 +448,7 @@
$rc,
&$classes = []
) {
-   if ( !self::oresEnabled( $changesList->getUser() ) ) {
+   if ( !self::oresUiEnabled( $changesList->getUser() ) ) {
return;
}
 
@@ -487,7 +487,7 @@
ContribsPager $pager,
&$query
) {
-   if ( !self::oresEnabled( $pager->getUser() ) ) {
+   if ( !self::oresUiEnabled( $pager->getUser() ) ) {
return;
}
 
@@ -516,7 +516,7 @@
$row,
array &$flags
) {
-   if ( !self::oresEnabled( $context->getUser() ) ) {
+   if ( !self::oresUiEnabled( $context->getUser() ) ) {
return;
}
 
@@ -542,7 +542,7 @@
$row,
array &$classes
) {
-   if ( !self::oresEnabled( $pager->getUser() ) ) {
+   if ( !self::oresUiEnabled( $pager->getUser() ) ) {
return;
}
 
@@ -571,7 +571,7 @@
SpecialContributions $page,
array &$filters
) {
-   if ( !self::oresEnabled( $page->getUser() ) || 
!self::isModelEnabled( 'damaging' ) ) {
+   if ( !self::oresUiEnabled( $page->getUser() ) || 
!self::isModelEnabled( 'damaging' ) ) {
return;
}
 
@@ -669,7 +669,7 @@
 * @param Skin $skin
 */
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin ) {
-   if ( !self::oresEnabled( $out->getUser() ) ) {
+   if ( !self::oresUiEnabled( $out->getUser() ) ) {
return;
}
 
@@ -727,8 +727,14 @@
 * @param User $user
 * @return bool
 */
-   public static function oresEnabled( User $user ) {
-   global $wgOresExtensionStatus;
+   public static function oresUiEnabled( User $user ) {
+   global $wgOresExtensionStatus, $wgOresUiEnabled;
+
+   // Is the UI enabled or not?  If not, we've been deployed in
+   // infrastructure-only mode, so hide all the UI elements.
+   if ( !$wgOresUiEnabled ) {
+   return false;
+   }
 
// enabled by default for everybody

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: move openstack::repo to new model

[Rush (Code Review)]

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

Change subject: openstack: move openstack::repo to new model
..


openstack: move openstack::repo to new model

The openstack module and roles are very tangled
and it is going to be an iterative process to move
them to the a new layout.  This sets the groundwork
for the single role profiles to come and associated
configuration using the initial cloud repo setup
as the initial transfer.

* openstack2 is only for transition
* openstack::repo to openstack2::cloudrepo
* create basic roles that will become the
  single role for hosts as refactor happens
* apply roles in site.pp (note this creates
  a bad state for order of operations but
  that is known amongst the wmcs team)
* remove explicit scattered includes for
  openstack::repo
* note keeping module level version setting
  in openstack2::cloudrepo temporarily
  before the next bit of refactor for clientlib

Bug: T171494
Change-Id: I6b7bb1bc68af2159265479c2914dc6ce606af3eb
---
M hieradata/common.yaml
M hieradata/hosts/californium.yaml
M hieradata/hosts/labstore1004.yaml
M hieradata/hosts/labstore1005.yaml
M hieradata/hosts/labtestweb2001.yaml
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M manifests/site.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/clientlib.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/network.pp
M modules/openstack/manifests/nova/scheduler.pp
M modules/openstack/manifests/nova/spiceproxy.pp
M modules/openstack/manifests/queue_server.pp
A modules/openstack2/manifests/cloudrepo.pp
A modules/profile/manifests/openstack/base/cloudrepo.pp
A modules/profile/manifests/openstack/labtest/cloudrepo.pp
A modules/profile/manifests/openstack/labtestn/cloudrepo.pp
A modules/profile/manifests/openstack/main/cloudrepo.pp
D modules/role/manifests/wmcloud/openstack/control.pp
A modules/role/manifests/wmcs/openstack/labtest/control.pp
A modules/role/manifests/wmcs/openstack/labtest/net.pp
A modules/role/manifests/wmcs/openstack/labtest/services.pp
A modules/role/manifests/wmcs/openstack/labtest/virt.pp
A modules/role/manifests/wmcs/openstack/labtest/web.pp
A modules/role/manifests/wmcs/openstack/labtestn/control.pp
A modules/role/manifests/wmcs/openstack/labtestn/net.pp
A modules/role/manifests/wmcs/openstack/labtestn/services.pp
A modules/role/manifests/wmcs/openstack/labtestn/virt.pp
A modules/role/manifests/wmcs/openstack/labtestn/web.pp
A modules/role/manifests/wmcs/openstack/main/control.pp
A modules/role/manifests/wmcs/openstack/main/horizon.pp
A modules/role/manifests/wmcs/openstack/main/net.pp
A modules/role/manifests/wmcs/openstack/main/net_secondary.pp
A modules/role/manifests/wmcs/openstack/main/services.pp
A modules/role/manifests/wmcs/openstack/main/virt.pp
A modules/role/manifests/wmcs/openstack/main/web.pp
A modules/role/manifests/wmcs/openstack/main/wikitech.pp
47 files changed, 191 insertions(+), 57 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e45ce54..98ef81f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -319,6 +319,10 @@
 
 # LABS
 
+profile::openstack::main::version: 'liberty'
+profile::openstack::labtest::version: 'liberty'
+profile::openstack::labtestn::version: 'liberty'
+
 labs_tld: "wmflabs"
 labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
 labs_designate_hostname:  "labservices1001.wikimedia.org"
diff --git a/hieradata/hosts/californium.yaml b/hieradata/hosts/californium.yaml
index 2c0c74d..467d0ed 100644
--- a/hieradata/hosts/californium.yaml
+++ b/hieradata/hosts/californium.yaml
@@ -1 +1,2 @@
+profile::openstack::main::version: 'mitaka'
 openstack::version: 'mitaka'
diff --git a/hieradata/hosts/labstore1004.yaml 
b/hieradata/hosts/labstore1004.yaml
index 6bcecbc..e81a0b5 100644
--- a/hieradata/hosts/labstore1004.yaml
+++ b/hieradata/hosts/labstore1004.yaml
@@ -1 +1,2 @@
+profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml 
b/hieradata/hosts/labstore1005.yaml
index 6bcecbc..e81a0b5 100644
--- a/hieradata/hosts/labstore1005.yaml
+++ b/hieradata/hosts/labstore1005.yaml
@@ -1 +1,2 @@
+profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labtestweb2001.yaml 
b/hieradata/hosts/labtestweb2001.yaml
index 0f588af..2d42e1a 100644
--- 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove temporary wgStructuredChangeFiltersEnableExperimental...

[Catrope (Code Review)]

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

Change subject: Remove temporary 
wgStructuredChangeFiltersEnableExperimentalViews setting
..

Remove temporary wgStructuredChangeFiltersEnableExperimentalViews setting

Now that wmf.12 is deployed everywhere.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f1220e2..99a73ec 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19209,11 +19209,6 @@
'labtestwiki' => true,
 ],
 
-// Temporarily enable until 1.30.0-wmf.12 rolls out -RK
-'wgStructuredChangeFiltersEnableExperimentalViews' => [
-   'default' => true,
-],
-
 ];
 
 ### WMF Labs override #

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6ffd837d88a26bf62159fea7fefe543ade1c784
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]: RCFilters: Make namespace and tag features no longer experim...

[Catrope (Code Review)]

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

Change subject: RCFilters: Make namespace and tag features no longer 
experimental
..

RCFilters: Make namespace and tag features no longer experimental

Change-Id: I6a8619088d5672a156617a313d22f25701289e9c
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
3 files changed, 44 insertions(+), 50 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/368329/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f1468b8..dfb8d57 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -35,11 +35,10 @@
views = {},
items = [],
uri = new mw.Uri(),
-   $changesList = $( '.mw-changeslist' 
).first().contents(),
-   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' );
+   $changesList = $( '.mw-changeslist' 
).first().contents();
 
// Prepare views
-   if ( namespaceStructure && experimentalViews ) {
+   if ( namespaceStructure ) {
items = [];
$.each( namespaceStructure, function ( namespaceID, 
label ) {
// Build and clean up the individual namespace 
items definition
@@ -70,7 +69,7 @@
} ]
};
}
-   if ( tagList && experimentalViews ) {
+   if ( tagList ) {
views.tags = {
title: mw.msg( 'rcfilters-view-tags' ),
trigger: '#',
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 6a6790f..5c5a2d2 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -47,7 +47,6 @@
footers: [
{
name: 'viewSelect',
-   disabled: !mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ),
sticky: false,
// View select menu, appears on 
default view only
$element: $( '' )
@@ -141,49 +140,47 @@
);
}
 
-   if ( mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
-   // Add a selector at the right of the input
-   this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
-   classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
-   items: [
-   new OO.ui.ButtonOptionWidget( {
-   framed: false,
-   data: 'namespaces',
-   icon: 'article',
-   title: mw.msg( 
'rcfilters-view-namespaces-tooltip' )
-   } ),
-   new OO.ui.ButtonOptionWidget( {
-   framed: false,
-   data: 'tags',
-   icon: 'tag',
-   title: mw.msg( 
'rcfilters-view-tags-tooltip' )
-   } )
-   ]
-   } );
+   // Add a selector at the right of the input
+   this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
+   classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
+   items: [
+   new OO.ui.ButtonOptionWidget( {
+   framed: false,
+   data: 'namespaces',
+   icon: 'article',
+   title: mw.msg( 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 94b6ba5453: cast default value to string

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 94b6ba5453: cast default value to string
..


Follow-up 94b6ba5453: cast default value to string

The function we're calling here expects an array of strings,
and if we pass it a number it will treat the number 50
differently from the string "50".

Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 45e3046..f1468b8 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -146,7 +146,7 @@
}
// If the default value isn't in the 
group, add it
if ( groupData.default !== undefined ) {
-   extraValues.push( 
groupData.default );
+   extraValues.push( String( 
groupData.default ) );
}
controller.addNumberValuesToGroup( 
groupData, extraValues );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: Follow-up 94b6ba5453: cast default value to string

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 94b6ba5453: cast default value to string
..


Follow-up 94b6ba5453: cast default value to string

The function we're calling here expects an array of strings,
and if we pass it a number it will treat the number 50
differently from the string "50".

Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)

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 45e3046..f1468b8 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -146,7 +146,7 @@
}
// If the default value isn't in the 
group, add it
if ( groupData.default !== undefined ) {
-   extraValues.push( 
groupData.default );
+   extraValues.push( String( 
groupData.default ) );
}
controller.addNumberValuesToGroup( 
groupData, extraValues );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: Follow-up 94b6ba5453: cast default value to string

[Catrope (Code Review)]

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

Change subject: Follow-up 94b6ba5453: cast default value to string
..

Follow-up 94b6ba5453: cast default value to string

The function we're calling here expects an array of strings,
and if we pass it a number it will treat the number 50
differently from the string "50".

Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/368328/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 45e3046..f1468b8 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -146,7 +146,7 @@
}
// If the default value isn't in the 
group, add it
if ( groupData.default !== undefined ) {
-   extraValues.push( 
groupData.default );
+   extraValues.push( String( 
groupData.default ) );
}
controller.addNumberValuesToGroup( 
groupData, extraValues );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.11
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Use methods from the IP class to validate IPs and CIDR ranges

[Huji (Code Review)]

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

Change subject: Use methods from the IP class to validate IPs and CIDR ranges
..

Use methods from the IP class to validate IPs and CIDR ranges

Bug: T171699
Change-Id: I7609862e8a4310991b4ae6e71616ad3043ad14e7
---
M specials/SpecialCheckUser.php
1 file changed, 20 insertions(+), 27 deletions(-)


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

diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php
index 952f23e..4ba2dd9 100644
--- a/specials/SpecialCheckUser.php
+++ b/specials/SpecialCheckUser.php
@@ -1518,43 +1518,36 @@
 
/**
 * @param IDatabase $db
-* @param string $ip
+* @param string $target an IP address or CIDR range
 * @param string|bool $xfor
 * @return array|false array for valid conditions, false if invalid
 */
-   public static function getIpConds( $db, $ip, $xfor = false ) {
+   public static function getIpConds( $db, $target, $xfor = false ) {
global $wgCheckUserCIDRLimit;
$type = $xfor ? 'xff' : 'ip';
-   $matches = [];
-   if ( preg_match( '#^(\d+\.\d+\.\d+\.\d+)/(\d+)$#', $ip, 
$matches ) ) {
-   // IPv4 CIDR, 16-32 bits
-   if ( $matches[2] < $wgCheckUserCIDRLimit['IPv4'] || 
$matches[2] > 32 ) {
-   return false; // invalid
+   if( strpos( $target, '/' ) !== false ) {
+   list( $ip, $range ) = explode( '/', $target, 2 );
+   if ( IP::isIPv4( $ip ) ) {
+   // IPv4 CIDR, 16-32 bits
+   if ( $range < $wgCheckUserCIDRLimit['IPv4'] || 
$range > 32 ) {
+   return false; // invalid range, or too 
wide
+   }
+   } elseif ( IP::isIPv6( $ip ) ) {
+   // IPv6 CIDR, 32-128 bits
+   if ( $range < $wgCheckUserCIDRLimit['IPv6'] || 
$range > 128 ) {
+   return false; // invalid range, or too 
wide
+   }
}
-   list( $start, $end ) = IP::parseRange( $ip );
+   list( $start, $end ) = IP::parseRange( $target );
return [ 'cuc_' . $type . '_hex BETWEEN ' . 
$db->addQuotes( $start ) .
' AND ' . $db->addQuotes( $end ) ];
-   } elseif ( preg_match(
-   
'#^\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}/(\d+)$#',
-   $ip, $matches )
-   ) {
-   // IPv6 CIDR, 32-128 bits
-   if ( $matches[1] < $wgCheckUserCIDRLimit['IPv6'] || 
$matches[1] > 128 ) {
-   return false; // invalid
+   } else {
+   if ( IP::isIPv4( $target ) || IP::isIPv6( $target ) ) {
+   return [ "cuc_{$type}_hex" => IP::toHex( 
$target ) ];
+   } else {
+   return false; //invalid IP
}
-   list( $start, $end ) = IP::parseRange( $ip );
-   return [ 'cuc_' . $type . '_hex BETWEEN ' . 
$db->addQuotes( $start ) .
-   ' AND ' . $db->addQuotes( $end ) ];
-   } elseif (
-   // 32 bit IPv4
-   preg_match( '#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#', $ip ) ||
-   // 128 bit IPv6
-   preg_match( 
'#^\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}$#', $ip )
-   ) {
-   return [ "cuc_{$type}_hex" => IP::toHex( $ip ) ];
}
-   // Throw away this query, incomplete IP, these don't get 
through the entry point anyway
-   return false;
}
 
protected function getTimeConds( $period ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7609862e8a4310991b4ae6e71616ad3043ad14e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 94b6ba5453: cast default value to string

[Catrope (Code Review)]

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

Change subject: Follow-up 94b6ba5453: cast default value to string
..

Follow-up 94b6ba5453: cast default value to string

The function we're calling here expects an array of strings,
and if we pass it a number it will treat the number 50
differently from the string "50".

Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 45e3046..f1468b8 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -146,7 +146,7 @@
}
// If the default value isn't in the 
group, add it
if ( groupData.default !== undefined ) {
-   extraValues.push( 
groupData.default );
+   extraValues.push( String( 
groupData.default ) );
}
controller.addNumberValuesToGroup( 
groupData, extraValues );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2af535e8ef5dbbba50460013ec4d24e7f29b6b03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] operations/dns[master]: add releases2001.codfw.wmnet

[Dzahn (Code Review)]

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

Change subject: add releases2001.codfw.wmnet
..


add releases2001.codfw.wmnet

Bug: T171917
Change-Id: I11f9e806cda86d6f7cb342f1ffd5fc9ac7da83b5
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/wmnet
3 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0bda955..fdd58b7 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -101,6 +101,7 @@
 7.3.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   cp2011.codfw.wmnet.
 8.3.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   cp2012.codfw.wmnet.
 
+4.7.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   releases2001.codfw.wmnet.
 3.8.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   zosma.codfw.wmnet.
 9.8.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   prometheus2004.codfw.wmnet.
 
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index c3beb76..40b55b7 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3129,7 +3129,7 @@
 171 1H IN PTR   es2011.codfw.wmnet.
 172 1H IN PTR   es2018.codfw.wmnet.
 173 1H IN PTR   hassaleh.codfw.wmnet. ; VM on the ganeti01.svc.codfw.wmnet 
cluster
-
+174 1H IN PTR   releases2001.codfw.wmnet. ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 175 1H IN PTR   restbase2007.codfw.wmnet.
 176 1H IN PTR   restbase2007-a.codfw.wmnet.
 177 1H IN PTR   restbase2007-b.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 7e25122..dda7b85 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2997,6 +2997,8 @@
 rdb2004 1H  IN A10.192.16.123
 rdb2005 1H  IN A10.192.32.133
 rdb2006 1H  IN A10.192.48.44
+releases20011H  IN A10.192.16.174 ; VM on the 
ganeti01.svc.codfw.wmnet cluster
+releases20011H  IN  2620:0:860:102:10:192:16:174
 restbase-test2001   1H  IN A10.192.16.149
 restbase-test2001-a 1H  IN A10.192.16.154 ; cassandra instance
 restbase-test2001-b 1H  IN A10.192.16.155 ; cassandra instance

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11f9e806cda86d6f7cb342f1ffd5fc9ac7da83b5
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow blacklisting certain namespaces in Special:ShortPages

[Jdlrobson (Code Review)]

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

Change subject: Allow blacklisting certain namespaces in Special:ShortPages
..

Allow blacklisting certain namespaces in Special:ShortPages

This new config variable ($wgShortPagesNamespaceBlacklist)
allows wikis to specify namespaces which should be excluded from
Special:ShortPages.

This will be used by Commons, for which NS_FILE is a content namespace
(accessible via Special:Random and Special:Nearby) but is not useful
to list on Special:ShortPages.

If the blacklist cancels out all namespace in wgContentNamespaces then
all namespaces will show up on the page.

Bug: T170687
Change-Id: I10b4849a5d7f3f8af75ccc6cfba230d03725c898
---
M includes/DefaultSettings.php
M includes/specials/SpecialShortpages.php
2 files changed, 11 insertions(+), 2 deletions(-)


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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 74d5fa4..2fcf6ad 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4089,7 +4089,14 @@
  * contain "content" which should be considered when generating a count of the
  * number of articles in the wiki.
  */
-$wgContentNamespaces = [ NS_MAIN ];
+$wgContentNamespaces = [];
+
+/**
+ * Optional array of namespaces which should be blacklisted from 
Special:ShortPages
+ * Only pages inside $wgContentNamespaces but not 
$wgShortPagesNamespaceBlacklist will
+ * be shown on that page.
+ */
+$wgShortPagesNamespaceBlacklist = [];
 
 /**
  * Array of namespaces, in addition to the talk namespaces, where signatures
diff --git a/includes/specials/SpecialShortpages.php 
b/includes/specials/SpecialShortpages.php
index f980e71..e9c15e7 100644
--- a/includes/specials/SpecialShortpages.php
+++ b/includes/specials/SpecialShortpages.php
@@ -41,9 +41,11 @@
}
 
public function getQueryInfo() {
+   $config = $this->getConfig();
+   $blacklist = $config->get( 'ShortPagesNamespaceBlacklist' );
$tables = [ 'page' ];
$conds = [
-   'page_namespace' => MWNamespace::getContentNamespaces(),
+   'page_namespace' => array_diff( 
MWNamespace::getContentNamespaces(), $blacklist ),
'page_is_redirect' => 0
];
$joinConds = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10b4849a5d7f3f8af75ccc6cfba230d03725c898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...CheckUser[master]: Use methods from the IP class to validate IPs and CIDR ranges

[Huji (Code Review)]

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

Change subject: Use methods from the IP class to validate IPs and CIDR ranges
..

Use methods from the IP class to validate IPs and CIDR ranges

Bug: T171699
Change-Id: I87bcba21ab07c364b595d16a762d600f0ef8146c
---
M specials/SpecialCheckUser.php
1 file changed, 20 insertions(+), 27 deletions(-)


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

diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php
index 952f23e..4ba2dd9 100644
--- a/specials/SpecialCheckUser.php
+++ b/specials/SpecialCheckUser.php
@@ -1518,43 +1518,36 @@
 
/**
 * @param IDatabase $db
-* @param string $ip
+* @param string $target an IP address or CIDR range
 * @param string|bool $xfor
 * @return array|false array for valid conditions, false if invalid
 */
-   public static function getIpConds( $db, $ip, $xfor = false ) {
+   public static function getIpConds( $db, $target, $xfor = false ) {
global $wgCheckUserCIDRLimit;
$type = $xfor ? 'xff' : 'ip';
-   $matches = [];
-   if ( preg_match( '#^(\d+\.\d+\.\d+\.\d+)/(\d+)$#', $ip, 
$matches ) ) {
-   // IPv4 CIDR, 16-32 bits
-   if ( $matches[2] < $wgCheckUserCIDRLimit['IPv4'] || 
$matches[2] > 32 ) {
-   return false; // invalid
+   if( strpos( $target, '/' ) !== false ) {
+   list( $ip, $range ) = explode( '/', $target, 2 );
+   if ( IP::isIPv4( $ip ) ) {
+   // IPv4 CIDR, 16-32 bits
+   if ( $range < $wgCheckUserCIDRLimit['IPv4'] || 
$range > 32 ) {
+   return false; // invalid range, or too 
wide
+   }
+   } elseif ( IP::isIPv6( $ip ) ) {
+   // IPv6 CIDR, 32-128 bits
+   if ( $range < $wgCheckUserCIDRLimit['IPv6'] || 
$range > 128 ) {
+   return false; // invalid range, or too 
wide
+   }
}
-   list( $start, $end ) = IP::parseRange( $ip );
+   list( $start, $end ) = IP::parseRange( $target );
return [ 'cuc_' . $type . '_hex BETWEEN ' . 
$db->addQuotes( $start ) .
' AND ' . $db->addQuotes( $end ) ];
-   } elseif ( preg_match(
-   
'#^\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}/(\d+)$#',
-   $ip, $matches )
-   ) {
-   // IPv6 CIDR, 32-128 bits
-   if ( $matches[1] < $wgCheckUserCIDRLimit['IPv6'] || 
$matches[1] > 128 ) {
-   return false; // invalid
+   } else {
+   if ( IP::isIPv4( $target ) || IP::isIPv6( $target ) ) {
+   return [ "cuc_{$type}_hex" => IP::toHex( 
$target ) ];
+   } else {
+   return false; //invalid IP
}
-   list( $start, $end ) = IP::parseRange( $ip );
-   return [ 'cuc_' . $type . '_hex BETWEEN ' . 
$db->addQuotes( $start ) .
-   ' AND ' . $db->addQuotes( $end ) ];
-   } elseif (
-   // 32 bit IPv4
-   preg_match( '#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#', $ip ) ||
-   // 128 bit IPv6
-   preg_match( 
'#^\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}$#', $ip )
-   ) {
-   return [ "cuc_{$type}_hex" => IP::toHex( $ip ) ];
}
-   // Throw away this query, incomplete IP, these don't get 
through the entry point anyway
-   return false;
}
 
protected function getTimeConds( $period ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87bcba21ab07c364b595d16a762d600f0ef8146c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Huji 

___
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: Remove duplicate(!!) method mw.rcfilters.Contr...

[Catrope (Code Review)]

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

Change subject: RCFilters UI: Remove duplicate(!!) method 
mw.rcfilters.Controller#_getDefaultParams
..

RCFilters UI: Remove duplicate(!!) method 
mw.rcfilters.Controller#_getDefaultParams

Change-Id: Id26f4e9716d2276123881c3c74f908265dd1a52f
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 0 insertions(+), 37 deletions(-)


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

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 45e3046..82213ea 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -778,43 +778,6 @@
}
} );
 
-   return $.extend( true, {}, savedParams, 
savedHighlights, { invert: data.invert } );
-   }
-
-   return $.extend(
-   { highlight: '0' },
-   this.filtersModel.getDefaultParams()
-   );
-   };
-
-   /**
-* Get an object representing the default parameter state, whether
-* it is from the model defaults or from the saved queries.
-*
-* @return {Object} Default parameters
-*/
-   mw.rcfilters.Controller.prototype._getDefaultParams = function () {
-   var data, queryHighlights,
-   savedParams = {},
-   savedHighlights = {},
-   defaultSavedQueryItem = 
this.savedQueriesModel.getItemByID( this.savedQueriesModel.getDefault() );
-
-   if ( mw.config.get( 'wgStructuredChangeFiltersEnableSaving' ) &&
-   defaultSavedQueryItem ) {
-
-   data = defaultSavedQueryItem.getData();
-
-   queryHighlights = data.highlights || {};
-   savedParams = 
this.filtersModel.getParametersFromFilters( data.filters || {} );
-
-   // Translate highlights to parameters
-   savedHighlights.highlight = String( Number( 
queryHighlights.highlight ) );
-   $.each( queryHighlights, function ( filterName, color ) 
{
-   if ( filterName !== 'highlights' ) {
-   savedHighlights[ filterName + '_color' 
] = color;
-   }
-   } );
-
return $.extend( true, {}, savedParams, savedHighlights 
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id26f4e9716d2276123881c3c74f908265dd1a52f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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]: Enable jsduck for resources/src/mediawiki.rcfilters and make...

[Catrope (Code Review)]

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

Change subject: Enable jsduck for resources/src/mediawiki.rcfilters and make 
pass
..

Enable jsduck for resources/src/mediawiki.rcfilters and make pass

Change-Id: I2a29689e2697108a5c5206cc61b36b5fb838182f
---
M jsduck.json
M maintenance/jsduck/categories.json
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.HighlightColors.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitButtonWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js
17 files changed, 23 insertions(+), 8 deletions(-)


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

diff --git a/jsduck.json b/jsduck.json
index f7771d1..cbd4676 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -16,6 +16,7 @@
"resources/src/mediawiki.action",
"resources/src/mediawiki.language",
"resources/src/mediawiki.messagePoster",
+   "resources/src/mediawiki.rcfilters",
"resources/src/mediawiki.special",
"resources/src/mediawiki.toolbar",
"resources/src/mediawiki.widgets",
diff --git a/maintenance/jsduck/categories.json 
b/maintenance/jsduck/categories.json
index 2c8c8b0..899d80d 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -66,7 +66,8 @@
"mw.Upload*",
"mw.ForeignUpload",
"mw.ForeignStructuredUpload*",
-   "mw.GallerySlideshow"
+   "mw.GallerySlideshow",
+   "mw.rcfilters*"
]
},
{
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 3281735..4ea1e03 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -634,7 +634,7 @@
/**
 * Get the highlight parameters based on current filter configuration
 *
-* @return {Object} Object where keys are "_color" and 
values
+* @return {Object} Object where keys are `_color` and 
values
 *  are the selected highlight colors.
 */
mw.rcfilters.dm.FiltersViewModel.prototype.getHighlightParameters = 
function () {
@@ -656,7 +656,7 @@
 *
 * @param {Object} representation Object containing representation of
 *  some or all highlight values
-* @return {Object} Object where keys are "_color" and 
values
+* @return {Object} Object where keys are `_color` and 
values
 *  are the selected highlight colors. The returned 
object
 *  contains all available filters either with a color 
value
 *  or with null.
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 8536570..29134a5 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -2,6 +2,7 @@
/**
 * View model for saved queries
 *
+* @class
 * @mixins OO.EventEmitter
 * @mixins OO.EmitterList
 *
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
index 729aee3..c066a1f 100644
--- 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
+++ 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: RCFilters: Read base value of limit/days from preference

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Read base value of limit/days from preference
..


RCFilters: Read base value of limit/days from preference

Bug: T171368
Change-Id: I0cdbae5bf6b9d00efe351c551d1f8a52459559c4
(cherry picked from commit 94b6ba5453a72802e2db3b81e03530230967220b)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 85 insertions(+), 55 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index b6eda0f..7849cc2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -759,7 +759,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.selectItemByParamName = function 
( paramName ) {
this.getItems().forEach( function ( item ) {
-   item.toggleSelected( item.getParamName() === paramName 
);
+   item.toggleSelected( item.getParamName() === String( 
paramName ) );
} );
};
 
@@ -771,7 +771,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.getItemByParamName = function ( 
paramName ) {
return this.getItems().filter( function ( item ) {
-   return item.getParamName() === paramName;
+   return item.getParamName() === String( paramName );
} )[ 0 ];
};
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 3b8ebbd..45e3046 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -31,17 +31,12 @@
 */
mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure, namespaceStructure, tagList ) {
var parsedSavedQueries,
+   controller = this,
views = {},
items = [],
uri = new mw.Uri(),
$changesList = $( '.mw-changeslist' 
).first().contents(),
-   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ),
-   createFilterDataFromNumber = function ( num, 
convertedNumForLabel ) {
-   return {
-   name: String( num ),
-   label: mw.language.convertNumber( 
convertedNumForLabel )
-   };
-   };
+   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' );
 
// Prepare views
if ( namespaceStructure && experimentalViews ) {
@@ -103,9 +98,9 @@
allowArbitrary: true,
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
-   'default': '50',
+   'default': mw.user.options.get( 
'rclimit' ),
filters: [ 50, 100, 250, 500 ].map( 
function ( num ) {
-   return 
createFilterDataFromNumber( num, num );
+   return 
controller._createFilterDataFromNumber( num, num );
} )
},
{
@@ -116,14 +111,19 @@
allowArbitrary: true,
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
-   'default': '7',
+   numToLabelFunc: function ( i ) {
+   return Number( i ) < 1 ?
+   ( Number( i ) * 24 
).toFixed( 2 ) :
+   Number( i );
+   },
+   'default': mw.user.options.get( 
'rcdays' ),
filters: [
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5,
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: move openstack::repo to new model

[Rush (Code Review)]

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

Change subject: openstack: move openstack::repo to new model
..

openstack: move openstack::repo to new model

The openstack module and roles are very tangled
and it is going to be an iterative process to move
them to the a new layout.  This sets the groundwork
for the single role profiles to come and associated
configuration using the initial cloud repo setup
as the initial transfer.

* openstack2 is only for transition
* openstack::repo to openstack2::cloudrepo
* create basic roles that will become the
  single role for hosts as refactor happens
* apply roles in site.pp (note this creates
  a bad state for order of operations but
  that is known amongst the wmcs team)
* remove explicit scattered includes for
  openstack::repo
* note keeping module level version setting
  in openstack2::cloudrepo temporarily
  before the next bit of refactor for clientlib

Bug: T171494
Change-Id: I6b7bb1bc68af2159265479c2914dc6ce606af3eb
---
M hieradata/common.yaml
M hieradata/hosts/californium.yaml
M hieradata/hosts/labstore1004.yaml
M hieradata/hosts/labstore1005.yaml
M hieradata/hosts/labtestweb2001.yaml
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M manifests/site.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/clientlib.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/network.pp
M modules/openstack/manifests/nova/scheduler.pp
M modules/openstack/manifests/nova/spiceproxy.pp
M modules/openstack/manifests/queue_server.pp
A modules/openstack2/manifests/cloudrepo.pp
A modules/profile/manifests/openstack/base/cloudrepo.pp
A modules/profile/manifests/openstack/labtest/cloudrepo.pp
A modules/profile/manifests/openstack/labtestn/cloudrepo.pp
A modules/profile/manifests/openstack/main/cloudrepo.pp
D modules/role/manifests/wmcloud/openstack/control.pp
A modules/role/manifests/wmcs/openstack/labtest/control.pp
A modules/role/manifests/wmcs/openstack/labtest/net.pp
A modules/role/manifests/wmcs/openstack/labtest/services.pp
A modules/role/manifests/wmcs/openstack/labtest/virt.pp
A modules/role/manifests/wmcs/openstack/labtest/web.pp
A modules/role/manifests/wmcs/openstack/labtestn/control.pp
A modules/role/manifests/wmcs/openstack/labtestn/net.pp
A modules/role/manifests/wmcs/openstack/labtestn/services.pp
A modules/role/manifests/wmcs/openstack/labtestn/virt.pp
A modules/role/manifests/wmcs/openstack/labtestn/web.pp
A modules/role/manifests/wmcs/openstack/main/control.pp
A modules/role/manifests/wmcs/openstack/main/horizon.pp
A modules/role/manifests/wmcs/openstack/main/net.pp
A modules/role/manifests/wmcs/openstack/main/net_secondary.pp
A modules/role/manifests/wmcs/openstack/main/services.pp
A modules/role/manifests/wmcs/openstack/main/virt.pp
A modules/role/manifests/wmcs/openstack/main/web.pp
A modules/role/manifests/wmcs/openstack/main/wikitech.pp
47 files changed, 191 insertions(+), 57 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e45ce54..98ef81f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -319,6 +319,10 @@
 
 # LABS
 
+profile::openstack::main::version: 'liberty'
+profile::openstack::labtest::version: 'liberty'
+profile::openstack::labtestn::version: 'liberty'
+
 labs_tld: "wmflabs"
 labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
 labs_designate_hostname:  "labservices1001.wikimedia.org"
diff --git a/hieradata/hosts/californium.yaml b/hieradata/hosts/californium.yaml
index 2c0c74d..467d0ed 100644
--- a/hieradata/hosts/californium.yaml
+++ b/hieradata/hosts/californium.yaml
@@ -1 +1,2 @@
+profile::openstack::main::version: 'mitaka'
 openstack::version: 'mitaka'
diff --git a/hieradata/hosts/labstore1004.yaml 
b/hieradata/hosts/labstore1004.yaml
index 6bcecbc..e81a0b5 100644
--- a/hieradata/hosts/labstore1004.yaml
+++ b/hieradata/hosts/labstore1004.yaml
@@ -1 +1,2 @@
+profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml 
b/hieradata/hosts/labstore1005.yaml
index 6bcecbc..e81a0b5 100644
--- a/hieradata/hosts/labstore1005.yaml
+++ b/hieradata/hosts/labstore1005.yaml
@@ -1 +1,2 @@
+profile::openstack::main::version: 'mitaka'
 openstack::version: mitaka
diff --git a/hieradata/hosts/labtestweb2001.yaml 
b/hieradata/hosts/labtestweb2001.yaml
index 0f588af..2d42e1a 100644

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make emails for minor edits always available; keep defaults

[jenkins-bot (Code Review)]

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

Change subject: Make emails for minor edits always available; keep defaults
..


Make emails for minor edits always available; keep defaults

Instead of blocking the feature entirely, make it always available.
But start the defaults based on the old setting (whether the feature
was usable at all).

This also slightly mitigates a pretty bad bug (T29884) where emails are
blocked.

Bug: T29884
Bug: T142727
Change-Id: Ifd3b76e39aa24d17d41c66e63bbba1e9fd31a473
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9015563..e8b0962 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1338,6 +1338,10 @@
 
 $wgEnotifUseJobQ = true;
 
+// Keep this true; it's just whether the feature is available at all, not the 
default
+// setting. T142727
+$wgEnotifMinorEdits = true;
+
 // Username spoofing / mixed-script / similarity check detection
 wfLoadExtension( 'AntiSpoof' );
 
@@ -1983,7 +1987,10 @@
 } else {
$wgDefaultUserOptions['watchdefault'] = 0;
 }
+
+$wgDefaultUserOptions['enotifminoredits'] = $wmgEnotifMinorEditsUserDefault;
 $wgDefaultUserOptions['enotifwatchlistpages'] = 0;
+
 $wgDefaultUserOptions['usenewrc'] = 0;
 $wgDefaultUserOptions['extendwatchlist'] = 0;
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a6557a1..f1220e2 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11527,7 +11527,10 @@
'default' => true,
 ],
 
-'wgEnotifMinorEdits' => [
+// This controls whether minor edits trigger
+// an email notification by default.
+// The feature is always available ($wgEnotifMinorEdits).
+'wmgEnotifMinorEditsUserDefault' => [
'default' => false,
'hiwiki' => true,
'huwiki' => true, // T125351

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd3b76e39aa24d17d41c66e63bbba1e9fd31a473
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: add releases2001.codfw.wmnet

[Dzahn (Code Review)]

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

Change subject: add releases2001.codfw.wmnet
..

add releases2001.codfw.wmnet

Bug: T171917
Change-Id: I11f9e806cda86d6f7cb342f1ffd5fc9ac7da83b5
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/wmnet
3 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/19/368319/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0bda955..46b4726 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -101,9 +101,11 @@
 7.3.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   cp2011.codfw.wmnet.
 8.3.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   cp2012.codfw.wmnet.
 
+4.7.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   releases2001.codfw.wmnet.
 3.8.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   zosma.codfw.wmnet.
 9.8.1.0.6.1.0.0.2.9.1.0.0.1.0.0 1H IN PTR   prometheus2004.codfw.wmnet.
 
+
 ; private1-c-codfw (2620:0:860:103::/64)
 $ORIGIN 3.0.1.0.{{ zonename }}.
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-2019.codfw.wmnet.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index c3beb76..0c85c4c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3129,7 +3129,7 @@
 171 1H IN PTR   es2011.codfw.wmnet.
 172 1H IN PTR   es2018.codfw.wmnet.
 173 1H IN PTR   hassaleh.codfw.wmnet. ; VM on the ganeti01.svc.codfw.wmnet 
cluster
-
+174 1H IN PTR   releases2001.codfw.wmnet ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 175 1H IN PTR   restbase2007.codfw.wmnet.
 176 1H IN PTR   restbase2007-a.codfw.wmnet.
 177 1H IN PTR   restbase2007-b.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 7e25122..dda7b85 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2997,6 +2997,8 @@
 rdb2004 1H  IN A10.192.16.123
 rdb2005 1H  IN A10.192.32.133
 rdb2006 1H  IN A10.192.48.44
+releases20011H  IN A10.192.16.174 ; VM on the 
ganeti01.svc.codfw.wmnet cluster
+releases20011H  IN  2620:0:860:102:10:192:16:174
 restbase-test2001   1H  IN A10.192.16.149
 restbase-test2001-a 1H  IN A10.192.16.154 ; cassandra instance
 restbase-test2001-b 1H  IN A10.192.16.155 ; cassandra instance

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable experimental RCFilters everywhere

[jenkins-bot (Code Review)]

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

Change subject: Enable experimental RCFilters everywhere
..


Enable experimental RCFilters everywhere

Now that group2 has wmf.11 too.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 36225a3..a6557a1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19209,7 +19209,6 @@
 // Temporarily enable until 1.30.0-wmf.12 rolls out -RK
 'wgStructuredChangeFiltersEnableExperimentalViews' => [
'default' => true,
-   'group2' => false,
 ],
 
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec030092c9bc9183c49bbf7378fdd13941ee6c53
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: remove toollabs::admin_web_updater

[Andrew Bogott (Code Review)]

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

Change subject: wmcs: remove toollabs::admin_web_updater
..


wmcs: remove toollabs::admin_web_updater

The web interface for tools.wmflabs.org has moved to a different
codebase.

Bug: T140254
Change-Id: Id27a7e017e7fd78eddf5a53d0c67d30e6d124b7b
---
M modules/role/manifests/toollabs/services.pp
D modules/toollabs/manifests/admin_web_updater.pp
2 files changed, 0 insertions(+), 27 deletions(-)

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



diff --git a/modules/role/manifests/toollabs/services.pp 
b/modules/role/manifests/toollabs/services.pp
index e21b992..d766bc8 100644
--- a/modules/role/manifests/toollabs/services.pp
+++ b/modules/role/manifests/toollabs/services.pp
@@ -19,8 +19,4 @@
 class { '::toollabs::updatetools':
 active => ($::fqdn == $active_host),
 }
-
-class { '::toollabs::admin_web_updater':
-active => ($::fqdn == $active_host),
-}
 }
diff --git a/modules/toollabs/manifests/admin_web_updater.pp 
b/modules/toollabs/manifests/admin_web_updater.pp
deleted file mode 100644
index 6293748..000
--- a/modules/toollabs/manifests/admin_web_updater.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# This is responsible for https://tools.wmflabs.org/
-class toollabs::admin_web_updater(
-$active
-) {
-if $active {
-
-# Deploy and update root web.
-git::clone { 'labs/toollabs':
-ensure=> latest,
-directory => '/data/project/admin/toollabs',
-owner => "${::labsproject}.admin",
-group => "${::labsproject}.admin",
-mode  => '2755',
-}
-
-file { '/data/project/admin/public_html':
-ensure  => link,
-force   => true,
-target  => 'toollabs/www',
-require => Git::Clone['labs/toollabs'],
-}
-}
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id27a7e017e7fd78eddf5a53d0c67d30e6d124b7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
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]: wmcs: remove toollabs::admin_web_updater

[BryanDavis (Code Review)]

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

Change subject: wmcs: remove toollabs::admin_web_updater
..

wmcs: remove toollabs::admin_web_updater

The web interface for tools.wmflabs.org has moved to a different
codebase.

Bug: T140254
Change-Id: Id27a7e017e7fd78eddf5a53d0c67d30e6d124b7b
---
M modules/role/manifests/toollabs/services.pp
D modules/toollabs/manifests/admin_web_updater.pp
2 files changed, 0 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/368318/1

diff --git a/modules/role/manifests/toollabs/services.pp 
b/modules/role/manifests/toollabs/services.pp
index e21b992..d766bc8 100644
--- a/modules/role/manifests/toollabs/services.pp
+++ b/modules/role/manifests/toollabs/services.pp
@@ -19,8 +19,4 @@
 class { '::toollabs::updatetools':
 active => ($::fqdn == $active_host),
 }
-
-class { '::toollabs::admin_web_updater':
-active => ($::fqdn == $active_host),
-}
 }
diff --git a/modules/toollabs/manifests/admin_web_updater.pp 
b/modules/toollabs/manifests/admin_web_updater.pp
deleted file mode 100644
index 6293748..000
--- a/modules/toollabs/manifests/admin_web_updater.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# This is responsible for https://tools.wmflabs.org/
-class toollabs::admin_web_updater(
-$active
-) {
-if $active {
-
-# Deploy and update root web.
-git::clone { 'labs/toollabs':
-ensure=> latest,
-directory => '/data/project/admin/toollabs',
-owner => "${::labsproject}.admin",
-group => "${::labsproject}.admin",
-mode  => '2755',
-}
-
-file { '/data/project/admin/public_html':
-ensure  => link,
-force   => true,
-target  => 'toollabs/www',
-require => Git::Clone['labs/toollabs'],
-}
-}
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id27a7e017e7fd78eddf5a53d0c67d30e6d124b7b
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]: labs puppetmaster: allow new puppetmasters to talk to the enc

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster: allow new puppetmasters to talk to the enc
..


labs puppetmaster: allow new puppetmasters to talk to the enc

I don't like having the new masters talk to the enc on the old
master, but the enc address is hardcoded in /etc/puppet/hiera.yaml
and making that a template turns out to be ugly and dangerous.

Change-Id: I0128765a9c0c4cb693bd887f2bb2cbe5fbf29cee
---
M modules/role/manifests/labs/puppetmaster.pp
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/puppetmaster.pp 
b/modules/role/manifests/labs/puppetmaster.pp
index 7ebff36..69196c3 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -43,6 +43,12 @@
 $labs_vms = $novaconfig['fixed_range']
 $monitoring = '208.80.154.14 208.80.155.119 208.80.153.74'
 
+# temporarily open up the enc to the old puppetmasters.
+# I hate this, but the enc url is hardcoded in hiera.yaml and difficult
+# to modify per puppetmaster.
+#  FIXME:  Remove this after we've standardized on 
labs-puppetmaster.wikimedia.org
+$new_puppetmasters = '208.80.154.158 208.80.155.120'
+
 $fwrules = {
 puppetmaster => {
 rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
@@ -51,7 +57,7 @@
 rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
 },
 puppetbackendgetter => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${new_puppetmasters}) proto tcp dport 8100 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0128765a9c0c4cb693bd887f2bb2cbe5fbf29cee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: labs puppetmaster: allow new puppetmasters to talk to the enc

[Andrew Bogott (Code Review)]

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

Change subject: labs puppetmaster: allow new puppetmasters to talk to the enc
..

labs puppetmaster: allow new puppetmasters to talk to the enc

I don't like having the new masters talk to the enc on the old
master, but the enc address is hardcoded in /etc/puppet/hiera.yaml
and making that a template turns out to be ugly and dangerous.

Change-Id: I0128765a9c0c4cb693bd887f2bb2cbe5fbf29cee
---
M modules/role/manifests/labs/puppetmaster.pp
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/modules/role/manifests/labs/puppetmaster.pp 
b/modules/role/manifests/labs/puppetmaster.pp
index 7ebff36..69196c3 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -43,6 +43,12 @@
 $labs_vms = $novaconfig['fixed_range']
 $monitoring = '208.80.154.14 208.80.155.119 208.80.153.74'
 
+# temporarily open up the enc to the old puppetmasters.
+# I hate this, but the enc url is hardcoded in hiera.yaml and difficult
+# to modify per puppetmaster.
+#  FIXME:  Remove this after we've standardized on 
labs-puppetmaster.wikimedia.org
+$new_puppetmasters = '208.80.154.158 208.80.155.120'
+
 $fwrules = {
 puppetmaster => {
 rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
@@ -51,7 +57,7 @@
 rule => "saddr (${horizon_host_ip} ${designate_host_ip}) proto tcp 
dport 8101 ACCEPT;",
 },
 puppetbackendgetter => {
-rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
+rule => "saddr (${labs_vms} ${labs_metal} ${monitoring} 
${horizon_host_ip} ${new_puppetmasters}) proto tcp dport 8100 ACCEPT;",
 },
 }
 create_resources (ferm::rule, $fwrules)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix regression from trimming near match queries

[EBernhardson (Code Review)]

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

Change subject: Fix regression from trimming near match queries
..

Fix regression from trimming near match queries

Trimming the spaces off the end of near match queries had an
unexpected side effect of the near match now matching more things.
This is turn led to parts of the query that were not part of the
near match being ignored, such that a required (or required to not)
piece of the query string was no longer a strict requirement as long
as the remaining near match piece still matched.

To resolve this convert the near match into a bool with a must on
the near match and a filter on the remainder. Not sure if this is
the best solution, but it passes the broken browser tests at least.

Bug: T171009
Change-Id: I989469a38061b16b81d362a0b1df483448b89376
---
M includes/Query/FullTextQueryStringQueryBuilder.php
M includes/Query/FullTextSimpleMatchQueryBuilder.php
M tests/unit/fixtures/searchText/browsertest_034.default.expected
M 
tests/unit/fixtures/searchText/browsertest_034.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_034.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_036.default.expected
M 
tests/unit/fixtures/searchText/browsertest_036.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_036.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_037.default.expected
M 
tests/unit/fixtures/searchText/browsertest_037.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_037.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_057.default.expected
M 
tests/unit/fixtures/searchText/browsertest_057.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_057.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_058.default.expected
M 
tests/unit/fixtures/searchText/browsertest_058.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_058.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_059.default.expected
M 
tests/unit/fixtures/searchText/browsertest_059.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_059.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_060.default.expected
M 
tests/unit/fixtures/searchText/browsertest_060.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_060.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_061.default.expected
M 
tests/unit/fixtures/searchText/browsertest_061.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_061.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_062.default.expected
M 
tests/unit/fixtures/searchText/browsertest_062.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_062.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_070.default.expected
M 
tests/unit/fixtures/searchText/browsertest_070.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_070.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_071.default.expected
M 
tests/unit/fixtures/searchText/browsertest_071.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_071.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_072.default.expected
M 
tests/unit/fixtures/searchText/browsertest_072.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_072.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_073.default.expected
M 
tests/unit/fixtures/searchText/browsertest_073.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_073.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_075.default.expected
M 
tests/unit/fixtures/searchText/browsertest_075.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_075.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_076.default.expected
M 
tests/unit/fixtures/searchText/browsertest_076.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_076.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_077.default.expected
M 
tests/unit/fixtures/searchText/browsertest_077.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_077.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_078.default.expected
M 
tests/unit/fixtures/searchText/browsertest_078.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_078.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_110.default.expected
M 
tests/unit/fixtures/searchText/browsertest_110.fullyfeatured-interwiki.expected
M 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: SkinMinerva should deal with edit section link not MobileFor...

[jenkins-bot (Code Review)]

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

Change subject: SkinMinerva should deal with edit section link not 
MobileFormatter
..


SkinMinerva should deal with edit section link not MobileFormatter

Additional changes:
* Document prepareHeading to make it clearer what it is doing

Bug: T171519
Change-Id: Ic4dcf24e6036c00277ee3c436de43983cd0397ca
---
M extension.json
M includes/MobileFormatter.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 473a130..e80cc56 100644
--- a/extension.json
+++ b/extension.json
@@ -1287,7 +1287,6 @@
"beta": [],
"base": [
".toc",
-   ".mw-editsection",
".navbox",
".nomobile"
]
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 9f1d7d1..c314169 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -743,7 +743,7 @@
$heading->setAttribute( 'onclick', 
'javascript:mfTempOpenSection(' . $sectionNumber . ')' );
}
 
-   // prepend indicator
+   // prepend indicator - this avoids a reflow by creating a 
placeholder for a toggling indicator
$indicator = $doc->createElement( 'div' );
$indicator->setAttribute( 'class', MobileUI::iconClass( '', 
'element', 'indicator' ) );
$heading->insertBefore( $indicator, $heading->firstChild );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4dcf24e6036c00277ee3c436de43983cd0397ca
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Pmiazga 
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...Wikidata[wmf/1.30.0-wmf.10]: DNM JENKINS JOB VALIDATION

[Addshore (Code Review)]

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

Change subject: DNM JENKINS JOB VALIDATION
..

DNM JENKINS JOB VALIDATION

Change-Id: Iae1dabb0cdbc3dcb33451c9cb8eaf0e90ff265a1
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/README.md b/README.md
index 95e2f22..dc42ab5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#Wikidata Build
+#Wikidata Build JOB VALIDATION
 
 Wikidata is using a build with Wikibase and its dependencies packaged into one 
git repo.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae1dabb0cdbc3dcb33451c9cb8eaf0e90ff265a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.30.0-wmf.10
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Code review session: DONOTMERGE

[Jdlrobson (Code Review)]

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

Change subject: Code review session: DONOTMERGE
..

Code review session: DONOTMERGE

Please comment on the lines of code in this patch.
The purpose is to discuss the frontend architecure of
MobileFrontend and improve understanding and ultimately
improve the code.

Change-Id: I8234245d69c85852a77c07a8de0e60183ba84dc8
---
D resources/mobile.talk.overlays/TalkOverlay.js
D resources/mobile.talk.overlays/TalkSectionAddOverlay.js
2 files changed, 0 insertions(+), 339 deletions(-)


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

diff --git a/resources/mobile.talk.overlays/TalkOverlay.js 
b/resources/mobile.talk.overlays/TalkOverlay.js
deleted file mode 100644
index f0c4cdb..000
--- a/resources/mobile.talk.overlays/TalkOverlay.js
+++ /dev/null
@@ -1,158 +0,0 @@
-( function ( M, $ ) {
-   var TalkOverlayBase = M.require( 'mobile.talk.overlays/TalkOverlayBase' 
),
-   Page = M.require( 'mobile.startup/Page' ),
-   Anchor = M.require( 'mobile.startup/Anchor' ),
-   user = M.require( 'mobile.startup/user' );
-   /**
-* Overlay for talk page
-* @extends Overlay
-* @class TalkOverlay
-* @uses Page
-* @uses TalkSectionOverlay
-* @uses TalkSectionAddOverlay
-*/
-   function TalkOverlay() {
-   TalkOverlayBase.apply( this, arguments );
-   }
-
-   OO.mfExtend( TalkOverlay, TalkOverlayBase, {
-   templatePartials: $.extend( {}, 
TalkOverlayBase.prototype.templatePartials, {
-   content: mw.template.get( 'mobile.talk.overlays', 
'content.hogan' )
-   } ),
-   /**
-* @inheritdoc
-* @cfg {Object} defaults Default options hash.
-* @cfg {Array} defaults.headings A list of {Section} objects 
to render heading links
-* for. If not set ajax request will be performed.
-* @cfg {string} defaults.heading Heading for talk overlay.
-* @cfg {string} defaults.leadHeading Heading for a discussion 
which has no heading
-* (lead section of talk page).
-* @cfg {string} defaults.headerButtonsListClassName Class name 
of the header buttons
-* list
-* @cfg {Array} defaults.headerButtons Objects that will be 
used as defaults for
-* generating header buttons. Default list includes an 'add' 
button, which opens
-* a new talk overlay.
-*/
-   defaults: $.extend( {}, TalkOverlayBase.prototype.defaults, {
-   headings: undefined,
-   heading: '' + mw.msg( 
'mobile-frontend-talk-overlay-header' ) + '',
-   leadHeading: mw.msg( 
'mobile-frontend-talk-overlay-lead-header' ),
-   headerButtonsListClassName: 'header-action',
-   headerButtons: [ {
-   href: '#/talk/new',
-   className: 'add continue hidden',
-   msg: mw.msg( 
'mobile-frontend-talk-add-overlay-submit' )
-   } ],
-   footerAnchor: new Anchor( {
-   progressive: true,
-   additionalClassNames: 'footer-link 
talk-fullpage',
-   label: mw.msg( 'mobile-frontend-talk-fullpage' )
-   } ).options
-   } ),
-
-   /** @inheritdoc */
-   postRender: function () {
-   TalkOverlayBase.prototype.postRender.apply( this );
-   this.$board = this.$( '.board' );
-   this.$( '.talk-fullpage' ).attr( 'href', 
mw.util.getUrl( this.options.title ) )
-   .removeClass( 'hidden' );
-   if ( !this.options.headings ) {
-   this._loadContent( this.options );
-   }
-   this._setupAddDiscussionButton( this.options );
-   this.showHidden( '.initial-header' );
-   },
-
-   /**
-* Show a loading spinner
-* @method
-*/
-   showSpinner: function () {
-   this.$board.hide();
-   TalkOverlayBase.prototype.showSpinner.apply( this, 
arguments );
-   },
-
-   /**
-* Hide the loading spinner
-* @method
-*/
-   clearSpinner: function () {
-   TalkOverlayBase.prototype.clearSpinner.apply( this, 
arguments );
-   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.legacy.shared can be run in mobile target

[jenkins-bot (Code Review)]

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

Change subject: mediawiki.legacy.shared can be run in mobile target
..


mediawiki.legacy.shared can be run in mobile target

Minerva explicitly disables it
These are needed for rendering for:
?useformat=mobile=vector

Change-Id: I759c023b4ce63186929b893953042fc0a5059aa2
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index f725efe..64ecc96 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2239,6 +2239,7 @@
],
// Used in the web installer. Test it after modifying this definition!
'mediawiki.legacy.shared' => [
+   'targets' => [ 'desktop', 'mobile' ],
'styles' => [
'resources/src/mediawiki.legacy/shared.css' => [ 
'media' => 'screen' ]
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I759c023b4ce63186929b893953042fc0a5059aa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
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] mediawiki/core[master]: benchmarks: Add benchmarks for MapCacheLRU and HashBagOStuff

[jenkins-bot (Code Review)]

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

Change subject: benchmarks: Add benchmarks for MapCacheLRU and HashBagOStuff
..


benchmarks: Add benchmarks for MapCacheLRU and HashBagOStuff

Currently, HashBagOStuff leads in most benchmarks, except for
the --fill benchmark, where MapCacheLRU is faster on HHVM.
(by invoking with `PHP=hhvm mwscript maintenance/bench...`)

Run in MediaWiki-Vagrant (Debian Jessie) on MacBook Pro host.

$ benchmarkLruHash.php --count 5 --construct
Running PHP 5.6.30-0+deb8u1:
- HashBagOStuff-construct (22% faster)
  total: 446.20ms (min: 0.01ms, median: 0.01ms, max: 2.09ms)
- MapCacheLRU-construct
  total: 575.31ms (min: 0.01ms, median: 0.01ms, max: 3.51ms)
Running PHP version 5.6.99-hhvm:
- HashBagOStuff-construct (13% faster)
  total: 124.70ms (min: 0.00ms, median: 0.00ms, max: 1.27ms)
- MapCacheLRU-construct
  total: 143.76ms (min: 0.00ms, median: 0.00ms, max: 2.01ms)

For MapCacheLRU, the main slowdown is its use of Wikimedia\Assert.
Removing that would make it faster than HashBagOStuff.

$ benchmarkLruHash.php --count 3000 --fill
Running PHP 5.6.30-0+deb8u1:
- HashBagOStuff-fill (22% faster)
  total: 10196.82ms (min: 2.91ms, median: 3.24ms, max: 9.51ms)
- MapCacheLRU-fill
  total: 13197.13ms (min: 3.92ms, median: 4.31ms, max: 9.90ms)
Running PHP version 5.6.99-hhvm:
- HashBagOStuff-fill
  total: 5700.37ms (min: 1.71ms, median: 1.85ms, max: 8.24ms)
- MapCacheLRU-fill (11% faster)
  total: 4986.90ms (min: 1.48ms, median: 1.62ms, max: 6.93ms)

Change-Id: Icd03f872dddb308f162c72674c8d2aa6092395e5
---
M autoload.php
A maintenance/benchmarks/benchmarkLruHash.php
2 files changed, 98 insertions(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 510..2bf1d4c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -193,6 +193,7 @@
'BenchmarkDeleteTruncate' => __DIR__ . 
'/maintenance/benchmarks/bench_delete_truncate.php',
'BenchmarkHooks' => __DIR__ . 
'/maintenance/benchmarks/benchmarkHooks.php',
'BenchmarkJSMinPlus' => __DIR__ . 
'/maintenance/benchmarks/benchmarkJSMinPlus.php',
+   'BenchmarkLruHash' => __DIR__ . 
'/maintenance/benchmarks/benchmarkLruHash.php',
'BenchmarkParse' => __DIR__ . 
'/maintenance/benchmarks/benchmarkParse.php',
'BenchmarkPurge' => __DIR__ . 
'/maintenance/benchmarks/benchmarkPurge.php',
'BenchmarkTidy' => __DIR__ . 
'/maintenance/benchmarks/benchmarkTidy.php',
diff --git a/maintenance/benchmarks/benchmarkLruHash.php 
b/maintenance/benchmarks/benchmarkLruHash.php
new file mode 100644
index 000..1541f82
--- /dev/null
+++ b/maintenance/benchmarks/benchmarkLruHash.php
@@ -0,0 +1,97 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Benchmark
+ */
+
+require_once __DIR__ . '/Benchmarker.php';
+
+/**
+ * Maintenance script that benchmarks HashBagOStuff and MapCacheLRU.
+ *
+ * @ingroup Benchmark
+ */
+class BenchmarkLruHash extends Benchmarker {
+   protected $defaultCount = 1000;
+
+   public function __construct() {
+   parent::__construct();
+   $this->addDescription( 'Benchmarks HashBagOStuff and 
MapCacheLRU.' );
+   $this->addOption( 'construct', 'Run construct only', false, 
false );
+   $this->addOption( 'fill', 'Run fill only', false, false );
+   }
+
+   public function execute() {
+   $exampleKeys = [];
+   $max = 100;
+   $count = 500;
+   while ( $count-- ) {
+   $exampleKeys[] = wfRandomString();
+   }
+   // 1000 keys (1...500, 500...1)
+   $keys = array_merge( $exampleKeys, array_reverse( $exampleKeys 
) );
+
+   $fill = $this->hasOption( 'fill' ) || !$this->hasOption( 
'construct' );
+   $construct = $this->hasOption( 'construct' ) || 
!$this->hasOption( 'fill' );
+   $benches = [];
+
+   if ( $construct ) {
+   $benches['HashBagOStuff-construct'] = [
+   'function' => function () use ( $max ) {
+   $obj = new HashBagOStuff( [ 'maxKeys' 
=> $max ] );
+   },
+   ];
+   $benches['MapCacheLRU-construct'] = [
+   'function' => function () use ( $max ) {
+   $obj = new MapCacheLRU( $max );
+   },
+   ];
+   }
+
+   if ( $fill ) {
+   // For the fill bechmark, ensure object creation is not 
measured.
+   $hObj = null;
+   $benches['HashBagOStuff-fill'] = [
+   'setup' => function () use 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.legacy.shared can be run in mobile target

[Jdlrobson (Code Review)]

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

Change subject: mediawiki.legacy.shared can be run in mobile target
..

mediawiki.legacy.shared can be run in mobile target

Minerva explicitly disables it
These are needed for rendering for:
?useformat=mobile=vector

Change-Id: I759c023b4ce63186929b893953042fc0a5059aa2
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/Resources.php b/resources/Resources.php
index f725efe..64ecc96 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2239,6 +2239,7 @@
],
// Used in the web installer. Test it after modifying this definition!
'mediawiki.legacy.shared' => [
+   'targets' => [ 'desktop', 'mobile' ],
'styles' => [
'resources/src/mediawiki.legacy/shared.css' => [ 
'media' => 'screen' ]
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I759c023b4ce63186929b893953042fc0a5059aa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...Wikidata[wmf/1.30.0-wmf.10]: WB: Move injection of RC records to a separate job.

[Addshore (Code Review)]

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

Change subject: WB: Move injection of RC records to a separate job.
..

WB: Move injection of RC records to a separate job.

Backport for 1.30.0-wmf.10 from
https://gerrit.wikimedia.org/r/367328

Bug: T171370
Change-Id: I01776073e8a9fbf440e4030f3493b209beef93cb
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.php
A extensions/Wikibase/client/includes/Changes/InjectRCRecordsJob.php
M extensions/Wikibase/client/includes/Changes/WikiPageUpdater.php
M extensions/Wikibase/client/includes/WikibaseClient.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Changes/WikiPageUpdaterTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_static.php
M vendor/composer/installed.json
10 files changed, 690 insertions(+), 196 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 29b06e4..bd07d27 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1026,7 +1026,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2017-07-21T19:59:47+00:00"
+"time": "2017-07-21T11:21:34+00:00"
 },
 {
 "name": "wikibase/data-model",
@@ -1484,12 +1484,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "48684cef3f4fb79d517a247ddea72f2e4883d07b"
+"reference": "467e1cd2ddc0073c6ff91eeab42c4eae4386ecf4"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/48684cef3f4fb79d517a247ddea72f2e4883d07b;,
-"reference": "48684cef3f4fb79d517a247ddea72f2e4883d07b",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/467e1cd2ddc0073c6ff91eeab42c4eae4386ecf4;,
+"reference": "467e1cd2ddc0073c6ff91eeab42c4eae4386ecf4",
 "shasum": ""
 },
 "require": {
@@ -1565,7 +1565,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2017-07-24T00:47:16+00:00"
+"time": "2017-07-27T17:56:33+00:00"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.php 
b/extensions/Wikibase/client/WikibaseClient.php
index fd0fe88..012905d 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -182,6 +182,24 @@
// job classes
$wgJobClasses['wikibase-addUsagesForPage'] = 
Wikibase\Client\Store\AddUsagesForPageJob::class;
$wgJobClasses['ChangeNotification'] = 
Wikibase\Client\ChangeNotificationJob::class;
+   $wgJobClasses['wikibase-InjectRCRecords'] = function ( Title $unused, 
array $params ) {
+   $mwServices = MediaWiki\MediaWikiServices::getInstance();
+   $wbServices = 
Wikibase\Client\WikibaseClient::getDefaultInstance();
+
+   $job = new Wikibase\Client\Changes\InjectRCRecordsJob(
+   $mwServices->getDBLoadBalancerFactory(),
+   $wbServices->getStore()->getEntityChangeLookup(),
+   $wbServices->getRecentChangeFactory(),
+   $params
+   );
+
+   $job->setRecentChangesDuplicateDetector( 
$wbServices->getStore()->getRecentChangesDuplicateDetector() );
+
+   $job->setLogger( MediaWiki\Logger\LoggerFactory::getInstance( 
'wikibase.client.pageupdates' ) );
+   $job->setStats( $mwServices->getStatsdDataFactory() );
+
+   return $job;
+   };
 
// api modules
$wgAPIMetaModules['wikibase'] = array(
@@ -226,8 +244,8 @@
$wgAPIPropModules['wbentityusage'] = [
'class' => Wikibase\Client\Api\ApiPropsEntityUsage::class,
'factory' => function ( ApiQuery $query, $moduleName ) {
-   $repoLinker = 
\Wikibase\Client\WikibaseClient::getDefaultInstance()->newRepoLinker();
-   return new \Wikibase\Client\Api\ApiPropsEntityUsage(
+   $repoLinker = 
Wikibase\Client\WikibaseClient::getDefaultInstance()->newRepoLinker();
+   return new Wikibase\Client\Api\ApiPropsEntityUsage(
$query,
$moduleName,
$repoLinker
diff --git 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

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

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


Merge branch 'master' into deployment

7907ec4e9 Add throttling to Omnrecipients.load function
1af6a49f7 Simplify duplicate check call

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

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




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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

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

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

Merge branch 'master' into deployment

7907ec4e9 Add throttling to Omnrecipients.load function
1af6a49f7 Simplify duplicate check call

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/11/368311/1


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Record user login timing

[MaxSem (Code Review)]

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

Change subject: Record user login timing
..

Record user login timing

Due to differences in logic between UI and API logins ( the latter
supports bot passwords, for example), record these separately.

Bug: T171882
Change-Id: I984c9223a4481685a7bcb659a68002c8ec4d122a
---
M includes/api/ApiLogin.php
M includes/specialpage/LoginSignupSpecialPage.php
2 files changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index aa7e25e..db937d4 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -29,6 +29,8 @@
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
 
 /**
  * Unit to authenticate log-in attempts to the current wiki.
@@ -93,6 +95,14 @@
 
$result = [];
 
+   $timing = $this->getTiming();
+   $timing->mark( 'login.api' );
+   $profilingScope = new ScopedCallback( function() use ( $timing 
) {
+   $time = $timing->measure( 'login.api' );
+   $statsd = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   $statsd->timing( 'timing.login.api', $time['duration'] 
* 1000 );
+   } );
+
// Make sure session is persisted
$session = MediaWiki\Session\SessionManager::getGlobalSession();
$session->persist();
diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 0600642..4208288 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -26,7 +26,9 @@
 use MediaWiki\Auth\AuthManager;
 use MediaWiki\Auth\Throttler;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Session\SessionManager;
+use Wikimedia\ScopedCallback;
 
 /**
  * Holds shared logic for login and account creation pages.
@@ -212,6 +214,14 @@
 * @param string|null $subPage
 */
public function execute( $subPage ) {
+   $timing = $this->getContext()->getTiming();
+   $timing->mark( 'login.ui' );
+   $profilingScope = new ScopedCallback( function() use ( $timing 
) {
+   $time = $timing->measure( 'login.ui' );
+   $statsd = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   $statsd->timing( 'timing.login.ui', $time['duration'] * 
1000 );
+   } );
+
$authManager = AuthManager::singleton();
$session = SessionManager::getGlobalSession();
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Browser tests: Use generic toast step

[jenkins-bot (Code Review)]

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

Change subject: Browser tests: Use generic toast step
..


Browser tests: Use generic toast step

Introduces a new generic
"I should see a toast with message ".*""
step reducing toast steps to two generic ones.

Change-Id: Ic8b91c78f6df088244f15223ee4ed658847a05b5
---
M tests/browser/features/language.feature
M tests/browser/features/search_loggedin.feature
M tests/browser/features/step_definitions/common_article_steps.rb
M tests/browser/features/step_definitions/language_steps.rb
M tests/browser/features/step_definitions/search_steps.rb
M tests/browser/features/step_definitions/watchstar_steps.rb
M tests/browser/features/watchstar.feature
7 files changed, 9 insertions(+), 25 deletions(-)

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



diff --git a/tests/browser/features/language.feature 
b/tests/browser/features/language.feature
index 454d96a..f45a064 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -27,7 +27,7 @@
   Scenario: Tapping the disabled icon shows a toast
 Given I go to a page that does not have languages
 When I click the switch-language page action
-Then I should see a toast with message about page not being available in 
other languages
+Then I should see a toast with message "This page is not available in 
other languages."
 
   Scenario: Closing language overlay (overlay button)
 Given I go to a page that has languages
diff --git a/tests/browser/features/search_loggedin.feature 
b/tests/browser/features/search_loggedin.feature
index 52cc5e9..291fe8e 100644
--- a/tests/browser/features/search_loggedin.feature
+++ b/tests/browser/features/search_loggedin.feature
@@ -12,4 +12,4 @@
   And I see the search overlay
   And I type into search box "Selenium search tes"
 When I click a search watch star
-Then I should see a toast
+Then I should see a toast notification
diff --git a/tests/browser/features/step_definitions/common_article_steps.rb 
b/tests/browser/features/step_definitions/common_article_steps.rb
index 93baaa8..0e89e9e 100644
--- a/tests/browser/features/step_definitions/common_article_steps.rb
+++ b/tests/browser/features/step_definitions/common_article_steps.rb
@@ -30,6 +30,11 @@
   expect(on(ArticlePage).toast_element.when_present(10)).to be_visible
 end
 
+Then(/^I should see a toast with message "(.+)"$/) do |msg|
+  step "I should see a toast notification"
+  expect(on(ArticlePage).toast_element.when_present.text).to match msg
+end
+
 Then /^I should see a drawer with message "(.+)"$/ do |text|
   expect(on(ArticlePage).drawer_element.when_present.text).to match text
 end
diff --git a/tests/browser/features/step_definitions/language_steps.rb 
b/tests/browser/features/step_definitions/language_steps.rb
index 2b8eb30..676f917 100644
--- a/tests/browser/features/step_definitions/language_steps.rb
+++ b/tests/browser/features/step_definitions/language_steps.rb
@@ -10,10 +10,6 @@
   on(ArticlePage).non_suggested_language_link_element.when_present.click
 end
 
-Then(/^I should see a toast with message about page not being available in 
other languages$/) do
-  expect(on(ArticlePage).toast_element.when_present.text).to match 'This page 
is not available in other languages.'
-end
-
 Then(/^I should not see the languages overlay$/) do
   expect(on(ArticlePage).overlay_languages_element).not_to be_visible
 end
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index bd89290..3420aac 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -78,7 +78,3 @@
 Then(/^I should not see '#\/search' in URL$/) do
   expect(on(ArticlePage).current_url.end_with? '#/search').to be false
 end
-
-Then(/^I should see a toast$/) do
-  expect(on(ArticlePage).toast_element.when_present).to be_visible
-end
diff --git a/tests/browser/features/step_definitions/watchstar_steps.rb 
b/tests/browser/features/step_definitions/watchstar_steps.rb
index c6366e2..10f5bdd 100644
--- a/tests/browser/features/step_definitions/watchstar_steps.rb
+++ b/tests/browser/features/step_definitions/watchstar_steps.rb
@@ -9,16 +9,3 @@
   api.unwatch_page 'Selenium mobile watch test'
   step 'I am on the "Selenium mobile watch test" page'
 end
-
-Then(/^I should see a toast with message about watching the page$/) do
-  expect(on(ArticlePage).toast_element.when_present.text).to match 'Added 
Selenium mobile watch test to your watchlist'
-end
-
-Then(/^I should see a toast with message about unwatching the page$/) do
-  on(ArticlePage) do |page|
-page.wait_until do
-  page.text.include? 'Removed' # Chrome needs this, FF does not
-end
-expect(page.toast_element.when_present.text).to 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.11]: RCFilters: Read base value of limit/days from preference

[Catrope (Code Review)]

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

Change subject: RCFilters: Read base value of limit/days from preference
..

RCFilters: Read base value of limit/days from preference

Bug: T171368
Change-Id: I0cdbae5bf6b9d00efe351c551d1f8a52459559c4
(cherry picked from commit 94b6ba5453a72802e2db3b81e03530230967220b)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 85 insertions(+), 55 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/368309/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index b6eda0f..7849cc2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -759,7 +759,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.selectItemByParamName = function 
( paramName ) {
this.getItems().forEach( function ( item ) {
-   item.toggleSelected( item.getParamName() === paramName 
);
+   item.toggleSelected( item.getParamName() === String( 
paramName ) );
} );
};
 
@@ -771,7 +771,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.getItemByParamName = function ( 
paramName ) {
return this.getItems().filter( function ( item ) {
-   return item.getParamName() === paramName;
+   return item.getParamName() === String( paramName );
} )[ 0 ];
};
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 3b8ebbd..45e3046 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -31,17 +31,12 @@
 */
mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure, namespaceStructure, tagList ) {
var parsedSavedQueries,
+   controller = this,
views = {},
items = [],
uri = new mw.Uri(),
$changesList = $( '.mw-changeslist' 
).first().contents(),
-   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ),
-   createFilterDataFromNumber = function ( num, 
convertedNumForLabel ) {
-   return {
-   name: String( num ),
-   label: mw.language.convertNumber( 
convertedNumForLabel )
-   };
-   };
+   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' );
 
// Prepare views
if ( namespaceStructure && experimentalViews ) {
@@ -103,9 +98,9 @@
allowArbitrary: true,
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
-   'default': '50',
+   'default': mw.user.options.get( 
'rclimit' ),
filters: [ 50, 100, 250, 500 ].map( 
function ( num ) {
-   return 
createFilterDataFromNumber( num, num );
+   return 
controller._createFilterDataFromNumber( num, num );
} )
},
{
@@ -116,14 +111,19 @@
allowArbitrary: true,
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
-   'default': '7',
+   numToLabelFunc: function ( i ) {
+   return Number( i ) < 1 ?
+   ( Number( i ) * 24 
).toFixed( 2 ) :
+   Number( i );
+   },
+   'default': mw.user.options.get( 
'rcdays' ),
filters: [
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5,
  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: benchmarks: Add benchmarks for MapCacheLRU and HashBagOStuff

[Krinkle (Code Review)]

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

Change subject: benchmarks: Add benchmarks for MapCacheLRU and HashBagOStuff
..

benchmarks: Add benchmarks for MapCacheLRU and HashBagOStuff

Currently, HashBagOStuff leads in most benchmarks, except for
the --fill benchmark, where MapCacheLRU is faster on HHVM.

Run in MediaWiki-Vagrant (Debian Jessie) on MacBook Pro host.

$ benchmarkLruHash.php --count 5 --construct
Running PHP 5.6.30-0+deb8u1:
- HashBagOStuff-construct (22% faster)
  total: 446.20ms (min: 0.01ms, median: 0.01ms, max: 2.09ms)
- MapCacheLRU-construct
  total: 575.31ms (min: 0.01ms, median: 0.01ms, max: 3.51ms)
Running PHP version 5.6.99-hhvm:
- HashBagOStuff-construct (13% faster)
  total: 124.70ms (min: 0.00ms, median: 0.00ms, max: 1.27ms)
- MapCacheLRU-construct
  total: 143.76ms (min: 0.00ms, median: 0.00ms, max: 2.01ms)

For MapCacheLRU, the main slowdown is its use of Wikimedia\Assert.
Removing that would make it faster than HashBagOStuff.

$ benchmarkLruHash.php --count 3000 --fill
Running PHP 5.6.30-0+deb8u1:
- HashBagOStuff-fill (22% faster)
  total: 10196.82ms (min: 2.91ms, median: 3.24ms, max: 9.51ms)
- MapCacheLRU-fill
  total: 13197.13ms (min: 3.92ms, median: 4.31ms, max: 9.90ms)
Running PHP version 5.6.99-hhvm:
- HashBagOStuff-fill
  total: 5700.37ms (min: 1.71ms, median: 1.85ms, max: 8.24ms)
- MapCacheLRU-fill (11% faster)
  total: 4986.90ms (min: 1.48ms, median: 1.62ms, max: 6.93ms)

Change-Id: Icd03f872dddb308f162c72674c8d2aa6092395e5
---
A maintenance/benchmarks/benchmarkLruHash.php
1 file changed, 97 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/368308/1

diff --git a/maintenance/benchmarks/benchmarkLruHash.php 
b/maintenance/benchmarks/benchmarkLruHash.php
new file mode 100644
index 000..1541f82
--- /dev/null
+++ b/maintenance/benchmarks/benchmarkLruHash.php
@@ -0,0 +1,97 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Benchmark
+ */
+
+require_once __DIR__ . '/Benchmarker.php';
+
+/**
+ * Maintenance script that benchmarks HashBagOStuff and MapCacheLRU.
+ *
+ * @ingroup Benchmark
+ */
+class BenchmarkLruHash extends Benchmarker {
+   protected $defaultCount = 1000;
+
+   public function __construct() {
+   parent::__construct();
+   $this->addDescription( 'Benchmarks HashBagOStuff and 
MapCacheLRU.' );
+   $this->addOption( 'construct', 'Run construct only', false, 
false );
+   $this->addOption( 'fill', 'Run fill only', false, false );
+   }
+
+   public function execute() {
+   $exampleKeys = [];
+   $max = 100;
+   $count = 500;
+   while ( $count-- ) {
+   $exampleKeys[] = wfRandomString();
+   }
+   // 1000 keys (1...500, 500...1)
+   $keys = array_merge( $exampleKeys, array_reverse( $exampleKeys 
) );
+
+   $fill = $this->hasOption( 'fill' ) || !$this->hasOption( 
'construct' );
+   $construct = $this->hasOption( 'construct' ) || 
!$this->hasOption( 'fill' );
+   $benches = [];
+
+   if ( $construct ) {
+   $benches['HashBagOStuff-construct'] = [
+   'function' => function () use ( $max ) {
+   $obj = new HashBagOStuff( [ 'maxKeys' 
=> $max ] );
+   },
+   ];
+   $benches['MapCacheLRU-construct'] = [
+   'function' => function () use ( $max ) {
+   $obj = new MapCacheLRU( $max );
+   },
+   ];
+   }
+
+   if ( $fill ) {
+   // For the fill bechmark, ensure object creation is not 
measured.
+   $hObj = null;
+   $benches['HashBagOStuff-fill'] = [
+   'setup' => function () use ( &$hObj, $max ) {
+   $hObj = new HashBagOStuff( [ 'maxKeys' 
=> $max ] );
+   },
+   'function' => function () use ( &$hObj, &$keys 
) {
+   foreach ( $keys as $i => $key ) {
+   $hObj->set( $key, $i );
+   }
+   }
+   ];
+   $mObj = null;
+   $benches['MapCacheLRU-fill'] = [
+   'setup' => function () use ( &$mObj, $max ) {
+   $mObj = new MapCacheLRU( $max );
+   },
+   'function' => function () use ( 

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Store processed payments in main cache, not session

[Ejegg (Code Review)]

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

Change subject: Store processed payments in main cache, not session
..

Store processed payments in main cache, not session

Seeing users still being redirected to failpage on reload. These
users also seem to have gotten new sessions between the first
ResultSwitcher hit and the second.

Bug: T167990
Change-Id: I79f593fd126a2cb6d24662f770d8a7846bd4eb93
---
M gateway_common/GatewayPage.php
M gateway_common/gateway.adapter.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
M tests/phpunit/DonationInterfaceApiTestCase.php
M tests/phpunit/DonationInterfaceTestCase.php
M tests/phpunit/TestConfiguration.php
6 files changed, 21 insertions(+), 19 deletions(-)


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

diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index f2061ea..634d558 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -589,11 +589,9 @@
$requestProcessId = $this->adapter->getRequestProcessId(
$request->getValues()
);
-   $processedRequests = $request->getSessionData( 
'processed_requests' );
-   if ( !$requestProcessId || empty( $processedRequests ) ) {
-   return false;
-   }
-   return array_key_exists( $requestProcessId, $processedRequests 
);
+   $key = 'processed_request-' . $requestProcessId;
+   $cachedResult = wfGetMainCache()->get( $key );
+   return boolval( $cachedResult );
}
 
protected function markReturnProcessed() {
@@ -604,13 +602,10 @@
if ( !$requestProcessId ) {
return;
}
-   $processedRequests = $request->getSessionData( 
'processed_requests' );
-   if ( !$processedRequests ) {
-   $processedRequests = array();
-   }
+   $key = 'processed_request-' . $requestProcessId;
+
// TODO: we could store the results of the last process here, 
but for now
// we just indicate we did SOMETHING with it
-   $processedRequests[$requestProcessId] = true;
-   $request->setSessionData( 'processed_requests', 
$processedRequests );
+   wfGetMainCache()->add( $key, true, 7200 );
}
 }
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 5da2a72..8c0859d 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -2967,7 +2967,6 @@
'PaymentForms',
'numAttempt',
'order_status', //for post-payment activities
-   'processed_requests', //for post-payment 
activities
'sequence',
);
$preservedData = array();
diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php 
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
index b13db0c..6ba90a9 100644
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
@@ -283,8 +283,9 @@
);
 
$this->verifyFormOutput( 'PaypalExpressGatewayResult', 
$request, $assertNodes, false, $session );
-   $processed = 
RequestContext::getMain()->getRequest()->getSessionData( 'processed_requests' );
-   $this->assertArrayHasKey( $request['token'], $processed );
+   $key = 'processed_request-' . $request['token'];
+   $processed = wfGetMainCache()->get( $key );
+   $this->assertTrue( $processed );
 
// Make sure we logged the expected cURL attempts
$messages = self::getLogMatches( 'info', '/Preparing to send 
GetExpressCheckoutDetails transaction to Paypal Express Checkout/' );
@@ -303,12 +304,12 @@
$init['gateway_session_id'] = mt_rand();
$init['language'] = 'pt';
$session = array(
-   'Donor' => $init,
-   'processed_requests' => array(
-   $init['gateway_session_id'] => true
-   )
+   'Donor' => $init
);
 
+   $key = 'processed_request-' . $init['gateway_session_id'];
+   wfGetMainCache()->add( $key, true, 100 );
+
$request = array(
'token' => $init['gateway_session_id'],
'PayerID' => 'ASdASDAS',
diff --git a/tests/phpunit/DonationInterfaceApiTestCase.php 
b/tests/phpunit/DonationInterfaceApiTestCase.php
index f033056..39b0c85 100644

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Blank parsoid styles, update thumbnail selectors for Parsoid...

[Jdlrobson (Code Review)]

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

Change subject: Blank parsoid styles, update thumbnail selectors for Parsoid 
content
..

Blank parsoid styles, update thumbnail selectors for Parsoid content

This brings Parsoid styles when viewed in Minerva consistent with
MediaWiki parser output styles.

Bug: T171727
Change-Id: If4bd7671a99aefdf074061dd1d5b0bac93620e9e
---
M resources/skins.minerva.content.styles/thumbnails.less
M resources/skins.minerva.tablet.styles/common.less
M skin.json
3 files changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/resources/skins.minerva.content.styles/thumbnails.less 
b/resources/skins.minerva.content.styles/thumbnails.less
index 5533068..1f2858e 100644
--- a/resources/skins.minerva.content.styles/thumbnails.less
+++ b/resources/skins.minerva.content.styles/thumbnails.less
@@ -13,6 +13,7 @@
 //
 // Styleguide 1.2.
 .content {
+   figure,
.thumb {
margin: 0.6em 0;
 
@@ -24,12 +25,16 @@
}
}
 
+   figcaption,
.thumbcaption {
margin: 0.5em 0 0;
font-size: 0.8em;
line-height: 1.5;
padding: 0 !important;
color: @grayMediumDark;
+   }
+
+   .thumbcaption {
width: auto !important;
}
 
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 2f4fefa..8274c19 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -90,7 +90,11 @@
// e.g. [[File:Scholars mate 
animation.gif|frame|left|"[[Scholar's mate]]"]]
// We use @noflip because we still want .tleft to be on the 
left and
// .tright to be on the right in RTL languages.
+   figure,
.thumb {
+   width: 320px;
+
+   &.mw-halign-left,
&.tleft {
/* @noflip */
float: left;
@@ -100,6 +104,8 @@
margin-right: 1.4em;
}
 
+   &.mw-default-size,
+   &.mw-halign-right,
&.tright {
/* @noflip */
float: right;
diff --git a/skin.json b/skin.json
index 5bb2f25..41956f9 100644
--- a/skin.json
+++ b/skin.json
@@ -36,6 +36,7 @@
},
"ResourceModuleSkinStyles": {
"minerva": {
+   "mediawiki.skinning.content.parsoid": [],
"mediawiki.hlist": [
"skinStyles/mediawiki.hlist/minerva.less"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4bd7671a99aefdf074061dd1d5b0bac93620e9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
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] apps...wikipedia[master]: Hygiene: Remove redundant ANDROID_HOME setting

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Remove redundant ANDROID_HOME setting
..


Hygiene: Remove redundant ANDROID_HOME setting

SDK installation is managed by the Jenkins emulator plugin for our
periodic job, which uses it; no need to set it here.

Change-Id: I134dd00a76c09b559c6f333bddfde66482166abb
---
M scripts/apps-android-wikipedia-periodic-test
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/scripts/apps-android-wikipedia-periodic-test 
b/scripts/apps-android-wikipedia-periodic-test
index d858135..56aa758 100755
--- a/scripts/apps-android-wikipedia-periodic-test
+++ b/scripts/apps-android-wikipedia-periodic-test
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-export ANDROID_HOME="${ANDROID_HOME:-$PWD/.sdk}"
-
 ./gradlew clean checkstyle lintAlphaRelease testAllAlphaRelease
 
 scripts/diff-screenshots
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Allow content to be sourced from Parsoid

[Jdlrobson (Code Review)]

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

Change subject: Allow content to be sourced from Parsoid
..

Allow content to be sourced from Parsoid

This helps with testing Apps related bugs and Parsoid related
bugs e.g. T171727

To use:
$wgMFContentProviderClass = 
'MobileFrontend\ContentProviders\McsContentProvider';
$wgMFMcsContentProviderBaseUri = "https://en.wikipedia.org/api/rest_v1;;

Change-Id: I648ed26e1826aaca4d6616097fdfc3019ca7a848
---
M extension.json
M includes/content-providers/ContentProviderFactory.php
A includes/content-providers/McsContentProvider.php
3 files changed, 60 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index ef0f5c1..c08fd65 100644
--- a/extension.json
+++ b/extension.json
@@ -86,6 +86,7 @@
"MobileFrontend\\ContentProviders\\ContentProviderFactory": 
"includes/content-providers/ContentProviderFactory.php",
"MobileFrontend\\ContentProviders\\DefaultContentProvider": 
"includes/content-providers/DefaultContentProvider.php",
"MobileFrontend\\ContentProviders\\IContentProvider": 
"includes/content-providers/IContentProvider.php",
+   "MobileFrontend\\ContentProviders\\McsContentProvider": 
"includes/content-providers/McsContentProvider.php",
"MobileFrontend\\ContentProviders\\MwApiContentProvider": 
"includes/content-providers/MwApiContentProvider.php"
},
"ResourceModules": {
diff --git a/includes/content-providers/ContentProviderFactory.php 
b/includes/content-providers/ContentProviderFactory.php
index 43f36f0..8017fea 100644
--- a/includes/content-providers/ContentProviderFactory.php
+++ b/includes/content-providers/ContentProviderFactory.php
@@ -8,6 +8,7 @@
 class ContentProviderFactory {
const MW_API = 'MobileFrontend\\ContentProviders\\MwApiContentProvider';
const PHP_PARSER = 
'MobileFrontend\\ContentProviders\\DefaultContentProvider';
+   const MCS_API = 'MobileFrontend\\ContentProviders\\McsContentProvider';
 
/**
 * Create an instance of IContentProvider
@@ -28,6 +29,9 @@
}
 
switch ( $contentProviderClass ) {
+   case self::MCS_API:
+   $baseUrl = $config->get( 
'MFMcsContentProviderBaseUri' );
+   return new $contentProviderClass( $baseUrl, 
$out );
case self::MW_API:
$baseUrl = $config->get( 
'MFMwApiContentProviderBaseUri' );
return new $contentProviderClass( $baseUrl, 
$out );
diff --git a/includes/content-providers/McsContentProvider.php 
b/includes/content-providers/McsContentProvider.php
new file mode 100644
index 000..59380e7
--- /dev/null
+++ b/includes/content-providers/McsContentProvider.php
@@ -0,0 +1,55 @@
+baseUrl = $baseUrl;
+   $this->out = $out;
+   }
+
+   /**
+* @inheritdoc
+*/
+   public function getHTML() {
+   $out = $this->out;
+   $title = $out->getTitle();
+   $url = $this->baseUrl . '/page/mobile-sections/';
+   $url .= $title->getPrefixedDBKey();
+
+   $resp = file_get_contents( $url, false );
+   $json = json_decode( $resp, true );
+   if ( !is_bool( $json ) ) {
+   $lead = $json['lead'];
+   $html = isset( $lead['sections'][0]['text'] ) ? 
$lead['sections'][0]['text'] : '';
+
+   $remaining = $json['remaining'];
+
+   foreach( $remaining['sections'] as $section ) {
+   if ( isset( $section['line'] ) ) {
+   $toc = $section['toclevel'] + 1;
+   $line = $section['line'];
+   $html .= "$line";
+   }
+   if ( isset( $section['text'] ) ) {
+   $html .= $section['text'];
+   }
+   }
+
+   return $html;
+   } else {
+   return '';
+   }
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageMap[master]: Do not die on phpcs run

[jenkins-bot (Code Review)]

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

Change subject: Do not die on phpcs run
..


Do not die on phpcs run

Loading the php shim with composer autoload on phpcs run breaks phpcs

Bug: T168738
Change-Id: I6577a34fcb3d20f905e7120d39506bffc50b2fa2
---
M composer.json
M phpcs.xml
2 files changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/composer.json b/composer.json
index 3d48569..1936211 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,6 @@
"composer/installers": "1.*,>=1.0.1"
},
"autoload": {
-   "files": [
-   "ImageMap.php"
-   ],
"classmap": [
"ImageMap_body.php"
]
diff --git a/phpcs.xml b/phpcs.xml
index 35d9b37..be977e0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,9 @@
 
 
-   
+   
+   
+   
.

-   
-   vendor
-   node_modules
+   
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6577a34fcb3d20f905e7120d39506bffc50b2fa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMap
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Add jakub-onderka/php-console-highlighter

[jenkins-bot (Code Review)]

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

Change subject: Add jakub-onderka/php-console-highlighter
..


Add jakub-onderka/php-console-highlighter

Organize phpcs.xml

Change-Id: Ibc7852e0e077b350aee372b06978bd62246e0561
---
M .gitignore
M composer.json
M phpcs.xml
3 files changed, 20 insertions(+), 21 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 5daed6e..a45b924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /node_modules
 /vendor
+/composer.lock
 
 .svn
 *~
diff --git a/composer.json b/composer.json
index f498b4c..f677d3a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,11 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
-   "lint": "parallel-lint --exclude vendor --ignore-fails .",
+   "lint": "parallel-lint --exclude vendor --exclude node_modules 
--ignore-fails .",
"phpcs": "phpcs -p -s",
"fix": "phpcbf",
"test": [
diff --git a/phpcs.xml b/phpcs.xml
index 41bf1f4..dc46632 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 
 
-   
+   



@@ -8,27 +8,24 @@



-   
-   

+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   

.
-   
+   

-
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc7852e0e077b350aee372b06978bd62246e0561
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaBadges[master]: Do not die on phpcs run

[jenkins-bot (Code Review)]

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

Change subject: Do not die on phpcs run
..


Do not die on phpcs run

Loading the php shim with composer autoload on phpcs run breaks phpcs

Bug: T168738
Change-Id: Id9644b518c039a445f5ca9e167fff4417ea5cfd0
---
M composer.json
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 6fade2c..c838078 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,6 @@
"php": ">=5.5.9"
},
"autoload": {
-   "files": [
-   "WikimediaBadges.php"
-   ],
"psr-4": {
"WikimediaBadges\\": "includes/"
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9644b518c039a445f5ca9e167fff4417ea5cfd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaBadges
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Add stylelint for css file

[jenkins-bot (Code Review)]

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

Change subject: Add stylelint for css file
..


Add stylelint for css file

Needed since I173a46da75d6632305883a81adb932f2a95227c6

Change-Id: Ib3fc5f033ef39900ae668dd39662f53937ac32fc
---
A .stylelintrc
M Gruntfile.js
M modules/ext.wikimediaEvents.humanSearchRelevance.css
M package.json
4 files changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+   "extends": "stylelint-config-wikimedia"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index ce6eda3..6b26cac 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,6 +4,7 @@
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
jshint: {
@@ -21,14 +22,23 @@
jsonlint: {
all: [
'**/*.json',
-   '!node_modules/**'
+   '.stylelintrc',
+   '!node_modules/**',
+   '!vendor/**'
]
},
banana: {
all: 'i18n/'
+   },
+   stylelint: {
+   all: [
+   '**/*.css',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana', 
'stylelint' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.css 
b/modules/ext.wikimediaEvents.humanSearchRelevance.css
index 0119a1f..41594a0 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.css
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.css
@@ -6,5 +6,5 @@
 .mw-wme-humanrel-question > span,
 .mw-wme-humanrel-question > small {
display: inline-block;
-   margin-top: .5em;
+   margin-top: 0.5em;
 }
diff --git a/package.json b/package.json
index 0b2bb68..72480fa 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,9 @@
 "grunt-banana-checker": "0.4.0",
 "grunt-contrib-jshint": "0.12.0",
 "grunt-jscs": "2.6.0",
-"grunt-jsonlint": "1.0.7"
+"grunt-jsonlint": "1.0.7",
+"grunt-stylelint": "0.8.0",
+"stylelint": "7.8.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3fc5f033ef39900ae668dd39662f53937ac32fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: update reference screenshots

[jenkins-bot (Code Review)]

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

Change subject: update reference screenshots
..


update reference screenshots

Change-Id: I4304545249a1fd5a606190b7be3e29a839d33fbf
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
20 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
index 39d4ff0..bf7cf48 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
index d7a99c1..52c955b 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
index 39d4ff0..bf7cf48 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: WIP order sequence numbers start at 1, not 0

[Ejegg (Code Review)]

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

Change subject: WIP order sequence numbers start at 1, not 0
..

WIP order sequence numbers start at 1, not 0

Bug: T171891
Change-Id: I2ae477f3d1e4bb9d155333534b9fcb5c6a14074d
---
M adyen_gateway/adyen.adapter.php
M amazon_gateway/amazon.adapter.php
M astropay_gateway/astropay.adapter.php
M gateway_common/gateway.adapter.php
M tests/phpunit/Adapter/Adyen/AdyenApiTest.php
M tests/phpunit/Adapter/Adyen/AdyenTest.php
M tests/phpunit/Adapter/Amazon/AmazonApiTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
M tests/phpunit/includes/Responses/amazon/authorize.json
M tests/phpunit/includes/Responses/amazon/authorizeOnBillingAgreement.json
M tests/phpunit/includes/Responses/amazon/authorize_AmazonRejected.json
M tests/phpunit/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
M tests/phpunit/includes/Responses/amazon/authorize_TransactionTimedOut.json
M tests/phpunit/includes/Responses/amazon/getBillingAgreementDetails.json
M tests/phpunit/includes/Responses/amazon/getCaptureDetails.json
M tests/phpunit/includes/Responses/amazon/setBillingAgreementDetails.json
M 
tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_10486.testresponse
M 
tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_OK.testresponse
19 files changed, 45 insertions(+), 43 deletions(-)


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

diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 4542a24..992270f 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -153,11 +153,7 @@
 * is never used at all.
 */
function do_transaction( $transaction ) {
-   // If this is not our first call, get a fresh order ID
-   // FIXME: This is repeated in three places. Maybe always 
regenerate in incrementSequenceNumber?
-   if ( $this->session_getData( 'sequence' ) ) {
-   $this->regenerateOrderID();
-   }
+   $this->ensureUniqueOrderID();
$this->session_addDonorData();
$this->setCurrentTransaction( $transaction );
 
diff --git a/amazon_gateway/amazon.adapter.php 
b/amazon_gateway/amazon.adapter.php
index c150ae2..213db1f 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -118,9 +118,7 @@
$this->client = $this->getPwaClient();
 
$this->transaction_response = new PaymentTransactionResponse();
-   if ( $this->session_getData( 'sequence' ) ) {
-   $this->regenerateOrderID();
-   }
+   $this->ensureUniqueOrderID();
 
try {
if ( $this->getData_Unstaged_Escaped( 'recurring' ) === 
'1' ) {
@@ -133,8 +131,6 @@
} catch ( ResponseProcessingException $ex ) {
$this->handleErrors( $ex, $this->transaction_response );
}
-
-   $this->incrementSequenceNumber();
 
return PaymentResult::fromResults(
$this->transaction_response,
diff --git a/astropay_gateway/astropay.adapter.php 
b/astropay_gateway/astropay.adapter.php
index 9b98b44..47e3a41 100644
--- a/astropay_gateway/astropay.adapter.php
+++ b/astropay_gateway/astropay.adapter.php
@@ -199,10 +199,7 @@
}
 
function doPayment() {
-   // If this is not our first NewInvoice call, get a fresh order 
ID
-   if ( $this->session_getData( 'sequence' ) ) {
-   $this->regenerateOrderID();
-   }
+   $this->ensureUniqueOrderID();
 
$transaction_result = $this->do_transaction( 'NewInvoice' );
$this->runAntifraudFilters();
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 5da2a72..590bef5 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3479,7 +3479,11 @@
}
 
$this->session_ensure();
-   $sequence = $this->session_getData( 'sequence' ) ?: 0;
+   $sequence = $this->session_getData( 'sequence' );
+   if ( !$sequence ) {
+   $sequence = 1;
+   WmfFramework::setSessionValue( 'sequence', 
$sequence );
+   }
 
return "{$ctid}.{$sequence}";
}
@@ -3511,6 +3515,15 @@
return $id;
}
 
+   protected function ensureUniqueOrderID() {
+   // If this is not our first call, get a fresh order ID
+  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Read base value of limit/days from preference

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Read base value of limit/days from preference
..


RCFilters: Read base value of limit/days from preference

Bug: T171368
Change-Id: I0cdbae5bf6b9d00efe351c551d1f8a52459559c4
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
2 files changed, 85 insertions(+), 55 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index b6eda0f..7849cc2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -759,7 +759,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.selectItemByParamName = function 
( paramName ) {
this.getItems().forEach( function ( item ) {
-   item.toggleSelected( item.getParamName() === paramName 
);
+   item.toggleSelected( item.getParamName() === String( 
paramName ) );
} );
};
 
@@ -771,7 +771,7 @@
 */
mw.rcfilters.dm.FilterGroup.prototype.getItemByParamName = function ( 
paramName ) {
return this.getItems().filter( function ( item ) {
-   return item.getParamName() === paramName;
+   return item.getParamName() === String( paramName );
} )[ 0 ];
};
 
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 3b8ebbd..45e3046 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -31,17 +31,12 @@
 */
mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure, namespaceStructure, tagList ) {
var parsedSavedQueries,
+   controller = this,
views = {},
items = [],
uri = new mw.Uri(),
$changesList = $( '.mw-changeslist' 
).first().contents(),
-   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' ),
-   createFilterDataFromNumber = function ( num, 
convertedNumForLabel ) {
-   return {
-   name: String( num ),
-   label: mw.language.convertNumber( 
convertedNumForLabel )
-   };
-   };
+   experimentalViews = mw.config.get( 
'wgStructuredChangeFiltersEnableExperimentalViews' );
 
// Prepare views
if ( namespaceStructure && experimentalViews ) {
@@ -103,9 +98,9 @@
allowArbitrary: true,
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
-   'default': '50',
+   'default': mw.user.options.get( 
'rclimit' ),
filters: [ 50, 100, 250, 500 ].map( 
function ( num ) {
-   return 
createFilterDataFromNumber( num, num );
+   return 
controller._createFilterDataFromNumber( num, num );
} )
},
{
@@ -116,14 +111,19 @@
allowArbitrary: true,
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
-   'default': '7',
+   numToLabelFunc: function ( i ) {
+   return Number( i ) < 1 ?
+   ( Number( i ) * 24 
).toFixed( 2 ) :
+   Number( i );
+   },
+   'default': mw.user.options.get( 
'rcdays' ),
filters: [
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5,
// Days
  

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix browser tests

[EBernhardson (Code Review)]

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

Change subject: Fix browser tests
..

Fix browser tests

* The config dump format has changed, such that now results are
 of the form CirrusSearchNamespaceWeights, instead of namespaceWeights

* Prevent double encoding of : in more like this options tests. This
  solution is a bit of a hack, but will work for now. Not sure what
  changed to cause this, probably some update of ruby dependencies.

* A recent change to trim extra spaces off near match queries has caused
 a regression in the search for `catapult -"asdf" "two words"` allowing
 a document with "asdf" in it to match. Marking this test as a known
 failure for now, but will followup to either fix or revert the trim
 in T171009

Change-Id: Ia69dcc7c714653c9149762be8524f429af814a3e
---
M tests/browser/features/dump_config.feature
M tests/browser/features/exact_quotes_api.feature
M tests/browser/features/step_definitions/search_steps.rb
3 files changed, 10 insertions(+), 5 deletions(-)


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

diff --git a/tests/browser/features/dump_config.feature 
b/tests/browser/features/dump_config.feature
index 5336f15..3432f05 100644
--- a/tests/browser/features/dump_config.feature
+++ b/tests/browser/features/dump_config.feature
@@ -2,7 +2,7 @@
 Feature: You can dump CirrusSearch's configuration
   Scenario: You can dump CirrusSearch's configuration
 When I dump the cirrus config
-Then the page text contains phraseSuggestMaxErrors
-  And the page text contains namespaceWeights
+Then the page text contains PhraseSuggestMaxErrors
+  And the page text contains NamespaceWeights
   And the page text does not contain Password
   And the page text does not contain password
diff --git a/tests/browser/features/exact_quotes_api.feature 
b/tests/browser/features/exact_quotes_api.feature
index 5475c38..dfa10cc 100644
--- a/tests/browser/features/exact_quotes_api.feature
+++ b/tests/browser/features/exact_quotes_api.feature
@@ -83,6 +83,7 @@
 Then Catapult is in the api search results
   And Two Words is not in the api search results
 
+  @expect_failure
   Scenario: Can combine positive and negative phrase search (backwards)
 When I api search for catapult -"asdf" "two words"
 Then Two Words is in the api search results
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index f71a846..c6ea423 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -219,17 +219,21 @@
 
 When(/^I set More Like This Options to ([^ ]+) field, word length to (\d+) and 
I search for (.+)$/) do |field, length, search|
   step("I search for " + search)
-  
browser.goto("#{browser.url}=yes=#{field}=1=1=#{length}")
+  # Evil hax to prevent double-encoding : on morelike:Foo
+  url = browser.url.sub('morelike%3A', 'morelike:')
+  
browser.goto("#{url}=yes=#{field}=1=1=#{length}")
 end
 
 When(/^I set More Like This Options to ([^ ]+) field, percent terms to match 
to (\d+%) and I search for (.+)$/) do |field, percent, search|
   step("I search for " + search)
-  
browser.goto("#{browser.url}=yes=#{field}=1=1=0=#{percent}")
+  url = browser.url.sub('morelike%3A', 'morelike:')
+  
browser.goto("#{url}=yes=#{field}=1=1=0=#{percent}")
 end
 
 When(/^I set More Like This Options to bad settings and I search for (.+)$/) 
do |search|
   step("I search for " + search)
-  
browser.goto("#{browser.url}=yes=title=100=20=190=100%")
+  url = browser.url.sub('morelike%3A', 'morelike:')
+  
browser.goto("#{url}=yes=title=100=20=190=100%")
 end
 
 Then(/^suggestions should( not)? appear$/) do |not_appear|

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: update reference screenshots

[Mholloway (Code Review)]

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

Change subject: update reference screenshots
..

update reference screenshots

Change-Id: I4304545249a1fd5a606190b7be3e29a839d33fbf
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
20 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
index 39d4ff0..bf7cf48 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
index d7a99c1..52c955b 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
index 39d4ff0..bf7cf48 100644
--- 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: JobQueueEventBus: not set properties are accessed

[Ppchelko (Code Review)]

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

Change subject: JobQueueEventBus: not set properties are accessed
..

JobQueueEventBus: not set properties are accessed

Change-Id: I0f021d716a6ed5ae42e6ae811347007c2f667c20
---
M JobQueueEventBus.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/64/368264/1

diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index 6b55945..18259ad 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -96,10 +96,10 @@
foreach ( $jobs as $job ) {
$item = self::createJobEvent( $job );
// hash identifier => de-duplicate
-   if ( strlen( $item['sha1'] ) ) {
+   if ( isset( $item['sha1'] ) ) {
$events[$item['sha1']] = $item;
} else {
-   $events[$item['meta']['uuid']] = $item;
+   $events[$item['meta']['id']] = $item;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f021d716a6ed5ae42e6ae811347007c2f667c20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix error

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368262 )

Change subject: Fix error
..


Fix error

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index ff77f62..96d67a5 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2728,7 +2728,7 @@
 optional = group-widgeteditor.css, group-widgeteditor.js
 
 # Wigo3 // 2017-07-19: Import, still old i18n style
-c
+
 WikEd Diff
 descmsg = wiked-diff-desc
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide08927a3dce3e9520bcb7b55342014a1f1f1a41
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fix blank i18n message added by TranslateWiki

[jenkins-bot (Code Review)]

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

Change subject: Fix blank i18n message added by TranslateWiki
..


Fix blank i18n message added by TranslateWiki

This is breaking unrelated things, and probably shouldn't have been
allowed in the first place!

Change-Id: I71168377c940df2abb07e47f07a2c30cc61196fc
---
M amazon_gateway/i18n/de.json
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/amazon_gateway/i18n/de.json b/amazon_gateway/i18n/de.json
index 9dbdf1b..803669c 100644
--- a/amazon_gateway/i18n/de.json
+++ b/amazon_gateway/i18n/de.json
@@ -5,6 +5,5 @@
"Metalhead64"
]
},
-   "amazon_gateway-desc": "Ermöglicht die Verarbeitung von Zahlungen über 
Amazon",
-   "apihelp-di_amazon_bill-param-currency": ""
+   "amazon_gateway-desc": "Ermöglicht die Verarbeitung von Zahlungen über 
Amazon"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71168377c940df2abb07e47f07a2c30cc61196fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix error

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368262 )

Change subject: Fix error
..

Fix error

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/62/368262/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index ff77f62..96d67a5 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2728,7 +2728,7 @@
 optional = group-widgeteditor.css, group-widgeteditor.js
 
 # Wigo3 // 2017-07-19: Import, still old i18n style
-c
+
 WikEd Diff
 descmsg = wiked-diff-desc
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide08927a3dce3e9520bcb7b55342014a1f1f1a41
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Fix broken @covers tag

[jenkins-bot (Code Review)]

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

Change subject: Fix broken @covers tag
..


Fix broken @covers tag

Change-Id: Ib3c11e4e10aca5f4ea635e3b9e176b70b9fa4f82
---
M tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php 
b/tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php
index e912c9c..1f762b9 100644
--- a/tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php
+++ b/tests/phpunit/includes/specials/SpecialCreateTopicPageTest.php
@@ -9,7 +9,7 @@
 use SpecialPage;
 
 /**
- * @covers ArticlePlaceholder\SpecialCreateTopicPage
+ * @covers ArticlePlaceholder\Specials\SpecialCreateTopicPage
  *
  * @group ArticlePlaceholder
  * @group Database

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3c11e4e10aca5f4ea635e3b9e176b70b9fa4f82
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [DonationInterface] Update keys to ignore

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368261 )

Change subject: [DonationInterface] Update keys to ignore
..


[DonationInterface] Update keys to ignore

Change-Id: Ifaf5e8b73727bef72a56981102e581f63e0c26b9
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 88fcc32..ff77f62 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -873,9 +873,9 @@
 file = DonationInterface/amazon_gateway/i18n/%CODE%.json
 id = ext-di-ag
 descmsg = amazon_gateway-desc
-ignored = apihelp-di_amazon_bill-description, 
apihelp-di_amazon_bill-param-amount, 
apihelp-di_amazon_bill-param-billingAgreementId
-ignored = apihelp-di_amazon_bill-param-currency_code, 
apihelp-di_amazon_bill-param-orderReferenceId, 
apihelp-di_amazon_bill-param-recurring
-ignored = apihelp-di_amazon_bill-param-wmf_token
+ignored = apihelp-di_amazon_bill-description, apihelp-di_amazon_bill-summary, 
apihelp-di_amazon_bill-param-amount
+ignored = apihelp-di_amazon_bill-param-billingAgreementId, 
apihelp-di_amazon_bill-param-currency, 
apihelp-di_amazon_bill-param-orderReferenceId
+ignored = apihelp-di_amazon_bill-param-recurring, 
apihelp-di_amazon_bill-param-wmf_token
 
 Donation Interface - Astro Gateway
 file = DonationInterface/astropay_gateway/i18n/%CODE%.json
@@ -2727,6 +2727,8 @@
 magicfile = Widgets/Widgets.i18n.magic.php
 optional = group-widgeteditor.css, group-widgeteditor.js
 
+# Wigo3 // 2017-07-19: Import, still old i18n style
+c
 WikEd Diff
 descmsg = wiked-diff-desc
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaf5e8b73727bef72a56981102e581f63e0c26b9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [DonationInterface] Update keys to ignore

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368261 )

Change subject: [DonationInterface] Update keys to ignore
..

[DonationInterface] Update keys to ignore

Change-Id: Ifaf5e8b73727bef72a56981102e581f63e0c26b9
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/61/368261/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 88fcc32..ff77f62 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -873,9 +873,9 @@
 file = DonationInterface/amazon_gateway/i18n/%CODE%.json
 id = ext-di-ag
 descmsg = amazon_gateway-desc
-ignored = apihelp-di_amazon_bill-description, 
apihelp-di_amazon_bill-param-amount, 
apihelp-di_amazon_bill-param-billingAgreementId
-ignored = apihelp-di_amazon_bill-param-currency_code, 
apihelp-di_amazon_bill-param-orderReferenceId, 
apihelp-di_amazon_bill-param-recurring
-ignored = apihelp-di_amazon_bill-param-wmf_token
+ignored = apihelp-di_amazon_bill-description, apihelp-di_amazon_bill-summary, 
apihelp-di_amazon_bill-param-amount
+ignored = apihelp-di_amazon_bill-param-billingAgreementId, 
apihelp-di_amazon_bill-param-currency, 
apihelp-di_amazon_bill-param-orderReferenceId
+ignored = apihelp-di_amazon_bill-param-recurring, 
apihelp-di_amazon_bill-param-wmf_token
 
 Donation Interface - Astro Gateway
 file = DonationInterface/astropay_gateway/i18n/%CODE%.json
@@ -2727,6 +2727,8 @@
 magicfile = Widgets/Widgets.i18n.magic.php
 optional = group-widgeteditor.css, group-widgeteditor.js
 
+# Wigo3 // 2017-07-19: Import, still old i18n style
+c
 WikEd Diff
 descmsg = wiked-diff-desc
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaf5e8b73727bef72a56981102e581f63e0c26b9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Browser tests: Use generic toast step

[Jdlrobson (Code Review)]

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

Change subject: Browser tests: Use generic toast step
..

Browser tests: Use generic toast step

Change-Id: Ic8b91c78f6df088244f15223ee4ed658847a05b5
---
M tests/browser/features/search_loggedin.feature
M tests/browser/features/step_definitions/search_steps.rb
2 files changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/tests/browser/features/search_loggedin.feature 
b/tests/browser/features/search_loggedin.feature
index 52cc5e9..291fe8e 100644
--- a/tests/browser/features/search_loggedin.feature
+++ b/tests/browser/features/search_loggedin.feature
@@ -12,4 +12,4 @@
   And I see the search overlay
   And I type into search box "Selenium search tes"
 When I click a search watch star
-Then I should see a toast
+Then I should see a toast notification
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index bd89290..3420aac 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -78,7 +78,3 @@
 Then(/^I should not see '#\/search' in URL$/) do
   expect(on(ArticlePage).current_url.end_with? '#/search').to be false
 end
-
-Then(/^I should see a toast$/) do
-  expect(on(ArticlePage).toast_element.when_present).to be_visible
-end

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: JobQueueEventBus: Enable job events in group0 wikis.

[Ppchelko (Code Review)]

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

Change subject: JobQueueEventBus: Enable job events in group0 wikis.
..

JobQueueEventBus: Enable job events in group0 wikis.

This enables the creation of Job events on test wikis
and mediawiki.org

Bug: T163380
Change-Id: I6f9ab56d3397e4602e02ed412563672dfa12be9d
---
M wmf-config/InitialiseSettings.php
M wmf-config/jobqueue.php
2 files changed, 24 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 36225a3..2c5a185 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19026,6 +19026,14 @@
'votewiki' => false,
 ],
 
+'wmgDebugJobQueueEventBus' => [
+   'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true,
+   'testwikidatawiki' => true,
+   'mediawikiwiki' => true,
+],
+
 'wmgUseCapiunto' => [
'default' => false,
'testwiki' => true,
diff --git a/wmf-config/jobqueue.php b/wmf-config/jobqueue.php
index f3491de..e3f7d65 100644
--- a/wmf-config/jobqueue.php
+++ b/wmf-config/jobqueue.php
@@ -27,7 +27,7 @@
return $result;
 }
 
-$wgJobTypeConf['default'] = [
+$jobQueueFederatedConfig = [
'class' => 'JobQueueFederated',
'configByPartition' => wmfRedisConfigByPartition(
$wmgRedisQueueBaseConfig,
@@ -40,6 +40,21 @@
],
'maxPartitionsTry' => 5 // always covers 2+ servers
 ];
+
+if ( $wmgUseEventBus && $wmgDebugJobQueueEventBus ) {
+   $wgJobTypeConf['default'] = [
+   'class' => 'JobQueueSecondTestQueue',
+   'mainqueue' => $jobQueueFederatedConfig,
+   'debugqueue' => [
+   'class' => 'JobQueueEventBus'
+   ]
+   ];
+} else {
+   $wgJobTypeConf['default'] = $jobQueueFederatedConfig;
+}
+
+unset( $jobQueueFederatedConfig );
+
 // Note: on server failure, this should be changed to any other redis server
 $wgJobQueueAggregator = [
'class' => 'JobQueueAggregatorRedis',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update sitematrix

[Urbanecm (Code Review)]

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

Change subject: Update sitematrix
..

Update sitematrix

Change-Id: I18ddbc14cd3f48801f1a8f8e0eb9ad0de770c2e0
---
M lib/config/sitematrix.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/config/sitematrix.json b/lib/config/sitematrix.json
index 175d36c..491cdab 100644
--- a/lib/config/sitematrix.json
+++ b/lib/config/sitematrix.json
@@ -1088,7 +1088,7 @@
},
"47": {
"code": "ckb",
-   "name": "کوردیی ناوەندی",
+   "name": "کوردی",
"site": [
{
"url": "https://ckb.wikipedia.org;,

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [docs]Improve contribution section in readme

[jenkins-bot (Code Review)]

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

Change subject: [docs]Improve contribution section in readme
..


[docs]Improve contribution section in readme

Bug: T171826
Change-Id: I45293b5473148c7f92cd6eed63980e57ad991bba
---
M README.rst
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/README.rst b/README.rst
index f9da046..4294017 100644
--- a/README.rst
+++ b/README.rst
@@ -102,9 +102,9 @@
 Contributing
 
 
-Our code is maintained on Wikimedia's `Gerrit installation 
`_,
-`learn `_ 
how to get
-started.
+Our code is maintained on Wikimedia's
+`Gerrit installation 
`_.
+Learn about `how to contribute 
`_.
 
 .. image:: 
https://secure.travis-ci.org/wikimedia/pywikibot-core.png?branch=master
:alt: Build Status

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45293b5473148c7f92cd6eed63980e57ad991bba
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Danmichaelo 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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