[MediaWiki-commits] [Gerrit] Update tags - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Update tags
..


Update tags

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 993d4a4..51cd898 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2001,6 +2001,7 @@
 optional = revcs-log-supplement
 
 Revision Slider
+optional = revisionslider-show-help
 
 Right Functions
 optional = rightfunctions-rest1, rightfunctions-rest2, rightfunctions-rest3, 
rightfunctions-sep

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If51dfe8cf0f542ee048c85df548f3563b73ca0ae
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
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] Phabricator: support systemd as well as upstart. - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Phabricator: support systemd as well as upstart.
..


Phabricator: support systemd as well as upstart.

Production currently runs on ubuntu, but I have been testing with
debian on labs.

Change-Id: Ideb6b9c177d554bd398cf71b4ed708859a17f80f
---
M modules/phabricator/manifests/vcs.pp
A modules/phabricator/templates/ssh-phab.service
2 files changed, 33 insertions(+), 9 deletions(-)

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



diff --git a/modules/phabricator/manifests/vcs.pp 
b/modules/phabricator/manifests/vcs.pp
index d02f0fc..fb43716 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -70,14 +70,6 @@
 notify  => Service['ssh-phab'],
 }
 
-file { '/etc/init/ssh-phab.conf':
-content => template('phabricator/sshd-phab.conf'),
-mode=> '0644',
-owner   => 'root',
-group   => 'root',
-require => Package['openssh-server'],
-}
-
 # phd.user owns repo resources and both vcs and web user
 # must sudo to phd to for repo work.
 sudo::user { $vcs_user:
@@ -94,9 +86,26 @@
 require=> File['/usr/local/bin/git-http-backend'],
 }
 
+if $::initsystem == 'upstart' {
+$init_file = '/etc/init/ssh-phab.conf'
+$init_template = template('phabricator/sshd-phab.conf')
+} else {
+$init_file = '/etc/systemd/system/ssh-phab.service'
+$init_template = template('phabricator/ssh-phab.service')
+}
+
+file { $init_file:
+content => $init_template,
+mode=> '0644',
+owner   => 'root',
+group   => 'root',
+require => Package['openssh-server'],
+}
+
 service { 'ssh-phab':
 ensure => running,
+provider   => $::initsystem,
 hasrestart => true,
-require=> File['/etc/init/ssh-phab.conf'],
+require=> File[$init_file],
 }
 }
diff --git a/modules/phabricator/templates/ssh-phab.service 
b/modules/phabricator/templates/ssh-phab.service
new file mode 100644
index 000..6f2d1c9
--- /dev/null
+++ b/modules/phabricator/templates/ssh-phab.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Phabricator Secure Shell server
+After=network.target auditd.service
+ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
+
+[Service]
+EnvironmentFile=-/etc/default/ssh
+ExecStart=/usr/sbin/sshd -D -f<%= @sshd_config %>
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+Alias=ssh-phab.service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ideb6b9c177d554bd398cf71b4ed708859a17f80f
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove obsolete code that manages phabricator src/extensions - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Remove obsolete code that manages phabricator src/extensions
..


Remove obsolete code that manages phabricator src/extensions

We now use phutil libraries loaded from libext/extension/* via configuration.
Get rid of unneeded code for injecting extensions into the phabricator src tree.

Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
---
D modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
M modules/role/manifests/phabricator/labs.pp
M modules/role/manifests/phabricator/main.pp
4 files changed, 0 insertions(+), 35 deletions(-)

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



diff --git a/modules/phabricator/manifests/extension.pp 
b/modules/phabricator/manifests/extension.pp
deleted file mode 100644
index 2b143b7..000
--- a/modules/phabricator/manifests/extension.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# == Class: phabricator::extension
-#
-# === Parameters
-#
-# [*rootdir*]
-#Phabricator repo directory
-
-define phabricator::extension($rootdir='/') {
-file { "${rootdir}/phabricator/src/extensions/${name}":
-ensure  => 'link',
-target  => "${rootdir}/extensions/${name}",
-require => File[$rootdir],
-}
-}
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index ae712f6..6eafb2d 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -26,8 +26,6 @@
 # maintenance
 # Requires: mysql_admin_user
 #
-# [*extensions*]
-# Array of extensions to load
 #
 # [*serveralias*]
 # Alternative domain on which to respond too
@@ -55,7 +53,6 @@
 $timezone = 'UTC',
 $trusted_proxies  = [],
 $libraries= [],
-$extensions   = [],
 $settings = {},
 $mysql_admin_user = '',
 $mysql_admin_pass = '',
@@ -165,22 +162,6 @@
 require => $base_requirements,
 }
 $phab_settings['load-libraries'] = $libraries
-}
-
-if ($extensions) {
-file { "${phabdir}/phabricator/src/extensions":
-ensure  => 'directory',
-path=> "${phabdir}/phabricator/src/extensions",
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-require => $base_requirements,
-}
-
-phabricator::extension { $extensions:
-rootdir => $phabdir,
-require => $base_requirements,
-}
 }
 
 file { '/etc/php5/apache2/php.ini':
diff --git a/modules/role/manifests/phabricator/labs.pp 
b/modules/role/manifests/phabricator/labs.pp
index 4f590b6..48d2593 100644
--- a/modules/role/manifests/phabricator/labs.pp
+++ b/modules/role/manifests/phabricator/labs.pp
@@ -11,7 +11,6 @@
 libraries => ["${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/"],
-extensions=> [ ],
 settings  => {
 'darkconsole.enabled' => true,
 'phabricator.base-uri'=> 
"https://${::hostname}.wmflabs.org;,
diff --git a/modules/role/manifests/phabricator/main.pp 
b/modules/role/manifests/phabricator/main.pp
index 3cf11ba..1bccc2d 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -37,7 +37,6 @@
 libraries=> [ "${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/" ],
-extensions   => [ ],
 settings => {
 'darkconsole.enabled'=> false,
 'phabricator.base-uri'   => "https://${domain};,

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

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

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

[MediaWiki-commits] [Gerrit] puppetmaster: lint-ignore layout in test/puppetmaster - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: puppetmaster: lint-ignore layout in test/puppetmaster
..


puppetmaster: lint-ignore layout in test/puppetmaster

Change-Id: Ia154d242d96e9fdc0c218c110dc69bb37e2214df
---
M modules/puppetmaster/tests/puppetmaster.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/puppetmaster/tests/puppetmaster.pp 
b/modules/puppetmaster/tests/puppetmaster.pp
index 2c99cc2..c820061 100644
--- a/modules/puppetmaster/tests/puppetmaster.pp
+++ b/modules/puppetmaster/tests/puppetmaster.pp
@@ -1,3 +1,4 @@
+# lint:ignore:autoloader_layout
 class passwords::geoip {}
-
+# lint:endignore
 include puppetmaster

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

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

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

[MediaWiki-commits] [Gerrit] Remove obsolete code that manages phabricator src/extensions - change (operations/puppet)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Remove obsolete code that manages phabricator src/extensions
..

Remove obsolete code that manages phabricator src/extensions

We now use phutil libraries loaded from libext/extension/* via configuration.
Get rid of unneeded code for injecting extensions into the phabricator src tree.

Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
---
D modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
M modules/role/manifests/phabricator/labs.pp
M modules/role/manifests/phabricator/main.pp
4 files changed, 0 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/296068/1

diff --git a/modules/phabricator/manifests/extension.pp 
b/modules/phabricator/manifests/extension.pp
deleted file mode 100644
index 2b143b7..000
--- a/modules/phabricator/manifests/extension.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# == Class: phabricator::extension
-#
-# === Parameters
-#
-# [*rootdir*]
-#Phabricator repo directory
-
-define phabricator::extension($rootdir='/') {
-file { "${rootdir}/phabricator/src/extensions/${name}":
-ensure  => 'link',
-target  => "${rootdir}/extensions/${name}",
-require => File[$rootdir],
-}
-}
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index ae712f6..6eafb2d 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -26,8 +26,6 @@
 # maintenance
 # Requires: mysql_admin_user
 #
-# [*extensions*]
-# Array of extensions to load
 #
 # [*serveralias*]
 # Alternative domain on which to respond too
@@ -55,7 +53,6 @@
 $timezone = 'UTC',
 $trusted_proxies  = [],
 $libraries= [],
-$extensions   = [],
 $settings = {},
 $mysql_admin_user = '',
 $mysql_admin_pass = '',
@@ -165,22 +162,6 @@
 require => $base_requirements,
 }
 $phab_settings['load-libraries'] = $libraries
-}
-
-if ($extensions) {
-file { "${phabdir}/phabricator/src/extensions":
-ensure  => 'directory',
-path=> "${phabdir}/phabricator/src/extensions",
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-require => $base_requirements,
-}
-
-phabricator::extension { $extensions:
-rootdir => $phabdir,
-require => $base_requirements,
-}
 }
 
 file { '/etc/php5/apache2/php.ini':
diff --git a/modules/role/manifests/phabricator/labs.pp 
b/modules/role/manifests/phabricator/labs.pp
index 4f590b6..48d2593 100644
--- a/modules/role/manifests/phabricator/labs.pp
+++ b/modules/role/manifests/phabricator/labs.pp
@@ -11,7 +11,6 @@
 libraries => ["${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/"],
-extensions=> [ ],
 settings  => {
 'darkconsole.enabled' => true,
 'phabricator.base-uri'=> 
"https://${::hostname}.wmflabs.org;,
diff --git a/modules/role/manifests/phabricator/main.pp 
b/modules/role/manifests/phabricator/main.pp
index 3cf11ba..1bccc2d 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -37,7 +37,6 @@
 libraries=> [ "${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/" ],
-extensions   => [ ],
 settings => {
 'darkconsole.enabled'=> false,
 'phabricator.base-uri'   => "https://${domain};,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] let phab2001 use same role classes as iridium - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: let phab2001 use same role classes as iridium
..


let phab2001 use same role classes as iridium

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 5727752..235315e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1349,7 +1349,7 @@
 }
 
 # Phabricator
-node 'iridium.eqiad.wmnet' {
+node /^(iridium\.eqiad|phab2001\.codfw)\.wmnet$/ {
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5caa35df02cbef14a912a9a017392bab2633801b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] let phab2001 use same role classes as iridium - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: let phab2001 use same role classes as iridium
..

let phab2001 use same role classes as iridium

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


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 5727752..bd81015 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1349,7 +1349,7 @@
 }
 
 # Phabricator
-node 'iridium.eqiad.wmnet' {
+node /^(iridium|phab2001)\.(codfw|eqiad)\.wmnet$/
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }

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

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

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

[MediaWiki-commits] [Gerrit] Added a Database::buildStringCast and use on int/string join - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Added a Database::buildStringCast and use on int/string join
..

Added a Database::buildStringCast and use on int/string join

The database specific sql is untested, but sql is taken from docs

mssql - knows about implict casts -
https://technet.microsoft.com/en-us/library/ms191530(v=sql.105).aspx
mysql - knows about implict casts
oracle - https://docs.oracle.com/javadb/10.8.3.0/ref/rrefsqlj33562.html
postgresql -
https://www.postgresql.org/docs/9.2/static/sql-expressions.html#SQL-SYNTAX-TYPE-CASTS
sqlite - http://www.sqlite.org/lang_expr.html

Bug: T69065
Change-Id: I3a83276dc65aae58124460af1810d37dff52e943
---
M includes/db/Database.php
M includes/db/DatabaseOracle.php
M includes/db/DatabasePostgres.php
M includes/db/DatabaseSqlite.php
M includes/specials/SpecialProtectedpages.php
5 files changed, 37 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/296066/1

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 6bdcb24..413240b 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1642,6 +1642,15 @@
return '(' . $this->selectSQLText( $table, $fld, $conds, null, 
[], $join_conds ) . ')';
}
 
+   /**
+* @param string $field Field or column to cast
+* @return string
+* @since 1.28
+*/
+   public function buildStringCast( $field ) {
+   return $field;
+   }
+
public function selectDB( $db ) {
# Stub. Shouldn't cause serious problems if it's not 
overridden, but
# if your database engine supports a concept similar to MySQL's
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 9e53653..13cfddf 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1543,6 +1543,15 @@
return '(' . $this->selectSQLText( $table, $fld, $conds, null, 
[], $join_conds ) . ')';
}
 
+   /**
+* @param string $field Field or column to cast
+* @return string
+* @since 1.28
+*/
+   public function buildStringCast( $field ) {
+   return 'CAST ( ' . $field . ' AS VARCHAR2 )';
+   }
+
public function getSearchEngine() {
return 'SearchOracle';
}
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 839d6a0..7db9f6e 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1530,6 +1530,15 @@
return '(' . $this->selectSQLText( $table, $fld, $conds, null, 
[], $join_conds ) . ')';
}
 
+   /**
+* @param string $field Field or column to cast
+* @return string
+* @since 1.28
+*/
+   public function buildStringCast( $field ) {
+   return $field . '::text';
+   }
+
public function getSearchEngine() {
return 'SearchPostgres';
}
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 9d0a0f7..b90724b 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -833,6 +833,15 @@
}
 
/**
+* @param string $field Field or column to cast
+* @return string
+* @since 1.28
+*/
+   public function buildStringCast( $field ) {
+   return 'CAST ( ' . $field . ' AS TEXT )';
+   }
+
+   /**
 * @return string
 */
public function getSearchEngine() {
diff --git a/includes/specials/SpecialProtectedpages.php 
b/includes/specials/SpecialProtectedpages.php
index 54b471e..2d62941 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -537,7 +537,7 @@
'join_conds' => [
'log_search' => [
'LEFT JOIN', [
-   'ls_field' => 'pr_id', 
'ls_value = pr_id'
+   'ls_field' => 'pr_id', 
'ls_value = ' . $this->mDb->buildStringCast( 'pr_id' )
]
],
'logging' => [

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

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

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

[MediaWiki-commits] [Gerrit] ores: missing single quotes for worker monitor - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: ores: missing single quotes for worker monitor
..


ores: missing single quotes for worker monitor

Change-Id: I7f8f3cb4e51db3d8ee146f645f6bc116ba9f8ccc
---
M modules/nagios_common/files/check_commands/check_ores_workers.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/nagios_common/files/check_commands/check_ores_workers.cfg 
b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
index b7f85cc..4be5de4 100644
--- a/modules/nagios_common/files/check_commands/check_ores_workers.cfg
+++ b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
@@ -1,4 +1,4 @@
 define command {
 command_namecheck_ores_workers
-command_line$USER4$/check_ores_workers $HOSTADDRESS$ $ARG1$
+command_line$USER4$/check_ores_workers $HOSTADDRESS$ '$ARG1$'
 }

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

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

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

[MediaWiki-commits] [Gerrit] ores: missing single quotes for worker monitor - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: ores: missing single quotes for worker monitor
..

ores: missing single quotes for worker monitor

Change-Id: I7f8f3cb4e51db3d8ee146f645f6bc116ba9f8ccc
---
M modules/nagios_common/files/check_commands/check_ores_workers.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/296065/1

diff --git a/modules/nagios_common/files/check_commands/check_ores_workers.cfg 
b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
index b7f85cc..4be5de4 100644
--- a/modules/nagios_common/files/check_commands/check_ores_workers.cfg
+++ b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
@@ -1,4 +1,4 @@
 define command {
 command_namecheck_ores_workers
-command_line$USER4$/check_ores_workers $HOSTADDRESS$ $ARG1$
+command_line$USER4$/check_ores_workers $HOSTADDRESS$ '$ARG1$'
 }

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

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

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

[MediaWiki-commits] [Gerrit] Add parser test for "Piped link with empty link text" - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Add parser test for "Piped link with empty link text"
..

Add parser test for "Piped link with empty link text"

The parsoid part is untested

Change-Id: Iea2bcf3d3ff618973d2300fef702fa0667db3c93
---
M tests/parser/parserTests.txt
1 file changed, 17 insertions(+), 0 deletions(-)


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

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 2e059d7..d68db39 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -7379,6 +7379,23 @@
 !! end
 
 !! test
+Piped link with empty link text
+!! wikitext
+[[Main Page|]] - empty nowiki
+[[Main Page| ]] - empty space
+[[Main Page|]] - empty non breaking space
+!! html/php
+ - empty nowiki
+  - empty space
+ - empty non breaking 
space
+
+!! html/parsoid
+
+ 
+
+!! end
+
+!! test
 Broken link
 !! wikitext
 [[Zigzagzogzagzig]]

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

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

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

[MediaWiki-commits] [Gerrit] Make ext.flaggedRevs.review.css top loading - change (mediawiki...FlaggedRevs)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Make ext.flaggedRevs.review.css top loading
..

Make ext.flaggedRevs.review.css top loading

This avoids FOUC and reflow of diff pages

Bug: T138076
Change-Id: I94ddaa8edfa0869db507ae53dcf4b5531400d5f1
---
M frontend/FlaggedRevsUI.hooks.php
M frontend/FlaggedRevsUI.setup.php
2 files changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/frontend/FlaggedRevsUI.hooks.php b/frontend/FlaggedRevsUI.hooks.php
index c474ad4..82da44b 100644
--- a/frontend/FlaggedRevsUI.hooks.php
+++ b/frontend/FlaggedRevsUI.hooks.php
@@ -24,6 +24,7 @@
# Add review form JS for reviewers
if ( $wgUser->isAllowed( 'review' ) ) {
$wgOut->addModules( 'ext.flaggedRevs.review' );
+   $wgOut->addModules( 'ext.flaggedRevs.review.styles' );
}
return true;
}
diff --git a/frontend/FlaggedRevsUI.setup.php b/frontend/FlaggedRevsUI.setup.php
index 3fe5f2d..8f85c2e 100644
--- a/frontend/FlaggedRevsUI.setup.php
+++ b/frontend/FlaggedRevsUI.setup.php
@@ -153,7 +153,6 @@
);
$modules['ext.flaggedRevs.review'] = array(
'scripts'   => array( 'ext.flaggedRevs.review.js' ),
-   'styles'=> array( 'ext.flaggedRevs.review.css' 
),
'messages'  => array(
'savearticle', 'tooltip-save',
'revreview-submitedit', 
'revreview-submitedit-title',
@@ -168,6 +167,12 @@
'localBasePath' => $localModulePath,
'remoteExtPath' => $remoteModulePath,
);
+   $modules['ext.flaggedRevs.review.styles'] = array(
+   'styles'=> array( 'ext.flaggedRevs.review.css' 
),
+   'localBasePath' => $localModulePath,
+   'remoteExtPath' => $remoteModulePath,
+   'position' => 'top',
+   );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94ddaa8edfa0869db507ae53dcf4b5531400d5f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] VisualEditor: Disallow insertion before tag - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

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

Change subject: VisualEditor: Disallow insertion before  tag
..


VisualEditor: Disallow insertion before  tag

Bug: T138518
Change-Id: I2f9ceacedb06eab6047dfb4711ca3d1543e3dd0c
---
M modules/ve/node/ve.dm.MWPagequalityNode.js
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve/node/ve.dm.MWPagequalityNode.js 
b/modules/ve/node/ve.dm.MWPagequalityNode.js
index 90f2071..4184e08 100644
--- a/modules/ve/node/ve.dm.MWPagequalityNode.js
+++ b/modules/ve/node/ve.dm.MWPagequalityNode.js
@@ -26,6 +26,13 @@
 /**
  * @inheritdoc
  */
+ve.dm.MWPagequalityNode.prototype.canHaveSlugBefore = function () {
+   return false;
+};
+
+/**
+ * @inheritdoc
+ */
 ve.dm.MWPagequalityNode.prototype.isEditable = function () {
// TODO: check editing right with mw.user.getRights() ?
return !mw.user.isAnon();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f9ceacedb06eab6047dfb4711ca3d1543e3dd0c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve statsbar updates - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Improve statsbar updates
..


Improve statsbar updates

Message can be in one of the following status:
* untranslated
* translated
* fuzzy
* proofread (implies translated)

Handle updates accordingly.

Change-Id: Ied2e57bb202e8eb082068069c8a808649bf43c9d
---
M resources/js/ext.translate.statsbar.js
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/resources/js/ext.translate.statsbar.js 
b/resources/js/ext.translate.statsbar.js
index f3e24ec..4535063 100644
--- a/resources/js/ext.translate.statsbar.js
+++ b/resources/js/ext.translate.statsbar.js
@@ -48,7 +48,8 @@
statsbar.$statsBar.on( 'change', function ( event, to, 
from ) {
for ( i = 0; i < languageStats.length; i++ ) {
if ( languageStats[ i ].group === 
statsbar.group ) {
-   if ( to === 'translated' && 
from === 'untranslated' ) {
+   // Changing a proofread message 
does not create a new translation
+   if ( to === 'translated' && 
from !== 'proofread' ) {
languageStats[ i 
].translated++;
}
if ( to === 'proofread' ) {
@@ -64,7 +65,8 @@
if ( from === 'proofread' ) {
languageStats[ i 
].proofread--;
}
-   if ( from === 'translated' ) {
+   // Proofreading a message does 
not remove translation
+   if ( from === 'translated' && 
to !== 'proofread' ) {
languageStats[ i 
].translated--;
}
break;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied2e57bb202e8eb082068069c8a808649bf43c9d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Santhosh 
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] Improve accuracy of message status updates - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Improve accuracy of message status updates
..


Improve accuracy of message status updates

Test plan for issue 1:
1. Find a fuzzy or untranslated message
2. Keep making edits to the message and save them
3. Observe that the statsbar stays in the state it is after first edit

Without this patch, the amount of translated messages would keep growing
without limit, exceeding 100% easily.

Test plan for issue 2:
1. Make a message fuzzy and reload Special:Translate
2. In page mode/proofread mode (separately) edit the message
3. Observer that the yellow label goes away after saving

Without this patch, the yellow label with a clock symbol would stay even
after saving.

Bug: T62949
Change-Id: Ic14b70d72750ec8645d2b67ce0d6b2b98eb78556
---
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.pagemode.js
M resources/js/ext.translate.proofread.js
3 files changed, 14 insertions(+), 8 deletions(-)

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



diff --git a/resources/js/ext.translate.editor.js 
b/resources/js/ext.translate.editor.js
index 69bdf27..db63eb4 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -157,8 +157,8 @@
);
 
this.$messageItem
-   .addClass( 'translated' )
-   .removeClass( 'untranslated' );
+   .removeClass( 'untranslated translated fuzzy 
proofread' )
+   .addClass( 'translated' );
 
this.dirty = false;
 
@@ -167,6 +167,8 @@
'change',
[ 'translated', 
this.message.properties.status ]
);
+
+   this.message.properties.status = 'translated';
// TODO: Update any other statsbar for the same 
group in the page.
}
},
diff --git a/resources/js/ext.translate.pagemode.js 
b/resources/js/ext.translate.pagemode.js
index 7d564d0..8f665a3 100644
--- a/resources/js/ext.translate.pagemode.js
+++ b/resources/js/ext.translate.pagemode.js
@@ -44,6 +44,10 @@
pagemode.$message.find( 
'.tux-pagemode-translation' )
.removeClass( 'highlight' );
pagemode.message.translation = 
translation;
+
+   pagemode.$message.find( 
'.tux-pagemode-status' )
+   .removeClass( 'translated fuzzy 
proofread untranslated' )
+   .addClass( 
pagemode.message.properties.status );
}
} );
 
diff --git a/resources/js/ext.translate.proofread.js 
b/resources/js/ext.translate.proofread.js
index c615bf3..43e8ecb 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -55,12 +55,10 @@
.text( translation );
proofread.message.translation = 
translation;
proofread.markSelfTranslation();
-   // Update stats - to translated state 
from current state.
-   $( '.tux-action-bar .tux-statsbar' )
-   .trigger(
-   'change',
-   [ 'translated', 
proofread.message.properties.status ]
-   );
+
+   proofread.$message.find( 
'.tux-proofread-status' )
+   .removeClass( 'translated fuzzy 
proofread untranslated' )
+   .addClass( 
proofread.message.properties.status );
}
} );
 
@@ -222,6 +220,8 @@
[ 'proofread', 
message.properties.status ]
);
 
