[MediaWiki-commits] [Gerrit] mediawiki...UIFeedback[master]: Add file for special page aliases

[jenkins-bot (Code Review)]

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

Change subject: Add file for special page aliases
..


Add file for special page aliases

Allows translations and avoids:
Notice: Did not find alias for special page ''.
Perhaps no aliases are defined for it?

Change-Id: I6da5bee8e74d23be7ad75dbac198a03ef8951ae2
---
A UIFeedback.alias.php
M UIFeedback.php
2 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/UIFeedback.alias.php b/UIFeedback.alias.php
new file mode 100644
index 000..457b722
--- /dev/null
+++ b/UIFeedback.alias.php
@@ -0,0 +1,15 @@
+ array( 'UiFeedback' ),
+);
diff --git a/UIFeedback.php b/UIFeedback.php
index 90293b0..83eaebb 100644
--- a/UIFeedback.php
+++ b/UIFeedback.php
@@ -22,6 +22,7 @@
 // Register files
 $wgMessagesDirs['UiFeedback'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles[ 'UiFeedback' ] = __DIR__ . '/UiFeedback.i18n.php';
+$wgExtensionMessagesFiles[ 'UIFeedbackAlias' ] = __DIR__ . 
'/UIFeedback.alias.php';
 
 // add permissions and groups
 // $wgGroupPermissions['user']['userrights'] = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6da5bee8e74d23be7ad75dbac198a03ef8951ae2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UIFeedback
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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...ContentTranslation[master]: Allow translation tool to control when to appear in tools co...

[jenkins-bot (Code Review)]

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

Change subject: Allow translation tool to control when to appear in tools column
..


Allow translation tool to control when to appear in tools column

* Add a unique id for each Translation unit data models
* Use that id for 'data' for each translation tool - This is required
to hide and show a tool in tools column queries by data
* Let the tools listen for specific events from translation unit than
  unconditionally showing all tools for translation unit on click
* This allows, for example Dictionary tool to activate on a valid text
  selection instead of click
* Allow each tool to control when to appear in tools column

Change-Id: Ibe6e59054179aa6e504186079afa962cf0f7cb5a
---
M modules/dm/translationunits/mw.cx.dm.TranslationUnit.js
M modules/tools/mw.cx.tools.DictionaryTool.js
M modules/tools/mw.cx.tools.LinkTool.js
M modules/tools/mw.cx.tools.ReferenceTool.js
M modules/tools/mw.cx.tools.SearchTool.js
M modules/tools/mw.cx.tools.TranslationTool.js
M modules/ui/mw.cx.ui.ToolsColumn.js
M modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
8 files changed, 80 insertions(+), 20 deletions(-)

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



diff --git a/modules/dm/translationunits/mw.cx.dm.TranslationUnit.js 
b/modules/dm/translationunits/mw.cx.dm.TranslationUnit.js
index 393b7ea..55ceec2 100644
--- a/modules/dm/translationunits/mw.cx.dm.TranslationUnit.js
+++ b/modules/dm/translationunits/mw.cx.dm.TranslationUnit.js
@@ -120,10 +120,18 @@
 };
 
 /**
+ * Get a unique id for this translation unit
+ * @return {string}
+ */
+mw.cx.dm.TranslationUnit.prototype.getId = function () {
+   return this.constructor.static.name + '::' + this.sourceDocument.id;
+};
+
+/**
  * String representation of the translation unit instance. Useful for 
debugging.
  *
  * @return {string} String identified for the instance
  */
 mw.cx.dm.TranslationUnit.prototype.toString = function() {
-   return this.constructor.name + '::' + this.constructor.static.name + 
'::' + this.sourceDocument.id;
+   return this.constructor.name + '::' + this.getId();
 };
diff --git a/modules/tools/mw.cx.tools.DictionaryTool.js 
b/modules/tools/mw.cx.tools.DictionaryTool.js
index 4403286..0418586 100644
--- a/modules/tools/mw.cx.tools.DictionaryTool.js
+++ b/modules/tools/mw.cx.tools.DictionaryTool.js
@@ -13,6 +13,9 @@
this.translationUnit = translationUnit;
// Parent constructor
mw.cx.tools.DictionaryTool.super.call( this, translationUnit, config );
+   this.translationUnitUIModel.connect( this, {
+   select: 'onSelect'
+   } );
 };
 
 /* Inheritance */
@@ -27,8 +30,16 @@
return [];
 };
 
+mw.cx.tools.DictionaryTool.prototype.onSelect = function ( selection ) {
+   this.content = selection;
+   // TODO: Sanitize content
+   if ( this.content && this.content.length < 1000 ) {
+   this.showTool();
+   }
+};
+
 mw.cx.tools.DictionaryTool.prototype.getContent = function () {
-   return 'Word meaning';
+   return 'Word meaning for ' + this.content;
 };
 
 /* Register */
diff --git a/modules/tools/mw.cx.tools.LinkTool.js 
b/modules/tools/mw.cx.tools.LinkTool.js
index 699d845..2e57199 100644
--- a/modules/tools/mw.cx.tools.LinkTool.js
+++ b/modules/tools/mw.cx.tools.LinkTool.js
@@ -16,6 +16,10 @@
this.targetTitle = null;
// Parent constructor
mw.cx.tools.LinkTool.super.call( this, translationUnit, config );
+   this.translationUnitUIModel.connect( this, {
+   click: 'showTool',
+   focus: 'showTool'
+   } );
 };
 
 /* Inheritance */
diff --git a/modules/tools/mw.cx.tools.ReferenceTool.js 
b/modules/tools/mw.cx.tools.ReferenceTool.js
index a7ce82f..ed3a967 100644
--- a/modules/tools/mw.cx.tools.ReferenceTool.js
+++ b/modules/tools/mw.cx.tools.ReferenceTool.js
@@ -14,6 +14,9 @@
config.order = 301;
// Parent constructor
mw.cx.tools.ReferenceTool.super.call( this, translationUnitUI, config );
+   this.translationUnitUIModel.connect( this, {
+   click: 'showTool'
+   } );
 };
 
 /* Inheritance */
diff --git a/modules/tools/mw.cx.tools.SearchTool.js 
b/modules/tools/mw.cx.tools.SearchTool.js
index 5ebcdf1..9048918 100644
--- a/modules/tools/mw.cx.tools.SearchTool.js
+++ b/modules/tools/mw.cx.tools.SearchTool.js
@@ -14,6 +14,9 @@
this.config = config;
// Parent constructor
mw.cx.tools.InstructionsTool.super.call( this, translationUnit, config 
);
+   this.translationUnitUIModel.connect( this, {
+   click: 'showTool'
+   } );
 };
 
 /* Inheritance */
diff --git a/modules/tools/mw.cx.tools.TranslationTool.js 
b/modules/tools/mw.cx.tools.TranslationTool.js
index 4f4087a..7e0f83a 100644
--- 

[MediaWiki-commits] [Gerrit] operations...linux44[master]: Update to 4.4.47

[Muehlenhoff (Code Review)]

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

Change subject: Update to 4.4.47
..


Update to 4.4.47

Change-Id: I1581337aa8f9cd2771a3dc1f955a3dab104ef203
---
M debian/changelog
A debian/patches/bugfix/all/stable-4.4.47.patch
M debian/patches/series
3 files changed, 580 insertions(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index 3408281..565a2b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.45
 - CVE-2017-5551 [497de07d89c1410d76a15bec2bb41f24a2a89f31]
   * Update to 4.4.46:
-https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.45
+https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.46
 - CVE-2016-8405 [2dc705a9930b4806250fbf5a76e55266e59389f2]
+  * Update to 4.4.47:
+https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.47
 
  -- Moritz Muehlenhoff   Mon, 16 Jan 2017 11:17:27 
+0100
 
diff --git a/debian/patches/bugfix/all/stable-4.4.47.patch 
b/debian/patches/bugfix/all/stable-4.4.47.patch
new file mode 100644
index 000..a822953
--- /dev/null
+++ b/debian/patches/bugfix/all/stable-4.4.47.patch
@@ -0,0 +1,576 @@
+diff --git a/Makefile b/Makefile
+index 2dd5cb2fe182..7b233ac7f86c 100644
+--- a/Makefile
 b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+-SUBLEVEL = 46
++SUBLEVEL = 47
+ EXTRAVERSION =
+ NAME = Blurry Fish Butt
+ 
+diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c 
b/drivers/net/ethernet/broadcom/bcmsysport.c
+index 858106352ce9..8860e74aa28f 100644
+--- a/drivers/net/ethernet/broadcom/bcmsysport.c
 b/drivers/net/ethernet/broadcom/bcmsysport.c
+@@ -732,11 +732,8 @@ static unsigned int __bcm_sysport_tx_reclaim(struct 
bcm_sysport_priv *priv,
+   unsigned int c_index, last_c_index, last_tx_cn, num_tx_cbs;
+   unsigned int pkts_compl = 0, bytes_compl = 0;
+   struct bcm_sysport_cb *cb;
+-  struct netdev_queue *txq;
+   u32 hw_ind;
+ 
+-  txq = netdev_get_tx_queue(ndev, ring->index);
+-
+   /* Compute how many descriptors have been processed since last call */
+   hw_ind = tdma_readl(priv, TDMA_DESC_RING_PROD_CONS_INDEX(ring->index));
+   c_index = (hw_ind >> RING_CONS_INDEX_SHIFT) & RING_CONS_INDEX_MASK;
+@@ -767,9 +764,6 @@ static unsigned int __bcm_sysport_tx_reclaim(struct 
bcm_sysport_priv *priv,
+ 
+   ring->c_index = c_index;
+ 
+-  if (netif_tx_queue_stopped(txq) && pkts_compl)
+-  netif_tx_wake_queue(txq);
+-
+   netif_dbg(priv, tx_done, ndev,
+ "ring=%d c_index=%d pkts_compl=%d, bytes_compl=%d\n",
+ ring->index, ring->c_index, pkts_compl, bytes_compl);
+@@ -781,16 +775,33 @@ static unsigned int __bcm_sysport_tx_reclaim(struct 
bcm_sysport_priv *priv,
+ static unsigned int bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv,
+  struct bcm_sysport_tx_ring *ring)
+ {
++  struct netdev_queue *txq;
+   unsigned int released;
+   unsigned long flags;
+ 
++  txq = netdev_get_tx_queue(priv->netdev, ring->index);
++
+   spin_lock_irqsave(>lock, flags);
+   released = __bcm_sysport_tx_reclaim(priv, ring);
++  if (released)
++  netif_tx_wake_queue(txq);
++
+   spin_unlock_irqrestore(>lock, flags);
+ 
+   return released;
+ }
+ 
++/* Locked version of the per-ring TX reclaim, but does not wake the queue */
++static void bcm_sysport_tx_clean(struct bcm_sysport_priv *priv,
++   struct bcm_sysport_tx_ring *ring)
++{
++  unsigned long flags;
++
++  spin_lock_irqsave(>lock, flags);
++  __bcm_sysport_tx_reclaim(priv, ring);
++  spin_unlock_irqrestore(>lock, flags);
++}
++
+ static int bcm_sysport_tx_poll(struct napi_struct *napi, int budget)
+ {
+   struct bcm_sysport_tx_ring *ring =
+@@ -1275,7 +1286,7 @@ static void bcm_sysport_fini_tx_ring(struct 
bcm_sysport_priv *priv,
+   napi_disable(>napi);
+   netif_napi_del(>napi);
+ 
+-  bcm_sysport_tx_reclaim(priv, ring);
++  bcm_sysport_tx_clean(priv, ring);
+ 
+   kfree(ring->cbs);
+   ring->cbs = NULL;
+diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.h 
b/drivers/net/ethernet/mellanox/mlxsw/pci.h
+index 142f33d978c5..a0fbe00dd690 100644
+--- a/drivers/net/ethernet/mellanox/mlxsw/pci.h
 b/drivers/net/ethernet/mellanox/mlxsw/pci.h
+@@ -206,21 +206,21 @@ MLXSW_ITEM32(pci, eqe, owner, 0x0C, 0, 1);
+ /* pci_eqe_cmd_token
+  * Command completion event - token
+  */
+-MLXSW_ITEM32(pci, eqe, cmd_token, 0x08, 16, 16);
++MLXSW_ITEM32(pci, eqe, cmd_token, 0x00, 16, 16);
+ 
+ /* pci_eqe_cmd_status
+  * Command completion event - status
+  */
+-MLXSW_ITEM32(pci, eqe, cmd_status, 0x08, 0, 8);

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Support removal of reference from reference tool

[jenkins-bot (Code Review)]

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

Change subject: Support removal of reference from reference tool
..


Support removal of reference from reference tool

Change-Id: I16e75b9897a7a61eeded2b1ab0f47206ebab2b09
---
M modules/tools/mw.cx.tools.ReferenceTool.js
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/tools/mw.cx.tools.ReferenceTool.js 
b/modules/tools/mw.cx.tools.ReferenceTool.js
index 73ad043..a7ce82f 100644
--- a/modules/tools/mw.cx.tools.ReferenceTool.js
+++ b/modules/tools/mw.cx.tools.ReferenceTool.js
@@ -34,7 +34,9 @@
this.actions = [
this.removeReferenceButton
];
-
+   this.removeReferenceButton.connect( this, {
+   click: 'removeReference'
+   } );
return this.actions;
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16e75b9897a7a61eeded2b1ab0f47206ebab2b09
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Align tab navigation to color palette

[VolkerE (Code Review)]

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

Change subject: MediaWiki theme: Align tab navigation to color palette
..

MediaWiki theme: Align tab navigation to color palette

Aligning tab navigation's background to color palette and
integrate transitions.

Change-Id: I309824fd0aba7e343c20c1dd7bc4d152dbdbe2f8
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
2 files changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/77/336377/1

diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 4593aaf..560a25a 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -49,6 +49,9 @@
 @background-color-framed-hover: @background-color-default; //fade( 
@color-default, 10% );
 @background-color-framed-active: #c8ccd1;
 
+// Tabbed Navigation
+@background-color-tabs: #eaecf0;
+
 // Toolbar, Tools & Menus
 @background-color-toolbar: @background-color-default;
 @background-color-tool-hover: @background-color-default-hover;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index e27e355..1810c2f 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1245,14 +1245,18 @@
 }
 
 .theme-oo-ui-tabOptionWidget () {
-   padding: 0.35em 1em;
+   color: @color-default;
margin: 0.5em 0 0 0.75em;
border: 1px solid transparent;
border-bottom: 0;
border-top-left-radius: @border-radius-default;
border-top-right-radius: @border-radius-default;
-   color: @color-default;
+   padding: 0.35em 1em;
font-weight: bold;
+   .oo-ui-transition(
+   background-color @transition-ease-quick,
+   color @transition-ease-quick
+   );
 
&.oo-ui-widget-enabled {
&:hover {
@@ -1276,7 +1280,7 @@
.oo-ui-selectWidget-depressed &.oo-ui-optionWidget-selected,
&.oo-ui-optionWidget-selected:hover {
background-color: @background-color-default;
-   color: #333;
+   color: @color-default-active;
}
 }
 
@@ -1454,7 +1458,7 @@
 .theme-oo-ui-outlineSelectWidget () {}
 
 .theme-oo-ui-tabSelectWidget () {
-   background-color: #ddd;
+   background-color: @background-color-tabs;
 }
 
 .theme-oo-ui-numberInputWidget () {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Add special page alias to alias file

[jenkins-bot (Code Review)]

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

Change subject: Add special page alias to alias file
..


Add special page alias to alias file

Allows translations and avoids:
Notice: Did not find alias for special page 'PageValues'.
Perhaps no aliases are defined for it?

Change-Id: Id6b14048d60cf07b2bc1c7faf2203e94ecafc0a2
---
M Cargo.alias.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/Cargo.alias.php b/Cargo.alias.php
index 908c6ab..4323c1a 100644
--- a/Cargo.alias.php
+++ b/Cargo.alias.php
@@ -15,5 +15,6 @@
'CargoTables' => array( 'CargoTables' ),
'DeleteCargoTable' => array( 'DeleteCargoTable' ),
'Drilldown' => array( 'Drilldown' ),
+   'PageValues' => array( 'PageValues' ),
'ViewData' => array( 'ViewData' ),
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6b14048d60cf07b2bc1c7faf2203e94ecafc0a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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...ContentTranslation[master]: Support removal of links from Link card

[jenkins-bot (Code Review)]

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

Change subject: Support removal of links from Link card
..


Support removal of links from Link card

Change-Id: Ibcf2dd053e23ee438191ea6d8853fa8d9da37f28
---
M modules/tools/mw.cx.tools.LinkTool.js
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/modules/tools/mw.cx.tools.LinkTool.js 
b/modules/tools/mw.cx.tools.LinkTool.js
index 5a8f754..699d845 100644
--- a/modules/tools/mw.cx.tools.LinkTool.js
+++ b/modules/tools/mw.cx.tools.LinkTool.js
@@ -39,7 +39,9 @@
framed: false,
classes: [ 'cx-tools-link-remove-button' ]
} );
-
+   this.removeLinkButton.connect( this, {
+   click: 'removeLink'
+   } );
this.actions = [
this.addLinkButton,
this.removeLinkButton
@@ -83,5 +85,10 @@
return panel.$element;
 };
 
+mw.cx.tools.LinkTool.prototype.removeLink = function () {
+   this.translationUnitUIModel.remove();
+   this.destroy();
+};
+
 /* Register */
 mw.cx.tools.translationToolFactory.register( mw.cx.tools.LinkTool );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcf2dd053e23ee438191ea6d8853fa8d9da37f28
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
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...ContributionTracking[master]: Add special page alias to alias file

[jenkins-bot (Code Review)]

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

Change subject: Add special page alias to alias file
..


Add special page alias to alias file

Allows translations and avoids:
Notice: Did not find alias for special page
'ContributionTrackingTester'.
Perhaps no aliases are defined for it?

Change-Id: I5c9a747654e53721d70544c603bb6064754239b7
---
M ContributionTracking.alias.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/ContributionTracking.alias.php b/ContributionTracking.alias.php
index 287185c..c8dc6b0 100644
--- a/ContributionTracking.alias.php
+++ b/ContributionTracking.alias.php
@@ -13,6 +13,7 @@
 $specialPageAliases['en'] = array(
'ContributionTracking' => array( 'ContributionTracking' ),
'FundraiserMaintenance' => array( 'FundraiserMaintenance' ),
+   'ContributionTrackingTester' => array( 'ContributionTrackingTester' ),
 );
 
 /** Arabic (العربية) */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c9a747654e53721d70544c603bb6064754239b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContributionTracking
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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...PrivateDomains[master]: Add file for special page aliases

[jenkins-bot (Code Review)]

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

Change subject: Add file for special page aliases
..


Add file for special page aliases

Allows translations and avoids:
Notice: Did not find alias for special page ''.
Perhaps no aliases are defined for it?

Change-Id: Ifc740afe2249f3932b3d86443509df1be5dcc50d
---
A PrivateDomains.alias.php
M extension.json
2 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/PrivateDomains.alias.php b/PrivateDomains.alias.php
new file mode 100644
index 000..fe53e1d
--- /dev/null
+++ b/PrivateDomains.alias.php
@@ -0,0 +1,15 @@
+ array( 'PrivateDomains' ),
+);
diff --git a/extension.json b/extension.json
index 21471be..d2ec519 100644
--- a/extension.json
+++ b/extension.json
@@ -17,6 +17,9 @@
"i18n"
]
},
+   "ExtensionMessagesFiles": {
+   "PrivateDomainsAlias": "PrivateDomains.alias.php"
+   },
"AutoloadClasses": {
"PrivateDomains": "SpecialPrivateDomains.php",
"PrivateDomainsHooks": "PrivateDomainsHooks.php"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc740afe2249f3932b3d86443509df1be5dcc50d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PrivateDomains
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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...BlockAndNuke[master]: Move special page alias to alias file

[jenkins-bot (Code Review)]

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

Change subject: Move special page alias to alias file
..


Move special page alias to alias file

This allows to translate the special page alias in the known files

Change-Id: I47bfda726bbf71430ea2380586f2171a9a98e54d
---
A BlockAndNuke.alias.php
M BlockAndNuke.hooks.php
M extension.json
3 files changed, 19 insertions(+), 6 deletions(-)

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



diff --git a/BlockAndNuke.alias.php b/BlockAndNuke.alias.php
new file mode 100644
index 000..38d442d
--- /dev/null
+++ b/BlockAndNuke.alias.php
@@ -0,0 +1,15 @@
+ array( 'BlockandNuke' ),
+);
diff --git a/BlockAndNuke.hooks.php b/BlockAndNuke.hooks.php
index 8730b3b..37f7778 100644
--- a/BlockAndNuke.hooks.php
+++ b/BlockAndNuke.hooks.php
@@ -4,8 +4,4 @@
public static function onPerformRetroactiveAutoblock( $block, $blockIds 
) {
return true;
}
-
-   public static function onLanguageGetSpecialPageAliases( 
&$specialPageAliases, $langCode ) {
-   $specialPageAliases['blockandnuke'] = array( 'BlockandNuke' );
-   }
 }
