date:20160526

[MediaWiki-commits] [Gerrit] Show a pointer cursor on revision wrappers. - change (mediawiki...RevisionSlider)

2016-05-26 Thread Jakob (Code Review)

Jakob has uploaded a new change for review.

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

Change subject: Show a pointer cursor on revision wrappers.
..

Show a pointer cursor on revision wrappers.

Bug: T134993
Change-Id: I3412e03aba726fde6194b3cac88765655e69b8aa
---
M modules/ext.RevisionSlider.css
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/36/290936/1

diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 79bbf2a..279bebe 100755
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -48,6 +48,7 @@
 
 .revision-wrapper {
 position: absolute;
+cursor: pointer;
 z-index: 10;
 height: 140px;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3412e03aba726fde6194b3cac88765655e69b8aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jakob 

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

[MediaWiki-commits] [Gerrit] contint: let us vary localhost vhost unix user - change (operations/puppet)

2016-05-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: let us vary localhost vhost unix user
..

contint: let us vary localhost vhost unix user

The contint::worker_localhost create an Apache document root that needs
to be writable by the user that runs the Jenkins jobs. On permanent
slaves that is 'jenkins-deploy' for legacy reasons, on Nodepool it is
'jenkins'.

Make contint::worker_localhost to require a $owner parameter that is
solely used to set the owner of /srv/localhost-worker

Adjust the only existing call in this repo which is used by permanent
slaves and thus must use jenkins-deploy.

Bug: T136301
Change-Id: I8f62962c515019bb87fa92937c8c5435e6d53359
---
M modules/contint/manifests/worker_localhost.pp
M modules/role/manifests/ci/slave/labs.pp
2 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/290938/1

diff --git a/modules/contint/manifests/worker_localhost.pp 
b/modules/contint/manifests/worker_localhost.pp
index 330b3a5..d21363f 100644
--- a/modules/contint/manifests/worker_localhost.pp
+++ b/modules/contint/manifests/worker_localhost.pp
@@ -1,11 +1,23 @@
-class contint::worker_localhost {
+# == class contint::worker_localhost
+#
+# Apache vhost for localhost testing (qunit/selenium)
+#
+# Parameters:
+#
+# **owner** Unix user that runs the jobs. Should be:
+#  Permanent slaves: jenkins-deploy
+#  Nodepool slaves: jenkins
+#
+class contint::worker_localhost(
+$owner
+) {
 
 include ::apache::mod::rewrite
 
 file { '/srv/localhost-worker':
 ensure => directory,
 mode   => '0775',
-owner  => 'jenkins-deploy',
+owner  => $owner,
 group  => 'root',
 }
 
diff --git a/modules/role/manifests/ci/slave/labs.pp 
b/modules/role/manifests/ci/slave/labs.pp
index 75bce3d..985b771 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -12,7 +12,9 @@
 include ::contint::package_builder
 }
 
-include contint::worker_localhost
+class { 'contint::worker_localhost':
+owner => 'jenkins-deploy',
+}
 
 contint::tmpfs { 'tmpfs for jenkins CI labs slave':
 # Jobs expect the tmpfs to be in $HOME/tmpfs

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

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

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

[MediaWiki-commits] [Gerrit] Use HTMLForm style sheets on mobile - change (mediawiki/core)

2016-05-26 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Use HTMLForm style sheets on mobile
..

Use HTMLForm style sheets on mobile

Bug: T135779
Change-Id: I7152da816b979a2d41b57cd4c117ec8087c3ff7a
---
M resources/Resources.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/290941/1

diff --git a/resources/Resources.php b/resources/Resources.php
index bacf1e6..6c55a6d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1060,14 +1060,17 @@
// @todo Load this message in content language
'colon-separator',
],
+   'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.htmlform.styles' => [
'styles' => 'resources/src/mediawiki/mediawiki.htmlform.css',
'position' => 'top',
+   'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.htmlform.ooui.styles' => [
'styles' => 
'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
'position' => 'top',
+   'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.icon' => [
'styles' => 'resources/src/mediawiki/mediawiki.icon.less',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7152da816b979a2d41b57cd4c117ec8087c3ff7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Add druid100[123] with just standard and base::firewall - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add druid100[123] with just standard and base::firewall
..


Add druid100[123] with just standard and base::firewall

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a989e7f..ea1efc0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -914,6 +914,13 @@
 }
 }
 
+# Analytics Druid servers.
+# https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
+node /^druid100[123].eqiad.wmnet$/ {
+include base::firewall
+include standard
+}
+
 node 'eeden.wikimedia.org' {
 role authdns::server
 

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

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

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

[MediaWiki-commits] [Gerrit] Add netboot MACs and partman recipe for druid hosts - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Add netboot MACs and partman recipe for druid hosts
..

Add netboot MACs and partman recipe for druid hosts

druid1003's mgmt is not currently responding.  Will add MAC for it when I can 
get it.

Bug: T134275
Change-Id: I3359fc5f3e1b6466ec782692f06bf6238000c4d1
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 84 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/290944/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 1c1c4b8..9812132 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,6 +69,7 @@
 cp[1234][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
 
db[0-8][0-9]|db10[0-7][0-9]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
 d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
+druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
 eeden|bast3001|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
 elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic20[0-2][0-9]|elastic203[0-1]) 
echo partman/elasticsearch-raid1.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg 
b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
new file mode 100644
index 000..04de011
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 4 SSD, sda, sdb, sdc, sdd
+# * LVM
+# * layout:
+#   - /:  RAID1,  30G,  ext4
+#   - swap:   RAID1,   1G,  swap
+#   - /var/lib/druid: RAID10, LVM,  ext4
+
+d-ipartman-auto/method string  raid
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman/alignment   select  optimal
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
+d-ipartman-auto/choose_recipe select raid1-root
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   raid1-root ::   \
+   3   1   3   raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10002   1000raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10  3   -1  raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10  4   -1  ext4\
+   $lvmok{ }   \
+   $defaultignore{ }   \
+   lv_name{ var }  \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ /var/lib/druid }\
+   .
+
+# Parameters are:
+#  \
+#   
+d-ipartman-auto-raid/recipestring  \
+   1   4   2   ext4/   \
+   /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+   .   \
+   1   4   0   swap-   \
+   /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+   .   \
+   10  4   0   lvm -   \
+   /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
+   .
+
+d-ipartman-md/confirm  boolean true
+d-ipartman-md/confirm_nooverwrite  boolean true
+d-ipartman/confirm_write_new_label boolean true
+d-ipartman/choose_partitionselect  finish
+d-ipartman/confirm

[MediaWiki-commits] [Gerrit] contint: let us vary localhost vhost unix user - change (operations/puppet)

2016-05-26 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: contint: let us vary localhost vhost unix user
..


contint: let us vary localhost vhost unix user

The contint::worker_localhost create an Apache document root that needs
to be writable by the user that runs the Jenkins jobs. On permanent
slaves that is 'jenkins-deploy' for legacy reasons, on Nodepool it is
'jenkins'.

Make contint::worker_localhost to require a $owner parameter that is
solely used to set the owner of /srv/localhost-worker

Adjust the only existing call in this repo which is used by permanent
slaves and thus must use jenkins-deploy.

Bug: T136301
Change-Id: I8f62962c515019bb87fa92937c8c5435e6d53359
---
M modules/contint/manifests/worker_localhost.pp
M modules/role/manifests/ci/slave/labs.pp
2 files changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/modules/contint/manifests/worker_localhost.pp 
b/modules/contint/manifests/worker_localhost.pp
index 330b3a5..363c123 100644
--- a/modules/contint/manifests/worker_localhost.pp
+++ b/modules/contint/manifests/worker_localhost.pp
@@ -1,11 +1,24 @@
-class contint::worker_localhost {
+# == class contint::worker_localhost
+#
+# Apache vhost for localhost testing (qunit/selenium)
+#
+# === Parameters
+#
+# [*owner*]
+#   Unix user that runs the jobs. Should be:
+#- Permanent slaves: jenkins-deploy
+#- Nodepool slaves: jenkins
+#
+class contint::worker_localhost(
+$owner,
+) {
 
 include ::apache::mod::rewrite
 
 file { '/srv/localhost-worker':
 ensure => directory,
 mode   => '0775',
-owner  => 'jenkins-deploy',
+owner  => $owner,
 group  => 'root',
 }
 
diff --git a/modules/role/manifests/ci/slave/labs.pp 
b/modules/role/manifests/ci/slave/labs.pp
index 75bce3d..985b771 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -12,7 +12,9 @@
 include ::contint::package_builder
 }
 
-include contint::worker_localhost
+class { 'contint::worker_localhost':
+owner => 'jenkins-deploy',
+}
 
 contint::tmpfs { 'tmpfs for jenkins CI labs slave':
 # Jobs expect the tmpfs to be in $HOME/tmpfs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f62962c515019bb87fa92937c8c5435e6d53359
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add netboot MACs and partman recipe for druid hosts - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add netboot MACs and partman recipe for druid hosts
..


Add netboot MACs and partman recipe for druid hosts

druid1003's mgmt is not currently responding.  Will add MAC for it when I can 
get it.

Bug: T134275
Change-Id: I3359fc5f3e1b6466ec782692f06bf6238000c4d1
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 84 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: 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 1c1c4b8..9812132 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,6 +69,7 @@
 cp[1234][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
 
db[0-8][0-9]|db10[0-7][0-9]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
 d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
+druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
 eeden|bast3001|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
 elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic20[0-2][0-9]|elastic203[0-1]) 
echo partman/elasticsearch-raid1.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg 
b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
new file mode 100644
index 000..04de011
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 4 SSD, sda, sdb, sdc, sdd
+# * LVM
+# * layout:
+#   - /:  RAID1,  30G,  ext4
+#   - swap:   RAID1,   1G,  swap
+#   - /var/lib/druid: RAID10, LVM,  ext4
+
+d-ipartman-auto/method string  raid
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman/alignment   select  optimal
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
+d-ipartman-auto/choose_recipe select raid1-root
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   raid1-root ::   \
+   3   1   3   raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10002   1000raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10  3   -1  raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10  4   -1  ext4\
+   $lvmok{ }   \
+   $defaultignore{ }   \
+   lv_name{ var }  \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ /var/lib/druid }\
+   .
+
+# Parameters are:
+#  \
+#   
+d-ipartman-auto-raid/recipestring  \
+   1   4   2   ext4/   \
+   /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+   .   \
+   1   4   0   swap-   \
+   /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+   .   \
+   10  4   0   lvm -   \
+   /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
+   .
+
+d-ipartman-md/confirm  boolean true
+d-ipartman-md/confirm_nooverwrite  boolean true
+d-ipartman/confirm_write_new_label boolean true
+d-ipartman/choose_partitionselect  finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite

[MediaWiki-commits] [Gerrit] rsyslog::receiver: Increase log retention to 90 days - change (operations/puppet)

2016-05-26 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: rsyslog::receiver: Increase log retention to 90 days
..

rsyslog::receiver: Increase log retention to 90 days

Our privacy policy says 90 days anyway and current usage on lithium is
19% on /srv/syslog. Increase for the current 30 days to 90 days

Change-Id: I94b7090ea22455ca26a83b58570b9bf2926ca7be
---
M modules/rsyslog/manifests/receiver.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/rsyslog/manifests/receiver.pp 
b/modules/rsyslog/manifests/receiver.pp
index d3ae6f1..cce7f88 100644
--- a/modules/rsyslog/manifests/receiver.pp
+++ b/modules/rsyslog/manifests/receiver.pp
@@ -20,7 +20,7 @@
 
 class rsyslog::receiver (
 $udp_port   = 514,
-$log_retention_days = 30,
+$log_retention_days = 90,
 $log_directory  = '/srv/syslog',
 $archive_directory  = '/srv/syslog/archive',
 ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94b7090ea22455ca26a83b58570b9bf2926ca7be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...ContentTranslation)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Update mediawiki_api gem to 1.7.1
..


Update mediawiki_api gem to 1.7.1

Required for selenium test compatibility with AuthManager

Bug: T135884
Change-Id: Idd454801073432cf1de4ece217014098aafc2077
---
M Gemfile
M Gemfile.lock
2 files changed, 22 insertions(+), 20 deletions(-)

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



diff --git a/Gemfile b/Gemfile
index e482715..d08d5e5 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'commons_upload', '~> 0.0.4'
-gem 'mediawiki_selenium', '~> 1.6.2'
+gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1'
 gem 'rubocop', '~> 0.34.2', require: false
 gem 'screenshot', '~> 0.0.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 70d27d6..f347025 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-childprocess (0.5.7)
+childprocess (0.5.9)
   ffi (~> 1.0, >= 1.0.11)
 chunky_png (1.3.4)
 commons_upload (0.0.4)
@@ -16,13 +16,13 @@
   gherkin (~> 2.12)
   multi_json (>= 1.7.5, < 2.0)
   multi_test (>= 0.1.2)
-data_magic (0.21)
+data_magic (0.22)
   faker (>= 1.1.2)
-  yml_reader (>= 0.4)
+  yml_reader (>= 0.6)
 diff-lcs (1.2.5)
-domain_name (0.5.25)
+domain_name (0.5.20160310)
   unf (>= 0.0.5, < 1.0.0)
-faker (1.5.0)
+faker (1.6.3)
   i18n (~> 0.5)
 faraday (0.9.2)
   multipart-post (>= 1.2, < 3)
@@ -32,31 +32,31 @@
 ffi (1.9.10)
 gherkin (2.12.2)
   multi_json (~> 1.3)
-headless (2.2.0)
+headless (2.2.3)
 http-cookie (1.0.2)
   domain_name (~> 0.5)
 i18n (0.7.0)
 json (1.8.3)
-mediawiki_api (0.5.0)
+mediawiki_api (0.6.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (1.6.2)
+mediawiki_selenium (1.7.1)
   cucumber (~> 1.3, >= 1.3.20)
   headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.5, >= 0.5.0)
+  mediawiki_api (~> 0.6, >= 0.6.0)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
   rspec-core (~> 2.14, >= 2.14.4)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
   thor (~> 0.19, >= 0.19.1)
-mime-types (2.6.2)
-multi_json (1.11.2)
+mime-types (2.99.2)
+multi_json (1.12.1)
 multi_test (0.1.2)
 multipart-post (2.0.0)
 netrc (0.11.0)
-page-object (1.1.0)
+page-object (1.1.1)
   page_navigation (>= 0.9)
   selenium-webdriver (>= 2.44.0)
   watir-webdriver (>= 0.6.11)
@@ -80,29 +80,31 @@
   rainbow (>= 1.99.1, < 3.0)
   ruby-progressbar (~> 1.4)
 ruby-progressbar (1.7.5)
-rubyzip (1.1.7)
+rubyzip (1.2.0)
 screenshot (0.0.7)
   chunky_png (~> 1.3.3)
-selenium-webdriver (2.48.1)
+selenium-webdriver (2.53.0)
   childprocess (~> 0.5)
-  multi_json (~> 1.0)
   rubyzip (~> 1.0)
   websocket (~> 1.0)
 syntax (1.2.0)
 thor (0.19.1)
 unf (0.1.4)
   unf_ext
-unf_ext (0.0.7.1)
+unf_ext (0.0.7.2)
 watir-webdriver (0.9.1)
   selenium-webdriver (>= 2.46.2)
-websocket (1.2.2)
-yml_reader (0.5)
+websocket (1.2.3)
+yml_reader (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   commons_upload (~> 0.0.4)
-  mediawiki_selenium (~> 1.6.2)
+  mediawiki_selenium (~> 1.7, >= 1.7.1)
   rubocop (~> 0.34.2)
   screenshot (~> 0.0.6)
+
+BUNDLED WITH
+   1.12.5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd454801073432cf1de4ece217014098aafc2077
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dib: localhost-worker must belong to jenkins user - change (integration/config)

2016-05-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: dib: localhost-worker must belong to jenkins user
..

dib: localhost-worker must belong to jenkins user

Bug: T136301
Change-Id: I075a39f347d234d3c71ae0e3226b1815dc4e0d31
Depends-On: I8f62962c515019bb87fa92937c8c5435e6d53359
---
M dib/puppet/ciimage.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/39/290939/1

diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index f2e0534..2d8c3ce 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -40,7 +40,9 @@
 
 # Qunit/Selenium related
 include contint::browsers
-include contint::worker_localhost
+class { 'contint::worker_localhost':
+owner => 'jenkins',
+}
 
 # Some NodeJS native modules require g++
 package { 'g++':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I075a39f347d234d3c71ae0e3226b1815dc4e0d31
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] Change button text for *Credentials special pages - change (mediawiki/core)

2016-05-26 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Change button text for *Credentials special pages
..

Change button text for *Credentials special pages

Bug: T135779
Change-Id: If6c2edab6a574bc961e47c7ea04ec0ef18e36491
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 5398858..f135f40 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4168,12 +4168,12 @@
"cannotauth-not-allowed-title": "Permission denied",
"cannotauth-not-allowed": "You are not allowed to use this page",
"changecredentials" : "Change credentials",
-   "changecredentials-submit": "Change",
+   "changecredentials-submit": "Change credentials",
"changecredentials-submit-cancel": "Cancel",
"changecredentials-invalidsubpage": "$1 is not a valid credential 
type.",
"changecredentials-success": "Your credentials have been changed.",
"removecredentials" : "Remove credentials",
-   "removecredentials-submit": "Remove",
+   "removecredentials-submit": "Remove credentials",
"removecredentials-submit-cancel": "Cancel",
"removecredentials-invalidsubpage": "$1 is not a valid credential 
type.",
"removecredentials-success": "Your credentials have been removed.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c2edab6a574bc961e47c7ea04ec0ef18e36491
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Add druid100[123] with just standard and base::firewall - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Add druid100[123] with just standard and base::firewall
..

Add druid100[123] with just standard and base::firewall

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


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

diff --git a/manifests/site.pp b/manifests/site.pp
index a989e7f..ea1efc0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -914,6 +914,13 @@
 }
 }
 
+# Analytics Druid servers.
+# https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
+node /^druid100[123].eqiad.wmnet$/ {
+include base::firewall
+include standard
+}
+
 node 'eeden.wikimedia.org' {
 role authdns::server
 

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

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

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

[MediaWiki-commits] [Gerrit] Change button text for *Credentials special pages - change (mediawiki/core)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Change button text for *Credentials special pages
..


Change button text for *Credentials special pages

Bug: T135779
Change-Id: If6c2edab6a574bc961e47c7ea04ec0ef18e36491
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 5398858..f135f40 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4168,12 +4168,12 @@
"cannotauth-not-allowed-title": "Permission denied",
"cannotauth-not-allowed": "You are not allowed to use this page",
"changecredentials" : "Change credentials",
-   "changecredentials-submit": "Change",
+   "changecredentials-submit": "Change credentials",
"changecredentials-submit-cancel": "Cancel",
"changecredentials-invalidsubpage": "$1 is not a valid credential 
type.",
"changecredentials-success": "Your credentials have been changed.",
"removecredentials" : "Remove credentials",
-   "removecredentials-submit": "Remove",
+   "removecredentials-submit": "Remove credentials",
"removecredentials-submit-cancel": "Cancel",
"removecredentials-invalidsubpage": "$1 is not a valid credential 
type.",
"removecredentials-success": "Your credentials have been removed.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6c2edab6a574bc961e47c7ea04ec0ef18e36491
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 173067a..1f38c6b - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 173067a..1f38c6b
..

Syncronize VisualEditor: 173067a..1f38c6b

Change-Id: I0214588ade30e0668a88618e2cc874919c7a14d8
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 173067a..1f38c6b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 173067afe6dbe5a416b272ede24b94908bbd6471
+Subproject commit 1f38c6bcfcbbe4bcfb9176621e61922cac4ae74f

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0214588ade30e0668a88618e2cc874919c7a14d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add Jenkins job for mediawiki/extensions/Wikispeech - change (integration/config)

2016-05-26 Thread Lokal Profil (Code Review)

Lokal Profil has uploaded a new change for review.

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

Change subject: Add Jenkins job for mediawiki/extensions/Wikispeech
..

Add Jenkins job for mediawiki/extensions/Wikispeech

Adding basic testing for initialised project
* jshint
* jsonlint
* extension-unittests-generic

Bug: T136196
Change-Id: I52385d9aeceeacd5323a7c7c8b70fd9b9908d64b
---
M zuul/layout.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/43/290943/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 950a073..e9a189f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7834,6 +7834,12 @@
 template:
   - name: extension-unittests-generic
 
+  - name: mediawiki/extensions/Wikispeech
+template:
+  - name: jshint
+  - name: jsonlint
+  - name: extension-unittests-generic
+
   - name: mediawiki/extensions/Workflow
 template:
   - name: archived

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52385d9aeceeacd5323a7c7c8b70fd9b9908d64b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 

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

[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Update mediawiki_api gem to 1.7.1
..


Update mediawiki_api gem to 1.7.1

Required for selenium test compatibility with AuthManager

Bug: T135884
Change-Id: Iffc3e0aad539316bfcd71f3831ab8eda02916761
---
M Gemfile
M Gemfile.lock
2 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/Gemfile b/Gemfile
index 615703b..4d94084 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'commons_upload', '~> 0.0.4'
-gem 'mediawiki_selenium', '~> 1.7'
+gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1'
 gem 'rake', '~> 10.4', '>= 10.4.2'
 gem 'rubocop', '~> 0.32.1', require: false
 gem 'screenshot', '~> 0.0.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index b11d3fa..3a6e56b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,7 +20,7 @@
   faker (>= 1.1.2)
   yml_reader (>= 0.6)
 diff-lcs (1.2.5)
-domain_name (0.5.25)
+domain_name (0.5.20160310)
   unf (>= 0.0.5, < 1.0.0)
 faker (1.6.3)
   i18n (~> 0.5)
@@ -37,22 +37,22 @@
   domain_name (~> 0.5)
 i18n (0.7.0)
 json (1.8.3)
-mediawiki_api (0.5.0)
+mediawiki_api (0.6.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (1.7.0)
+mediawiki_selenium (1.7.1)
   cucumber (~> 1.3, >= 1.3.20)
   headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.5, >= 0.5.0)
+  mediawiki_api (~> 0.6, >= 0.6.0)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
   rspec-core (~> 2.14, >= 2.14.4)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
   thor (~> 0.19, >= 0.19.1)
-mime-types (2.99.1)
-multi_json (1.11.3)
+mime-types (2.99.2)
+multi_json (1.12.1)
 multi_test (0.1.2)
 multipart-post (2.0.0)
 netrc (0.11.0)
@@ -92,7 +92,7 @@
 thor (0.19.1)
 unf (0.1.4)
   unf_ext
-unf_ext (0.0.7.1)
+unf_ext (0.0.7.2)
 watir-webdriver (0.9.1)
   selenium-webdriver (>= 2.46.2)
 websocket (1.2.3)
@@ -103,10 +103,10 @@
 
 DEPENDENCIES
   commons_upload (~> 0.0.4)
-  mediawiki_selenium (~> 1.7)
+  mediawiki_selenium (~> 1.7, >= 1.7.1)
   rake (~> 10.4, >= 10.4.2)
   rubocop (~> 0.32.1)
   screenshot (~> 0.0.7)
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffc3e0aad539316bfcd71f3831ab8eda02916761
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 173067a..1f38c6b - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 173067a..1f38c6b
..


Syncronize VisualEditor: 173067a..1f38c6b

Change-Id: I0214588ade30e0668a88618e2cc874919c7a14d8
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 173067a..1f38c6b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 173067afe6dbe5a416b272ede24b94908bbd6471
+Subproject commit 1f38c6bcfcbbe4bcfb9176621e61922cac4ae74f

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0214588ade30e0668a88618e2cc874919c7a14d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] enable instance restbase1014-c.eqiad.wmnet - change (operations/puppet)

2016-05-26 Thread Eevans (Code Review)

Eevans has uploaded a new change for review.

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

Change subject: enable instance restbase1014-c.eqiad.wmnet
..

enable instance restbase1014-c.eqiad.wmnet

Bug: T134016
Change-Id: I4a1dfc4f099ea0e6ffa0e919a56065e941f2936a
---
M hieradata/hosts/restbase1014.yaml
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/hieradata/hosts/restbase1014.yaml 
b/hieradata/hosts/restbase1014.yaml
index 83d37b9..79a98a1 100644
--- a/hieradata/hosts/restbase1014.yaml
+++ b/hieradata/hosts/restbase1014.yaml
@@ -11,8 +11,8 @@
 listen_address: 10.64.48.136
 rpc_address: 10.64.48.136
 rpc_interface: eth0
-#  c:
-#jmx_port: 7191
-#listen_address: 10.64.48.137
-#rpc_address: 10.64.48.137
-#rpc_interface: eth0
+  c:
+jmx_port: 7191
+listen_address: 10.64.48.137
+rpc_address: 10.64.48.137
+rpc_interface: eth0

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

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

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

[MediaWiki-commits] [Gerrit] enable instance restbase1014-c.eqiad.wmnet - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: enable instance restbase1014-c.eqiad.wmnet
..


enable instance restbase1014-c.eqiad.wmnet

Bug: T134016
Change-Id: I4a1dfc4f099ea0e6ffa0e919a56065e941f2936a
---
M hieradata/hosts/restbase1014.yaml
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/hieradata/hosts/restbase1014.yaml 
b/hieradata/hosts/restbase1014.yaml
index 83d37b9..79a98a1 100644
--- a/hieradata/hosts/restbase1014.yaml
+++ b/hieradata/hosts/restbase1014.yaml
@@ -11,8 +11,8 @@
 listen_address: 10.64.48.136
 rpc_address: 10.64.48.136
 rpc_interface: eth0
-#  c:
-#jmx_port: 7191
-#listen_address: 10.64.48.137
-#rpc_address: 10.64.48.137
-#rpc_interface: eth0
+  c:
+jmx_port: 7191
+listen_address: 10.64.48.137
+rpc_address: 10.64.48.137
+rpc_interface: eth0

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

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

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

[MediaWiki-commits] [Gerrit] Set correct pointer color on click. - change (mediawiki...RevisionSlider)

2016-05-26 Thread Jakob (Code Review)

Jakob has uploaded a new change for review.

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

Change subject: Set correct pointer color on click.
..

Set correct pointer color on click.

This fixes a bug which caused the old revision pointer to appear yellow
when being moved on click after the pointers switched places.

Change-Id: Ibfa104e059e847c68667605b60efe5cbb003327f
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/46/290946/1

diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index c98a588..0e4fdea 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -129,7 +129,7 @@
pOld.setPosition( $clickedRev.data( 
'pos' ) );
}
 
-   self.resetPointerColorsBasedOnValues( 
pOld.getPosition(), pNew.getPosition() );
+   self.resetPointerColorsBasedOnValues( 
self.pointerOne.getPosition(), self.pointerTwo.getPosition() );
self.resetRevisionStylesBasedOnPointerPosition( 
$revisions );
self.alignPointers();
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfa104e059e847c68667605b60efe5cbb003327f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jakob 

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

[MediaWiki-commits] [Gerrit] Use key as default queue name - change (wikimedia...SmashPig)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Use key as default queue name
..


Use key as default queue name

Via config node reference voodoo.

Change-Id: I2858af6e770689fb0c41c64b77c701c53eed7dc7
---
M Core/DataStores/QueueConsumer.php
M Tests/QueueConsumerTest.php
M Tests/data/config_queue.yaml
3 files changed, 21 insertions(+), 14 deletions(-)

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



diff --git a/Core/DataStores/QueueConsumer.php 
b/Core/DataStores/QueueConsumer.php
index 1777524..02cb5a3 100644
--- a/Core/DataStores/QueueConsumer.php
+++ b/Core/DataStores/QueueConsumer.php
@@ -58,10 +58,7 @@
$this->timeLimit = $timeLimit;
$this->messageLimit = $messageLimit;
 
-   $config = Context::get()->getConfiguration();
-   $this->backend = $config->object(
-   "data-store/$queueName", true
-   );
+   $this->backend = self::getQueue( $queueName );
 
if ( !$this->backend instanceof AtomicReadBuffer ) {
throw new InvalidArgumentException( "Queue $queueName 
is not an AtomicReadBuffer" );
@@ -72,9 +69,7 @@
}
 
if ( $damagedQueue ) {
-   $this->damagedQueue = $config->object(
-   "data-store/$damagedQueue", true
-   );
+   $this->damagedQueue = self::getQueue( $damagedQueue );
 
if (
!$this->damagedQueue instanceof FifoQueueStore 
&&
@@ -128,4 +123,20 @@
$this->damagedQueue->push( $message );
}
}
+
+   public static function getQueue( $queueName ) {
+   $config = Context::get()->getConfiguration();
+   $key = "data-store/$queueName";
+
+   // Get a reference to the config node so we can mess with it
+   $node =& $config->val( $key, true );
+   if (
+   empty( $node['inst-args'] ) ||
+   empty( $node['inst-args'][0]['queue'] )
+   ) {
+   $node['inst-args'][0]['queue'] = $queueName;
+   }
+
+   return $config->object( $key, true );
+   }
 }
diff --git a/Tests/QueueConsumerTest.php b/Tests/QueueConsumerTest.php
index c0dd4c6..4dec67e 100644
--- a/Tests/QueueConsumerTest.php
+++ b/Tests/QueueConsumerTest.php
@@ -3,7 +3,6 @@
 namespace SmashPig\Tests;
 
 use PHPQueue\Interfaces\FifoQueueStore;
-use SmashPig\Core\Context;
 use SmashPig\Core\DataStores\QueueConsumer;
 
 class QueueConsumerTest extends BaseSmashPigUnitTestCase {
@@ -16,7 +15,7 @@
public function setUp() {
parent::setUp();
$this->setConfig( 'default', __DIR__ . 
'/data/config_queue.yaml' );
-   $this->queue = Context::get()->getConfiguration()->object( 
'data-store/test' );
+   $this->queue = QueueConsumer::getQueue( 'test' );
$this->queue->createTable( 'test' );
}
 
@@ -76,9 +75,7 @@
}
 
public function testDamagedQueue() {
-   $damagedQueue = Context::get()->getConfiguration()->object(
-   'data-store/damaged', true
-   );
+   $damagedQueue = QueueConsumer::getQueue( 'damaged' );
$damagedQueue->createTable('damaged'); // FIXME: should not need
 
$payload = array(
diff --git a/Tests/data/config_queue.yaml b/Tests/data/config_queue.yaml
index c75dc27..3a8a328 100644
--- a/Tests/data/config_queue.yaml
+++ b/Tests/data/config_queue.yaml
@@ -5,10 +5,9 @@
 inst-args:
 -
 connection_string: 'sqlite::memory:'
-queue: 'test'
+
 damaged:
 class: PHPQueue\Backend\PDO
 inst-args:
 -
 connection_string: 'sqlite::memory:'
-queue: 'damaged'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2858af6e770689fb0c41c64b77c701c53eed7dc7
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/SmashPig
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] Make pointer offset depend on whether pointer is the upper p... - change (mediawiki...RevisionSlider)

2016-05-26 Thread WMDE-leszek (Code Review)

WMDE-leszek has submitted this change and it was merged.

Change subject: Make pointer offset depend on whether pointer is the upper 
pointer.
..


Make pointer offset depend on whether pointer is the upper pointer.

Bug: T135837
Change-Id: I0ccc34751765f1f98dd29426d4efb3f3419f3932
---
M modules/ext.RevisionSlider.Pointer.js
M modules/ext.RevisionSlider.PointerView.js
M tests/RevisionSlider.PointerView.test.js
3 files changed, 24 insertions(+), 16 deletions(-)

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



diff --git a/modules/ext.RevisionSlider.Pointer.js 
b/modules/ext.RevisionSlider.Pointer.js
index e581c0d..f3a88c1 100644
--- a/modules/ext.RevisionSlider.Pointer.js
+++ b/modules/ext.RevisionSlider.Pointer.js
@@ -1,6 +1,6 @@
 ( function ( mw, $ ) {
-   var Pointer = function ( id, offset ) {
-   this.view = new mw.libs.revisionSlider.PointerView( this, id, 
offset );
+   var Pointer = function ( id ) {
+   this.view = new mw.libs.revisionSlider.PointerView( this, id );
};
 
$.extend( Pointer.prototype, {
diff --git a/modules/ext.RevisionSlider.PointerView.js 
b/modules/ext.RevisionSlider.PointerView.js
index ffc106c..ad8bbb1 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -1,8 +1,7 @@
 ( function ( mw, $ ) {
-   var PointerView = function ( pointer, id, offset ) {
+   var PointerView = function ( pointer, id ) {
this.pointer = pointer;
this.id = id;
-   this.offset = offset;
};
 
$.extend( PointerView.prototype, {
@@ -10,11 +9,6 @@
 * @type {string}
 */
id: '',
-
-   /**
-* @type {int}
-*/
-   offset: 0,
 
/**
 * @type {Pointer}
@@ -44,8 +38,12 @@
return this.$html;
},
 
+   isUpperPointer: function () {
+   return this.getElement().hasClass( 'upper-pointer' );
+   },
+
getOffset: function () {
-   return this.offset;
+   return this.isUpperPointer() ? 16 : 0;
},
 
animateTo: function ( posInPx, duration ) {
@@ -59,9 +57,9 @@
 
slideToSide: function ( slider, posBeforeSlider, duration ) {
if ( posBeforeSlider ) {
-   return this.animateTo( this.offset - 
slider.getView().revisionWidth + 20, duration ); // +20 otherwise pointer is in 
arrow
+   return this.animateTo( this.getOffset() - ( 
slider.getView().revisionWidth / 2 ), duration ); // +10 otherwise pointer is 
in arrow
} else {
-   return this.animateTo( ( 
slider.getRevisionsPerWindow() + 1 ) * slider.getView().revisionWidth - 
this.offset, duration );
+   return this.animateTo( ( 
slider.getRevisionsPerWindow() + 1 ) * slider.getView().revisionWidth + 
this.getOffset(), duration );
}
},
 
diff --git a/tests/RevisionSlider.PointerView.test.js 
b/tests/RevisionSlider.PointerView.test.js
index 34613a3..7b6c8db 100644
--- a/tests/RevisionSlider.PointerView.test.js
+++ b/tests/RevisionSlider.PointerView.test.js
@@ -7,11 +7,21 @@
assert.ok( ( new PointerView( null, 'revslider-pointer' ) 
).render().hasClass( 'pointer' ) );
} );
 
-   QUnit.test( 'Has offset', function ( assert ) {
-   var offset = 30,
-   pointer = new PointerView( null, 'revslider-pointer', 
offset );
+   QUnit.test( 'Is upper pointer', function ( assert ) {
+   var pv = new PointerView( null, 'revslider-pointer' );
+   pv.render();
+   assert.notOk( pv.isUpperPointer() );
 
-   assert.equal( pointer.getOffset(), offset );
+   pv.getElement().addClass( 'upper-pointer' );
+   assert.ok( pv.isUpperPointer() );
} );
 
+   QUnit.test( 'Has offset', function ( assert ) {
+   var pv = new PointerView( null, 'revslider-pointer' );
+   pv.render();
+   assert.equal( pv.getOffset(), 0 );
+
+   pv.getElement().addClass( 'upper-pointer' );
+   assert.equal( pv.getOffset(), 16 );
+   } );
 } )( mediaWiki );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ccc34751765f1f98dd29426d4efb3f3419f3932
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jakob 
Gerrit-Reviewer: Addshore

[MediaWiki-commits] [Gerrit] Add Graph and Kartographer to the main Editing channel - change (labs...grrrit)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Add Graph and Kartographer to the main Editing channel
..

Add Graph and Kartographer to the main Editing channel

Change-Id: I31c304232c28a65937a9150c0929067b3cee4401
---
M config.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/48/290948/1

diff --git a/config.yaml b/config.yaml
index 76f89f1..bb70e18 100644
--- a/config.yaml
+++ b/config.yaml
@@ -35,6 +35,8 @@
 mediawiki/extensions/Cite$:
 mediawiki/extensions/CiteThisPage:
 mediawiki/extensions/CodeEditor:
+mediawiki/extensions/Graph:
+mediawiki/extensions/Kartographer:
 mediawiki/extensions/Math:
 mediawiki/extensions/ParserFunctions:
 mediawiki/skins/apex:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31c304232c28a65937a9150c0929067b3cee4401
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Fix comment about two duplicated repos - change (labs...grrrit)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Fix comment about two duplicated repos
..

Fix comment about two duplicated repos

Change-Id: Ibd620d996d0bc5c541f25c2e5011eb98aa5ac8f4
---
M config.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/47/290947/1

diff --git a/config.yaml b/config.yaml
index 6a1b98b..76f89f1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -84,13 +84,13 @@
 mediawiki/extensions/Campaigns:
 mediawiki/extensions/EducationProgram:
 # These are sent to #mediawiki-visualeditor too
-mediawiki/extensions/Math:
-mediawiki/extensions/ParserFunctions:
 mediawiki/extensions/WikiEditor:
 # These are sent to #wikimedia-editing too
 mediawiki/extensions/Cite$:
 mediawiki/extensions/CiteThisPage:
 mediawiki/extensions/CodeEditor:
+mediawiki/extensions/Math:
+mediawiki/extensions/ParserFunctions:
 mediawiki/skins/Vector:
 # These are sent to #brickimedia too
 mediawiki/extensions/MediaWikiChat:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd620d996d0bc5c541f25c2e5011eb98aa5ac8f4
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Update cxserver to b431aef - change (mediawiki...deploy)

2016-05-26 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Update cxserver to b431aef
..

Update cxserver to b431aef

List of changes:
d42ca82 Fix contrib/systemd config
b3cc7bd registry: Remove non-exist en-hi Dictd pair
68a6d59 registry: Add Yandex MT for bn, gu, kn, pa, si and ta languages

Change-Id: Iefc89549c05c31c715331993914bb7a8f2cbecc0
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy 
refs/changes/49/290949/1

diff --git a/src b/src
index 4c5738c..b431aef 16
--- a/src
+++ b/src
-Subproject commit 4c5738c087228466829ab80e57e85ca85685a6ae
+Subproject commit b431aefb2ea909c588cd26602ef322be49c8a63d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefc89549c05c31c715331993914bb7a8f2cbecc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Use getPrefixedURL and getPrefixedDBkey instead of getText - change (mediawiki...EventBus)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Use getPrefixedURL and getPrefixedDBkey instead of getText
..


Use getPrefixedURL and getPrefixedDBkey instead of getText

The getText() method of a Title strips out the namespace prefix.
If we want to use the titles in change-prop, the easiest way is
to use titles in the prefixed db-key format. In that case we will
be able to 'just use' the field without additional processing.

Also, the titles which are used in the URIs for resource_change
event should be uri-encoded.

Change-Id: I132d0b7e70e1a992f0204361a71b715c2cd1655f
---
M EventBus.hooks.php
M extension.json
2 files changed, 11 insertions(+), 8 deletions(-)

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



diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index 5849c14..60455c1 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -71,7 +71,7 @@
 */
public static function onRevisionInsertComplete( $revision, $data, 
$flags ) {
$attrs = [];
-   $attrs['page_title'] = $revision->getTitle()->getText();
+   $attrs['page_title'] = 
$revision->getTitle()->getPrefixedDBkey();
$attrs['page_id'] = $revision->getPage();
$attrs['page_namespace'] = 
$revision->getTitle()->getNamespace();
$attrs['rev_id'] = $revision->getId();
@@ -111,7 +111,7 @@
$logEntry
) {
$attrs = [];
-   $attrs['title'] = $article->getTitle()->getText();
+   $attrs['title'] = $article->getTitle()->getPrefixedDBkey();
$attrs['page_id'] = $id;
$attrs['user_id'] = $user->getId();
$attrs['user_text'] = $user->getName();
@@ -136,7 +136,7 @@
 */
public static function onArticleUndelete( Title $title, $create, 
$comment, $oldPageId ) {
$attrs = [];
-   $attrs['title'] = $title->getText();
+   $attrs['title'] = $title->getPrefixedDBkey();
$attrs['new_page_id'] = $title->getArticleID();
if ( !is_null( $oldPageId ) && $oldPageId !== 0 ) {
$attrs['old_page_id'] = $oldPageId;
@@ -172,8 +172,8 @@
$newid, $reason, Revision $newRevision
) {
$attrs = [];
-   $attrs['new_title'] = $newtitle->getText();
-   $attrs['old_title'] = $title->getText();
+   $attrs['new_title'] = $newtitle->getPrefixedDBkey();
+   $attrs['old_title'] = $title->getPrefixedDBkey();
$attrs['page_id'] = $oldid;
$attrs['new_revision_id'] = $newRevision->getId();
$attrs['old_revision_id'] = $newRevision->getParentId();
@@ -240,7 +240,9 @@
public static function onArticlePurge( $wikiPage ) {
global $wgCanonicalServer, $wgArticlePath;
// The $wgArticlePath contains '$1' string where the article 
title should appear.
-   $uri = $wgCanonicalServer . str_replace( '$1', 
$wikiPage->getTitle()->getText(), $wgArticlePath );
+   $title = $wikiPage->getTitle()->getPrefixedURL();
+   $uri = $wgCanonicalServer . str_replace( '$1', $title, 
$wgArticlePath );
+
$event = self::createEvent( $uri, 'resource_change', [
'tags' => [ 'purge' ]
] );
@@ -278,7 +280,8 @@
// In case of a null edit the status revision value will be null
if ( is_null( $status->getValue()['revision'] ) ) {
// The $wgArticlePath contains '$1' string where the 
article title should appear.
-   $uri = $wgCanonicalServer . str_replace( '$1', 
$article->getTitle()->getText(), $wgArticlePath );
+   $title = $article->getTitle()->getPrefixedURL();
+   $uri = $wgCanonicalServer . str_replace( '$1', $title, 
$wgArticlePath );
$event = self::createEvent( $uri, 'resource_change', [
'tags' => [ 'null_edit' ]
] );
diff --git a/extension.json b/extension.json
index 7ca6de3..be89bd7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "EventBus",
-   "version": "0.2.5",
+   "version": "0.2.6",
"author": [
"Eric Evans"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I132d0b7e70e1a992f0204361a71b715c2cd1655f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac

[MediaWiki-commits] [Gerrit] Close nav menu as soon as Random is tapped. - change (apps...wikipedia)

2016-05-26 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Close nav menu as soon as Random is tapped.
..

Close nav menu as soon as Random is tapped.

Bug: T135448
Change-Id: Ic5467be50abd4fc38957c0a2dc38463127fade10
---
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java 
b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
index 776334a..f47f88f 100644
--- a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
+++ b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
@@ -104,6 +104,7 @@
 break;
 case R.id.nav_item_random:
 activity.getRandomHandler().doVisitRandomArticle();
+activity.closeNavDrawer();
 funnel.logRandom();
 break;
 case R.id.nav_item_donate:

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

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

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

[MediaWiki-commits] [Gerrit] Add Graph and Kartographer to the main Editing channel - change (labs...grrrit)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Add Graph and Kartographer to the main Editing channel
..


Add Graph and Kartographer to the main Editing channel

Change-Id: I31c304232c28a65937a9150c0929067b3cee4401
---
M config.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/config.yaml b/config.yaml
index 76f89f1..bb70e18 100644
--- a/config.yaml
+++ b/config.yaml
@@ -35,6 +35,8 @@
 mediawiki/extensions/Cite$:
 mediawiki/extensions/CiteThisPage:
 mediawiki/extensions/CodeEditor:
+mediawiki/extensions/Graph:
+mediawiki/extensions/Kartographer:
 mediawiki/extensions/Math:
 mediawiki/extensions/ParserFunctions:
 mediawiki/skins/apex:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31c304232c28a65937a9150c0929067b3cee4401
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix comment about two duplicated repos - change (labs...grrrit)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix comment about two duplicated repos
..


Fix comment about two duplicated repos

Change-Id: Ibd620d996d0bc5c541f25c2e5011eb98aa5ac8f4
---
M config.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/config.yaml b/config.yaml
index 6a1b98b..76f89f1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -84,13 +84,13 @@
 mediawiki/extensions/Campaigns:
 mediawiki/extensions/EducationProgram:
 # These are sent to #mediawiki-visualeditor too
-mediawiki/extensions/Math:
-mediawiki/extensions/ParserFunctions:
 mediawiki/extensions/WikiEditor:
 # These are sent to #wikimedia-editing too
 mediawiki/extensions/Cite$:
 mediawiki/extensions/CiteThisPage:
 mediawiki/extensions/CodeEditor:
+mediawiki/extensions/Math:
+mediawiki/extensions/ParserFunctions:
 mediawiki/skins/Vector:
 # These are sent to #brickimedia too
 mediawiki/extensions/MediaWikiChat:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd620d996d0bc5c541f25c2e5011eb98aa5ac8f4
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] CommonSettings: cleanup temp cache file if rename fails - change (operations/mediawiki-config)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: CommonSettings: cleanup temp cache file if rename fails
..


CommonSettings: cleanup temp cache file if rename fails

This failure will only happen if there is a permissions issue, but if
that happens on live server leaving the temp file on disk could lead to
resource exhaustion.

Bug: T136258
Change-Id: I3c5fd0995470e9242df333d2d7a7b188a33dc4f8
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 23180a7..32df79a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -186,7 +186,10 @@
@mkdir( '/tmp/mw-cache-' . $wmgVersionNumber );
$tmpFile = tempnam( '/tmp/', "conf-$wmgVersionNumber-$wgDBname" );
if ( $tmpFile && file_put_contents( $tmpFile, serialize( $globals ) ) ) 
{
-   rename( $tmpFile, $filename );
+   if ( !rename( $tmpFile, $filename ) ) {
+   // T136258: Rename failed, cleanup temp file
+   unlink( $tmpFile );
+   };
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c5fd0995470e9242df333d2d7a7b188a33dc4f8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move druid entries into analytics vlans - change (operations/dns)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Move druid entries into analytics vlans
..


Move druid entries into analytics vlans

Bug: T134275
Change-Id: I6984fff38bab95a22b56a0f99ec409c1cffcc448
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 640c2ab..f7bb9c8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -321,7 +321,6 @@
 126 1H IN PTR   aqs1004-a.eqiad.wmnet. ; cassandra instance
 127 1H IN PTR   aqs1004-b.eqiad.wmnet. ; cassandra instance
 162 1H IN PTR   logstash1004.eqiad.wmnet.
-163 1H IN PTR   druid1001.eqiad.wmnet.
 164 1H IN PTR   strontium.eqiad.wmnet.
 165 1H IN PTR   dbproxy1001.eqiad.wmnet.
 166 1H IN PTR   dbproxy1002.eqiad.wmnet.
@@ -413,8 +412,10 @@
 19  1H IN PTR   analytics1056.eqiad.wmnet.
 20  1H IN PTR   analytics1057.eqiad.wmnet.
 
+101 1H IN PTR   druid1001.eqiad.wmnet.
 102 1H IN PTR   stat1002.eqiad.wmnet.
 104 1H IN PTR   stat1004.eqiad.wmnet.
+
 
 ; 10.64.16.0/22 - private1-b-eqiad
 $ORIGIN 16.64.{{ zonename }}.
@@ -773,7 +774,6 @@
 109 1H IN PTR   elastic1041.eqiad.wmnet.
 110 1H IN PTR   elastic1042.eqiad.wmnet.
 111 1H IN PTR   elastic1043.eqiad.wmnet.
-112 1H IN PTR   druid1002.eqiad.wmnet.
 113 1H IN PTR   db1087.eqiad.wmnet.
 114 1H IN PTR   db1088.eqiad.wmnet.
 115 1H IN PTR   db1089.eqiad.wmnet.
@@ -865,6 +865,7 @@
 2   1H IN PTR   ae3-1022.cr1-eqiad.wikimedia.org.
 3   1H IN PTR   ae3-1022.cr2-eqiad.wikimedia.org.
 
+102 1H IN PTR   druid1002.eqiad.wmnet.
 103 1H IN PTR   stat1003.eqiad.wmnet.
 
 114 1H IN PTR   kafka1014.eqiad.wmnet.
@@ -1079,7 +1080,6 @@
 144 1H  IN PTR  elastic1046.eqiad.wmnet.
 145 1H  IN PTR  elastic1047.eqiad.wmnet.
 146 1H  IN PTR  aqs1006.eqiad.wmnet.
-147 1H  IN PTR  druid1003.eqiad.wmnet.
 148 1H  IN PTR  aqs1006-a.eqiad.wmnet. ; cassandra instance
 149 1H  IN PTR  aqs1006-b.eqiad.wmnet. ; cassandra instance
 150 1H  IN PTR  db1091.eqiad.wmnet.
@@ -1122,6 +1122,8 @@
 24  1H IN PTR   analytics1044.eqiad.wmnet.
 25  1H IN PTR   analytics1045.eqiad.wmnet.
 
+103 1H  IN PTR  druid1003.eqiad.wmnet.
+
 ; 10.65.0.0/16 is eqiad management network
 
 $ORIGIN 65.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 47a9b54..2f7726d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -330,9 +330,9 @@
 dbstore1001 1H  IN A10.64.48.17
 dbstore1002 1H  IN A10.64.48.18
 d-i-test1H  IN A10.64.32.201
-druid1001   1H  IN A10.64.0.163
-druid1002   1H  IN A10.64.32.112
-druid1003   1H  IN A10.64.48.147
+druid1001   1H  IN A10.64.5.101
+druid1002   1H  IN A10.64.36.102
+druid1003   1H  IN A10.64.53.103
 elastic1001 1H  IN A10.64.0.108
 elastic1002 1H  IN A10.64.0.109
 elastic1003 1H  IN A10.64.0.110

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6984fff38bab95a22b56a0f99ec409c1cffcc448
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Do not include public keys in keyholder check - change (operations/puppet)

2016-05-26 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: Do not include public keys in keyholder check
..

Do not include public keys in keyholder check

Change-Id: I645c1151a05df2e2447e0ff1bf62e9ebe9815878
---
M modules/keyholder/files/check_keyholder
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/290966/1

diff --git a/modules/keyholder/files/check_keyholder 
b/modules/keyholder/files/check_keyholder
index 93f0eb3..448d645 100755
--- a/modules/keyholder/files/check_keyholder
+++ b/modules/keyholder/files/check_keyholder
@@ -5,7 +5,7 @@
 
 configured_keys() {
   # Get a sorted list of all key files in /etc/keyholder.d
-  /usr/bin/find /etc/keyholder.d -type f 2>/dev/null | /usr/bin/sort
+  /usr/bin/find /etc/keyholder.d -type f -not -name '*.pub' 2>/dev/null | 
/usr/bin/sort
 }
 
 active_keys() {

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

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

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/es2.x' - change (mediawiki...CirrusSearch)

2016-05-26 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Merge remote-tracking branch 'origin/es2.x'
..

Merge remote-tracking branch 'origin/es2.x'

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b28392d772571024eb3303218c06bdecde36a48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: es2.x
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Fix key name in scap::target - change (operations/puppet)

2016-05-26 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: Fix key name in scap::target
..

Fix key name in scap::target

Change-Id: I23b0939ba51e0442be08931fd5f3d5c661ed01cb
---
M modules/scap/manifests/target.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/290973/1

diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp
index 8479ca4..e583413 100644
--- a/modules/scap/manifests/target.pp
+++ b/modules/scap/manifests/target.pp
@@ -78,6 +78,8 @@
 }
 }
 if !defined(Ssh::Userkey[$deploy_user]) {
+$key_name_safe = regsubst($key_name, '\W', '_', 'G')
+
 ssh::userkey { $deploy_user:
 ensure  => 'present',
 content => secret("keyholder/${key_name}.pub"),

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

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

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

[MediaWiki-commits] [Gerrit] Use insertContent with templates when range is collapsed - change (mediawiki...VisualEditor)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Use insertContent with templates when range is collapsed
..

Use insertContent with templates when range is collapsed

We may be trying to insert a block into a paragraph. fixUpInsertion
handles this, but not if use a replace transactions.

Bug: T136279
Change-Id: I1401da52676e79f38ef835a32d2c76004b75fb4e
(cherry picked from commit bc3edc77124cb7caed656bbdd0dd1a73ddcca762)
---
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
1 file changed, 20 insertions(+), 16 deletions(-)


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

diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index ce98bd2..8dbd870 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -65,24 +65,28 @@
nodeClass = ve.dm.MWTransclusionNode;
 
function insertNode( isInline ) {
-   // Generate a replacement transaction instead of using 
surfaceFragment.insert (which
-   // generates a removal and insertion) as blanking the 
reference triggers T135127.
-   // TODO: Once T135127 is fixed, revert to using 
surfaceFragment.insert.
var type = isInline ? nodeClass.static.inlineType : 
nodeClass.static.blockType,
-   tx = ve.dm.Transaction.newFromReplacement(
-   surfaceFragment.getDocument(),
-   
surfaceFragment.getSelection().getCoveringRange(),
-   [
-   {
-   type: type,
-   attributes: {
-   mw: 
model.getPlainObject()
-   }
-   },
-   { type: '/' + type }
-   ]
+   range = 
surfaceFragment.getSelection().getCoveringRange(),
+   data = [
+   {
+   type: type,
+   attributes: {
+   mw: 
model.getPlainObject()
+   }
+   },
+   { type: '/' + type }
+   ];
+
+   if ( range.isCollapsed() ) {
+   surfaceFragment.insertContent( data );
+   } else {
+   // Generate a replacement transaction instead 
of using surfaceFragment.insertContent
+   // (which generates a removal and insertion) as 
blanking a reference triggers T135127.
+   // TODO: Once T135127 is fixed, revert to using 
surfaceFragment.insert.
+   surfaceFragment.getSurface().change(
+   ve.dm.Transaction.newFromReplacement( 
surfaceFragment.getDocument(), range, data )
);
-   surfaceFragment.getSurface().change( tx );
+   }
deferred.resolve();
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1401da52676e79f38ef835a32d2c76004b75fb4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 

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

[MediaWiki-commits] [Gerrit] Expect specific output from sniffs - change (mediawiki...codesniffer)

2016-05-26 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Expect specific output from sniffs
..

Expect specific output from sniffs

Many of these files were testing multiple things, but the only thing
we asserted was that the file had at least one failure. Patch adds
.expect files for all tests so we can assert that it fails in all the
cases we expect it to fail. I have not manually reviewed the expect
files to determine if all the things that were supposed to be failing
actually do.

.expect files were generated with:

find MediaWiki/Tests/files/ -iname '*.php' -print0 | \
xargs -0 -I{} bash -c 'vendor/bin/phpcs --standard=MediaWiki {} > {}.expect'

Change-Id: Idd06a613599b2ac9f88bcdb68c558ead29ee2109
---
M MediaWiki/Tests/MediaWikiStandardTest.php
A MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php.expect
A MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_pass.php.expect
A 
MediaWiki/Tests/files/ControlStructures/assignment_in_control_structures_fail.php.expect
A 
MediaWiki/Tests/files/ControlStructures/assignment_in_control_structures_pass.php.expect
A MediaWiki/Tests/files/ControlStructures/if_else_structure_fail.php.expect
A MediaWiki/Tests/files/ControlStructures/if_else_structure_pass.php.expect
A 
MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php.expect
A 
MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_pass.php.expect
A 
MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_fail.php.expect
A 
MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_pass.php.expect
A MediaWiki/Tests/files/NamingConventions/case_global_name_fail.php.expect
A MediaWiki/Tests/files/NamingConventions/wf_global_function_fail.php.expect
A MediaWiki/Tests/files/NamingConventions/wf_global_function_pass.php.expect
A MediaWiki/Tests/files/NamingConventions/wf_namespace_pass.php.expect
A MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php.expect
A MediaWiki/Tests/files/NamingConventions/wg_global_name_fail.php.expect
A MediaWiki/Tests/files/Usage/dir_usage_fail.php.expect
A MediaWiki/Tests/files/Usage/dir_usage_pass.php.expect
A MediaWiki/Tests/files/Usage/goto_usage_fail.php.expect
A MediaWiki/Tests/files/Usage/goto_usage_pass.php.expect
A MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php.expect
A 
MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_heredoc_pass.php.expect
A MediaWiki/Tests/files/VariableAnalysis/used_global_variables_pass.php.expect
A 
MediaWiki/Tests/files/VariableAnalysis/used_global_variables_quote_string_pass.php.expect
A 
MediaWiki/Tests/files/VariableAnalysis/used_global_variables_regression_pass.php.expect
A MediaWiki/Tests/files/WhiteSpace/multiple_empty_lines_fail.php.expect
A MediaWiki/Tests/files/WhiteSpace/multiple_empty_lines_pass.php.expect
A MediaWiki/Tests/files/WhiteSpace/short_array_fail.php.expect
A 
MediaWiki/Tests/files/WhiteSpace/space_after_delim_singleline_comment_fail.php.expect
A 
MediaWiki/Tests/files/WhiteSpace/space_after_delim_singleline_comment_pass.php.expect
A MediaWiki/Tests/files/WhiteSpace/space_before_parens_fail.php.expect
A MediaWiki/Tests/files/WhiteSpace/space_before_parens_pass.php.expect
A MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis_fail.php.expect
A MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis_pass.php.expect
A MediaWiki/Tests/files/generic_namespace_pass.php.expect
A MediaWiki/Tests/files/generic_pass.php.expect
37 files changed, 299 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/75/290975/1

diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index d556d01..44f57a3 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -40,7 +40,8 @@
/**
 * testFiles
 *
-* Run simple syntax checks, if the filename ends with pass.php - 
expect it to pass
+* Run simple syntax checks, comparing the phpcs output for the test
+* file against an expected output.
 */
public static function testProvider() {
$tests = [];
@@ -54,11 +55,13 @@
}
 
$file = $dir->getPathname();
-   $expectPass = ( substr( $file, -8 ) === 'pass.php' );
+   if ( substr( $file, -4 ) !== '.php' ) {
+   continue;
+   }
$tests[] = [
$file,
$standard,
-   $expectPass
+   "$file.expect"
];
}
return $tests;
@@ -71,23 +74,46 @@
 *

[MediaWiki-commits] [Gerrit] Fix key name in scap::target - change (operations/puppet)

2016-05-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Fix key name in scap::target
..


Fix key name in scap::target

Change-Id: I23b0939ba51e0442be08931fd5f3d5c661ed01cb
---
M modules/scap/manifests/target.pp
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp
index 8479ca4..062981c 100644
--- a/modules/scap/manifests/target.pp
+++ b/modules/scap/manifests/target.pp
@@ -78,9 +78,11 @@
 }
 }
 if !defined(Ssh::Userkey[$deploy_user]) {
+$key_name_safe = regsubst($key_name, '\W', '_', 'G')
+
 ssh::userkey { $deploy_user:
 ensure  => 'present',
-content => secret("keyholder/${key_name}.pub"),
+content => secret("keyholder/${key_name_safe}.pub"),
 }
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23b0939ba51e0442be08931fd5f3d5c661ed01cb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into es2.x - change (mediawiki...Elastica)

2016-05-26 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Merge remote-tracking branch 'origin/master' into es2.x
..

Merge remote-tracking branch 'origin/master' into es2.x

Change-Id: I9e7d3a3f4e1d1876fa42cf00f79639ad02877005
---
M .gitreview
M composer.json
2 files changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/.gitreview b/.gitreview
index e72671e..2a40129 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Elastica.git
-defaultbranch=es2.x
+defaultbranch=master
 defaultrebase=0
diff --git a/composer.json b/composer.json
index ac0f94c..e2b4ee4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,6 @@
],
"require": {
"php": ">=5.5.9",
-<<< HEAD   (3ffdde Bump Elastica requirement to 3.3.1 for es2.x)
"ruflin/elastica": "3.1.1"
-===
-   "ruflin/elastica": "2.3.1"
->>> BRANCH (1b0763 Move iterateOverScroll from Cirrus to Elastica)
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e7d3a3f4e1d1876fa42cf00f79639ad02877005
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Elastica
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Track why mentions didn't happen - change (mediawiki...Echo)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Track why mentions didn't happen
..


Track why mentions didn't happen

Right now we don't actually know how many times
each of these cases happen so add some basic tracking
so we can make some informed decisions.

Bug: T135719
Change-Id: Id4d519aefe96ecca2e3c51dd1c8128de70d0caac
---
M includes/DiscussionParser.php
1 file changed, 20 insertions(+), 7 deletions(-)

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



diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 909723b..4a8e636 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -144,26 +144,39 @@
}
$mentionedUsers = array();
$count = 0;
+   $stats = RequestContext::getMain()->getStats();
 
foreach ( $links[NS_USER] as $dbk => $page_id ) {
$user = User::newFromName( $dbk );
 
// we should not add user to 'mention' notification 
list if
// 1. the user name is not valid
-   // 2. the user mentions themselves
-   // 3. the user is the owner of the talk page
-   // 4. user is anonymous
-   if (
-   !$user || $user->isAnon() || $user->getId() == 
$revision->getUser() ||
-   ( $title->getNamespace() === NS_USER_TALK && 
$title->getDBkey() === $dbk )
-   ) {
+   if ( !$user ) {
+   $stats->increment( 
'echo.event.mention.error.invalidUser' );
continue;
}
+   // 2. the user mentions themselves
+   if ( $user->getId() == $revision->getUser() ) {
+   $stats->increment( 
'echo.event.mention.error.sameUser' );
+   continue;
+   }
+   // 3. the user is the owner of the talk page
+   if ( $title->getNamespace() === NS_USER_TALK && 
$title->getDBkey() === $dbk ) {
+   $stats->increment( 
'echo.event.mention.error.ownPage' );
+   continue;
+   }
+   // 4. user is anonymous
+   if ( $user->isAnon() ) {
+   $stats->increment( 
'echo.event.mention.error.anonUser' );
+   continue;
+   }
+
$mentionedUsers[$user->getId()] = $user->getId();
$count++;
// If more than 50 users are being pinged this is 
likely a spam/attack vector
// Don't send any mention notifications.
if ( $count > 50 ) {
+   $stats->increment( 
'echo.event.mention.error.tooMany' );
return;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4d519aefe96ecca2e3c51dd1c8128de70d0caac
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gabriel Birke 
Gerrit-Reviewer: Jakob 
Gerrit-Reviewer: Kai Nissen (WMDE) 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use Revision::RAW when checking whether the author of a revi... - change (mediawiki...Echo)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Use Revision::RAW when checking whether the author of a 
revision mentioned themselves
..


Use Revision::RAW when checking whether the author of a revision mentioned 
themselves

It's probably not realistically possible for a revision to be oversighted
by the time generateMentionEvents() runs, but for consistency
we should be using RAW here.

Change-Id: If73b4abe5fbae5cadb75c5e09137299873f2a764
---
M includes/DiscussionParser.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 4a8e636..86a416b 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -156,7 +156,7 @@
continue;
}
// 2. the user mentions themselves
-   if ( $user->getId() == $revision->getUser() ) {
+   if ( $user->getId() == $revision->getUser( 
Revision::RAW ) ) {
$stats->increment( 
'echo.event.mention.error.sameUser' );
continue;
}

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

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

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

[MediaWiki-commits] [Gerrit] Add Feed Activity, Fragment, & card aggregator UI - change (apps...wikipedia)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Add Feed Activity, Fragment, & card aggregator UI
..


Add Feed Activity, Fragment, & card aggregator UI

• Add FeedActivity and wire it to the nav drawer. An Activity is used
  to help enforce separation of concerns. It's sparse and may be removed
  for a pure View or Fragment implementation at any time.

• Add bare bones FeedFragment with a FeedView and a button to add
  dummy cards.

• Add supporting components (a couple placeholders and
  AutoFitRecyclerView).

Bug: T129078
Change-Id: Icd6f10097d6b32f40f27b1409ead4ec803acb7ea
---
M app/src/main/AndroidManifest.xml
A app/src/main/java/org/wikipedia/feed/FeedActivity.java
A app/src/main/java/org/wikipedia/feed/FeedFragment.java
A app/src/main/java/org/wikipedia/feed/model/FeedCard.java
A app/src/main/java/org/wikipedia/feed/view/FeedCardView.java
A app/src/main/java/org/wikipedia/feed/view/FeedView.java
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
A app/src/main/java/org/wikipedia/views/AutoFitRecyclerView.java
A app/src/main/java/org/wikipedia/views/DefaultViewHolder.java
A app/src/main/res/layout/fragment_feed.xml
A app/src/main/res/layout/view_feed.xml
A app/src/main/res/layout/view_feed_card.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/strings_no_translate.xml
15 files changed, 426 insertions(+), 5 deletions(-)

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



diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d34780..dcfbd88 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,6 +54,11 @@
 
 
+
+
  {
+public static Intent newIntent(Context context) {
+return new Intent(context, FeedActivity.class);
+}
+
+@Override protected FeedFragment createFragment() {
+return FeedFragment.newInstance();
+}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
new file mode 100644
index 000..69c6244
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -0,0 +1,63 @@
+package org.wikipedia.feed;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.wikipedia.R;
+import org.wikipedia.activity.CallbackFragment;
+import org.wikipedia.activity.FragmentUtil;
+import org.wikipedia.feed.model.FeedCard;
+import org.wikipedia.feed.view.FeedView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+
+public class FeedFragment extends Fragment
+implements CallbackFragment {
+@BindView(R.id.fragment_feed_feed) FeedView feedView;
+private Unbinder unbinder;
+
+@NonNull private final List cards = new ArrayList<>();
+
+public static FeedFragment newInstance() {
+return new FeedFragment();
+}
+
+@Nullable @Override public View onCreateView(LayoutInflater inflater,
+ @Nullable ViewGroup container,
+ @Nullable Bundle 
savedInstanceState) {
+super.onCreateView(inflater, container, savedInstanceState);
+
+View view = inflater.inflate(R.layout.fragment_feed, container, false);
+
+unbinder = ButterKnife.bind(this, view);
+feedView.set(cards);
+
+return view;
+}
+
+@Override public void onDestroyView() {
+unbinder.unbind();
+super.onDestroyView();
+}
+
+@Override @Nullable public Callback getCallback() {
+return FragmentUtil.getCallback(this, Callback.class);
+}
+
+// TODO: [Feed] remove.
+@OnClick(R.id.fragment_feed_add_card) void addCard() {
+cards.add(new FeedCard());
+feedView.update();
+}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/model/FeedCard.java 
b/app/src/main/java/org/wikipedia/feed/model/FeedCard.java
new file mode 100644
index 000..f8fabe6
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/model/FeedCard.java
@@ -0,0 +1,37 @@
+package org.wikipedia.feed.model;
+
+import android.support.annotation.ColorInt;
+
+import java.util.Random;
+
+public class FeedCard {
+// TODO: [Feed] remove this fun data and fill in model data.
+private final int height;
+@ColorInt private final int color;
+
+public FeedCard() {
+height = randomHeight();
+color = randomColor();
+}
+
+public int height() {
+return height;
+}

[MediaWiki-commits] [Gerrit] Close nav menu as soon as Random is tapped. - change (apps...wikipedia)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Close nav menu as soon as Random is tapped.
..


Close nav menu as soon as Random is tapped.

Bug: T135448
Change-Id: Ic5467be50abd4fc38957c0a2dc38463127fade10
---
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java 
b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
index 776334a..f47f88f 100644
--- a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
+++ b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
@@ -104,6 +104,7 @@
 break;
 case R.id.nav_item_random:
 activity.getRandomHandler().doVisitRandomArticle();
+activity.closeNavDrawer();
 funnel.logRandom();
 break;
 case R.id.nav_item_donate:

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

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

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

[MediaWiki-commits] [Gerrit] Merge es2.x into master - change (mediawiki/vendor)

2016-05-26 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Merge es2.x into master
..

Merge es2.x into master

Change-Id: I8560cd5c4536267f22342eaea1726feb9893dc87
---
M .gitreview
M composer.lock
2 files changed, 3 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/85/290985/1

diff --git a/.gitreview b/.gitreview
index 1aa40cd..e4d6d34 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/vendor.git
-defaultbranch=es2.x
+defaultbranch=master
 defaultrebase=0
diff --git a/composer.lock b/composer.lock
index f0b1459..eeafbf0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-<<< HEAD   (19639d Merge branch 'master' into es2.x)
-"hash": "412c73ef489449a139a67079a8be51e5",
-"content-hash": "699128f236799508862ecd32bc4f8902",
-===
-"hash": "b4e1317390ac96c9e2e5174390879f50",
-"content-hash": "fd539bcbde44e20ed005eecf15c4e691",
->>> BRANCH (e3a58e Update OOjs UI to v0.17.3)
+"hash": "7253faa6e78c67e17f3e0ed6b88e2c0c",
+"content-hash": "fa3b66688dd61115f4e93a380b664a6d",
 "packages": [
 {
 "name": "composer/semver",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8560cd5c4536267f22342eaea1726feb9893dc87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: EBernhardson 

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

[MediaWiki-commits] [Gerrit] keyholder key cleanup - change (operations/puppet)

2016-05-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: keyholder key cleanup
..


keyholder key cleanup

* Clean up the mess that is scap::target and keyholder::agent
* Make ssh_agent_proxy look up keys by name instead of fingerprint
** This avoids needing to store fingerprints in puppet manifests
* password-protected key test is now optional and skipped on beta

Bug: T132747

Change-Id: Id298a3e0f12e31afd7ea83970e192330ffbd4243
---
M hieradata/common/scap/server.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/phabricator/common.yaml
M modules/eventlogging/manifests/deployment/target.pp
M modules/keyholder/files/keyholder
M modules/keyholder/files/ssh-agent-proxy
M modules/keyholder/manifests/agent.pp
M modules/keyholder/manifests/init.pp
D modules/keyholder/manifests/private_key.pp
M modules/mediawiki/manifests/users.pp
D modules/phabricator/manifests/deployment/target.pp
M modules/phabricator/manifests/init.pp
M modules/role/manifests/deployment/mediawiki.pp
M modules/role/manifests/snapshot/deployment.pp
M modules/scap/manifests/server.pp
M modules/scap/manifests/target.pp
M modules/service/manifests/deploy/scap.pp
M modules/service/manifests/node.pp
M modules/service/manifests/uwsgi.pp
M modules/zotero/manifests/init.pp
20 files changed, 155 insertions(+), 206 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/common/scap/server.yaml 
b/hieradata/common/scap/server.yaml
index 260e18f..03826ad 100644
--- a/hieradata/common/scap/server.yaml
+++ b/hieradata/common/scap/server.yaml
@@ -13,26 +13,19 @@
   phabricator:
 trusted_groups:
   - deploy-phabricator
-key_fingerprint: 39:b3:2c:a7:b2:80:65:ff:0c:97:e1:22:88:6c:59:10
-key_secret: phabricator/phab_deploy_private_key
 
   eventlogging:
 trusted_groups:
   - eventlogging-admins
-key_fingerprint: b6:4e:1a:1b:4b:70:ef:91:31:cd:a3:18:9a:ca:41:44
 
   deploy-service:
 trusted_groups:
   - deploy-service
   - aqs-admins
-key_fingerprint: 6d:54:92:8b:39:10:f5:9b:84:40:36:ef:3c:9a:6d:d8
-key_file: servicedeploy_rsa
 
-  # Note: dumpsdeploy normally would have ops as trusted group,
-  # but ops is added implicitly anyway
   dumpsdeploy:
-key_fingerprint: 86:c9:17:ab:b7:00:79:b5:8a:c5:b5:ee:29:24:c9:2f
-
+trusted_groups:
+  - ops
 
 # scap::source declarations.  These are created
 # by the scap::server class.  Each source listed here
@@ -64,4 +57,3 @@
   # cxserver is the ContentTranslation server.
   cxserver/deploy:
 repository: cxserver/deploy
-
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index d7edbe9..ba85571 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -216,20 +216,14 @@
   phabricator:
 trusted_groups:
   - project-%{::labsproject}
-key_fingerprint: 39:b3:2c:a7:b2:80:65:ff:0c:97:e1:22:88:6c:59:10
-key_secret: phabricator/phab_deploy_private_key
 
   eventlogging:
 trusted_groups:
   - project-%{::labsproject}
-key_fingerprint: 02:9b:99:e2:f0:16:70:a3:d2:5a:e6:02:a3:73:0e:b0
 
   deploy-service:
 trusted_groups:
   - deploy-service
-key_fingerprint: 6d:54:92:8b:39:10:f5:9b:84:40:36:ef:3c:9a:6d:d8
-key_file: servicedeploy_rsa
-
 
 # deployment-prep scap::source declarations.  These are created
 # by the scap::server class.  Each source listed here
diff --git a/hieradata/labs/phabricator/common.yaml 
b/hieradata/labs/phabricator/common.yaml
index aa2496f..70043f3 100644
--- a/hieradata/labs/phabricator/common.yaml
+++ b/hieradata/labs/phabricator/common.yaml
@@ -2,4 +2,4 @@
   deployment:
 source:
   key_fingerprint: '36:75:c2:fa:34:02:c8:8c:ff:30:09:aa:f7:77:96:41'
-  trusted_group: 'project-phabricator'
+  trusted_groups: 'project-phabricator'
diff --git a/modules/eventlogging/manifests/deployment/target.pp 
b/modules/eventlogging/manifests/deployment/target.pp
index 07a46ea..6ecd1ae 100644
--- a/modules/eventlogging/manifests/deployment/target.pp
+++ b/modules/eventlogging/manifests/deployment/target.pp
@@ -41,11 +41,10 @@
 include eventlogging::dependencies
 
 scap::target { "eventlogging/${title}":
-package_name  => $package_name,
-deploy_user   => 'eventlogging',
-public_key_source => 
"puppet:///modules/eventlogging/deployment/eventlogging_rsa.pub.${::realm}",
-service_name  => $service_name,
-sudo_rules=> $sudo_rules,
-manage_user   => false,
+package_name => $package_name,
+deploy_user  => 'eventlogging',
+service_name => $service_name,
+sudo_rules   => $sudo_rules,
+manage_user  => false,
 }
 }
diff --git a/modules/keyholder/files/keyholder 
b/modules/keyholder/files/keyholder
index 942bbc1..7ad7fb3 100755
---

[MediaWiki-commits] [Gerrit] Do not include public keys in keyholder check - change (operations/puppet)

2016-05-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Do not include public keys in keyholder check
..


Do not include public keys in keyholder check

Change-Id: I645c1151a05df2e2447e0ff1bf62e9ebe9815878
---
M modules/keyholder/files/check_keyholder
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/keyholder/files/check_keyholder 
b/modules/keyholder/files/check_keyholder
index 93f0eb3..448d645 100755
--- a/modules/keyholder/files/check_keyholder
+++ b/modules/keyholder/files/check_keyholder
@@ -5,7 +5,7 @@
 
 configured_keys() {
   # Get a sorted list of all key files in /etc/keyholder.d
-  /usr/bin/find /etc/keyholder.d -type f 2>/dev/null | /usr/bin/sort
+  /usr/bin/find /etc/keyholder.d -type f -not -name '*.pub' 2>/dev/null | 
/usr/bin/sort
 }
 
 active_keys() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I645c1151a05df2e2447e0ff1bf62e9ebe9815878
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
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] Show a pointer cursor on revision wrappers. - change (mediawiki...RevisionSlider)

2016-05-26 Thread WMDE-leszek (Code Review)

WMDE-leszek has submitted this change and it was merged.

Change subject: Show a pointer cursor on revision wrappers.
..


Show a pointer cursor on revision wrappers.

Bug: T134993
Change-Id: I3412e03aba726fde6194b3cac88765655e69b8aa
---
M modules/ext.RevisionSlider.css
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 79bbf2a..279bebe 100755
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -48,6 +48,7 @@
 
 .revision-wrapper {
 position: absolute;
+cursor: pointer;
 z-index: 10;
 height: 140px;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3412e03aba726fde6194b3cac88765655e69b8aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jakob 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Gabriel Birke 
Gerrit-Reviewer: Jakob 
Gerrit-Reviewer: Kai Nissen (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add browserDisconnectTolerance to karma in grunt - change (mediawiki/core)

2016-05-26 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add browserDisconnectTolerance to karma in grunt
..

Add browserDisconnectTolerance to karma in grunt

Per fix that worked for
https://github.com/karma-runner/karma/issues/1514#issuecomment-210631797

Bug: T136188
Change-Id: If2000671d1ed0d8f6d68a04e7c72007d88a4268d
---
M Gruntfile.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/290952/1

diff --git a/Gruntfile.js b/Gruntfile.js
index a08db5c..c3d2af2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -69,7 +69,8 @@
singleRun: true,
autoWatch: false,
// Some tests in extensions don't yield for 
more than the default 10s (T89075)
-   browserNoActivityTimeout: 60 * 1000
+   browserNoActivityTimeout: 60 * 1000,
+   browserDisconnectTolerance: 10
},
main: {
browsers: [ 'Chrome' ]

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

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

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

[MediaWiki-commits] [Gerrit] Fix regression: text color in `.mw-search-result-data` - change (mediawiki/core)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix regression: text color in `.mw-search-result-data`
..


Fix regression: text color in `.mw-search-result-data`

Follow-up to I2ba04cc3ad9898c17fee3c65bb3bead834c3a1fd where `green` in
`.mw-search-result-data` was transcripted falsely into
`#0f0` instead of `#008000`.

Bug: T136175
Change-Id: I5d55718510650634a718d688a0e0698355097c6c
(cherry picked from commit aa6546f762abfb2962fa7ba874e6ec7c297ec6db)
---
M resources/src/mediawiki.special/mediawiki.special.search.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.special/mediawiki.special.search.css 
b/resources/src/mediawiki.special/mediawiki.special.search.css
index 1e99361..850957e 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.css
@@ -44,7 +44,7 @@
font-size: 108%;
 }
 .mw-search-result-data {
-   color: #0f0;
+   color: #008000;
font-size: 97%;
 }
 .mw-search-profile-tabs {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d55718510650634a718d688a0e0698355097c6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Provide missing license-lable / take 2 - change (mediawiki...SemanticForms)

2016-05-26 Thread Kghbln (Code Review)

Kghbln has uploaded a new change for review.

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

Change subject: Provide missing license-lable / take 2
..

Provide missing license-lable / take 2

* extension.json file also needs to have this information

Change-Id: Ic59cc7429dfb3e50a4bceb314b59ca30cb203b2e
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/55/290955/1

diff --git a/extension.json b/extension.json
index e250f91..d3524bb 100644
--- a/extension.json
+++ b/extension.json
@@ -10,6 +10,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Semantic_Forms;,
"descriptionmsg": "semanticforms-desc",
+   "license-name": "GPL-2.0+",
"type": "specialpage",
"callback": "SFHooks::registerExtension",
"ExtensionFunctions": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic59cc7429dfb3e50a4bceb314b59ca30cb203b2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Kghbln 

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

[MediaWiki-commits] [Gerrit] Fix links to page titles with plus signs. - change (apps...wikipedia)

2016-05-26 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Fix links to page titles with plus signs.
..

Fix links to page titles with plus signs.

Bug: T136223
Change-Id: I3a5bd2a4adba4e6f320de554264717a38d7a696c
---
M app/src/main/java/org/wikipedia/util/UriUtil.java
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/app/src/main/java/org/wikipedia/util/UriUtil.java 
b/app/src/main/java/org/wikipedia/util/UriUtil.java
index bca5ad7..e0c3f16 100644
--- a/app/src/main/java/org/wikipedia/util/UriUtil.java
+++ b/app/src/main/java/org/wikipedia/util/UriUtil.java
@@ -31,7 +31,11 @@
  */
 public static String decodeURL(String url) {
 try {
-return URLDecoder.decode(url, "UTF-8");
+// Before decoding, replace plus signs with the correct encoded 
character.
+// The JavaScript layer doesn't escape plus signs when passing 
data over
+// the Bridge.  However, the Java layer considers plus signs to be 
spaces,
+// so the encodings aren't symmetric for that single character.
+return URLDecoder.decode(url.replace("+", "%2B"), "UTF-8");
 } catch (UnsupportedEncodingException e) {
 // Inexplicable decoding problem. This shouldn't happen. Return 
the input.
 Log.d("Wikipedia", "URL decoding failed. String was: " + url);

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

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

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

[MediaWiki-commits] [Gerrit] Remove duplicate include contint::browsers - change (integration/config)

2016-05-26 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Remove duplicate include contint::browsers
..

Remove duplicate include contint::browsers

hashar updated it to allow it to be used in jessie and trusty so theres no
point in duplicating it. I3a9035998448a497c21363955b7d43da7fb76b6d

Change-Id: Id2aef4a89e199f7cdf774bb2ef617f51c83f0a62
---
M dib/puppet/ciimage.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/59/290959/1

diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index f2e0534..a2b1a4a 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -76,7 +76,6 @@
 
 if os_version('debian >= jessie') {
 include contint::packages::python
-include contint::browsers
 
 # services packages and -dev packages for npm modules compilation and test
 # run. NOTE: hiera must have: service::configuration::use_dev_pkgs: true

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up 3f456b1: Fix typo in function call - change (mediawiki...Math)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up 3f456b1: Fix typo in function call
..

Follow-up 3f456b1: Fix typo in function call

Bug: T132736
Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
---
M modules/ve-math/ve.ui.MWMathContextItem.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/70/290970/1

diff --git a/modules/ve-math/ve.ui.MWMathContextItem.js 
b/modules/ve-math/ve.ui.MWMathContextItem.js
index c278228..a247672 100644
--- a/modules/ve-math/ve.ui.MWMathContextItem.js
+++ b/modules/ve-math/ve.ui.MWMathContextItem.js
@@ -55,7 +55,7 @@
  * Handle inline edit button click events.
  */
 ve.ui.MWMathContextItem.prototype.onInlineEditButtonClick = function () {
-   this.context.getSurface().executeComamnd( 'mathInspector' );
+   this.context.getSurface().executeCommand( 'mathInspector' );
 };
 
 /* Registration */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: REL1_27
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Defer translation page update edit after translation unit de... - change (mediawiki...Translate)

2016-05-26 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Defer translation page update edit after translation unit 
deletion to a separate transaction
..

Defer translation page update edit after translation unit deletion to a 
separate transaction

Users can use tools which can mass delete (eg. Nuke) multiple translation units
in one request. This means onDeleteTranslationUnit() will do many edits to a
translation page (and do MessageGroupStats queries) many times if many
translation units belonging to one translation page was deleted in one
request. This is quite bad user experience and can also be slow for the user.

To avoid this, we are now deferring the update to a separate transaction after
the main transaction so that we can use the text that is after all the units
has been deleted. Additionally, we now use a queue-based system so that only 
one update
is done for each translation page in order to avoid doing unnecessary stats 
updates,
null edits and purges (and other secondary updates) to these pages.

I'm not sure whether this will work in all cases where users can do multiple 
deletions
in a single request but at least this works for Nuke which is what is used on 
Wikimedia
for doing batch deletions in one request.
This was suggested at 
https://meta.wikimedia.org/?oldid=15647503#Deleting_translations

Change-Id: I2df5411fb51b6e45888fb7333855cf5a75732af9
---
M tag/PageTranslationHooks.php
1 file changed, 23 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/78/290978/1

diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 1c93456..5a2c43b 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -981,17 +981,32 @@
return true;
}
 
+   // There could be interfaces which may allow mass deletion (eg. 
Nuke). Since they
+   // could delete many units in one request, it may do several 
unnecessary edits
+   // and cause several other unnecessary updates to be done 
slowing down the user.
+   // To avoid that, we push this to a separate transaction so 
that we can see the
+   // version that is after all the deletions has been done and we 
so we can do just one
+   // edit per translatable page after the current deletions has 
been done. This is sort
+   // of hackish but this is better user experience and is also 
more efficent.
+   static $queuedPages = array();
+   $target = $group->getTitle();
$langCode = $handle->getCode();
-   $id = $group->getId();
+   $targetPage = $target->getSubpage( $langCode 
)->getPrefixedText();
 
-   MessageGroupStats::clear( $handle );
-   MessageGroupStats::forItem( $id, $langCode );
+   if ( !in_array( $targetPage, $queuedPages ) ) {
+   $queuedPages[] = $targetPage;
 
-   if ( $handle->isDoc() ) {
-   return true;
+   $dbw = wfGetDB( DB_MASTER );
+   $dbw->onTransactionIdle( function () use ( $target, 
$handle, $langCode, $user, $reason ) {
+   $page = TranslatablePage::newFromTitle( $target 
);
+
+   MessageGroupStats::clear( $handle );
+   MessageGroupStats::forItem( 
$page->getMessageGroupId(), $langCode );
+
+   if ( !$handle->isDoc() ) {
+   self::updateTranslationPage( $page, 
$langCode, $user, 0, $reason );
+   }
+   } );
}
-
-   $page = TranslatablePage::newFromTitle( $group->getTitle() );
-   self::updateTranslationPage( $page, $langCode, $user, 0, 
$reason );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2df5411fb51b6e45888fb7333855cf5a75732af9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

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

[MediaWiki-commits] [Gerrit] Merge es2.x back into master - change (mediawiki/vendor)

2016-05-26 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Merge es2.x back into master
..

Merge es2.x back into master

Change-Id: I4625d2bc9f8518b2ef8b06572d647502164c2928
---
M .gitreview
M composer.lock
2 files changed, 3 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/79/290979/1

diff --git a/.gitreview b/.gitreview
index 1aa40cd..e4d6d34 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/vendor.git
-defaultbranch=es2.x
+defaultbranch=master
 defaultrebase=0
diff --git a/composer.lock b/composer.lock
index f0b1459..eeafbf0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-<<< HEAD   (19639d Merge branch 'master' into es2.x)
-"hash": "412c73ef489449a139a67079a8be51e5",
-"content-hash": "699128f236799508862ecd32bc4f8902",
-===
-"hash": "b4e1317390ac96c9e2e5174390879f50",
-"content-hash": "fd539bcbde44e20ed005eecf15c4e691",
->>> BRANCH (e3a58e Update OOjs UI to v0.17.3)
+"hash": "7253faa6e78c67e17f3e0ed6b88e2c0c",
+"content-hash": "fa3b66688dd61115f4e93a380b664a6d",
 "packages": [
 {
 "name": "composer/semver",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4625d2bc9f8518b2ef8b06572d647502164c2928
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Update cxserver to b431aef - change (mediawiki...deploy)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Update cxserver to b431aef
..


Update cxserver to b431aef

List of changes:
d42ca82 Fix contrib/systemd config
b3cc7bd registry: Remove non-exist en-hi Dictd pair
68a6d59 registry: Add Yandex MT for bn, gu, kn, pa, si and ta languages

Change-Id: Iefc89549c05c31c715331993914bb7a8f2cbecc0
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index 4c5738c..b431aef 16
--- a/src
+++ b/src
-Subproject commit 4c5738c087228466829ab80e57e85ca85685a6ae
+Subproject commit b431aefb2ea909c588cd26602ef322be49c8a63d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefc89549c05c31c715331993914bb7a8f2cbecc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stop trying to log to schema.Undefined - change (mediawiki...Flow)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Stop trying to log to schema.Undefined
..


Stop trying to log to schema.Undefined

Bug: T135185
Change-Id: I09549b7ac82b21c5f616e4187edcc4b197868a44
---
M modules/engine/components/board/base/flow-boardandhistory-base.js
1 file changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/modules/engine/components/board/base/flow-boardandhistory-base.js 
b/modules/engine/components/board/base/flow-boardandhistory-base.js
index 0810a80..d906238 100644
--- a/modules/engine/components/board/base/flow-boardandhistory-base.js
+++ b/modules/engine/components/board/base/flow-boardandhistory-base.js
@@ -199,7 +199,7 @@
 
// Only log cancel attempt if it was user-initiated, not when 
the cancel
// was triggered by code (as part of a post-submit form destroy)
-   if ( event.which ) {
+   if ( event.which && schemaName ) {
flowComponent.logEvent( schemaName, { action: 
'cancel-attempt', funnelId: funnelId } );
}
 
@@ -214,9 +214,13 @@
// Only log if user had already entered text (= confirmation 
was requested)
if ( changedFieldCount ) {
if ( confirm( 
flowComponent.constructor.static.TemplateEngine.l10n( 'flow-cancel-warning' ) ) 
) {
-   flowComponent.logEvent( schemaName, { action: 
'cancel-success', funnelId: funnelId } );
+   if ( schemaName ) {
+   flowComponent.logEvent( schemaName, { 
action: 'cancel-success', funnelId: funnelId } );
+   }
} else {
-   flowComponent.logEvent( schemaName, { action: 
'cancel-abort', funnelId: funnelId } );
+   if ( schemaName ) {
+   flowComponent.logEvent( schemaName, { 
action: 'cancel-abort', funnelId: funnelId } );
+   }
 
// User aborted cancel, quit this function & 
don't destruct the form!
return $deferred.reject().promise();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09549b7ac82b21c5f616e4187edcc4b197868a44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move druid entries into analytics vlans - change (operations/dns)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Move druid entries into analytics vlans
..

Move druid entries into analytics vlans

Bug: T134275
Change-Id: I6984fff38bab95a22b56a0f99ec409c1cffcc448
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/54/290954/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 640c2ab..f7bb9c8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -321,7 +321,6 @@
 126 1H IN PTR   aqs1004-a.eqiad.wmnet. ; cassandra instance
 127 1H IN PTR   aqs1004-b.eqiad.wmnet. ; cassandra instance
 162 1H IN PTR   logstash1004.eqiad.wmnet.
-163 1H IN PTR   druid1001.eqiad.wmnet.
 164 1H IN PTR   strontium.eqiad.wmnet.
 165 1H IN PTR   dbproxy1001.eqiad.wmnet.
 166 1H IN PTR   dbproxy1002.eqiad.wmnet.
@@ -413,8 +412,10 @@
 19  1H IN PTR   analytics1056.eqiad.wmnet.
 20  1H IN PTR   analytics1057.eqiad.wmnet.
 
+101 1H IN PTR   druid1001.eqiad.wmnet.
 102 1H IN PTR   stat1002.eqiad.wmnet.
 104 1H IN PTR   stat1004.eqiad.wmnet.
+
 
 ; 10.64.16.0/22 - private1-b-eqiad
 $ORIGIN 16.64.{{ zonename }}.
@@ -773,7 +774,6 @@
 109 1H IN PTR   elastic1041.eqiad.wmnet.
 110 1H IN PTR   elastic1042.eqiad.wmnet.
 111 1H IN PTR   elastic1043.eqiad.wmnet.
-112 1H IN PTR   druid1002.eqiad.wmnet.
 113 1H IN PTR   db1087.eqiad.wmnet.
 114 1H IN PTR   db1088.eqiad.wmnet.
 115 1H IN PTR   db1089.eqiad.wmnet.
@@ -865,6 +865,7 @@
 2   1H IN PTR   ae3-1022.cr1-eqiad.wikimedia.org.
 3   1H IN PTR   ae3-1022.cr2-eqiad.wikimedia.org.
 
+102 1H IN PTR   druid1002.eqiad.wmnet.
 103 1H IN PTR   stat1003.eqiad.wmnet.
 
 114 1H IN PTR   kafka1014.eqiad.wmnet.
@@ -1079,7 +1080,6 @@
 144 1H  IN PTR  elastic1046.eqiad.wmnet.
 145 1H  IN PTR  elastic1047.eqiad.wmnet.
 146 1H  IN PTR  aqs1006.eqiad.wmnet.
-147 1H  IN PTR  druid1003.eqiad.wmnet.
 148 1H  IN PTR  aqs1006-a.eqiad.wmnet. ; cassandra instance
 149 1H  IN PTR  aqs1006-b.eqiad.wmnet. ; cassandra instance
 150 1H  IN PTR  db1091.eqiad.wmnet.
@@ -1122,6 +1122,8 @@
 24  1H IN PTR   analytics1044.eqiad.wmnet.
 25  1H IN PTR   analytics1045.eqiad.wmnet.
 
+103 1H  IN PTR  druid1003.eqiad.wmnet.
+
 ; 10.65.0.0/16 is eqiad management network
 
 $ORIGIN 65.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 47a9b54..2f7726d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -330,9 +330,9 @@
 dbstore1001 1H  IN A10.64.48.17
 dbstore1002 1H  IN A10.64.48.18
 d-i-test1H  IN A10.64.32.201
-druid1001   1H  IN A10.64.0.163
-druid1002   1H  IN A10.64.32.112
-druid1003   1H  IN A10.64.48.147
+druid1001   1H  IN A10.64.5.101
+druid1002   1H  IN A10.64.36.102
+druid1003   1H  IN A10.64.53.103
 elastic1001 1H  IN A10.64.0.108
 elastic1002 1H  IN A10.64.0.109
 elastic1003 1H  IN A10.64.0.110

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

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

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

[MediaWiki-commits] [Gerrit] Append surface & toolbar components in the correct places - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Append surface & toolbar components in the correct places
..


Append surface & toolbar components in the correct places

Use setSurface and setupToolbar to position the surface and the
toolbar save button in the DOM.

Change-Id: Ide634848f4e78501724c358bcb1fdab8abd491b9
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 57 insertions(+), 20 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 76a68f6..972586d 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -490,7 +490,6 @@
  */
 ve.init.mw.DesktopArticleTarget.prototype.afterActivate = function () {
$( 'html' ).removeClass( 've-activating' ).addClass( 've-active' );
-   this.$editableContent.after( this.getSurface().$element );
if ( !this.editingTabDialog ) {
// We have to focus the page after hiding the original content, 
otherwise
// in firefox the contentEditable container was below the view 
page, and
@@ -501,6 +500,18 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.init.mw.DesktopArticleTarget.prototype.setSurface = function ( surface ) {
+   if ( surface !== this.surface ) {
+   this.$editableContent.after( surface.$element );
+   }
+
+   // Parent method
+   ve.init.mw.DesktopArticleTarget.super.prototype.setSurface.apply( this, 
arguments );
+};
+
+/**
  * Determines whether we want to switch to view mode or not (displaying a 
dialog if necessary)
  * Then, if we do, actually switches to view mode.
  *
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 73001f7..7dd392d 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -300,8 +300,6 @@
this.getSurface().getModel().connect( this, {
history: 'updateToolbarSaveButtonState'
} );
-   this.setupToolbarSaveButton();
-   this.attachToolbarSaveButton();
this.restoreEditSection();
 
// Parent method
@@ -1466,30 +1464,42 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.init.mw.ArticleTarget.prototype.setupToolbar = function () {
+   // Parent method
+   ve.init.mw.ArticleTarget.super.prototype.setupToolbar.apply( this, 
arguments );
+
+   this.setupToolbarSaveButton();
+   this.attachToolbarSaveButton();
+};
+
+/**
  * Add content and event bindings to toolbar save button.
  *
  * @param {Object} [config] Configuration options for the button
  */
 ve.init.mw.ArticleTarget.prototype.setupToolbarSaveButton = function ( config 
) {
-   this.toolbarSaveButton = new OO.ui.ButtonWidget( ve.extendObject( {
-   label: ve.msg( 'visualeditor-toolbar-savedialog' ),
-   flags: [ 'progressive', 'primary' ],
-   disabled: !this.restoring
-   }, config ) );
+   if ( !this.toolbarSaveButton ) {
+   this.toolbarSaveButton = new OO.ui.ButtonWidget( 
ve.extendObject( {
+   label: ve.msg( 'visualeditor-toolbar-savedialog' ),
+   flags: [ 'progressive', 'primary' ],
+   disabled: !this.restoring
+   }, config ) );
 
-   // NOTE (phuedx, 2014-08-20): This class is used by the firsteditve 
guided
-   // tour to attach a guider to the "Save page" button.
-   this.toolbarSaveButton.$element.addClass( 've-ui-toolbar-saveButton' );
+   // NOTE (phuedx, 2014-08-20): This class is used by the 
firsteditve guided
+   // tour to attach a guider to the "Save page" button.
+   this.toolbarSaveButton.$element.addClass( 
've-ui-toolbar-saveButton' );
 
-   if ( ve.msg( 'accesskey-save' ) !== '-' && ve.msg( 'accesskey-save' ) 
!== '' ) {
-   // FlaggedRevs tries to use this - it's useless on VE pages 
because all that stuff gets hidden, but it will still conflict so get rid of it
-   this.elementsThatHadOurAccessKey = $( '[accesskey="' + ve.msg( 
'accesskey-save' ) + '"]' ).removeAttr( 'accesskey' );
-   this.toolbarSaveButton.$button.attr( 'accesskey', ve.msg( 
'accesskey-save' ) );
+   if ( ve.msg( 'accesskey-save' ) !== '-' && ve.msg( 
'accesskey-save' ) !== '' ) {
+   // FlaggedRevs tries to use this - it's useless on VE 
pages because all that stuff gets hidden, but it will still conflict so get rid 
of it
+   this.elementsThatHadOurAccessKey = $( '[accesskey="' + 
ve.msg(

[MediaWiki-commits] [Gerrit] Separate out List content from Hub content - change (mediawiki...CollaborationKit)

2016-05-26 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Separate out List content from Hub content
..

Separate out List content from Hub content

Also adds better validation of json content. Has a
rudiementry display of lists, that's just for the moment,
I assume we'll change that part later.

List content when transcluded will only show the first 5 items.

Bug: T135088
Change-Id: I343a374ff00d40f84a3bdabdaee28b8f6d27c5a4
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/content/CollaborationListContent.php
A includes/content/CollaborationListContentHandler.php
5 files changed, 437 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index b88dbe1..13dc1cb 100644
--- a/extension.json
+++ b/extension.json
@@ -20,11 +20,14 @@
"CollaborationKitHooks": "includes/CollaborationKit.php",
"CollaborationHubContent": 
"includes/content/CollaborationHubContent.php",
"CollaborationHubContentHandler": 
"includes/content/CollaborationHubContentHandler.php",
+   "CollaborationListContent": 
"includes/content/CollaborationListContent.php",
+   "CollaborationListContentHandler": 
"includes/content/CollaborationListContentHandler.php",
"SpecialCreateCollaborationHub": 
"includes/SpecialCreateCollaborationHub.php",
"SpecialEditCollaborationHub": 
"includes/SpecialEditCollaborationHub.php"
},
"ContentHandlers": {
-   "CollaborationHubContent": "CollaborationHubContentHandler"
+   "CollaborationHubContent": "CollaborationHubContentHandler",
+   "CollaborationListContent": "CollaborationListContentHandler"
},
"SpecialPages": {
"EditCollaborationHub": "SpecialEditCollaborationHub",
diff --git a/i18n/en.json b/i18n/en.json
index 23c972a..4ce1daf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -36,5 +36,7 @@
"collaborationhub-display-list": "Simple list",
"collaborationkit-edit-missingsummary": "Missing edit summary",
"collaborationhub-edit-apierror": "Editing the Collaboration Hub 
through the API failed with error code $1.",
-   "collaborationhub-edit-tojsonerror": "Error creating json out of 
provided junk"
+   "collaborationhub-edit-tojsonerror": "Error creating json out of 
provided junk",
+   "collaborationkit-taglist": "'''{{PLURAL:$2|Tagged:|Tags:}}''' $1 ",
+   "collaborationkit-listempty": "This list has no items in it."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ae4242a..72a07bd 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -36,5 +36,7 @@
"collaborationhub-display-list": "Select option for a plain list",
"collaborationkit-edit-missingsummary": "Warning that the edit summary 
is missing on Special:EditCollaborationHub (maybe should be worded more/less 
harshly depending on how/when it actually shows up)\n\nApparently refers to 
{{msg-mw|Htmlform-submit}}",
"collaborationhub-edit-apierror": "Error message shown when a request 
to the edit API to update a collaboration hub failed.\n\nParameters:\n* $1 - 
error code string",
-   "collaborationhub-edit-tojsonerror": "Error message shown when the 
input could not be successfully encoded back into the collaboration hub json"
+   "collaborationhub-edit-tojsonerror": "Error message shown when the 
input could not be successfully encoded back into the collaboration hub json",
+   "collaborationkit-taglist": "Box for showing tags a specific item has 
on a list. $1 = comma separated list of tags. $2 = number of tags",
+   "collaborationkit-listempty": "Shown on lists that are empty 
immediately after the description"
 }
diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
new file mode 100644
index 000..8c7e49e
--- /dev/null
+++ b/includes/content/CollaborationListContent.php
@@ -0,0 +1,351 @@
+getData();
+   if ( !is_object( $status ) || !$status->isOk() ) {
+   return false;
+   }
+
+   $data = $status->value;
+
+   if (
+   !property_exists( $data, "items" )
+   || !property_exists( $data, "options" )
+   || !property_exists( $data, "description" )
+   ) { 
+   return false;
+   }
+   foreach( $data as $field => $value ) {
+   switch( $field ) {
+   case 'items':
+   if( !is_array( $value ) ) { 
+   return false;
+   }
+   if(

[MediaWiki-commits] [Gerrit] Fix CS - change (mediawiki/core)

2016-05-26 Thread Alexia (Code Review)

Alexia has uploaded a new change for review.

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

Change subject: Fix CS
..

Fix CS

Change-Id: I86de9b464dc2ac97ddb8de5f984e9f2f02c1ab59
---
M includes/clientpool/RedisConnectionPool.php
1 file changed, 19 insertions(+), 13 deletions(-)


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

diff --git a/includes/clientpool/RedisConnectionPool.php 
b/includes/clientpool/RedisConnectionPool.php
index 9312ee0..2068791 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -409,7 +409,10 @@
 * @param int $timeout Optional
 */
public function resetTimeout( Redis $conn, $timeout = null ) {
-   $conn->setOption( Redis::OPT_READ_TIMEOUT, ( $timeout !== null 
? $timeout : $this->readTimeout ) );
+   $conn->setOption(
+   Redis::OPT_READ_TIMEOUT,
+   ( $timeout !== null ? $timeout : $this->readTimeout )
+   );
}
 
/**
@@ -508,11 +511,13 @@
 * @throws  RedisException
 */
public function __call( $name, $arguments ) {
-   //Work around https://github.com/nicolasff/phpredis/issues/70
+   // Work around https://github.com/nicolasff/phpredis/issues/70
$lname = strtolower( $name );
-   if ( ( $lname === 'blpop' || $lname === 'brpop' || $lname === 
'brpoplpush' ) && count($arguments) > 1 ) {
-   $timeout = end( $arguments ); //Pull the timeout off 
the end since the timeout is always required and the preceding argument length 
can vary.
-   $this->pool->resetTimeout( $this->conn, ( $timeout > 0 
? $timeout + 1 : $timeout ) ); //Only give the additional one second buffer if 
not requesting an infinite timeout.
+   if ( ( $lname === 'blpop' || $lname === 'brpop' || $lname === 
'brpoplpush' ) && count( $arguments ) > 1 ) {
+   // Get timeout off the end since the timeout is always 
required and argument length can vary.
+   $timeout = end( $arguments );
+   ///Only give the additional one second buffer if not 
requesting an infinite timeout.
+   $this->pool->resetTimeout( $this->conn, ( $timeout > 0 
? $timeout + 1 : $timeout ) );
}
 
$res = $this->tryCall( $name, $arguments );
@@ -532,10 +537,10 @@
private function tryCall( $method, $arguments ) {
$this->conn->clearLastError();
try {
-   $res = call_user_func_array( array( $this->conn, 
$method ), $arguments );
+   $res = call_user_func_array( [ $this->conn, $method ], 
$arguments );
$authError = $this->handleAuthError();
if ( $authError === self::AUTH_ERROR_TEMPORARY ) {
-   $res = call_user_func_array( array( 
$this->conn, $method ), $arguments );
+   $res = call_user_func_array( [ $this->conn, 
$method ], $arguments );
}
if ( $authError === self::AUTH_ERROR_PERMANENT ) {
throw new RedisException( "There was a 
permanent failure reauthenticating to Redis." );
@@ -562,7 +567,7 @@
 * @return  array   Results for this pass.
 */
public function scan( &$iterator, $pattern = null, $count = null ) {
-   $res = $this->tryCall( 'scan', array( &$iterator, $pattern, 
$count ) );
+   $res = $this->tryCall( 'scan', [ &$iterator, $pattern, $count ] 
);
 
return $res;
}
@@ -580,7 +585,7 @@
 * @return  array   Results for this pass.
 */
public function sScan( $key, &$iterator, $pattern = null, $count = null 
) {
-   $res = $this->tryCall( 'sScan', array( $key, &$iterator, 
$pattern, $count ) );
+   $res = $this->tryCall( 'sScan', [ $key, &$iterator, $pattern, 
$count ] );
 
return $res;
}
@@ -598,7 +603,7 @@
 * @return  array   Results for this pass.
 */
public function hScan( $key, &$iterator, $pattern = null, $count = null 
) {
-   $res = $this->tryCall( 'hScan', array( $key, &$iterator, 
$pattern, $count ) );
+   $res = $this->tryCall( 'hScan', [ $key, &$iterator, $pattern, 
$count ] );
 
return $res;
}
@@ -616,7 +621,7 @@
 * @return  array   Results for this pass.
 */
public function zScan( $key, &$iterator, $pattern = null, $count = null 
) {
-   $res = $this->tryCall( 'zScan', array( $key, &$iterator, 
$pattern, $count ) );
+   $res = $this->tryCall( 'zScan', [ $key, &$iterator, $pattern, 
$count ] );

[MediaWiki-commits] [Gerrit] Pass dataTransferHandler to surface - change (VisualEditor/VisualEditor)

2016-05-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Pass dataTransferHandler to surface
..

Pass dataTransferHandler to surface

Also always lookup registies/factories via the surface.

Change-Id: Ic9fd2f27079f45857196146abfc08d7f93f888c6
---
M src/ce/ve.ce.Surface.js
M src/init/sa/ve.init.sa.Target.js
M src/init/ve.init.Target.js
M src/ui/ve.ui.Surface.js
M src/ui/widgets/ve.ui.TargetWidget.js
5 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/51/290951/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index e1dcc5e..7fa8411 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -847,6 +847,7 @@
 ve.ce.Surface.prototype.onDocumentDragOver = function ( e ) {
var i, l, $target, $dropTarget, node, dropPosition, targetPosition, 
targetOffset, top, left,
nodeType, inIgnoreChildren, item, fakeItem,
+   dataTransferHandlerFactory = 
this.getSurface().dataTransferHandlerFactory,
isContent = true,
dataTransfer = e.originalEvent.dataTransfer;
 
@@ -863,7 +864,7 @@
item = dataTransfer.items[ i ];
if ( item.kind !== 'string' ) {
fakeItem = new 
ve.ui.DataTransferItem( item.kind, item.type );
-   if ( 
ve.init.target.dataTransferHandlerFactory.getHandlerNameForItem( fakeItem ) ) {
+   if ( 
dataTransferHandlerFactory.getHandlerNameForItem( fakeItem ) ) {
this.allowedFile = true;
break;
}
@@ -873,7 +874,7 @@
for ( i = 0, l = dataTransfer.files.length; i < 
l; i++ ) {
item = dataTransfer.items[ i ];
fakeItem = new ve.ui.DataTransferItem( 
item.kind, item.type );
-   if ( 
ve.init.target.dataTransferHandlerFactory.getHandlerNameForItem( fakeItem ) ) {
+   if ( 
dataTransferHandlerFactory.getHandlerNameForItem( fakeItem ) ) {
this.allowedFile = true;
break;
}
@@ -2281,6 +2282,7 @@
  */
 ve.ce.Surface.prototype.handleDataTransferItems = function ( items, isPaste, 
targetFragment ) {
var i, l, name, item,
+   dataTransferHandlerFactory = 
this.getSurface().dataTransferHandlerFactory,
handled = false;
 
targetFragment = targetFragment || this.getModel().getFragment();
@@ -2299,9 +2301,9 @@
 
for ( i = 0, l = items.length; i < l; i++ ) {
item = items[ i ];
-   name = 
ve.init.target.dataTransferHandlerFactory.getHandlerNameForItem( item, isPaste, 
this.pasteSpecial );
+   name = dataTransferHandlerFactory.getHandlerNameForItem( item, 
isPaste, this.pasteSpecial );
if ( name ) {
-   ve.init.target.dataTransferHandlerFactory.create( name, 
this.surface, item )
+   dataTransferHandlerFactory.create( name, this.surface, 
item )
.getInsertableData().done( insert );
handled = true;
break;
diff --git a/src/init/sa/ve.init.sa.Target.js b/src/init/sa/ve.init.sa.Target.js
index 8d04f65..d6f2de0 100644
--- a/src/init/sa/ve.init.sa.Target.js
+++ b/src/init/sa/ve.init.sa.Target.js
@@ -59,7 +59,9 @@
  * @inheritdoc
  */
 ve.init.sa.Target.prototype.addSurface = function () {
+   // Parent method
var surface = ve.init.sa.Target.super.prototype.addSurface.apply( this, 
arguments );
+
this.$element.append( $( '' ).addClass( 
've-init-sa-target-surfaceWrapper' ).append( surface.$element ) );
if ( !this.getSurface() ) {
this.setSurface( surface );
diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index e5dc358..17ba4ef 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -418,7 +418,6 @@
toolbar.$bar.append( surface.getToolbarDialogs().$element );
toolbar.$actions.append( actions.$element );
this.onContainerScroll();
-
 };
 
 /**
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 8766821..f9728ac 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -17,6 +17,7 @@
  * @cfg {jQuery} [$scrollContainer] The scroll container of the surface
  * @cfg {ve.ui.CommandRegistry} [commandRegistry] Command

[MediaWiki-commits] [Gerrit] Add labels to revision tooltips. - change (mediawiki...RevisionSlider)

2016-05-26 Thread WMDE-leszek (Code Review)

WMDE-leszek has submitted this change and it was merged.

Change subject: Add labels to revision tooltips.
..


Add labels to revision tooltips.

This adds labels for user, comment and article size to the revision
tooltip as well as the respective messages needed for the labels.

Bug: T135740
Change-Id: Ia65fb0bbbe3eb2405665d784bad157ea059e2d6e
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.RevisionSlider.RevisionListView.js
4 files changed, 23 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 24f96ca..e1e92ef 100755
--- a/extension.json
+++ b/extension.json
@@ -108,7 +108,10 @@
"modules/ext.RevisionSlider.RevisionListView.js"
],
"messages": [
-   "revisionslider-revision-bytes"
+   "revisionslider-revision-bytes",
+   "revisionslider-label-article-size",
+   "revisionslider-label-user",
+   "revisionslider-label-comment"
]
},
"ext.RevisionSlider.pointers.lower": {
diff --git a/i18n/en.json b/i18n/en.json
index b9eca7a..577e5b3 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,6 +9,9 @@
 "revisionslider-beta-feature-message": "Revision Slider",
 "revisionslider-beta-feature-description": "Show a revision slider when 
comparing two revisions of a page.",
 "revisionslider-revision-bytes": "$1 {{PLURAL:$1|byte|bytes}}",
+"revisionslider-label-article-size": "Article size: $1",
+"revisionslider-label-comment": "Comment: $1",
+"revisionslider-label-user": "User: $1",
 "revisionslider-loading-placeholder": "The revision slider is loading.",
 "revisionslider-loading-failed": "The revision slider failed to load.",
 "revisionslider-loading-out-of-range": "The revision slider failed to load 
as the requested revisions are not in the top 500 versions of the page.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3a12104..eca0762 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,6 +9,9 @@
"revisionslider-beta-feature-message": "Label for the revision slider 
Beta Feature.",
"revisionslider-beta-feature-description": "Description for the 
revision slider Beta Feature, describing the feature that will be enabled.",
"revisionslider-revision-bytes": "Label describing the amount of bytes 
changed in this revision.\nParameters:\n* $1 - Revision size in bytes.",
+   "revisionslider-label-article-size": "Label describing the size of this 
revision.\nParameters:\n* $1 - Revision size.",
+   "revisionslider-label-comment": "Label showing the edit summary of a 
revision.\nParameters:\n* $1 - The revision's edit summary.",
+   "revisionslider-label-user": "Label showing this revision's author's 
username.\nParameters:\n* $1 - Username.",
"revisionslider-loading-placeholder": "Message shown while the 
RevisionSlider is still loading on a diff page. Once loaded the message is 
removed.",
"revisionslider-loading-failed": "Message shown if the RevisionSlider 
fails to initially load.",
"revisionslider-loading-out-of-range": "Message shown if the 
RevisionSlider fails to initially load due to revisions being requested that 
are not in the most recent 500 revisions.",
diff --git a/modules/ext.RevisionSlider.RevisionListView.js 
b/modules/ext.RevisionSlider.RevisionListView.js
index 5f6a3fb..9e3d05c 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -55,9 +55,19 @@
makeTooltip: function ( rev ) {
var $tooltip = $( '' )
.append( '' + rev.getFormattedDate() + 
'' )
-   .append( $( '' ).append( $( '' 
).text( mw.html.escape( rev.getUser() ) ) ) )
-   .append( rev.getComment() ? $( '' 
).append( $( '' ).append( '' ).text( mw.html.escape( rev.getComment() ) 
) ) : '' )
-   .append( $( '' ).html( mw.msg( 
'revisionslider-revision-bytes', rev.getSize() ) ) )
+   .append( $( '' ).append( $( '' ).text(
+   mw.msg( 'revisionslider-label-user', 
mw.html.escape( rev.getUser() ) )
+   ) ) )
+   .append(
+   rev.getComment() ?
+   $( '' ).append( $( '' 
).append( $( '' ).text(
+   mw.msg( 
'revisionslider-label-comment', mw.html.escape( rev.getComment() ) )
+   ) ) )

[MediaWiki-commits] [Gerrit] T135902 Adding readme to repo - change (wikimedia/portals)

2016-05-26 Thread Jdrewniak (Code Review)

Jdrewniak has uploaded a new change for review.

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

Change subject: T135902 Adding readme to repo
..

T135902 Adding readme to repo

Bug: T135902
Change-Id: Icebdfca294234cbcfb10daf299a09c48dcde9617
---
A README.md
1 file changed, 102 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals 
refs/changes/53/290953/1

diff --git a/README.md b/README.md
new file mode 100644
index 000..2fe68c8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,102 @@
+# WMF Portal Pages
+
+This repo houses the www.wikipedia.org portal page as well as copies of other 
Wikimedia Foundation portal pages.   
+
+### Overview
+The WMF portal pages are static HTML pages. The www.wikipedia.org portal page 
is built using the process outlined below, whereas the process for editing 
other WMF project portals is described in the 'Editing Other Portals' section.
+
+## Wikipedia.org Portal Development
+
+### Install
+`npm install` and grab a coffee, this might take a while. the wikipedia.org 
portal page has numerous dev dependancies, all of which are listed in the 
`package.json` file.
+
+### Development
+General directory structure:
+
+
+|— package.json
+|— gulpfile.js
+|— dev/
development dir
+|  |— wikipedia.org/   
+|  |— portal/  symlink to 
'../' this mirrors server setup.
+|  |— templates/   handlebar partials
+|  |— index.handlebars main handlebar template
+|  |—assets/   
+|  |— css/ compiled postCSS
+|  |— img/ compiled 
sprites & non-sprite images
+|  |— sprite_assetsoriginal sprite images  
+|  |— js/  javascript files
+|  |— postcss/ postCSS files
+|— prod
Compiled production dir
+   |—wikipedia.org/
+   |— index.html   compiled from dev with 
inlined CSS
+   |— assets/  minimized & 
compressed assets
+   |— img/
+   |— js/  
+   
+   
+
+
+
+Main development dependencies
+
+- Gulp 
+- PostCSS & cssnext 
+- handlebar templates
+
+ Gulp tasks
+Gulp documentation can be viewed by running `gulp help`, which outputs the 
following:
+
+
++-+
+| =  USAGE =   
   |
++-+
+| GLOBAL TASKS :   
   |
+|  
   |
+| gulp lint   - run jslint on all JS files 
   |
+| gulp update-stats   - update file containing 
projects stats |
++-+
+| PORTAL-SPECIFIC TASKS :  
   |
+|  
   |
+| gulp lint --portal wikipedia.org- run jslint on JS files on 
portal JS files |
+| gulp inline-assets --portal wikipedia.org   - build inline CSS and JS assets 
   |
+| gulp optimize-images --portal wikipedia.org - run imagemin on image 
directory   |
+| gulp watch --portal wikipedia.org   - watches dev directory and 
generates an index.html |
+|   file in it without 
inlined/minified assets|
+| gulp --portal wikipedia.org - run all of the above on the 
specified portal page |
+|  
   |
+| gulp fetch-meta --portal wikipedia.org  - overwrite the portal page with 
source from Meta   |
++-+
+
+
+ Starting Development
+
+The most useful gulp task during portal development is `gulp watch --portal 
wikipedia.org`. This task watches for changes in `dev/wikipedia.org/` and 
generate an `index.html` file at

[MediaWiki-commits] [Gerrit] Provide missing license-lable / take 2 - change (mediawiki...SemanticForms)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Provide missing license-lable / take 2
..


Provide missing license-lable / take 2

* extension.json file also needs to have this information

Change-Id: Ic59cc7429dfb3e50a4bceb314b59ca30cb203b2e
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index e250f91..d3524bb 100644
--- a/extension.json
+++ b/extension.json
@@ -10,6 +10,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Semantic_Forms;,
"descriptionmsg": "semanticforms-desc",
+   "license-name": "GPL-2.0+",
"type": "specialpage",
"callback": "SFHooks::registerExtension",
"ExtensionFunctions": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic59cc7429dfb3e50a4bceb314b59ca30cb203b2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Paladox2014 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1f38c6b..6eac839 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 1f38c6b..6eac839
..


Syncronize VisualEditor: 1f38c6b..6eac839

Change-Id: I1c1a99cffd1a2ca5025c1455a9ac97b5690bc94f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 1f38c6b..6eac839 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 1f38c6bcfcbbe4bcfb9176621e61922cac4ae74f
+Subproject commit 6eac8391502f884f6c94b3f8a30aaa28f5d7350e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c1a99cffd1a2ca5025c1455a9ac97b5690bc94f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Follow-up 1dc933be: Don't fatal when editing non-NS0/6/14 pages - change (mediawiki...VisualEditor)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up 1dc933be: Don't fatal when editing non-NS0/6/14 pages
..

Follow-up 1dc933be: Don't fatal when editing non-NS0/6/14 pages

Change-Id: I9280fe4d771cf7ce1ee3874a34d7a14b672b222c
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 972586d..4f64290 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -89,6 +89,8 @@
case namespaceIds.file:
this.$editableContent = $( 
'#mw-imagepage-content' );
break;
+   default:
+   this.$editableContent = $( '#mw-content-text' );
}
} else {
// TODO: Load view page content if switching from edit source

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9280fe4d771cf7ce1ee3874a34d7a14b672b222c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Use mw-ui-button mw-ui-progressive mw-ui-quiet for links on ... - change (mediawiki/core)

2016-05-26 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Use mw-ui-button mw-ui-progressive mw-ui-quiet for links on 
Special:UserLogin
..

Use mw-ui-button mw-ui-progressive mw-ui-quiet for links on Special:UserLogin

They are marked as quiet links, but are styled like all the other
mw-ui/ooui fields now.

Change-Id: Ibcd52821be56f5b76fbac0dd0632dfba08e0c440
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/290964/1

diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 66718f9..32f80c3 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -638,7 +638,8 @@
[ 'class' => 'mw-ui-vform-field 
mw-form-related-link-container' ],
Linker::link(
SpecialPage::getTitleFor( 
'PasswordReset' ),
-   $this->msg( 
'userlogin-resetpassword-link' )->escaped()
+   $this->msg( 
'userlogin-resetpassword-link' )->escaped(),
+   [ 'class' => 'mw-ui-button 
mw-ui-progressive mw-ui-quiet' ]
)
) );
}
@@ -662,7 +663,10 @@
[
'id' => 
'mw-createaccount-join' . ( $loggedIn ? '-loggedin' : '' ),
'href' => 
$linkTitle->getLocalURL( $linkq ),
-   'class' => ( $loggedIn 
? '' : 'mw-ui-button' ),
+   'class' => ( $loggedIn ?
+   'mw-ui-button 
mw-ui-progressive mw-ui-quiet' :
+   'mw-ui-button'
+   ),
'tabindex' => 100,
],
$this->msg(
@@ -1023,6 +1027,7 @@
'href' => 
Skin::makeInternalOrExternalUrl( wfMessage( 'helplogin-url' )
->inContentLanguage()
->text() ),
+   'class' => 'mw-ui-button 
mw-ui-progressive mw-ui-quiet',
], $this->msg( 'userlogin-helplink2' 
)->text() ),
'weight' => 200,
],

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

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

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

[MediaWiki-commits] [Gerrit] Add druid1003's MAC to linxu-host-entries - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add druid1003's MAC to linxu-host-entries
..


Add druid1003's MAC to linxu-host-entries

Bug: T134275
Change-Id: I8b43596f89b80bcddf0e42e8e98bbf1dc6b45501
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index bf4711e..8f71929 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2018,6 +2018,13 @@
 filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host druid1003 {
+hardware ethernet 1C:98:EC:29:E2:78;
+fixed-address druid1003.eqiad.wmnet;
+option pxelinux.pathprefix "jessie-installer/";
+filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host eeden {
 hardware ethernet a4:ba:db:30:d8:80;
 fixed-address eeden.wikimedia.org;

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

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

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

[MediaWiki-commits] [Gerrit] Use insertContent with templates when range is collapsed - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Use insertContent with templates when range is collapsed
..


Use insertContent with templates when range is collapsed

We may be trying to insert a block into a paragraph. fixUpInsertion
handles this, but not if use a replace transactions.

Bug: T136279
Change-Id: I1401da52676e79f38ef835a32d2c76004b75fb4e
---
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
1 file changed, 20 insertions(+), 16 deletions(-)

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



diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index ce98bd2..8dbd870 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -65,24 +65,28 @@
nodeClass = ve.dm.MWTransclusionNode;
 
function insertNode( isInline ) {
-   // Generate a replacement transaction instead of using 
surfaceFragment.insert (which
-   // generates a removal and insertion) as blanking the 
reference triggers T135127.
-   // TODO: Once T135127 is fixed, revert to using 
surfaceFragment.insert.
var type = isInline ? nodeClass.static.inlineType : 
nodeClass.static.blockType,
-   tx = ve.dm.Transaction.newFromReplacement(
-   surfaceFragment.getDocument(),
-   
surfaceFragment.getSelection().getCoveringRange(),
-   [
-   {
-   type: type,
-   attributes: {
-   mw: 
model.getPlainObject()
-   }
-   },
-   { type: '/' + type }
-   ]
+   range = 
surfaceFragment.getSelection().getCoveringRange(),
+   data = [
+   {
+   type: type,
+   attributes: {
+   mw: 
model.getPlainObject()
+   }
+   },
+   { type: '/' + type }
+   ];
+
+   if ( range.isCollapsed() ) {
+   surfaceFragment.insertContent( data );
+   } else {
+   // Generate a replacement transaction instead 
of using surfaceFragment.insertContent
+   // (which generates a removal and insertion) as 
blanking a reference triggers T135127.
+   // TODO: Once T135127 is fixed, revert to using 
surfaceFragment.insert.
+   surfaceFragment.getSurface().change(
+   ve.dm.Transaction.newFromReplacement( 
surfaceFragment.getDocument(), range, data )
);
-   surfaceFragment.getSurface().change( tx );
+   }
deferred.resolve();
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1401da52676e79f38ef835a32d2c76004b75fb4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/es2.x' - change (mediawiki...CirrusSearch)

2016-05-26 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Merge remote-tracking branch 'origin/es2.x'
..

Merge remote-tracking branch 'origin/es2.x'

Change-Id: I6b28392d772571024eb3303218c06bdecde36a48
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/.gitreview b/.gitreview
index 8864349..f1a60d0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/CirrusSearch.git
-defaultbranch=es2.x
+defaultbranch=master
 defaultrebase=0

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up 1dc933be: Don't fatal when editing non-NS0/6/14 pages - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Follow-up 1dc933be: Don't fatal when editing non-NS0/6/14 pages
..


Follow-up 1dc933be: Don't fatal when editing non-NS0/6/14 pages

Change-Id: I9280fe4d771cf7ce1ee3874a34d7a14b672b222c
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 2 insertions(+), 0 deletions(-)

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

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 972586d..4f64290 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -89,6 +89,8 @@
case namespaceIds.file:
this.$editableContent = $( 
'#mw-imagepage-content' );
break;
+   default:
+   this.$editableContent = $( '#mw-content-text' );
}
} else {
// TODO: Load view page content if switching from edit source

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9280fe4d771cf7ce1ee3874a34d7a14b672b222c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
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] Syncronize VisualEditor: 628e109..3fbb170 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 628e109..3fbb170
..

Syncronize VisualEditor: 628e109..3fbb170

Change-Id: Iff10710703114a5d6375cb1cb9924f804ae17962
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/83/290983/1

diff --git a/VisualEditor b/VisualEditor
index 628e109..3fbb170 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 628e1098afa58cbd9bf9a20a26961ec3982bd234
+Subproject commit 3fbb170c7a12e2ab4ced2e96fbe5a19f41338751

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff10710703114a5d6375cb1cb9924f804ae17962
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 628e109..3fbb170 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 628e109..3fbb170
..


Syncronize VisualEditor: 628e109..3fbb170

Change-Id: Iff10710703114a5d6375cb1cb9924f804ae17962
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 628e109..3fbb170 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 628e1098afa58cbd9bf9a20a26961ec3982bd234
+Subproject commit 3fbb170c7a12e2ab4ced2e96fbe5a19f41338751

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff10710703114a5d6375cb1cb9924f804ae17962
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Genericise target initialisation across namespaces - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Genericise target initialisation across namespaces
..


Genericise target initialisation across namespaces

Define $editableContent on target construction, and mark
all non-ancestor nodes between that at the target container
as uneditable (50% opacity, no pointer events).

Bug: T58289
Change-Id: I7fe51104bd5aa1bd53ffc604e5f02752c7553578
---
M extension.json
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
9 files changed, 106 insertions(+), 95 deletions(-)

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



diff --git a/extension.json b/extension.json
index ab5838d..2a6206c 100644
--- a/extension.json
+++ b/extension.json
@@ -99,6 +99,8 @@
"VisualEditorTransitionDefault": false,
"VisualEditorAvailableNamespaces": {
"User": true,
+   "File": true,
+   "Category": true,
"_merge_strategy": "array_plus"
},
"VisualEditorSkinToolbarScrollOffset": [],
diff --git 
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
index e1a0208..3fb1da0 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
@@ -5,24 +5,19 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
-.ve-init-mw-desktopArticleTarget {
+.ve-init-mw-desktopArticleTarget-toolbar {
/* Enforce different font-size for all UI elements of VisualEditor. The 
difference is tiny, but
   enough to make the icon containers 23.813px rather than 24px and 
thus the icons blurry */
-   font-size: 1.00787401575em; /* 0.8em / x-small / 127% */
-}
-
-.ve-init-mw-desktopArticleTarget .mw-body-content,
-.ve-ui-overlay-global .mw-body-content {
-   /* Match skin's font-size for the surface content */
-   font-size: 0.9921875em; /* 1/1.00787401575 */
-}
-
-.ve-init-mw-desktopArticleTarget-toolbar {
-   /* 1/1.00787401575 */
+   /* 1/ ( 0.8em / x-small / 127% ) */
margin: -0.9921875em;
margin-bottom: 0;
 }
 
+.ve-ui-overlay .mw-body-content {
+   /* Fix font-size for surfaces inside UI overlays */
+   font-size: 0.9921875em; /* 1/ ( 0.8em / x-small / 127% ) */
+}
+
 .ve-active .ve-init-mw-desktopArticleTarget-originalContent {
padding-top: 0.9921875em;
 }
diff --git 
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
index f8fdd60..63452e8 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
@@ -19,23 +19,19 @@
part of it instead of its parent, thus making it treat the area as part
of content editable.
*/
-   /* 0.8/0.8, 1/0.8 */
-   margin: 0 -1.25em -1.25em -1.25em;
-   padding-bottom: 1.25em;
+   /* 1/0.875 */
+   margin: 0 -1.14286em -1.14286em -1.14286em;
+   padding-bottom: 1.14286em;
 }
 
-.ve-active .ve-init-mw-desktopArticleTarget-originalContent {
-   padding-top: 1.25em;
-}
-
-.ve-active .ve-init-mw-target-surface 
.ve-init-mw-desktopArticleTarget-originalContent {
-   padding-left: 1.25em;
-   padding-right: 1.25em;
+.ve-deactivating .ve-init-mw-desktopArticleTarget-originalContent,
+.ve-activated .ve-init-mw-desktopArticleTarget-originalContent {
+   padding-top: 1em;
 }
 
 .ve-init-mw-target-surface .ve-ce-documentNode,
 .ve-init-mw-target-surface .ve-ui-surface-placeholder {
-   padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content 
font-size) 0.875em */
+   padding: 0 1.14286em; /* 1/0.875 */
 }
 
 .mw-body .ve-init-mw-target-surface .ve-ui-surface-placeholder > * {
@@ -45,19 +41,8 @@
border: 0;
 }
 
-.ve-init-mw-desktopArticleTarget {
-   /* Enforce different font-size for all UI elements of VisualEditor */
-   font-size: 0.8em;
-}
-
-.ve-init-mw-desktopArticleTarget .firstHeading {
-   /* Restore 1.8em font size of page title */
-   font-size: 2.25em; /* 1.8/0.8 */
-}
-
-.ve-init-mw-desktopArticleTarget .mw-body-content,
-.ve-ui-overlay-global .mw-body-content {
-   /* Match skin's font-size for the

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1f38c6b..6eac839 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 1f38c6b..6eac839
..

Syncronize VisualEditor: 1f38c6b..6eac839

Change-Id: I1c1a99cffd1a2ca5025c1455a9ac97b5690bc94f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/56/290956/1

diff --git a/VisualEditor b/VisualEditor
index 1f38c6b..6eac839 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 1f38c6bcfcbbe4bcfb9176621e61922cac4ae74f
+Subproject commit 6eac8391502f884f6c94b3f8a30aaa28f5d7350e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1a99cffd1a2ca5025c1455a9ac97b5690bc94f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add druid1003's MAC to linxu-host-entries - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Add druid1003's MAC to linxu-host-entries
..

Add druid1003's MAC to linxu-host-entries

Bug: T134275
Change-Id: I8b43596f89b80bcddf0e42e8e98bbf1dc6b45501
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index bf4711e..8f71929 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2018,6 +2018,13 @@
 filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host druid1003 {
+hardware ethernet 1C:98:EC:29:E2:78;
+fixed-address druid1003.eqiad.wmnet;
+option pxelinux.pathprefix "jessie-installer/";
+filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host eeden {
 hardware ethernet a4:ba:db:30:d8:80;
 fixed-address eeden.wikimedia.org;

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

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

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

[MediaWiki-commits] [Gerrit] Add URL encoding to TOTP QR code URL - change (mediawiki...OATHAuth)

2016-05-26 Thread Parent5446 (Code Review)

Parent5446 has uploaded a new change for review.

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

Change subject: Add URL encoding to TOTP QR code URL
..

Add URL encoding to TOTP QR code URL

Add RFC 3986 URI encoding to the account label in accordance with the
Google Authenticator specification to ensure the QR code is properly
generated for usernames with special characters in them.

Bug: T136269
Change-Id: I18175c9a3c9a45346fa7a227a5209194385c6696
---
M special/SpecialOATHEnable.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/special/SpecialOATHEnable.php b/special/SpecialOATHEnable.php
index a6e9290..02845ff 100644
--- a/special/SpecialOATHEnable.php
+++ b/special/SpecialOATHEnable.php
@@ -82,9 +82,9 @@
array( 'ext.oathauth' ),
new XmlJsCode(
'function () {'
-. '$("#qrcode").qrcode("otpauth://totp/'
-. $this->OATHUser->getAccount()
-. '?secret=' . $secret. '");'
+   . '$("#qrcode").qrcode("otpauth://totp/'
+   . rawurlencode( 
$this->OATHUser->getAccount() )
+   . '?secret=' . $secret . '");'
. '}'
)
) )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18175c9a3c9a45346fa7a227a5209194385c6696
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Parent5446 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 02a8369..628e109 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 02a8369..628e109
..

Syncronize VisualEditor: 02a8369..628e109

Change-Id: I48ca56163da2bf22e6bffd5e53a901bb17289a55
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 02a8369..628e109 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 02a836977740fc82f18a97f18fd6995f0715cc50
+Subproject commit 628e1098afa58cbd9bf9a20a26961ec3982bd234

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48ca56163da2bf22e6bffd5e53a901bb17289a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 02a8369..628e109 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 02a8369..628e109
..


Syncronize VisualEditor: 02a8369..628e109

Change-Id: I48ca56163da2bf22e6bffd5e53a901bb17289a55
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 02a8369..628e109 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 02a836977740fc82f18a97f18fd6995f0715cc50
+Subproject commit 628e1098afa58cbd9bf9a20a26961ec3982bd234

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48ca56163da2bf22e6bffd5e53a901bb17289a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Don't cancel payments missing donor details - change (wikimedia...SmashPig)

2016-05-26 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Don't cancel payments missing donor details
..

Don't cancel payments missing donor details

We had been assuming that meant a duplicate authorization (see
https://phabricator.wikimedia.org/T129935 ) but it can also happen
when there's a queue outage.  Leave them for manual resolution.

Bug: T136038
Change-Id: Ibc788d3a486e0f3260e147b559b197d00b66dd96
---
M PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/80/290980/1

diff --git a/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php 
b/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
index be14beb..83473e5 100644
--- a/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
+++ b/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
@@ -60,11 +60,13 @@
);
 
// Determine if a message exists in the pending queue; if it 
does not then
-   // this payment has already been sent to the verified queue. If 
it does,
-   // 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 all the duplicate 
authorizations.
+   // this payment has already been sent to the verified queue, or 
there is a
+   // problem with the queue. 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.
$this->logger->debug( 'Attempting to locate associated message 
in pending queue.' );
/**
 * @var \SmashPig\Core\DataStores\KeyedOpaqueDataStore
@@ -143,7 +145,7 @@
"ID '{$this->correlationId}'.",
$queueMessage
);
-   return self::ACTION_DUPLICATE;
+   return self::ACTION_REVIEW;
}
if ( $queueMessage->captured ) {
$this->logger->info(

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

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

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/es2.x' - change (mediawiki...CirrusSearch)

2016-05-26 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Merge remote-tracking branch 'origin/es2.x'
..

Merge remote-tracking branch 'origin/es2.x'

Change-Id: Iaba12613347d76301ce5997d8b6aba1e8b377287
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/.gitreview b/.gitreview
index 8864349..f1a60d0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/CirrusSearch.git
-defaultbranch=es2.x
+defaultbranch=master
 defaultrebase=0

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6eac839..02a8369 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 6eac839..02a8369
..

Syncronize VisualEditor: 6eac839..02a8369

Change-Id: I5627a2df950854223f1b315d5b7d2dd0dd0ae37f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 6eac839..02a8369 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 6eac8391502f884f6c94b3f8a30aaa28f5d7350e
+Subproject commit 02a836977740fc82f18a97f18fd6995f0715cc50

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5627a2df950854223f1b315d5b7d2dd0dd0ae37f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Clear save caches when toolbar is re-attached - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Clear save caches when toolbar is re-attached
..


Clear save caches when toolbar is re-attached

Change-Id: I14ddcba9fa4fd5f39341312d241ce59980276a2b
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 7dd392d..4cc8e45 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -913,6 +913,7 @@
// Clear the cached HTML and cache key once the document changes
if ( this.getSurface() ) {
this.getSurface().getModel().getDocument().once( 'transact', 
clear );
+   this.getSurface().once( 'destroy', clear );
} else {
clear();
}
@@ -1472,6 +1473,11 @@
 
this.setupToolbarSaveButton();
this.attachToolbarSaveButton();
+
+   if ( this.saveDialog ) {
+   this.saveDialog.disconnect( this );
+   this.saveDialog = null;
+   }
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14ddcba9fa4fd5f39341312d241ce59980276a2b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6eac839..02a8369 - change (mediawiki/extensions)

2016-05-26 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 6eac839..02a8369
..


Syncronize VisualEditor: 6eac839..02a8369

Change-Id: I5627a2df950854223f1b315d5b7d2dd0dd0ae37f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 6eac839..02a8369 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 6eac8391502f884f6c94b3f8a30aaa28f5d7350e
+Subproject commit 02a836977740fc82f18a97f18fd6995f0715cc50

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5627a2df950854223f1b315d5b7d2dd0dd0ae37f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Follow-up 3f456b1: Fix typo in function call - change (mediawiki...Math)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up 3f456b1: Fix typo in function call
..

Follow-up 3f456b1: Fix typo in function call

Bug: T132736
Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
---
M modules/ve-math/ve.ui.MWMathContextItem.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/67/290967/1

diff --git a/modules/ve-math/ve.ui.MWMathContextItem.js 
b/modules/ve-math/ve.ui.MWMathContextItem.js
index c278228..a247672 100644
--- a/modules/ve-math/ve.ui.MWMathContextItem.js
+++ b/modules/ve-math/ve.ui.MWMathContextItem.js
@@ -55,7 +55,7 @@
  * Handle inline edit button click events.
  */
 ve.ui.MWMathContextItem.prototype.onInlineEditButtonClick = function () {
-   this.context.getSurface().executeComamnd( 'mathInspector' );
+   this.context.getSurface().executeCommand( 'mathInspector' );
 };
 
 /* Registration */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Follow-up 3f456b1: Fix typo in function call - change (mediawiki...Math)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Follow-up 3f456b1: Fix typo in function call
..


Follow-up 3f456b1: Fix typo in function call

Bug: T132736
Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
---
M modules/ve-math/ve.ui.MWMathContextItem.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-math/ve.ui.MWMathContextItem.js 
b/modules/ve-math/ve.ui.MWMathContextItem.js
index c278228..a247672 100644
--- a/modules/ve-math/ve.ui.MWMathContextItem.js
+++ b/modules/ve-math/ve.ui.MWMathContextItem.js
@@ -55,7 +55,7 @@
  * Handle inline edit button click events.
  */
 ve.ui.MWMathContextItem.prototype.onInlineEditButtonClick = function () {
-   this.context.getSurface().executeComamnd( 'mathInspector' );
+   this.context.getSurface().executeCommand( 'mathInspector' );
 };
 
 /* Registration */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use insertContent with templates when range is collapsed - change (mediawiki...VisualEditor)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Use insertContent with templates when range is collapsed
..


Use insertContent with templates when range is collapsed

We may be trying to insert a block into a paragraph. fixUpInsertion
handles this, but not if use a replace transactions.

Bug: T136279
Change-Id: I1401da52676e79f38ef835a32d2c76004b75fb4e
(cherry picked from commit bc3edc77124cb7caed656bbdd0dd1a73ddcca762)
---
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
1 file changed, 20 insertions(+), 16 deletions(-)

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



diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index ce98bd2..8dbd870 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -65,24 +65,28 @@
nodeClass = ve.dm.MWTransclusionNode;
 
function insertNode( isInline ) {
-   // Generate a replacement transaction instead of using 
surfaceFragment.insert (which
-   // generates a removal and insertion) as blanking the 
reference triggers T135127.
-   // TODO: Once T135127 is fixed, revert to using 
surfaceFragment.insert.
var type = isInline ? nodeClass.static.inlineType : 
nodeClass.static.blockType,
-   tx = ve.dm.Transaction.newFromReplacement(
-   surfaceFragment.getDocument(),
-   
surfaceFragment.getSelection().getCoveringRange(),
-   [
-   {
-   type: type,
-   attributes: {
-   mw: 
model.getPlainObject()
-   }
-   },
-   { type: '/' + type }
-   ]
+   range = 
surfaceFragment.getSelection().getCoveringRange(),
+   data = [
+   {
+   type: type,
+   attributes: {
+   mw: 
model.getPlainObject()
+   }
+   },
+   { type: '/' + type }
+   ];
+
+   if ( range.isCollapsed() ) {
+   surfaceFragment.insertContent( data );
+   } else {
+   // Generate a replacement transaction instead 
of using surfaceFragment.insertContent
+   // (which generates a removal and insertion) as 
blanking a reference triggers T135127.
+   // TODO: Once T135127 is fixed, revert to using 
surfaceFragment.insert.
+   surfaceFragment.getSurface().change(
+   ve.dm.Transaction.newFromReplacement( 
surfaceFragment.getDocument(), range, data )
);
-   surfaceFragment.getSurface().change( tx );
+   }
deferred.resolve();
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1401da52676e79f38ef835a32d2c76004b75fb4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Avoid DBPerformance warnings on PURGE/TRACE requests - change (mediawiki/core)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Avoid DBPerformance warnings on PURGE/TRACE requests
..


Avoid DBPerformance warnings on PURGE/TRACE requests

The former sometimes show up in the logs as they were causing
CentralAuth to use the master but the expectations treated
the request as a GET request. This makes things more
consistent.

Bug: T92357
Change-Id: I55bf3139c68f5926fe67a51cf0eb1b2ffe55d17b
---
M includes/MediaWiki.php
M includes/WebRequest.php
M includes/api/ApiMain.php
3 files changed, 33 insertions(+), 21 deletions(-)

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



diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index ff469e4..55f9e9e 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -667,10 +667,10 @@
$trxLimits = $this->config->get( 'TrxProfilerLimits' );
$trxProfiler = Profiler::instance()->getTransactionProfiler();
$trxProfiler->setLogger( LoggerFactory::getInstance( 
'DBPerformance' ) );
-   if ( $request->wasPosted() ) {
-   $trxProfiler->setExpectations( $trxLimits['POST'], 
__METHOD__ );
-   } else {
+   if ( $request->hasSafeMethod() ) {
$trxProfiler->setExpectations( $trxLimits['GET'], 
__METHOD__ );
+   } else {
+   $trxProfiler->setExpectations( $trxLimits['POST'], 
__METHOD__ );
}
 
// If the user has forceHTTPS set to true, or if the user
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 2333c78..152a3d2 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1250,6 +1250,26 @@
}
 
/**
+* Check if this request uses a "safe" HTTP method
+*
+* Safe methods are verbs (e.g. GET/HEAD/OPTIONS) used for obtaining 
content. Such requests
+* are not expected to mutate content, especially in ways attributable 
to the client. Verbs
+* like POST and PUT are typical of non-safe requests which often 
change content.
+*
+* @return bool
+* @see https://tools.ietf.org/html/rfc7231#section-4.2.1
+* @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html
+* @since 1.28
+*/
+   public function hasSafeMethod() {
+   if ( !isset( $_SERVER['REQUEST_METHOD'] ) ) {
+   return false; // CLI mode
+   }
+
+   return in_array( $_SERVER['REQUEST_METHOD'], [ 'GET', 'HEAD', 
'OPTIONS', 'TRACE' ] );
+   }
+
+   /**
 * Whether this request should be identified as being "safe"
 *
 * This means that the client is not requesting any state changes and 
that database writes
@@ -1268,21 +1288,15 @@
 * @since 1.28
 */
public function isSafeRequest() {
-   if ( !isset( $_SERVER['REQUEST_METHOD'] ) ) {
-   return false; // CLI mode
+   if ( $this->markedAsSafe && $this->wasPosted() ) {
+   return true; // marked as a "safe" POST
}
 
-   if ( $_SERVER['REQUEST_METHOD'] === 'POST' ) {
-   return $this->markedAsSafe;
-   } elseif ( in_array( $_SERVER['REQUEST_METHOD'], [ 'GET', 
'HEAD', 'OPTIONS' ] ) ) {
-   return true; // HTTP "safe methods"
-   }
-
-   return false; // PUT/DELETE
+   return $this->hasSafeMethod();
}
 
/**
-* Mark this request is identified as being nullipotent even if it is a 
POST request
+* Mark this request as identified as being nullipotent even if it is a 
POST request
 *
 * POST requests are often used due to the need for a client payload, 
even if the request
 * is otherwise equivalent to a "safe method" request.
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 9c54eac..93a5b60 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1356,15 +1356,13 @@
protected function setRequestExpectations( ApiBase $module ) {
$limits = $this->getConfig()->get( 'TrxProfilerLimits' );
$trxProfiler = Profiler::instance()->getTransactionProfiler();
-   if ( $this->getRequest()->wasPosted() ) {
-   if ( $module->isWriteMode() ) {
-   $trxProfiler->setExpectations( $limits['POST'], 
__METHOD__ );
-   } else {
-   $trxProfiler->setExpectations( 
$limits['POST-nonwrite'], __METHOD__ );
-   $this->getRequest()->markAsSafeRequest();
-   }
-   } else {
+   if ( $this->getRequest()->hasSafeMethod() ) {

[MediaWiki-commits] [Gerrit] Indent with spaces and update version string. - change (mediawiki...QuickGV)

2016-05-26 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: Indent with spaces and update version string.
..


Indent with spaces and update version string.

According to https://www.mediawiki.org/wiki/Manual:Coding_conventions,
fix following files.
* QuickGV.php
* QuickGV.i18n.php
* QuickGV.template.php

Bug: T133633
Change-Id: Iaf56644e1d9538d9cea4b667ad811e272446cbb8
---
M QuickGV.i18n.php
M QuickGV.php
M QuickGV.template.php
3 files changed, 167 insertions(+), 163 deletions(-)

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



diff --git a/QuickGV.i18n.php b/QuickGV.i18n.php
index 1271004..6592f8d 100644
--- a/QuickGV.i18n.php
+++ b/QuickGV.i18n.php
@@ -2,31 +2,31 @@
 $messages = array();
 
 $messages['en'] = array(
-   'quickgv-desc' => 'A little tool to create digraph',
-   'filepath' => 'File Path',
-   'filesize' => 'File Size',
-   'filemtime' => 'Last modified',
-   'md5sum' => 'MD5 Summary',
-   'exectime' => 'Execution Time',
-   'seconds'  => 'second(s)',
-   'graphviz-path' => 'Graphviz Path',
-   'graphviz-ver' => 'Graphviz Version',
-   'graphviz-ref' => 'Reference',
-   'quickgv-ver' => 'QuickGV Version',
-   'quickgv-about' => 'About QuickGV',
+'quickgv-desc'  => 'Build flowchart, mindmap and ram description quickly.',
+'filepath'  => 'File Path',
+'filesize'  => 'File Size',
+'filemtime' => 'Last modified',
+'md5sum'=> 'MD5 Summary',
+'exectime'  => 'Execution Time',
+'seconds'   => 'second(s)',
+'graphviz-path' => 'Graphviz Path',
+'graphviz-ver'  => 'Graphviz Version',
+'graphviz-ref'  => 'Reference',
+'quickgv-ver'   => 'QuickGV Version',
+'quickgv-about' => 'About QuickGV',
 );
 
 $messages['zh-hant'] = array(
-   'quickgv-desc' => '有向圖小工具',
-   'filepath' => '檔案路徑',
-   'filesize' => '檔案大小',
-   'filemtime' => '檔案更新時間',
-   'md5sum' => 'MD5 摘要',
-   'exectime' => '轉圖時間',
-   'seconds'  => '秒',
-   'graphviz-path' => 'Graphviz 路徑',
-   'graphviz-ver' => 'Graphviz 版本',
-   'graphviz-ref' => '參考文件',
-   'quickgv-ver' => 'QuickGV 版本',
-   'quickgv-about' => '關於 QuickGV',
+'quickgv-desc'  => '快速製作流程圖、心智圖、記憶體描述的小工具。',
+'filepath'  => '檔案路徑',
+'filesize'  => '檔案大小',
+'filemtime' => '檔案更新時間',
+'md5sum'=> 'MD5 摘要',
+'exectime'  => '轉圖時間',
+'seconds'   => '秒',
+'graphviz-path' => 'Graphviz 路徑',
+'graphviz-ver'  => 'Graphviz 版本',
+'graphviz-ref'  => '參考文件',
+'quickgv-ver'   => 'QuickGV 版本',
+'quickgv-about' => '關於 QuickGV',
 );
diff --git a/QuickGV.php b/QuickGV.php
index 8fb48a1..9c3d7b6 100644
--- a/QuickGV.php
+++ b/QuickGV.php
@@ -1,13 +1,13 @@
  __FILE__,
-   'name'   => 'QuickGV',
-   'author' => '[https://github.com/virus-warnning Raymond Wu]',
-   'url'=> 'https://www.mediawiki.org/wiki/Extension:QuickGV',
-   'descriptionmsg' => 'quickgv-desc',
-   'version'=> '0.2.3',
+'path'   => __FILE__,
+'name'   => 'QuickGV',
+'author' => '[https://github.com/virus-warnning 吳政璋]',
+'url'=> 'https://www.mediawiki.org/wiki/Extension:QuickGV',
+'descriptionmsg' => 'quickgv-desc',
+'version'=> '0.2.4',
 );
 
-$wgAutoloadClasses['QuickGV'] = __DIR__ . '/QuickGV.body.php';
+$wgAutoloadClasses['QuickGV']= __DIR__ . '/QuickGV.body.php';
 $wgExtensionMessagesFiles['QuickGV'] = __DIR__ . '/QuickGV.i18n.php';
-$wgHooks['ParserFirstCallInit'][] = 'QuickGV::init';
+$wgHooks['ParserFirstCallInit'][]= 'QuickGV::init';
diff --git a/QuickGV.template.php b/QuickGV.template.php
index 69c3b77..7204ba7 100644
--- a/QuickGV.template.php
+++ b/QuickGV.template.php
@@ -3,175 +3,179 @@
  * Template of graph description (dot syntax)
  */
 
-// theme definitions
+// Theme definitions
 $THEME_ATTRS = array(
-   'cold' => array(
-   'graph_bg' => '#66',
-   'graph_label'  => '#ff',
-   'graph_border' => '#ff',
-   'edge_path'=> '#ff',
-   'edge_font'=> '#ff',
-   'node_border'  => '#ff',
-   'node_font'=> '#00',
-   'node_fill'=> '#cc:#00c0ff'
-   ),
-   'warm' => array(
-   'graph_bg' => '#f7',
-   'graph_label'  => '#00',
-   'graph_border' => '#804000',
-   'edge_path'=> '#704000',
-   'edge_font'=> '#704000',
-   'node_border'  => '#c07000',
-   'node_font'=> '#00',
-   'node_fill'=> '#ff:#c0'
-   ),
-   'sakura' => array(
-   'graph_bg' => '#996677',
-

[MediaWiki-commits] [Gerrit] Rationalize accesibility of fns and methods for Extras - change (mediawiki...DonationInterface)

2016-05-26 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Rationalize accesibility of fns and methods for Extras
..

Rationalize accesibility of fns and methods for Extras

TODO: ip_velocity

Change-Id: Ie3d02718a21774b5e445e8e930ea37e8b33ead8d
---
M extras/FraudFilter.php
M extras/conversion_log/conversion_log.body.php
M extras/custom_filters/custom_filters.body.php
M extras/custom_filters/filters/functions/functions.body.php
M extras/custom_filters/filters/minfraud/minfraud.body.php
M extras/custom_filters/filters/referrer/referrer.body.php
M extras/custom_filters/filters/source/source.body.php
M extras/extras.body.php
M tests/DonationInterfaceTestCase.php
9 files changed, 56 insertions(+), 51 deletions(-)


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

diff --git a/extras/FraudFilter.php b/extras/FraudFilter.php
index b183f7c..34d99dd 100644
--- a/extras/FraudFilter.php
+++ b/extras/FraudFilter.php
@@ -10,7 +10,7 @@
 */
protected $fraud_logger;
 
-   public function __construct( GatewayType $gateway_adapter ) {
+   protected function __construct( GatewayType $gateway_adapter ) {
parent::__construct( $gateway_adapter );
$this->fraud_logger = DonationLoggerFactory::getLogger( 
$this->gateway_adapter, '_fraud' );
}
diff --git a/extras/conversion_log/conversion_log.body.php 
b/extras/conversion_log/conversion_log.body.php
index 585dfaa..1a97ab4 100644
--- a/extras/conversion_log/conversion_log.body.php
+++ b/extras/conversion_log/conversion_log.body.php
@@ -2,12 +2,12 @@
 
 class Gateway_Extras_ConversionLog extends Gateway_Extras {
 
-   public static $instance;
+   protected static $instance;
 
/**
 * Logs the response from a transaction
 */
-   public function post_process() {
+   protected function post_process() {
// if the trxn has been outright rejected, log it
if ( $this->gateway_adapter->getValidationAction() == 'reject' 
) {
$this->log(
@@ -33,7 +33,7 @@
return true;
}
 
-   static function onPostProcess( GatewayType $gateway_adapter ) {
+   public static function onPostProcess( GatewayType $gateway_adapter ) {
if ( !$gateway_adapter->getGlobal( 'EnableConversionLog' ) ) {
return true;
}
@@ -41,7 +41,7 @@
return self::singleton( $gateway_adapter )->post_process();
}
 
-   static function singleton( GatewayType $gateway_adapter ) {
+   protected static function singleton( GatewayType $gateway_adapter ) {
if ( !self::$instance ) {
self::$instance = new self( $gateway_adapter );
}
diff --git a/extras/custom_filters/custom_filters.body.php 
b/extras/custom_filters/custom_filters.body.php
index 146043e..0f41a26 100644
--- a/extras/custom_filters/custom_filters.body.php
+++ b/extras/custom_filters/custom_filters.body.php
@@ -20,14 +20,14 @@
 * Define the action to take for a given $risk_score
 * @var array
 */
-   public $action_ranges;
+   protected $action_ranges;
 
/**
 * A container for an instance of self
 */
-   static $instance;
+   protected static $instance;
 
-   public function __construct( GatewayType $gateway_adapter ) {
+   protected function __construct( GatewayType $gateway_adapter ) {
parent::__construct( $gateway_adapter ); //gateway_adapter is 
set in there. 
// load user action ranges and risk score   
$this->action_ranges = $this->gateway_adapter->getGlobal( 
'CustomFiltersActionRanges' );
@@ -43,7 +43,7 @@
 *
 * @return string The action to take
 */
-   public function determineAction() {
+   protected function determineAction() {
$risk_score = $this->getRiskScore();
// possible risk scores are between 0 and 100
if ( $risk_score < 0 )
@@ -101,8 +101,10 @@
 
/**
 * Run the transaction through the custom filters
+* @param string $hook Run custom filters attached to a hook with this 
name
+* @return bool
 */
-   public function validate( $hook ) {
+   protected function validate( $hook ) {
// expose a hook for custom filters
WmfFramework::runHooks( $hook, array( $this->gateway_adapter, 
$this ) );
$score = $this->getRiskScore();
@@ -134,7 +136,7 @@
return TRUE;
}
 
-   static function onValidate( GatewayType $gateway_adapter ) {
+   public static function onValidate( GatewayType $gateway_adapter ) {
if (

[MediaWiki-commits] [Gerrit] Set correct pointer color on click. - change (mediawiki...RevisionSlider)

2016-05-26 Thread WMDE-leszek (Code Review)

WMDE-leszek has submitted this change and it was merged.

Change subject: Set correct pointer color on click.
..


Set correct pointer color on click.

This fixes a bug which caused the old revision pointer to appear yellow
when being moved on click after the pointers switched places.

Change-Id: Ibfa104e059e847c68667605b60efe5cbb003327f
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index c98a588..0e4fdea 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -129,7 +129,7 @@
pOld.setPosition( $clickedRev.data( 
'pos' ) );
}
 
-   self.resetPointerColorsBasedOnValues( 
pOld.getPosition(), pNew.getPosition() );
+   self.resetPointerColorsBasedOnValues( 
self.pointerOne.getPosition(), self.pointerTwo.getPosition() );
self.resetRevisionStylesBasedOnPointerPosition( 
$revisions );
self.alignPointers();
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfa104e059e847c68667605b60efe5cbb003327f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jakob 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Gabriel Birke 
Gerrit-Reviewer: Jakob 
Gerrit-Reviewer: Kai Nissen (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Follow-up 276c30e: Use the correct hex for the green we want - change (mediawiki/core)

2016-05-26 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up 276c30e: Use the correct hex for the green we want
..

Follow-up 276c30e: Use the correct hex for the green we want

Bug: T136175
Change-Id: I4ce6010d55c361c56584a36ac252a68f0d2ee363
---
M mw-config/config.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/290976/1

diff --git a/mw-config/config.css b/mw-config/config.css
index 9cfc40f..3aeb1ed 100644
--- a/mw-config/config.css
+++ b/mw-config/config.css
@@ -137,7 +137,7 @@
 .success-message {
font-weight: bold;
font-size: 110%;
-   color: #0f0;
+   color: #008000;
 }
 
 .success-box {

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up 3f456b1: Fix typo in function call - change (mediawiki...Math)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Follow-up 3f456b1: Fix typo in function call
..


Follow-up 3f456b1: Fix typo in function call

Bug: T132736
Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
---
M modules/ve-math/ve.ui.MWMathContextItem.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-math/ve.ui.MWMathContextItem.js 
b/modules/ve-math/ve.ui.MWMathContextItem.js
index c278228..a247672 100644
--- a/modules/ve-math/ve.ui.MWMathContextItem.js
+++ b/modules/ve-math/ve.ui.MWMathContextItem.js
@@ -55,7 +55,7 @@
  * Handle inline edit button click events.
  */
 ve.ui.MWMathContextItem.prototype.onInlineEditButtonClick = function () {
-   this.context.getSurface().executeComamnd( 'mathInspector' );
+   this.context.getSurface().executeCommand( 'mathInspector' );
 };
 
 /* Registration */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36862baf287efe275d5b5fdc3bef911b7815a762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: REL1_27
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Create raid module to hold RAID monitoring checks - change (operations/puppet)

2016-05-26 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

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

Change subject: Create raid module to hold RAID monitoring checks
..

Create raid module to hold RAID monitoring checks

Move check-raid.py and associated packages and definitions away from
base::monitoring::host and into a new "raid" class, init class of the
new "raid" module. Not much win so far, more will follow.

Bug: T84050
Change-Id: Ifb3e9dd0ed78cf6fa7b37f576ae0302c668e966a
---
M modules/base/manifests/monitoring/host.pp
M modules/nagios_common/files/checkcommands.cfg
R modules/raid/files/check-raid.py
A modules/raid/manifests/init.pp
4 files changed, 48 insertions(+), 33 deletions(-)


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

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 752235c..bb68963 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -30,6 +30,9 @@
 ) {
 include base::puppet::params # In order to be able to use some variables
 
+# RAID checks
+include raid
+
 monitoring::host { $::hostname: }
 
 monitoring::service { 'ssh':
@@ -37,26 +40,6 @@
 check_command => 'check_ssh',
 }
 
-package { [ 'megacli', 'arcconf', 'mpt-status' ]:
-ensure => 'latest',
-}
-
-file { '/etc/default/mpt-statusd':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0555',
-content => "RUN_DAEMON=no\n",
-before  => Package['mpt-status'],
-}
-
-file { '/usr/local/bin/check-raid.py':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/base/monitoring/check-raid.py';
-}
 file { '/usr/local/lib/nagios/plugins/check_puppetrun':
 ensure => present,
 owner  => 'root',
@@ -87,15 +70,9 @@
 source => 
'puppet:///modules/base/monitoring/check-fresh-files-in-dir.py',
 }
 
-sudo::user { 'nagios':
-privileges   => [
-'ALL = NOPASSWD: /usr/local/bin/check-raid.py',
-'ALL = NOPASSWD: 
/usr/local/lib/nagios/plugins/check_puppetrun',
-],
-}
-nrpe::monitor_service { 'raid':
-description  => 'RAID',
-nrpe_command => '/usr/bin/sudo /usr/local/bin/check-raid.py',
+sudo::user { 'nagios_puppetrun':
+user   => 'nagios',
+privileges  => ['ALL = NOPASSWD: 
/usr/local/lib/nagios/plugins/check_puppetrun'],
 }
 
 # Check for disk usage on the root partition for labs instances
diff --git a/modules/nagios_common/files/checkcommands.cfg 
b/modules/nagios_common/files/checkcommands.cfg
index 8c014fa..ceb56d3 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -324,10 +324,6 @@
 }
 
 define command {
-command_namenrpe_check_raid
-command_line$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_raid
-}
-define command {
 command_namecheck_ircd
 command_line$USER1$/check_ircd -H $HOSTADDRESS$ -w 800 -c 1000
 }
diff --git a/modules/base/files/monitoring/check-raid.py 
b/modules/raid/files/check-raid.py
similarity index 100%
rename from modules/base/files/monitoring/check-raid.py
rename to modules/raid/files/check-raid.py
diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
new file mode 100644
index 000..e9f9509
--- /dev/null
+++ b/modules/raid/manifests/init.pp
@@ -0,0 +1,42 @@
+# == Class: raid
+#
+# Class to set up monitoring for software and hardware RAID
+#
+# === Parameters
+#
+# === Examples
+#
+#  include raid
+
+class raid {
+package { [ 'megacli', 'arcconf', 'mpt-status' ]:
+ensure => 'latest',
+}
+
+file { '/etc/default/mpt-statusd':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => "RUN_DAEMON=no\n",
+before  => Package['mpt-status'],
+}
+
+file { '/usr/local/bin/check-raid.py':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/raid/check-raid.py';
+}
+
+sudo::user { 'nagios_raid':
+user   => 'nagios',
+privileges => ['ALL = NOPASSWD: /usr/local/bin/check-raid.py'],
+}
+
+nrpe::monitor_service { 'raid':
+description  => 'RAID',
+nrpe_command => '/usr/bin/sudo /usr/local/bin/check-raid.py',
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb3e9dd0ed78cf6fa7b37f576ae0302c668e966a
Gerrit-PatchSet: 1
Gerrit-Project:

[MediaWiki-commits] [Gerrit] raid: add a new "raid" fact - change (operations/puppet)

2016-05-26 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid: add a new "raid" fact
..

raid: add a new "raid" fact

This holds a array of all the possible RAID configurations that can be
found in one server. Hence, it will support configurations such as
software RAID on top or on the side of hardware RAID, or multiple RAID
controllers in one server.

Unused for now -- it's still useful to populate the database with it, so
that errors can be found before we can start using it.

Bug: T84050
Change-Id: Ie3b2ed86e088655b5361b2c45c80a2e0acdfc1cc
---
A modules/raid/lib/facter/raid.rb
1 file changed, 60 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/290988/1

diff --git a/modules/raid/lib/facter/raid.rb b/modules/raid/lib/facter/raid.rb
new file mode 100644
index 000..e837fd7
--- /dev/null
+++ b/modules/raid/lib/facter/raid.rb
@@ -0,0 +1,60 @@
+Facter.add('raid') do
+  confine :kernel => :Linux
+  setcode do
+raids = []
+
+if FileTest.exist?('/dev/cciss/') or FileTest.exist?('/sys/module/hpsa/')
+  raids.push('hpsa')
+end
+
+if FileTest.exist?('/dev/megadev0') or
+   Dir.glob('/sys/bus/pci/drivers/megaraid_sas/00*').length > 0
+  raids.push('megaraid')
+end
+
+if FileTest.exist?('/dev/mptctl') or
+   FileTest.exist?('/dev/mpt0') or
+   FileTest.exist?('/proc/mpt/summary') or
+   FileTest.exist?('/proc/scsi/mptsas/0')
+  raids.push('mpt')
+end
+
+if FileTest.exist?('/dev/aac0')
+  raids.push('aacraid')
+end
+
+if FileTest.exist?('/proc/scsi/scsi')
+  IO.foreach('/proc/scsi/scsi') do |x|
+if x =~ /Vendor: 3ware/
+  raids.push('3ware')
+  break
+end
+  end
+end
+
+IO.foreach('/proc/devices') do |x|
+  valid_devs = [ 'aac', 'twe', 'megadev' ]
+  if x =~ /^\s*\d+\s+(\w+)/
+raids.push($1) if valid_devs.include?($1)
+  end
+end
+
+if FileTest.exist?('/proc/mdstat') and FileTest.exist?('/sbin/mdadm')
+  IO.foreach('/proc/mdstat') do |x|
+if x =~ /md[0-9]+ : active/
+  raids.push('md')
+  break
+end
+  end
+end
+
+raids.sort!.uniq!
+
+if Facter.version < '2.0.0'
+  raids.join(',')
+else
+  raids
+end
+
+  end
+end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3b2ed86e088655b5361b2c45c80a2e0acdfc1cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] raid: add HP's RAID tool to the list - change (operations/puppet)

2016-05-26 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid: add HP's RAID tool to the list
..

raid: add HP's RAID tool to the list

Bug: T97998
Change-Id: I7dbf1596671f99410f708d928095346766be0265
---
M modules/raid/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index e9f9509..4219606 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -9,7 +9,7 @@
 #  include raid
 
 class raid {
-package { [ 'megacli', 'arcconf', 'mpt-status' ]:
+package { [ 'megacli', 'arcconf', 'mpt-status', 'hpssacli' ]:
 ensure => 'latest',
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dbf1596671f99410f708d928095346766be0265
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] registration: Add --config-prefix to convertExtensionToRegis... - change (mediawiki/core)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: registration: Add --config-prefix to 
convertExtensionToRegistration.php
..


registration: Add --config-prefix to convertExtensionToRegistration.php

For converting extensions that use custom prefixes.

Change-Id: I4fcf7ff2af04e9a0367de368503f2c70d8fed959
---
M maintenance/convertExtensionToRegistration.php
1 file changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/convertExtensionToRegistration.php 
b/maintenance/convertExtensionToRegistration.php
index aab2087..7c87e10 100644
--- a/maintenance/convertExtensionToRegistration.php
+++ b/maintenance/convertExtensionToRegistration.php
@@ -59,6 +59,7 @@
$this->addArg( 'path', 'Location to the PHP entry point you 
wish to convert',
/* $required = */ true );
$this->addOption( 'skin', 'Whether to write to skin.json', 
false, false );
+   $this->addOption( 'config-prefix', 'Custom prefix for 
configuration settings', false, true );
}
 
protected function getAllGlobals() {
@@ -92,6 +93,10 @@
$this->dir = dirname( realpath( $this->getArg( 0 ) ) );
$this->json = [];
$globalSettings = $this->getAllGlobals();
+   $configPrefix = $this->getOption( 'config-prefix', 'wg' );
+   if ( $configPrefix !== 'wg' ) {
+   $this->json['config']['_prefix'] = $configPrefix;
+   }
foreach ( $vars as $name => $value ) {
$realName = substr( $name, 2 ); // Strip 'wg'
if ( $realName === false ) {
@@ -113,9 +118,14 @@

$this->noLongerSupportedGlobals[$realName] . '). ' .
"Please update the entry point before 
convert to registration.\n" );
$this->hasWarning = true;
-   } elseif ( strpos( $name, 'wg' ) === 0 ) {
+   } elseif ( strpos( $name, $configPrefix ) === 0 ) {
// Most likely a config setting
-   $this->json['config'][$realName] = $value;
+   $this->json['config'][substr( $name, strlen( 
$configPrefix ) )] = $value;
+   } elseif ( $configPrefix !== 'wg' && strpos( $name, 
'wg' ) === 0 ) {
+   // Warn about this
+   $this->output( 'Warning: Skipped global "' . 
$name . '" (' .
+   'config prefix is "' . $configPrefix . 
'"). ' .
+   "Please check that this setting isn't 
needed.\n" );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fcf7ff2af04e9a0367de368503f2c70d8fed959
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use exchars instead of exsentences for the extract - change (mediawiki...Popups)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Use exchars instead of exsentences for the extract
..


Use exchars instead of exsentences for the extract

To avoid sentence parsing bugs in other languages.

We have to artificially remove the always-added ellipsis from textextracts to
mimic previous behavior, and we'll add ellipsis via CSS afterwards.

Bug: T135824
Change-Id: Idf27f2fd18f7197e588c609eeb62ac8fc80626d7
---
M resources/ext.popups.renderer.article.js
1 file changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/resources/ext.popups.renderer.article.js 
b/resources/ext.popups.renderer.article.js
index 14ec6e9..ac8363a 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -9,6 +9,12 @@
$window = $( window );
 
/**
+* Number of chars to request for the article extract
+* @property CHARS
+*/
+   article.CHARS = 525;
+
+   /**
 * Size constants for popup images
 * @property SIZES
 */
@@ -55,7 +61,7 @@
formatversion: 2,
redirects: true,
exintro: true,
-   exsentences: 5,
+   exchars: article.CHARS,
// there is an added geometric limit on 
.mwe-popups-extract
// so that text does not overflow from the card
explaintext: true,
@@ -99,6 +105,8 @@
deferred.reject();
return;
}
+
+   re.query.pages[ 0 ].extract = removeEllipsis( 
re.query.pages[ 0 ].extract );
 
mw.popups.render.cache[ href ] = {};
mw.popups.render.cache[ href ].popup = 
article.createPopup( re.query.pages[ 0 ], href );
@@ -667,4 +675,11 @@
 */
mw.popups.render.getClosestYPosition = getClosestYPosition;
 
+   /**
+* Remove ellipsis if exists at the end
+*/
+   function removeEllipsis( text ) {
+   return text.replace( /\.\.\.$/, '' );
+   }
+
 } )( jQuery, mediaWiki );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf27f2fd18f7197e588c609eeb62ac8fc80626d7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Thumbnails: allow overflow inside thumbnails" - change (mediawiki/core)

2016-05-26 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Thumbnails: allow overflow inside thumbnails"
..


Revert "Thumbnails: allow overflow inside thumbnails"

This reverts commit 2964c2799f0c19ac4c765f025a2998a0f3baeff0.

Bug: T133439
Change-Id: Id16420e8f5fd73e31cba2d5415ae9c1730a5a32c
(cherry picked from commit f1e9a4eabd1c65a8a51450db77b6758fd20b4243)
---
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/oldshared.css
M resources/src/mediawiki.skinning/content.css
3 files changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/resources/src/mediawiki.legacy/commonPrint.css 
b/resources/src/mediawiki.legacy/commonPrint.css
index 975ec2a..109165b 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -247,6 +247,7 @@
padding: 3px !important;
font-size: 94%;
text-align: center;
+   overflow: hidden;
 }
 
 html .thumbimage {
@@ -259,8 +260,6 @@
line-height: 1.4em;
padding: 3px !important;
font-size: 94%;
-   overflow: hidden;
-   word-wrap: break-word;
 }
 
 /* @noflip */
diff --git a/resources/src/mediawiki.legacy/oldshared.css 
b/resources/src/mediawiki.legacy/oldshared.css
index 9adfba1..5d637da 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -90,6 +90,7 @@
background-color: #f9f9f9;
font-size: 94%;
text-align: center;
+   overflow: hidden;
 }
 
 html .thumbimage {
@@ -102,8 +103,6 @@
padding: 3px;
font-size: 94%;
text-align: left;
-   overflow: hidden;
-   word-wrap: break-word;
 }
 
 div.magnify {
diff --git a/resources/src/mediawiki.skinning/content.css 
b/resources/src/mediawiki.skinning/content.css
index 89f8745..e6f92a5 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -152,6 +152,7 @@
background-color: #f9f9f9;
font-size: 94%;
text-align: center;
+   overflow: hidden;
 }
 
 html .thumbimage {
@@ -163,8 +164,6 @@
line-height: 1.4em;
padding: 3px;
font-size: 94%;
-   overflow: hidden;
-   word-wrap: break-word;
/* Default styles when there's no .mw-content-ltr or .mw-content-rtl, 
overridden below */
text-align: left;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id16420e8f5fd73e31cba2d5415ae9c1730a5a32c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix lvname for druid volume in druid-4ssd-raid10.cfg - change (operations/puppet)

2016-05-26 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Fix lvname for druid volume in druid-4ssd-raid10.cfg
..

Fix lvname for druid volume in druid-4ssd-raid10.cfg

Change-Id: If92d9dc6e8ff02a02fd69cf7489b2805801c34e8
---
M modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg 
b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
index 04de011..69c88a7 100644
--- a/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
+++ b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
@@ -33,7 +33,7 @@
10  4   -1  ext4\
$lvmok{ }   \
$defaultignore{ }   \
-   lv_name{ var }  \
+   lv_name{ druid }\
method{ format }\
format{ }   \
use_filesystem{ }   \

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

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

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

1 2 3 4 5 >

1 - 100 of 473 matches

Mail list logo