date:20161102

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: WIP: Partial change rebasing in the case of conflicts

2016-11-02 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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

Change subject: WIP: Partial change rebasing in the case of conflicts
..

WIP: Partial change rebasing in the case of conflicts

Change-Id: Ice73a863008c41078c2d931cd1f84a2a4661a9c2
---
M src/dm/ve.dm.Change.js
M tests/dm/ve.dm.Change.test.js
2 files changed, 35 insertions(+), 19 deletions(-)


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

diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index 10dd578..f224d3c 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -193,8 +193,8 @@
  * rebased onto a1 * ... * aN . Iteratively we can take the same approach to 
rebase over
  * b2,...,bM, giving both rebased lists as required.
  *
- * If any of the transaction rebases conflict, then we immediately return a 
conflict for the
- * whole change rebase.
+ * If any of the transaction rebases conflict, then we return all of a1,...,aN 
rebased onto
+ * the largest non-conflicting initial segment b1,...,bK (where clearly K < M).
  *
  * If ordering is ambiguous (two inserts at the same location), the insert for 
the transaction
  * with the highest author ID is put first (Javascript less-than is used, so 
comparisons with
@@ -203,11 +203,14 @@
  *
  * @param {ve.dm.Change} changeA A change
  * @param {ve.dm.Change} changeB Another change
- * @return {ve.dm.Change[]} [ changeAOnChangeB, changeBOnChangeA ], or [ null, 
null ] if conflict
- * @throws {Error} If changeA and changeB have different starts
+ * @return {Object} Rebased changeA and (the largest non-conflicting initial 
segment of) changeB
+ * @return {ve.dm.Change} return.a All of changeA rebased onto an initial 
segment of changeB
+ * @return {ve.dm.Change} return.b An initial segment of changeB rebased onto 
all of changeA
+ * @return {boolean} return.conflict Whether part of changeB was rejected due 
to conflict
  */
 ve.dm.Change.static.rebaseChanges = function ( changeA, changeB ) {
-   var i, iLen, b, j, jLen, a, rebases,
+   var i, iLen, b, j, jLen, a, rebases, rebasedTransactionsA,
+   conflict = false,
transactionsA = changeA.transactions.slice(),
transactionsB = changeB.transactions.slice();
 
@@ -234,9 +237,11 @@
//
// These identities hold if all the rebases work; if any of them fail, 
the entire
// rebase fails and we return null values.
+   bLoop:
for ( i = 0, iLen = transactionsB.length; i < iLen; i++ ) {
b = transactionsB[ i ];
// Rebase transactions list onto otherTx
+   rebasedTransactionsA = [];
for ( j = 0, jLen = transactionsA.length; j < jLen; j++ ) {
a = transactionsA[ j ];
if ( a.author < b.author ) {
@@ -244,30 +249,34 @@
} else {
rebases = ve.dm.Transaction.rebaseTransactions( 
a, b );
}
-   transactionsA[ j ] = rebases[ 0 ];
-   b = rebases[ 1 ];
-   if ( b === null ) {
-   return [ null, null ];
+   if ( rebases[ 0 ] === null ) {
+   conflict = true;
+   transactionsB.length = i;
+   break bLoop;
}
+   rebasedTransactionsA[ j ] = rebases[ 0 ];
+   b = rebases[ 1 ];
}
+   transactionsA = rebasedTransactionsA;
transactionsB[ i ] = b;
}
 
-   return [
+   return {
// These length calculations assume no removal of empty rebased 
transactions
-   new ve.dm.Change(
-   changeA.transactionStart + changeB.transactions.length,
+   a: new ve.dm.Change(
+   changeA.transactionStart + transactionsB.length,
transactionsA,
changeB.storeStart + changeB.store.getLength(),
changeA.store.difference( changeB.store )
),
-   new ve.dm.Change(
-   changeB.transactionStart + changeA.transactions.length,
+   b: new ve.dm.Change(
+   changeB.transactionStart + transactionsA.length,
transactionsB,
changeA.storeStart + changeA.store.getLength(),
changeB.store.difference( changeA.store )
-   )
-   ];
+   ),
+   conflict: conflict
+   };
 };
 
 /* Methods */
@@ -312,10 +321,13 @@
  * @throws {Error} If this change and other have different starts
  */
 ve.dm.Change.prototype.rebasedOnto = function ( other, startmost

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Minor SpecialBannerLoader style cleanups

2016-11-02 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Minor SpecialBannerLoader style cleanups
..

Minor SpecialBannerLoader style cleanups

Change-Id: I7884bcff24cb14d77cead9151dbafd1cb9817bcc
---
M special/SpecialBannerLoader.php
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/19/319519/1

diff --git a/special/SpecialBannerLoader.php b/special/SpecialBannerLoader.php
index dfaeb61..7265ef0 100644
--- a/special/SpecialBannerLoader.php
+++ b/special/SpecialBannerLoader.php
@@ -3,7 +3,6 @@
  * Renders banner contents as jsonp.
  */
 class SpecialBannerLoader extends UnlistedSpecialPage {
-
/**
 * Seconds leeway for checking stale choice data. Should be the same
 * as mw.cnBannerControllerLib.CAMPAIGN_STALENESS_LEEWAY.
@@ -12,10 +11,9 @@
 
/** @var string Name of the chosen banner */
public $bannerName;
-
/** @var string Name of the campaign that the banner belongs to.*/
public $campaignName;
-
+   /** @var bool */
protected $debug;
 
function __construct() {
@@ -99,7 +97,6 @@
 * @throws StaleCampaignException
 */
public function getJsNotice( $bannerName ) {
-
// If this wasn't a test of a banner, check that this is from a 
campaign
// that hasn't ended. We might get old campaigns due to 
forever-cached
// JS somewhere. Note that we include some leeway and don't 
consider
@@ -108,7 +105,6 @@
 
// An empty campaign name is how bannerController indicates a 
test request.
if ( $this->campaignName !== '' ) {
-
// The following will throw a 
CampaignExistenceException if there's
// no such campaign.
$campaign = new Campaign( $this->campaignName );
@@ -131,7 +127,8 @@
if ( !$banner->exists() ) {
throw new EmptyBannerException( $bannerName );
}
-   $bannerRenderer = new BannerRenderer( $this->getContext(), 
$banner, $this->campaignName, $this->debug );
+   $bannerRenderer = new BannerRenderer(
+   $this->getContext(), $banner, $this->campaignName, 
$this->debug );
 
$bannerHtml = $bannerRenderer->toHtml();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7884bcff24cb14d77cead9151dbafd1cb9817bcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
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]: labstore: Add mountpoint at srv for labstore-lvm-noraid part...

2016-11-02 Thread Madhuvishy (Code Review)

Madhuvishy has submitted this change and it was merged.

Change subject: labstore: Add mountpoint at srv for labstore-lvm-noraid partman 
recipe
..


labstore: Add mountpoint at srv for labstore-lvm-noraid partman recipe

Bug: T149870
Change-Id: I081ef3ae1f9b0d380f41e51573c95d205b51bc5d
---
M modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg 
b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
index 0689bd7..5cc291c 100644
--- a/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
+++ b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
@@ -35,7 +35,7 @@
lv_name{ data } \
$defaultignore{ }   \
$lvmok{ }   \
-   mountpoint{  }  \
+   mountpoint{ /srv }  \
.
 
 d-ipartman-auto-lvm/guided_sizestring  80%

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I081ef3ae1f9b0d380f41e51573c95d205b51bc5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: Add mountpoint at srv for labstore-lvm-noraid part...

2016-11-02 Thread Madhuvishy (Code Review)

Madhuvishy has uploaded a new change for review.

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

Change subject: labstore: Add mountpoint at srv for labstore-lvm-noraid partman 
recipe
..

labstore: Add mountpoint at srv for labstore-lvm-noraid partman recipe

Bug: T149870
Change-Id: I081ef3ae1f9b0d380f41e51573c95d205b51bc5d
---
M modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg 
b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
index 0689bd7..5cc291c 100644
--- a/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
+++ b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
@@ -35,7 +35,7 @@
lv_name{ data } \
$defaultignore{ }   \
$lvmok{ }   \
-   mountpoint{  }  \
+   mountpoint{ /srv }  \
.
 
 d-ipartman-auto-lvm/guided_sizestring  80%

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

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

___
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 wrong colored `box-shadow` on ToggleSwi...

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: MediaWiki theme: Fix wrong colored `box-shadow` on 
ToggleSwitchWidget
..


MediaWiki theme: Fix wrong colored `box-shadow` on ToggleSwitchWidget

Fixing a small visual glitch, `box-shadow` on ToggleSwitchWidget
should be progressive active blue and not progressive when
in `:active` and `:active:focus` state.

Change-Id: Ifc2e0d619b46011af840df663ca93882480c4fff
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index f9c6c8a..9499f9e 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -91,6 +91,7 @@
 
 @box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
 @box-shadow-menu: @box-shadow-dialog;
+@box-shadow-active: inset 0 0 0 1px @color-progressive-active;
 @box-shadow-focus-default: inset 0 0 0 1px @color-progressive;
 @box-shadow-focus-inset: inset 0 0 0 1px @color-progressive, inset 0 0 0 2px 
@color-default-light;
 @box-shadow-focus-readonly: inset 0 0 0 1px #c8ccd1;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index d58223f..55f5226 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1554,9 +1554,11 @@
}
}
&:active,
-   &:active:hover {
+   &:active:hover,
+   &:active:focus {
background-color: @background-color-input-binary-active;
border-color: @border-color-input-binary-active;
+   box-shadow: @box-shadow-active;
 
.oo-ui-toggleSwitchWidget-grip {
background-color: @background-color-default;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2e0d619b46011af840df663ca93882480c4fff
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Prtksxna 
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]: cache_text: route around codfw in cache::route_table

2016-11-02 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: cache_text: route around codfw in cache::route_table
..


cache_text: route around codfw in cache::route_table

Bug: T131503
Change-Id: I9a9d4a9a3ecd4903c2af37680d68590fd9b64591
---
M hieradata/role/common/cache/text.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/cache/text.yaml 
b/hieradata/role/common/cache/text.yaml
index ae2fe39..c9c45a6 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -24,5 +24,5 @@
 cache::route_table:
   eqiad: 'direct'
   codfw: 'eqiad'
-  ulsfo: 'codfw'
+  ulsfo: 'eqiad'
   esams: 'eqiad'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a9d4a9a3ecd4903c2af37680d68590fd9b64591
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 
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]: SystemTap Puppet module and role::systemtap::devserver

2016-11-02 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: SystemTap Puppet module and role::systemtap::devserver
..


SystemTap Puppet module and role::systemtap::devserver

The systemtap puppet module allows configuring a SystemTap development
server as well as the runtime environment required to run compiled
SystemTap probes.

A role called systemtap::devserver is also introduced by this commit.

Change-Id: I24ad8d60a0ccc7616c33af4b0a323c39344a1444
---
A modules/role/manifests/systemtap/devserver.pp
A modules/systemtap/README.md
A modules/systemtap/manifests/devserver.pp
A modules/systemtap/manifests/runtime.pp
4 files changed, 83 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/systemtap/devserver.pp 
b/modules/role/manifests/systemtap/devserver.pp
new file mode 100644
index 000..7d6f969
--- /dev/null
+++ b/modules/role/manifests/systemtap/devserver.pp
@@ -0,0 +1,11 @@
+# == Class: role::systemtap::devserver
+#
+# Role to configure a SystemTap development server
+#
+class role::systemtap::devserver {
+include systemtap::devserver
+
+system::role { 'role::systemtap::devserver':
+description => 'SystemTap development environment'
+}
+}
diff --git a/modules/systemtap/README.md b/modules/systemtap/README.md
new file mode 100644
index 000..cea4d79
--- /dev/null
+++ b/modules/systemtap/README.md
@@ -0,0 +1,17 @@
+# SystemTap Puppet Module #
+
+A Puppet module for configuring SystemTap development servers and the runtime
+environment required to run compiled SystemTap probes.
+
+# Usage #
+
+To configure a development environment where SystemTap probes can be compiled,
+include systemtap::devserver. The following sample probe can be executed on the
+development server to check if the basic SystemTap functionalities are working
+fine: `stap -e 'probe oneshot { println("hello world") }'`.
+
+Production machines can be configured to run SystemTap probes by including
+systemtap::runtime.
+
+# See also #
+https://wikitech.wikimedia.org/wiki/SystemTap
diff --git a/modules/systemtap/manifests/devserver.pp 
b/modules/systemtap/manifests/devserver.pp
new file mode 100644
index 000..db873cd
--- /dev/null
+++ b/modules/systemtap/manifests/devserver.pp
@@ -0,0 +1,33 @@
+# Class systemtap::devserver
+# Development environment for SystemTap probes
+#
+# Actions:
+#   Installs the systemtap package, the debugging symbols for the Linux kernel
+#   and the kernel headers matching the currently running kernel.
+#
+# Usage:
+#   include systemtap::devserver
+class systemtap::devserver {
+require_package([
+'build-essential',
+"linux-image-${::kernelrelease}-dbg",
+"linux-headers-${::kernelrelease}"
+])
+
+# require_package creates a dynamic intermediate class that makes declaring
+# dependencies a bit strange. Let's use package directly here.
+if !defined(Package['systemtap']) {
+package { 'systemtap':
+ensure => 'present',
+}
+}
+
+if os_version('debian jessie') {
+apt::pin { 'systemtap':
+package  => 'systemtap systemtap-common systemtap-runtime',
+pin  => 'release a=jessie-backports',
+priority => '1001',
+before   => Package['systemtap'],
+}
+}
+}
diff --git a/modules/systemtap/manifests/runtime.pp 
b/modules/systemtap/manifests/runtime.pp
new file mode 100644
index 000..c52e619
--- /dev/null
+++ b/modules/systemtap/manifests/runtime.pp
@@ -0,0 +1,22 @@
+# Class systemtap::runtime
+# SystemTap runtime environment
+#
+# Actions:
+#   Installs the systemtap-runtime package, necessary to run compiled SystemTap
+#   probes.
+#
+# Usage:
+#   include systemtap::runtime
+class systemtap::runtime {
+package { 'systemtap-runtime':
+ensure => 'present',
+}
+
+if os_version('debian jessie') {
+apt::pin { 'systemtap-runtime':
+pin  => 'release a=jessie-backports',
+priority => '1001',
+before   => Package['systemtap-runtime'],
+}
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24ad8d60a0ccc7616c33af4b0a323c39344a1444
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
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] operations/mediawiki-config[master]: mariadb: Remove references to db1042 for decommission

2016-11-02 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged.

Change subject: mariadb: Remove references to db1042 for decommission
..


mariadb: Remove references to db1042 for decommission

Change-Id: I6e4f32a87a82e9a69da1c68298cfdd3773511adb
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index f13bf26..129d1f2 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -441,7 +441,6 @@
'db1039' => '10.64.16.28', #do not remove or comment out
'db1040' => '10.64.16.29', #do not remove or comment out
'db1041' => '10.64.16.30', #do not remove or comment out
-   'db1042' => '10.64.16.31', #do not remove or comment out
'db1043' => '10.64.16.32', #do not remove or comment out
'db1044' => '10.64.16.33', #do not remove or comment out
'db1045' => '10.64.16.34', #do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 2e59268..39b6bc5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -467,7 +467,6 @@
'db1039' => '10.64.16.28', #do not remove or comment out
'db1040' => '10.64.16.29', #do not remove or comment out
'db1041' => '10.64.16.30', #do not remove or comment out
-   'db1042' => '10.64.16.31', #do not remove or comment out
'db1043' => '10.64.16.32', #do not remove or comment out
'db1044' => '10.64.16.33', #do not remove or comment out
'db1045' => '10.64.16.34', #do not remove or comment out

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1052 and db1073 once extra en api load has...

2016-11-02 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged.

Change subject: mariadb: Depool db1052 and db1073 once extra en api load has 
gone
..


mariadb: Depool db1052 and db1073 once extra en api load has gone

Change-Id: I2ee026aea68d6e1ef7d8b576038177a0a9e14aaf
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0efcebc..2e59268 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -94,13 +94,13 @@
 'sectionLoads' => [
's1' => [
'db1057' => 0,   # 2.8TB  96GB, master
-   'db1052' => 1  , # 2.8TB  96GB, old master, api
+#  'db1052' => 1  , # 2.8TB  96GB, old master
'db1051' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1055' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 1,   # 2.8TB 160GB, api
'db1066' => 1,   # 2.8TB 160GB, api
'db1072' => 0,   # 2.8TB 160GB, vslow, dump
-   'db1073' => 1,   # 2.8TB 160GB, api
+#  'db1073' => 1,   # 2.8TB 160GB
'db1080' => 500, # 3.6TB 512GB
'db1083' => 500, # 3.6TB 512GB
'db1089' => 500, # 3.6TB 512GB
@@ -264,10 +264,8 @@
'db1072' => 1,
],
'api' => [
-   'db1052' => 3,
-   'db1065' => 5,
-   'db1066' => 5,
-   'db1073' => 5,
+   'db1065' => 1,
+   'db1066' => 1,
],
],
's2' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: Optionally rate limit users who hit the spam blacklist

2016-11-02 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Optionally rate limit users who hit the spam blacklist
..

Optionally rate limit users who hit the spam blacklist

This allows wikis to configure $wgRateLimits to prevent users who
continually trip the spam blacklist to be blocked from editing. By
default no rate limits are set, so this doesn't do anything.

This was inspired by
.

Change-Id: Ic7938b86ec070f35d6463f8f3376239a7c8bc487
---
M SpamBlacklistHooks.php
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index eb0d5dd..79cabd7 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -44,6 +44,13 @@
$links[] = $summary;
}
 
+   // See if they've already tripped the rate limits,
+   // but don't increment yet
+   if ( $user->pingLimiter( 'spamblacklist', 0 ) ) {
+   $status->fatal( 'actionthrottledtext' );
+   return true;
+   }
+
$spamObj = BaseBlacklist::getInstance( 'spam' );
$matches = $spamObj->filter( $links, $title );
 
@@ -57,6 +64,8 @@
$status->apiHookResult = [
'spamblacklist' => implode( '|', $matches ),
];
+   // Increment the rate limit
+   $user->pingLimiter( 'spamblacklist' );
}
 
// Always return true, EditPage will look at $status->isOk().

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7938b86ec070f35d6463f8f3376239a7c8bc487
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: DatabaseMysqlBase visibility cleanups

2016-11-02 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: DatabaseMysqlBase visibility cleanups
..

DatabaseMysqlBase visibility cleanups

Change-Id: I015fc37a5525a31fb779ba841a1966675ebc494d
---
M includes/libs/rdbms/database/DatabaseMysqlBase.php
1 file changed, 31 insertions(+), 29 deletions(-)


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

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php 
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 3b7681e..6799ca3 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -94,7 +94,7 @@
/**
 * @return string
 */
-   function getType() {
+   public function getType() {
return 'mysql';
}
 
@@ -106,7 +106,7 @@
 * @throws Exception|DBConnectionError
 * @return bool
 */
-   function open( $server, $user, $password, $dbName ) {
+   public function open( $server, $user, $password, $dbName ) {
# Close/unset connection handle
$this->close();
 
@@ -237,7 +237,7 @@
 * @param ResultWrapper|resource $res
 * @throws DBUnexpectedError
 */
-   function freeResult( $res ) {
+   public function freeResult( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
}
@@ -262,7 +262,7 @@
 * @return stdClass|bool
 * @throws DBUnexpectedError
 */
-   function fetchObject( $res ) {
+   public function fetchObject( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
}
@@ -298,7 +298,7 @@
 * @return array|bool
 * @throws DBUnexpectedError
 */
-   function fetchRow( $res ) {
+   public function fetchRow( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
}
@@ -362,7 +362,7 @@
 * @param ResultWrapper|resource $res
 * @return int
 */
-   function numFields( $res ) {
+   public function numFields( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
}
@@ -383,7 +383,7 @@
 * @param int $n
 * @return string
 */
-   function fieldName( $res, $n ) {
+   public function fieldName( $res, $n ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
}
@@ -428,7 +428,7 @@
 * @param int $row
 * @return bool
 */
-   function dataSeek( $res, $row ) {
+   public function dataSeek( $res, $row ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
}
@@ -448,7 +448,7 @@
/**
 * @return string
 */
-   function lastError() {
+   public function lastError() {
if ( $this->mConn ) {
# Even if it's non-zero, it can still be invalid
MediaWiki\suppressWarnings();
@@ -482,7 +482,7 @@
 * @param string $fname
 * @return ResultWrapper
 */
-   function replace( $table, $uniqueIndexes, $rows, $fname = __METHOD__ ) {
+   public function replace( $table, $uniqueIndexes, $rows, $fname = 
__METHOD__ ) {
return $this->nativeReplace( $table, $rows, $fname );
}
 
@@ -518,7 +518,7 @@
return (int)$rows;
}
 
-   function tableExists( $table, $fname = __METHOD__ ) {
+   public function tableExists( $table, $fname = __METHOD__ ) {
$table = $this->tableName( $table, 'raw' );
if ( isset( $this->mSessionTempTables[$table] ) ) {
return true; // already known to exist and won't show 
in SHOW TABLES anyway
@@ -534,7 +534,7 @@
 * @param string $field
 * @return bool|MySQLField
 */
-   function fieldInfo( $table, $field ) {
+   public function fieldInfo( $table, $field ) {
$table = $this->tableName( $table );
$res = $this->query( "SELECT * FROM $table LIMIT 1", 
__METHOD__, true );
if ( !$res ) {
@@ -569,7 +569,7 @@
 * @param string $fname
 * @return bool|array|null False or null on failure
 */
-   function indexInfo( $table, $index, $fname = __METHOD__ ) {
+   public function indexInfo( $table, $index, $fname = __METHOD__ ) {
# SHOW INDEX works in MySQL 3.23.58, but SHOW INDEXES does not.
# SHOW INDEX should work for 3.x and up:
# http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
@@ -598,7 +59

[MediaWiki-commits] [Gerrit] operations/dns[master]: add missing asset tag forward DNS Bug:P4356

2016-11-02 Thread Papaul (Code Review)

Papaul has uploaded a new change for review.

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

Change subject: add missing asset tag forward DNS Bug:P4356
..

add missing asset tag forward DNS
Bug:P4356

Change-Id: I5c70975e832df147ab79361fc02d0464a297d530
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 26 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/12/319512/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index f5eba05..8cffd34 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3965,7 +3965,7 @@
 240 1H IN PTR  es2016.mgmt.codfw.wmnet.
 240 1H IN PTR  wmf6395.mgmt.codfw.wmnet.
 241 1H IN PTR  es2017.mgmt.codfw.wmnet.
-241 1H IN PTR  wmf6596.mgmt.codfw.wmnet.
+241 1H IN PTR  wmf6396.mgmt.codfw.wmnet.
 242 1H IN PTR  es2018.mgmt.codfw.wmnet.
 242 1H IN PTR  wmf6397.mgmt.codfw.wmnet.
 243 1H IN PTR  es2019.mgmt.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index d5363a8..4f01d0d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3306,6 +3306,15 @@
 
 ; Servers MGMT - Alphabetical by asset tag
 
+WMF3414 1H  IN A10.65.3.39
+WMF3415 1H  IN A10.65.3.40
+WMF3416 1H  IN A10.65.3.41
+WMF3417 1H  IN A10.65.3.42
+WMF3418 1H  IN A10.65.3.43
+WMF3419 1H  IN A10.65.3.44
+WMF3558 1H  IN A10.65.3.132
+WMF3562 1H  IN A10.65.3.136
+WMF3563 1H  IN A10.65.3.137
 WMF3612 1H  IN A10.193.1.235
 WMF3613 1H  IN A10.193.1.236
 WMF3627 1H  IN A10.193.1.237
@@ -3356,6 +3365,22 @@
 WMF3811 1H  IN A10.193.2.119
 WMF3810 1H  IN A10.193.1.18
 WMF3903 1H  IN A10.193.2.13
+WMF4752 1H  IN A10.65.7.1
+WMF4753 1H  IN A10.65.7.2
+WMF4754 1H  IN A10.65.7.3
+WMF4755 1H  IN A10.65.7.4
+WMF4756 1H  IN A10.65.7.5
+WMF4757 1H  IN A10.65.7.6
+WMF4758 1H  IN A10.65.7.7
+WMF4759 1H  IN A10.65.7.8
+WMF4760 1H  IN A10.65.7.9
+WMF4761 1H  IN A10.65.7.10
+WMF4762 1H  IN A10.65.7.11
+WMF4763 1H  IN A10.65.7.12
+WMF4764 1H  IN A10.65.7.13
+WMF4765 1H  IN A10.65.7.14
+WMF4766 1H  IN A10.65.7.15
+WMF4767 1H  IN A10.65.7.16
 WMF5718 1H  IN A10.193.1.73
 WMF5723 1H  IN A10.193.1.78
 WMF5724 1H  IN A10.193.1.79

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve getUrlDomainDistance() return values

2016-11-02 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Improve getUrlDomainDistance() return values
..

Improve getUrlDomainDistance() return values

This change is just cosmetic given the caller it has.

Change-Id: I591f92e56d9f5574d032dda380bc03b491b10738
---
M includes/MediaWiki.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index f21128e..f7e57fc 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -676,14 +676,14 @@
/**
 * @param string $url
 * @param IContextSource $context
-* @return string|bool Either "local" or "remote" if in the farm, false 
otherwise
+* @return string Either "local", "remote" if in the farm, "external" 
otherwise
 */
private static function getUrlDomainDistance( $url, IContextSource 
$context ) {
static $relevantKeys = [ 'host' => true, 'port' => true ];
 
$infoCandidate = wfParseUrl( $url );
if ( $infoCandidate === false ) {
-   return false;
+   return 'external';
}
 
$infoCandidate = array_intersect_key( $infoCandidate, 
$relevantKeys );
@@ -705,7 +705,7 @@
}
}
 
-   return false;
+   return 'external';
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I591f92e56d9f5574d032dda380bc03b491b10738
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]: new labstore partman recipe

2016-11-02 Thread Madhuvishy (Code Review)

Madhuvishy has submitted this change and it was merged.

Change subject: new labstore partman recipe
..


new labstore partman recipe

this should create a / outside the LVM, and then create an empty LVM,
where puppet can later create partitions within it as nessasary.

Bug: T149870
Change-Id: I27128c10850ddb4f3ac9898061c796a1ba1c2773
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
2 files changed, 46 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 7d8ddad..a5d5d30 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -90,7 +90,8 @@
 labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
 labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
 labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
-sodium|labstore200[3-4]) echo partman/lvm-ext-srv.cfg ;; \
+sodium) echo partman/lvm-ext-srv.cfg ;; \
+labstore200[3-4]) echo partman/labstore-lvm-noraid.cfg ;; \
 labtestneutron2001) echo partman/mw.cfg ;; \
 labtestnet2001) echo partman/raid1.cfg ;; \
 labtestweb2001) echo partman/raid1.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg 
b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
new file mode 100644
index 000..0689bd7
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
@@ -0,0 +1,44 @@
+# configuration to create:
+#  * no RAID (either single disk or hardware raid presenting a single device)
+#  ** 30G / ext4 outside lvm
+#  ** no swap
+#  ** the rest as ext4 with no mount
+
+
+d-ipartman-auto/method string  lvm
+d-ipartman-auto/disk   string  /dev/sda
+
+# the install makes sure we want to wipe the lvm
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite true
+
+d-ipartman/confirm_nooverwrite true
+d-ipartman/choose_partitionselect  finish
+
+d-ipartman-auto/expert_recipe  string  es ::   \
+   3 2 3 ext4  \
+   $primary{ } \
+   $bootable{ }\
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ / } \
+   .   \
+   64 1000 1000 ext4   \
+   $primary{ } \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   lv_name{ data } \
+   $defaultignore{ }   \
+   $lvmok{ }   \
+   mountpoint{  }  \
+   .
+
+d-ipartman-auto-lvm/guided_sizestring  80%
+
+d-ipartman-auto/choose_recipe  es
+partman-basicfilesystems partman-basicfilesystems/no_swap boolean false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27128c10850ddb4f3ac9898061c796a1ba1c2773
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Madhuvishy 
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 processing listeners in node v7.x

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix processing listeners in node v7.x
..


Fix processing listeners in node v7.x

 * In https://github.com/nodejs/node/commit/b7a8a691b4, once listeners
   are now returned unwrapped, so our manual calling of them no longer
   removed them from the queue.  Here we do that explicitly beforehand,
   which should be backwards compatible.

Change-Id: Id8f42fddd71191d11d5dba60a01e9498d06c43a1
---
M lib/mw/ApiRequest.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index 75d350f..a33f7ca 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -350,6 +350,7 @@
var maxIters = Math.min(1, listeners.length);
for (var it = 0; it < maxIters; it++) {
var nextListener = listeners.shift();
+   self.removeListener('src', nextListener);
 
// We only retrieve text/x-mediawiki source currently.
// We expect these listeners to remove themselves when 
being

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: changepw: continue if login fails on a host

2016-11-02 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: changepw: continue if login fails on a host
..

changepw: continue if login fails on a host

If the login with sshpass fails on a host,
continue with the next host.

Change-Id: I2d5513d6f617b131f162af74111b38704b3fd858
---
M modules/mgmt/files/changepw
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/319510/1

diff --git a/modules/mgmt/files/changepw b/modules/mgmt/files/changepw
index 8709feb..9d074d2 100644
--- a/modules/mgmt/files/changepw
+++ b/modules/mgmt/files/changepw
@@ -38,6 +38,7 @@
 
 if [ $? -ne 0 ]; then
 echo "Failed. See logfile for details"
+continue
 else
 echo "DRAC configured successfully on $host_ip"
 fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d5513d6f617b131f162af74111b38704b3fd858
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...WikibaseQualityExternalValidation[master]: Define compatibility w/ data-values/number 0.8

2016-11-02 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Define compatibility w/ data-values/number 0.8
..

Define compatibility w/ data-values/number 0.8

Now that Wikibase uses 0.8

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
 refs/changes/09/319509/1

diff --git a/composer.json b/composer.json
index fffb0fb..802bf1d 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"require": {
"data-values/common": ">=0.1 <0.4",
"data-values/geo": "~1.0",
-   "data-values/number": ">=0.1 <0.8",
+   "data-values/number": ">=0.1 <0.9",
"data-values/time": "~0.8",
"php": ">=5.5.0",
"serialization/serialization": "3.*,>=3.2.1",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I590b38b2f2d371cea02a4c8203a77ea97b158665
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Call parent coroutine properly

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: Call parent coroutine properly
..

jupyterhub: Call parent coroutine properly

Change-Id: I93b75099cb061b42a5a98ca77a02eb3aaf0b05a5
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 4a56a77..11e511d 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -112,7 +112,7 @@
 if username not in grp.getgrnam('researchers').gr_mem:
 self.log.warn('User %s not in researchers group' % username)
 return None
-return super().authenticate(handler, data)
+return (yield super().authenticate(handler, data))
 
 
 c.JupyterHub.authenticator_class = VenvCreatingAuthenticator

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Call parent coroutine properly

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: Call parent coroutine properly
..


jupyterhub: Call parent coroutine properly

Change-Id: I93b75099cb061b42a5a98ca77a02eb3aaf0b05a5
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 4a56a77..11e511d 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -112,7 +112,7 @@
 if username not in grp.getgrnam('researchers').gr_mem:
 self.log.warn('User %s not in researchers group' % username)
 return None
-return super().authenticate(handler, data)
+return (yield super().authenticate(handler, data))
 
 
 c.JupyterHub.authenticator_class = VenvCreatingAuthenticator

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93b75099cb061b42a5a98ca77a02eb3aaf0b05a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Add additional protections against arbitrary use...

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: Add additional protections against arbitrary user 
login
..


jupyterhub: Add additional protections against arbitrary user login

Bug: T149543
Change-Id: I40cdbdda6127bc6315adf407b800b79bb32010f3
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index efcf9a2..4a56a77 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -6,6 +6,7 @@
 than a ruby template (erb) that generates python.
 """
 import os
+import grp
 import subprocess
 import shutil
 from tornado import gen
@@ -71,6 +72,8 @@
   appropriately
 - if the user doesn't have a venv in their homedir, we create one under
   $HOME/venv, and install jupyterhub+jupyter in it from our wheelhouse
+- If the user doesn't exist in the system as part of the specified group,
+  then deny authentication.
 
 This happens before the notebook is launched for each users, and thus
 users can install packages they want with pip from here.
@@ -81,6 +84,7 @@
 venv_path = os.path.join(home_path, 'venv')
 if not os.path.exists(home_path):
 os.mkdir(home_path, 0o755)
+# FIXME: Parameterize this groupname
 shutil.chown(home_path, user.name, 'wikidev')
 if not os.path.exists(venv_path):
 subprocess.check_call([
@@ -101,6 +105,15 @@
 'jupyterhub'
 ])
 
+@gen.coroutine
+def authenticate(self, handler, data):
+username = data['username']
+# FIXME: Parameterize this groupname
+if username not in grp.getgrnam('researchers').gr_mem:
+self.log.warn('User %s not in researchers group' % username)
+return None
+return super().authenticate(handler, data)
+
 
 c.JupyterHub.authenticator_class = VenvCreatingAuthenticator
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40cdbdda6127bc6315adf407b800b79bb32010f3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations...adminbot[master]: Use page.text() instead of deprecated page.edit()

2016-11-02 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Use page.text() instead of deprecated page.edit()
..


Use page.text() instead of deprecated page.edit()

Bug: T124852
Change-Id: I9560ccb27f8b32e662c2c8c02a56238b31359fb7
---
M adminlog.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Dzahn: Verified; Looks good to me, approved



diff --git a/adminlog.py b/adminlog.py
index d543092..04793df 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -24,7 +24,7 @@
 if page.redirect:
 page = next(page.links())
 
-text = page.edit()
+text = page.text()
 lines = text.split('\n')
 position = 0
 # Um, check the date

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9560ccb27f8b32e662c2c8c02a56238b31359fb7
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Add additional protections against arbitrary use...

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: Add additional protections against arbitrary user 
login
..

jupyterhub: Add additional protections against arbitrary user login

Bug: T149543
Change-Id: I40cdbdda6127bc6315adf407b800b79bb32010f3
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/319507/1

diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index efcf9a2..4a56a77 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -6,6 +6,7 @@
 than a ruby template (erb) that generates python.
 """
 import os
+import grp
 import subprocess
 import shutil
 from tornado import gen
@@ -71,6 +72,8 @@
   appropriately
 - if the user doesn't have a venv in their homedir, we create one under
   $HOME/venv, and install jupyterhub+jupyter in it from our wheelhouse
+- If the user doesn't exist in the system as part of the specified group,
+  then deny authentication.
 
 This happens before the notebook is launched for each users, and thus
 users can install packages they want with pip from here.
@@ -81,6 +84,7 @@
 venv_path = os.path.join(home_path, 'venv')
 if not os.path.exists(home_path):
 os.mkdir(home_path, 0o755)
+# FIXME: Parameterize this groupname
 shutil.chown(home_path, user.name, 'wikidev')
 if not os.path.exists(venv_path):
 subprocess.check_call([
@@ -101,6 +105,15 @@
 'jupyterhub'
 ])
 
+@gen.coroutine
+def authenticate(self, handler, data):
+username = data['username']
+# FIXME: Parameterize this groupname
+if username not in grp.getgrnam('researchers').gr_mem:
+self.log.warn('User %s not in researchers group' % username)
+return None
+return super().authenticate(handler, data)
+
 
 c.JupyterHub.authenticator_class = VenvCreatingAuthenticator
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Add geojson content model with a mapframe view

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add geojson content model with a mapframe view
..


Add geojson content model with a mapframe view

Suggested Configuration:
$wgJsonConfigModels['Map.JsonConfig'] = 'JsonConfig\JCMapDataContent';
$wgJsonConfigs['Map.JsonConfig'] = array(
'namespace' => 486,
'nsName' => 'Data',
'pattern' => '/.\.map$/', // ensure that there is at least one char 
before the dot
);

Bug: T149548
Change-Id: Iaf101fd944c46a435ad0a867c298af9e9630b9a1
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/JCMapDataContent.php
A includes/JCMapDataContentView.php
M includes/JCUtils.php
M includes/JCValidators.php
7 files changed, 232 insertions(+), 13 deletions(-)

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



diff --git a/extension.json b/extension.json
index c791a43..17e57c0 100644
--- a/extension.json
+++ b/extension.json
@@ -52,6 +52,8 @@
"JsonConfig\\JCDefaultContentView": 
"includes/JCDefaultContentView.php",
"JsonConfig\\JCDefaultObjContentView": 
"includes/JCDefaultObjContentView.php",
"JsonConfig\\JCLuaLibrary": "includes/JCLuaLibrary.php",
+   "JsonConfig\\JCMapDataContent": "includes/JCMapDataContent.php",
+   "JsonConfig\\JCMapDataContentView": 
"includes/JCMapDataContentView.php",
"JsonConfig\\JCObjContent": "includes/JCObjContent.php",
"JsonConfig\\JCSingleton": "includes/JCSingleton.php",
"JsonConfig\\JCTabularContent": "includes/JCTabularContent.php",
diff --git a/i18n/en.json b/i18n/en.json
index 92d7c34..f793339 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,7 @@
"jsonconfig-err-array-expected": "The value at \"$1\" was expected to 
be a list surrounded by the [...] brackets",
"jsonconfig-err-assoc-array": "Parameter \"$1\" must be an associative 
array (dictionary), e.g. {'key': 'value', ...}",
"jsonconfig-err-bad-header-string": "Header \"$1\" must only consist of 
letters, numbers, and underscore characters, and must not begin with a number",
+   "jsonconfig-err-bad-geojson": "Parameter \"$1\" must be a valid GeoJSON 
data object, or an array of GeoJSON objects. If \"properties\" field contains 
\"title\" or \"description\", they must be either single line strings without 
tabs or trailing spaces, or a multi-lingual objects of such strings, e.g. { 
\"en\":\"String in English\", ... }",
"jsonconfig-err-bad-type": "Parameter \"$1\" must be a valid type like 
\"string\", \"number\", or \"boolean\"",
"jsonconfig-err-bool": "Parameter \"$1\" must be either set to true or 
false",
"jsonconfig-err-integer": "Parameter \"$1\" must be an integer",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7f52ec4..808707a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,13 +19,14 @@
"jsonconfig-err-array-expected": "The field named \"$1\" is not a valid 
list",
"jsonconfig-err-assoc-array": "A field named \"$1\" is not a valid 
associative array (not a dictionary). Parameters:\n* $1 - field name",
"jsonconfig-err-bad-header-string": "A field named \"$1\" must contain 
only the allowed characters. Parameters:\n* $1 - field name",
+   "jsonconfig-err-bad-geojson": "A field named \"$1\" must be a valid 
geojson data. Parameters:\n* $1 - field name",
"jsonconfig-err-bad-type": "A field named \"$1\" must be set to one of 
the allowed values. Parameters:\n* $1 - field name",
"jsonconfig-err-bool": "A field named \"$1\" is not a valid boolean. 
Parameters:\n* $1 - parameter name",
"jsonconfig-err-integer": "A field named \"$1\" is not a valid integer. 
Parameters:\n* $1 - field name",
"jsonconfig-err-license": "A field named \"$1\" is not a valid license 
code. Parameters:\n* $1 - field name\n* $2 - one or more of the comma separated 
allowed license codes",
"jsonconfig-err-localized": "A field named \"$1\" is not a valid 
localized string (string available in multiple languages). Parameters:\n* $1 - 
field name.",
"jsonconfig-err-number": "A field named \"$1\" is not a valid number. 
Parameters:\n* $1 - field name",
-   "jsonconfig-err-object-expected": "The field named \"$1\" is not a 
valid object",
+   "jsonconfig-err-object-expected": "The field named \"$1\" is not a 
valid object. Parameters:\n* $1 - field name",
"jsonconfig-err-root-array-expected": "Entire JSON data was not a list 
surrounded by the [...] brackets",
"jsonconfig-err-root-object-expected": "Entire JSON data was not an 
object, surrounded by the {...} braces",
"jsonconfig-err-string": "A field named \"$1\" is not a valid string. 
Parameters:\n* $1 - field name",
diff --git a/includes/JCMapDataContent.php b/includes/JCMapDataContent.php
new file mode 100644
index 000..770f

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: Fix empty "parentProject" when new project is a...

2016-11-02 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: phabricator: Fix empty "parentProject" when new project is a 
milestone
..


phabricator: Fix empty "parentProject" when new project is a milestone

The query worked for created subprojects but not for milestones as
we only checked for "project:parent" but not for "project:milestone"

Followup to https://gerrit.wikimedia.org/r/#/c/317321

Change-Id: I30fa4ce4968693c70c3d9ddaab1a4258110707e8
---
M modules/phabricator/templates/project_changes.sh.erb
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/phabricator/templates/project_changes.sh.erb 
b/modules/phabricator/templates/project_changes.sh.erb
index 9877662..b430e98 100644
--- a/modules/phabricator/templates/project_changes.sh.erb
+++ b/modules/phabricator/templates/project_changes.sh.erb
@@ -21,7 +21,8 @@
 (SELECT project.name, project_transaction2.objectPHID, 
project_transaction2.transactionType
 FROM project_transaction AS project_transaction2
 JOIN project
-WHERE project_transaction2.transactionType = "project:parent"
+WHERE (project_transaction2.transactionType = "project:parent"
+OR project_transaction2.transactionType = "project:milestone")
 AND SUBSTRING(project_transaction2.newValue, 2,30) = project.phid
 AND project_transaction2.dateModified > UNIX_TIMESTAMP(DATE_SUB(NOW(), 
INTERVAL 1 WEEK))) parent
 ON parent.objectPHID = project_transaction1.objectPHID

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30fa4ce4968693c70c3d9ddaab1a4258110707e8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aklapper 
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]: jupyterhub: widen group of users who can log in

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: widen group of users who can log in
..


jupyterhub: widen group of users who can log in

Bug: T149543
Change-Id: Ic68c16041b103c35e6e23e4460ae762ee5c71801
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 5c0205f..efcf9a2 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -109,7 +109,11 @@
 c.LDAPAuthenticator.bind_dn_template = \
 'uid={username},ou=people,dc=wikimedia,dc=org'
 c.LDAPAuthenticator.allowed_groups = [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
+# This still restricts it to only people in the researchers group
+# in admin.yaml, since you need to have a working local user account
+# to launch a notebook
+'cn=nda,ou=groups,dc=wikimedia,dc=org',
+'cn=wmf,ou=groups,dc=wikimedia,dc=org',
 ]
 
 # Security settings! Let's lock this down!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic68c16041b103c35e6e23e4460ae762ee5c71801
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Volans 
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]: jupyterhub: widen group of users who can log in

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: widen group of users who can log in
..

jupyterhub: widen group of users who can log in

Bug: T149543
Change-Id: Ic68c16041b103c35e6e23e4460ae762ee5c71801
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/319506/1

diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 5c0205f..efcf9a2 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -109,7 +109,11 @@
 c.LDAPAuthenticator.bind_dn_template = \
 'uid={username},ou=people,dc=wikimedia,dc=org'
 c.LDAPAuthenticator.allowed_groups = [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
+# This still restricts it to only people in the researchers group
+# in admin.yaml, since you need to have a working local user account
+# to launch a notebook
+'cn=nda,ou=groups,dc=wikimedia,dc=org',
+'cn=wmf,ou=groups,dc=wikimedia,dc=org',
 ]
 
 # Security settings! Let's lock this down!

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove db1027 remnants (reverse lookup)

2016-11-02 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: remove db1027 remnants (reverse lookup)
..


remove db1027 remnants (reverse lookup)

Bug: T135253
Change-Id: I07eff425620818c1ee9e09cb7f91e606430106b0
---
M templates/10.in-addr.arpa
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index fa59eaa..3c03545 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -447,7 +447,6 @@
 13  1H IN PTR   db1024.eqiad.wmnet.
 
 15  1H IN PTR   db1026.eqiad.wmnet.
-16  1H IN PTR   db1027.eqiad.wmnet.
 17  1H IN PTR   db1028.eqiad.wmnet.
 18  1H IN PTR   db1029.eqiad.wmnet.
 19  1H IN PTR   db1030.eqiad.wmnet.
@@ -2078,7 +2077,6 @@
 25  1H IN PTR   wmf3261.mgmt.eqiad.wmnet.
 26  1H IN PTR   db1026.mgmt.eqiad.wmnet.
 26  1H IN PTR   wmf3260.mgmt.eqiad.wmnet.
-27  1H IN PTR   db1027.mgmt.eqiad.wmnet.
 27  1H IN PTR   wmf3259.mgmt.eqiad.wmnet.
 28  1H IN PTR   db1028.mgmt.eqiad.wmnet.
 28  1H IN PTR   wmf3258.mgmt.eqiad.wmnet.

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: add forward DNS for papaul-laptop.mgmt

2016-11-02 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: add forward DNS for papaul-laptop.mgmt
..


add forward DNS for papaul-laptop.mgmt

This only existed in reverse DNS but not in forward DNS.

Change-Id: Iaaa8a948298d1487b6f8f9d506b175026097926d
---
M templates/wmnet
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index d5363a8..0262624 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3242,6 +3242,7 @@
 osm-web2002 1H  IN A10.193.2.10
 osm-web2003 1H  IN A10.193.2.11
 osm-web2004 1H  IN A10.193.2.12
+papaul-laptop   1H  IN A10.193.1.7
 pc2004  1H  IN A10.193.2.231
 pc2005  1H  IN A10.193.2.232
 pc2006  1H  IN A10.193.2.233

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: replace wfShellExec() with a class

2016-11-02 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: WIP: replace wfShellExec() with a class
..

WIP: replace wfShellExec() with a class

This function has gotten so unwieldy that a helper was
introduced. Instead, I'm proposing this class that makes
shelling out easier and more readable.

Example usage:
  $command = Shell::command( 'shell command' )
   ->environment( [ 'ENVIRONMENT_VARIABLE' => 'VALUE' ] )
   ->limits( [ 'time' => 300 ] )
   ->execute();

  $exitCode = $command->getExitCode();
  $output = $command->getOutput();

This is a minimal change, so lots of stuff remains
unrefactored - I'd rather limit the scope of this commit.
A future improvement could be an ability to get stderr
separately from stdout.

Problem points that I'd like to discuss:
* I went with a purely OOP approach for handling the 'proc_open()
  is disabled' error - throw an exception and forget. While
  stubbed wfShellExec() retains the old behavior, once callers
  are updated they will either need to catch the exception or they
  will break for some poor souls - another option would be to introduce
  a noThrow() option.
* proc_open() failures currently just return a status code - do something
  about that, too?

Change-Id: I8ac9858b80d7908cf7e7981d7e19d0fc9c2265c0
---
M autoload.php
M includes/GlobalFunctions.php
A includes/exception/ShellDisabledError.php
A includes/shell/Shell.php
4 files changed, 444 insertions(+), 290 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/319505/1

diff --git a/autoload.php b/autoload.php
index b96250d..27952b3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -904,6 +904,8 @@
'MediaWiki\\Session\\SessionProviderInterface' => __DIR__ . 
'/includes/session/SessionProviderInterface.php',
'MediaWiki\\Session\\Token' => __DIR__ . '/includes/session/Token.php',
'MediaWiki\\Session\\UserInfo' => __DIR__ . 
'/includes/session/UserInfo.php',
+   'MediaWiki\\Shell' => __DIR__ . '/includes/shell/Shell.php',
+   'MediaWiki\\ShellDisabledError' => __DIR__ . 
'/includes/exception/ShellDisabledError.php',
'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . 
'/includes/site/MediaWikiPageNameNormalizer.php',
'MediaWiki\\Tidy\\BalanceActiveFormattingElements' => __DIR__ . 
'/includes/tidy/Balancer.php',
'MediaWiki\\Tidy\\BalanceElement' => __DIR__ . 
'/includes/tidy/Balancer.php',
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index bae9c77..e6d3f24 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -27,6 +27,7 @@
 use Liuggio\StatsdClient\Sender\SocketSender;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Session\SessionManager;
+use MediaWiki\Shell;
 use Wikimedia\ScopedCallback;
 
 // Hide compatibility functions from Doxygen
@@ -2205,66 +2206,11 @@
  *
  * @param string ... strings to escape and glue together, or a single array of 
strings parameter
  * @return string
+ * @deprecated since 1.29 use MediaWiki\Shell::escape()
  */
 function wfEscapeShellArg( /*...*/ ) {
-   wfInitShellLocale();
-
$args = func_get_args();
-   if ( count( $args ) === 1 && is_array( reset( $args ) ) ) {
-   // If only one argument has been passed, and that argument is 
an array,
-   // treat it as a list of arguments
-   $args = reset( $args );
-   }
-
-   $first = true;
-   $retVal = '';
-   foreach ( $args as $arg ) {
-   if ( !$first ) {
-   $retVal .= ' ';
-   } else {
-   $first = false;
-   }
-
-   if ( wfIsWindows() ) {
-   // Escaping for an MSVC-style command line parser and 
CMD.EXE
-   // @codingStandardsIgnoreStart For long URLs
-   // Refs:
-   //  * 
http://web.archive.org/web/20020708081031/http://mailman.lyra.org/pipermail/scite-interest/2002-March/000436.html
-   //  * 
http://technet.microsoft.com/en-us/library/cc723564.aspx
-   //  * T15518
-   //  * CR r63214
-   // Double the backslashes before any double quotes. 
Escape the double quotes.
-   // @codingStandardsIgnoreEnd
-   $tokens = preg_split( '/(*")/', $arg, -1, 
PREG_SPLIT_DELIM_CAPTURE );
-   $arg = '';
-   $iteration = 0;
-   foreach ( $tokens as $token ) {
-   if ( $iteration % 2 == 1 ) {
-   // Delimiter, a double quote preceded 
by zero or more slashes
-   $arg .= str_replace( '\\', '', 
substr( $token, 0, -1 ) ) . '\\"';
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix regex typo

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix regex typo
..


Fix regex typo

https://xkcd.com/1638/

Change-Id: I219605f88be3da09a0a4dee13263dc77f6709812
---
M sites/all/modules/wmf_common/WmfQueueConsumer.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_common/WmfQueueConsumer.php 
b/sites/all/modules/wmf_common/WmfQueueConsumer.php
index 9d2eabb..54cae44 100644
--- a/sites/all/modules/wmf_common/WmfQueueConsumer.php
+++ b/sites/all/modules/wmf_common/WmfQueueConsumer.php
@@ -116,7 +116,7 @@
}
 
protected function logMessage( $message ) {
-   $className = preg_replace( '/.*\\/', '', get_called_class() );
+   $className = preg_replace( '/.*\\\/', '', get_called_class() );
$formattedMessage = print_r( $message, true );
watchdog( $className, $formattedMessage, NULL, WATCHDOG_INFO );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I219605f88be3da09a0a4dee13263dc77f6709812
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
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]: jupyterhub: Fix typo

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: Fix typo
..


jupyterhub: Fix typo

Bug: T149543
Change-Id: If1221c8e8aa3048e0fe8293f716e5a82d05fd8c4
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 9d8f374..5c0205f 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -48,7 +48,7 @@
 # things via pip easily and have them be immediately available
 c.SystemdSpawner.extra_paths = ['/home/{USERNAME}/venv/bin']
 
-if 'HTTP_PROXY' in os.environ:
+if 'SINGLEUSER_HTTP_PROXY' in os.environ:
 c.SystemdSpawner.environment = {
 # Use HTTP_PROXY for both HTTP and HTTPS proxy
 # Looks like smaller case is more compatible - curl doesn't like

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1221c8e8aa3048e0fe8293f716e5a82d05fd8c4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Fix typo

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: Fix typo
..

jupyterhub: Fix typo

Bug: T149543
Change-Id: If1221c8e8aa3048e0fe8293f716e5a82d05fd8c4
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/319504/1

diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 9d8f374..5c0205f 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -48,7 +48,7 @@
 # things via pip easily and have them be immediately available
 c.SystemdSpawner.extra_paths = ['/home/{USERNAME}/venv/bin']
 
-if 'HTTP_PROXY' in os.environ:
+if 'SINGLEUSER_HTTP_PROXY' in os.environ:
 c.SystemdSpawner.environment = {
 # Use HTTP_PROXY for both HTTP and HTTPS proxy
 # Looks like smaller case is more compatible - curl doesn't like

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Optimise startup by merging regexes

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: resourceloader: Optimise startup by merging regexes
..


resourceloader: Optimise startup by merging regexes

Merge webOS, misc and Google Glass regexes.

* Add various test cases for PlayStation.
* Add tests for unrelated user agent matching "Glass".

Change-Id: Ifb0944d190f230bb36197b22cf3099c187dad091
---
M resources/src/startup.js
M tests/qunit/suites/resources/startup.test.js
2 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/resources/src/startup.js b/resources/src/startup.js
index d026cb0..61d06b6 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -64,10 +64,8 @@
// Hardcoded exceptions for browsers that pass the requirement 
but we don't want to
// support in the modern run-time.
&& !(
-   ua.match( /webOS\/1\.[0-4]/ ) ||
-   ua.match( /PlayStation/i ) ||
-   ua.match( /SymbianOS|Series60|NetFront|Opera 
Mini|S40OviBrowser|MeeGo/ ) ||
-   ( ua.match( /Glass/ ) && ua.match( /Android/ ) )
+   ua.match( 
/webOS\/1\.[0-4]|SymbianOS|Series60|NetFront|Opera 
Mini|S40OviBrowser|MeeGo|Android.+Glass/ ) ||
+   ua.match( /PlayStation/i )
)
);
 }
diff --git a/tests/qunit/suites/resources/startup.test.js 
b/tests/qunit/suites/resources/startup.test.js
index 2934b39..2d996ae 100644
--- a/tests/qunit/suites/resources/startup.test.js
+++ b/tests/qunit/suites/resources/startup.test.js
@@ -99,12 +99,18 @@
'Wget/1.10.1 (Red Hat modified)',
// Unknown
'I\'m an unknown browser',
+   'I\'m an unknown Glass browser',
// Empty
''
],
blacklisted: [
/* Grade C */
 
+   // PlayStation
+   'Mozilla/5.0 (PLAYSTATION 3; 1.10)',
+   'Mozilla/5.0 (PLAYSTATION 3; 3.55)',
+   'Mozilla/5.0 (PLAYSTATION 3 4.21) AppleWebKit/531.22.8 
(KHTML, like Gecko)',
+   'Mozilla/5.0 (PlayStation 4 1.70) AppleWebKit/536.26 
(KHTML, like Gecko)',
// Open WebOS < 1.5 (Palm Pre, Palm Pixi)
'Mozilla/5.0 (webOS/1.0; U; en-US) AppleWebKit/525.27.1 
(KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0',
'Mozilla/5.0 (webOS/1.4.0; U; en-US) AppleWebKit/532.2 
(KHTML, like Gecko) Version/1.0 Safari/532.2 Pixi/1.1 ',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb0944d190f230bb36197b22cf3099c187dad091
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
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]: jupyterhub: Do not use proxying when talking to localhost

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: Do not use proxying when talking to localhost
..


jupyterhub: Do not use proxying when talking to localhost

This prevents the hub and spawned notebooks from talking to
each other!

Bug: T149543
Change-Id: Id292f6177c39d68a6851732eb89ce7cb5b57e093
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 78308ed..9d8f374 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -57,6 +57,10 @@
 # the hub itself to use the HTTP_PROXY
 'https_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
 'http_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
+# Do not use proxying to talk to localhost! This will mostly just
+# never work, and will cause strange errors when the spawned
+# notebooks talk to the hub or if the hub tries to talk to them
+'no_proxy': 'localhost,127.0.0.1'
 }
 
 class VenvCreatingAuthenticator(Authenticator):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id292f6177c39d68a6851732eb89ce7cb5b57e093
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Do not use proxying when talking to localhost

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: Do not use proxying when talking to localhost
..

jupyterhub: Do not use proxying when talking to localhost

This prevents the hub and spawned notebooks from talking to
each other!

Bug: T149543
Change-Id: Id292f6177c39d68a6851732eb89ce7cb5b57e093
---
M modules/jupyterhub/files/jupyterhub_config.py
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 78308ed..9d8f374 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -57,6 +57,10 @@
 # the hub itself to use the HTTP_PROXY
 'https_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
 'http_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
+# Do not use proxying to talk to localhost! This will mostly just
+# never work, and will cause strange errors when the spawned
+# notebooks talk to the hub or if the hub tries to talk to them
+'no_proxy': 'localhost,127.0.0.1'
 }
 
 class VenvCreatingAuthenticator(Authenticator):

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Don't set HTTP_PROXY on jupyterhub itself

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: Don't set HTTP_PROXY on jupyterhub itself
..


jupyterhub: Don't set HTTP_PROXY on jupyterhub itself

This means it tries to use the proxy to talk to *everything*,
including the spawned pods! This doesn't work at all.

Bug: T149543
Change-Id: I70cab045f9913e109816721ee85c64f00281cf2b
---
M modules/jupyterhub/files/jupyterhub_config.py
M modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index c547b37..78308ed 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -53,8 +53,10 @@
 # Use HTTP_PROXY for both HTTP and HTTPS proxy
 # Looks like smaller case is more compatible - curl doesn't like
 # all upper case HTTP_PROXY. lol?
-'https_proxy': os.environ['HTTP_PROXY'],
-'http_proxy': os.environ['HTTP_PROXY'],
+# Also remember to not use HTTP_PROXY itself, since we don't want
+# the hub itself to use the HTTP_PROXY
+'https_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
+'http_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
 }
 
 class VenvCreatingAuthenticator(Authenticator):
diff --git a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb 
b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
index d3f1fe6..9d17944 100644
--- a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
+++ b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
@@ -9,7 +9,7 @@
 Environment=AUTHENTICATOR=<%= @authenticator %>
 Environment=WHEELS_PATH=<%= @wheels_path %>
 Environment=DATA_PATH=<%= @data_path %>
-<% if @web_proxy %>Environment=HTTP_PROXY=<%= @web_proxy %> <% end %>
+<% if @web_proxy %>Environment=SINGLEUSER_HTTP_PROXY=<%= @web_proxy %> <% end 
%>
 EnvironmentFile=<%= @venv_path %>/configproxy_auth_token
 PrivateTmp=yes
 PrivateDevices=yes

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70cab045f9913e109816721ee85c64f00281cf2b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix processing listeners in node v7.x

2016-11-02 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Fix processing listeners in node v7.x
..

Fix processing listeners in node v7.x

 * In https://github.com/nodejs/node/commit/b7a8a691b4, once listeners
   are now returned unwrapped, so our manual calling of them no longer
   removed them from the queue.  Here we do that explicitly beforehand,
   which should be backwards compatible.

Change-Id: Id8f42fddd71191d11d5dba60a01e9498d06c43a1
---
M lib/mw/ApiRequest.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index 75d350f..a33f7ca 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -350,6 +350,7 @@
var maxIters = Math.min(1, listeners.length);
for (var it = 0; it < maxIters; it++) {
var nextListener = listeners.shift();
+   self.removeListener('src', nextListener);
 
// We only retrieve text/x-mediawiki source currently.
// We expect these listeners to remove themselves when 
being

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Don't set HTTP_PROXY on jupyterhub itself

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: Don't set HTTP_PROXY on jupyterhub itself
..

jupyterhub: Don't set HTTP_PROXY on jupyterhub itself

This means it tries to use the proxy to talk to *everything*,
including the spawned pods! This doesn't work at all.

Bug: T149543
Change-Id: I70cab045f9913e109816721ee85c64f00281cf2b
---
M modules/jupyterhub/files/jupyterhub_config.py
M modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/319501/1

diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index c547b37..78308ed 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -53,8 +53,10 @@
 # Use HTTP_PROXY for both HTTP and HTTPS proxy
 # Looks like smaller case is more compatible - curl doesn't like
 # all upper case HTTP_PROXY. lol?
-'https_proxy': os.environ['HTTP_PROXY'],
-'http_proxy': os.environ['HTTP_PROXY'],
+# Also remember to not use HTTP_PROXY itself, since we don't want
+# the hub itself to use the HTTP_PROXY
+'https_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
+'http_proxy': os.environ['SINGLEUSER_HTTP_PROXY'],
 }
 
 class VenvCreatingAuthenticator(Authenticator):
diff --git a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb 
b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
index d3f1fe6..9d17944 100644
--- a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
+++ b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
@@ -9,7 +9,7 @@
 Environment=AUTHENTICATOR=<%= @authenticator %>
 Environment=WHEELS_PATH=<%= @wheels_path %>
 Environment=DATA_PATH=<%= @data_path %>
-<% if @web_proxy %>Environment=HTTP_PROXY=<%= @web_proxy %> <% end %>
+<% if @web_proxy %>Environment=SINGLEUSER_HTTP_PROXY=<%= @web_proxy %> <% end 
%>
 EnvironmentFile=<%= @venv_path %>/configproxy_auth_token
 PrivateTmp=yes
 PrivateDevices=yes

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.1]: Follow-up Id0021594: Remove extra code for redlink suggestions

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up Id0021594: Remove extra code for redlink suggestions
..


Follow-up Id0021594: Remove extra code for redlink suggestions

We do a second query now instead which handles this by itself.

Move the description stuff to be generic for all redlinks

Bug: T149130
Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
(cherry picked from commit c2824fbb52c6210a4c4c5919e12782d455cdfce2)
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 7 insertions(+), 15 deletions(-)

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



diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 222586f..7ca19df 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -30,7 +30,6 @@
 * @cfg {boolean} [relative=true] If a namespace is set, display titles 
relative to it
 * @cfg {boolean} [suggestions=true] Display search suggestions
 * @cfg {boolean} [showRedirectTargets=true] Show the targets of 
redirects
-* @cfg {boolean} [showRedlink] Show red link to exact match if it 
doesn't exist
 * @cfg {boolean} [showImages] Show page images
 * @cfg {boolean} [showDescriptions] Show page descriptions
 * @cfg {boolean} [excludeCurrentPage] Exclude the current page from 
suggestions
@@ -52,7 +51,6 @@
this.relative = config.relative !== undefined ? config.relative 
: true;
this.suggestions = config.suggestions !== undefined ? 
config.suggestions : true;
this.showRedirectTargets = config.showRedirectTargets !== false;
-   this.showRedlink = !!config.showRedlink;
this.showImages = !!config.showImages;
this.showDescriptions = !!config.showDescriptions;
this.excludeCurrentPage = !!config.excludeCurrentPage;
@@ -246,13 +244,6 @@
)
);
 
-   if ( !pageExists ) {
-   pageData[ this.getQueryValue() ] = {
-   missing: true, known: false, redirect: false, 
disambiguation: false,
-   description: mw.msg( 
'mw-widgets-titleinput-description-new-page' )
-   };
-   }
-
if ( this.cache ) {
this.cache.set( pageData );
}
@@ -261,10 +252,7 @@
if ( pageExists && !pageExistsExact ) {
titles.unshift( this.getQueryValue() );
}
-   // Offer the exact text as a new page if the title is valid
-   if ( this.showRedlink && !pageExists && titleObj ) {
-   titles.push( this.getQueryValue() );
-   }
+
for ( i = 0, len = titles.length; i < len; i++ ) {
page = pageData[ titles[ i ] ] || {};
items.push( new mw.widgets.TitleOptionWidget( 
this.getOptionWidgetData( titles[ i ], page ) ) );
@@ -281,14 +269,18 @@
 * @return {Object} Data for option widget
 */
mw.widgets.TitleWidget.prototype.getOptionWidgetData = function ( 
title, data ) {
-   var mwTitle = new mw.Title( title );
+   var mwTitle = new mw.Title( title ),
+   description = data.description;
+   if ( data.missing && !description ) {
+   description = mw.msg( 
'mw-widgets-titleinput-description-new-page' );
+   }
return {
data: this.namespace !== null && this.relative
? mwTitle.getRelativeText( this.namespace )
: title,
url: mwTitle.getUrl(),
imageUrl: this.showImages ? data.imageUrl : null,
-   description: this.showDescriptions ? data.description : 
null,
+   description: this.showDescriptions ? description : null,
missing: data.missing,
redirect: data.redirect,
disambiguation: data.disambiguation,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: new labstore partman recipe

2016-11-02 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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

Change subject: new labstore partman recipe
..

new labstore partman recipe

this should create a / outside the LVM, and then create an empty LVM,
where puppet can later create partitions within it as nessasary.

labstore2003 is online in monitoring, so i wont merge or test this until
tomorrow (thursday) with madu to confirm those hosts can come down.

at that time, we can append in a phab task reference #

Change-Id: I27128c10850ddb4f3ac9898061c796a1ba1c2773
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
2 files changed, 46 insertions(+), 0 deletions(-)


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

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 7d8ddad..938a9b8 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -91,6 +91,7 @@
 labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
 labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
 sodium|labstore200[3-4]) echo partman/lvm-ext-srv.cfg ;; \
+sodium|labstore200[3-4]) echo partman/labstore-lvm-noraid.cfg ;; \
 labtestneutron2001) echo partman/mw.cfg ;; \
 labtestnet2001) echo partman/raid1.cfg ;; \
 labtestweb2001) echo partman/raid1.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg 
b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
new file mode 100644
index 000..f8d0a5b
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/labstore-lvm-noraid.cfg
@@ -0,0 +1,45 @@
+# configuration to create:
+#  * no RAID (either single disk or hardware raid presenting a single device)
+#  ** 30G / ext4 outside lvm
+#  ** no swap
+#  ** the rest as ext4 with no mount
+
+
+d-ipartman-auto/method string  lvm
+d-ipartman-auto/disk   string  /dev/sda
+
+# the install makes sure we want to wipe the lvm
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite true
+
+d-ipartman/confirm_nooverwrite true
+d-ipartman/choose_partitionselect  finish
+
+d-ipartman-auto/expert_recipe  string  es ::   \
+   3 2 3 ext4  \
+   $primary{ } \
+   $bootable{ }\
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ / } \
+   .   \
+   64 1000 1000 ext4   \
+   $primary{ } \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   lv_name{ data } \
+   $defaultignore{ }   \
+   $lvmok{ }   \
+   mountpoint{  }  \
+   .
+
+d-ipartman-auto-lvm/guided_sizestring  75%
+
+d-ipartman-auto/choose_recipe  es
+partman-basicfilesystems partman-basicfilesystems/no_swap boolean false
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27128c10850ddb4f3ac9898061c796a1ba1c2773
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...PageForms[REL1_28]: Fix extension.json and also re add support for extension.jso...

2016-11-02 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Fix extension.json and also re add support for extension.json 
in MW 1.27
..

Fix extension.json and also re add support for extension.json in MW 1.27

Change-Id: Ia58769f92153cd08409bc5c850b7ac0623b98b02
(cherry picked from commit 5b76de2a68263b1e48f869f757ea7b168671ed91)
---
M PageForms.php
M extension.json
2 files changed, 38 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/99/319499/1

diff --git a/PageForms.php b/PageForms.php
index 65372f4..8efef74 100644
--- a/PageForms.php
+++ b/PageForms.php
@@ -43,7 +43,7 @@
 // set in LocalSettings.php do not override the settings in
 // extension.json. For simplicity's sake, don't load extensions unless we're
 // at version 1.27 or higher.
-if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
+if ( version_compare( $GLOBALS['wgVersion'], '1.27c', '>' ) ) {
if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'PageForms' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
diff --git a/extension.json b/extension.json
index fcfaf66..2ce863d 100644
--- a/extension.json
+++ b/extension.json
@@ -31,7 +31,7 @@
"PFHooks::initialize"
],
"require": {
-   "MediaWiki": ">= 1.28.0"
+   "MediaWiki": ">= 1.27.0"
},
"GroupPermissions": {
"*": {
@@ -400,93 +400,43 @@
]
},
"config": {
-   "PageFormsMaxAutocompleteValues": {
-   "value": 1000
-   },
-   "PageFormsMaxLocalAutocompleteValues": {
-   "value": 100
-   },
-   "PageFormsAutocompleteOnAllChars": {
-   "value": false
-   },
-   "PageFormsCacheAutocompleteValues": {
-   "value": false
-   },
-   "PageFormsAutocompleteCacheTimeout": {
-   "value": null
-   },
-   "PageFormsRenameEditTabs": {
-   "value": false
-   },
-   "PageFormsRenameMainEditTab": {
-   "value": false
-   },
-   "PageFormsListSeparator": {
-   "value": ","
-   },
-   "PageForms24HourTime": {
-   "value": false
-   },
-   "PageFormsCacheFormDefinitions": {
-   "value": false
-   },
-   "PageFormsFormCacheType": {
-   "value": null
-   },
-   "PageFormsLinkAllRedLinksToForms": {
-   "value": false
-   },
-   "PageFormsRedLinksCheckOnlyLocalProps": {
-   "value": false
-   },
-   "PageFormsShowTabsForAllHelperForms": {
-   "value": true
-   },
-   "PageFormsRunQueryFormAtTop": {
-   "value": false
-   },
-   "PageFormsGoogleMapsKey": {
-   "value": null
-   },
-   "PageFormsShowOnSelect": {
-   "value": []
-   },
-   "PageFormsAutocompleteValues": {
-   "value": []
-   },
-   "PageFormsGridValues": {
-   "value": []
-   },
-   "PageFormsGridParams": {
-   "value": []
-   },
-   "PageFormsFieldProperties": {
-   "value": []
-   },
-   "PageFormsCargoFields": {
-   "value": []
-   },
-   "PageFormsDependentFields": {
-   "value": []
-   },
-   "PageFormsCheckboxesSelectAllMinimum": {
-   "value": 10
-   },
+   "PageFormsMaxAutocompleteValues": 1000,
+   "PageFormsMaxLocalAutocompleteValues": 100,
+   "PageFormsAutocompleteOnAllChars": false,
+   "PageFormsCacheAutocompleteValues": false,
+   "PageFormsAutocompleteCacheTimeout": null,
+   "PageFormsRenameEditTabs": false,
+   "PageFormsRenameMainEditTab": false,
+   "PageFormsListSeparator":  ",",
+   "PageForms24HourTime": false,
+   "PageFormsCacheFormDefinitions": false,
+   "PageFormsFormCacheType": null,
+   "PageFormsLinkAllRedLinksToForms": false,
+   "PageFormsRedLinksCheckOnlyLocalProps": false,
+   "PageFormsShowTabsForAllHelperForms": true,
+   "PageFormsRu

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: [WIP] Script to generate wmgCirrusSearchInterwikiSources

2016-11-02 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: [WIP] Script to generate wmgCirrusSearchInterwikiSources
..

[WIP] Script to generate wmgCirrusSearchInterwikiSources

CirrusSearch has a variable, $wgCirrusSearchInterwikiSources, that
lists the sister-wiki's that should be queried as part of Special:Search
and displayed in a sidebar. This generates the full map for
$wmgCirrusSearchInterwikiSources that will be included into
InitialiseSettings.php.

We are working up something so this can be more directly done, but
before that is complete we need to start running some load tests to get
an idea of other changes that need to be made. This should be a
reasonable stop-gap solution.

Change-Id: I7145b63a97ed6caf142df076d19486752af46426
---
A dumpCirrusInterwikiSources.php
1 file changed, 112 insertions(+), 0 deletions(-)


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

diff --git a/dumpCirrusInterwikiSources.php b/dumpCirrusInterwikiSources.php
new file mode 100644
index 000..01f9340
--- /dev/null
+++ b/dumpCirrusInterwikiSources.php
@@ -0,0 +1,112 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ * @ingroup Wikimedia
+ */
+require_once __DIR__ . '/WikimediaMaintenance.php';
+
+
+class DumpCirrusInterwikiSources extends Maintenance {
+
+   public function __construct() {
+   parent::__construct();
+   $this->mDescription = "Build CirrusSearch interwiki source map";
+   }
+
+   private function expandDbList( $project ) {
+   static $private = null;
+   if ( $private === null ) {
+   $private = MWWikiversions::evalDbListExpression( 
'private' );
+   }
+   if ( $project === 'wiki' ) {
+   $project = 'wikipedia';
+   }
+   $list = MWWikiversions::evalDbListExpression( $project );
+   return array_diff( $list, $private );
+   }
+   
+   private function findInterwikiPrefix( $dbName, $targetDomain ) {
+   global $wgInterwikiCache;
+
+   if ( $targetDomain === 'wiki' ) {
+   $targetDomain = 'wikipedia';
+   }
+
+   foreach ( $wgInterwikiCache as $key => $value ) {
+   if (substr($key, 0, strlen($dbName)) !== $dbName) {
+   continue;
+   } 
+   list( $_, $prefix ) = explode( ':', $key, 2 );
+   list( $_, $url ) = explode( ' ', $value, 2 );
+   $host = parse_url( $url, PHP_URL_HOST );
+   list( $lang, $domain, $tld ) = explode( '.', $host, 3 );
+   if ( $domain === $targetDomain ) {
+   return $prefix;
+   }
+   }
+   return null;
+   }
+
+   public function execute() {
+   $all = array_flip( expandDbList( "all" ) );
+   
+   $matrix = new SiteMatrix();
+   $map = [];
+   foreach ( $matrix->getSites() as $baseSite ) {
+   // Collect things that look like wikipedias
+   $wikis = expandDbList( $baseSite );
+   foreach ( $wikis as $dbName ) {
+   list( $_, $lang ) = $wgConf->siteFromDB( 
$dbName );
+   foreach ( $matrix->getSites() as $sisterSite ) {
+   if ( $baseSite === $sisterSite ) {
+   continue;
+   }
+   if ( !$matrix->exist( $lang, 
$sisterSite ) ) {
+   continue;
+   }
+   $iwPrefix = findInterwikiPrefix( 
$dbName, $sisterSite );
+   if ($iwPrefix === null ) {
+   fwrite( STDERR, "Matrix reports 
site at $lang / $sisterSite, but no interwiki prefix found" );
+   continue;
+   }
+   $sisterDbName = strtr( $lang, '-', '_' 
) . $sisterSite;
+   if ( !isset( $all[$sisterDbName] ) ) {
+   fwrite( STDERR, "Found prefix 
($iwPrefix) from $dbName but no db ($sisterDbName)\n" );
+   continue;
+   }
+   $map[$dbName][$sisterDbName] = 
$iwPrefix;
+   }
+

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.1]: Sets font size to 14px for both static and interactive maps

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Sets font size to 14px for both static and interactive maps
..


Sets font size to 14px for both static and interactive maps

Bug: T149860
Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
---
M styles/kartographer.less
M styles/leaflet-overrides.less
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/styles/kartographer.less b/styles/kartographer.less
index 1bbf13d..a27a3f7 100644
--- a/styles/kartographer.less
+++ b/styles/kartographer.less
@@ -3,7 +3,7 @@
 .mw-kartographer-mapDialog-map {
position: absolute;
top: 0;
-   bottom: 4.75em;
+   bottom: 4.11em;
left: 0;
right: 0;
z-index: 1;
@@ -65,6 +65,8 @@
background-repeat: no-repeat;
background-size: contain;
display: block;
+   font-size: 14px;
+
&.mw-kartographer-link {
display: block;
}
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index bd79933..64fecea 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -2,6 +2,7 @@
z-index: 0;
 
&.leaflet-container {
+   font-size: 14px;
 
.marker-description img {
width: 100%;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: 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] wikimedia...crm[master]: Backfill gift so that donations of 000+ have a gift source.

2016-11-02 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Backfill gift so that donations of 000+ have a gift source.
..

Backfill gift so that donations of 000+ have a gift source.

Bug: T138361
Change-Id: I2f069a4c0e996ee9217746c2ab2840f77e55a08e
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/97/319497/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 3574e7a..6f0150e 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2404,3 +2404,26 @@
   a.timezone = c.timezone
   ");
 }
+
+/**
+ * Backfill gift so that donations of $1000+ have a gift source.
+ *
+ * These fields have defaults which will have been used if the table is
+ * touched at all during the update. As this stage I think we are just filling
+ * missing data.
+ *
+ * T138361
+ */
+function wmf_civicrm_update_7325() {
+  civicrm_initialize();
+  $customGroup = civicrm_api3('CustomGroup', 'getsingle', array('name' => 
'Gift_Data', 'return' => 'table_name'));
+  $customField = civicrm_api3('CustomField', 'getsingle', array('name' => 
'Campaign', 'return' => 'column_name'));
+
+  CRM_Core_DAO::executeQuery("INSERT INTO {$customGroup['table_name']} 
(entity_id, {$customField['column_name']})
+SELECT c.id as entity_id, 'Benefactor Gift' as 
{$customField['column_name']}
+FROM civicrm_contribution c
+LEFT JOIN {$customGroup['table_name']} v ON v.entity_id = c.id
+WHERE c.total_amount >= 1000 AND v.id IS NULL
+  ");
+
+}

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix polestar view in Firefox.

2016-11-02 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Fix polestar view in Firefox.
..

Fix polestar view in Firefox.

Bug: T149655
Change-Id: I58cd6e87617794538830654f650137c221b418c8
---
M polestar/embed.html
M wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
2 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/96/319496/1

diff --git a/polestar/embed.html b/polestar/embed.html
index b2fc044..24a876f 100644
--- a/polestar/embed.html
+++ b/polestar/embed.html
@@ -1,5 +1,7 @@
 Pole✭
 if(window.parent && document.location.hash) {
-  window.vguiData = JSON.parse(document.location.hash.substr(1));
+  /* More browser-compatible */
+  var hashData = atob(location.hash.substr(1));
+  window.vguiData = JSON.parse(hashData);
 }
-
\ No newline at end of file
+
diff --git a/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
index 89e486b..644ffea 100644
--- a/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
@@ -30,12 +30,12 @@
 */
SELF.prototype.draw = function( $element ) {
var polestarData = {
-   url: GRAPH_QUERY_PREFIX + window.location.hash.substr( 
1 ),
+   url: GRAPH_QUERY_PREFIX + location.hash.substr(1),
name: 'Imported from Wikidata Query Service',
_directEmbed: true
};
var $container = $( '' ).attr( {
-   'src': POLESTAR + '#' + JSON.stringify( polestarData ),
+   'src': POLESTAR + '#' + btoa( JSON.stringify( 
polestarData ) ),
'class': 'graph-iframe'
} ).height( '98vh' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58cd6e87617794538830654f650137c221b418c8
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix enotices due to passing wrong params to watchdog()

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix enotices due to passing wrong params to watchdog()
..


Fix enotices due to passing wrong params to watchdog()

The 3rd argument for watchdog is an array of variables

Change-Id: I6d3bd160070f135ae5b39af0c3c00fc4377fac13
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 150cb23..8b950dc 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1635,6 +1635,7 @@
 watchdog(
 'wmf_civicrm',
 'Message is missing order_id, looking for a substitute 
identifier.',
+array(),
 WATCHDOG_INFO
 );
 $keys = array( 'contribution_tracking_id', 'gateway_txn_id' );
@@ -1643,6 +1644,7 @@
 watchdog(
 'wmf_civicrm',
 "Filling order_id with {$msg[$key]} from key $key.",
+array(),
 WATCHDOG_INFO
 );
 $msg['order_id'] = $msg[$key];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d3bd160070f135ae5b39af0c3c00fc4377fac13
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Follow-up Id0021594: Remove extra code for redlink suggestions

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up Id0021594: Remove extra code for redlink suggestions
..


Follow-up Id0021594: Remove extra code for redlink suggestions

We do a second query now instead which handles this by itself.

Move the description stuff to be generic for all redlinks

Bug: T149130
Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
(cherry picked from commit c2824fbb52c6210a4c4c5919e12782d455cdfce2)
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 7 insertions(+), 15 deletions(-)

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



diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 222586f..7ca19df 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -30,7 +30,6 @@
 * @cfg {boolean} [relative=true] If a namespace is set, display titles 
relative to it
 * @cfg {boolean} [suggestions=true] Display search suggestions
 * @cfg {boolean} [showRedirectTargets=true] Show the targets of 
redirects
-* @cfg {boolean} [showRedlink] Show red link to exact match if it 
doesn't exist
 * @cfg {boolean} [showImages] Show page images
 * @cfg {boolean} [showDescriptions] Show page descriptions
 * @cfg {boolean} [excludeCurrentPage] Exclude the current page from 
suggestions
@@ -52,7 +51,6 @@
this.relative = config.relative !== undefined ? config.relative 
: true;
this.suggestions = config.suggestions !== undefined ? 
config.suggestions : true;
this.showRedirectTargets = config.showRedirectTargets !== false;
-   this.showRedlink = !!config.showRedlink;
this.showImages = !!config.showImages;
this.showDescriptions = !!config.showDescriptions;
this.excludeCurrentPage = !!config.excludeCurrentPage;
@@ -246,13 +244,6 @@
)
);
 
-   if ( !pageExists ) {
-   pageData[ this.getQueryValue() ] = {
-   missing: true, known: false, redirect: false, 
disambiguation: false,
-   description: mw.msg( 
'mw-widgets-titleinput-description-new-page' )
-   };
-   }
-
if ( this.cache ) {
this.cache.set( pageData );
}
@@ -261,10 +252,7 @@
if ( pageExists && !pageExistsExact ) {
titles.unshift( this.getQueryValue() );
}
-   // Offer the exact text as a new page if the title is valid
-   if ( this.showRedlink && !pageExists && titleObj ) {
-   titles.push( this.getQueryValue() );
-   }
+
for ( i = 0, len = titles.length; i < len; i++ ) {
page = pageData[ titles[ i ] ] || {};
items.push( new mw.widgets.TitleOptionWidget( 
this.getOptionWidgetData( titles[ i ], page ) ) );
@@ -281,14 +269,18 @@
 * @return {Object} Data for option widget
 */
mw.widgets.TitleWidget.prototype.getOptionWidgetData = function ( 
title, data ) {
-   var mwTitle = new mw.Title( title );
+   var mwTitle = new mw.Title( title ),
+   description = data.description;
+   if ( data.missing && !description ) {
+   description = mw.msg( 
'mw-widgets-titleinput-description-new-page' );
+   }
return {
data: this.namespace !== null && this.relative
? mwTitle.getRelativeText( this.namespace )
: title,
url: mwTitle.getUrl(),
imageUrl: this.showImages ? data.imageUrl : null,
-   description: this.showDescriptions ? data.description : 
null,
+   description: this.showDescriptions ? description : null,
missing: data.missing,
redirect: data.redirect,
disambiguation: data.disambiguation,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Further e-notice fix.

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Further e-notice fix.
..


Further e-notice fix.

Not sure if this happens in production but the test engage import csv triggers 
e-notices here

Change-Id: I6184ecca10353a2c97eeeffe7fd40eeff8ef6b9b
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 8b950dc..06913be 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -565,7 +565,7 @@
 
 /**
  * Determines which civi-only payment instrument is appropriate for the current
- * message, and resturns the civi payment instrument's human-readable display
+ * message, and returns the civi payment instrument's human-readable display
  * string (if it exists).
  *
  * TODO lookup table
@@ -738,6 +738,10 @@
 break;
 case 'cash':
 $payment_instrument = 'Cash';
+if ( empty( $msg['payment_submethod'] ) ) {
+watchdog( 'wmf_civicrm', 'No cash submethod given', NULL, 
WATCHDOG_WARNING );
+break;
+}
 switch ( strtolower( $msg['payment_submethod'] ) ){
 case 'cash_boleto':
 $payment_instrument = 'Boleto';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6184ecca10353a2c97eeeffe7fd40eeff8ef6b9b
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Setup HTTP Proxy for each spawned node

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: jupyterhub: Setup HTTP Proxy for each spawned node
..


jupyterhub: Setup HTTP Proxy for each spawned node

Since in prod there's no direct internet access, we set this
so users can install things from the internet easily.

Bug: T149543
Change-Id: Ieca73621582fe90ad952ac0a657c70c006f75a6e
---
M hieradata/role/common/paws_internal/jupyterhub.yaml
M modules/jupyterhub/files/jupyterhub_config.py
M modules/jupyterhub/manifests/init.pp
M modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
4 files changed, 16 insertions(+), 5 deletions(-)

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



diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml 
b/hieradata/role/common/paws_internal/jupyterhub.yaml
index f1b03cc..eff4c08 100644
--- a/hieradata/role/common/paws_internal/jupyterhub.yaml
+++ b/hieradata/role/common/paws_internal/jupyterhub.yaml
@@ -2,6 +2,8 @@
   - notebook-roots
   - researchers
 
+jupyterhub::web_proxy: http://webproxy.eqiad.wmnet:8080
+
 debdeploy::grains:
   debdeploy-notebook:
 value: standard
diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 8f82f66..c547b37 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -23,7 +23,6 @@
 raise ImportError('Unknown AUTHENTICATOR_CLASS %s' % AUTHENTICATOR)
 
 
-
 c.JupyterHub.log_level = 'WARN'
 
 # Isolate the db file into a specific directory, and give JupyterHub write
@@ -49,10 +48,14 @@
 # things via pip easily and have them be immediately available
 c.SystemdSpawner.extra_paths = ['/home/{USERNAME}/venv/bin']
 
-# ???
-c.SystemdSpawner.environment = {
-'HADOOP_CONF_DIR': '/etc/hadoop/conf.analytics-cluster/',
-}
+if 'HTTP_PROXY' in os.environ:
+c.SystemdSpawner.environment = {
+# Use HTTP_PROXY for both HTTP and HTTPS proxy
+# Looks like smaller case is more compatible - curl doesn't like
+# all upper case HTTP_PROXY. lol?
+'https_proxy': os.environ['HTTP_PROXY'],
+'http_proxy': os.environ['HTTP_PROXY'],
+}
 
 class VenvCreatingAuthenticator(Authenticator):
 """
diff --git a/modules/jupyterhub/manifests/init.pp 
b/modules/jupyterhub/manifests/init.pp
index 743b88b..fc56087 100644
--- a/modules/jupyterhub/manifests/init.pp
+++ b/modules/jupyterhub/manifests/init.pp
@@ -20,10 +20,15 @@
 #  machine. On labs, this means anyone with labs account.
 #  'ldap' to use LDAPAuthenticator, configured to let only people with LDAP
 #  credentials in. Currently restricted to members of the ops group only.
+#
+# [*web_proxy*]
+#  Set this to put http/https_proxy environment variables in the spawned
+#  single user servers.
 class jupyterhub (
 $wheels_repo,
 $base_path='/srv/jupyterhub',
 $authenticator='ldap',
+$web_proxy=undef,
 ) {
 
 $venv_path = "${base_path}/venv"
diff --git a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb 
b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
index 4e3adf8..d3f1fe6 100644
--- a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
+++ b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
@@ -9,6 +9,7 @@
 Environment=AUTHENTICATOR=<%= @authenticator %>
 Environment=WHEELS_PATH=<%= @wheels_path %>
 Environment=DATA_PATH=<%= @data_path %>
+<% if @web_proxy %>Environment=HTTP_PROXY=<%= @web_proxy %> <% end %>
 EnvironmentFile=<%= @venv_path %>/configproxy_auth_token
 PrivateTmp=yes
 PrivateDevices=yes

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieca73621582fe90ad952ac0a657c70c006f75a6e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use Database::addQuotes in Special:WantedPages/UnwatchedPages

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Use Database::addQuotes in Special:WantedPages/UnwatchedPages
..


Use Database::addQuotes in Special:WantedPages/UnwatchedPages

Database::addQuotes uses the correct quotes/apos, hopefully together
with numeric values

Change-Id: Ia3aba8cabf3ae877f56185e5724dca204a19f73a
---
M includes/specials/SpecialUnwatchedpages.php
M includes/specials/SpecialWantedpages.php
2 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/includes/specials/SpecialUnwatchedpages.php 
b/includes/specials/SpecialUnwatchedpages.php
index df57744..a4e96ae 100644
--- a/includes/specials/SpecialUnwatchedpages.php
+++ b/includes/specials/SpecialUnwatchedpages.php
@@ -44,6 +44,7 @@
}
 
public function getQueryInfo() {
+   $dbr = wfGetDB( DB_REPLICA );
return [
'tables' => [ 'page', 'watchlist' ],
'fields' => [
@@ -54,7 +55,7 @@
'conds' => [
'wl_title IS NULL',
'page_is_redirect' => 0,
-   "page_namespace != '" . NS_MEDIAWIKI . "'"
+   'page_namespace != ' . $dbr->addQuotes( 
NS_MEDIAWIKI ),
],
'join_conds' => [ 'watchlist' => [
'LEFT JOIN', [ 'wl_title = page_title',
diff --git a/includes/specials/SpecialWantedpages.php 
b/includes/specials/SpecialWantedpages.php
index 76b721c..c37ecbd 100644
--- a/includes/specials/SpecialWantedpages.php
+++ b/includes/specials/SpecialWantedpages.php
@@ -49,6 +49,7 @@
}
 
function getQueryInfo() {
+   $dbr = wfGetDB( DB_REPLICA );
$count = $this->getConfig()->get( 'WantedPagesThreshold' ) - 1;
$query = [
'tables' => [
@@ -63,13 +64,13 @@
],
'conds' => [
'pg1.page_namespace IS NULL',
-   "pl_namespace NOT IN ( '" . NS_USER . "', '" . 
NS_USER_TALK . "' )",
-   "pg2.page_namespace != '" . NS_MEDIAWIKI . "'"
+   'pl_namespace NOT IN (' . $dbr->makeList( [ 
NS_USER, NS_USER_TALK ] ) . ')',
+   'pg2.page_namespace != ' . $dbr->addQuotes( 
NS_MEDIAWIKI ),
],
'options' => [
'HAVING' => [
-   "COUNT(*) > $count",
-   "COUNT(*) > SUM(pg2.page_is_redirect)"
+   'COUNT(*) > ' . $dbr->addQuotes( $count 
),
+   'COUNT(*) > SUM(pg2.page_is_redirect)'
],
'GROUP BY' => [ 'pl_namespace', 'pl_title' ]
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3aba8cabf3ae877f56185e5724dca204a19f73a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Set gift field on import for contributions over 999.

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Set gift field on import for contributions over 999.
..


Set gift field on import for contributions over 999.

Major Gifts are most concerned about this for $1000 and over, so only do those 
in order to
meet their needs without bloat.

Note that the fields in the data set have defaults but if nothing is inserted 
into ANY field
in the set then the default will not kick in as it is at the mysql level.

Bug: T138361
Change-Id: I4cbc5bec3e31edfd8eba3e24ac6a4bcc8ff8c1b8
---
M sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 18 insertions(+), 7 deletions(-)

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



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
index 58b5b01..181cfdd 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
@@ -66,11 +66,11 @@
$this->recurringConsumer = new RecurringQueueConsumer( 
'recurring-new' );
}
 
-   /**
+/**
  * Process an ordinary (one-time) donation message
  */
 public function testDonation() {
-$message = new TransactionMessage();
+$message = new TransactionMessage(array('gross' => 400, 
'original_gross' => 400, 'original_currency' => 'USD'));
 $message2 = new TransactionMessage();
 
 exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
@@ -79,13 +79,20 @@
 $this->queueConsumer->processMessage( $message->getBody() );
 $this->queueConsumer->processMessage( $message2->getBody() );
 
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$message->getGateway(), $message->getGatewayTxnId() );
-$this->assertEquals( 1, count( $contributions ) );
+$contribution = civicrm_api3('Contribution', 'getsingle', array(
+  wmf_civicrm_get_custom_field_name('gateway_txn_id') => 
$message->getGatewayTxnId(),
+  'return' => array(wmf_civicrm_get_custom_field_name('Campaign'), 
'total_amount'),
+));
+
$this->assertEmpty($contribution[wmf_civicrm_get_custom_field_name('campaign')] 
);
 
-$contributions2 = wmf_civicrm_get_contributions_from_gateway_id( 
$message2->getGateway(), $message2->getGatewayTxnId() );
-$this->assertEquals( 1, count( $contributions2 ) );
+$contribution2 = civicrm_api3('Contribution', 'getsingle', array(
+  wmf_civicrm_get_custom_field_name('gateway_txn_id') => 
$message2->getGatewayTxnId(),
+  'return' => array(wmf_civicrm_get_custom_field_name('Campaign'), 
'total_amount'),
+));
 
-$this->assertNotEquals( $contributions[0]['contact_id'], 
$contributions2[0]['contact_id'] );
+$this->assertEquals('Benefactor Gift', 
$contribution2[wmf_civicrm_get_custom_field_name('campaign')] );
+
+$this->assertNotEquals( $contribution['contact_id'], 
$contribution2['contact_id'] );
 }
 
 /**
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 21bfae5..150cb23 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -375,9 +375,13 @@
 * NOTE: the custom field for "Gift_Information" indicates that check 
number is stored here.  It is not.
 */
 $custom_field_defaults = array(
+// Contribution_comments field does not appear to exist & is quietly 
ignored I believe.
 'Contribution_Comments' => '',
 'gateway_account' => '',
 );
+if ($contribution['total_amount'] >= 1000) {
+$custom_field_defaults['Campaign'] = 'Benefactor Gift';
+}
 
 // Legacy field names which do not match the message field names
 $custom_name_mangle = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cbc5bec3e31edfd8eba3e24ac6a4bcc8ff8c1b8
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove db1027 remnants (reverse lookup)

2016-11-02 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: remove db1027 remnants (reverse lookup)
..

remove db1027 remnants (reverse lookup)

Change-Id: I07eff425620818c1ee9e09cb7f91e606430106b0
---
M templates/10.in-addr.arpa
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/95/319495/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index f5eba05..087c89c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -447,7 +447,6 @@
 13  1H IN PTR   db1024.eqiad.wmnet.
 
 15  1H IN PTR   db1026.eqiad.wmnet.
-16  1H IN PTR   db1027.eqiad.wmnet.
 17  1H IN PTR   db1028.eqiad.wmnet.
 18  1H IN PTR   db1029.eqiad.wmnet.
 19  1H IN PTR   db1030.eqiad.wmnet.
@@ -2078,7 +2077,6 @@
 25  1H IN PTR   wmf3261.mgmt.eqiad.wmnet.
 26  1H IN PTR   db1026.mgmt.eqiad.wmnet.
 26  1H IN PTR   wmf3260.mgmt.eqiad.wmnet.
-27  1H IN PTR   db1027.mgmt.eqiad.wmnet.
 27  1H IN PTR   wmf3259.mgmt.eqiad.wmnet.
 28  1H IN PTR   db1028.mgmt.eqiad.wmnet.
 28  1H IN PTR   wmf3258.mgmt.eqiad.wmnet.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jupyterhub: Setup HTTP Proxy for each spawned node

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: jupyterhub: Setup HTTP Proxy for each spawned node
..

jupyterhub: Setup HTTP Proxy for each spawned node

Since in prod there's no direct internet access, we set this
so users can install things from the internet easily.

Bug: T149543
Change-Id: Ieca73621582fe90ad952ac0a657c70c006f75a6e
---
M hieradata/role/common/paws_internal/jupyterhub.yaml
M modules/jupyterhub/files/jupyterhub_config.py
M modules/jupyterhub/manifests/init.pp
M modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
4 files changed, 16 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/319494/1

diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml 
b/hieradata/role/common/paws_internal/jupyterhub.yaml
index f1b03cc..eff4c08 100644
--- a/hieradata/role/common/paws_internal/jupyterhub.yaml
+++ b/hieradata/role/common/paws_internal/jupyterhub.yaml
@@ -2,6 +2,8 @@
   - notebook-roots
   - researchers
 
+jupyterhub::web_proxy: http://webproxy.eqiad.wmnet:8080
+
 debdeploy::grains:
   debdeploy-notebook:
 value: standard
diff --git a/modules/jupyterhub/files/jupyterhub_config.py 
b/modules/jupyterhub/files/jupyterhub_config.py
index 8f82f66..c547b37 100644
--- a/modules/jupyterhub/files/jupyterhub_config.py
+++ b/modules/jupyterhub/files/jupyterhub_config.py
@@ -23,7 +23,6 @@
 raise ImportError('Unknown AUTHENTICATOR_CLASS %s' % AUTHENTICATOR)
 
 
-
 c.JupyterHub.log_level = 'WARN'
 
 # Isolate the db file into a specific directory, and give JupyterHub write
@@ -49,10 +48,14 @@
 # things via pip easily and have them be immediately available
 c.SystemdSpawner.extra_paths = ['/home/{USERNAME}/venv/bin']
 
-# ???
-c.SystemdSpawner.environment = {
-'HADOOP_CONF_DIR': '/etc/hadoop/conf.analytics-cluster/',
-}
+if 'HTTP_PROXY' in os.environ:
+c.SystemdSpawner.environment = {
+# Use HTTP_PROXY for both HTTP and HTTPS proxy
+# Looks like smaller case is more compatible - curl doesn't like
+# all upper case HTTP_PROXY. lol?
+'https_proxy': os.environ['HTTP_PROXY'],
+'http_proxy': os.environ['HTTP_PROXY'],
+}
 
 class VenvCreatingAuthenticator(Authenticator):
 """
diff --git a/modules/jupyterhub/manifests/init.pp 
b/modules/jupyterhub/manifests/init.pp
index 743b88b..fc56087 100644
--- a/modules/jupyterhub/manifests/init.pp
+++ b/modules/jupyterhub/manifests/init.pp
@@ -20,10 +20,15 @@
 #  machine. On labs, this means anyone with labs account.
 #  'ldap' to use LDAPAuthenticator, configured to let only people with LDAP
 #  credentials in. Currently restricted to members of the ops group only.
+#
+# [*web_proxy*]
+#  Set this to put http/https_proxy environment variables in the spawned
+#  single user servers.
 class jupyterhub (
 $wheels_repo,
 $base_path='/srv/jupyterhub',
 $authenticator='ldap',
+$web_proxy=undef,
 ) {
 
 $venv_path = "${base_path}/venv"
diff --git a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb 
b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
index 4e3adf8..d3f1fe6 100644
--- a/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
+++ b/modules/jupyterhub/templates/initscripts/jupyterhub.systemd.erb
@@ -9,6 +9,7 @@
 Environment=AUTHENTICATOR=<%= @authenticator %>
 Environment=WHEELS_PATH=<%= @wheels_path %>
 Environment=DATA_PATH=<%= @data_path %>
+<% if @web_proxy %>Environment=HTTP_PROXY=<%= @web_proxy %> <% end %>
 EnvironmentFile=<%= @venv_path %>/configproxy_auth_token
 PrivateTmp=yes
 PrivateDevices=yes

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Sets font size to 14px for both static and interactive maps

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Sets font size to 14px for both static and interactive maps
..


Sets font size to 14px for both static and interactive maps

Bug: T149860
Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
---
M styles/kartographer.less
M styles/leaflet-overrides.less
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/styles/kartographer.less b/styles/kartographer.less
index 1bbf13d..a27a3f7 100644
--- a/styles/kartographer.less
+++ b/styles/kartographer.less
@@ -3,7 +3,7 @@
 .mw-kartographer-mapDialog-map {
position: absolute;
top: 0;
-   bottom: 4.75em;
+   bottom: 4.11em;
left: 0;
right: 0;
z-index: 1;
@@ -65,6 +65,8 @@
background-repeat: no-repeat;
background-size: contain;
display: block;
+   font-size: 14px;
+
&.mw-kartographer-link {
display: block;
}
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index bd79933..64fecea 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -2,6 +2,7 @@
z-index: 0;
 
&.leaflet-container {
+   font-size: 14px;
 
.marker-description img {
width: 100%;

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Rename decile value options.

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Rename decile value options.
..


Rename decile value options.

Rosie revised the values back to numeric. Reflecting back for dev dbs

Bug: T147965
Change-Id: I2dcc3b88e4673d5f4c778004ff58303d84abb53a
---
M sites/all/modules/wmf_civicrm/update_custom_fields.php
1 file changed, 11 insertions(+), 9 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/update_custom_fields.php 
b/sites/all/modules/wmf_civicrm/update_custom_fields.php
index 8a3600a..e53eead 100644
--- a/sites/all/modules/wmf_civicrm/update_custom_fields.php
+++ b/sites/all/modules/wmf_civicrm/update_custom_fields.php
@@ -341,15 +341,17 @@
   'note_columns' => 60,
   'note_rows' => 4,
   'option_values' => array(
-'A' => 'A',
-'B' => 'B',
-'C' => 'C',
-'D' => 'D',
-'E' => 'E',
-'F' => 'F',
-'G' => 'G',
-'H' => 'H',
-'I' => 'I',
+'1' => 'A',
+'2' => 'B',
+'3' => 'C',
+'4' => 'D',
+'5' => 'E',
+'6' => 'F',
+'7' => 'G',
+'8' => 'H',
+'9' => 'I',
+'10' => 'J',
+'11' => 'J',
   )
 ),
 'Voter_Party' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2dcc3b88e4673d5f4c778004ff58303d84abb53a
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.1]: Sets font size to 14px for both static and interactive maps

2016-11-02 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Sets font size to 14px for both static and interactive maps
..

Sets font size to 14px for both static and interactive maps

Bug: T149860
Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
---
M styles/kartographer.less
M styles/leaflet-overrides.less
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/93/319493/1

diff --git a/styles/kartographer.less b/styles/kartographer.less
index 1bbf13d..a27a3f7 100644
--- a/styles/kartographer.less
+++ b/styles/kartographer.less
@@ -3,7 +3,7 @@
 .mw-kartographer-mapDialog-map {
position: absolute;
top: 0;
-   bottom: 4.75em;
+   bottom: 4.11em;
left: 0;
right: 0;
z-index: 1;
@@ -65,6 +65,8 @@
background-repeat: no-repeat;
background-size: contain;
display: block;
+   font-size: 14px;
+
&.mw-kartographer-link {
display: block;
}
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index bd79933..64fecea 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -2,6 +2,7 @@
z-index: 0;
 
&.leaflet-container {
+   font-size: 14px;
 
.marker-description img {
width: 100%;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Yurik 
Gerrit-Reviewer: JGirault 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Further e-notic fix.

2016-11-02 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Further e-notic fix.
..

Further e-notic fix.

Not sure if this happens in production but the test engage import csv triggers 
e-notices here

Change-Id: I6184ecca10353a2c97eeeffe7fd40eeff8ef6b9b
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/319492/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 33fbd1a..04aa6c1 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -565,7 +565,7 @@
 
 /**
  * Determines which civi-only payment instrument is appropriate for the current
- * message, and resturns the civi payment instrument's human-readable display
+ * message, and returns the civi payment instrument's human-readable display
  * string (if it exists).
  *
  * TODO lookup table
@@ -738,6 +738,10 @@
 break;
 case 'cash':
 $payment_instrument = 'Cash';
+  if ( empty( $msg['payment_submethod'] ) ) {
+  watchdog( 'wmf_civicrm', 'No cash submethod given', NULL, 
WATCHDOG_WARNING );
+  break;
+  }
 switch ( strtolower( $msg['payment_submethod'] ) ){
 case 'cash_boleto':
 $payment_instrument = 'Boleto';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Factor out getWikitext in ApiVisualEditorEdit

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Factor out getWikitext in ApiVisualEditorEdit
..


Factor out getWikitext in ApiVisualEditorEdit

Change-Id: I0f6709f170034263acc94daa41603bcc77897d31
---
M ApiVisualEditorEdit.php
1 file changed, 36 insertions(+), 32 deletions(-)

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

Objections:
  Jforrester: There's a problem with this change, please improve



diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index 1211bdc..22a4766 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -127,6 +127,29 @@
return $content;
}
 
+   protected function getWikitext( $title, $params, $parserParams ) {
+   if ( $params['cachekey'] !== null ) {
+   $wikitext = $this->trySerializationCache( 
$params['cachekey'] );
+   if ( !is_string( $wikitext ) ) {
+   $this->dieUsage( 'No cached serialization found 
with that key', 'badcachekey' );
+   }
+   } else {
+   $wikitext = $this->getWikitextNoCache( $title, $params, 
$parserParams );
+   }
+   return $wikitext;
+   }
+
+   protected function getWikitextNoCache( $title, $params, $parserParams ) 
{
+   $this->requireOnlyOneParameter( $params, 'html' );
+   $wikitext = $this->postHTML(
+   $title, $this->tryDeflate( $params['html'] ), 
$parserParams, $params['etag']
+   );
+   if ( $wikitext === false ) {
+   $this->dieUsage( 'Error contacting the document 
server', 'docserver' );
+   }
+   return $wikitext;
+   }
+
protected function storeInSerializationCache( $title, $wikitext ) {
global $wgMemc;
 
@@ -160,22 +183,24 @@
return $wgMemc->get( $key );
}
 
-   protected function postHTML( $title, $html, $parserParams, $etag ) {
+   protected function postData( $path, $title, $data, $parserParams, $etag 
) {
if ( $parserParams['oldid'] === 0 ) {
$parserParams['oldid'] = '';
}
-   $path = 'transform/html/to/wikitext/' . urlencode( 
$title->getPrefixedDBkey() );
+   $path .= urlencode( $title->getPrefixedDBkey() );
if ( $parserParams['oldid'] ) {
$path .= '/' . $parserParams['oldid'];
}
return $this->requestRestbase(
-   'POST',
-   $path,
-   [
-   'html' => $html,
-   'scrub_wikitext' => 1,
-   ],
+   'POST', $path, $data,
[ 'If-Match' => $etag ]
+   );
+   }
+
+   protected function postHTML( $title, $html, $parserParams, $etag ) {
+   return $this->postData(
+   'transform/html/to/wikitext/', $title,
+   [ 'html' => $html, 'scrub_wikitext' => 1 ], 
$parserParams, $etag
);
}
 
@@ -236,30 +261,9 @@
$parserParams['oldid'] = $params['oldid'];
}
 
-   if (
-   $params['paction'] !== 'serialize' &&
-   $params['paction'] !== 'serializeforcache' &&
-   $params['wikitext'] !== null
-   ) {
-   // Get wikitext from param
-   $wikitext = $params['wikitext'];
-   } elseif ( $params['paction'] !== 'serializeforcache' && 
$params['cachekey'] !== null ) {
-   // Get wikitext from cachekey
-   $wikitext = $this->trySerializationCache( 
$params['cachekey'] );
-   if ( !is_string( $wikitext ) ) {
-   $this->dieUsage( 'No cached serialization found 
with that key', 'badcachekey' );
-   }
-   } else {
-   // Get wikitext by parsing HTML
-   if ( $params['html'] === null ) {
-   $this->dieUsageMsg( 'missingparam', 'html' );
-   }
-   $wikitext = $this->postHTML(
-   $title, $this->tryDeflate( $params['html'] ), 
$parserParams, $params['etag']
-   );
-   if ( $wikitext === false ) {
-   $this->dieUsage( 'Error contacting the 
Parsoid/RESTbase server', 'docserver' );
-   }
+   $wikitext = $params['wikitext'];
+   if ( !$wikitext ) {
+   $wikitext = $this->getWikitext( $title,

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix enotices due to passing wrong params to watchdog()

2016-11-02 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Fix enotices due to passing wrong params to watchdog()
..

Fix enotices due to passing wrong params to watchdog()

The 3rd argument for watchdog is an array of variables

Change-Id: I6d3bd160070f135ae5b39af0c3c00fc4377fac13
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/91/319491/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 632867d..33fbd1a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1635,6 +1635,7 @@
 watchdog(
 'wmf_civicrm',
 'Message is missing order_id, looking for a substitute 
identifier.',
+array(),
 WATCHDOG_INFO
 );
 $keys = array( 'contribution_tracking_id', 'gateway_txn_id' );
@@ -1643,6 +1644,7 @@
 watchdog(
 'wmf_civicrm',
 "Filling order_id with {$msg[$key]} from key $key.",
+array(),
 WATCHDOG_INFO
 );
 $msg['order_id'] = $msg[$key];

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: add forward DNS for papaul-laptop.mgmt

2016-11-02 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: add forward DNS for papaul-laptop.mgmt
..

add forward DNS for papaul-laptop.mgmt

This only existed in reverse DNS but not in forward DNS.

Change-Id: Iaaa8a948298d1487b6f8f9d506b175026097926d
---
M templates/wmnet
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/90/319490/1

diff --git a/templates/wmnet b/templates/wmnet
index d5363a8..0262624 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3242,6 +3242,7 @@
 osm-web2002 1H  IN A10.193.2.10
 osm-web2003 1H  IN A10.193.2.11
 osm-web2004 1H  IN A10.193.2.12
+papaul-laptop   1H  IN A10.193.1.7
 pc2004  1H  IN A10.193.2.231
 pc2005  1H  IN A10.193.2.232
 pc2006  1H  IN A10.193.2.233

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: WIP capture Adyen payments missing pending messages

2016-11-02 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP capture Adyen payments missing pending messages
..

WIP capture Adyen payments missing pending messages

We can get in this mess if the donor somehow succeeds on a second
attempt after we've already deleted the message for a failed first
attempt with the same order ID. If we find the risk score in fredge,
we can still request the capture, then wait for the audit parser to
reconstruct the donor details from payments logs.

TODO: refactor this spaghetti

Bug: T149861
Change-Id: Ib80e5d3434fa1f7c4412872f4512e683b46b846d
---
A Core/DataStores/PaymentsFraudDatabase.php
M PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
A Schema/mysql/005_CreatePaymentsFraudTable.sql
A Schema/sqlite/005_CreatePaymentsFraudTable.sql
4 files changed, 115 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/89/319489/1

diff --git a/Core/DataStores/PaymentsFraudDatabase.php 
b/Core/DataStores/PaymentsFraudDatabase.php
new file mode 100644
index 000..7d19286
--- /dev/null
+++ b/Core/DataStores/PaymentsFraudDatabase.php
@@ -0,0 +1,61 @@
+ $gatewayName,
+   'order_id' => $orderId,
+   );
+   $executed = $this->prepareAndExecute( $sql, $params );
+   $row = $executed->fetch( PDO::FETCH_ASSOC );
+   if ( !$row ) {
+   return null;
+   }
+   return $row;
+   }
+
+   /**
+* FIXME: only good for tests as is, need to insert breakdown rows
+*
+* @param array $message
+*/
+   public function storeMessage( $message ) {
+   list( $fieldList, $paramList ) = self::formatInsertParameters(
+   $message
+   );
+
+   $sql = "INSERT INTO payments_fraud ( $fieldList ) VALUES ( 
$paramList )";
+   $this->prepareAndExecute( $sql, $message );
+   }
+
+   protected function getConfigKey() {
+   return 'data-store/fredge-db';
+   }
+
+   protected function getTableScriptFile() {
+   return '005_CreatePaymentsFraudTable.sql';
+   }
+}
diff --git a/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php 
b/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
index 50a0bc8..b3df44e 100644
--- a/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
+++ b/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
@@ -1,6 +1,7 @@
 correlationId}'."
);
 
-   // Determine if a message exists in the pending database; if it 
does not then
-   // this payment has already been sent to the verified queue, or 
there is a
-   // problem with the database. If it does exist, we need to check
-   // $capture_requested in case we have requested a capture but 
have not yet
-   // received notification of capture success. Either case can 
occur when a
-   // donor submits their credit card details multiple times 
against a single
-   // order ID. We should cancel duplicate authorizations, but 
leave payments
-   // with missing donor details open for potential manual capture.
+   // Determine if a message exists in the pending database; if it 
does not
+   // then we may have deleted the details due to a duplicate 
order ID.
+   // If it does exist, we need to check $capture_requested in 
case we have
+   // requested a capture but have not yet received notification 
of capture
+   // success. Either case can occur when a donor submits their 
credit card
+   // details multiple times against a single order ID. We should 
cancel
+   // duplicate authorizations, but for missing details we can 
check fredge
+   // for the fraud score.
$this->logger->debug( 'Attempting to locate associated message 
in pending database.' );
$db = PendingDatabase::get();
$dbMessage = $db->fetchMessageByGatewayOrderId( 'adyen', 
$this->merchantReference );
+   $fallback = false;
+   if ( !$dbMessage ) {
+   // Try to find the risk score from fredge
+   $fallback = true;
+   $fraudDb = PaymentsFraudDatabase::get();
+   $dbMessage = $fraudDb->fetchMessageByGatewayOrderId(
+   'adyen', $this->merchantReference
+   );
+   }
$success = true;
 
$action = $this->determineAction( $dbMessage );
@@ -95,8 +105,10 @@
'Marking pending 
database message as captured.'

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Sets font size to 14px for both static and interactive maps

2016-11-02 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Sets font size to 14px for both static and interactive maps
..

Sets font size to 14px for both static and interactive maps

Bug: T149860
Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
---
M styles/kartographer.less
M styles/leaflet-overrides.less
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/88/319488/1

diff --git a/styles/kartographer.less b/styles/kartographer.less
index 1bbf13d..a27a3f7 100644
--- a/styles/kartographer.less
+++ b/styles/kartographer.less
@@ -3,7 +3,7 @@
 .mw-kartographer-mapDialog-map {
position: absolute;
top: 0;
-   bottom: 4.75em;
+   bottom: 4.11em;
left: 0;
right: 0;
z-index: 1;
@@ -65,6 +65,8 @@
background-repeat: no-repeat;
background-size: contain;
display: block;
+   font-size: 14px;
+
&.mw-kartographer-link {
display: block;
}
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index bd79933..64fecea 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -2,6 +2,7 @@
z-index: 0;
 
&.leaflet-container {
+   font-size: 14px;
 
.marker-description img {
width: 100%;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc08a8b1585b4680f8cb55623c799b01464633f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mgmt: fix-up grep regex in getmgmtips

2016-11-02 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: mgmt: fix-up grep regex in getmgmtips
..


mgmt: fix-up grep regex in getmgmtips

Change the grep regex to include names with a "-"
dash character in them.

Always delete the tmp files on startup.

Change-Id: Ib4a710e17163f9318d2f367aeb2d762d3a634d85
---
M modules/mgmt/files/getmgmtips
1 file changed, 6 insertions(+), 10 deletions(-)

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



diff --git a/modules/mgmt/files/getmgmtips b/modules/mgmt/files/getmgmtips
index 1cbc685..9d04a04 100644
--- a/modules/mgmt/files/getmgmtips
+++ b/modules/mgmt/files/getmgmtips
@@ -14,15 +14,11 @@
 
 echo "getting all mgmt hostnames from DNS templates.."
 
-if [ ! -d  "$tempdir" ]; then
-echo "creating temp dir $tempdir and git cloning DNS repo.."
-mkdir -p $tempdir
-cd $tempdir
-git clone $dnsrepo
-else
-echo "removing $tempdir"
-rm -rf $tempdir
-fi
+rm -rf $tempdir
+echo "creating temp dir $tempdir and git cloning DNS repo.."
+mkdir -p $tempdir
+cd $tempdir
+git clone $dnsrepo
 
 cd ${tempdir}/dns/templates
 
@@ -32,7 +28,7 @@
 fi
 
 echo -e "extracting mgmt hostnames from 10.in-addr.arpa..\n"
-mgmt_hosts=$(grep -oh "\w*.mgmt.\w*.\w*.\w*" 10.in-addr.arpa)
+mgmt_hosts=$(grep -o '[a-z].*\.mgmt\.[a-z].*' 10.in-addr.arpa)
 
 touch $resulfile.tmp
 touch $rejectfile.tmp

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4a710e17163f9318d2f367aeb2d762d3a634d85
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Papaul 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Upgrade to Support Library v25.0.0

2016-11-02 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Upgrade to Support Library v25.0.0
..

Upgrade to Support Library v25.0.0

Upgrade the Support Libraries to v25.0.0[0], buildToolsVersion to
v25.0.0[1], and compileSdkVersion to 25. There were several bugs
mentioned in the Android subreddit[2,3,4,5] but none I could repro in
the app. There was one noteworthy new feature added mentioned in the
release notes that is not tracked in Phabricator:

  The new DiffUtil class can calculate the difference between two
  collections, and can dispatch a list of update operations that are
  suitable to be consumed by a RecyclerView.Adapter.

The paradigm for Gradle dependencies is unclear. The Topeka[6] example
doesn't match the library breakdown by feature[7].

The upgrade does not seem to have affected any of the Spoon or unit
screenshot tests.

[0] https://developer.android.com/topic/libraries/support-library/revisions.html
[1] https://developer.android.com/studio/releases/build-tools.html
[2] 
https://www.reddit.com/r/androiddev/comments/500cx9/android_design_support_2420_update_password/
[3] 
https://www.reddit.com/r/androiddev/comments/52m6ac/android_support_library_revision_2421_released/
[4] 
https://www.reddit.com/r/androiddev/comments/4y70e7/android_support_library_v242_released/
[5] 
https://www.reddit.com/r/androiddev/comments/58czcd/support_lib_25_with_bottomnavigationview/
[6] 
https://github.com/googlesamples/android-topeka/blob/ed5573691843d6afde4086f86ed2f7659016ec9b/app/build.gradle
[7] https://developer.android.com/topic/libraries/support-library/features.html

Bug: T144318
Change-Id: Ibdf76a6b640b5cb749caaf2b3e4bb3186d6fa710
---
M app/build.gradle
1 file changed, 9 insertions(+), 4 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index e5271d5..755a549 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,9 +40,9 @@
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_7
 android {
 // Keep version in sync with /project.properties
-compileSdkVersion 24
+compileSdkVersion 25
 
-buildToolsVersion '23.0.3'
+buildToolsVersion '25.0.0'
 compileOptions {
 sourceCompatibility = JAVA_VERSION
 targetCompatibility = JAVA_VERSION
@@ -167,7 +167,7 @@
 
 String okHttpVersion = '3.4.1'
 String retrofitVersion = '2.1.0'
-String supportVersion = '24.1.1'
+String supportVersion = '25.0.0'
 String espressoVersion = '2.2.2'
 String butterKnifeVersion = '8.4.0'
 String frescoVersion = '0.13.0'
@@ -175,13 +175,18 @@
 String mockitoCore = 'org.mockito:mockito-core:1.9.5'
 String leakCanaryVersion = '1.5'
 
-compile "com.android.support:appcompat-v7:$supportVersion" // includes 
support-v4
+compile "com.android.support:support-compat:$supportVersion"
+compile "com.android.support:support-core-utils:$supportVersion"
+compile "com.android.support:support-core-ui:$supportVersion"
+compile "com.android.support:support-fragment:$supportVersion"
+
 compile "com.android.support:cardview-v7:$supportVersion"
 compile "com.android.support:design:$supportVersion"
 compile "com.android.support:recyclerview-v7:$supportVersion"
 compile "com.android.support:percent:$supportVersion"
 compile "com.android.support:palette-v7:$supportVersion"
 compile "com.android.support:preference-v14:$supportVersion"
+
 compile "com.facebook.fresco:animated-gif:$frescoVersion"
 compile "com.facebook.fresco:fresco:$frescoVersion"
 compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix duplicate show password icon

2016-11-02 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Fix duplicate show password icon
..

Fix duplicate show password icon

Bug: T144318
Change-Id: I7faa4aebebaf55f6b5b18a2a625734e45c61a1a7
---
A 
app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
A app/src/androidTest/java/org/wikipedia/test/view/Visibility.java
A app/src/main/java/android/support/design/widget/PasswordTextInput.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
D app/src/main/java/org/wikipedia/views/PasswordTextInput.java
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_wiki_login.xml
M app/src/main/res/layout/view_password_text_input.xml
M app/src/main/res/values-af/strings.xml
M app/src/main/res/values-ak/strings.xml
M app/src/main/res/values-ar/strings.xml
M app/src/main/res/values-as/strings.xml
M app/src/main/res/values-ast/strings.xml
M app/src/main/res/values-av/strings.xml
M app/src/main/res/values-azb/strings.xml
M app/src/main/res/values-b+be+tarask/strings.xml
M app/src/main/res/values-b+kk+Cyrl/strings.xml
M app/src/main/res/values-b+tg+Cyrl/strings.xml
M app/src/main/res/values-ba/strings.xml
M app/src/main/res/values-bn/strings.xml
M app/src/main/res/values-br/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-ce/strings.xml
M app/src/main/res/values-ckb/strings.xml
M app/src/main/res/values-cnh/strings.xml
M app/src/main/res/values-cs/strings.xml
M app/src/main/res/values-cu/strings.xml
M app/src/main/res/values-cy/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-diq/strings.xml
M app/src/main/res/values-el/strings.xml
M app/src/main/res/values-eo/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-et/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fa/strings.xml
M app/src/main/res/values-fi/strings.xml
M app/src/main/res/values-fo/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-gu/strings.xml
M app/src/main/res/values-hi/strings.xml
M app/src/main/res/values-hr/strings.xml
M app/src/main/res/values-hu/strings.xml
M app/src/main/res/values-hy/strings.xml
M app/src/main/res/values-ia/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-is/strings.xml
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-iw/strings.xml
M app/src/main/res/values-ja/strings.xml
M app/src/main/res/values-ji/strings.xml
M app/src/main/res/values-jv/strings.xml
M app/src/main/res/values-ka/strings.xml
M app/src/main/res/values-km/strings.xml
M app/src/main/res/values-kn/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-kw/strings.xml
M app/src/main/res/values-ky/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-lt/strings.xml
M app/src/main/res/values-lv/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-ml/strings.xml
M app/src/main/res/values-mn/strings.xml
M app/src/main/res/values-mr/strings.xml
M app/src/main/res/values-ms/strings.xml
M app/src/main/res/values-mt/strings.xml
M app/src/main/res/values-my/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-ne/strings.xml
M app/src/main/res/values-nl/strings.xml
M app/src/main/res/values-oc/strings.xml
M app/src/main/res/values-olo/strings.xml
M app/src/main/res/values-om/strings.xml
M app/src/main/res/values-or/strings.xml
M app/src/main/res/values-pa/strings.xml
M app/src/main/res/values-pl/strings.xml
M app/src/main/res/values-ps/strings.xml
M app/src/main/res/values-pt-rBR/strings.xml
M app/src/main/res/values-pt/strings.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values-ro/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sa/strings.xml
M app/src/main/res/values-sah/strings.xml
M app/src/main/res/values-sd/strings.xml
M app/src/main/res/values-si/strings.xml
M app/src/main/res/values-sk/strings.xml
M app/src/main/res/values-sq/strings.xml
M app/src/main/res/values-sr/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-sw/strings.xml
M app/src/main/res/values-ta/strings.xml
M app/src/main/res/values-tcy/strings.xml
M app/src/main/res/values-te/strings.xml
M app/src/main/res/values-th/strings.xml
M app/src/main/res/values-tl/strings.xml
M app/src/main/res/values-tr/strings.xml
M app/src/main/res/values-uk/strings.xml
M app/src/main/res/values-ur/strings.xml
M app/src/main/res/values-uz/strings.xml
M app/src/main/res/values-vi/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
M app/src/main/res/values/strings.xml
D icon

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Only perform interwiki search with 'simple' searches

2016-11-02 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Only perform interwiki search with 'simple' searches
..

Only perform interwiki search with 'simple' searches

CirrusSearch provides many advanced search syntaxes that can be used.
These vary in computational complexit from very little (intitle) to
rather expensive (insource). To keep advanced functionality from taking
up too much load on the cluster only perform interwiki searches when no
special syntax has been used.

Change-Id: I3fd887fb3fa4e4ad16b12d343bae22bbdd29b4ca
---
M includes/InterwikiSearcher.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/includes/InterwikiSearcher.php b/includes/InterwikiSearcher.php
index ffa237d..b29ee43 100644
--- a/includes/InterwikiSearcher.php
+++ b/includes/InterwikiSearcher.php
@@ -76,6 +76,10 @@
$this->buildFullTextSearch( $term, false );
$context = $this->searchContext;
 
+   if ($context->isSyntaxUsed()) {
+   return null;
+   }
+
$retval = [];
$searches = [];
$resultsTypes = [];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: [WIP] Add configuration value to run interwiki load test

2016-11-02 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: [WIP] Add configuration value to run interwiki load test
..

[WIP] Add configuration value to run interwiki load test

Before we roll out interwiki search we need to know that that impact on
our search cluster will be within acceptable limits. It is possible
there will be strong negative side effects, like pushing hot data out of
memory that now needs to be pulled from disk.

Patch creates a new configuration value that can be set to perform
interwiki queries, but not render their results, for a specified
percentage of full-text search requests to Special:Search. We can slowly
ramp this value from something small to 100% while monitoring the
cluster to safely test our ability to handle the increased load.

A matching patch will be required for the mediawiki-config repository to
both configure wgCirrusSearchInterwikiSources for all wikipedias, along
with settings wgCirrusSearchInterwikiLoadTest = 0.01, or some other
starting value.

Bug: T149740
Change-Id: Idb297c66dd626766a2ec6cb2b75d3c5a2a256afe
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/InterwikiSearcher.php
3 files changed, 65 insertions(+), 5 deletions(-)


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

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 550ddb9..b63752b 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -550,6 +550,18 @@
 // Results are cached.
 $wgCirrusSearchInterwikiSources = [];
 
+/**
+ * Temporary special configuration for load testing the addition of interwiki
+ * search results to a wiki. If this value is null then nothing special
+ * happens, and wgCirrusSearchInterwikiSources is treated as usual. If this is
+ * set to a value between 0 and 1 that is treated as the % of requests to
+ * Special:Search that should use wgCirrusSearchInterwikiSources to make a
+ * query. The results of this query will not be attached to the
+ * SearchResultSet, and will not be displayed to the user. This is to estimate
+ * the effect of adding this additional load onto a search cluster.
+ */
+$wgCirrusSearchInterwikiLoadTest = null;
+
 // How long to cache interwiki search results for (in seconds)
 $wgCirrusSearchInterwikiCacheTime = 7200;
 
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 2ecc29e..410aa5c 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -403,7 +403,8 @@
$highlightingConfig ^= 
FullTextResultsType::HIGHLIGHT_FILE_TEXT;
}
 
-   $searcher->setResultsType( new FullTextResultsType( 
$highlightingConfig, $config ? $config->getWikiCode() : '') );
+   $resultsType = new FullTextResultsType( $highlightingConfig, 
$config ? $config->getWikiCode() : '');
+   $searcher->setResultsType( $resultsType );
$status = $searcher->searchText( $term, $this->showSuggestion );
 
$this->lastSearchMetrics = $searcher->getSearchMetrics();
@@ -429,6 +430,12 @@
$iwSearch->setReturnQuery( $dumpQuery );
$iwSearch->setDumpResult( $dumpResult );
$iwSearch->setReturnExplain( $returnExplain );
+   // This is not strictly true, or even really half true. 
It is a stand
+   // in for the purposes of interwiki load testing using 
the full
+   // search configuration, rather than the limited 
InterwikiResultsType.
+   // InterwikiSearcher will use this or 
InterwikiResultsType depending
+   // on it's needs.
+   $iwSearch->setResultsType( $resultsType );
$interwikiResults = $iwSearch->getInterwikiResults( 
$term );
if ( $interwikiResults !== null ) {
// If we are dumping we need to convert into an 
array that can be appended to
diff --git a/includes/InterwikiSearcher.php b/includes/InterwikiSearcher.php
index b29ee43..722a62c 100644
--- a/includes/InterwikiSearcher.php
+++ b/includes/InterwikiSearcher.php
@@ -37,6 +37,16 @@
private $interwiki;
 
/**
+* @var bool Is the interwiki load test configured?
+*/
+   private $isLoadTest = false;
+
+   /**
+* @var bool Is the interwiki load test enabled?
+*/
+   private $isLoadTestEnabled = false;
+
+   /**
 * Constructor
 * @param Connection $connection
 * @param int[]|null $namespaces Namespace numbers to search, or null 
for all of them
@@ -50,7 +60,24 @@
return $namespace <= 15;
} );
}
-   parent::__construct( $connection, 0, self::MAX_RESULTS, null, 
$namespaces, $user );
+
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mgmt: fix-up grep regex in getmgmtips

2016-11-02 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: mgmt: fix-up grep regex in getmgmtips
..

mgmt: fix-up grep regex in getmgmtips

Change the grep regex to include names with a "-"
dash character in them.

Always delete the tmp files on startup.

Change-Id: Ib4a710e17163f9318d2f367aeb2d762d3a634d85
---
M modules/mgmt/files/getmgmtips
1 file changed, 7 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/319483/1

diff --git a/modules/mgmt/files/getmgmtips b/modules/mgmt/files/getmgmtips
index 1cbc685..4ff9c72 100644
--- a/modules/mgmt/files/getmgmtips
+++ b/modules/mgmt/files/getmgmtips
@@ -14,15 +14,11 @@
 
 echo "getting all mgmt hostnames from DNS templates.."
 
-if [ ! -d  "$tempdir" ]; then
-echo "creating temp dir $tempdir and git cloning DNS repo.."
-mkdir -p $tempdir
-cd $tempdir
-git clone $dnsrepo
-else
-echo "removing $tempdir"
-rm -rf $tempdir
-fi
+rm -rf $tempdir
+echo "creating temp dir $tempdir and git cloning DNS repo.."
+mkdir -p $tempdir
+cd $tempdir
+git clone $dnsrepo
 
 cd ${tempdir}/dns/templates
 
@@ -32,7 +28,8 @@
 fi
 
 echo -e "extracting mgmt hostnames from 10.in-addr.arpa..\n"
-mgmt_hosts=$(grep -oh "\w*.mgmt.\w*.\w*.\w*" 10.in-addr.arpa)
+# mgmt_hosts=$(grep -oh "\w*.mgmt.\w*.\w*.\w*" 10.in-addr.arpa)
+mgmt_hosts=$(grep -o '[a-z].*\.mgmt\.[a-z].*' 10.in-addr.arpa)
 
 touch $resulfile.tmp
 touch $rejectfile.tmp

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4a710e17163f9318d2f367aeb2d762d3a634d85
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]: prometheus: add varnish_exporter to all varnishes

2016-11-02 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: prometheus: add varnish_exporter to all varnishes
..


prometheus: add varnish_exporter to all varnishes

Bug: T147424
Change-Id: I69dd07393b05eb51a8124a700e7b434f93176464
---
M manifests/site.pp
M modules/role/manifests/cache/base.pp
2 files changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 22183a9..ec93766 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -309,12 +309,12 @@
 
 node /^cp10(45|5[18]|61)\.eqiad\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec, prometheus::varnish_exporter)
+role(cache::misc, ipsec)
 }
 
 node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet', 
'cp1060.eqiad.wmnet' {
 interface::add_ip6_mapped { 'main': }
-role(cache::maps, ipsec, prometheus::varnish_exporter)
+role(cache::maps, ipsec)
 }
 
 node /^cp10(4[89]|50|6[234]|7[1-4]|99)\.eqiad\.wmnet$/ {
@@ -339,22 +339,22 @@
 
 node /^cp20(0[39]|15|21)\.codfw\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::maps, ipsec, prometheus::varnish_exporter)
+role(cache::maps, ipsec)
 }
 
 node /^cp20(06|1[28]|25)\.codfw\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec, prometheus::varnish_exporter)
+role(cache::misc, ipsec)
 }
 
 node /^cp300[3-6]\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::maps, ipsec, prometheus::varnish_exporter)
+role(cache::maps, ipsec)
 }
 
 node /^cp30(0[789]|10)\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec, prometheus::varnish_exporter)
+role(cache::misc, ipsec)
 }
 
 node /^cp301[1-4]\.esams\.wmnet$/ {
@@ -392,7 +392,7 @@
 
 node /^cp400[1-4]\.ulsfo\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec, prometheus::varnish_exporter)
+role(cache::misc, ipsec)
 }
 
 node /^cp40(0[5-7]|1[3-5])\.ulsfo\.wmnet$/ {
@@ -407,7 +407,7 @@
 
 node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role(cache::maps, ipsec, prometheus::varnish_exporter)
+role(cache::maps, ipsec)
 }
 
 node 'darmstadtium.eqiad.wmnet' {
diff --git a/modules/role/manifests/cache/base.pp 
b/modules/role/manifests/cache/base.pp
index c6f127f..8b259f7 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -9,6 +9,7 @@
 include lvs::configuration
 include network::constants
 include conftool::scripts
+include ::role::prometheus::varnish_exporter
 
 $cache_cluster = hiera('cache::cluster')
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69dd07393b05eb51a8124a700e7b434f93176464
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix translateRange bug that expands selections

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix translateRange bug that expands selections
..


Fix translateRange bug that expands selections

Change-Id: Ib93e88afe8a4be61fa3306db87d6f51f6f495198
---
M src/dm/selections/ve.dm.LinearSelection.js
M src/dm/selections/ve.dm.NullSelection.js
M src/dm/selections/ve.dm.TableSelection.js
M src/dm/ve.dm.Selection.js
M src/dm/ve.dm.Surface.js
M src/dm/ve.dm.Transaction.js
M tests/dm/ve.dm.Document.test.js
M tests/dm/ve.dm.Surface.test.js
8 files changed, 145 insertions(+), 9 deletions(-)

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



diff --git a/src/dm/selections/ve.dm.LinearSelection.js 
b/src/dm/selections/ve.dm.LinearSelection.js
index 2d795b2..79e3e87 100644
--- a/src/dm/selections/ve.dm.LinearSelection.js
+++ b/src/dm/selections/ve.dm.LinearSelection.js
@@ -106,6 +106,13 @@
 /**
  * @inheritdoc
  */
+ve.dm.LinearSelection.prototype.translateByTransactionWithAuthor = function ( 
tx, author ) {
+   return new this.constructor( this.getDocument(), 
tx.translateRangeWithAuthor( this.getRange(), author ) );
+};
+
+/**
+ * @inheritdoc
+ */
 ve.dm.LinearSelection.prototype.getRanges = function () {
return [ this.range ];
 };
@@ -130,9 +137,12 @@
  * @inheritdoc
  */
 ve.dm.LinearSelection.prototype.equals = function ( other ) {
-   return other instanceof ve.dm.LinearSelection &&
+   return this === other || (
+   !!other &&
+   other.constructor === this.constructor &&
this.getDocument() === other.getDocument() &&
-   this.getRange().equals( other.getRange() );
+   this.getRange().equals( other.getRange() )
+   );
 };
 
 /* Registration */
diff --git a/src/dm/selections/ve.dm.NullSelection.js 
b/src/dm/selections/ve.dm.NullSelection.js
index a099620..9a23ecc 100644
--- a/src/dm/selections/ve.dm.NullSelection.js
+++ b/src/dm/selections/ve.dm.NullSelection.js
@@ -74,6 +74,8 @@
 
 ve.dm.NullSelection.prototype.translateByTransaction = 
ve.dm.NullSelection.prototype.clone;
 
+ve.dm.NullSelection.prototype.translateByTransactionWithAuthor = 
ve.dm.NullSelection.prototype.clone;
+
 /**
  * @inheritdoc
  */
@@ -92,8 +94,11 @@
  * @inheritdoc
  */
 ve.dm.NullSelection.prototype.equals = function ( other ) {
-   return other instanceof ve.dm.NullSelection &&
-   this.getDocument() === other.getDocument();
+   return this === other || (
+   !!other &&
+   other.constructor === this.constructor &&
+   this.getDocument() === other.getDocument()
+   );
 };
 
 /**
diff --git a/src/dm/selections/ve.dm.TableSelection.js 
b/src/dm/selections/ve.dm.TableSelection.js
index def74f1..f4f39ee 100644
--- a/src/dm/selections/ve.dm.TableSelection.js
+++ b/src/dm/selections/ve.dm.TableSelection.js
@@ -112,7 +112,14 @@
  * @inheritdoc
  */
 ve.dm.TableSelection.prototype.clone = function () {
-   return new this.constructor( this.getDocument(), this.tableRange, 
this.fromCol, this.fromRow, this.toCol, this.toRow );
+   return new this.constructor(
+   this.getDocument(),
+   this.tableRange,
+   this.fromCol,
+   this.fromRow,
+   this.toCol,
+   this.toRow
+   );
 };
 
 /**
@@ -303,6 +310,21 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.dm.TableSelection.prototype.translateByTransactionWithAuthor = function ( 
tx, author ) {
+   var newRange = tx.translateRangeWithAuthor( this.tableRange, author );
+
+   if ( newRange.isCollapsed() ) {
+   return new ve.dm.NullSelection( this.getDocument() );
+   }
+   return new this.constructor(
+   this.getDocument(), newRange,
+   this.fromCol, this.fromRow, this.toCol, this.toRow
+   );
+};
+
+/**
  * Check if the selection spans a single cell
  *
  * @return {boolean} The selection spans a single cell
@@ -464,13 +486,16 @@
  * @inheritdoc
  */
 ve.dm.TableSelection.prototype.equals = function ( other ) {
-   return other instanceof ve.dm.TableSelection &&
+   return this === other || (
+   !!other &&
+   other.constructor === this.constructor &&
this.getDocument() === other.getDocument() &&
this.tableRange.equals( other.tableRange ) &&
this.fromCol === other.fromCol &&
this.fromRow === other.fromRow &&
this.toCol === other.toCol &&
-   this.toRow === other.toRow;
+   this.toRow === other.toRow
+   );
 };
 
 /**
diff --git a/src/dm/ve.dm.Selection.js b/src/dm/ve.dm.Selection.js
index dc80892..e2bf78b 100644
--- a/src/dm/ve.dm.Selection.js
+++ b/src/dm/ve.dm.Selection.js
@@ -57,6 +57,11 @@
 /* Methods */
 
 /**
+ * Test for selection equality
+ */
+ve.dm.Selection.prototype.equals = null;
+
+/**
  * Get a JSON ser

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Follow-up Id0021594: Remove extra code for redlink suggestions

2016-11-02 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up Id0021594: Remove extra code for redlink suggestions
..

Follow-up Id0021594: Remove extra code for redlink suggestions

We do a second query now instead which handles this by itself.

Move the description stuff to be generic for all redlinks

Bug: T149130
Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
(cherry picked from commit c2824fbb52c6210a4c4c5919e12782d455cdfce2)
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 7 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/319482/1

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 222586f..7ca19df 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -30,7 +30,6 @@
 * @cfg {boolean} [relative=true] If a namespace is set, display titles 
relative to it
 * @cfg {boolean} [suggestions=true] Display search suggestions
 * @cfg {boolean} [showRedirectTargets=true] Show the targets of 
redirects
-* @cfg {boolean} [showRedlink] Show red link to exact match if it 
doesn't exist
 * @cfg {boolean} [showImages] Show page images
 * @cfg {boolean} [showDescriptions] Show page descriptions
 * @cfg {boolean} [excludeCurrentPage] Exclude the current page from 
suggestions
@@ -52,7 +51,6 @@
this.relative = config.relative !== undefined ? config.relative 
: true;
this.suggestions = config.suggestions !== undefined ? 
config.suggestions : true;
this.showRedirectTargets = config.showRedirectTargets !== false;
-   this.showRedlink = !!config.showRedlink;
this.showImages = !!config.showImages;
this.showDescriptions = !!config.showDescriptions;
this.excludeCurrentPage = !!config.excludeCurrentPage;
@@ -246,13 +244,6 @@
)
);
 
-   if ( !pageExists ) {
-   pageData[ this.getQueryValue() ] = {
-   missing: true, known: false, redirect: false, 
disambiguation: false,
-   description: mw.msg( 
'mw-widgets-titleinput-description-new-page' )
-   };
-   }
-
if ( this.cache ) {
this.cache.set( pageData );
}
@@ -261,10 +252,7 @@
if ( pageExists && !pageExistsExact ) {
titles.unshift( this.getQueryValue() );
}
-   // Offer the exact text as a new page if the title is valid
-   if ( this.showRedlink && !pageExists && titleObj ) {
-   titles.push( this.getQueryValue() );
-   }
+
for ( i = 0, len = titles.length; i < len; i++ ) {
page = pageData[ titles[ i ] ] || {};
items.push( new mw.widgets.TitleOptionWidget( 
this.getOptionWidgetData( titles[ i ], page ) ) );
@@ -281,14 +269,18 @@
 * @return {Object} Data for option widget
 */
mw.widgets.TitleWidget.prototype.getOptionWidgetData = function ( 
title, data ) {
-   var mwTitle = new mw.Title( title );
+   var mwTitle = new mw.Title( title ),
+   description = data.description;
+   if ( data.missing && !description ) {
+   description = mw.msg( 
'mw-widgets-titleinput-description-new-page' );
+   }
return {
data: this.namespace !== null && this.relative
? mwTitle.getRelativeText( this.namespace )
: title,
url: mwTitle.getUrl(),
imageUrl: this.showImages ? data.imageUrl : null,
-   description: this.showDescriptions ? data.description : 
null,
+   description: this.showDescriptions ? description : null,
missing: data.missing,
redirect: data.redirect,
disambiguation: data.disambiguation,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.1]: Follow-up Id0021594: Remove extra code for redlink suggestions

2016-11-02 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up Id0021594: Remove extra code for redlink suggestions
..

Follow-up Id0021594: Remove extra code for redlink suggestions

We do a second query now instead which handles this by itself.

Move the description stuff to be generic for all redlinks

Bug: T149130
Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
(cherry picked from commit c2824fbb52c6210a4c4c5919e12782d455cdfce2)
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 7 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/319481/1

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 222586f..7ca19df 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -30,7 +30,6 @@
 * @cfg {boolean} [relative=true] If a namespace is set, display titles 
relative to it
 * @cfg {boolean} [suggestions=true] Display search suggestions
 * @cfg {boolean} [showRedirectTargets=true] Show the targets of 
redirects
-* @cfg {boolean} [showRedlink] Show red link to exact match if it 
doesn't exist
 * @cfg {boolean} [showImages] Show page images
 * @cfg {boolean} [showDescriptions] Show page descriptions
 * @cfg {boolean} [excludeCurrentPage] Exclude the current page from 
suggestions
@@ -52,7 +51,6 @@
this.relative = config.relative !== undefined ? config.relative 
: true;
this.suggestions = config.suggestions !== undefined ? 
config.suggestions : true;
this.showRedirectTargets = config.showRedirectTargets !== false;
-   this.showRedlink = !!config.showRedlink;
this.showImages = !!config.showImages;
this.showDescriptions = !!config.showDescriptions;
this.excludeCurrentPage = !!config.excludeCurrentPage;
@@ -246,13 +244,6 @@
)
);
 
-   if ( !pageExists ) {
-   pageData[ this.getQueryValue() ] = {
-   missing: true, known: false, redirect: false, 
disambiguation: false,
-   description: mw.msg( 
'mw-widgets-titleinput-description-new-page' )
-   };
-   }
-
if ( this.cache ) {
this.cache.set( pageData );
}
@@ -261,10 +252,7 @@
if ( pageExists && !pageExistsExact ) {
titles.unshift( this.getQueryValue() );
}
-   // Offer the exact text as a new page if the title is valid
-   if ( this.showRedlink && !pageExists && titleObj ) {
-   titles.push( this.getQueryValue() );
-   }
+
for ( i = 0, len = titles.length; i < len; i++ ) {
page = pageData[ titles[ i ] ] || {};
items.push( new mw.widgets.TitleOptionWidget( 
this.getOptionWidgetData( titles[ i ], page ) ) );
@@ -281,14 +269,18 @@
 * @return {Object} Data for option widget
 */
mw.widgets.TitleWidget.prototype.getOptionWidgetData = function ( 
title, data ) {
-   var mwTitle = new mw.Title( title );
+   var mwTitle = new mw.Title( title ),
+   description = data.description;
+   if ( data.missing && !description ) {
+   description = mw.msg( 
'mw-widgets-titleinput-description-new-page' );
+   }
return {
data: this.namespace !== null && this.relative
? mwTitle.getRelativeText( this.namespace )
: title,
url: mwTitle.getUrl(),
imageUrl: this.showImages ? data.imageUrl : null,
-   description: this.showDescriptions ? data.description : 
null,
+   description: this.showDescriptions ? description : null,
missing: data.missing,
redirect: data.redirect,
disambiguation: data.disambiguation,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: roles: Kill the 'notebook' roles

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: roles: Kill the 'notebook' roles
..


roles: Kill the 'notebook' roles

Is in paws_internal now

Change-Id: Idd577034a634c5c8049149d0d14c5efe401f5b81
---
D modules/role/manifests/notebook/server.pp
M modules/role/manifests/paws_internal/jupyterhub.pp
2 files changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/modules/role/manifests/notebook/server.pp 
b/modules/role/manifests/notebook/server.pp
deleted file mode 100644
index dd27064..000
--- a/modules/role/manifests/notebook/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# stub role for experimental notebook servers
-class role::notebook::server {
-
-include base::firewall
-}
diff --git a/modules/role/manifests/paws_internal/jupyterhub.pp 
b/modules/role/manifests/paws_internal/jupyterhub.pp
index 8de8687..2841a3a 100644
--- a/modules/role/manifests/paws_internal/jupyterhub.pp
+++ b/modules/role/manifests/paws_internal/jupyterhub.pp
@@ -4,6 +4,8 @@
 # See https://wikitech.wikimedia.org/wiki/PAWS/Internal for more info
 class role::paws_internal::jupyterhub {
 
+include ::base::firewall
+
 class { '::jupyterhub':
 base_path   => '/srv/paws-internal',
 wheels_repo => 'operations/wheels/paws-internal',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd577034a634c5c8049149d0d14c5efe401f5b81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: paws_internal: Provision research users on notebook node

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: paws_internal: Provision research users on notebook node
..


paws_internal: Provision research users on notebook node

Bug: T149543
Change-Id: I36c4e6cfabfe005e595426eb5e100a939d06554f
---
M hieradata/role/common/paws_internal/jupyterhub.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml 
b/hieradata/role/common/paws_internal/jupyterhub.yaml
index 4ae3c30..f1b03cc 100644
--- a/hieradata/role/common/paws_internal/jupyterhub.yaml
+++ b/hieradata/role/common/paws_internal/jupyterhub.yaml
@@ -1,5 +1,6 @@
 admin::groups:
   - notebook-roots
+  - researchers
 
 debdeploy::grains:
   debdeploy-notebook:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36c4e6cfabfe005e595426eb5e100a939d06554f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fill in missing city and state from US zip code

2016-11-02 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Fill in missing city and state from US zip code
..

Fill in missing city and state from US zip code

Bug: T86239
Change-Id: Iea001290d30059c94e63e5179a0e489ccfe5c8ae
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/80/319480/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 21bfae5..4bfced4 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2720,9 +2720,11 @@
$address['country_id'] == $usId &&
!empty( $address['postal_code'] )
) {
-   $sql = 'SELECT latitude, longitude, timezone
-   FROM wmf_zip_geo
-   WHERE zip = %1';
+   $sql = "SELECT city, s.id AS state_id, 
latitude, longitude, timezone
+   FROM wmf_zip_geo g
+   JOIN civicrm_state_province s ON 
s.abbreviation = g.state
+   AND s.country_id = $usId
+   WHERE zip = %1";
 
$result = CRM_Core_DAO::executeQuery(
$sql,
@@ -2737,6 +2739,13 @@
'geo_code_2' => 
$result->longitude,
'timezone' => $result->timezone,
);
+   // Only overwrite city and state if 
empty
+   if ( empty( $address['city'] ) ) {
+   $geoData['city'] = 
$result->city;
+   }
+   if ( $address['state_province_id'] == 
'null' ) {
+   $geoData['state_province_id'] = 
$result->state_id;
+   }
}
}
if ( empty( $geoData ) && $op == 'edit' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea001290d30059c94e63e5179a0e489ccfe5c8ae
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] operations/puppet[production]: paws_internal: Provision research users on notebook node

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: paws_internal: Provision research users on notebook node
..

paws_internal: Provision research users on notebook node

Bug: T149543
Change-Id: I36c4e6cfabfe005e595426eb5e100a939d06554f
---
M hieradata/role/common/paws_internal/jupyterhub.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/319479/1

diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml 
b/hieradata/role/common/paws_internal/jupyterhub.yaml
index 4ae3c30..f1b03cc 100644
--- a/hieradata/role/common/paws_internal/jupyterhub.yaml
+++ b/hieradata/role/common/paws_internal/jupyterhub.yaml
@@ -1,5 +1,6 @@
 admin::groups:
   - notebook-roots
+  - researchers
 
 debdeploy::grains:
   debdeploy-notebook:

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

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

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

[MediaWiki-commits] [Gerrit] operations...hhvm_exporter[master]: Initial commit

2016-11-02 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: Initial commit
..

Initial commit

Change-Id: Ia156b8b057d04e7b0beedbbfe313c018d1b80477
---
A .gitignore
A LICENSE
A README.md
A hhvm_exporter.py
A setup.py
5 files changed, 451 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/hhvm_exporter 
refs/changes/77/319477/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..200f339
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+__pycache__/
+hhvm_exporter.egg-info/
+.venv/
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: paws_internal: Add mysql reseach creds to notebook1001

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: paws_internal: Add mysql reseach creds to notebook1001
..


paws_internal: Add mysql reseach creds to notebook1001

Bug: T149543
Change-Id: I76b37074668ec5740a4f356a7e0c7dcb232666da
---
M manifests/site.pp
A modules/role/manifests/paws_internal/mysql_access.pp
2 files changed, 16 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 822535f..22183a9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2247,8 +2247,15 @@
 }
 
 # Experimental Jupyter notebook servers
-node /^notebook100[12]\.eqiad\.wmnet$/ {
-role(notebook::server, paws_internal::jupyterhub, 
analytics_cluster::client)
+node 'notebook1001.eqiad.wmnet' {
+# Equivalent of stat1003
+role(paws_internal::jupyterhub, paws_internal::mysql_access)
+
+include standard
+}
+node 'notebook1002.eqiad.wmnet' {
+# Equivalent to stat1002
+role(paws_internal::jupyterhub, analytics_cluster::client)
 include standard
 }
 
diff --git a/modules/role/manifests/paws_internal/mysql_access.pp 
b/modules/role/manifests/paws_internal/mysql_access.pp
new file mode 100644
index 000..254780c
--- /dev/null
+++ b/modules/role/manifests/paws_internal/mysql_access.pp
@@ -0,0 +1,7 @@
+# = Class role::paws_internal::mysql_access
+# Setup MySQL access to research dbs from paws_internal
+class role::paws_internal::mysql_access {
+statistics::mysql_credentials { 'research':
+group => 'researchers',
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76b37074668ec5740a4f356a7e0c7dcb232666da
Gerrit-PatchSet: 3
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] operations/puppet[production]: roles: Kill the 'notebook' roles

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: roles: Kill the 'notebook' roles
..

roles: Kill the 'notebook' roles

Is in paws_internal now

Change-Id: Idd577034a634c5c8049149d0d14c5efe401f5b81
---
D modules/role/manifests/notebook/server.pp
M modules/role/manifests/paws_internal/jupyterhub.pp
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/319476/1

diff --git a/modules/role/manifests/notebook/server.pp 
b/modules/role/manifests/notebook/server.pp
deleted file mode 100644
index dd27064..000
--- a/modules/role/manifests/notebook/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# stub role for experimental notebook servers
-class role::notebook::server {
-
-include base::firewall
-}
diff --git a/modules/role/manifests/paws_internal/jupyterhub.pp 
b/modules/role/manifests/paws_internal/jupyterhub.pp
index 8de8687..2841a3a 100644
--- a/modules/role/manifests/paws_internal/jupyterhub.pp
+++ b/modules/role/manifests/paws_internal/jupyterhub.pp
@@ -4,6 +4,8 @@
 # See https://wikitech.wikimedia.org/wiki/PAWS/Internal for more info
 class role::paws_internal::jupyterhub {
 
+include ::base::firewall
+
 class { '::jupyterhub':
 base_path   => '/srv/paws-internal',
 wheels_repo => 'operations/wheels/paws-internal',

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable maps snapshots on cawiki, hewiki, mkwiki

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Enable maps snapshots on cawiki, hewiki, mkwiki
..


Enable maps snapshots on cawiki, hewiki, mkwiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7135da4..7b2fa8d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17606,6 +17606,9 @@
 'wgKartographerStaticMapframe' => [
'default' => false,
'mediawikiwiki' => true,
+   'cawiki' => true,
+   'hewiki' => true,
+   'mkwiki' => true,
'testwiki' => true,
'test2wiki' => true,
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I968abbf0d43b5edcfa00cda8d3c1df420e4b211e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Florianschmidtwelzow 
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] apps...wikipedia[master]: Hygiene: Don't keep an Activity in DisambigList and IssuesList.

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Don't keep an Activity in DisambigList and IssuesList.
..


Hygiene: Don't keep an Activity in DisambigList and IssuesList.

Change-Id: I983700722a028703c16250f36a95eb01643e46a9
---
M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M app/src/main/java/org/wikipedia/page/IssuesListAdapter.java
2 files changed, 11 insertions(+), 26 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java 
b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
index aaf1c96..cfdc288 100644
--- a/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
+++ b/app/src/main/java/org/wikipedia/page/DisambigListAdapter.java
@@ -1,6 +1,6 @@
 package org.wikipedia.page;
 
-import android.app.Activity;
+import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v4.util.LruCache;
 import android.view.LayoutInflater;
@@ -31,19 +31,12 @@
 class DisambigListAdapter extends ArrayAdapter {
 private static final int MAX_CACHE_SIZE_IMAGES = 24;
 @NonNull private final LruCache pageImagesCache = new 
LruCache<>(MAX_CACHE_SIZE_IMAGES);
-private final Activity activity;
 private final DisambigResult[] items;
 private final WikipediaApp app;
 private final WikiSite wiki;
 
-/**
- * Constructor
- * @param activity The current activity.
- * @param items The objects to represent in the ListView.
- */
-DisambigListAdapter(Activity activity, DisambigResult[] items) {
-super(activity, 0, items);
-this.activity = activity;
+DisambigListAdapter(@NonNull Context context, @NonNull DisambigResult[] 
items) {
+super(context, 0, items);
 this.items = items;
 app = (WikipediaApp) getContext().getApplicationContext();
 wiki = app.getWikiSite();
@@ -118,9 +111,8 @@
 private TextView description;
 }
 
-@Override
-public View getView(int position, View convertView, ViewGroup parent) {
-LayoutInflater inflater = activity.getLayoutInflater();
+@Override @NonNull public View getView(int position, View convertView, 
@NonNull ViewGroup parent) {
+LayoutInflater inflater = LayoutInflater.from(parent.getContext());
 ViewHolder holder;
 if (convertView == null) {
 convertView = inflater.inflate(R.layout.item_page_list_entry, 
null);
diff --git a/app/src/main/java/org/wikipedia/page/IssuesListAdapter.java 
b/app/src/main/java/org/wikipedia/page/IssuesListAdapter.java
index 6ef8d73..2b7f10b 100644
--- a/app/src/main/java/org/wikipedia/page/IssuesListAdapter.java
+++ b/app/src/main/java/org/wikipedia/page/IssuesListAdapter.java
@@ -1,6 +1,7 @@
 package org.wikipedia.page;
 
-import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,19 +18,12 @@
 class IssuesListAdapter extends ArrayAdapter {
 private static final String SEPARATOR = "(";
 private static final String SEPARATOR_END = ")";
-private final Activity activity;
 private final String[] items;
 
 private ViewHolder holder;
 
-/**
- * Constructor
- * @param activity The current activity.
- * @param items The objects to represent in the ListView.
- */
-IssuesListAdapter(Activity activity, String[] items) {
-super(activity, 0, items);
-this.activity = activity;
+IssuesListAdapter(@NonNull Context context, @NonNull String[] items) {
+super(context, 0, items);
 this.items = items;
 }
 
@@ -44,9 +38,8 @@
 return false; // don't make it appear clickable
 }
 
-@Override
-public View getView(int position, View convertView, ViewGroup parent) {
-LayoutInflater inflater = activity.getLayoutInflater();
+@Override @NonNull public View getView(int position, View convertView, 
@NonNull ViewGroup parent) {
+LayoutInflater inflater = LayoutInflater.from(parent.getContext());
 if (convertView == null) {
 convertView = inflater.inflate(R.layout.item_issue, null);
 holder = new ViewHolder();

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

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

___
MediaWiki-commits mailing list
MediaWiki-c

[MediaWiki-commits] [Gerrit] operations/puppet[production]: paws_internal: Add mysql reseach creds to notebook1001

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: paws_internal: Add mysql reseach creds to notebook1001
..

paws_internal: Add mysql reseach creds to notebook1001

Bug: T149543
Change-Id: I76b37074668ec5740a4f356a7e0c7dcb232666da
---
M manifests/site.pp
A modules/role/manifests/paws_internal/mysql_access.pp
2 files changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/319475/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6d8fbca..81f2dd2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2246,8 +2246,15 @@
 }
 
 # Experimental Jupyter notebook servers
-node /^notebook100[12]\.eqiad\.wmnet$/ {
-role(notebook::server, paws_internal::jupyterhub, 
analytics_cluster::client)
+node 'notebook1001.eqiad.wmnet' {
+# Equivalent of stat1003
+role(paws_internal::jupyterhub, paws_internal::mysql_access)
+
+include standard
+}
+node 'notebook1002.eqiad.wmnet' {
+# Equivalent to stat1002
+role(paws_internal::jupyterhub, analytics_cluster::client)
 include standard
 }
 
diff --git a/modules/role/manifests/paws_internal/mysql_access.pp 
b/modules/role/manifests/paws_internal/mysql_access.pp
new file mode 100644
index 000..0bb0c71
--- /dev/null
+++ b/modules/role/manifests/paws_internal/mysql_access.pp
@@ -0,0 +1,5 @@
+class role::paws_internal::mysql_access {
+statistics::mysql_credentials { 'research':
+group => 'researchers',
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: network::constants: remove /64 from icinga hosts

2016-11-02 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: network::constants: remove /64 from icinga hosts
..


network::constants: remove /64 from icinga hosts

These shouldn't have netmask suffixes here (nothing else does),
and it was breaking NTP configs as well.

Change-Id: I67506afba05292a30ebddd515f9db9b8dccfccd7
---
M modules/network/manifests/constants.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index 921df04..d777f88 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -46,9 +46,9 @@
 '208.80.154.14',# neon.wikimedia.org
 '2620:0:861:1:208:80:154:14',   # neon.wikimedia.org
 '208.80.153.74',# tegmen.wikimedia.org
-'2620:0:860:3:208:80:153:74/64',# tegmen.wikimedia.org
+'2620:0:860:3:208:80:153:74',   # tegmen.wikimedia.org
 '208.80.155.119',   # 
einsteinium.wikimedia.org
-'2620:0:860:3:208:80:155:119/64',   # 
einsteinium.wikimedia.org
+'2620:0:860:3:208:80:155:119',  # 
einsteinium.wikimedia.org
 '208.80.154.53',# 
uranium.wikimedia.org (ganglia, gmetad needs it)
 '2620:0:861:1:208:80:154:53',   # uranium.wikimedia.org
 ],
@@ -88,9 +88,9 @@
 '208.80.154.14',# neon.wikimedia.org
 '2620:0:861:1:208:80:154:14',   # neon.wikimedia.org
 '208.80.153.74',# tegmen.wikimedia.org
-'2620:0:860:3:208:80:153:74/64',# tegmen.wikimedia.org
+'2620:0:860:3:208:80:153:74',   # tegmen.wikimedia.org
 '208.80.155.119',   # 
einsteinium.wikimedia.org
-'2620:0:860:3:208:80:155:119/64',   # 
einsteinium.wikimedia.org
+'2620:0:860:3:208:80:155:119',  # 
einsteinium.wikimedia.org
 '208.80.154.53',# 
uranium.wikimedia.org (ganglia, gmetad needs it)
 '2620:0:861:1:208:80:154:53',   # uranium.wikimedia.org
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67506afba05292a30ebddd515f9db9b8dccfccd7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Fix Puppet lint errors that crept in somehow

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix Puppet lint errors that crept in somehow
..


Fix Puppet lint errors that crept in somehow

Change-Id: I0e93500226e5e181220664dd875f7f9d6915238b
---
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/role/manifests/cirrussearch.pp
M puppet/modules/smashpig/manifests/init.pp
3 files changed, 20 insertions(+), 20 deletions(-)

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



diff --git a/puppet/modules/payments/manifests/donation_interface.pp 
b/puppet/modules/payments/manifests/donation_interface.pp
index e0a5ed1..b48eef2 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -19,9 +19,9 @@
   wgDonationInterfaceEnableReferrerFilter   => true,
   wgDonationInterfaceEnableSourceFilter => true,
 
-  wgDonationInterfaceTest  => true,
+  wgDonationInterfaceTest   => true,
 
-  wgAdyenGatewayAccountInfo=> {
+  wgAdyenGatewayAccountInfo => {
 'test' => {
   'AccountName'  => 'test',
   'SkinCode' => 'test',
@@ -29,27 +29,27 @@
   'PublicKey'=> 'test',
 },
   },
-  wgDonationInterfaceAdyenPublicKey=> 
'10001|9C916360EC9BD4530A9BCF8367069EDD88E48E0569310B8653452723372B1635035E3DE63D1EF882D17918E0E6EA73D8248815C2D95E8D2EAE6F65A0D8359E903AB84024A3230F6A05797C9116FA0264FCD00E5ED3A2BC0FA897E74DAA4496337318507659EF5D03974D92204C9464C197B1E11FA7814442751EA069EFC2E470A9E82A8E621D899A02C4173B4019F74F16A59B22336421639BAC1513644EEE47298CCBAA681C1E8F0B00B0BC18638BA7FEA22FC394972ACE4BD7038E866CF3FFBF20FB860669137083EE73DD53DE5934ADC6378B9',
+  wgDonationInterfaceAdyenPublicKey => 
'10001|9C916360EC9BD4530A9BCF8367069EDD88E48E0569310B8653452723372B1635035E3DE63D1EF882D17918E0E6EA73D8248815C2D95E8D2EAE6F65A0D8359E903AB84024A3230F6A05797C9116FA0264FCD00E5ED3A2BC0FA897E74DAA4496337318507659EF5D03974D92204C9464C197B1E11FA7814442751EA069EFC2E470A9E82A8E621D899A02C4173B4019F74F16A59B22336421639BAC1513644EEE47298CCBAA681C1E8F0B00B0BC18638BA7FEA22FC394972ACE4BD7038E866CF3FFBF20FB860669137083EE73DD53DE5934ADC6378B9',
 
-  wgGlobalCollectGatewayAccountInfo=> {
+  wgGlobalCollectGatewayAccountInfo => {
 'test' => {
   'MerchantID' => 'test'
 }
   },
 
-  wgPaypalGatewayURL   => 
'https://www.sandbox.paypal.com/cgi-bin/webscr',
+  wgPaypalGatewayURL=> 
'https://www.sandbox.paypal.com/cgi-bin/webscr',
 
-  wgDonationInterfaceMemcacheHost  => 'localhost',
+  wgDonationInterfaceMemcacheHost   => 'localhost',
 
-  wgDonationInterfaceUseSyslog => true,
+  wgDonationInterfaceUseSyslog  => true,
 
-  wgDonationInterfaceDefaultQueueServer=> {
+  wgDonationInterfaceDefaultQueueServer => {
 'type'   => 'PHPQueue\Backend\Stomp',
 'uri'=> 'tcp://localhost:61613',
 'persistent' => 1
   },
 
-  wgDonationInterfaceQueues=> {
+  wgDonationInterfaceQueues => {
 'globalcollect-cc-limbo' => {
   'type'  => 'PHPQueue\Backend\Predis',
   'servers'   => 'tcp://localhost',
@@ -67,29 +67,29 @@
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
-'banner-history' => {
+'banner-history' => {
   'type'=> 'PHPQueue\Backend\Predis',
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
-'payments-antifraud' => {
+'payments-antifraud' => {
   'type'=> 'PHPQueue\Backend\Predis',
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
-'payments-init'  => {
+'payments-init'  => {
   'type'=> 'PHPQueue\Backend\Predis',
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
   },
 
-  wgDonationInterfaceQueueMirrors  => {
+  wgDonationInterfaceQueueMirrors   => {
 'globalcollect-cc-limbo' => 'pending',
 'complete'   => 'complete-new',
   },
 
-  wgDonationInterfaceOrphanCron=> {
+  wgDonationInterfaceOrphanCron => {
 'enable'   => true,
 'max_per_execute'  => '',
 'override_command_line_params' => true,
diff --git a/puppet/modules/role/manifests/cirrussearch.pp 
b/puppet/modules/role/manifests/cirrussearch.pp
index 57cb7db..a7dfae2 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -30,19 +30,19 @@
 # Not enabled o

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix splice typo

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix splice typo
..


Fix splice typo

Bug: T149537
Bug: T149528
Change-Id: If8d137aeaf4e0097ca4643feaeed381ded65d51b
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index cb88dee..b22a64e 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -313,7 +313,7 @@
insertIndex = newPreviousNodeRange.from - 
nodeRange.from;
}
// Splice in the subnode's annotated data just after 
the new node's open tag
-   ve.batchSplice( nodeData, 0, insertIndex, outerNodeData 
);
+   ve.batchSplice( nodeData, insertIndex, 0, outerNodeData 
);
}
 
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8d137aeaf4e0097ca4643feaeed381ded65d51b
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Fix Puppet lint errors that crept in somehow

2016-11-02 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Fix Puppet lint errors that crept in somehow
..

Fix Puppet lint errors that crept in somehow

Change-Id: I0e93500226e5e181220664dd875f7f9d6915238b
---
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/role/manifests/cirrussearch.pp
M puppet/modules/smashpig/manifests/init.pp
3 files changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/73/319473/1

diff --git a/puppet/modules/payments/manifests/donation_interface.pp 
b/puppet/modules/payments/manifests/donation_interface.pp
index e0a5ed1..b48eef2 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -19,9 +19,9 @@
   wgDonationInterfaceEnableReferrerFilter   => true,
   wgDonationInterfaceEnableSourceFilter => true,
 
-  wgDonationInterfaceTest  => true,
+  wgDonationInterfaceTest   => true,
 
-  wgAdyenGatewayAccountInfo=> {
+  wgAdyenGatewayAccountInfo => {
 'test' => {
   'AccountName'  => 'test',
   'SkinCode' => 'test',
@@ -29,27 +29,27 @@
   'PublicKey'=> 'test',
 },
   },
-  wgDonationInterfaceAdyenPublicKey=> 
'10001|9C916360EC9BD4530A9BCF8367069EDD88E48E0569310B8653452723372B1635035E3DE63D1EF882D17918E0E6EA73D8248815C2D95E8D2EAE6F65A0D8359E903AB84024A3230F6A05797C9116FA0264FCD00E5ED3A2BC0FA897E74DAA4496337318507659EF5D03974D92204C9464C197B1E11FA7814442751EA069EFC2E470A9E82A8E621D899A02C4173B4019F74F16A59B22336421639BAC1513644EEE47298CCBAA681C1E8F0B00B0BC18638BA7FEA22FC394972ACE4BD7038E866CF3FFBF20FB860669137083EE73DD53DE5934ADC6378B9',
+  wgDonationInterfaceAdyenPublicKey => 
'10001|9C916360EC9BD4530A9BCF8367069EDD88E48E0569310B8653452723372B1635035E3DE63D1EF882D17918E0E6EA73D8248815C2D95E8D2EAE6F65A0D8359E903AB84024A3230F6A05797C9116FA0264FCD00E5ED3A2BC0FA897E74DAA4496337318507659EF5D03974D92204C9464C197B1E11FA7814442751EA069EFC2E470A9E82A8E621D899A02C4173B4019F74F16A59B22336421639BAC1513644EEE47298CCBAA681C1E8F0B00B0BC18638BA7FEA22FC394972ACE4BD7038E866CF3FFBF20FB860669137083EE73DD53DE5934ADC6378B9',
 
-  wgGlobalCollectGatewayAccountInfo=> {
+  wgGlobalCollectGatewayAccountInfo => {
 'test' => {
   'MerchantID' => 'test'
 }
   },
 
-  wgPaypalGatewayURL   => 
'https://www.sandbox.paypal.com/cgi-bin/webscr',
+  wgPaypalGatewayURL=> 
'https://www.sandbox.paypal.com/cgi-bin/webscr',
 
-  wgDonationInterfaceMemcacheHost  => 'localhost',
+  wgDonationInterfaceMemcacheHost   => 'localhost',
 
-  wgDonationInterfaceUseSyslog => true,
+  wgDonationInterfaceUseSyslog  => true,
 
-  wgDonationInterfaceDefaultQueueServer=> {
+  wgDonationInterfaceDefaultQueueServer => {
 'type'   => 'PHPQueue\Backend\Stomp',
 'uri'=> 'tcp://localhost:61613',
 'persistent' => 1
   },
 
-  wgDonationInterfaceQueues=> {
+  wgDonationInterfaceQueues => {
 'globalcollect-cc-limbo' => {
   'type'  => 'PHPQueue\Backend\Predis',
   'servers'   => 'tcp://localhost',
@@ -67,29 +67,29 @@
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
-'banner-history' => {
+'banner-history' => {
   'type'=> 'PHPQueue\Backend\Predis',
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
-'payments-antifraud' => {
+'payments-antifraud' => {
   'type'=> 'PHPQueue\Backend\Predis',
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
-'payments-init'  => {
+'payments-init'  => {
   'type'=> 'PHPQueue\Backend\Predis',
   'servers' => 'tcp://localhost',
   'expiry'  => 3600,
 },
   },
 
-  wgDonationInterfaceQueueMirrors  => {
+  wgDonationInterfaceQueueMirrors   => {
 'globalcollect-cc-limbo' => 'pending',
 'complete'   => 'complete-new',
   },
 
-  wgDonationInterfaceOrphanCron=> {
+  wgDonationInterfaceOrphanCron => {
 'enable'   => true,
 'max_per_execute'  => '',
 'override_command_line_params' => true,
diff --git a/puppet/modules/role/manifests/cirrussearch.pp 
b/puppet/modules/role/manifests/cirrussearch.pp
index 57cb7db..a7dfae2 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Rework Template:Multiple_image hack

2016-11-02 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review.

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

Change subject: Rework Template:Multiple_image hack
..

Rework Template:Multiple_image hack

- Move it into the hacks file where it belongs.
- Only apply when under tablet-width
- Add comment referring to tickets for future reference
- Use display box to
 - align center
 - wrap sibling images to the next line if needed
 - make sure a thumbcaption child is always on it's own line

Bug: T148505
Change-Id: Ib6c1a4af34157384aded880c13078a647e342588
---
M resources/skins.minerva.content.styles/hacks.less
M resources/skins.minerva.content.styles/thumbnails.less
2 files changed, 12 insertions(+), 6 deletions(-)


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

diff --git a/resources/skins.minerva.content.styles/hacks.less 
b/resources/skins.minerva.content.styles/hacks.less
index 41950cc..f426485 100644
--- a/resources/skins.minerva.content.styles/hacks.less
+++ b/resources/skins.minerva.content.styles/hacks.less
@@ -132,5 +132,17 @@
}
}
}
+   // Deal with Template:Multiple_image.  T38030 and T148505
+   .thumb .thumbinner {
+   > div {
+   .flex-display( flex );
+   justify-content: center;
+   flex-wrap: wrap;
+   align-content: flex-start;
+   }
+   > .thumbcaption {
+   .flex( 1, 0, 100% );
+   }
+   }
}
 }
diff --git a/resources/skins.minerva.content.styles/thumbnails.less 
b/resources/skins.minerva.content.styles/thumbnails.less
index 25a7507..8da82bd 100644
--- a/resources/skins.minerva.content.styles/thumbnails.less
+++ b/resources/skins.minerva.content.styles/thumbnails.less
@@ -21,12 +21,6 @@
margin: 0 auto;
// !important is needed because of Bug T87198 for 
example
max-width: 100% !important;
-
-   > div {
-   float: none !important;
-   width: auto !important;
-   clear: both !important;
-   }
}
 
/* bug 20030 */

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: statistics: Separate research mysql cluster credentials into...

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: statistics: Separate research mysql cluster credentials into 
define
..


statistics: Separate research mysql cluster credentials into define

Change-Id: Icc01e77e941046fdeec39b65415fbbeb89ad0ddd
---
M manifests/site.pp
M modules/role/manifests/statistics/cruncher.pp
A modules/statistics/manifests/mysql_credentials.pp
3 files changed, 21 insertions(+), 15 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index aebf7ff..822535f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2682,12 +2682,8 @@
 # /etc/mysql/conf.d/analytics-research-client.cnf
 # and only readable by users in the
 # analytics-privatedata-users group.
-include passwords::mysql::research
-mysql::config::client { 'analytics-research':
-user  => $::passwords::mysql::research::user,
-pass  => $::passwords::mysql::research::pass,
+statistics::mysql_credentials { 'analytics-research':
 group => 'analytics-privatedata-users',
-mode  => '0440',
 }
 
 # The eventlogging code is useful for scripting
@@ -2702,16 +2698,6 @@
 # query results for further processing on this node.
 node 'stat1003.eqiad.wmnet' {
 role(statistics::cruncher)
-
-include passwords::mysql::research
-# This file will render at
-# /etc/mysql/conf.d/research-client.cnf.
-mysql::config::client { 'research':
-user  => $::passwords::mysql::research::user,
-pass  => $::passwords::mysql::research::pass,
-group => 'researchers',
-mode  => '0440',
-}
 }
 
 node 'stat1004.eqiad.wmnet' {
diff --git a/modules/role/manifests/statistics/cruncher.pp 
b/modules/role/manifests/statistics/cruncher.pp
index 8be8cb1..8085737 100644
--- a/modules/role/manifests/statistics/cruncher.pp
+++ b/modules/role/manifests/statistics/cruncher.pp
@@ -9,6 +9,10 @@
 include role::backup::host
 backup::set { 'home' : }
 
+statistics::mysql_credentials { 'research':
+group => 'researchers',
+}
+
 # include stuff common to statistics compute nodes
 include ::statistics::compute
 
diff --git a/modules/statistics/manifests/mysql_credentials.pp 
b/modules/statistics/manifests/mysql_credentials.pp
new file mode 100644
index 000..7a87296
--- /dev/null
+++ b/modules/statistics/manifests/mysql_credentials.pp
@@ -0,0 +1,16 @@
+# = Define: statistics::mysql_credentials
+# Sets up mysql credentials for a given user group to access
+# the research dbs
+define statistics::mysql_credentials(
+$group,
+) {
+include passwords::mysql::research
+# This file will render at
+# /etc/mysql/conf.d/research-client.cnf.
+mysql::config::client { $title:
+user  => $::passwords::mysql::research::user,
+pass  => $::passwords::mysql::research::pass,
+group => $group,
+mode  => '0440',
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc01e77e941046fdeec39b65415fbbeb89ad0ddd
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...UniversalLanguageSelector[master]: build: Replace jscs+jshint with eslint

2016-11-02 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: build: Replace jscs+jshint with eslint
..

build: Replace jscs+jshint with eslint

Change-Id: I7f114267fbb4efd62a9162758445cff4fb3c0973
---
A .eslintrc.json
D .jsbeautifyrc
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
M resources/js/ext.uls.common.js
M resources/js/ext.uls.compactlinks.js
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.inputsettings.js
M resources/js/ext.uls.interface.js
M resources/js/ext.uls.preferences.js
M resources/js/ext.uls.webfonts.js
14 files changed, 70 insertions(+), 100 deletions(-)


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

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..16168fc
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,17 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true,
+   "qunit": true
+   },
+   "globals": {
+   "mw": false,
+   "mediaWiki": false,
+   "OO": false
+   },
+   "rules": {
+   "dot-notation": 0,
+   "wrap-iife": 0
+   }
+}
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
deleted file mode 100644
index cfa5b27..000
--- a/.jsbeautifyrc
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-"preserve_newlines": true,
-"jslint_happy": true,
-"keep_array_indentation": true,
-"space_before_conditional": true,
-"max_preserve_newlines": 10,
-"brace_style": "collapse",
-"keep_function_indentation": false,
-"break_chained_methods": false,
-"eval_code": false,
-"unescape_strings": false,
-"wrap_line_length": 0,
-"space_in_paren": true,
-"git_happy": true,
-"indent_with_tabs": true,
-"end_with_newline": true
-}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 1959eea..000
--- a/.jscsrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   "preset": "wikimedia",
-
-   "jsDoc": {
-   "checkAnnotations": {
-   "preset": "jsduck5",
-   "extra": {
-   "this": true,
-   "source": true,
-   "see": true
-   }
-   },
-   "checkTypes": "strictNativeCase",
-   "checkParamNames": true,
-   "checkRedundantAccess": true,
-   "checkRedundantReturns": true,
-   "requireNewlineAfterDescription": true,
-   "requireParamTypes": true,
-   "requireReturnTypes": true
-   }
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index a1bbf64..000
--- a/.jshintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# upstream libs
-lib/*
-# Generated file that contains JSON. Would fail "Strings must use singlequote."
-resources/js/ext.uls.webfonts.repository.js
-vendor/*
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index f2fa9d3..000
--- a/.jshintrc
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "freeze": true,
-   "latedef": "nofunc",
-   "futurehostile": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-
-   "strict": false,
-
-   // Relaxing
-
-   // Environment
-   "browser": true,
-   "jquery": true,
-
-   "globals": {
-   "mediaWiki": false,
-   "OO": false,
-   "QUnit": false
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 38a5102..aa27902 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,28 +1,27 @@
-/*jshint node:true */
+/* eslint-env node */
 module.exports = function ( grunt ) {
'use strict';
 
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
+   eslint: {
+   fix: {
+   options: {
+   fix: true
+   },
+   src: '<%= eslint.main %>'
},
-   all: [
+   main: [
'**/*.js',
'!lib/**',
'!node_modules/**',
'!vendor/**',
'!resources/js/ext.uls.webf

[MediaWiki-commits] [Gerrit] operations/puppet[production]: network::constants: remove /64 from icinga hosts

2016-11-02 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: network::constants: remove /64 from icinga hosts
..

network::constants: remove /64 from icinga hosts

These shouldn't have netmask suffixes here (nothing else does),
and it was breaking NTP configs as well.

Change-Id: I67506afba05292a30ebddd515f9db9b8dccfccd7
---
M modules/network/manifests/constants.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/319470/1

diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index 921df04..0352749 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -46,9 +46,9 @@
 '208.80.154.14',# neon.wikimedia.org
 '2620:0:861:1:208:80:154:14',   # neon.wikimedia.org
 '208.80.153.74',# tegmen.wikimedia.org
-'2620:0:860:3:208:80:153:74/64',# tegmen.wikimedia.org
+'2620:0:860:3:208:80:153:74',   # tegmen.wikimedia.org
 '208.80.155.119',   # 
einsteinium.wikimedia.org
-'2620:0:860:3:208:80:155:119/64',   # 
einsteinium.wikimedia.org
+'2620:0:860:3:208:80:155:119',  # 
einsteinium.wikimedia.org
 '208.80.154.53',# 
uranium.wikimedia.org (ganglia, gmetad needs it)
 '2620:0:861:1:208:80:154:53',   # uranium.wikimedia.org
 ],

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Geocoding: trim zip to 5 characters before lookup

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Geocoding: trim zip to 5 characters before lookup
..


Geocoding: trim zip to 5 characters before lookup

Bug: T148578
Change-Id: I1237250f25cfd4805c3d7f906286d31eee85c561
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 105e140..21bfae5 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2726,9 +2726,10 @@
 
$result = CRM_Core_DAO::executeQuery(
$sql,
-   array(
-   1 => array( 
$address['postal_code'], 'String' )
-   )
+   array( 1 => array(
+   substr( trim( 
$address['postal_code'] ), 0, 5 ),
+   'String'
+   ) )
);
if ( $result->fetch() ) {
$geoData = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1237250f25cfd4805c3d7f906286d31eee85c561
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Rename parsoid jsduck publish job

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Rename parsoid jsduck publish job
..


Rename parsoid jsduck publish job

Needs to be suffixed with '-publish' else the doc environment variables
are not set:

DOC_SUBPATH

Change-Id: Id228108831c57bb5688ca34c0e20c4c74b986255
---
M jjb/parsoidsvc.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 713611a..96f2a9e 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -129,7 +129,7 @@
  - castor-save
 
 - job-template:
-name: parsoidsvc-{repository}-jsduck-publish-jessie
+name: parsoidsvc-{repository}-jsduck-publish
 node: ci-jessie-wikimedia
 defaults: use-remote-zuul-shallow-clone
 concurrent: false
@@ -166,7 +166,7 @@
 - 'parsoidsvc-{repository}-parse-tool-check-jessie'
 - 'parsoidsvc-{repository}-roundtrip-test-check-jessie'
 - 'parsoidsvc-{repository}-npm-node-4-jessie'
-- 'parsoidsvc-{repository}-jsduck-publish-jessie':
+- 'parsoidsvc-{repository}-jsduck-publish':
 # We only publish doc of the 'source' repo
 repository:
 - source
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 58b0c23..8309851 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -835,7 +835,7 @@
 success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
 failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to fixup the working directory on 
the destination server.'
 
-  - name: parsoidsvc-source-jsduck-publish-jessie
+  - name: parsoidsvc-source-jsduck-publish
 branch: ^master$
 success-message: 'SUCCESS Deployed documentation to 
https://doc.wikimedia.org/Parsoid/master/'
 failure-message: 'FAILURE Failed to deploy documentation :-/'
@@ -7263,7 +7263,7 @@
   - parsoidsvc-source-roundtrip-test-check-jessie
   - parsoidsvc-source-npm-node-4-jessie
 postmerge:
-  - parsoidsvc-source-jsduck-publish-jessie
+  - parsoidsvc-source-jsduck-publish
 
   - name: mediawiki/services/parsoid/deploy
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id228108831c57bb5688ca34c0e20c4c74b986255
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: statistics: Separate research mysql cluster credentials into...

2016-11-02 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: statistics: Separate research mysql cluster credentials into 
define
..

statistics: Separate research mysql cluster credentials into define

Change-Id: Icc01e77e941046fdeec39b65415fbbeb89ad0ddd
---
M manifests/site.pp
M modules/role/manifests/statistics/cruncher.pp
A modules/statistics/manifests/mysql_credentials.pp
3 files changed, 21 insertions(+), 15 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index a9edec3..6d8fbca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2681,12 +2681,8 @@
 # /etc/mysql/conf.d/analytics-research-client.cnf
 # and only readable by users in the
 # analytics-privatedata-users group.
-include passwords::mysql::research
-mysql::config::client { 'analytics-research':
-user  => $::passwords::mysql::research::user,
-pass  => $::passwords::mysql::research::pass,
+statistics::mysql_credentials { 'analytics-research':
 group => 'analytics-privatedata-users',
-mode  => '0440',
 }
 
 # The eventlogging code is useful for scripting
@@ -2701,16 +2697,6 @@
 # query results for further processing on this node.
 node 'stat1003.eqiad.wmnet' {
 role(statistics::cruncher)
-
-include passwords::mysql::research
-# This file will render at
-# /etc/mysql/conf.d/research-client.cnf.
-mysql::config::client { 'research':
-user  => $::passwords::mysql::research::user,
-pass  => $::passwords::mysql::research::pass,
-group => 'researchers',
-mode  => '0440',
-}
 }
 
 node 'stat1004.eqiad.wmnet' {
diff --git a/modules/role/manifests/statistics/cruncher.pp 
b/modules/role/manifests/statistics/cruncher.pp
index 8be8cb1..8085737 100644
--- a/modules/role/manifests/statistics/cruncher.pp
+++ b/modules/role/manifests/statistics/cruncher.pp
@@ -9,6 +9,10 @@
 include role::backup::host
 backup::set { 'home' : }
 
+statistics::mysql_credentials { 'research':
+group => 'researchers',
+}
+
 # include stuff common to statistics compute nodes
 include ::statistics::compute
 
diff --git a/modules/statistics/manifests/mysql_credentials.pp 
b/modules/statistics/manifests/mysql_credentials.pp
new file mode 100644
index 000..7a87296
--- /dev/null
+++ b/modules/statistics/manifests/mysql_credentials.pp
@@ -0,0 +1,16 @@
+# = Define: statistics::mysql_credentials
+# Sets up mysql credentials for a given user group to access
+# the research dbs
+define statistics::mysql_credentials(
+$group,
+) {
+include passwords::mysql::research
+# This file will render at
+# /etc/mysql/conf.d/research-client.cnf.
+mysql::config::client { $title:
+user  => $::passwords::mysql::research::user,
+pass  => $::passwords::mysql::research::pass,
+group => $group,
+mode  => '0440',
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable maps snapshots on cawiki, hewiki, mkwiki

2016-11-02 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Enable maps snapshots on cawiki, hewiki, mkwiki
..

Enable maps snapshots on cawiki, hewiki, mkwiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7135da4..7b2fa8d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17606,6 +17606,9 @@
 'wgKartographerStaticMapframe' => [
'default' => false,
'mediawikiwiki' => true,
+   'cawiki' => true,
+   'hewiki' => true,
+   'mkwiki' => true,
'testwiki' => true,
'test2wiki' => true,
 ],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable maps snapshots on mw.org

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Enable maps snapshots on mw.org
..


Enable maps snapshots on mw.org

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 49f45c8..7135da4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17605,6 +17605,7 @@
 
 'wgKartographerStaticMapframe' => [
'default' => false,
+   'mediawikiwiki' => true,
'testwiki' => true,
'test2wiki' => true,
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d479459a9f878b68a436be9187d898da2986c35
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Florianschmidtwelzow 
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] wikimedia...crm[master]: Geocoding: trim zip to 5 characters before lookup

2016-11-02 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Geocoding: trim zip to 5 characters before lookup
..

Geocoding: trim zip to 5 characters before lookup

Bug: T148578
Change-Id: I1237250f25cfd4805c3d7f906286d31eee85c561
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/43/319443/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 105e140..21bfae5 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2726,9 +2726,10 @@
 
$result = CRM_Core_DAO::executeQuery(
$sql,
-   array(
-   1 => array( 
$address['postal_code'], 'String' )
-   )
+   array( 1 => array(
+   substr( trim( 
$address['postal_code'] ), 0, 5 ),
+   'String'
+   ) )
);
if ( $result->fetch() ) {
$geoData = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1237250f25cfd4805c3d7f906286d31eee85c561
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] integration/config[master]: Rename parsoid jsduck publish job

2016-11-02 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Rename parsoid jsduck publish job
..

Rename parsoid jsduck publish job

Needs to be suffixed with '-publish' else the doc environment variables
are not set:

DOC_SUBPATH

Change-Id: Id228108831c57bb5688ca34c0e20c4c74b986255
---
M jjb/parsoidsvc.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/319423/1

diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 713611a..96f2a9e 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -129,7 +129,7 @@
  - castor-save
 
 - job-template:
-name: parsoidsvc-{repository}-jsduck-publish-jessie
+name: parsoidsvc-{repository}-jsduck-publish
 node: ci-jessie-wikimedia
 defaults: use-remote-zuul-shallow-clone
 concurrent: false
@@ -166,7 +166,7 @@
 - 'parsoidsvc-{repository}-parse-tool-check-jessie'
 - 'parsoidsvc-{repository}-roundtrip-test-check-jessie'
 - 'parsoidsvc-{repository}-npm-node-4-jessie'
-- 'parsoidsvc-{repository}-jsduck-publish-jessie':
+- 'parsoidsvc-{repository}-jsduck-publish':
 # We only publish doc of the 'source' repo
 repository:
 - source
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 58b0c23..8309851 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -835,7 +835,7 @@
 success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
 failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to fixup the working directory on 
the destination server.'
 
-  - name: parsoidsvc-source-jsduck-publish-jessie
+  - name: parsoidsvc-source-jsduck-publish
 branch: ^master$
 success-message: 'SUCCESS Deployed documentation to 
https://doc.wikimedia.org/Parsoid/master/'
 failure-message: 'FAILURE Failed to deploy documentation :-/'
@@ -7263,7 +7263,7 @@
   - parsoidsvc-source-roundtrip-test-check-jessie
   - parsoidsvc-source-npm-node-4-jessie
 postmerge:
-  - parsoidsvc-source-jsduck-publish-jessie
+  - parsoidsvc-source-jsduck-publish
 
   - name: mediawiki/services/parsoid/deploy
 test:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Add binding for when only tab is new wikitext editor

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add binding for when only tab is new wikitext editor
..


Add binding for when only tab is new wikitext editor

Bug: T149796
Change-Id: I675c5876fbb9ca8427983e9d4252cccda35775f9
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 38 insertions(+), 20 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 727e596..17dc83c 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -21,9 +21,9 @@
  */
 ( function () {
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, 
veEditSourceUri, isViewPage, isEditPage,
-   pageCanLoadVE, init, targetPromise, enable, tempdisable, 
autodisable,
+   pageCanLoadEditor, init, targetPromise, enable, tempdisable, 
autodisable,
tabPreference, userPrefEnabled, userPrefPreferShow, 
initialWikitext, oldid,
-   onlyTabIsVE, isLoading,
+   isLoading,
editModes = {
edit: 'visual'
},
@@ -344,7 +344,7 @@
pageExists = !!mw.config.get( 'wgRelevantArticleId' );
viewUri = new mw.Uri( mw.util.getUrl( mw.config.get( 
'wgRelevantPageName' ) ) );
isViewPage = mw.config.get( 'wgIsArticle' ) && !( 'diff' in uri.query );
-   pageCanLoadVE = (
+   pageCanLoadEditor = (
isViewPage ||
mw.config.get( 'wgAction' ) === 'edit' ||
mw.config.get( 'wgAction' ) === 'submit'
@@ -435,7 +435,7 @@
// Use url instead of '#'.
// So that 1) one can always 
open it in a new tab, even when
// onEditTabClick is bound.
-   // 2) when onEditTabClick is 
not bound (!pageCanLoadVE) it will
+   // 2) when onEditTabClick is 
not bound (!pageCanLoadEditor) it will
// just work.
veEditUri,
tabMessages[ action ] !== null 
? mw.msg( tabMessages[ action ] ) : $caEditLink.text(),
@@ -469,11 +469,11 @@
// If the edit tab is hidden, remove it.
if ( !( init.isVisualAvailable && userPrefPreferShow ) 
) {
$caVeEdit.remove();
-   } else if ( pageCanLoadVE ) {
+   } else if ( pageCanLoadEditor ) {
// Allow instant switching to edit mode, 
without refresh
$caVeEdit.on( 'click', 
init.onEditTabClick.bind( init, 'visual' ) );
}
-   if ( init.isWikitextAvailable ) {
+   if ( pageCanLoadEditor && init.isWikitextAvailable ) {
$caEdit.on( 'click', init.onEditTabClick.bind( 
init, 'source' ) );
}
 
@@ -548,7 +548,7 @@
} );
}
 
-   if ( pageCanLoadVE ) {
+   if ( pageCanLoadEditor ) {
// Only init without refresh if we're on a view 
page. Though section edit links
// are rarely shown on non-view pages, they 
appear in one other case, namely
// when on a diff against the latest version of 
a page. In that case we mustn't
@@ -690,21 +690,33 @@
tempdisable = Number( mw.user.options.get( 
'visualeditor-betatempdisable' ) );
autodisable = Number( mw.user.options.get( 'visualeditor-autodisable' ) 
);
tabPreference = mw.user.options.get( 'visualeditor-tabs' );
-   onlyTabIsVE = mw.config.get( 'wgVisualEditorConfig' ).singleEditTab && (
-   tabPreference === 'prefer-ve' || (
-   tabPreference === 'remember-last' &&
-   getLastEditor() !== 'wikitext'
-   )
-   );
+
+   function isOnlyTabVE() {
+   return conf.singleEditTab && (
+   tabPreference === 'prefer-ve' || (
+   tabPreference === 'remember-last' &&
+   getLastEditor() !== 'wikitext'
+   )
+   );
+   }
+
+   function isOnlyTabWikitext() {
+   return conf.singleEditTab &&

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix splice typo

2016-11-02 Thread Tchanders (Code Review)

Tchanders has uploaded a new change for review.

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

Change subject: Fix splice typo
..

Fix splice typo

Bug: T149537
Bug: T149528
Change-Id: If8d137aeaf4e0097ca4643feaeed381ded65d51b
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/16/319416/1

diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index cb88dee..02ac060 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -313,9 +313,11 @@
insertIndex = newPreviousNodeRange.from - 
nodeRange.from;
}
// Splice in the subnode's annotated data just after 
the new node's open tag
-   ve.batchSplice( nodeData, 0, insertIndex, outerNodeData 
);
+   ve.batchSplice( nodeData, insertIndex, 0, outerNodeData 
);
}
 
+   alreadyProcessed[ action ].push( nodeIndex );
+
}
 
ilen = Math.max( oldNodes.length, newNodes.length );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8d137aeaf4e0097ca4643feaeed381ded65d51b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Return 204s for empty responses (for RESTBase aggregated req...

2016-11-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Return 204s for empty responses (for RESTBase aggregated 
requests)
..


Return 204s for empty responses (for RESTBase aggregated requests)

Currently we're returning these as 200s but a 204 (no content) response
code is more accurate.

This is in preparation for patches strengthening feed response format
checking on the server side.

Change-Id: Ibe419c58c24cb96180ea49df30b1fd4a6e47bcb2
---
M lib/feed/featured-image.js
M lib/feed/news.js
M routes/featured-image.js
M routes/featured.js
M routes/most-read.js
M routes/news.js
M spec.yaml
M test/features/featured-image/pagecontent.js
M test/features/featured/pagecontent.js
M test/features/most-read/most-read.js
M test/features/news/news.js
11 files changed, 30 insertions(+), 19 deletions(-)

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



diff --git a/lib/feed/featured-image.js b/lib/feed/featured-image.js
index 8e01366..b122ece 100644
--- a/lib/feed/featured-image.js
+++ b/lib/feed/featured-image.js
@@ -126,7 +126,7 @@
 }).catch(function(err) {
 if (err.status === 504) {
 if (aggregated) {
-return BBPromise.resolve({ payload: undefined, meta: undefined 
});
+return BBPromise.resolve({});
 }
 throw new HTTPError({
 status: 404,
diff --git a/lib/feed/news.js b/lib/feed/news.js
index 95ac537..d183479 100644
--- a/lib/feed/news.js
+++ b/lib/feed/news.js
@@ -32,7 +32,7 @@
 var aggregated = !!req.query.aggregated;
 if (!NEWS_TEMPLATES[lang]) {
 if (aggregated) {
-return BBPromise.resolve({ payload: undefined, meta: undefined });
+return BBPromise.resolve({});
 }
 throw new HTTPError({
 status: 501,
diff --git a/routes/featured-image.js b/routes/featured-image.js
index bace4c6..e282e11 100644
--- a/routes/featured-image.js
+++ b/routes/featured-image.js
@@ -26,7 +26,7 @@
 router.get('/image/featured/:/:mm/:dd', function (req, res) {
 return featured.promise(app, req)
 .then(function (response) {
-res.status(200);
+res.status(!response.payload ? 204 : 200);
 mUtil.setETagToValue(res, response.meta && response.meta.etag);
 res.json(response.payload || null).end();
 });
diff --git a/routes/featured.js b/routes/featured.js
index e83fb0a..7529d07 100644
--- a/routes/featured.js
+++ b/routes/featured.js
@@ -26,7 +26,7 @@
 router.get('/featured/:/:mm/:dd', function (req, res) {
 return featured.promise(app, req)
 .then(function (response) {
-res.status(200);
+res.status(!response.payload ? 204 : 200);
 mUtil.setETagToValue(res, response.meta && response.meta.etag);
 mUtil.setContentType(res, mUtil.CONTENT_TYPES.unpublished);
 res.json(response.payload || null).end();
diff --git a/routes/most-read.js b/routes/most-read.js
index 4d6da4e..34b7ddb 100644
--- a/routes/most-read.js
+++ b/routes/most-read.js
@@ -24,7 +24,7 @@
 router.get('/most-read/:/:mm/:dd', function (req, res) {
 return mostRead.promise(app, req)
 .then(function (response) {
-res.status(200);
+res.status(!response.payload ? 204 : 200);
 mUtil.setETagToValue(res, response.meta && response.meta.etag);
 mUtil.setContentType(res, mUtil.CONTENT_TYPES.unpublished);
 res.json(response.payload || null).end();
diff --git a/routes/news.js b/routes/news.js
index fa4811c..532760d 100644
--- a/routes/news.js
+++ b/routes/news.js
@@ -23,7 +23,7 @@
 router.get('/news', function (req, res) {
 return news.promise(app, req)
 .then(function (response) {
-res.status(200);
+res.status(!response.payload ? 204 : 200);
 mUtil.setETagToValue(res, response.meta && response.meta.etag);
 res.json(response.payload || null).end();
 });
diff --git a/spec.yaml b/spec.yaml
index 8510a91..c3acd69 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -108,7 +108,7 @@
 query:
   aggregated: true
   response:
-status: 200
+status: 204
 body: ""
   # from routes/featured-image.js
   /{domain}/v1/media/image/featured/{}/{mm}/{dd}:
@@ -238,7 +238,7 @@
 query:
   aggregated: true
   response:
-status: 200
+status: 204
 body: ""
   # from routes/random.js
   /{domain}/v1/page/random/title:
@@ -282,7 +282,7 @@
 query:
   aggregated: true
   response:
-status: 200
+status: 204
 body: ""
   # from routes/media.js
   /{domain}/v1/page/media/{title}:
diff --git a/test/features/featured-image/pagecontent.js 
b/test/features/featured-image/pagecontent.js
index 6bb07e9..04cdf49 100644
--- a/test/feat

1 2 3 4 >

1 - 100 of 386 matches

Mail list logo