[MediaWiki-commits] [Gerrit] mediawiki...WikiCategoryTagCloud[master]: Version 1.3.1: ArticleSave hook was deprecated in MW 1.21, u...
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325264
Change subject: Version 1.3.1: ArticleSave hook was deprecated in MW 1.21, use
PageContentSave instead
..
Version 1.3.1: ArticleSave hook was deprecated in MW 1.21, use PageContentSave
instead
Change-Id: I7d512aa64a0d6fd4eaa16926179b2d9f153e6dd5
---
M WikiCategoryTagCloud.class.php
M WikiCategoryTagCloud.php
M extension.json
3 files changed, 6 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiCategoryTagCloud
refs/changes/64/325264/1
diff --git a/WikiCategoryTagCloud.class.php b/WikiCategoryTagCloud.class.php
index 7a6f3c1..81658e9 100644
--- a/WikiCategoryTagCloud.class.php
+++ b/WikiCategoryTagCloud.class.php
@@ -36,8 +36,8 @@
* When an admin edits MediaWiki:Tagcloudpages, purge the cache for
each page
* listed on that message.
*/
- public static function invalidateCache( &$article, &$user, &$text,
&$summary, $minor, $watchThis, $sectionAnchor, &$flags, &$status ) {
- $at = $article->getTitle();
+ public static function invalidateCache( &$wikiPage, &$user, &$content,
&$summary, $isMinor, $isWatch, $section, &$flags, &$status ) {
+ $at = $wikiPage->getTitle();
if ( $at->getText() == 'Tagcloudpages' && $at->getNamespace()
== NS_MEDIAWIKI ) {
$message = wfMessage( 'tagcloudpages'
)->inContentLanguage();
diff --git a/WikiCategoryTagCloud.php b/WikiCategoryTagCloud.php
index 8863ab2..971b0cd 100644
--- a/WikiCategoryTagCloud.php
+++ b/WikiCategoryTagCloud.php
@@ -26,7 +26,7 @@
$wgExtensionCredits['parserhook'][] = array(
'name' => 'Wiki Category Tag Cloud',
- 'version' => '1.3',
+ 'version' => '1.3.1',
'author' => array( '[http://danf.ca/mw/ Daniel Friesen]', 'Jack
Phoenix' ),
'descriptionmsg' => 'wikicategorytagcloud-desc',
'url' =>
'https://www.mediawiki.org/wiki/Extension:WikiCategoryTagCloud',
@@ -49,4 +49,4 @@
$wgHooks['ParserFirstCallInit'][] = 'WikiCategoryTagCloud::register';
// Hooked function
-$wgHooks['ArticleSave'][] = 'WikiCategoryTagCloud::invalidateCache';
\ No newline at end of file
+$wgHooks['PageContentSave'][] = 'WikiCategoryTagCloud::invalidateCache';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index d68eff2..0134de8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Wiki Category Tag Cloud",
- "version": "1.3",
+ "version": "1.3.1",
"author": [
"[http://danf.ca/mw/ Daniel Friesen]",
"Jack Phoenix"
@@ -28,7 +28,7 @@
}
},
"Hooks": {
- "ArticleSave": [
+ "PageContentSave": [
"WikiCategoryTagCloud::invalidateCache"
],
"ParserFirstCallInit": [
--
To view, visit https://gerrit.wikimedia.org/r/325264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d512aa64a0d6fd4eaa16926179b2d9f153e6dd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiCategoryTagCloud
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiCategoryTagCloud[master]: Version 1.3.1: ArticleSave hook was deprecated in MW 1.21, u...
jenkins-bot has submitted this change and it was merged.
Change subject: Version 1.3.1: ArticleSave hook was deprecated in MW 1.21, use
PageContentSave instead
..
Version 1.3.1: ArticleSave hook was deprecated in MW 1.21, use PageContentSave
instead
Change-Id: I7d512aa64a0d6fd4eaa16926179b2d9f153e6dd5
---
M WikiCategoryTagCloud.class.php
M WikiCategoryTagCloud.php
M extension.json
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikiCategoryTagCloud.class.php b/WikiCategoryTagCloud.class.php
index 7a6f3c1..81658e9 100644
--- a/WikiCategoryTagCloud.class.php
+++ b/WikiCategoryTagCloud.class.php
@@ -36,8 +36,8 @@
* When an admin edits MediaWiki:Tagcloudpages, purge the cache for
each page
* listed on that message.
*/
- public static function invalidateCache( &$article, &$user, &$text,
&$summary, $minor, $watchThis, $sectionAnchor, &$flags, &$status ) {
- $at = $article->getTitle();
+ public static function invalidateCache( &$wikiPage, &$user, &$content,
&$summary, $isMinor, $isWatch, $section, &$flags, &$status ) {
+ $at = $wikiPage->getTitle();
if ( $at->getText() == 'Tagcloudpages' && $at->getNamespace()
== NS_MEDIAWIKI ) {
$message = wfMessage( 'tagcloudpages'
)->inContentLanguage();
diff --git a/WikiCategoryTagCloud.php b/WikiCategoryTagCloud.php
index 8863ab2..971b0cd 100644
--- a/WikiCategoryTagCloud.php
+++ b/WikiCategoryTagCloud.php
@@ -26,7 +26,7 @@
$wgExtensionCredits['parserhook'][] = array(
'name' => 'Wiki Category Tag Cloud',
- 'version' => '1.3',
+ 'version' => '1.3.1',
'author' => array( '[http://danf.ca/mw/ Daniel Friesen]', 'Jack
Phoenix' ),
'descriptionmsg' => 'wikicategorytagcloud-desc',
'url' =>
'https://www.mediawiki.org/wiki/Extension:WikiCategoryTagCloud',
@@ -49,4 +49,4 @@
$wgHooks['ParserFirstCallInit'][] = 'WikiCategoryTagCloud::register';
// Hooked function
-$wgHooks['ArticleSave'][] = 'WikiCategoryTagCloud::invalidateCache';
\ No newline at end of file
+$wgHooks['PageContentSave'][] = 'WikiCategoryTagCloud::invalidateCache';
\ No newline at end of file
diff --git a/extension.json b/extension.json
index d68eff2..0134de8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Wiki Category Tag Cloud",
- "version": "1.3",
+ "version": "1.3.1",
"author": [
"[http://danf.ca/mw/ Daniel Friesen]",
"Jack Phoenix"
@@ -28,7 +28,7 @@
}
},
"Hooks": {
- "ArticleSave": [
+ "PageContentSave": [
"WikiCategoryTagCloud::invalidateCache"
],
"ParserFirstCallInit": [
--
To view, visit https://gerrit.wikimedia.org/r/325264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d512aa64a0d6fd4eaa16926179b2d9f153e6dd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiCategoryTagCloud
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceCategoryManager[REL1_27]: Set default review branch
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/325265 Change subject: Set default review branch .. Set default review branch Change-Id: I2410e0c1c960da10d402a8a322db4d682d16a607 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceCategoryManager refs/changes/65/325265/1 diff --git a/.gitreview b/.gitreview index 76fa075..eacb7d5 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,6 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceCategoryManager.git +defaultbranch=REL1_27 track=1 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/325265 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2410e0c1c960da10d402a8a322db4d682d16a607 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceCategoryManager Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSMWConnector[REL1_27]: Set default review branch
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/325266 Change subject: Set default review branch .. Set default review branch Change-Id: I5116dcf3218e10bc9f40cc3235baf8ae88ec3349 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSMWConnector refs/changes/66/325266/1 diff --git a/.gitreview b/.gitreview index 359839e..adad360 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,6 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceSMWConnector.git +defaultbranch=REL1_27 track=1 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/325266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5116dcf3218e10bc9f40cc3235baf8ae88ec3349 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSMWConnector Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SpamDiffTool[master]: Remove deprecated PHP entry point
jenkins-bot has submitted this change and it was merged. Change subject: Remove deprecated PHP entry point .. Remove deprecated PHP entry point Bug: T140007 Change-Id: I227f7bb5df5a485c5121b903873d36725128ac7e --- D SpamDiffTool.php 1 file changed, 0 insertions(+), 40 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/SpamDiffTool.php b/SpamDiffTool.php deleted file mode 100644 index f519774..000 --- a/SpamDiffTool.php +++ /dev/null @@ -1,40 +0,0 @@ - - * @author Alexandre Emsenhuber - * @author Jack Phoenix - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - * @link https://www.mediawiki.org/wiki/Extension:SpamDiffTool Documentation - */ - -$wgSpamBlacklistArticle = 'Project:Spam_Blacklist'; - -$wgExtensionCredits['antispam'][] = array( - 'path' => __FILE__, - 'name' => 'SpamDiffTool', - 'version' => '1.1', - 'license-name' => 'GPL-2.0+', - 'author' => array( 'Travis Derouin', 'Alexandre Emsenhuber', 'Jack Phoenix' ), - 'descriptionmsg' => 'spamdifftool-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:SpamDiffTool', -); - -$wgResourceModules['ext.spamdifftool.styles'] = array( - 'styles' => 'ext.spamdifftool.css', - 'localBasePath' => __DIR__, - 'remoteExtPath' => 'SpamDiffTool', - 'position' => 'top' -); - -$wgMessagesDirs['SpamDiffTool'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['SpamDiffToolAlias'] = __DIR__ . '/SpamDiffTool.alias.php'; - -$wgSpecialPages['SpamDiffTool'] = 'SpamDiffTool'; -$wgAutoloadClasses['SpamDiffTool'] = __DIR__ . '/SpamDiffTool.body.php'; -$wgAutoloadClasses['SpamDiffToolHooks'] = __DIR__ . '/SpamDiffToolHooks.php'; -$wgHooks['DiffViewHeader'][] = 'SpamDiffToolHooks::onDiffViewHeader'; -- To view, visit https://gerrit.wikimedia.org/r/228627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I227f7bb5df5a485c5121b903873d36725128ac7e Gerrit-PatchSet: 10 Gerrit-Project: mediawiki/extensions/SpamDiffTool Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: IAlex Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Updated stats and added fi.wikivoyage to the www.wikivoyage....
jenkins-bot has submitted this change and it was merged. Change subject: Updated stats and added fi.wikivoyage to the www.wikivoyage.org portal .. Updated stats and added fi.wikivoyage to the www.wikivoyage.org portal Bug: T151570 Change-Id: Iae264db9ac352b8a4adfeb555c7374b0d2719bc9 --- M prod/wikivoyage.org/index.html 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jdrewniak: Looks good to me, approved jenkins-bot: Verified diff --git a/prod/wikivoyage.org/index.html b/prod/wikivoyage.org/index.html index a2dc80f..1c4072a 100644 --- a/prod/wikivoyage.org/index.html +++ b/prod/wikivoyage.org/index.html @@ -1,7 +1,7 @@ - + Wikivoyage @@ -152,6 +152,7 @@ Português Română Русский +Suomi Svenska Українська Tiếng Việt @@ -171,6 +172,7 @@ Nederlands Português Română +Suomi Svenska Tiếng Việt 中文 @@ -189,4 +191,4 @@ - \ No newline at end of file + -- To view, visit https://gerrit.wikimedia.org/r/325178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae264db9ac352b8a4adfeb555c7374b0d2719bc9 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/portals Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Jdrewniak Gerrit-Reviewer: Mxn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PrivateDomains[master]: Remove old PHP entry point in favor of extension.json
Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/325267 Change subject: Remove old PHP entry point in favor of extension.json .. Remove old PHP entry point in favor of extension.json MW 1.25 or newer is now explicitly required Change-Id: Iae1fca81c9e93d301c1076be66efcdaa0033859c --- D PrivateDomains.php 1 file changed, 0 insertions(+), 68 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PrivateDomains refs/changes/67/325267/1 diff --git a/PrivateDomains.php b/PrivateDomains.php deleted file mode 100644 index 1a3ae0e..000 --- a/PrivateDomains.php +++ /dev/null @@ -1,68 +0,0 @@ - - * @author Jack Phoenix - * @link https://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ - -// Extension credits that will show up on Special:Version -$wgExtensionCredits['specialpage'][] = array( - 'name' => 'PrivateDomains', - 'version' => '1.5.0', - 'author' => array( 'Inez Korczyński', 'Jack Phoenix' ), - 'description' => 'Allows to restrict editing to users with a certain e-mail address', - 'url' => 'https://www.mediawiki.org/wiki/Extension:PrivateDomains', - 'license-name' => 'GPL-2.0+', -); - -// Set up the new special page -$wgAutoloadClasses['PrivateDomains'] = __DIR__ . '/SpecialPrivateDomains.php'; -$wgMessagesDirs['PrivateDomains'] = __DIR__ . '/i18n'; -$wgSpecialPages['PrivateDomains'] = 'PrivateDomains'; - -$wgAutoloadClasses['PrivateDomainsHooks'] = __DIR__ . '/PrivateDomainsHooks.php'; -$wgHooks['AlternateEdit'][] = 'PrivateDomainsHooks::onAlternateEdit'; -$wgHooks['UserLoggedIn'][] = 'PrivateDomainsHooks::onUserLoginComplete'; -$wgHooks['ConfirmEmailComplete'][] = 'PrivateDomainsHooks::onUserLoginComplete'; - -# set 'privatedomains' right to users in staff or bureaucrat group -$wgAvailableRights[] = 'privatedomains'; -$wgGroupPermissions['staff']['privatedomains'] = true; -$wgGroupPermissions['bureaucrat']['privatedomains'] = true; - -# overwrite standard groups permissions -$wgGroupPermissions['staff']['edit'] = true; -$wgGroupPermissions['bureaucrat']['edit'] = true; -$wgGroupPermissions['user']['edit'] = false; -$wgGroupPermissions['*']['edit'] = false; -$wgGroupPermissions['privatedomains']['edit'] = true; - -$wgGroupPermissions['staff']['upload'] = true; -$wgGroupPermissions['bureaucrat']['upload'] = true; -$wgGroupPermissions['user']['upload'] = false; -$wgGroupPermissions['*']['upload'] = false; -$wgGroupPermissions['privatedomains']['upload'] = true; - -$wgGroupPermissions['staff']['move'] = true; -$wgGroupPermissions['bureaucrat']['move'] = true; -$wgGroupPermissions['user']['move'] = false; -$wgGroupPermissions['*']['move'] = false; -$wgGroupPermissions['privatedomains']['move'] = true; - -$wgGroupPermissions['user']['reupload'] = false; -$wgGroupPermissions['*']['reupload'] = false; -$wgGroupPermissions['privatedomains']['reupload'] = true; - -$wgGroupPermissions['user']['reupload-shared'] = false; -$wgGroupPermissions['*']['reupload-shared'] = false; -$wgGroupPermissions['privatedomains']['reupload-shared'] = true; - -$wgGroupPermissions['user']['minoredit'] = false; -$wgGroupPermissions['*']['minoredit'] = false; -$wgGroupPermissions['privatedomains']['minoredit'] = true; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325267 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae1fca81c9e93d301c1076be66efcdaa0033859c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PrivateDomains Gerrit-Branch: master Gerrit-Owner: Jack Phoenix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker: add package provider
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: docker: add package provider
..
docker: add package provider
While most of our containers will be managed by kubernetes itself, a few
will be managed by puppet itself; it is therefore convenient using the
package abstraction to manage installation/upgrade of docker images.
Change-Id: I5a016874acb012b651617b03cfe3f09119f04d23
---
A modules/docker/lib/puppet/provider/package/docker.rb
1 file changed, 99 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/docker/lib/puppet/provider/package/docker.rb
b/modules/docker/lib/puppet/provider/package/docker.rb
new file mode 100644
index 000..70bc545
--- /dev/null
+++ b/modules/docker/lib/puppet/provider/package/docker.rb
@@ -0,0 +1,99 @@
+# Puppet package provider for `docker`.
+#
+# Copyright 2016 Giuseppe Lavagetto, Wikimedia Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide(
+ :docker, :parent => Puppet::Provider::Package) do
+
+ desc 'Puppet package provider for docker.'
+
+ has_feature :installable, :uninstallable, :versionable, :upgradeable
+
+ commands :docker => '/usr/bin/docker'
+
+ DOCKER_IMAGES_FORMAT_STRING = "{{.Repository}}\t{{.Tag}}\t{{.ID}}"
+
+ def self.instances
+packages = []
+docker('images', '--format', DOCKER_IMAGES_FORMAT_STRING).split("\n").each
do |line|
+ repo, tag, _ = line.split "\t"
+ package = {:ensure => tag, :name => repo,
+ :provider => :docker}
+ packages << new(package)
+end
+
+packages
+ end
+
+ def installed_versions
+docker('images', '--format', '{{.Tag}}', resource[:name]).split("\n")
+ end
+
+ def required_version
+should = resource[:ensure]
+case should
+when true, false, Symbol
+ "#{resource[:name]}:latest"
+else
+ "#{resource[:name]}:#{should}"
+end
+ end
+
+ def install
+docker('pull', required_version)
+installed_versions.each do |version|
+ tag = "#{resource[:name]}:#{version}"
+ next if tag == required_version
+ begin
+docker('rmi', tag)
+ rescue Puppet::ExecutionFailure
+Puppet.warning("Not removing image #{tag} as it is currently in use.")
+ end
+end
+ end
+
+ def uninstall
+installed_versions.each do |version|
+ docker('rmi', "#{resource[:name]}:#{version}")
+end
+ end
+
+ def update
+install
+ end
+
+ def query
+result = { :ensure => :absent, :name => resource[:name] }
+versions = installed_versions
+
+unless versions.empty?
+ if versions.include?('latest')
+result[:ensure] = 'latest'
+ else
+result[:ensure] = versions.sort{ |x, y| Gem::Version.new(x) <=>
Gem::Version.new(y) }.pop
+ end
+end
+
+result
+ end
+
+ # Ok this is dumb. But, it should do what people would expect when writing
+ # ensure => latest
+ def latest
+'latest'
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/323815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a016874acb012b651617b03cfe3f09119f04d23
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Alexandros Kosiaris
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[production]: labs: Add db structure for keeping info about labsdb accounts
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/325268 Change subject: labs: Add db structure for keeping info about labsdb accounts .. labs: Add db structure for keeping info about labsdb accounts Bug: T149933 Change-Id: If98e7877151173623b96b168d44a82464b6e59e0 --- A modules/role/files/labs/db/maintain-dbusers.sql 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/325268/1 diff --git a/modules/role/files/labs/db/maintain-dbusers.sql b/modules/role/files/labs/db/maintain-dbusers.sql new file mode 100644 index 000..73df709 --- /dev/null +++ b/modules/role/files/labs/db/maintain-dbusers.sql @@ -0,0 +1,20 @@ +-- Keep state about tool / user accounts on tool labs and their mysql +-- account counterparts. This is the canonical store of this information. +-- Schema is set up to be able to trivially query the following things: +-- 1. What labsdb hosts does this tool / user *not* have an account on. +-- 2. What's the mysql username / password for this tool / user. +CREATE TABLE accounts( +id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, +mysql_username VARCHAR(255) NOT NULL, +type VARCHAR(255) NOT NULL, -- 'tool' or 'user' +username VARCHAR(255) NOT NULL, +password VARCHAR(255) NOT NULL, +) CHARSET=utf8mb4; +CREATE UNIQUE INDEX account_type ON accounts(type, username); + +CREATE TABLE accounts_hosts( +id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, +account_id INT UNSIGNED NOT NULL, +hostname VARCHAR(255) NOT NULL, +) CHARSET=utf8mb4; +CREATE INDEX account_host_status ON accounts(account_id, hostname); -- To view, visit https://gerrit.wikimedia.org/r/325268 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If98e7877151173623b96b168d44a82464b6e59e0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PrivateDomains[master]: Remove old PHP entry point in favor of extension.json
jenkins-bot has submitted this change and it was merged. Change subject: Remove old PHP entry point in favor of extension.json .. Remove old PHP entry point in favor of extension.json MW 1.25 or newer is now explicitly required Change-Id: Iae1fca81c9e93d301c1076be66efcdaa0033859c --- D PrivateDomains.php 1 file changed, 0 insertions(+), 68 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/PrivateDomains.php b/PrivateDomains.php deleted file mode 100644 index 1a3ae0e..000 --- a/PrivateDomains.php +++ /dev/null @@ -1,68 +0,0 @@ - - * @author Jack Phoenix - * @link https://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ - -// Extension credits that will show up on Special:Version -$wgExtensionCredits['specialpage'][] = array( - 'name' => 'PrivateDomains', - 'version' => '1.5.0', - 'author' => array( 'Inez Korczyński', 'Jack Phoenix' ), - 'description' => 'Allows to restrict editing to users with a certain e-mail address', - 'url' => 'https://www.mediawiki.org/wiki/Extension:PrivateDomains', - 'license-name' => 'GPL-2.0+', -); - -// Set up the new special page -$wgAutoloadClasses['PrivateDomains'] = __DIR__ . '/SpecialPrivateDomains.php'; -$wgMessagesDirs['PrivateDomains'] = __DIR__ . '/i18n'; -$wgSpecialPages['PrivateDomains'] = 'PrivateDomains'; - -$wgAutoloadClasses['PrivateDomainsHooks'] = __DIR__ . '/PrivateDomainsHooks.php'; -$wgHooks['AlternateEdit'][] = 'PrivateDomainsHooks::onAlternateEdit'; -$wgHooks['UserLoggedIn'][] = 'PrivateDomainsHooks::onUserLoginComplete'; -$wgHooks['ConfirmEmailComplete'][] = 'PrivateDomainsHooks::onUserLoginComplete'; - -# set 'privatedomains' right to users in staff or bureaucrat group -$wgAvailableRights[] = 'privatedomains'; -$wgGroupPermissions['staff']['privatedomains'] = true; -$wgGroupPermissions['bureaucrat']['privatedomains'] = true; - -# overwrite standard groups permissions -$wgGroupPermissions['staff']['edit'] = true; -$wgGroupPermissions['bureaucrat']['edit'] = true; -$wgGroupPermissions['user']['edit'] = false; -$wgGroupPermissions['*']['edit'] = false; -$wgGroupPermissions['privatedomains']['edit'] = true; - -$wgGroupPermissions['staff']['upload'] = true; -$wgGroupPermissions['bureaucrat']['upload'] = true; -$wgGroupPermissions['user']['upload'] = false; -$wgGroupPermissions['*']['upload'] = false; -$wgGroupPermissions['privatedomains']['upload'] = true; - -$wgGroupPermissions['staff']['move'] = true; -$wgGroupPermissions['bureaucrat']['move'] = true; -$wgGroupPermissions['user']['move'] = false; -$wgGroupPermissions['*']['move'] = false; -$wgGroupPermissions['privatedomains']['move'] = true; - -$wgGroupPermissions['user']['reupload'] = false; -$wgGroupPermissions['*']['reupload'] = false; -$wgGroupPermissions['privatedomains']['reupload'] = true; - -$wgGroupPermissions['user']['reupload-shared'] = false; -$wgGroupPermissions['*']['reupload-shared'] = false; -$wgGroupPermissions['privatedomains']['reupload-shared'] = true; - -$wgGroupPermissions['user']['minoredit'] = false; -$wgGroupPermissions['*']['minoredit'] = false; -$wgGroupPermissions['privatedomains']['minoredit'] = true; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325267 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae1fca81c9e93d301c1076be66efcdaa0033859c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PrivateDomains Gerrit-Branch: master Gerrit-Owner: Jack Phoenix Gerrit-Reviewer: Jack Phoenix 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]: admin: Update my (=legoktm) dotfiles
Alexandros Kosiaris has submitted this change and it was merged. Change subject: admin: Update my (=legoktm) dotfiles .. admin: Update my (=legoktm) dotfiles Change-Id: Ic7267077cb33687d7a81227f8127c49c56763808 --- M modules/admin/files/home/legoktm/.bash_aliases 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/modules/admin/files/home/legoktm/.bash_aliases b/modules/admin/files/home/legoktm/.bash_aliases index 62836f5..bfde7fc 100644 --- a/modules/admin/files/home/legoktm/.bash_aliases +++ b/modules/admin/files/home/legoktm/.bash_aliases @@ -1,2 +1,5 @@ alias ack='ack-grep' - +alias sync-file='scap sync-file' +alias sync-dir='scap sync-dir' +alias mwversionsinuse='scap wikiversions-inuse' +alias zuul-logs='tail -f -n100 /var/log/zuul/zuul.log' -- To view, visit https://gerrit.wikimedia.org/r/325134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7267077cb33687d7a81227f8127c49c56763808 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Legoktm Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: eventlogging_sync: By pass ssl check on localhost
Jcrespo has submitted this change and it was merged. Change subject: eventlogging_sync: By pass ssl check on localhost .. eventlogging_sync: By pass ssl check on localhost The error logs are getting flooded with errors from the SSL certificate. When running this in localhost there is no need to check for the SSL cert, so skipping it. Bug: T152364 Change-Id: Ibb92a3d4c18e8f18887ef1089ab634a449f7b1f2 --- M files/mariadb/eventlogging_sync.sh 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jcrespo: Looks good to me, approved jenkins-bot: Verified diff --git a/files/mariadb/eventlogging_sync.sh b/files/mariadb/eventlogging_sync.sh index 8dc433f..339e026 100755 --- a/files/mariadb/eventlogging_sync.sh +++ b/files/mariadb/eventlogging_sync.sh @@ -19,9 +19,9 @@ mhost='m4-master.eqiad.wmnet' shost="localhost" -slave="mysql -h $shost --compress --skip-column-names" -master="mysql -h $mhost --compress --skip-column-names" -dump="mysqldump -h $mhost --skip-opt --single-transaction --quick --skip-triggers" +slave="mysql -h $shost --compress --skip-column-names --skip-ssl" +master="mysql -h $mhost --compress --skip-column-names --skip-ssl" +dump="mysqldump --skip-ssl -h $mhost --skip-opt --single-transaction --quick --skip-triggers" dumpdata="$dump --no-create-info --insert-ignore --extended-insert --compress --hex-blob" querytables="select table_name from information_schema.tables where table_schema = '$db' and table_name" # select this many rows per table at a time -- To view, visit https://gerrit.wikimedia.org/r/325257 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb92a3d4c18e8f18887ef1089ab634a449f7b1f2 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProtectSite[master]: Remove old PHP entry point in favor of extension.json
Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/325269 Change subject: Remove old PHP entry point in favor of extension.json .. Remove old PHP entry point in favor of extension.json MW 1.25 or newer is now explicitly required Change-Id: I9ac1fbcf84634c56613b530a5c389b92e255d350 --- D ProtectSite.php 1 file changed, 0 insertions(+), 56 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProtectSite refs/changes/69/325269/1 diff --git a/ProtectSite.php b/ProtectSite.php deleted file mode 100644 index 30fbd2f..000 --- a/ProtectSite.php +++ /dev/null @@ -1,56 +0,0 @@ - - * @author Chris Stafford - * @author Jack Phoenix - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ - -/* Extension Credits. Splarka wants me to be so UN:VAIN! Haet haet hat! */ -$wgExtensionCredits['specialpage'][] = array( - 'path' => __FILE__, - 'name' => 'Protect Site', - 'version' => '0.5.0', - 'author' => array( '[http://en.uncyclopedia.co/wiki/User:Dawg Eric Johnston]', 'Chris Stafford', 'Jack Phoenix' ), - 'descriptionmsg' => 'protectsite-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:ProtectSite', - 'license-name' => 'GPL-2.0+', -); - -# Configuration settings -// Array of non-sysop user groups to be not effected by rights changes -$wgProtectSiteExempt = array(); - -/* Set the default timeout. */ -$wgProtectsiteDefaultTimeout = '1 hour'; - -// Maximum time allowed for protection of the site -$wgProtectSiteLimit = '1 week'; - -/* Register the new user rights level */ -$wgAvailableRights[] = 'protectsite'; - -/* Set the group access permissions */ -$wgGroupPermissions['bureaucrat']['protectsite'] = true; - -/* Add this special page to the special page listing array */ -$wgMessagesDirs['ProtectSite'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['ProtectSiteAliases'] = __DIR__ . '/ProtectSite.alias.php'; -$wgAutoloadClasses['ProtectSite'] = __DIR__ . '/ProtectSite.body.php'; -$wgAutoloadClasses['ProtectSiteForm'] = __DIR__ . '/ProtectSite.body.php'; -$wgSpecialPages['ProtectSite'] = 'ProtectSite'; - -/* Register initialization function */ -$wgExtensionFunctions[] = 'ProtectSite::setup'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325269 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ac1fbcf84634c56613b530a5c389b92e255d350 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProtectSite Gerrit-Branch: master Gerrit-Owner: Jack Phoenix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProtectSite[master]: Remove old PHP entry point in favor of extension.json
jenkins-bot has submitted this change and it was merged. Change subject: Remove old PHP entry point in favor of extension.json .. Remove old PHP entry point in favor of extension.json MW 1.25 or newer is now explicitly required Change-Id: I9ac1fbcf84634c56613b530a5c389b92e255d350 --- D ProtectSite.php 1 file changed, 0 insertions(+), 56 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/ProtectSite.php b/ProtectSite.php deleted file mode 100644 index 30fbd2f..000 --- a/ProtectSite.php +++ /dev/null @@ -1,56 +0,0 @@ - - * @author Chris Stafford - * @author Jack Phoenix - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ - -/* Extension Credits. Splarka wants me to be so UN:VAIN! Haet haet hat! */ -$wgExtensionCredits['specialpage'][] = array( - 'path' => __FILE__, - 'name' => 'Protect Site', - 'version' => '0.5.0', - 'author' => array( '[http://en.uncyclopedia.co/wiki/User:Dawg Eric Johnston]', 'Chris Stafford', 'Jack Phoenix' ), - 'descriptionmsg' => 'protectsite-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:ProtectSite', - 'license-name' => 'GPL-2.0+', -); - -# Configuration settings -// Array of non-sysop user groups to be not effected by rights changes -$wgProtectSiteExempt = array(); - -/* Set the default timeout. */ -$wgProtectsiteDefaultTimeout = '1 hour'; - -// Maximum time allowed for protection of the site -$wgProtectSiteLimit = '1 week'; - -/* Register the new user rights level */ -$wgAvailableRights[] = 'protectsite'; - -/* Set the group access permissions */ -$wgGroupPermissions['bureaucrat']['protectsite'] = true; - -/* Add this special page to the special page listing array */ -$wgMessagesDirs['ProtectSite'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['ProtectSiteAliases'] = __DIR__ . '/ProtectSite.alias.php'; -$wgAutoloadClasses['ProtectSite'] = __DIR__ . '/ProtectSite.body.php'; -$wgAutoloadClasses['ProtectSiteForm'] = __DIR__ . '/ProtectSite.body.php'; -$wgSpecialPages['ProtectSite'] = 'ProtectSite'; - -/* Register initialization function */ -$wgExtensionFunctions[] = 'ProtectSite::setup'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325269 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ac1fbcf84634c56613b530a5c389b92e255d350 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProtectSite Gerrit-Branch: master Gerrit-Owner: Jack Phoenix Gerrit-Reviewer: Jack Phoenix 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: Remove references to Special:TopicTag
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove references to Special:TopicTag .. Hygiene: Remove references to Special:TopicTag This is a remnant from the ancient tags experiment. Change-Id: I06c833c769eda0fc07e8c558bd844474684a0585 --- M MobileFrontend.alias.php 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: jenkins-bot: Verified Phuedx: Looks good to me, approved diff --git a/MobileFrontend.alias.php b/MobileFrontend.alias.php index f8099d7..739a3a5 100644 --- a/MobileFrontend.alias.php +++ b/MobileFrontend.alias.php @@ -20,7 +20,6 @@ 'MobileMenu' => array( 'MobileMenu' ), 'MobileLanguages' => array( 'MobileLanguages' ), 'Nearby' => array( 'Nearby' ), - 'TopicTag' => array( 'TopicTag' ), ); /** Afrikaans (Afrikaans) */ @@ -40,8 +39,7 @@ 'MobileMenu' => array( 'قائمة_المحمول' ), 'MobileLanguages' => array( 'لغات_المحمول' ), 'Nearby' => array( 'قريب' ), - 'TopicTag' => array( 'وسم_الموضوع' ), -); + ); /** Egyptian Arabic (مصرى) */ $specialPageAliases['arz'] = array( -- To view, visit https://gerrit.wikimedia.org/r/324602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06c833c769eda0fc07e8c558bd844474684a0585 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Phuedx Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-05T10:00:01+0000
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325270
Change subject: New Wikidata Build - 2016-12-05T10:00:01+
..
New Wikidata Build - 2016-12-05T10:00:01+
Change-Id: Ie530d000496f608ddee2a04d40cfa1a5914e24bd
---
M composer.lock
A extensions/Wikibase/client/i18n/sty.json
M extensions/Wikibase/repo/i18n/ast.json
M vendor/composer/installed.json
4 files changed, 30 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/70/325270/1
diff --git a/composer.lock b/composer.lock
index d188793..f55d5e1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1585,12 +1585,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a"
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b946b675e628dcb586bcef000a96a81f652c164a";,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b80daa060e9dc6e6d98920203a128362a9150517";,
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517",
"shasum": ""
},
"require": {
@@ -1662,7 +1662,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2016-12-02 21:21:23"
+"time": "2016-12-04 21:41:34"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/sty.json
b/extensions/Wikibase/client/i18n/sty.json
new file mode 100644
index 000..f3b6ea6
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/sty.json
@@ -0,0 +1,11 @@
+{
+ "@metadata": {
+ "authors": [
+ "Khanmarat"
+ ]
+ },
+ "tooltip-t-wikibase": "Мәғлүмәтле репозиторийтағы пәйләнкән элементҡа
ссылка",
+ "wikibase-dataitem": "{{WBREPONAME}}ның элементы",
+ "wikibase-editlinks": "Ссылкаларны төсәткәле",
+ "wikibase-editlinkstitle": "Пашҡа телләртәге ссылкаларны төсәткәле"
+}
diff --git a/extensions/Wikibase/repo/i18n/ast.json
b/extensions/Wikibase/repo/i18n/ast.json
index 84c736c..57d639a 100644
--- a/extensions/Wikibase/repo/i18n/ast.json
+++ b/extensions/Wikibase/repo/i18n/ast.json
@@ -386,7 +386,7 @@
"apihelp-wbformatvalue-param-datatype": "El tipu de datu del valor.
Esto ye diferente del tipu del valor",
"apihelp-wbformatvalue-param-datavalue": "Los datos a los que dar
formatu. Esto tien que ser la serialización JSON d'un oxetu DataValue.",
"apihelp-wbformatvalue-param-options": "Les opciones que tien d'usar el
formateador. Daes como oxetu JSON.",
- "apihelp-wbformatvalue-param-property": "Id de propiedá a la que
pertenez el valor de los datos, tendría d'usase en llugar del parámetru
datatype.",
+ "apihelp-wbformatvalue-param-property": "ID de la propiedá a la que
pertenez el valor de los datos, tendría d'usase en llugar del parámetru
datatype.",
"apihelp-wbformatvalue-example-1": "Da formatu a un valor simple de
cadena de testu.",
"apihelp-wbformatvalue-example-2": "Da formatu a un valor de cadena de
testu como URL en HTML.",
"apihelp-wbgetclaims-description": "Recibe afirmaciones de Wikibase.",
@@ -421,12 +421,12 @@
"apihelp-wbgetentities-example-10": "Algamar l'elementu pa la páxina
«Berlin» del sitiu \"enwiki\", colos atributos de llingua del idioma inglés",
"apihelp-wbgetentities-example-11": "Algamar l'elementu de la páxina
«Berlin» del sitiu \"enwiki\" después de normalizar el títulu dende «berlin»",
"apihelp-wbgetentities-example-12": "Algamar los enllaces de sitiu del
elementu Q42",
- "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42
amosando sólo los enllaces d'enwiki",
+ "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42
amosando sólo los enllaces d'\"enwiki\"",
"apihelp-wblinktitles-description": "Asocia dos artículos de dos wikis
diferentes con un elementu de Wikibase.",
- "apihelp-wblinktitles-param-tosite": "Un identificador pal sitiu onde
ta allugada la páxina.\nÚsalu xunto con 'totitle' pa facer un enllaz completu
del sitiu.",
- "apihelp-wblinktitles-param-totitle": "Títulu de la páxina a
asociar.\nÚsalo xunto con 'tosite' pa crear un enllaz completu del sitiu.",
- "apihelp-wblinktitles-param-fromsite": "Un identificador pal sitiu nel
que ta asitiada la páxina.\nÚsalo xunto con 'fromtitle' pa crear un enllaz
com
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add user and passwords for labspuppet and labsdbaccounts
Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325271
Change subject: Add user and passwords for labspuppet and labsdbaccounts
..
Add user and passwords for labspuppet and labsdbaccounts
Bug: T152377
Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7
---
M modules/role/manifests/mariadb.pp
M templates/mariadb/production-grants-m5.sql.erb
2 files changed, 21 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/325271/1
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index e391b6c..9472360 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -28,6 +28,8 @@
include passwords::prometheus
include passwords::servermon
include passwords::striker
+include passwords::labspuppet
+include passwords::labsdbaccounts
$root_pass = $passwords::misc::scripts::mysql_root_pass
$repl_pass = $passwords::misc::scripts::mysql_repl_pass
@@ -60,6 +62,8 @@
$servermon_pass = $passwords::servermon::db_password
$striker_pass= $passwords::striker::application_db_password
$striker_admin_pass = $passwords::striker::admin_db_password
+$labspuppet_pass = $passwords::labspuppet::db_password
+$labsdbaccounts_pass = $passwords::labsdbaccounts::db_password
file { '/etc/mysql/production-grants-shard.sql':
ensure => present,
diff --git a/templates/mariadb/production-grants-m5.sql.erb
b/templates/mariadb/production-grants-m5.sql.erb
index bef362d..f8947b7 100644
--- a/templates/mariadb/production-grants-m5.sql.erb
+++ b/templates/mariadb/production-grants-m5.sql.erb
@@ -1,6 +1,5 @@
-- haproxy
CREATE USER 'haproxy'@'10.64.16.155';
-CREATE USER 'haproxy'@'10.64.48.97';
-- designate, labservices1002
@@ -140,4 +139,20 @@
-- labspuppetbackend user, will run on the labs puppetmaster host --
GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
-ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92';
+ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92'
+IDENTIFIED BY '<%= @labspuppet_pass' %>';
+
+GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
+ON `labspuppet`.* TO 'labspuppet'@'10.64.16.155'
+IDENTIFIED BY '<%= @labspuppet_pass' %>';
+
+-- labsdbaccounts user, will run from labstore1004 and 1005
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.19'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.20'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.16.155'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
--
To view, visit https://gerrit.wikimedia.org/r/325271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7
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] analytics/refinery[master]: Update oozie articleplaceholder_metrics to refinery-job-0.0....
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325272
Change subject: Update oozie articleplaceholder_metrics to
refinery-job-0.0.38.jar
..
Update oozie articleplaceholder_metrics to refinery-job-0.0.38.jar
Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
---
M oozie/wikidata/articleplaceholder_metrics/coordinator.properties
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/72/325272/1
diff --git a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
index ca6e187..0d202eb 100644
--- a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
+++ b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
@@ -49,7 +49,7 @@
spark_master = yarn
spark_deploy = cluster
spark_assembly_jar=
${name_node}/user/spark/share/lib/spark-assembly.jar
-spark_job_jar =
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.33.jar
+spark_job_jar =
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.38.jar
spark_job_class =
org.wikimedia.analytics.refinery.job.WikidataArticlePlaceholderMetrics
spark_job_name= wikidata_articleplaceholder_metrics
spark_additional_files= ${name_node}/user/hive/hive-site.xml
--
To view, visit https://gerrit.wikimedia.org/r/325272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Update oozie articleplaceholder_metrics to refinery-job-0.0....
Joal has submitted this change and it was merged.
Change subject: Update oozie articleplaceholder_metrics to
refinery-job-0.0.38.jar
..
Update oozie articleplaceholder_metrics to refinery-job-0.0.38.jar
Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
---
M oozie/wikidata/articleplaceholder_metrics/coordinator.properties
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Joal: Verified; Looks good to me, approved
diff --git a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
index ca6e187..0d202eb 100644
--- a/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
+++ b/oozie/wikidata/articleplaceholder_metrics/coordinator.properties
@@ -49,7 +49,7 @@
spark_master = yarn
spark_deploy = cluster
spark_assembly_jar=
${name_node}/user/spark/share/lib/spark-assembly.jar
-spark_job_jar =
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.33.jar
+spark_job_jar =
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.38.jar
spark_job_class =
org.wikimedia.analytics.refinery.job.WikidataArticlePlaceholderMetrics
spark_job_name= wikidata_articleplaceholder_metrics
spark_additional_files= ${name_node}/user/hive/hive-site.xml
--
To view, visit https://gerrit.wikimedia.org/r/325272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7302e8759240b78f8d9145499a76785b49e91bc5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Joal
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb-replica: Disable parallel replication
Marostegui has submitted this change and it was merged. Change subject: labsdb-replica: Disable parallel replication .. labsdb-replica: Disable parallel replication As we have done in sanitarium, we should disable parallel replication in the labs servers. Bug: T152194 Change-Id: I8c98ae4eb91bd2c93036a2469b7262ae047f5ead --- M templates/mariadb/labsdb-replica.my.cnf.erb 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jcrespo: Looks good to me, but someone else must approve Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/labsdb-replica.my.cnf.erb b/templates/mariadb/labsdb-replica.my.cnf.erb index a6fa163..dfe8f39 100644 --- a/templates/mariadb/labsdb-replica.my.cnf.erb +++ b/templates/mariadb/labsdb-replica.my.cnf.erb @@ -34,6 +34,10 @@ log_bin log_slave_updates +slave_parallel_mode= none +slave_parallel_threads = 0 +slave_parallel_max_queued = 16M + skip-external-locking skip-name-resolve temp-pool -- To view, visit https://gerrit.wikimedia.org/r/325255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c98ae4eb91bd2c93036a2469b7262ae047f5ead Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui 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]: Renew expired TLS certificate for eventlogging hosts
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/325273 Change subject: Renew expired TLS certificate for eventlogging hosts .. Renew expired TLS certificate for eventlogging hosts Bug: T152364 Bug: T152188 Change-Id: I93e6084d3a2981482ba7ace70525eef8e1d8394e --- M modules/role/manifests/mariadb.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/325273/1 diff --git a/modules/role/manifests/mariadb.pp b/modules/role/manifests/mariadb.pp index e391b6c..640ac11 100644 --- a/modules/role/manifests/mariadb.pp +++ b/modules/role/manifests/mariadb.pp @@ -388,7 +388,7 @@ datadir => '/srv/sqldata', tmpdir=> '/srv/tmp', read_only => $read_only, -ssl => 'on', +ssl => 'puppet-cert', p_s => 'off', binlog_format => 'MIXED', } -- To view, visit https://gerrit.wikimedia.org/r/325273 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93e6084d3a2981482ba7ace70525eef8e1d8394e 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] labs/private[master]: Add fake passwords for labspuppet and labsdbaccounts databases
Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325274
Change subject: Add fake passwords for labspuppet and labsdbaccounts databases
..
Add fake passwords for labspuppet and labsdbaccounts databases
Bug: T152377
Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
---
M modules/passwords/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/private
refs/changes/74/325274/1
diff --git a/modules/passwords/manifests/init.pp
b/modules/passwords/manifests/init.pp
index 9c3f016..a5398f8 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -484,3 +484,11 @@
$user = 'notsecret'
$db_pass = 'notsecret'
}
+
+class passwords::labspuppet {
+$db_password = 'notsecret'
+}
+
+class passwords::labsdbaccounts {
+$db_password = 'notsecret'
+}
--
To view, visit https://gerrit.wikimedia.org/r/325274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Jcrespo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/private[master]: Add fake passwords for labspuppet and labsdbaccounts databases
Jcrespo has submitted this change and it was merged.
Change subject: Add fake passwords for labspuppet and labsdbaccounts databases
..
Add fake passwords for labspuppet and labsdbaccounts databases
Bug: T152377
Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
---
M modules/passwords/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Jcrespo: Verified; Looks good to me, approved
diff --git a/modules/passwords/manifests/init.pp
b/modules/passwords/manifests/init.pp
index 9c3f016..a5398f8 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -484,3 +484,11 @@
$user = 'notsecret'
$db_pass = 'notsecret'
}
+
+class passwords::labspuppet {
+$db_password = 'notsecret'
+}
+
+class passwords::labsdbaccounts {
+$db_password = 'notsecret'
+}
--
To view, visit https://gerrit.wikimedia.org/r/325274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibed8d1e5b1b6d6731ee2c3512f683e0c89d7d84a
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Jcrespo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Create import sources list for hsbwiki
Urbanecm has uploaded a new change for review. https://gerrit.wikimedia.org/r/325275 Change subject: Create import sources list for hsbwiki .. Create import sources list for hsbwiki Bug: T152382 Change-Id: I3bee1f348fbd76bb4fdd14f4f644d673b3fed3ff --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/75/325275/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d81235e..c07d132 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10768,6 +10768,7 @@ 'hiwikiquote' => [ 'w', 'w:en', 'w:sa', 'q:en', 'q:gu', 'q:sa', 'meta', 'mw' ], // T127593 'hiwiktionary' => [ 'commons', 'meta', 'w', 'q', 'b', 'species', 'w:en', 'b:en', 'q:en', 's:en', 'v:en', 'voy:en', 'w:es', 'w:fa', 'w:fr', 'w:ml', 'w:ne', 'w:nl', 'w:ro', 'w:ru', 'w:pl', 'w:pt', 'w:simple', 'w:ta', 'w:ur', 'w:mr', 'w:gu', 'w:bh', 'en', 'mg', 'fr', 'es', 'zh', 'ru', 'it', 'pl', 'sv', 'ku', 'el', 'nl', 'de', 'ko', 'it', 'tr', 'ta', 'hu', 'fi', 'kn', 'ja', 'ml', 'my', 'or', 'te', 'fa', 'gu', 'ar', 'th', 'ps', 'simple', 'sw' ], // T132417 'hifwiki' => [ 'incubator', 'commons', 'meta', 'species', 'bh', 'de', 'en', 'en:b', 'en:q', 'en:n', 'en:s', 'en:v', 'el', 'es', 'fa', 'fr', 'hi', 'ml', 'ne', 'nl', 'ro', 'ru', 'pa', 'pl', 'pt', 'simple', 'te', 'ta', 'ur' ], // T99826 + 'hsbwiki' => [ 'de', 'dsb', 'en', 'cs', 'pl', 'ru', 'hr', 'sr', 'sh' ], // T152382 'hsbwiktionary' => [ 'incubator', 'w' ], 'huwikinews' => [ 'incubator' ], 'idwiki' => [ 'ms' ], // T18033 -- To view, visit https://gerrit.wikimedia.org/r/325275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3bee1f348fbd76bb4fdd14f4f644d673b3fed3ff 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] operations/puppet[production]: elasticsearch - upgrade codfw cluster to Java 8
Gehel has uploaded a new change for review. https://gerrit.wikimedia.org/r/325276 Change subject: elasticsearch - upgrade codfw cluster to Java 8 .. elasticsearch - upgrade codfw cluster to Java 8 Bug: T151325 Change-Id: I7091ccee1c6b3e002ffc528e46866066e7aceeff --- M hieradata/role/codfw/elasticsearch/cirrus.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/76/325276/1 diff --git a/hieradata/role/codfw/elasticsearch/cirrus.yaml b/hieradata/role/codfw/elasticsearch/cirrus.yaml index 2948f15..8fe6970 100644 --- a/hieradata/role/codfw/elasticsearch/cirrus.yaml +++ b/hieradata/role/codfw/elasticsearch/cirrus.yaml @@ -51,3 +51,5 @@ elasticsearch::https::certificate_name: 'search.svc.codfw.wmnet' base::puppet::dns_alt_names:'search.svc.codfw.wmnet' + +elasticsearch::java_package: 'openjdk-8-jdk' -- To view, visit https://gerrit.wikimedia.org/r/325276 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7091ccee1c6b3e002ffc528e46866066e7aceeff Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel ___ 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-eqiad.php: Depool db1082"
Marostegui has uploaded a new change for review. https://gerrit.wikimedia.org/r/325277 Change subject: Revert "db-eqiad.php: Depool db1082" .. Revert "db-eqiad.php: Depool db1082" db1082 finished the ALTER table and it is ready to go back in the pool This reverts commit 0881436365874ead7134427e149d09e7409147e8. Change-Id: Ifcdff4b21002357f9b43aa16ad674a78450c6313 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/77/325277/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d29353e..c9d6a52 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -144,7 +144,7 @@ 'db1045' => 0, # 1.4TB 64GB, vslow, dump 'db1070' => 50, # 2.8TB 160GB, api, old master 'db1071' => 50, # 2.8TB 160GB, api -# 'db1082' => 500, # 3.6TB 512GB #T148967 + 'db1082' => 500, # 3.6TB 512GB 'db1087' => 500, # 3.6TB 512GB 'db1092' => 500, # 3.6TB 512GB ], -- To view, visit https://gerrit.wikimedia.org/r/325277 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcdff4b21002357f9b43aa16ad674a78450c6313 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/puppet[production]: mariadb: Update check private data script to handle BINARY f...
Jcrespo has submitted this change and it was merged.
Change subject: mariadb: Update check private data script to handle BINARY
fields
..
mariadb: Update check private data script to handle BINARY fields
We need to trim \0 (unicode/asci code 0), as BINARY fields store
empty string values as \0\0\0... n times, being n the width of the
binary field.
Bug: T152194
Change-Id: I744ba0fd8c1448760b9a71f7b1dc4af75aba22b1
---
M modules/role/files/mariadb/check_private_data.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/role/files/mariadb/check_private_data.py
b/modules/role/files/mariadb/check_private_data.py
index 341505b..769be5a 100644
--- a/modules/role/files/mariadb/check_private_data.py
+++ b/modules/role/files/mariadb/check_private_data.py
@@ -120,8 +120,8 @@
query = ("SELECT count(*)"
" FROM `{}`.`{}`"
" WHERE IF(`{}` IS NULL, 0,"
- " `{}` NOT IN ('0', ''))").format(database, table,
-column, column)
+ " TRIM(LEADING '\0' FROM `{}`) NOT IN ('0', ''))")
+query = query.format(database, table, column, column)
cursor.execute(query)
result = cursor.fetchall()
if int(result[0][0]) > 0:
--
To view, visit https://gerrit.wikimedia.org/r/325176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I744ba0fd8c1448760b9a71f7b1dc4af75aba22b1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
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] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1082"
jenkins-bot has submitted this change and it was merged. Change subject: Revert "db-eqiad.php: Depool db1082" .. Revert "db-eqiad.php: Depool db1082" db1082 finished the ALTER table and it is ready to go back in the pool This reverts commit 0881436365874ead7134427e149d09e7409147e8. Change-Id: Ifcdff4b21002357f9b43aa16ad674a78450c6313 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d29353e..c9d6a52 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -144,7 +144,7 @@ 'db1045' => 0, # 1.4TB 64GB, vslow, dump 'db1070' => 50, # 2.8TB 160GB, api, old master 'db1071' => 50, # 2.8TB 160GB, api -# 'db1082' => 500, # 3.6TB 512GB #T148967 + 'db1082' => 500, # 3.6TB 512GB 'db1087' => 500, # 3.6TB 512GB 'db1092' => 500, # 3.6TB 512GB ], -- To view, visit https://gerrit.wikimedia.org/r/325277 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcdff4b21002357f9b43aa16ad674a78450c6313 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]: Send secondary DNS recursor IP from labs DHCP
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325278
Change subject: Send secondary DNS recursor IP from labs DHCP
..
Send secondary DNS recursor IP from labs DHCP
Bug: T137460
Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
---
M modules/openstack/manifests/nova/network.pp
M modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
M modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
3 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/325278/1
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 72aeacb..34442ba 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -38,6 +38,7 @@
$dnsconfig = hiera_hash('labsdnsconfig', {})
$labs_metal = hiera('labs_metal',{})
$recursor_ip = ipresolve($dnsconfig['recursor'],4)
+$recursor_secondary_ip = ipresolve($dnsconfig['recursor_secondary'],4)
file { '/etc/dnsmasq-nova.conf':
content =>
template("openstack/${openstack_version}/nova/dnsmasq-nova.conf.erb"),
owner => 'root',
diff --git a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
<% end -%>
#Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%=
scope.function_ipresolve([@tftp_host, 4]) %>
diff --git a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
<% end -%>
#Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%=
scope.function_ipresolve([@tftp_host, 4]) %>
--
To view, visit https://gerrit.wikimedia.org/r/325278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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/puppet[production]: Revert "eventlogging_sync: By pass ssl check on localhost"
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/325279 Change subject: Revert "eventlogging_sync: By pass ssl check on localhost" .. Revert "eventlogging_sync: By pass ssl check on localhost" This reverts commit b6a8100080559648d07a554e8ee2e39bf751fff0. Change-Id: Iae16a1cea9343b8bf186bd258d115ac9402241ca --- M files/mariadb/eventlogging_sync.sh 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/325279/1 diff --git a/files/mariadb/eventlogging_sync.sh b/files/mariadb/eventlogging_sync.sh index 339e026..8dc433f 100755 --- a/files/mariadb/eventlogging_sync.sh +++ b/files/mariadb/eventlogging_sync.sh @@ -19,9 +19,9 @@ mhost='m4-master.eqiad.wmnet' shost="localhost" -slave="mysql -h $shost --compress --skip-column-names --skip-ssl" -master="mysql -h $mhost --compress --skip-column-names --skip-ssl" -dump="mysqldump --skip-ssl -h $mhost --skip-opt --single-transaction --quick --skip-triggers" +slave="mysql -h $shost --compress --skip-column-names" +master="mysql -h $mhost --compress --skip-column-names" +dump="mysqldump -h $mhost --skip-opt --single-transaction --quick --skip-triggers" dumpdata="$dump --no-create-info --insert-ignore --extended-insert --compress --hex-blob" querytables="select table_name from information_schema.tables where table_schema = '$db' and table_name" # select this many rows per table at a time -- To view, visit https://gerrit.wikimedia.org/r/325279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae16a1cea9343b8bf186bd258d115ac9402241ca 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] wikimedia/portals[master]: Improving CSS linting
Jdrewniak has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325280
Change subject: Improving CSS linting
..
Improving CSS linting
[WIP] should throw stylelint errors in CI.
Catching all postCSS compile errors
now in addition to stylelint errors.
Removing the tests/lint.js script and trying
to run gulp from packages.json instead.
Change-Id: Id728d96e0935bdc2125fdcb78f7272d6a23a9090
---
M gulpfile.js
M package.json
D tests/lint.js
3 files changed, 18 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals
refs/changes/80/325280/1
diff --git a/gulpfile.js b/gulpfile.js
index 9b56a63..c48a570 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,6 +14,8 @@
sprity = require( 'sprity' ),
postCSSNext = require( 'postcss-cssnext' ),
postCSSImport = require( 'postcss-import' ),
+ postCSSReporter = require( 'postcss-reporter' ),
+ gulpStylelint = require( 'gulp-stylelint' ),
del = require( 'del' );
var plugins = gulpLoadPlugins(),
@@ -297,8 +299,18 @@
.pipe( plugins.jscs.reporter( 'fail' ) );
} );
-gulp.task( 'lint-css', function lintCssTask() {
- const gulpStylelint = require( 'gulp-stylelint' );
+gulp.task( 'validate-postCSS', function () {
+ return gulp
+ .src( [ 'dev/**/postcss/*.css', '!dev/**/postcss/_*.css' ] )
+ .pipe( plugins.postcss( [
+ postCSSImport(),
+ postCSSNext( { browsers: [ 'last 5 versions',
'ie 6-8', 'Firefox >= 3.5', 'iOS >= 4', 'Android >= 2.3' ] } ),
+ postCSSReporter( { clearMessages: true,
throwError: true } )
+ ], { map: { inline: true } }
+ ) );
+} );
+
+gulp.task( 'lint-css', [ 'validate-postCSS' ], function () {
return gulp
.src( 'dev/**/postcss/*.css' )
diff --git a/package.json b/package.json
index 25a393c..91c0b64 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
{
"private": true,
"scripts": {
-"test": "node ./tests/lint.js",
+"gulp": "gulp",
+"test": "npm run gulp -- lint",
"casperjs": "casperjs test ./tests/casper.js",
"elbucketing": "casperjs test ./tests/elbucketing.js",
"el-abtest3": "casperjs test ./tests/el-abtest3.js",
@@ -29,7 +30,7 @@
"gulp-rename": "^1.2.2",
"gulp-rev": "^6.0.1",
"gulp-rev-replace": "^0.4.3",
-"gulp-stylelint": "^3.0.0",
+"gulp-stylelint": "^3.5.0",
"gulp-uglify": "^1.4.2",
"gulp-useref": "^3.0.5",
"handlebars": "^4.0.4",
@@ -40,6 +41,7 @@
"moment": "^2.10.6",
"postcss-cssnext": "^2.4.0",
"postcss-import": "^8.0.2",
+"postcss-reporter": "^2.0.0",
"preq": "^0.4.6",
"sprity": "^1.0.8",
"stylelint-config-wikimedia": "^0.3.0",
diff --git a/tests/lint.js b/tests/lint.js
deleted file mode 100644
index 834ae04..000
--- a/tests/lint.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var gulp = require( 'gulp' ),
- jshint = require( 'gulp-jshint' ),
- jscs = require( 'gulp-jscs' ),
- stylelint = require( 'gulp-stylelint' );
-
-gulp.task( 'lint-js', function () {
- var devFolder = 'dev/**/*.js';
-
- gulp.src( [ '*.js', devFolder ] )
- .pipe( jshint( '.jshintrc' ) )
- .pipe( jshint.reporter( 'default' ) )
- .pipe( jshint.reporter( 'fail' ) )
- .pipe( jscs() )
- .pipe( jscs.reporter() )
- .pipe( jscs.reporter( 'fail' ) );
-} );
-
-gulp.task( 'lint-css', function lintCssTask() {
- return gulp
- .src( 'dev/**/postcss/*.css' )
- .pipe( stylelint( {
- reporters: [
- { formatter: 'string', console: true }
- ]
- } ) );
-} );
-
-gulp.task ( 'lint', [ 'lint-js', 'lint-css' ] );
-
-gulp.start( 'lint' );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/325280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id728d96e0935bdc2125fdcb78f7272d6a23a9090
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Lockdown[master]: Convert to use "Extension Registration" (MW 1.25+)
FreedomFighterSparrow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325281
Change subject: Convert to use "Extension Registration" (MW 1.25+)
..
Convert to use "Extension Registration" (MW 1.25+)
https://www.mediawiki.org/wiki/Manual:Extension_registration#Migration_for_extension_developers
Change-Id: I1d03c0c07e1094bed1e63c68ea3601f4afa3f626
---
D Lockdown.i18n.php
D Lockdown.php
A LockdownHooks.php
M README
A extension.json
M install.settings
6 files changed, 257 insertions(+), 260 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lockdown
refs/changes/81/325281/1
diff --git a/Lockdown.i18n.php b/Lockdown.i18n.php
deleted file mode 100644
index 816658b..000
--- a/Lockdown.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimc61c7aea6122cc77' ) ) {
- function wfJsonI18nShimc61c7aea6122cc77( $cache, $code, &$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimc61c7aea6122cc77';
-}
diff --git a/Lockdown.php b/Lockdown.php
deleted file mode 100644
index 3632364..000
--- a/Lockdown.php
+++ /dev/null
@@ -1,222 +0,0 @@
- may work in some versions of
mediawiki. Same with diff, etc.
-*
-* NOTE: you cannot GRANT access to things forbidden by $wgGroupPermissions.
You can only DENY access
-* granted there.
-*/
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- echo( "This file is an extension to the MediaWiki software and cannot
be used standalone.\n" );
- die( 1 );
-}
-
-$wgExtensionCredits['other'][] = array(
- 'path' => __FILE__,
- 'name' => 'Lockdown',
- 'author' => array(
- 'Daniel Kinzler',
- 'Platonides'
- ),
- 'url' => 'https://mediawiki.org/wiki/Extension:Lockdown',
- 'descriptionmsg' => 'lockdown-desc',
- 'license-name' => 'GPL-2.0+'
-);
-
-$wgMessagesDirs['Lockdown'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Lockdown'] = __DIR__ . '/Lockdown.i18n.php';
-$wgNamespacePermissionLockdown = array();
-$wgSpecialPageLockdown = array();
-$wgActionLockdown = array();
-
-$wgHooks['getUserPermissionsErrors'][] = 'lockdownUserPermissionsErrors';
-$wgHooks['MediaWikiPerformAction'][] = 'lockdownMediawikiPerformAction';
-$wgHooks['SearchableNamespaces'][] = 'lockdownSearchableNamespaces';
-$wgHooks['SearchGetNearMatchComplete'][] =
'lockdownSearchGetNearMatchComplete';
-
-/**
- * @param Title $title
- * @param User $user
- * @param string $action
- * @param MessageSpecifier|array|string|bool|null $result
- * @return bool
- */
-function lockdownUserPermissionsErrors(
- Title $title,
- User $user,
- $action,
- &$result = null
-) {
- global $wgNamespacePermissionLockdown, $wgSpecialPageLockdown,
$wgWhitelistRead, $wgLang;
-
- $result = null;
-
- // don't impose extra restrictions on UI pages
- if ( $title->isCssJsSubpage() ) {
- return true;
- }
-
- if ( $action == 'read' && is_array( $wgWhitelistRead ) ) {
- // don't impose read restrictions on whitelisted pages
- if ( in_array( $title->getPrefixedText(), $wgWhitelistRead ) ) {
- return true;
- }
- }
-
- $groups = null;
- $ns = $title->getNamespace();
- if ( NS_SPECIAL == $ns ) {
- foreach ( $wgSpecialPageLockdown as $page => $g ) {
- if ( !$title->i
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Avoid using CONTENT_MODEL_FLOW_BOARD
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid using CONTENT_MODEL_FLOW_BOARD
..
Avoid using CONTENT_MODEL_FLOW_BOARD
This constant won't be defined any more once Flow switches to extension.json
Change-Id: I7f2a2bad53023a53415487e9340fcd7b8a81501f
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
Paladox: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 187a03d..2e311e6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2749,7 +2749,7 @@
}
foreach ( $wmgFlowNamespaces as $namespace ) {
- $wgNamespaceContentModels[$namespace] =
CONTENT_MODEL_FLOW_BOARD;
+ $wgNamespaceContentModels[$namespace] = 'flow-board'; //
CONTENT_MODEL_FLOW_BOARD
}
// Requires that Parsoid is available for all wikis using Flow.
$wgFlowContentFormat = 'html';
--
To view, visit https://gerrit.wikimedia.org/r/325152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f2a2bad53023a53415487e9340fcd7b8a81501f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Use camel case for statsd metric names
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325282
Change subject: Use camel case for statsd metric names
..
Use camel case for statsd metric names
Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
---
M includes/specials/SpecialCreateTopicPage.php
M
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
M
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
3 files changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder
refs/changes/82/325282/1
diff --git a/includes/specials/SpecialCreateTopicPage.php
b/includes/specials/SpecialCreateTopicPage.php
index 167bd83..2288a40 100644
--- a/includes/specials/SpecialCreateTopicPage.php
+++ b/includes/specials/SpecialCreateTopicPage.php
@@ -28,7 +28,7 @@
$this->setHeaders();
if ( $this->getRequest()->getVal( 'ref' ) === 'button' ) {
$statsd =
MediaWikiServices::getInstance()->getStatsdDataFactory();
- $statsd->increment(
'wikibase.articleplaceholder.button.create-article' );
+ $statsd->increment(
'wikibase.articleplaceholder.button.createArticle' );
}
$page = $this->getRequest()->getVal( 'wptitleinput', $par );
if ( $page === '' || $page === null ) {
diff --git
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
index bd8f55d..7ed4baa 100644
---
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
+++
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
@@ -41,7 +41,7 @@
return
CreateArticleTranslationDialog.super.prototype.onSubmit.apply( this );
}
- mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.translate-article' );
+ mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.translateArticle' );
mw.loader.using( 'ext.cx.sitemapper' ).then( function () {
document.location.href =
mw.cx.SiteMapper.prototype.getCXUrl(
diff --git
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
index 4ea6b57..b0264d4 100644
---
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
+++
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
@@ -19,7 +19,7 @@
windowManager.addWindows( [ dialog ] );
OO.ui.infuse( 'new-article-button' ).on( 'click', function () {
- mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.create-article' );
+ mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.createArticle' );
windowManager.openWindow( dialog );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/325282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Include user's edit count in BOOT action
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325285
Change subject: Include user's edit count in BOOT action
..
Include user's edit count in BOOT action
Action changes:
* Group user-related data in the user property, rather than repeating
"isUser" and "user" prefixes.
* Include user's edit count in the user property of the action.
Reducer changes:
* Make the preview reducer handle the action's new shape.
* Make the eventLogging reducer add the bucketed user's edit count to
the state tree.
Bug: T152223
Change-Id: I8fae9e2d0f6889ffdd30bb5192513d194f791967
---
M extension.json
M resources/ext.popups/actions.js
A resources/ext.popups/counts.js
M resources/ext.popups/reducers.js
M tests/qunit/ext.popups/actions.test.js
A tests/qunit/ext.popups/counts.test.js
M tests/qunit/ext.popups/reducers.eventLogging.test.js
M tests/qunit/ext.popups/reducers.test.js
8 files changed, 105 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/85/325285/1
diff --git a/extension.json b/extension.json
index 888fd10..264ae1b 100644
--- a/extension.json
+++ b/extension.json
@@ -63,6 +63,7 @@
"resources/ext.popups/experiment.js",
"resources/ext.popups/actions.js",
"resources/ext.popups/processLinks.js",
+ "resources/ext.popups/counts.js",
"resources/ext.popups/gateway.js",
"resources/ext.popups/reducers.js",
"resources/ext.popups/changeListener.js",
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 239aa91..450e023 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -43,9 +43,10 @@
* i.e. `mw.config`
*/
actions.boot = function ( isUserInCondition, user, generateToken,
config ) {
+ var editCount = config.get( 'wgUserEditCount' );
+
return {
type: types.BOOT,
- isUserInCondition: isUserInCondition(),
sessionToken: user.sessionId(),
pageToken: generateToken(),
page: {
@@ -53,7 +54,11 @@
namespaceID: config.get( 'wgNamespaceNumber' ),
id: config.get( 'wgArticleId' )
},
- isUserAnon: user.isAnon()
+ user: {
+ isInCondition: isUserInCondition(),
+ isAnon: user.isAnon(),
+ editCount: editCount
+ }
};
};
diff --git a/resources/ext.popups/counts.js b/resources/ext.popups/counts.js
new file mode 100644
index 000..47fed15
--- /dev/null
+++ b/resources/ext.popups/counts.js
@@ -0,0 +1,34 @@
+( function ( mw ) {
+
+ mw.popups.counts = {};
+
+ /**
+* Return count bucket for the number of edits a user has made.
+*
+* The buckets are defined as part of
+* [the Popups schema](https://meta.wikimedia.org/wiki/Schema:Popups).
+*
+* Extracted from `mw.popups.schemaPopups.getEditCountBucket`.
+*
+* @param {Number} count
+* @return {String}
+*/
+ mw.popups.counts.getEditCountBucket = function ( count ) {
+ var bucket;
+
+ if ( count === 0 ) {
+ bucket = '0';
+ } else if ( count >= 1 && count <= 4 ) {
+ bucket = '1-4';
+ } else if ( count >= 5 && count <= 99 ) {
+ bucket = '5-99';
+ } else if ( count >= 100 && count <= 999 ) {
+ bucket = '100-999';
+ } else if ( count >= 1000 ) {
+ bucket = '1000+';
+ }
+
+ return bucket + ' edits';
+ };
+
+}( mediaWiki ) );
diff --git a/resources/ext.popups/reducers.js b/resources/ext.popups/reducers.js
index 7e4e0c7..9a80a77 100644
--- a/resources/ext.popups/reducers.js
+++ b/resources/ext.popups/reducers.js
@@ -1,4 +1,8 @@
( function ( mw, $ ) {
+
+ // Sugar for the mw.popups.reducers.eventLogging reducer.
+ var counts = mw.popups.counts;
+
mw.popups.reducers = {};
/**
@@ -56,7 +60,7 @@
switch ( action.type ) {
case mw.popups.actionTypes.BOOT:
return nextState( state, {
- enabled: action.isUserInCondition
+ enabled: action.user.isInCondition
} );
case mw.popups.actionTyp
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Increment preview count
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325287
Change subject: Increment preview count
..
Increment preview count
Action changes:
* Add the PREVIEW_SHOW action.
Reducer changes:
* Increment the user's preview count in the eventLogging reducer.
Changes:
* Add the previewCount change listener, which is responsible for
persisting the user's preview count to storage.
* Call the change listener factories individually in
#registerChangeListeners as their signatures aren't consistent.
Bug: T152223
Change-Id: Ifb493c5bff66712a25614ebb905251e43375420a
---
M extension.json
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
A resources/ext.popups/previewCountChangeListener.js
M resources/ext.popups/reducers.js
M resources/ext.popups/renderChangeListener.js
A tests/qunit/ext.popups/previewCountChangeListener.test.js
M tests/qunit/ext.popups/reducers.eventLogging.test.js
A tests/qunit/ext.popups/renderChangeListener.test.js
9 files changed, 219 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/87/325287/1
diff --git a/extension.json b/extension.json
index 264ae1b..9408bd2 100644
--- a/extension.json
+++ b/extension.json
@@ -71,6 +71,7 @@
"resources/ext.popups/linkTitleChangeListener.js",
"resources/ext.popups/renderer.js",
"resources/ext.popups/renderChangeListener.js",
+
"resources/ext.popups/previewCountChangeListener.js",
"resources/ext.popups/boot.js"
],
"templates": {
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 838f901..bea886a 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -15,6 +15,7 @@
PREVIEW_ABANDON_END: 'PREVIEW_ABANDON_END',
PREVIEW_ANIMATING: 'PREVIEW_ANIMATING',
PREVIEW_INTERACTIVE: 'PREVIEW_INTERACTIVE',
+ PREVIEW_SHOW: 'PREVIEW_SHOW',
PREVIEW_CLICK: 'PREVIEW_CLICK',
COG_CLICK: 'COG_CLICK',
SETTINGS_DIALOG_RENDERED: 'SETTINGS_DIALOG_RENDERED',
@@ -174,7 +175,7 @@
};
/**
-* Represents the user dwelling on a preivew with their mouse.
+* Represents the user dwelling on a preview with their mouse.
*
* @return {Object}
*/
@@ -206,6 +207,20 @@
};
/**
+* Represents a preview being shown to the user.
+*
+* This action is dispatched by the `mw.popups.changeListeners.render`
change
+* listener.
+*
+* @return {Object}
+*/
+ actions.previewShow = function () {
+ return {
+ type: 'PREVIEW_SHOW'
+ };
+ };
+
+ /**
* Represents the user clicking either the "Enable previews" footer
menu link,
* or the "cog" icon that's present on each preview.
*
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index 05c077e..6729599 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -1,4 +1,4 @@
-( function ( mw, Redux, ReduxThunk, $ ) {
+( function ( mw, Redux, ReduxThunk ) {
var BLACKLISTED_LINKS = [
'.extiw',
'.image',
@@ -28,13 +28,19 @@
* `mw.popups.changeListeners`.
*
* @param {Redux.Store} store
+* @param {Object} actions
+* @param {ext.popups.UserSettings} userSettings
*/
- function registerChangeListeners( store, actions ) {
- $.each( mw.popups.changeListeners, function ( _,
changeListenerFactory ) {
- var changeListener = changeListenerFactory( actions );
+ function registerChangeListeners( store, actions, userSettings ) {
- mw.popups.registerChangeListener( store, changeListener
);
- } );
+ // Sugar.
+ var changeListeners = mw.popups.changeListeners,
+ registerChangeListener =
mw.popups.registerChangeListener;
+
+ registerChangeListener( store, changeListeners.footerLink(
actions ) );
+ registerChangeListener( store, changeListeners.linkTitle() );
+ registerChangeListener( store, changeListeners.render( actions
) );
+ registerChangeListener( store, changeListeners.previewCount(
userSettings ) );
}
/**
@@ -84,7 +90,7 @@
) )
);
actions = createBoundActions( store );
- registerChangeListeners( store, actions );
+ registerCh
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Add minimal eventLogging reducer
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325283
Change subject: Add minimal eventLogging reducer
..
Add minimal eventLogging reducer
Action changes:
* Include whether the user is logged in/out and information about the
current page in the BOOT action.
Reducer changes:
* Move all tokens and timing information from the preview reducer to the
eventLogging reducer.
Bug: T152223
Change-Id: I8a3f58358b211cc55417dcda7e796fe538e3d910
---
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
M resources/ext.popups/reducers.js
M tests/qunit/ext.popups/actions.test.js
A tests/qunit/ext.popups/reducers.eventLogging.test.js
M tests/qunit/ext.popups/reducers.test.js
6 files changed, 140 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/83/325283/1
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 98213b5..239aa91 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -37,15 +37,23 @@
* so as not to impact latency-critical events.
*
* @param {Function} isUserInCondition See `mw.popups.createExperiment`
-* @param {String} sessionToken
+* @param {mw.user} user
* @param {Function} generateToken
+* @param {mw.Map} config The config of the MediaWiki client-side
application,
+* i.e. `mw.config`
*/
- actions.boot = function ( isUserInCondition, sessionToken,
generateToken ) {
+ actions.boot = function ( isUserInCondition, user, generateToken,
config ) {
return {
type: types.BOOT,
isUserInCondition: isUserInCondition(),
- sessionToken: sessionToken,
- pageToken: generateToken()
+ sessionToken: user.sessionId(),
+ pageToken: generateToken(),
+ page: {
+ title: config.get( 'wgTitle' ),
+ namespaceID: config.get( 'wgNamespaceNumber' ),
+ id: config.get( 'wgArticleId' )
+ },
+ isUserAnon: user.isAnon()
};
};
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index e9a2f81..a2d9208 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -99,8 +99,9 @@
actions.boot(
isUserInCondition(),
- mw.user.sessionId(),
- generateToken
+ mw.user,
+ generateToken,
+ mw.config
);
mw.hook( 'wikipage.content' ).add( function ( $container ) {
diff --git a/resources/ext.popups/reducers.js b/resources/ext.popups/reducers.js
index cee40f7..7e4e0c7 100644
--- a/resources/ext.popups/reducers.js
+++ b/resources/ext.popups/reducers.js
@@ -46,12 +46,8 @@
if ( state === undefined ) {
state = {
enabled: undefined,
- sessionToken: undefined,
- pageToken: undefined,
- linkInteractionToken: undefined,
activeLink: undefined,
activeEvent: undefined,
- interactionStarted: undefined,
shouldShow: false,
isUserDwelling: false
};
@@ -60,16 +56,12 @@
switch ( action.type ) {
case mw.popups.actionTypes.BOOT:
return nextState( state, {
- enabled: action.isUserInCondition,
- sessionToken: action.sessionToken,
- pageToken: action.pageToken
+ enabled: action.isUserInCondition
} );
case mw.popups.actionTypes.LINK_DWELL:
return nextState( state, {
activeLink: action.el,
activeEvent: action.event,
- interactionStarted:
action.interactionStarted,
- linkInteractionToken:
action.linkInteractionToken,
// When the user dwells on a link with
their keyboard, a preview is
// renderered, and then dwells on
another link, the LINK_ABANDON_END
@@ -89,8 +81,6 @@
return
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Include user's preview count in BOOT action
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325286
Change subject: Include user's preview count in BOOT action
..
Include user's preview count in BOOT action
Action changes:
* Include user's preview count in the user property of the action.
Changes:
* Extract mw.popups.UserSettings#getPreviewCount and #setPreviewCount
and associated tests from the ext.popups.core module.
Bug: T152223
Change-Id: I6b7afef31311be8fede685deb536f577845cb9cf
---
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
M resources/ext.popups/counts.js
M resources/ext.popups/userSettings.js
M tests/qunit/ext.popups/actions.test.js
M tests/qunit/ext.popups/counts.test.js
M tests/qunit/ext.popups/reducers.eventLogging.test.js
M tests/qunit/ext.popups/userSettings.test.js
8 files changed, 195 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/86/325286/1
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 450e023..838f901 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -38,12 +38,20 @@
*
* @param {Function} isUserInCondition See `mw.popups.createExperiment`
* @param {mw.user} user
+* @param {ext.popups.UserSettings} userSettings
* @param {Function} generateToken
* @param {mw.Map} config The config of the MediaWiki client-side
application,
* i.e. `mw.config`
*/
- actions.boot = function ( isUserInCondition, user, generateToken,
config ) {
- var editCount = config.get( 'wgUserEditCount' );
+ actions.boot = function (
+ isUserInCondition,
+ user,
+ userSettings,
+ generateToken,
+ config
+ ) {
+ var editCount = config.get( 'wgUserEditCount' ),
+ previewCount = userSettings.getPreviewCount();
return {
type: types.BOOT,
@@ -57,7 +65,8 @@
user: {
isInCondition: isUserInCondition(),
isAnon: user.isAnon(),
- editCount: editCount
+ editCount: editCount,
+ previewCount: previewCount
}
};
};
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index a2d9208..05c077e 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -10,23 +10,6 @@
];
/**
-* Creates an experiment with sensible values for the depenencies.
-*
-* See `mw.popups.createExperiment`.
-*
-* @return {Function}
-*/
- function isUserInCondition() {
- var userSettings = mw.popups.createUserSettings( mw.storage,
mw.user );
-
- return mw.popups.createExperiment(
- mw.config,
- mw.user,
- userSettings
- );
- }
-
- /**
* Creates a gateway with sensible values for the dependencies.
*
* See `mw.popups.createGateway`.
@@ -80,8 +63,14 @@
var compose = Redux.compose,
store,
actions,
+
+ // So-called "services"
generateToken = mw.user.generateRandomSessionId,
- gateway = createGateway();
+ gateway = createGateway(),
+ userSettings = mw.popups.createUserSettings(
mw.storage, mw.user ),
+ isUserInCondition;
+
+ isUserInCondition = mw.popups.createExperiment( mw.config,
mw.user, userSettings );
// If debug mode is enabled, then enable Redux DevTools.
if ( mw.config.get( 'debug' ) === true ) {
@@ -98,8 +87,9 @@
registerChangeListeners( store, actions );
actions.boot(
- isUserInCondition(),
+ isUserInCondition,
mw.user,
+ userSettings,
generateToken,
mw.config
);
diff --git a/resources/ext.popups/counts.js b/resources/ext.popups/counts.js
index 47fed15..0c19281 100644
--- a/resources/ext.popups/counts.js
+++ b/resources/ext.popups/counts.js
@@ -31,4 +31,38 @@
return bucket + ' edits';
};
+ /**
+* Return count bucket for the number of previews a user has seen.
+*
+* If local storage isn't available - because the user has disabled it
+* or the browser doesn't support it - then then "unknown" is returned.
+*
+* Th
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Hygiene: Extract shared stub user object
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325284
Change subject: Hygiene: Extract shared stub user object
..
Hygiene: Extract shared stub user object
Changes:
* Extract the various shapes of stub user object into the shared
mw.popups.tests.stubs#createStubUser factory method.
* Register the ext.popups.tests.stubs module in
PopupsHooks#onResourceLoaderTestModules and make the test suite depend
on it.
Bug: T152223
Change-Id: I893b11461d8484bcaabfd950c2fa0dc672454a9d
---
M Popups.hooks.php
M tests/qunit/ext.popups/actions.test.js
M tests/qunit/ext.popups/experiment.test.js
A tests/qunit/ext.popups/stubs/index.js
A tests/qunit/ext.popups/stubs/user.js
M tests/qunit/ext.popups/userSettings.test.js
6 files changed, 50 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/84/325284/1
diff --git a/Popups.hooks.php b/Popups.hooks.php
index c3559d9..ccc5512 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -102,10 +102,23 @@
return substr( $script, $start );
}, $scripts );
+ $testModules['qunit']['ext.popups.tests.stubs'] = [
+ 'scripts' => [
+ 'tests/qunit/ext.popups/stubs/index.js',
+ 'tests/qunit/ext.popups/stubs/user.js',
+ ],
+ 'dependencies' => [
+ 'ext.popups', // The mw.popups is required.
+ ],
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => 'Popups',
+ ];
+
$testModules['qunit']['ext.popups.tests'] = [
'scripts' => $scripts,
'dependencies' => [
'ext.popups',
+ 'ext.popups.tests.stubs',
],
'localBasePath' => __DIR__,
'remoteExtPath' => 'Popups',
diff --git a/tests/qunit/ext.popups/actions.test.js
b/tests/qunit/ext.popups/actions.test.js
index 0907426..ff49db7 100644
--- a/tests/qunit/ext.popups/actions.test.js
+++ b/tests/qunit/ext.popups/actions.test.js
@@ -10,22 +10,13 @@
return '9876543210';
},
config = new mw.Map(),
- stubUser;
+ stubUser = mw.popups.tests.stubs.createStubUser( /*
isAnon = */ true );
config.set( {
wgTitle: 'Foo',
wgNamespaceNumber: 1,
wgArticleId: 2
} );
-
- stubUser = {
- sessionId: function () {
- return '0123456789';
- },
- isAnon: function () {
- return true;
- }
- };
assert.expect( 1 );
diff --git a/tests/qunit/ext.popups/experiment.test.js
b/tests/qunit/ext.popups/experiment.test.js
index 7dd8085..793da46 100644
--- a/tests/qunit/ext.popups/experiment.test.js
+++ b/tests/qunit/ext.popups/experiment.test.js
@@ -1,13 +1,5 @@
( function ( mw ) {
- function createStubUser( isAnon ) {
- return {
- isAnon: function () {
- return isAnon;
- }
- };
- }
-
function createStubUserSettings( hasIsEnabled ) {
return {
getToken: function () {
@@ -25,7 +17,7 @@
QUnit.module( 'ext.popups/experiment', {
setup: function () {
this.config = new mw.Map();
- this.user = createStubUser( /* isAnon = */ true );
+ this.user = mw.popups.tests.stubs.createStubUser( /*
isAnon = */ true );
this.userSettings = createStubUserSettings( /*
hasIsEnabled = */ false );
this.isUserInCondition = mw.popups.createExperiment(
this.config, this.user, this.userSettings );
}
@@ -38,7 +30,7 @@
} );
QUnit.test( '#isUserInCondition', 2, function ( assert ) {
- var user = createStubUser( /* isAnon = */ false ),
+ var user = mw.popups.tests.stubs.createStubUser( /* isAnon = */
false ),
isUserInCondition = mw.popups.createExperiment(
this.config, user, this.userSettings );
this.config.set( {
diff --git a/tests/qunit/ext.popups/stubs/index.js
b/tests/qunit/ext.popups/stubs/index.js
new file mode 100644
index 000..6c415fb
--- /dev/null
+++ b/tests/qunit/ext.popups/stubs/index.js
@@ -0,0 +1,9 @@
+( function ( mw ) {
+
+ // TODO: Thi
[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[wmf/1.29.0-wmf.4]: Use prefixedDbKey when redirecting to Electron
jenkins-bot has submitted this change and it was merged.
Change subject: Use prefixedDbKey when redirecting to Electron
..
Use prefixedDbKey when redirecting to Electron
Bug: T152113
Change-Id: I920834913aec01e5285a9723014463cbc0fc3c16
---
M specials/SpecialElectronPdf.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Addshore: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index e16b070..d9fe326 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -173,7 +173,7 @@
private function getServiceUrl( Title $title ) {
$restBaseUrl = $this->config->get(
'ElectronPdfServiceRESTbaseURL' );
- return $restBaseUrl . urlencode( $title->getPrefixedText() );
+ return $restBaseUrl . urlencode( $title->getPrefixedDBkey() );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/324791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I920834913aec01e5285a9723014463cbc0fc3c16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: wmf/1.29.0-wmf.4
Gerrit-Owner: Addshore
Gerrit-Reviewer: Addshore
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] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-05T10:00:01+0000
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2016-12-05T10:00:01+
..
New Wikidata Build - 2016-12-05T10:00:01+
Change-Id: Ie530d000496f608ddee2a04d40cfa1a5914e24bd
---
M composer.lock
A extensions/Wikibase/client/i18n/sty.json
M extensions/Wikibase/repo/i18n/ast.json
M vendor/composer/installed.json
4 files changed, 30 insertions(+), 19 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index d188793..f55d5e1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1585,12 +1585,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a"
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b946b675e628dcb586bcef000a96a81f652c164a";,
-"reference": "b946b675e628dcb586bcef000a96a81f652c164a",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b80daa060e9dc6e6d98920203a128362a9150517";,
+"reference": "b80daa060e9dc6e6d98920203a128362a9150517",
"shasum": ""
},
"require": {
@@ -1662,7 +1662,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2016-12-02 21:21:23"
+"time": "2016-12-04 21:41:34"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/sty.json
b/extensions/Wikibase/client/i18n/sty.json
new file mode 100644
index 000..f3b6ea6
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/sty.json
@@ -0,0 +1,11 @@
+{
+ "@metadata": {
+ "authors": [
+ "Khanmarat"
+ ]
+ },
+ "tooltip-t-wikibase": "Мәғлүмәтле репозиторийтағы пәйләнкән элементҡа
ссылка",
+ "wikibase-dataitem": "{{WBREPONAME}}ның элементы",
+ "wikibase-editlinks": "Ссылкаларны төсәткәле",
+ "wikibase-editlinkstitle": "Пашҡа телләртәге ссылкаларны төсәткәле"
+}
diff --git a/extensions/Wikibase/repo/i18n/ast.json
b/extensions/Wikibase/repo/i18n/ast.json
index 84c736c..57d639a 100644
--- a/extensions/Wikibase/repo/i18n/ast.json
+++ b/extensions/Wikibase/repo/i18n/ast.json
@@ -386,7 +386,7 @@
"apihelp-wbformatvalue-param-datatype": "El tipu de datu del valor.
Esto ye diferente del tipu del valor",
"apihelp-wbformatvalue-param-datavalue": "Los datos a los que dar
formatu. Esto tien que ser la serialización JSON d'un oxetu DataValue.",
"apihelp-wbformatvalue-param-options": "Les opciones que tien d'usar el
formateador. Daes como oxetu JSON.",
- "apihelp-wbformatvalue-param-property": "Id de propiedá a la que
pertenez el valor de los datos, tendría d'usase en llugar del parámetru
datatype.",
+ "apihelp-wbformatvalue-param-property": "ID de la propiedá a la que
pertenez el valor de los datos, tendría d'usase en llugar del parámetru
datatype.",
"apihelp-wbformatvalue-example-1": "Da formatu a un valor simple de
cadena de testu.",
"apihelp-wbformatvalue-example-2": "Da formatu a un valor de cadena de
testu como URL en HTML.",
"apihelp-wbgetclaims-description": "Recibe afirmaciones de Wikibase.",
@@ -421,12 +421,12 @@
"apihelp-wbgetentities-example-10": "Algamar l'elementu pa la páxina
«Berlin» del sitiu \"enwiki\", colos atributos de llingua del idioma inglés",
"apihelp-wbgetentities-example-11": "Algamar l'elementu de la páxina
«Berlin» del sitiu \"enwiki\" después de normalizar el títulu dende «berlin»",
"apihelp-wbgetentities-example-12": "Algamar los enllaces de sitiu del
elementu Q42",
- "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42
amosando sólo los enllaces d'enwiki",
+ "apihelp-wbgetentities-example-13": "Algamar les entidaes con ID Q42
amosando sólo los enllaces d'\"enwiki\"",
"apihelp-wblinktitles-description": "Asocia dos artículos de dos wikis
diferentes con un elementu de Wikibase.",
- "apihelp-wblinktitles-param-tosite": "Un identificador pal sitiu onde
ta allugada la páxina.\nÚsalu xunto con 'totitle' pa facer un enllaz completu
del sitiu.",
- "apihelp-wblinktitles-param-totitle": "Títulu de la páxina a
asociar.\nÚsalo xunto con 'tosite' pa crear un enllaz completu del sitiu.",
- "apihelp-wblinktitles-param-fromsite": "Un identificador pal sitiu nel
que ta asitiada la páxina.\nÚsalo xunto con 'fromtitle' pa crear un enllaz
completu del sitiu.",
- "apihelp-wblinktitles-param-fromtit
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable ElectronPdfService extension on test wikis & mediawik...
jenkins-bot has submitted this change and it was merged.
Change subject: Enable ElectronPdfService extension on test wikis &
mediawikiwiki
..
Enable ElectronPdfService extension on test wikis & mediawikiwiki
Bug: T150944
Change-Id: I3ec52bbcd3fd01e32bbf7e81bddccd6d8aa32edb
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 0c39c43..dde7c8d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -257,10 +257,6 @@
$wgCollectionCommandToServeURL[ 'zip_post' ] =
'https://pediapress.com/wmfup/';
}
-if ( $wmgUseElectronPdfService ) {
- wfLoadExtension( 'ElectronPdfService' );
-}
-
if ( $wmgUsePageImages ) {
require_once "$IP/extensions/PageImages/PageImages.php";
$wgPageImagesExpandOpenSearchXml = $wmgPageImagesExpandOpenSearchXml;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2e311e6..887cded 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1796,6 +1796,10 @@
$wgCollectionPortletFormats = $wmgCollectionPortletFormats;
}
+if ( $wmgUseElectronPdfService ) {
+ wfLoadExtension( 'ElectronPdfService' );
+}
+
# Various system to allow/prevent flooding
# (including exemptions for scheduled outreach events)
require( "$wmfConfigDir/throttle.php" );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d81235e..fbbabdd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12045,6 +12045,13 @@
// ta/gu/ml/ne/ur (T39154, T39384, T39672, T39374, T43714).
],
+'wmgUseElectronPdfService' => [
+ 'default' => false,
+ 'testwiki' => true, // T150944
+ 'test2wiki' => true, // T150944
+ 'mediawikiwiki' => true, // T150944
+],
+
'wmgUseSpamBlacklist' => [
'default' => true,
'private' => false,
--
To view, visit https://gerrit.wikimedia.org/r/324487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ec52bbcd3fd01e32bbf7e81bddccd6d8aa32edb
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: Set default review branch
jenkins-bot has submitted this change and it was merged. Change subject: Set default review branch .. Set default review branch Change-Id: I95648c5104da5aa48777ce879f2ac37564fd1779 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index ed8d8db..22e2acc 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceFoundation.git +defaultbranch=REL1_27 track=1 -- To view, visit https://gerrit.wikimedia.org/r/325258 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95648c5104da5aa48777ce879f2ac37564fd1779 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Dvogel hallowelt 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...BlueSpiceSMWConnector[REL1_27]: Set default review branch
jenkins-bot has submitted this change and it was merged. Change subject: Set default review branch .. Set default review branch Change-Id: I5116dcf3218e10bc9f40cc3235baf8ae88ec3349 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 359839e..adad360 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,6 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceSMWConnector.git +defaultbranch=REL1_27 track=1 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/325266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5116dcf3218e10bc9f40cc3235baf8ae88ec3349 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSMWConnector Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Dvogel hallowelt 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]: Set default review branch
jenkins-bot has submitted this change and it was merged. Change subject: Set default review branch .. Set default review branch Change-Id: I51d1b8b9c444c8c120a353e479940d598c5744e8 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index dca4900..6cf8fd3 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceExtensions.git +defaultbranch=REL1_27 track=1 -- To view, visit https://gerrit.wikimedia.org/r/325261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51d1b8b9c444c8c120a353e479940d598c5744e8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Dvogel hallowelt 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...BlueSpiceCategoryManager[REL1_27]: Set default review branch
jenkins-bot has submitted this change and it was merged. Change subject: Set default review branch .. Set default review branch Change-Id: I2410e0c1c960da10d402a8a322db4d682d16a607 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 76fa075..eacb7d5 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,6 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceCategoryManager.git +defaultbranch=REL1_27 track=1 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/325265 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2410e0c1c960da10d402a8a322db4d682d16a607 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceCategoryManager Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Dvogel hallowelt 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...BlueSpiceEditNotifyConnector[REL1_27]: Set default review branch
jenkins-bot has submitted this change and it was merged. Change subject: Set default review branch .. Set default review branch Change-Id: Ib044c8ecf05edef8461ef598403d7a8f2143f981 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index bf3c4c4..d847644 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,6 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/BlueSpiceEditNotifyConnector.git +defaultbranch=REL1_27 track=1 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/325263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib044c8ecf05edef8461ef598403d7a8f2143f981 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceEditNotifyConnector Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Mglaser 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...BlueSpiceSkin[REL1_27]: Set default review branch
jenkins-bot has submitted this change and it was merged. Change subject: Set default review branch .. Set default review branch Change-Id: I5cb5501cb974db48d272e83bd59e3353752f9042 --- M .gitreview 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 64b0efd..b60d89c 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/BlueSpiceSkin.git +defaultbranch=REL1_27 track=1 -- To view, visit https://gerrit.wikimedia.org/r/325262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cb5501cb974db48d272e83bd59e3353752f9042 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Dvogel hallowelt 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] wikimedia/wikimania-scholarships[master]: Use Special::MyLanguage when linking to wikis
jenkins-bot has submitted this change and it was merged. Change subject: Use Special::MyLanguage when linking to wikis .. Use Special::MyLanguage when linking to wikis Bug: T85533 Change-Id: I3fd16697c1131362b6a9064d8e6b1e4e4da6b5fb --- M data/i18n/en.json 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/data/i18n/en.json b/data/i18n/en.json index 603a8d8..4d988c4 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -27,16 +27,16 @@ "mock": "This is a mock scholarship application site only, use it just for testing.", - "not-open": "The 2017 Wikimania Scholarship process is not yet open. For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Main_Page\";>About Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Scholarships\";>About Scholarships\n", + "not-open": "The 2017 Wikimania Scholarship process is not yet open. For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>About Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\";>About Scholarships\n", - "deadline-passed": "Scholarship application deadline was February 16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result of their application.\nPlease see the scholarships page on the wiki for more details.", + "deadline-passed": "Scholarship application deadline was February 16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result of their application.\nPlease see the scholarships page on the wiki for more details.", - "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org\";>Wikimania 2017, the annual international conference centered on Wikimedia projects. Awardees will receive a scholarship which will cover conference registration fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada , Aug 9-13, 2017.\nApplications may be submitted in any language, but every applicant must provide evidence of English language abilities that are at a level which would enable them to participate in Wikimania, a conference which is primarily conducted in English. Sufficient English abilities could be demonstrated in the application itself or elsewhere.\nThis is not a scholarship for university study. Applications not obviously related to the conference will be discarded.\nPlease carefully consider your financial needs before applying for a scholarship to attend Wikimania. There are limited funds available and many applicants do not have the financial means to attend Wikimania without this opportunity. Thank you.\nPlease note that if you need more then 10 minutes to complete this application, please draft your answers in a text editor, reload this page and then copy-paste your answers into corresponding fields before submitting. This application may give an error (\"Missing or invalid CSRF token\") if it is open for more then 15 minutes before submitting.\nThe deadline to apply is February 16, 23:59 UTC. ", + "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania 2017, the annual international conference centered on Wikimedia projects. Awardees will receive a scholarship which will cover conference registration fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada , Aug 9-13, 2017.\nApplications may be submitted in any language, but every applicant must provide evidence of English language abilities that are at a level which would enable them to participate in Wikimania, a conference which is primarily conducted in English. Sufficient English abilities could be demonstrated in the application itself or elsewhere.\nThis is not a scholarship for university study. Applications not obviously related to the conference will be discarded.\nPlease carefully consider your financial needs before applying for a scholarship to attend Wikimania. There are limited funds available and many applicants do not have the financial means to attend Wikimania without this opportunity. Thank you.\nPlease note that if you need more then 10 minutes to complete this application, please draft your answers in a text editor, reload this page and then copy-paste your answers into corresponding fields before submitting. This application may give an error (\"Missing or invalid CSRF token\") if it is open for more then 15 minutes before submitting.\nThe deadline to apply is February 16, 23:59 UTC. ", - "form-intro-faq": "Frequently asked questions", + "form-intro-faq": "Frequently asked questions", "form-scholarship-type": "Type of Scholarship", - "form-scholarship": "This year for Wikimania 2017, th
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add ElectronPdfService to extension-list
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/325288 Change subject: Add ElectronPdfService to extension-list .. Add ElectronPdfService to extension-list Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265 --- M wmf-config/extension-list 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/88/325288/1 diff --git a/wmf-config/extension-list b/wmf-config/extension-list index 7c5ab66..1754e05 100644 --- a/wmf-config/extension-list +++ b/wmf-config/extension-list @@ -37,6 +37,7 @@ $IP/extensions/Echo/Echo.php $IP/extensions/EducationProgram/EducationProgram.php $IP/extensions/Elastica/extension.json +$IP/extensions/ElectronPdfService/extension.json $IP/extensions/EventBus/extension.json $IP/extensions/EventLogging/extension.json $IP/extensions/ExtensionDistributor/extension.json -- To view, visit https://gerrit.wikimedia.org/r/325288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add ElectronPdfService to extension-list
jenkins-bot has submitted this change and it was merged. Change subject: Add ElectronPdfService to extension-list .. Add ElectronPdfService to extension-list Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265 --- M wmf-config/extension-list 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/extension-list b/wmf-config/extension-list index 7c5ab66..1754e05 100644 --- a/wmf-config/extension-list +++ b/wmf-config/extension-list @@ -37,6 +37,7 @@ $IP/extensions/Echo/Echo.php $IP/extensions/EducationProgram/EducationProgram.php $IP/extensions/Elastica/extension.json +$IP/extensions/ElectronPdfService/extension.json $IP/extensions/EventBus/extension.json $IP/extensions/EventLogging/extension.json $IP/extensions/ExtensionDistributor/extension.json -- To view, visit https://gerrit.wikimedia.org/r/325288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a7e49da3284043543f7300e593a7269edd4a265 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore 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...varnish4[debian-wmf]: Release 4.1.4-1wm1
Ema has uploaded a new change for review. https://gerrit.wikimedia.org/r/325289 Change subject: Release 4.1.4-1wm1 .. Release 4.1.4-1wm1 Change-Id: Id9499a10edd97f41b5c7b6dcc486d1509fc3eb17 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish4 refs/changes/89/325289/1 diff --git a/debian/changelog b/debian/changelog index 319edd8..ff68cd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +varnish (4.1.4-1wm1) jessie-wikimedia; urgency=medium + + * New upstream release. + + -- Emanuele Rocca Mon, 05 Dec 2016 13:19:31 +0100 + varnish (4.1.3-1wm4) jessie-wikimedia; urgency=medium * Make extrachance upper bound configurable. -- To view, visit https://gerrit.wikimedia.org/r/325289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9499a10edd97f41b5c7b6dcc486d1509fc3eb17 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish4 Gerrit-Branch: debian-wmf Gerrit-Owner: Ema ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Add Insertables to Wikimedia iOS app
jenkins-bot has submitted this change and it was merged. Change subject: Add Insertables to Wikimedia iOS app .. Add Insertables to Wikimedia iOS app Bug: T150255 Change-Id: Ia5e34a4a8ed0216ad711d7d4b04a8060eb4e51b8 --- M groups/Wikimedia/WikimediaMobile-ios.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified Objections: John Vandenberg: There's a problem with this change, please improve diff --git a/groups/Wikimedia/WikimediaMobile-ios.yaml b/groups/Wikimedia/WikimediaMobile-ios.yaml index b787035..8d8c4cd 100644 --- a/groups/Wikimedia/WikimediaMobile-ios.yaml +++ b/groups/Wikimedia/WikimediaMobile-ios.yaml @@ -10,6 +10,9 @@ patterns: - "*" + INSERTABLES: +class: MediaWikiInsertablesSuggester + --- BASIC: icon: wiki://Wikipedia-logo-v2.svg -- To view, visit https://gerrit.wikimedia.org/r/324700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5e34a4a8ed0216ad711d7d4b04a8060eb4e51b8 Gerrit-PatchSet: 4 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: SacredWKnight Gerrit-Reviewer: Amire80 Gerrit-Reviewer: Bgerstle Gerrit-Reviewer: John Vandenberg 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...TemplateData[master]: Move all init code over to target
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325290
Change subject: Move all init code over to target
..
Move all init code over to target
Change-Id: I9ba06bb3a57a7683e246461341c67462cab465d0
---
M extension.json
M modules/ext.templateDataGenerator.editPage.js
M modules/ext.templateDataGenerator.target.js
D modules/ext.templateDataGenerator.ui.js
4 files changed, 280 insertions(+), 333 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/90/325290/1
diff --git a/extension.json b/extension.json
index a946024..ad6d70a 100644
--- a/extension.json
+++ b/extension.json
@@ -74,7 +74,6 @@
"styles": "modules/ext.templateDataGenerator.ui.css",
"scripts": [
"modules/ext.templateDataGenerator.target.js",
- "modules/ext.templateDataGenerator.ui.js",
"modules/widgets/ext.templateDataGenerator.paramSelectWidget.js",
"modules/widgets/ext.templateDataGenerator.paramWidget.js",
"modules/widgets/ext.templateDataGenerator.paramImportWidget.js",
diff --git a/modules/ext.templateDataGenerator.editPage.js
b/modules/ext.templateDataGenerator.editPage.js
index 521b04d..30d7fb0 100644
--- a/modules/ext.templateDataGenerator.editPage.js
+++ b/modules/ext.templateDataGenerator.editPage.js
@@ -10,7 +10,7 @@
/* global ve */
$( function () {
- var pieces, isDocPage,
+ var pieces, isDocPage, target,
pageName = mw.config.get( 'wgPageName' ),
config = {
pageName: pageName,
@@ -43,21 +43,15 @@
// Textbox wikitext editor
if ( $textbox.length ) {
// Prepare the editor
- mw.libs.tdgUi.init(
- $( '#mw-content-text' ),
- new mw.TemplateData.TextareaTarget( $textbox ),
- config
- );
+ target = new mw.TemplateData.TextareaTarget( $textbox,
config );
+ $( '#mw-content-text' ).prepend( target.$element );
}
// Visual editor source mode
mw.hook( 've.activationComplete' ).add( function () {
var surface = ve.init.target.getSurface();
if ( surface.getMode() === 'source' ) {
- mw.libs.tdgUi.init(
- $(
'.ve-init-mw-desktopArticleTarget-originalContent' ),
- new mw.TemplateData.VETarget( surface ),
- config
- );
+ target = new mw.TemplateData.VETarget( surface,
config );
+ $(
'.ve-init-mw-desktopArticleTarget-originalContent' ).prepend( target.$element );
}
} );
mw.hook( 've.deactivate' ).add( function () {
diff --git a/modules/ext.templateDataGenerator.target.js
b/modules/ext.templateDataGenerator.target.js
index dc4d45f..50d1a81 100644
--- a/modules/ext.templateDataGenerator.target.js
+++ b/modules/ext.templateDataGenerator.target.js
@@ -7,16 +7,94 @@
* @mixin OO.EventEmitter
*
* @constructor
+ * @param {Object} config Configuration options
*/
-mw.TemplateData.Target = function mwTemplateDataTarget() {
+mw.TemplateData.Target = function mwTemplateDataTarget( config ) {
+ var $helpLink, relatedPage,
+ target = this;
+
// Parent constructor
mw.TemplateData.Target.super.apply( this, arguments );
// Mixin constructor
OO.EventEmitter.call( this );
- this.$element.addClass( 'tdg-editscreen-main' );
- // TODO: Move more init code into this class
+ this.pageName = config.pageName;
+ this.parentPage = config.parentPage;
+ this.isPageSubLevel = !!config.isPageSubLevel;
+ this.isDocPage = !!config.isDocPage;
+
+ this.editOpenDialogButton = new OO.ui.ButtonWidget( {
+ label: mw.msg( 'templatedata-editbutton' )
+ } );
+
+ this.editNoticeLabel = new OO.ui.LabelWidget( {
+ classes: [ 'tdg-editscreen-error-msg' ]
+ } )
+ .toggle( false );
+
+ $helpLink = $( '' )
+ .attr( {
+ href: mw.msg( 'templatedata-helplink-target' ),
+ target: '_blank'
+ } )
+ .addClass( 'tdg-editscreen-main-helplink' )
+ .text( mw.msg( 'templatedata-helplink' ) );
+
+ this.windowManager = OO.ui.getWindowManager();
+
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Add db structure for keeping info about labsdb accounts
Yuvipanda has submitted this change and it was merged.
Change subject: labs: Add db structure for keeping info about labsdb accounts
..
labs: Add db structure for keeping info about labsdb accounts
Bug: T149933
Change-Id: If98e7877151173623b96b168d44a82464b6e59e0
---
A modules/role/files/labs/db/maintain-dbusers.sql
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
Jcrespo: Looks good to me, but someone else must approve
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/files/labs/db/maintain-dbusers.sql
b/modules/role/files/labs/db/maintain-dbusers.sql
new file mode 100644
index 000..da867b7
--- /dev/null
+++ b/modules/role/files/labs/db/maintain-dbusers.sql
@@ -0,0 +1,20 @@
+-- Keep state about tool / user accounts on tool labs and their mysql
+-- account counterparts. This is the canonical store of this information.
+-- Schema is set up to be able to trivially query the following things:
+-- 1. What labsdb hosts does this tool / user *not* have an account on.
+-- 2. What's the mysql username / password for this tool / user.
+CREATE TABLE accounts(
+id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+mysql_username VARCHAR(255) NOT NULL,
+type enum('tool', 'user') NOT NULL,
+username VARCHAR(255) NOT NULL,
+password VARCHAR(255) NOT NULL,
+) CHARSET=utf8mb4;
+CREATE UNIQUE INDEX account_type ON accounts(type, username);
+
+CREATE TABLE account_hosts(
+id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+account_id INT UNSIGNED NOT NULL,
+hostname VARCHAR(255) NOT NULL,
+) CHARSET=utf8mb4;
+CREATE INDEX account_host_status ON accounts(account_id, hostname);
--
To view, visit https://gerrit.wikimedia.org/r/325268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If98e7877151173623b96b168d44a82464b6e59e0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: StringHelper: Added return statement with boolean
Mglaser has submitted this change and it was merged. Change subject: StringHelper: Added return statement with boolean .. StringHelper: Added return statement with boolean Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af --- M includes/utility/StringHelper.class.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/utility/StringHelper.class.php b/includes/utility/StringHelper.class.php index 11a22f8..744a457 100644 --- a/includes/utility/StringHelper.class.php +++ b/includes/utility/StringHelper.class.php @@ -167,6 +167,7 @@ case self::FILTER_EQUALSNOT: return $sHaystack !== $sNeedle; } + return false; } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Dvogel hallowelt 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...BlueSpiceFoundation[REL1_27]: StringHelper: Added return statement with boolean
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/325291 Change subject: StringHelper: Added return statement with boolean .. StringHelper: Added return statement with boolean Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af (cherry picked from commit f9889a894f9033b0e359bde8618a4cf1ee3eebd9) --- M includes/utility/StringHelper.class.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/91/325291/1 diff --git a/includes/utility/StringHelper.class.php b/includes/utility/StringHelper.class.php index 11a22f8..744a457 100644 --- a/includes/utility/StringHelper.class.php +++ b/includes/utility/StringHelper.class.php @@ -167,6 +167,7 @@ case self::FILTER_EQUALSNOT: return $sHaystack !== $sNeedle; } + return false; } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: REL1_27 Gerrit-Owner: Mglaser 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/core[master]: Use single quotes
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325292
Change subject: Use single quotes
..
Use single quotes
Follow-up to Icc9bc096
Change-Id: I4863e0e7946fd59022846198e86302f556fee617
---
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/92/325292/1
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 23720a8..b2fac3c 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -50,7 +50,7 @@
mw.config.set( 'wgUserLanguage', 'en' );
assert.equal( mw.language.convertNumber( 1800 ), '1.800',
'formatting' );
- assert.equal( mw.language.convertNumber( "1.800", true ),
'1800', 'unformatting' );
+ assert.equal( mw.language.convertNumber( '1.800', true ),
'1800', 'unformatting' );
} );
function grammarTest( langCode, test ) {
--
To view, visit https://gerrit.wikimedia.org/r/325292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4863e0e7946fd59022846198e86302f556fee617
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: StringHelper: Added return statement with boolean
jenkins-bot has submitted this change and it was merged. Change subject: StringHelper: Added return statement with boolean .. StringHelper: Added return statement with boolean Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af (cherry picked from commit f9889a894f9033b0e359bde8618a4cf1ee3eebd9) --- M includes/utility/StringHelper.class.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/utility/StringHelper.class.php b/includes/utility/StringHelper.class.php index 11a22f8..744a457 100644 --- a/includes/utility/StringHelper.class.php +++ b/includes/utility/StringHelper.class.php @@ -167,6 +167,7 @@ case self::FILTER_EQUALSNOT: return $sHaystack !== $sNeedle; } + return false; } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5be0ab0cd8cb1b2be92a8c236d90c8a9a12b9af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: REL1_27 Gerrit-Owner: Mglaser Gerrit-Reviewer: Dvogel hallowelt 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...WikimediaMessages[master]: Add inflected forms of sitename on Finnish Wikivoyage
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/325293 Change subject: Add inflected forms of sitename on Finnish Wikivoyage .. Add inflected forms of sitename on Finnish Wikivoyage Bug: T152376 Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10 --- M WikimediaMessages.hooks.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages refs/changes/93/325293/1 diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php index 61282b3..f7442ea 100644 --- a/WikimediaMessages.hooks.php +++ b/WikimediaMessages.hooks.php @@ -825,26 +825,31 @@ 'Wikiuutiset' => 'Wikiuutisten', 'Wikisitaatit' => 'Wikisitaattien', 'Wikimedia Suomi' => 'Wikimedia Suomen', + 'Wikimatkat' => 'Wikimatkojen', ), 'partitive' => array( 'Wikiuutiset' => 'Wikiuutisia', 'Wikisitaatit' => 'Wikisitaatteja', 'Wikimedia Suomi' => 'Wikimedia Suomea', + 'Wikimatkat' => 'Wikimatkoja', ), 'elative' => array( 'Wikiuutiset' => 'Wikiuutisista', 'Wikisitaatit' => 'Wikisitaateista', 'Wikimedia Suomi' => 'Wikimedia Suomesta', + 'Wikimatkat' => 'Wikimatkoista', ), 'inessive' => array( 'Wikiuutiset' => 'Wikiuutisissa', 'Wikisitaatit' => 'Wikisitaateissa', 'Wikimedia Suomi' => 'Wikimedia Suomessa', + 'Wikimatkat' => 'Wikimatkoissa', ), 'illative' => array( 'Wikiuutiset' => 'Wikiuutisiin', 'Wikisitaatit' => 'Wikisitaatteihin', 'Wikimedia Suomi' => 'Wikimedia Suomeen', + 'Wikimatkat' => 'Wikimatkoihin', ), ); # fi -- To view, visit https://gerrit.wikimedia.org/r/325293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc5b1e4f1a58e8f4c63f7fccbd6ee3b7f4116b10 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: master Gerrit-Owner: Nikerabbit ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1087
Marostegui has uploaded a new change for review. https://gerrit.wikimedia.org/r/325294 Change subject: db-eqiad.php: Depool db1087 .. db-eqiad.php: Depool db1087 db1087 needs an ALTER table, so needs to be depooled Bug: T148967 Change-Id: Ib4c96d38bb2bd7d7ffbbc2ef7ce85fd9e289831a --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/94/325294/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c9d6a52..2b4f30d 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -145,7 +145,7 @@ 'db1070' => 50, # 2.8TB 160GB, api, old master 'db1071' => 50, # 2.8TB 160GB, api 'db1082' => 500, # 3.6TB 512GB - 'db1087' => 500, # 3.6TB 512GB +# 'db1087' => 500, # 3.6TB 512GB 'db1092' => 500, # 3.6TB 512GB ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/325294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4c96d38bb2bd7d7ffbbc2ef7ce85fd9e289831a 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-eqiad.php: Depool db1087
jenkins-bot has submitted this change and it was merged. Change subject: db-eqiad.php: Depool db1087 .. db-eqiad.php: Depool db1087 db1087 needs an ALTER table, so needs to be depooled Bug: T148967 Change-Id: Ib4c96d38bb2bd7d7ffbbc2ef7ce85fd9e289831a --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c9d6a52..5905050 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -145,7 +145,7 @@ 'db1070' => 50, # 2.8TB 160GB, api, old master 'db1071' => 50, # 2.8TB 160GB, api 'db1082' => 500, # 3.6TB 512GB - 'db1087' => 500, # 3.6TB 512GB +# 'db1087' => 500, # 3.6TB 512GB #T148967 'db1092' => 500, # 3.6TB 512GB ], 's6' => [ -- To view, visit https://gerrit.wikimedia.org/r/325294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4c96d38bb2bd7d7ffbbc2ef7ce85fd9e289831a 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] mediawiki...Wikibase[master]: EditorConfig file
jenkins-bot has submitted this change and it was merged. Change subject: EditorConfig file .. EditorConfig file EditorConfig format standardizes some formatting properties across different editors and simplifies setting up IDE formatting. For more info see http://editorconfig.org Change-Id: Iba6f964bf403467c02e8e2cebf32914ac249007b --- A .editorconfig 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000..452169f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +# http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = tab +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.php] +max_line_length = 140 +quote_type = single +spaces_around_operators = true +spaces_around_brackets = inside +indent_brace_style = K&R -- To view, visit https://gerrit.wikimedia.org/r/324937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba6f964bf403467c02e8e2cebf32914ac249007b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) Gerrit-Reviewer: Jonas Kress (WMDE) Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: WMDE-leszek Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Update Semantic extensions part 1
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325295
Change subject: Update Semantic extensions part 1
..
Update Semantic extensions part 1
Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
---
M translatewiki-composer.json
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/95/325295/1
diff --git a/translatewiki-composer.json b/translatewiki-composer.json
index d9e4451..ca6ad15 100644
--- a/translatewiki-composer.json
+++ b/translatewiki-composer.json
@@ -1,8 +1,8 @@
{
"require": {
- "mediawiki/semantic-maps": "~3.4",
-"mediawiki/maps": "~3.8",
-"mediawiki/semantic-media-wiki": "~2.4",
+"mediawiki/maps": "~4.0",
+"mediawiki/page-forms": "~4.0",
+ "mediawiki/semantic-media-wiki": "~2.4",
"romaricdrigon/metayaml": "~1.0"
},
"extra": {
--
To view, visit https://gerrit.wikimedia.org/r/325295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Use camel case for statsd metric names
jenkins-bot has submitted this change and it was merged.
Change subject: Use camel case for statsd metric names
..
Use camel case for statsd metric names
Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
---
M includes/specials/SpecialCreateTopicPage.php
M
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
M
modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialCreateTopicPage.php
b/includes/specials/SpecialCreateTopicPage.php
index 167bd83..2288a40 100644
--- a/includes/specials/SpecialCreateTopicPage.php
+++ b/includes/specials/SpecialCreateTopicPage.php
@@ -28,7 +28,7 @@
$this->setHeaders();
if ( $this->getRequest()->getVal( 'ref' ) === 'button' ) {
$statsd =
MediaWikiServices::getInstance()->getStatsdDataFactory();
- $statsd->increment(
'wikibase.articleplaceholder.button.create-article' );
+ $statsd->increment(
'wikibase.articleplaceholder.button.createArticle' );
}
$page = $this->getRequest()->getVal( 'wptitleinput', $par );
if ( $page === '' || $page === null ) {
diff --git
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
index bd8f55d..7ed4baa 100644
---
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
+++
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js
@@ -41,7 +41,7 @@
return
CreateArticleTranslationDialog.super.prototype.onSubmit.apply( this );
}
- mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.translate-article' );
+ mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.translateArticle' );
mw.loader.using( 'ext.cx.sitemapper' ).then( function () {
document.location.href =
mw.cx.SiteMapper.prototype.getCXUrl(
diff --git
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
index 4ea6b57..b0264d4 100644
---
a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
+++
b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.newArticle.js
@@ -19,7 +19,7 @@
windowManager.addWindows( [ dialog ] );
OO.ui.infuse( 'new-article-button' ).on( 'click', function () {
- mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.create-article' );
+ mw.track(
'counter.MediaWiki.wikibase.articleplaceholder.button.createArticle' );
windowManager.openWindow( dialog );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/325282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I947723fe2457a6fc720c1cf8458800882959f6e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jonas Kress (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] mediawiki...Gadgets[master]: Gadgets.alias.php translation for bengali
jenkins-bot has submitted this change and it was merged. Change subject: Gadgets.alias.php translation for bengali .. Gadgets.alias.php translation for bengali Change-Id: I843615496190fb22babae751d58805b73904e4ea --- M Gadgets.alias.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/Gadgets.alias.php b/Gadgets.alias.php index d6b8d2d..c4688f6 100644 --- a/Gadgets.alias.php +++ b/Gadgets.alias.php @@ -55,6 +55,12 @@ 'Gadgets' => array( 'Pakakas' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'Gadgets' => array( 'গ্যাজেট' ), + 'GadgetUsage' => array( 'গ্যাজেট_ব্যবহার' ), +); + /** Breton (brezhoneg) */ $specialPageAliases['br'] = array( 'Gadgets' => array( 'Bitrakoù' ), -- To view, visit https://gerrit.wikimedia.org/r/323888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I843615496190fb22babae751d58805b73904e4ea Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Gadgets Gerrit-Branch: master Gerrit-Owner: Aftab Gerrit-Reviewer: Raimond Spekking 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] integration/config[master]: Fix up seb35 email
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/325296 Change subject: Fix up seb35 email .. Fix up seb35 email Change-Id: I57d20d99d1c40c182dad8f95c8bca06352d8c9b2 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/96/325296/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index cfadaa3..a40eb27 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -189,7 +189,7 @@ | santhosh\.thottingal@gmail\.com | saper@saper\.info | se4598@gmx\.de -| seb35@seb35\.fr +| seb35wikipedia@gmail\.com | sebastian\.berlin@wikimedia\.se | shahyar@gmail\.com | siebrand@kitano\.nl @@ -418,7 +418,7 @@ - ^vogel@hallowelt\.biz$ # Robert Vogel - ^saper@saper\.info$ - ^se4598@gmx\.de$ - - ^seb35@seb35\.fr$ + - ^seb35wikipedia@gmail\.com$ - ^skizzerz@skizzerz\.net$ - ^strigiwm@gmail\.com$ # MarcoAurelio - ^s7eph4n@gmail\.org$ # Foxtrott -- To view, visit https://gerrit.wikimedia.org/r/325296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57d20d99d1c40c182dad8f95c8bca06352d8c9b2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Fix up seb35 email
jenkins-bot has submitted this change and it was merged. Change subject: Fix up seb35 email .. Fix up seb35 email Change-Id: I57d20d99d1c40c182dad8f95c8bca06352d8c9b2 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index cfadaa3..a40eb27 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -189,7 +189,7 @@ | santhosh\.thottingal@gmail\.com | saper@saper\.info | se4598@gmx\.de -| seb35@seb35\.fr +| seb35wikipedia@gmail\.com | sebastian\.berlin@wikimedia\.se | shahyar@gmail\.com | siebrand@kitano\.nl @@ -418,7 +418,7 @@ - ^vogel@hallowelt\.biz$ # Robert Vogel - ^saper@saper\.info$ - ^se4598@gmx\.de$ - - ^seb35@seb35\.fr$ + - ^seb35wikipedia@gmail\.com$ - ^skizzerz@skizzerz\.net$ - ^strigiwm@gmail\.com$ # MarcoAurelio - ^s7eph4n@gmail\.org$ # Foxtrott -- To view, visit https://gerrit.wikimedia.org/r/325296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57d20d99d1c40c182dad8f95c8bca06352d8c9b2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Special:TranslationStats: start using datetime-local format
jenkins-bot has submitted this change and it was merged.
Change subject: Special:TranslationStats: start using datetime-local format
..
Special:TranslationStats: start using datetime-local format
This should help if we want to migrate to browser native datetime
input which uses this format.
Change-Id: I9185ffe9fa8e991c33c2f5910bfc2c79d9e63f48
---
M resources/js/ext.translate.special.translationstats.js
M specials/SpecialTranslationStats.php
2 files changed, 4 insertions(+), 13 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.translationstats.js
b/resources/js/ext.translate.special.translationstats.js
index 9440e5f..2e55304 100644
--- a/resources/js/ext.translate.special.translationstats.js
+++ b/resources/js/ext.translate.special.translationstats.js
@@ -14,23 +14,14 @@
// Based on UploadWizard, TranslationNotifications
$( '#start' )
.datepicker( {
- dateFormat: 'yymmdd',
+ dateFormat: 'yy-mm-ddT00:00:00',
constrainInput: false,
showOn: 'focus',
changeMonth: true,
changeYear: true,
showAnim: false,
showButtonPanel: true,
- maxDate: new Date(),
- onClose: function ( dateText, inst ) {
- // TranslationStats works with the
mmddhhmmss format,
- // so zeros that represents generic hh:mm:ss
must be added.
- // The zeros are added only if a date was
actually selected
- // and is not currently displayed.
- if ( dateText !== '' && inst.input.val().length
< 14 ) {
- inst.input.val( dateText + '00' );
- }
- }
+ maxDate: new Date()
} )
.attr( 'autocomplete', 'off' );
} );
diff --git a/specials/SpecialTranslationStats.php
b/specials/SpecialTranslationStats.php
index 6643f79..2eb7303 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -92,7 +92,7 @@
$opts->validateIntBounds( 'height', 200, 1000 );
if ( $opts['start'] !== '' ) {
- $opts['start'] = (string)( wfTimestamp( TS_MW,
$opts['start'] ) );
+ $opts['start'] = rtrim( wfTimestamp( TS_ISO_8601,
$opts['start'] ), 'Z' );
}
$validScales = array( 'months', 'weeks', 'days', 'hours' );
@@ -166,7 +166,7 @@
$this->eInput( 'width', $opts ) .
$this->eInput( 'height', $opts ) .
'' .
- $this->eInput( 'start', $opts, 16 ) . // Should
fit mmddhhmmss
+ $this->eInput( 'start', $opts, 24 ) .
$this->eInput( 'days', $opts ) .
$this->eRadio( 'scale', $opts, array( 'months',
'weeks', 'days', 'hours' ) ) .
$this->eRadio( 'count', $opts,
$this->getGraphTypes() ) .
--
To view, visit https://gerrit.wikimedia.org/r/310331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9185ffe9fa8e991c33c2f5910bfc2c79d9e63f48
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: KartikMistry
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Update Semantic extensions part 1
jenkins-bot has submitted this change and it was merged.
Change subject: Update Semantic extensions part 1
..
Update Semantic extensions part 1
Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
---
M translatewiki-composer.json
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/translatewiki-composer.json b/translatewiki-composer.json
index d9e4451..ca6ad15 100644
--- a/translatewiki-composer.json
+++ b/translatewiki-composer.json
@@ -1,8 +1,8 @@
{
"require": {
- "mediawiki/semantic-maps": "~3.4",
-"mediawiki/maps": "~3.8",
-"mediawiki/semantic-media-wiki": "~2.4",
+"mediawiki/maps": "~4.0",
+"mediawiki/page-forms": "~4.0",
+ "mediawiki/semantic-media-wiki": "~2.4",
"romaricdrigon/metayaml": "~1.0"
},
"extra": {
--
To view, visit https://gerrit.wikimedia.org/r/325295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf6a9ddfef19e08d43edc1b09c198f92695b3a08
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
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] translatewiki[master]: Update semantic extensions part 2
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/325297 Change subject: Update semantic extensions part 2 .. Update semantic extensions part 2 Change-Id: I3e04e8bad2dd69814f115d6d6c426daaa3a91da6 --- M TranslatewikiSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/97/325297/1 diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index 5cdc993..b7e6093 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -272,7 +272,7 @@ $smwgNamespacesWithSemanticLinks[92/*NS_LQT_SUMMARY*/] = true; $smwgEnabledEditPageHelp = false; -wfLoadExtension( 'SemanticForms' ); +wfLoadExtension( 'PageForms' ); $sfgRedLinksCheckOnlyLocalProps = true; $wgNoFollowDomainExceptions = [ -- To view, visit https://gerrit.wikimedia.org/r/325297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e04e8bad2dd69814f115d6d6c426daaa3a91da6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Update semantic extensions part 2
jenkins-bot has submitted this change and it was merged. Change subject: Update semantic extensions part 2 .. Update semantic extensions part 2 Change-Id: I3e04e8bad2dd69814f115d6d6c426daaa3a91da6 --- M TranslatewikiSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index 5cdc993..b7e6093 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -272,7 +272,7 @@ $smwgNamespacesWithSemanticLinks[92/*NS_LQT_SUMMARY*/] = true; $smwgEnabledEditPageHelp = false; -wfLoadExtension( 'SemanticForms' ); +wfLoadExtension( 'PageForms' ); $sfgRedLinksCheckOnlyLocalProps = true; $wgNoFollowDomainExceptions = [ -- To view, visit https://gerrit.wikimedia.org/r/325297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e04e8bad2dd69814f115d6d6c426daaa3a91da6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit 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] operations/puppet[production]: Add user and passwords for labspuppet and labsdbaccounts
Jcrespo has submitted this change and it was merged.
Change subject: Add user and passwords for labspuppet and labsdbaccounts
..
Add user and passwords for labspuppet and labsdbaccounts
* Delete references to dbproxy1010, which no longer services m5
Bug: T152377
Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7
---
M modules/role/manifests/mariadb.pp
M templates/mariadb/production-grants-m5.sql.erb
2 files changed, 21 insertions(+), 2 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
Yuvipanda: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index e391b6c..9472360 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -28,6 +28,8 @@
include passwords::prometheus
include passwords::servermon
include passwords::striker
+include passwords::labspuppet
+include passwords::labsdbaccounts
$root_pass = $passwords::misc::scripts::mysql_root_pass
$repl_pass = $passwords::misc::scripts::mysql_repl_pass
@@ -60,6 +62,8 @@
$servermon_pass = $passwords::servermon::db_password
$striker_pass= $passwords::striker::application_db_password
$striker_admin_pass = $passwords::striker::admin_db_password
+$labspuppet_pass = $passwords::labspuppet::db_password
+$labsdbaccounts_pass = $passwords::labsdbaccounts::db_password
file { '/etc/mysql/production-grants-shard.sql':
ensure => present,
diff --git a/templates/mariadb/production-grants-m5.sql.erb
b/templates/mariadb/production-grants-m5.sql.erb
index bef362d..27f51bb 100644
--- a/templates/mariadb/production-grants-m5.sql.erb
+++ b/templates/mariadb/production-grants-m5.sql.erb
@@ -1,6 +1,5 @@
-- haproxy
CREATE USER 'haproxy'@'10.64.16.155';
-CREATE USER 'haproxy'@'10.64.48.97';
-- designate, labservices1002
@@ -140,4 +139,20 @@
-- labspuppetbackend user, will run on the labs puppetmaster host --
GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
-ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92';
+ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92'
+IDENTIFIED BY '<%= @labspuppet_pass %>';
+
+GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
+ON `labspuppet`.* TO 'labspuppet'@'10.64.16.155'
+IDENTIFIED BY '<%= @labspuppet_pass %>';
+
+-- labsdbaccounts user, will run from labstore1004 and 1005
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.19'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.20'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
+
+GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.16.155'
+IDENTIFIED BY '<%= @labsdbaccounts_pass %>';
--
To view, visit https://gerrit.wikimedia.org/r/325271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...source[master]: Update version number in pom files
Joal has uploaded a new change for review. https://gerrit.wikimedia.org/r/325299 Change subject: Update version number in pom files .. Update version number in pom files An error occurred during previous deployment leading to incorrect new devlopement version number. This patch correct the problem. Change-Id: I31d8e6351fe740a5019c39cfac8c3493f39e88d9 --- M pom.xml M refinery-camus/pom.xml M refinery-cassandra/pom.xml M refinery-core/pom.xml M refinery-hive/pom.xml M refinery-job/pom.xml M refinery-tools/pom.xml 7 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source refs/changes/99/325299/1 diff --git a/pom.xml b/pom.xml index 18b8040..aa3a95c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.wikimedia.analytics.refinery refinery - 0.0.38-SNAPSHOT + 0.0.39-SNAPSHOT pom diff --git a/refinery-camus/pom.xml b/refinery-camus/pom.xml index dc9036d..311a098 100644 --- a/refinery-camus/pom.xml +++ b/refinery-camus/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.camus diff --git a/refinery-cassandra/pom.xml b/refinery-cassandra/pom.xml index 7124e7d..9263e96 100644 --- a/refinery-cassandra/pom.xml +++ b/refinery-cassandra/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.cassandra diff --git a/refinery-core/pom.xml b/refinery-core/pom.xml index 28bc40a..2398471 100644 --- a/refinery-core/pom.xml +++ b/refinery-core/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.core diff --git a/refinery-hive/pom.xml b/refinery-hive/pom.xml index 3ed8ee3..1c7ba2a 100644 --- a/refinery-hive/pom.xml +++ b/refinery-hive/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.hive diff --git a/refinery-job/pom.xml b/refinery-job/pom.xml index 6b06dbb..b13605a 100644 --- a/refinery-job/pom.xml +++ b/refinery-job/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.job diff --git a/refinery-tools/pom.xml b/refinery-tools/pom.xml index 4d109c7..30411fd 100644 --- a/refinery-tools/pom.xml +++ b/refinery-tools/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT refinery-tools -- To view, visit https://gerrit.wikimedia.org/r/325299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31d8e6351fe740a5019c39cfac8c3493f39e88d9 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: Joal ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable ElectronPdfService on mw.org until messages are fixed.
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/325298 Change subject: Disable ElectronPdfService on mw.org until messages are fixed. .. Disable ElectronPdfService on mw.org until messages are fixed. Bug: T150944 Change-Id: I2039bf684144ff6555e8b2f0ca833e6fc3827212 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/325298/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fbbabdd..5480bbe 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12049,7 +12049,7 @@ 'default' => false, 'testwiki' => true, // T150944 'test2wiki' => true, // T150944 - 'mediawikiwiki' => true, // T150944 + // 'mediawikiwiki' => true, // T150944 ], 'wmgUseSpamBlacklist' => [ -- To view, visit https://gerrit.wikimedia.org/r/325298 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2039bf684144ff6555e8b2f0ca833e6fc3827212 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable ElectronPdfService on mw.org until messages are fixed.
jenkins-bot has submitted this change and it was merged. Change subject: Disable ElectronPdfService on mw.org until messages are fixed. .. Disable ElectronPdfService on mw.org until messages are fixed. Bug: T150944 Change-Id: I2039bf684144ff6555e8b2f0ca833e6fc3827212 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fbbabdd..5480bbe 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12049,7 +12049,7 @@ 'default' => false, 'testwiki' => true, // T150944 'test2wiki' => true, // T150944 - 'mediawikiwiki' => true, // T150944 + // 'mediawikiwiki' => true, // T150944 ], 'wmgUseSpamBlacklist' => [ -- To view, visit https://gerrit.wikimedia.org/r/325298 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2039bf684144ff6555e8b2f0ca833e6fc3827212 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Add SemanticFormsSelect
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325300
Change subject: Add SemanticFormsSelect
..
Add SemanticFormsSelect
https://github.com/SemanticMediaWiki/SemanticFormsSelect/issues/6
Change-Id: I4aaa516e9b52a5aff8f80cae38ad5041d5487956
---
M groups/MediaWiki/mwgithub.yaml
M repoconfig.commit.json
M repoconfig.json
3 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/00/325300/1
diff --git a/groups/MediaWiki/mwgithub.yaml b/groups/MediaWiki/mwgithub.yaml
index 26f7bc2..3601e22 100644
--- a/groups/MediaWiki/mwgithub.yaml
+++ b/groups/MediaWiki/mwgithub.yaml
@@ -108,6 +108,15 @@
sourcePattern:
"%GROUPROOT%/mwgithub/SemanticMediaWiki/SemanticExtraSpecialProperties/i18n/%CODE%.json"
---
BASIC:
+ id: mwgithub-semanticformsselect
+ label: Semantic Forms Select
+ description: "{{Special:MyLanguage/MediaWiki:sfs-desc/en}}"
+
+FILES:
+ class: JsonFFS
+ sourcePattern:
"%GROUPROOT%/mwgithub/SemanticMediaWiki/SemanticFormsSelect/i18n/%CODE%.json"
+---
+BASIC:
id: mwgithub-semanticglossary
label: Semantic Glossary
description: "{{Special:MyLanguage/MediaWiki:Semanticglossary-desc/en}}"
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 31f9f86..c9715ec 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -285,6 +285,10 @@
"type": "git",
"url":
"g...@github.com:SemanticMediaWiki/SemanticExtraSpecialProperties.git"
},
+ "mwgithub/SemanticMediaWiki/SemanticFormsSelect": {
+ "type": "git",
+ "url":
"g...@github.com:SemanticMediaWiki/SemanticFormsSelect.git"
+ },
"mwgithub/SemanticMediaWiki/SemanticGlossary": {
"type": "git",
"url":
"g...@github.com:SemanticMediaWiki/SemanticGlossary.git"
diff --git a/repoconfig.json b/repoconfig.json
index 81a796e..597685c 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -281,6 +281,10 @@
"type": "git",
"url":
"https://github.com/SemanticMediaWiki/SemanticExtraSpecialProperties.git";
},
+ "mwgithub/SemanticMediaWiki/SemanticFormsSelect": {
+ "type": "git",
+ "url":
"https://github.com/SemanticMediaWiki/SemanticFormsSelect.git";
+ },
"mwgithub/SemanticMediaWiki/SemanticGlossary": {
"type": "git",
"url":
"https://github.com/SemanticMediaWiki/SemanticGlossary.git";
--
To view, visit https://gerrit.wikimedia.org/r/325300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aaa516e9b52a5aff8f80cae38ad5041d5487956
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: Add minor fixes for maintain-dbusers schema
Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325301
Change subject: labsdb: Add minor fixes for maintain-dbusers schema
..
labsdb: Add minor fixes for maintain-dbusers schema
* Syntax error on comma ',' before the ')' end table definition
* Explicitly enforce InnoDB engine (non needed, noop, but just in
case)
Bug: T149933
Change-Id: I43c5345fdf05af12d46df105a9d4bc90acaed615
---
M modules/role/files/labs/db/maintain-dbusers.sql
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/325301/1
diff --git a/modules/role/files/labs/db/maintain-dbusers.sql
b/modules/role/files/labs/db/maintain-dbusers.sql
index da867b7..37c2ccb 100644
--- a/modules/role/files/labs/db/maintain-dbusers.sql
+++ b/modules/role/files/labs/db/maintain-dbusers.sql
@@ -8,13 +8,13 @@
mysql_username VARCHAR(255) NOT NULL,
type enum('tool', 'user') NOT NULL,
username VARCHAR(255) NOT NULL,
-password VARCHAR(255) NOT NULL,
-) CHARSET=utf8mb4;
+password VARCHAR(255) NOT NULL
+) ENGINE=InnoDB CHARSET=utf8mb4;
CREATE UNIQUE INDEX account_type ON accounts(type, username);
CREATE TABLE account_hosts(
id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
account_id INT UNSIGNED NOT NULL,
-hostname VARCHAR(255) NOT NULL,
-) CHARSET=utf8mb4;
+hostname VARCHAR(255) NOT NULL
+) ENGINE=InnoDB CHARSET=utf8mb4;
CREATE INDEX account_host_status ON accounts(account_id, hostname);
--
To view, visit https://gerrit.wikimedia.org/r/325301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43c5345fdf05af12d46df105a9d4bc90acaed615
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] translatewiki[master]: Add SemanticFormsSelect
jenkins-bot has submitted this change and it was merged.
Change subject: Add SemanticFormsSelect
..
Add SemanticFormsSelect
https://github.com/SemanticMediaWiki/SemanticFormsSelect/issues/6
Change-Id: I4aaa516e9b52a5aff8f80cae38ad5041d5487956
---
M groups/MediaWiki/mwgithub.yaml
M repoconfig.commit.json
M repoconfig.json
3 files changed, 17 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/groups/MediaWiki/mwgithub.yaml b/groups/MediaWiki/mwgithub.yaml
index 26f7bc2..3601e22 100644
--- a/groups/MediaWiki/mwgithub.yaml
+++ b/groups/MediaWiki/mwgithub.yaml
@@ -108,6 +108,15 @@
sourcePattern:
"%GROUPROOT%/mwgithub/SemanticMediaWiki/SemanticExtraSpecialProperties/i18n/%CODE%.json"
---
BASIC:
+ id: mwgithub-semanticformsselect
+ label: Semantic Forms Select
+ description: "{{Special:MyLanguage/MediaWiki:sfs-desc/en}}"
+
+FILES:
+ class: JsonFFS
+ sourcePattern:
"%GROUPROOT%/mwgithub/SemanticMediaWiki/SemanticFormsSelect/i18n/%CODE%.json"
+---
+BASIC:
id: mwgithub-semanticglossary
label: Semantic Glossary
description: "{{Special:MyLanguage/MediaWiki:Semanticglossary-desc/en}}"
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 31f9f86..c9715ec 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -285,6 +285,10 @@
"type": "git",
"url":
"g...@github.com:SemanticMediaWiki/SemanticExtraSpecialProperties.git"
},
+ "mwgithub/SemanticMediaWiki/SemanticFormsSelect": {
+ "type": "git",
+ "url":
"g...@github.com:SemanticMediaWiki/SemanticFormsSelect.git"
+ },
"mwgithub/SemanticMediaWiki/SemanticGlossary": {
"type": "git",
"url":
"g...@github.com:SemanticMediaWiki/SemanticGlossary.git"
diff --git a/repoconfig.json b/repoconfig.json
index 81a796e..597685c 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -281,6 +281,10 @@
"type": "git",
"url":
"https://github.com/SemanticMediaWiki/SemanticExtraSpecialProperties.git";
},
+ "mwgithub/SemanticMediaWiki/SemanticFormsSelect": {
+ "type": "git",
+ "url":
"https://github.com/SemanticMediaWiki/SemanticFormsSelect.git";
+ },
"mwgithub/SemanticMediaWiki/SemanticGlossary": {
"type": "git",
"url":
"https://github.com/SemanticMediaWiki/SemanticGlossary.git";
--
To view, visit https://gerrit.wikimedia.org/r/325300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4aaa516e9b52a5aff8f80cae38ad5041d5487956
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Validate $type variable to prevent accidental injection
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325302
Change subject: Validate $type variable to prevent accidental injection
..
Validate $type variable to prevent accidental injection
Change-Id: I97bd6344580831057fe0b4bc44f7ee9fd978dc76
---
M includes/Hooks.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES
refs/changes/02/325302/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 1a23775..a0c2051 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -561,6 +561,14 @@
return;
}
+ // $type is used in field alias in $fields and $conds.
+ // Even though it is not called with user input, it is
+ // restricted to one lower case word to avoid accidental
+ // injection.
+ if( !preg_match( '/^[a-z]+$/', $type ) ) {
+ throw new Exception( 'String not allowed for ORES field
alias: ' . $type );
+ }
+
$dbr = \wfGetDB( DB_REPLICA );
$threshold = self::getThreshold( $type, $user );
$tables["ores_${type}_mdl"] = 'ores_model';
--
To view, visit https://gerrit.wikimedia.org/r/325302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97bd6344580831057fe0b4bc44f7ee9fd978dc76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Sbisson
___
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 interwiki map for fiwikivoyage
jenkins-bot has submitted this change and it was merged. Change subject: Update interwiki map for fiwikivoyage .. Update interwiki map for fiwikivoyage Bug: T152201 Change-Id: I4b611b97a5884896b4e3ff188077edcb1f63aa38 --- M wmf-config/interwiki.php 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/interwiki.php b/wmf-config/interwiki.php index bb74124..3842a8a 100644 --- a/wmf-config/interwiki.php +++ b/wmf-config/interwiki.php @@ -1,5 +1,5 @@ '0 http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=$1', '__global:advisory' => '1 https://advisory.wikimedia.org/wiki/$1', @@ -5535,6 +5535,15 @@ 'fiwikiversity:s' => '1 https://fi.wikisource.org/wiki/$1', 'fiwikiversity:chapter' => '1 https://fi.wikimedia.org/wiki/$1', 'fiwikiversity:voy' => '1 https://fi.wikivoyage.org/wiki/$1', + '__sites:fiwikivoyage' => 'wikivoyage', + 'fiwikivoyage:w' => '1 https://fi.wikipedia.org/wiki/$1', + 'fiwikivoyage:wikt' => '1 https://fi.wiktionary.org/wiki/$1', + 'fiwikivoyage:q' => '1 https://fi.wikiquote.org/wiki/$1', + 'fiwikivoyage:b' => '1 https://fi.wikibooks.org/wiki/$1', + 'fiwikivoyage:n' => '1 https://fi.wikinews.org/wiki/$1', + 'fiwikivoyage:s' => '1 https://fi.wikisource.org/wiki/$1', + 'fiwikivoyage:chapter' => '1 https://fi.wikimedia.org/wiki/$1', + 'fiwikivoyage:v' => '1 https://fi.wikiversity.org/wiki/$1', '__sites:fiwiktionary' => 'wiktionary', 'fiwiktionary:w' => '1 https://fi.wikipedia.org/wiki/$1', 'fiwiktionary:q' => '1 https://fi.wikiquote.org/wiki/$1', @@ -11447,7 +11456,7 @@ '__list:_wikimedia' => 'aa ab ace ady af ak als am an ang ar arc arz as ast av ay az azb ba bar bat-smg bcl be be-tarask be-x-old bg bh bi bjn bm bn bo bpy br bs bug bxr ca cbk-zam cdo ce ceb ch cho chr chy ckb cmn co cr crh cs csb cu cv cy cz da de diq dk dsb dv dz ee egl el eml en eo epo es et eu ext fa ff fi fiu-vro fj fo fr frp frr fur fy ga gag gan gd gl glk gn gom got gsw gu gv ha hak haw he hi hif ho hr hsb ht hu hy hz ia id ie ig ii ik ilo io is it iu ja jam jbo jp jv ka kaa kab kbd kg ki kj kk kl km kn ko koi kr krc ks ksh ku kv kw ky la lad lb lbe lez lg li lij lmo ln lo lrc lt ltg lv lzh mai map-bms mdf mg mh mhr mi min minnan mk ml mn mo mr mrj ms mt mus mwl my myv mzn na nah nan nap nb nds nds-nl ne new ng nl nn no nov nrm nso nv ny oc olo om or os pa pag pam pap pcd pdc pfl pi pih pl pms pnb pnt ps pt qu rm rmy rn ro roa-rup roa-tara ru rue rup rw sa sah sc scn sco sd se sg sgs sh si simple sk sl sm sn so sq sr srn ss st stq su sv sw szl ta tcy te tet tg th ti tk tl tn to tpi tr ts tt tum tw ty tyv udm ug uk ur uz ve vec vep vi vls vo vro wa war wo wuu xal xh xmf yi yo yue za zea zh zh-cfr zh-classical zh-cn zh-min-nan zh-tw zh-yue zu', '__list:_wikiversity' => 'aa ab ace ady af ak als am an ang ar arc arz as ast av ay az azb ba bar bat-smg bcl be be-tarask be-x-old bg bh bi bjn bm bn bo bpy br bs bug bxr ca cbk-zam cdo ce ceb ch cho chr chy ckb cmn co cr crh cs csb cu cv cy cz da de diq dk dsb dv dz ee egl el eml en eo epo es et eu ext fa ff fi fiu-vro fj fo fr frp frr fur fy ga gag gan gd gl glk gn gom got gsw gu gv ha hak haw he hi hif ho hr hsb ht hu hy hz ia id ie ig ii ik ilo io is it iu ja jam jbo jp jv ka kaa kab kbd kg ki kj kk kl km kn ko koi kr krc ks ksh ku kv kw ky la lad lb lbe lez lg li lij lmo ln lo lrc lt ltg lv lzh mai map-bms mdf mg mh mhr mi min minnan mk ml mn mo mr mrj ms mt mul mus mwl my myv mzn na nah nan nap nb nds nds-nl ne new ng nl nn no nov nrm nso nv ny oc olo om or os pa pag pam pap pcd pdc pfl pi pih pl pms pnb pnt ps pt qu rm rmy rn ro roa-rup roa-tara ru rue rup rw sa sah sc scn sco sd se sg sgs sh si simple sk sl sm sn so sq sr srn ss st stq su sv sw szl ta tcy te tet tg th ti tk tl tn to tpi tr ts tt tum tw ty tyv udm ug uk ur uz v ve vec vep vi vls vo vro wa war wo wuu xal xh xmf yi yo yue za zea zh zh-cfr zh-classical zh-cn zh-min-nan zh-tw zh-yue zu', '__list:_wikivoyage' => 'aa ab ace ady af ak als am an ang ar arc arz as ast av ay az azb ba bar bat-smg bcl be be-tarask be-x-old bg bh bi bjn bm bn bo bpy br bs bug bxr ca cbk-zam cdo ce ceb ch cho chr chy ckb cmn co cr crh cs csb cu cv cy cz da de diq dk dsb dv dz ee egl el eml en eo epo es et eu ext fa ff fi fiu-vro fj fo fr frp frr fur fy ga gag gan gd gl glk gn gom got gsw gu gv ha hak haw he hi hif ho hr hsb ht hu hy hz ia id ie ig ii ik ilo io is it iu ja jam jbo jp jv ka kaa kab kbd kg ki kj kk kl km kn ko koi kr krc ks ksh ku kv kw ky la lad lb lbe lez lg li lij lmo ln lo lrc lt ltg lv lzh mai map-bms mdf mg mh mhr mi min minnan mk ml mn mo mr mrj ms mt mus mwl my myv mzn na nah nan nap nb nds nds-nl ne new ng nl nn no nov nrm nso nv ny oc olo om or os pa pag pam pap pcd pdc
[MediaWiki-commits] [Gerrit] analytics...source[master]: Update version number in pom files
Milimetric has submitted this change and it was merged. Change subject: Update version number in pom files .. Update version number in pom files An error occurred during previous deployment leading to incorrect new devlopement version number. This patch correct the problem. Change-Id: I31d8e6351fe740a5019c39cfac8c3493f39e88d9 --- M pom.xml M refinery-camus/pom.xml M refinery-cassandra/pom.xml M refinery-core/pom.xml M refinery-hive/pom.xml M refinery-job/pom.xml M refinery-tools/pom.xml 7 files changed, 7 insertions(+), 7 deletions(-) Approvals: Milimetric: Looks good to me, approved diff --git a/pom.xml b/pom.xml index 18b8040..aa3a95c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.wikimedia.analytics.refinery refinery - 0.0.38-SNAPSHOT + 0.0.39-SNAPSHOT pom diff --git a/refinery-camus/pom.xml b/refinery-camus/pom.xml index dc9036d..311a098 100644 --- a/refinery-camus/pom.xml +++ b/refinery-camus/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.camus diff --git a/refinery-cassandra/pom.xml b/refinery-cassandra/pom.xml index 7124e7d..9263e96 100644 --- a/refinery-cassandra/pom.xml +++ b/refinery-cassandra/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.cassandra diff --git a/refinery-core/pom.xml b/refinery-core/pom.xml index 28bc40a..2398471 100644 --- a/refinery-core/pom.xml +++ b/refinery-core/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.core diff --git a/refinery-hive/pom.xml b/refinery-hive/pom.xml index 3ed8ee3..1c7ba2a 100644 --- a/refinery-hive/pom.xml +++ b/refinery-hive/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.hive diff --git a/refinery-job/pom.xml b/refinery-job/pom.xml index 6b06dbb..b13605a 100644 --- a/refinery-job/pom.xml +++ b/refinery-job/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT org.wikimedia.analytics.refinery.job diff --git a/refinery-tools/pom.xml b/refinery-tools/pom.xml index 4d109c7..30411fd 100644 --- a/refinery-tools/pom.xml +++ b/refinery-tools/pom.xml @@ -4,7 +4,7 @@ org.wikimedia.analytics.refinery refinery -0.0.38-SNAPSHOT +0.0.39-SNAPSHOT refinery-tools -- To view, visit https://gerrit.wikimedia.org/r/325299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31d8e6351fe740a5019c39cfac8c3493f39e88d9 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: Joal Gerrit-Reviewer: Milimetric 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 $wgAbuseFilterProfile for eswiki
jenkins-bot has submitted this change and it was merged. Change subject: Enable $wgAbuseFilterProfile for eswiki .. Enable $wgAbuseFilterProfile for eswiki Bug: T152087 Change-Id: I5baf303b5646c90e104fa28c373bc9ad6158427d --- M wmf-config/abusefilter.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index dc001b4..82bddd0 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -130,6 +130,7 @@ $wgGroupPermissions['user']['abusefilter-log'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; + $wgAbuseFilterProfile = true; // T152087 break; case 'eswikibooks': $wgGroupPermissions['*']['abusefilter-view'] = false; -- To view, visit https://gerrit.wikimedia.org/r/324701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5baf303b5646c90e104fa28c373bc9ad6158427d Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: Hoo man 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: Added gtid_domain_id variable
Marostegui has uploaded a new change for review. https://gerrit.wikimedia.org/r/325303 Change subject: mariadb: Added gtid_domain_id variable .. mariadb: Added gtid_domain_id variable Adding the gtid_domain_id variable to labs hosts. This variable is not used not, but it is harmless to have it enable in this role. It will be used in the future once we switch to GTID and multisource Bug: T149418 Bug: T152194 Change-Id: Ia3a47e96d391f0e7742a271fcd800802ff10fd3e --- M templates/mariadb/labsdb-replica.my.cnf.erb 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/325303/1 diff --git a/templates/mariadb/labsdb-replica.my.cnf.erb b/templates/mariadb/labsdb-replica.my.cnf.erb index dfe8f39..21a44b3 100644 --- a/templates/mariadb/labsdb-replica.my.cnf.erb +++ b/templates/mariadb/labsdb-replica.my.cnf.erb @@ -25,6 +25,8 @@ port = 3306 datadir= <%= @datadir %> tmpdir = <%= @tmpdir %> +# needed for multisource replication + GTID. +gtid_domain_id = <%= @server_id %> server_id = <%= @server_id %> read_only = 0 -- To view, visit https://gerrit.wikimedia.org/r/325303 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3a47e96d391f0e7742a271fcd800802ff10fd3e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Linter] Register alias file
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/325304 Change subject: [Linter] Register alias file .. [Linter] Register alias file https://gerrit.wikimedia.org/r/#/c/324932/ Change-Id: I38dea8de132f430eb1f6c9b98da432aa28e98187 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/04/325304/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 4596d20..eafe169 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1423,6 +1423,7 @@ # Linked Wiki // 2016-09-19 Missing qqq Linter +aliasfile = Linter/Linter.alias.php optional = linker-page-title-edit Liquid Threads -- To view, visit https://gerrit.wikimedia.org/r/325304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38dea8de132f430eb1f6c9b98da432aa28e98187 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Linter] Register alias file
Raimond Spekking has submitted this change and it was merged. Change subject: [Linter] Register alias file .. [Linter] Register alias file https://gerrit.wikimedia.org/r/#/c/324932/ Change-Id: I38dea8de132f430eb1f6c9b98da432aa28e98187 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 4596d20..eafe169 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1423,6 +1423,7 @@ # Linked Wiki // 2016-09-19 Missing qqq Linter +aliasfile = Linter/Linter.alias.php optional = linker-page-title-edit Liquid Threads -- To view, visit https://gerrit.wikimedia.org/r/325304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38dea8de132f430eb1f6c9b98da432aa28e98187 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix minor PSR-4 loading mistakes in client and lib
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/325305 Change subject: Fix minor PSR-4 loading mistakes in client and lib .. Fix minor PSR-4 loading mistakes in client and lib I made sure that no external codes uses any of these classes. So these changes are purely cosmetical, for consistency. Change-Id: Ifb5ad892eef375bd1fe66b1af2ccce81695bd351 --- M client/tests/phpunit/includes/ChangeNotificationJobTest.php M client/tests/phpunit/includes/Store/AddUsagesForPageJobTest.php M client/tests/phpunit/includes/Store/Sql/PagePropsEntityIdLookupTest.php M client/tests/phpunit/includes/Store/UsageUpdaterTest.php M client/tests/phpunit/includes/Usage/HashUsageAccumulatorTest.php M client/tests/phpunit/includes/Usage/NullSubscriptionManagerTest.php M client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php M client/tests/phpunit/includes/Usage/ParserOutputUsageAccumulatorTest.php M client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php M client/tests/phpunit/includes/Usage/UsageAspectTransformerTest.php M client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php M lib/tests/phpunit/Interactors/DispatchingTermSearchInteractorTest.php 12 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/05/325305/1 diff --git a/client/tests/phpunit/includes/ChangeNotificationJobTest.php b/client/tests/phpunit/includes/ChangeNotificationJobTest.php index 1574660..ed7e467 100644 --- a/client/tests/phpunit/includes/ChangeNotificationJobTest.php +++ b/client/tests/phpunit/includes/ChangeNotificationJobTest.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/325305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb5ad892eef375bd1fe66b1af2ccce81695bd351 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (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]: Move EasyTimeline config to its own file
jenkins-bot has submitted this change and it was merged.
Change subject: Move EasyTimeline config to its own file
..
Move EasyTimeline config to its own file
I will need to write some test for EasyTimeline and assert the
configured fonts are properly registered in the /fonts/ submodule (see
T22825).
Since CommonSettings.php is not easily includable for testing, move all
of EasyTimeline config to a standalone file.
Add the noc entry and refresh symbolic link.
Bug: T22825
Change-Id: I6ea585cfe10c3a87de0ee5e761d91860647392c1
---
A docroot/noc/conf/timeline.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
A wmf-config/timeline.php
4 files changed, 24 insertions(+), 14 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/timeline.php.txt
b/docroot/noc/conf/timeline.php.txt
new file mode 12
index 000..cf41bde
--- /dev/null
+++ b/docroot/noc/conf/timeline.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/timeline.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 1e5be37..803ea6a 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -42,6 +42,7 @@
squid-labs.php
session.php
session-labs.php
+ timeline.php
trusted-xff.php
Wikibase.php
Wikibase-labs.php
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 887cded..ab0e3b9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -665,21 +665,10 @@
};
if ( $wmgUseTimeline ) {
- wfLoadExtension( 'timeline' );
- if ( $wgDBname === 'testwiki' || $wgDBname === 'mlwiki' ) {
- // FreeSansWMF has been generated from FreeSans and FreeSerif
by using this script with fontforge:
- // Open("FreeSans.ttf");
- // MergeFonts("FreeSerif.ttf");
- // SetFontNames("FreeSans-WMF", "FreeSans WMF", "FreeSans WMF
Regular", "Regular", "");
- // Generate("FreeSansWMF.ttf", "", 4 );
- $wgTimelineFontFile = 'FreeSansWMF.ttf';
- } elseif ( $lang == 'zh' ) {
- $wgTimelineFontFile = 'unifont-5.1.20080907.ttf';
- }
- $wgTimelineFileBackend = 'local-multiwrite';
- $wgTimelineEpochTimestamp = '2013060100';
+ include( "$wmfConfigDir/timeline.php" );
}
-
+# Most probably only used by EasyTimeline which is conditionally included above
+# but it is hard know whether there other use cases.
putenv( "GDFONTPATH=/srv/mediawiki/fonts" );
if ( $wmgUseWikiHiero ) {
diff --git a/wmf-config/timeline.php b/wmf-config/timeline.php
new file mode 100644
index 000..9837c53
--- /dev/null
+++ b/wmf-config/timeline.php
@@ -0,0 +1,19 @@
+https://gerrit.wikimedia.org/r/321493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ea585cfe10c3a87de0ee5e761d91860647392c1
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Reedy
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] mediawiki/core[master]: Use single quotes
jenkins-bot has submitted this change and it was merged.
Change subject: Use single quotes
..
Use single quotes
Follow-up to Icc9bc096
Change-Id: I4863e0e7946fd59022846198e86302f556fee617
---
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
Nemo bis: Looks good to me, but someone else must approve
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 23720a8..b2fac3c 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -50,7 +50,7 @@
mw.config.set( 'wgUserLanguage', 'en' );
assert.equal( mw.language.convertNumber( 1800 ), '1.800',
'formatting' );
- assert.equal( mw.language.convertNumber( "1.800", true ),
'1800', 'unformatting' );
+ assert.equal( mw.language.convertNumber( '1.800', true ),
'1800', 'unformatting' );
} );
function grammarTest( langCode, test ) {
--
To view, visit https://gerrit.wikimedia.org/r/325292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4863e0e7946fd59022846198e86302f556fee617
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Nemo bis
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]: Drop '.ttf' from $wgTimelineFontFile + bump epoch
jenkins-bot has submitted this change and it was merged.
Change subject: Drop '.ttf' from $wgTimelineFontFile + bump epoch
..
Drop '.ttf' from $wgTimelineFontFile + bump epoch
Bump /fonts/ submodule so it includes the suffix less symbolic links.
Raise $wgTimelineEpochTimestamp for those wikis, since the rendering is
changed/fixed.
Covered by tests in a subsequent commit.
Bug: T22825
Change-Id: I6962803e6e92dd02cb3be0ef3a0b77ccec81538a
Depends-On: I40ee0bc843c4c2ac8363c99c3421be8bf09b9e18
---
M fonts
M wmf-config/timeline.php
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/fonts b/fonts
index 7ce8027..f6d4ad3 16
--- a/fonts
+++ b/fonts
@@ -1 +1 @@
-Subproject commit 7ce8027a832c550fc56f0f0da50b38fc7581ed7a
+Subproject commit f6d4ad3e98cd7ca455845ffbab44b688116389bc
diff --git a/wmf-config/timeline.php b/wmf-config/timeline.php
index 9837c53..7b23533 100644
--- a/wmf-config/timeline.php
+++ b/wmf-config/timeline.php
@@ -4,6 +4,7 @@
# Do not put private data here.
wfLoadExtension( 'timeline' );
+$wgTimelineEpochTimestamp = '2013060100';
if ( $wgDBname === 'testwiki' || $wgDBname === 'mlwiki' ) {
// FreeSansWMF has been generated from FreeSans and FreeSerif by using
this script with fontforge:
@@ -11,9 +12,10 @@
// MergeFonts("FreeSerif.ttf");
// SetFontNames("FreeSans-WMF", "FreeSans WMF", "FreeSans WMF Regular",
"Regular", "");
// Generate("FreeSansWMF.ttf", "", 4 );
- $wgTimelineFontFile = 'FreeSansWMF.ttf';
+ $wgTimelineEpochTimestamp = '2016120100';
+ $wgTimelineFontFile = 'FreeSansWMF';
} elseif ( $lang == 'zh' ) {
- $wgTimelineFontFile = 'unifont-5.1.20080907.ttf';
+ $wgTimelineEpochTimestamp = '2016120100';
+ $wgTimelineFontFile = 'unifont-5.1.20080907';
}
$wgTimelineFileBackend = 'local-multiwrite';
-$wgTimelineEpochTimestamp = '2013060100';
--
To view, visit https://gerrit.wikimedia.org/r/321561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6962803e6e92dd02cb3be0ef3a0b77ccec81538a
Gerrit-PatchSet: 7
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Translate.alias for Bengali (bn)
jenkins-bot has submitted this change and it was merged. Change subject: Translate.alias for Bengali (bn) .. Translate.alias for Bengali (bn) Bug: T151927 Change-Id: I56373b5de5c6a53bc8594761a7bc1797fbb869fd --- M Translate.alias.php 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Translate.alias.php b/Translate.alias.php index 0219246..010942f 100644 --- a/Translate.alias.php +++ b/Translate.alias.php @@ -186,6 +186,28 @@ 'Translations' => array( 'Tarjamahan' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'AggregateGroups' => array( 'সমষ্টিগত_গোষ্ঠীসমূহ' ), + 'ImportTranslations' => array( 'অনুবাদ_আমদানি' ), + 'ExportTranslations' => array( 'অনুবাদ_রপ্তানি' ), + 'LanguageStats' => array( 'ভাষার_পরিসংখ্যান' ), + 'Magic' => array( 'উন্নত_অনুবাদ', 'জাদু' ), + 'ManageMessageGroups' => array( 'বার্তার_গোষ্ঠী_পরিচালনা' ), + 'ManageTranslatorSandbox' => array( 'অনুবাদকের_খেলাঘর_পরিচালনা', 'অনুবাদের_খেলাঘর' ), + 'MessageGroupStats' => array( 'বার্তা_দলের_পরিসংখ্যান' ), + 'PageTranslation' => array( 'পাতা_অনুবাদ' ), + 'PageTranslationDeletePage' => array( 'পাতা_অনুবাদের_পাতা_অপসারণ' ), + 'SearchTranslations' => array( 'অনুবাদ_অনুসন্ধান' ), + 'SupportedLanguages' => array( 'সমর্থিত_ভাষা' ), + 'Translate' => array( 'অনুবাদ' ), + 'TranslationStash' => array( 'অনুবাদের_স্টাশ' ), + 'TranslationStats' => array( 'অনুবাদের_পরিসংখ্যান' ), + 'Translations' => array( 'অনুবাদসমূহ' ), + 'PageMigration' => array( 'পাতা_অভিপ্রায়ণ', 'পৃষ্ঠা_অভিপ্রায়ণ' ), + 'PagePreparation' => array( 'পাতা_প্রস্তুতি', 'পৃষ্ঠা_প্রস্তুতি' ), +); + /** Breton (brezhoneg) */ $specialPageAliases['br'] = array( 'ImportTranslations' => array( 'EnporzhiañTroidigezhioù' ), -- To view, visit https://gerrit.wikimedia.org/r/324521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56373b5de5c6a53bc8594761a7bc1797fbb869fd Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Aftab Gerrit-Reviewer: Aftab Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SiteMatrix[master]: SiteMatrix.alias for Bengali (bn)
jenkins-bot has submitted this change and it was merged. Change subject: SiteMatrix.alias for Bengali (bn) .. SiteMatrix.alias for Bengali (bn) Bug: T151927 Change-Id: Ic6fd12315ccc68cea8fd5b42896f2d2eeb4a60a9 --- M SiteMatrix.alias.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved Thiemo Mättig (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/SiteMatrix.alias.php b/SiteMatrix.alias.php index 97ff532..6cba1fc 100644 --- a/SiteMatrix.alias.php +++ b/SiteMatrix.alias.php @@ -39,6 +39,11 @@ 'SiteMatrix' => array( 'ویب_سایٹ_ئی_ماتریس' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'SiteMatrix' => array( 'সাইটের_ম্যাট্রিক্স', 'উইকিমিডিয়ার_উইকিসমূহ', 'সাইট_ম্যাট্রিক্স' ), +); + /** Catalan (català) */ $specialPageAliases['ca'] = array( 'SiteMatrix' => array( 'Projectes_Wikimedia', 'Wikis_Wikimedia' ), -- To view, visit https://gerrit.wikimedia.org/r/324509 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6fd12315ccc68cea8fd5b42896f2d2eeb4a60a9 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/SiteMatrix Gerrit-Branch: master Gerrit-Owner: Aftab Gerrit-Reviewer: Aftab Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking 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] mediawiki...FlaggedRevs[master]: FlaggedRevs.alias for Bengali (bn)
jenkins-bot has submitted this change and it was merged. Change subject: FlaggedRevs.alias for Bengali (bn) .. FlaggedRevs.alias for Bengali (bn) Bug: T151927 Change-Id: I727f75658663d64ca9d07361b39fd395cffdef53 --- M frontend/language/FlaggedRevs.alias.php 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/frontend/language/FlaggedRevs.alias.php b/frontend/language/FlaggedRevs.alias.php index a85440b..86ad68f 100644 --- a/frontend/language/FlaggedRevs.alias.php +++ b/frontend/language/FlaggedRevs.alias.php @@ -128,6 +128,21 @@ 'UnreviewedPages' => array( 'Tungkaran_nang_balum_ditinjau' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'PendingChanges' => array( 'অমীমাংসিত_পরিবর্তন', 'পুরনো_পর্যালোচিত_পাতা' ), + 'ProblemChanges' => array( 'সমস্যাযুক্ত_পরিবর্তন' ), + 'QualityOversight' => array( 'উন্নত_পর্যালোচনা_লগ' ), + 'ReviewedPages' => array( 'পর্যালোচিত_পাতা', 'পর্যালোচিত_পৃষ্ঠা' ), + 'RevisionReview' => array( 'সংশোধন_পর্যালোচনা' ), + 'Stabilization' => array( 'স্থিতিশীলতা' ), + 'StablePages' => array( 'স্থিতিশীল_পাতাসমূহ' ), + 'ConfiguredPages' => array( 'কনফিগারকৃত_পাতা' ), + 'ReviewedVersions' => array( 'পর্যালোচিত_সংস্করণ', 'স্থিতিশীল_সংস্করণ' ), + 'UnreviewedPages' => array( 'অপর্যালোচিত_পাতা', 'পর্যালোচনাবিহীন_পৃষ্ঠা'), + 'ValidationStatistics' => array( 'বৈধকরণের_পরিসংখ্যান', 'বৈধকরণ_পরিসংখ্যান' ), +); + /** Breton (brezhoneg) */ $specialPageAliases['br'] = array( 'ReviewedPages' => array( 'PajennoùAdwelet' ), -- To view, visit https://gerrit.wikimedia.org/r/324498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I727f75658663d64ca9d07361b39fd395cffdef53 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/FlaggedRevs Gerrit-Branch: master Gerrit-Owner: Aftab Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Improve testing infrastructure
jenkins-bot has submitted this change and it was merged.
Change subject: Improve testing infrastructure
..
Improve testing infrastructure
* Instead of a hacky 'sed -i' in composer.json, dynamically declare the class
MediaWikiTestCase if missing (when PHPUnit is called directly).
* Check if phpdbg is installed, else use php
* Skip two tests when running HHVM because of issue #4797
"Multiple calls of 'include' do not check for file modification HHVM 3.5.0"
https://github.com/facebook/hhvm/issues/4797
Possibly a workaround will be later added, but for now try to render
MediaWikiFarm compatible with WMF CI suites
* Fixed two phpcs issues
* Dynamically create two JSON files with bad syntax (used in a test) to avoid
trigerring a CI error report
* Made phpdoc optional for now
Bug: T151879
Change-Id: I17604c11e773f74f2c8b7ccb6aa7919cb729d552
---
M composer.json
M src/MediaWikiFarm.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/MediaWikiFarmTestCase.php
M tests/phpunit/MultiversionInstallationTest.php
D tests/phpunit/data/config/badsyntax.json
D tests/phpunit/data/config/empty.json
7 files changed, 35 insertions(+), 17 deletions(-)
Approvals:
Seb35: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 7a94498..61956c2 100644
--- a/composer.json
+++ b/composer.json
@@ -16,27 +16,21 @@
},
"require-dev": {
"justinrainbow/json-schema": "~3.0",
- "phpdocumentor/phpdocumentor": "*",
"phpunit/phpunit": "~4.8",
"jakub-onderka/php-parallel-lint": "*",
"phpmd/phpmd": "*",
"mediawiki/mediawiki-codesniffer": "*"
},
+ "suggest": {
+ "phpdocumentor/phpdocumentor": "*"
+ },
"scripts": {
"validate-schema": "php ./bin/validate-schema.php",
"lint": "parallel-lint --exclude vendor .",
"phpcs": "phpcs -p -s",
- "phpdoc": "phpdoc -d bin,src -t ./docs/code",
- "phpunit": [
- "sed -i 's/extends MediaWikiTestCase/extends
PHPUnit_Framework_TestCase/' tests/phpunit/MediaWikiFarmTestCase.php",
- "phpdbg -qrr `which phpunit` --strict-coverage",
- "sed -i 's/extends PHPUnit_Framework_TestCase/extends
MediaWikiTestCase/' tests/phpunit/MediaWikiFarmTestCase.php"
- ],
- "unit": [
- "sed -i 's/extends MediaWikiTestCase/extends
PHPUnit_Framework_TestCase/' tests/phpunit/MediaWikiFarmTestCase.php",
- "phpunit --no-coverage",
- "sed -i 's/extends PHPUnit_Framework_TestCase/extends
MediaWikiTestCase/' tests/phpunit/MediaWikiFarmTestCase.php"
- ],
+ "phpdoc": "[ \"`which phpdoc`\" = \"\" ] || phpdoc -d bin,src
-t ./docs/code",
+ "phpunit": "which phpdbg && phpdbg -qrr `which phpunit`
--strict-coverage || phpunit --strict-coverage",
+ "unit": "phpunit --no-coverage",
"test": [
"composer lint",
"composer unit",
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 7d47050..8a324ad 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -539,7 +539,9 @@
}
# Shortcut loading
+ // @codingStandardsIgnoreStart
if( $this->cacheDir && ( $result = $this->readFile(
'versions.php', $this->cacheDir, false ) ) && array_key_exists( $host, $result
) ) {
+ // @codingStandardsIgnoreEnd
$result = $result[$host];
$fresh = true;
$myfreshness = filemtime( $this->cacheDir .
'/versions.php' );
diff --git a/tests/phpunit/ConfigurationTest.php
b/tests/phpunit/ConfigurationTest.php
index 4c03391..7e4b13d 100644
--- a/tests/phpunit/ConfigurationTest.php
+++ b/tests/phpunit/ConfigurationTest.php
@@ -182,7 +182,6 @@
$farm->checkExistence();
$farm->getMediaWikiConfig();
$settings = $farm->getConfiguration( 'settings' );
- #$this->assertEquals( [], $settings );
$extensions = $farm->getConfiguration( 'extensions' );
$skins = $farm->getConfiguration( 'skins' );
$this->assertTrue(
$settings['wgUseExtensionTestExtensionBiLoading'] );
diff --git a/tests/phpunit/MediaWikiFarmTestCase.php
b/tests/phpunit/MediaWikiFarmTestCase.php
index 9b5e037..d9493b6 100644
--- a/tests/phpunit/MediaWikiFarmTestCase.php
+++ b/tests/phpunit/MediaWikiFarmTestCase.php
@@ -9,6 +9,13 @@
require_once dirname( dirname( dirname( __FILE__ ) ) ) .
'/src/AbstractMediaWikiFarmScript.php';
+# These tests can be called either directly with PHPUnit or through the
PHPUnit infrastruct
[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: EducationProgram.i18n.alias for Bengali (bn)
jenkins-bot has submitted this change and it was merged. Change subject: EducationProgram.i18n.alias for Bengali (bn) .. EducationProgram.i18n.alias for Bengali (bn) Bug: T151927 Change-Id: I7c705984e69c0d8a77508d45aaa696039e97ef4d --- M EducationProgram.i18n.alias.php 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/EducationProgram.i18n.alias.php b/EducationProgram.i18n.alias.php index 722a711..91c1a45 100644 --- a/EducationProgram.i18n.alias.php +++ b/EducationProgram.i18n.alias.php @@ -115,6 +115,26 @@ 'CourseActivity' => array( 'سبق_ئی_پئالیت' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'MyCourses' => array( 'আমার_কোর্স' ), + 'ManageCourses' => array( 'কোর্স_পরিচালনা' ), + 'Institutions' => array( 'প্রতিষ্ঠান', 'অর্গ' ), + 'Student' => array( 'শিক্ষার্থী' ), + 'Students' => array( 'ছাত্রছাত্রী' ), + 'Courses' => array( 'কোর্স' ), + 'EducationProgram' => array( 'শিক্ষা_কর্মসূচী' ), + 'Enroll' => array( 'তালিকাভুক্ত' ), + 'Disenroll' => array( 'অ-তালিকাভুক্ত' ), + 'CampusAmbassadors' => array( 'ক্যাম্পাস_স্বেচ্ছাসেবক', 'ক্যাম্পাস_দূত' ), + 'OnlineAmbassadors' => array( 'অনলাইন_স্বেচ্ছাসেবক', 'অনলাইন_দূত' ), + 'OnlineAmbassadorProfile' => array( 'অনলাইন_স্বেচ্ছাসেবকের_প্রোফাইল', 'অনলাইন_দূতের_প্রোফাইল' ), + 'CampusAmbassadorProfile' => array( 'ক্যাম্পাস_স্বেচ্ছাসেবকের_প্রোফাইল', 'ক্যাম্পাস_দূতের_প্রোফাইল' ), + 'StudentActivity' => array( 'শিক্ষার্থীর_কার্যক্রম', 'শিক্ষার্থীর_কার্যকলাপ' ), + 'Articles' => array( 'নিবন্ধসমূহ' ), + 'CourseActivity' => array( 'কোর্সের_কার্যক্রম', 'কোর্সের_কার্যকলাপ' ), +); + /** буряад (буряад) */ $specialPageAliases['bxr'] = array( 'Student' => array( 'Оюутан' ), -- To view, visit https://gerrit.wikimedia.org/r/324493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c705984e69c0d8a77508d45aaa696039e97ef4d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/EducationProgram Gerrit-Branch: master Gerrit-Owner: Aftab Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: $specialPageAliases for Bengali (bn)
jenkins-bot has submitted this change and it was merged. Change subject: $specialPageAliases for Bengali (bn) .. $specialPageAliases for Bengali (bn) Bug: T151927 Change-Id: Ie0c5c182396313fc362de7128fdde322ff49b620 --- M CentralAuth.alias.php 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved Aftab: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/CentralAuth.alias.php b/CentralAuth.alias.php index 56ed69e..f5a3e00 100644 --- a/CentralAuth.alias.php +++ b/CentralAuth.alias.php @@ -89,6 +89,24 @@ 'GlobalUsers' => array( 'GlobalUsers' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'CentralAuth' => array( 'কেন্দ্রীয়_প্রমাণী' ), + 'MergeAccount' => array( 'অ্যাকাউন্ট_একত্রীকরণ' ), + 'GlobalGroupMembership' => array( 'বৈশ্বিক_ব্যবহারকারী_অধিকার', 'বৈশ্বিক_দলের_সদস্যপদ' ), + 'GlobalGroupPermissions' => array( 'বৈশ্বিক_দলের_অনুমতি' ), + 'WikiSets' => array( 'উইকিসেট', 'উইকিসেট_সম্পাদনা' ), + 'GlobalUsers' => array( 'বৈশ্বিক_ব্যবহারকারী' ), + 'MultiLock' => array( 'বহুবাধা' ), + 'GlobalRenameUser' => array( 'বৈশ্বিক_ব্যবহারকারী_নামান্তর', 'বৈশ্বিক_ব্যবহারকারী_পুনঃনামকরণ' ), + 'GlobalRenameProgress' => array( 'বৈশ্বিক_নামান্তরের_অগ্রগতি' ), + 'GlobalUserMerge' => array( 'বৈশ্বিক_ব্যবহারকারী_একত্রীকরণ' ), + 'GlobalRenameRequest' => array( 'বৈশ্বিক_নামান্তরের_অনুরোধ' ), + 'GlobalRenameQueue' => array( 'বৈশ্বিক_নামান্তরের_সারি' ), + 'SulRenameWarning' => array( 'SUL_নামান্তরের_সতর্কবার্তা' ), + 'UsersWhoWillBeRenamed' => array( 'ব্যবহারকারী_যারা_নামান্তরিত_হবেন' ), +); + /** Bulgarian (български) */ $specialPageAliases['bg'] = array( 'CentralAuth' => array( 'Управление_на_единните_сметки' ), -- To view, visit https://gerrit.wikimedia.org/r/324405 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0c5c182396313fc362de7128fdde322ff49b620 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Aftab Gerrit-Reviewer: Catrope Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalBlocking[master]: GlobalBlocking.alias for Bengali (bn)
jenkins-bot has submitted this change and it was merged. Change subject: GlobalBlocking.alias for Bengali (bn) .. GlobalBlocking.alias for Bengali (bn) Bug: T151927 Change-Id: I0156c32f1c6a21ffc39382c7edb8b06803563b8b --- M GlobalBlocking.alias.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved Thiemo Mättig (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/GlobalBlocking.alias.php b/GlobalBlocking.alias.php index b57bca3..9b3d4fd 100644 --- a/GlobalBlocking.alias.php +++ b/GlobalBlocking.alias.php @@ -74,6 +74,14 @@ 'GlobalBlockStatus' => array( 'Daptar_putih_pamblukiran_global' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'GlobalBlock' => array( 'বৈশ্বিক_বাধাদান', 'বৈশ্বিক_বাধা' ), + 'GlobalBlockList' => array( 'বৈশ্বিক_বাধাদানের_তালিকা', 'বৈশ্বিক_বাধার_তালিকা' ), + 'RemoveGlobalBlock' => array( 'বৈশ্বিক_বাধাদান_অপসারণ', 'বৈশ্বিক_বাধা_অপসারণ', 'বৈশ্বিক_বাধা_তোলা' ), + 'GlobalBlockStatus' => array( 'বৈশ্বিক_বাধাদানের_সাদাতালিকা', 'বৈশ্বিক_বাধার_অবস্থা', 'বৈশ্বিক_বাধাদানের_অবস্থা', 'বৈশ্বিক_বাধা_নিষ্ক্রিয়করণ' ), +); + /** Breton (brezhoneg) */ $specialPageAliases['br'] = array( 'GlobalBlock' => array( 'StankadennHollek' ), -- To view, visit https://gerrit.wikimedia.org/r/324499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0156c32f1c6a21ffc39382c7edb8b06803563b8b Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/GlobalBlocking Gerrit-Branch: master Gerrit-Owner: Aftab Gerrit-Reviewer: Aftab Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking 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/mediawiki-config[master]: Test for $wgTimelineFontFile values
jenkins-bot has submitted this change and it was merged.
Change subject: Test for $wgTimelineFontFile values
..
Test for $wgTimelineFontFile values
Parse wmf-config/timeline.php for potential values given to
$wgTimelineFontFile.
The file must not end up with '.ttf' which is stripped by ploticus and
would cause it to fail finding the file.
We have GDFONTPATH pointing to /fonts/ ensure the given filename exists
there.
Bug: T22825
Change-Id: I2a79931822e687e9463f7e1a76a39d7134b5157c
---
A tests/timelineTest.php
1 file changed, 64 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/timelineTest.php b/tests/timelineTest.php
new file mode 100644
index 000..f1eb261
--- /dev/null
+++ b/tests/timelineTest.php
@@ -0,0 +1,64 @@
+assertStringEndsNotWith( '.ttf', $filename );
+ }
+
+
+ /**
+* @dataProvider wgTimelineFontFileValues
+*/
+ function testTimelinefontfile_exists( $filename ) {
+ $this->assertFileExists( __DIR__ . "/../fonts/" . $filename );
+ }
+
+ /**
+* Parse wmf-config/timeline.php and find values for $wgTimelineFontFile
+*/
+ public static function wgTimelineFontFileValues() {
+
+ $testCases = [];
+ $conf = file_get_contents( __DIR__ .
'/../wmf-config/timeline.php' );
+ $tokens = ( token_get_all( $conf ) );
+
+ while( $token = each( $tokens )[1] ) {
+
+ # Skip until we find $wgTimelineFontFile
+ if ( !(
+ is_array( $token )
+ && $token[0] == T_VARIABLE
+ && $token[1] == '$wgTimelineFontFile'
+ ) ) {
+ continue;
+ }
+
+ while ( $next_token = next($tokens) ) {
+ # Skip ' = ' to reach the actual value being set
+ if (
+ $next_token == '='
+ || is_array( $next_token ) &&
$next_token[0] == T_WHITESPACE ) {
+ continue;
+ }
+ break;
+ }
+ self::assertInternalType( 'array', $next_token );
+ self::assertEquals(
+ T_CONSTANT_ENCAPSED_STRING,
+ $next_token[0],
+ 'Test suite expects $wgTimelineFontFile to be
set to a string' );
+
+ $testCases[] = [ trim( $next_token[1], '\'' ) ];
+ }
+ return $testCases;
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/321558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a79931822e687e9463f7e1a76a39d7134b5157c
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Refactoring of the cache data architecture
Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325306
Change subject: Refactoring of the cache data architecture
..
Refactoring of the cache data architecture
Architecture:
* At the beginning cache was only for config files, then it was added the
LocalSettings,
then it was added an 'existence' cache file. The cache data architecture is
here
refactored to (expectedly):
1a/ boost the case where the requested wiki is existant and has a cached
configuration (LS.php)
1b/ while always be sure of the freshness of the origin files,
and with second objectives:
2/ not harm too much the performance of nonexistant wiki or nonfresh cached
files,
3/ reasonably distribute the write operation on cached files to prefer
long-lived
small cached files over a short-lived big cached file.
* Given these objectives, the just-previously-introduced [cache]/versions.php,
which
answers globally to objective 1a (avoid recomputing the farm config to
directly get
the version and test the freshness of the origin files), is split in
one-per-wiki
cached files with almost the same content (objective 3). This file is
self-consistent
(objective 1b) to self-check its freshness for the existence operation
('coreconfig'
parameter containing the origin files for this file) and is self-sufficient to
regenerate the cached config (LS.php) in case this one is not fresh (in this
case
only LS.php is regenerated, objectives 1b and 2).
* I considered the following alternatives:
* A global existence cache file similar to [cache]/versions.php, but
restricted to
the version of each wiki and the origin files for the existence and config
operations. This was not further considered because of objectives 2 (any
change in
existence or config origin files implies recomputing the whole farm
configuration)
and 3 (any change in existence or config origin files implies rewriting this
cache file).
* An existence file like it is here implemented (one-per-wiki existence cache
file),
but only with the wiki version and the existence origin files, with other
variables
stored in the beginning of LS.php (wikiID, suffix, data, config files), in
order to
directly define this cached LS.php without further evaluation during
existence
operation. But, when the cached config becomes nonfresh (it would be itself
aware
of it because it know its origin files), it should recompute the new config
and
write it in its own file. The PHP engine would currently correctly behave,
but HHVM
will not (bug #4797 on GitHub), and anyway this operation is quite risky.
Anyway
this would only move some instructions from the existence to the config
operation
and there is no performance gain; with the adoption solution, all farm
variables
are consistently stored in the existence cache file.
* The cache directory is slightly reorganised by namespaces:
* 'config': directly corresponding to origin config files,
* 'wikis': per-wiki existence/coreconfig files,
* 'LocalSettings': per-wiki config files.
* Note that, with the current way of computing the variables (it was not
explicitely
constructed but it is finally quite good), the only data sources for the
variables
are in the host regex and the version, nothing else. When a variable is
defined from
another variable, it could be equivalently expanded with the variables from
the host
regex and, for $DATA, $VERSION, $CODE, and config files and keys, the version
and
version directory. E.g. if $SUFFIX='$family' and $WIKIID='$lang$SUFFIX', the
second
could have been written $WIKIID='$lang$family'. Saying this, intermediary
variables
are useful to shorten definition and improve their understanding.
Code:
* Removed the farm variable '$HTTP404' coming from farm config 'HTTP404'; it is
now
only computed when required (when a wiki is “soft-missing” = existing farm,
nonexistant wiki) to avoid pollute the variables (reduce a bit the existence
cache
file explained just above) and I don’t think it would be required for any
other variable.
* Removed the old subarray MediaWikiFarm::$config['general'] unused since some
time
(replaced by the two subarrays 'settings' and 'arrays').
* Removed execution of execFiles in MediaWikiFarm::loadMediaWikiConfig to avoid
execution in a restricted scope, and it is already executed in LS.php or
src/main.php.
* Sanitised host in MediaWikiFarm::__construct: now it is checked if the host
has some
corresponding file on the file system, so avoid any surprise (previously it
was
checked against a finite list of existing hosts).
* Cached LS.php now has only the host name as cache key, no more version: I
don’t see
any advantage in keeping the version, and on the long term it would pollute a
bit
the cache directory.
* In the cache directory, if some parent dir
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Move interwiki sorting orders to config
jenkins-bot has submitted this change and it was merged. Change subject: Move interwiki sorting orders to config .. Move interwiki sorting orders to config The sorting orders come from Wikibase: https://phabricator.wikimedia.org/diffusion/EWBA/browse/master/client/config/WikibaseClient.default.php and originally from meta-wiki: https://meta.wikimedia.org/wiki/MediaWiki:Interwiki_config-sorting_order-native-languagename https://meta.wikimedia.org/wiki/MediaWiki:Interwiki_config-sorting_order-native-languagename-first There are some other discrepencies between the sorting order from Wikibase and the one on meta wiki (possibly wikis missing from those lists). @todo in another patch is to better synchronize the meta wiki lists and what we have in config, maybe with a rebuild script or such. Bug: T111023 Change-Id: Ie7a4551187e788d5f1ee6f48bd667b15b77b17b1 --- M wmf-config/Wikibase.php 1 file changed, 113 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved Daniel Kinzler: Looks good to me, but someone else must approve Thiemo Mättig (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index 4bc5b5a..ef9c5be 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -194,6 +194,119 @@ ); }; + $wgWBClientSettings['interwikiSortOrders'] = [ + 'alphabetic' => [ + 'ace', 'kbd', 'ady', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', + 'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'azb', 'bm', 'bn', 'bjn', + 'zh-min-nan', 'nan', 'map-bms', 'ba', 'be', 'be-x-old', 'bh', 'bcl', 'bi', + 'bg', 'bar', 'bo', 'bs', 'br', 'bxr', 'ca', 'cv', 'ceb', 'cs', 'ch', + 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', + 'dv', 'nv', 'dsb', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', + 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', + 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'gu', 'got', 'gom', 'hak', 'xal', 'ko', + 'ha', 'haw', 'hy', 'hi', 'ho', 'hsb', 'hr', 'io', 'ig', 'ilo', 'bpy', 'id', 'ia', + 'ie', 'iu', 'ik', 'os', 'xh', 'zu', 'is', 'it', 'he', 'jv', 'kl', 'kn', 'kr', + 'pam', 'krc', 'ka', 'ks', 'csb', 'kk', 'kw', 'rw', 'rn', 'sw', 'kv', 'kg', + 'ht', 'ku', 'kj', 'ky', 'mrj', 'lad', 'lbe', 'lez', 'lo', 'lrc', 'ltg', 'la', + 'lv', 'lb', 'lt', 'lij', 'li', 'ln', 'olo', 'jbo', 'lg', 'lmo', 'hu', 'mai', 'mk', + 'mg', 'ml', 'mt', 'mi', 'mr', 'xmf', 'arz', 'mzn', 'ms', 'min', 'cdo', 'mwl', + 'mdf', 'mo', 'mn', 'mus', 'my', 'nah', 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', + 'new', 'ja', 'nap', 'ce', 'frr', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', + 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', 'pag', 'pnb', 'pap', 'ps', + 'jam', 'koi', 'km', 'pcd', 'pms', 'tpi', 'nds', 'pl', 'tokipona', 'tp', 'pnt', 'pt', + 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'rue', 'ru', 'sah', + 'se', 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', + 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 'srn', 'sr', + 'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'shi', 'kab', 'roa-tara', 'tt', 'te', 'tet', + 'th', 'ti', 'tg', 'to', 'chr', 'chy', 've', 'tcy', 'tr', 'tk', 'tw', 'tyv', 'udm', 'bug', + 'uk', 'ur', 'ug', 'za', 'vec', 'vep', 'vi', 'vo', 'fiu-vro', 'wa', 'zh-classical', + 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 'zea', 'bat-smg', + 'zh', 'zh-tw', 'zh-cn' + ], + 'alphabetic_revised' => [ + 'ace', 'ady', 'kbd', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup', + 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'azb', 'bjn', 'id', 'ms', 'bm', 'bn', + 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', 'min', 'be', 'be-x-old', 'bh', + 'bcl', 'bi', 'bar', 'bo', 'bs', 'br', 'bug', 'bg', 'bxr', 'ca', 'ceb', 'cv', 'cs', + 'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', + 'dv', 'nv', 'dsb', 'na', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', + 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'sm', +