\ No newline at end of file
diff --git a/extension.json b/extension.json
index cab8580..b706ce0 100644
--- a/extension.json
+++ b/extension.json
@@ -25,14 +25,16 @@
"i18n"
]
},
+   "ExtensionMessagesFiles": {
+   "BlockAndNukeAlias": "BlockAndNuke.alias.php"
+   },
"AutoloadClasses": {
"SpecialBlock_Nuke": "BlockAndNuke.body.php",
"BanPests": "BanPests.php",
"BlockAndNukeHooks": "BlockAndNuke.hooks.php"
},
"Hooks": {
-   "PerformRetroactiveAutoblock": 
"BlockAndNukeHooks::onPerformRetroactiveAutoblock",
-   "LanguageGetSpecialPageAliases": 
"BlockAndNukeHooks::onLanguageGetSpecialPageAliases"
+   "PerformRetroactiveAutoblock": 
"BlockAndNukeHooks::onPerformRetroactiveAutoblock"
},
"config": {
"BaNwhitelist": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47bfda726bbf71430ea2380586f2171a9a98e54d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SmiteSpam[master]: Add special page alias to alias file

[jenkins-bot (Code Review)]

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

Change subject: Add special page alias to alias file
..


Add special page alias to alias file

Allows translations and avoids:
Notice: Did not find alias for special page 'SmiteSpamTrustedUsers'.
Perhaps no aliases are defined for it?

Special:SmiteSpamTrustedUsers was added with
I4e2e14677f5b02613c2632a2ec9209bd750c8e7a

Change-Id: If769fdad8d185703ca0dc56b0cea91094601e953
---
M SmiteSpam.alias.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/SmiteSpam.alias.php b/SmiteSpam.alias.php
index 0cdeb58..0a358ad 100644
--- a/SmiteSpam.alias.php
+++ b/SmiteSpam.alias.php
@@ -6,4 +6,5 @@
 /** English (English) */
 $specialPageAliases['en'] = array(
'SmiteSpam' => array( 'SmiteSpam' ),
+   'SmiteSpamTrustedUsers' => array( 'SmiteSpamTrustedUsers' ),
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If769fdad8d185703ca0dc56b0cea91094601e953
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SmiteSpam
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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...GlobalContribs[master]: Add file for special page aliases

[jenkins-bot (Code Review)]

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

Change subject: Add file for special page aliases
..


Add file for special page aliases

Allows translations and avoids:
Notice: Did not find alias for special page ''.
Perhaps no aliases are defined for it?

Change-Id: Id3d4d3b1e40244cabd27bc3c07dfe87fe8d8f122
---
A GlobalContribs.alias.php
M extension.json
2 files changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/GlobalContribs.alias.php b/GlobalContribs.alias.php
new file mode 100644
index 000..1811892
--- /dev/null
+++ b/GlobalContribs.alias.php
@@ -0,0 +1,16 @@
+ array( 'GlobalEditcount' ),
+   'GlobalContributions' => array( 'GlobalContributions' ),
+);
diff --git a/extension.json b/extension.json
index 0436f71..09c49e9 100644
--- a/extension.json
+++ b/extension.json
@@ -21,6 +21,9 @@
"i18n"
]
},
+   "ExtensionMessagesFiles": {
+   "GlobalContribsAlias": "GlobalContribs.alias.php"
+   },
"SpecialPages": {
"GlobalContributions": "SpecialGlobalContributions",
"GlobalEditcount": "SpecialGlobalEditcount"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3d4d3b1e40244cabd27bc3c07dfe87fe8d8f122
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalContribs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
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...ContentTranslation[master]: Add complete file path in @import

[jenkins-bot (Code Review)]

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

Change subject: Add complete file path in @import
..


Add complete file path in @import

Change-Id: Iee00bf4a2794ed3e93b6d3b51ac75a9e71f1649b
---
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/entrypoint/styles/ext.cx.contributions.less
M modules/entrypoint/styles/ext.cx.entrypoint.less
M modules/publish/styles/ext.cx.publish.dialog.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.selector.less
M modules/stats/styles/ext.cx.stats.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/tools/styles/ext.cx.tools.instructions.less
M modules/tools/styles/ext.cx.tools.less
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.linker.less
M modules/tools/styles/ext.cx.tools.linter.less
M modules/tools/styles/ext.cx.tools.manager.less
M modules/tools/styles/ext.cx.tools.mt.card.less
M modules/tools/styles/ext.cx.tools.mtabuse.less
M modules/tools/styles/ext.cx.tools.reference.less
M modules/tools/styles/ext.cx.tools.template.card.less
M modules/tools/styles/ext.cx.tools.template.editor.less
M modules/tools/styles/ext.cx.tools.template.less
M modules/translation/styles/ext.cx.translation.conflict.less
M modules/translation/styles/ext.cx.translation.less
M modules/widgets/common/ext.cx.common.less
M modules/widgets/common/grid/agora-grid.less
M modules/widgets/common/grid/grid-core.less
M modules/widgets/common/grid/grid-responsive.less
M modules/widgets/pageselector/ext.cx.pageselector.less
M modules/widgets/translator/ext.cx.translator.less
34 files changed, 40 insertions(+), 40 deletions(-)

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



diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index c455e99..4f0e450 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
 .cx-campaign-contributionsmenu {
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less 
b/modules/dashboard/styles/ext.cx.dashboard.less
index 48a39a9..cdfa817 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
 body {
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index abc0ff6..48c3226 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 
 .cx-tlitem,
 .cx-slitem {
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index 5a1582a..9bacbd4 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -1,5 +1,5 @@
-@import '../../widgets/common/ext.cx.common';
-@import 'ext.cx.lists.common';
+@import '../../widgets/common/ext.cx.common.less';
+@import 'ext.cx.lists.common.less';
 @import 'mediawiki.mixins';
 
 .cx-suggestionlist {
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less 
b/modules/dashboard/styles/ext.cx.translationlist.less
index 4a58ac2..4eef3c8 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -1,5 +1,5 @@
-@import '../../widgets/common/ext.cx.common';
-@import 'ext.cx.lists.common';
+@import '../../widgets/common/ext.cx.common.less';
+@import 'ext.cx.lists.common.less';
 @import 'mediawiki.mixins';
 
 .cx-tlitem {
diff --git a/modules/entrypoint/styles/ext.cx.contributions.less 
b/modules/entrypoint/styles/ext.cx.contributions.less
index 438be5c..65ce8cf 100644
--- a/modules/entrypoint/styles/ext.cx.contributions.less
+++ b/modules/entrypoint/styles/ext.cx.contributions.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
 .cx-contributions {
diff --git a/modules/entrypoint/styles/ext.cx.entrypoint.less 

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

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Repool db1072
..


db-eqiad.php: Repool db1072

After changing the BBU db1072 looks good and it is ready to be back in
the pool

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 11d7cca..a4386e9 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -99,9 +99,9 @@
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
-#  'db1072' => 10,  # B2 2.8TB 160GB, api #T156226 #possible bad 
BBU
+   'db1072' => 50,  # B2 2.8TB 160GB, api
'db1073' => 50,  # D1 2.8TB 160GB, api
-   'db1080' => 500, # A2 3.6TB 512GB, api
+   'db1080' => 500, # A2 3.6TB 512GB
'db1083' => 500, # B1 3.6TB 512GB
'db1089' => 500, # C3 3.6TB 512GB
],
@@ -265,7 +265,7 @@
],
'api' => [
'db1066' => 1,
-#  'db1072' => 1,
+   'db1072' => 1,
'db1073' => 1,
],
],

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

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

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

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

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Repool db1072
..

db-eqiad.php: Repool db1072

After changing the BBU db1072 looks good and it is ready to be back in
the pool

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 11d7cca..a4386e9 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -99,9 +99,9 @@
'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
-#  'db1072' => 10,  # B2 2.8TB 160GB, api #T156226 #possible bad 
BBU
+   'db1072' => 50,  # B2 2.8TB 160GB, api
'db1073' => 50,  # D1 2.8TB 160GB, api
-   'db1080' => 500, # A2 3.6TB 512GB, api
+   'db1080' => 500, # A2 3.6TB 512GB
'db1083' => 500, # B1 3.6TB 512GB
'db1089' => 500, # C3 3.6TB 512GB
],
@@ -265,7 +265,7 @@
],
'api' => [
'db1066' => 1,
-#  'db1072' => 1,
+   'db1072' => 1,
'db1073' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Updating hub-related tests; new files for future tests.

[Harej (Code Review)]

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

Change subject: Updating hub-related tests; new files for future tests.
..

Updating hub-related tests; new files for future tests.

Change-Id: Ia37e3a4d9f5d5f1451e86a20515222d774b94462
---
M includes/content/CollaborationHubContentHandler.php
M tests/phpunit/CollaborationHubContentTest.php
A tests/phpunit/CollaborationHubTOCTest.php
A tests/phpunit/CollaborationKitImageTest.php
A tests/phpunit/CollaborationListContentHandlerTest.php
A tests/phpunit/CollaborationListContentTest.php
A tests/phpunit/SpecialCreateCollaborationHubTest.php
A tests/phpunit/SpecialCreateHubFeatureTest.php
8 files changed, 36 insertions(+), 8 deletions(-)


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

diff --git a/includes/content/CollaborationHubContentHandler.php 
b/includes/content/CollaborationHubContentHandler.php
index b334213..71631d3 100644
--- a/includes/content/CollaborationHubContentHandler.php
+++ b/includes/content/CollaborationHubContentHandler.php
@@ -71,7 +71,7 @@
 * @return CollaborationHubContent
 */
public function makeEmptyContent() {
-   return new CollaborationHubContent( '{ "display_name": "", 
"introduction": "", "content": [] }' );
+   return new CollaborationHubContent( '{ "display_name": "", 
"introduction": "", "footer": "", "content": [] }' );
}
 
/**
diff --git a/tests/phpunit/CollaborationHubContentTest.php 
b/tests/phpunit/CollaborationHubContentTest.php
index f3da086..8964d54 100644
--- a/tests/phpunit/CollaborationHubContentTest.php
+++ b/tests/phpunit/CollaborationHubContentTest.php
@@ -9,7 +9,7 @@
$content = new CollaborationHubContent(
'{ "introduction": "Test content", "display_name": 
"foo",'
. '"footer": "More test content", "content": ['
-   . '{ "title": "Me!", "image": "cool.png" }'
+   . '{ "title": "Project:Wow", "image": "cool.png", 
"display_name": "Wow!" }'
. '] }'
);
$this->content = TestingAccessWrapper::newFromObject( $content 
);
@@ -27,7 +27,7 @@
[ $this->m(
'{ "introduction": "\'\'Test\'\' content", 
"display_name": "foo",'
. '"footer": "\'\'\'Test\'\'\' content footer", 
"content": ['
-   . '{ "title": "Me!", "image": "cool.png" }'
+   . '{ "title": "Project:Wow", "image": 
"cool.png", "display_name": "Wow!" }'
. '] }'
), 0 ],
[ ( new CollaborationHubContentHandler 
)->makeEmptyContent(), 1 ],
@@ -47,11 +47,11 @@
[ '{ afdsfda }' ],
[ '{ "introduction": 1, "display_name": "", "content": 
"" }' ],
[ '{ "display_name": [ "doggy" ], "content": "" }' ],
-   [ '{ "page_type": "food", "display_name": "", 
"content": "" }' ],
-   [ '{ "page_type": {}, "display_name": "", "content": "" 
}' ],
+   [ '{ "display_name": "", "content": "" }' ],
# FIXME Empty objects aren't being rejected like they 
should be.
# [ '{ "display_name": "", "content": {} }' ],
[ '{ "display_name": "", "content": [], "footer": [] }' 
],
+   [ '{ "display_name": "Legit", "content": { "title": 
"Project:Test/Test", "image": "bell", "display_title": "Test" } }']
];
}
 
@@ -94,7 +94,7 @@
 */
public function testContent( CollaborationHubContent $content, $id ) {
$expected = [
-   [ [ "title" => "Me!", "image" => "cool.png", 
"displayTitle" => null ] ],
+   [ [ "title" => "Project:Wow", "image" => "cool.png", 
"displayTitle" => null ] ],
[],
[],
];
@@ -133,12 +133,10 @@
public function testGetParsedContent() {
$this->markTestIncomplete();
// FIXME implement.
-   // getParsedContent does not appear to be entirely stable yet.
}
 
public function testFillParserOutput() {
$this->markTestIncomplete();
// FIXME implement.
-   // fillParserOutput does not appear to be entirely stable yet.
}
 }
diff --git a/tests/phpunit/CollaborationHubTOCTest.php 
b/tests/phpunit/CollaborationHubTOCTest.php
new file mode 100644
index 000..699217b
--- /dev/null
+++ b/tests/phpunit/CollaborationHubTOCTest.php
@@ -0,0 +1,5 @@
+https://gerrit.wikimedia.org/r/336375
To unsubscribe, visit 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: languages supported & namespace translation for Goan...

[jenkins-bot (Code Review)]

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

Change subject: Update: languages supported & namespace translation for Goan 
Konkani
..


Update: languages supported & namespace translation for Goan Konkani

  scripts/generate_wiki_languages.py &&
  scripts/make-templates.py &&
  mv \
FileAliasData.java \
MainPageNameData.java \
SpecialAliasData.java \
app/src/main/java/org/wikipedia/staticdata/ &&
  mv languages_list.xml app/src/main/res/values/

Bug: T126148
Change-Id: I29a9b115a0c5dd04b03e3f70a8e05dcb31f88499
---
M app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
M app/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
M app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
M app/src/main/res/values/languages_list.xml
4 files changed, 202 insertions(+), 202 deletions(-)

Approvals:
  The Discoverer: Looks good to me, but someone else must approve
  Niedzielski: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java 
b/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
index ca0a2c7..7ab73ce 100644
--- a/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
+++ b/app/src/main/java/org/wikipedia/staticdata/FileAliasData.java
@@ -12,13 +12,20 @@
 public final class FileAliasData {
 @NonNull private static final Map DATA_MAP = 
Collections.unmodifiableMap(newMap());
 
+@NonNull public static String valueFor(String key) {
+if (DATA_MAP.containsKey(key)) {
+return DATA_MAP.get(key);
+}
+return DATA_MAP.get("en");
+}
+
 @SuppressWarnings({"checkstyle:methodlength", "SpellCheckingInspection"})
 private static Map newMap() {
 final int size = 297;
 Map map = new HashMap<>(size);
 map.put("en", "File");
-map.put("sv", "Fil");
 map.put("ceb", "Payl");
+map.put("sv", "Fil");
 map.put("de", "Datei");
 map.put("nl", "Bestand");
 map.put("fr", "Fichier");
@@ -36,8 +43,8 @@
 map.put("uk", "Файл");
 map.put("ca", "Fitxer");
 map.put("fa", "پرونده");
-map.put("nb", "Fil");
 map.put("ar", "ملف");
+map.put("nb", "Fil");
 map.put("sh", "Datoteka");
 map.put("fi", "Tiedosto");
 map.put("hu", "Fájl");
@@ -66,8 +73,8 @@
 map.put("gl", "Ficheiro");
 map.put("nn", "Fil");
 map.put("uz", "Fayl");
-map.put("la", "Fasciculus");
 map.put("el", "Αρχείο");
+map.put("la", "Fasciculus");
 map.put("be", "Файл");
 map.put("simple", "File");
 map.put("vo", "Ragiv");
@@ -88,18 +95,18 @@
 map.put("tg", "Акс");
 map.put("te", "దస్త్రం");
 map.put("tl", "Talaksan");
-map.put("pms", "Figura");
 map.put("sq", "Skeda");
+map.put("pms", "Figura");
 map.put("br", "Restr");
-map.put("ky", "Файл");
 map.put("be-tarask", "Файл");
+map.put("ky", "Файл");
 map.put("ht", "Fichye");
 map.put("zh-yue", "File");
 map.put("jv", "Gambar");
 map.put("ast", "Ficheru");
 map.put("lb", "Fichier");
-map.put("ml", "പ്രമാണം");
 map.put("bn", "চিত্র");
+map.put("ml", "പ്രമാണം");
 map.put("mr", "चित्र");
 map.put("af", "Lêer");
 map.put("pnb", "فائل");
@@ -107,8 +114,8 @@
 map.put("is", "Mynd");
 map.put("ga", "Íomhá");
 map.put("cv", "Ӳкерчĕк");
-map.put("ba", "Файл");
 map.put("fy", "Ofbyld");
+map.put("ba", "Файл");
 map.put("sw", "Picha");
 map.put("lmo", "Archivi");
 map.put("my", "File");
@@ -135,9 +142,9 @@
 map.put("nap", "Fiùra");
 map.put("wa", "Imådje");
 map.put("gd", "Faidhle");
+map.put("azb", "فایل");
 map.put("bug", "Berkas");
 map.put("yi", "טעקע");
-map.put("azb", "فایل");
 map.put("am", "ስዕል");
 map.put("map-bms", "Gambar");
 map.put("si", "ගොනුව");
@@ -149,27 +156,27 @@
 map.put("sah", "Билэ");
 map.put("vec", "File");
 map.put("os", "Файл");
+map.put("ilo", "Papeles");
 map.put("sa", "सञ्चिका");
 map.put("mrj", "Файл");
-map.put("ilo", "Papeles");
 map.put("mai", "फाइल");
 map.put("hif", "file");
-map.put("nah", "Īxiptli");
 map.put("mhr", "Файл");
 map.put("roa-tara", "File");
 map.put("xmf", "ფაილი");
+map.put("nah", "Īxiptli");
 map.put("eml", "File");
 map.put("pam", "File");
 map.put("bh", "चित्र");
 map.put("ps", "دوتنه");
-map.put("sd", "عڪس");
 map.put("nso", "Seswantšho");
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move LikeMatch to Rdbms namespace

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336374 )

Change subject: Move LikeMatch to Rdbms namespace
..

Move LikeMatch to Rdbms namespace

Change-Id: I0cba263cd02fc5c4bfe8f063f38d1b4be28246b0
---
M autoload.php
M includes/LinkFilter.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/encasing/LikeMatch.php
M tests/phpunit/includes/LinkFilterTest.php
M tests/phpunit/includes/db/DatabaseSQLTest.php
7 files changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/336374/1

diff --git a/autoload.php b/autoload.php
index 970dff0..4a97e7c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -727,7 +727,6 @@
'LegacyLogFormatter' => __DIR__ . '/includes/logging/LogFormatter.php',
'License' => __DIR__ . '/includes/Licenses.php',
'Licenses' => __DIR__ . '/includes/Licenses.php',
-   'LikeMatch' => __DIR__ . '/includes/libs/rdbms/encasing/LikeMatch.php',
'LinkBatch' => __DIR__ . '/includes/cache/LinkBatch.php',
'LinkCache' => __DIR__ . '/includes/cache/LinkCache.php',
'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
@@ -1593,6 +1592,7 @@
'Wikimedia\\Rdbms\\LBFactoryMulti' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactoryMulti.php',
'Wikimedia\\Rdbms\\LBFactorySimple' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactorySimple.php',
'Wikimedia\\Rdbms\\LBFactorySingle' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactorySingle.php',
+   'Wikimedia\\Rdbms\\LikeMatch' => __DIR__ . 
'/includes/libs/rdbms/encasing/LikeMatch.php',
'Wikimedia\\Rdbms\\LoadMonitor' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/LoadMonitor.php',
'Wikimedia\\Rdbms\\LoadMonitorMySQL' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php',
'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php',
diff --git a/includes/LinkFilter.php b/includes/LinkFilter.php
index 7b3d72b..2f50558 100644
--- a/includes/LinkFilter.php
+++ b/includes/LinkFilter.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use Wikimedia\Rdbms\LikeMatch;
 
 /**
  * Some functions to help implement an external link filter for spam control.
diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index d15d6f1..17c9fda 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -27,6 +27,7 @@
 use Psr\Log\LoggerInterface;
 use Wikimedia\ScopedCallback;
 use Wikimedia\Rdbms\TransactionProfiler;
+use Wikimedia\Rdbms\LikeMatch;
 
 /**
  * Relational database abstraction object
diff --git a/includes/libs/rdbms/database/IDatabase.php 
b/includes/libs/rdbms/database/IDatabase.php
index c6055db..f1613eb 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -24,6 +24,7 @@
  * @ingroup Database
  */
 use Wikimedia\ScopedCallback;
+use Wikimedia\Rdbms\LikeMatch;
 
 /**
  * Basic database interface for live and lazy-loaded relation database handles
diff --git a/includes/libs/rdbms/encasing/LikeMatch.php 
b/includes/libs/rdbms/encasing/LikeMatch.php
index b0b3c87..98812a5 100644
--- a/includes/libs/rdbms/encasing/LikeMatch.php
+++ b/includes/libs/rdbms/encasing/LikeMatch.php
@@ -1,4 +1,7 @@
 https://gerrit.wikimedia.org/r/336374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cba263cd02fc5c4bfe8f063f38d1b4be28246b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Add complete file path in @import

[KartikMistry (Code Review)]

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

Change subject: Add complete file path in @import
..

Add complete file path in @import

Change-Id: Iee00bf4a2794ed3e93b6d3b51ac75a9e71f1649b
---
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/entrypoint/styles/ext.cx.contributions.less
M modules/entrypoint/styles/ext.cx.entrypoint.less
M modules/publish/styles/ext.cx.publish.dialog.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.selector.less
M modules/stats/styles/ext.cx.stats.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/tools/styles/ext.cx.tools.instructions.less
M modules/tools/styles/ext.cx.tools.less
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.linker.less
M modules/tools/styles/ext.cx.tools.linter.less
M modules/tools/styles/ext.cx.tools.manager.less
M modules/tools/styles/ext.cx.tools.mt.card.less
M modules/tools/styles/ext.cx.tools.mtabuse.less
M modules/tools/styles/ext.cx.tools.reference.less
M modules/tools/styles/ext.cx.tools.template.card.less
M modules/tools/styles/ext.cx.tools.template.editor.less
M modules/tools/styles/ext.cx.tools.template.less
M modules/translation/styles/ext.cx.translation.conflict.less
M modules/translation/styles/ext.cx.translation.less
M modules/widgets/common/ext.cx.common.less
M modules/widgets/common/grid/agora-grid.less
M modules/widgets/common/grid/grid-core.less
M modules/widgets/common/grid/grid-responsive.less
M modules/widgets/pageselector/ext.cx.pageselector.less
M modules/widgets/translator/ext.cx.translator.less
34 files changed, 40 insertions(+), 40 deletions(-)


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

diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index c455e99..4f0e450 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
 .cx-campaign-contributionsmenu {
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less 
b/modules/dashboard/styles/ext.cx.dashboard.less
index 48a39a9..cdfa817 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
 body {
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index abc0ff6..48c3226 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 
 .cx-tlitem,
 .cx-slitem {
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index 5a1582a..9bacbd4 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -1,5 +1,5 @@
-@import '../../widgets/common/ext.cx.common';
-@import 'ext.cx.lists.common';
+@import '../../widgets/common/ext.cx.common.less';
+@import 'ext.cx.lists.common.less';
 @import 'mediawiki.mixins';
 
 .cx-suggestionlist {
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less 
b/modules/dashboard/styles/ext.cx.translationlist.less
index 4a58ac2..4eef3c8 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -1,5 +1,5 @@
-@import '../../widgets/common/ext.cx.common';
-@import 'ext.cx.lists.common';
+@import '../../widgets/common/ext.cx.common.less';
+@import 'ext.cx.lists.common.less';
 @import 'mediawiki.mixins';
 
 .cx-tlitem {
diff --git a/modules/entrypoint/styles/ext.cx.contributions.less 
b/modules/entrypoint/styles/ext.cx.contributions.less
index 438be5c..65ce8cf 100644
--- a/modules/entrypoint/styles/ext.cx.contributions.less
+++ b/modules/entrypoint/styles/ext.cx.contributions.less
@@ -1,4 +1,4 @@
-@import '../../widgets/common/ext.cx.common';
+@import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
 .cx-contributions {
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Move Database and subclass to Rdbms namespace

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336372 )

Change subject: [WIP] Move Database and subclass to Rdbms namespace
..

[WIP] Move Database and subclass to Rdbms namespace

Change-Id: I52bef87512f9ddd155d1f4cc0052f6b7a0db5b42
---
M autoload.php
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabaseMysql.php
M includes/libs/rdbms/database/DatabaseMysqlBase.php
M includes/libs/rdbms/database/DatabaseMysqli.php
M includes/libs/rdbms/database/DatabasePostgres.php
M includes/libs/rdbms/database/DatabaseSqlite.php
M includes/libs/rdbms/database/compat.php
M includes/libs/rdbms/database/utils/SavepointPostgres.php
M includes/libs/rdbms/field/PostgresField.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
M tests/phpunit/includes/db/DatabaseSqliteTest.php
14 files changed, 102 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/336372/1

diff --git a/autoload.php b/autoload.php
index e919381..01400ab 100644
--- a/autoload.php
+++ b/autoload.php
@@ -322,19 +322,13 @@
'DBTransactionSizeError' => __DIR__ . 
'/includes/libs/rdbms/exception/DBTransactionSizeError.php',
'DBUnexpectedError' => __DIR__ . 
'/includes/libs/rdbms/exception/DBUnexpectedError.php',
'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
-   'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
'DatabaseBase' => __DIR__ . 
'/includes/libs/rdbms/database/Database.php',
'DatabaseDomain' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseDomain.php',
'DatabaseInstaller' => __DIR__ . 
'/includes/installer/DatabaseInstaller.php',
'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
'DatabaseLogEntry' => __DIR__ . '/includes/logging/LogEntry.php',
'DatabaseMssql' => __DIR__ . '/includes/db/DatabaseMssql.php',
-   'DatabaseMysql' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysql.php',
-   'DatabaseMysqlBase' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqlBase.php',
-   'DatabaseMysqli' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqli.php',
'DatabaseOracle' => __DIR__ . '/includes/db/DatabaseOracle.php',
-   'DatabasePostgres' => __DIR__ . 
'/includes/libs/rdbms/database/DatabasePostgres.php',
-   'DatabaseSqlite' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseSqlite.php',
'DatabaseUpdater' => __DIR__ . 
'/includes/installer/DatabaseUpdater.php',
'DateFormats' => __DIR__ . '/maintenance/language/date-formats.php',
'DateFormatter' => __DIR__ . '/includes/parser/DateFormatter.php',
@@ -1587,6 +1581,12 @@
'WikiTextStructure' => __DIR__ . 
'/includes/content/WikiTextStructure.php',
'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . 
'/includes/libs/rdbms/ChronologyProtector.php',
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . 
'/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
+   'Wikimedia\\Rdbms\\Database' => __DIR__ . 
'/includes/libs/rdbms/database/Database.php',
+   'Wikimedia\\Rdbms\\DatabaseMysql' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysql.php',
+   'Wikimedia\\Rdbms\\DatabaseMysqlBase' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqlBase.php',
+   'Wikimedia\\Rdbms\\DatabaseMysqli' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqli.php',
+   'Wikimedia\\Rdbms\\DatabasePostgres' => __DIR__ . 
'/includes/libs/rdbms/database/DatabasePostgres.php',
+   'Wikimedia\\Rdbms\\DatabaseSqlite' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseSqlite.php',
'Wikimedia\\Rdbms\\IDatabase' => __DIR__ . 
'/includes/libs/rdbms/database/IDatabase.php',
'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/ILBFactory.php',
'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
diff --git a/includes/libs/rdbms/database/DBConnRef.php 
b/includes/libs/rdbms/database/DBConnRef.php
index 550055d..01b21db 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -1,6 +1,7 @@
 https://gerrit.wikimedia.org/r/336372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52bef87512f9ddd155d1f4cc0052f6b7a0db5b42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move IDatabase/IMaintainableDatabase to Rdbms namespace

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336371 )

Change subject: Move IDatabase/IMaintainableDatabase to Rdbms namespace
..

Move IDatabase/IMaintainableDatabase to Rdbms namespace

Added compat.php file with aliases for the old global interfaces.
Database is marked as implementing both, so that both global and
namespaced type hints of IDatabase work. The former can be removed
once all type-hints have been migrated.

Change-Id: If7e8a8ff574661fd827de8bcec11d2c39a687300
---
M autoload.php
M includes/libs/rdbms/connectionmanager/ConnectionManager.php
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/database/IMaintainableDatabase.php
M includes/libs/rdbms/database/MaintainableDBConnRef.php
A includes/libs/rdbms/database/compat.php
M includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
M includes/libs/rdbms/defines.php
M includes/libs/rdbms/exception/DBConnectionError.php
M includes/libs/rdbms/exception/DBError.php
M includes/libs/rdbms/exception/DBExpectedError.php
M includes/libs/rdbms/exception/DBQueryError.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/lbfactory/LBFactoryMulti.php
M includes/libs/rdbms/lbfactory/LBFactorySingle.php
M includes/libs/rdbms/loadbalancer/ILoadBalancer.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
M includes/libs/rdbms/loadmonitor/LoadMonitor.php
M includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
22 files changed, 63 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/336371/1

diff --git a/autoload.php b/autoload.php
index 970dff0..e919381 100644
--- a/autoload.php
+++ b/autoload.php
@@ -592,14 +592,14 @@
'ICacheHelper' => __DIR__ . '/includes/cache/CacheHelper.php',
'IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
'IDBAccessObject' => __DIR__ . '/includes/dao/IDBAccessObject.php',
-   'IDatabase' => __DIR__ . '/includes/libs/rdbms/database/IDatabase.php',
+   'IDatabase' => __DIR__ . '/includes/libs/rdbms/database/compat.php',
'IEContentAnalyzer' => __DIR__ . 
'/includes/libs/mime/IEContentAnalyzer.php',
'IEUrlExtension' => __DIR__ . '/includes/libs/IEUrlExtension.php',
'IExpiringStore' => __DIR__ . 
'/includes/libs/objectcache/IExpiringStore.php',
'IJobSpecification' => __DIR__ . 
'/includes/jobqueue/JobSpecification.php',
'ILoadBalancer' => __DIR__ . 
'/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
'ILocalizedException' => __DIR__ . 
'/includes/exception/LocalizedException.php',
-   'IMaintainableDatabase' => __DIR__ . 
'/includes/libs/rdbms/database/IMaintainableDatabase.php',
+   'IMaintainableDatabase' => __DIR__ . 
'/includes/libs/rdbms/database/compat.php',
'IP' => __DIR__ . '/includes/libs/IP.php',
'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
'IPTC' => __DIR__ . '/includes/media/IPTC.php',
@@ -1587,8 +1587,10 @@
'WikiTextStructure' => __DIR__ . 
'/includes/content/WikiTextStructure.php',
'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . 
'/includes/libs/rdbms/ChronologyProtector.php',
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . 
'/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
+   'Wikimedia\\Rdbms\\IDatabase' => __DIR__ . 
'/includes/libs/rdbms/database/IDatabase.php',
'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/ILBFactory.php',
'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
+   'Wikimedia\\Rdbms\\IMaintainableDatabase' => __DIR__ . 
'/includes/libs/rdbms/database/IMaintainableDatabase.php',
'Wikimedia\\Rdbms\\LBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactory.php',
'Wikimedia\\Rdbms\\LBFactoryMulti' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactoryMulti.php',
'Wikimedia\\Rdbms\\LBFactorySimple' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactorySimple.php',
diff --git a/includes/libs/rdbms/connectionmanager/ConnectionManager.php 
b/includes/libs/rdbms/connectionmanager/ConnectionManager.php
index 4f72f77..1e65934 100644
--- a/includes/libs/rdbms/connectionmanager/ConnectionManager.php
+++ b/includes/libs/rdbms/connectionmanager/ConnectionManager.php
@@ -4,7 +4,6 @@
 
 use Database;
 use DBConnRef;
-use IDatabase;
 use InvalidArgumentException;
 use LoadBalancer;
 
diff --git a/includes/libs/rdbms/database/DBConnRef.php 
b/includes/libs/rdbms/database/DBConnRef.php
index b268b9f..550055d 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -1,4 +1,7 @@
 

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Make sure wgPageAssessmentProjects is actually an array befo...

[jenkins-bot (Code Review)]

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

Change subject: Make sure wgPageAssessmentProjects is actually an array before 
using
..


Make sure wgPageAssessmentProjects is actually an array before using

It can theoretically return false.

Change-Id: I16ecbf5ece5e051b66f137794f3b93cad4a239c1
---
M modules/ext.pageassessments.special.js
1 file changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/modules/ext.pageassessments.special.js 
b/modules/ext.pageassessments.special.js
index d9a8129..310fa4f 100644
--- a/modules/ext.pageassessments.special.js
+++ b/modules/ext.pageassessments.special.js
@@ -36,13 +36,16 @@
 */
$( 'input[name="project"]' ).suggestions( {
fetch: function ( userInput, response, maxRows ) {
-   var projects = [];
-   $.each( mw.config.get( 'wgPageAssessmentProjects' ), 
function ( index, value ) {
-   if ( value.substring( 0, userInput.length 
).toLocaleLowerCase() === userInput.toLocaleLowerCase() ) {
-   projects.push( value );
-   }
-   } );
-   response( projects.slice( 0, maxRows ) );
+   var allProjects = mw.config.get( 
'wgPageAssessmentProjects' ),
+   matchingProjects = [];
+   if ( Array.isArray( allProjects ) ) {
+   $.each( allProjects, function ( index, value ) {
+   if ( value.substring( 0, 
userInput.length ).toLocaleLowerCase() === userInput.toLocaleLowerCase() ) {
+   matchingProjects.push( value );
+   }
+   } );
+   }
+   response( matchingProjects.slice( 0, maxRows ) );
}
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16ecbf5ece5e051b66f137794f3b93cad4a239c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Samwilson 
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]: Don't escape text in some messages so that admins can add li...

[jenkins-bot (Code Review)]

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

Change subject: Don't escape text in some messages so that admins can add links 
to external tools
..


Don't escape text in some messages so that admins can add links to external 
tools

Admins already have the ability to edit site JS, etc., so I don't think we 
should be concerned about malicious content

This patch allows markup in all messages in the edit interface, except the 
labels for the checkboxes

Bug: T157235
Change-Id: I5f1a2cd536a2c7ec5f7a5d7afbf124104bfcd975
---
M Views/AbuseFilterViewEdit.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index ca25b6a..a8eddec 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -315,7 +315,7 @@
$out->addSubtitle( $this->msg(
$filter === 'new' ? 'abusefilter-edit-subtitle-new' : 
'abusefilter-edit-subtitle',
$this->getLanguage()->formatNum( $filter ), $history_id
-   )->text() );
+   )->parse() );
 
// Hide hidden filters.
if ( ( ( isset( $row->af_hidden ) && $row->af_hidden ) ||
@@ -402,7 +402,7 @@
} else {

$fields['abusefilter-edit-status-label'] = $this->msg( 
'abusefilter-edit-status' )
->numParams( $total, 
$matches_count, $matches_percent )
-   ->escaped();
+   ->parse();
}
}
}
@@ -478,7 +478,7 @@
'p', null,
$this->linkRenderer->makeLink(
$this->getTitle( 
"revert/$filter" ),
-   $this->msg( 
'abusefilter-edit-revert' )->text()
+   new HtmlArmor( $this->msg( 
'abusefilter-edit-revert' )->parse() )
)
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f1a2cd536a2c7ec5f7a5d7afbf124104bfcd975
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MusikAnimal 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Kaldari 
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...ContentTranslation[master]: stylelint: Disable no-unsupported-browser-features rule

[jenkins-bot (Code Review)]

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

Change subject: stylelint: Disable no-unsupported-browser-features rule
..


stylelint: Disable no-unsupported-browser-features rule

Deprecated with stylelint 7.8.0

Change-Id: I03e41dafd3d124b0de9ac06608918df046b0957e
---
M .stylelintrc
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/entrypoint/styles/ext.cx.contributions.less
M modules/publish/styles/ext.cx.publish.dialog.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.selector.less
M modules/stats/styles/ext.cx.stats.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/tools/styles/ext.cx.tools.instructions.less
M modules/tools/styles/ext.cx.tools.less
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.linker.less
M modules/tools/styles/ext.cx.tools.linter.less
M modules/tools/styles/ext.cx.tools.mt.card.less
M modules/tools/styles/ext.cx.tools.mtabuse.less
M modules/tools/styles/ext.cx.tools.reference.less
M modules/tools/styles/ext.cx.tools.template.card.less
M modules/tools/styles/ext.cx.tools.template.editor.less
M modules/tools/styles/ext.cx.tools.template.less
M modules/tools/styles/mw.cx.tools.LinkTool.less
M modules/translation/styles/ext.cx.translation.less
M modules/ui/legacy/styles/mw.cx.ui.Columns.less
M modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
M modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
M modules/ui/styles/mw.cx.ui.Columns.less
M modules/ui/styles/mw.cx.ui.Header.less
M modules/ui/styles/mw.cx.ui.Infobar.less
M modules/ui/styles/mw.cx.ui.ToolsColumn.less
M modules/ui/styles/mw.cx.ui.TranslationColumn.less
M modules/widgets/callout/ext.cx.callout.css
M modules/widgets/common/ext.cx.column.less
M modules/widgets/common/ext.cx.common.less
M modules/widgets/common/ext.cx.highlight.less
M modules/widgets/feedback/styles/ext.cx.feedback.less
M modules/widgets/mw.cx.widgets.ProgressBarWidget.less
M modules/widgets/pageselector/ext.cx.pageselector.less
M modules/widgets/progressbar/ext.cx.progressbar.less
M modules/widgets/spinner/ext.cx.spinner.less
M modules/widgets/translator/ext.cx.translator.less
45 files changed, 107 insertions(+), 116 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
index 195d9ee..2c90730 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,12 +1,3 @@
 {
-   "extends": "stylelint-config-wikimedia",
-   "rules": {
-   "no-browser-hacks": [ true, {
-   "browsers": "last 2 Chrome versions, last 2 Firefox 
versions, Explorer >= 9, Edge >= 12, iOS >= 7, Opera >= 12.1, Safari >= 5.1, 
ExplorerMobile >= 10, Android >= 4, not BlackBerry >= 1, ChromeAndroid >= 1, 
FirefoxAndroid >= 1, OperaMobile >= 12, not OperaMini >= 1"
-   } ],
-
-   "no-unsupported-browser-features": [ true, {
-   "browsers": "last 2 Chrome versions, last 2 Firefox 
versions, Explorer >= 9, Edge >= 12, iOS >= 7, Opera >= 12.1, Safari >= 5.1, 
ExplorerMobile >= 10, Android >= 4, not BlackBerry >= 1, ChromeAndroid >= 1, 
FirefoxAndroid >= 1, OperaMobile >= 12, not OperaMini >= 1"
-   } ]
-   }
+   "extends": "stylelint-config-wikimedia"
 }
diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index 9949bb2..c455e99 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -15,7 +15,7 @@
margin: 0;
border-bottom: 1px solid @gray;
min-width: 200px;
-   background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
+   background-size: 24px;
background-position: left 10px center;
background-repeat: no-repeat;
 
@@ -45,11 +45,11 @@
.background-image-svg('../images/blue-beta.svg', 
'../images/blue-beta.png');
background-position: right center;
background-repeat: no-repeat;
-   background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
+   background-size: 24px;
}
 
.cx-campaign-contributionsmenu__expansion {
-   background-size: 24px; /* stylelint-disable-line 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: New OOUI icon - halfStar icon

[SamanthaNguyen (Code Review)]

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

Change subject: New OOUI icon - halfStar icon
..

New OOUI icon - halfStar icon

Bug: T156553
Change-Id: I99a5428d8e7504e7d064b30ef1759f09f7c7a0c9
---
M demos/pages/icons.js
M src/themes/apex/icons-moderation.json
A src/themes/apex/images/icons/halfStar.svg
M src/themes/mediawiki/icons-moderation.json
A src/themes/mediawiki/images/icons/halfStar.svg
5 files changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/70/336370/1

diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 10b689d..49a4cbd 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -86,6 +86,7 @@
'lock',
'unLock',
'star',
+   'halfStar',
'unStar',
'trash',
'unTrash',
diff --git a/src/themes/apex/icons-moderation.json 
b/src/themes/apex/icons-moderation.json
index b5dff27..1bbb97d 100644
--- a/src/themes/apex/icons-moderation.json
+++ b/src/themes/apex/icons-moderation.json
@@ -29,6 +29,7 @@
"rtl": "images/icons/unLock-rtl.svg"
} },
"star": { "file": "images/icons/star.svg" },
+   "halfStar": { "file": "images/icons/halfStar.svg" },
"unStar": { "file": "images/icons/unStar.svg" },
"trash": { "file": "images/icons/trash.svg" },
"unTrash": { "file": {
diff --git a/src/themes/apex/images/icons/halfStar.svg 
b/src/themes/apex/images/icons/halfStar.svg
new file mode 100644
index 000..4aa9df5
--- /dev/null
+++ b/src/themes/apex/images/icons/halfStar.svg
@@ -0,0 +1,8 @@
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
+viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" 
xml:space="preserve">
+
+   
+   
+
+
diff --git a/src/themes/mediawiki/icons-moderation.json 
b/src/themes/mediawiki/icons-moderation.json
index 9cc0f32..a0aa01f 100644
--- a/src/themes/mediawiki/icons-moderation.json
+++ b/src/themes/mediawiki/icons-moderation.json
@@ -52,6 +52,7 @@
"rtl": "images/icons/unLock-rtl.svg"
}, "variants": [ "destructive" ] },
"star": { "file": "images/icons/star.svg", "variants": [ 
"constructive", "progressive" ] },
+   "halfStar": { "file": "images/icons/halfStar.svg", "variants": 
[ "constructive", "progressive" ] },
"unStar": { "file": "images/icons/unStar.svg", "variants": [ 
"constructive", "progressive" ] },
"trash": { "file": "images/icons/trash.svg" },
"unTrash": { "file": {
diff --git a/src/themes/mediawiki/images/icons/halfStar.svg 
b/src/themes/mediawiki/images/icons/halfStar.svg
new file mode 100644
index 000..4aa9df5
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/halfStar.svg
@@ -0,0 +1,8 @@
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
+viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" 
xml:space="preserve">
+
+   
+   
+
+

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: operations/software/tools-manifest: Make debian-glue voting

[Tim Landscheidt (Code Review)]

Hello Hashar,

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

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

to review the following change.


Change subject: operations/software/tools-manifest: Make debian-glue voting
..

operations/software/tools-manifest: Make debian-glue voting

Bug: T156651
Change-Id: I8e2ddd007492b14fd4231cc515b354a107afd069
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/69/336369/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 222461f..31e2be0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2457,7 +2457,9 @@
 template:
   - name: tox-jessie
 test:
-  - debian-glue-non-voting
+  - debian-glue
+gate-and-submit:
+  - debian-glue
 
   - name: operations/software/tools-webservice
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e2ddd007492b14fd4231cc515b354a107afd069
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] operations...tools-manifest[master]: Cut release 0.11

[jenkins-bot (Code Review)]

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

Change subject: Cut release 0.11
..


Cut release 0.11

Change-Id: I9a9a105994c2b20db935661658c234a103bd0d20
---
M debian/changelog
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index f21fc13..49c44c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-tools-manifest (0.11~dev) trusty; urgency=medium
+tools-manifest (0.11) trusty; urgency=medium
 
   * Correct weekday in changelog entry
   * Add extended description to control
   * Generate man page for collector-runner
   * Do not manage service with package scripts
 
- -- Tim Landscheidt   Tue, 07 Feb 2017 03:41:10 +
+ -- Tim Landscheidt   Tue, 07 Feb 2017 04:17:35 +
 
 tools-manifest (0.10) trusty; urgency=low
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a9a105994c2b20db935661658c234a103bd0d20
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Tim Landscheidt 
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...tools-manifest[master]: Cut release 0.11

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336368 )

Change subject: Cut release 0.11
..

Cut release 0.11

Change-Id: I9a9a105994c2b20db935661658c234a103bd0d20
---
M debian/changelog
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-manifest 
refs/changes/68/336368/1

diff --git a/debian/changelog b/debian/changelog
index f21fc13..49c44c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-tools-manifest (0.11~dev) trusty; urgency=medium
+tools-manifest (0.11) trusty; urgency=medium
 
   * Correct weekday in changelog entry
   * Add extended description to control
   * Generate man page for collector-runner
   * Do not manage service with package scripts
 
- -- Tim Landscheidt   Tue, 07 Feb 2017 03:41:10 +
+ -- Tim Landscheidt   Tue, 07 Feb 2017 04:17:35 +
 
 tools-manifest (0.10) trusty; urgency=low
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a9a105994c2b20db935661658c234a103bd0d20
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] operations...tools-manifest[master]: Do not manage service with package scripts

[jenkins-bot (Code Review)]

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

Change subject: Do not manage service with package scripts
..


Do not manage service with package scripts

dh_installinit does not seem to generate a postrm script for
upstart-only services.  However as the service is explicitly managed
by Puppet, there is no need for starting or stopping the service on
package installation or removal anyway, so this change disables
dh_installinit amending the package scripts.

Bug: T156651
Change-Id: I22370a5d6c8e89ab7aa99d6a0e667a7e4ae5dc43
---
M debian/changelog
M debian/rules
2 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 4b2122f..f21fc13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@
   * Correct weekday in changelog entry
   * Add extended description to control
   * Generate man page for collector-runner
+  * Do not manage service with package scripts
 
- -- Tim Landscheidt   Sun, 05 Feb 2017 06:33:23 +
+ -- Tim Landscheidt   Tue, 07 Feb 2017 03:41:10 +
 
 tools-manifest (0.10) trusty; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 05287db..80bfd91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,9 @@
rm -f collector-runner.1
dh_clean
 
+# The service is explicitly managed by Puppet, so there is no need to
+# start or stop it on package installation or removal.  In addition,
+# dh_installinit does not seem to generate a postrm script for
+# upstart-only services.
 override_dh_installinit:
-   dh_installinit --name=webservicemonitor
+   dh_installinit --noscripts --name=webservicemonitor

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22370a5d6c8e89ab7aa99d6a0e667a7e4ae5dc43
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Tim Landscheidt 
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...tools-manifest[master]: Do not manage service with package scripts

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336367 )

Change subject: Do not manage service with package scripts
..

Do not manage service with package scripts

dh_installinit does not seem to generate a postrm script for
upstart-only services.  However as the service is explicitly managed
by Puppet, there is no need for starting or stopping the service on
package installation or removal anyway, so this change disables
dh_installinit amending the package scripts.

Bug: T156651
Change-Id: I22370a5d6c8e89ab7aa99d6a0e667a7e4ae5dc43
---
M debian/changelog
M debian/rules
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-manifest 
refs/changes/67/336367/1

diff --git a/debian/changelog b/debian/changelog
index 4b2122f..f21fc13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@
   * Correct weekday in changelog entry
   * Add extended description to control
   * Generate man page for collector-runner
+  * Do not manage service with package scripts
 
- -- Tim Landscheidt   Sun, 05 Feb 2017 06:33:23 +
+ -- Tim Landscheidt   Tue, 07 Feb 2017 03:41:10 +
 
 tools-manifest (0.10) trusty; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 05287db..80bfd91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,9 @@
rm -f collector-runner.1
dh_clean
 
+# The service is explicitly managed by Puppet, so there is no need to
+# start or stop it on package installation or removal.  In addition,
+# dh_installinit does not seem to generate a postrm script for
+# upstart-only services.
 override_dh_installinit:
-   dh_installinit --name=webservicemonitor
+   dh_installinit --noscripts --name=webservicemonitor

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22370a5d6c8e89ab7aa99d6a0e667a7e4ae5dc43
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Update stylelint version

[jenkins-bot (Code Review)]

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

Change subject: Update stylelint version
..


Update stylelint version

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

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



diff --git a/package.json b/package.json
index 947c403..7265735 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,6 @@
 "grunt-jsonlint": "1.0.8",
 "grunt-stylelint": "0.6.0",
 "stylelint-config-wikimedia": "0.3.0",
-"stylelint": "^7.0.2"
+"stylelint": "^7.8.0"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8b71cb028bf2a6313eaeeca6e5e617cbbe5e855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix crasher from 85b7a988

[jenkins-bot (Code Review)]

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

Change subject: Fix crasher from 85b7a988
..


Fix crasher from 85b7a988

* The affected page won't render properly -- it was broken before
  the template handler refactoring and is still broken now.

Change-Id: Ia395d11486186d1961f12506ab6517f2f6b05812
---
M lib/wt2html/tt/TemplateHandler.js
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/lib/wt2html/tt/TemplateHandler.js 
b/lib/wt2html/tt/TemplateHandler.js
index f3e3e7c..ccb832d 100644
--- a/lib/wt2html/tt/TemplateHandler.js
+++ b/lib/wt2html/tt/TemplateHandler.js
@@ -392,6 +392,15 @@
// even though the target (=lc) matches a registered parser-function 
name.
if ((magicWordAlias && this.parserFunctions && 
this.parserFunctions['pf_' + magicWordAlias]) ||
(pieces.length > 1 && (translatedPrefix[0] === '#' || 
wiki.functionHooks.has(translatedPrefix {
+
+   // FIXME: In the scenario where the target itself is
+   // templated / is not a string, protect from crashers by
+   // using the full token -- this is still going to generate
+   // incorrect output, but it won't crash.
+   // Ex: {{safesubst:#invoke:RfD|foo}}
+   var t0Src = typeof targetToks[0] === 'string' ?
+   targetToks[0].replace(/^[^:]*:?/, '') : targetToks[0];
+
state.parserFunctionName = translatedPrefix;
return {
isPF: true,
@@ -400,7 +409,7 @@
target: 'pf_' + translatedPrefix,
pfArg: target.substr(prefix.length + 1),
// Extract toks that make up pfArg
-   pfArgToks: [targetToks[0].replace(/^[^:]*:?/, 
'')].concat(targetToks.slice(1)),
+   pfArgToks: [t0Src].concat(targetToks.slice(1)),
};
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia395d11486186d1961f12506ab6517f2f6b05812
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add class to diff and history links in Special:Contributions

[jenkins-bot (Code Review)]

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

Change subject: Add class to diff and history links in Special:Contributions
..


Add class to diff and history links in Special:Contributions

Bug: T157178
Change-Id: I4fb26d55a0b7721e430b497440029c6de254dd8f
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index 0c3a211..47a2aed 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -402,7 +402,7 @@
$difftext = $linkRenderer->makeKnownLink(
$page,
new HtmlArmor( $this->messages['diff'] 
),
-   [],
+   [ 'class' => 'mw-changeslist-diff' ],
[
'diff' => 'prev',
'oldid' => $row->rev_id
@@ -414,7 +414,7 @@
$histlink = $linkRenderer->makeKnownLink(
$page,
new HtmlArmor( $this->messages['hist'] ),
-   [],
+   [ 'class' => 'mw-changeslist-history' ],
[ 'action' => 'history' ]
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fb26d55a0b7721e430b497440029c6de254dd8f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Remove unnecessary `font-weight` property

[VolkerE (Code Review)]

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

Change subject: MediaWiki theme: Remove unnecessary `font-weight` property
..

MediaWiki theme: Remove unnecessary `font-weight` property

Removing unnecessary `font-weight: 500;` property. As `500` falls
back to `normal` when the font doesn't support it, and neither
Arial nor Helvetica does as `sans-serif` default, setting it is
of no use currently

Change-Id: Ia26a51b7784de9bdf46b180c67d85ab4641b3e16
---
M src/themes/mediawiki/tools.less
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/66/336366/1

diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index d1e8ce9..21441b9 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -4,7 +4,6 @@
&-bar {
background-color: @background-color-toolbar;
color: @color-default;
-   font-weight: 500;
 
.oo-ui-toolbar-position-top > & {
border-bottom: @border-toolbar;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] Run tests files from parserTests.json

[Arlolra (Code Review)]

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

Change subject: [WIP] Run tests files from parserTests.json
..

[WIP] Run tests files from parserTests.json

Change-Id: I703f02ed0a6b063ef4cd3e92c68d8bfda9131386
---
M bin/parserTests.js
1 file changed, 23 insertions(+), 15 deletions(-)


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

diff --git a/bin/parserTests.js b/bin/parserTests.js
index 6507a81..0e634bf 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -41,9 +41,6 @@
 // Run a mock API in the background so we can request things from it
 var mockAPIServerURL;
 
-// track files imported / required
-var fileDependencies = [];
-
 var exitUnexpected = new Error('unexpected failure');  // unique marker value
 
 // Our code...
@@ -91,7 +88,7 @@
var i;
 
this.cacheFile = "parserTests.cache"; // Name of file used to cache the 
parser tests cases
-   this.parserTestsFile = "parserTests.txt";
+   this.parserTestsFile = "parserTests.json";
 
this.articles = {};
this.tests = new Set();
@@ -300,6 +297,9 @@
  * @return {Object}
  */
 ParserTests.prototype.getTests = function(argv) {
+   // track files imported / required
+   var fileDependencies = [];
+
// Startup by loading .txt test file
var testFile;
try {
@@ -308,6 +308,7 @@
} catch (e) {
console.error(e);
}
+
// parser grammar is also a dependency
fileDependencies.push(this.testParserFileName);
 
@@ -328,6 +329,7 @@
.digest('hex');
 
var cacheFileName = __dirname + '/../tests/' + this.cacheFile;
+
// Look for a cacheFile
var cacheContent;
var cacheFileDigest;
@@ -1462,8 +1464,9 @@
  * @param {number} stats.passedTests Number of tests passed without any 
special consideration
  * @param {number} stats.passedTestsWhitelisted Number of tests passed by 
whitelisting
  * @param {Object} stats.modes All of the stats (failedTests, passedTests, and 
passedTestsWhitelisted) per-mode.
+ * @param {String} file
  */
-ParserTests.prototype.reportSummary = function(modesRan, stats) {
+ParserTests.prototype.reportSummary = function(modesRan, stats, file) {
var curStr, mode, thisMode;
var failTotalTests = stats.failedTests;
 
@@ -1627,7 +1630,14 @@
if (options._[0]) {
this.testFileName = options._[0] ;
} else {
-   this.testFileName = __dirname + '/../tests/' + 
this.parserTestsFile;
+   this.testFileName = path.join(__dirname, '../tests/' + 
this.parserTestsFile);
+   }
+
+   if ((options['update-tests'] || options['update-unexpected']) &&
+   path.parse(this.testFileName).ext !== '.txt') {
+   console.error('To update, please run with a specific tests 
file. ' +
+   'The default is to use all the files in ' + 
this.testFileName);
+   process.exit(1);
}
 
try {
@@ -2155,8 +2165,7 @@
booleanOption(options['update-unexpected'])) {
var updateFormat = (options['update-tests'] === 'raw') ?
'raw' : 'actualNormalized';
-   var parserTestsFilename = __dirname + 
'/../tests/parserTests.txt';
-   var parserTests = fs.readFileSync(parserTestsFilename, 
'utf8');
+   var parserTests = fs.readFileSync(this.testFileName, 
'utf8');

this.stats.modes.wt2html.failList.forEach(function(fail) {
if (options['update-tests'] || fail.unexpected) 
{
var exp = new RegExp("(" + 
/!!\s*test\s*/.source +
@@ -2166,14 +2175,14 @@

fail[updateFormat].replace(/\$/g, ''));
}
});
-   fs.writeFileSync(parserTestsFilename, parserTests, 
'utf8');
+   fs.writeFileSync(this.testFileName, parserTests, 
'utf8');
}
 
// print out the summary
// note: these stats won't necessarily be useful if someone
// reimplements the reporting methods, since that's where we
// increment the stats.
-   var failures = options.reportSummary(options.modes, this.stats);
+   var failures = options.reportSummary(options.modes, this.stats, 
this.testFileName);
 
// we're done!
if (booleanOption(options['exit-zero'])) {
@@ -2241,19 +2250,18 @@
 *
 * Report the start of the tests output.
 */
-   var reportStartXML = function() {
-   console.log('');
-   };
+   var reportStartXML = 

[MediaWiki-commits] [Gerrit] operations...tools-manifest[master]: Generate man page for collector-runner

[jenkins-bot (Code Review)]

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

Change subject: Generate man page for collector-runner
..


Generate man page for collector-runner

Bug: T156651
Change-Id: I1df500f9101448f68e1558bd0eff0843e31ac377
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 19 insertions(+), 2 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 41571ed..4b2122f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@
 
   * Correct weekday in changelog entry
   * Add extended description to control
+  * Generate man page for collector-runner
 
- -- Tim Landscheidt   Sun, 05 Feb 2017 06:20:38 +
+ -- Tim Landscheidt   Sun, 05 Feb 2017 06:33:23 +
 
 tools-manifest (0.10) trusty; urgency=low
 
diff --git a/debian/control b/debian/control
index ecbeea5..5f46fe6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@
 Maintainer: Yuvi Panda 
 Section: python
 Priority: optional
-Build-Depends: python3-setuptools, python3-all, debhelper (>= 9)
+Build-Depends: debhelper (>= 9), help2man, python3-setuptools,
+ python3-all
 Standards-Version: 3.9.5
 
 Package: tools-manifest
diff --git a/debian/rules b/debian/rules
index 7c58135..05287db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,22 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 %:
dh $@ --with python3 --buildsystem=pybuild
 
+collector-runner.1:
+   PYTHONPATH=${CURDIR} help2man --no-info \
+   --version-string="${DEB_VERSION}" -o $@ \
+   -n 'collect manifests and perform operations on them'   \
+   $(CURDIR)/debian/tools-manifest/usr/bin/collector-runner
+
+override_dh_installman: collector-runner.1
+   dh_installman collector-runner.1
+
+override_dh_clean:
+   rm -f collector-runner.1
+   dh_clean
+
 override_dh_installinit:
dh_installinit --name=webservicemonitor

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1df500f9101448f68e1558bd0eff0843e31ac377
Gerrit-PatchSet: 7
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
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...tools-manifest[master]: Add extended description to control

[jenkins-bot (Code Review)]

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

Change subject: Add extended description to control
..


Add extended description to control

Bug: T156651
Change-Id: Ic4aa4ddb42e8574fca29b66d12faf57cd7a1d5fb
---
M debian/changelog
M debian/control
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index d574e04..41571ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 tools-manifest (0.11~dev) trusty; urgency=medium
 
   * Correct weekday in changelog entry
+  * Add extended description to control
 
- -- Tim Landscheidt   Sun, 05 Feb 2017 06:15:27 +
+ -- Tim Landscheidt   Sun, 05 Feb 2017 06:20:38 +
 
 tools-manifest (0.10) trusty; urgency=low
 
diff --git a/debian/control b/debian/control
index 03ed4dd..ecbeea5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,3 +9,6 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
 Description: Infrastructure for running services on tools.wmflabs.org
+ tools-manifest provides an upstart service that (re-)starts
+ webservices if a tool's service.manifest requires it, but
+ no running webservice is found.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4aa4ddb42e8574fca29b66d12faf57cd7a1d5fb
Gerrit-PatchSet: 3
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
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]: DHCP: switch install1001->1002, 2001->2002 as TFTP server

[Dzahn (Code Review)]

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

Change subject: DHCP: switch install1001->1002, 2001->2002 as TFTP server
..

DHCP: switch install1001->1002, 2001->2002 as TFTP server

Change-Id: I1088cdabb798d4ff144aab86e715cb57098abd13
---
M modules/install_server/files/dhcpd/dhcpd.conf
1 file changed, 26 insertions(+), 26 deletions(-)


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

diff --git a/modules/install_server/files/dhcpd/dhcpd.conf 
b/modules/install_server/files/dhcpd/dhcpd.conf
index 92361d1..07ef169 100644
--- a/modules/install_server/files/dhcpd/dhcpd.conf
+++ b/modules/install_server/files/dhcpd/dhcpd.conf
@@ -34,7 +34,7 @@
 option routers 208.80.153.1;
 option domain-name "wikimedia.org";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # public1-b-codfw
@@ -46,7 +46,7 @@
 option routers 208.80.153.33;
 option domain-name "wikimedia.org";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # public1-c-codfw
@@ -58,7 +58,7 @@
 option routers 208.80.153.65;
 option domain-name "wikimedia.org";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 
@@ -71,7 +71,7 @@
 option routers 208.80.153.97;
 option domain-name "wikimedia.org";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # private1-a-codfw
@@ -83,7 +83,7 @@
 option routers 10.192.0.1;
 option domain-name "codfw.wmnet";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # private1-b-codfw
@@ -95,7 +95,7 @@
 option routers 10.192.16.1;
 option domain-name "codfw.wmnet";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # labs-hosts1-b-codfw
@@ -107,7 +107,7 @@
 option routers 10.192.20.1;
 option domain-name "codfw.wmnet";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # labs-support1-b-codfw
@@ -119,7 +119,7 @@
 option routers 10.192.21.1;
 option domain-name "codfw.wmnet";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # private1-c-codfw
@@ -131,7 +131,7 @@
 option routers 10.192.32.1;
 option domain-name "codfw.wmnet";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 # private1-d-codfw
@@ -143,7 +143,7 @@
 option routers 10.192.48.1;
 option domain-name "codfw.wmnet";
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 }
 
 #
@@ -159,7 +159,7 @@
 option routers 208.80.154.1;
 option domain-name "wikimedia.org";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # public1-b-eqiad
@@ -171,7 +171,7 @@
 option routers 208.80.154.129;
 option domain-name "wikimedia.org";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # public1-c-eqiad
@@ -183,7 +183,7 @@
 option routers 208.80.154.65;
 option domain-name "wikimedia.org";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # public1-d-eqiad
@@ -195,7 +195,7 @@
 option routers 208.80.155.97;
 option domain-name "wikimedia.org";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # sandbox1-b-eqiad
@@ -207,7 +207,7 @@
 option routers 208.80.155.65;
 option domain-name "wikimedia.org";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # private1-a-eqiad
@@ -219,7 +219,7 @@
 option routers 10.64.0.1;
 option domain-name "eqiad.wmnet";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # private1-b-eqiad
@@ -231,7 +231,7 @@
 option routers 10.64.16.1;
 option domain-name "eqiad.wmnet";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 }
 
 # private1-c-eqiad
@@ -243,7 +243,7 @@
 option routers 10.64.32.1;
 option domain-name "eqiad.wmnet";
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netboot: remove install2001

[Dzahn (Code Review)]

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

Change subject: netboot: remove install2001
..

netboot: remove install2001

Change-Id: I79435a78cf212f95dcca2d7e2f6a6e76dbefe3aa
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 8abbbd4..f3cfd5e 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -54,7 +54,7 @@
 arsenic|heze|neodymium|oxygen|promethium|strontium|terbium|europium) 
echo partman/lvm.cfg ;; \
 copper|ruthenium|subra|suhail|ocg1003) echo partman/raid1-lvm.cfg ;; \
 bast[1234]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
-californium|dbproxy10[0-1][0-9]|install2001|iridium) echo 
partman/raid1.cfg ;; \
+californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
 boron) echo partman/lvm.cfg ;; \
 helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;; 
