[MediaWiki-commits] [Gerrit] Add an hhvm-graceful-all command - change (mediawiki...scap)
jenkins-bot has submitted this change and it was merged.
Change subject: Add an hhvm-graceful-all command
..
Add an hhvm-graceful-all command
Add a new command that can be used to perform a rolling restart of HHVM
across the cluster.
Bug: T103886
Change-Id: Ic937aea94c5c5eea1a24df1d253f6e448cd99c65
---
A bin/hhvm-graceful-all
M scap/__init__.py
M scap/main.py
3 files changed, 52 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/hhvm-graceful-all b/bin/hhvm-graceful-all
new file mode 100755
index 000..8cafdb9
--- /dev/null
+++ b/bin/hhvm-graceful-all
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Restart HHVM across the entire cluster
+#
+# Copyright © 2015 Wikimedia Foundation and contributors
+
+import os
+import sys
+
+# Add scap package to search path
+script = os.path.realpath(sys.argv[0])
+scap_src = os.path.dirname(os.path.dirname(script))
+sys.path.append(scap_src)
+
+import scap
+scap.HHVMGracefulAll.run()
diff --git a/scap/__init__.py b/scap/__init__.py
index d628c73..84af164 100644
--- a/scap/__init__.py
+++ b/scap/__init__.py
@@ -8,6 +8,7 @@
from .main import (
CompileWikiversions,
+HHVMGracefulAll,
MWVersionsInUse,
PurgeL10nCache,
RebuildCdbs,
@@ -24,6 +25,7 @@
__all__ = (
'CompileWikiversions',
+'HHVMGracefulAll',
'MWVersionsInUse',
'PurgeL10nCache',
'RebuildCdbs',
@@ -40,6 +42,7 @@
any((
CompileWikiversions,
+HHVMGracefulAll,
MWVersionsInUse,
PurgeL10nCache,
RebuildCdbs,
diff --git a/scap/main.py b/scap/main.py
index f36c4bf..b4f4c9e 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -263,6 +263,7 @@
self.get_logger().warning(
'%d hosts failed to restart HHVM', failed)
self.soft_errors = True
+self.get_stats().increment('deploy.restart')
def _after_lock_release(self):
self.announce('Finished scap: %s (duration: %s)',
@@ -473,7 +474,7 @@
class RestartHHVM(cli.Application):
-Restart the HHVM fcgi process
+Restart the HHVM fcgi process on the local server
#. Depool the server if registered with pybal
#. Wait for pending requests to complete
@@ -524,3 +525,33 @@
'/usr/sbin/service apache2 start', self.get_logger())
return 0
+
+
+class HHVMGracefulAll(cli.Application):
+Perform a rolling restart of HHVM across the cluster.
+
+def _process_arguments(self, args, extra_args):
+if hasattr(args, 'message'):
+args.message = ' '.join(args.message) or '(no message)'
+return args, extra_args
+
+@cli.argument('message', nargs='*', help='Log message for SAL')
+def main(self, *extra_args):
+exit_code = 0
+self.announce('Restarting HHVM: %s', self.arguments.message)
+
+target_hosts = utils.read_dsh_hosts_file(self.config['dsh_targets'])
+succeeded, failed = tasks.restart_hhvm(
+target_hosts, self.config,
+# Use a batch size of 5% of the total target list
+len(target_hosts) // 20)
+if failed:
+self.get_logger().warning(
+'%d hosts failed to restart HHVM', failed)
+exit_code = 1
+
+self.announce('Finished HHVM restart: %s (duration: %s)',
+self.arguments.message, utils.human_duration(self.get_duration()))
+self.get_stats().increment('deploy.restart')
+
+return exit_code
--
To view, visit https://gerrit.wikimedia.org/r/220941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic937aea94c5c5eea1a24df1d253f6e448cd99c65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More wikitech cleanup - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221009
Change subject: More wikitech cleanup
..
More wikitech cleanup
* Move semantic namespace stuff up to below Semantic includes
* Remove pmtpa reference from OSM config
Bug: T75939
Change-Id: Iebea58aee16a999d083363e16665c0ea8da265ac
---
M wmf-config/wikitech.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/09/221009/1
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 4abbe76..03ee088 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -12,6 +12,10 @@
require_once( $IP/extensions/SemanticResultFormats/SemanticResultFormats.php
);
enableSemantics( 'wikitech' );
+$smwgNamespacesWithSemanticLinks[112] = true;
+$smwgNamespacesWithSemanticLinks[NS_NOVA_RESOURCE] = true;
+#$wgNamespacesToBeSearchedDefault[NS_NOVA_RESOURCE] = true;
+
require_once( $IP/extensions/LdapAuthentication/LdapAuthentication.php );
$wgAuth = new LdapAuthenticationPlugin();
$wgLDAPDomainNames = array( 'labs');
@@ -115,15 +119,11 @@
# Enable doc links on the 'configure instance' page
$wgOpenStackManagerPuppetDocBase =
'http://doc.wikimedia.org/puppet/classes/__site__/';
-$wgOpenStackManagerProxyGateways = array('pmtpa' = '208.80.153.214', 'eqiad'
= '208.80.155.156');
+$wgOpenStackManagerProxyGateways = array( 'eqiad' = '208.80.155.156' );
# Restrict eqiad to a group
$wgOpenStackManagerRestrictedRegions = array();
$wgOpenStackManagerReadOnlyRegions = array();
-
-$smwgNamespacesWithSemanticLinks[112] = true;
-$smwgNamespacesWithSemanticLinks[NS_NOVA_RESOURCE] = true;
-#$wgNamespacesToBeSearchedDefault[NS_NOVA_RESOURCE] = true;
# TODO: Re-enable OpenID
#require_once($IP/extensions/OpenID/OpenID.php);
--
To view, visit https://gerrit.wikimedia.org/r/221009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebea58aee16a999d083363e16665c0ea8da265ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Temporarily make subpages in occupied namespaces non-Flow again - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221011
Change subject: Temporarily make subpages in occupied namespaces non-Flow again
..
Temporarily make subpages in occupied namespaces non-Flow again
This will allow ContentHandler::getDefaultModelFor to do the right
thing for wikitext subpages last edited before $wgContentHandlerUseDB
was turned on.
This should go to production. Then, Kunal's script for T103388
should be run on all WMF wikis. Then, this can be reverted.
Bug: T103776
Change-Id: I7af2e61dbb4968977c0898d20de24f8ce5f59f12
---
M includes/TalkpageManager.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/11/221011/1
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index 7a93e5c..d399024 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -106,7 +106,7 @@
if ( in_array( $title-getPrefixedText(),
$this-occupiedPages ) ) {
return true;
}
- if ( in_array( $title-getNamespace(),
$this-occupiedNamespaces ) ) {
+ if ( !$title-isSubpage() in_array(
$title-getNamespace(), $this-occupiedNamespaces ) ) {
return true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/221011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7af2e61dbb4968977c0898d20de24f8ce5f59f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add high-resolution logos for the Chinese Wikipedia - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add high-resolution logos for the Chinese Wikipedia .. Add high-resolution logos for the Chinese Wikipedia This patch adds configuration support for two high-resolution logos for the Chinese Wikipedia (zhwiki), which currently uses Common.css overrides to achieve this. Both logos have been generated from the official wiki logo and optimized with optipng. The logo is copyrighted by the Wikimedia Foundation and released under the CC-BY-SA; also trademarked by the WMF. See Phabricator task for details. Bug: T102852 Change-Id: I1fc5be0af4d23c799c373c358f0bbe5df9f198e3 --- A w/static/images/project-logos/zhwiki-1.5x.png A w/static/images/project-logos/zhwiki-2x.png M wmf-config/InitialiseSettings.php 3 files changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/w/static/images/project-logos/zhwiki-1.5x.png b/w/static/images/project-logos/zhwiki-1.5x.png new file mode 100644 index 000..4e05af0 --- /dev/null +++ b/w/static/images/project-logos/zhwiki-1.5x.png Binary files differ diff --git a/w/static/images/project-logos/zhwiki-2x.png b/w/static/images/project-logos/zhwiki-2x.png new file mode 100644 index 000..ed0b502 --- /dev/null +++ b/w/static/images/project-logos/zhwiki-2x.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 050d3d5..7cf1076 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1100,6 +1100,7 @@ 'ruwiki' = array( '1.5x' = '/static/images/project-logos/ruwiki-1.5x.png', '2x' = '/static/images/project-logos/ruwiki-2x.png' ), 'tawiki' = array( '1.5x' = '/static/images/project-logos/tawiki-1.5x.png', '2x' = '/static/images/project-logos/tawiki-2x.png' ), 'viwiki' = array( '1.5x' = '/static/images/project-logos/viwiki-1.5x.png', '2x' = '/static/images/project-logos/viwiki-2x.png' ), + 'zhwiki' = array( '1.5x' = '/static/images/project-logos/zhwiki-1.5x.png', '2x' = '/static/images/project-logos/zhwiki-2x.png' ), # Wiktionary 'viwiktionary' = array( '1.5x' = '/static/images/project-logos/viwiktionary-1.5x.png', '2x' = '/static/images/project-logos/viwiktionary-2x.png' ), -- To view, visit https://gerrit.wikimedia.org/r/219012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1fc5be0af4d23c799c373c358f0bbe5df9f198e3 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jQuery Client to v2.0.0 - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update jQuery Client to v2.0.0
..
Update jQuery Client to v2.0.0
Breaking change
* Microsoft's new Edge browser is now identified as edge instead of msie.
Project link
* https://github.com/wikimedia/jquery-client
File link
* https://github.com/wikimedia/jquery-client/blob/v2.0.0/jquery.client.js
Change-Id: I3d6aab9687feb45e813167f6c9c08575d3710148
---
M lib/jquery.client/jquery.client.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.client/jquery.client.js
b/lib/jquery.client/jquery.client.js
index 1560c7d..8257d85 100644
--- a/lib/jquery.client/jquery.client.js
+++ b/lib/jquery.client/jquery.client.js
@@ -1,5 +1,5 @@
/*!
- * jQuery Client v1.0.0
+ * jQuery Client v2.0.0
* https://www.mediawiki.org/wiki/JQuery_Client
*
* Copyright 2010-2015 jquery-client maintainers and other contributors.
@@ -182,9 +182,12 @@
version = match[1];
}
}
- // And IE 12's different lies about not being IE
+ // And MS Edge's lies about being Chrome
+ //
+ // It's different enough from classic IE Trident engine
that they do this
+ // to avoid getting caught by MSIE-specific browser
sniffing.
if ( name === 'chrome' ( match = ua.match(
/\bedge\/([0-9\.]*)/ ) ) ) {
- name = 'msie';
+ name = 'edge';
version = match[1];
layout = 'edge';
layoutversion = parseInt( match[1], 10 );
--
To view, visit https://gerrit.wikimedia.org/r/216531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d6aab9687feb45e813167f6c9c08575d3710148
Gerrit-PatchSet: 8
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] planet: remove role from zirconium - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221016
Change subject: planet: remove role from zirconium
..
planet: remove role from zirconium
It is moving to planet1001 on ganeti instead.
Bug:T101730
Change-Id: I743b252298116a0860e91fe12f596d3015b60f90
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/221016/1
diff --git a/manifests/site.pp b/manifests/site.pp
index cd0af12..1c9b696 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2369,7 +2369,6 @@
class { 'base::firewall': }
include standard
-include role::planet
include role::wikimania_scholarships
include role::bugzilla_static
include role::transparency
--
To view, visit https://gerrit.wikimedia.org/r/221016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I743b252298116a0860e91fe12f596d3015b60f90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...BlueSpiceSkin)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221020
Change subject: build: Configure banana-checker and jsonlint
..
build: Configure banana-checker and jsonlint
Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/20/221020/1
diff --git a/.gitignore b/.gitignore
index 75a89f4..9b344da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*~
*.kate-swp
.*.swp
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+ private: true,
+ scripts: {
+test: grunt test
+ },
+ devDependencies: {
+grunt: 0.4.5,
+grunt-cli: 0.1.13,
+grunt-banana-checker: 0.2.2,
+grunt-jsonlint: 1.0.4
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/221020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] planet: remove role from zirconium - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: planet: remove role from zirconium
..
planet: remove role from zirconium
It is moving to planet1001 on ganeti instead.
Bug:T101730
Change-Id: I743b252298116a0860e91fe12f596d3015b60f90
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index cd0af12..1c9b696 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2369,7 +2369,6 @@
class { 'base::firewall': }
include standard
-include role::planet
include role::wikimania_scholarships
include role::bugzilla_static
include role::transparency
--
To view, visit https://gerrit.wikimedia.org/r/221016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I743b252298116a0860e91fe12f596d3015b60f90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide the red border around syntax errors - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide the red border around syntax errors
..
Hide the red border around syntax errors
MZMcBride noticed the red border around '國' in
https://en.wikipedia.org/wiki/Swift_(programming_language)#Example_code
That particular case happens to be a Pygments bug, because multibyte characters
are valid variable names in Swift. But even in cases of legitimate syntax
errors, I don't think we want to show the red border. This behavior may be
useful in code editors, but it is not useful in a wiki environment, especially
given the longstanding habit of using an existing, mostly-compatible lexer to
highlight a language for which no specific lexer exists.
To fix this, override the style in pygments.wrapper.css, and swap the order in
which the two CSS files are concatenated, so that in general we have the
ability to override Pygments-generated CSS.
Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
(cherry picked from commit 927f40e98ac63cd93d79fbac622478344274fade)
---
M extension.json
M modules/pygments.wrapper.css
2 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index f2d238d..af19063 100644
--- a/extension.json
+++ b/extension.json
@@ -36,8 +36,8 @@
mobile
],
styles: [
- pygments.wrapper.css,
- pygments.generated.css
+ pygments.generated.css,
+ pygments.wrapper.css
]
}
},
diff --git a/modules/pygments.wrapper.css b/modules/pygments.wrapper.css
index b1f7cb9..643e3c3 100644
--- a/modules/pygments.wrapper.css
+++ b/modules/pygments.wrapper.css
@@ -14,3 +14,13 @@
border: 0;
padding: 0;
}
+
+/*
+ * Don't show a red border around syntax errors. This behavior may be useful
+ * in code editors, but it is not useful in a wiki environment, especially
+ * given the longstanding habit of using an existing, mostly-compatible lexer
+ * to highlight a language for which no lexer exists.
+ */
+.mw-highlight .err {
+border: 0;
+}
--
To view, visit https://gerrit.wikimedia.org/r/221018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I304fdaf3a462445d316e0f7fecc983fa87afc629
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registration: 'FilterLogTypes' is a JSON object - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: registration: 'FilterLogTypes' is a JSON object
..
registration: 'FilterLogTypes' is a JSON object
Change-Id: I01eb28b9d01db8e500e376db9296b4eee85854c1
---
M docs/extension.schema.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index d7d9e47..c9f629c 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -575,7 +575,7 @@
type: object
},
FilterLogTypes: {
- type: array
+ type: object
},
LogNames: {
type: object
--
To view, visit https://gerrit.wikimedia.org/r/221019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01eb28b9d01db8e500e376db9296b4eee85854c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Waldir wal...@email.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cache/misc: switch planet over to planet1001 - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: cache/misc: switch planet over to planet1001
..
cache/misc: switch planet over to planet1001
Bug:T101730
Change-Id: Ie3c6fd1fb34695864dc5d36486e38baf550a0eb6
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index fc1aea1..5a10413 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -74,7 +74,7 @@
}
}
elsif (req.http.Host ~ .*\.planet\.wikimedia\.org || req.http.Host ==
planet.wikimedia.org) {
- set req.backend = zirconium;
+ set req.backend = planet1001;
} elsif (req.http.Host == etherpad.wikimedia.org) {
set req.backend = etherpad1001;
return (pass);
--
To view, visit https://gerrit.wikimedia.org/r/221032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3c6fd1fb34695864dc5d36486e38baf550a0eb6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lots and lots of cleanup; requires at least MW 1.24 (in theo... - change (mediawiki...BlueSky)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221034
Change subject: Lots and lots of cleanup; requires at least MW 1.24 (in
theory), but in practise tested only against MW 1.25
..
Lots and lots of cleanup; requires at least MW 1.24 (in theory), but in
practise tested only against MW 1.25
Some of the changes include:
* fixed logging in via the skin's integrated login box
* removed legacy PHP i18n file/wrapper
* added skin.json file for MW 1.25+
* removed legacy external links CSS files in favor of the core RL module
* got rid of the BeforePageDisplay hook in favor of defining the things in
SkinBlueSky::initPage()
* removed some wikiHow-specific bits 'n' pieces
Change-Id: Iedbcf359cc7d0a88a6e142901b59ac94caa3ddd5
---
M BlueSky.hooks.php
D BlueSky.i18n.php
M BlueSky.php
M BlueSky.skin.php
M i18n/fi.json
D resources/css/externallinks-123.css
D resources/css/externallinks-124.css
A skin.json
M templates/userloginbox.tmpl.php
9 files changed, 331 insertions(+), 413 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky
refs/changes/34/221034/1
diff --git a/BlueSky.hooks.php b/BlueSky.hooks.php
index 4ab5557..dc4e78f 100644
--- a/BlueSky.hooks.php
+++ b/BlueSky.hooks.php
@@ -5,74 +5,13 @@
*/
class SkinBlueSkyHooks {
/**
- * TOC processing
- * Shamelessly stolen from brickimedia's refreshed skin
- * Currently:
https://github.com/Brickimedia/Refreshed/blob/master/Refreshed.skin.php#L72
- */
-
- public static function wfTOCCrap( OutputPage $out, ParserOutput
$parseroutput ) {
- global $blueSkyTOC;
- $blueSkyTOC = $parseroutput-mSections;
-
- return true;
- }
-
- public static function onBeforePageDisplayCrap( OutputPage $out,
$skin ) {
- //global $wgRequest, $wgUser;
-
- // Hooks are global, but we want these things *only* for this
skin.
- if ( get_class( $skin ) !== 'SkinBlueSky' ) {
- return true;
- }
-
- /*
- $action = $wgRequest-getVal( 'action', 'view' );
- $isMainPage = $out-getTitle()-isMainPage();
- $isArticlePage = $out-getTitle()
- !$isMainPage
- $out-getTitle()-getNamespace() == NS_MAIN
- $action == 'view';
- */
-
- $out-addMeta( 'http:content-type', 'text/html; charset=UTF-8'
);
-
- /*
- if ( $isArticlePage || $isMainPage ) {
- global $wgLanguageCode;
-
- if ( $wgLanguageCode != 'en' ) {
- $mobileLang = $wgLanguageCode . '.';
- } else {
- $mobileLang = '';
- }
-
- $out-addLink( array(
- 'rel' = 'alternate',
- 'media' = 'only screen and (max-width: 640px)',
- 'href' = 'http://' . $mobileLang .
'm.wikihow.com/' . $out-getTitle()-getPartialURL()
- ) );
- }
-
- $out-setCanonicalUrl( $out-getTitle()-getFullURL() );
- $out-addLink( array(
- 'href' =
'https://plus.google.com/102818024478962731382',
- 'rel' = 'publisher'
- ) );
-
- $out-addLink( array(
- 'rel' = 'alternate',
- 'type' = 'application/rss+xml',
- 'title' = 'wikiHow: How-to of the Day',
- 'href' = 'http://www.wikihow.com/feed.rss'
- ) );
-
- $out-addLink( array(
- 'rel' = 'apple-touch-icon',
- 'href' = $wgStylePath .
'/BlueSky/images/safari-large-icon.png'
- ) );
-
- echo $out-getHeadItems();
- */
+* TOC processing
+* Shamelessly stolen from brickimedia's refreshed skin
+* Currently:
https://github.com/Brickimedia/Refreshed/blob/master/Refreshed.skin.php#L72
+*/
+ public static function wfTOCCrap( OutputPage $out, ParserOutput
$parserOutput ) {
+ global $wgBlueSkyTOC;
+ $wgBlueSkyTOC = $parserOutput-mSections;
return true;
}
diff --git a/BlueSky.i18n.php b/BlueSky.i18n.php
deleted file mode 100644
index 42233bf..000
--- a/BlueSky.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
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
[MediaWiki-commits] [Gerrit] planet: install xslt-proc - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221033
Change subject: planet: install xslt-proc
..
planet: install xslt-proc
Description-en: XSLT 1.0 command line processor
This is needed by planet to transform XML to HTML but it did not install it
via package dependencies.
INFO:planet.runner:Loading cached data
sh: 1: xsltproc: not found
sh: 1: xsltproc: not found
sh: 1: xsltproc: not found
..
Bug:T101730
Change-Id: Ib9ca87db66e920cb255d2df1cb17c3d339774b50
---
M modules/planet/manifests/packages.pp
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/221033/1
diff --git a/modules/planet/manifests/packages.pp
b/modules/planet/manifests/packages.pp
index 9e4622e..d61c824 100644
--- a/modules/planet/manifests/packages.pp
+++ b/modules/planet/manifests/packages.pp
@@ -7,4 +7,9 @@
ensure = 'present',
}
+# XSLT 1.0 command line processor
+package { 'xsltproc':
+ensure = 'present',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/221033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9ca87db66e920cb255d2df1cb17c3d339774b50
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use spdx license identifier - change (mediawiki...FilterListUsers)
jenkins-bot has submitted this change and it was merged. Change subject: Use spdx license identifier .. Use spdx license identifier Change-Id: Ie76ffe846782708a665d10e31f49d054a64c361d --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 9dbfcc2..7a8f513 100644 --- a/extension.json +++ b/extension.json @@ -4,7 +4,7 @@ author: [ Jack Phoenix ], - license-name: GPLv2+, + license-name: GPL-2.0+, url: https://www.mediawiki.org/wiki/Extension:FilterListUsers;, descriptionmsg: filterlistusers-desc, type: other, -- To view, visit https://gerrit.wikimedia.org/r/221017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie76ffe846782708a665d10e31f49d054a64c361d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FilterListUsers Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set CORS headers on etherpad static files - change (operations/puppet)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221035
Change subject: Set CORS headers on etherpad static files
..
Set CORS headers on etherpad static files
Bug: T103940
Change-Id: Ic7321e5f5f5aac844f3973a3239ac10f7d6b26f6
---
M templates/misc/etherpad.wikimedia.org.erb
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/221035/1
diff --git a/templates/misc/etherpad.wikimedia.org.erb
b/templates/misc/etherpad.wikimedia.org.erb
index 8a5b2f8..856472c 100644
--- a/templates/misc/etherpad.wikimedia.org.erb
+++ b/templates/misc/etherpad.wikimedia.org.erb
@@ -37,6 +37,10 @@
RewriteCond %{HTTP_HOST} !%= @etherpad_host %
RewriteRule ^/+(.+)$ https://%= @etherpad_host %/$1 [R=301,L]
+Location /static
+Header set Access-Control-Allow-Origin *
+/Location
+
Proxy *
Options FollowSymLinks MultiViews
AllowOverride All
--
To view, visit https://gerrit.wikimedia.org/r/221035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7321e5f5f5aac844f3973a3239ac10f7d6b26f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] planet: proxy through url-downloader to fetch URLs - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221036
Change subject: planet: proxy through url-downloader to fetch URLs
..
planet: proxy through url-downloader to fetch URLs
Now that planet is on a ganeti VM we can't directly fetch
the external feed URLs but have to proxy via url-downloader.wm.org
instead.
Bug:T101730
Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
M modules/planet/manifests/init.pp
3 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/221036/1
diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index e20af3d..c51bf11 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -191,11 +191,15 @@
# protocol-relative link to a meta or index page for all planets
$planet_meta_link = meta.wikimedia.org/wiki/Planet_Wikimedia
+# since we are on Ganeti now we need to proxy to fetch external URLs
+$planet_http_proxy=http://url-downloader.wikimedia.org:8080;
+
# the 'planet' class from modules/planet/init.pp does the setup
class {'::planet':
planet_domain_name = $planet_domain_name,
planet_languages = $planet_languages,
-planet_meta_link = $planet_meta_link
+planet_meta_link = $planet_meta_link,
+planet_http_proxy = $planet_http_proxy
}
ferm::service { 'planet-http':
diff --git a/modules/planet/manifests/cronjob.pp
b/modules/planet/manifests/cronjob.pp
index 423a8a9..c4c14fc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
cron { update-${title}-planet:
ensure = 'present',
-command = ${planet_bin} -v ${planet_config} ${planet_logfile}
21,
+command = http_proxy=\${planet_http_proxy}\ ${planet_bin} -v
${planet_config} ${planet_logfile} 21,
user= 'planet',
minute = $minute,
require = [
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 44a89bb..2673fb5 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -16,7 +16,8 @@
class planet (
$planet_domain_name,
$planet_languages,
-$planet_meta_link
+$planet_meta_link,
+$planet_http_proxy,
) {
# locales are essential for planet
--
To view, visit https://gerrit.wikimedia.org/r/221036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] planet: fix to variable name for proxy - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: planet: fix to variable name for proxy
..
planet: fix to variable name for proxy
Change-Id: I874f9658333e4338268206900f4129857dc86689
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index c51bf11..0106a6c 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -192,7 +192,7 @@
$planet_meta_link = meta.wikimedia.org/wiki/Planet_Wikimedia
# since we are on Ganeti now we need to proxy to fetch external URLs
-$planet_http_proxy=http://url-downloader.wikimedia.org:8080;
+$planet_http_proxy = http://url-downloader.wikimedia.org:8080;
# the 'planet' class from modules/planet/init.pp does the setup
class {'::planet':
diff --git a/modules/planet/manifests/cronjob.pp
b/modules/planet/manifests/cronjob.pp
index c4c14fc..59120bc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
cron { update-${title}-planet:
ensure = 'present',
-command = http_proxy=\${planet_http_proxy}\ ${planet_bin} -v
${planet_config} ${planet_logfile} 21,
+command = http_proxy=\${planet::planet_http_proxy}\ ${planet_bin}
-v ${planet_config} ${planet_logfile} 21,
user= 'planet',
minute = $minute,
require = [
--
To view, visit https://gerrit.wikimedia.org/r/221037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I874f9658333e4338268206900f4129857dc86689
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] planet: fix to variable name for proxy - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221037
Change subject: planet: fix to variable name for proxy
..
planet: fix to variable name for proxy
Change-Id: I874f9658333e4338268206900f4129857dc86689
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/221037/1
diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index c51bf11..0106a6c 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -192,7 +192,7 @@
$planet_meta_link = meta.wikimedia.org/wiki/Planet_Wikimedia
# since we are on Ganeti now we need to proxy to fetch external URLs
-$planet_http_proxy=http://url-downloader.wikimedia.org:8080;
+$planet_http_proxy = http://url-downloader.wikimedia.org:8080;
# the 'planet' class from modules/planet/init.pp does the setup
class {'::planet':
diff --git a/modules/planet/manifests/cronjob.pp
b/modules/planet/manifests/cronjob.pp
index c4c14fc..59120bc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
cron { update-${title}-planet:
ensure = 'present',
-command = http_proxy=\${planet_http_proxy}\ ${planet_bin} -v
${planet_config} ${planet_logfile} 21,
+command = http_proxy=\${planet::planet_http_proxy}\ ${planet_bin}
-v ${planet_config} ${planet_logfile} 21,
user= 'planet',
minute = $minute,
require = [
--
To view, visit https://gerrit.wikimedia.org/r/221037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I874f9658333e4338268206900f4129857dc86689
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Add languages for deployment on 20150625 - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/220707 Change subject: CX: Add languages for deployment on 20150625 .. CX: Add languages for deployment on 20150625 Also, fixed code bat-smg - sgs Bug: T95955 Bug: T97011 Bug: T103507 Bug: T103508 Bug: T103509 Bug: T103510 Bug: T103511 Bug: T103512 Bug: T103513 Bug: T103514 Bug: T103515 Bug: T103516 Bug: T103517 Bug: T103518 Bug: T103519 Bug: T103520 Bug: T103521 Bug: T103523 Bug: T103524 Bug: T103525 Bug: T103550 Change-Id: If46a3e8e2488205db7640b4ed2daae81944cf277 --- M hieradata/common/cxserver.yaml 1 file changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/07/220707/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 8a7ed3d..ddd2877 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -297,6 +297,7 @@ - 'am' - 'an' - 'ang' +- 'ar' - 'arc' - 'arz' - 'as' @@ -306,7 +307,6 @@ - 'az' - 'ba' - 'bar' -- 'bat-smg' - 'be' - 'be-tarask' - 'bcl' @@ -330,6 +330,7 @@ - 'crh-latn' - 'chy' - 'ckb' +- 'co' - 'cs' - 'csb' - 'cv' @@ -340,11 +341,13 @@ - 'dz' - 'ee' - 'el' +- 'eml' - 'eo' - 'es' - 'et' - 'eu' - 'ext' +- 'fa' - 'ff' - 'fi' - 'fj' @@ -352,6 +355,7 @@ - 'fr' - 'frp' - 'frr' +- 'fur' - 'fy' - 'ga' - 'gag' @@ -364,6 +368,7 @@ - 'gu' - 'gv' - 'haw' +- 'he' - 'hi' - 'hif' - 'hr' @@ -373,10 +378,12 @@ - 'hy' - 'id' - 'ig' -- 'io' - 'ik' - 'ilo' +- 'io' - 'is' +- 'it' +- 'iu' - 'ja' - 'jbo' - 'jv' @@ -403,12 +410,15 @@ - 'lbe' - 'lez' - 'li' +- 'lij' - 'lg' +- 'lmo' - 'ln' - 'lo' - 'lt' - 'ltg' - 'lv' +- 'lzh' - 'mai' - 'map-bms' - 'mdf' @@ -427,7 +437,9 @@ - 'mwl' - 'mzn' - 'na' +- 'nap' - 'nah' +- 'nan' - 'nds' - 'nds-nl' - 'ne' @@ -459,19 +471,24 @@ - 'ps' - 'pt' - 'qu' +- 'rm' - 'rmy' - 'rn' - 'ro' +- 'roa-tara' - 'ru' -- 'rup' - 'rue' +- 'rup' - 'rw' - 'sa' - 'sah' +- 'sc' +- 'scn' - 'sco' - 'sd' - 'se' - 'sg' +- 'sgs' - 'sh' - 'si' - 'simple' @@ -511,6 +528,7 @@ - 'ur' - 'uz' - 've' +- 'vec' - 'vep' - 'vi' - 'vls' @@ -524,8 +542,10 @@ - 'xh' - 'yi' - 'yo' +- 'yue' - 'za' - 'zea' +- 'zh' - 'zu' mt: Apertium: -- To view, visit https://gerrit.wikimedia.org/r/220707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If46a3e8e2488205db7640b4ed2daae81944cf277 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unsupported direct mode - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220710
Change subject: Remove unsupported direct mode
..
Remove unsupported direct mode
If we decide to want this, we'll just replace the queue send function.
Change-Id: Ib2f9454b4e219381cb9bd2853458051129eda4f8
---
M sites/all/modules/wmf_audit/wmf_audit.module
M sites/all/modules/wmf_audit/worldpay/worldpay_audit.drush.inc
2 files changed, 3 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/10/220710/1
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index 5ab67c1..adff527 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -1,7 +1,6 @@
?php
define('WMF_AUDIT_PAYMENTS_LOGS_DIR', '/usr/local/src/logs/');
-define('WMF_AUDIT_DIRECT_INSERT', false);
/**
* Implementation of hook_menu()
@@ -53,12 +52,6 @@
'#title' = t('Path to directory containing WMF payments logs'),
'#required' = TRUE,
'#default_value' = variable_get('wmf_audit_log_archive_dir',
WMF_AUDIT_PAYMENTS_LOGS_DIR),
- );
- $form['wmf_audit_direct_insert'] = array(
-'#type' = 'checkbox',
-'#title' = t('When this box is checked, the audit scripts will attempt to
write to civicrm directly, instead of flooding the regular queues'),
-'#required' = FALSE,
-'#default_value' = variable_get('wmf_audit_direct_insert',
WMF_AUDIT_DIRECT_INSERT),
);
return system_settings_form($form);
}
@@ -1204,9 +1197,8 @@
/**
* Sends a completed transaction to... somewhere.
* The default is to send this thing to an appropriate stomp queue for its
type.
- * Other possibilities are to echo the complete message (test mode) or try to
- * save the message to civicm directly (no_queue, not currently supported.
- * It's nice to want things.)
+ * Other possibilities are to echo the complete message (test mode).
+ *
* @param array $record An array representing the complete data we want to save
* @param string $type The type of transaction we are. 'main', 'negative',
* 'recurring'... like that.
@@ -1218,14 +1210,7 @@
return true;
}
- if (wmf_audit_runtime_options('no_queue')) {
-die(__FUNCTION__ . Direct inserts are not yet supported. Please use
queue flood mode. . print_r($record, true));
-//wmf_civicrm_contribution_message_import($record); //or something
like that
-//BLOCKERS: No failmail or standard hooks yet.
-//Other things: Do we need a different import function for each main type?
I mean, we have three different queue consumers.
- } else {
-return wmf_audit_send_stomp($record, $type);
- }
+ return wmf_audit_send_stomp($record, $type);
}
/**
diff --git a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.drush.inc
b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.drush.inc
index 308f61e..08e9097 100644
--- a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.drush.inc
+++ b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.drush.inc
@@ -24,7 +24,6 @@
'makemissing' = 'Will reconstruct the un-rebuildable transactions found
in the recon file, with default values. USE WITH CAUTION: Currently this
prevents real data from entering the system if we ever get it.',
'charlimit' = 'Will cause echoing to line break after the given number
of characters',
'verbose' = 'Verbose output',
- 'no_queue' = 'Running in direct insert mode - no queue flooding',
'recon_complete_count' = 'Number past which we should consider a recon
file to be complete, and move it out of the working dir.',
),
'aliases' = array('wp_audit'),
@@ -54,7 +53,6 @@
'makemissing' = 'Making payments data for missing transactions',
'run_all' = 'Running all recon files! This might take a while...',
'verbose' = 'Outputting verbose.',
-'no_queue' = 'Running in direct insert mode',
'recon_complete_count' = 'Number past which we should consider a recon
file to be complete, and move it out of the working dir.'
);
@@ -62,7 +60,6 @@
//handle our defaults first...
$args['test'] = variable_get('worldpay_audit_test_mode', WP_AUDIT_TEST_MODE);
- $args['no_queue'] = variable_get('wmf_audit_direct_insert',
WMF_AUDIT_DIRECT_INSERT); //defaults to false at the UI level. Can't really set
*to* false at the command line, though...
//now override with the command line settings
foreach ($simple_opts as $key = $message) {
if (drush_get_option($key)) {
--
To view, visit https://gerrit.wikimedia.org/r/220710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2f9454b4e219381cb9bd2853458051129eda4f8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
[MediaWiki-commits] [Gerrit] WIP remove audit cruft - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220711
Change subject: WIP remove audit cruft
..
WIP remove audit cruft
Bookmark for future destruction. In a better world, these functions wouldn't
be necessary.
Change-Id: Ib08792d89ef0210b6c00e34ea370982ba94808a3
---
M sites/all/modules/wmf_audit/wmf_audit.module
1 file changed, 0 insertions(+), 120 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/11/220711/1
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index adff527..a78b8ed 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -760,28 +760,6 @@
}
/**
- * Executes a function that is expected to exist in the relevant submodule
- * defined at runtime. Fails angrily if that function doesn't exist.
- * @param string $function_name_base Everything after the submodule . '_audit_'
- * in the function you're trying to call.
- * @param array $parameters The parameters you want to send to the function, in
- * array format.
- * @return mixed The return value of the specified function.
- */
-function wmfa_execute($function_name_base, $parameters = array()) {
- $submod_prefix = wmf_audit_runtime_options('submod_prefix');
- $function_name = $submod_prefix . '_audit_' . $function_name_base;
- if (function_exists($function_name)) {
-return call_user_func_array($function_name, $parameters);
- } else {
-//serious issues, you have.
-wmf_audit_log_error(Missing required function $function_name,
'MISSING_FUNCTION'); //should be fatal
-die(); //this really should die here. For real, though.
- }
- return false; //no way to get here with all the dying
-}
-
-/**
* Check the database to see if we have already recorded the transactions
* present in the recon files.
* @param array $transactions An array of transactions we have already parsed
@@ -887,79 +865,6 @@
$chars = 0;
}
}
-
-/**
- * A confusing function for holding local runtime vars without having to goof
- * around with globals. Works as both get and set, depending on what you pass
in
- * with $confusing_thing
- * @staticvar array $args The arguments set at runtime via drush command
- * @param array|string|null $confusing_thing A confusing thing.
- * * When it is an array, sets the internal static $args variable to that array
- * * When it is a string, it interprets the string to be the key for which
there
- * should be a value in $args, and returns that value (or false if not
- * present).
- * * When it is null, it returns the whole $args array.
- * @return mixed Either a boolean, or a specific runtime setting (if
- * $confusing_thing is neither an array nor null)
- */
-function wmf_audit_runtime_options($confusing_thing = null) {
- static $args = array();
- if (is_array($confusing_thing)) { //we're setting up the function for later
use, and $confusing_thing is the array of current settings.
-$args = $confusing_thing;
-return true;
- } elseif (is_null($confusing_thing)) { //we want all the settings
-return $args;
- } elseif (array_key_exists($confusing_thing, $args)) { //we are after a
specific setting
-return $args[$confusing_thing];
- }
- return false;
-}
-
-/**
- * Logs the errors we get in a consistent way
- * @param string $watchdog_message The message we want to log. Should be
- * descriptive enough that we can bug hunt without having to go all cowboy in
- * prod.
- * @param string $drush_code If this code is fatal (According to
- * wmf_audit_error_isfatal), this will result in the whole script dying.
- */
-function wmf_audit_log_error($watchdog_message, $drush_code) {
-
- watchdog(wmf_audit_runtime_options('submod_prefix') . '_audit',
$watchdog_message, NULL, WATCHDOG_ERROR);
-
- //Maybe explode
- if (wmf_audit_error_isfatal($drush_code)) {
-die(\n*** Fatal Error $drush_code: $watchdog_message);
- }
-}
-
-/**
- * Returns an array of errors that should not cause the script to blow up, but
- * which will probably still cause messages to get thrown out.
- * @return boolean true if the error code is fatal, otherwise false.
- */
-function wmf_audit_error_isfatal($error) {
- //All of these nonfatal things are meant to be nonfatal to the *job*, and
- //not nonfatal to the contribution itself. We hit one of these,
- //the contribution will be skipped, and we move to the next one.
- //ALL OTHER CODES will cause the process to come to a screeching halt.
- $nonfatal = array(
-'DATA_INCONSISTENT',
-'DATA_INCOMPLETE',
-'DATA_WEIRD',
-'MISSING_PAYMENTS_LOG',
-'MISSING_MANDATORY_DATA',
-'UTM_DATA_MISMATCH',
-'NORMALIZE_DATA',
- );
-
- if (in_array($error, $nonfatal)) {
-return false;
- } else {
-return true;
- }
-}
-
/**
* Returns supplemental data for the relevant order id from the
[MediaWiki-commits] [Gerrit] Use new names for fields - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220708
Change subject: Use new names for fields
..
Use new names for fields
Change-Id: I0ffafbaee684d69350aed3cc37d1db44719faadc
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
M sites/all/modules/wmf_audit/wmf_audit.module
M sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
3 files changed, 7 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/08/220708/1
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index 73d028e..c68cb58 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -676,7 +676,7 @@
'last_name' = array( 'donor_data', 'SURNAME' ),
'street_address' = array( 'donor_data', 'STREET' ),
'city' = array( 'donor_data', 'CITY' ),
- 'state' = array( 'donor_data', 'STATE' ),
+ 'state_province' = array( 'donor_data', 'STATE' ),
'country' = array( 'donor_data', 'COUNTRYCODE' ),
'postal_code' = array( 'donor_data', 'ZIP' ),
'gateway_txn_id' = array( 'donor_data', 'ORDERID' ),
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index e703deb..0aaad6d 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -1276,21 +1276,5 @@
wmf_common_set_message_source($headers, 'audit',
wmf_audit_runtime_options('submod_prefix') . ' Recon Auditor');
- $rekey = array(
-'first_name' = 'fname',
-'last_name' = 'lname',
-'street_address' = 'street',
-'state_province' = 'state',
-'postal_code' = 'zip',
-'currency' = 'currency_code',
- );
-
- foreach ($rekey as $new = $old) {
-if (array_key_exists($old, $body)) {
- $body[$new] = $body[$old];
- //don't unset; It's okay.
-}
- }
-
return $q-enqueue(json_encode($body), $headers, $types[$type]);
}
diff --git a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
index b727962..8854a1c 100644
--- a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
+++ b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
@@ -440,10 +440,10 @@
'OrderNumber' = 'gateway_txn_id',
'Amount' = 'gross',
'REMOTE_ADDR' = 'user_ip',
-'FirstName' = 'fname',
-'LastName' = 'lname',
-'Address1' = 'street', //N0NE PROVIDED
-'ZipCode' = 'zip', //0
+'FirstName' = 'first_name',
+'LastName' = 'last_name',
+'Address1' = 'street_address', //N0NE PROVIDED
+'ZipCode' = 'postal_code', //0
'CountryCode' = 'country',
'Email' = 'email',
'contribution_tracking_id' = 'contribution_tracking_id', //passed
through, because I already set this manually
@@ -460,8 +460,8 @@
}
$unsets = array(
-'street' = 'N0NE PROVIDED',
-'zip' = '0',
+'street_address' = 'N0NE PROVIDED',
+'postal_code' = '0',
);
foreach ($unsets as $key = $value) {
--
To view, visit https://gerrit.wikimedia.org/r/220708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ffafbaee684d69350aed3cc37d1db44719faadc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove various code formatting inconsistencies - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove various code formatting inconsistencies
..
Remove various code formatting inconsistencies
Found by running CodeSniffer.
Change-Id: I56cd00859f19d104efc2040578ab4ac7e143e3df
---
M resources/css/ext.translate.special.pagemigration.css
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.editor.shortcuts.js
M resources/js/ext.translate.special.aggregategroups.js
M tests/qunit/ext.translate.special.pagemigration.test.js
5 files changed, 4 insertions(+), 7 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.special.pagemigration.css
b/resources/css/ext.translate.special.pagemigration.css
index 514bab8..d64402e 100644
--- a/resources/css/ext.translate.special.pagemigration.css
+++ b/resources/css/ext.translate.special.pagemigration.css
@@ -62,4 +62,4 @@
color: #C00;
border: 1px solid #FAC5C5;
background-color: #FAE3E3;
-}
\ No newline at end of file
+}
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 77a2b60..83ae13b 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -113,7 +113,6 @@
this.markUnsaved( 'tux-warning' );
},
-
/**
* Mark the message as no longer unsaved
*/
diff --git a/resources/js/ext.translate.editor.shortcuts.js
b/resources/js/ext.translate.editor.shortcuts.js
index e68b6e3..4f980bd 100644
--- a/resources/js/ext.translate.editor.shortcuts.js
+++ b/resources/js/ext.translate.editor.shortcuts.js
@@ -18,7 +18,7 @@
maxLeft = editorOffset.left;
if ( !rtl ) {
-maxLeft += this.$editor.outerWidth();
+ maxLeft += this.$editor.outerWidth();
}
this.hideShortcuts();
diff --git a/resources/js/ext.translate.special.aggregategroups.js
b/resources/js/ext.translate.special.aggregategroups.js
index 11cd05a..0fab949 100644
--- a/resources/js/ext.translate.special.aggregategroups.js
+++ b/resources/js/ext.translate.special.aggregategroups.js
@@ -148,7 +148,7 @@
$( document ).ready( function () {
var excludeFunction, autocompleteFunction,
api = new mw.Api(),
- exclude = [], resp, groups=[],
+ exclude = [], resp, groups = [],
$input = $( '.tp-group-input' );
excludeFunction = function( event ) {
@@ -295,7 +295,6 @@
$div.data( 'groupid', aggregateGroupId );
$div.data( 'id', aggregateGroupId );
-
$groupSelector = $( 'input' ).attr( {
'type': 'text' ,
diff --git a/tests/qunit/ext.translate.special.pagemigration.test.js
b/tests/qunit/ext.translate.special.pagemigration.test.js
index 4eb5fed..71afaff 100644
--- a/tests/qunit/ext.translate.special.pagemigration.test.js
+++ b/tests/qunit/ext.translate.special.pagemigration.test.js
@@ -98,5 +98,4 @@
translationUnits2 = mw.translate.alignHeaders( sourceUnits,
translationUnits2 );
assert.deepEqual( translationUnits2, result2, 'h2 headers
aligned with merging' );
} );
-
-}( jQuery, mediaWiki ) );
\ No newline at end of file
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/213993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56cd00859f19d104efc2040578ab4ac7e143e3df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused local variable - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused local variable
..
Remove unused local variable
Change-Id: Iac074f4ef5d929d17a4c3d156965b01a9d779ce7
---
M ffs/AmdFFS.php
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ffs/AmdFFS.php b/ffs/AmdFFS.php
index d057971..b04dfde 100644
--- a/ffs/AmdFFS.php
+++ b/ffs/AmdFFS.php
@@ -89,8 +89,6 @@
*/
protected function writeReal( MessageCollection $collection ) {
$messages = array();
- $template = $this-read( $collection-getLanguage() );
-
$mangler = $this-group-getMangler();
/// @var $m ThinMessage
--
To view, visit https://gerrit.wikimedia.org/r/213994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac074f4ef5d929d17a4c3d156965b01a9d779ce7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the strong formatting for 'revdelete-suppress' - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove the strong formatting for 'revdelete-suppress'
..
Remove the strong formatting for 'revdelete-suppress'
Just came across this in the interface, and it drew my attention, but I
see no reason why this option is more or less important than 'watchthis'
or any other option.
Change-Id: I8fd2c27dea5f0822514b7ce78a9ad8ff2bbe42f4
---
M includes/page/Article.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 5d7f365..8a11844 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1706,10 +1706,8 @@
if ( $user-isAllowed( 'suppressrevision' ) ) {
$suppress = Html::openElement( 'div', array( 'id' =
'wpDeleteSuppressRow' ) ) .
- strong .
- Xml::checkLabel( wfMessage(
'revdelete-suppress' )-text(),
- 'wpSuppress',
'wpSuppress', false, array( 'tabindex' = '4' ) ) .
- /strong .
+ Xml::checkLabel( wfMessage(
'revdelete-suppress' )-text(),
+ 'wpSuppress', 'wpSuppress', false,
array( 'tabindex' = '4' ) ) .
Html::closeElement( 'div' );
} else {
$suppress = '';
--
To view, visit https://gerrit.wikimedia.org/r/219826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fd2c27dea5f0822514b7ce78a9ad8ff2bbe42f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Happy-melon happy.melon.w...@gmail.com
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T102717: Fix the RDF links always use http: - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: T102717: Fix the RDF links always use http:
..
T102717: Fix the RDF links always use http:
Change-Id: Ifa78d36f639b041d526e065f7d0583f7ce0040ff
---
M repo/includes/rdf/RdfVocabulary.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/rdf/RdfVocabulary.php
b/repo/includes/rdf/RdfVocabulary.php
index 7ed998d..3bc09ea 100644
--- a/repo/includes/rdf/RdfVocabulary.php
+++ b/repo/includes/rdf/RdfVocabulary.php
@@ -97,8 +97,8 @@
* @param string $dataUri Base URI for entity description URIs.
*/
public function __construct( $baseUri, $dataUri ) {
- $this-baseUri = $baseUri;
- $this-dataUri = $dataUri;
+ $this-baseUri = self::alwaysHTTP( $baseUri );
+ $this-dataUri = self::alwaysHTTP( $dataUri );
if( substr($this-baseUri, -7) === 'entity/') {
$topUri = substr($this-baseUri, 0, -7);
@@ -215,4 +215,17 @@
return self::COMMONS_URI . rawurlencode( $file );
}
+ /**
+* Returns URI that is always http: even if the passed URI is https
+* @param string $uri
+* @return string
+*/
+ public static function alwaysHTTP( $uri ) {
+ if( strncasecmp( $uri, 'https://', 8 ) === 0 ) {
+ // https: becomes http:
+ $uri = 'http' . substr( $uri, 5 );
+ }
+ return $uri;
+ }
+
}
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
index 90b9791..b3b4b90 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
@@ -31,7 +31,7 @@
class RdfBuilderTestData {
const URI_BASE = 'http://acme.test/';
- const URI_DATA = 'http://data.acme.test/';
+ const URI_DATA = 'https://data.acme.test/';
/**
* @var EntityContentDataCodec|null
--
To view, visit https://gerrit.wikimedia.org/r/218994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa78d36f639b041d526e065f7d0583f7ce0040ff
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev smalys...@wikimedia.org
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Smalyshev smalys...@wikimedia.org
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove superflous return statement - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove superflous return statement
..
Remove superflous return statement
Code analysis said that there was a return argument missing, but
SpecialPage::displayRestrictionError() throws a PermissionsError so that
the return statement is not reached.
Change-Id: Iaf83e87ce45224ae6a3fc9bc29577d975879d469
---
M tag/SpecialPageTranslationDeletePage.php
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tag/SpecialPageTranslationDeletePage.php
b/tag/SpecialPageTranslationDeletePage.php
index 3b26e78..10c0acb 100644
--- a/tag/SpecialPageTranslationDeletePage.php
+++ b/tag/SpecialPageTranslationDeletePage.php
@@ -133,7 +133,6 @@
# Check rights
if ( !$this-userCanExecute( $this-getUser() ) ) {
$this-displayRestrictionError();
- return;
}
if ( $this-title === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/213995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf83e87ce45224ae6a3fc9bc29577d975879d469
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Generalise cdb-coverage into phpunit-coverage-publish - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Generalise cdb-coverage into phpunit-coverage-publish .. Generalise cdb-coverage into phpunit-coverage-publish Change-Id: I950fac50ec68d1097af48e98b9ad69c89276a137 --- M jjb/misc.yaml M zuul/layout.yaml 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/misc.yaml b/jjb/misc.yaml index 0c1f96c..e872cbd 100644 --- a/jjb/misc.yaml +++ b/jjb/misc.yaml @@ -1,7 +1,7 @@ -# Doxygen Publish job for PHP packages -# The doc.wm.o subdirectory must be the same -# as the git repository name +# Publish Doxygen-generated docs to doc.wikimedia.org +# NOTE: Only use this generic job if the desired public directory name +# matches the Git repository name. - job: name: 'doxygen-publish' node: contintLabsSlave UbuntuTrusty @@ -19,7 +19,7 @@ - global-teardown - job: -name: 'cdb-coverage' +name: 'phpunit-coverage-publish' node: contintLabsSlave UbuntuTrusty defaults: use-remote-zuul-shallow-clone concurrent: false @@ -31,7 +31,7 @@ - phpunit-coverage - cover-publish: src: 'coverage' -dest: 'cdb' +dest: '$ZUUL_PROJECT' publishers: - global-teardown diff --git a/zuul/layout.yaml b/zuul/layout.yaml index d549175..2191b22 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7633,7 +7633,7 @@ - name: composer-test-package postmerge: - doxygen-publish - - cdb-coverage + - phpunit-coverage-publish - name: utfnormal template: -- To view, visit https://gerrit.wikimedia.org/r/220705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I950fac50ec68d1097af48e98b9ad69c89276a137 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Step up convenience function - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220709
Change subject: Step up convenience function
..
Step up convenience function
Change-Id: Ie807b9ae269081f3fe5e17e7bcdc5fc445717470
---
M sites/all/modules/wmf_audit/wmf_audit.module
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/09/220709/1
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index 0aaad6d..5ab67c1 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -1245,7 +1245,7 @@
static $types = array();
if (!$q) {
-$q = new Queue(queue2civicrm_stomp_url());
+$q = queue2civicrm_stomp();
}
//@FIXME: This is actually more for the queue consumer modules, but: Make a
--
To view, visit https://gerrit.wikimedia.org/r/220709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie807b9ae269081f3fe5e17e7bcdc5fc445717470
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 1.0.8: responsiveness. Code by Bizzeebeever of Uncyc... - change (mediawiki...Gamepress)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220719
Change subject: Version 1.0.8: responsiveness. Code by Bizzeebeever of
Uncyclopedia.
..
Version 1.0.8: responsiveness. Code by Bizzeebeever of Uncyclopedia.
Change-Id: I43f103219d2db5a3f2e61af5c8fc75c78ba9f769
---
M Gamepress.skin.php
M resources/css/style.css
M skin.json
3 files changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress
refs/changes/19/220719/1
diff --git a/Gamepress.skin.php b/Gamepress.skin.php
index a620d73..26f0bb6 100644
--- a/Gamepress.skin.php
+++ b/Gamepress.skin.php
@@ -134,6 +134,7 @@
div id=content-inner
!-- CONTENT --
div id=content
+ div id=hilariously-bad-hack-for-responsiveness
style=height: 0; visibility: hidden;You shouldn't even be seeing this.
Bizzeebeever told me to add this here so that we can get responsiveness working
for all screens./div
section id=main-content role=main
article class=post hentry list-big-thumb
div id=jump-to-nav
class=mw-jump?php $this-msg( 'jumpto' ) ? a href=#content?php
$this-msg( 'jumptonavigation' ) ?/a?php $this-msg( 'comma-separator' )
?a href=#searchInput?php $this-msg( 'jumptosearch' ) ?/a/div
diff --git a/resources/css/style.css b/resources/css/style.css
index 71f81b3..b6d1280 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -513,13 +513,15 @@
#header {
text-align: center;
margin-bottom: 52px;
+ width: auto !important;
}
#header-inner {
- width: 980px;
+ max-width: 980px !important;
padding: 35px 0 0 0;
margin: 0 auto;
text-align: left;
position: relative;
+ width: auto !important;
}
header #logo {
float: left;
@@ -824,13 +826,15 @@
padding: 0 0 36px 0;
}
#content-inner {
- width: 980px;
+ max-width: 980px;
margin: 0 auto;
text-align: left;
+ width: auto !important;
}
#content {
float: left;
- width: 642px;
+ max-width: 642px;
+ width: auto;
}
#content.full-width {
float: none;
diff --git a/skin.json b/skin.json
index 2d62ec6..22c827e 100644
--- a/skin.json
+++ b/skin.json
@@ -1,9 +1,10 @@
{
name: Gamepress,
- version: 1.0.7,
+ version: 1.0.8,
author: [
[http://webtuts.pl/themes/ Aleksandra Łączek],
- Jack Phoenix
+ Jack Phoenix,
+ [http://en.uncyclopedia.co/wiki/User:Bizzeebeever
Bizzeebeever]
],
url: https://www.mediawiki.org/wiki/Skin:Gamepress;,
license-name: GPL-2.0+,
--
To view, visit https://gerrit.wikimedia.org/r/220719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f103219d2db5a3f2e61af5c8fc75c78ba9f769
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wrap lines in pre and .mw-code by default - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/220720 Change subject: Wrap lines in pre and .mw-code by default .. Wrap lines in pre and .mw-code by default No longer create inline scrollbars and/or page-level scrollbarts with the content escaping the skin container. This used to be an option in SyntaxHighlighter Geshi (using enclose=div) but it makes more sense to do by default. Also move the 'direction' and 'unicode-bidi' rules that currently live in SyntaxHighlighter extension. Make them the default instead. Pre-wrap is supported by IE 8+, Firefox 3.5+, Chrome 1+, Opera 8+, and Safari 3+. Bug: T103780 Change-Id: Icd8b9bd56d6abc7b64c93e89541cf32c55cf7686 (cherry picked from commit 054b1c9e3cd82ee96bb6ee2be3026497e5f9f099) --- M resources/src/mediawiki.skinning/elements.css 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/220720/1 diff --git a/resources/src/mediawiki.skinning/elements.css b/resources/src/mediawiki.skinning/elements.css index 9c59fc1..6986034 100644 --- a/resources/src/mediawiki.skinning/elements.css +++ b/resources/src/mediawiki.skinning/elements.css @@ -199,6 +199,11 @@ background-color: #f9f9f9; border: 1px solid #ddd; padding: 1em; + /* @noflip */ + direction: ltr; + unicode-bidi: embed; + /* Wrap lines in overflow. T103780 */ + white-space: pre-wrap; } /* Tables */ -- To view, visit https://gerrit.wikimedia.org/r/220720 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd8b9bd56d6abc7b64c93e89541cf32c55cf7686 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf11 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 1.0.8: responsiveness. Code by Bizzeebeever of Uncyc... - change (mediawiki...Gamepress)
jenkins-bot has submitted this change and it was merged.
Change subject: Version 1.0.8: responsiveness. Code by Bizzeebeever of
Uncyclopedia.
..
Version 1.0.8: responsiveness. Code by Bizzeebeever of Uncyclopedia.
Change-Id: I43f103219d2db5a3f2e61af5c8fc75c78ba9f769
---
M Gamepress.skin.php
M resources/css/style.css
M skin.json
3 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gamepress.skin.php b/Gamepress.skin.php
index a620d73..26f0bb6 100644
--- a/Gamepress.skin.php
+++ b/Gamepress.skin.php
@@ -134,6 +134,7 @@
div id=content-inner
!-- CONTENT --
div id=content
+ div id=hilariously-bad-hack-for-responsiveness
style=height: 0; visibility: hidden;You shouldn't even be seeing this.
Bizzeebeever told me to add this here so that we can get responsiveness working
for all screens./div
section id=main-content role=main
article class=post hentry list-big-thumb
div id=jump-to-nav
class=mw-jump?php $this-msg( 'jumpto' ) ? a href=#content?php
$this-msg( 'jumptonavigation' ) ?/a?php $this-msg( 'comma-separator' )
?a href=#searchInput?php $this-msg( 'jumptosearch' ) ?/a/div
diff --git a/resources/css/style.css b/resources/css/style.css
index 71f81b3..b6d1280 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -513,13 +513,15 @@
#header {
text-align: center;
margin-bottom: 52px;
+ width: auto !important;
}
#header-inner {
- width: 980px;
+ max-width: 980px !important;
padding: 35px 0 0 0;
margin: 0 auto;
text-align: left;
position: relative;
+ width: auto !important;
}
header #logo {
float: left;
@@ -824,13 +826,15 @@
padding: 0 0 36px 0;
}
#content-inner {
- width: 980px;
+ max-width: 980px;
margin: 0 auto;
text-align: left;
+ width: auto !important;
}
#content {
float: left;
- width: 642px;
+ max-width: 642px;
+ width: auto;
}
#content.full-width {
float: none;
diff --git a/skin.json b/skin.json
index 2d62ec6..22c827e 100644
--- a/skin.json
+++ b/skin.json
@@ -1,9 +1,10 @@
{
name: Gamepress,
- version: 1.0.7,
+ version: 1.0.8,
author: [
[http://webtuts.pl/themes/ Aleksandra Łączek],
- Jack Phoenix
+ Jack Phoenix,
+ [http://en.uncyclopedia.co/wiki/User:Bizzeebeever
Bizzeebeever]
],
url: https://www.mediawiki.org/wiki/Skin:Gamepress;,
license-name: GPL-2.0+,
--
To view, visit https://gerrit.wikimedia.org/r/220719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f103219d2db5a3f2e61af5c8fc75c78ba9f769
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wrap lines in pre and .mw-code by default - change (mediawiki/core)
Ori.livneh has submitted this change and it was merged. Change subject: Wrap lines in pre and .mw-code by default .. Wrap lines in pre and .mw-code by default No longer create inline scrollbars and/or page-level scrollbarts with the content escaping the skin container. This used to be an option in SyntaxHighlighter Geshi (using enclose=div) but it makes more sense to do by default. Also move the 'direction' and 'unicode-bidi' rules that currently live in SyntaxHighlighter extension. Make them the default instead. Pre-wrap is supported by IE 8+, Firefox 3.5+, Chrome 1+, Opera 8+, and Safari 3+. Bug: T103780 Change-Id: Icd8b9bd56d6abc7b64c93e89541cf32c55cf7686 (cherry picked from commit 054b1c9e3cd82ee96bb6ee2be3026497e5f9f099) --- M resources/src/mediawiki.skinning/elements.css 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/resources/src/mediawiki.skinning/elements.css b/resources/src/mediawiki.skinning/elements.css index 9c59fc1..6986034 100644 --- a/resources/src/mediawiki.skinning/elements.css +++ b/resources/src/mediawiki.skinning/elements.css @@ -199,6 +199,11 @@ background-color: #f9f9f9; border: 1px solid #ddd; padding: 1em; + /* @noflip */ + direction: ltr; + unicode-bidi: embed; + /* Wrap lines in overflow. T103780 */ + white-space: pre-wrap; } /* Tables */ -- To view, visit https://gerrit.wikimedia.org/r/220720 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd8b9bd56d6abc7b64c93e89541cf32c55cf7686 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf11 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Edokter er...@darcoury.nl Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depool db1018 to disable performance schema - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/220721 Change subject: Depool db1018 to disable performance schema .. Depool db1018 to disable performance schema Performance schema was being tested on this host, needs a restart to disable it. Change-Id: I3952ba77b3b49d5131ff0dcbef4d4f9002d5d2a2 References: T99485 --- 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/21/220721/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7d8d06b..c72c147 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -102,7 +102,7 @@ 'db1024' = 0, # 1.4TB 64GB 'db1021' = 0, # 1.4TB 64GB, dump, vslow 'db1036' = 200, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1018' = 200, # 1.4TB 64GB (perf schema testing) +# 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB -- To view, visit https://gerrit.wikimedia.org/r/220721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3952ba77b3b49d5131ff0dcbef4d4f9002d5d2a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add doxygen and coverage publish for IPSet - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Add doxygen and coverage publish for IPSet .. Add doxygen and coverage publish for IPSet Change-Id: Iecb21b55e74bdccaa39aa158d7a0409824b9a240 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 2191b22..530fb99 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7654,6 +7654,9 @@ - name: IPSet template: - name: composer-test-package +postmerge: + - doxygen-publish + - phpunit-coverage-publish - name: sartoris template: -- To view, visit https://gerrit.wikimedia.org/r/220712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecb21b55e74bdccaa39aa158d7a0409824b9a240 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add IPSet to doc.wikimedia.org index - change (integration/docroot)
jenkins-bot has submitted this change and it was merged. Change subject: Add IPSet to doc.wikimedia.org index .. Add IPSet to doc.wikimedia.org index https://integration.wikimedia.org/cover/ lists it automatically. Change-Id: I50de4288e1e57adca29a51b75ed05cd43746b9c4 --- M org/wikimedia/doc/default.html 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html index 3fa2a10..cc9d234 100644 --- a/org/wikimedia/doc/default.html +++ b/org/wikimedia/doc/default.html @@ -7,6 +7,7 @@ ul lia href=at-ease/master/at-ease/a/li lia href=cdb/master/CDB/a/li + lia href=IPSet/master/IPSet/a/li lia href=oojs/master/OOjs core/a/li lia href=oojs-ui/master/OOjs UI/a/li lia href=VisualEditor/master/VisualEditor/a/li -- To view, visit https://gerrit.wikimedia.org/r/220713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50de4288e1e57adca29a51b75ed05cd43746b9c4 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused import - change (mediawiki...Wikibase)
Bene has submitted this change and it was merged. Change subject: Remove unused import .. Remove unused import Change-Id: I4cc993a581882bf4122dc0e8c44cfa6786b6b02e --- M client/maintenance/populateEntityUsage.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Bene: Looks good to me, approved diff --git a/client/maintenance/populateEntityUsage.php b/client/maintenance/populateEntityUsage.php index 745dfcc..7d41e0f 100644 --- a/client/maintenance/populateEntityUsage.php +++ b/client/maintenance/populateEntityUsage.php @@ -4,7 +4,6 @@ use LoggedUpdateMaintenance; use Wikibase\Client\Usage\Sql\EntityUsageTableBuilder; -use Wikibase\Client\Usage\Sql\SqlUsageTracker; use Wikibase\Client\WikibaseClient; use Wikibase\Lib\Reporting\ObservableMessageReporter; use Wikibase\Lib\Reporting\ReportingExceptionHandler; -- To view, visit https://gerrit.wikimedia.org/r/220395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cc993a581882bf4122dc0e8c44cfa6786b6b02e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Bene benestar.wikime...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Also support skin.json for updating JSON AutoloadClasses - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Also support skin.json for updating JSON AutoloadClasses
..
Also support skin.json for updating JSON AutoloadClasses
Bug: T88194
Change-Id: Ib56680e6e0e983184e31c336dcac174922a86551
---
M includes/utils/AutoloadGenerator.php
1 file changed, 91 insertions(+), 62 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/utils/AutoloadGenerator.php
b/includes/utils/AutoloadGenerator.php
index dd1a38a..7d63156 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -119,85 +119,88 @@
}
/**
-* Write out all known classes to autoload.php in
-* the provided basedir
+* Updates the AutoloadClasses field at the given
+* filename.
*
-* @param string $commandName Value used in file comment to direct
-* developers towards the appropriate way to update the autoload.
+* @param {string} $filename Filename of JSON
+* extension/skin registration file
*/
- public function generateAutoload( $commandName = 'AutoloadGenerator' ) {
-
- // We need to check whether an extenson.json exists or not, and
- // incase it doesn't, update the autoload.php file.
-
- if ( file_exists( $this-basepath . '/extension.json' ) ) {
- require_once __DIR__ .
'/../../includes/json/FormatJson.php';
- $key = 'AutoloadClasses';
- $json = FormatJson::decode( file_get_contents(
$this-basepath
- . '/extension.json' ), true );
- unset( $json[$key] );
- // Inverting the key-value pairs so that they become of
the
- // format class-name : path when they get converted
into json.
- foreach ( $this-classes as $path = $contained ) {
- foreach ( $contained as $fqcn ) {
-
- // Using substr to remove the leading
'/'
- $json[$key][$fqcn] = substr( $path, 1 );
- }
- }
- foreach ( $this-overrides as $path = $fqcn ) {
+ protected function generateJsonAutoload( $filename ) {
+ require_once __DIR__ . '/../../includes/json/FormatJson.php';
+ $key = 'AutoloadClasses';
+ $json = FormatJson::decode( file_get_contents( $filename ),
true );
+ unset( $json[$key] );
+ // Inverting the key-value pairs so that they become of the
+ // format class-name : path when they get converted into json.
+ foreach ( $this-classes as $path = $contained ) {
+ foreach ( $contained as $fqcn ) {
// Using substr to remove the leading '/'
$json[$key][$fqcn] = substr( $path, 1 );
}
+ }
+ foreach ( $this-overrides as $path = $fqcn ) {
- // Sorting the list of autoload classes.
- ksort( $json[$key] );
+ // Using substr to remove the leading '/'
+ $json[$key][$fqcn] = substr( $path, 1 );
+ }
- // Update extension.json, using constants for the
required
- // formatting.
- file_put_contents( $this-basepath . '/extension.json',
- FormatJson::encode( $json, true ) . \n );
- } else {
- $content = array();
+ // Sorting the list of autoload classes.
+ ksort( $json[$key] );
- // We need to generate a line each rather than
exporting the
- // full array so __DIR__ can be prepended to all the
paths
- $format = %s = __DIR__ . %s,;
- foreach ( $this-classes as $path = $contained ) {
- $exportedPath = var_export( $path, true );
- foreach ( $contained as $fqcn ) {
- $content[$fqcn] = sprintf(
- $format,
- var_export( $fqcn, true ),
- $exportedPath
- );
- }
- }
+ // Update file, using constants for the required
+ // formatting.
+ file_put_contents( $filename,
+ FormatJson::encode( $json, true ) . \n );
[MediaWiki-commits] [Gerrit] Fix Family.from_url support for generated families - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220722
Change subject: Fix Family.from_url support for generated families
..
Fix Family.from_url support for generated families
The generator creates family classes which require explicit
code parameters to each method. This failed for multi-code
generated families, as the domain name was expected to be in
regex group 0, however the constructed regex places the domain in
one of the regex group, but not necessarily the first regex group.
Also better optimise from_url for family classes which have methods
that do not accept None for the code.
Bug: T85658
Change-Id: I266b39d359d69b7fdd940fa337c14c3782c66432
---
M pywikibot/family.py
1 file changed, 28 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/22/220722/1
diff --git a/pywikibot/family.py b/pywikibot/family.py
index a4634fc..ab0cc1b 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1126,6 +1126,9 @@
lookup the correct value in a dictionary such as C{langs}.
On KeyError, it retries it with each key from C{langs}.
+The regex capture the domain in the url, however it will appear
+in any one of the regex groups.
+
@return: regex string
@rtype: unicode
@@ -1147,48 +1150,43 @@
try:
protocol = self.protocol(None) + '\:\/\/'
+protocols = set([protocol])
except KeyError:
-protocol = None
+protocols = set(self.protocol(code) + '\:\/\/'
+for code in self.langs.keys())
try:
hostname = re.escape(self.hostname(None))
+hostnames = set([hostname])
except KeyError:
-hostname = None
+hostnames = set(re.escape(self.hostname(code))
+for code in self.langs.keys())
try:
path = self._get_path_regex(None)
+paths = set([path])
except KeyError:
-path = None
+paths = set(self._get_path_regex(code)
+for code in self.langs.keys())
-# If two or more of the three above varies, the regex cant be optimised
-none_count = [protocol, hostname, path].count(None)
+single_item_elements = (
+len(protocols), len(hostnames), len(paths)).count(1)
-if none_count 1:
+# If two or more of the three elements have multiple items,
+# the regex can not be optimised.
+if single_item_elements 2:
self._regex_all = ('(?:%s)'
% '|'.join(self._get_url_regex(code)
for code in self.langs.keys()))
return self._regex_all
-if not protocol:
-protocols = set(self.protocol(code) + '\:\/\/'
-for code in self.langs.keys())
-protocol = '|'.join(protocols)
-
# Allow protocol neutral '//'
-protocol = '(?:\/\/|%s)' % protocol
-
-if not hostname:
-hostnames = set(re.escape(self.hostname(code))
-for code in self.langs.keys())
-hostname = '|'.join(hostnames)
+protocol = '(?:\/\/|%s)' % '|'.join(protocols)
# capture hostname
-hostname = '(' + hostname + ')'
+hostname = '(%s)' % '|'.join(hostnames)
-if not path:
-regexes = set(self._get_path_regex(code)
- for code in self.langs.keys())
-path = '(?:%s)' % '|'.join(regexes)
+path = '(?:%s)' % '|'.join(paths)
self._regex_all = protocol + hostname + path
return self._regex_all
@@ -1216,11 +1214,15 @@
if not url_match:
return None
+url_domain = [s for s in url_match.groups() if s is not None]
+assert len(url_domain) == 1
+url_domain = url_domain[0]
+
for code, domain in self.langs.items():
if domain is None:
-warn('Family(%s): langs missing domain names' % self.name,
+warn('Family(%s): code %s has no domain name' % self.name,
FamilyMaintenanceWarning)
-elif domain == url_match.group(1):
+elif domain == url_domain:
return code
# if domain was None, this will return the only possible code.
@@ -1228,8 +1230,8 @@
return next(iter(self.langs))
raise RuntimeError(
-'Family(%s): matched regex has not matched a domain in langs'
-% self.name)
+'Family(%s): regex matched %s without domain in langs'
+% (self.name, url))
def maximum_GET_length(self, code):
return config.maximum_GET_length
--
To view, visit
[MediaWiki-commits] [Gerrit] Fix the prefooter footer area. Code by Bizzeebeever. - change (mediawiki...Gamepress)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220723
Change subject: Fix the prefooter footer area. Code by Bizzeebeever.
..
Fix the prefooter footer area. Code by Bizzeebeever.
Change-Id: Ie38f38552c207d52e9d7be9480a46ca00ad3a68b
---
M resources/css/style.css
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress
refs/changes/23/220723/1
diff --git a/resources/css/style.css b/resources/css/style.css
index b6d1280..55cfa89 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -1410,7 +1410,7 @@
padding-bottom: 36px;
}
#prefooter-inner {
- width: 980px;
+ width: auto;
padding: 35px 0 0 0;
margin: 0 auto;
text-align: left;
@@ -1424,7 +1424,7 @@
height: 2px;
}
#footer-inner {
- width: 980px;
+ width: auto;
padding: 0;
margin: 0 auto;
font-size: 11px;
--
To view, visit https://gerrit.wikimedia.org/r/220723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie38f38552c207d52e9d7be9480a46ca00ad3a68b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depool db1018 to disable performance schema - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: Depool db1018 to disable performance schema .. Depool db1018 to disable performance schema Performance schema was being tested on this host, needs a restart to disable it. Change-Id: I3952ba77b3b49d5131ff0dcbef4d4f9002d5d2a2 References: T99485 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7d8d06b..c72c147 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -102,7 +102,7 @@ 'db1024' = 0, # 1.4TB 64GB 'db1021' = 0, # 1.4TB 64GB, dump, vslow 'db1036' = 200, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1018' = 200, # 1.4TB 64GB (perf schema testing) +# 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB -- To view, visit https://gerrit.wikimedia.org/r/220721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3952ba77b3b49d5131ff0dcbef4d4f9002d5d2a2 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set viewport to actually make the responsiveness work as int... - change (mediawiki...Gamepress)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220724
Change subject: Set viewport to actually make the responsiveness work as
intended
..
Set viewport to actually make the responsiveness work as intended
Change-Id: I7425c336ef7faa6a1f843f7850c4a53576eaaab9
---
M Gamepress.skin.php
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress
refs/changes/24/220724/1
diff --git a/Gamepress.skin.php b/Gamepress.skin.php
index 26f0bb6..987d229 100644
--- a/Gamepress.skin.php
+++ b/Gamepress.skin.php
@@ -19,6 +19,17 @@
$template = 'GamepressTemplate', $useHeadElement = true;
/**
+* Initializes OutputPage and sets up skin-specific parameters
+*
+* @param OutputPage $out
+*/
+ public function initPage( OutputPage $out ) {
+ parent::initPage( $out );
+
+ $out-addMeta( 'viewport', 'width=device-width;' );
+ }
+
+ /**
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
--
To view, visit https://gerrit.wikimedia.org/r/220724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7425c336ef7faa6a1f843f7850c4a53576eaaab9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set viewport to actually make the responsiveness work as int... - change (mediawiki...Gamepress)
jenkins-bot has submitted this change and it was merged.
Change subject: Set viewport to actually make the responsiveness work as
intended
..
Set viewport to actually make the responsiveness work as intended
Change-Id: I7425c336ef7faa6a1f843f7850c4a53576eaaab9
---
M Gamepress.skin.php
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gamepress.skin.php b/Gamepress.skin.php
index 26f0bb6..987d229 100644
--- a/Gamepress.skin.php
+++ b/Gamepress.skin.php
@@ -19,6 +19,17 @@
$template = 'GamepressTemplate', $useHeadElement = true;
/**
+* Initializes OutputPage and sets up skin-specific parameters
+*
+* @param OutputPage $out
+*/
+ public function initPage( OutputPage $out ) {
+ parent::initPage( $out );
+
+ $out-addMeta( 'viewport', 'width=device-width;' );
+ }
+
+ /**
* @param $out OutputPage
*/
function setupSkinUserCss( OutputPage $out ) {
--
To view, visit https://gerrit.wikimedia.org/r/220724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7425c336ef7faa6a1f843f7850c4a53576eaaab9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up for Idb7e03aee: update i18n message for Pygments s... - change (mediawiki...SyntaxHighlight_GeSHi)
Ricordisamoa has uploaded a new change for review. https://gerrit.wikimedia.org/r/220726 Change subject: Follow-up for Idb7e03aee: update i18n message for Pygments switch .. Follow-up for Idb7e03aee: update i18n message for Pygments switch Change-Id: I6babe03f7de57cfa14dfbc976c73cc68b0204705 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/26/220726/1 diff --git a/i18n/en.json b/i18n/en.json index f72897a..c9b196c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,7 +5,7 @@ Ed Sanders ] }, -syntaxhighlight-desc: Provides syntax highlighting codelt;syntaxhighlightgt;/code using [http://pygments.org/ GeSHi - Generic Syntax Highlighter], +syntaxhighlight-desc: Provides syntax highlighting codelt;syntaxhighlightgt;/code using [http://pygments.org/ Pygments - Python syntax highlighter], syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-code: Code, syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-language: Language, syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-title: Code block -- To view, visit https://gerrit.wikimedia.org/r/220726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6babe03f7de57cfa14dfbc976c73cc68b0204705 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix the prefooter footer area. Code by Bizzeebeever. - change (mediawiki...Gamepress)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix the prefooter footer area. Code by Bizzeebeever.
..
Fix the prefooter footer area. Code by Bizzeebeever.
Change-Id: Ie38f38552c207d52e9d7be9480a46ca00ad3a68b
---
M resources/css/style.css
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/style.css b/resources/css/style.css
index b6d1280..55cfa89 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -1410,7 +1410,7 @@
padding-bottom: 36px;
}
#prefooter-inner {
- width: 980px;
+ width: auto;
padding: 35px 0 0 0;
margin: 0 auto;
text-align: left;
@@ -1424,7 +1424,7 @@
height: 2px;
}
#footer-inner {
- width: 980px;
+ width: auto;
padding: 0;
margin: 0 auto;
font-size: 11px;
--
To view, visit https://gerrit.wikimedia.org/r/220723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie38f38552c207d52e9d7be9480a46ca00ad3a68b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vector.php: Don't die on missing wfLoadSkin if in CLI enviro... - change (mediawiki...Vector)
Polybuildr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220725
Change subject: Vector.php: Don't die on missing wfLoadSkin if in CLI
environment
..
Vector.php: Don't die on missing wfLoadSkin if in CLI environment
If wfLoadSkin does not exist, Vector.php dies. However, when running
`composer test`, Vector.php is included and wfLoadSkin does not exist,
hence it die()s. This patch changes the die to only echo the warning
if in CLI environment.
Bug: T103800
Change-Id: Icd8acc34f52be9c3c0f564744d2eb2aae7f34398
---
M Vector.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/25/220725/1
diff --git a/Vector.php b/Vector.php
index 1a06ea9..e6e38cd 100644
--- a/Vector.php
+++ b/Vector.php
@@ -10,5 +10,10 @@
); */
return true;
} else {
- die( 'This version of the Vector skin requires MediaWiki 1.25+' );
+ if ( PHP_SAPI !== 'cli' ) {
+ die( 'This version of the Vector skin requires MediaWiki 1.25+'
);
+ }
+ else {
+ echo This version of the Vector skin requires MediaWiki
1.25+\n;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/220725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd8acc34f52be9c3c0f564744d2eb2aae7f34398
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Polybuildr v.a.ghai...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
