[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: Set InnoDB as the default storage engine
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370992 ) Change subject: labsdb: Set InnoDB as the default storage engine .. labsdb: Set InnoDB as the default storage engine To avoid excessive replica locking, use InnoDB as the default storage engine, which will minimize lag issues when running DML/DDLs. Bug: T172882 Change-Id: Ida8de308c2a8d583b030bf6ffd9b199e1fb76560 --- M modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/370992/1 diff --git a/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb b/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb index 2ac7dd3..6a74eb2 100644 --- a/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb +++ b/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb @@ -66,7 +66,7 @@ character_set_filesystem = binary collation_server = binary -default-storage-engine = Aria +default-storage-engine = InnoDB aria_pagecache_buffer_size = <%= (Float(@memorysize.split[0]) * 0.05).round %>G innodb_data_home_dir = /srv/innodb innodb_file_per_table = 0 -- To view, visit https://gerrit.wikimedia.org/r/370992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida8de308c2a8d583b030bf6ffd9b199e1fb76560 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: Set InnoDB as the default storage engine
Jcrespo has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370992 ) Change subject: labsdb: Set InnoDB as the default storage engine .. labsdb: Set InnoDB as the default storage engine To avoid excessive replica locking, use InnoDB as the default storage engine, which will minimize lag issues when running DML/DDLs. Bug: T172882 Change-Id: Ida8de308c2a8d583b030bf6ffd9b199e1fb76560 --- M modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb b/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb index 2ac7dd3..6a74eb2 100644 --- a/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb +++ b/modules/role/templates/mariadb/mysqld_config/labs.my.cnf.erb @@ -66,7 +66,7 @@ character_set_filesystem = binary collation_server = binary -default-storage-engine = Aria +default-storage-engine = InnoDB aria_pagecache_buffer_size = <%= (Float(@memorysize.split[0]) * 0.05).round %>G innodb_data_home_dir = /srv/innodb innodb_file_per_table = 0 -- To view, visit https://gerrit.wikimedia.org/r/370992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida8de308c2a8d583b030bf6ffd9b199e1fb76560 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove custom salt grains due to salt deprecation
Jcrespo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370993 )
Change subject: mariadb: Remove custom salt grains due to salt deprecation
..
mariadb: Remove custom salt grains due to salt deprecation
Bug: T164780
Change-Id: Ie5dc2142035eb85cc1b345b43dbe6e6e936337b2
---
M modules/role/manifests/mariadb.pp
1 file changed, 0 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/370993/1
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index f25b041..4b86840 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -159,26 +159,6 @@
$socket = '/run/mysqld/mysqld.sock',
) {
-salt::grain { 'mysql_group':
-ensure => present,
-replace => true,
-value => $mysql_group,
-}
-
-salt::grain { 'mysql_role':
-ensure => present,
-replace => true,
-value => $mysql_role,
-}
-
-if $mysql_shard != '' {
-salt::grain { 'mysql_shard':
-ensure => present,
-replace => true,
-value => $mysql_shard,
-}
-}
-
include role::prometheus::node_exporter
class { 'role::prometheus::mysqld_exporter':
socket => $socket,
--
To view, visit https://gerrit.wikimedia.org/r/370993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5dc2142035eb85cc1b345b43dbe6e6e936337b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...puppet-compiler[master]: Fix call to compile_cmd_env
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370994 ) Change subject: Fix call to compile_cmd_env .. Fix call to compile_cmd_env Change-Id: I9d3cec91717f208c52b860a3de851ffbedd64a65 --- M puppet_compiler/puppet.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/puppet-compiler refs/changes/94/370994/1 diff --git a/puppet_compiler/puppet.py b/puppet_compiler/puppet.py index a48931f..6cd5614 100644 --- a/puppet_compiler/puppet.py +++ b/puppet_compiler/puppet.py @@ -56,7 +56,7 @@ Specialized function to store data into puppetdb when compiling. """ -cmd, env = compile_cmd_env(hostname, 'prod') +cmd, env = compile_cmd_env(hostname, 'prod', vardir, '--storeconfigs', '--storeconfigs_backend=puppetdb') out = spoolfile() err = spoolfile() success = False -- To view, visit https://gerrit.wikimedia.org/r/370994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d3cec91717f208c52b860a3de851ffbedd64a65 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/puppet-compiler Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Improve documentation of methods
Matěj Suchánek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330117 )
Change subject: Improve documentation of methods
..
Improve documentation of methods
Change-Id: I231d6a3e095324ae1509fdf028bcc352148a0dbe
---
M AbuseFilter.hooks.php
M includes/AbuseFilter.class.php
2 files changed, 134 insertions(+), 124 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/17/330117/7
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index a10552c..ed76687 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -222,10 +222,10 @@
* @param bool $minoredit
* @param bool $watchthis
* @param string $sectionanchor
-* @param integer $flags
+* @param int $flags
* @param Revision $revision
-* @param $status Status
-* @param $baseRevId
+* @param Status $status
+* @param int $baseRevId
* @return bool
*/
public static function onPageContentSaveComplete(
@@ -286,8 +286,8 @@
/**
* Check if two article objects are identical or have an identical
WikiPage
-* @param $page1 Article|WikiPage
-* @param $page2 Article|WikiPage
+* @param Article|WikiPage $page1
+* @param Article|WikiPage $page2
* @return bool
*/
protected static function identicalPageObjects( $page1, $page2 ) {
@@ -302,8 +302,8 @@
}
/**
-* @param $user
-* @param $promote
+* @param User $user
+* @param array &$promote
* @return bool
*/
public static function onGetAutoPromoteGroups( $user, &$promote ) {
@@ -325,6 +325,14 @@
return true;
}
+ /**
+* @param Title $oldTitle
+* @param Title $newTitle
+* @param User $user
+* @param string $reason
+* @param Status $status
+* @return bool
+*/
public static function onMovePageCheckPermissions( Title $oldTitle,
Title $newTitle,
User $user, $reason, Status $status
) {
@@ -371,9 +379,9 @@
}
/**
-* @param $user User
-* @param $message
-* @param $autocreate bool Indicates whether the account is created
automatically.
+* @param User $user
+* @param Message $message
+* @param bool $autocreate Indicates whether the account is created
automatically.
* @return bool
* @deprecated AbuseFilterPreAuthenticationProvider will take over this
functionality
*/
@@ -405,8 +413,8 @@
}
/**
-* @param $user User
-* @param $message
+* @param User $user
+* @param Message $message
* @return bool
* @deprecated AbuseFilterPreAuthenticationProvider will take over this
functionality
*/
@@ -415,8 +423,8 @@
}
/**
-* @param $user User
-* @param $message
+* @param User $user
+* @param Message $message
* @return bool
* @deprecated AbuseFilterPreAuthenticationProvider will take over this
functionality
*/
@@ -428,7 +436,7 @@
}
/**
-* @param $recentChange RecentChange
+* @param RecentChange $recentChange
* @return bool
*/
public static function onRecentChangeSave( $recentChange ) {
@@ -450,7 +458,7 @@
}
/**
-* @param array $tags
+* @param string[] $tags
* @param bool $enabled
* @return bool
*/
@@ -502,7 +510,7 @@
}
/**
-* @param array $tags
+* @param string[] $tags
* @return bool
*/
public static function onListDefinedTags( array &$tags ) {
@@ -510,7 +518,7 @@
}
/**
-* @param array $tags
+* @param string[] $tags
* @return bool
*/
public static function onChangeTagsListActive( array &$tags ) {
@@ -518,7 +526,7 @@
}
/**
-* @param $updater DatabaseUpdater
+* @param DatabaseUpdater|null $updater
* @throws MWException
* @return bool
*/
@@ -631,7 +639,7 @@
/**
* Updater callback to create the AbuseFilter user after the user
tables have been updated.
-* @param $updater DatabaseUpdater
+* @param DatabaseUpdater $updater
*/
public static function createAbuseFilterUser( $updater ) {
$username = wfMessage( 'abusefilter-blocker'
)->inContentLanguage()->text();
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index daf2ae8..f872a27 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -16,6 +16,8 @@
private static $filterCache = [];
public static $condCount
[MediaWiki-commits] [Gerrit] marvin[master]: Fix: escape start script wildcard
Jhernandez has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370799 )
Change subject: Fix: escape start script wildcard
..
Fix: escape start script wildcard
The package.json start script should escape its task wildcard argument
to forbid shell completion. Previously, when a file named `dev:foo`
existed, the following error occurred:
ERROR: Task not found: "dev:foo"
Also, super minor formatting change to place `-s` arguments
consistently.
Change-Id: I724b29c82b5db50b0b3842bb9563c31361f909d8
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jhernandez: Verified; Looks good to me, approved
diff --git a/package.json b/package.json
index c838752..f7be2a2 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,11 @@
"version": "0.0.0",
"description": "An API driven skin for MediaWiki",
"scripts": {
-"start": "run-p -sn dev:*",
+"start": "run-p -sn dev:\\*",
"dev:client": "NODE_ENV=development webpack -w",
"dev:server": "NODE_ENV=development nodemon -w dist/client -w src/server/
src/server/index.js",
"prod:build": "NODE_ENV=production webpack -p",
-"format": "npm run -s lint -- --fix",
+"format": "npm run lint -s -- --fix",
"format:all": "npm run format -s -- '{src,test}/**/*.js'",
"lint": "eslint --cache --max-warnings 0",
"lint:all": "npm run lint -s -- '{src,test}/**/*.js'",
--
To view, visit https://gerrit.wikimedia.org/r/370799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I724b29c82b5db50b0b3842bb9563c31361f909d8
Gerrit-PatchSet: 2
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: statistics::package: add missing package depencency
Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370786 )
Change subject: statistics::package: add missing package depencency
..
statistics::package: add missing package depencency
Puppet on notebook hosts is failing because apt::pin
is required to wait for packages that are not listed
in the catalog.
Bug: T171924
Change-Id: If0d3510bb7c28398862b70c3cbbe1da926ab3e06
---
M modules/statistics/manifests/packages.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/statistics/manifests/packages.pp
b/modules/statistics/manifests/packages.pp
index 6389454..8e6b724 100644
--- a/modules/statistics/manifests/packages.pp
+++ b/modules/statistics/manifests/packages.pp
@@ -141,6 +141,13 @@
'r-cran-rmysql',
'r-recommended'# CRAN-recommended packages (e.g. MASS, Matrix,
boot)
]
+
+# Explicitly list package dependencies, instead of using
require_package,
+# to avoid dependency issues with the 'before' clause in apt::pin.
+package { $r_packages:
+ensure => present,
+}
+
apt::pin { $r_packages:
pin => 'release a=jessie-backports',
priority => '1001',
--
To view, visit https://gerrit.wikimedia.org/r/370786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0d3510bb7c28398862b70c3cbbe1da926ab3e06
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Doc: add license
Jhernandez has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370976 ) Change subject: Doc: add license .. Doc: add license License copied from https://www.gnu.org/licenses/gpl-2.0.txt. Bug: T172682 Change-Id: Ib3e97bf77dd759fb5e76550ddaaa2ce7d82b9e42 --- A docs/license.txt M package.json M readme.md 3 files changed, 357 insertions(+), 1 deletion(-) Approvals: Jhernandez: Verified; Looks good to me, approved diff --git a/docs/license.txt b/docs/license.txt new file mode 100644 index 000..d159169 --- /dev/null +++ b/docs/license.txt @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet-compiler: bump version, run puppetdb-populate
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370995 )
Change subject: puppet-compiler: bump version, run puppetdb-populate
..
puppet-compiler: bump version, run puppetdb-populate
Bug: T150456
Change-Id: I5ffeea1e9534a4ae2ef0bdae62095b9424f420ea
---
M hieradata/labs/puppet3-diffs/common.yaml
M modules/puppet_compiler/manifests/init.pp
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/370995/1
diff --git a/hieradata/labs/puppet3-diffs/common.yaml
b/hieradata/labs/puppet3-diffs/common.yaml
index a53a085d..0197378 100644
--- a/hieradata/labs/puppet3-diffs/common.yaml
+++ b/hieradata/labs/puppet3-diffs/common.yaml
@@ -5,7 +5,7 @@
explicit_macs: false
disable_agent_forwarding: false
challenge_response_auth: false
-puppet_compiler::version: 0.3.2
+puppet_compiler::version: 0.3.3
etcd::peers_list: "%{::hostname}=http://127.0.0.1:2380";
etcd::client::globalconfig::host: 127.0.0.1
etcd::client::globalconfig::port: 2379
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index 3175574..4373423 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -1,6 +1,6 @@
# Installs the puppet compiler and all the other software we need.
class puppet_compiler(
-$version = '0.0.4',
+$version = '0.3.3',
$workdir = '/mnt/jenkins-workspace/puppet-compiler',
$libdir = '/var/lib/catalog-differ',
$ensure = 'present',
@@ -125,4 +125,13 @@
owner => $user,
require => File['/etc/puppet/puppetdb.conf']
}
+
+# periodic script to populate puppetdb. Run at 4 AM every sunday.
+cron { 'Populate puppetdb':
+command => "/usr/local/bin/puppetdb-populate --basedir ${libdir} >
${homedir}/puppetdb-populate.log 2>&1",
+user=> $user,
+hour=> 4,
+minute => 0,
+weekday => 0,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/370995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ffeea1e9534a4ae2ef0bdae62095b9424f420ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet-compiler: bump version, run puppetdb-populate
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370995 )
Change subject: puppet-compiler: bump version, run puppetdb-populate
..
puppet-compiler: bump version, run puppetdb-populate
Bug: T150456
Change-Id: I5ffeea1e9534a4ae2ef0bdae62095b9424f420ea
---
M hieradata/labs/puppet3-diffs/common.yaml
M modules/puppet_compiler/manifests/init.pp
2 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/puppet3-diffs/common.yaml
b/hieradata/labs/puppet3-diffs/common.yaml
index a53a085d..0197378 100644
--- a/hieradata/labs/puppet3-diffs/common.yaml
+++ b/hieradata/labs/puppet3-diffs/common.yaml
@@ -5,7 +5,7 @@
explicit_macs: false
disable_agent_forwarding: false
challenge_response_auth: false
-puppet_compiler::version: 0.3.2
+puppet_compiler::version: 0.3.3
etcd::peers_list: "%{::hostname}=http://127.0.0.1:2380";
etcd::client::globalconfig::host: 127.0.0.1
etcd::client::globalconfig::port: 2379
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index 3175574..4373423 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -1,6 +1,6 @@
# Installs the puppet compiler and all the other software we need.
class puppet_compiler(
-$version = '0.0.4',
+$version = '0.3.3',
$workdir = '/mnt/jenkins-workspace/puppet-compiler',
$libdir = '/var/lib/catalog-differ',
$ensure = 'present',
@@ -125,4 +125,13 @@
owner => $user,
require => File['/etc/puppet/puppetdb.conf']
}
+
+# periodic script to populate puppetdb. Run at 4 AM every sunday.
+cron { 'Populate puppetdb':
+command => "/usr/local/bin/puppetdb-populate --basedir ${libdir} >
${homedir}/puppetdb-populate.log 2>&1",
+user=> $user,
+hour=> 4,
+minute => 0,
+weekday => 0,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/370995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ffeea1e9534a4ae2ef0bdae62095b9424f420ea
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...puppet-compiler[master]: Fix call to compile_cmd_env
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370994 ) Change subject: Fix call to compile_cmd_env .. Fix call to compile_cmd_env Change-Id: I9d3cec91717f208c52b860a3de851ffbedd64a65 --- M puppet_compiler/puppet.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet_compiler/puppet.py b/puppet_compiler/puppet.py index a48931f..6cd5614 100644 --- a/puppet_compiler/puppet.py +++ b/puppet_compiler/puppet.py @@ -56,7 +56,7 @@ Specialized function to store data into puppetdb when compiling. """ -cmd, env = compile_cmd_env(hostname, 'prod') +cmd, env = compile_cmd_env(hostname, 'prod', vardir, '--storeconfigs', '--storeconfigs_backend=puppetdb') out = spoolfile() err = spoolfile() success = False -- To view, visit https://gerrit.wikimedia.org/r/370994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d3cec91717f208c52b860a3de851ffbedd64a65 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/puppet-compiler Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-08-10T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370996 ) Change subject: New Wikidata Build - 2017-08-10T10:00:01+ .. New Wikidata Build - 2017-08-10T10:00:01+ Change-Id: I108c9f3f2b2b9dcfdd08af92cce80b7899f6dfc5 --- M composer.lock M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php M extensions/ArticlePlaceholder/includes/SearchHookHandler.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php M extensions/Constraints/i18n/ar.json M extensions/Constraints/i18n/ko.json M extensions/Constraints/i18n/lv.json M extensions/Constraints/i18n/nl.json M extensions/Constraints/i18n/sr-ec.json M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php M extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php M extensions/Wikibase/.mailmap M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/i18n/he.json M extensions/Wikibase/client/i18n/kab.json M extensions/Wikibase/client/i18n/ml.json M extensions/Wikibase/client/i18n/nb.json M extensions/Wikibase/client/i18n/nl.json M extensions/Wikibase/client/i18n/th.json M extensions/Wikibase/client/i18n/tr.json M extensions/Wikibase/client/i18n/tt-cyrl.json M extensions/Wikibase/client/includes/Changes/InjectRCRecordsJob.php M extensions/Wikibase/client/includes/Changes/WikiPageUpdater.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua M extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php M extensions/Wikibase/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php M extensions/Wikibase/client/tests/phpunit/includes/Changes/WikiPageUpdaterTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementsParserFunctionIntegrationTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaEntityBindingsTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php M extensions/Wikibase/data-access/src/DispatchingServiceFactory.php M extensions/Wikibase/data-access/src/RepositoryServiceContainer.php M extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php M extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php M extensions/Wikibase/lib/WikibaseLib.php A extensions/Wikibase/lib/i18n/kab.json M extensions/Wikibase/lib/includes/Changes/ChangeRow.php M extensions/Wikibase/lib/includes/Changes/EntityChange.php M extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php M extensions/Wikibase/lib/includes/Store/BufferingTermLookup.php M extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php M extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php M extensions/Wikibase/lib/includes/Store/EntityRevision.php M extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php M extensions/Wikibase/lib/includes/Store/EntityStore.php M extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php M extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php M extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php M extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php M extensions/Wikibase/lib/includes/WikibaseSettings.php M extensions/Wikibase/lib/tests/phpunit/Changes/EntityChangeFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/Changes/EntityChangeTest.php M extensions/Wikibase/lib/tests/phpunit/Changes/TestChanges.php M extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php M extensions/Wikibase/li
[MediaWiki-commits] [Gerrit] operations/puppet[production]: [TEST] Test commit for T172362
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370997 )
Change subject: [TEST] Test commit for T172362
..
[TEST] Test commit for T172362
Change-Id: I58cd6997ef887b411d73d51526a4dd919013c1f0
---
M modules/mediawiki/templates/errorpage.html.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/370997/1
diff --git a/modules/mediawiki/templates/errorpage.html.erb
b/modules/mediawiki/templates/errorpage.html.erb
index 3ec69aa..6f1cf12 100644
--- a/modules/mediawiki/templates/errorpage.html.erb
+++ b/modules/mediawiki/templates/errorpage.html.erb
@@ -24,7 +24,7 @@
a { color: #0645AD; text-decoration: none; }
a:hover { text-decoration: underline; }
code { font-family: sans-serif; }
-.text-muted { color: #777; }
+.text-muted { color: #776; }
<% if @errorpage['logo_link'] && @errorpage['logo_link'] != :undef -%>
--
To view, visit https://gerrit.wikimedia.org/r/370997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58cd6997ef887b411d73d51526a4dd919013c1f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove redundant attributes in ChangeHandler
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370998 )
Change subject: Remove redundant attributes in ChangeHandler
..
Remove redundant attributes in ChangeHandler
Change-Id: I4844c5f8c88dbf1310dd4f7eb585c6c51fc9e537
---
M client/config/WikibaseClient.default.php
M client/config/WikibaseClient.example.php
M client/includes/Changes/ChangeHandler.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M docs/options.wiki
6 files changed, 3 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/98/370998/1
diff --git a/client/config/WikibaseClient.default.php
b/client/config/WikibaseClient.default.php
index 0f233c3..29b8098 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -24,7 +24,6 @@
// but we will need to make sure the caching works good enough
'siteLocalID' => $wgLanguageCode,
'languageLinkSiteGroup' => null,
- 'injectRecentChanges' => true,
'showExternalRecentChanges' => true,
'sendEchoNotification' => false,
'echoIcon' => false,
diff --git a/client/config/WikibaseClient.example.php
b/client/config/WikibaseClient.example.php
index 27469f0..07d4489 100644
--- a/client/config/WikibaseClient.example.php
+++ b/client/config/WikibaseClient.example.php
@@ -20,7 +20,6 @@
// Defaults to $wgDBname.
// $wgWBClientSettings['siteGlobalID'] = "mywiki";
-$wgWBClientSettings['injectRecentChanges'] = true;
$wgWBClientSettings['showExternalRecentChanges'] = true;
// If this wiki also runs the Wikibase repo extension,
diff --git a/client/includes/Changes/ChangeHandler.php
b/client/includes/Changes/ChangeHandler.php
index 58dc2ec..4fc7443 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -50,23 +50,11 @@
private $siteLookup;
/**
-* @var string
-*/
- private $repoId;
-
- /**
-* @var bool
-*/
- private $injectRecentChanges;
-
- /**
* @param AffectedPagesFinder $affectedPagesFinder
* @param TitleFactory $titleFactory
* @param PageUpdater $updater
* @param ChangeRunCoalescer $changeRunCoalescer
* @param SiteLookup $siteLookup
-* @param string $repoId
-* @param bool $injectRecentChanges
*
* @throws InvalidArgumentException
*/
@@ -75,21 +63,14 @@
TitleFactory $titleFactory,
PageUpdater $updater,
ChangeRunCoalescer $changeRunCoalescer,
- SiteLookup $siteLookup,
- $repoId,
- $injectRecentChanges = true
+ SiteLookup $siteLookup
) {
- if ( !is_bool( $injectRecentChanges ) ) {
- throw new InvalidArgumentException(
'$injectRecentChanges must be a bool' );
- }
$this->affectedPagesFinder = $affectedPagesFinder;
$this->titleFactory = $titleFactory;
$this->updater = $updater;
$this->changeRunCoalescer = $changeRunCoalescer;
$this->siteLookup = $siteLookup;
- $this->repoId = $repoId;
- $this->injectRecentChanges = $injectRecentChanges;
}
/**
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 164f09f..8a250dc 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -1199,8 +1199,7 @@
new TitleFactory(),
$pageUpdater,
$changeListTransformer,
- $this->siteLookup,
- $this->settings->getSetting( 'injectRecentChanges' )
+ $this->siteLookup
);
}
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index a3dc146..5857711 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -78,9 +78,7 @@
$titleFactory,
$updater ?: new MockPageUpdater(),
$this->getChangeRunCoalescer(),
- $this->getMock( SiteLookup::class ),
- 'repowiki',
- true
+ $this->getMock( SiteLookup::class )
);
return $handler;
diff --git a/docs/options.wiki b/docs/options.wiki
index f1905ca..fde8d79 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -106,7 +106,6 @@
:;'prefixMapping': A prefix mappi
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::mediawiki::jobrunner/videoscaler: switch to the future...
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368621 ) Change subject: role::mediawiki::jobrunner/videoscaler: switch to the future parser .. role::mediawiki::jobrunner/videoscaler: switch to the future parser Bug: T171704 Change-Id: I9a97878614c6701ec276652139c9fd03f1c526f5 --- M hieradata/role/common/mediawiki/jobrunner.yaml M hieradata/role/common/mediawiki/videoscaler.yaml 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml b/hieradata/role/common/mediawiki/jobrunner.yaml index 5dc69b8..848a024 100644 --- a/hieradata/role/common/mediawiki/jobrunner.yaml +++ b/hieradata/role/common/mediawiki/jobrunner.yaml @@ -17,3 +17,6 @@ size: 30 "namedPools.cirrus-eqiad": size: 30 + +# Use the future parser here +profile::base::environment: "future" diff --git a/hieradata/role/common/mediawiki/videoscaler.yaml b/hieradata/role/common/mediawiki/videoscaler.yaml index 5fbe653..0540117 100644 --- a/hieradata/role/common/mediawiki/videoscaler.yaml +++ b/hieradata/role/common/mediawiki/videoscaler.yaml @@ -12,3 +12,6 @@ connection_timeout_seconds: 86400 thread_count: 15 max_execution_time: 86400 + +# Use the future parser here +profile::base::environment: "future" -- To view, visit https://gerrit.wikimedia.org/r/368621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a97878614c6701ec276652139c9fd03f1c526f5 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Allow searching for visible-only/hidden-only/both on abuselo...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368362 )
Change subject: Allow searching for visible-only/hidden-only/both on abuselog
entries
..
Allow searching for visible-only/hidden-only/both on abuselog entries
Bug: T153065
Change-Id: I44ca86ff8564328ae932ccad9675298b686dc6ab
---
M i18n/en.json
M i18n/qqq.json
M includes/special/SpecialAbuseLog.php
3 files changed, 31 insertions(+), 0 deletions(-)
Approvals:
Matěj Suchánek: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index be06bcf..a967cd3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,6 +47,10 @@
"abusefilter-log-search-filter": "Filter IDs (separate with pipes):",
"abusefilter-log-search-title": "Title:",
"abusefilter-log-search-wiki": "Wiki:",
+ "abusefilter-log-search-entries-label": "Visibility:",
+ "abusefilter-log-search-entries-all": "All entries",
+ "abusefilter-log-search-entries-hidden": "Hidden entries only",
+ "abusefilter-log-search-entries-visible": "Visible entries only",
"abusefilter-log-search-submit": "Search",
"abusefilter-log-entry": "$1: $2 {{GENDER:$8|triggered}} an abuse
filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken:
$5;\nFilter description: $6",
"abusefilter-log-entry-withdiff": "$1: $2 {{GENDER:$8|triggered}} an
abuse filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken:
$5;\nFilter description: $6 ($7)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ed2698b..7769374 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -78,6 +78,10 @@
"abusefilter-log-search-filter": "Field label in abuse filter log
page.",
"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-entries-label": "Label for options allowing to
find entries with specified visibility.",
+ "abusefilter-log-search-entries-all": "Option allowing to find all
entries in abuse log.",
+ "abusefilter-log-search-entries-hidden": "Option allowing to find
hidden entries only in abuse log.",
+ "abusefilter-log-search-entries-visible": "Option allowing to find
visible entries only in abuse log.",
"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* $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}}",
diff --git a/includes/special/SpecialAbuseLog.php
b/includes/special/SpecialAbuseLog.php
index 853424b..61b60c5 100644
--- a/includes/special/SpecialAbuseLog.php
+++ b/includes/special/SpecialAbuseLog.php
@@ -15,6 +15,8 @@
protected $mSearchFilter;
+ protected $mSearchEntries;
+
public function __construct() {
parent::__construct( 'AbuseLog', 'abusefilter-log' );
}
@@ -95,6 +97,8 @@
if ( self::canSeeDetails() ) {
$this->mSearchFilter = $request->getText(
'wpSearchFilter' );
}
+
+ $this->mSearchEntries = $request->getText( 'wpSearchEntries' );
}
function searchForm() {
@@ -130,6 +134,17 @@
'type' => 'text',
'default' => $this->mSearchWiki,
'size' => 45,
+ ];
+ }
+ if ( self::canSeeHidden() ) {
+ $formDescriptor['SearchEntries'] = [
+ 'type' => 'select',
+ 'label-message' =>
'abusefilter-log-search-entries-label',
+ 'options' => [
+ $this->msg(
'abusefilter-log-search-entries-all' )->text() => 0,
+ $this->msg(
'abusefilter-log-search-entries-hidden' )->text() => 1,
+ $this->msg(
'abusefilter-log-search-entries-visible' )->text() => 2,
+ ],
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-08-10T10:00:01+0000
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370996 ) Change subject: New Wikidata Build - 2017-08-10T10:00:01+ .. New Wikidata Build - 2017-08-10T10:00:01+ Change-Id: I108c9f3f2b2b9dcfdd08af92cce80b7899f6dfc5 --- M composer.lock M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php M extensions/ArticlePlaceholder/includes/SearchHookHandler.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php M extensions/Constraints/i18n/ar.json M extensions/Constraints/i18n/ko.json M extensions/Constraints/i18n/lv.json M extensions/Constraints/i18n/nl.json M extensions/Constraints/i18n/sr-ec.json M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php M extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php M extensions/Wikibase/.mailmap M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/i18n/he.json M extensions/Wikibase/client/i18n/kab.json M extensions/Wikibase/client/i18n/ml.json M extensions/Wikibase/client/i18n/nb.json M extensions/Wikibase/client/i18n/nl.json M extensions/Wikibase/client/i18n/th.json M extensions/Wikibase/client/i18n/tr.json M extensions/Wikibase/client/i18n/tt-cyrl.json M extensions/Wikibase/client/includes/Changes/InjectRCRecordsJob.php M extensions/Wikibase/client/includes/Changes/WikiPageUpdater.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php M extensions/Wikibase/client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua M extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeNotificationJobTest.php M extensions/Wikibase/client/tests/phpunit/includes/Changes/InjectRCRecordsJobTest.php M extensions/Wikibase/client/tests/phpunit/includes/Changes/WikiPageUpdaterTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyParserFunctionIntegrationTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementsParserFunctionIntegrationTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaEntityBindingsTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php M extensions/Wikibase/data-access/src/DispatchingServiceFactory.php M extensions/Wikibase/data-access/src/RepositoryServiceContainer.php M extensions/Wikibase/data-access/tests/phpunit/DispatchingServiceFactoryTest.php M extensions/Wikibase/data-access/tests/phpunit/RepositoryServiceContainerTest.php M extensions/Wikibase/lib/WikibaseLib.php A extensions/Wikibase/lib/i18n/kab.json M extensions/Wikibase/lib/includes/Changes/ChangeRow.php M extensions/Wikibase/lib/includes/Changes/EntityChange.php M extensions/Wikibase/lib/includes/Changes/EntityChangeFactory.php M extensions/Wikibase/lib/includes/Store/BufferingTermLookup.php M extensions/Wikibase/lib/includes/Store/CachingEntityRevisionLookup.php M extensions/Wikibase/lib/includes/Store/DispatchingEntityRevisionLookup.php M extensions/Wikibase/lib/includes/Store/EntityRevision.php M extensions/Wikibase/lib/includes/Store/EntityRevisionLookup.php M extensions/Wikibase/lib/includes/Store/EntityStore.php M extensions/Wikibase/lib/includes/Store/EntityStoreWatcher.php M extensions/Wikibase/lib/includes/Store/Sql/PrefetchingWikiPageEntityMetaDataAccessor.php M extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php M extensions/Wikibase/lib/includes/Store/Sql/WikiPageEntityRevisionLookup.php M extensions/Wikibase/lib/includes/WikibaseSettings.php M extensions/Wikibase/lib/tests/phpunit/Changes/EntityChangeFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/Changes/EntityChangeTest.php M extensions/Wikibase/lib/tests/phpunit/Changes/TestChanges.php M extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php M extensions/Wikibas
[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370999 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: I02c9c424e8deb41ef7d727b227b875a086bdfff5
---
M PageAssessments.hooks.php
M PageAssessmentsBody.php
M composer.json
M phpcs.xml
4 files changed, 11 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments
refs/changes/99/370999/1
diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 584d4e8..fae597b 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -24,7 +24,7 @@
/**
* Register the parser function hook
-* @param $parser Parser
+* @param Parser &$parser
*/
public static function onParserFirstCallInit( &$parser ) {
$parser->setFunctionHook( 'assessment',
'PageAssessmentsBody::cacheAssessment' );
@@ -32,7 +32,7 @@
/**
* Update assessment records after talk page is saved
-* @param LinksUpdate $linksUpdate
+* @param LinksUpdate &$linksUpdate
* @param mixed $ticket
*/
public static function onLinksUpdateComplete( &$linksUpdate, $ticket =
null ) {
@@ -77,6 +77,12 @@
/**
* Delete assessment records when page is deleted
+* @param Article &$article
+* @param User &$user
+* @param string $reason
+* @param int $id
+* @param Content $content
+* @param LogEntry $logEntry
*/
public static function onArticleDeleteComplete(
&$article, &$user, $reason, $id, $content = null, $logEntry
diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index de2c05a..e5ae6d8 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -125,7 +125,7 @@
/**
* Get name for the given wikiproject
-* @param integer $projectId The ID of the project
+* @param int $projectId The ID of the project
* @return string|false The name of the project or false if not found
*/
public static function getProjectName( $projectId ) {
@@ -322,7 +322,7 @@
/**
* Function called on parser init
-* @param Parser $parser Parser object
+* @param Parser &$parser Parser object
* @param string $project Wikiproject name
* @param string $class Class of article
* @param string $importance Importance of article
diff --git a/composer.json b/composer.json
index 834ad8e..f175d8d 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude vendor --exclude
node_modules",
"phpcs -p -s"
],
"fix": [
diff --git a/phpcs.xml b/phpcs.xml
index c4e2dec..30d35e8 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,9 +2,6 @@
-
-
-
--
To view, visit https://gerrit.wikimedia.org/r/370999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02c9c424e8deb41ef7d727b227b875a086bdfff5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
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] mediawiki...PageTriage[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371000 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: Ieb4d82d3562ea459a3b1b7a100634a7437f276b4
---
M PageTriage.hooks.php
M SpecialNewPagesFeed.php
M api/ApiPageTriageList.php
M api/ApiPageTriageTemplate.php
M composer.json
M includes/ArticleMetadata.php
M includes/Notifications/PageTriageAddDeletionTagPresentationModel.php
M includes/Notifications/PageTriageAddMaintenanceTagPresentationModel.php
M includes/Notifications/PageTriageMarkAsReviewedPresentationModel.php
M includes/Notifications/PageTriagePresentationModel.php
M includes/PageTriage.php
M includes/PageTriageExternalDeletionTagsOptions.php
M includes/PageTriageExternalTagsOptions.php
M includes/PageTriageUtil.php
M phpcs.xml
M tools/importNewPages.php
16 files changed, 153 insertions(+), 150 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/00/371000/1
diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 71a495a..9cdecdd 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -7,9 +7,9 @@
* main(article) namespace
*
* @see
http://www.mediawiki.org/wiki/Manual:Hooks/SpecialMovepageAfterMove
-* @param $movePage MovePageForm object
-* @param $oldTitle Title old title object
-* @param $newTitle Title new title object
+* @param MovePageForm $movePage MovePageForm object
+* @param Title &$oldTitle old title object
+* @param Title &$newTitle new title object
* @return bool
*/
public static function onSpecialMovepageAfterMove( $movePage,
&$oldTitle, &$newTitle ) {
@@ -59,10 +59,10 @@
* Note: Page will be automatically marked as triaged for users with
autopatrol right
*
* @see
http://www.mediawiki.org/wiki/Manual:Hooks/NewRevisionFromEditComplete
-* @param $page WikiPage the WikiPage edited
-* @param $rev Revision|null the new revision
-* @param $baseID int the revision ID this was based on, if any
-* @param $user User the editing user
+* @param WikiPage $page the WikiPage edited
+* @param Revision|null $rev the new revision
+* @param int $baseID the revision ID this was based on, if any
+* @param User $user the editing user
* @return bool
*/
public static function onNewRevisionFromEditComplete( $page, $rev,
$baseID, $user ) {
@@ -90,15 +90,15 @@
* When a new article is created, insert it into the PageTriage Queue
*
* @see http://www.mediawiki.org/wiki/Manual:Hooks/ArticleInsertComplete
-* @param $article WikiPage created
-* @param $user User creating the article
-* @param $content Content New content
-* @param $summary string Edit summary/comment
-* @param $isMinor bool Whether or not the edit was marked as minor
-* @param $isWatch bool (No longer used)
-* @param $section bool (No longer used)
-* @param $flags: Flags passed to Article::doEdit()
-* @param $revision Revision New Revision of the article
+* @param WikiPage $article WikiPage created
+* @param User $user User creating the article
+* @param Content $content New content
+* @param string $summary Edit summary/comment
+* @param bool $isMinor Whether or not the edit was marked as minor
+* @param bool $isWatch (No longer used)
+* @param bool $section (No longer used)
+* @param int $flags Flags passed to Article::doEdit()
+* @param Revision $revision New Revision of the article
* @return bool
*/
public static function onPageContentInsertComplete(
@@ -118,17 +118,17 @@
* Flush user status cache on a successful save.
*
* @see
http://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
-* @param $article WikiPage
-* @param $user
-* @param $content Content
-* @param $summary
-* @param $minoredit
-* @param $watchthis
-* @param $sectionanchor
-* @param $flags
-* @param $revision
-* @param $status
-* @param $baseRevId
+* @param WikiPage $article
+* @param User $user
+* @param Content $content
+* @param string $summary
+* @param bool $minoredit
+* @param bool $watchthis
+* @param string $sectionanchor
+* @param int $flags
+* @param Revision $revision
+* @param Status $status
+* @param int $baseRevId
* @return bool
*/
public static function onPageContentSaveComplete(
@@ -144,7 +144,6 @@
* @param LinksUpdate $linksUpdate
* @return bool
*/
-
public static function
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: VisualEditor: API unittest and fix for deprecated function
ItSpiderman has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371001 )
Change subject: VisualEditor: API unittest and fix for deprecated function
..
VisualEditor: API unittest and fix for deprecated function
Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
ERM: #6639
---
M VisualEditor/includes/api/BSApiVisualEditorTasks.php
A VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
2 files changed, 61 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/01/371001/1
diff --git a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
index 7c1052a..150e0c6 100644
--- a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
+++ b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
@@ -165,7 +165,8 @@
}
if ( $iSection ) {
- $sText = $oArticle->replaceSection( $iSection, $sText );
+ $oSectionContent = ContentHandler::makeContent( $sText,
$oArticle->getTitle() );
+ $sText = $oArticle->replaceSectionAtRev( $iSection,
$oSectionContent )->getNativeData();
}
$oSaveResult = $oArticle->doEditContent(
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
new file mode 100644
index 000..35938f1
--- /dev/null
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -0,0 +1,59 @@
+insertPage( 'Dummy', 'Some random text' );
+ $this->insertPage( 'File:Test' );
+ }
+
+ public function testCheckLinks() {
+ $aData = array(
+ 'Dummy' => true,
+ 'Idontexist' => false,
+ 'Media:Test' => true,
+ 'File:Test' => true
+ );
+
+ $oResponse = $this->executeTask(
+ 'checkLinks',
+ array_keys( $aData )
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $aPayload = $oResponse->payload;
+ $this->assertEquals( array_values( $aData ), $aPayload,
'Response is not as expected' );
+ }
+
+ public function testSaveArticle() {
+ $oTitle = Title::newFromText( 'Dummy' );
+ $iArticleID = $oTitle->getArticleID();
+
+ $oResponse = $this->executeTask(
+ 'saveArticle',
+ [
+ 'articleId' => $iArticleID,
+ 'text' => 'Sample text',
+ 'pageName' => 'Dummy',
+ 'summary' => 'API test change',
+ 'editsection' => false
+ ]
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $oWikiPage = WikiPage::factory( $oTitle );
+ $sText = $oWikiPage->getText();
+ $this->assertEquals( 'Sample text', $sText );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/371001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Poem[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371002 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: I1c877b5a985d13b8a4ee04a9583833652337b31e
---
M Poem.class.php
M phpcs.xml
2 files changed, 3 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Poem
refs/changes/02/371002/1
diff --git a/Poem.class.php b/Poem.class.php
index f554fe5..b366c97 100644
--- a/Poem.class.php
+++ b/Poem.class.php
@@ -6,7 +6,7 @@
class Poem {
/**
* Bind the renderPoem function to the tag
-* @param Parser $parser
+* @param Parser &$parser
* @return bool true
*/
public static function init( &$parser ) {
@@ -19,7 +19,7 @@
* @param string $in The text inside the poem tag
* @param array $param
* @param Parser $parser
-* @param boolean $frame
+* @param bool $frame
* @return string
*/
public static function renderPoem( $in, $param = [], $parser = null,
$frame = false ) {
diff --git a/phpcs.xml b/phpcs.xml
index 3011e19..d1b5f11 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,12 +2,8 @@
-
-
.
-
- vendor
- node_modules
+
--
To view, visit https://gerrit.wikimedia.org/r/371002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c877b5a985d13b8a4ee04a9583833652337b31e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Poem
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] mediawiki...Popups[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371003 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: Ic78a889eb7374731a282312c9eadb701483ae298
---
M composer.json
M includes/UserPreferencesChangeHandler.php
M phpcs.xml
3 files changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/03/371003/1
diff --git a/composer.json b/composer.json
index 55507be..91c6304 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude vendor --exclude
node_modules",
"phpcs -p -s"
],
"fix": [
diff --git a/includes/UserPreferencesChangeHandler.php
b/includes/UserPreferencesChangeHandler.php
index ccd3770..ee80b48 100644
--- a/includes/UserPreferencesChangeHandler.php
+++ b/includes/UserPreferencesChangeHandler.php
@@ -74,7 +74,7 @@
* @param array $formData Form data submitted by user
* @param PreferencesForm $form A preferences form
* @param User $user Logged-in user
-* @param boolean &$result Variable defining is form save successful
+* @param bool &$result Variable defining is form save successful
* @param array $oldUserOptions Old user options array
*/
public static function onPreferencesFormPreSave(
diff --git a/phpcs.xml b/phpcs.xml
index 7255308..1a3c9e9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,17 +1,15 @@
-
-
+
.
-
- vendor
+
-
-
+
+
--
To view, visit https://gerrit.wikimedia.org/r/371003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic78a889eb7374731a282312c9eadb701483ae298
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
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] mediawiki...SecurePoll[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371004 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: Ifc9967f1e0470a86e56f9d883ed13c0e55125bf3
---
M composer.json
M includes/main/Context.php
M includes/main/Store.php
M includes/pages/ListPage.php
M includes/user/Auth.php
M phpcs.xml
6 files changed, 25 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/04/371004/1
diff --git a/composer.json b/composer.json
index bf202bf..fd295f4 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
"scripts": {
"fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude vendor --exclude
node_modules",
"phpcs -p -s"
]
}
diff --git a/includes/main/Context.php b/includes/main/Context.php
index 1bd6f08..ac14d06 100644
--- a/includes/main/Context.php
+++ b/includes/main/Context.php
@@ -248,7 +248,7 @@
/**
* Get a database object, or throw an exception if the current store
object
* does not support database operations.
-* @param integer $index DB_MASTER or DB_REPLICA
+* @param int $index DB_MASTER or DB_REPLICA
* @return DatabaseBase
*/
function getDB( $index = DB_MASTER ) {
diff --git a/includes/main/Store.php b/includes/main/Store.php
index 8f851cf..4934f47 100644
--- a/includes/main/Store.php
+++ b/includes/main/Store.php
@@ -35,8 +35,8 @@
/**
* Get the type of one or more SecurePoll entities.
-* @param $ids Int
-* @return String
+* @param int $id
+* @return string
*/
function getEntityType( $id );
@@ -60,7 +60,7 @@
/**
* Get a database connection object.
-* @param integer $index DB_MASTER or DB_REPLICA
+* @param int $index DB_MASTER or DB_REPLICA
*/
function getDB( $index = DB_MASTER );
diff --git a/includes/pages/ListPage.php b/includes/pages/ListPage.php
index 710670a..d3cbddc 100644
--- a/includes/pages/ListPage.php
+++ b/includes/pages/ListPage.php
@@ -10,7 +10,7 @@
/**
* Execute the subpage.
-* @param $params array Array of subpage parameters.
+* @param array $params Array of subpage parameters.
*/
public function execute( $params ) {
$out = $this->specialPage->getOutput();
@@ -132,9 +132,9 @@
/**
* The strike/unstrike backend.
-* @param $action string strike or unstrike
-* @param $voteId integer The vote ID
-* @param $reason string The reason
+* @param string $action strike or unstrike
+* @param int $voteId The vote ID
+* @param string $reason The reason
*/
public function strike( $action, $voteId, $reason ) {
$dbw = $this->context->getDB();
diff --git a/includes/user/Auth.php b/includes/user/Auth.php
index 92ea666..d9a5b53 100644
--- a/includes/user/Auth.php
+++ b/includes/user/Auth.php
@@ -19,6 +19,7 @@
* Create an auth object of the given type
* @param SecurePoll_Context $context
* @param string $type
+* @return SecurePoll_LocalAuth|SecurePoll_RemoteMWAuth
* @throws MWException
*/
static function factory( $context, $type ) {
@@ -49,7 +50,7 @@
/**
* Create a voter transparently, without user interaction.
* Sessions authorized against local accounts are created this way.
-* @param $election SecurePoll_Election
+* @param SecurePoll_Election $election
* @return Status
*/
function autoLogin( $election ) {
@@ -58,7 +59,7 @@
/**
* Create a voter on a direct request from a remote site.
-* @param $election SecurePoll_Election
+* @param SecurePoll_Election $election
* @return Status
*/
function requestLogin( $election ) {
@@ -68,7 +69,7 @@
/**
* Get the voter associated with the current session. Returns false if
* there is no session.
-* @param $election SecurePoll_Election
+* @param SecurePoll_Election $election
* @return SecurePoll_Election
*/
function getVoterFromSession( $election ) {
@@ -105,7 +106,7 @@
* Get a voter object with the relevant parameters.
* If no voter exists with those parameters, a new one is created. If
one
* does exist already, it is returned.
-* @param $params array
+* @param array $params
* @return SecurePoll_Voter
*/
function getVoter( $params ) {
@@ -138,7 +139,7 @@
/**
* Create a voter without user interaction,
[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371005 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: I8e656d2fdf324e768cd173e73f92a63bbc41ef39
---
M TitleBlacklist.hooks.php
M TitleBlacklist.list.php
M api/ApiQueryTitleBlacklist.php
M phpcs.xml
4 files changed, 56 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist
refs/changes/05/371005/1
diff --git a/TitleBlacklist.hooks.php b/TitleBlacklist.hooks.php
index 3648d5b..6e1b75c 100644
--- a/TitleBlacklist.hooks.php
+++ b/TitleBlacklist.hooks.php
@@ -37,10 +37,10 @@
/**
* getUserPermissionsErrorsExpensive hook
*
-* @param $title Title
-* @param $user User
-* @param $action
-* @param $result
+* @param Title $title
+* @param User $user
+* @param string $action
+* @param array &$result
* @return bool
*/
public static function userCan( $title, $user, $action, &$result ) {
@@ -90,8 +90,9 @@
* because they have tboverride.
*
* @param Title $title
-* @param integer $oldid
+* @param int $oldid
* @param array &$notices
+* @return true
*/
public static function displayBlacklistOverrideNotice( Title $title,
$oldid, array &$notices ) {
if ( !RequestContext::getMain()->getUser()->isAllowed(
'tboverride' ) ) {
@@ -123,7 +124,7 @@
* @param Title $oldTitle
* @param Title $newTitle
* @param User $user
-* @param $reason
+* @param string $reason
* @param Status $status
* @return bool
*/
@@ -155,6 +156,11 @@
* Used by abortNewAccount and centralAuthAutoCreate.
* May also be called externally to vet alternate account names.
*
+* @param string $userName
+* @param User $permissionsUser
+* @param string &$err
+* @param bool $override
+* @param bool $log
* @return bool Acceptable
*/
public static function acceptNewUserName(
@@ -215,7 +221,7 @@
*
* @param User $user
* @param string &$message
-* @param Status $status
+* @param Status &$status
* @return bool
*/
public static function abortNewAccount( $user, &$message, &$status ) {
@@ -247,7 +253,11 @@
/**
* EditFilter hook
*
-* @param $editor EditPage
+* @param EditPage $editor
+* @param string $text
+* @param string $section
+* @param string &$error
+* @return true
*/
public static function validateBlacklist( $editor, $text, $section,
&$error ) {
$title = $editor->mTitle;
@@ -279,7 +289,14 @@
/**
* PageContentSaveComplete hook
*
-* @param Article $article
+* @param Article &$article
+* @param User &$user
+* @param Content $content
+* @param string $summary
+* @param bool $isminor
+* @param bool $iswatch
+* @param string $section
+* @return true
*/
public static function clearBlacklist( &$article, &$user,
$content, $summary, $isminor, $iswatch, $section
@@ -291,7 +308,11 @@
return true;
}
- /** UserCreateForm hook based on the one from AntiSpoof extension */
+ /**
+* UserCreateForm hook based on the one from AntiSpoof extension
+* @param UsercreateTemplate &$template
+* @return true
+*/
public static function addOverrideCheckbox( &$template ) {
global $wgRequest, $wgUser;
@@ -304,8 +325,8 @@
}
/**
-* @param ApiBase $module
-* @param array $params
+* @param ApiBase &$module
+* @param array &$params
* @return bool
*/
public static function onAPIGetAllowedParams( ApiBase &$module, array
&$params ) {
@@ -367,7 +388,7 @@
* External Lua library for Scribunto
*
* @param string $engine
-* @param array $extraLibraries
+* @param array &$extraLibraries
* @return bool
*/
public static function scribuntoExternalLibraries( $engine, array
&$extraLibraries ) {
diff --git a/TitleBlacklist.list.php b/TitleBlacklist.list.php
index b7b29ae..57f526d 100644
--- a/TitleBlacklist.list.php
+++ b/TitleBlacklist.list.php
@@ -153,7 +153,8 @@
/**
* Parse blacklist from a string
*
-* @param $list string Text of a blacklist source
+* @param string $list Text of a blacklist source
+* @param string $sourceName
* @return array of TitleBlacklistEntry entries
*/
public static func
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371006 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: I4cb9f1739ada66ddb368a1bb94d7d4f11462d0c0
---
M api/ApiQueryMessageGroups.php
M messagegroups/WikiPageMessageGroup.php
M phpcs.xml
M tag/TranslatablePage.php
M ttmserver/Interfaces.php
M utils/TranslationHelpers.php
6 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/06/371006/1
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 3305ae9..7ec0da1 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -203,7 +203,7 @@
* Get the workflow states applicable to the given message group
*
* @param MessageGroup $group
-* @return boolean|array Associative array with states as key and
localized state
+* @return bool|array Associative array with states as key and
localized state
* labels as values
*/
protected function getWorkflowStates( MessageGroup $group ) {
diff --git a/messagegroups/WikiPageMessageGroup.php
b/messagegroups/WikiPageMessageGroup.php
index a991989..230cd7c 100644
--- a/messagegroups/WikiPageMessageGroup.php
+++ b/messagegroups/WikiPageMessageGroup.php
@@ -108,7 +108,7 @@
*
* @param string $key Message key
* @param string $code Language code
-* @param integer $flags READ_* class constant bitfield
+* @param int $flags READ_* class constant bitfield
* @return string|null Stored translation or null.
*/
public function getMessage( $key, $code, $flags = self::READ_LATEST ) {
diff --git a/phpcs.xml b/phpcs.xml
index 673182e..366a58c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index bfbb914..44f643b 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -87,7 +87,7 @@
* behavior will happen.
*
* @param Title $title
-* @param integer $revision Revision number
+* @param int $revision Revision number
* @throws MWException
* @return TranslatablePage
*/
@@ -159,7 +159,7 @@
/**
* Revision is null if object was constructed using newFromText.
-* @return null or integer
+* @return null|int
*/
public function getRevision() {
return $this->revision;
@@ -167,7 +167,7 @@
/**
* Manually set a revision number to use loading page text.
-* @param integer $revision
+* @param int $revision
*/
public function setRevision( $revision ) {
$this->revision = $revision;
@@ -510,7 +510,7 @@
/**
* Adds a tag which indicates that this page is
* suitable for translation.
-* @param integer $revision
+* @param int $revision
* @param null|string $value
*/
public function addMarkedTag( $revision, $value = null ) {
@@ -520,7 +520,7 @@
/**
* Adds a tag which indicates that this page source is
* ready for marking for translation.
-* @param integer $revision
+* @param int $revision
*/
public function addReadyTag( $revision ) {
$this->addTag( 'tp:tag', $revision );
@@ -559,7 +559,7 @@
/**
* Returns the latest revision which has marked tag, if any.
-* @return integer|bool false
+* @return int|bool false
*/
public function getMarkedTag() {
return $this->getTag( 'tp:mark' );
diff --git a/ttmserver/Interfaces.php b/ttmserver/Interfaces.php
index cda9ee1..64e1906 100644
--- a/ttmserver/Interfaces.php
+++ b/ttmserver/Interfaces.php
@@ -113,7 +113,7 @@
* a frozen service may lead to errors or unexpected behaviors.
*
* @since 2017.04
-* @return boolean true if the service is frozen
+* @return bool true if the service is frozen
*/
public function isFrozen();
}
diff --git a/utils/TranslationHelpers.php b/utils/TranslationHelpers.php
index 04bca1a..0650b10 100644
--- a/utils/TranslationHelpers.php
+++ b/utils/TranslationHelpers.php
@@ -82,7 +82,7 @@
/**
* Sets the HTML id of the text area that contains the translation.
-* @param $id String
+* @param String $id
*/
public function setTextareaId( $id ) {
$this->textareaId = $id;
@@ -90,7 +90,7 @@
/**
* Enable or disable extra help for editing.
-* @param $mode Boolean
+* @param bool $mode
*/
public function setEditMode( $mode = tr
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: BSPageTemplates: Removed outdated bugfix
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371008 )
Change subject: BSPageTemplates: Removed outdated bugfix
..
BSPageTemplates: Removed outdated bugfix
Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.
See
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file
NEEDS CHERRY-PICK TO REL1_27 AND REL1_23
Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/08/371008/1
diff --git a/PageTemplates/PageTemplates.class.php
b/PageTemplates/PageTemplates.class.php
index f89680d..03c20fc 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -76,7 +76,6 @@
//Hooks
$this->setHook( 'LinkBegin' );
- $this->setHook( 'EditPage::showEditForm:initial',
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
@@ -379,20 +378,6 @@
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
- }
-
- return true;
- }
-
- /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
- function onEditPageShowEditFormInitial( &$oEdit ) {
- if ( RequestContext::getMain()->getRequest()->getVal(
'preload', '' ) ) {
- // TODO MRG (27.09.11 10:28): Put replacement of
noinclude into core
- $oEdit->textbox1 = preg_replace(
'/.*?<\/noinclude>/s', '', $oEdit->textbox1 );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/371008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSPageTemplates: Removed outdated bugfix
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371007 )
Change subject: BSPageTemplates: Removed outdated bugfix
..
BSPageTemplates: Removed outdated bugfix
Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.
See
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file
NEEDS CHERRY-PICK TO REL1_27 AND REL1_23
Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/07/371007/1
diff --git a/PageTemplates/PageTemplates.class.php
b/PageTemplates/PageTemplates.class.php
index b6ce4d4..78228c8 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -56,7 +56,6 @@
//Hooks
$this->setHook( 'LinkBegin' );
- $this->setHook( 'EditPage::showEditForm:initial',
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
@@ -209,20 +208,6 @@
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
- }
-
- return true;
- }
-
- /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
- function onEditPageShowEditFormInitial( &$oEdit ) {
- if ( RequestContext::getMain()->getRequest()->getVal(
'preload', '' ) ) {
- // TODO MRG (27.09.11 10:28): Put replacement of
noinclude into core
- $oEdit->textbox1 = preg_replace(
'/.*?<\/noinclude>/s', '', $oEdit->textbox1 );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/371007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Improve some parameter docs
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371009 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: Id5bd8954790c38084ae6e6e38927dcb30772533b
---
M WikimediaEventsHooks.php
M composer.json
M includes/AuthManagerStatsdHandler.php
M phpcs.xml
M tests/browser/SearchSatisfactionTests.php
5 files changed, 37 insertions(+), 25 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/09/371009/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index ec50dfe..0d8b7e5 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -35,6 +35,8 @@
* special page)
*
* Add a 'loggedIn' key with the value of 1 if the user is logged in
+* @param OutputPage $out
+* @param array &$headerItems
*/
public static function onXAnalyticsHeader( OutputPage $out, array
&$headerItems ) {
$title = $out->getTitle();
@@ -70,6 +72,9 @@
* @param bool $isWatch
* @param string $section
* @param int $flags
+* @param Revision $revision
+* @param Status $status
+* @param int $baseRevId
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
* @see https://meta.wikimedia.org/wiki/Schema:PageContentSaveComplete
*/
@@ -205,11 +210,11 @@
* Handler for UserSaveOptions hook.
* @see http://www.mediawiki.org/wiki/Manual:Hooks/UserSaveOptions
* @param User $user user whose options are being saved
-* @param array $options Options being saved
+* @param array &$options Options being saved
* @return bool true in all cases
*/
- // Modified version of original method from the Echo extension
public static function onUserSaveOptions( $user, &$options ) {
+ // Modified version of original method from the Echo extension
global $wgOut;
// Capture user options saved via Special:Preferences or
ApiOptions
@@ -256,7 +261,8 @@
* @param WikiPage $article The article that was deleted
* @param User $user The user that deleted the article
* @param string $reason The reason that the article was deleted
-* @param integer $id The ID of the article that was deleted
+* @param int $id The ID of the article that was deleted
+* @return true
*/
public static function onArticleDeleteComplete( WikiPage $article, User
$user, $reason, $id ) {
$title = $article->getTitle();
@@ -277,9 +283,9 @@
* @see http://www.mediawiki.org/wiki/Manual:Hooks/ArticleUndelete
* @see https://meta.wikimedia.org/wiki/Schema:PageRestoration
* @param Title $title Title of article restored
-* @param boolean $created whether the revision created the page
(default false)
+* @param bool $created whether the revision created the page (default
false)
* @param string $comment Reason for undeleting the page
-* @param integer $oldPageId The ID of the article that was deleted
+* @param int $oldPageId The ID of the article that was deleted
*/
public static function onArticleUndelete( $title, $created, $comment,
$oldPageId ) {
global $wgUser;
@@ -327,8 +333,8 @@
* @param Title $oldTitle The title of the old article (moved from)
* @param Title $newTitle The title of the new article (moved to)
* @param User $user The user who moved the article
-* @param integer $pageId The page ID of the old article
-* @param integer $redirectId The page ID of the redirect, 0 if a
redirect wasn't
+* @param int $pageId The page ID of the old article
+* @param int $redirectId The page ID of the redirect, 0 if a redirect
wasn't created
* created
* @param string $reason The reason that the title was moved
* @return bool true in all cases
@@ -361,16 +367,17 @@
*
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/PageContentInsertComplete
* @see https://meta.wikimedia.org/wiki/Schema:PageCreation
-* @param WikiPage $wikipage page just created
+* @param WikiPage $wikiPage page just created
* @param User $user user who created the page
* @param Content $content content of new page
* @param string $summary summary given by creating user
* @param bool $isMinor whether the edit is marked as minor (not
actually possible for new
* pages)
-* @param $isWatch not used
-* @param $section not used
+* @param bool $isWatch not used
+* @param string $section not used
* @param int $flags bit flags about page creation
* @param
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSPageTemplates: Removed outdated bugfix
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370485 )
Change subject: BSPageTemplates: Removed outdated bugfix
..
BSPageTemplates: Removed outdated bugfix
Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.
See
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file
NEEDS CHERRY-PICK TO REL1_27 AND REL1_23
Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageTemplates/PageTemplates.class.php
b/PageTemplates/PageTemplates.class.php
index b6ce4d4..78228c8 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -56,7 +56,6 @@
//Hooks
$this->setHook( 'LinkBegin' );
- $this->setHook( 'EditPage::showEditForm:initial',
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
@@ -209,20 +208,6 @@
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
- }
-
- return true;
- }
-
- /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
- function onEditPageShowEditFormInitial( &$oEdit ) {
- if ( RequestContext::getMain()->getRequest()->getVal(
'preload', '' ) ) {
- // TODO MRG (27.09.11 10:28): Put replacement of
noinclude into core
- $oEdit->textbox1 = preg_replace(
'/.*?<\/noinclude>/s', '', $oEdit->textbox1 );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/370485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: BSPageTemplates: Removed outdated bugfix
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371008 )
Change subject: BSPageTemplates: Removed outdated bugfix
..
BSPageTemplates: Removed outdated bugfix
Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.
See
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file
NEEDS CHERRY-PICK TO REL1_27 AND REL1_23
Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageTemplates/PageTemplates.class.php
b/PageTemplates/PageTemplates.class.php
index f89680d..03c20fc 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -76,7 +76,6 @@
//Hooks
$this->setHook( 'LinkBegin' );
- $this->setHook( 'EditPage::showEditForm:initial',
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
@@ -379,20 +378,6 @@
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
- }
-
- return true;
- }
-
- /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
- function onEditPageShowEditFormInitial( &$oEdit ) {
- if ( RequestContext::getMain()->getRequest()->getVal(
'preload', '' ) ) {
- // TODO MRG (27.09.11 10:28): Put replacement of
noinclude into core
- $oEdit->textbox1 = preg_replace(
'/.*?<\/noinclude>/s', '', $oEdit->textbox1 );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/371008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSPageTemplates: Removed outdated bugfix
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371007 )
Change subject: BSPageTemplates: Removed outdated bugfix
..
BSPageTemplates: Removed outdated bugfix
Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.
See
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file
NEEDS CHERRY-PICK TO REL1_27 AND REL1_23
Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageTemplates/PageTemplates.class.php
b/PageTemplates/PageTemplates.class.php
index b6ce4d4..78228c8 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -56,7 +56,6 @@
//Hooks
$this->setHook( 'LinkBegin' );
- $this->setHook( 'EditPage::showEditForm:initial',
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
@@ -209,20 +208,6 @@
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
- }
-
- return true;
- }
-
- /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
- function onEditPageShowEditFormInitial( &$oEdit ) {
- if ( RequestContext::getMain()->getRequest()->getVal(
'preload', '' ) ) {
- // TODO MRG (27.09.11 10:28): Put replacement of
noinclude into core
- $oEdit->textbox1 = preg_replace(
'/.*?<\/noinclude>/s', '', $oEdit->textbox1 );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/371007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: WIP: Chore: Add ES5 transpilation for client files
Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371010 )
Change subject: WIP: Chore: Add ES5 transpilation for client files
..
WIP: Chore: Add ES5 transpilation for client files
Using typescript as the compiler, add ts-loader so that webpack
transpiles files to ES5.
* Base tsconfig.json in the root of the project
* Specific client details extending the root config in
src/client/tsconfig.json
TODO:
* Fix linting & formatting.
Change-Id: If76bd06a768e75a82e1d54e45be8177e2decf20b
---
M package-lock.json
M package.json
R src/client/index.ts
A src/client/tsconfig.json
A tsconfig.json
M webpack.config.js
6 files changed, 107 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/10/371010/1
diff --git a/package-lock.json b/package-lock.json
index 2d71c41..da73b19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -550,6 +550,21 @@
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true
},
+"color-convert": {
+ "version": "1.9.0",
+ "resolved":
"https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";,
+ "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+ "dev": true,
+ "requires": {
+"color-name": "1.1.3"
+ }
+},
+"color-name": {
+ "version": "1.1.3",
+ "resolved":
"https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";,
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+},
"comment-parser": {
"version": "0.4.0",
"resolved":
"https://registry.npmjs.org/comment-parser/-/comment-parser-0.4.0.tgz";,
@@ -5011,6 +5026,49 @@
"integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
"dev": true
},
+"ts-loader": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.3.2.tgz";,
+ "integrity":
"sha512-KcQvWwla5nviCMX1511iKVsLfrx97Hbah6l5awE1HNL6eiyAzb3gSO8b5yasB6fK/qGukLpu9czWcd/AGGFy/g==",
+ "dev": true,
+ "requires": {
+"chalk": "2.1.0",
+"enhanced-resolve": "3.4.1",
+"loader-utils": "1.1.0",
+"semver": "5.4.1"
+ },
+ "dependencies": {
+"ansi-styles": {
+ "version": "3.2.0",
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";,
+ "integrity":
"sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "dev": true,
+ "requires": {
+"color-convert": "1.9.0"
+ }
+},
+"chalk": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";,
+ "integrity":
"sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+ "dev": true,
+ "requires": {
+"ansi-styles": "3.2.0",
+"escape-string-regexp": "1.0.5",
+"supports-color": "4.2.1"
+ }
+},
+"supports-color": {
+ "version": "4.2.1",
+ "resolved":
"https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";,
+ "integrity":
"sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+ "dev": true,
+ "requires": {
+"has-flag": "2.0.0"
+ }
+}
+ }
+},
"tty-browserify": {
"version": "0.0.0",
"resolved":
"https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";,
@@ -5047,6 +5105,12 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true
},
+"typescript": {
+ "version": "2.4.2",
+ "resolved":
"https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz";,
+ "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+ "dev": true
+},
"uglify-js": {
"version": "2.8.29",
"resolved":
"https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";,
diff --git a/package.json b/package.json
index 9faa5b5..b8eb578 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,8 @@
"npm-run-all": "^4.0.2",
"prettier": "^1.5.3",
"sinon": "^3.0.0",
+"ts-loader": "^2.3.2",
+"typescript": "^2.4.2",
"webpack": "^3.4.1"
}
}
diff --git a/src/client/index.js b/src/client/index.ts
similarity index 100%
rename from src/client/index.js
rename to src/client/index.ts
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
new file mode 100644
index 000..2820b53
--- /dev/null
+++ b/src/client/tsconfig.json
@@ -0,0 +1,7 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+"target": "ES5",
+"module": "ES2015"
+ }
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000..f67dbd8
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,14 @@
+{
+
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: PageAssignments: Added page link to notifications
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370180 )
Change subject: PageAssignments: Added page link to notifications
..
PageAssignments: Added page link to notifications
Change-Id: Ice27eb665f4a30916e6b1a7346e89901350c4482
---
M PageAssignments/includes/PageAssignmentsNotificationHooks.php
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
index c19523a..621237e 100644
--- a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
+++ b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
@@ -18,7 +18,8 @@
BSNotifications::registerNotificationCategory(
'bs-pageassignments-action-cat' );
$aExtraParams = array(
- 'formatter-class' =>
'PageAssignmentsNotificationFormatter'
+ 'formatter-class' =>
'PageAssignmentsNotificationFormatter',
+ 'primary-link' => array( 'message' =>
'notification-link-text-view-page', 'destination' => 'title' )
);
BSNotifications::registerNotification(
@@ -29,7 +30,8 @@
'notification-bs-pageassignments-assignment-change-add-subject',
array('agent', 'title', 'titlelink'),
'notification-bs-pageassignments-assignment-change-add-body',
- array('agent', 'title', 'titlelink')
+ array('agent', 'title', 'titlelink'),
+ $aExtraParams
);
BSNotifications::registerNotification(
@@ -40,7 +42,8 @@
'notification-bs-pageassignments-assignment-change-remove-subject',
array('agent', 'title', 'titlelink'),
'notification-bs-pageassignments-assignment-change-remove-body',
- array('agent', 'title', 'titlelink')
+ array('agent', 'title', 'titlelink'),
+ $aExtraParams
);
BSNotifications::registerNotification(
--
To view, visit https://gerrit.wikimedia.org/r/370180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice27eb665f4a30916e6b1a7346e89901350c4482
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: PageAssignments: Added page link to notifications
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371011 )
Change subject: PageAssignments: Added page link to notifications
..
PageAssignments: Added page link to notifications
Change-Id: Ice27eb665f4a30916e6b1a7346e89901350c4482
---
M PageAssignments/includes/PageAssignmentsNotificationHooks.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/11/371011/1
diff --git a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
index c19523a..621237e 100644
--- a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
+++ b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
@@ -18,7 +18,8 @@
BSNotifications::registerNotificationCategory(
'bs-pageassignments-action-cat' );
$aExtraParams = array(
- 'formatter-class' =>
'PageAssignmentsNotificationFormatter'
+ 'formatter-class' =>
'PageAssignmentsNotificationFormatter',
+ 'primary-link' => array( 'message' =>
'notification-link-text-view-page', 'destination' => 'title' )
);
BSNotifications::registerNotification(
@@ -29,7 +30,8 @@
'notification-bs-pageassignments-assignment-change-add-subject',
array('agent', 'title', 'titlelink'),
'notification-bs-pageassignments-assignment-change-add-body',
- array('agent', 'title', 'titlelink')
+ array('agent', 'title', 'titlelink'),
+ $aExtraParams
);
BSNotifications::registerNotification(
@@ -40,7 +42,8 @@
'notification-bs-pageassignments-assignment-change-remove-subject',
array('agent', 'title', 'titlelink'),
'notification-bs-pageassignments-assignment-change-remove-body',
- array('agent', 'title', 'titlelink')
+ array('agent', 'title', 'titlelink'),
+ $aExtraParams
);
BSNotifications::registerNotification(
--
To view, visit https://gerrit.wikimedia.org/r/371011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice27eb665f4a30916e6b1a7346e89901350c4482
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: PageAssignments: Added page link to notifications
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371011 )
Change subject: PageAssignments: Added page link to notifications
..
PageAssignments: Added page link to notifications
Change-Id: Ice27eb665f4a30916e6b1a7346e89901350c4482
---
M PageAssignments/includes/PageAssignmentsNotificationHooks.php
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
index c19523a..621237e 100644
--- a/PageAssignments/includes/PageAssignmentsNotificationHooks.php
+++ b/PageAssignments/includes/PageAssignmentsNotificationHooks.php
@@ -18,7 +18,8 @@
BSNotifications::registerNotificationCategory(
'bs-pageassignments-action-cat' );
$aExtraParams = array(
- 'formatter-class' =>
'PageAssignmentsNotificationFormatter'
+ 'formatter-class' =>
'PageAssignmentsNotificationFormatter',
+ 'primary-link' => array( 'message' =>
'notification-link-text-view-page', 'destination' => 'title' )
);
BSNotifications::registerNotification(
@@ -29,7 +30,8 @@
'notification-bs-pageassignments-assignment-change-add-subject',
array('agent', 'title', 'titlelink'),
'notification-bs-pageassignments-assignment-change-add-body',
- array('agent', 'title', 'titlelink')
+ array('agent', 'title', 'titlelink'),
+ $aExtraParams
);
BSNotifications::registerNotification(
@@ -40,7 +42,8 @@
'notification-bs-pageassignments-assignment-change-remove-subject',
array('agent', 'title', 'titlelink'),
'notification-bs-pageassignments-assignment-change-remove-body',
- array('agent', 'title', 'titlelink')
+ array('agent', 'title', 'titlelink'),
+ $aExtraParams
);
BSNotifications::registerNotification(
--
To view, visit https://gerrit.wikimedia.org/r/371011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice27eb665f4a30916e6b1a7346e89901350c4482
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: WIP: DONOTMERGE: Compile server side code
Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371012 )
Change subject: WIP: DONOTMERGE: Compile server side code
..
WIP: DONOTMERGE: Compile server side code
Using typescript and as much of the config of the client code shared in
the root tsconfig.json
TODO:
* Install node.js typings
* Fix compiler errors
* Migrate node tests to TS
* Review npm scripts structure/organization
* Review src/{server,client} + test/ structure and where do they compile
to.
* REMOVE ||true in npm scripts to pass precommit while WIP
Change-Id: Ia489def195b6aa8f7279f692d2fb2e2c9351dbd4
---
M package.json
R src/server/index.ts
R src/server/templates/page.ts
A src/server/tsconfig.json
4 files changed, 18 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/12/371012/1
diff --git a/package.json b/package.json
index b8eb578..4aba743 100644
--- a/package.json
+++ b/package.json
@@ -3,16 +3,20 @@
"version": "0.0.0",
"description": "An API driven skin for MediaWiki",
"scripts": {
-"start": "run-p -sn dev:\\*",
-"dev:client": "NODE_ENV=development webpack -w",
-"dev:server": "NODE_ENV=development nodemon -w dist/client -w src/server/
src/server/index.js",
-"prod:build": "NODE_ENV=production webpack -p",
+"start": "NODE_ENV=development run-p -sn dev:\\*",
+"dev:client": "webpack -w",
+"dev:server": "run-p -sn dev:server:\\*",
+"dev:server:build": "npm run -s server:build -- -w",
+"dev:server:watch": "nodemon -w dist/ dist/server/index.js",
+"server:build": "tsc -p src/server/tsconfig.json",
+"client:build": "webpack -p",
+"prod:build": "NODE_ENV=production run-s server:build client:build",
"format": "npm run lint -s -- --fix",
"format:all": "npm run format -s -- '{src,test}/**/*.js'",
"lint": "eslint --cache --max-warnings 0",
"lint:all": "npm run lint -s -- '{src,test}/**/*.js'",
-"pretest": "npm run lint:all -s",
-"test": "mocha '{src,test}/**/*.test.js'",
+"pretest": "run-s -s lint:all server:build || true",
+"test": "mocha '{dist/server,test}/**/*.test.js' || true",
"test:watch": "nodemon -w src -w test -x 'npm test'",
"precommit": "npm run test -s"
},
diff --git a/src/server/index.js b/src/server/index.ts
similarity index 100%
rename from src/server/index.js
rename to src/server/index.ts
diff --git a/src/server/templates/page.js b/src/server/templates/page.ts
similarity index 100%
rename from src/server/templates/page.js
rename to src/server/templates/page.ts
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
new file mode 100644
index 000..122f217
--- /dev/null
+++ b/src/server/tsconfig.json
@@ -0,0 +1,8 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+"target": "ES2015",
+"module": "commonjs",
+"outDir": "../../dist/server"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/371012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia489def195b6aa8f7279f692d2fb2e2c9351dbd4
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Jhernandez
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: VisualEditor: API unittest and fix for deprecated function
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371013 )
Change subject: VisualEditor: API unittest and fix for deprecated function
..
VisualEditor: API unittest and fix for deprecated function
Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
ERM: #6639
---
M VisualEditor/includes/api/BSApiVisualEditorTasks.php
A VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
2 files changed, 61 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/13/371013/1
diff --git a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
index 7c1052a..150e0c6 100644
--- a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
+++ b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
@@ -165,7 +165,8 @@
}
if ( $iSection ) {
- $sText = $oArticle->replaceSection( $iSection, $sText );
+ $oSectionContent = ContentHandler::makeContent( $sText,
$oArticle->getTitle() );
+ $sText = $oArticle->replaceSectionAtRev( $iSection,
$oSectionContent )->getNativeData();
}
$oSaveResult = $oArticle->doEditContent(
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
new file mode 100644
index 000..35938f1
--- /dev/null
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -0,0 +1,59 @@
+insertPage( 'Dummy', 'Some random text' );
+ $this->insertPage( 'File:Test' );
+ }
+
+ public function testCheckLinks() {
+ $aData = array(
+ 'Dummy' => true,
+ 'Idontexist' => false,
+ 'Media:Test' => true,
+ 'File:Test' => true
+ );
+
+ $oResponse = $this->executeTask(
+ 'checkLinks',
+ array_keys( $aData )
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $aPayload = $oResponse->payload;
+ $this->assertEquals( array_values( $aData ), $aPayload,
'Response is not as expected' );
+ }
+
+ public function testSaveArticle() {
+ $oTitle = Title::newFromText( 'Dummy' );
+ $iArticleID = $oTitle->getArticleID();
+
+ $oResponse = $this->executeTask(
+ 'saveArticle',
+ [
+ 'articleId' => $iArticleID,
+ 'text' => 'Sample text',
+ 'pageName' => 'Dummy',
+ 'summary' => 'API test change',
+ 'editsection' => false
+ ]
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $oWikiPage = WikiPage::factory( $oTitle );
+ $sText = $oWikiPage->getText();
+ $this->assertEquals( 'Sample text', $sText );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/371013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: VisualEditor: API unittest and fix for deprecated function
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371001 )
Change subject: VisualEditor: API unittest and fix for deprecated function
..
VisualEditor: API unittest and fix for deprecated function
Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
ERM: #6639
---
M VisualEditor/includes/api/BSApiVisualEditorTasks.php
A VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
2 files changed, 61 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
index 7c1052a..150e0c6 100644
--- a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
+++ b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
@@ -165,7 +165,8 @@
}
if ( $iSection ) {
- $sText = $oArticle->replaceSection( $iSection, $sText );
+ $oSectionContent = ContentHandler::makeContent( $sText,
$oArticle->getTitle() );
+ $sText = $oArticle->replaceSectionAtRev( $iSection,
$oSectionContent )->getNativeData();
}
$oSaveResult = $oArticle->doEditContent(
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
new file mode 100644
index 000..35938f1
--- /dev/null
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -0,0 +1,59 @@
+insertPage( 'Dummy', 'Some random text' );
+ $this->insertPage( 'File:Test' );
+ }
+
+ public function testCheckLinks() {
+ $aData = array(
+ 'Dummy' => true,
+ 'Idontexist' => false,
+ 'Media:Test' => true,
+ 'File:Test' => true
+ );
+
+ $oResponse = $this->executeTask(
+ 'checkLinks',
+ array_keys( $aData )
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $aPayload = $oResponse->payload;
+ $this->assertEquals( array_values( $aData ), $aPayload,
'Response is not as expected' );
+ }
+
+ public function testSaveArticle() {
+ $oTitle = Title::newFromText( 'Dummy' );
+ $iArticleID = $oTitle->getArticleID();
+
+ $oResponse = $this->executeTask(
+ 'saveArticle',
+ [
+ 'articleId' => $iArticleID,
+ 'text' => 'Sample text',
+ 'pageName' => 'Dummy',
+ 'summary' => 'API test change',
+ 'editsection' => false
+ ]
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $oWikiPage = WikiPage::factory( $oTitle );
+ $sText = $oWikiPage->getText();
+ $this->assertEquals( 'Sample text', $sText );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/371001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: VisualEditor: API unittest and fix for deprecated function
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371013 )
Change subject: VisualEditor: API unittest and fix for deprecated function
..
VisualEditor: API unittest and fix for deprecated function
Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
ERM: #6639
---
M VisualEditor/includes/api/BSApiVisualEditorTasks.php
A VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
2 files changed, 61 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
index 7c1052a..150e0c6 100644
--- a/VisualEditor/includes/api/BSApiVisualEditorTasks.php
+++ b/VisualEditor/includes/api/BSApiVisualEditorTasks.php
@@ -165,7 +165,8 @@
}
if ( $iSection ) {
- $sText = $oArticle->replaceSection( $iSection, $sText );
+ $oSectionContent = ContentHandler::makeContent( $sText,
$oArticle->getTitle() );
+ $sText = $oArticle->replaceSectionAtRev( $iSection,
$oSectionContent )->getNativeData();
}
$oSaveResult = $oArticle->doEditContent(
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
new file mode 100644
index 000..35938f1
--- /dev/null
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -0,0 +1,59 @@
+insertPage( 'Dummy', 'Some random text' );
+ $this->insertPage( 'File:Test' );
+ }
+
+ public function testCheckLinks() {
+ $aData = array(
+ 'Dummy' => true,
+ 'Idontexist' => false,
+ 'Media:Test' => true,
+ 'File:Test' => true
+ );
+
+ $oResponse = $this->executeTask(
+ 'checkLinks',
+ array_keys( $aData )
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $aPayload = $oResponse->payload;
+ $this->assertEquals( array_values( $aData ), $aPayload,
'Response is not as expected' );
+ }
+
+ public function testSaveArticle() {
+ $oTitle = Title::newFromText( 'Dummy' );
+ $iArticleID = $oTitle->getArticleID();
+
+ $oResponse = $this->executeTask(
+ 'saveArticle',
+ [
+ 'articleId' => $iArticleID,
+ 'text' => 'Sample text',
+ 'pageName' => 'Dummy',
+ 'summary' => 'API test change',
+ 'editsection' => false
+ ]
+ );
+
+ $this->assertTrue( $oResponse->success, 'checkLinks task
failed' );
+ $oWikiPage = WikiPage::factory( $oTitle );
+ $sText = $oWikiPage->getText();
+ $this->assertEquals( 'Sample text', $sText );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/371013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I547af55ccfad8a6e01fa596cbfdd34f703eed784
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Improve some parameter docs
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371003 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: Ic78a889eb7374731a282312c9eadb701483ae298
---
M composer.json
M includes/UserPreferencesChangeHandler.php
M phpcs.xml
3 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Phuedx: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 55507be..91c6304 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude vendor --exclude
node_modules",
"phpcs -p -s"
],
"fix": [
diff --git a/includes/UserPreferencesChangeHandler.php
b/includes/UserPreferencesChangeHandler.php
index ccd3770..ee80b48 100644
--- a/includes/UserPreferencesChangeHandler.php
+++ b/includes/UserPreferencesChangeHandler.php
@@ -74,7 +74,7 @@
* @param array $formData Form data submitted by user
* @param PreferencesForm $form A preferences form
* @param User $user Logged-in user
-* @param boolean &$result Variable defining is form save successful
+* @param bool &$result Variable defining is form save successful
* @param array $oldUserOptions Old user options array
*/
public static function onPreferencesFormPreSave(
diff --git a/phpcs.xml b/phpcs.xml
index 7255308..1a3c9e9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,17 +1,15 @@
-
-
+
.
-
- vendor
+
-
-
+
+
--
To view, visit https://gerrit.wikimedia.org/r/371003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic78a889eb7374731a282312c9eadb701483ae298
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: Pmiazga
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role:eventubus: set deploy-service as scap deploy_user
Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371014 )
Change subject: role:eventubus: set deploy-service as scap deploy_user
..
role:eventubus: set deploy-service as scap deploy_user
Bug: T171506
Change-Id: I02f18ef4c506f02ec28d26bd32a0ec8c1dbf48e8
---
M modules/eventlogging/manifests/deployment/target.pp
M modules/role/manifests/eventbus/eventbus.pp
M modules/role/manifests/eventlogging/analytics/server.pp
3 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/371014/1
diff --git a/modules/eventlogging/manifests/deployment/target.pp
b/modules/eventlogging/manifests/deployment/target.pp
index 4c9fc38..831735e 100644
--- a/modules/eventlogging/manifests/deployment/target.pp
+++ b/modules/eventlogging/manifests/deployment/target.pp
@@ -18,6 +18,9 @@
# Array of extra sudo rules to pass to scap::target.
# Default: undef
#
+# [*deploy_user*]
+# The scap deploy-user.
+#
# == Usage
#
# # Deploy eventlogging/eventbus here, and allow
@@ -36,13 +39,14 @@
$package_name = "eventlogging/${title}",
$service_name = undef,
$sudo_rules = undef,
+deploy_user,
) {
# Install eventlogging dependencies from .deb packages.
include ::eventlogging::dependencies
scap::target { "eventlogging/${title}":
package_name => $package_name,
-deploy_user => 'eventlogging',
+deploy_user => $deploy_user,
service_name => $service_name,
sudo_rules => $sudo_rules,
manage_user => false,
diff --git a/modules/role/manifests/eventbus/eventbus.pp
b/modules/role/manifests/eventbus/eventbus.pp
index 9433b4e..459b8bb 100644
--- a/modules/role/manifests/eventbus/eventbus.pp
+++ b/modules/role/manifests/eventbus/eventbus.pp
@@ -26,6 +26,7 @@
# via scap/scap.cfg on the deployment host.
eventlogging::deployment::target { 'eventbus':
service_name=> 'eventlogging-service-eventbus',
+deploy_user => 'deploy-service',
}
# Include eventlogging server configuration, including
diff --git a/modules/role/manifests/eventlogging/analytics/server.pp
b/modules/role/manifests/eventlogging/analytics/server.pp
index dffe570..a404c6c 100644
--- a/modules/role/manifests/eventlogging/analytics/server.pp
+++ b/modules/role/manifests/eventlogging/analytics/server.pp
@@ -8,7 +8,10 @@
# EventLogging for analytics processing is deployed
# as the eventlogging/analytics scap target.
-eventlogging::deployment::target { 'analytics': }
+eventlogging::deployment::target { 'analytics':
+deploy_user => 'eventLogging',
+}
+
class { 'eventlogging::server':
eventlogging_path => '/srv/deployment/eventlogging/analytics'
}
--
To view, visit https://gerrit.wikimedia.org/r/371014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02f18ef4c506f02ec28d26bd32a0ec8c1dbf48e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Switch elastic1017-1031 to niofs
Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370834 )
Change subject: Switch elastic1017-1031 to niofs
..
Switch elastic1017-1031 to niofs
By default elasticsearch uses an mmap file store implementation
for 64 bit linux hosts. This works on most of our servers, but after
the upgrade from elasticsearch 2 to elasticsearch 5 these servers
have seen drastically increased IO load, and the linux kernel reports
only about half of the available disk caching memory is actually being
mmap'd into the process. On a single test machine a switch to niofs
dramatically decreased IO and appears to have let the servers access
the full disk caching memory.
Bug: T169498
Change-Id: I8ea4689356f738932567ee27b5f4e7f5b4759491
---
M hieradata/regex.yaml
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch_5.yml.erb
M modules/profile/manifests/elasticsearch.pp
4 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index dbaa90d..bb995c2 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -38,6 +38,10 @@
profile::elasticsearch::rack: D5
profile::elasticsearch::row: D
+es_eqiad_niofs:
+__regex: !ruby/regexp /^elastic10(1\d|2\d|30|31)\.eqiad\.wmnet$/
+profile::elasticsearch::index_store: niofs
+
es_eqiad_rack_a3:
__regex: !ruby/regexp
/^(elastic10(30|31|32|33|34|35)|relforge1001)\.eqiad\.wmnet$/
profile::elasticsearch::rack: A3
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index fef01ae..4f82e84 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -80,6 +80,10 @@
#and port are used. Defaults to undef, which means no remote reindex
can occur.
# - $script_max_compilations_per_minute: integer, max number of script
#compilations per minute, defaults to undef (see T171579).
+# - $index_store: Sets the storage implementation elasticsearch will use to
+#access index data. Defaults to fs which lets elasticsearch decide.
+#This should almost always be fs unless there is a specific issue to
+#be solved.
#
# == Sample usage:
#
@@ -120,6 +124,7 @@
$curator_uses_unicast_hosts = true,
$reindex_remote_whitelist = undef,
$script_max_compilations_per_minute = undef,
+$index_store = 'fs',
) {
# Check arguments
diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
index 196931d..b4a2d59 100644
--- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
@@ -135,6 +135,7 @@
# Use the Index Status API () to inspect
# the index status.
+index.store.type: <%= @index_store %>
Paths
diff --git a/modules/profile/manifests/elasticsearch.pp
b/modules/profile/manifests/elasticsearch.pp
index b84f3f9..24115fd 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -29,6 +29,7 @@
$recover_after_nodes =
hiera('profile::elasticsearch::recover_after_nodes', 1),
$search_shard_count_limit =
hiera('profile::elasticsearch::search_shard_count_limit'),
$reindex_remote_whitelist =
hiera('profile::elasticsearch::reindex_remote_whitelist'),
+$index_store = hiera('profile::elasticsearch::index_store', 'fs'),
) {
$master_eligible = $::fqdn in $unicast_hosts
@@ -100,6 +101,7 @@
search_shard_count_limit => $search_shard_count_limit,
reindex_remote_whitelist => $reindex_remote_whitelist,
script_max_compilations_per_minute => 1,
+index_store=> $index_store,
}
class { '::elasticsearch::https':
--
To view, visit https://gerrit.wikimedia.org/r/370834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ea4689356f738932567ee27b5f4e7f5b4759491
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: db2045.yaml: Update socket location
Marostegui has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370958 ) Change subject: db2045.yaml: Update socket location .. db2045.yaml: Update socket location Given that db2045 is depooled, taking the opportunity to update its socket location Bug: T148507 Change-Id: Ib652c1546970bc2f41a54d3a3bb0af2c0eccf6d3 --- M hieradata/hosts/db2045.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/db2045.yaml b/hieradata/hosts/db2045.yaml index 987af0e..0d8bce2 100644 --- a/hieradata/hosts/db2045.yaml +++ b/hieradata/hosts/db2045.yaml @@ -1,2 +1 @@ mariadb::shard: 's5' -mariadb::socket: '/tmp/mysql.sock' -- To view, visit https://gerrit.wikimedia.org/r/370958 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib652c1546970bc2f41a54d3a3bb0af2c0eccf6d3 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable NewUserMessage on knwiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370815 ) Change subject: Enable NewUserMessage on knwiki .. Enable NewUserMessage on knwiki Bug: T172894 Change-Id: I481aaee745a1c280745540f420d3dbe603c950b1 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fab2d9d..196652b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12658,6 +12658,7 @@ 'hifwiki' => true, // T99824 'incubatorwiki' => true, 'kkwiki' => true, // T149563 + 'knwiki' => true, // T172894 'kowiki' => true, 'ladwiki' => true, // T32221 'lvwiki' => true, @@ -12710,6 +12711,7 @@ 'hifwiki' => true, // T99824 'incubatorwiki' => true, 'kkwiki' => true, // T149563 + 'knwiki' => true, // T172894 'lvwiki' => true, 'maiwiki' => true, // T99488 'mlwiki' => true, -- To view, visit https://gerrit.wikimedia.org/r/370815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I481aaee745a1c280745540f420d3dbe603c950b1 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: DraggableElement: Make toggling draggability consistent
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370965 )
Change subject: DraggableElement: Make toggling draggability consistent
..
DraggableElement: Make toggling draggability consistent
* Move some setup code from constructor to #toggleDraggable
* Make the constructor call #toggleDraggable
Bug: T172781
Change-Id: I569bb9b5c072c6928a4379cd5ff64b784d775e12
---
M src/mixins/DraggableElement.js
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/mixins/DraggableElement.js b/src/mixins/DraggableElement.js
index 9e4b92f..47cda32 100644
--- a/src/mixins/DraggableElement.js
+++ b/src/mixins/DraggableElement.js
@@ -21,14 +21,10 @@
this.index = null;
this.$handle = config.$handle || this.$element;
this.wasHandleUsed = null;
- this.draggable = config.draggable === undefined ? true :
!!config.draggable;
// Initialize and events
- this.$element.addClass( 'oo-ui-draggableElement' )
- // We make the entire element draggable, not just the handle,
so that
- // the whole element appears to move. wasHandleUsed prevents
drags from
- // starting outside the handle
- .attr( 'draggable', true )
+ this.$element
+ .addClass( 'oo-ui-draggableElement' )
.on( {
mousedown: this.onDragMouseDown.bind( this ),
dragstart: this.onDragStart.bind( this ),
@@ -37,6 +33,7 @@
drop: this.onDrop.bind( this )
} );
this.$handle.addClass( 'oo-ui-draggableElement-handle' );
+ this.toggleDraggable( config.draggable === undefined ? true :
!!config.draggable );
};
OO.initClass( OO.ui.mixin.DraggableElement );
@@ -85,6 +82,11 @@
this.draggable = isDraggable;
this.$handle.toggleClass( 'oo-ui-draggableElement-undraggable',
!this.draggable );
+
+ // We make the entire element draggable, not just the handle,
so that
+ // the whole element appears to move. wasHandleUsed prevents
drags from
+ // starting outside the handle
+ this.$element.prop( 'draggable', this.draggable );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/370965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I569bb9b5c072c6928a4379cd5ff64b784d775e12
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes sure that parser tests works
Tpt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371015 )
Change subject: Makes sure that parser tests works
..
Makes sure that parser tests works
Change-Id: I5cd4a4485b5bf5583a4bc3cb1372c55e9eaf2845
---
M includes/index/IndexContentHandler.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/15/371015/1
diff --git a/includes/index/IndexContentHandler.php
b/includes/index/IndexContentHandler.php
index a7eb709..c9d4979 100644
--- a/includes/index/IndexContentHandler.php
+++ b/includes/index/IndexContentHandler.php
@@ -38,11 +38,9 @@
}
private function buildParser() {
- global $wgParser;
- StubObject::unstub( $wgParser );
- $parser = clone $wgParser;
+ $parser = new Parser();
$parser->startExternalParse(
- null, $this->makeParserOptions( 'canonical' ),
Parser::OT_PLAIN, true
+ null, $this->makeParserOptions( 'canonical' ),
Parser::OT_PLAIN
);
return $parser;
}
--
To view, visit https://gerrit.wikimedia.org/r/371015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cd4a4485b5bf5583a4bc3cb1372c55e9eaf2845
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] mediawiki...CodeReview[master]: Use .length instead of .size() as it's getting removed in jQ...
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371016 )
Change subject: Use .length instead of .size() as it's getting removed in
jQuery 3.0
..
Use .length instead of .size() as it's getting removed in jQuery 3.0
Change-Id: I572d1d93c03abe8bd604ff0c099dfd4558ac8ce6
---
M modules/ext.codereview.overview.js
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview
refs/changes/16/371016/1
diff --git a/modules/ext.codereview.overview.js
b/modules/ext.codereview.overview.js
index 1368835..715cd8c 100644
--- a/modules/ext.codereview.overview.js
+++ b/modules/ext.codereview.overview.js
@@ -12,8 +12,8 @@
"use strict";
// check if we're on a page with a useful list of revisions
- if ( $( '#path' ).size() && $( 'table.TablePager' ).size() ) {
- var portlet = $( '#p-namespaces' ).size() ? 'p-namespaces' :
'p-cactions';
+ if ( $( '#path' ).length && $( 'table.TablePager' ).length ) {
+ var portlet = $( '#p-namespaces' ).length ? 'p-namespaces' :
'p-cactions';
mw.util.addPortletLink(
portlet,
'#',
@@ -25,9 +25,9 @@
$( '#ca-scapmap' ).click( function () {
var $tr = $( 'table.TablePager tr' );
- if ( $tr.size() < 2 ) {
+ if ( $tr.length < 2 ) {
return;
- } else if ( $( '#overviewmap' ).size() ) {
+ } else if ( $( '#overviewmap' ).length ) {
// We've already created it; maybe they just want to
toggle it on and off
$( '#overviewmap' ).slideToggle();
return;
@@ -100,11 +100,11 @@
}
sumtext.sort();
var $summary = $( '' )
- .text( 'Total revisions: ' + ( $tr.size() - 1 ) + '. ['
+ sumtext.join( ', ' ) + ']' );
+ .text( 'Total revisions: ' + ( $tr.length - 1 ) + '. ['
+ sumtext.join( ', ' ) + ']' );
$( '#overviewmap' )
.append( $summary )
- .css( 'max-width', Math.floor( Math.sqrt( $tr.size() )
) * 30 )
+ .css( 'max-width', Math.floor( Math.sqrt( $tr.length )
) * 30 )
.slideDown();
// Add the hover popup
--
To view, visit https://gerrit.wikimedia.org/r/371016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I572d1d93c03abe8bd604ff0c099dfd4558ac8ce6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Use prop instead of removeAttr
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371017 )
Change subject: Use prop instead of removeAttr
..
Use prop instead of removeAttr
Change-Id: Ie272357a6ba7929ca4cfd410640bdc9adea18971
---
M modules/collection.js
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/17/371017/1
diff --git a/modules/collection.js b/modules/collection.js
index f63971e..b36d51a 100644
--- a/modules/collection.js
+++ b/modules/collection.js
@@ -165,30 +165,30 @@
function update_buttons() {
if ( $( '#collectionList .article' ).length === 0 ) {
- $( '#saveButton, #downloadButton, input.order' ).attr(
'disabled', 'disabled' );
+ $( '#saveButton, #downloadButton, input.order' ).prop(
'disabled', true );
return;
} else {
- $( '#downloadButton, input.order' ).removeAttr(
'disabled' );
+ $( '#downloadButton, input.order' ).prop( 'disabled',
false );
}
if ( !$( '#saveButton' ).length ) {
return;
}
if ( !$( '#communityCollTitle' ).length || $(
'#personalCollType:checked' ).val() ) {
- $( '#personalCollTitle' ).removeAttr( 'disabled' );
- $( '#communityCollTitle' ).attr( 'disabled', 'disabled'
);
+ $( '#personalCollTitle' ).prop( 'disabled', false );
+ $( '#communityCollTitle' ).prop( 'disabled', true );
if ( !$.trim( $( '#personalCollTitle' ).val() ) ) {
- $( '#saveButton' ).attr( 'disabled', 'disabled'
);
+ $( '#saveButton' ).prop( 'disabled', true );
return;
}
} else if ( !$( '#personalCollTitle' ).length || $(
'#communityCollType:checked' ).val() ) {
- $( '#communityCollTitle' ).removeAttr( 'disabled' );
- $( '#personalCollTitle' ).attr( 'disabled', 'disabled'
);
+ $( '#communityCollTitle' ).prop( 'disabled', false );
+ $( '#personalCollTitle' ).prop( 'disabled', true );
if ( !$.trim( $( '#communityCollTitle' ).val() ) ) {
- $( '#saveButton' ).attr( 'disabled', 'disabled'
);
+ $( '#saveButton' ).prop( 'disabled', true );
return;
}
}
- $( '#saveButton' ).removeAttr( 'disabled' );
+ $( '#saveButton' ).prop( 'disabled', false );
}
function make_sortable() {
--
To view, visit https://gerrit.wikimedia.org/r/371017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie272357a6ba7929ca4cfd410640bdc9adea18971
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MwEmbedSupport[master]: Use .length instead of .size() as it's getting removed in jQ...
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371018 )
Change subject: Use .length instead of .size() as it's getting removed in
jQuery 3.0
..
Use .length instead of .size() as it's getting removed in jQuery 3.0
Change-Id: Ie2645db7a837e5f08b9b85c09aff9b67ff0c3b63
---
M MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MwEmbedSupport
refs/changes/18/371018/1
diff --git a/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
b/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
index 5b8314a..1821412 100644
--- a/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
+++ b/MwEmbedModules/MwEmbedSupport/jquery.embedMenu/jquery.embedMenu.js
@@ -229,13 +229,13 @@
case 37: // left arrow
if (menuType == 'flyout') {
$(event.target).trigger('mouseout');
- if
($('.'+options.flyOutOnState).size() > 0) {
$('.'+options.flyOutOnState).trigger('mouseover'); };
+ if
($('.'+options.flyOutOnState).length > 0) {
$('.'+options.flyOutOnState).trigger('mouseover'); };
};
if (menuType == 'ipod') {
$(event.target).trigger('mouseout');
- if
($('.fg-menu-footer').find('a').size() > 0) {
$('.fg-menu-footer').find('a').trigger('click'); };
- if
($('.fg-menu-header').find('a').size() > 0) {
$('.fg-menu-current-crumb').prev().find('a').trigger('click'); };
+ if
($('.fg-menu-footer').find('a').length > 0) {
$('.fg-menu-footer').find('a').trigger('click'); };
+ if
($('.fg-menu-header').find('a').length > 0) {
$('.fg-menu-current-crumb').prev().find('a').trigger('click'); };
if
($('.fg-menu-current').prev().is('.fg-menu-indicator')) {
$('.fg-menu-current').prev().trigger('mouseover');
};
@@ -246,7 +246,7 @@
case 38: // up arrow
if ($(event.target).is('.' +
options.linkHover)) {
var prevLink =
$(event.target).parent().prev().find('a:eq(0)');
- if (prevLink.size() > 0) {
+ if (prevLink.length > 0) {
$(event.target).trigger('mouseout');
prevLink.trigger('mouseover');
};
@@ -273,7 +273,7 @@
case 40: // down arrow
if ($(event.target).is('.' +
options.linkHover)) {
var nextLink =
$(event.target).parent().next().find('a:eq(0)');
- if (nextLink.size() > 0) {
+ if (nextLink.length > 0) {
$(event.target).trigger('mouseout');
nextLink.trigger('mouseover');
};
@@ -322,7 +322,7 @@
container.find( 'a' ).attr('tabindex', '-1');
// when there are multiple levels of hierarchy, create flyout
or drilldown menu
- if ( container.find( 'ul' ).size() > 1 ) {
+ if ( container.find( 'ul' ).length > 1 ) {
if ( options.flyOut ) {
mw.log("jquery.embedMenu:: call menu.flyout ");
menu.flyout(container, options);
@@ -531,7 +531,7 @@
// initialize "back" link
if (options.backLink) {
- if (footer.find('a').size() ==
0) {
+ if (footer.find('a').length ==
0) {
footer.show();
$(' Back')
.appendTo(footer)
@@ -547,7 +547,7 @@
}
[MediaWiki-commits] [Gerrit] mediawiki...SVGEdit[master]: Use prop instead of removeAttr
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371019 )
Change subject: Use prop instead of removeAttr
..
Use prop instead of removeAttr
Change-Id: Id9c8c62877477f35a858d742e9e80802e8f15ebf
---
M modules/ext.svgedit.editor.js
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SVGEdit
refs/changes/19/371019/1
diff --git a/modules/ext.svgedit.editor.js b/modules/ext.svgedit.editor.js
index 818dab2..e121f63 100644
--- a/modules/ext.svgedit.editor.js
+++ b/modules/ext.svgedit.editor.js
@@ -116,8 +116,8 @@
};
var spinnerOn = function() {
- $('#mw-svgedit-summary').attr('disabled', 'disabled');
- $('#mw-svgedit-save').attr('disabled', 'disabled');
+ $('#mw-svgedit-summary').prop('disabled', true);
+ $('#mw-svgedit-save').prop('disabled', true);
var offset = frame.offset();
spinner
.css('left', offset.left)
@@ -127,8 +127,8 @@
.show();
};
var spinnerOff = function() {
- $('#mw-svgedit-summary').removeAttr('disabled');
- $('#mw-svgedit-save').removeAttr('disabled');
+ $('#mw-svgedit-summary').prop('disabled', false);
+ $('#mw-svgedit-save').prop('disabled', false);
spinner.hide();
};
--
To view, visit https://gerrit.wikimedia.org/r/371019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9c8c62877477f35a858d742e9e80802e8f15ebf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SVGEdit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Properly show progress bar when searching.
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371020 )
Change subject: Properly show progress bar when searching.
..
Properly show progress bar when searching.
For some reason, the progress bar was no longer getting enabled when
performing a prefix search from our main Search interface.
Change-Id: Idcaf4b22aa4580753637ea68b99c44b93653138f
---
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/20/371020/1
diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
index 53f3ae6..5feefee 100644
--- a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
@@ -236,6 +236,7 @@
private void doTitlePrefixSearch(final String searchTerm) {
cancelSearchTask();
final long startTime = System.nanoTime();
+updateProgressBar(true);
prefixSearchClient.request(app.getWikiSite(), searchTerm, new
PrefixSearchClient.Callback() {
@Override
--
To view, visit https://gerrit.wikimedia.org/r/371020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcaf4b22aa4580753637ea68b99c44b93653138f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::docker::storage: fix guard around vg_to_remove
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371023 )
Change subject: profile::docker::storage: fix guard around vg_to_remove
..
profile::docker::storage: fix guard around vg_to_remove
This way, the test will work with the future parser as well.
Change-Id: I0bf15cdc4ad9bbfef3e6419d51b1d46299016daf
---
M modules/profile/manifests/docker/storage.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/371023/1
diff --git a/modules/profile/manifests/docker/storage.pp
b/modules/profile/manifests/docker/storage.pp
index f253f36..7137073 100644
--- a/modules/profile/manifests/docker/storage.pp
+++ b/modules/profile/manifests/docker/storage.pp
@@ -19,7 +19,7 @@
Class['::profile::docker::storage'] -> Service['docker']
-if $vg_to_remove {
+if ($vg_to_remove and ! empty($vg_to_remove)) {
volume_group { $vg_to_remove:
ensure => absent,
physical_volumes => [],
--
To view, visit https://gerrit.wikimedia.org/r/371023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bf15cdc4ad9bbfef3e6419d51b1d46299016daf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: confd: fix templates for the future parser.
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371022 )
Change subject: confd: fix templates for the future parser.
..
confd: fix templates for the future parser.
Change-Id: I8ee24e8079a221953f33b5ea0f1bbd84d3642781
---
M modules/confd/templates/initscripts/confd.systemd.erb
M modules/confd/templates/initscripts/confd.upstart.erb
2 files changed, 23 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/371022/1
diff --git a/modules/confd/templates/initscripts/confd.systemd.erb
b/modules/confd/templates/initscripts/confd.systemd.erb
index 0ecb310..912a66e 100644
--- a/modules/confd/templates/initscripts/confd.systemd.erb
+++ b/modules/confd/templates/initscripts/confd.systemd.erb
@@ -1,23 +1,27 @@
<%-
-if @interval
- opts = "-interval=#{@interval}"
+if scope['confd::interval']
+ opts = "-interval=#{scope['confd::interval']}"
else
opts = "-watch"
end
if @prefix and !@prefix.empty?
- opts += " -prefix=#{@prefix}"
+ opts += " -prefix=#{scope['confd::prefix']}"
end
+backend = scope['confd::backend']
+node = scope['confd::node']
+srv_dns = scope['confd::srv_dns']
+scheme = scope['confd::scheme']
-%>
[Unit]
Description=confd
[Service]
User=root
-Environment="CONFD_BACKEND=<%= @backend %>"
-<%- if @node -%>
-Environment="CONFD_DISCOVERY=-node <%= @node %>"
+Environment="CONFD_BACKEND=<%= backend %>"
+<%- if node -%>
+Environment="CONFD_DISCOVERY=-node <%= node %>"
<%- else -%>
-Environment="CONFD_DISCOVERY=-srv-domain <%= @srv_dns %> -scheme <%= @scheme
%>"
+Environment="CONFD_DISCOVERY=-srv-domain <%= srv_dns %> -scheme <%= scheme %>"
<%- end -%>
Environment="CONFD_OPTS=<%= opts %>"
ExecStart=/usr/bin/confd -backend $CONFD_BACKEND $CONFD_DISCOVERY $CONFD_OPTS
diff --git a/modules/confd/templates/initscripts/confd.upstart.erb
b/modules/confd/templates/initscripts/confd.upstart.erb
index 867ba8c..e29fbaf 100644
--- a/modules/confd/templates/initscripts/confd.upstart.erb
+++ b/modules/confd/templates/initscripts/confd.upstart.erb
@@ -1,16 +1,23 @@
+<%-
+backend = scope['confd::backend']
+node = scope['confd::node']
+srv_dns = scope['confd::srv_dns']
+scheme = scope['confd::scheme']
+interval = scope['confd::interval']
+-%>
# confd config management daemon
description "Confd config management daemon"
start on (local-filesystem and net-device-up IFACE!=lo)
script
-CONFD_BACKEND="<%= @backend %>"
-<%- if @node -%>
-CONFD_DISCOVERY="-node <%= @node %>"
+CONFD_BACKEND="<%= backend %>"
+<%- if node -%>
+CONFD_DISCOVERY="-node <%= node %>"
<%- else -%>
-CONFD_DISCOVERY="-srv-domain <%= @srv_dns %> -scheme <%= @scheme %>"
+CONFD_DISCOVERY="-srv-domain <%= srv_dns %> -scheme <%= scheme %>"
<%- end -%>
-CONFD_OPTS="<% if @interval %>-interval <%= @interval %><% else %>-watch<%
end %>"
+CONFD_OPTS="<% if interval %>-interval <%= interval %><% else %>-watch<%
end %>"
/usr/bin/confd -backend $CONFD_BACKEND $CONFD_DISCOVERY $CONFD_OPTS
end script
--
To view, visit https://gerrit.wikimedia.org/r/371022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ee24e8079a221953f33b5ea0f1bbd84d3642781
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::mediawiki::memcached: switch to the future parser
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371021 ) Change subject: role::mediawiki::memcached: switch to the future parser .. role::mediawiki::memcached: switch to the future parser Change-Id: Ib1e5b23ff706ff2af76bfa08d116c2cfff9c2752 --- M hieradata/role/common/mediawiki/memcached.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/371021/1 diff --git a/hieradata/role/common/mediawiki/memcached.yaml b/hieradata/role/common/mediawiki/memcached.yaml index 70221d7..0a9c936 100644 --- a/hieradata/role/common/mediawiki/memcached.yaml +++ b/hieradata/role/common/mediawiki/memcached.yaml @@ -22,3 +22,4 @@ profile::memcached::extended_options: - 'slab_reassign' profile::memcached::port: '11211' +profile::base::environment: "future" -- To view, visit https://gerrit.wikimedia.org/r/371021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1e5b23ff706ff2af76bfa08d116c2cfff9c2752 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Use .length instead of .size() as it's getting removed in jQ...
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371024 )
Change subject: Use .length instead of .size() as it's getting removed in
jQuery 3.0
..
Use .length instead of .size() as it's getting removed in jQuery 3.0
Change-Id: I86d0a9414960a190e4eda1e732b2530110287a55
---
M resources/js/ext.translate.quickedit.js
M resources/js/ext.translate.special.languagestats.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/24/371024/1
diff --git a/resources/js/ext.translate.quickedit.js
b/resources/js/ext.translate.quickedit.js
index 3e4f93e..8b7a512 100644
--- a/resources/js/ext.translate.quickedit.js
+++ b/resources/js/ext.translate.quickedit.js
@@ -201,7 +201,7 @@
id = 'jsedit' + page.replace( /[^a-zA-Z0-9_]/g, '_' );
dialogElement = $( '#' + id );
- if ( dialogElement.size() > 0 ) {
+ if ( dialogElement.length > 0 ) {
dialogElement.dialog( 'option', 'position',
'top' );
dialogElement.dialog( 'open' );
return false;
diff --git a/resources/js/ext.translate.special.languagestats.js
b/resources/js/ext.translate.special.languagestats.js
index c01920e..24800d7 100644
--- a/resources/js/ext.translate.special.languagestats.js
+++ b/resources/js/ext.translate.special.languagestats.js
@@ -14,7 +14,7 @@
$metaRows = $( 'tr.AggregateMessageGroup',
$translateTable );
// Quick return
- if ( !$metaRows.size() ) {
+ if ( !$metaRows.length ) {
return;
}
@@ -25,7 +25,7 @@
$children = $( 'tr[data-parentgroup="' +
thisGroupId + '"]', $translateTable );
// Only do the collapse stuff if this Meta-group
actually has children on this page
- if ( !$children.size() ) {
+ if ( !$children.length ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/371024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d0a9414960a190e4eda1e732b2530110287a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes sure that parser tests works
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371015 )
Change subject: Makes sure that parser tests works
..
Makes sure that parser tests works
Change-Id: I5cd4a4485b5bf5583a4bc3cb1372c55e9eaf2845
---
M includes/index/IndexContentHandler.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Tpt: Looks good to me, approved
diff --git a/includes/index/IndexContentHandler.php
b/includes/index/IndexContentHandler.php
index a7eb709..c9d4979 100644
--- a/includes/index/IndexContentHandler.php
+++ b/includes/index/IndexContentHandler.php
@@ -38,11 +38,9 @@
}
private function buildParser() {
- global $wgParser;
- StubObject::unstub( $wgParser );
- $parser = clone $wgParser;
+ $parser = new Parser();
$parser->startExternalParse(
- null, $this->makeParserOptions( 'canonical' ),
Parser::OT_PLAIN, true
+ null, $this->makeParserOptions( 'canonical' ),
Parser::OT_PLAIN
);
return $parser;
}
--
To view, visit https://gerrit.wikimedia.org/r/371015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cd4a4485b5bf5583a4bc3cb1372c55e9eaf2845
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt
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] operations/mediawiki-config[master]: Set $wgArticleCountMethod to 'any' on srwikisource
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370991 ) Change subject: Set $wgArticleCountMethod to 'any' on srwikisource .. Set $wgArticleCountMethod to 'any' on srwikisource Bug: T172974 Change-Id: I577a09db976133f3abed7e5609a19774422964b6 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Luke081515: Looks good to me, but someone else must approve Zfilipin: Looks good to me, approved jenkins-bot: Verified Zoranzoki21: Looks good to me, but someone else must approve diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 196652b..ade2156 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13209,6 +13209,7 @@ 'ptwikibooks' => 'comma', // T29256 'guwikisource' => 'any', // T42173 'plwikisource' => 'any', // T131771 + 'srwikisource' => 'any', // T172974 'wikidatawiki' => 'any', // T144687 'zhwikinews' => 'any', // T53604 ], -- To view, visit https://gerrit.wikimedia.org/r/370991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I577a09db976133f3abed7e5609a19774422964b6 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Luke081515 Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Partially undo I88c70fa
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371025 )
Change subject: Partially undo I88c70fa
..
Partially undo I88c70fa
Moving this into Minerva part
Bug: T145493
Change-Id: I15a47acf26eed87100c6e2de7bad0f930c3da353
---
M resources/mobile.watchstar/watchstar.less
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/25/371025/1
diff --git a/resources/mobile.watchstar/watchstar.less
b/resources/mobile.watchstar/watchstar.less
index 2d4e2d3..c837b7f 100644
--- a/resources/mobile.watchstar/watchstar.less
+++ b/resources/mobile.watchstar/watchstar.less
@@ -2,7 +2,6 @@
.animations {
.watch-this-article {
- cursor: pointer;
.transition-transform( 0.5s );
&.watched {
.transform( rotate( 72deg ) );
--
To view, visit https://gerrit.wikimedia.org/r/371025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15a47acf26eed87100c6e2de7bad0f930c3da353
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use prop instead of removeAttr
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371026 )
Change subject: Use prop instead of removeAttr
..
Use prop instead of removeAttr
Change-Id: I683ec23e12afaade0463c55657b0808c0968a1dd
---
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/26/371026/1
diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index 8b99bd0..6538b6c 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -279,7 +279,7 @@
apiUrl = $( '#wbclient-linkItem-site'
).siteselector( 'getSelectedSite' ).getApi();
} catch ( e ) {
// Invalid input (likely incomplete). Disable
the page input an re-disable to button
- $page.attr( 'disabled', 'disabled' );
+ $page.prop( 'disabled', true );
this.$goButton.button( 'disable' );
return;
}
@@ -288,7 +288,7 @@
// input element. Furthermore, we remove the old
suggestor (if there's one) and create a new
// one working on the right wiki.
$page
- .removeAttr( 'disabled' )
+ .prop( 'disabled', false )
.suggester( {
source: function ( term ) {
var deferred = $.Deferred();
@@ -330,9 +330,9 @@
.attr( {
name: 'wbclient-linkItem-page',
id: 'wbclient-linkItem-page',
- disabled: 'disabled',
'class': 'wbclient-linkItem-input'
} )
+ .prop( 'disabled', true )
.on( 'eachchange', function () {
// Enable the button if the field has a
value
self.$goButton.button( $( this ).val()
=== '' ? 'disable' : 'enable' );
--
To view, visit https://gerrit.wikimedia.org/r/371026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I683ec23e12afaade0463c55657b0808c0968a1dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-codfw.php: Depool db2045"
Hello Florianschmidtwelzow, jenkins-bot, Jcrespo, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/371027 to review the following change. Change subject: Revert "db-codfw.php: Depool db2045" .. Revert "db-codfw.php: Depool db2045" This reverts commit c7f914b4774bc8be54bff78734b3f948f5cf81f8. Change-Id: I2e2e436c8fcc306b68a761fe9215cd31b5485677 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/27/371027/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 4c7b64c..7afee2f 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -133,7 +133,7 @@ 's5' => [ 'db2023' => 0, # B6 2.9TB 96GB, master 'db2038' => 50, # C6 2.9TB 160GB, rc, log - # 'db2045' => 400, # C6 2.9TB 160GB # Fix dup entries T151029 + 'db2045' => 400, # C6 2.9TB 160GB 'db2052' => 50, # D6 2.9TB 160GB, dump (inactive), vslow 'db2059' => 100, # D6 3.3TB 160GB, api 'db2066' => 400, # D6 3.3TB 160GB -- To view, visit https://gerrit.wikimedia.org/r/371027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e2e436c8fcc306b68a761fe9215cd31b5485677 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Make sure that all buttons in the actions area have pointer
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371028 )
Change subject: Make sure that all buttons in the actions area have pointer
..
Make sure that all buttons in the actions area have pointer
Also include a elements here, as a elements without href, as is used
in some places in Minerva, does not have a pointer by default.
Bug: T145493
Change-Id: I08d9176e55ec298c9d423d391b6fb4ed5e9df5e7
---
M resources/skins.minerva.base.styles/pageactions.less
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/28/371028/1
diff --git a/resources/skins.minerva.base.styles/pageactions.less
b/resources/skins.minerva.base.styles/pageactions.less
index bcbf124..f1c304b 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -92,6 +92,10 @@
text-indent: inherit;
outline: 0;
}
+ a,
+ button {
+ cursor: pointer;
+ }
&:first-child {
margin-top: 0;
--
To view, visit https://gerrit.wikimedia.org/r/371028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08d9176e55ec298c9d423d391b6fb4ed5e9df5e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update wikviersity favicon
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371029 ) Change subject: Update wikviersity favicon .. Update wikviersity favicon Bug: T160491 Change-Id: Ie56f77e5a92185853d5666ecd6db69c6f732d0be --- M static/favicon/wikiversity.ico 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/29/371029/1 diff --git a/static/favicon/wikiversity.ico b/static/favicon/wikiversity.ico index 06956f9..e12a0e7 100644 --- a/static/favicon/wikiversity.ico +++ b/static/favicon/wikiversity.ico Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/371029 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie56f77e5a92185853d5666ecd6db69c6f732d0be Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: VisualEditor: API unittest fix for a wrong flag
ItSpiderman has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371030 )
Change subject: VisualEditor: API unittest fix for a wrong flag
..
VisualEditor: API unittest fix for a wrong flag
Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
---
M VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/30/371030/1
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
index 35938f1..d6a3c3e 100644
--- a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -5,7 +5,7 @@
* @group API
* @group Database
* @group BlueSpice
- * @group BlueSpiceReadConfirmation
+ * @group BlueSpiceExtensions
*/
class BSApiVisualEditorTasksTest extends BSApiTasksTestBase {
protected function getModuleName() {
--
To view, visit https://gerrit.wikimedia.org/r/371030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: VisualEditor: API unittest fix for a wrong flag
ItSpiderman has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371031 )
Change subject: VisualEditor: API unittest fix for a wrong flag
..
VisualEditor: API unittest fix for a wrong flag
Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
---
M VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/31/371031/1
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
index 35938f1..d6a3c3e 100644
--- a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -5,7 +5,7 @@
* @group API
* @group Database
* @group BlueSpice
- * @group BlueSpiceReadConfirmation
+ * @group BlueSpiceExtensions
*/
class BSApiVisualEditorTasksTest extends BSApiTasksTestBase {
protected function getModuleName() {
--
To view, visit https://gerrit.wikimedia.org/r/371031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Minor fix for phan 0.8.5
WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371032 )
Change subject: Minor fix for phan 0.8.5
..
Minor fix for phan 0.8.5
Array should be declared before usage.
Bug: T172935
Change-Id: I97d642b4c8c4b6610008b541bece0ad8eb2ff9cb
---
M includes/TwoColConflictPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/32/371032/1
diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 9f84306..c4377ed 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -250,7 +250,7 @@
private function buildHiddenChangesTextbox( $wikiText ) {
$name = 'mw-twocolconflict-hidden-editor';
- $customAttribs['class'] = $name;
+ $customAttribs = [ 'class' => $name ];
if ( $this->wikiEditorIsEnabled() ) {
$customAttribs['class'] .= '
mw-twocolconflict-wikieditor';
}
--
To view, visit https://gerrit.wikimedia.org/r/371032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97d642b4c8c4b6610008b541bece0ad8eb2ff9cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Use .length instead of .size() as it's getting removed in jQ...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371024 )
Change subject: Use .length instead of .size() as it's getting removed in
jQuery 3.0
..
Use .length instead of .size() as it's getting removed in jQuery 3.0
Bug: T169385
Change-Id: I86d0a9414960a190e4eda1e732b2530110287a55
---
M resources/js/ext.translate.quickedit.js
M resources/js/ext.translate.special.languagestats.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/resources/js/ext.translate.quickedit.js
b/resources/js/ext.translate.quickedit.js
index 3e4f93e..8b7a512 100644
--- a/resources/js/ext.translate.quickedit.js
+++ b/resources/js/ext.translate.quickedit.js
@@ -201,7 +201,7 @@
id = 'jsedit' + page.replace( /[^a-zA-Z0-9_]/g, '_' );
dialogElement = $( '#' + id );
- if ( dialogElement.size() > 0 ) {
+ if ( dialogElement.length > 0 ) {
dialogElement.dialog( 'option', 'position',
'top' );
dialogElement.dialog( 'open' );
return false;
diff --git a/resources/js/ext.translate.special.languagestats.js
b/resources/js/ext.translate.special.languagestats.js
index c01920e..24800d7 100644
--- a/resources/js/ext.translate.special.languagestats.js
+++ b/resources/js/ext.translate.special.languagestats.js
@@ -14,7 +14,7 @@
$metaRows = $( 'tr.AggregateMessageGroup',
$translateTable );
// Quick return
- if ( !$metaRows.size() ) {
+ if ( !$metaRows.length ) {
return;
}
@@ -25,7 +25,7 @@
$children = $( 'tr[data-parentgroup="' +
thisGroupId + '"]', $translateTable );
// Only do the collapse stuff if this Meta-group
actually has children on this page
- if ( !$children.size() ) {
+ if ( !$children.length ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/371024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86d0a9414960a190e4eda1e732b2530110287a55
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Krinkle
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] integration/config[master]: Use PHAN 0.8.5
WMDE-leszek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371033 ) Change subject: Use PHAN 0.8.5 .. Use PHAN 0.8.5 Change-Id: I4b73f389549740a259948f9b9290f2ed51db7abd --- M jjb/mediawiki-extensions.yaml M jjb/mediawiki.yaml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/33/371033/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index c9f549b..5a7f2e6 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -394,7 +394,7 @@ - shell: | cd $WORKSPACE/src mkdir -p $WORKSPACE/log -composer require etsy/phan:0.8 --prefer-dist --dev --no-progress --ansi --profile -v # todo don't hardcode version here +composer require etsy/phan:0.8.5 --prefer-dist --dev --no-progress --ansi --profile -v # todo don't hardcode version here PHAN=$WORKSPACE/src/vendor/bin/phan ./tests/phan/bin/phan ./extensions/$EXT_NAME -m checkstyle mv $WORKSPACE/src/extensions/$EXT_NAME/tests/phan/issues/latest $WORKSPACE/log/phan-issues publishers: diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index ae24e87..d234fa8 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -455,7 +455,7 @@ dir: '$WORKSPACE/src' - shell: | cd $WORKSPACE/src -composer require etsy/phan:0.8 --prefer-dist --dev --no-progress --ansi --profile -v # todo don't hardcode version here +composer require etsy/phan:0.8.5 --prefer-dist --dev --no-progress --ansi --profile -v # todo don't hardcode version here PHAN=vendor/bin/phan ./tests/phan/bin/phan -m checkstyle publishers: - castor-save -- To view, visit https://gerrit.wikimedia.org/r/371033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b73f389549740a259948f9b9290f2ed51db7abd Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: WMDE-leszek ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Remove redundant CalendarHint from TimeInput expert
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370835 )
Change subject: Remove redundant CalendarHint from TimeInput expert
..
Remove redundant CalendarHint from TimeInput expert
This code was meant to show the calendar model, along with a button
to switch between Julian and Gregorian. All this is entirely redundant
for a while now, because:
* We are showing the calendar model as a superscript text in the preview.
* The dropdown to manually change the calendar model is not hidden in a
collapsed section any more.
* The link to toggle the calendar model is partially broken anyways (it
only updates the dropdown).
Right now the calendar model is shown 3 (!) times, and there are 2 UI
elements to change it.
This is already approved by Jan (UX).
Bug: T172916
Change-Id: I55a3f09f8ac7bc6329e75ab5d738130c4984b61b
---
M i18n/en.json
M i18n/qqq.json
D src/ExpertExtender/ExpertExtender.CalendarHint.css
D src/ExpertExtender/ExpertExtender.CalendarHint.js
M src/ExpertExtender/resources.php
M src/experts/TimeInput.js
M src/experts/resources.php
D tests/src/ExpertExtender/ExpertExtender.CalendarHint.tests.js
M tests/src/ExpertExtender/resources.php
9 files changed, 2 insertions(+), 358 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 5200c8f..676208b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,10 +17,6 @@
"valueview-expert-timevalue-calendar-julian": "Julian",
"valueview-expert-timeinput-precision": "Precision:",
"valueview-expert-timeinput-calendar": "Calendar:",
- "valueview-expertextender-calendarhint-gregorian": "(Gregorian
calendar)",
- "valueview-expertextender-calendarhint-julian": "(Julian calendar)",
- "valueview-expertextender-calendarhint-switch-gregorian": "→
change to Gregorian",
- "valueview-expertextender-calendarhint-switch-julian": "→ change
to Julian",
"valueview-expertextender-languageselector-languagetemplate": "$1 ($2)",
"valueview-expertextender-languageselector-label": "Language
(mandatory): ",
"valueview-expertextender-unitsuggester-label": "Unit (optional): ",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0d40f13..58ec425 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -17,14 +17,10 @@
"valueview-expert-globecoordinateinput-precision": "Label for the user
interface element used to set a specific precision (e.g. 1, 0.1, 0.001) when
entering a coordinate value.\n{{Identical|Precision}}",
"valueview-expert-globecoordinateinput-nullprecision": "Label
describing the meaning of the coordinate precision \"null\". Usually it means
there was no precision specified when the value was entered, other than the
precision that can be guessed based on the number of fractional digits of the
latitude and longitude values.\n{{Identical|Unspecified}}",
"valueview-expert-globecoordinateinput-customprecision": "Label
wrapping a custom precision the user can not select when entering
coordinates.\n\nParameters\n* $1 - the precision value as a decimal
number\n{{Identical|Special}}",
- "valueview-expert-timevalue-calendar-gregorian": "Label of the
GREGORIAN calendar. The label is used for selecting the GREGORIAN calendar
model when entering a date and is displayed with dates that refer to that
calendar model.\n\nSee also:\n*
{{msg-mw|Valueview-expert-timeinput-calendarhint-gregorian}}\n*
{{msg-mw|Valueview-expert-timeinput-calendarhint-switch-gregorian}}\n{{Identical|Gregorian}}",
- "valueview-expert-timevalue-calendar-julian": "Label of the JULIAN
calendar. The label is used for selecting the JULIAN calendar model when
entering a date and is displayed with dates that refer to that calendar
model.\n\nSee also:\n*
{{msg-mw|Valueview-expert-timeinput-calendarhint-julian}}\n*
{{msg-mw|Valueview-expert-timeinput-calendarhint-switch-julian}}\n{{Identical|Julian}}",
+ "valueview-expert-timevalue-calendar-gregorian": "Label of the
GREGORIAN calendar. The label is used for selecting the GREGORIAN calendar
model when entering a date and is displayed with dates that refer to that
calendar model.\n{{Identical|Gregorian}}",
+ "valueview-expert-timevalue-calendar-julian": "Label of the JULIAN
calendar. The label is used for selecting the JULIAN calendar model when
entering a date and is displayed with dates that refer to that calendar
model.\n{{Identical|Julian}}",
"valueview-expert-timeinput-precision": "Label for the user interface
element used to set a specific precision (e.g. hour, day, month, year) when
entering a time value.\n{{Identical|Precision}}",
"valueview-expert-timeinput-calendar": "Label for the user interface
element used to select a specific calendar (e.g. Gre
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Properly show progress bar when searching.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371020 )
Change subject: Properly show progress bar when searching.
..
Properly show progress bar when searching.
For some reason, the progress bar was no longer getting enabled when
performing a prefix search from our main Search interface.
Change-Id: Idcaf4b22aa4580753637ea68b99c44b93653138f
---
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
index 53f3ae6..5feefee 100644
--- a/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
@@ -236,6 +236,7 @@
private void doTitlePrefixSearch(final String searchTerm) {
cancelSearchTask();
final long startTime = System.nanoTime();
+updateProgressBar(true);
prefixSearchClient.request(app.getWikiSite(), searchTerm, new
PrefixSearchClient.Callback() {
@Override
--
To view, visit https://gerrit.wikimedia.org/r/371020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcaf4b22aa4580753637ea68b99c44b93653138f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Initialize SmashPig context when submitting import
Eileen has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370980 )
Change subject: Initialize SmashPig context when submitting import
..
Initialize SmashPig context when submitting import
FIXME: figure out a better way to make sure it's initialized
whenever we need it, but doesn't litter the log files (and touch
all the files) for every single request.
Bug: T172918
Change-Id: I68bb18df1073cf425dddfe8f57e8412bc0b16c4a
---
M sites/all/modules/offline2civicrm/offline2civicrm.module
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 2a563e5..18ff9fa 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -150,6 +150,7 @@
}
function offline2civicrm_import_checks_form_submit( $form, $form_state ) {
+ wmf_common_create_smashpig_context( 'offline2civicrm' );
if ( !empty( $form_state['values']['import_upload_submit'] ) ) {
try {
$validators = array(
--
To view, visit https://gerrit.wikimedia.org/r/370980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68bb18df1073cf425dddfe8f57e8412bc0b16c4a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: Eileen
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...Wikibase[master]: Remove removed CalendarHint selector
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370843 ) Change subject: Remove removed CalendarHint selector .. Remove removed CalendarHint selector Bug: T172916 Change-Id: Ifca891374c6fa14409ebabd51fab1991c567923d Depends-On: I55a3f09f8ac7bc6329e75ab5d738130c4984b61b --- M tests/browser/features/support/modules/statement_module.rb 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/tests/browser/features/support/modules/statement_module.rb b/tests/browser/features/support/modules/statement_module.rb index 1936474..cd4085e 100644 --- a/tests/browser/features/support/modules/statement_module.rb +++ b/tests/browser/features/support/modules/statement_module.rb @@ -30,7 +30,6 @@ div(:inputextender_preview, css: 'div.ui-inputextender-extension > div.ui-preview > div.ui-preview-value') text_field(:inputextender_input, css: 'div.ui-inputextender-extension > input') text_field(:inputextender_unitsuggester, css: 'div.ui-inputextender-extension > .ui-unitsuggester-input') - span(:time_hint, css: 'div.ui-inputextender-extension > div.valueview-expertextender-calendarhint > span') a(:time_precision, css: 'div.ui-inputextender-extension div.valueview-expert-TimeInput-precision > a.ui-listrotator-curr') a(:time_calendar, css: 'div.ui-inputextender-extension div.valueview-expert-TimeInput-calendar > a.ui-listrotator-curr') a(:geo_precision, css: 'div.ui-inputextender-extension div.valueview-expert-GlobeCoordinateInput-precision > a.ui-listrotator-curr') -- To view, visit https://gerrit.wikimedia.org/r/370843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifca891374c6fa14409ebabd51fab1991c567923d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: thumbor: do not hardcode jessie-backports
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371034 )
Change subject: thumbor: do not hardcode jessie-backports
..
thumbor: do not hardcode jessie-backports
Bug: T170817
Change-Id: Ie9c1d741ac3f079e7544019686f7043942aa7a9b
---
M modules/thumbor/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/371034/1
diff --git a/modules/thumbor/manifests/init.pp
b/modules/thumbor/manifests/init.pp
index 5aee764..ee76e8e 100644
--- a/modules/thumbor/manifests/init.pp
+++ b/modules/thumbor/manifests/init.pp
@@ -34,7 +34,7 @@
package { 'python-thumbor-wikimedia':
ensure => installed,
-install_options => ['-t', 'jessie-backports'],
+install_options => ['-t', "${::lsbdistcodename}-backports"],
}
file { '/usr/local/lib/thumbor/':
--
To view, visit https://gerrit.wikimedia.org/r/371034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9c1d741ac3f079e7544019686f7043942aa7a9b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...wheels[master]: Add new wheels
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371036 ) Change subject: Add new wheels .. Add new wheels Add wheels for new packages introduced for tool account creation and toolinfo management. Bug: T149458 Change-Id: I5c5a94761927004b3ee0de40408f54a4b78a90fe --- A diff_match_patch-20121119-py3-none-any.whl A django_autocomplete_light-3.2.9-py3-none-any.whl A django_reversion-2.0.9-py2.py3-none-any.whl A django_reversion_compare-0.7.5-py2.py3-none-any.whl A setuptools-36.2.7-py2.py3-none-any.whl A sqlparse-0.2.3-py2.py3-none-any.whl 6 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/striker/wheels refs/changes/36/371036/1 diff --git a/diff_match_patch-20121119-py3-none-any.whl b/diff_match_patch-20121119-py3-none-any.whl new file mode 100644 index 000..66856c7 --- /dev/null +++ b/diff_match_patch-20121119-py3-none-any.whl Binary files differ diff --git a/django_autocomplete_light-3.2.9-py3-none-any.whl b/django_autocomplete_light-3.2.9-py3-none-any.whl new file mode 100644 index 000..1e4b81f --- /dev/null +++ b/django_autocomplete_light-3.2.9-py3-none-any.whl Binary files differ diff --git a/django_reversion-2.0.9-py2.py3-none-any.whl b/django_reversion-2.0.9-py2.py3-none-any.whl new file mode 100644 index 000..b51ed6a --- /dev/null +++ b/django_reversion-2.0.9-py2.py3-none-any.whl Binary files differ diff --git a/django_reversion_compare-0.7.5-py2.py3-none-any.whl b/django_reversion_compare-0.7.5-py2.py3-none-any.whl new file mode 100644 index 000..22b6309 --- /dev/null +++ b/django_reversion_compare-0.7.5-py2.py3-none-any.whl Binary files differ diff --git a/setuptools-36.2.7-py2.py3-none-any.whl b/setuptools-36.2.7-py2.py3-none-any.whl new file mode 100644 index 000..d63cdc7 --- /dev/null +++ b/setuptools-36.2.7-py2.py3-none-any.whl Binary files differ diff --git a/sqlparse-0.2.3-py2.py3-none-any.whl b/sqlparse-0.2.3-py2.py3-none-any.whl new file mode 100644 index 000..ad95e59 --- /dev/null +++ b/sqlparse-0.2.3-py2.py3-none-any.whl Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/371036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c5a94761927004b3ee0de40408f54a4b78a90fe Gerrit-PatchSet: 1 Gerrit-Project: labs/striker/wheels Gerrit-Branch: master Gerrit-Owner: BryanDavis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371035 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment cc6df81aa Initialize SmashPig context when submitting import Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/35/371035/1 -- To view, visit https://gerrit.wikimedia.org/r/371035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371035 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment cc6df81aa Initialize SmashPig context when submitting import Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/371035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5cce9e8b921387f5a2c6db38c138a1b5f30a680 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: No longer use color states for edit toolbar buttons.
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371038 )
Change subject: No longer use color states for edit toolbar buttons.
..
No longer use color states for edit toolbar buttons.
This makes it more compatible with lower API versions.
Bug: T172903
Change-Id: Idbf6b7a602f4f0b3d475e9ddb30f10338ce027f2
---
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
1 file changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/38/371038/1
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 9e0edb1..77ee6a9 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -10,7 +10,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
@@ -581,11 +580,8 @@
}
});
-if (editPreviewFragment.isActive()) {
-ViewCompat.setBackgroundTintList(v,
ContextCompat.getColorStateList(this, R.color.color_state_blue));
-} else {
-ViewCompat.setBackgroundTintList(v,
ContextCompat.getColorStateList(this, R.color.color_state_green));
-}
+v.setBackgroundColor(ContextCompat.getColor(this, item.isEnabled()
+? (editPreviewFragment.isActive() ? R.color.accent50 :
R.color.green50) : R.color.base50));
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/371038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbf6b7a602f4f0b3d475e9ddb30f10338ce027f2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Fix "JQMIGRATE: jQuery.fn.unbind() is deprecated" in WikiLove
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371037 )
Change subject: Fix "JQMIGRATE: jQuery.fn.unbind() is deprecated" in WikiLove
..
Fix "JQMIGRATE: jQuery.fn.unbind() is deprecated" in WikiLove
Replaced method in jQuery 3.
Bug: T169387
Change-Id: Ic456700c3e685aa67727f38e5002318da4ade52a
---
M resources/ext.wikiLove.core.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove
refs/changes/37/371037/1
diff --git a/resources/ext.wikiLove.core.js b/resources/ext.wikiLove.core.js
index 1dfa64b..7b1f1b2 100644
--- a/resources/ext.wikiLove.core.js
+++ b/resources/ext.wikiLove.core.js
@@ -835,7 +835,7 @@
} else { // legacy skins
$wikiLoveLink = $( '#topbar a:contains(' + mw.msg(
'wikilove-tab-text' ) + ')' );
}
- $wikiLoveLink.unbind( 'click' );
+ $wikiLoveLink.off( 'click' );
$wikiLoveLink.click( function ( e ) {
e.preventDefault();
$.wikiLove.openDialog();
--
To view, visit https://gerrit.wikimedia.org/r/371037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic456700c3e685aa67727f38e5002318da4ade52a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: VisualEditor: API unittest fix for a wrong flag
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371030 )
Change subject: VisualEditor: API unittest fix for a wrong flag
..
VisualEditor: API unittest fix for a wrong flag
Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
---
M VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
index 35938f1..d6a3c3e 100644
--- a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -5,7 +5,7 @@
* @group API
* @group Database
* @group BlueSpice
- * @group BlueSpiceReadConfirmation
+ * @group BlueSpiceExtensions
*/
class BSApiVisualEditorTasksTest extends BSApiTasksTestBase {
protected function getModuleName() {
--
To view, visit https://gerrit.wikimedia.org/r/371030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Fix "JQMIGRATE: jQuery.fn.unbind() is deprecated" in WikiLove
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371037 )
Change subject: Fix "JQMIGRATE: jQuery.fn.unbind() is deprecated" in WikiLove
..
Fix "JQMIGRATE: jQuery.fn.unbind() is deprecated" in WikiLove
Replaced method in jQuery 3.
Bug: T169387
Change-Id: Ic456700c3e685aa67727f38e5002318da4ade52a
---
M resources/ext.wikiLove.core.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.wikiLove.core.js b/resources/ext.wikiLove.core.js
index 1dfa64b..7b1f1b2 100644
--- a/resources/ext.wikiLove.core.js
+++ b/resources/ext.wikiLove.core.js
@@ -835,7 +835,7 @@
} else { // legacy skins
$wikiLoveLink = $( '#topbar a:contains(' + mw.msg(
'wikilove-tab-text' ) + ')' );
}
- $wikiLoveLink.unbind( 'click' );
+ $wikiLoveLink.off( 'click' );
$wikiLoveLink.click( function ( e ) {
e.preventDefault();
$.wikiLove.openDialog();
--
To view, visit https://gerrit.wikimedia.org/r/371037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic456700c3e685aa67727f38e5002318da4ade52a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Simplify MobileContext::shouldStripResponsiveImages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/317134 )
Change subject: Hygiene: Simplify MobileContext::shouldStripResponsiveImages
..
Hygiene: Simplify MobileContext::shouldStripResponsiveImages
MobileContext#shouldStripResponsiveImages should return false if
MobileContext#shouldDisplayMobileView returns false, which is captured
in MobileFrontend\ResponsiveImages\Hooks#shouldStripResponsiveImages.
Moving this dependency into the definition of
Changes:
* Make the result of MobileContext#shouldStripResponsiveImages depend on
the result of #shouldDisplayMobileView.
* Add unit tests for MobileContext#shouldStripResponsiveImages.
* Add unit tests for MobileFrontendHooks::onThumbnailBeforeProduceHTML.
Change-Id: If114aab998627001ea0390fd4014d7f3ea89eab3
---
M includes/MobileContext.php
M includes/MobileFrontend.hooks.php
M tests/phpunit/MobileContextTest.php
M tests/phpunit/MobileFrontend.hooksTest.php
4 files changed, 135 insertions(+), 30 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 242a1ae..330a39a 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -1159,7 +1159,8 @@
*/
public function shouldStripResponsiveImages() {
if ( $this->stripResponsiveImagesOverride === null ) {
- return $this->getMFConfig()->get(
'MFStripResponsiveImages' );
+ return $this->shouldDisplayMobileView()
+ && $this->getMFConfig()->get(
'MFStripResponsiveImages' );
} else {
return $this->stripResponsiveImagesOverride;
}
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index ab43d74..70eec12 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -367,20 +367,26 @@
}
/**
-* PageRenderingHash hook handler
-* @see https://www.mediawiki.org/wiki/Manual:Hooks/PageRenderingHash
+* Varies the parser cache if responsive images should have their
variants
+* stripped from the parser output, since the transformation happens
during
+* the parse.
*
-* @param string &$confstr Reference to a hash key string which can be
modified
-* @param User $user User object that is requesting the page
-* @param array &$forOptions Array of options used to generate the
$confstr hash key
+* See `$wgMFStripResponsiveImages` and `$wgMFResponsiveImageWhitelist`
for
+* more detail about the stripping of responsive images.
+*
+* See https://www.mediawiki.org/wiki/Manual:Hooks/PageRenderingHash
for more
+* detail about the `PageRenderingHash` hook.
+*
+* @param string &$confstr The parser cache key
+* @param User $user User
+* @param array &$forOptions
+*
+* @param string &$confstr Reference to the parser cache key
+* @param User $user The user that is requesting the page
+* @param array &$forOptions The options used to generate the parser
cache key
*/
public static function onPageRenderingHash( &$confstr, User $user,
&$forOptions ) {
- $context = MobileContext::singleton();
-
- if (
- $context->shouldDisplayMobileView()
- && $context->shouldStripResponsiveImages()
- ) {
+ if ( MobileContext::singleton()->shouldStripResponsiveImages()
) {
$confstr .= '!responsiveimages=0';
}
}
@@ -1132,19 +1138,22 @@
}
/**
-* Omit srcset attributes from thumbnail image tags, to conserve
bandwidth.
+* Removes the responsive image's variants from the parser output if
+* configured to do so and the thumbnail's MIME type isn't whitelisted.
*
-* @param ThumbnailImage $thumbnail
-* @param array &$attribs
-* @param array &$linkAttribs
+* See
https://www.mediawiki.org/wiki/Manual:Hooks/ThumbnailBeforeProduceHTML
+* for more detail about the `ThumbnailBeforeProduceHTML` hook.
+*
+* @param ThumbnailImage $thumbnail The thumbnail
+* @param array &$attribs The attributes of the DOMElement being
contructed
+* to represent the thumbnail
+* @param array &$linkAttribs The attributes of the DOMElement being
+* constructed to represent the link to original file
*/
public static function onThumbnailBeforeProduceHTML( $thumbnail,
&$attribs, &$linkAttribs ) {
$context = MobileContext::singleton();
$config = $context->getMFConfig();
- if (
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: package_builder: add hooks for stretch
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371039 )
Change subject: package_builder: add hooks for stretch
..
package_builder: add hooks for stretch
Change-Id: I30b242902a5a04cc21d0e05aaf49aee3d83b5e44
---
M modules/package_builder/manifests/hooks.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/371039/1
diff --git a/modules/package_builder/manifests/hooks.pp
b/modules/package_builder/manifests/hooks.pp
index c72d6a6..c9c0a65 100644
--- a/modules/package_builder/manifests/hooks.pp
+++ b/modules/package_builder/manifests/hooks.pp
@@ -25,6 +25,13 @@
basepath => $basepath,
}
+package_builder::pbuilder_hook { 'stretch':
+distribution => 'stretch',
+components => 'main backports thirdparty',
+basepath => $basepath,
+}
+
File["${basepath}/hooks"] -> Package_builder::Pbuilder_hook['trusty']
File["${basepath}/hooks"] -> Package_builder::Pbuilder_hook['jessie']
+File["${basepath}/hooks"] -> Package_builder::Pbuilder_hook['stretch']
}
--
To view, visit https://gerrit.wikimedia.org/r/371039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30b242902a5a04cc21d0e05aaf49aee3d83b5e44
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Improve some parameter docs
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371006 )
Change subject: Improve some parameter docs
..
Improve some parameter docs
Change-Id: I4cb9f1739ada66ddb368a1bb94d7d4f11462d0c0
---
M api/ApiQueryMessageGroups.php
M messagegroups/WikiPageMessageGroup.php
M phpcs.xml
M tag/TranslatablePage.php
M ttmserver/Interfaces.php
M utils/TranslationHelpers.php
6 files changed, 21 insertions(+), 21 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 3305ae9..7ec0da1 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -203,7 +203,7 @@
* Get the workflow states applicable to the given message group
*
* @param MessageGroup $group
-* @return boolean|array Associative array with states as key and
localized state
+* @return bool|array Associative array with states as key and
localized state
* labels as values
*/
protected function getWorkflowStates( MessageGroup $group ) {
diff --git a/messagegroups/WikiPageMessageGroup.php
b/messagegroups/WikiPageMessageGroup.php
index a991989..230cd7c 100644
--- a/messagegroups/WikiPageMessageGroup.php
+++ b/messagegroups/WikiPageMessageGroup.php
@@ -108,7 +108,7 @@
*
* @param string $key Message key
* @param string $code Language code
-* @param integer $flags READ_* class constant bitfield
+* @param int $flags READ_* class constant bitfield
* @return string|null Stored translation or null.
*/
public function getMessage( $key, $code, $flags = self::READ_LATEST ) {
diff --git a/phpcs.xml b/phpcs.xml
index 673182e..366a58c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index bfbb914..44f643b 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -87,7 +87,7 @@
* behavior will happen.
*
* @param Title $title
-* @param integer $revision Revision number
+* @param int $revision Revision number
* @throws MWException
* @return TranslatablePage
*/
@@ -159,7 +159,7 @@
/**
* Revision is null if object was constructed using newFromText.
-* @return null or integer
+* @return null|int
*/
public function getRevision() {
return $this->revision;
@@ -167,7 +167,7 @@
/**
* Manually set a revision number to use loading page text.
-* @param integer $revision
+* @param int $revision
*/
public function setRevision( $revision ) {
$this->revision = $revision;
@@ -510,7 +510,7 @@
/**
* Adds a tag which indicates that this page is
* suitable for translation.
-* @param integer $revision
+* @param int $revision
* @param null|string $value
*/
public function addMarkedTag( $revision, $value = null ) {
@@ -520,7 +520,7 @@
/**
* Adds a tag which indicates that this page source is
* ready for marking for translation.
-* @param integer $revision
+* @param int $revision
*/
public function addReadyTag( $revision ) {
$this->addTag( 'tp:tag', $revision );
@@ -559,7 +559,7 @@
/**
* Returns the latest revision which has marked tag, if any.
-* @return integer|bool false
+* @return int|bool false
*/
public function getMarkedTag() {
return $this->getTag( 'tp:mark' );
diff --git a/ttmserver/Interfaces.php b/ttmserver/Interfaces.php
index cda9ee1..64e1906 100644
--- a/ttmserver/Interfaces.php
+++ b/ttmserver/Interfaces.php
@@ -113,7 +113,7 @@
* a frozen service may lead to errors or unexpected behaviors.
*
* @since 2017.04
-* @return boolean true if the service is frozen
+* @return bool true if the service is frozen
*/
public function isFrozen();
}
diff --git a/utils/TranslationHelpers.php b/utils/TranslationHelpers.php
index 04bca1a..0650b10 100644
--- a/utils/TranslationHelpers.php
+++ b/utils/TranslationHelpers.php
@@ -82,7 +82,7 @@
/**
* Sets the HTML id of the text area that contains the translation.
-* @param $id String
+* @param String $id
*/
public function setTextareaId( $id ) {
$this->textareaId = $id;
@@ -90,7 +90,7 @@
/**
* Enable or disable extra help for editing.
-* @param $mode Boolean
+* @param bool $mode
*/
public function setEditMode( $mode = true ) {
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-codfw.php: Depool db2045"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371027 ) Change subject: Revert "db-codfw.php: Depool db2045" .. Revert "db-codfw.php: Depool db2045" This reverts commit c7f914b4774bc8be54bff78734b3f948f5cf81f8. Change-Id: I2e2e436c8fcc306b68a761fe9215cd31b5485677 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 0a14787..027b310 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -133,7 +133,7 @@ 's5' => [ 'db2023' => 0, # B6 2.9TB 96GB, master 'db2038' => 50, # C6 2.9TB 160GB, rc, log - # 'db2045' => 400, # C6 2.9TB 160GB # Fix dup entries T151029 + 'db2045' => 400, # C6 2.9TB 160GB 'db2052' => 50, # D6 2.9TB 160GB, dump (inactive), vslow 'db2059' => 100, # D6 3.3TB 160GB, api 'db2066' => 400, # D6 3.3TB 160GB -- To view, visit https://gerrit.wikimedia.org/r/371027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e2e436c8fcc306b68a761fe9215cd31b5485677 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Fix: observe project root not removable directories
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371040 )
Change subject: Fix: observe project root not removable directories
..
Fix: observe project root not removable directories
It seems that replaced watched directories cannot be observed by
nodemon. The recommended [workaround] is to watch the parent. This patch
changes the files monitored to the package root less ignored files
(.git|node_modules) so that any change has the expected effect.
The output prior to this change was approximately:
$ DEBUG=nodemon,nodemon:\* npm start
...
nodemon start watch on: dist/client +0ms
nodemon start watch on: /home/stephen/dev/wmf/marvin/dist/client +0ms
...
clean-webpack-plugin: /home/stephen/dev/wmf/marvin/dist/client has been
removed.
...
[workaround]: https://github.com/paulmillr/chokidar/issues/555
Change-Id: I5d84a8e65141fe46db9750dcd09ce7c23dfc6600
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/40/371040/1
diff --git a/package.json b/package.json
index 9faa5b5..3542cce 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"scripts": {
"start": "run-p -sn dev:\\*",
"dev:client": "NODE_ENV=development webpack -w",
-"dev:server": "NODE_ENV=development nodemon -w dist/client -w src/server/
src/server/index.js",
+"dev:server": "NODE_ENV=development nodemon src/server/index.js",
"prod:build": "NODE_ENV=production webpack -p",
"format": "npm run lint -s -- --fix",
"format:all": "npm run format -s -- '{src,test}/**/*.js'",
--
To view, visit https://gerrit.wikimedia.org/r/371040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d84a8e65141fe46db9750dcd09ce7c23dfc6600
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add hiwikiversity to labsrecursor
Rush has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369924 ) Change subject: Add hiwikiversity to labsrecursor .. Add hiwikiversity to labsrecursor Bug: T168765 Change-Id: Iad16ad1d4327c672bee480bccef822c13808703e --- M modules/role/manifests/labs/dnsrecursor.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/manifests/labs/dnsrecursor.pp b/modules/role/manifests/labs/dnsrecursor.pp index 441fab2..72c520e 100644 --- a/modules/role/manifests/labs/dnsrecursor.pp +++ b/modules/role/manifests/labs/dnsrecursor.pp @@ -163,7 +163,7 @@ 'hawiktionary', 'hawwiki', 'hewiki', 'hewikibooks', 'hewikinews', 'hewikiquote', 'hewikisource', 'hewikivoyage', 'hewiktionary', 'hifwiki', 'hiwiki', 'hiwikibooks', -'hiwikiquote', 'hiwiktionary', 'howiki', 'hrwiki', +'hiwikiquote', 'hiwiktionary', 'hiwikiversity', 'howiki', 'hrwiki', 'hrwikibooks', 'hrwikiquote', 'hrwikisource', 'hrwiktionary', 'hsbwiki', 'hsbwiktionary', 'htwiki', 'htwikisource', 'huwiki', 'huwikibooks', 'huwikinews', 'huwikiquote', -- To view, visit https://gerrit.wikimedia.org/r/369924 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad16ad1d4327c672bee480bccef822c13808703e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Reedy Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cognate[master]: Minor fix for phan 0.8.5
WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371041 )
Change subject: Minor fix for phan 0.8.5
..
Minor fix for phan 0.8.5
- run should return a bool
- suppress issue for noop stub
Bug: T172935
Change-Id: I5f57e57ad0b6c89991f3cc95bc4068332fb98ffc
---
M src/CognateUpdater.php
M src/LocalJobSubmitJob.php
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cognate
refs/changes/41/371041/1
diff --git a/src/CognateUpdater.php b/src/CognateUpdater.php
index 0ae2246..9c2bd90 100644
--- a/src/CognateUpdater.php
+++ b/src/CognateUpdater.php
@@ -61,6 +61,10 @@
return $updater;
}
+ /**
+* @suppress PhanTypeMissingReturn
+* @return array
+*/
protected function getCoreUpdateList() {
// not used but is abstract and must be implemented
}
diff --git a/src/LocalJobSubmitJob.php b/src/LocalJobSubmitJob.php
index 58f76fa..9bdd942 100644
--- a/src/LocalJobSubmitJob.php
+++ b/src/LocalJobSubmitJob.php
@@ -36,6 +36,8 @@
foreach ( array_unique( $sites ) as $dbName ) {
JobQueueGroup::singleton( $dbName )->push( $job );
}
+
+ return true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/371041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f57e57ad0b6c89991f3cc95bc4068332fb98ffc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cognate
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: package_builder: add hooks for stretch
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371039 )
Change subject: package_builder: add hooks for stretch
..
package_builder: add hooks for stretch
Change-Id: I30b242902a5a04cc21d0e05aaf49aee3d83b5e44
---
M modules/package_builder/manifests/hooks.pp
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/package_builder/manifests/hooks.pp
b/modules/package_builder/manifests/hooks.pp
index c72d6a6..ab1185e 100644
--- a/modules/package_builder/manifests/hooks.pp
+++ b/modules/package_builder/manifests/hooks.pp
@@ -25,6 +25,11 @@
basepath => $basepath,
}
-File["${basepath}/hooks"] -> Package_builder::Pbuilder_hook['trusty']
-File["${basepath}/hooks"] -> Package_builder::Pbuilder_hook['jessie']
+package_builder::pbuilder_hook { 'stretch':
+distribution => 'stretch',
+components => 'main backports thirdparty',
+basepath => $basepath,
+}
+
+File["${basepath}/hooks"] -> Package_builder::Pbuilder_hook <| |>
}
--
To view, visit https://gerrit.wikimedia.org/r/371039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30b242902a5a04cc21d0e05aaf49aee3d83b5e44
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Increase wbsearchentities to 50
Jonas Kress (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371042 )
Change subject: Increase wbsearchentities to 50
..
Increase wbsearchentities to 50
Change-Id: I30d141829e5e926dd32e714cd2e9444c45577f3e
---
M wikibase/queryService/api/Wikibase.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/42/371042/1
diff --git a/wikibase/queryService/api/Wikibase.js
b/wikibase/queryService/api/Wikibase.js
index e727a50..12ddccd 100644
--- a/wikibase/queryService/api/Wikibase.js
+++ b/wikibase/queryService/api/Wikibase.js
@@ -11,6 +11,7 @@
var SEARCH_ENTITES = {
action: 'wbsearchentities',
format: 'json',
+ limit: 50,
continue: 0,
language: LANGUAGE,
uselang: LANGUAGE
--
To view, visit https://gerrit.wikimedia.org/r/371042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30d141829e5e926dd32e714cd2e9444c45577f3e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Pool db2075
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371043 ) Change subject: db-codfw.php: Pool db2075 .. db-codfw.php: Pool db2075 db2075 is now replicating with innodb compressed Bug: T170662 Change-Id: I289ac89669ffdde856bc4579ff436443ddfc140a --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/43/371043/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 027b310..cb00a85 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -137,7 +137,7 @@ 'db2052' => 50, # D6 2.9TB 160GB, dump (inactive), vslow 'db2059' => 100, # D6 3.3TB 160GB, api 'db2066' => 400, # D6 3.3TB 160GB - # 'db2075' => 400, # A1 3.3TB 512GB # Compressing InnoDB + 'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB ], 's6' => [ 'db2028' => 0, # B6 2.9TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/371043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I289ac89669ffdde856bc4579ff436443ddfc140a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Pool db2075
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371043 ) Change subject: db-codfw.php: Pool db2075 .. db-codfw.php: Pool db2075 db2075 is now replicating with innodb compressed Bug: T170662 Change-Id: I289ac89669ffdde856bc4579ff436443ddfc140a --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 027b310..cb00a85 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -137,7 +137,7 @@ 'db2052' => 50, # D6 2.9TB 160GB, dump (inactive), vslow 'db2059' => 100, # D6 3.3TB 160GB, api 'db2066' => 400, # D6 3.3TB 160GB - # 'db2075' => 400, # A1 3.3TB 512GB # Compressing InnoDB + 'db2075' => 400, # A1 3.3TB 512GB # Compressed InnoDB ], 's6' => [ 'db2028' => 0, # B6 2.9TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/371043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I289ac89669ffdde856bc4579ff436443ddfc140a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: add wikitech-grep as utility for adminscripts
Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363896 )
Change subject: openstack: add wikitech-grep as utility for adminscripts
..
openstack: add wikitech-grep as utility for adminscripts
* now with pep8 friendlyness
* very simple utility script we have been using for
rebrand cleanup.
Bug: T169820
Change-Id: I867c7dae8e1ee064deed1276c705048890131c39
---
A modules/openstack/files/utils/wikitech-grep.py
M modules/openstack/manifests/adminscripts.pp
2 files changed, 173 insertions(+), 0 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/files/utils/wikitech-grep.py
b/modules/openstack/files/utils/wikitech-grep.py
new file mode 100644
index 000..43db7ef
--- /dev/null
+++ b/modules/openstack/files/utils/wikitech-grep.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ usage: mwgrep [-h] [--max-results N] [--timeout N] [--user | --module]
+[--title TITLE] regex
+
+ Grep for Lua or CSS and JS code fragments
+on (per default) MediaWiki wiki pages
+
+ positional arguments:
+regexregex to search for
+
+ optional arguments:
+-h, --help show this help message and exit
+--max-results N show at most this many results (default: 100)
+--timeout N abort search after this many seconds (default: 30)
+--user search NS_USER rather than NS_MEDIAWIKI
+--module search NS_MODULE rather than NS_MEDIAWIKI
+--title TITLErestrict search to pages with this title
+
+ mwgrep will grep the MediaWiki namespace across Wikimedia wikis. specify
+ --user to search the user namespace instead. See the lucene documentation
+ for org.apache.lucene.util.automaton.RegExp for supported syntax. The current
+ lucene version is available from `curl search.svc.eqiad.wmnet:9200`.
+
+"""
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
+
+import argparse
+import bisect
+import json
+import urllib
+import urllib2
+
+
+TIMEOUT = 30
+BASE_URI = 'http://search.svc.eqiad.wmnet:9200/_all/page/_search'
+NS_MEDIAWIKI = 8
+NS_USER = 2
+NS_MODULE = 828
+PREFIX_NS = {
+NS_MEDIAWIKI: 'MediaWiki:',
+NS_USER: 'User:',
+NS_MODULE: 'Module:'
+}
+
+ap = argparse.ArgumentParser(
+prog='mwgrep',
+description='Grep for CSS and JS code fragments in MediaWiki wiki pages',
+epilog='mwgrep will grep the MediaWiki namespace across Wikimedia wikis. '
+ 'specify --user to search the user namespace instead.'
+)
+ap.add_argument('term', help='text to search for')
+
+ap.add_argument(
+'--max-results',
+metavar='N',
+type=int, default=1000,
+help='show at most this many results (default: 1000)'
+)
+
+ap.add_argument(
+'--timeout',
+metavar='N',
+type='{0}s'.format,
+default='30',
+help='abort search after this many seconds (default: 30)'
+)
+
+args = ap.parse_args()
+
+filters = [
+{'bool': {
+'must': [
+{'term': {'wiki': 'labswiki'}},
+{'source_regex': {
+'regex': args.term,
+'field': 'source_text',
+'ngram_field': 'source_text.trigram',
+'max_determinized_states': 2,
+'max_expand': 10,
+'case_sensitive': True,
+'locale': 'en',
+'timeout': args.timeout,
+}},
+],
+'must_not': [
+{'term': {'namespace': '2'}}, # User
+{'term': {'namespace': '3'}}, # User talk
+],
+}},
+]
+
+search = {
+'size': args.max_results,
+'_source': ['namespace', 'title', 'namespace_text'],
+'sort': ['_doc'],
+'query': {'bool': {'filter': filters}},
+'stats': ['mwgrep'],
+}
+
+query = {
+'timeout': args.timeout,
+}
+
+matches = {'public': [], 'private': []}
+uri = BASE_URI + '?' + urllib.urlencode(query)
+try:
+req = urllib2.urlopen(uri, json.dumps(search))
+full_result = json.load(req)
+result = full_result['hits']
+
+for hit in result['hits']:
+db_name = hit['_index'].rsplit('_', 2)[0]
+title = hit['_source']['title']
+ns = hit['_source']['namespace_text']
+if ns != '':
+ns = '%s:' % ns
+page_name = '%s%s' % (ns, title)
+bisect.insort(matches['public'], (db_name, page_name))
+
+if matches['public']:
+print('## Public wiki results')
+for db_name, page_name in matches['public']:
+print('{:<20}{}'.format(db_name, page_name))
+
+print('')
+print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))
+if full_result['timed_out']:
+print("""
+The query was unable to complete within the alloted time. Only partial results
+are shown here, and the reported total hits is <= the true value. To speed up
+the query:
+
+* Ensure the regular expression c
[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Minor fix for phan 0.8.5
WMDE-Fisch has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371044 ) Change subject: Minor fix for phan 0.8.5 .. Minor fix for phan 0.8.5 Phan seems to be confused how the parameters should be used here with OOUI in some cases. Suppressed for the time beeing. Bug: T172935 Change-Id: I24bd3c91cc8099b11dd99decf6b96a8fc5ad9ccc --- M src/specials/SpecialElectronPdf.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService refs/changes/44/371044/1 diff --git a/src/specials/SpecialElectronPdf.php b/src/specials/SpecialElectronPdf.php index 193240b..0b94274 100644 --- a/src/specials/SpecialElectronPdf.php +++ b/src/specials/SpecialElectronPdf.php @@ -63,6 +63,7 @@ } /** +* @suppress PhanTypeMismatchArgument * @param Title $title page to download as PDF * @param string $collectionDownloadUrl URL to the download page of the Collection extension */ -- To view, visit https://gerrit.wikimedia.org/r/371044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24bd3c91cc8099b11dd99decf6b96a8fc5ad9ccc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ElectronPdfService Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Correctly update page model state after querying reading lis...
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371045 )
Change subject: Correctly update page model state after querying reading list
DAO.
..
Correctly update page model state after querying reading list DAO.
Bug: T172999
Change-Id: I3c1f99de3934bcf0869926aec2b370414eb10f15
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/45/371045/1
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index eb17502..4b3773c 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -700,6 +700,7 @@
if (!isAdded()) {
return;
}
+model.setReadingListPage(page);
pageActionTabsCallback.updateBookmark(page != null);
}
});
--
To view, visit https://gerrit.wikimedia.org/r/371045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c1f99de3934bcf0869926aec2b370414eb10f15
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Add apihelp messages to pass unit tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370005 )
Change subject: Add apihelp messages to pass unit tests
..
Add apihelp messages to pass unit tests
Change-Id: Ifa83f47ea3ae6cbf2c130faed3d931cb228667dc
---
M i18n/en.json
M i18n/qqq.json
M src/MediaWiki/Api/TriggerUpdate.php
3 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 7da59e9..7cb0431 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,6 +16,9 @@
"apihelp-bs-extendedsearch-stats-description": "Returns statistical
data about the registered backends and their configured sources",
"apihelp-bs-extendedsearch-stats-summary": "Returns statistical data
about the registered backends and their configured sources",
"apihelp-bs-extendedsearch-stats-param-stats": "A list of statistics
that should be returned",
+ "apihelp-bs-extendedsearch-triggerupdate-summary": "Trigger update of
search index",
+ "apihelp-bs-extendedsearch-triggerupdate-param-title": "Title of the
page the update should be triggered",
+ "apihelp-bs-extendedsearch-triggerupdate-param-params": "Additional
parameters for the query",
"apihelp-bs-extendedsearch-generic-param-backend": "Key of the
configured backend that should be queried",
"apihelp-bs-extendedsearch-generic-param-sources" : "One or more
sources within the specified backend separated by pipe. If empty, all available
sources will be queried.",
"bs-extendedsearch-search-input-placeholder": "Find ...",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e4ac36c..4e27a06 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,6 +16,9 @@
"apihelp-bs-extendedsearch-stats-description":
"{{doc-apihelp-description|bs-extendedsearch-stats}}",
"apihelp-bs-extendedsearch-stats-summary":
"{{doc-apihelp-summary|bs-extendedsearch-stats}}",
"apihelp-bs-extendedsearch-stats-param-stats":
"{{doc-apihelp-param|bs-extendedsearch-stats|stats}}",
+ "apihelp-bs-extendedsearch-triggerupdate-summary":
"{{doc-apihelp-summary|bs-extendedsearch-triggerupdate}}",
+ "apihelp-bs-extendedsearch-triggerupdate-param-title":
"{{doc-apihelp-param|bs-extendedsearch-triggerupdate|title}}",
+ "apihelp-bs-extendedsearch-triggerupdate-param-params":
"{{doc-apihelp-param|bs-extendedsearch-triggerupdate|params}}",
"apihelp-bs-extendedsearch-generic-param-backend":
"{{doc-apihelp-param|bs-extendedsearch-query|backend}}",
"apihelp-bs-extendedsearch-generic-param-sources" :
"{{doc-apihelp-param|bs-extendedsearch-query|sources}}",
"bs-extendedsearch-search-input-placeholder": "Placeholder text within
the search input field",
diff --git a/src/MediaWiki/Api/TriggerUpdate.php
b/src/MediaWiki/Api/TriggerUpdate.php
index 9a49f9c..7bfd58d 100644
--- a/src/MediaWiki/Api/TriggerUpdate.php
+++ b/src/MediaWiki/Api/TriggerUpdate.php
@@ -19,12 +19,12 @@
\ApiBase::PARAM_TYPE => 'string',
\ApiBase::PARAM_REQUIRED => false,
\ApiBase::PARAM_DFLT => 'local',
- \ApiBase::PARAM_HELP_MSG =>
'apihelp-bs-extendedsearch-triggerupdate-param-backend',
+ \ApiBase::PARAM_HELP_MSG =>
'apihelp-bs-extendedsearch-generic-param-backend',
],
'source' => [
\ApiBase::PARAM_TYPE => 'string',
\ApiBase::PARAM_REQUIRED => true,
- \ApiBase::PARAM_HELP_MSG =>
'apihelp-bs-extendedsearch-triggerupdate-param-source',
+ \ApiBase::PARAM_HELP_MSG =>
'apihelp-bs-extendedsearch-generic-param-sources',
],
'title' => [
\ApiBase::PARAM_TYPE => 'string',
--
To view, visit https://gerrit.wikimedia.org/r/370005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa83f47ea3ae6cbf2c130faed3d931cb228667dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: VisualEditor: API unittest fix for a wrong flag
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371031 )
Change subject: VisualEditor: API unittest fix for a wrong flag
..
VisualEditor: API unittest fix for a wrong flag
Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
---
M VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
index 35938f1..d6a3c3e 100644
--- a/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
+++ b/VisualEditor/tests/phpunit/BSApiVisualEditorTasksTest.php
@@ -5,7 +5,7 @@
* @group API
* @group Database
* @group BlueSpice
- * @group BlueSpiceReadConfirmation
+ * @group BlueSpiceExtensions
*/
class BSApiVisualEditorTasksTest extends BSApiTasksTestBase {
protected function getModuleName() {
--
To view, visit https://gerrit.wikimedia.org/r/371031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60e477a1634c43d058f479e40a6efe9929520cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: ItSpiderman
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Add apihelp messages to pass unit tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370009 )
Change subject: Add apihelp messages to pass unit tests
..
Add apihelp messages to pass unit tests
Change-Id: I4f5a58642161ad93a95b0ba5ec272a9b3aee1f53
---
M ExtendedSearch/i18n/en.json
M ExtendedSearch/i18n/qqq.json
M PageAccess/i18n/en.json
M PageAccess/i18n/qqq.json
M UsageTracker/i18n/en.json
M UsageTracker/i18n/qqq.json
6 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ExtendedSearch/i18n/en.json b/ExtendedSearch/i18n/en.json
index 565304d..73e7d15 100644
--- a/ExtendedSearch/i18n/en.json
+++ b/ExtendedSearch/i18n/en.json
@@ -95,6 +95,7 @@
"extendedsearchadmin": "Extended search administration",
"bs-extendedsearch-create-page": "Create page \"$1\".",
"apihelp-feedextendedsearch-description": "Search the wiki using the
OpenSearch protocol",
+ "apihelp-feedextendedsearch-summary": "Search the wiki using the
OpenSearch protocol",
"apihelp-feedextendedsearch-param-q": "Search string",
"apihelp-feedextendedsearch-param-feedformat": "Maximum amount of
results to return",
"apihelp-feedextendedsearch-param-user": "Do nothing if
$wgEnableOpenSearchSuggest is false",
diff --git a/ExtendedSearch/i18n/qqq.json b/ExtendedSearch/i18n/qqq.json
index 7643fac..99dd979 100644
--- a/ExtendedSearch/i18n/qqq.json
+++ b/ExtendedSearch/i18n/qqq.json
@@ -105,6 +105,7 @@
"extendedsearchadmin": "Extended search administration",
"bs-extendedsearch-create-page": "Text for create page \"$1\". $1 is
the entered page name\n{{Identical|Create page}}",
"apihelp-feedextendedsearch-description":
"{{doc-apihelp-description|feedextendedsearch}}",
+ "apihelp-feedextendedsearch-summary":
"{{doc-apihelp-summary|feedextendedsearch}}",
"apihelp-feedextendedsearch-param-q":
"{{doc-apihelp-param|feedextendedsearch|q}}",
"apihelp-feedextendedsearch-param-feedformat":
"{{doc-apihelp-param|feedextendedsearch|feedformat}}",
"apihelp-feedextendedsearch-param-user":
"{{doc-apihelp-param|feedextendedsearch|user}}",
diff --git a/PageAccess/i18n/en.json b/PageAccess/i18n/en.json
index 8ba7665..28434fd 100644
--- a/PageAccess/i18n/en.json
+++ b/PageAccess/i18n/en.json
@@ -17,5 +17,6 @@
"logentry-bs-pageaccess-change": "$1 {{GENDER:$2|has changed}} the
access permissions of $3 to \"$4\"",
"action-pageaccess-viewspecialpage":"view the special page
\"{{int:pageaccess}}\"",
"bs-pageaccess-column-title": "Page title",
- "bs-pageaccess-column-groups": "Groups"
+ "bs-pageaccess-column-groups": "Groups",
+ "apihelp-bs-pageaccess-store-summary": "Control access on page level"
}
diff --git a/PageAccess/i18n/qqq.json b/PageAccess/i18n/qqq.json
index 319b2a6..38bffae 100644
--- a/PageAccess/i18n/qqq.json
+++ b/PageAccess/i18n/qqq.json
@@ -21,5 +21,6 @@
"logentry-bs-pageaccess-change": "Log message about changes on the
access settings for a page.\nParameters:\n* $4 - comma separated list of the
allowed groups",
"action-pageaccess-viewspecialpage": "placeholder to describe that view
of special page \"{{int:pageaccess}}\" is restricted for the current
user.\n\n{{Doc-action|pageaccess-viewspecialpage}}",
"bs-pageaccess-column-title": "Extjs grid calumn label for
Pagetitle\n{{Identical|Page title}}",
- "bs-pageaccess-column-groups": "Extjs grid calumn label for
Groups\n{{Identical|Group}}"
+ "bs-pageaccess-column-groups": "Extjs grid calumn label for
Groups\n{{Identical|Group}}",
+ "apihelp-bs-pageaccess-store-summary":
"{{doc-apihelp-summary|bs-pageaccess-store}}"
}
diff --git a/UsageTracker/i18n/en.json b/UsageTracker/i18n/en.json
index d839de7..9f375b1 100644
--- a/UsageTracker/i18n/en.json
+++ b/UsageTracker/i18n/en.json
@@ -17,5 +17,6 @@
"bs-usagetracker-base-collector-desc" : "Number of pages using $1",
"bs-usagetracker-tag-collector-desc" : "Number of pages using tag <$1>",
"bs-usagetracker-db-collector-desc": "Number of $1",
- "bs-usagetracker-open-tasks" : "Site analysis is currently in progress.
{{PLURAL:$1|One analysis is|$1 analyses are}} still open. (Refresh)"
+ "bs-usagetracker-open-tasks" : "Site analysis is currently in progress.
{{PLURAL:$1|One analysis is|$1 analyses are}} still open. (Refresh)",
+ "apihelp-bs-usagetracker-store-summary": "Holds statistical data about
extension use"
}
diff --git a/UsageTracker/i18n/qqq.json b/UsageTracker/i18n/qqq.json
index b2dc418..9449ca9 100644
--- a/UsageTracker/i18n/qqq.json
+++ b/UsageTracker/i18n/qqq.json
@@ -18,5 +18,6 @@
"bs-usagetracker-base-collector-desc": "Used in
[[Special:Usage_Tracker]], description of a base c
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: maintain-views and maintain_meta-p sock option
Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370217 )
Change subject: labsdb: maintain-views and maintain_meta-p sock option
..
labsdb: maintain-views and maintain_meta-p sock option
Bug: T172496
Change-Id: I4f35960f6718550f425d5d57e6cc7f92393b31c1
---
M modules/role/files/labs/db/views/maintain-meta_p.py
M modules/role/files/labs/db/views/maintain-views.py
2 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/files/labs/db/views/maintain-meta_p.py
b/modules/role/files/labs/db/views/maintain-meta_p.py
index 2963d4e..787f14b 100644
--- a/modules/role/files/labs/db/views/maintain-meta_p.py
+++ b/modules/role/files/labs/db/views/maintain-meta_p.py
@@ -153,6 +153,12 @@
)
argparser.add_argument(
+"--mysql-socket",
+help=("Path to MySQL socket file"),
+default="/tmp/mysql.sock"
+)
+
+argparser.add_argument(
'--debug',
help='Turn on debug logging',
action='store_true'
@@ -177,7 +183,7 @@
dbh = pymysql.connect(
user=config["mysql_user"],
passwd=config["mysql_password"],
-unix_socket="/tmp/mysql.sock",
+unix_socket=args.mysql_socket,
charset="utf8"
)
diff --git a/modules/role/files/labs/db/views/maintain-views.py
b/modules/role/files/labs/db/views/maintain-views.py
index 1f793f7..3905420 100644
--- a/modules/role/files/labs/db/views/maintain-views.py
+++ b/modules/role/files/labs/db/views/maintain-views.py
@@ -329,6 +329,13 @@
" values can be given space-separated."),
default="/usr/local/lib/mediawiki-config"
)
+
+argparser.add_argument(
+"--mysql-socket",
+help=("Path to MySQL socket file"),
+default="/tmp/mysql.sock"
+)
+
argparser.add_argument(
'--debug',
help='Turn on debug logging',
@@ -376,7 +383,7 @@
dbh = pymysql.connect(
user=config["mysql_user"],
passwd=config["mysql_password"],
-unix_socket="/tmp/mysql.sock",
+unix_socket=args.mysql_socket,
charset="utf8"
)
--
To view, visit https://gerrit.wikimedia.org/r/370217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f35960f6718550f425d5d57e6cc7f92393b31c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Rush
Gerrit-Reviewer: Volans
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Update the list of suppressed Phan issues to match those rep...
WMDE-leszek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371046 ) Change subject: Update the list of suppressed Phan issues to match those reported by Phan 0.8.5 .. Update the list of suppressed Phan issues to match those reported by Phan 0.8.5 Change-Id: Iac04ca0d70877602c848b6c3797f5a2eb804f41f --- M tests/phan/config.php 1 file changed, 27 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/46/371046/1 diff --git a/tests/phan/config.php b/tests/phan/config.php index e08ded8..582282f 100644 --- a/tests/phan/config.php +++ b/tests/phan/config.php @@ -324,46 +324,54 @@ * to this black-list to inhibit them from being reported. */ 'suppress_issue_types' => [ + // approximate error count: 1 + "PhanAccessClassConstantInternal", // approximate error count: 3 "PhanDeprecatedClass", - // approximate error count: 43 + // approximate error count: 40 "PhanDeprecatedFunction", + // approximate error count: 6 + "PhanDeprecatedInterface", // approximate error count: 3 "PhanParamReqAfterOpt", - // approximate error count: 19 + // approximate error count: 14 "PhanParamSignatureMismatch", - // approximate error count: 1 - "PhanParamSignatureMismatchInternal", - // approximate error count: 17 - "PhanParamTooMany", - // approximate error count: 2 - "PhanTypeComparisonToArray", - // approximate error count: 75 - "PhanTypeMismatchArgument", // approximate error count: 5 + "PhanParamTooMany", + // approximate error count: 1 + "PhanTypeComparisonToArray", + // approximate error count: 53 + "PhanTypeMismatchArgument", + // approximate error count: 10 "PhanTypeMismatchArgumentInternal", + // approximate error count: 4 + "PhanTypeMismatchDeclaredParamNullable", // approximate error count: 5 "PhanTypeMismatchProperty", // approximate error count: 9 "PhanTypeMismatchReturn", - // approximate error count: 3 + // approximate error count: 11 "PhanTypeMissingReturn", - // approximate error count: 2 + // approximate error count: 5 "PhanUndeclaredClassConstant", - // approximate error count: 14 + // approximate error count: 43 "PhanUndeclaredClassMethod", - // approximate error count: 54 + // approximate error count: 58 "PhanUndeclaredConstant", - // approximate error count: 139 + // approximate error count: 135 "PhanUndeclaredMethod", - // approximate error count: 25 + // approximate error count: 22 "PhanUndeclaredProperty", - // approximate error count: 3 + // approximate error count: 2 + "PhanUndeclaredStaticMethod", + // approximate error count: 5 "PhanUndeclaredTypeParameter", - // approximate error count: 4 + // approximate error count: 5 "PhanUndeclaredTypeProperty", - // approximate error count: 3 + // approximate error count: 9 "PhanUndeclaredVariable", + // approximate error count: 4 + "PhanUndeclaredVariableDim", ], /** -- To view, visit https://gerrit.wikimedia.org/r/371046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac04ca0d70877602c848b6c3797f5a2eb804f41f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: WMDE-leszek ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Doc: update package source repository link
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371047 )
Change subject: Doc: update package source repository link
..
Doc: update package source repository link
Replace the temporary GitHub repo with the permanent Diffusion one.
Change-Id: I7559870171620e7eb55f55408f0ce1a4170f33ee
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/47/371047/1
diff --git a/package.json b/package.json
index 9faa5b5..3241726 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
},
"repository": {
"type": "git",
-"url": "git+https://github.com/niedzielski/marvin.git";
+"url": "git+https://phabricator.wikimedia.org/source/marvin.git";
},
"keywords": [
"mediawiki",
--
To view, visit https://gerrit.wikimedia.org/r/371047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7559870171620e7eb55f55408f0ce1a4170f33ee
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Make sure that all buttons in the actions area have pointer
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371028 )
Change subject: Make sure that all buttons in the actions area have pointer
..
Make sure that all buttons in the actions area have pointer
Also include a elements here, as a elements without href, as is used
in some places in Minerva, does not have a pointer by default.
Bug: T145493
Change-Id: I08d9176e55ec298c9d423d391b6fb4ed5e9df5e7
---
M resources/skins.minerva.base.styles/pageactions.less
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/skins.minerva.base.styles/pageactions.less
b/resources/skins.minerva.base.styles/pageactions.less
index bcbf124..f1c304b 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -92,6 +92,10 @@
text-indent: inherit;
outline: 0;
}
+ a,
+ button {
+ cursor: pointer;
+ }
&:first-child {
margin-top: 0;
--
To view, visit https://gerrit.wikimedia.org/r/371028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08d9176e55ec298c9d423d391b6fb4ed5e9df5e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Pmiazga
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