\
 
lawrencium|netmon1001|notebook1001|notebook1002|stat1002|tungsten|labsdb100[0-9]|labsdb101[0-1])
 echo partman/db.cfg ;; \

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: switch codfw aggregator to install2002

[Dzahn (Code Review)]

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

Change subject: ganglia: switch codfw aggregator to install2002
..

ganglia: switch codfw aggregator to install2002

Change-Id: Idcbeac6f5df71d390283da73c076148dd6d3aacd
---
M hieradata/codfw.yaml
M manifests/site.pp
M modules/ganglia/manifests/configuration.pp
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/336362/1

diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index d2aead4..4e865ed 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -17,7 +17,7 @@
   - '10.192.32.23:11211:1 "shard16"'
 
 jobrunner_state: 'stopped'
-ganglia_aggregators: install2001.wikimedia.org:10649
+ganglia_aggregators: install2002.wikimedia.org:10649
 
 # Default zookeeper cluster to use in codfw.
 # The cluster config is in common.yaml in zookeeper_clusters.
diff --git a/manifests/site.pp b/manifests/site.pp
index 20795e0..9792851 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1338,10 +1338,6 @@
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
-
-class { '::ganglia::monitor::aggregator':
-sites =>  'codfw',
-}
 }
 
 node 'install2002.wikimedia.org' {
@@ -1357,6 +1353,10 @@
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
+
+class { '::ganglia::monitor::aggregator':
+sites =>  'codfw',
+}
 }
 
 # Phabricator