+   message.properties.status = 'proofread';
+
if ( mw.track ) {
mw.track( 
'ext.translate.event.proofread', message );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic14b70d72750ec8645d2b67ce0d6b2b98eb78556

[MediaWiki-commits] [Gerrit] Expose $wgMaxArticleSize in siteinfo query api - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Expose $wgMaxArticleSize in siteinfo query api
..

Expose $wgMaxArticleSize in siteinfo query api

Currently, an user of the api has to try to save a page to see,
if it's too big, or not. A much saner way would be, that the api user
reads the siteinfo of the target wiki to know the maximum size of a
page and trim the edit to not exceed this limit.

This commit exposes the value of the configuration variable, which
handles the maximum article size.

Bug: T138669
Change-Id: I25a4c1b9013f98e5b0a263a637c8b006dccfd5ad
---
M includes/api/ApiQuerySiteinfo.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/296062/1

diff --git a/includes/api/ApiQuerySiteinfo.php 
b/includes/api/ApiQuerySiteinfo.php
index 590a712..14355b6 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -221,6 +221,8 @@
}
$data['writeapi'] = (bool)$config->get( 'EnableWriteAPI' );
 
+   $data['maxarticlesize'] = $config->get( 'MaxArticleSize' );
+
$tz = $config->get( 'Localtimezone' );
$offset = $config->get( 'LocalTZoffset' );
if ( is_null( $tz ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25a4c1b9013f98e5b0a263a637c8b006dccfd5ad
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] Move script out of assert-phpflavor macro - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Move script out of assert-phpflavor macro
..

Move script out of assert-phpflavor macro

Ive moved it into integration/jenkins with this patch
I8cfeabdfe3f786b6ae31168ca0497fbed7e0cb4f

Bug: T124572
Change-Id: I21fa4d2fb0a0ebd5dd6f6495458b096e2c910f81
---
M jjb/macro.yaml
1 file changed, 4 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/61/296061/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index cb0f892..20433eb 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -203,46 +203,15 @@
 # Assert 'php' is phpflavor
 #
 # Parameter:
-# * phpflavor: 'hhvm' or 'zend' or 'php53'
+# * phpflavor: 'hhvm' or 'zend' or 'php53' or 'php55'
+#
+# The script is located in integration/jenkins repo now.
 #
 - builder:
 name: assert-phpflavor
 builders:
 - shell: |
-#!/bin/bash -eu
-PHP_VERSION=`php --version`
-
-case "{phpflavor}" in
-( 'hhvm' )
-MATCHER='^HipHop'
-;;
-( 'zend' )
-MATCHER='^Zend Engine'
-;;
-( 'php53' )
-MATCHER='^PHP 5\.3'
-;;
-( 'php55' )
-MATCHER='^PHP 5\.5'
-PHP_VERSION=`php5 --version`
-;;
-( 'php56' )
-MATCHER='^PHP 5\.6'
-PHP_VERSION=`php5 --version`
-;;
-( * )
-echo "Invalid phpflavor '{phpflavor}' for JJB macro 
'assert-phpflavor'"
-echo "Must be either 'hhvm' or 'zend'"
-exit 1
-;;
-esac
-
-if ( echo "$PHP_VERSION" | egrep "$MATCHER" > /dev/null ); then
-echo -e "php is {phpflavor}:\n\n$PHP_VERSION\n"
-else
-echo -e "Assertion error: php is not 
{phpflavor}:\n\n$PHP_VERSION\n"
-exit 1
-fi
+. /srv/deployment/integration/slave-scripts/bin/npm-setup.sh
 
 - builder:
 name: 'hhvm-clear-hhbc'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21fa4d2fb0a0ebd5dd6f6495458b096e2c910f81
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] Add assert-phpfalvour.sh shell script - change (integration/jenkins)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add assert-phpfalvour.sh shell script
..

Add assert-phpfalvour.sh shell script

Moved it from integration/config to jenkins

Bug: T124572
Change-Id: I8cfeabdfe3f786b6ae31168ca0497fbed7e0cb4f
---
A bin/assert-phpflavor.sh
1 file changed, 34 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/60/296060/1

diff --git a/bin/assert-phpflavor.sh b/bin/assert-phpflavor.sh
new file mode 100644
index 000..29d8c0d
--- /dev/null
+++ b/bin/assert-phpflavor.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -eu
+PHP_VERSION=`php --version`
+
+case "{phpflavor}" in
+( 'hhvm' )
+MATCHER='^HipHop'
+;;
+( 'zend' )
+MATCHER='^Zend Engine'
+;;
+( 'php53' )
+MATCHER='^PHP 5\.3'
+;;
+( 'php55' )
+MATCHER='^PHP 5\.5'
+PHP_VERSION=`php5 --version`
+;;
+( 'php56' )
+MATCHER='^PHP 5\.6'
+PHP_VERSION=`php5 --version`
+;;
+( * )
+echo "Invalid phpflavor '{phpflavor}' for JJB macro 'assert-phpflavor'"
+echo "Must be either 'hhvm' or 'zend'"
+exit 1
+;;
+ esac
+
+ if ( echo "$PHP_VERSION" | egrep "$MATCHER" > /dev/null ); then
+  echo -e "php is {phpflavor}:\n\n$PHP_VERSION\n"
+ else
+  echo -e "Assertion error: php is not {phpflavor}:\n\n$PHP_VERSION\n"
+  exit 1
+ fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cfeabdfe3f786b6ae31168ca0497fbed7e0cb4f
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
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] Make WikiPage::doDeleteArticle more robust. - change (mediawiki/core)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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

Change subject: Make WikiPage::doDeleteArticle more robust.
..

Make WikiPage::doDeleteArticle more robust.

When it becomes impossible to load the content of a page due to some
error or misconfiguration, we still want to be able to delete that
page. This change makes WikiPage::doDeleteArticle more robust by catching
any exceptions that may be thrown while trying to load the page content
during the deletion process.

See T128466 for context.

Change-Id: I19f2d16850a3c1af5b504a70a27b9bf1330bc68d
---
M docs/hooks.txt
M includes/page/WikiPage.php
2 files changed, 28 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/296059/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index c0c01f4..a1c30eb7 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -606,7 +606,7 @@
 &$user: the user that deleted the article
 $reason: the reason the article was deleted
 $id: id of the article that was deleted
-$content: the Content of the deleted page
+$content: the Content of the deleted page (or null, when deleting a broken 
page)
 $logEntry: the ManualLogEntry used to record the deletion
 
 'ArticleEditUpdateNewTalk': Before updating user_newtalk when a user talk page
@@ -3621,7 +3621,8 @@
 specific to a content model should be provided by the respective Content's
 getDeletionUpdates() method.
 $page: the WikiPage
-$content: the Content to generate updates for
+$content: the Content to generate updates for (or null, if the Content could 
not be loaded
+due to an error)
 &$updates: the array of DataUpdate objects. Hook function may want to add to 
it.
 
 'XmlDumpWriterOpenPage': Called at the end of XmlDumpWriter::openPage, to allow
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index a416d56..b1f6d93 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -2848,7 +2848,14 @@
// unless they actually try to catch exceptions (which is rare).
 
// we need to remember the old content so we can use it to 
generate all deletion updates.
-   $content = $this->getContent( Revision::RAW );
+   try {
+   $content = $this->getContent( Revision::RAW );
+   } catch ( Exception $ex ) {
+   wfLogWarning( __METHOD__ . ': failed to load content 
during deletion! '
+   . $ex->getMessage() );
+
+   $content = null;
+   }
 
// Bitfields to further suppress the content
if ( $suppress ) {
@@ -2982,8 +2989,16 @@
 *   may already return null when the page proper was deleted.
 */
public function doDeleteUpdates( $id, Content $content = null ) {
+   try {
+   $countable = $this->isCountable();
+   } catch ( Exception $ex ) {
+   // fallback for deleting broken pages for which we 
cannot load the content for
+   // some reason. Note that doDeleteArticleReal() already 
logged this problem.
+   $countable = false;
+   }
+
// Update site status
-   DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, - 
(int)$this->isCountable(), -1 ) );
+   DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, - 
(int)$countable, -1 ) );
 
// Delete pagelinks, update secondary indexes, etc
$updates = $this->getDeletionUpdates( $content );
@@ -3575,7 +3590,14 @@
if ( !$content ) {
// load content object, which may be used to determine 
the necessary updates.
// XXX: the content may not be needed to determine the 
updates.
-   $content = $this->getContent( Revision::RAW );
+   try {
+   $content = $this->getContent( Revision::RAW );
+   } catch ( Exception $ex ) {
+   // If we can't load the content, something is 
wrong. Perhaps that's why
+   // the user is trying to delete the page, so 
let's not fail in that case.
+   // Note that doDeleteArticleRead will already 
have logged an issue with
+   // loading the content.
+   }
}
 