diff --git a/modules/ganglia/manifests/configuration.pp 
b/modules/ganglia/manifests/configuration.pp
index 3e350f3..d02e987 100644
--- a/modules/ganglia/manifests/configuration.pp
+++ b/modules/ganglia/manifests/configuration.pp
@@ -8,7 +8,7 @@
 $aggregator_hosts = {
 'eqiad' => [ ipresolve('install1002.wikimedia.org') ],
 'esams' => [ ipresolve('bast3001.wikimedia.org') ],
-'codfw' => [ ipresolve('install2001.wikimedia.org') ],
+'codfw' => [ ipresolve('install2002.wikimedia.org') ],
 'ulsfo' => [ ipresolve('bast4001.wikimedia.org') ],
 }
 $base_port = 8649

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: switch eqiad aggregator to install1002

[Dzahn (Code Review)]

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

Change subject: ganglia: switch eqiad aggregator to install1002
..

ganglia: switch eqiad aggregator to install1002

Change-Id: I275941115968db3fb43d6654938199b9850b06e5
---
M hieradata/eqiad.yaml
M manifests/site.pp
M modules/ganglia/manifests/configuration.pp
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/336361/1

diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 37ca9a9..7e6475b 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -24,7 +24,7 @@
 #
 # Ganglia
 #
-ganglia_aggregators: install1001.wikimedia.org:9649
+ganglia_aggregators: install1002.wikimedia.org:9649
 
 # Eventlogging
 eventlogging_host: 10.64.32.167 # eventlog1001
diff --git a/manifests/site.pp b/manifests/site.pp
index fc35fb0..20795e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1304,10 +1304,6 @@
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
-
-class { '::ganglia::monitor::aggregator':
-sites =>  'eqiad',
-}
 }
 
 node 'install1002.wikimedia.org' {
@@ -1323,6 +1319,10 @@
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
+
+class { '::ganglia::monitor::aggregator':
+sites =>  'eqiad',
+}
 }
 
 node 'install2001.wikimedia.org' {
diff --git a/modules/ganglia/manifests/configuration.pp 
b/modules/ganglia/manifests/configuration.pp
index 2576e83..3e350f3 100644
--- a/modules/ganglia/manifests/configuration.pp
+++ b/modules/ganglia/manifests/configuration.pp
@@ -6,7 +6,7 @@
 $url = 'http://ganglia.wikimedia.org'
 $gmetad_hosts = [ '208.80.154.53']
 $aggregator_hosts = {
-'eqiad' => [ ipresolve('install1001.wikimedia.org') ],
+'eqiad' => [ ipresolve('install1002.wikimedia.org') ],
 'esams' => [ ipresolve('bast3001.wikimedia.org') ],
 'codfw' => [ ipresolve('install2001.wikimedia.org') ],
 'ulsfo' => [ ipresolve('bast4001.wikimedia.org') ],

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Use correct `border-color` on PopupWidget a...

[VolkerE (Code Review)]

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

Change subject: MediaWiki theme: Use correct `border-color` on PopupWidget 
anchor
..

MediaWiki theme: Use correct `border-color` on PopupWidget anchor

Replacing leftover fixed value on PopupWidget's anchor with
default `border-color` Less variable. Also replacing wrong variable
with correct one, which holds the same value.

Change-Id: I30c42c45071a712e47e5259a607f89e723ac3896
---
M src/themes/mediawiki/widgets.less
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/60/336360/1

diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index e27e355..99da5bf 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1309,14 +1309,14 @@
.oo-ui-popupWidget-anchor:before {
bottom: -@size-anchor - 1px;
left: -@size-anchor;
-   border-bottom-color: #888;
+   border-bottom-color: @border-color-default;
border-width: @size-anchor + 1px;
}
 
.oo-ui-popupWidget-anchor:after {
bottom: -@size-anchor - 1px;
left: -@size-anchor + 1px;
-   border-bottom-color: @border-color-disabled-filled;
+   border-bottom-color: @background-color-default;
border-width: @size-anchor;
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Use mediawiki cache for IP Velocity

[jenkins-bot (Code Review)]

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

Change subject: Use mediawiki cache for IP Velocity
..


Use mediawiki cache for IP Velocity

Change-Id: I8a831b7ef95614609e60561b8a4db8eb6f85769d
TODO: more tests
---
M README.txt
M extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
A tests/phpunit/IPVelocityTest.php
3 files changed, 114 insertions(+), 53 deletions(-)

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



diff --git a/README.txt b/README.txt
index 3308f57..2ee6d4a 100644
--- a/README.txt
+++ b/README.txt
@@ -468,8 +468,6 @@
 $wgDonationInterfaceCustomFiltersInitialFunctions = array()
 
 //IP velocity filter globals
-$wgDonationInterfaceMemcacheHost = 'localhost'
-$wgDonationInterfaceMemcachePort = '11211'
 $wgDonationInterfaceIPVelocityFailScore = 100
 $wgDonationInterfaceIPVelocityTimeout = 60 * 5 //5 minutes in seconds
 $wgDonationInterfaceIPVelocityThreshhold = 3   //3 transactions per timeout
diff --git a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php 
b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
index 58b24ca..9b05f21 100644
--- a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
+++ b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php
@@ -17,8 +17,8 @@
protected $cfo;
 
/**
-* Memcached instance we use to store and retrieve scores
-* @var Memcached
+* Cache instance we use to store and retrieve scores
+* @var BagOStuff
 */
protected $cache_obj;
 
@@ -29,6 +29,7 @@
 
parent::__construct( $gateway_adapter );
$this->cfo = $custom_filter_object;
+   $this->cache_obj = ObjectCache::getLocalClusterInstance();
}
 
protected function filter() {
@@ -46,64 +47,38 @@
$this->cfo->addRiskScore( 
$this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPBlacklist' );
return true;
}
-   
-   //if the user ip was in neither list, check the velocity. 
-   if ( $this->connectToMemcache() ){
 
-   $stored = $this->getMemcachedValue();
+   $stored = $this->getCachedValue();
 
-   if (!$stored){ //we don't have anything in memcache for 
this dude yet.
-   $this->gateway_adapter->debugarray[] = "Found 
no memcached data for $user_ip";
-   $this->cfo->addRiskScore( 0, 'IPVelocityFilter' 
); //want to see the explicit zero
-   return true;
+   if (!$stored){ //we don't have anything in memcache for this 
dude yet.
+   $this->gateway_adapter->debugarray[] = "Found no 
memcached data for $user_ip";
+   $this->cfo->addRiskScore( 0, 'IPVelocityFilter' ); 
//want to see the explicit zero
+   return true;
+   } else {
+   $count = count( $stored );
+   $this->gateway_adapter->debugarray[] = "Found a 
memcached bit of data for $user_ip: " . print_r($stored, true);
+   $this->gateway_logger->info( "IPVelocityFilter: 
$user_ip has $count hits" );
+   if ( $count >= $this->gateway_adapter->getGlobal( 
'IPVelocityThreshhold' ) ){
+   $this->cfo->addRiskScore( 
$this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPVelocityFilter' 
);
+   //cool off, sucker. Muahahaha.
+   $this->addNowToCachedValue( $stored, true );
} else {
-   $count = count( $stored );
-   $this->gateway_adapter->debugarray[] = "Found a 
memcached bit of data for $user_ip: " . print_r($stored, true);
-   $this->gateway_logger->info( "IPVelocityFilter: 
$user_ip has $count hits" );
-   if ( $count >= 
$this->gateway_adapter->getGlobal( 'IPVelocityThreshhold' ) ){
-   $this->cfo->addRiskScore( 
$this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPVelocityFilter' 
);
-   //cool off, sucker. Muahahaha. 
-   $this->addNowToMemcachedValue( $stored, 
true );
-   } else {
-   $this->cfo->addRiskScore( 0, 
'IPVelocityFilter' ); //want to see the explicit zero here, too.
-   }
-   }   
+   $this->cfo->addRiskScore( 0, 'IPVelocityFilter' 
); //want to see the explicit zero here, too.
+   }
}
-   
+
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip] RCFilters UI: Filter interaction: conflicts

[Mooeypoo (Code Review)]

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

Change subject: [wip] RCFilters UI: Filter interaction: conflicts
..

[wip] RCFilters UI: Filter interaction: conflicts

Some filters conflict with other filters, and the state should be shown 
properly.

Bug: T156861
Change-Id: I1649e01a80e5a2a576af0a90df20302887631284
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
4 files changed, 159 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/336359/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 192453f..71ad2d2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -123,6 +123,34 @@
};
 
/**
+* Check whether all selected items are in conflict with the given item
+*
+* @param {mw.rcfilters.dm.FilterItem} filterItem Filter item to test
+* @return {boolean} All selected items are in conflict with this item
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.areAllSelectedInConflictWith = 
function ( filterItem ) {
+   var selectedItems = this.getSelectedItems( filterItem );
+
+   return selectedItems.length > 0 && selectedItems.every( 
function ( selectedFilter ) {
+   return selectedFilter.existsInConflicts( filterItem );
+   } );
+   };
+
+   /**
+* Check whether any of the selected items are in conflict with the 
given item
+*
+* @param {mw.rcfilters.dm.FilterItem} filterItem Filter item to test
+* @return {boolean} Any of the selected items are in conflict with 
this item
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.areAnySelectedInConflictWith = 
function ( filterItem ) {
+   var selectedItems = this.getSelectedItems( filterItem );
+
+   return selectedItems.length > 0 && selectedItems.some( function 
( selectedFilter ) {
+   return selectedFilter.existsInConflicts( filterItem );
+   } );
+   };
+
+   /**
 * Get group type
 *
 * @return {string} Group type
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index b271628..e98bdd1 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -189,7 +189,7 @@
 * @param {mw.rcfilters.dm.FilterItem} filterItem Filter name
 * @return {boolean} This item has a conflict with the given item
 */
-   mw.rcfilters.dm.FilterItem.prototype.hasConflictWith = function ( 
filterItem ) {
+   mw.rcfilters.dm.FilterItem.prototype.existsInConflicts = function ( 
filterItem ) {
return this.conflicts.indexOf( filterItem.getName() ) > -1;
};
 
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 784316b..a5b021b 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -18,7 +18,7 @@
 
// Events
this.aggregate( { update: 'filterItemUpdate' } );
-   this.connect( this, { filterItemUpdate: 'onFilterItemUpdate' } 
);
+   this.connect( this, { filterItemUpdate: [ 'emit', 'itemUpdate' 
] } );
};
 
/* Initialization */
@@ -44,16 +44,6 @@
/* Methods */
 
/**
-* Respond to filter item change.
-*
-* @param {mw.rcfilters.dm.FilterItem} item Updated filter
-* @fires itemUpdate
-*/
-   mw.rcfilters.dm.FiltersViewModel.prototype.onFilterItemUpdate = 
function ( item ) {
-   this.emit( 'itemUpdate', item );
-   };
-
-   /**
 * Re-assess the states of filter items based on the interactions 
between them
 *
 * NOTE: The group-level state for 'fullCoverage' is reassessed at the 
group
@@ -66,6 +56,7 @@
 */
mw.rcfilters.dm.FiltersViewModel.prototype.reassessFilterInteractions = 
function ( item ) {
var model = this,
+   itemGroup = this.getGroup( item.getGroup() ),
changeIncludedIfNeeded = function( itemAffecting, 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Add new recruitment surveys for iOS and Android to announcem...

[Fjalapeno (Code Review)]

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

Change subject: Add new recruitment surveys for iOS and Android to 
announcements endpoint
..

Add new recruitment surveys for iOS and Android to announcements endpoint

Also re-enable tests and update yaml file

Bug: T156419
Change-Id: I71d48203554b11863735e4167bddadc1eedb31fc
---
M routes/announcements.js
M spec.yaml
M test/features/announcements/announcements.js
3 files changed, 61 insertions(+), 2 deletions(-)


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

diff --git a/routes/announcements.js b/routes/announcements.js
index 87c72a2..b247eb1 100644
--- a/routes/announcements.js
+++ b/routes/announcements.js
@@ -9,7 +9,44 @@
 const router = sUtil.router();
 
 function getEnwikiAnnouncements() {
-return [];
+return [
+{
+id: "EN0217SURVEYIOS",
+type: "survey",
+start_time: "2017-02-09T00:00:00Z",
+end_time: "2017-02-14T00:00:00Z",
+platforms: [
+"iOSApp",
+],
+text: "Help to improve the Wikipedia mobile apps by signing-up to 
be a user tester. Take a quick survey to sign-up to be a user tester for an 
upcoming study or to participate in a research interview.",
+action: {
+title: "Sign-up to be a user tester",
+url: "https://goo.gl/forms/AjwqEK42MaHMUsoN2;
+},
+caption_HTML: "Hosted by a third-party service. See the https://wikimediafoundation.org/wiki/Mobile_User_Testing_Recruitment_Survey_Privacy_Statement\;>privacy
 statement for information on data handling.",
+countries: [
+"US"
+]
+},
+{
+id: "EN0217SURVEYANDROID",
+type: "survey",
+start_time: "2017-02-11T00:00:00Z",
+end_time: "2017-02-13T00:00:00Z",
+platforms: [
+"AndroidApp"
+],
+text: "Help to improve the Wikipedia mobile apps by signing-up to 
be a user tester. Take a quick survey to sign-up to be a user tester for an 
upcoming study or to participate in a research interview.",
+action: {
+title: "Sign-up to be a user tester",
+url: "https://goo.gl/forms/AjwqEK42MaHMUsoN2;
+},
+caption_HTML: "Hosted by a third-party service. See the https://wikimediafoundation.org/wiki/Mobile_User_Testing_Recruitment_Survey_Privacy_Statement\;>privacy
 statement for information on data handling.",
+countries: [
+"US"
+]
+}
+];
 }
 
 /**
diff --git a/spec.yaml b/spec.yaml
index 32f6699..82b10af 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -85,7 +85,18 @@
 headers:
   content-type: application/json
 body:
-  announce: []
+  announce:
+- id: /.+/
+  type: /.+/
+  start_time: /.+/
+  end_time: /.+/
+  platforms: [ /.+/ ]
+  text: /.+/
+  action:
+title: /.+/
+url: /.+/
+  caption_HTML: /.+/
+  countries: [ /.+/ ]
 
   # from routes/featured.js
   /{domain}/v1/page/featured/{}/{mm}/{dd}:
diff --git a/test/features/announcements/announcements.js 
b/test/features/announcements/announcements.js
index faf556f..4f292d7 100644
--- a/test/features/announcements/announcements.js
+++ b/test/features/announcements/announcements.js
@@ -31,6 +31,17 @@
 assert.ok(elem.caption_HTML, 'caption_HTML should be 
present');
 assert.ok(elem.countries, 'countries should be present');
 });
+assert.ok(res.body.announce[2].image_url, 'image present');
+assert.ok(res.body.announce[3].image, 'image present');
+});
+});
+
+it('should return two surveys', () => {
+return preq.get({ uri: 
`${server.config.uri}en.wikipedia.org/v1/feed/announcements` })
+.then((res) => {
+assert.ok(res.body.announce.length === 2);
+assert.equal(res.body.announce[0].id, 'EN0217SURVEYIOS');
+assert.equal(res.body.announce[1].id, 'EN0217SURVEYANDROID');
 });
 });
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Nuke[master]: Update callers

[Ladsgroup (Code Review)]

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

Change subject: Update callers
..

Update callers

Bug: T154276
Change-Id: I2850c22d8b203a4eb8c9801fd43f514689d4b087
---
M Nuke_body.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/Nuke_body.php b/Nuke_body.php
index 9cc4f2f..bba849a 100644
--- a/Nuke_body.php
+++ b/Nuke_body.php
@@ -23,7 +23,7 @@
}
 
$req = $this->getRequest();
-   $target = trim( $req->getText( 'target', $par ) );
+   $target = trim( $req->getText( 'nuke-target', $par ) );
 
// Normalise name
if ( $target !== '' ) {
@@ -266,7 +266,7 @@
$where['rc_namespace'] = $namespace;
}
 
-   $pattern = $this->getRequest()->getText( 'pattern' );
+   $pattern = $this->getRequest()->getText( 'nuke-pattern' );
if ( !is_null( $pattern ) && trim( $pattern ) !== '' ) {
$where[] = 'rc_title ' . $dbr->buildLike( $pattern );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2850c22d8b203a4eb8c9801fd43f514689d4b087
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Nuke
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: switch installserver to install1002

[Dzahn (Code Review)]

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

Change subject: openstack: switch installserver to install1002
..

openstack: switch installserver to install1002

Change-Id: Ic37995551cf75e9de5c684f5ae37513481794004
---
M modules/openstack/manifests/nova/network.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/openstack/manifests/nova/network.pp 
b/modules/openstack/manifests/nova/network.pp
index c4d6f49..fa69812 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -4,7 +4,7 @@
 class openstack::nova::network($novaconfig, 
$openstack_version=$::openstack::version) {
 include openstack::repo
 
-$tftp_host = 'install1001.wikimedia.org'
+$tftp_host = 'install1002.wikimedia.org'
 
 package {  [ 'nova-network', 'dnsmasq' ]:
 ensure  => present,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic37995551cf75e9de5c684f5ae37513481794004
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]: wmflib/tests: replace install1001 with install1002

[Dzahn (Code Review)]

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

Change subject: wmflib/tests: replace install1001 with install1002
..

wmflib/tests: replace install1001 with install1002

Change-Id: Iae5c00a29b18a041a3ed021993a6ea64c61f34a4
---
M modules/wmflib/spec/functions/ipresolve_spec.rb
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/336355/1

diff --git a/modules/wmflib/spec/functions/ipresolve_spec.rb 
b/modules/wmflib/spec/functions/ipresolve_spec.rb
index 5628c1c..070dc01 100644
--- a/modules/wmflib/spec/functions/ipresolve_spec.rb
+++ b/modules/wmflib/spec/functions/ipresolve_spec.rb
@@ -2,19 +2,19 @@
 describe 'ipresolve' do
 
   it "should resolve ipv4 addresses by default" do
-should 
run.with_params('install1001.wikimedia.org').and_return('208.80.154.83')
+should 
run.with_params('install1002.wikimedia.org').and_return('208.80.154.86')
   end
   it "should resolve ipv4 addresses when explicitly asked to" do
-should run.with_params('install1001.wikimedia.org', 
'4').and_return('208.80.154.83')
+should run.with_params('install1002.wikimedia.org', 
'4').and_return('208.80.154.86')
   end
 
   it "should resolve ipv6 addresses" do
-should run.with_params('install1001.wikimedia.org', 
'6').and_return('2620::861:1:208:80:154:83')
+should run.with_params('install1002.wikimedia.org', 
'6').and_return('2620::861:1:208:80:154:86')
   end
 
   it "should be able to perform a reverse DNS lookup" do
-should run.with_params('2620::861:1:208:80:154:83', 
'ptr').and_return('install1001.wikimedia.org')
-should run.with_params('208.80.154.83', 
'ptr').and_return('install1001.wikimedia.org')
+should run.with_params('2620::861:1:208:80:154:86', 
'ptr').and_return('install1002.wikimedia.org')
+should run.with_params('208.80.154.86', 
'ptr').and_return('install1002.wikimedia.org')
   end
 
   it "fails when resolving an inexistent name" do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae5c00a29b18a041a3ed021993a6ea64c61f34a4
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]: add prometheus1003/1004 to site.pp

[Dzahn (Code Review)]

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

Change subject: add prometheus1003/1004 to site.pp
..

add prometheus1003/1004 to site.pp

Bug: T152504
Change-Id: Iab83f351fbc90bca2904cfe8f66ac36cdad58c92
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index f6a61e7..fc35fb0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2443,7 +2443,7 @@
 }
 }
 
-node /^prometheus100[12]\.eqiad\.wmnet$/ {
+node /^prometheus100[1234]\.eqiad\.wmnet$/ {
 role(prometheus::ops)
 
 include ::base::firewall

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: Adjust new header styles to be compatible with cached HTML

[Jdlrobson (Code Review)]

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

Change subject: Adjust new header styles to be compatible with cached HTML
..

Adjust new header styles to be compatible with cached HTML

Tested on old cached HTML.

Bug: T156423
Change-Id: I8180f4ab5e8f5fea6a0e7d6ad3da1db276b3149b
---
M includes/skins/minerva.mustache
M resources/skins.minerva.base.styles/ui.less
2 files changed, 16 insertions(+), 18 deletions(-)


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

diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index b10f914..e108a96 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,5 +1,5 @@
 {{{headelement}}}
-
+
{{>ie8Html5Support}}

{{{mainmenuhtml}}}
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index a95665d..196fdc8 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -53,6 +53,9 @@
background-size: @searchIconSize @searchIconSize;
border-radius: @borderRadius;
box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.05 );
+   // FIXME: Necessary to support rendering of cached HTML. Move 
when new header in production
+   // and cache has cleared.
+   margin-top: 0.4em;
}
 }
 
@@ -150,10 +153,6 @@
}
}
 
-   .search-box {
-   display: none;
-   }
-
> .header-title {
vertical-align: middle;
}
@@ -162,6 +161,18 @@
min-height: @headerHeight;
}
 }
+
+// FIXME: Fold into .header css rules when cache has cleared
+.feature-header-v2 {
+   .search-box {
+   display: none;
+
+   .search {
+   margin-top: 0;
+   }
+   }
+}
+
 .header > form,
 .overlay-header .overlay-title {
padding: 0.15em 0;
@@ -172,19 +183,6 @@
// because there is a hamburger or close/back icon next to this 
element and
// the space between them is exactly that.
padding-right: @iconGutterWidth;
-   }
-}
-
-// Make search input more visible for users on small screens.
-// Opera Mini doesn't support placeholders.
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
-   .header {
-   .search {
-   border: 1px solid @grayLight;
-   // Remove the space for the search icon inside the 
search bar and increase height to size of button
-   padding: 0.5em 0.1em;
-   background: none;  // so that the icon doesn't overlap 
with the placeholder
-   }
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[branding]: WIP: Allow feature flagging of new header

[Jdlrobson (Code Review)]

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

Change subject: WIP: Allow feature flagging of new header
..

WIP: Allow feature flagging of new header

After a bit of an experiment, if we are happy to roll out the new
notifications icon and margins for inputs at tablet thresholds
we can feature flag switching the search input to a search button
for testing purposes to allow a rollout for Catalan wiki.

TODO:
* Add the feature flag and make it pass the correct value to
minerva.mustache
* Cake

Bug: T156794
Change-Id: If1b014feac263ac5632cbbf797f597e43cf74868
---
M includes/skins/MinervaTemplate.php
M includes/skins/minerva.mustache
M resources/skins.minerva.base.styles/ui.less
3 files changed, 19 insertions(+), 5 deletions(-)


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

diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index c713c5d..b8d442f 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -293,6 +293,7 @@
'mainmenuhtml' => $this->getMainMenuHtml( $data ),
'contenthtml' => $this->getContentWrapperHtml( $data ),
'footer' => $this->getFooterTemplateData( $data ),
+   'isHeaderV2' => true,
];
// begin rendering
echo $templateParser->processTemplate( 'minerva', $templateData 
);
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index e108a96..44d9bcf 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,5 +1,6 @@
 {{{headelement}}}
-
+
{{>ie8Html5Support}}

{{{mainmenuhtml}}}
@@ -11,19 +12,24 @@


{{{menuButton}}}
+   {{#isHeaderV2}}


{{{headinghtml}}}



+   {{/isHeaderV2}}



+   {{#isHeaderV2}}
{{{searchButton}}}
+   {{/isHeaderV2}}

{{^isAnon}}{{#secondaryButtonData}}{{>secondaryButton}}{{/secondaryButtonData}}{{/isAnon}}
+   {{^isHeaderV2}}{{#isAnon}}{{/isAnon}}{{/isHeaderV2}}



diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 196fdc8..18a9f2f 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -39,9 +39,11 @@
}
 }
 
-.search-box {
+.header .search-box {
// FIXME: remove when micro.tap in stable and rule from common-js.less 
too
-webkit-tap-highlight-color: rgba( 255, 255, 255, 0 );
+   // FIXME: Remove when cache clears
+   width: 100%;
 
.search {
@searchIconSize: 20px;
@@ -166,10 +168,15 @@
 .feature-header-v2 {
.search-box {
display: none;
+   width: auto;
+   }
+}
 
-   .search {
-   margin-top: 0;
-   }
+// FIXME: Fold into .header css rules when cache has cleared
+.feature-header-v2,
+.feature-header-v1 {
+   .header .search-box .search {
+   margin-top: 0;
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: First batch of entries for LDAP users

[Dzahn (Code Review)]

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

Change subject: First batch of entries for LDAP users
..


First batch of entries for LDAP users

Start tracking users with privileged LDAP access (wmf or nda group) also
in data.yaml. This way we have review and a proper audit trail in git and're
also able to handle account expiry in a unified manner.

(Later on those LDAP changes will be triggered based on the changes
to data.yaml).

Bug: 142826
Change-Id: Ic6bd1494e5991509d46091cc27d7cef080a005ed
---
M modules/admin/data/data.yaml
1 file changed, 61 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 10b0021..e8365bc 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2444,3 +2444,64 @@
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC5jAvhIngD3svnIyBaHkhZTPEJc80jM363NfWUaFNcdi7n/VudTa3t8vL9jb1OZBUWnL/gfIW4VeLU4rKsfQkcpw6BpL9Qmr50Ewex9eU2pN3/tu1JN9OGNoJry8q81ZaxpH2wJD0JmCC4nlL84Ie7YjZQdcDpeDp4NL/eqEN30DilejVc34cMFpxcH2UYtJnoHGgSPBNsRvftrSniENKlWBrNF+Gjeg+awidUnlpTfGA0q8AGa5Fo69GkHxAzUymgNgeCY6w2H/HqgFcKT53YWgkViBZC0vi3Y0X0EDxnTgYbbKmSij7JU7Z4qJzzd+Tscd/xcO20hPsAYXcW/nF5
 musikani...@wikimedia.org
 uid: 11106
 email: lzie...@wikimedia.org
+ldap_only_users:
+  abartov:
+ensure: present
+realname: Asaf Bartov
+email: abar...@wikimedia.org
+  apalmer:
+ensure: present
+realname: Aeryn Palmer
+email: apal...@wikimedia.org
+  cmadeo:
+ensure: present
+realname: Carolyn Li-Madeo
+email: cma...@wikimedia.org
+  coreyfloyd:
+ensure: present
+realname: Corey Floyd
+email: cfl...@wikimedia.org
+  ferdbold:
+ensure: present
+realname: Frederic Bolduc
+email: fbol...@wikimedia.org
+  heather:
+ensure: present
+realname: Heather Walls
+email: hwa...@wikimedia.org
+  jbuatti:
+ensure: present
+realname: James Buatti
+email: jbua...@wikimedia.org
+  jrobell:
+ensure: present
+realname: Jessica Robell
+email: jrob...@wikimedia.org
+  kemayo:
+ensure: present
+realname: David Lynch
+email: dly...@wikimedia.org
+  mhernandez:
+ensure: present
+realname: Megan Hernandez
+email: mhernan...@wikimedia.org
+  nirzar:
+ensure: present
+realname: Nirzar Pangarkar
+email: npangar...@wikimedia.org
+  phedenskog:
+ensure: present
+realname: Peter Hedenskog
+email: phedens...@wikimedia.org
+  prtksxna:
+ensure: present
+realname: Prateek Saxena
+email: psax...@wikimedia.org
+  qgil:
+ensure: present
+realname: Quim Gil
+email: q...@wikimedia.org
+  seddon:
+ensure: present
+realname: Joseph Seddon
+email: jsed...@wikimedia.org

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Do not install adminbot

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336351 )

Change subject: Tools: Do not install adminbot
..

Tools: Do not install adminbot

The package adminbot was used exclusively by the tool morebots which
has been replaced by the tool stashbot.

Bug: T157400
Change-Id: I8c875b5a027f9155edccb351befe2ca4701154f9
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 2082338..2e48512 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -238,7 +238,6 @@
 'tesseract-ocr-vie',
 
 # Other packages
-'adminbot',
 'bison',   # T67974.
 'calibre', # T100165
 'csh', # common user request

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c875b5a027f9155edccb351befe2ca4701154f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prevent user attempting to create a duplicate-titled reading...

[Mholloway (Code Review)]

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

Change subject: Prevent user attempting to create a duplicate-titled reading 
list
..

Prevent user attempting to create a duplicate-titled reading list

Checks the title in the reading list creation dialog against the list
of existing list titles, disabling the positive button and displaying
error text in the case of a match.

My personal preference and sense of what a user intends favor this
solution over something like creating a new list and  appending a " (1)"
to the title.

Bug: T156017
Change-Id: I8a46db35724104434053a802408ffc58c4d800b7
---
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
M app/src/main/res/layout/dialog_reading_list_edit.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
6 files changed, 70 insertions(+), 8 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java 
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 69e5784..7710de7 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -188,7 +188,7 @@
 .description(null)
 .pages(new ArrayList())
 .build();
-AlertDialog dialog = ReadingListDialogs.createEditDialog(getContext(), 
list, false,
+AlertDialog dialog = ReadingListDialogs.createEditDialog(getContext(), 
list, false, readingLists,
 new ReadingListDialogs.EditDialogListener() {
 @Override
 public void onModify(String newTitle, String 
newDescription, boolean saveOffline) {
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
index 5a21fa4..7af66ee 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
@@ -187,7 +187,8 @@
 private class EditButtonClickListener implements OnClickListener {
 @Override
 public void onClick(View v) {
-ReadingListDialogs.createEditDialog(getContext(), readingList, 
true, new ReadingListDialogs.EditDialogListener() {
+ReadingListDialogs.createEditDialog(getContext(), readingList, 
true, null,
+new ReadingListDialogs.EditDialogListener() {
 @Override
 public void onModify(String newTitle, String newDescription, 
boolean saveOffline) {
 if (actionListener != null) {
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
index 3881a3f..3885964 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
@@ -3,8 +3,12 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SwitchCompat;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
@@ -14,6 +18,8 @@
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.DimenUtil;
 
+import java.util.List;
+
 public final class ReadingListDialogs {
 
 public interface EditDialogListener {
@@ -21,11 +27,43 @@
 void onDelete();
 }
 
-public static AlertDialog createEditDialog(Context context, final 
ReadingList readingList,
-   boolean showDescription,
+private interface TitleTextCallback {
+void onMatchesExistingTitle(@NonNull String title);
+void onDoesNotMatchExistingTitle();
+}
+
+private static class TitleTextWatcher implements TextWatcher {
+@NonNull private List lists;
+@NonNull private TitleTextCallback cb;
+
+TitleTextWatcher(@NonNull List lists, @NonNull 
TitleTextCallback cb) {
+this.lists = lists;
+this.cb = cb;
+}
+
+@Override public void beforeTextChanged(CharSequence charSequence, int 
i, int i1, int i2) {
+}
+
+@Override public void onTextChanged(CharSequence charSequence, int i, 
int i1, int i2) {
+for 

[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Always show RelatedArticles to users who opted into beta fea...

[Jdlrobson (Code Review)]

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

Change subject: Always show RelatedArticles to users who opted into beta feature
..

Always show RelatedArticles to users who opted into beta feature

Bug: T157372
Change-Id: I70008dd179fcf6768fbcdba78d957e19c1caff81
---
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
2 files changed, 13 insertions(+), 3 deletions(-)


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

diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index 1be58cc..82c6690 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -28,7 +28,7 @@
->makeConfig( 'RelatedArticles' );
 
$vars['wgRelatedArticles'] = $out->getProperty( 
'RelatedArticles' );
-
+   $vars['RelatedArticlesBetaFeatureEnabled'] = 
self::isUserOptedIntoBetaFeature( $out->getUser() );
$vars['wgRelatedArticlesUseCirrusSearch'] = $config->get( 
'RelatedArticlesUseCirrusSearch' );
$vars['wgRelatedArticlesOnlyUseCirrusSearch'] =
$config->get( 'RelatedArticlesOnlyUseCirrusSearch' );
@@ -66,6 +66,16 @@
}
 
/**
+* Did the user opt into the ReadMore beta feature?
+*
+* @param User $user
+* @return bool
+*/
+   public static function isUserOptedIntoBetaFeature( User $user ) {
+   return !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $user, 'read-more' );
+   }
+
+   /**
 * Is ReadMore allowed on skin?
 *
 * The feature is allowed on all skins as long as they are not 
blacklisted
@@ -86,7 +96,7 @@
 
if ( !$isBlacklistedSkin ) {
if ( $isBetaFeatureSkin ) {
-   return !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $user, 'read-more' );
+   return self::isUserOptedIntoBetaFeature( $user 
);
} else {
return true;
}
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js 
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index 77f999f..9746c00 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -65,7 +65,7 @@
}
}
 
-   if ( isEnabledForCurrentUser() ) {
+   if ( isEnabledForCurrentUser() || mw.config.get( 
'RelatedArticlesBetaFeatureEnabled' ) ) {
// Add container to DOM for checking distance on scroll
// If a skin has marked up a footer content area prepend it 
there
if ( $( '.footer-content' ).length ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70008dd179fcf6768fbcdba78d957e19c1caff81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
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]: Fix $wmgVisualEditorAvailableNamespaces code style

[jenkins-bot (Code Review)]

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

Change subject: Fix $wmgVisualEditorAvailableNamespaces code style
..


Fix $wmgVisualEditorAvailableNamespaces code style

Append commas to arrays' last items.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7d2781c..8e24562 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14039,7 +14039,7 @@
'User' => true,
'File' => true,
'Help' => true,
-   'Category' => true
+   'Category' => true,
],
 
// Group 0 wikis
@@ -14048,14 +14048,14 @@
'Manual' => true, // T50430
'Extension' => true, // T50430
'API' => true, // T50430
-   'Skin' => true // T50430
+   'Skin' => true, // T50430
],
 
// Wikipedias
'+cawiki' => [
'Project' => true, // T88896
'Portal' => true, // T58000
-   'Viquiprojecte' => true // T58000
+   'Viquiprojecte' => true, // T58000
],
'+cswiki' => [
'Project' => true, // T136628
@@ -14063,28 +14063,28 @@
'+enwiki' => [
'Portal' => true, // T58001
'Book' => true, // T58001
-   'Draft' => true
+   'Draft' => true,
],
'+fawiki' => [
-   'پیش‌نویس' /* Draft */ => true // T118060
+   'پیش‌نویس' /* Draft */ => true, // T118060
],
'+fiwiki' => [
'Wikiprojekti' => true, // T156621
],
'+frwiki' => [
-   'Projet' => true // T116603
+   'Projet' => true, // T116603
],
'+hewiki' => [
-   'טיוטה' /* Draft */ => true // T87027
+   'טיוטה' /* Draft */ => true, // T87027
],
'+htwiki' => [
-   'Project' => true // T130177
+   'Project' => true, // T130177
],
'+jawiki' => [
-   'Portal' => true // T97313
+   'Portal' => true, // T97313
],
'+kowiki' => [
-   '초안' /* Draft */ => true // T92798
+   '초안' /* Draft */ => true, // T92798
],
'+plwiki' => [
'Project' => true, // T133980
@@ -14092,20 +14092,20 @@
'Wikiprojekt' => true, // T92698
],
'+ruwiki' => [
-   'Инкубатор' /* Draft / Incubator */ => true // T86688
+   'Инкубатор' /* Draft / Incubator */ => true, // T86688
],
'+svwiki' => [
'Project' => true, // T144688
'Portal' => true, // T144688
],
'+zhwiki' => [
-   'Draft' => true // T91223
+   'Draft' => true, // T91223
],
 
// Wiktionaries
'+frwiktionary' => [
'Annexe' => true, // T127819
-   'Thésaurus' => true // T127819
+   'Thésaurus' => true, // T127819
],
 
// Wikiquotes
@@ -14118,7 +14118,7 @@
 
// Wikiversities
'+frwikiversity' => [
-   'Recherche' => true // T63874
+   'Recherche' => true, // T63874
],
 
// Wikivoyages
@@ -14127,13 +14127,13 @@
 
// Wikimedias
'+sewikimedia' => [
-   'Projekt' => true // T62882
+   'Projekt' => true, // T62882
],
 
// Other wikis (e.g. Commons, Meta)
'+commonswiki' => [
'Creator' => true, // T67067
-   'Institution' => true // T67067
+   'Institution' => true, // T67067
],
'+metawiki' => [
'Project' => true, // T107003
@@ -14144,12 +14144,12 @@
'Programs' => true // T67067
],
'+wikidata' => [
-   'Project' => true
+   'Project' => true,
],
 
// Private wikis
'+officewiki' => [
-   'Report' => true // T60547
+   'Report' => true, // T60547
],
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f06b7adbb83dc7fb2a10b29cb0eca228c89864b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix $wmgVisualEditorAvailableNamespaces code style

[Dereckson (Code Review)]

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

Change subject: Fix $wmgVisualEditorAvailableNamespaces code style
..

Fix $wmgVisualEditorAvailableNamespaces code style

Append commas to arrays' last items.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7d2781c..8e24562 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14039,7 +14039,7 @@
'User' => true,
'File' => true,
'Help' => true,
-   'Category' => true
+   'Category' => true,
],
 
// Group 0 wikis
@@ -14048,14 +14048,14 @@
'Manual' => true, // T50430
'Extension' => true, // T50430
'API' => true, // T50430
-   'Skin' => true // T50430
+   'Skin' => true, // T50430
],
 
// Wikipedias
'+cawiki' => [
'Project' => true, // T88896
'Portal' => true, // T58000
-   'Viquiprojecte' => true // T58000
+   'Viquiprojecte' => true, // T58000
],
'+cswiki' => [
'Project' => true, // T136628
@@ -14063,28 +14063,28 @@
'+enwiki' => [
'Portal' => true, // T58001
'Book' => true, // T58001
-   'Draft' => true
+   'Draft' => true,
],
'+fawiki' => [
-   'پیش‌نویس' /* Draft */ => true // T118060
+   'پیش‌نویس' /* Draft */ => true, // T118060
],
'+fiwiki' => [
'Wikiprojekti' => true, // T156621
],
'+frwiki' => [
-   'Projet' => true // T116603
+   'Projet' => true, // T116603
],
'+hewiki' => [
-   'טיוטה' /* Draft */ => true // T87027
+   'טיוטה' /* Draft */ => true, // T87027
],
'+htwiki' => [
-   'Project' => true // T130177
+   'Project' => true, // T130177
],
'+jawiki' => [
-   'Portal' => true // T97313
+   'Portal' => true, // T97313
],
'+kowiki' => [
-   '초안' /* Draft */ => true // T92798
+   '초안' /* Draft */ => true, // T92798
],
'+plwiki' => [
'Project' => true, // T133980
@@ -14092,20 +14092,20 @@
'Wikiprojekt' => true, // T92698
],
'+ruwiki' => [
-   'Инкубатор' /* Draft / Incubator */ => true // T86688
+   'Инкубатор' /* Draft / Incubator */ => true, // T86688
],
'+svwiki' => [
'Project' => true, // T144688
'Portal' => true, // T144688
],
'+zhwiki' => [
-   'Draft' => true // T91223
+   'Draft' => true, // T91223
],
 
// Wiktionaries
'+frwiktionary' => [
'Annexe' => true, // T127819
-   'Thésaurus' => true // T127819
+   'Thésaurus' => true, // T127819
],
 
// Wikiquotes
@@ -14118,7 +14118,7 @@
 
// Wikiversities
'+frwikiversity' => [
-   'Recherche' => true // T63874
+   'Recherche' => true, // T63874
],
 
// Wikivoyages
@@ -14127,13 +14127,13 @@
 
// Wikimedias
'+sewikimedia' => [
-   'Projekt' => true // T62882
+   'Projekt' => true, // T62882
],
 
// Other wikis (e.g. Commons, Meta)
'+commonswiki' => [
'Creator' => true, // T67067
-   'Institution' => true // T67067
+   'Institution' => true, // T67067
],
'+metawiki' => [
'Project' => true, // T107003
@@ -14144,12 +14144,12 @@
'Programs' => true // T67067
],
'+wikidata' => [
-   'Project' => true
+   'Project' => true,
],
 
// Private wikis
'+officewiki' => [
-   'Report' => true // T60547
+   'Report' => true, // T60547
],
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable VE on fr.wiktionary Projet: namespace

[Dereckson (Code Review)]

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

Change subject: Enable VE on fr.wiktionary Projet: namespace
..

Enable VE on fr.wiktionary Projet: namespace

The French wiktionary community would mainly like to use Visual Editor
to edit tables more easily.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8e24562..5224629 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14106,6 +14106,7 @@
'+frwiktionary' => [
'Annexe' => true, // T127819
'Thésaurus' => true, // T127819
+   'Projet' => true, // T156660
],
 
// Wikiquotes

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: update cache must-revalidate header logic

[Niedzielski (Code Review)]

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

Change subject: Fix: update cache must-revalidate header logic
..

Fix: update cache must-revalidate header logic

When caching HTTP requests, only ignore RESTBase must-revalidate headers
instead of all endpoints. This change fixes an issue where stale
useroptions are used which caused theme changes to be immediately
reverted. Clear your cache or add the following annotation to
DefaultUserOptionDataClient.Client.get() since the cache interceptors
unconditionally respect no-cache:

  @Headers("cache-control: no-cache")

Also, only add max-stale header instead of replacing cache-control in
the response

Change-Id: I3ff84c7ea2a0cf5a2dce85fa89429a95d5f97e7b
---
M app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
1 file changed, 44 insertions(+), 37 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java 
b/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
index eb21de5..4d08d73 100644
--- a/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/OkHttpConnectionFactory.java
@@ -64,46 +64,50 @@
 .build();
 }
 
+@NonNull private static CacheControl 
cacheControlWithDefaultMaximumStale(@NonNull CacheControl cacheControl) {
+int maxStaleSeconds = cacheControl.maxStaleSeconds() < 0
+? Integer.MAX_VALUE
+: cacheControl.maxStaleSeconds();
+return newCacheControlBuilder(cacheControl)
+.maxStale(maxStaleSeconds, TimeUnit.SECONDS)
+.build();
+}
+
+@NonNull private static CacheControl.Builder 
newCacheControlBuilder(@NonNull CacheControl cacheControl) {
+CacheControl.Builder builder = new CacheControl.Builder();
+if (cacheControl.noCache()) {
+builder.noCache();
+}
+if (cacheControl.noStore()) {
+builder.noStore();
+}
+if (cacheControl.maxAgeSeconds() >= 0) {
+builder.maxAge(cacheControl.maxAgeSeconds(), TimeUnit.SECONDS);
+}
+if (cacheControl.maxStaleSeconds() >= 0) {
+builder.maxStale(cacheControl.maxStaleSeconds(), TimeUnit.SECONDS);
+}
+if (cacheControl.minFreshSeconds() >= 0) {
+builder.minFresh(cacheControl.minFreshSeconds(), TimeUnit.SECONDS);
+}
+if (cacheControl.onlyIfCached()) {
+builder.onlyIfCached();
+}
+if (cacheControl.noTransform()) {
+builder.noTransform();
+}
+return builder;
+}
+
 /** Sets a default max-stale cache-control argument on all requests that 
do not specify one */
 private static class DefaultMaxStaleInterceptor implements Interceptor {
-@Override public Response intercept(Interceptor.Chain chain) throws 
IOException {
+@Override public Response intercept(Chain chain) throws IOException {
 Request req = chain.request();
 
-int maxStaleSeconds = req.cacheControl().maxStaleSeconds() < 0
-? Integer.MAX_VALUE
-: req.cacheControl().maxStaleSeconds();
-CacheControl cacheControl = 
newCacheControlBuilder(req.cacheControl())
-.maxStale(maxStaleSeconds, TimeUnit.SECONDS)
-.build();
+CacheControl cacheControl = 
cacheControlWithDefaultMaximumStale(req.cacheControl());
 req = req.newBuilder().cacheControl(cacheControl).build();
 
 return chain.proceed(req);
-}
-
-private CacheControl.Builder newCacheControlBuilder(CacheControl 
cacheControl) {
-CacheControl.Builder builder = new CacheControl.Builder();
-if (cacheControl.noCache()) {
-builder.noCache();
-}
-if (cacheControl.noStore()) {
-builder.noStore();
-}
-if (cacheControl.maxAgeSeconds() >= 0) {
-builder.maxAge(cacheControl.maxAgeSeconds(), TimeUnit.SECONDS);
-}
-if (cacheControl.maxStaleSeconds() >= 0) {
-builder.maxStale(cacheControl.maxStaleSeconds(), 
TimeUnit.SECONDS);
-}
-if (cacheControl.minFreshSeconds() >= 0) {
-builder.minFresh(cacheControl.minFreshSeconds(), 
TimeUnit.SECONDS);
-}
-if (cacheControl.onlyIfCached()) {
-builder.onlyIfCached();
-}
-if (cacheControl.noTransform()) {
-builder.noTransform();
-}
-return builder;
 }
 }
 
@@ -112,10 +116,13 @@
 @Override public Response intercept(Interceptor.Chain 

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Align CX callout menu to UI Standards

[VolkerE (Code Review)]

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

Change subject: Align CX callout menu to UI Standards
..

Align CX callout menu to UI Standards

Aligning menu to comply to UI Standards, establishing a similar layout
like OOjs UI's PopupWidget popup and following several base layout properties.
Also adding slight transition on `:hover` for better user experience.

Bug: T157217
Change-Id: I17bce3af84e62ddb192861934ebf086df7d15f02
---
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
M modules/widgets/callout/ext.cx.callout.css
2 files changed, 38 insertions(+), 35 deletions(-)


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

diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index 9949bb2..a9d056b 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -5,59 +5,60 @@
padding: 0;
 
ul {
-   padding: 0;
margin: 0;
+   padding: 0;
+   font-size: 0.75em; /* equals `#p-personal li` */
}
 
li {
-   list-style: none;
-   padding: 5px 10px 5px 40px;
-   margin: 0;
-   border-bottom: 1px solid @gray;
-   min-width: 200px;
-   background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
+   list-style: none none;
background-position: left 10px center;
background-repeat: no-repeat;
+   background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
+   min-width: 200px;
+   margin: 0;
+   padding: 7px 10px 6px 40px;
+   font-size: 1.1667em; /* equals `14px` at base `font-size: 
16px` by inheriting from above */
 
a {
-   text-decoration: none;
-   color: @gray-dark;
+   color: #222;
display: block;
+   text-decoration: none;
+   .transition( ~'background-color 100ms' );
}
 
&:hover {
-   background-color: #eee;
+   background-color: #eaecf0;
}
 
&.cx-campaign-contributions {
-   .background-image-svg('../images/userAvatar.svg', 
'../images/userAvatar.png');
+   .background-image-svg( '../images/userAvatar.svg', 
'../images/userAvatar.png' );
}
 
&.cx-campaign-uploads {
-   .background-image-svg('../images/wikimediaCommons.svg', 
'../images/wikimediaCommons.png');
+   .background-image-svg( 
'../images/wikimediaCommons.svg', '../images/wikimediaCommons.png' );
}
 
&.cx-campaign-translations {
-   .background-image-svg('../images/translation.svg', 
'../images/translation.png');
+   .background-image-svg( '../images/translation.svg', 
'../images/translation.png' );
}
 
&.cx-campaign-new-beta-feature a {
-   .background-image-svg('../images/blue-beta.svg', 
'../images/blue-beta.png');
+   .background-image-svg( '../images/blue-beta.svg', 
'../images/blue-beta.png' );
background-position: right center;
background-repeat: no-repeat;
background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
}
 
.cx-campaign-contributionsmenu__expansion {
-   background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
+   background-color: #ecf5ff;
+   .background-image-svg( '../images/question.svg', 
'../images/question.png' );
background-position: left 10px center;
background-repeat: no-repeat;
-   .background-image-svg('../images/question.svg', 
'../images/question.png');
-
-   margin: 2px 5px 0 0;
-   padding: 5px 5px 5px 40px;
+   background-size: 24px; /* stylelint-disable-line 
no-unsupported-browser-features */
color: @gray-dark;
-   background-color: #ecf5ff;
+   margin: 2px 5px 0 0;
+   padding: 7px 5px 6px 40px;
font-size: small;
}
}
diff --git a/modules/widgets/callout/ext.cx.callout.css 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Show again svwiki logo between 1.5x and 2x zoom

[jenkins-bot (Code Review)]

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

Change subject: Show again svwiki logo between 1.5x and 2x zoom
..


Show again svwiki logo between 1.5x and 2x zoom

b8ef8a87cf set the filename to 1.5x.png, but the file is named svwiki-1.5x.png

Bug: T157387
Change-Id: I2e3b9ed8e18d65c1a22b271ae64029c8601cecd7
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9b6b07a..7d2781c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1196,7 +1196,7 @@
'shwiki' => [ '1.5x' => '/static/images/project-logos/shwiki-1.5x.png', 
'2x' => '/static/images/project-logos/shwiki-2x.png' ], //T150618
'sowiki' => [ '1.5x' => '/static/images/project-logos/sowiki-1.5x.png', 
'2x' => '/static/images/project-logos/sowiki-2x.png' ], //T150618
'stqwiki' => [ '1.5x' => 
'/static/images/project-logos/stqwiki-1.5x.png', '2x' => 
'/static/images/project-logos/stqwiki-2x.png' ], //T150618
-   'svwiki' => [ '1.5x' => '/static/images/project-logos/1.5x.png', '2x' 
=> '/static/images/project-logos/svwiki-2x.png' ], //T150618
+   'svwiki' => [ '1.5x' => '/static/images/project-logos/svwiki-1.5x.png', 
'2x' => '/static/images/project-logos/svwiki-2x.png' ], //T150618
'tawiki' => [ '1.5x' => '/static/images/project-logos/tawiki-1.5x.png', 
'2x' => '/static/images/project-logos/tawiki-2x.png' ],
'tcywiki' => [ '1.5x' => 
'/static/images/project-logos/tcywiki-1.5x.png', '2x' => 
'/static/images/project-logos/tcywiki-2x.png' ], // T140898
'tgwiki' => [ '1.5x' => '/static/images/project-logos/tgwiki-1.5x.png', 
'2x' => '/static/images/project-logos/tgwiki-2x.png' ], //T150618

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e3b9ed8e18d65c1a22b271ae64029c8601cecd7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Platonides 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
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...DuskToDawn[master]: Remve wordpress CSS and media file technical debt in DuskToDawn

[SamanthaNguyen (Code Review)]

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

Change subject: Remve wordpress CSS and media file technical debt in DuskToDawn
..

Remve wordpress CSS and media file technical debt in DuskToDawn

Bug: T157202
Change-Id: I11ff28ab9c59a69837ebec00e402caacbaea8294
---
D resources/images/ornaments-rs-ltr.png
D resources/images/ornaments-rs-rtl.png
D resources/images/page-rs-ltr.gif
D resources/images/page-rs-rtl.gif
M resources/style.css
M skin.json
6 files changed, 20 insertions(+), 725 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn 
refs/changes/43/336343/1

diff --git a/resources/images/ornaments-rs-ltr.png 
b/resources/images/ornaments-rs-ltr.png
deleted file mode 100644
index 1997819..000
--- a/resources/images/ornaments-rs-ltr.png
+++ /dev/null
Binary files differ
diff --git a/resources/images/ornaments-rs-rtl.png 
b/resources/images/ornaments-rs-rtl.png
deleted file mode 100644
index 7526bbb..000
--- a/resources/images/ornaments-rs-rtl.png
+++ /dev/null
Binary files differ
diff --git a/resources/images/page-rs-ltr.gif b/resources/images/page-rs-ltr.gif
deleted file mode 100644
index 704ecd5..000
--- a/resources/images/page-rs-ltr.gif
+++ /dev/null
Binary files differ
diff --git a/resources/images/page-rs-rtl.gif b/resources/images/page-rs-rtl.gif
deleted file mode 100644
index 3b91a1b..000
--- a/resources/images/page-rs-rtl.gif
+++ /dev/null
Binary files differ
diff --git a/resources/style.css b/resources/style.css
index 3115d4b..5954034 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -151,60 +151,13 @@
position: absolute;
width: 100%;
 }
-/* Right sidebar layout */
-.right-sidebar #page {
-   /* @embed */
-   background: url(images/ornaments-rs-ltr.png) no-repeat 0 0;
-}
-.right-sidebar #main {
-   /* @embed */
-   background: url(images/page-rs-ltr.gif) repeat-y 0 0;
-}
-.right-sidebar #primary {
-   float: left;
-   margin: 0 -282px 0 0;
-}
-.right-sidebar #content {
-   margin: 0 282px 0 0;
-}
-.right-sidebar #main .widget-area {
-   float: right;
-}
-/* Get rid of the faux column from templates without sidebars */
-.page-template-full-width-page-php #main,
-.single-attachment #main,
-.error404 #main {
-   background-color: #eeeae8;
-   background-image: none;
-}
-/* Increase the size of the content area for templates without sidebars */
-.full-width #content,
-.image-attachment #content,
-.error404 #content {
-   margin: 0;
-}
+
 /* Text meant only for screen readers */
 .screen-reader-text,
 .assistive-text {
position: absolute !important;
clip: rect(1px, 1px, 1px, 1px);
 }