if ( !$content ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19f2d16850a3c1af5b504a70a27b9bf1330bc68d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

[MediaWiki-commits] [Gerrit] Update oojs-ui-demos-publish to jessie - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update oojs-ui-demos-publish to jessie
..

Update oojs-ui-demos-publish to jessie

Change-Id: I014cd2b3bd54e638f5ba63796a1c5f0c949c1ea9
---
M jjb/misc.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 15 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/58/296058/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 0e39c66..b4d289d 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -154,21 +154,28 @@
  - global-teardown
 
 - job:
-name: 'oojs-ui-demos-publish'
-node: contintLabsSlave && UbuntuTrusty
+name: 'oojs-ui-demos-publish-jessie'
+node: ci-jessie-wikimedia
 defaults: use-remote-zuul-shallow-clone
 concurrent: false
+properties:
+ - zeromq-event
 triggers:
  - zuul
 builders:
- - npm-install
- - npm-run:
- script: demos
+ - assert-node-version-4.3
+ # FIXME: we should save node_modules and run npm prune
+ - castor-load
+ - shell: |
+node --version
+npm --version
+npm install
+npm run-script demos
  - doc-publish:
 docsrc: 'demos'
 docdest: 'oojs-ui/$DOC_SUBPATH/demos'
 publishers:
- - global-teardown
+ - castor-save
 
 - job:
 name: 'visualeditor-coverage'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5f26996..1e3cab3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8225,7 +8225,7 @@
   - oojs-ui-jsduck-publish
   - oojs-ui-doxygen-publish
   - oojs-ui-coverage
-  - oojs-ui-demos-publish
+  - oojs-ui-demos-publish-jessie
 
   - name: unicodejs
 template:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 407cad0..1f2cd0c 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -20,6 +20,7 @@
 hhvm_jobs = (
 'mediawiki-core-phpcs-trusty',
 'mw-tools-codesniffer-mwcore-testrun',
+'oojs-ui-demos-publish-jessie',
 )
 php5_jobs = (
 # Qunit localhost uses apache mod_php which is Zend. Lets be consistent

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I014cd2b3bd54e638f5ba63796a1c5f0c949c1ea9
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] Update oojs-ui-coverage test to jessie - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update oojs-ui-coverage test to jessie
..

Update oojs-ui-coverage test to jessie

Bug: T138666
Change-Id: Ieeb53dc06ea09db4011813dbcda2174ca942
---
M jjb/misc.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 15 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/57/296057/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 0e39c66..31a2721 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -123,19 +123,28 @@
  - global-teardown
 
 - job:
-name: 'oojs-ui-coverage'
-node: contintLabsSlave && UbuntuTrusty
+name: 'oojs-ui-coverage-jessie'
+node: ci-jessie-wikimedia
 defaults: use-remote-zuul-shallow-clone
 concurrent: false
+properties:
+ - zeromq-event
 triggers:
  - zuul
 builders:
- - npm
+ - assert-node-version-4.3
+ # FIXME: we should save node_modules and run npm prune
+ - castor-load
+ - shell: |
+ node --version
+ npm --version
+ npm install
+ npm test
  - cover-publish:
 src: 'coverage'
 dest: 'oojs-ui'
 publishers:
- - global-teardown
+ - castor-save
 
 - job:
 name: 'oojs-ui-doxygen-publish'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5f26996..f74971d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8224,7 +8224,7 @@
 postmerge:
   - oojs-ui-jsduck-publish
   - oojs-ui-doxygen-publish
-  - oojs-ui-coverage
+  - oojs-ui-coverage-jessie
   - oojs-ui-demos-publish
 
   - name: unicodejs
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 407cad0..dc83d77 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -20,6 +20,7 @@
 hhvm_jobs = (
 'mediawiki-core-phpcs-trusty',
 'mw-tools-codesniffer-mwcore-testrun',
+'oojs-ui-coverage-jessie',
 )
 php5_jobs = (
 # Qunit localhost uses apache mod_php which is Zend. Lets be consistent

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeb53dc06ea09db4011813dbcda2174ca942
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] Use camelCase - change (mediawiki...UpdateMediaWiki)

[jenkins-bot (Code Review)]

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

Change subject: Use camelCase
..


Use camelCase

Change-Id: I25d787c92ff7597fe904d6301ecc59ce78ca4d8a
---
R SpecialUpdateMediaWiki.php
R UpdateMediaWiki.alias.php
M extension.json
3 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/specialupdatemediawiki.php b/SpecialUpdateMediaWiki.php
similarity index 95%
rename from specialupdatemediawiki.php
rename to SpecialUpdateMediaWiki.php
index a96f00e..910d3da 100644
--- a/specialupdatemediawiki.php
+++ b/SpecialUpdateMediaWiki.php
@@ -9,10 +9,10 @@
 * @link http://www.mediawiki.org/wiki/Extension:UpdateMediaWiki Documentation
 **/
 
-class Specialupdatemediawiki extends SpecialPage {
+class SpecialUpdateMediaWiki extends SpecialPage {
 
function __construct() {
-   parent::__construct( 'updatemediawiki', 'updatecore' );
+   parent::__construct( 'UpdateMediaWiki', 'updatecore' );
}
 
function execute( $par ) {
@@ -80,7 +80,7 @@
$output->addWikiText( "" );
$updated = true;
} else {
-   $output->addWikiText( "" . 
$this->msg( 'updatemediawiki-update-updateready' )->text() . " 
[[Special:Updatemediawiki/doUpdate|" . $this->msg( 
'updatemediawiki-update-install' )->text() . "]]" );
+   $output->addWikiText( "" . 
$this->msg( 'updatemediawiki-update-updateready' )->text() . " 
[[Special:UpdateMediaWiki/doUpdate|" . $this->msg( 
'updatemediawiki-update-install' )->text() . "]]" );
}
}
}
diff --git a/updatemediawiki.alias.php b/UpdateMediaWiki.alias.php
similarity index 84%
rename from updatemediawiki.alias.php
rename to UpdateMediaWiki.alias.php
index 19591ea..109f0d5 100644
--- a/updatemediawiki.alias.php
+++ b/UpdateMediaWiki.alias.php
@@ -17,12 +17,12 @@
  * @author Miguel2706
  */
 $specialPageAliases[ 'en' ] = array(
-   'updatemediawiki' => array( 'updatemediawiki', 'Update MediaWiki' ),
+   'UpdateMediaWiki' => array( 'UpdateMediaWiki', 'Update MediaWiki' ),
 );
 
 /** Spanish
  * @author Miguel2706
  */
 $specialPageAliases[ 'es' ] = array(
-   'updatemediawiki' => array( 'ActualizarMediaWiki', 'Actualizar 
MediaWiki' ),
+   'UpdateMediaWiki' => array( 'ActualizarMediaWiki', 'Actualizar 
MediaWiki' ),
 );
diff --git a/extension.json b/extension.json
index c698bd5..340c21e 100644
--- a/extension.json
+++ b/extension.json
@@ -12,7 +12,7 @@
"MediaWiki": ">= 1.25.0"
},
"SpecialPages": {
-   "updatemediawiki": "Specialupdatemediawiki"
+   "UpdateMediaWiki": "SpecialUpdateMediaWiki"
},
"MessagesDirs": {
"UpdateMediaWiki": [
@@ -20,10 +20,10 @@
]
},
"ExtensionMessagesFiles": {
-   "updatemediawikiAlias": "updatemediawiki.alias.php"
+   "UpdateMediaWikiAlias": "UpdateMediaWiki.alias.php"
},
"AutoloadClasses": {
-   "Specialupdatemediawiki": "specialupdatemediawiki.php"
+   "SpecialUpdateMediaWiki": "SpecialUpdateMediaWiki.php"
},
"manifest_version": 1
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25d787c92ff7597fe904d6301ecc59ce78ca4d8a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UpdateMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Miguel2706 
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] Drop b/c for i18n - change (mediawiki...UpdateMediaWiki)

[jenkins-bot (Code Review)]

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

Change subject: Drop b/c for i18n
..


Drop b/c for i18n

Change-Id: Ie036201e33738b13690c473b1b2ea36292d07bb7
---
M extension.json
D updatemediawiki.i18n.php
2 files changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/extension.json b/extension.json
index 002764c..c698bd5 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,6 @@
]
},
"ExtensionMessagesFiles": {
-   "updatemediawiki": "updatemediawiki.i18n.php",
"updatemediawikiAlias": "updatemediawiki.alias.php"
},
"AutoloadClasses": {
diff --git a/updatemediawiki.i18n.php b/updatemediawiki.i18n.php
deleted file mode 100644
index 1802b2b..000
--- a/updatemediawiki.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim9648fbddfca06a8b' ) ) {
-   function wfJsonI18nShim9648fbddfca06a8b( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim9648fbddfca06a8b';
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie036201e33738b13690c473b1b2ea36292d07bb7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UpdateMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Miguel2706 
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] Convert to use extension registration - change (mediawiki...UpdateMediaWiki)

[jenkins-bot (Code Review)]

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

Change subject: Convert to use extension registration
..


Convert to use extension registration

Change-Id: I70141958c40d6269f7a828b31047fd20b9bfc5ed
---
M UpdateMediaWiki.php
A extension.json
2 files changed, 43 insertions(+), 32 deletions(-)

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



diff --git a/UpdateMediaWiki.php b/UpdateMediaWiki.php
index 8ce1162..f534da4 100644
--- a/UpdateMediaWiki.php
+++ b/UpdateMediaWiki.php
@@ -1,35 +1,16 @@
 
-* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 
or later
-* @link http://www.mediawiki.org/wiki/Extension:UpdateMediaWiki Documentation
-**/
-
-# Alert the user that this is not a valid access point to MediaWiki if they 
try to access the special pages file directly.
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo < __FILE__,
-   'name' => 'UpdateMediaWiki',
-   'author' =>'Miguel Peláez',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:UpdateMediaWiki',
-   'descriptionmsg' => 'updatemediawiki-desc',
-   'version'  => '0.3.0',
-);
-
-$wgAutoloadClasses[ 'Specialupdatemediawiki' ] = __DIR__ . 
'/specialupdatemediawiki.php';
-$wgMessagesDirs['UpdateMediaWiki'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles[ 'updatemediawiki' ] = __DIR__ . 
'/updatemediawiki.i18n.php';
-$wgSpecialPages[ 'updatemediawiki' ] = 'Specialupdatemediawiki';
-$wgExtensionMessagesFiles['updatemediawikiAlias'] = __DIR__ . 
'/updatemediawiki.alias.php';
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..002764c
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,30 @@
+{
+   "name": "UpdateMediaWiki",
+   "version": "0.4.0",
+   "author": [
+   "Miguel Pelaez"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:UpdateMediaWiki;,
+   "descriptionmsg": "updatemediawiki-desc",
+   "license-name": "GPL-2.0+",
+   "type": "extensions",
+   "requires": {
+   "MediaWiki": ">= 1.25.0"
+   },
+   "SpecialPages": {
+   "updatemediawiki": "Specialupdatemediawiki"
+   },
+   "MessagesDirs": {
+   "UpdateMediaWiki": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "updatemediawiki": "updatemediawiki.i18n.php",
+   "updatemediawikiAlias": "updatemediawiki.alias.php"
+   },
+   "AutoloadClasses": {
+   "Specialupdatemediawiki": "specialupdatemediawiki.php"
+   },
+   "manifest_version": 1
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70141958c40d6269f7a828b31047fd20b9bfc5ed
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UpdateMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Miguel2706 
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] Make fetching the newest version work again - change (mediawiki...UpdateMediaWiki)

[jenkins-bot (Code Review)]

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

Change subject: Make fetching the newest version work again
..


Make fetching the newest version work again

Change-Id: Idfba7b56c0854c660f3d9c3e0987d0e6ac0a0e89
---
M i18n/en.json
M i18n/es.json
M specialupdatemediawiki.php
3 files changed, 61 insertions(+), 61 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index dd05680..fde5570 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,9 +6,9 @@
},
"updatemediawiki": "Update MediaWiki",
"updatemediawiki-desc": "Allows updating MediaWiki via a special page",
-   "updatemediawiki-current": "Current version",
+   "updatemediawiki-current": "Current version $1",
"updatemediawiki-update-nofound": "No update is available",
-   "updatemediawiki-update-found": "New update found",
+   "updatemediawiki-update-found": "New update found: $1",
"updatemediawiki-update-downloading": "Downloading new update",
"updatemediawiki-update-saved": "Update downloaded and saved",
"updatemediawiki-update-exist": "Update already downloaded",
diff --git a/i18n/es.json b/i18n/es.json
index 8b1d820..18e549c 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -6,9 +6,9 @@
},
"updatemediawiki": "Actualizar MediaWiki",
"updatemediawiki-desc": "Permite a los administradores y usuarios 
autorizados actualizar MediaWiki desde una página especial.",
-   "updatemediawiki-current": "Versión Actual",
+   "updatemediawiki-current": "Versión Actual $1",
"updatemediawiki-update-nofound": "No hay actualizaciones disponibles",
-   "updatemediawiki-update-found": "Nueva actualización encontrada",
+   "updatemediawiki-update-found": "Nueva actualización encontrada: $1",
"updatemediawiki-update-downloading": "Descargando nueva actualización",
"updatemediawiki-update-saved": "Nueva actualización descargada y 
guardada",
"updatemediawiki-update-exist": "La actualización ya se había 
descargado",
diff --git a/specialupdatemediawiki.php b/specialupdatemediawiki.php
index 00050b0..a96f00e 100644
--- a/specialupdatemediawiki.php
+++ b/specialupdatemediawiki.php
@@ -10,12 +10,12 @@
 **/
 
 class Specialupdatemediawiki extends SpecialPage {
+
function __construct() {
-   parent::__construct( $name = 'updatemediawiki', $restriction = 
'updatecore' ); 
+   parent::__construct( 'updatemediawiki', 'updatecore' );
}
 
function execute( $par ) {
-
// ...
if ( !$this->userCanExecute( $this->getUser() ) ) {
$this->displayRestrictionError();
@@ -26,76 +26,76 @@
$output = $this->getOutput();
$this->setHeaders();
 
-   $param = $request->getText( 'param' );
-
global $wgVersion, $IP;
-   $getVersions = 
substr(file_get_contents('https://www.mediawiki.org/w/index.php?title=Template:MW_stable_release_number=raw'),
 0, 6) or die ('ERROR');
-   if ($getVersions != '') {
+   $getVersion = json_decode( file_get_contents( 
'https://www.mediawiki.org/w/api.php?action=parse=json=%7B%7B%23invoke%3AVersion%7Cget%7Cstable%7Cversion%7D%7D=text=1=1=1=1=wikitext'
 ), true ) or die ( 'ERROR' );
+   $aV = $getVersion["parse"]["text"]["*"];
+   $updated = false;
+   $found = false;
+   if ( !empty( $aV ) ) {
//If we managed to access that file, then lets break up 
those release versions into an array.
-   $output->addWikiText( "== ". wfMessage( 
'updatemediawiki-current' )->text() ." ".$wgVersion." == " );
-   $versionList = explode("\\n", $getVersions);
-   $mainVersion = substr($getVersions, 0, 4);
-   foreach ( $versionList as $aV ) {
-   if ( $aV > $wgVersion ) {
-   $output->addWikiText( "".wfMessage( 
'updatemediawiki-update-found' )->text()."v".$aV."" );
-   $found = true;
-//Download The File If We Do Not Have 
It
-   if ( !is_file( __DIR__ . 
'/Updates/mediawiki-'.$aV.'.tar.gz' ) ) {
-   $output->addWikiText( 
"".wfMessage( 'updatemediawiki-update-downloading' )->text()."" );
-   $newUpdate = 
file_get_contents('http://download.wikimedia.org/mediawiki/'.$mainVersion.'/mediawiki-'.$aV.'.tar.gz');
-   if ( !is_dir( __DIR__ . 
'/Updates' ) ) {
-

[MediaWiki-commits] [Gerrit] Support GENDER in two more log messages - change (mediawiki...AbuseFilter)

[jenkins-bot (Code Review)]

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

Change subject: Support GENDER in two more log messages
..


Support GENDER in two more log messages

Change-Id: I92085a291565bd76e3f983da3bb4dfdb253b8007
---
M i18n/en.json
M i18n/qqq.json
M special/SpecialAbuseLog.php
3 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index fb3421a..73ca257 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,8 +47,8 @@
"abusefilter-log-search-title": "Title:",
"abusefilter-log-search-wiki": "Wiki:",
"abusefilter-log-search-submit": "Search",
-   "abusefilter-log-entry": "$1: $2 triggered an abuse filter, performing 
the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6",
-   "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter, 
performing the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6 
($7)",
+   "abusefilter-log-entry": "$1: $2 triggered an abuse filter, 
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter 
description: $6",
+   "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter, 
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter 
description: $6 ($7)",
"abusefilter-log-detailedentry-meta": "$1: $2 triggered $3, 
{{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter 
description: $7 ($8)",
"abusefilter-log-detailedentry-global": "global filter $1",
"abusefilter-log-detailedentry-local": "filter $1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dab9ee9..c6f5df2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -78,8 +78,8 @@
"abusefilter-log-search-title": "Field label in abuse filter log 
page.\n{{Identical|Title}}",
"abusefilter-log-search-wiki": "Label for text field that allows the 
user to limit search results to a specific wiki, by name.\n{{Identical|Wiki}}",
"abusefilter-log-search-submit": "Button text to search log in abuse 
filter log page.\n{{Identical|Search}}",
-   "abusefilter-log-entry": "This message is for a log entry. 
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link 
to page the action that triggered the filter was made on\n* $5 - actions taken 
by the filter\n* $6 - comments in filter 
description\n{{Related|Abusefilter-log}}",
-   "abusefilter-log-entry-withdiff": "This message is for a log entry. 
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link 
to page the action that triggered the filter was made on\n* $5 - actions taken 
by the filter\n* $6 - comments in filter description\n* $7 - link to 
diff\n{{Related|Abusefilter-log}}",
+   "abusefilter-log-entry": "This message is for a log entry. 
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link 
to page the action that triggered the filter was made on\n* $5 - actions taken 
by the filter\n* $6 - comments in filter description\n* $8 - raw username, for 
GENDER support\n{{Related|Abusefilter-log}}",
+   "abusefilter-log-entry-withdiff": "This message is for a log entry. 
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link 
to page the action that triggered the filter was made on\n* $5 - actions taken 
by the filter\n* $6 - comments in filter description\n* $7 - link to diff\n* $8 
- raw username, for GENDER support\n{{Related|Abusefilter-log}}",
"abusefilter-log-detailedentry-meta": "This message is for a log entry. 
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - link to filter\n* $4 - 
action by user\n* $5 - link to page the action that triggered the filter was 
made on\n* $6 - actions taken by the filter\n* $7 - comments in filter 
description\n* $8 - link to action details, examine, and optional diff\n* $9 - 
(Optional) raw username, for GENDER support\n{{Related|Abusefilter-log}}",
"abusefilter-log-detailedentry-global": "Addition in the abuse filter 
log detail when a filter rule is a global rule. Parameters:\n* $1 is a global 
filter ID.",
"abusefilter-log-detailedentry-local": "Addition in the abuse filter 
log detail when a filter rule is a local rule. Parameters:\n* $1 is a local 
filter ID.\n{{Identical|Filter}}",
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index a97d0a0..be70819 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -586,7 +586,7 @@
$actions_taken,
$parsed_comments,
$diffLink // Passing $7 to 
'abusefilter-log-entry' will do nothing, as it's not used.
-   )->parse();
+   )->params( $row->afl_user_text )->parse();
}
 
if ( 

[MediaWiki-commits] [Gerrit] Add GENDER to abusefilter-revert-preview-item - change (mediawiki...AbuseFilter)

[jenkins-bot (Code Review)]

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

Change subject: Add GENDER to abusefilter-revert-preview-item
..


Add GENDER to abusefilter-revert-preview-item

Change-Id: I4fe0190238fc97409c18678a617a8f6a46d41bab
---
M Views/AbuseFilterViewRevert.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/Views/AbuseFilterViewRevert.php b/Views/AbuseFilterViewRevert.php
index 4e39998..15a2268 100644
--- a/Views/AbuseFilterViewRevert.php
+++ b/Views/AbuseFilterViewRevert.php
@@ -74,7 +74,7 @@
array(),
array( 'details' => 
$result['id'] )
)
-   )->parse();
+   )->params( $result['user'] )->parse();
$list[] = Xml::tags( 'li', null, $msg );
}
 
diff --git a/i18n/en.json b/i18n/en.json
index fb3421a..a9cc1a4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -338,7 +338,7 @@
"abusefilter-action-disallow": "Disallow",
"abusefilter-revert-title": "Revert all changes by filter $1",
"abusefilter-revert-intro": "This form allows you to revert all changes 
made by the abuse filter due to filter $1.\nPlease exercise care in using this 
tool.",
-   "abusefilter-revert-preview-item": "$1: $2 made a $3 on $4.\nActions to 
be reverted: $5 ($6)",
+   "abusefilter-revert-preview-item": "$1: $2 {{GENDER:$7|made}} a $3 on 
$4.\nActions to be reverted: $5 ($6)",
"abusefilter-revert-search-legend": "Select abuse filter actions to be 
reverted",
"abusefilter-revert-periodstart": "Period start:",
"abusefilter-revert-periodend": "Period end:",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dab9ee9..6c00538 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -345,7 +345,7 @@
"abusefilter-action-disallow": "{{doc-abusefilter-action}}\n\nTo 
'''disallow''' actions means that actions matching the filter will be 
'''prevented''', and a descriptive error message will be shown. Additional 
information: https://www.mediawiki.org/wiki/Extension:AbuseFilter/Actions;,
"abusefilter-revert-title": "Used as page title of 
[[Special:AbuseFilter/revert/1]] (go to [[Special:AbuseFilter]], open a filter, 
click \"Revert actions taken by this filter\").\n\nParameters:\n* $1 - filter 
ID",
"abusefilter-revert-intro": "Parameters:\n* $1 - filter",
-   "abusefilter-revert-preview-item": "Parameters:\n* $1 is a localised 
time and date\n* $2 is the linked user that made a change\n* $3 is the 
action\n* $4 is the page title of the page that was changed\n* $5 is a 
(localised) comma separated list of actions\n* $6 is link to the log details 
with {{msg-mw|abusefilter-log-detailslink}} as link description.",
+   "abusefilter-revert-preview-item": "Parameters:\n* $1 is a localised 
time and date\n* $2 is the linked user that made a change\n* $3 is the 
action\n* $4 is the page title of the page that was changed\n* $5 is a 
(localised) comma separated list of actions\n* $6 is link to the log details 
with {{msg-mw|abusefilter-log-detailslink}} as link description.\n* $7 is a raw 
username, which can be used for GENDER.",
"abusefilter-revert-filter": "{{Identical|Filter}}",
"abusefilter-revert-preview-intro": "Refers to 
{{msg-mw|Abusefilter-revert-confirm}}.",
"abusefilter-revert-confirm": "This is also used in 
{{msg-mw|Abusefilter-revert-preview-intro}}. When changing this message, please 
also remember to change that one.\n{{Identical|Confirm}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fe0190238fc97409c18678a617a8f6a46d41bab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Se4598 
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] Add symlink to Toolbox from HTML page - change (labs...heritage)

[Code Review]

Jean-Frédéric has uploaded a new change for review.

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

Change subject: Add symlink to Toolbox from HTML page
..

Add symlink to Toolbox from HTML page

So it is accessible on ToolLabs and on local dev environment.

Bug: T138519
Change-Id: Ic9d815898dcaef530f786fcf2e90f585bddcf062
---
A html/toolbox
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/56/296056/1

diff --git a/html/toolbox b/html/toolbox
new file mode 12
index 000..c9203e9
--- /dev/null
+++ b/html/toolbox
@@ -0,0 +1 @@
+../toolbox/
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d815898dcaef530f786fcf2e90f585bddcf062
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] ores: fix-up monitoring of workers in prod - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: ores: fix-up monitoring of workers in prod
..


ores: fix-up monitoring of workers in prod

Change-Id: Iedf3213a93ec59faffb2b040766ba7d9a3173dff
---
M modules/nagios_common/files/check_commands/check_ores_workers
M modules/nagios_common/files/check_commands/check_ores_workers.cfg
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/nagios_common/files/check_commands/check_ores_workers 
b/modules/nagios_common/files/check_commands/check_ores_workers
index 6e75bc9..dcb40a6 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -4,6 +4,7 @@
 timestamp=$(/bin/date +%s)
 pluginpath="/usr/lib/nagios/plugins"
 host=$1
+urlhost=$2
 
-$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/;
+$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${urlhost}/scores/testwiki/reverted/${timestamp}/;
 
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers.cfg 
b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
index 48b6bef..b7f85cc 100644
--- a/modules/nagios_common/files/check_commands/check_ores_workers.cfg
+++ b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
@@ -1,4 +1,4 @@
 define command {
 command_namecheck_ores_workers
-command_line$USER4$/check_ores_workers $HOSTADDRESS$
+command_line$USER4$/check_ores_workers $HOSTADDRESS$ $ARG1$
 }

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

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

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

[MediaWiki-commits] [Gerrit] ores: fix-up monitoring of workers in prod - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: ores: fix-up monitoring of workers in prod
..

ores: fix-up monitoring of workers in prod

Change-Id: Iedf3213a93ec59faffb2b040766ba7d9a3173dff
---
M modules/nagios_common/files/check_commands/check_ores_workers
M modules/nagios_common/files/check_commands/check_ores_workers.cfg
2 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/modules/nagios_common/files/check_commands/check_ores_workers 
b/modules/nagios_common/files/check_commands/check_ores_workers
index 6e75bc9..dcb40a6 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -4,6 +4,7 @@
 timestamp=$(/bin/date +%s)
 pluginpath="/usr/lib/nagios/plugins"
 host=$1
+urlhost=$2
 
-$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/;
+$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${urlhost}/scores/testwiki/reverted/${timestamp}/;
 
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers.cfg 
b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
index 48b6bef..b7f85cc 100644
--- a/modules/nagios_common/files/check_commands/check_ores_workers.cfg
+++ b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
@@ -1,4 +1,4 @@
 define command {
 command_namecheck_ores_workers
-command_line$USER4$/check_ores_workers $HOSTADDRESS$
+command_line$USER4$/check_ores_workers $HOSTADDRESS$ $ARG1$
 }

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

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

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

[MediaWiki-commits] [Gerrit] ores: add monitoring for production workers - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: ores: add monitoring for production workers
..


ores: add monitoring for production workers

Change-Id: Ia593c74304fb299e2d113cd9f358e2d0c9da9173
---
M modules/icinga/manifests/monitor/ores.pp
M modules/nagios_common/files/check_commands/check_ores_workers
2 files changed, 15 insertions(+), 4 deletions(-)

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



diff --git a/modules/icinga/manifests/monitor/ores.pp 
b/modules/icinga/manifests/monitor/ores.pp
index 1371319..4ff627d 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -5,6 +5,10 @@
 host_fqdn => 'ores.wmflabs.org',
 }
 
+@monitoring::host { 'ores.wikimedia.org':
+host_fqdn => 'ores.wikimedia.org',
+}
+
 monitoring::service { 'ores_main_page':
 description   => 'ORES home page',
 check_command => 'check_http',
@@ -13,13 +17,20 @@
 }
 
 # T121656
-monitoring::service { 'ores_worker':
-description   => 'ORES worker',
-check_command => 'check_ores_workers',
+monitoring::service { 'ores_worker_labs':
+description   => 'ORES worker labs',
+check_command => 'check_ores_workers!oresweb',
 host  => 'ores.wmflabs.org',
 contact_group => 'team-ores',
 }
 
+monitoring::service { 'ores_worker_production':
+description   => 'ORES worker production',
+check_command => 'check_ores_workers!ores.wikimedia.org',
+host  => 'ores.wikimedia.org',
+contact_group => 'team-ores',
+}
+
 # T122830
 file { '/usr/local/lib/nagios/plugins/check_ores_workers':
 source => 
'puppet:///modules/nagios_common/check_commands/check_ores_workers',
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers 
b/modules/nagios_common/files/check_commands/check_ores_workers
index 32be9d5..6e75bc9 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -5,5 +5,5 @@
 pluginpath="/usr/lib/nagios/plugins"
 host=$1
 
-$pluginpath/check_http -f follow -H $host -I $host -u 
"http://oresweb/scores/testwiki/reverted/${timestamp}/;
+$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/;
 

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

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

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

[MediaWiki-commits] [Gerrit] ores: add monitoring for production workers - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: ores: add monitoring for production workers
..

ores: add monitoring for production workers

Change-Id: Ia593c74304fb299e2d113cd9f358e2d0c9da9173
---
M modules/icinga/manifests/monitor/ores.pp
M modules/nagios_common/files/check_commands/check_ores_workers
2 files changed, 15 insertions(+), 4 deletions(-)


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

diff --git a/modules/icinga/manifests/monitor/ores.pp 
b/modules/icinga/manifests/monitor/ores.pp
index 1371319..4ff627d 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -5,6 +5,10 @@
 host_fqdn => 'ores.wmflabs.org',
 }
 
+@monitoring::host { 'ores.wikimedia.org':
+host_fqdn => 'ores.wikimedia.org',
+}
+
 monitoring::service { 'ores_main_page':
 description   => 'ORES home page',
 check_command => 'check_http',
@@ -13,13 +17,20 @@
 }
 
 # T121656
-monitoring::service { 'ores_worker':
-description   => 'ORES worker',
-check_command => 'check_ores_workers',
+monitoring::service { 'ores_worker_labs':
+description   => 'ORES worker labs',
+check_command => 'check_ores_workers!oresweb',
 host  => 'ores.wmflabs.org',
 contact_group => 'team-ores',
 }
 
+monitoring::service { 'ores_worker_production':
+description   => 'ORES worker production',
+check_command => 'check_ores_workers!ores.wikimedia.org',
+host  => 'ores.wikimedia.org',
+contact_group => 'team-ores',
+}
+
 # T122830
 file { '/usr/local/lib/nagios/plugins/check_ores_workers':
 source => 
'puppet:///modules/nagios_common/check_commands/check_ores_workers',
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers 
b/modules/nagios_common/files/check_commands/check_ores_workers
index 32be9d5..6e75bc9 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -5,5 +5,5 @@
 pluginpath="/usr/lib/nagios/plugins"
 host=$1
 
-$pluginpath/check_http -f follow -H $host -I $host -u 
"http://oresweb/scores/testwiki/reverted/${timestamp}/;
+$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/;
 

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

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

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

[MediaWiki-commits] [Gerrit] Added Dutch translation - change (mediawiki...Gadgets)

[jenkins-bot (Code Review)]

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

Change subject: Added Dutch translation
..


Added Dutch translation

Bug: T138183
Change-Id: Icf673c64a284942f515d625fec9322be9e5321fc
---
M Gadgets.namespaces.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index 51d906a..f4e4e81 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -142,6 +142,13 @@
NS_GADGET_DEFINITION_TALK => 'گجت_توضیحات_گپ',
 );
 
+$namespaceNames['nl'] = array(
+   NS_GADGET => 'Uitbreiding',
+   NS_GADGET_TALK => 'Overleg_uitbreiding',
+   NS_GADGET_DEFINITION => 'Uitbreidingsdefinitie',
+   NS_GADGET_DEFINITION_TALK => 'Overleg_uitbreidingsdefinitie',
+);
+
 $namespaceNames['or'] = array(
NS_GADGET => 'ଗ୍ୟାଜେଟ',
NS_GADGET_TALK => 'ଗ୍ୟାଜେଟ_ଆଲୋଚନା',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf673c64a284942f515d625fec9322be9e5321fc
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Mbch331 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Legoktm 
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] Makes VE -> Wikieditor switch work - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

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

Change subject: Makes VE -> Wikieditor switch work
..


Makes VE -> Wikieditor switch work

Adds a simple Wikitext serialization parser
 We should probably move to an API call in the future (see 
Id34b2c10bbf0cb23643b3b300e3182a4a12c9933 )

Change-Id: I315468a493ba1c770bd1d1fd89e883e9bb5ab53f
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 54 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index ea16f92..9265751 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -145,6 +145,60 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.init.mw.ProofreadPagePageTarget.prototype.submit = function ( wikitext, 
fields ) {
+   var content;
+   if ( this.submitting ) {
+   return false;
+   }
+
+   content = this.parseWikitext( wikitext );
+   ve.extendObject( fields, {
+   model: 'proofread-page',
+   wpHeaderTextbox: content.header,
+   wpTextbox1: content.body,
+   wpFooterTextbox: content.footer,
+   wpQuality: content.level.level
+   } );
+
+   return ve.init.mw.ProofreadPagePageTarget.super.prototype.submit.call( 
this, wikitext, fields );
+};
+
+/**
+ * Parse Wikitext into the JSON serialization
+ */
+ve.init.mw.ProofreadPagePageTarget.prototype.parseWikitext = function ( 
wikitext ) {
+   var structureMatchResult, headerMatchResult, result = {
+   header: '',
+   body: '',
+   footer: '',
+   level: {
+   level: 1,
+   user: null
+   }
+   };
+
+   structureMatchResult = wikitext.match( 
/^([\s\S]*)\n*<\/noinclude>([\s\S]*)([\s\S]*)<\/noinclude>$/
 );
+   if ( structureMatchResult === null ) {
+   result.body = wikitext;
+   return result;
+   }
+   result.body = structureMatchResult[ 2 ];
+   result.footer = structureMatchResult[ 3 ];
+
+   headerMatchResult = structureMatchResult[ 1 ].match( /^|> *<\/pagequality>)([\s\S]*)$/ );
+   if ( headerMatchResult === null ) {
+   result.header = structureMatchResult[ 1 ];
+   return result;
+   }
+   result.level.level = parseInt( headerMatchResult[ 1 ] );
+   result.level.user = headerMatchResult[ 2 ];
+   result.header = headerMatchResult[ 4 ];
+   return result;
+};
+
+/**
  * Split a document into balanced header, body and footer sections
  *
  * @param {HTMLDocument} doc Document

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I315468a493ba1c770bd1d1fd89e883e9bb5ab53f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] MediaWiki theme: Improve focus states of primary buttons & T... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: MediaWiki theme: Improve focus states of primary buttons & 
ToggleSwitchWidget
..


MediaWiki theme: Improve focus states of primary buttons & ToggleSwitchWidget

Improving focus states of primary buttons to be more harmonious with
normal buttons. Also moving `oo-ui-toggleSwitchWidget-grip` styles to
Apex only as they are not used in MediaWiki theme. Also aligning Less mixins
to CSS Coding guidelines.

Bug: T137658
Change-Id: I5a083f1682cd10d833e1483c3de15e023ac39ffd
---
M src/styles/widgets/ToggleSwitchWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
5 files changed, 45 insertions(+), 55 deletions(-)

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



diff --git a/src/styles/widgets/ToggleSwitchWidget.less 
b/src/styles/widgets/ToggleSwitchWidget.less
index 54cb57b..78c9937 100644
--- a/src/styles/widgets/ToggleSwitchWidget.less
+++ b/src/styles/widgets/ToggleSwitchWidget.less
@@ -18,21 +18,5 @@
.oo-ui-box-sizing( border-box );
}
 
-   .oo-ui-toggleSwitchWidget-glow {
-   position: absolute;
-   top: 0;
-   bottom: 0;
-   right: 0;
-   left: 0;
-
-   .oo-ui-unselectable();
-   }
-
-   .oo-ui-toggleWidget-off & {
-   &-glow {
-   display: none;
-   }
-   }
-
.theme-oo-ui-toggleSwitchWidget();
 }
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index b429eb7..c9d647d 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -970,13 +970,18 @@
border-radius: 1em;
box-shadow: 0 0 0 #fff, inset 0 0.1em 0.2em #ddd;
border: 1px solid #ccc;
-
.oo-ui-inline-spacing(0.5em);
-
.oo-ui-vertical-gradient(#ddd, #fff);
 
&.oo-ui-widget-disabled {
opacity: 0.5;
+   }
+
+   &.oo-ui-widget-enabled {
+   &:hover,
+   &:hover .oo-ui-toggleSwitchWidget-grip {
+   border-color: #aaa;
+   }
}
 
&-grip {
@@ -989,23 +994,31 @@
box-shadow: 0 0.1em 0.25em rgba( 0, 0, 0, 0.1 );
border: 1px #c9c9c9 solid;
 
-   .oo-ui-transition(left @medium-ease, margin-left @medium-ease);
-   .oo-ui-vertical-gradient(#fff, #ddd);
+   .oo-ui-transition( left @medium-ease, margin-left @medium-ease 
);
+   .oo-ui-vertical-gradient( #fff, #ddd );
}
 
-   &.oo-ui-widget-enabled {
-   &:hover,
-   &:hover .oo-ui-toggleSwitchWidget-grip {
-   border-color: #aaa;
-   }
-   }
-
-   .oo-ui-toggleSwitchWidget-glow {
+   &-glow {
+   position: absolute;
+   top: 0;
+   bottom: 0;
+   right: 0;
+   left: 0;
border-radius: 1em;
box-shadow: inset 0 1px 4px 0 rgba( 0, 0, 0, 0.07 );
+   .oo-ui-transition( opacity @medium-ease );
+   .oo-ui-vertical-gradient( #b0d9ee, #eaf4fa );
+   .oo-ui-unselectable();
+   }
 
-   .oo-ui-transition(opacity @medium-ease);
-   .oo-ui-vertical-gradient(#b0d9ee, #eaf4fa);
+   .oo-ui-toggleWidget-off & {
+   &-glow {
+   opacity: 0;
+   }
+   &-grip {
+   left: 0.25em;
+   margin-left: 0;
+   }
}
 
.oo-ui-toggleWidget-on & {
@@ -1015,17 +1028,6 @@
&-grip {
left: @travelDistance + 0.25em;
margin-left: -2px;
-   }
-   }
-
-   .oo-ui-toggleWidget-off & {
-   &-glow {
-   display: block;
-   opacity: 0;
-   }
-   &-grip {
-   left: 0.25em;
-   margin-left: 0;
}
}
 }
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index bc421c5..3bd5c2f 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -50,12 +50,13 @@
 
 @border-color-progressive-active: #859dcc; // equivalents `fade( 
@color-progressive-active, 50% )`
 @border-color-destructive-active: #b77c79; // equivalents `fade( 
@color-destructive-active, 50% )`
+@border-color-focus-inset: @color-default-light;
 
 @box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
 @box-shadow-menu: @box-shadow-dialog;
 @box-shadow-popup: @box-shadow-dialog;
 @box-shadow-focus-default: inset 0 0 0 1px 

[MediaWiki-commits] [Gerrit] Follow-up ebe7205c: Edit stash: Unbreak jQuery selectors - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Follow-up ebe7205c: Edit stash: Unbreak jQuery selectors
..


Follow-up ebe7205c: Edit stash: Unbreak jQuery selectors

Change-Id: I4d72948ba62cb5c1cc29277f30363c29e42fa25b
---
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js 
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 2ae05dd..da27d20 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -13,10 +13,10 @@
$form = $( '#editform' ),
$text = $form.find( '#wpTextbox1' ),
$summary = $form.find( '#wpSummary' ),
-   section = $form.find( '#wpSection' ).val(),
-   model = $form.find( '#model' ).val(),
-   format = $form.find( '#format' ).val(),
-   revId = $form.find( '#parentRevId' ).val(),
+   section = $form.find( '[name=wpSection]' ).val(),
+   model = $form.find( '[name=model]' ).val(),
+   format = $form.find( '[name=format]' ).val(),
+   revId = $form.find( '[name=parentRevId]' ).val(),
lastText = $text.textSelection( 'getContents' ),
timer = null;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d72948ba62cb5c1cc29277f30363c29e42fa25b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump version number to 1.0.0 and add authors - change (mediawiki...RevisionSlider)

[WMDE-leszek (Code Review)]

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

Change subject: Bump version number to 1.0.0 and add authors
..


Bump version number to 1.0.0 and add authors

Bug: T137948
Change-Id: Ibcd39fbb503d0a603dae35c8ae515b5bb19178ee
---
M extension.json
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 0ad78c1..439569b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,8 +1,12 @@
 {
"name": "RevisionSlider",
-   "version": "0.0.0",
+   "version": "1.0.0",
"author": [
-   "WMDE"
+   "TCB team (Wikimedia Deutschland)",
+   "Christoph Fischer",
+   "Leszek Manicki",
+   "Adam Shorland",
+   "Jakob Warkotsch"
],
"url": "https://www.mediawiki.org/wiki/Extension:RevisionSlider;,
"namemsg": "revisionslider",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcd39fbb503d0a603dae35c8ae515b5bb19178ee
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Jakob 
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 username for username label - change (mediawiki...RevisionSlider)

[WMDE-leszek (Code Review)]

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

Change subject: Use username for username label
..


Use username for username label

After changing this several times to address concerns related to
GENDER, decided to use the mediawiki standard here also used
in the core code. For translators a hint was added that GENDER
is not supported here so an appropriate translation should be
chosen by them.

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

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



diff --git a/extension.json b/extension.json
index 44008d6..93531fb 100644
--- a/extension.json
+++ b/extension.json
@@ -122,7 +122,7 @@
"revisionslider-label-date",
"revisionslider-label-page-size",
"revisionslider-label-change-size",
-   "revisionslider-label-edited-by",
+   "revisionslider-label-username",
"revisionslider-label-comment"
],
"dependencies": [
diff --git a/i18n/en.json b/i18n/en.json
index d5450fd..10167b3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,7 +12,7 @@
 "revisionslider-label-page-size": "Page size: $1 
{{PLURAL:$2|byte|bytes}}",
 "revisionslider-label-change-size": "Change size: $1 
{{PLURAL:$2|byte|bytes}}",
 "revisionslider-label-comment": "Comment: ",
-"revisionslider-label-edited-by": "Edited by: $1",
+"revisionslider-label-username": "Username: $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 4e0e70a..53fe345 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -13,7 +13,7 @@
"revisionslider-label-page-size": "Label describing the size of this 
revision.\nParameters:\n* $1 - Formatted article size.\n* $2 - Article size as 
raw number.",
"revisionslider-label-change-size": "Label describing the size of the 
change compared to the revision before.\nParameters:\n* $1 - Formatted change 
size colored with markup.\n* $2 - Change size as raw number.",
"revisionslider-label-comment": "Label showing the edit summary of a 
revision.",
-   "revisionslider-label-edited-by": "Gender-neutral label showing this 
revision's author's username.\nParameters:\n* $1 - Username.",
+   "revisionslider-label-username": "Label for the revision's author's 
username.\n{{doc-important|{{[[Gender|GENDER]]}}
 is '''NOT''' supported.}}\n\nParameters:\n* $1 - 
Username.\n\n{{Identical|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 6c19f0d..21c7d22 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -140,7 +140,7 @@
),
rev.getUser() ?
$( '' ).append( $( '' 
).append(
-   mw.message( 
'revisionslider-label-edited-by', mw.html.escape( rev.getUser() ) ).parseDom()
+   mw.message( 
'revisionslider-label-username', mw.html.escape( rev.getUser() ) ).parseDom()
) )
: '',
this.makeCommentLine( rev ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc2a8e6fc08761367c4ab6bb2a446262f8aa86e6
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Gabriel Birke 
Gerrit-Reviewer: Jakob 

[MediaWiki-commits] [Gerrit] Bold tooltip labels and color-coded change size - change (mediawiki...RevisionSlider)

[WMDE-leszek (Code Review)]

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

Change subject: Bold tooltip labels and color-coded change size
..


Bold tooltip labels and color-coded change size

Also introduced language specific number formating. Therefore removed the
'bytes' message. Plural form will be computed in the size messages directly.

Comment label and value were split so the parsed comment can be used
plain without parsing the html again.

Bug: T137183
Change-Id: I12f30cb518e3cc5210528d5b22737dde868a0325
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.RevisionSlider.RevisionListView.js
M modules/ext.RevisionSlider.css
5 files changed, 57 insertions(+), 22 deletions(-)

Approvals:
  WMDE-leszek: Verified; Looks good to me, approved
  Siebrand: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 25c19c9..27c1b19 100644
--- a/extension.json
+++ b/extension.json
@@ -118,8 +118,8 @@
"modules/ext.RevisionSlider.RevisionListView.js"
],
"messages": [
-   "revisionslider-revision-bytes",
-   "revisionslider-label-article-size",
+   "revisionslider-label-date",
+   "revisionslider-label-page-size",
"revisionslider-label-change-size",
"revisionslider-label-edited-by",
"revisionslider-label-comment"
diff --git a/i18n/en.json b/i18n/en.json
index ed4af13..06b92f2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,11 +8,11 @@
 "revisionslider-desc": "Shows a slider allowing selecting and comparing of 
revisions on a diff page",
 "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-change-size": "Change size: $1",
-"revisionslider-label-comment": "Comment: $1",
-"revisionslider-label-edited-by": "Edited by: $1",
+"revisionslider-label-date": "Date: $1",
+"revisionslider-label-page-size": "Page size: $1 
{{PLURAL:$2|byte|bytes}}",
+"revisionslider-label-change-size": "Change size: $1 
{{PLURAL:$2|byte|bytes}}",
+"revisionslider-label-comment": "Comment: ",
+"revisionslider-label-edited-by": "Edited by: $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 56adeae..1ee1e3c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,10 +9,10 @@
"revisionslider-desc": 
"{{desc|name=RevisionSlider|url=https://www.mediawiki.org/wiki/Extension:RevisionSlider}};,
"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-change-size": "Label describing the size of the 
change compared to the revision before.\nParameters:\n* $1 - Change size.",
-   "revisionslider-label-comment": "Label showing the edit summary of a 
revision.\nParameters:\n* $1 - The revision's edit summary.",
+   "revisionslider-label-date": "Label describing the creation date of 
this revision.\nParameters:\n* $1 - Creation date.",
+   "revisionslider-label-page-size": "Label describing the size of this 
revision.\nParameters:\n* $1 - Formatted article size.\n* $2 - Article size as 
raw number.",
+   "revisionslider-label-change-size": "Label describing the size of the 
change compared to the revision before.\nParameters:\n* $1 - Formatted change 
size colored with markup.\n* $2 - Change size as raw number.",
+   "revisionslider-label-comment": "Label showing the edit summary of a 
revision.",
"revisionslider-label-edited-by": "Gender-neutral 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.",

[MediaWiki-commits] [Gerrit] install_server: Use PRODUCTION_NETWORKS - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: install_server: Use PRODUCTION_NETWORKS
..


install_server: Use PRODUCTION_NETWORKS

Only used to install systems in the production networks.

Change-Id: Ia26316bc1060cf480bbc1052c620c7a898297c91
---
M manifests/role/installserver.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 215fc61..eb85526 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -36,7 +36,7 @@
 
 include install_server::tftp_server
 ferm::rule { 'tftp':
-rule => 'proto udp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto udp dport tftp { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
@@ -58,7 +58,7 @@
 }
 
 ferm::rule { 'proxy':
-rule => 'proto tcp dport 8080 { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto tcp dport 8080 { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 include install_server::web_server
@@ -73,7 +73,7 @@
 
 include install_server::dhcp_server
 ferm::rule { 'dhcp':
-rule => 'proto udp dport bootps { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto udp dport bootps { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 # Backup

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

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

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

[MediaWiki-commits] [Gerrit] Disallows insertion before tag - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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

Change subject: Disallows insertion before  tag
..

Disallows insertion before  tag

Bug: T138518
Change-Id: I2f9ceacedb06eab6047dfb4711ca3d1543e3dd0c
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 9b0a244..72cfcc0 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -88,6 +88,9 @@
 
// Make image zoomable
this.$zoomImage.prpZoom();
+
+   // Remove insertion before 
+   $( 'div[typeof="mw:Extension/pagequality"]' ).prev().remove();
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f9ceacedb06eab6047dfb4711ca3d1543e3dd0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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

[MediaWiki-commits] [Gerrit] Add Plural support for googlelogin-manage-linked - change (mediawiki...GoogleLogin)

[jenkins-bot (Code Review)]

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

Change subject: Add Plural support for googlelogin-manage-linked
..


Add Plural support for googlelogin-manage-linked

Bug: T138137
Change-Id: I3d332983986fc3dced3e4a1fe2907d71d225944e
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialManageGoogleLogin.php
3 files changed, 16 insertions(+), 17 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index a235622..f73edb6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,7 +12,7 @@
"googlelogin-managelegend": "Find user to manage",
"googlelogin-manage-usersubmit": "Manage user",
"googlelogin-manage-user": "You manage the {{GENDER:$1|user}} 
$1.",
-   "googlelogin-manage-linked": "The account is linked with Google 
account(s) with the following ID(s): ",
+   "googlelogin-manage-linked": "The account is linked with {{PLURAL:$1|a 
Google account|Google accounts}} with the following {{PLURAL:$1|ID|IDs}}: ",
"googlelogin-manage-notlinked": "The account is actually not linked 
with any Google account.",
"googlelogin-manage-changelegend": "Change Google ID",
"googlelogin-manage-noplus": "Notice: The user with 
the Google ID you entered seems to have no Google+ profile. Maybe a typing 
error?",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5e5fa50..324ef08 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -17,7 +17,7 @@
"googlelogin-managelegend": "Text used in legend on 
Special:ManageGoogleLogin.",
"googlelogin-manage-usersubmit": "Submit text for find user form on 
Special:ManageGoogleLogin.",
"googlelogin-manage-user": "Used on Special:ManageGoogleLogin to show, 
which user is managed.\n* $1 - The name of the managed user, used for GENDER",
-   "googlelogin-manage-linked": "Message, that indicates, that the Wiki 
user is linked with a Google account.\n* $1 - Google ID of the linked Google 
account",
+   "googlelogin-manage-linked": "Message, that indicates, that the Wiki 
user is linked with one or more Google account(s).\n* $1 - Number of Google 
accounts (used for PLURAL support only)",
"googlelogin-manage-notlinked": "Message that indicates, that the Wiki 
user isn't linked with a Google account.",
"googlelogin-manage-changelegend": "Legendmessage for the \"Change 
Google ID\" form on Special:ManageGoogleLogin.",
"googlelogin-manage-noplus": "Notice message, that the passed Google ID 
doesn't have a Plus profile, including a hint to check a typing error.",
diff --git a/includes/specials/SpecialManageGoogleLogin.php 
b/includes/specials/SpecialManageGoogleLogin.php
index ff0ccbd..cafe07e 100644
--- a/includes/specials/SpecialManageGoogleLogin.php
+++ b/includes/specials/SpecialManageGoogleLogin.php
@@ -102,26 +102,25 @@
$out->addWikiMsg( 'googlelogin-manage-user', $user->getName() );
$googleIds = GoogleUser::getGoogleIdFromUser( $user );
if ( $googleIds ) {
-   $out->addHTML(
-   Html::openElement( 'div' ) .
-   $this->msg( 'googlelogin-manage-linked' 
)->escaped() .
-   Html::openElement( 'strong' )
-   );
-
+   $googleIdLinks = '';
foreach ( $googleIds as $count => $googleId ) {
+   $googleIdCount = $count + 1;
if ( $count !== 0 ) {
-   $out->addHTML( ', ' );
+   $googleIdLinks .= ', ';
}
-   $out->addHTML(
-   Html::element( 'a',
-   [
-   'href' => 
'javascript:void(0)',
-   'data-googleid' => 
$googleId,
-   ],
-   $googleId
-   ) );
+   $googleIdLinks .= Html::element( 'a',
+   [
+   'href' => 'javascript:void(0)',
+   'data-googleid' => $googleId,
+   ],
+   $googleId
+   );
}
$out->addHTML(
+   Html::openElement( 'div' ) .
+   $this->msg( 'googlelogin-manage-linked', 
$googleIdCount )->escaped() .
+ 

[MediaWiki-commits] [Gerrit] Loads PageTarget all the time with VisualEditorPluginModules - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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

Change subject: Loads PageTarget all the time with VisualEditorPluginModules
..

Loads PageTarget all the time with VisualEditorPluginModules

Bug: T138644
Change-Id: Ic4cbb756033523a537d9e6e2bb4b84cf52ce4369
---
M ProofreadPage.body.php
M extension.json
D modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
3 files changed, 2 insertions(+), 14 deletions(-)


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

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 899678d..776e39c 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -174,7 +174,6 @@
$out->addModuleStyles( 'ext.proofreadpage.base' );
} elseif ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$out->addModules( 'ext.proofreadpage.page.navigation' );
-   $out->addModules( 
'ext.proofreadpage.ve.pageTarget.init' );
} elseif (
$title->inNamespace( NS_MAIN ) &&
( $out->isArticle() || $isEdit ) &&
diff --git a/extension.json b/extension.json
index cc78d35..793d39e 100644
--- a/extension.json
+++ b/extension.json
@@ -326,7 +326,8 @@
"tests/parser/proofreadpage_pagequality.txt"
],
"VisualEditorPluginModules": [
-   "ext.proofreadpage.ve.node.pages"
+   "ext.proofreadpage.ve.node.pages",
+   "ext.proofreadpage.ve.pageTarget"
],
"VisualEditorAvailableNamespaces": {
"Page": true
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
deleted file mode 100644
index 0d2621d..000
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * VisualEditor MediaWiki Initialization ProofreadPagePageTarget 
initialization.
- *
- * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-if ( mw.loader.getState( 'ext.visualEditor.desktopArticleTarget.init' ) ) {
-   mw.loader.using( 'ext.visualEditor.desktopArticleTarget.init', function 
() {
-   mw.libs.ve.addPlugin( 'ext.proofreadpage.ve.pageTarget' );
-   } );
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4cbb756033523a537d9e6e2bb4b84cf52ce4369
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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

[MediaWiki-commits] [Gerrit] apertium-hbs-mkd: Rebuild for Jessie and cleanup - change (operations...apertium-hbs-mkd)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: apertium-hbs-mkd: Rebuild for Jessie and cleanup
..

apertium-hbs-mkd: Rebuild for Jessie and cleanup

Bug: T107306
Change-Id: Ib5256532ca4e7cb17f7b94ca13d7e44f750c30c5
---
M debian/changelog
M debian/compat
M debian/control
M debian/rules
4 files changed, 20 insertions(+), 30 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-hbs-mkd
 refs/changes/51/296051/1

diff --git a/debian/changelog b/debian/changelog
index 9a61883..a80901e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apertium-hbs-mkd (0.1.0~r57554-1+wmf1) jessie; urgency=low
+
+  * Rebuild for Jessie.
+  * debian/control:
++ Fixed dependencies.
++ Fixed Vcs-Git URL.
++ Updated Standards-Version.
+  * Cleanup debian/rules file.
+
+ -- Kartik Mistry   Sat, 25 Jun 2016 18:47:49 +0530
+
 apertium-hbs-mkd (0.1.0~r57554-1) trusty; urgency=low
 
   [ Tino Didriksen ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 11fbfd7..5323b6c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,24 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 

-Uploaders: Tino Didriksen ,
+Uploaders: Tino Didriksen ,
Kartik Mistry 
-Build-Depends: apertium,
+Build-Depends: apertium-dev (>= 3.4),
apertium-lex-tools,
autotools-dev,
cg3,
-   debhelper (>= 8.0),
+   debhelper (>= 9),
dh-autoreconf,
gawk,
-   libapertium3-3.3-dev,
-   locales,
-   lttoolbox,
pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-hbs-mkd.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-hbs-mkd.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-hbs-mkd.git
 
 Package: apertium-hbs-mkd
 Architecture: all
-Depends: apertium (>= 3.3),
+Depends: apertium (>= 3.4),
  apertium-lex-tools,
  cg3,
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 11004df..b5d222c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export LC_ALL=C.UTF-8
 
 %:
-   dh $@ --with autoreconf
-
-override_dh_auto_build:
-   mkdir -p debian/tmp/locale/
-   localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-   export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-   export LC_ALL=en_US.UTF-8 && \
-   dh_auto_build
+   dh $@ --fail-missing --with autoreconf

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5256532ca4e7cb17f7b94ca13d7e44f750c30c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-hbs-mkd
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] apertium-isl: Rebuild for Jessie and cleanup - change (operations...apertium-isl)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: apertium-isl: Rebuild for Jessie and cleanup
..

apertium-isl: Rebuild for Jessie and cleanup

Bug: T107306
Change-Id: Ibd79070523ac67a97e445c34832578f93b46b11b
---
M debian/changelog
M debian/control
M debian/copyright
M debian/docs
M debian/rules
5 files changed, 53 insertions(+), 31 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-isl
 refs/changes/50/296050/1

diff --git a/debian/changelog b/debian/changelog
index 6b2325d..f54379a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apertium-isl (0.1.0-1+wmf1) jessie; urgency=low
+
+  * Rebuild for Jessie.
+  * Updated dependencies.
+  * Cleanup debian/rules file.
+  * Fixed debian/copyright for Authors.
+
+ -- Kartik Mistry   Sat, 25 Jun 2016 18:41:37 +0530
+
 apertium-isl (0.1.0-1) trusty; urgency=low
 
   [ Tino Didriksen ]
diff --git a/debian/control b/debian/control
index 32cb651..272c142 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,25 @@
 Source: apertium-isl
 Section: science
 Priority: optional
-Maintainer: Kartik Mistry 
-Build-Depends: apertium (>= 3.3),
+Maintainer: Debian Science Team 

+Uploaders: Tino Didriksen ,
+   Kartik Mistry 
+Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
cg3,
debhelper (>= 9),
dh-autoreconf,
gawk,
hfst,
-   libapertium3-3.3-dev,
-   libhfst39-dev,
-   liblttoolbox3-3.3-dev (>= 3.3),
-   locales,
+   libhfst-dev,
pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-isl.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-isl.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-isl.git
 
 Package: apertium-isl
 Architecture: all
-Depends: apertium (>= 3.3), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
 Description: Apertium single language data for Icelandic
  Data package providing Apertium language resources for Icelandic
diff --git a/debian/copyright b/debian/copyright
index 8f6f23c..66e0051 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,39 @@
 Source: http://apertium.org/
 
 Files: *
-Copyright: 2014, Apertium Project Management Committee 

- See AUTHORS for more copyrights.
+Copyright: 2009-2010, Jim O'Regan 
+   2009-2011, Hlynur Sigurþórsson , Háskólinn í 
Reykjavík
+   2009-2011, Hrafn Loftsson , Háskólinn í Reykjavík
+   2009-2011, Martha Dís Brandt , Háskólinn í 
Reykjavík
+   2009-2014, Francis M. Tyers 
+   2009-2016, Kevin Brubeck Unhammer 
+2009, Jacob Nordfalk 
+2009, Pminervini 
+   2010-2011, Trond Trosterud 
+2011, Ólafur Waage 
+2012, Anthony J. Bentley 

+License: GPL-3
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+Files: debian/*
+Copyright: 2016, Apertium Project Management Committee 

+License: GPL-3+
+
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/docs b/debian/docs
index 6f12db5..6f83607 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,3 @@
 AUTHORS
+NEWS
 README
diff --git a/debian/rules b/debian/rules
index 11004df..b5d222c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,9 @@
 #!/usr/bin/make -f
 # -*- 

[MediaWiki-commits] [Gerrit] apertium-hbs-eng: Rebuild for Jessie and cleanup - change (operations...apertium-hbs-eng)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: apertium-hbs-eng: Rebuild for Jessie and cleanup
..

apertium-hbs-eng: Rebuild for Jessie and cleanup

Bug: T107306
Change-Id: I35d8d21d90780008f7cea7235621f6412a089f9c
---
M debian/changelog
M debian/compat
M debian/control
M debian/rules
4 files changed, 16 insertions(+), 30 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-hbs-eng
 refs/changes/49/296049/1

diff --git a/debian/changelog b/debian/changelog
index 3d82a6d..979593b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apertium-hbs-eng (0.1.0~r57554-1+wmf1) jessie; urgency=low
+
+  * Rebuild for Jessie.
+  * Fixed dependencies and cleanup debian/rules file.
+
+ -- Kartik Mistry   Sat, 25 Jun 2016 18:37:21 +0530
+
 apertium-hbs-eng (0.1.0~r57554-1) trusty; urgency=low
 
   [ Tino Didriksen ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 4babf67..e7b6e6a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,28 +2,25 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 

-Uploaders: Tino Didriksen ,
+Uploaders: Tino Didriksen ,
Kartik Mistry 
-Build-Depends: apertium,
+Build-Depends: apertium-dev (>= 3.4),
apertium-hbs,
apertium-lex-tools,
autotools-dev,
cg3,
-   debhelper (>= 8.0),
+   debhelper (>= 9),
dh-autoreconf,
gawk,
-   libapertium3-3.3-dev,
-   locales,
-   lttoolbox,
pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-hbs-eng.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-hbs-eng.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-hbs-eng.git
 
 Package: apertium-hbs-eng
 Architecture: all
-Depends: apertium (>= 3.3),
+Depends: apertium (>= 3.4),
  apertium-lex-tools,
  cg3,
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 11004df..b5d222c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export LC_ALL=C.UTF-8
 
 %:
-   dh $@ --with autoreconf
-
-override_dh_auto_build:
-   mkdir -p debian/tmp/locale/
-   localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-   export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-   export LC_ALL=en_US.UTF-8 && \
-   dh_auto_build
+   dh $@ --fail-missing --with autoreconf

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35d8d21d90780008f7cea7235621f6412a089f9c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-hbs-eng
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] Syncronize VisualEditor: 2a2a041..d4cbb9a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 2a2a041..d4cbb9a
..

Syncronize VisualEditor: 2a2a041..d4cbb9a

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


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

diff --git a/VisualEditor b/VisualEditor
index 2a2a041..d4cbb9a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2a2a041933c958f372f791eef9a163cb9e4ec726
+Subproject commit d4cbb9ad8f2f290d30a128caade999802046ecda

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18d5aedf7973d7d5a8d1e6871b9a4564786ce6fc
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: 2a2a041..d4cbb9a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 2a2a041..d4cbb9a
..


Syncronize VisualEditor: 2a2a041..d4cbb9a

Change-Id: I18d5aedf7973d7d5a8d1e6871b9a4564786ce6fc
---
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 2a2a041..d4cbb9a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2a2a041933c958f372f791eef9a163cb9e4ec726
+Subproject commit d4cbb9ad8f2f290d30a128caade999802046ecda

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18d5aedf7973d7d5a8d1e6871b9a4564786ce6fc
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] TranslateDeleteJob: Fix result of errors value when deletion... - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: TranslateDeleteJob: Fix result of errors value when deletions 
fail
..


TranslateDeleteJob: Fix result of errors value when deletions fail

doDeleteArticle() returns a bool so it isn't very helpful to log this value
as an error. For some reason, it also seems to be either ignored by the
list=logevents API or it's not even inserted. So switch to use
doDeleteArticleReal() which returns a Status object so that we can properly
log the errors. Discovered while looking into T138571.

Change-Id: Ie04b7049accf5db4e79f136135d3c206e504e6a6
---
M tag/TranslateDeleteJob.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tag/TranslateDeleteJob.php b/tag/TranslateDeleteJob.php
index de4d418..a5e6827 100644
--- a/tag/TranslateDeleteJob.php
+++ b/tag/TranslateDeleteJob.php
@@ -59,11 +59,11 @@
 
$error = '';
$wikipage = new WikiPage( $title );
-   $ok = $wikipage->doDeleteArticle( "{$summary}: $reason", false, 
0, true, $error, $user );
-   if ( !$ok ) {
+   $status = $wikipage->doDeleteArticleReal( "{$summary}: 
$reason", false, 0, true, $error, $user );
+   if ( !$status->isGood() ) {
$params = array(
'target' => $base,
-   'error' => $ok,
+   'errors' => $status->getErrorsArray(),
);
 
$type = $this->getFull() ? 'deletefnok' : 'deletelnok';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie04b7049accf5db4e79f136135d3c206e504e6a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Glaisher 
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] Add two missing fields to i18n - change (labs...heritage)

[jenkins-bot (Code Review)]

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

Change subject: Add two missing fields to i18n
..


Add two missing fields to i18n

Change-Id: Ib5156319d8a6a5eec2ffab8870706b247331a1cb
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Jean-Frédéric: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 84fa066..35be86e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,6 +21,9 @@
"db-field-source": "Source",
"db-field-monument_article": "Monument page",
"db-field-registrant_url": "Registrant URL",
+   "db-field-commonscat": "Commons category",
+   "db-field-wd_item": "Wikidata item",
+   "db-field-wd_project": "Wikimedia project",
"db-field-st_address": "Addresses",
"db-field-st_address_pct": "Addresses %",
"db-field-st_coordinates": "Coordinates",
@@ -32,7 +35,6 @@
"db-field-st_name": "Names",
"db-field-st_name_pct": "Names %",
"db-field-st_total": "Total number",
-   "db-field-commonscat": "Commons category",
"toolbox-label-searchtipps": "use %term or term% or %term% for fuzzy 
search",
"toolbox-meta-title": "Wiki Loves Monuments Toolbox",
"toolbox-main-title": "WLM Toolbox",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 22a8136..a275e65 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -31,6 +31,9 @@
"db-field-source": "Translation of the field \"source\" in the 
monuments database. The source field contains a link to the list on a Wikimedia 
project from which the data was imported.\n{{Identical|Source}}",
"db-field-monument_article": "Translation of the field 
\"monument_article\" in the monuments database. This is the title of a wiki 
page about the monument.",
"db-field-registrant_url": "Translation of the field \"registrant_url\" 
in the monuments database.\n\nExamples of registrant URLs:\n* 
http://www.culture.gouv.fr/public/mistral/merimee_fr?ACTION=CHERCHER_1=REF_1=PA00088517\n*
 http://register.muinas.ee/?menuID=monument=view=20875;,
+   "db-field-commonscat": "Translation of the field \"commonscat\" in the 
monuments database. This is the title of a category on Wikimedia Commons with 
images of the monument.",
+   "db-field-wd_item": "Translation of the field \"wd_item\" in the 
monuments database. This is the id of a Wikidata item.",
+   "db-field-wd_project": "Translation of the field \"project\" in the 
monuments database. This is the title of a Wikimedia Project.",
"db-field-st_address": "{{Identical|Address}}",
"db-field-st_address_pct": "{{Identical|Address}}",
"db-field-st_coordinates": "{{Identical|Coordinates}}",
@@ -42,7 +45,6 @@
"db-field-st_name": "{{Identical|Name}}",
"db-field-st_name_pct": "{{Identical|Name}}",
"db-field-st_total": "{{Identical|Total number}}",
-   "db-field-commonscat": "Translation of the field \"commonscat\" in the 
monuments database. This is the title of a category on Wikimedia Commons with 
images of the monument.",
"toolbox-label-searchtipps": "Instruction for how to perform a fuzzy 
search.",
"toolbox-meta-title": "Title used in the metadata header of the page.",
"toolbox-main-title": "Page header used in the top of every page of the 
toolbox.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5156319d8a6a5eec2ffab8870706b247331a1cb
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 
Gerrit-Reviewer: Jean-Frédéric 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] SpecialManageTranslatorSandbox: avoid FOUC - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: SpecialManageTranslatorSandbox: avoid FOUC
..


SpecialManageTranslatorSandbox: avoid FOUC

Separated styles to a different module. Due to changes in loading order I had
to increase specificity of some CSS classes. This is good because it means
that sometimes users could see broken interface if loading order was different.

Change-Id: Icdbfe14d726c8bad8f9e34ef6b94ac6c2498cb6e
---
M Resources.php
M resources/css/ext.translate.special.managetranslatorsandbox.css
M specials/SpecialManageTranslatorSandbox.php
3 files changed, 14 insertions(+), 11 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index acecf39..63a7b9e 100644
--- a/Resources.php
+++ b/Resources.php
@@ -312,8 +312,6 @@
 
 $wgResourceModules['ext.translate.special.managetranslatorsandbox'] = array(
'scripts' => 
'resources/js/ext.translate.special.managetranslatorsandbox.js',
-   'styles' => 
'resources/css/ext.translate.special.managetranslatorsandbox.css',
-   'position' => 'top',
'dependencies' => array(
'ext.translate.loader',
'ext.translate.translationstashstorage',
@@ -346,6 +344,10 @@
),
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.special.managetranslatorsandbox.styles'] = 
array(
+   'styles' => 
'resources/css/ext.translate.special.managetranslatorsandbox.css',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.special.pagemigration'] = array(
'styles' => 'resources/css/ext.translate.special.pagemigration.css',
'scripts' => 'resources/js/ext.translate.special.pagemigration.js',
diff --git a/resources/css/ext.translate.special.managetranslatorsandbox.css 
b/resources/css/ext.translate.special.managetranslatorsandbox.css
index 08ffa04..5bd1181 100644
--- a/resources/css/ext.translate.special.managetranslatorsandbox.css
+++ b/resources/css/ext.translate.special.managetranslatorsandbox.css
@@ -20,7 +20,7 @@
font-size: 24px;
 }
 
-.search.pane {
+.grid .search.pane {
background: url('../images/search.png') no-repeat scroll left top 
transparent;
background-image: -webkit-linear-gradient(transparent, transparent), 
url(../images/search.svg);
/* @embed */
@@ -52,16 +52,16 @@
overflow: auto;
 }
 
-.details.pane {
+.grid .details.pane {
border-left: 1px solid #DD;
left: -1px;
padding: 5px 20px 10px 20px;
 }
 
 /* Requests pane */
-.requests.pane,
-.requests.pane .request,
-.requests.pane .request-header {
+.grid .requests.pane,
+.grid .requests.pane .request,
+.grid .requests.pane .request-header {
margin: 0;
padding: 0;
 }
@@ -84,7 +84,7 @@
background-color: #f0f0f0;
 }
 
-.request .amount {
+.grid .request .amount {
height: 100%;
font-size: 3em;
color: #96989A;
@@ -122,8 +122,8 @@
overflow: hidden;
 }
 
-.request .request-info,
-.request .approval {
+.grid .request .request-info,
+.grid .request .approval {
padding-top: 5px;
 }
 
diff --git a/specials/SpecialManageTranslatorSandbox.php 
b/specials/SpecialManageTranslatorSandbox.php
index 3a82d50..123c770 100644
--- a/specials/SpecialManageTranslatorSandbox.php
+++ b/specials/SpecialManageTranslatorSandbox.php
@@ -38,7 +38,8 @@
$this->setHeaders();
$this->checkPermissions();
$out = $this->getOutput();
-   $out->addModuleStyles( 'mediawiki.ui.button' );
+   $out->addModuleStyles( array( 'mediawiki.ui.button', 
'jquery.uls.grid' ) );
+   $out->addModuleStyles( 
'ext.translate.special.managetranslatorsandbox.styles' );
$out->addModules( 
'ext.translate.special.managetranslatorsandbox' );
$this->stash = new TranslationStashStorage( wfGetDB( DB_MASTER 
) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdbfe14d726c8bad8f9e34ef6b94ac6c2498cb6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
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] Remove unused LoginForm - change (mediawiki...OpenBadges)

[jenkins-bot (Code Review)]

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

Change subject: Remove unused LoginForm
..


Remove unused LoginForm

Bug: T135277
Change-Id: I18b70e4e076ffe8a5df2855e884e903aeac38509
---
M SpecialBadgeCreate.php
M SpecialBadgeIssue.php
2 files changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/SpecialBadgeCreate.php b/SpecialBadgeCreate.php
index 1fde12a..fe603af 100644
--- a/SpecialBadgeCreate.php
+++ b/SpecialBadgeCreate.php
@@ -7,12 +7,9 @@
  */
 
 class SpecialBadgeCreate extends FormSpecialPage {
-   /** @var LoginForm **/
-   private $mLoginForm;
 
public function __construct() {
parent::__construct( 'BadgeCreate', 'createbadge' );
-   $this->mLoginForm = new LoginForm();
}
 
/**
diff --git a/SpecialBadgeIssue.php b/SpecialBadgeIssue.php
index 771ea24..40ec85e 100644
--- a/SpecialBadgeIssue.php
+++ b/SpecialBadgeIssue.php
@@ -7,12 +7,9 @@
  */
 
 class SpecialBadgeIssue extends FormSpecialPage {
-   /** @var LoginForm **/
-   private $mLoginForm;
 
public function __construct() {
parent::__construct( 'BadgeIssue', 'issuebadge' );
-   $this->mLoginForm = new LoginForm();
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18b70e4e076ffe8a5df2855e884e903aeac38509
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenBadges
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [fixed] remove rstrip() because T137637 has been fixed - change (pywikibot...xqbot)

[jenkins-bot (Code Review)]

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

Change subject: [fixed] remove rstrip() because T137637 has been fixed
..


[fixed] remove rstrip() because T137637 has been fixed

Change-Id: I059a3d3dbcb28641d2a4c4358b1abbfd29dbd28f
---
M checkvotes.py
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/checkvotes.py b/checkvotes.py
index 5a7a3d9..ac24702 100644
--- a/checkvotes.py
+++ b/checkvotes.py
@@ -474,7 +474,6 @@
 r'\n#:\1 nicht stimmberechtigt 
--\n', [])
 
 text = head + text
-text = text.rstrip()  # TODO: may removed when T137637 is fixed
 if self.userPut(page, page.text, text,
 summary=self.summary + comment):
 for username in userlist:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I059a3d3dbcb28641d2a4c4358b1abbfd29dbd28f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/xqbot
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [RevisionSlider] Add new optional key - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [RevisionSlider] Add new optional key
..

[RevisionSlider] Add new optional key

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/91/295991/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index eb3277b..6ae3cad 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2002,6 +2002,7 @@
 optional = revcs-log-supplement
 
 Revision Slider
+optional = revisionslider-show-help
 
 Right Functions
 optional = rightfunctions-rest1, rightfunctions-rest2, rightfunctions-rest3, 
rightfunctions-sep

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

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

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

[MediaWiki-commits] [Gerrit] [RevisionSlider] Add new optional key - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [RevisionSlider] Add new optional key
..


[RevisionSlider] Add new optional key

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index eb3277b..6ae3cad 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2002,6 +2002,7 @@
 optional = revcs-log-supplement
 
 Revision Slider
+optional = revisionslider-show-help
 
 Right Functions
 optional = rightfunctions-rest1, rightfunctions-rest2, rightfunctions-rest3, 
rightfunctions-sep

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

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

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

[MediaWiki-commits] [Gerrit] [fixed] remove rstrip() because T137637 has been fixed - change (pywikibot...xqbot)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: [fixed] remove rstrip() because T137637 has been fixed
..

[fixed] remove rstrip() because T137637 has been fixed

Change-Id: I059a3d3dbcb28641d2a4c4358b1abbfd29dbd28f
---
M checkvotes.py
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot 
refs/changes/90/295990/1

diff --git a/checkvotes.py b/checkvotes.py
index 5a7a3d9..ac24702 100644
--- a/checkvotes.py
+++ b/checkvotes.py
@@ -474,7 +474,6 @@
 r'\n#:\1 nicht stimmberechtigt 
--\n', [])
 
 text = head + text
-text = text.rstrip()  # TODO: may removed when T137637 is fixed
 if self.userPut(page, page.text, text,
 summary=self.summary + comment):
 for username in userlist:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I059a3d3dbcb28641d2a4c4358b1abbfd29dbd28f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/xqbot
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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

[MediaWiki-commits] [Gerrit] Add Mailgun.php shim, after extension registration - change (mediawiki...Mailgun)

[jenkins-bot (Code Review)]

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

Change subject: Add Mailgun.php shim, after extension registration
..


Add Mailgun.php shim, after extension registration

Change-Id: I7db41fd83b9fe1f59d391c113e9aa3067d82f641
---
A Mailgun.php
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/Mailgun.php b/Mailgun.php
new file mode 100644
index 000..22a4a9b
--- /dev/null
+++ b/Mailgun.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the Mailgun extension requires MediaWiki 1.25+' );
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7db41fd83b9fe1f59d391c113e9aa3067d82f641
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Mailgun
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update tags - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Update tags
..

Update tags

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/89/295989/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 993d4a4..51cd898 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2001,6 +2001,7 @@
 optional = revcs-log-supplement
 
 Revision Slider
+optional = revisionslider-show-help
 
 Right Functions
 optional = rightfunctions-rest1, rightfunctions-rest2, rightfunctions-rest3, 
rightfunctions-sep

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If51dfe8cf0f542ee048c85df548f3563b73ca0ae
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] Make a symbol on the "Show help" button translatable - change (mediawiki...RevisionSlider)

[jenkins-bot (Code Review)]

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

Change subject: Make a symbol on the "Show help" button translatable
..


Make a symbol on the "Show help" button translatable

Change-Id: I60ae368f59203f63fb352ec861db5d75d488f8fa
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.RevisionSlider.init.js
4 files changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Jakob: Checked; Looks good to me, but someone else must approve
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 25c19c9..11a1b7a 100644
--- a/extension.json
+++ b/extension.json
@@ -40,6 +40,7 @@
"mediawiki.api.options"
],
"messages": [
+   "revisionslider-show-help",
"revisionslider-loading-out-of-range",
"revisionslider-loading-failed"
],
diff --git a/i18n/en.json b/i18n/en.json
index ed4af13..db4f679 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -18,6 +18,7 @@
 "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.",
 "revisionslider-arrow-tooltip-newer": "See newer revisions",
 "revisionslider-arrow-tooltip-older": "See older revisions",
+"revisionslider-show-help": "?",
 "revisionslider-help-dialog-slide1": "The RevisionSlider helps you to 
navigate and compare revisions on the diff page. It is based on a 
[[m:WMDE_Technical_Wishes/Revision_Slider|community wish]] from the 
German-speaking community technical wishlist.",
 "revisionslider-help-dialog-slide2": "Each bar represents an article 
revision. Bars on the top show growth in size of the article, bars on the 
bottom show a reduction. In the image, revision 1 represents added content, 
while revision 2 represents removal of content.",
 "revisionslider-help-dialog-slide3": "To compare certain revisions, 
select the revisions using the yellow and blue pointer.The blue pointer 
controls the newer revision, the yellow pointer maps to the older 
revision.Move the pointers by drag and drop or click on a bar.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 56adeae..36e2e9a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,6 +19,7 @@
"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.",
"revisionslider-arrow-tooltip-newer": "Text shown after hovering the 
button scrolling to newer revisions.",
"revisionslider-arrow-tooltip-older": "Text shown after hovering the 
button scrolling to older revisions.",
+   "revisionslider-show-help": "A symbol shown in the \"Show help\" 
button.",
"revisionslider-help-dialog-slide1": "Text shown on the first slide of 
the help dialog.",
"revisionslider-help-dialog-slide2": "Text shown on the second slide of 
the help dialog.",
"revisionslider-help-dialog-slide3": "Text shown on the third slide of 
the help dialog.",
diff --git a/modules/ext.RevisionSlider.init.js 
b/modules/ext.RevisionSlider.init.js
index 77fd306..680dad0 100644
--- a/modules/ext.RevisionSlider.init.js
+++ b/modules/ext.RevisionSlider.init.js
@@ -35,7 +35,7 @@
.click( function () {

mw.libs.revisionSlider.HelpDialog.show();
} )
-   .text( '?' )
+   .text( mw.message( 
'revisionslider-show-help' ).text() )
.addClass( 'mw-show-help' )
);
} catch ( err ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60ae368f59203f63fb352ec861db5d75d488f8fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jakob 
Gerrit-Reviewer: Siebrand 
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] installer: Allow specifying where LocalSettings.php should b... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: installer: Allow specifying where LocalSettings.php should be 
saved
..


installer: Allow specifying where LocalSettings.php should be saved

This allows software packages to specify where the LocalSettings.php
file should be saved to when the user is downloading it from the web
installer.

Bug: T123151
Change-Id: I06ded602be9aac0a10773e9d85c4d1585a70933b
(cherry picked from commit 4dba618ae0eae04ef8902be45fa98fd55ef73483)
---
M includes/installer/WebInstaller.php
M includes/installer/WebInstallerComplete.php
M includes/installer/i18n/en.json
M includes/installer/i18n/qqq.json
4 files changed, 25 insertions(+), 2 deletions(-)

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



diff --git a/includes/installer/WebInstaller.php 
b/includes/installer/WebInstaller.php
index 4c4e6b7..c08212e 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1157,6 +1157,20 @@
}
 
/**
+* If the software package wants the LocalSettings.php file
+* to be placed in a specific location, override this function
+* (see mw-config/overrides/README) to return the path of
+* where the file should be saved, or false for a generic
+* "in the base of your install"
+*
+* @since 1.27
+* @return string|bool
+*/
+   public function getLocalSettingsLocation() {
+   return false;
+   }
+
+   /**
 * @return bool
 */
public function envCheckPath() {
diff --git a/includes/installer/WebInstallerComplete.php 
b/includes/installer/WebInstallerComplete.php
index 11a1833..456058e 100644
--- a/includes/installer/WebInstallerComplete.php
+++ b/includes/installer/WebInstallerComplete.php
@@ -37,13 +37,20 @@
 
$this->startForm();
$this->parent->disableLinkPopups();
+   $location = $this->parent->getLocalSettingsLocation();
+   $msg = 'config-install-done';
+   if ( $location !== false ) {
+   // config-install-done-path
+   $msg .= '-path';
+   }
$this->addHTML(
$this->parent->getInfoBox(
-   wfMessage( 'config-install-done',
+   wfMessage( $msg,
$lsUrl,
$this->getVar( 'wgServer' ) .
$this->getVar( 'wgScriptPath' ) . 
'/index.php',
-   ''
+   '',
+   $location ?: ''
)->plain(), 'tick-32.png'
)
);
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index 8a66ad9..2d9b991 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -303,6 +303,7 @@
"config-install-extension-tables": "Creating tables for enabled 
extensions",
"config-install-mainpage-failed": "Could not insert main page: $1",
"config-install-done": "Congratulations!\nYou have 
installed MediaWiki.\n\nThe installer has generated a 
LocalSettings.php file.\nIt contains all your 
configuration.\n\nYou will need to download it and put it in the base of your 
wiki installation (the same directory as index.php). The download should have 
started automatically.\n\nIf the download was not offered, or if you cancelled 
it, you can restart the download by clicking the link 
below:\n\n$3\n\nNote: If you do not do this now, this 
generated configuration file will not be available to you later if you exit the 
installation without downloading it.\n\nWhen that has been done, you can 
[$2 enter your wiki].",
+   "config-install-done-path": "Congratulations!\nYou 
have installed MediaWiki.\n\nThe installer has generated a 
LocalSettings.php file.\nIt contains all your 
configuration.\n\nYou will need to download it and put it at $4. 
The download should have started automatically.\n\nIf the download was not 
offered, or if you cancelled it, you can restart the download by clicking the 
link below:\n\n$3\n\nNote: If you do not do this now, this 
generated configuration file will not be available to you later if you exit the 
installation without downloading it.\n\nWhen that has been done, you can 
[$2 enter your wiki].",
"config-download-localsettings": "Download 
LocalSettings.php",
"config-help": "help",
"config-help-tooltip": "click to expand",
diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index 77d4569..307cf4d 100644
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -321,6 +321,7 @@

[MediaWiki-commits] [Gerrit] Makes sure to remove the WikiEditor UI - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

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

Change subject: Makes sure to remove the WikiEditor UI
..


Makes sure to remove the WikiEditor UI

Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Task: T138393
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
2 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
index 2803b57..7d8c779 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.css
@@ -4,7 +4,7 @@
  * @copyright 2011-2016 VisualEditor Team and others; see 
http://ve.mit-license.org
  */
 
-.ve-init-mw-proofreadPagePageTarget .ve-init-mw-target-surface {
+.prp-page-container .ve-init-mw-target-surface {
float: left;
width: calc( 50% + 1em );
 }
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 6397a92..87c6854 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -15,12 +15,16 @@
  * @param {Object} config Configuration options
  */
 ve.init.mw.ProofreadPagePageTarget = function 
VeInitMwProofreadPagePageTarget() {
-   var zoomIn, zoomReset, zoomOut;
+   var zoomIn, zoomReset, zoomOut, $contentText, $pageContainer;
 
// Parent method
ve.init.mw.ProofreadPagePageTarget.super.apply( this, arguments );
 
-   this.$element.addClass( 've-init-mw-proofreadPagePageTarget' );
+   if ( [ 'edit', 'submit' ].indexOf( mw.config.get( 'wgAction' ) ) !== -1 
) {
+   $contentText = $( '#mw-content-text' );
+   $pageContainer = $contentText.find( '.prp-page-container' );
+   $contentText.empty().append( $pageContainer );
+   }
 
this.$zoomContainer = $( '' ).addClass( 
've-init-mw-proofreadPagePageTarget-zoomContainer' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] rm misc::monitoring::view::hadoop - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: rm misc::monitoring::view::hadoop
..

rm misc::monitoring::view::hadoop

Looking at the view in Ganglia at
https://ganglia.wikimedia.org/latest/?r=hour===cpu_report=by+name==v==false

it is not working "No matching metrics detected .."

and we would like to get rid of the remnants in misc/monitoring

Change-Id: I56b7a200bceaf7ddbc118665c387d51c29889755
---
M manifests/misc/monitoring.pp
1 file changed, 0 insertions(+), 101 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/295988/1

diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index d71d240..9ae941f 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -7,11 +7,6 @@
 topic_regex => 'webrequest_.+',
 }
 
-class { 'misc::monitoring::view::hadoop':
-master   => 'analytics1001.eqiad.wmnet',
-worker_regex => 'analytics10(11|[3-9]|20).eqiad.wmnet',
-}
-
 include misc::monitoring::views::dns
 }
 
@@ -229,102 +224,6 @@
 ],
 }
 }
-
-
-# == Class misc::monitoring::view::hadoop
-#
-class misc::monitoring::view::hadoop($master, $worker_regex, $ensure = 
'present') {
-ganglia::web::view { 'hadoop':
-ensure => $ensure,
-graphs => [
-# ResourceManager active applications
-{
-'host_regex'   => $master,
-'metric_regex' => 
'Hadoop.ResourceManager.QueueMetrics.*ActiveApplications',
-'type' => 'stack',
-},
-# ResourceManager failed applications
-{
-'host_regex'   => $master,
-'metric_regex' => 
'Hadoop.ResourceManager.QueueMetrics.*AppsFailed',
-'type' => 'stack',
-},
-# NodeManager containers running
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
'Hadoop.NodeManager.NodeManagerMetrics.ContainersRunning',
-'type' => 'stack',
-},
-# NodeManager Allocated Memeory GB
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
'Hadoop.NodeManager.NodeManagerMetrics.AllocatedGB',
-'type' => 'stack',
-},
-# Worker Node bytes_in
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'bytes_in',
-'type' => 'stack',
-},
-# Worker Node bytes_out
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'bytes_out',
-'type' => 'stack',
-},
-# Primary NameNode File activity
-{
-'host_regex'   => $master,
-'metric_regex' => 
'Hadoop.NameNode.NameNodeActivity.Files(Created|Deleted|Renamed|Appended)',
-'type' => 'line',
-},
-# Worker Node /proc/diskstat bytes written per second
-{
-# FIXME - top-scope var without namespace ($worker_regex), will 
break in puppet 2.8
-# lint:ignore:variable_scope
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_write_bytes_per_sec",
-'type' => 'stack',
-},
-# /proc/diskstat bytes read per second
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_read_bytes_per_sec",
-'type' => 'stack',
-},
-# Worker Node /proc/diskstat disk utilization %
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_percent_io_time",
-'type' => 'line',
-},
-# Worker Node /proc/diskstat IO time
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_io_time",
-'type' => 'line',
-},
-# lint:endignore
-# Worker Node 15 minute load average
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'load_fifteen',
-'type' => 'line',
-},
-# Worker Node IO wait
-{
-'host_regex'   => $worker_regex,
-'metric_regex' => 'cpu_wio',
-'type' => 'line',
-},
-],
-}
-}
-
-
-
-
 
 
 # == Class misc::monitoring::view::analytics::data

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] Mock Http in MediaWikiPageNameNormalizerTest and add more te... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Mock Http in MediaWikiPageNameNormalizerTest and add more test 
cases
..


Mock Http in MediaWikiPageNameNormalizerTest and add more test cases

Bug: T138570
Change-Id: Ia156ba61afb90c9a3b1a2e1e0bf967056bd87fc8
---
M includes/site/MediaWikiPageNameNormalizer.php
M tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
2 files changed, 80 insertions(+), 34 deletions(-)

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



diff --git a/includes/site/MediaWikiPageNameNormalizer.php 
b/includes/site/MediaWikiPageNameNormalizer.php
index 2f71736..1a079b4 100644
--- a/includes/site/MediaWikiPageNameNormalizer.php
+++ b/includes/site/MediaWikiPageNameNormalizer.php
@@ -35,6 +35,22 @@
 class MediaWikiPageNameNormalizer {
 
/**
+* @var Http
+*/
+   private $http;
+
+   /**
+* @param Http|null $http
+*/
+   public function __construct( Http $http = null ) {
+   if ( !$http ) {
+   $http = new Http();
+   }
+
+   $this->http = $http;
+   }
+
+   /**
 * Returns the normalized form of the given page title, using the
 * normalization rules of the given site. If the given title is a 
redirect,
 * the redirect weill be resolved and the redirect target is returned.
@@ -85,7 +101,7 @@
 
// Go on call the external site
// @todo we need a good way to specify a timeout here.
-   $ret = Http::get( $url, [], __METHOD__ );
+   $ret = $this->http->get( $url, [], __METHOD__ );
 
if ( $ret === false ) {
wfDebugLog( "MediaWikiSite", "call to external site 
failed: $url" );
diff --git a/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php 
b/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
index 3f67b2b..64cdbaa 100644
--- a/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
+++ b/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
@@ -29,36 +29,15 @@
  */
 class MediaWikiPageNameNormalizerTest extends PHPUnit_Framework_TestCase {
 
-   protected function setUp() {
-   parent::setUp();
-
-   static $connectivity = null;
-
-   if ( $connectivity === null ) {
-   // Check whether we have (reasonable fast) connectivity
-   $res = Http::get(
-   
'https://www.wikidata.org/w/api.php?action=query=siteinfo=json',
-   [ 'timeout' => 3 ],
-   __METHOD__
-   );
-
-   if ( $res === false || strpos( $res, 
'"sitename":"Wikidata"' ) === false ) {
-   $connectivity = false;
-   } else {
-   $connectivity = true;
-   }
-   }
-
-   if ( !$connectivity ) {
-   $this->markTestSkipped( 
'MediaWikiPageNameNormalizerTest needs internet connectivity.' );
-   }
-   }
-
/**
 * @dataProvider normalizePageTitleProvider
 */
-   public function testNormalizePageTitle( $expected, $pageName ) {
-   $normalizer = new MediaWikiPageNameNormalizer();
+   public function testNormalizePageTitle( $expected, $pageName, 
$getResponse ) {
+   MediaWikiPageNameNormalizerTestMockHttp::$response = 
$getResponse;
+
+   $normalizer = new MediaWikiPageNameNormalizer(
+   new MediaWikiPageNameNormalizerTestMockHttp()
+   );
 
$this->assertSame(
$expected,
@@ -67,19 +46,70 @@
}
 
public function normalizePageTitleProvider() {
-   // Note: This makes (very conservative) assumptions about pages 
on Wikidata
-   // existing or not.
+   // Response are taken from wikidata and kkwiki using the 
following API request
+   // 
api.php?action=query=info=1=1=json=…
return [
'universe (Q1)' => [
-   'Q1', 'Q1'
+   'Q1',
+   'Q1',
+   
'{"batchcomplete":"","query":{"pages":{"129":{"pageid":129,"ns":0,'
+   . 
'"title":"Q1","contentmodel":"wikibase-item","pagelanguage":"en",'
+   . 
'"pagelanguagehtmlcode":"en","pagelanguagedir":"ltr",'
+   . 
'"touched":"2016-06-23T05:11:21Z","lastrevid":350004448,"length":58001'
],
'Q404 redirects to Q395' => [
-   'Q395', 'Q404'
+  

[MediaWiki-commits] [Gerrit] puppetmaster: lint-ignore layout in test/puppetmaster - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: puppetmaster: lint-ignore layout in test/puppetmaster
..

puppetmaster: lint-ignore layout in test/puppetmaster

Change-Id: Ia154d242d96e9fdc0c218c110dc69bb37e2214df
---
M modules/puppetmaster/tests/puppetmaster.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/295987/1

diff --git a/modules/puppetmaster/tests/puppetmaster.pp 
b/modules/puppetmaster/tests/puppetmaster.pp
index 2c99cc2..c820061 100644
--- a/modules/puppetmaster/tests/puppetmaster.pp
+++ b/modules/puppetmaster/tests/puppetmaster.pp
@@ -1,3 +1,4 @@
+# lint:ignore:autoloader_layout
 class passwords::geoip {}
-
+# lint:endignore
 include puppetmaster

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

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

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

[MediaWiki-commits] [Gerrit] lint-ignore arrows in tests/server - change (operations...kafka)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: lint-ignore arrows in tests/server
..

lint-ignore arrows in tests/server

Change-Id: I2e1fd0490f105c15adbd37b022ea3cf057e732ff
---
M tests/server.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka 
refs/changes/86/295986/1

diff --git a/tests/server.pp b/tests/server.pp
index ed5ca01..541c650 100644
--- a/tests/server.pp
+++ b/tests/server.pp
@@ -1,7 +1,9 @@
 class { 'kafka::server':
+# lint:ignore:arrow_alignment
 brokers   => {
 "${::fqdn}"   => { 'id' => 1, 'port' => 12345 },
 'kafka-node02.domain.org' => { 'id' => 2 },
 },
+# lint:endignore
 zookeeper_hosts => ['zk-node01:2181', 'zk-node02:2181', 'zk-node03:2181'],
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e1fd0490f105c15adbd37b022ea3cf057e732ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] Fix jQuery selector in edit stash - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Fix jQuery selector in edit stash
..

Fix jQuery selector in edit stash

Follow-up to: ebe7205c

Change-Id: I4d72948ba62cb5c1cc29277f30363c29e42fa25b
---
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/295984/1

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js 
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 2ae05dd..da27d20 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -13,10 +13,10 @@
$form = $( '#editform' ),
$text = $form.find( '#wpTextbox1' ),
$summary = $form.find( '#wpSummary' ),
-   section = $form.find( '#wpSection' ).val(),
-   model = $form.find( '#model' ).val(),
-   format = $form.find( '#format' ).val(),
-   revId = $form.find( '#parentRevId' ).val(),
+   section = $form.find( '[name=wpSection]' ).val(),
+   model = $form.find( '[name=model]' ).val(),
+   format = $form.find( '[name=format]' ).val(),
+   revId = $form.find( '[name=parentRevId]' ).val(),
lastText = $text.textSelection( 'getContents' ),
timer = null;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d72948ba62cb5c1cc29277f30363c29e42fa25b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] openstack: move instancersync define to own file - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: openstack: move instancersync define to own file
..

openstack: move instancersync define to own file

Change-Id: Ibb86285d99123c3e04f5a60d04c98864d8ca4e26
---
M modules/openstack/manifests/nova/compute.pp
1 file changed, 0 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/295985/1

diff --git a/modules/openstack/manifests/nova/compute.pp 
b/modules/openstack/manifests/nova/compute.pp
index 80efe7c..ddbdbdb 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -207,13 +207,3 @@
 }
 }
 
-# defines an rsync server on an instance
-define instancersync (
-$hostname = undef) {
-
-rsync::server::module { "nova_instance_rsync_${hostname}":
-path=> '/var/lib/nova/instances',
-read_only   => 'no',
-hosts_allow => ["${hostname}.${::site}.wmnet"],
-}
-}

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

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

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

[MediaWiki-commits] [Gerrit] diamond: move _lib classes to own files - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: diamond: move _lib classes to own files
..

diamond: move _lib classes to own files

Each class should have its own file, per style guide
and lint check.

Change-Id: Ibbdab575b26b3f06d9986351ac01b5db53534872
---
M modules/diamond/manifests/collector/nagios.pp
A modules/diamond/manifests/collector/nagios_lib.pp
M modules/diamond/manifests/collector/servicestats.pp
A modules/diamond/manifests/collector/servicestats_lib.pp
4 files changed, 41 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/295982/1

diff --git a/modules/diamond/manifests/collector/nagios.pp 
b/modules/diamond/manifests/collector/nagios.pp
index 2e0a7b4..67d58c1 100644
--- a/modules/diamond/manifests/collector/nagios.pp
+++ b/modules/diamond/manifests/collector/nagios.pp
@@ -36,16 +36,3 @@
 }
 }
 
-# support class, to be include'd multiple times
-class diamond::collector::nagios_lib {
-diamond::collector { 'Nagios':
-source   => 'puppet:///modules/diamond/collector/nagios.py'
-}
-
-file { '/etc/diamond/nagios.d':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-}
-}
diff --git a/modules/diamond/manifests/collector/nagios_lib.pp 
b/modules/diamond/manifests/collector/nagios_lib.pp
new file mode 100644
index 000..8a61b01
--- /dev/null
+++ b/modules/diamond/manifests/collector/nagios_lib.pp
@@ -0,0 +1,13 @@
+# support class, to be include'd multiple times
+class diamond::collector::nagios_lib {
+diamond::collector { 'Nagios':
+source   => 'puppet:///modules/diamond/collector/nagios.py'
+}
+
+file { '/etc/diamond/nagios.d':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
+}
diff --git a/modules/diamond/manifests/collector/servicestats.pp 
b/modules/diamond/manifests/collector/servicestats.pp
index 01957bd..94b0fef 100644
--- a/modules/diamond/manifests/collector/servicestats.pp
+++ b/modules/diamond/manifests/collector/servicestats.pp
@@ -30,31 +30,3 @@
 }
 }
 
-# support class, to be include'd multiple times
-class diamond::collector::servicestats_lib {
-diamond::collector { 'ServiceStats':
-source   => 'puppet:///modules/diamond/collector/servicestats.py',
-settings => {
-  initsystem => $::initsystem
-}
-}
-
-file { '/usr/share/diamond/collectors/servicestats/servicestats_lib.py':
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-source  => 'puppet:///modules/diamond/collector/servicestats_lib.py',
-require => Diamond::Collector['ServiceStats'],
-}
-
-file { '/etc/diamond/servicestats.d':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-}
-
-package { ['python-psutil', 'python-configparser']:
-before => Diamond::Collector['ServiceStats'],
-}
-}
diff --git a/modules/diamond/manifests/collector/servicestats_lib.pp 
b/modules/diamond/manifests/collector/servicestats_lib.pp
new file mode 100644
index 000..60ec86d
--- /dev/null
+++ b/modules/diamond/manifests/collector/servicestats_lib.pp
@@ -0,0 +1,28 @@
+# support class, to be include'd multiple times
+class diamond::collector::servicestats_lib {
+diamond::collector { 'ServiceStats':
+source   => 'puppet:///modules/diamond/collector/servicestats.py',
+settings => {
+  initsystem => $::initsystem
+}
+}
+
+file { '/usr/share/diamond/collectors/servicestats/servicestats_lib.py':
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+source  => 'puppet:///modules/diamond/collector/servicestats_lib.py',
+require => Diamond::Collector['ServiceStats'],
+}
+
+file { '/etc/diamond/servicestats.d':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
+
+package { ['python-psutil', 'python-configparser']:
+before => Diamond::Collector['ServiceStats'],
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] Remove unused LoginForm - change (mediawiki...OpenBadges)

[Lokal Profil (Code Review)]

Lokal Profil has uploaded a new change for review.

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

Change subject: Remove unused LoginForm
..

Remove unused LoginForm

Bug: T135277
Change-Id: I18b70e4e076ffe8a5df2855e884e903aeac38509
---
M SpecialBadgeCreate.php
M SpecialBadgeIssue.php
2 files changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/SpecialBadgeCreate.php b/SpecialBadgeCreate.php
index 1fde12a..fe603af 100644
--- a/SpecialBadgeCreate.php
+++ b/SpecialBadgeCreate.php
@@ -7,12 +7,9 @@
  */
 
 class SpecialBadgeCreate extends FormSpecialPage {
-   /** @var LoginForm **/
-   private $mLoginForm;
 
public function __construct() {
parent::__construct( 'BadgeCreate', 'createbadge' );
-   $this->mLoginForm = new LoginForm();
}
 
/**
diff --git a/SpecialBadgeIssue.php b/SpecialBadgeIssue.php
index 771ea24..40ec85e 100644
--- a/SpecialBadgeIssue.php
+++ b/SpecialBadgeIssue.php
@@ -7,12 +7,9 @@
  */
 
 class SpecialBadgeIssue extends FormSpecialPage {
-   /** @var LoginForm **/
-   private $mLoginForm;
 
public function __construct() {
parent::__construct( 'BadgeIssue', 'issuebadge' );
-   $this->mLoginForm = new LoginForm();
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18b70e4e076ffe8a5df2855e884e903aeac38509
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenBadges
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] New Wikidata Build - 2016-06-25T08:33:57+0000 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 2016-06-25T08:33:57+
..


New Wikidata Build - 2016-06-25T08:33:57+

Change-Id: Id7f20e56a074467763fa76dd788d5fa0e2b43db0
---
M composer.lock
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
M vendor/composer/installed.json
4 files changed, 9 insertions(+), 30 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index d76e683..c758153 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1570,12 +1570,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "67dc6b522354268882c0fccad379ee1fa4a04c7d"
+"reference": "b4a48b944a8e16f8da62b168ed0271289474db39"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/67dc6b522354268882c0fccad379ee1fa4a04c7d;,
-"reference": "67dc6b522354268882c0fccad379ee1fa4a04c7d",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b4a48b944a8e16f8da62b168ed0271289474db39;,
+"reference": "b4a48b944a8e16f8da62b168ed0271289474db39",
 "shasum": ""
 },
 "require": {
@@ -1648,7 +1648,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-06-24 09:19:05"
+"time": "2016-06-24 16:40:40"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/WikibaseRepo.php 
b/extensions/Wikibase/repo/includes/WikibaseRepo.php
index b0ee875..9468090 100644
--- a/extensions/Wikibase/repo/includes/WikibaseRepo.php
+++ b/extensions/Wikibase/repo/includes/WikibaseRepo.php
@@ -1731,7 +1731,7 @@
public function getCachingCommonsMediaFileNameLookup() {
if ( $this->cachingCommonsMediaFileNameLookup === null ) {
$this->cachingCommonsMediaFileNameLookup = new 
CachingCommonsMediaFileNameLookup(
-   new MediaWikiPageNameNormalizer( 
'https://commons.wikimedia.org/w/api.php' ),
+   new MediaWikiPageNameNormalizer(),
new HashBagOStuff()
);
}
diff --git 
a/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js 
b/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
index 1706359..7ea3e6d 100644
--- a/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
+++ b/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
@@ -44,12 +44,6 @@
 * @param {jQuery.Event}
 * @param {boolean} Whether widget has been dis- oder enabled.
 */
-   /**
-* @event init
-* Triggered after the widget is fully initialized. (`jQuery.Widget` 
native "create" event is
-* triggered after the template DOM is ready and template short-cuts 
are assigned.)
-* @param {jQuery.Event}
-*/
$.widget( 'ui.TemplatedWidget', PARENT, {
/**
 * @see jQuery.Widget.options
@@ -87,21 +81,6 @@
this._createTemplateShortCuts();
 
PARENT.prototype._create.apply( this );
-   },
-
-   /**
-* Initializes any additional widget logic (i.e. child widgets, 
event handlers). DOM
-* creation/manipulation is supposed to be performed in 
`_create` which is run before
-* `_init`. With the `TemplatedWidget`'s base `_init` 
implementation triggering the "init"
-* event, inheriting widgets should call parent's `_init` as 
last action for other
-* components listening to the "init" event can be sure the 
widget in fully initialized.
-*
-* @see jQuery.Widget._init
-* @protected
-*/
-   _init: function() {
-   PARENT.prototype._init.call( this );
-   this._trigger( 'init' );
},
 
/**
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b25bde4..ed23d58 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1392,12 +1392,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "67dc6b522354268882c0fccad379ee1fa4a04c7d"
+

[MediaWiki-commits] [Gerrit] Fix filename - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has submitted this change and it was merged.

Change subject: Fix filename
..


Fix filename

Change-Id: I25c6ec35ad3bd52913ab336029698590c8274b7a
---
M groups/Wikimedia/video2commons.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/groups/Wikimedia/video2commons.yaml 
b/groups/Wikimedia/video2commons.yaml
index b9d98cf..237e54f 100644
--- a/groups/Wikimedia/video2commons.yaml
+++ b/groups/Wikimedia/video2commons.yaml
@@ -25,5 +25,5 @@
   class: Video2commonsInsertablesSuggester
 
 AUTOLOAD:
-  Video2commonsInsertablesSuggester: Video2commonsInsertablesChecker.php
+  Video2commonsInsertablesSuggester: Video2commonsInsertablesSuggester.php
   Video2commonsMessageChecker: Video2commonsMessageChecker.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25c6ec35ad3bd52913ab336029698590c8274b7a
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] Fix filename - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Fix filename
..

Fix filename

Change-Id: I25c6ec35ad3bd52913ab336029698590c8274b7a
---
M groups/Wikimedia/video2commons.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/80/295980/1

diff --git a/groups/Wikimedia/video2commons.yaml 
b/groups/Wikimedia/video2commons.yaml
index b9d98cf..237e54f 100644
--- a/groups/Wikimedia/video2commons.yaml
+++ b/groups/Wikimedia/video2commons.yaml
@@ -25,5 +25,5 @@
   class: Video2commonsInsertablesSuggester
 
 AUTOLOAD:
-  Video2commonsInsertablesSuggester: Video2commonsInsertablesChecker.php
+  Video2commonsInsertablesSuggester: Video2commonsInsertablesSuggester.php
   Video2commonsMessageChecker: Video2commonsMessageChecker.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c6ec35ad3bd52913ab336029698590c8274b7a
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] [Cite][Citoid] Add new key to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [Cite][Citoid] Add new key to ignore
..


[Cite][Citoid] Add new key to ignore

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 214f2b7..eb3277b 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -578,7 +578,7 @@
 optional = cite_references_link_suffix, cite_reference_link, 
cite_references_link_one, cite_references_link_many
 optional = cite_references_link_many_format, 
cite_references_link_many_format_backlink_labels, 
cite_references_link_many_sep, cite_references_link_many_and
 ignored = cite_references_prefix, cite_references_suffix, 
cite_references_no_link
-ignored = cite_error_refs_without_references_category
+ignored = cite_error_refs_without_references_category, 
visualeditor-cite-tool-definition.json, cite-tool-definition.json
 
 Cite - VisualEditor
 id = ext-cite-visualeditor
@@ -589,6 +589,7 @@
 ignored = citethispage-summary, accesskey-citethispage
 
 Citoid
+ignored = citoid-template-type-map.json
 
 cldr
 

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

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

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

[MediaWiki-commits] [Gerrit] [Cite][Citoid] Add new key to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [Cite][Citoid] Add new key to ignore
..

[Cite][Citoid] Add new key to ignore

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/79/295979/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 214f2b7..eb3277b 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -578,7 +578,7 @@
 optional = cite_references_link_suffix, cite_reference_link, 
cite_references_link_one, cite_references_link_many
 optional = cite_references_link_many_format, 
cite_references_link_many_format_backlink_labels, 
cite_references_link_many_sep, cite_references_link_many_and
 ignored = cite_references_prefix, cite_references_suffix, 
cite_references_no_link
-ignored = cite_error_refs_without_references_category
+ignored = cite_error_refs_without_references_category, 
visualeditor-cite-tool-definition.json, cite-tool-definition.json
 
 Cite - VisualEditor
 id = ext-cite-visualeditor
@@ -589,6 +589,7 @@
 ignored = citethispage-summary, accesskey-citethispage
 
 Citoid
+ignored = citoid-template-type-map.json
 
 cldr
 

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-06-25T08:33:57+0000 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2016-06-25T08:33:57+
..

New Wikidata Build - 2016-06-25T08:33:57+

Change-Id: Id7f20e56a074467763fa76dd788d5fa0e2b43db0
---
M composer.lock
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
M vendor/composer/installed.json
4 files changed, 9 insertions(+), 30 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index d76e683..c758153 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1570,12 +1570,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "67dc6b522354268882c0fccad379ee1fa4a04c7d"
+"reference": "b4a48b944a8e16f8da62b168ed0271289474db39"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/67dc6b522354268882c0fccad379ee1fa4a04c7d;,
-"reference": "67dc6b522354268882c0fccad379ee1fa4a04c7d",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b4a48b944a8e16f8da62b168ed0271289474db39;,
+"reference": "b4a48b944a8e16f8da62b168ed0271289474db39",
 "shasum": ""
 },
 "require": {
@@ -1648,7 +1648,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-06-24 09:19:05"
+"time": "2016-06-24 16:40:40"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/WikibaseRepo.php 
b/extensions/Wikibase/repo/includes/WikibaseRepo.php
index b0ee875..9468090 100644
--- a/extensions/Wikibase/repo/includes/WikibaseRepo.php
+++ b/extensions/Wikibase/repo/includes/WikibaseRepo.php
@@ -1731,7 +1731,7 @@
public function getCachingCommonsMediaFileNameLookup() {
if ( $this->cachingCommonsMediaFileNameLookup === null ) {
$this->cachingCommonsMediaFileNameLookup = new 
CachingCommonsMediaFileNameLookup(
-   new MediaWikiPageNameNormalizer( 
'https://commons.wikimedia.org/w/api.php' ),
+   new MediaWikiPageNameNormalizer(),
new HashBagOStuff()
);
}
diff --git 
a/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js 
b/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
index 1706359..7ea3e6d 100644
--- a/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
+++ b/extensions/Wikibase/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
@@ -44,12 +44,6 @@
 * @param {jQuery.Event}
 * @param {boolean} Whether widget has been dis- oder enabled.
 */
-   /**
-* @event init
-* Triggered after the widget is fully initialized. (`jQuery.Widget` 
native "create" event is
-* triggered after the template DOM is ready and template short-cuts 
are assigned.)
-* @param {jQuery.Event}
-*/
$.widget( 'ui.TemplatedWidget', PARENT, {
/**
 * @see jQuery.Widget.options
@@ -87,21 +81,6 @@
this._createTemplateShortCuts();
 
PARENT.prototype._create.apply( this );
-   },
-
-   /**
-* Initializes any additional widget logic (i.e. child widgets, 
event handlers). DOM
-* creation/manipulation is supposed to be performed in 
`_create` which is run before
-* `_init`. With the `TemplatedWidget`'s base `_init` 
implementation triggering the "init"
-* event, inheriting widgets should call parent's `_init` as 
last action for other
-* components listening to the "init" event can be sure the 
widget in fully initialized.
-*
-* @see jQuery.Widget._init
-* @protected
-*/
-   _init: function() {
-   PARENT.prototype._init.call( this );
-   this._trigger( 'init' );
},
 
/**
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b25bde4..ed23d58 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1392,12 +1392,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": 

[MediaWiki-commits] [Gerrit] Enable video2commons - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Enable video2commons
..

Enable video2commons

Change-Id: I3d8fa8a5566437efdd03781459175f0e87013652
---
M TranslateSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/77/295977/1

diff --git a/TranslateSettings.php b/TranslateSettings.php
index a3dc3f2..1fd36fa 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -237,6 +237,7 @@
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/GapFinder.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/jquery.uls.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/Pageviews.yaml";
+$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/video2commons.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/wiki-ai.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/WikiBlame.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/WikiEduDashboard.yaml";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d8fa8a5566437efdd03781459175f0e87013652
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] Enable video2commons - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has submitted this change and it was merged.

Change subject: Enable video2commons
..


Enable video2commons

Change-Id: I3d8fa8a5566437efdd03781459175f0e87013652
---
M TranslateSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/TranslateSettings.php b/TranslateSettings.php
index a3dc3f2..1fd36fa 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -237,6 +237,7 @@
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/GapFinder.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/jquery.uls.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/Pageviews.yaml";
+$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/video2commons.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/wiki-ai.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/WikiBlame.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/WikiEduDashboard.yaml";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d8fa8a5566437efdd03781459175f0e87013652
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] Make visualeditor-cite-tool-definition.json always exist, re... - change (mediawiki...Cite)

[jenkins-bot (Code Review)]

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

Change subject: Make visualeditor-cite-tool-definition.json always exist, 
rename to cite-tool-definition.json
..


Make visualeditor-cite-tool-definition.json always exist, rename to 
cite-tool-definition.json

Bug: T138573
Change-Id: I454380c392feea55483d00d4b7eec45bce04ff53
---
M CiteDataModule.php
M modules/ve-cite/i18n/en.json
M modules/ve-cite/i18n/qqq.json
M modules/ve-cite/ve.ui.MWReference.init.js
4 files changed, 19 insertions(+), 1 deletion(-)

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



diff --git a/CiteDataModule.php b/CiteDataModule.php
index e2468a0..0e2d9a3 100644
--- a/CiteDataModule.php
+++ b/CiteDataModule.php
@@ -21,11 +21,19 @@
 
public function getScript( ResourceLoaderContext $context ) {
$citationDefinition = json_decode(
-   $context->msg( 'visualeditor-cite-tool-definition.json' 
)
+   $context->msg( 'cite-tool-definition.json' )
->inContentLanguage()
->plain()
);
 
+   if ( $citationDefinition === null ) {
+   $citationDefinition = json_decode(
+   $context->msg( 
'visualeditor-cite-tool-definition.json' )
+   ->inContentLanguage()
+   ->plain()
+   );
+   }
+
$citationTools = [];
if ( is_array( $citationDefinition ) ) {
foreach ( $citationDefinition as $tool ) {
diff --git a/modules/ve-cite/i18n/en.json b/modules/ve-cite/i18n/en.json
index 263c2f0..a965889 100644
--- a/modules/ve-cite/i18n/en.json
+++ b/modules/ve-cite/i18n/en.json
@@ -16,10 +16,12 @@
"Amir E. Aharoni"
]
},
+   "visualeditor-cite-tool-definition.json": "null",
"visualeditor-cite-tool-name-book": "Book",
"visualeditor-cite-tool-name-journal": "Journal",
"visualeditor-cite-tool-name-news": "News",
"visualeditor-cite-tool-name-web": "Website",
+   "cite-tool-definition.json": "null",
"cite-ve-dialog-reference-editing-reused": "This reference is used $1 
{{PLURAL:$1|times}} on this page.",
"cite-ve-dialog-reference-options-group-label": "Use this group",
"cite-ve-dialog-reference-options-group-placeholder": "General 
references",
diff --git a/modules/ve-cite/i18n/qqq.json b/modules/ve-cite/i18n/qqq.json
index 2abccd3..003eece 100644
--- a/modules/ve-cite/i18n/qqq.json
+++ b/modules/ve-cite/i18n/qqq.json
@@ -26,10 +26,12 @@
"Umherirrender"
]
},
+   "visualeditor-cite-tool-definition.json": "Legacy name for 
cite-tool-definition.json message.",
"visualeditor-cite-tool-name-book": "Title of tool that inserts a 
citation for a book.\n{{Identical|Book}}",
"visualeditor-cite-tool-name-journal": "Title of tool that inserts a 
citation for a journal\n{{Identical|Journal}}",
"visualeditor-cite-tool-name-news": "Title of tool that inserts a 
citation for a news.\n{{Identical|News}}",
"visualeditor-cite-tool-name-web": "Title of tool that inserts a 
citation for a website.\n{{Identical|Website}}",
+   "cite-tool-definition.json": "JSON list of objects detailing each 
citation with name (key referring to a visualeditor-cite-tool-name-x message), 
icon ('ref-cite-book', 'ref-cite-journal', 'ref-cite-news', 'ref-cite-web'), 
and template name",
"cite-ve-dialog-reference-editing-reused": "Text shown at the top of 
the reference dialog when editing a reference that is used multiple 
times.\n\nParameters:\n* $1 - Number of times used. This is always greater than 
1.",
"cite-ve-dialog-reference-options-group-label": "Label for the 
reference group input",
"cite-ve-dialog-reference-options-group-placeholder": "Placeholder for 
the reference group input",
diff --git a/modules/ve-cite/ve.ui.MWReference.init.js 
b/modules/ve-cite/ve.ui.MWReference.init.js
index 46c0cd5..85b113e 100644
--- a/modules/ve-cite/ve.ui.MWReference.init.js
+++ b/modules/ve-cite/ve.ui.MWReference.init.js
@@ -77,6 +77,12 @@
// Must use mw.message to avoid JSON being parsed as 
Wikitext
tools = JSON.parse( mw.message( 
'visualeditor-cite-tool-definition.json' ).plain() );
} catch ( e ) {}
+   if ( !tools ) {
+   try {
+   // Must use mw.message to avoid JSON being 
parsed as Wikitext
+   tools = JSON.parse( mw.message( 
'cite-tool-definition.json' ).plain() );
+   } catch ( e ) {}
+   }
 
if ( Array.isArray( tools ) ) {
  

[MediaWiki-commits] [Gerrit] Make citoid-template-type-map.json message always exist - change (mediawiki...Citoid)

[jenkins-bot (Code Review)]

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

Change subject: Make citoid-template-type-map.json message always exist
..


Make citoid-template-type-map.json message always exist

Bug: T138574
Change-Id: I75489d8cf3ab2b8d088f24323e806ab29930caf3
---
M i18n/en.json
M i18n/qqq.json
M modules/ve.ui.Citoid.init.js
3 files changed, 11 insertions(+), 8 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index c8bf905..1fa9b4c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -19,5 +19,6 @@
"citoid-desc": "Provides access points between the citoid service and 
MediaWiki",
"citoid-referencecontextitem-convert-button": "Convert",
"citoid-referencecontextitem-convert-message": "This reference consists 
of just an external link. You can use the 
\"{{int:citoid-referencecontextitem-convert-button}}\" button below to generate 
a properly formatted reference.",
+   "citoid-template-type-map.json": "null",
"citoid-unknown-error": "An unknown error has occured that prevented us 
from creating a citation. Please try again later."
 }
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2b8d75e..635b271 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -28,5 +28,6 @@
"citoid-desc": 
"{{desc|name=Citoid|url=https://www.mediawiki.org/wiki/Citoid}};,
"citoid-referencecontextitem-convert-button": "Label for the button to 
convert a plain reference to a Citoid reference.\n{{Identical|Convert}}",
"citoid-referencecontextitem-convert-message": "Message explaining the 
functionality of the button to convert a plain reference to a Citoid 
reference.",
+   "citoid-template-type-map.json": "JSON object containing mapping of 
different document types to the wiki's template names. Each template must have 
TemplateData defined to map Citoid's fields to the template's fields. Document 
types: book, bookSection, journalArticle, magazineArticle, newspaperArticle, 
thesis, letter, manuscript, interview, film, artwork, webpage, report, bill, 
hearing, patent, statute, email, map, blogPost, instantMessage, forumPost, 
audioRecording, presentation, videoRecording, tvBroadcast, radioBroadcast, 
podcast, computerProgram, conferencePaper, document, encyclopediaArticle, 
dictionaryEntry",
"citoid-unknown-error": "Error message indicating that the service to 
create citations has returned an error or is temporarily malfunctioning, asking 
the user to try again later."
 }
diff --git a/modules/ve.ui.Citoid.init.js b/modules/ve.ui.Citoid.init.js
index 6c1d2db..881ec74 100644
--- a/modules/ve.ui.Citoid.init.js
+++ b/modules/ve.ui.Citoid.init.js
@@ -1,18 +1,19 @@
 ( function () {
-   var i, j, jLen, toolGroups, citeIndex, target;
+   var i, j, jLen, toolGroups, citeIndex, target, map;
 
// Don't create tool unless the configuration message is present
try {
-   JSON.parse( mw.message( 'citoid-template-type-map.json' 
).plain() );
+   map = JSON.parse( mw.message( 'citoid-template-type-map.json' 
).plain() );
} catch ( e ) {
// Temporary hack for T93800
try {
-   JSON.parse( mw.message( 
'citoid-template-type-map-backup.json' ).plain() );
-   } catch ( e2 ) {
-   // Unregister the tool
-   ve.ui.toolFactory.unregister( 
ve.ui.CiteFromIdInspectorTool );
-   return;
-   }
+   map = JSON.parse( mw.message( 
'citoid-template-type-map-backup.json' ).plain() );
+   } catch ( e2 ) {}
+   }
+   if ( !map ) {
+   // Unregister the tool
+   ve.ui.toolFactory.unregister( ve.ui.CiteFromIdInspectorTool );
+   return;
}
 
// HACK: Find the position of the current citation toolbar definition

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75489d8cf3ab2b8d088f24323e806ab29930caf3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Jforrester 
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] install contint::arcanist module on contint slave snapshots - change (integration/config)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: install contint::arcanist module on contint slave snapshots
..

install contint::arcanist module on contint slave snapshots

Change-Id: I3aa49c5dc3ed813186aecb9137a0ac520ec7569f
---
M dib/puppet/ciimage.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/295976/1

diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index daaa770..6fbbc2a 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -30,7 +30,7 @@
 include contint::packages::javascript
 include contint::packages::php
 
-require_package('arcanist')
+include contint::arcanist
 
 require_package('php5-xhprof')
 exec { 'Enable PHP module xhprof':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aa49c5dc3ed813186aecb9137a0ac520ec7569f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] Install arcanist from apt rather than git. - change (operations/puppet)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Install arcanist from apt rather than git.
..

Install arcanist from apt rather than git.

Change-Id: Icba0354d30ece9ae66e53518f3b2577d082c5729
---
A modules/contint/files/arcrc.json
A modules/contint/manifests/arcanist.pp
M modules/phabricator/manifests/arcanist.pp
3 files changed, 22 insertions(+), 21 deletions(-)


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

diff --git a/modules/contint/files/arcrc.json b/modules/contint/files/arcrc.json
new file mode 100644
index 000..0b8ad2c
--- /dev/null
+++ b/modules/contint/files/arcrc.json
@@ -0,0 +1,5 @@
+{
+"config": {
+  "default": "https://phabricator.wikimedia.org/;
+}
+}
diff --git a/modules/contint/manifests/arcanist.pp 
b/modules/contint/manifests/arcanist.pp
new file mode 100644
index 000..8ead13c
--- /dev/null
+++ b/modules/contint/manifests/arcanist.pp
@@ -0,0 +1,14 @@
+# Install arcanist and the .arcrc so that it can find our phabricator instance
+# this is needed for running `arc lint` and `arc unit` on contint slaves.
+class contint::arcanist {
+require_package('arcanist')
+
+file { '/var/lib/jenkins/.arcrc':
+ensure  => 'file',
+owner   => 'jenkins',
+group   => 'jenkins',
+mode=> '0600',
+require => User['jenkins'],
+source  => 'puppet:///modules/contint/arcrc.json',
+}
+}
diff --git a/modules/phabricator/manifests/arcanist.pp 
b/modules/phabricator/manifests/arcanist.pp
index 236b18b..31e8bad 100644
--- a/modules/phabricator/manifests/arcanist.pp
+++ b/modules/phabricator/manifests/arcanist.pp
@@ -1,25 +1,7 @@
 # == Class: phabricator::arcanist
 #
-# Clone the arcanist and libphutil repositories into /usr/local/share/, then
-# link /usr/local/bin/arc to the arc executable
+# Installs the phabricator client, arcanist, from apt.
 #
-class phabricator::arcanist() {
-git::clone { 'phabricator/libphutil':
-directory => '/usr/local/share/libphutil',
-branch=> 'stable',
-}
-
-git::clone { 'phabricator/arcanist':
-directory => '/usr/local/share/arcanist',
-branch=> 'stable',
-require   => Git::Clone['phabricator/libphutil'],
-}
-
-file { '/usr/local/bin/arc':
-  ensure  => 'link',
-  target  => '/usr/local/share/arcanist/bin/arc',
-  owner   => 'root',
-  group   => 'root',
-  require => Git::Clone['phabricator/arcanist'],
-}
+class phabricator::arcanist {
+require_package('arcanist')
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icba0354d30ece9ae66e53518f3b2577d082c5729
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

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