-/* Alignment */
-.alignleft {
-   display: inline;
-   float: left;
-}
-.alignright {
-   display: inline;
-   float: right;
-}
-.aligncenter {
-   clear: both;
-   display: block;
-   margin-left: auto;
-   margin-right: auto;
-}
-
 
 /* Global */
 
@@ -437,9 +390,7 @@
padding: 8px 30px 6px;
width: 474px;
 }
-.right-sidebar #branding hgroup {
-   margin: 2px 0 54px 54px;
-}
+
 /* ashley change: originally #site-title */
 #firstHeading {
font: 300 25px/1.3 Ubuntu, sans-serif;
@@ -461,17 +412,6 @@
 
 
 /* Content */
-
-.sticky {
-   background-color: #f6f6f6;
-}
-.sticky:first-child {
-   border-top-right-radius: 3px;
-}
-.right-sidebar .sticky:first-child {
-   border-top-right-radius: 0;
-   border-top-left-radius: 3px;
-}
 .hentry {
border-top: 1px solid #ccc;
padding: 0 0 59px 0;
@@ -488,27 +428,11 @@
margin: 0 0 47px 54px;
padding: 0 30px 0 24px;
 }
-.right-sidebar .entry-header {
-   border-left: none;
-   border-right: 6px solid #497ca7;
-   margin: 0 54px 47px 0;
-   padding: 0 24px 0 30px;
-}
-.page .entry-header,
-.no-results .entry-header {
+
+.page .entry-header {
padding: 68px 30px 0 24px;
 }
-.error404 .entry-header,
-.no-sidebar .full-width .entry-header,
-.image-attachment .entry-header {
-   border-left: none;
-   border-right: none;
-   margin: 0 0 47px 0;
-   padding: 68px 30px 0 30px;
-}
-.image-attachment .entry-header {
-   padding: 0 30px 0 24px;
-}
+
 .entry-title {
color: #0b0e18;
font: 300 22px/22px Ubuntu, sans-serif;
@@ -521,31 +445,11 @@
 .entry-title a:hover {
color: #497ca7;
 }
-.entry-content,
-.entry-summary {
+.entry-content {
padding: 0 30px 0 84px;
width: 474px;
 }
-.right-sidebar .entry-content,
-.right-sidebar .entry-summary {
-   padding: 0 84px 0 30px;
-}
-.error404 .entry-content,
-.full-width .entry-content,
-.image-attachment .entry-content {
-   padding: 0 30px;
-   width: 810px;
-}
-.image-attachment .entry-content {
-   clear: both;
-   margin: 0 0 44px 0
-}
-.image-attachment .entry-caption {
-   color: #777;
- 

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Use https:// default urls for communication with PediaPress

[Platonides (Code Review)]

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

Change subject: Use https:// default urls for communication with PediaPress
..

Use https:// default urls for communication with PediaPress

Bug: T157398
Change-Id: Ia64ea41b7366482467a1bf5f7dc83d9265ee3375
---
M Collection.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/Collection.php b/Collection.php
index 8587dfd..7205fd7 100644
--- a/Collection.php
+++ b/Collection.php
@@ -158,8 +158,8 @@
 $wgCollectionPODPartners = array(
'pediapress' => array(
'name' => 'PediaPress',
-   'url' => 'http://pediapress.com/',
-   'posturl' => 'http://pediapress.com/api/collections/',
+   'url' => 'https://pediapress.com/',
+   'posturl' => 'https://pediapress.com/api/collections/',
'infopagetitle' => 'coll-order_info_article',
),
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia64ea41b7366482467a1bf5f7dc83d9265ee3375
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Platonides 

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Use a https:// url for $wgCollectionMWServeURL

[Platonides (Code Review)]

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

Change subject: Use a https:// url for $wgCollectionMWServeURL
..

Use a https:// url for $wgCollectionMWServeURL

Bug: T157398
Change-Id: I79656da849cae8c70f6022ec187416052c794bb7
---
M Collection.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/42/336342/1

diff --git a/Collection.php b/Collection.php
index 7205fd7..cfebdcf 100644
--- a/Collection.php
+++ b/Collection.php
@@ -45,7 +45,7 @@
 # Configuration:
 
 /** URL of mw-serve render server */
-$wgCollectionMWServeURL = 'http://tools.pediapress.com/mw-serve/';
+$wgCollectionMWServeURL = 'https://tools.pediapress.com/mw-serve/';
 
 /** Login credentials to this MediaWiki as 'USERNAME:PASSWORD' string */
 $wgCollectionMWServeCredentials = null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79656da849cae8c70f6022ec187416052c794bb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Platonides 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Use https:// urls when communicating with PediaPress

[Platonides (Code Review)]

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

Change subject: Use https:// urls when communicating with PediaPress
..

Use https:// urls when communicating with PediaPress

Bug: T157398
Change-Id: I8cbbe0aba25102873b66ef0e4cc35d8d7ccfeb0e
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 25ec885..83c3a20 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1757,8 +1757,8 @@
$wgCollectionPODPartners = [
'pediapress' => [
'name' => 'PediaPress',
-   'url' => 'http://pediapress.com/',
-   'posturl' => 'http://pediapress.com/api/collections/',
+   'url' => 'https://pediapress.com/',
+   'posturl' => 'https://pediapress.com/api/collections/',
'infopagetitle' => 'coll-order_info_article',
],
];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Add standard border to map details sidebar

[jenkins-bot (Code Review)]

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

Change subject: Add standard border to map details sidebar
..


Add standard border to map details sidebar

Change-Id: I82761d0df9195cc1c1ba33de8920f45bec30c092
Bug: T157373
---
M styles/dialog.less
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/styles/dialog.less b/styles/dialog.less
index 5cdb1c6..afb4c9b 100644
--- a/styles/dialog.less
+++ b/styles/dialog.less
@@ -28,7 +28,8 @@
top: 0;
bottom: 4.5em;
z-index: 2;
-   width: 320px;
+   border-left: @border-base;
+   width: 321px; /* 320+1 so border is hidden on common 320px wide mobile 
devices */
box-sizing: border-box;
background-color: #fff;
padding: 3em 2em 1em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82761d0df9195cc1c1ba33de8920f45bec30c092
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MaxSem 
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]: Actually reload the page when hash is included

[Jdlrobson (Code Review)]

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

Change subject: Actually reload the page when hash is included
..

Actually reload the page when hash is included

Bug: T127496
Change-Id: I7633bbd3e350d3586f35a4e2ce40b8e05d8ff97d
---
M resources/mobile.editor.common/EditorOverlayBase.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/resources/mobile.editor.common/EditorOverlayBase.js 
b/resources/mobile.editor.common/EditorOverlayBase.js
index 6f48b08..cb94bef 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -207,6 +207,10 @@
} );
 
window.location = mw.util.getUrl( title );
+   if ( self.sectionLine ) {
+   // since the path and only the hash has changed 
it has not triggered a refresh so forcefully refresh
+   window.location.reload();
+   }
},
/**
 * Report load errors back to the user. Silently record the 
error using EventLogging.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Silence apt rsync repo activities

[Dzahn (Code Review)]

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

Change subject: Silence apt rsync repo activities
..


Silence apt rsync repo activities

Bug: T132324
Change-Id: Id1d4d4a43bf4e5f66abfb7ef4e8e3a4bf20d68ff
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/aptrepo/manifests/rsync.pp 
b/modules/aptrepo/manifests/rsync.pp
index c638d81..3d0b456 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -46,7 +46,7 @@
 cron { 'rsync-aptrepo':
 ensure  => $ensure_cron,
 user=> 'root',
-command => "rsync -avp ${aptrepo::basedir}/ 
rsync://${secondary_server}/aptrepo",
+command => "rsync -avp ${aptrepo::basedir}/ 
rsync://${secondary_server}/aptrepo > /dev/null",
 hour=> '*/6',
 minute  => '42',
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Use class names to avoid generic tag name selectors for styl...

[jenkins-bot (Code Review)]

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

Change subject: Use class names to avoid generic tag name selectors for styling 
tables
..


Use class names to avoid generic tag name selectors for styling tables

* Refactor less file to avoid descending specificity.
* Replace hardcoded colors with variables defined in wmui-base.less

Change-Id: I06d2a48bf5e60758383761a129d3a0179930702f
Bug: T157373
---
M styles/dialog.less
M templates/dialog-sidebar-externalservices.mustache
M templates/dialog-sidebar-mapdetails.mustache
3 files changed, 60 insertions(+), 60 deletions(-)

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



diff --git a/styles/dialog.less b/styles/dialog.less
index 21790e6..5cdb1c6 100644
--- a/styles/dialog.less
+++ b/styles/dialog.less
@@ -34,47 +34,6 @@
padding: 3em 2em 1em;
overflow-y: scroll;
 
-   table {
-   width: 100%;
-   border-collapse: collapse;
-
-   tr {
-   background-color: @wmui-color-base80;
-   text-align: center;
-   }
-
-   th {
-   text-align: left;
-   }
-
-   th,
-   td {
-   padding: 0.5em 1em;
-   font-size: 90%;
-   }
-
-   thead {
-   tr {
-   background-color: @wmui-color-base70;
-
-   th {
-   font-weight: bold;
-   }
-   }
-   }
-
-   tbody {
-   tr th:first-child {
-   width: 70%;
-   text-align: left;
-   }
-
-   tr:nth-child(even) {
-   background-color: @wmui-color-base100;
-   }
-   }
-   }
-
.mw-kartographer-mapDialog-closeButton {
position: absolute;
top: 10px;
@@ -83,6 +42,64 @@
 
.oo-ui-buttonElement-button {
border: 0;
+   }
+   }
+
+   /* For MobileFrontend */
+   .skin-minerva & h2 {
+   margin-bottom: 0.6em;
+   }
+}
+
+.mw-kartographer-mapdetails-table {
+   width: 100%;
+   border-collapse: collapse;
+
+   tr {
+   background-color: @wmui-color-base80;
+   text-align: center;
+   }
+
+   th {
+   text-align: left;
+   }
+
+   th,
+   td {
+   padding: 0.5em 1em;
+   font-size: 90%;
+   }
+
+   thead {
+   tr {
+   background-color: @wmui-color-base70;
+
+   th {
+   font-weight: bold;
+   }
+   }
+   }
+
+   tbody {
+   tr th:first-child {
+   width: 70%;
+   text-align: left;
+   }
+
+   tr:nth-child(even) {
+   background-color: @wmui-color-base100;
+   }
+   }
+
+   .mw-kartographer-externalservices & {
+   tbody tr {
+   &.featured {
+   background-color: @wmui-color-yellow90;
+   border-bottom: 1px solid @wmui-color-yellow50;
+   }
+   th {
+   font-weight: normal;
+   }
}
}
 }
@@ -98,23 +115,6 @@
 
 .mw-kartographer-filterservices {
margin-bottom: 1em;
-}
-
-.mw-kartographer-mapDialog-sidebar .mw-kartographer-externalservices {
-   tr.featured {
-   background-color: #fef6e7;
-   border-bottom: 1px solid #fc3;
-   }
-   /* stylelint-disable no-descending-specificity */
-   tbody th {
-   font-weight: normal;
-   }
-   /* stylelint-enable no-descending-specificity */
-}
-
-/* For MobileFrontend */
-.skin-minerva .mw-kartographer-mapDialog-sidebar h2 {
-   margin-bottom: 0.6em;
 }
 
 .kartographer-mapDialog-loading {
diff --git a/templates/dialog-sidebar-externalservices.mustache 
b/templates/dialog-sidebar-externalservices.mustache
index e5be34e..d83150b 100644
--- a/templates/dialog-sidebar-externalservices.mustache
+++ b/templates/dialog-sidebar-externalservices.mustache
@@ -1,6 +1,6 @@
 {{LBL_EXTERNAL_SERVICES}}
 
-
+
 
 
 {{LBL_SERVICE}}
diff --git a/templates/dialog-sidebar-mapdetails.mustache 
b/templates/dialog-sidebar-mapdetails.mustache
index 11a149e..0525ebd 100644
--- a/templates/dialog-sidebar-mapdetails.mustache
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix xml reporting in parserTests.js

[Arlolra (Code Review)]

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

Change subject: Fix xml reporting in parserTests.js
..

Fix xml reporting in parserTests.js

Change-Id: I19d40aa1a8fa01397d91d7da6bfd8bf32a51d4bf
---
M bin/parserTests.js
1 file changed, 41 insertions(+), 32 deletions(-)


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

diff --git a/bin/parserTests.js b/bin/parserTests.js
index 7f2fec6..6507a81 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1456,15 +1456,15 @@
 };
 
 /**
+ * @param {Array} modesRan
  * @param {Object} stats
  * @param {number} stats.failedTests Number of failed tests due to differences 
in output
  * @param {number} stats.passedTests Number of tests passed without any 
special consideration
  * @param {number} stats.passedTestsWhitelisted Number of tests passed by 
whitelisting
  * @param {Object} stats.modes All of the stats (failedTests, passedTests, and 
passedTestsWhitelisted) per-mode.
  */
-ParserTests.prototype.reportSummary = function(stats) {
-   var curStr;
-   var thisMode;
+ParserTests.prototype.reportSummary = function(modesRan, stats) {
+   var curStr, mode, thisMode;
var failTotalTests = stats.failedTests;
 

console.log("==");
@@ -1474,17 +1474,16 @@
}
 
if (failTotalTests !== 0) {
-   for (var i = 0; i < modes.length; i++) {
-   curStr = modes[i] + ': ';
-   thisMode = stats.modes[modes[i]];
-   if (thisMode.passedTests + 
thisMode.passedTestsWhitelisted + thisMode.failedTests > 0) {
-   curStr += colorizeCount(thisMode.passedTests + 
thisMode.passedTestsWhitelisted, 'green') + ' passed (';
-   curStr += 
colorizeCount(thisMode.passedTestsUnexpected, 'red') + ' unexpected, ';
-   curStr += 
colorizeCount(thisMode.passedTestsWhitelisted, 'yellow') + ' whitelisted) / ';
-   curStr += colorizeCount(thisMode.failedTests, 
'red') + ' failed (';
-   curStr += 
colorizeCount(thisMode.failedTestsUnexpected, 'red') + ' unexpected)';
-   console.log(curStr);
-   }
+   for (var i = 0; i < modesRan.length; i++) {
+   mode = modesRan[i];
+   curStr = mode + ': ';
+   thisMode = stats.modes[mode];
+   curStr += colorizeCount(thisMode.passedTests + 
thisMode.passedTestsWhitelisted, 'green') + ' passed (';
+   curStr += colorizeCount(thisMode.passedTestsUnexpected, 
'red') + ' unexpected, ';
+   curStr += 
colorizeCount(thisMode.passedTestsWhitelisted, 'yellow') + ' whitelisted) / ';
+   curStr += colorizeCount(thisMode.failedTests, 'red') + 
' failed (';
+   curStr += colorizeCount(thisMode.failedTestsUnexpected, 
'red') + ' unexpected)';
+   console.log(curStr);
}
 
curStr = 'TOTAL' + ': ';
@@ -2174,7 +2173,7 @@
// note: these stats won't necessarily be useful if someone
// reimplements the reporting methods, since that's where we
// increment the stats.
-   var failures = options.reportSummary(this.stats);
+   var failures = options.reportSummary(options.modes, this.stats);
 
// we're done!
if (booleanOption(options['exit-zero'])) {
@@ -2204,6 +2203,7 @@
wt2wt: '',
wt2html: '',
html2wt: '',
+   selser: '',
};
 
/**
@@ -2250,9 +2250,9 @@
 *
 * Report the end of the tests output.
 */
-   var reportSummaryXML = function() {
-   for (var i = 0; i < modes.length; i++) {
-   var mode = modes[i];
+   var reportSummaryXML = function(modesRan) {
+   for (var i = 0; i < modesRan.length; i++) {
+   var mode = modesRan[i];
console.log('');
console.log(results[mode]);
console.log('');
@@ -2270,15 +2270,23 @@
var reportFailureXML = function(title, comments, iopts, options, 
actual, expected, expectFail, failureOnly, mode, error) {
fail++;
 
-   var failEle;
+   var failEle = '';
if (error) {
-   failEle = '\n';
+   failEle += '\n';
failEle += error.toString();
-   failEle += '\n\n';
+   failEle += '\n';
} else {
-   

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

[Arlolra (Code Review)]

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

Change subject: Add citeParserTests.txt
..

Add citeParserTests.txt

Change-Id: I0799ed4174a88ddc032f04d17bb6a256a1537c22
---
A tests/citeParserTests.txt
M tests/parserTests.json
2 files changed, 615 insertions(+), 0 deletions(-)


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

diff --git a/tests/citeParserTests.txt b/tests/citeParserTests.txt
new file mode 100644
index 000..e1d66d4
--- /dev/null
+++ b/tests/citeParserTests.txt
@@ -0,0 +1,603 @@
+# Force the test runner to ensure the extension is loaded
+!! hooks
+ref
+references
+!! endhooks
+
+!! test
+Simple , no 
+!! input
+Wikipedia rocks!Proceeds of Rockology, vol. XXI
+!! result
+Wikipedia rocks!1
+↑ Proceeds of 
Rockology, vol. XXI
+
+
+
+!! end
+
+!! test
+Simple , with 
+!! input
+Wikipedia rocks!Proceeds of Rockology, vol. XXI
+
+
+!! result
+Wikipedia rocks!1
+
+
+↑ Proceeds of 
Rockology, vol. XXI
+
+
+
+!! end
+
+
+!! article
+Template:Simple template
+!! text
+A ''simple'' template.
+!! endarticle
+
+
+!! test
+ with a simple template
+!! input
+Templating{{simple template}}
+
+
+!! result
+Templating1
+
+
+↑ A simple 
template.
+
+
+
+!! end
+
+!! test
+ with a 
+!! input
+Templating{{simple template}}
+
+
+!! result
+Templating1
+
+
+↑ {{simple 
template}}
+
+
+
+!! end
+
+
+!! test
+ in a 
+!! input
+Templating{{simple template}}
+
+
+!! result
+Templatingref{{simple template}}/ref
+
+
+!! end
+
+!! test
+ in a 
+!! input
+Templating
+
+
+!! result
+Templating
+
+
+!! end
+
+!! test
+ in a  (bug 5384)
+!! input
+TemplatingText
+
+
+!! result
+Templating1
+
+
+↑ Text
+
+
+
+!! end
+
+!! test
+ after  (bug 6164)
+!! input
+one
+
+Image:Foobar.jpg
+
+
+!! result
+1
+
+
+   
+   http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>
+   
+   
+   
+
+
+↑ one
+
+
+
+!! end
+
+!! test
+{{REVISIONID}} on page with  (bug 6299)
+!! input
+{{REVISIONID}}elite
+!! result
+13371
+↑ elite
+
+
+
+!! end
+
+!! test
+{{REVISIONID}} on page without  (bug 6299 sanity check)
+!! input
+{{REVISIONID}}
+!! result
+1337
+
+!! end
+
+!! test
+Ref with content followed by blank ref
+!! input
+content
+
+
+
+
+!! result
+1
+1
+
+
+↑ 1.0 1.1 content
+
+
+
+!! end
+
+!! test
+Blank ref followed by ref with content
+!! input
+
+
+content
+
+
+!! result
+1
+1
+
+
+↑ 1.0 1.1 content
+
+
+
+!! end
+
+!! test
+Regression: non-blank ref "0" followed by ref with content
+!! input
+0
+
+content
+
+
+!! result
+1
+1
+
+
+↑ 1.0 1.1 0 
Cite error: Invalid 
ref tag; name "blank" defined multiple times with 
different content
+
+
+
+!! end
+
+!! test
+Regression sanity check: non-blank ref "1" followed by ref with content
+!! input
+1
+
+content
+
+
+!! result
+1
+1
+
+
+↑ 1.0 1.1 1 
Cite error: Invalid 
ref tag; name "blank" defined multiple times with 
different content
+
+
+
+!! end
+
+!! test
+Ref names containing a number
+!! input
+One
+Two
+Three
+
+
+!! result
+1
+2
+3
+
+
+↑ One
+
+↑ Two
+
+↑ Three
+
+
+
+!! end
+
+!! test
+Erroneous refs
+!! input
+Zero
+
+Also zero, but differently! (Normal ref)
+
+
+
+
+
+
+
+
+
+
+!! result
+Cite error: 
Invalid ref tag;
+name cannot be a simple integer. Use a descriptive title
+1
+Cite error: 
The opening ref tag is malformed or has a bad name
+2
+3
+Cite error: 
Invalid references tag;
+parameter "group" is allowed only.
+Use references /, or references group="..." 
/
+
+
+↑ Also zero, but 
differently! (Normal ref)
+
+↑ Cite error: Invalid ref tag;
+no text was provided for refs named bar
+↑ Cite error: Invalid 
ref tag;
+no text was provided for refs named 
blankwithnoreference
+
+
+!! end
+
+
+!! test
+Simple , with  in group
+!! input
+Wikipedia rocks!Proceeds of Rockology, vol. XXI
+Wikipedia rocks!Proceeds of Rockology, vol. XXI
+
+
+
+!! result
+Wikipedia rocks!1
+Wikipedia rocks!note 1
+
+
+↑ Proceeds of 
Rockology, vol. XXI
+
+
+
+↑ Proceeds of 
Rockology, vol. XXI
+
+
+
+!! end
+
+!! test
+Simple , with  in group, with groupname in Chinese
+!! input
+AAAref aBBBnote bCCCref c
+
+;refs
+
+;notes
+
+!! result
+AAA参 
1BBB注 1CCC参 2
+
+refs
+
+↑ ref a
+
+↑ ref c
+
+
+notes
+
+↑ note b
+
+
+
+!! end
+
+!! test
+ defined in 
+!! input
+
+
+
+BAR
+
+!! result
+1
+
+
+↑ BAR
+
+
+
+!! end
+
+!! test
+ defined in  called with #tag
+!! input
+
+
+{{#tag:references|
+BAR
+}}
+!! result
+1
+
+
+↑ BAR
+
+
+
+!! end
+
+!! test
+ defined in  error conditions
+!! input
+
+
+
+
+BAR
+bad group
+BAR BAR
+
+!! result
+2 1
+
+
+↑ Cite error: Invalid ref tag;
+no text was provided for refs named foo
+
+Cite error: 
ref tag with name "unused" defined in 
references 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Generalize fetch-parserTests.txt.js

[Arlolra (Code Review)]

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

Change subject: Generalize fetch-parserTests.txt.js
..

Generalize fetch-parserTests.txt.js

 * So we can use it to fetch other parserTests files.

Change-Id: I28076c2811e449faafef140d863f509c40dbbd22
---
A tests/parserTests.json
M tools/fetch-parserTests.txt.js
M tools/sync-parserTests.js
3 files changed, 59 insertions(+), 54 deletions(-)


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

diff --git a/tests/parserTests.json b/tests/parserTests.json
new file mode 100644
index 000..716a73b
--- /dev/null
+++ b/tests/parserTests.json
@@ -0,0 +1,14 @@
+{
+   "parserTests.txt": {
+   "downloadUrl": {
+   "host": "raw.githubusercontent.com",
+   "path": 
"/wikimedia/mediawiki/COMMIT-SHA/tests/parser/parserTests.txt"
+   },
+   "historyUrl": {
+   "host": "api.github.com",
+   "path": 
"/repos/wikimedia/mediawiki/commits?path=tests/parser/parserTests.txt"
+   },
+   "expectedSHA1": "e356e32b279671d5c662aa4409d64425c14adb6f",
+   "latestCommit": "4a07505402a56a32be23a570f4bd1fe33dd542a9"
+   }
+}
\ No newline at end of file
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 90f971d..5aa3040 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/fetch-parserTests.txt.js
@@ -11,48 +11,38 @@
 // ==> Use "./fetch-parserTests.txt.js --force" to download latest parserTests
 // and update these hashes automatically.
 //
-// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "e356e32b279671d5c662aa4409d64425c14adb6f";
-// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "4a07505402a56a32be23a570f4bd1fe33dd542a9";
 
 var fs = require('fs');
 var path = require('path');
 var https = require('https');
 var crypto = require('crypto');
 
-var downloadUrl = {
-   host: 'raw.githubusercontent.com',
-   path: '/wikimedia/mediawiki/COMMIT-SHA/tests/parser/parserTests.txt',
-};
-var historyUrl = {
-   host: 'api.github.com',
-   headers: {'user-agent': 'wikimedia-parsoid'},
-   path: 
'/repos/wikimedia/mediawiki/commits?path=tests/parser/parserTests.txt',
-};
-var DEFAULT_TARGET = __dirname + "/../tests/parserTests.txt";
+var testDir = path.join(__dirname, '../tests/');
+var testFilesPath = path.join(testDir, 'parserTests.json');
+var testFiles = require(testFilesPath);
+
+var DEFAULT_TARGET = 'parserTests.txt';
 
 var computeSHA1 = function(targetName) {
-   var existsSync = fs.existsSync || path.existsSync; // node 0.6 compat
-   if (!existsSync(targetName)) {
+   var targetPath = path.join(testDir, targetName);
+   if (!fs.existsSync(targetPath)) {
return "";
}
-   var contents = fs.readFileSync(targetName);
+   var contents = fs.readFileSync(targetPath);
return crypto.createHash('sha1').update(contents).digest('hex').
toLowerCase();
 };
 
-var fetch = function(url, targetName, gitCommit, cb) {
+var fetch = function(targetName, gitCommit, cb) {
console.log('Fetching parserTests.txt from mediawiki/core');
-   if (gitCommit) {
-   url = {
-   host: url.host,
-   headers: {'user-agent': 'wikimedia-parsoid'},
-   path: url.path.replace(/COMMIT-SHA/, gitCommit),
-   };
-   }
+   var file = testFiles[targetName];
+   var url = Object.assign({
+   headers: { 'user-agent': 'wikimedia-parsoid' },
+   }, file.downloadUrl);
+   url.path = url.path.replace(/COMMIT-SHA/, gitCommit || 
file.latestCommit);
https.get(url, function(result) {
-   var out = fs.createWriteStream(targetName);
+   var targetPath = path.join(testDir, targetName);
+   var out = fs.createWriteStream(targetPath);
result.on('data', function(data) {
out.write(data);
});
@@ -63,8 +53,8 @@
out.on('close', function() {
if (cb) {
return cb();
-   } else if (expectedSHA1 !== computeSHA1(targetName)) {
-   console.warn('Parsoid expected sha1sum', 
expectedSHA1,
+   } else if (file.expectedSHA1 !== 
computeSHA1(targetName)) {
+   console.warn('Parsoid expected sha1sum', 
file.expectedSHA1,
'but got', computeSHA1(targetName));
}
});
@@ -74,22 +64,26 @@
 };
 
 var isUpToDate = function(targetName) {
+   var expectedSHA1 = 

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix border colour in map dialog

[jenkins-bot (Code Review)]

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

Change subject: Fix border colour in map dialog
..


Fix border colour in map dialog

Also remove some unnecessary less variables.

Change-Id: Iac3a9fce9507fb947ef6db1ed2bffb52d313c2de
Bug: T157373
---
M styles/dialog.less
1 file changed, 3 insertions(+), 11 deletions(-)

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



diff --git a/styles/dialog.less b/styles/dialog.less
index e4aec66..21790e6 100644
--- a/styles/dialog.less
+++ b/styles/dialog.less
@@ -1,12 +1,4 @@
-/* Temporary import from wmui-base.less */
-/* https://phabricator.wikimedia.org/diffusion/WMUI/ */
-
-@wmui-color-base60:  #c8ccd1;
-@wmui-color-base80:  #eaecf0;
-@wmui-color-base100: #fff;
-@background-color-base:  @wmui-color-base100;
-@border-color-base:  #222;
-@border-base:1px solid @border-color-base;
+@import '../lib/wmui-base.less';
 
 /* Dialog footer */
 .mw-kartographer-mapDialog-foot {
@@ -38,7 +30,7 @@
z-index: 2;
width: 320px;
box-sizing: border-box;
-   background-color: @background-color-base;
+   background-color: #fff;
padding: 3em 2em 1em;
overflow-y: scroll;
 
@@ -63,7 +55,7 @@
 
thead {
tr {
-   background-color: @wmui-color-base60;
+   background-color: @wmui-color-base70;
 
th {
font-weight: bold;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac3a9fce9507fb947ef6db1ed2bffb52d313c2de
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MaxSem 
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]: fix icinga.wikimedia.org ssl check

[RobH (Code Review)]

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

Change subject: fix icinga.wikimedia.org ssl check
..


fix icinga.wikimedia.org ssl check

was left at normal check rate, which has 60/30 day warnings, which don't
work well with letsencrypt certs.  easily overlooked, so fixing.

Change-Id: If0f9be38a736be7a85b7d8e72c5fef0c550fe92f
---
M modules/role/manifests/icinga.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index 226e9d8..6d61360 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -49,7 +49,7 @@
 
 monitoring::service { 'https':
 description   => 'HTTPS',
-check_command => 'check_ssl_http!icinga.wikimedia.org',
+check_command => 'check_ssl_http_letsencrypt!icinga.wikimedia.org',
 }
 
 class { '::icinga':}

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix RTL version of largerText to be, well, RTL

[jenkins-bot (Code Review)]

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

Change subject: MediaWiki theme: Fix RTL version of largerText to be, well, RTL
..


MediaWiki theme: Fix RTL version of largerText to be, well, RTL

Change-Id: Iba6f738bc0a0539bdcf6d508da9956c8195b678a
---
M src/themes/mediawiki/images/icons/largerText-rtl.svg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/themes/mediawiki/images/icons/largerText-rtl.svg 
b/src/themes/mediawiki/images/icons/largerText-rtl.svg
index 4b01d74..6ac62dc 100644
--- a/src/themes/mediawiki/images/icons/largerText-rtl.svg
+++ b/src/themes/mediawiki/images/icons/largerText-rtl.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+
 

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Add link to documentation

[jenkins-bot (Code Review)]

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

Change subject: demos: Add link to documentation
..


demos: Add link to documentation

This hardcodes the URLS so that it works on doc.wikimedia.org. This
is a bad idea.

Bug: T127281
Change-Id: Ie7667f3128fcf4a8e3d07e861e6ccfbd66b5b8ce
---
M demos/demo.js
M demos/demos.php
2 files changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/demos/demo.js b/demos/demo.js
index 49620e2..47af285 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -53,6 +53,13 @@
new OO.ui.ButtonOptionWidget( { data: 'mobile', label: 'Mobile' 
} )
] );
 
+   this.documentationLink = new OO.ui.ButtonWidget( {
+   label: 'Docs',
+   icon: 'journal',
+   href: '../js/',
+   flags: [ 'progressive' ]
+   } );
+
// Events
this.pageMenu.on( 'choose', OO.ui.bind( this.onModeChange, this ) );
this.themeSelect.on( 'choose', OO.ui.bind( this.onModeChange, this ) );
@@ -71,7 +78,8 @@
this.themeSelect.$element,
this.directionSelect.$element,
this.jsPhpSelect.$element,
-   this.platformSelect.$element
+   this.platformSelect.$element,
+   this.documentationLink.$element
);
this.$element
.addClass( 'oo-ui-demo' )
diff --git a/demos/demos.php b/demos/demos.php
index 489db07..c3022f3 100644
--- a/demos/demos.php
+++ b/demos/demos.php
@@ -87,6 +87,13 @@
] ),
]
] );
+
+   echo new OOUI\ButtonWidget( [
+   'label' => 'Docs',
+   'icon' => 'journal',
+   'href' => '../php/',
+   'flags' => [ 'progressive' ],
+   ] );
?>

https://gerrit.wikimedia.org/r/334496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7667f3128fcf4a8e3d07e861e6ccfbd66b5b8ce
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fix icinga.wikimedia.org ssl check

[RobH (Code Review)]

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

Change subject: fix icinga.wikimedia.org ssl check
..

fix icinga.wikimedia.org ssl check

was left at normal check rate, which has 60/30 day warnings, which don't
work well with letsencrypt certs.  easily overlooked, so fixing.

Change-Id: If0f9be38a736be7a85b7d8e72c5fef0c550fe92f
---
M modules/role/manifests/icinga.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/336335/1

diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index 226e9d8..6d61360 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -49,7 +49,7 @@
 
 monitoring::service { 'https':
 description   => 'HTTPS',
-check_command => 'check_ssl_http!icinga.wikimedia.org',
+check_command => 'check_ssl_http_letsencrypt!icinga.wikimedia.org',
 }
 
 class { '::icinga':}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: The correct method is parse, not parsed

[jenkins-bot (Code Review)]

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

Change subject: The correct method is parse, not parsed
..


The correct method is parse, not parsed

A recent patch updated these two calls to use Message::parsed(),
but it should have used the Message::parse() message.

Change-Id: I5aba40576b89f21d2b1416ca0db0d28d2a088c39
---
M includes/widget/search/InterwikiSearchResultSetWidget.php
M includes/widget/search/SimpleSearchResultSetWidget.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php 
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index 9cd69fa..76b9b01 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -109,7 +109,7 @@
Html::rawElement(
'p',
[ 'class' => 'iw-headline' ],
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed()
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parse()
) .
Html::rawElement(
'ul', [ 'class' => 'iw-results', ], 
$iwResultListOutput
diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php 
b/includes/widget/search/SimpleSearchResultSetWidget.php
index 6a0bb29..04e1e21 100644
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/widget/search/SimpleSearchResultSetWidget.php
@@ -77,7 +77,7 @@
return
"" .
"" .
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed() .
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parse() .
'' .
$out .
"";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5aba40576b89f21d2b1416ca0db0d28d2a088c39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: TTO 
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...Kartographer[master]: Add static name property to map dialog window

[jenkins-bot (Code Review)]

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

Change subject: Add static name property to map dialog window
..


Add static name property to map dialog window

Bug: T154716
Change-Id: Ib676a0a9eefaed8bf24e882f020a0a9d111fd1de
---
M modules/dialog/dialog.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/dialog/dialog.js b/modules/dialog/dialog.js
index 5641d93..05d64e1 100644
--- a/modules/dialog/dialog.js
+++ b/modules/dialog/dialog.js
@@ -25,6 +25,7 @@
 
/* Static Properties */
 
+   MapDialog.static.name = 'mapDialog';
MapDialog.static.size = 'full';
 
/* Methods */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib676a0a9eefaed8bf24e882f020a0a9d111fd1de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix direction of shadow on position:bottom ...

[jenkins-bot (Code Review)]

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

Change subject: MediaWiki theme: Fix direction of shadow on position:bottom 
toolbars
..


MediaWiki theme: Fix direction of shadow on position:bottom toolbars

Change-Id: I764f200d18cab4d1a03d790139a740a1ef2fda69
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/tools.less
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 4d1cb94..4593aaf 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -105,7 +105,8 @@
 
 @box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
 @box-shadow-menu: @box-shadow-dialog;
-@box-shadow-toolbar: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
+@box-shadow-toolbar-top: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
+@box-shadow-toolbar-bottom: 0 -1px 1px 0 rgba( 0, 0, 0, 0.1 );
 @box-shadow-widget: inset 0 0 0 1px @background-color-default;
 @box-shadow-widget-focus: inset 0 0 0 1px @color-progressive;
 @box-shadow-progressive-focus: inset 0 0 0 1px @color-progressive, inset 0 0 0 
2px @color-default-light;
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index 421853f..d1e8ce9 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -4,15 +4,16 @@
&-bar {
background-color: @background-color-toolbar;
color: @color-default;
-   box-shadow: @box-shadow-toolbar;
font-weight: 500;
 
.oo-ui-toolbar-position-top > & {
border-bottom: @border-toolbar;
+   box-shadow: @box-shadow-toolbar-top;
}
 
.oo-ui-toolbar-position-bottom > & {
border-top: @border-toolbar;
+   box-shadow: @box-shadow-toolbar-bottom;
}
 
.oo-ui-toolbar-bar {

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Fix styling for disabled widgets in PHP

[jenkins-bot (Code Review)]

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

Change subject: FieldLayout: Fix styling for disabled widgets in PHP
..


FieldLayout: Fix styling for disabled widgets in PHP

Follow-up to 5c8f9d8a4ce7e4a1ba8745d3c17b4540ee006286, which only
fixed it for JS FieldLayout.

Change-Id: I2712d57368c91235160905fab25aa9e91b0040ad
---
M php/layouts/FieldLayout.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index d17d846..1681550 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -115,7 +115,7 @@
}
$this
->addClasses( [ 'oo-ui-fieldLayout' ] )
-   ->toggleClasses( [ 'oo-ui-fieldLayout-disable' ], 
$this->fieldWidget->isDisabled() )
+   ->toggleClasses( [ 'oo-ui-fieldLayout-disabled' ], 
$this->fieldWidget->isDisabled() )
->appendContent( $this->body );
if ( count( $this->errors ) || count( $this->notices ) ) {
$this->appendContent( $this->messages );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2712d57368c91235160905fab25aa9e91b0040ad
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove old footer remnant for mobile/desktop toggle

[Jdlrobson (Code Review)]

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

Change subject: Remove old footer remnant for mobile/desktop toggle
..

Remove old footer remnant for mobile/desktop toggle

Bug: T157075
Change-Id: I8125b1dfc7959d034ee91ed79d6295db0e0905fb
---
M includes/MobileFrontend.skin.hooks.php
1 file changed, 0 insertions(+), 7 deletions(-)


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

diff --git a/includes/MobileFrontend.skin.hooks.php 
b/includes/MobileFrontend.skin.hooks.php
index 74fc296..36fc78d 100644
--- a/includes/MobileFrontend.skin.hooks.php
+++ b/includes/MobileFrontend.skin.hooks.php
@@ -251,12 +251,6 @@
[ 'id' => "mw-mf-display-toggle", "href" => $desktopUrl 
], $desktop );
$sitename = self::getSitename( true );
$siteheading = Html::rawElement( 'h2', [], $sitename );
-   $switcherHtml = <<
-   {$mobile}{$desktopToggler}
-
-HTML;
 
// Generate the licensing text displayed in the footer of each 
page.
// See Skin::getCopyright for desktop equivalent.
@@ -270,7 +264,6 @@
// Enable extensions to add links to footer in Mobile view, too 
- bug 66350
Hooks::run( 'MobileSiteOutputPageBeforeExec', [ &$sk, &$tpl ] );
 
-   $tpl->set( 'mobile-switcher', $switcherHtml );
$tpl->set( 'footer-site-heading-html', $sitename );
$tpl->set( 'desktop-toggle', $desktopToggler );
$tpl->set( 'mobile-license', $licenseText );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: WIP look up iDEAL banks, cache in Memcache

[Ejegg (Code Review)]

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

Change subject: WIP look up iDEAL banks, cache in Memcache
..

WIP look up iDEAL banks, cache in Memcache

Needs SmashPig change, also should mock Memcache access.

But the real problem is how this ties an internal method to the
mediawiki cache classes. Definitely needs to happen differently.

Bug: T128692
Change-Id: I2e0383ed0863fa1e9c0f3a5f967a0e1dc814a3e3
---
M globalcollect_gateway/config/payment_submethods.yaml
M globalcollect_gateway/globalcollect.adapter.php
2 files changed, 38 insertions(+), 0 deletions(-)


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

diff --git a/globalcollect_gateway/config/payment_submethods.yaml 
b/globalcollect_gateway/config/payment_submethods.yaml
index cc99b9c..200add4 100644
--- a/globalcollect_gateway/config/payment_submethods.yaml
+++ b/globalcollect_gateway/config/payment_submethods.yaml
@@ -324,6 +324,7 @@
 - ISSUERID
 logo: iDEAL-klein.gif
 show_single_logo: true
+lookup_cache_duration: 300
 issuerids:
 ABNANL2A: ABN Amro
 ASNBNL21: ASN Bank
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index 2970e7e..29e9e94 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -16,6 +16,7 @@
  *
  */
 use Psr\Log\LogLevel;
+use SmashPig\PaymentProviders\Ingenico\BankPaymentProvider;
 
 /**
  * GlobalCollectAdapter
@@ -25,6 +26,7 @@
const GATEWAY_NAME = 'Global Collect';
const IDENTIFIER = 'globalcollect';
const GLOBAL_PREFIX = 'wgGlobalCollectGateway';
+   const BANK_LIST_CACHE_KEY = 'ingenico_rtbt_ideal_bank_list';
 
public function getCommunicationType() {
return 'xml';
@@ -1729,4 +1731,39 @@
return false;
}
}
+
+   /**
+* Override parent class to look up iDEAL banks
+* @param string|null $payment_submethod
+* @return array|mixed information about the selected submethod
+*/
+   public function getPaymentSubmethodMeta( $payment_submethod = null ) {
+   if ( is_null( $payment_submethod ) ) {
+   $payment_submethod = $this->getPaymentSubmethod();
+   }
+   $meta = parent::getPaymentSubmethodMeta( $payment_submethod );
+   if ( $payment_submethod === 'rtbt_ideal' ) {
+   try {
+   $cache = ObjectCache::getLocalClusterInstance();
+   $banks = $cache->get( self::BANK_LIST_CACHE_KEY 
);
+   if ( !$banks ) {
+   $provider = new BankPaymentProvider();
+   $banks = $provider->getBankList(
+   
$this->getData_Unstaged_Escaped( 'country' ),
+   
$this->getData_Unstaged_Escaped( 'currency' )
+   );
+   $duration = $this->getGlobal( 
'BankCacheDuration' );
+   $cache->set( self::BANK_LIST_CACHE_KEY, 
$banks, $duration );
+   $meta['issuers'] = $banks;
+   }
+   }
+   catch( Exception $e ) {
+   $this->logger->warning(
+   'Something failed trying to look up the 
bonks, using hard-coded list' .
+   $e->getMessage()
+   );
+   }
+   }
+   return $meta;
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move DatabaseDomain to Rdbms namespace

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336332 )

Change subject: Move DatabaseDomain to Rdbms namespace
..

Move DatabaseDomain to Rdbms namespace

Change-Id: Ifb06e792a36b5123ec3596933d0d394711ee5d08
---
M autoload.php
M includes/db/MWLBFactory.php
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabaseDomain.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/lbfactory/LBFactoryMulti.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
M tests/phpunit/includes/db/DatabaseTestHelper.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
11 files changed, 14 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/336332/1

diff --git a/autoload.php b/autoload.php
index 970dff0..ad7775a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -324,7 +324,6 @@
'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
'DatabaseBase' => __DIR__ . 
'/includes/libs/rdbms/database/Database.php',
-   'DatabaseDomain' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseDomain.php',
'DatabaseInstaller' => __DIR__ . 
'/includes/installer/DatabaseInstaller.php',
'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
'DatabaseLogEntry' => __DIR__ . '/includes/logging/LogEntry.php',
@@ -1587,6 +1586,7 @@
'WikiTextStructure' => __DIR__ . 
'/includes/content/WikiTextStructure.php',
'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . 
'/includes/libs/rdbms/ChronologyProtector.php',
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . 
'/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
+   'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseDomain.php',
'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/ILBFactory.php',
'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
'Wikimedia\\Rdbms\\LBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactory.php',
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index b215acd..09d8fab 100644
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -23,6 +23,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
  * MediaWiki-specific class for generating database load balancers
diff --git a/includes/libs/rdbms/database/DBConnRef.php 
b/includes/libs/rdbms/database/DBConnRef.php
index b268b9f..bd5cdb5 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -1,4 +1,7 @@
 https://gerrit.wikimedia.org/r/336332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb06e792a36b5123ec3596933d0d394711ee5d08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: The correct method is parse, not parsed

[EBernhardson (Code Review)]

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

Change subject: The correct method is parse, not parsed
..

The correct method is parse, not parsed

A recent patch updated these two calls to use Message::parsed(),
but it should have used the Message::parse() message.

Change-Id: I5aba40576b89f21d2b1416ca0db0d28d2a088c39
---
M includes/widget/search/InterwikiSearchResultSetWidget.php
M includes/widget/search/SimpleSearchResultSetWidget.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php 
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index 9cd69fa..76b9b01 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -109,7 +109,7 @@
Html::rawElement(
'p',
[ 'class' => 'iw-headline' ],
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed()
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parse()
) .
Html::rawElement(
'ul', [ 'class' => 'iw-results', ], 
$iwResultListOutput
diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php 
b/includes/widget/search/SimpleSearchResultSetWidget.php
index 6a0bb29..04e1e21 100644
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/widget/search/SimpleSearchResultSetWidget.php
@@ -77,7 +77,7 @@
return
"" .
"" .
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed() .
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parse() .
'' .
$out .
"";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aba40576b89f21d2b1416ca0db0d28d2a088c39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] operations/puppet[production]: extdist: Linting fixes

[Dzahn (Code Review)]

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

Change subject: extdist: Linting fixes
..


extdist: Linting fixes

Add trailing commas to abide by the Coding Style guidelines

Also add commas for last array element, although not required

Change-Id: I1ae0137232a61444968b046a6acd7b29f12afdb1
---
M modules/extdist/manifests/init.pp
1 file changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/modules/extdist/manifests/init.pp 
b/modules/extdist/manifests/init.pp
index 975c83c..dba183d 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -20,7 +20,7 @@
 'LOG_FILE'  => "${log_dir}/extdist",
 'SRC_PATH'  => $src_path,
 'PID_FILE'  => "${pid_folder}/pid.lock",
-'COMPOSER'  => "${composer_dir}/vendor/bin/composer"
+'COMPOSER'  => "${composer_dir}/vendor/bin/composer",
 }
 
 $skin_settings = {
@@ -30,7 +30,7 @@
 'LOG_FILE'  => "${log_dir}/skindist",
 'SRC_PATH'  => $src_path,
 'PID_FILE'  => "${pid_folder}/skinpid.lock",
-'COMPOSER'  => "${composer_dir}/vendor/bin/composer"
+'COMPOSER'  => "${composer_dir}/vendor/bin/composer",
 }
 
 user { 'extdist':
@@ -41,7 +41,7 @@
 file { '/home/extdist':
 ensure  => directory,
 owner   => 'extdist',
-require => User['extdist']
+require => User['extdist'],
 }
 
 file { [$dist_dir, $clone_dir, $src_path,
@@ -79,14 +79,14 @@
 ensure  => present,
 content => ordered_json($ext_settings),
 owner   => 'extdist',
-require => User['extdist']
+require => User['extdist'],
 }
 
 file { '/etc/skindist.conf':
 ensure  => present,
 content => ordered_json($skin_settings),
 owner   => 'extdist',
-require => User['extdist']
+require => User['extdist'],
 }
 
 cron { 'extdist-generate-tarballs':
@@ -97,8 +97,8 @@
 require => [
 Git::Clone['labs/tools/extdist'],
 User['extdist'],
-File['/etc/extdist.conf']
-]
+File['/etc/extdist.conf'],
+],
 }
 
 cron { 'skindist-generate-tarballs':
@@ -109,8 +109,8 @@
 require => [
 Git::Clone['labs/tools/extdist'],
 User['extdist'],
-File['/etc/skindist.conf']
-]
+File['/etc/skindist.conf'],
+],
 }
 
 nginx::site { 'extdist':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ae0137232a61444968b046a6acd7b29f12afdb1
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Juniorsys 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Yuvipanda 
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]: Switch search-interwiki-caption i18n to parsed

[jenkins-bot (Code Review)]

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

Change subject: Switch search-interwiki-caption i18n to parsed
..


Switch search-interwiki-caption i18n to parsed

A recent refactor of the interwiki sidebar looks to have a small
regression, in that this message used to use ->parsed() but now
uses ->escaped(). Switch back so the interiwki results on beta
render appropriately.

Bug: T149806
Change-Id: I44d0b1cd3bcc0606a0fb14e171d51bec1c310a91
---
M includes/widget/search/InterwikiSearchResultSetWidget.php
M includes/widget/search/SimpleSearchResultSetWidget.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php 
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index af1ed05..9cd69fa 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -109,7 +109,7 @@
Html::rawElement(
'p',
[ 'class' => 'iw-headline' ],
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->escaped()
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed()
) .
Html::rawElement(
'ul', [ 'class' => 'iw-results', ], 
$iwResultListOutput
diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php 
b/includes/widget/search/SimpleSearchResultSetWidget.php
index 49ebc4e..6a0bb29 100644
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/widget/search/SimpleSearchResultSetWidget.php
@@ -77,7 +77,7 @@
return
"" .
"" .
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->escaped() .
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed() .
'' .
$out .
"";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44d0b1cd3bcc0606a0fb14e171d51bec1c310a91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdrewniak 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Show again svwiki logo between 1.5x and 2x zoom

[Platonides (Code Review)]

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

Change subject: Show again svwiki logo between 1.5x and 2x zoom
..

Show again svwiki logo between 1.5x and 2x zoom

b8ef8a87cf set the filename to 1.5x.png, but the file is named svwiki-1.5x.png

Bug: T157387
Change-Id: I2e3b9ed8e18d65c1a22b271ae64029c8601cecd7
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9b6b07a..7d2781c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1196,7 +1196,7 @@
'shwiki' => [ '1.5x' => '/static/images/project-logos/shwiki-1.5x.png', 
'2x' => '/static/images/project-logos/shwiki-2x.png' ], //T150618
'sowiki' => [ '1.5x' => '/static/images/project-logos/sowiki-1.5x.png', 
'2x' => '/static/images/project-logos/sowiki-2x.png' ], //T150618
'stqwiki' => [ '1.5x' => 
'/static/images/project-logos/stqwiki-1.5x.png', '2x' => 
'/static/images/project-logos/stqwiki-2x.png' ], //T150618
-   'svwiki' => [ '1.5x' => '/static/images/project-logos/1.5x.png', '2x' 
=> '/static/images/project-logos/svwiki-2x.png' ], //T150618
+   'svwiki' => [ '1.5x' => '/static/images/project-logos/svwiki-1.5x.png', 
'2x' => '/static/images/project-logos/svwiki-2x.png' ], //T150618
'tawiki' => [ '1.5x' => '/static/images/project-logos/tawiki-1.5x.png', 
'2x' => '/static/images/project-logos/tawiki-2x.png' ],
'tcywiki' => [ '1.5x' => 
'/static/images/project-logos/tcywiki-1.5x.png', '2x' => 
'/static/images/project-logos/tcywiki-2x.png' ], // T140898
'tgwiki' => [ '1.5x' => '/static/images/project-logos/tgwiki-1.5x.png', 
'2x' => '/static/images/project-logos/tgwiki-2x.png' ], //T150618

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Allow us to disable opcache validate thing, this is needed o...

[Paladox (Code Review)]

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

Change subject: Allow us to disable opcache validate thing, this is needed on a 
development server
..

Allow us to disable opcache validate thing, this is needed on a development 
server

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/336329/1


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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove cp3011-cp3022, keep mgmt

[Dzahn (Code Review)]

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

Change subject: remove cp3011-cp3022, keep mgmt
..


remove cp3011-cp3022, keep mgmt

Bug: T130883
Change-Id: Ia7dc69ab4d73258244a7914040a279e1486a44db
---
M templates/10.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wmnet
3 files changed, 0 insertions(+), 48 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 123e9f0..c429a9d 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -120,18 +120,6 @@
 108 1H  IN PTR  cp3008.esams.wmnet.
 109 1H  IN PTR  cp3009.esams.wmnet.
 110 1H  IN PTR  cp3010.esams.wmnet.
-111 1H  IN PTR  cp3011.esams.wmnet.
-112 1H  IN PTR  cp3012.esams.wmnet.
-113 1H  IN PTR  cp3013.esams.wmnet.
-114 1H  IN PTR  cp3014.esams.wmnet.
-115 1H  IN PTR  cp3015.esams.wmnet.
-116 1H  IN PTR  cp3016.esams.wmnet.
-117 1H  IN PTR  cp3017.esams.wmnet.
-118 1H  IN PTR  cp3018.esams.wmnet.
-119 1H  IN PTR  cp3019.esams.wmnet.
-120 1H  IN PTR  cp3020.esams.wmnet.
-121 1H  IN PTR  cp3021.esams.wmnet.
-122 1H  IN PTR  cp3022.esams.wmnet.
 
 165 1H  IN PTR  cp3030.esams.wmnet.
 166 1H  IN PTR  cp3031.esams.wmnet.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7d1d13e..6c97193 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -55,18 +55,6 @@
 8.0.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3008.esams.wmnet.
 9.0.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3009.esams.wmnet.
 0.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3010.esams.wmnet.
-1.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3011.esams.wmnet.
-2.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3012.esams.wmnet.
-3.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3013.esams.wmnet.
-4.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3014.esams.wmnet.
-5.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3015.esams.wmnet.
-6.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3016.esams.wmnet.
-7.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3017.esams.wmnet.
-8.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3018.esams.wmnet.
-9.1.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3019.esams.wmnet.
-0.2.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3020.esams.wmnet.
-1.2.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3021.esams.wmnet.
-2.2.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3022.esams.wmnet.
 
 5.6.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3030.esams.wmnet.
 6.6.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3031.esams.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 8f01ed4..6bc5f52 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4001,30 +4001,6 @@
 1H  IN  2620:0:862:102:10:20:0:109
 cp3010  1H  IN A10.20.0.110
 1H  IN  2620:0:862:102:10:20:0:110
-cp3011  1H  IN A10.20.0.111
-1H  IN  2620:0:862:102:10:20:0:111
-cp3012  1H  IN A10.20.0.112
-1H  IN  2620:0:862:102:10:20:0:112
-cp3013  1H  IN A10.20.0.113
-1H  IN  2620:0:862:102:10:20:0:113
-cp3014  1H  IN A10.20.0.114
-1H  IN  2620:0:862:102:10:20:0:114
-cp3015  1H  IN A10.20.0.115
-1H  IN  2620:0:862:102:10:20:0:115
-cp3016  1H  IN A10.20.0.116
-1H  IN  2620:0:862:102:10:20:0:116
-cp3017  1H  IN A10.20.0.117
-1H  IN  2620:0:862:102:10:20:0:117
-cp3018  1H  IN A10.20.0.118
-1H  IN  2620:0:862:102:10:20:0:118
-cp3019  1H  IN A10.20.0.119
-1H  IN  2620:0:862:102:10:20:0:119
-cp3020  1H  IN A10.20.0.120
-1H  IN  2620:0:862:102:10:20:0:120
-cp3021  1H  IN A10.20.0.121
-1H  IN  2620:0:862:102:10:20:0:121
-cp3022  1H  IN A10.20.0.122
-1H  IN  2620:0:862:102:10:20:0:122
 cp3030  1H  IN A10.20.0.165
 1H  IN  2620:0:862:102:10:20:0:165
 cp3031  1H  IN A10.20.0.166

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7dc69ab4d73258244a7914040a279e1486a44db
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Remove unused docker related files

[Yuvipanda (Code Review)]

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

Change subject: tools: Remove unused docker related files
..


tools: Remove unused docker related files

Change-Id: I671443bd950602e73c3e495385eabd6c31bfe2f6
---
D modules/docker/files/docker.gpg
D modules/docker/files/setup-docker
D modules/k8s/manifests/docker.pp
D modules/k8s/templates/initscripts/docker.systemd.erb
4 files changed, 0 insertions(+), 65 deletions(-)

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



diff --git a/modules/docker/files/docker.gpg b/modules/docker/files/docker.gpg
deleted file mode 100644
index a81f586..000
--- a/modules/docker/files/docker.gpg
+++ /dev/null
Binary files differ
diff --git a/modules/docker/files/setup-docker 
b/modules/docker/files/setup-docker
deleted file mode 100644
index caf828b..000
--- a/modules/docker/files/setup-docker
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o nounset
-VERSION="$1"
-
-# If the default vd lvm group that labs_Lvm sets up still exists
-# remove it, since we will set up our own
-if vgdisplay vd; then
-vgremove --force vd
-fi
-
-# Create a docker vg, then create individual volumes in there
-vgcreate docker /dev/vda4
-
-lvcreate --wipesignatures y -n data docker -l 95%VG
-lvcreate --wipesignatures y -n metadata docker -l 5%VG
-
-# Run an apt-get update to make sure we have the docker repo
-apt-get update
-
-# Install a particular version of docker engine, but do not start it!
-RUNLEVEL=1 apt-get install --yes docker-engine=${VERSION}
-
-# Clean out the current /var/lib/docker for good measure, to prevent
-# any remnants of the loopback config from staying on
-rm -rf /var/lib/docker
\ No newline at end of file
diff --git a/modules/k8s/manifests/docker.pp b/modules/k8s/manifests/docker.pp
deleted file mode 100644
index f21bfa8..000
--- a/modules/k8s/manifests/docker.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# = Class: k8s::docker
-#
-# Sets up docker as used by kubernetes
-class k8s::docker {
-class { '::docker::engine':
-declare_service => false,
-}
-
-base::service_unit { 'docker':
-systemd   => true,
-subscribe => Class['::docker::engine'],
-}
-}
diff --git a/modules/k8s/templates/initscripts/docker.systemd.erb 
b/modules/k8s/templates/initscripts/docker.systemd.erb
deleted file mode 100644
index c27972c..000
--- a/modules/k8s/templates/initscripts/docker.systemd.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is managed by puppet
-[Unit]
-Description=Docker Application Container Engine (with flannel support)
-Documentation=http://docs.docker.com
-After=network.target docker.socket flannel.service
-Requires=docker.socket flannel.service
-
-[Service]
-EnvironmentFile=-/etc/default/docker
-EnvironmentFile=/run/flannel/subnet.env
-ExecStart=/usr/bin/docker daemon -H fd:// \
---bip=${FLANNEL_SUBNET} \
---mtu=${FLANNEL_MTU} \
---iptables=false \
---ip-masq=false \
---storage-opt dm.datadev=/dev/docker/data \
---storage-opt dm.metadatadev=/dev/docker/metadata
-MountFlags=slave
-LimitNOFILE=1048576
-LimitNPROC=1048576
-LimitCORE=infinity
-TimeoutStartSec=0
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I671443bd950602e73c3e495385eabd6c31bfe2f6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Yuvipanda 
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]: tools: Turn on docker live-migrate for docker builder

[Yuvipanda (Code Review)]

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

Change subject: tools: Turn on docker live-migrate for docker builder
..


tools: Turn on docker live-migrate for docker builder

Bug: T157180
Change-Id: Ie0a29a5e086c07365ffd2ff09b79ac65033c58dc
---
M modules/role/manifests/toollabs/docker/builder.pp
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/toollabs/docker/builder.pp 
b/modules/role/manifests/toollabs/docker/builder.pp
index 5def64e..8c3d211 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -9,8 +9,9 @@
 
 class { '::profile::docker::engine':
 settings=> {
-'iptables' => false,
-'ip-masq'  => false,
+'iptables' => false,
+'ip-masq'  => false,
+'live-restore' => true,
 },
 version => '1.12.6-0~debian-jessie',
 declare_service => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0a29a5e086c07365ffd2ff09b79ac65033c58dc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
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...EventBus[master]: Fix EventBusRCFeedEngine inheritance

[jenkins-bot (Code Review)]

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

Change subject: Fix EventBusRCFeedEngine inheritance
..


Fix EventBusRCFeedEngine inheritance

Follows-up 39a6e3dc4d in MediaWiki core, and 932c9d8a1e. Found in logstash-beta:
> PHP Fatal Error:
> EventBusRCFeedEngine cannot implement RCFeedEngine - not an interface

This interface wasn't implemented anywhere at the time that core patch
was written, but then this class was introduced in EventBus shortly after.

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

Approvals:
  Aaron Schulz: Looks good to me, approved
  Ottomata: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/EventBusRCFeedEngine.php b/EventBusRCFeedEngine.php
index 5dec860..0771dcf 100644
--- a/EventBusRCFeedEngine.php
+++ b/EventBusRCFeedEngine.php
@@ -15,7 +15,7 @@
  * );
  *
  */
-class EventBusRCFeedEngine implements RCFeedEngine {
+class EventBusRCFeedEngine extends RCFeedEngine {
 
/**
 * @param array$feed will be used for EventBus $config.  
Singleton instances

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6f671efab397d3a8e0146350ffb87a5df7d1ac
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Fix puppet on docker builder hosts

[Yuvipanda (Code Review)]

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

Change subject: tools: Fix puppet on docker builder hosts
..


tools: Fix puppet on docker builder hosts

Change-Id: Ifcb5469fd4d70cf6fa958472655a2d83ea0413e4
---
M modules/role/manifests/toollabs/docker/builder.pp
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/toollabs/docker/builder.pp 
b/modules/role/manifests/toollabs/docker/builder.pp
index c9bb1ad..5def64e 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -8,12 +8,13 @@
 }
 
 class { '::profile::docker::engine':
-settings => {
+settings=> {
 'iptables' => false,
 'ip-masq'  => false,
 },
-version  => '1.12.6-0~debian-jessie',
-require  => Class['::profile::docker::storage'],
+version => '1.12.6-0~debian-jessie',
+declare_service => true,
+require => Class['::profile::docker::storage'],
 }
 
 class { '::toollabs::images': }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcb5469fd4d70cf6fa958472655a2d83ea0413e4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
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]: Switch search-interwiki-caption i18n to parsed

[EBernhardson (Code Review)]

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

Change subject: Switch search-interwiki-caption i18n to parsed
..

Switch search-interwiki-caption i18n to parsed

A recent refactor of the interwiki sidebar looks to have a small
regression, in that this message used to use ->parsed() but now
uses ->escaped(). Switch back so the interiwki results on beta
render appropriately.

Bug: T149806
Change-Id: I44d0b1cd3bcc0606a0fb14e171d51bec1c310a91
---
M includes/widget/search/InterwikiSearchResultSetWidget.php
M includes/widget/search/SimpleSearchResultSetWidget.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php 
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index af1ed05..9cd69fa 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -109,7 +109,7 @@
Html::rawElement(
'p',
[ 'class' => 'iw-headline' ],
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->escaped()
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed()
) .
Html::rawElement(
'ul', [ 'class' => 'iw-results', ], 
$iwResultListOutput
diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php 
b/includes/widget/search/SimpleSearchResultSetWidget.php
index 49ebc4e..6a0bb29 100644
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/widget/search/SimpleSearchResultSetWidget.php
@@ -77,7 +77,7 @@
return
"" .
"" .
-   $this->specialSearch->msg( 
'search-interwiki-caption' )->escaped() .
+   $this->specialSearch->msg( 
'search-interwiki-caption' )->parsed() .
'' .
$out .
"";

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move ILoadBalancer to Rdbms namespace

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336327 )

Change subject: Move ILoadBalancer to Rdbms namespace
..

Move ILoadBalancer to Rdbms namespace

All callers are in core and have been updated.
Other callers can now be switched from LoadBalancer type hints to
ILoadBalancer type hints. Once that migration is done, the classes
implementing it can be moved too.

Change-Id: I6b34099b5816dd8bf9646ed39f7a2d1960e2ed06
---
M autoload.php
M includes/libs/rdbms/ChronologyProtector.php
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/defines.php
M includes/libs/rdbms/lbfactory/ILBFactory.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/loadbalancer/ILoadBalancer.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/libs/rdbms/loadmonitor/ILoadMonitor.php
M includes/libs/rdbms/loadmonitor/LoadMonitor.php
M includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
M includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
12 files changed, 21 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/336327/1

diff --git a/autoload.php b/autoload.php
index 970dff0..50789f8 100644
--- a/autoload.php
+++ b/autoload.php
@@ -597,7 +597,6 @@
'IEUrlExtension' => __DIR__ . '/includes/libs/IEUrlExtension.php',
'IExpiringStore' => __DIR__ . 
'/includes/libs/objectcache/IExpiringStore.php',
'IJobSpecification' => __DIR__ . 
'/includes/jobqueue/JobSpecification.php',
-   'ILoadBalancer' => __DIR__ . 
'/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
'ILocalizedException' => __DIR__ . 
'/includes/exception/LocalizedException.php',
'IMaintainableDatabase' => __DIR__ . 
'/includes/libs/rdbms/database/IMaintainableDatabase.php',
'IP' => __DIR__ . '/includes/libs/IP.php',
@@ -1588,6 +1587,7 @@
'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . 
'/includes/libs/rdbms/ChronologyProtector.php',
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . 
'/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/ILBFactory.php',
+   'Wikimedia\\Rdbms\\ILoadBalancer' => __DIR__ . 
'/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
'Wikimedia\\Rdbms\\LBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactory.php',
'Wikimedia\\Rdbms\\LBFactoryMulti' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactoryMulti.php',
diff --git a/includes/libs/rdbms/ChronologyProtector.php 
b/includes/libs/rdbms/ChronologyProtector.php
index dfe950e..0daa4ed 100644
--- a/includes/libs/rdbms/ChronologyProtector.php
+++ b/includes/libs/rdbms/ChronologyProtector.php
@@ -29,7 +29,6 @@
 use Wikimedia\WaitConditionLoop;
 use BagOStuff;
 use DBMasterPos;
-use ILoadBalancer;
 
 /**
  * Class for ensuring a consistent ordering of events as seen by the user, 
despite replication.
diff --git a/includes/libs/rdbms/database/DBConnRef.php 
b/includes/libs/rdbms/database/DBConnRef.php
index b268b9f..b28e7e5 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -1,4 +1,7 @@
 https://gerrit.wikimedia.org/r/336327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b34099b5816dd8bf9646ed39f7a2d1960e2ed06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Use docker profile for k8s worker nodes

[Yuvipanda (Code Review)]

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

Change subject: tools: Use docker profile for k8s worker nodes
..


tools: Use docker profile for k8s worker nodes

Change-Id: I51a43923ba14837ba1842cb9ddcef9662ea2d322
---
M hieradata/role/common/kubernetes/worker.yaml
M modules/profile/manifests/docker/engine.pp
A modules/profile/manifests/docker/flannel.pp
A 
modules/profile/templates/initscripts/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
M modules/role/manifests/toollabs/k8s/worker.pp
5 files changed, 59 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index eb27f09..f868bba 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -5,6 +5,7 @@
 profile::docker::storage::physical_volumes: "/dev/md2"
 profile::docker::storage::vg_to_remove: ''
 profile::docker::engine::version: "1.12.5-0~debian-jessie"
+profile::docker::engine::declare_service: true
 profile::kubernetes::master_hosts:
 - argon.eqiad.wmnet
 - chlorine.eqiad.wmnet
diff --git a/modules/profile/manifests/docker/engine.pp 
b/modules/profile/manifests/docker/engine.pp
index 7e9d1b5..c6b8d98 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -9,6 +9,9 @@
 $settings = hiera_hash('profile::docker::engine::settings'),
 # Version to install; the default is not to pick one.
 $version = hiera('profile::docker::engine::version'),
+# Set to false if we don't want to declare the docker service here
+# We want this to be on if we want to use a different docker systemd 
service (with flannel support, for eg.)
+$declare_service = hiera('profile::docker::engine::declare_service')
 ) {
 
 # Install docker
@@ -42,8 +45,10 @@
 value => '1',
 }
 
-# Service declaration
-service { 'docker':
-ensure => 'running',
+if $declare_service {
+# Service declaration
+service { 'docker':
+ensure => 'running',
+}
 }
 }
diff --git a/modules/profile/manifests/docker/flannel.pp 
b/modules/profile/manifests/docker/flannel.pp
new file mode 100644
index 000..4485001
--- /dev/null
+++ b/modules/profile/manifests/docker/flannel.pp
@@ -0,0 +1,15 @@
+class profile::docker::flannel(
+# Docker version in use. The systemd override is specific
+# to the version in use.
+$docker_version = hiera('profile::flannel::docker_version'),
+) {
+base::service_unit { 'docker':
+ensure   => present,
+systemd  => true,
+systemd_override => true,
+# Restarts must always be manual, since restart
+# destroy all running containers. Fuck you, Docker.
+refresh  => false,
+template_name=> "docker/flannel/docker_${docker_version}",
+}
+}
diff --git 
a/modules/profile/templates/initscripts/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
 
b/modules/profile/templates/initscripts/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
new file mode 100644
index 000..9b14f4e
--- /dev/null
+++ 
b/modules/profile/templates/initscripts/docker/flannel/docker_1.11.2-0~jessie.systemd_override.erb
@@ -0,0 +1,13 @@
+# Docker override systemd for v1.11.2-0~jessie
+[Unit]
+After=network.target docker.socket flannel.service
+Requires=docker.socket flannel.service
+
+[Service]
+EnvironmentFile=/run/flannel/subnet.env
+# We need to clear ExecStart first before setting it again
+ExecStart=
+ExecStart=/usr/bin/docker daemon -H fd:// \
+--config-file=/etc/docker/daemon.json \
+--bip=${FLANNEL_SUBNET} \
+--mtu=${FLANNEL_MTU}
diff --git a/modules/role/manifests/toollabs/k8s/worker.pp 
b/modules/role/manifests/toollabs/k8s/worker.pp
index e865010..f0e0847 100644
--- a/modules/role/manifests/toollabs/k8s/worker.pp
+++ b/modules/role/manifests/toollabs/k8s/worker.pp
@@ -16,9 +16,28 @@
 etcd_endpoints => $etcd_url,
 }
 
-class { '::k8s::docker':
-require => Class['::k8s::flannel'],
+$docker_version = '1.11.2-0~jessie'
+
+class { '::profile::docker::storage':
+physical_volumes => '/dev/vda4',
+vg_to_remove => 'vd',
 }
+
+class { '::profile::docker::engine':
+settings=> {
+'iptables' => false,
+'ip-masq'  => false,
+},
+version => $docker_version,
+declare_service => false,
+require => Class['::profile::docker::storage'],
+}
+
+class { '::profile::docker::flannel':
+docker_version => $docker_version,
+require=> Class['::profile::docker::engine'],
+}
+
 
 class { '::k8s::ssl':
 provide_private => 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools: Use docker engine profile in tools builder

[Yuvipanda (Code Review)]

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

Change subject: tools: Use docker engine profile in tools builder
..


tools: Use docker engine profile in tools builder

- Remove some choices that we aren't making, thus leading to dead
  code being removed (can no longer use debian docker image)
- Use lvm module to setup devicemapper docker storage backend,
  not bash script
- Upgrade version of docker we use

Change-Id: I6b5bcd6837509e21d1e1e65efa29cd3785e70a6f
---
M modules/docker/manifests/init.pp
M modules/profile/manifests/docker/engine.pp
M modules/role/manifests/toollabs/docker/builder.pp
M modules/toollabs/manifests/images.pp
4 files changed, 24 insertions(+), 30 deletions(-)

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



diff --git a/modules/docker/manifests/init.pp b/modules/docker/manifests/init.pp
index 16a21c4..ec884a1 100644
--- a/modules/docker/manifests/init.pp
+++ b/modules/docker/manifests/init.pp
@@ -7,23 +7,10 @@
 # === Parameters
 #
 # [*version*] The package version to install
-#
-# [*use_dockerproject*] Whether to use dockerproject.org packages or not.
-#
-class docker($version, $use_dockerproject=true){
-if $use_dockerproject {
-$package = 'docker-engine'
-$absent_package = 'docker.io'
-}
-else {
-$package = 'docker.io'
-$absent_package = 'docker-engine'
-}
-
-package { $absent_package:
-ensure => absent,
-}
-package { $package:
+class docker(
+$version,
+){
+package { 'docker-engine':
 ensure => $version,
 }
 }
diff --git a/modules/profile/manifests/docker/engine.pp 
b/modules/profile/manifests/docker/engine.pp
index 4dd5092..7e9d1b5 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -3,19 +3,17 @@
 # Installs docker, along with setting up the volume group needed for the
 # devicemapper storage driver to work.
 # to work
-class profile::docker::engine {
-
-# Optional parameters
+class profile::docker::engine(
 # We want to get settings across the hierarchy, some per host, some fleet
 # wide. So use hiera_hash to merge keys across the hierarchy
-$docker_settings = hiera_hash('profile::docker::engine::settings', {})
+$settings = hiera_hash('profile::docker::engine::settings'),
 # Version to install; the default is not to pick one.
-$docker_version = hiera('profile::docker::engine::version', 'present')
-$service_ensure = hiera('profile::docker::engine::service', 'running')
+$version = hiera('profile::docker::engine::version'),
+) {
 
 # Install docker
 class { 'docker':
-version => $docker_version,
+version => $version,
 }
 
 # Docker config
@@ -32,7 +30,7 @@
 
 # We need to import one storage config
 class { 'docker::configuration':
-settings => merge($docker_settings, $docker_storage_options),
+settings => merge($settings, $docker_storage_options),
 }
 
 # Enable memory cgroup
@@ -46,6 +44,6 @@
 
 # Service declaration
 service { 'docker':
-ensure => $service_ensure,
+ensure => 'running',
 }
 }
diff --git a/modules/role/manifests/toollabs/docker/builder.pp 
b/modules/role/manifests/toollabs/docker/builder.pp
index 6fee47e..c9bb1ad 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -2,7 +2,19 @@
 class role::toollabs::docker::builder {
 include ::toollabs::infrastructure
 
-class { '::docker::engine': }
+class { '::profile::docker::storage':
+vg_to_remove => 'vd',
+physical_volumes => '/dev/vda4',
+}
+
+class { '::profile::docker::engine':
+settings => {
+'iptables' => false,
+'ip-masq'  => false,
+},
+version  => '1.12.6-0~debian-jessie',
+require  => Class['::profile::docker::storage'],
+}
 
 class { '::toollabs::images': }
 
diff --git a/modules/toollabs/manifests/images.pp 
b/modules/toollabs/manifests/images.pp
index d522da0..9869cb8 100644
--- a/modules/toollabs/manifests/images.pp
+++ b/modules/toollabs/manifests/images.pp
@@ -1,9 +1,6 @@
 # Helper class to setup building toollabs related images
 
 class toollabs::images {
-
-require ::docker::engine
-
 class { '::docker::baseimages':
 docker_registry => hiera('docker::registry'),
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b5bcd6837509e21d1e1e65efa29cd3785e70a6f
Gerrit-PatchSet: 13
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Fix EventBusRCFeedEngine inheritance

[Krinkle (Code Review)]

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

Change subject: Fix EventBusRCFeedEngine inheritance
..

Fix EventBusRCFeedEngine inheritance

Follows-up 39a6e3dc4d in MediaWiki core. Found this error in logstash-beta:
> PHP Fatal Error:
> EventBusRCFeedEngine cannot implement RCFeedEngine - not an interface

This interface wasn't implemented anywhere at the time that core patch
was written, but then this class was introduced in EventBus shortly after.

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


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

diff --git a/EventBusRCFeedEngine.php b/EventBusRCFeedEngine.php
index 5dec860..0771dcf 100644
--- a/EventBusRCFeedEngine.php
+++ b/EventBusRCFeedEngine.php
@@ -15,7 +15,7 @@
  * );
  *
  */
-class EventBusRCFeedEngine implements RCFeedEngine {
+class EventBusRCFeedEngine extends RCFeedEngine {
 
/**
 * @param array$feed will be used for EventBus $config.  
Singleton instances

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:JavaScriptTest: send RL errors to the js console

[jenkins-bot (Code Review)]

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

Change subject: Special:JavaScriptTest: send RL errors to the js console
..


Special:JavaScriptTest: send RL errors to the js console

ResourceLoader errors, like invalid dependencies, are
hard to spot and only result in the special page
not finding any tests.

This is not a perfect solution but it would have
saved me a full day of troubleshooting.

Change-Id: I247174f89772b84b4cad31deffb03152921df020
---
M includes/specials/SpecialJavaScriptTest.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialJavaScriptTest.php 
b/includes/specials/SpecialJavaScriptTest.php
index 0e2e7db..dc6a619 100644
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -137,7 +137,9 @@
$code .= '(function () {'
. 'var start = window.__karma__ ? 
window.__karma__.start : QUnit.start;'
. 'try {'
-   . 'mw.loader.using( ' . Xml::encodeJsVar( $modules ) . 
' ).always( start );'
+   . 'mw.loader.using( ' . Xml::encodeJsVar( $modules ) . 
' )'
+   . '.always( start )'
+   . '.fail( function ( e ) { throw e; } );'
. '} catch ( e ) { start(); throw e; }'
. '}());';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I247174f89772b84b4cad31deffb03152921df020
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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