[MediaWiki-commits] [Gerrit] tools: Fixup k8s bastion role - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: tools: Fixup k8s bastion role .. tools: Fixup k8s bastion role - Adds a simple script to deploy appropriate binaries - Adds flannel + kube-proxy for access to pod/svc ips - Installs kubectl for use by everyone Bug: T136413 Change-Id: I3b106fe670a1e4f6a0a23a978b50ed211e85f31b --- D modules/k8s/manifests/client.pp M modules/k8s/manifests/flannel.pp M modules/k8s/manifests/proxy.pp A modules/k8s/templates/initscripts/flannel.upstart.erb A modules/k8s/templates/initscripts/kube-proxy.upstart.erb A modules/role/files/toollabs/deploy-bastion.bash M modules/role/manifests/toollabs/k8s/bastion.pp 7 files changed, 87 insertions(+), 8 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/k8s/manifests/client.pp b/modules/k8s/manifests/client.pp deleted file mode 100644 index ef4ff06..000 --- a/modules/k8s/manifests/client.pp +++ /dev/null @@ -1,6 +0,0 @@ -class k8s::client { - -include k8s::ssl - -require_package('kubectl') -} diff --git a/modules/k8s/manifests/flannel.pp b/modules/k8s/manifests/flannel.pp index 1932940..42158a3 100644 --- a/modules/k8s/manifests/flannel.pp +++ b/modules/k8s/manifests/flannel.pp @@ -5,5 +5,6 @@ base::service_unit { 'flannel': systemd => true, +upstart => true, } } diff --git a/modules/k8s/manifests/proxy.pp b/modules/k8s/manifests/proxy.pp index 99ec7a6..d79566b 100644 --- a/modules/k8s/manifests/proxy.pp +++ b/modules/k8s/manifests/proxy.pp @@ -7,6 +7,7 @@ base::service_unit { 'kube-proxy': systemd => true, +upstart => true, subscribe => File['/etc/kubernetes/kubeconfig'], } } diff --git a/modules/k8s/templates/initscripts/flannel.upstart.erb b/modules/k8s/templates/initscripts/flannel.upstart.erb new file mode 100644 index 000..e7a5eca --- /dev/null +++ b/modules/k8s/templates/initscripts/flannel.upstart.erb @@ -0,0 +1,13 @@ +description "flannel overlay network" + +start on started network-services + +setuid root +setgid root + +exec /usr/bin/flanneld \ +--etcd-endpoints=<%= @etcd_endpoints %> \ +--etcd-cafile=/var/lib/puppet/ssl/certs/ca.pem \ +--ip-masq=true + +respawn diff --git a/modules/k8s/templates/initscripts/kube-proxy.upstart.erb b/modules/k8s/templates/initscripts/kube-proxy.upstart.erb new file mode 100644 index 000..4609577 --- /dev/null +++ b/modules/k8s/templates/initscripts/kube-proxy.upstart.erb @@ -0,0 +1,13 @@ +description "Kubernetes Proxy" + +start on started network-services + +setuid root +setgid root + +exec /usr/local/bin/kube-proxy \ +--kubeconfig=/etc/kubernetes/kubeconfig \ +--proxy-mode=iptables \ +--masquerade-all=true + +respawn diff --git a/modules/role/files/toollabs/deploy-bastion.bash b/modules/role/files/toollabs/deploy-bastion.bash new file mode 100644 index 000..3543135 --- /dev/null +++ b/modules/role/files/toollabs/deploy-bastion.bash @@ -0,0 +1,32 @@ +#!/bin/bash +# This script does the following: +# +# - Stop kube-proxy service +# - Download new versions of kube-proxy & kubectl +# - Installs kube-proxy & kubectl in appropriate place +# - Start kube-proxy +set -e + +# TODO: Add error checking (basssh) +URL_PREFIX="$1" +VERSION="$2" + +# Stop the running services! +service kube-proxy stop + +# Download the new things! +wget -O /usr/local/bin/kubectl $URL_PREFIX/$VERSION/kubectl +wget -O /usr/local/bin/kube-proxy $URL_PREFIX/$VERSION/kube-proxy + +# Owned by root! +chown root /usr/local/bin/kubectl +chown root /usr/local/bin/kube-proxy + +# Make them executable root only +chmod u+x /usr/local/bin/kube-proxy + +# Executable by all! +chmod +x /usr/local/bin/kubectl + +# Start services again, and hope! +service kube-proxy start diff --git a/modules/role/manifests/toollabs/k8s/bastion.pp b/modules/role/manifests/toollabs/k8s/bastion.pp index e084d3a..f35f635 100644 --- a/modules/role/manifests/toollabs/k8s/bastion.pp +++ b/modules/role/manifests/toollabs/k8s/bastion.pp @@ -1,5 +1,30 @@ class role::toollabs::k8s::bastion { -# kubectl and things -include k8s::client +$master_host = hiera('k8s::master_host') +$etcd_url = join(prefix(suffix(hiera('flannel::etcd_hosts', [$master_host]), ':2379'), 'https://'), ',') + +ferm::service { 'flannel-vxlan': +proto => udp, +port => 8472, +} + +class { '::k8s::flannel': +etcd_endpoints => $etcd_url, +} + +class { '::k8s::ssl': +notify => Class['k8s::proxy'], +} + +class { 'k8s::proxy': +master_host => $master_host, +} + +# Deployment script (for now!) +file { '/usr/local/bin/deploy-bastion': +source => 'puppet:///modules/role/toollabs/deploy-bastion.bash', +mode => '0555', +owner => 'root', +group => 'root', +} } -- To view, visit https://gerri
[MediaWiki-commits] [Gerrit] librenms: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: librenms: Fix PEP8 violations .. librenms: Fix PEP8 violations * E203 whitespace before ',' * E211 whitespace before '(' * E221 multiple spaces before operator * E265 block comment should start with '# ' * E302 expected 2 blank lines, found 1 * E401 multiple imports on one line * E501 line too long (n > 100 characters) * E701 multiple statements on one line (colon) * W291 trailing whitespace * W293 blank line contains whitespace Change-Id: I2d5f6340d6701e6ea83261c6f88550ae7362f325 --- M modules/librenms/files/purge.py 1 file changed, 38 insertions(+), 23 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved Andrew Bogott: Looks good to me, but someone else must approve diff --git a/modules/librenms/files/purge.py b/modules/librenms/files/purge.py index fd2dcb4..346e165 100644 --- a/modules/librenms/files/purge.py +++ b/modules/librenms/files/purge.py @@ -1,6 +1,7 @@ #! /usr/bin/env python """ - purge.py A small tool that allows you to easily purge old entries in the eventlog and syslog table + purge.py A small tool that allows you to easily purge old entries in +the eventlog and syslog table Author:Mathieu Poussin Date: Mar 2014 @@ -10,8 +11,10 @@ --eventlog : Enable the eventlog table purge --perftimes : Enable the perftime table purge --devices-perftimes : Enable the device_pertimes table purge -INTERVAL : A MySQL compatible interval like "1 YEAR" or "3 MONTH", this is how long you should keep your log, -any entried older than the given interval will be deleted. (Defautl is 1 YEAR) +INTERVAL : A MySQL compatible interval like "1 YEAR" or +"3 MONTH", this is how long you should keep your log, +any entried older than the given interval will be deleted. +(Defautl is 1 YEAR) Ubuntu Linux: apt-get install python-mysqldb @@ -19,10 +22,12 @@ FreeBSD: cd /usr/ports/*/py-MySQLdb && make install clean Tested on: Python 2.7.5 / Ubuntu 13.10 - """ try: -import subprocess, sys, os, json +import subprocess +import sys +import os +import json except: print "ERROR: missing one or more of the following python modules:" print "sys, subprocess, os, json" @@ -44,16 +49,22 @@ especially as more features want to be added to this wrapper. and Take the amount of threads we want to run in parallel from the commandline -if None are given or the argument was garbage, fall back to default of 16 +if None are given or the argument was garbage, fall back to default of 16 """ try: import argparse parser = argparse.ArgumentParser(description='Purge task for Observium') -parser.add_argument('interval', nargs='?', type=str, default="1 YEAR", help='How much data to keep') -parser.add_argument('--syslog', help='Purge the syslog table', action='store_true', default=False) -parser.add_argument('--eventlog', help='Purge the eventlog table', action='store_true', default=False) -parser.add_argument('--perftimes', help='Purge the perf_times table', action='store_true', default=False) -parser.add_argument('--devices-perftimes', help='Purge the devices_pertimes table', action='store_true', default=False) +parser.add_argument( +'interval', nargs='?', type=str, default="1 YEAR", help='How much data to keep') +parser.add_argument( +'--syslog', help='Purge the syslog table', action='store_true', default=False) +parser.add_argument( +'--eventlog', help='Purge the eventlog table', action='store_true', default=False) +parser.add_argument( +'--perftimes', help='Purge the perf_times table', action='store_true', default=False) +parser.add_argument( +'--devices-perftimes', help='Purge the devices_pertimes table', +action='store_true', default=False) args = parser.parse_args() interval = args.interval purge_syslog = args.syslog @@ -75,6 +86,7 @@ ob_install_dir = os.path.dirname(os.path.realpath(__file__)) config_file = ob_install_dir + '/config.php' + def get_config_data(): config_cmd = ['/usr/bin/env', 'php', '%s/config_to_json.php' % ob_install_dir] try: @@ -85,7 +97,8 @@ return proc.communicate()[0] try: -with open(config_file) as f: pass +with open(config_file) as f: +pass except IOError as e: print "ERROR: Oh dear... %s does not seem readable" % config_file sys.exit(2) @@ -96,13 +109,13 @@ print "ERROR: Could not load or parse observium configuration, are PATHs correct?" sys.exit(2) -db_username = config['db_user'] -db_password = config['db_pass'] -db_server= config['db_host'] -db_dbname= config['db_name'] +db_u
[MediaWiki-commits] [Gerrit] enable instance restbase1008-c.eqiad.wmnet - change (operations/puppet)
Eevans has uploaded a new change for review. https://gerrit.wikimedia.org/r/291579 Change subject: enable instance restbase1008-c.eqiad.wmnet .. enable instance restbase1008-c.eqiad.wmnet Bug: T134016 Change-Id: I84b94f87512a6023cef89d9a193e76fa2781a74b --- M hieradata/hosts/restbase1008.yaml 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/291579/1 diff --git a/hieradata/hosts/restbase1008.yaml b/hieradata/hosts/restbase1008.yaml index b0630ea..fbf7593 100644 --- a/hieradata/hosts/restbase1008.yaml +++ b/hieradata/hosts/restbase1008.yaml @@ -14,8 +14,8 @@ listen_address: 10.64.32.195 rpc_address: 10.64.32.195 rpc_interface: eth0 -# c: -#jmx_port: 7191 -#listen_address: 10.64.32.196 -#rpc_address: 10.64.32.196 -#rpc_interface: eth0 + c: +jmx_port: 7191 +listen_address: 10.64.32.196 +rpc_address: 10.64.32.196 +rpc_interface: eth0 -- To view, visit https://gerrit.wikimedia.org/r/291579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84b94f87512a6023cef89d9a193e76fa2781a74b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable instance restbase2004-b.codfw.wmnet - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: enable instance restbase2004-b.codfw.wmnet .. enable instance restbase2004-b.codfw.wmnet Bug: T134016 Change-Id: If1549aba89c0b4993a1db9ab8e847383c179c846 --- M hieradata/hosts/restbase2004.yaml 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/hieradata/hosts/restbase2004.yaml b/hieradata/hosts/restbase2004.yaml index 267b535..287dad4 100644 --- a/hieradata/hosts/restbase2004.yaml +++ b/hieradata/hosts/restbase2004.yaml @@ -5,11 +5,11 @@ listen_address: 10.192.32.137 rpc_address: 10.192.32.137 rpc_interface: eth0 -# b: -#jmx_port: 7190 -#listen_address: 10.192.32.138 -#rpc_address: 10.192.32.138 -#rpc_interface: eth0 + b: +jmx_port: 7190 +listen_address: 10.192.32.138 +rpc_address: 10.192.32.138 +rpc_interface: eth0 # c: #jmx_port: 7191 #listen_address: 10.192.32.139 -- To view, visit https://gerrit.wikimedia.org/r/291563 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1549aba89c0b4993a1db9ab8e847383c179c846 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gmond_memcached.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: gmond_memcached.py: Fix PEP8 violations .. gmond_memcached.py: Fix PEP8 violations * E231 missing whitespace after ',' * E126 continuation line over-indented for hanging indent Change-Id: I8e6c79e3869b98f854874f318d2f5bcaf4863273 --- M modules/memcached/files/ganglia/gmond_memcached.py 1 file changed, 107 insertions(+), 117 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/memcached/files/ganglia/gmond_memcached.py b/modules/memcached/files/ganglia/gmond_memcached.py index 935fe1b..36efbe0 100644 --- a/modules/memcached/files/ganglia/gmond_memcached.py +++ b/modules/memcached/files/ganglia/gmond_memcached.py @@ -119,10 +119,10 @@ elif (name_tail[1] == "ratio" and "hits" in name_tail[0] and name_tail[0] in self.metric and -name_tail[0].replace("hits","misses") in self.metric): +name_tail[0].replace("hits", "misses") in self.metric): _Lock.acquire() hits_name = name_tail[0] -misses_name = hits_name.replace("hits","misses") +misses_name = hits_name.replace("hits", "misses") if (hits_name in self.last_metric and misses_name in self.last_metric): hits = self.metric[hits_name]-self.last_metric[hits_name] @@ -183,107 +183,101 @@ mp = params["metrix_prefix"] descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_curr_items", -"units": "items", -"slope": "both", -"description": "Current number of items stored", -})) +"name": mp+"_curr_items", +"units": "items", +"slope": "both", +"description": "Current number of items stored", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_cmd_get", -"units": "commands", -"slope": "positive", -"description": "Cumulative number of retrieval reqs", -})) +"name": mp+"_cmd_get", +"units": "commands", +"slope": "positive", +"description": "Cumulative number of retrieval reqs", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_cmd_set", -"units": "commands", -"slope": "positive", -"description": "Cumulative number of storage reqs", -})) +"name": mp+"_cmd_set", +"units": "commands", +"slope": "positive", +"description": "Cumulative number of storage reqs", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_bytes_read", -"units": "bytes", -"slope": "positive", -"description": "Total number of bytes read by this server " + - " from network", -})) +"name": mp+"_bytes_read", +"units": "bytes", +"slope": "positive", +"description": "Total number of bytes read by this server from network", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_bytes_written", -"units": "bytes", -"slope": "positive", -"description": "Total number of bytes sent by this server " + - "to network", -})) +"name": mp+"_bytes_written", +"units": "bytes", +"slope": "positive", +"description": "Total number of bytes sent by this server to network", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_bytes", -"units": "bytes", -"slope": "both", -"description": "Current number of bytes used to store items", -})) +"name": mp+"_bytes", +"units": "bytes", +"slope": "both", +"description": "Current number of bytes used to store items", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_limit_maxbytes", -"units": "bytes", -"slope": "both", -"description": "Number of bytes this server is allowed to " + - "use for storage", -})) +"name": mp+"_limit_maxbytes", +"units": "bytes", +"slope": "both", +"description": "Number of bytes this server is allowed to use for storage", +})) descriptors.append(create_desc(Desc_Skel, { -"name": mp+"_curr_connections", -"units": "connections", -"slope": "both", -"description": "Number of open connections", -})) +"name": mp+"_curr_connectio
[MediaWiki-commits] [Gerrit] Use specific varied versions of Python - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/291578 Change subject: Use specific varied versions of Python .. Use specific varied versions of Python Record the patch level of the Travis defaults, and use the recently added capability of Travis to install other versions on demand where possible. Not available via Travis python versions: - any other 2.6 except 2.6.9 - 2.7.0-2,4,5,7 - 3.3.0-2 - 3.4.0-1 Use pyenv to install 2.6.6 and 3.4.0 Change-Id: Ie87587dd8a841c9adeb9f74e35876bb3259fa89c --- M .travis.yml 1 file changed, 28 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/78/291578/1 diff --git a/.travis.yml b/.travis.yml index a0186ad..0348bc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,13 @@ sudo: false python: - - '2.7' - - '3.3' - - '3.4' - - '3.5' - - '2.6' + # Python minor versions pre-installed by Travis, with default patch level + - '2.7.9' + - '3.3.5' + - '3.4.2' + - '2.6.9' + # Installed on demand + - '3.5.1' # OSX builds do not yet support Python os: linux @@ -24,6 +26,14 @@ - liblua5.1-0-dev before_install: + # Use pyenv to install versions specified by $PYENV_VERSION + - | +git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT" +$PYENV_ROOT/bin/pyenv install --skip-existing "$PYENV_VERSION" +virtualenv --python="$PYENV_ROOT/versions/$PYENV_VERSION/bin/python" "$HOME/virtualenvs/$PYENV_VERSION" +source "$HOME/virtualenvs/$PYENV_VERSION/bin/activate" +python --version + # When PYSETUP_TEST_EXTRAS is not enabled, do not allow the # default 'install' step to install all dependencies listed in # requirements.txt to verify that a minimal install works as expected. @@ -126,7 +136,8 @@ # the github repository 'wikimedia/pywikibot-core'. # See http://docs.travis-ci.com/user/encryption-keys/ for more information. - secure: kofInMlisiTBt9o/Ustc/vySlkKfxGzGCX2LwA1D2waym8sDTS0o5gMJ5LsrT/BUKwZbe1vLozPHqZrrkQvsdTml+DpZuotzdILs0m0f3BUoexEC6OON5IDljuxFyETrD1Ug44ih5Mc4lVFOdTcBzg501ZmswGwQrBvg/OyEFfE= -- TEST_TIMEOUT: 300 +- TEST_TIMEOUT=300 +- PYENV_ROOT=$HOME/.pyenv matrix: - LANGUAGE=en FAMILY=wikipedia PYWIKIBOT2_TEST_PROD_ONLY=1 @@ -134,6 +145,7 @@ matrix: include: +# precise uses 2.7.3 - python: '2.7_with_system_site_packages' # equivalent to virtualenv: system_site_packages: true env: LANGUAGE=he FAMILY=wikivoyage DIST=precise-sudo PYWIKIBOT2_TEST_NO_RC=1 dist: precise @@ -145,6 +157,7 @@ - graphviz - liblua5.1-0-dev - python-ipaddr + # trusty uses 2.7.6 - python: '2.7_with_system_site_packages' env: LANGUAGE=nb FAMILY=wikipedia DIST=trusty PYSETUP_TEST_EXTRAS=1 dist: trusty @@ -156,24 +169,24 @@ - graphviz - liblua5.1-0-dev - python-ipaddr -- python: '2.7' +- python: '2.7.8' env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org" -- python: '3.3' +- python: '3.3.3' env: LANGUAGE=zh FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="zh.wikipedia.beta.wmflabs.org" - python: '3.4' - env: LANGUAGE=en FAMILY=wsbeta SITE_ONLY=1 -- python: '2.7' + env: LANGUAGE=en FAMILY=wsbeta SITE_ONLY=1 PYENV_VERSION=3.4.0 PYSETUP_TEST_EXTRAS=1 +- python: '2.7.11' env: LANGUAGE=wikia FAMILY=wikia PYWIKIBOT2_TEST_NO_RC=1 -- python: '3.3' +- python: '3.3.6' env: LANGUAGE=en FAMILY=musicbrainz SITE_ONLY=1 -- python: '3.4' +- python: '3.4.4' env: LANGUAGE=test FAMILY=wikipedia SITE_ONLY=1 OAUTH_DOMAIN="test.wikipedia.org" -- python: '3.4' +- python: '3.4.3' env: LANGUAGE=test FAMILY=wikidata SITE_ONLY=1 -- python: '3.4' +- python: '3.5.0' env: LANGUAGE=ar FAMILY=wiktionary PYWIKIBOT2_TEST_NO_RC=1 - python: '2.6' - env: LANGUAGE=wikidata FAMILY=wikidata SITE_ONLY=1 + env: LANGUAGE=wikidata FAMILY=wikidata SITE_ONLY=1 PYENV_VERSION=2.6.6 PYSETUP_TEST_EXTRAS=1 notifications: email: -- To view, visit https://gerrit.wikimedia.org/r/291578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87587dd8a841c9adeb9f74e35876bb3259fa89c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust recent added tests for case-sensitive site - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/291577 Change subject: Adjust recent added tests for case-sensitive site .. Adjust recent added tests for case-sensitive site 2230213 caused new errors on the Travis wiktionary jobs. Also fix non-pep8 method names. Bug: T134676 Change-Id: I4eabed2fb7ebeaf1516bb1f80c00a50050efb51c --- M tests/textlib_tests.py 1 file changed, 25 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/77/291577/1 diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index e4dbc57..06d72ae 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1353,44 +1353,60 @@ dry = True -def test_noMatch(self): +@classmethod +def setUpClass(cls): +"""Cache namespace 0 case sensitivity.""" +super(TestMultiTemplateMatchBuilder, cls).setUpClass() +cls._ns0_not_case_sensitive = ( +cls.get_site().namespaces[0].case != 'case-sensitive') + +def test_no_match(self): """Test text without any desired templates.""" string = 'The quick brown fox' builder = _MultiTemplateMatchBuilder(self.site) self.assertIsNone(re.search(builder.pattern('quick'), string)) -def test_Match(self): +def test_match(self): """Test text with one match without parameters.""" string = 'The {{quick}} brown fox' builder = _MultiTemplateMatchBuilder(self.site) self.assertIsNotNone(re.search(builder.pattern('quick'), string)) -self.assertIsNotNone(re.search(builder.pattern('Quick'), string)) +self.assertEqual(bool(re.search(builder.pattern('Quick'), string)), + self._ns0_not_case_sensitive) def test_match_with_params(self): """Test text with one match with parameters.""" -string = 'The {{Quick|brown}} fox' +string = 'The {{quick|brown}} fox' builder = _MultiTemplateMatchBuilder(self.site) self.assertIsNotNone(re.search(builder.pattern('quick'), string)) -self.assertIsNotNone(re.search(builder.pattern('Quick'), string)) +self.assertEqual(bool(re.search(builder.pattern('Quick'), string)), + self._ns0_not_case_sensitive) def test_match_msg(self): """Test text with {{msg:..}}.""" string = 'The {{msg:quick}} brown fox' builder = _MultiTemplateMatchBuilder(self.site) self.assertIsNotNone(re.search(builder.pattern('quick'), string)) -self.assertIsNotNone(re.search(builder.pattern('Quick'), string)) +self.assertEqual(bool(re.search(builder.pattern('Quick'), string)), + self._ns0_not_case_sensitive) def test_match_template_prefix(self): """Test pages with {{template:..}}.""" string = 'The {{%s:%s}} brown fox' template = 'template' builder = _MultiTemplateMatchBuilder(self.site) +if self._ns0_not_case_sensitive: +quick_list = ('quick', 'Quick') +else: +quick_list = ('quick', ) + for t in (template.upper(), template.lower(), template.title()): -for q in ('quick', 'Quick'): +for q in quick_list: self.assertIsNotNone(re.search(builder.pattern('quick'), string % (t, q))) -self.assertIsNotNone(re.search(builder.pattern('Quick'), - string % (t, q))) +self.assertEqual(bool(re.search(builder.pattern('Quick'), +string % (t, q))), + self._ns0_not_case_sensitive) class TestGetLanguageLinks(SiteAttributeTestCase): -- To view, visit https://gerrit.wikimedia.org/r/291577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4eabed2fb7ebeaf1516bb1f80c00a50050efb51c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PagesVisited: Improved tag documentation - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/291576 Change subject: PagesVisited: Improved tag documentation .. PagesVisited: Improved tag documentation New tag description. Thanks to Sabine Gürtler and Anja Ebersbach. Change-Id: I0c83a01512020f42d30b0b6ddc41a9fd232db114 --- M PagesVisited/PagesVisited.class.php M PagesVisited/i18n/en.json 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/76/291576/1 diff --git a/PagesVisited/PagesVisited.class.php b/PagesVisited/PagesVisited.class.php index 49918d8..3ce7762 100644 --- a/PagesVisited/PagesVisited.class.php +++ b/PagesVisited/PagesVisited.class.php @@ -130,6 +130,12 @@ 'name' => 'pagesvisited', 'desc' => wfMessage( 'bs-pagesvisited-tag-pagesvisited-desc' )->escaped(), 'code' => '', + 'examples' => array( + array( + 'code' => '' + ) + ), + 'helplink' => 'https://help.bluespice.com/index.php/PagesVisited' ); return true; diff --git a/PagesVisited/i18n/en.json b/PagesVisited/i18n/en.json index 0662920..638b211 100644 --- a/PagesVisited/i18n/en.json +++ b/PagesVisited/i18n/en.json @@ -13,5 +13,5 @@ "bs-pagesvisited-pref-widgetsortodr": "Sort by:", "bs-pagesvisited-pref-sort-time": "Time", "bs-pagesvisited-pref-sort-pagename": "Title", - "bs-pagesvisited-tag-pagesvisited-desc": "Displays a list of pages you have visited." + "bs-pagesvisited-tag-pagesvisited-desc": "Shows a list of recently visited pages. This list can be restricted by parameters." } -- To view, visit https://gerrit.wikimedia.org/r/291576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c83a01512020f42d30b0b6ddc41a9fd232db114 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Mglaser ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PageAccess: Improved tag documentation - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/291575 Change subject: PageAccess: Improved tag documentation .. PageAccess: Improved tag documentation New tag description. Thanks to Sabine Gürtler and Anja Ebersbach. Change-Id: Id47d4ff03ed1b48f0c925fbffe7de3f8508a7168 --- M PageAccess/PageAccess.class.php M PageAccess/i18n/en.json 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/75/291575/1 diff --git a/PageAccess/PageAccess.class.php b/PageAccess/PageAccess.class.php index 69d2034..ac6604f 100644 --- a/PageAccess/PageAccess.class.php +++ b/PageAccess/PageAccess.class.php @@ -214,7 +214,13 @@ 'type' => 'tag', 'name' => 'pageaccess', 'desc' => wfMessage( 'bs-pageaccess-tag-groups-desc' )->plain(), - 'code' => '', + 'code' => '', + 'examples' => array( + array( + 'code' => '' + ) + ), + 'helplink' => 'https://help.bluespice.com/index.php/PageAccess' ); return true; diff --git a/PageAccess/i18n/en.json b/PageAccess/i18n/en.json index 2cdf348..d39f36b 100644 --- a/PageAccess/i18n/en.json +++ b/PageAccess/i18n/en.json @@ -9,7 +9,7 @@ "bs-pageaccess-error-no-groups-given": "No groups were specified.", "bs-pageaccess-error-not-member-of-given-groups": "You are not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.", "bs-pageaccess-error-included-forbidden-template": "You have tried to use the template \"$1\" to which you do not have read access. In order to prevent you from locking yourself out, saving was disabled.", - "bs-pageaccess-tag-groups-desc": "Specify the groups that should have exclusive access to this page. Multiple groups can be separated by commas.", + "bs-pageaccess-tag-groups-desc": "Defines the groups which have exclusive access to a page. Several groups are separated by commas.", "pageaccess": "Pages secured by PageAccess", "log-name-bs-pageaccess": "Page access log", "log-description-bs-pageaccess": "This is a log of changes in the page access settings.", -- To view, visit https://gerrit.wikimedia.org/r/291575 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id47d4ff03ed1b48f0c925fbffe7de3f8508a7168 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Mglaser ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Smartlist: Improved tag documentation - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/291574 Change subject: Smartlist: Improved tag documentation .. Smartlist: Improved tag documentation New tag description. Thanks to Sabine Gürtler and Anja Ebersbach. Change-Id: I7452ec52a6248ca803a7a41c0698d415d583c728 --- M SmartList/SmartList.class.php M SmartList/i18n/en.json M SmartList/i18n/qqq.json 3 files changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/74/291574/1 diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php index 221bf60..6ff85ee 100644 --- a/SmartList/SmartList.class.php +++ b/SmartList/SmartList.class.php @@ -520,6 +520,17 @@ 'name' => 'smartlist', 'desc' => wfMessage( 'bs-smartlist-tag-smartlist-desc' )->plain(), 'code' => '', + 'examples' => array( + array( + 'label' => wfMessage( 'bs-smartlist-tag-smartlist-example-rc' )->plain(), + 'code' => '' + ), + array( + 'label' => wfMessage( 'bs-smartlist-tag-smartlist-example-whatlinkshere' )->plain(), + 'code' => '' + ) + ), + 'helplink' => 'https://help.bluespice.com/index.php/SmartList' ); $oResponse->result[] = array( @@ -528,6 +539,12 @@ 'name' => 'newbies', 'desc' => wfMessage( 'bs-smartlist-tag-newbies-desc' )->plain(), 'code' => '', + 'examples' => array( + array( + 'code' => '' + ) + ), + 'helplink' => 'https://help.bluespice.com/index.php/SmartList' ); $oResponse->result[] = array( @@ -536,6 +553,12 @@ 'name' => 'toplist', 'desc' => wfMessage( 'bs-smartlist-tag-toplist-desc' )->plain(), 'code' => '', + 'examples' => array( + array( + 'code' => '' + ) + ), + 'helplink' => 'https://help.bluespice.com/index.php/SmartList' ); return true; diff --git a/SmartList/i18n/en.json b/SmartList/i18n/en.json index f16df1a..1fe52fd 100644 --- a/SmartList/i18n/en.json +++ b/SmartList/i18n/en.json @@ -32,8 +32,10 @@ "bs-smartlist-time": "Time", "bs-smartlist-title": "Title", "bs-smartlist-tag-smartlist-desc": "Displays configurable information about recent changes.", - "bs-smartlist-tag-newbies-desc": "Displays the latest users.", - "bs-smartlist-tag-toplist-desc": "Displays a list of the most viewed pages.", + "bs-smartlist-tag-smartlist-example-rc": "Mode: Recent changes", + "bs-smartlist-tag-smartlist-example-whatlinkshere": "Mode: What links here", + "bs-smartlist-tag-newbies-desc": "Shows the new users of the wiki. The list can be restricted to a certain number.", + "bs-smartlist-tag-toplist-desc": "Shows the most visited pages. Can be limited by several parameters.", "bs-smartlist-mostvisitedpages": "Most viewed pages", "bs-smartlist-mosteditedpages": "Most edited pages", "bs-smartlist-mostactiveusers": "Most active users (by edits)", diff --git a/SmartList/i18n/qqq.json b/SmartList/i18n/qqq.json index 7010506..f023e7b 100644 --- a/SmartList/i18n/qqq.json +++ b/SmartList/i18n/qqq.json @@ -36,6 +36,8 @@ "bs-smartlist-time": "Option in [{{canonicalurl:Special:WikiAdmin|mode=Preferences}} Special:WikiAdmin?mode=Preferences], label for time\n{{Identical|Time}}", "bs-smartlist-title": "Option in [{{canonicalurl:Special:WikiAdmin|mode=Preferences}} Special:WikiAdmin?mode=Preferences], label for title\n{{Identical|Title}}", "bs-smartlist-tag-smartlist-desc": "Used in InsertMagic extension, tag description for displays configurable information about recent changes.\n{{Related|Bs-tag-desc}}", + "bs-smartlist-tag-smartlist-example-rc": "Description of example for mode \"recent changes\". Used in InsertMagic tag description.", + "bs-smartlist-tag-smartlist-example-whatlinkshere": "Description of example for mode \"whatlinkshere\". Used in InsertMagic tag description.", "bs-smartlist-tag-newbies-desc": "Used in InsertMagic extension, tag description for displays the latest use
[MediaWiki-commits] [Gerrit] Make GWToolset properly record events in CU log - change (mediawiki...GWToolset)
jenkins-bot has submitted this change and it was merged. Change subject: Make GWToolset properly record events in CU log .. Make GWToolset properly record events in CU log Bug: T126450 Change-Id: Ib5c5ae3ee02dc4201add88b66556b04efd86afe3 --- M includes/Jobs/UploadMediafileJob.php M includes/Jobs/UploadMetadataJob.php 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Jobs/UploadMediafileJob.php b/includes/Jobs/UploadMediafileJob.php index ca2e4d0..fa7044a 100755 --- a/includes/Jobs/UploadMediafileJob.php +++ b/includes/Jobs/UploadMediafileJob.php @@ -22,6 +22,7 @@ use ScopedCallback; use Title; use User; +use RequestContext; class UploadMediafileJob extends Job { @@ -38,6 +39,9 @@ * @param {int} $id */ public function __construct( $title, $params, $id = 0 ) { + if ( !isset( $params['session'] ) ) { + $params['session'] = RequestContext::getMain()->exportSession(); + } parent::__construct( 'gwtoolsetUploadMediafileJob', $title, $params, $id ); } @@ -117,6 +121,13 @@ return $result; } + if ( isset( $this->params['session'] ) ) { + $sessionScope = RequestContext::importScopedSession( $this->params['session'] ); + $this->addTeardownCallback( function () use ( &$sessionScope ) { + ScopedCallback::consume( $sessionScope ); // T126450 + } ); + } + $this->User = User::newFromName( $this->params['user-name'] ); try { diff --git a/includes/Jobs/UploadMetadataJob.php b/includes/Jobs/UploadMetadataJob.php index f44623d..5577bcc 100644 --- a/includes/Jobs/UploadMetadataJob.php +++ b/includes/Jobs/UploadMetadataJob.php @@ -20,6 +20,8 @@ use Exception; use Title; use User; +use RequestContext; +use ScopedCallback; /** * runs the MetadataMappingHandler with the originally $_POST’ed form fields when @@ -46,6 +48,9 @@ * @param {int} $id */ public function __construct( $title, $params, $id = 0 ) { + if ( !isset( $params['session'] ) ) { + $params['session'] = RequestContext::getMain()->exportSession(); + } parent::__construct( 'gwtoolsetUploadMetadataJob', $title, $params, $id ); } @@ -126,6 +131,13 @@ return $result; } + if ( isset( $this->params['session'] ) ) { + $sessionScope = RequestContext::importScopedSession( $this->params['session'] ); + $this->addTeardownCallback( function () use ( &$sessionScope ) { + ScopedCallback::consume( $sessionScope ); // T126450 + } ); + } + $this->User = User::newFromName( $this->params['user-name'] ); $job_queue_size = JobQueueGroup::singleton()->get( 'gwtoolsetUploadMediafileJob' )->getSize(); -- To view, visit https://gerrit.wikimedia.org/r/288878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5c5ae3ee02dc4201add88b66556b04efd86afe3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/GWToolset Gerrit-Branch: master Gerrit-Owner: Brian Wolff Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] No remoteExtPath key in extension.json. Broke RL debug mode - change (mediawiki...RevisionSlider)
jenkins-bot has submitted this change and it was merged. Change subject: No remoteExtPath key in extension.json. Broke RL debug mode .. No remoteExtPath key in extension.json. Broke RL debug mode Change-Id: Ie417c6361910cf574a0c127ff66d0d64b2d6c509 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index e1e92ef..66af9d2 100755 --- a/extension.json +++ b/extension.json @@ -134,7 +134,8 @@ } }, "ResourceFileModulePaths": { - "localBasePath": "" + "localBasePath": "", + "remoteExtPath": "RevisionSlider" }, "Hooks": { "DiffViewHeader": [ -- To view, visit https://gerrit.wikimedia.org/r/291294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie417c6361910cf574a0c127ff66d0d64b2d6c509 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RevisionSlider Gerrit-Branch: master Gerrit-Owner: Brian Wolff Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop using deprecated Skin::link in favour of Linker::link - change (mediawiki...SpecialNamespaces)
jenkins-bot has submitted this change and it was merged. Change subject: Stop using deprecated Skin::link in favour of Linker::link .. Stop using deprecated Skin::link in favour of Linker::link Linker::link introduced in mw 1.18 Skin::link deprecated in 1.21 Change-Id: I6a258e45adfd6f9ed5c095cc4143e1b9f5141457 --- M SpecialNamespaces_body.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialNamespaces_body.php b/SpecialNamespaces_body.php index 1e6ea4d..32b4951 100644 --- a/SpecialNamespaces_body.php +++ b/SpecialNamespaces_body.php @@ -291,10 +291,10 @@ $nscanonical"; if ( $admin ) { $out .= ''; - $out .= $skin->link( $selfTitle, $editmessage, array(), + $out .= Linker::link( $selfTitle, $editmessage, array(), array( 'action' => 'edit', 'prefix' => $nsid, 'name' => $nsname ) ); $out .= ', '; - $out .= $skin->link( $selfTitle, $deletemessage, array(), + $out .= Linker::link( $selfTitle, $deletemessage, array(), array( 'action' => 'delete', 'prefix' => $nsid, 'name' => $nsname ) ); $out .= ''; } -- To view, visit https://gerrit.wikimedia.org/r/291510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a258e45adfd6f9ed5c095cc4143e1b9f5141457 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SpecialNamespaces Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Checklist: Improved tag documentation - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/291573 Change subject: Checklist: Improved tag documentation .. Checklist: Improved tag documentation New tag description. Thanks to Sabine Gürtler and Anja Ebersbach. Change-Id: I1ebf3d437cfc426e5d57aa599a193d66ca2498b7 --- M Checklist/Checklist.class.php M Checklist/i18n/en.json M Checklist/i18n/qqq.json 3 files changed, 17 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/73/291573/1 diff --git a/Checklist/Checklist.class.php b/Checklist/Checklist.class.php index f8cbfc1..c2d528d 100644 --- a/Checklist/Checklist.class.php +++ b/Checklist/Checklist.class.php @@ -160,18 +160,23 @@ public function onBSInsertMagicAjaxGetData( &$oResponse, $type ) { if( $type != 'tags' ) return true; - $aMessage = array(); - $aMessage[] = wfMessage( 'bs-checklist-tag-checklist-desc' )->plain().''; - $aMessage[] = wfMessage( 'bs-checklist-tag-checklist-param-type' )->plain(); - $aMessage[] = wfMessage( 'bs-checklist-tag-checklist-param-list' )->plain(); - $aMessage[] = wfMessage( 'bs-checklist-tag-checklist-param-value' )->plain(); - $oResponse->result[] = array( 'id' => 'bs:checklist', 'type' => 'tag', 'name' => 'checklist', - 'desc' => implode( '', $aMessage ), + 'desc' => wfMessage( 'bs-checklist-tag-checklist-desc' )->text(), 'code' => '', + 'examples' => array( + array( + 'label' => wfMessage( 'bs-checklist-tag-checklist-example-check' )->text(), + 'code' => '' + ), + array( + 'label' => wfMessage( 'bs-checklist-tag-checklist-example-list' )->text(), + 'code' => '' + ), + ), + 'helplink' => 'https://help.bluespice.com/index.php/Checklist' ); return true; diff --git a/Checklist/i18n/en.json b/Checklist/i18n/en.json index 36c329d..7382dac 100644 --- a/Checklist/i18n/en.json +++ b/Checklist/i18n/en.json @@ -11,10 +11,9 @@ "bs-checklist-menu-insert-checkbox": "Checkbox", "bs-checklist-dlg-insert-list-title": "Insert a checklist", "bs-checklist-dlg-insert-list-value-list": "Value list", - "bs-checklist-tag-checklist-desc": "Renders a checkbox or select field. Available configuration attributes:", - "bs-checklist-tag-checklist-param-type": "type: list renders a select list.", - "bs-checklist-tag-checklist-param-list": "list: Name of the template with the available values. Parameter type must be set to list.", - "bs-checklist-tag-checklist-param-value": "value: checked or a value out of the list template.", + "bs-checklist-tag-checklist-desc": "Generates a checkbox or a select menu. The checklist can be modified by various parameters.", + "bs-checklist-tag-checklist-example-check": "Checkbox", + "bs-checklist-tag-checklist-example-list": "Select menu", "bs-checklist-dlg-new-list": "Create a new list", "bs-checklist-dlg-save-list": "Save changes to list", "bs-checklist-dlg-items-label" : "Items in list", diff --git a/Checklist/i18n/qqq.json b/Checklist/i18n/qqq.json index 3cc22ea..ec38efa 100644 --- a/Checklist/i18n/qqq.json +++ b/Checklist/i18n/qqq.json @@ -15,9 +15,8 @@ "bs-checklist-dlg-insert-list-title": "Title for insert checklist dialogue", "bs-checklist-dlg-insert-list-value-list": "Label for value list\n{{Identical|Value list}}", "bs-checklist-tag-checklist-desc": "Text for renders a checkbox or select field. Available configuration attributes:\n{{Related|Bs-tag-desc}}", - "bs-checklist-tag-checklist-param-type": "Text for type: list renders a select list. \n\n\"type\" has to be lowercase", - "bs-checklist-tag-checklist-param-list": "Text for list: Name of the template with the available values. Parameter type must be set to list. \n \"list\" has to be lowercase", - "bs-checklist-tag-checklist-param-value": "Text for value: checked or a value out of the list template. \n\n\"value\" has to be lowercase", + "bs-checklist-tag-checklist-example-check": "Description of example for checkbox. Used in InsertMagic tag description.", + "bs-checklist-tag-checklist-example-list": "Description of example for select menu. Used in InsertMagic tag description.", "bs-checklist-dlg-new-list": "Button text for creating a n
[MediaWiki-commits] [Gerrit] Stop using deprecated Skin::link - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged. Change subject: Stop using deprecated Skin::link .. Stop using deprecated Skin::link Skin::link was deprecated in 1.21 Linker::link can be used as of 1.18 Change-Id: I72380e4623ef74bd35e07caee7853571d06ba6b3 --- M ArticleInfo/ArticleInfo.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/ArticleInfo/ArticleInfo.class.php b/ArticleInfo/ArticleInfo.class.php index 90ca865..3145c69 100644 --- a/ArticleInfo/ArticleInfo.class.php +++ b/ArticleInfo/ArticleInfo.class.php @@ -526,7 +526,7 @@ $oList->setTemplate( '→ {LINK}' ); foreach ( $aSubpages as $oTitle ) { - $sLink = $this->getSkin()->link( $oTitle, $oTitle->getSubpageText() ); + $sLink = Linker::link( $oTitle, $oTitle->getSubpageText() ); $sStyle = 'margin-left:'.( count( explode( '/', $oTitle->getText() ) ) - 1 ).'em'; $oList->addData( array( 'LINK' => $sLink, 'STYLE' => $sStyle ) ); } -- To view, visit https://gerrit.wikimedia.org/r/291512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72380e4623ef74bd35e07caee7853571d06ba6b3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Dvogel hallowelt Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikilabels: make file settings recursive - change (operations/puppet)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/291572 Change subject: wikilabels: make file settings recursive .. wikilabels: make file settings recursive Change-Id: I59d88da30e724a7657e5dbdc0fdb2cc7ac68f903 --- M modules/wikilabels/manifests/web.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/72/291572/1 diff --git a/modules/wikilabels/manifests/web.pp b/modules/wikilabels/manifests/web.pp index 8e3b8ed..34adbad 100644 --- a/modules/wikilabels/manifests/web.pp +++ b/modules/wikilabels/manifests/web.pp @@ -26,6 +26,7 @@ owner => 'www-data', group => 'www-data', mode=> '0775', +recurse => true, require => File['/srv'], } -- To view, visit https://gerrit.wikimedia.org/r/291572 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59d88da30e724a7657e5dbdc0fdb2cc7ac68f903 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add background colors and utility script to show color combi... - change (pywikibot/core)
Mpaa has uploaded a new change for review. https://gerrit.wikimedia.org/r/291571 Change subject: Add background colors and utility script to show color combinations .. Add background colors and utility script to show color combinations Add additional backgroung colors support. Modify tool.Formatter to support background colors. Add utility to show possible background/foreground combinations, in preparation for possibility for user to select default use. Bug: T135984 Change-Id: Iecb648176b41c9ea3a2cc4ce879526f20d75bfde --- M pywikibot/tools/formatter.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py A scripts/show_pywikibot_colors.py 5 files changed, 88 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/71/291571/1 diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py index a571ee4..e5f3734 100644 --- a/pywikibot/tools/formatter.py +++ b/pywikibot/tools/formatter.py @@ -76,7 +76,7 @@ def get_value(self, key, args, kwargs): """Get value, filling in 'color' when it is a valid color.""" -if key == 'color' and kwargs.get('color') in self.colors: +if key in ['color', 'bgcolor'] and kwargs.get('color') in self.colors: return '\03{{{0}}}'.format(kwargs[key]) else: return super(_ColorFormatter, self).get_value(key, args, kwargs) diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 3cda2cf..b995ee1 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -47,8 +47,22 @@ 'lightpurple', 'lightyellow', 'white', +'Bblack', +'Bblue', +'Bgreen', +'Baqua', +'Bred', +'Bpurple', +'Byellow', +'Blightgray', +'Bgray', +'Blightblue', 'Blightgreen', +'Blightaqua', 'Blightred', +'Blightpurple', +'Blightyellow', +'Bwhite', ] colorTagR = re.compile('\03{(?P%s|previous)}' % '|'.join(colors)) diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index 9f37d58..9d7e286 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -31,8 +31,22 @@ 'lightpurple': chr(27) + '[95m',# Light Purple tag (Magenta) 'lightaqua': chr(27) + '[96m',# Light Aqua tag (Cyan) 'white': chr(27) + '[97m',# White start tag (Bright White) -'Blightgreen': chr(27) + '[102m', # Background Light Red tag -'Blightred': chr(27) + '[101m', # Background Light Green tag +'Bblack': chr(27) + '[40m', # Background Black start tag +'Bred': chr(27) + '[41m', # Background Red start tag +'Bgreen': chr(27) + '[42m', # Background Green start tag +'Byellow': chr(27) + '[43m', # Background Yellow start tag +'Bblue':chr(27) + '[44m', # Background Blue start tag +'Bpurple': chr(27) + '[45m', # Background Purple start tag (Magenta) +'Baqua':chr(27) + '[46m', # Background Aqua start tag (Cyan) +'Blightgray': chr(27) + '[47m', # Background Light gray start tag (White) +'Bgray':chr(27) + '[100m', # Background Gray start tag +'Blightred':chr(27) + '[101m', # Background Light Red tag +'Blightgreen': chr(27) + '[102m', # Background Light Green tag +'Blightyellow': chr(27) + '[103m', # Background Light Yellow tag +'Blightblue': chr(27) + '[104m', # Background Light Blue tag +'Blightpurple': chr(27) + '[105m', # Background Light Purple tag (Magenta) +'Blightaqua': chr(27) + '[106m', # Background Light Aqua tag (Cyan) +'Bwhite': chr(27) + '[107m', # Background White start tag (Bright White) } diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index 7c3ed10..2abb452 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -38,8 +38,23 @@ 'lightpurple': 13, 'lightyellow': 14, 'white': 15, -'Blightgreen': 32, # background color green. -'Blightred': 64, # background color red. +'Bblack':0, # Background color. +'Bblue':16, # Background color. +'Bgreen': 32, # Background color. +'Baqua':48, # Background color. +'Bred': 64, # Background color. +'Bpurple': 80, # Background color. +'Byellow': 96, # Background color. +'Blightgray': 112, # Background color. +'Bgray':128, # Background color. +'Blightblue': 144, # Background c
[MediaWiki-commits] [Gerrit] CountThings: Improved tag documentation - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/291570 Change subject: CountThings: Improved tag documentation .. CountThings: Improved tag documentation New tag description. Thanks to Sabine Gürtler and Anja Ebersbach. Change-Id: I214363ecd6df0a1bd500f07ecf1f9d2487128541 --- M CountThings/CountThings.class.php M CountThings/i18n/en.json M CountThings/i18n/qqq.json 3 files changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/70/291570/1 diff --git a/CountThings/CountThings.class.php b/CountThings/CountThings.class.php index 71f5510..f7a9073 100644 --- a/CountThings/CountThings.class.php +++ b/CountThings/CountThings.class.php @@ -125,6 +125,7 @@ 'name' => 'countarticles', 'desc' => wfMessage( 'bs-countthings-tag-countarticles-desc' )->escaped(), 'code' => '', + 'helplink' => 'https://help.bluespice.com/index.php/Count_Things' ); $oResponse->result[] = array( @@ -133,6 +134,7 @@ 'name' => 'countusers', 'desc' => wfMessage( 'bs-countthings-tag-countusers-desc' )->escaped(), 'code' => '', + 'helplink' => 'https://help.bluespice.com/index.php/Count_Things' ); $oResponse->result[] = array( @@ -140,7 +142,18 @@ 'type' => 'tag', 'name' => 'countcharacters', 'desc' => wfMessage( 'bs-countthings-tag-countcharacters-desc' )->escaped(), - 'code' => 'Article One,Article Two,Article Three', + 'code' => 'ARTICLENAME', + 'examples' => array( + array( + 'label' => wfMessage( 'bs-countthings-tag-countcharacters-example-1' )->escaped(), + 'code' => 'ARTICLENAME' + ), + array( + 'label' => wfMessage( 'bs-countthings-tag-countcharacters-example-2' )->escaped(), + 'code' => 'ARTICLENAME' + ), + ), + 'helplink' => 'https://help.bluespice.com/index.php/Count_Things' ); return true; diff --git a/CountThings/i18n/en.json b/CountThings/i18n/en.json index 6c0d2c0..977b987 100644 --- a/CountThings/i18n/en.json +++ b/CountThings/i18n/en.json @@ -11,8 +11,10 @@ "bs-countthings-error-no-input": "No page provided.", "bs-countthings-error-invalid-mode": "The mode \"$1\" is invalid. Please use \"chars\", \"words\", or \"pages\".", "bs-countthings-error-not-exist": "The page \"$1\" does not exist.", - "bs-countthings-tag-countarticles-desc": "Displays the number of pages.", - "bs-countthings-tag-countusers-desc": "Displays the number of users.", - "bs-countthings-tag-countcharacters-desc": "Displays statistics of the given page content. Available configuration attribute:", - "bs-countthings-tag-countcharacters-desc-param-mode": "mode: What should be counted chars (characters), words (words) or pages (pages)." + "bs-countthings-tag-countarticles-desc": "Displays the number of articles in the wiki.", + "bs-countthings-tag-countusers-desc": "Shows the number of registered users.", + "bs-countthings-tag-countcharacters-desc": "Generates metadata on the content of the indicated article. The output is an infobox that can be integrated into an article. With the parameter \"mode\" different kind of information can be displayed.", + "bs-countthings-tag-countcharacters-desc-param-mode": "mode: What should be counted chars (characters), words (words) or pages (pages).", + "bs-countthings-tag-countcharacters-example-1": "Number of words", + "bs-countthings-tag-countcharacters-example-2": "Number of characters" } diff --git a/CountThings/i18n/qqq.json b/CountThings/i18n/qqq.json index 03e2aff..9362cd9 100644 --- a/CountThings/i18n/qqq.json +++ b/CountThings/i18n/qqq.json @@ -16,5 +16,7 @@ "bs-countthings-tag-countarticles-desc": "Used in InsertMagic extension, tag description for displays the number of pages.\n{{Related|Bs-tag-desc}}", "bs-countthings-tag-countusers-desc": "Used in InsertMagic extension, tag description for displays the number of users.\n{{Related|Bs-tag-desc}}", "bs-countthings-tag-countcharacters-desc": "Used in InsertMagic extension, tag description for displays statistics of the given page content. Available configuration attribute:\n{{Related|Bs-tag-desc}}", - "bs-count
[MediaWiki-commits] [Gerrit] jquery.makeCollapsible: Tables with more header rows and tfoot - change (mediawiki/core)
MatthiasDD has uploaded a new change for review. https://gerrit.wikimedia.org/r/291569 Change subject: jquery.makeCollapsible: Tables with more header rows and tfoot .. jquery.makeCollapsible: Tables with more header rows and tfoot Make collapsible on tables with more than one header row and footer row. Hide all rows except the first if $defaultToggle in it. Bug: T114607 Change-Id: I1b5cf084d56d7eac093a04e8301e426f5d5d5d28 --- M resources/src/jquery/jquery.makeCollapsible.js M tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js 2 files changed, 49 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/69/291569/1 diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js index bdb5ce8..85a7e45 100644 --- a/resources/src/jquery/jquery.makeCollapsible.js +++ b/resources/src/jquery/jquery.makeCollapsible.js @@ -54,12 +54,7 @@ if ( !options.plainMode && $collapsible.is( 'table' ) ) { // Tables - // If there is a caption, hide all rows; otherwise, only hide body rows - if ( $collapsible.find( '> caption' ).length ) { - $containers = $collapsible.find( '> * > tr' ); - } else { - $containers = $collapsible.find( '> tbody > tr' ); - } + $containers = $collapsible.find( '> * > tr' ); if ( $defaultToggle ) { // Exclude table row containing togglelink $containers = $containers.not( $defaultToggle.closest( 'tr' ) ); diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js index c51e409..1e1d4b8 100644 --- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js @@ -113,6 +113,51 @@ test.clock.tick( 500 ); } ); + QUnit.test( 'basic operation () with and ', 13, function ( assert ) { + var test = this, + $collapsible = prepareCollapsible( + '' + + '' + loremIpsum + '' + + ' ' + loremIpsum + '' + loremIpsum + '' + + '' + loremIpsum + '' + loremIpsum + '' + + ' ' + loremIpsum + '' + loremIpsum + '' + + '' + loremIpsum + '' + loremIpsum + '' + + '' + ), + $headerRow1 = $collapsible.find( 'tr:eq(0)' ), + $headerRow2 = $collapsible.find( 'tr:eq(1)' ), + $contentRow = $collapsible.find( 'tr:eq(2)' ), + $footerRow = $collapsible.find( 'tr:last' ), + $toggle = $headerRow1.find( '.mw-collapsible-toggle' ); + + assert.equal( $toggle.length, 1, 'toggle is added to the cell of first row' ); + + assert.assertTrue( $headerRow1.is( ':visible' ), 'headerRow1 is visible' ); + assert.assertTrue( $headerRow2.is( ':visible' ), 'headerRow2 is visible' ); + assert.assertTrue( $contentRow.is( ':visible' ), 'contentRow is visible' ); + assert.assertTrue( $footerRow.is( ':visible' ), 'footerRow is visible' ); + + $collapsible.on( 'afterCollapse.mw-collapsible', function () { + assert.assertTrue( $headerRow1.is( ':visible' ), 'after collapsing: headerRow1 is still visible' ); + assert.assertTrue( $headerRow2.is( ':hidden' ), 'after collapsing: headerRow2 is hidden' ); + assert.assertTrue( $contentRow.is( ':hidden' ), 'after collapsing: contentRow is hidden' ); + assert.assertTrue( $footerRow.is( ':hidden' ), 'after collapsing: footerRow is hidden' ); + + $collapsible.on( 'afterExpand.mw-collapsible', function () { + assert.assertTrue( $headerRow1.is( ':visible' ), 'after expanding: headerRow1 is still visible' ); + assert.assertTrue( $headerRow2.is( ':visible' ), 'after expanding: headerRow2 is visible' ); + assert.assertTrue( $contentRow.is( ':visible' ), 'after expanding: contentRow is visible' ); + assert.assertTrue( $footerRow.is( ':visible' ), 'after expanding: footerRow is visible' ); + } ); + + $toggle.trigger( 'click' ); + test.cloc
[MediaWiki-commits] [Gerrit] First step cleaning up resources - change (mediawiki...Kartographer)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/291568 Change subject: First step cleaning up resources .. First step cleaning up resources This does not solve the bug, but it should help make the next step of cleaning it up. Also, resource 'ext.kartographer' is renamed to 'ext.kartographer.settings' Bug: T134079 Change-Id: Iac8cb9e89b3a210e50ea9eb5588bd9b27d6692fc --- M extension.json M modules/ve-maps/ve.ce.MWInlineMapsNode.js M modules/ve-maps/ve.ce.MWMapsNode.js R styles/ve.ui.MWMaps.css 4 files changed, 23 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/68/291568/1 diff --git a/extension.json b/extension.json index 063b80a..d09b348 100644 --- a/extension.json +++ b/extension.json @@ -33,10 +33,12 @@ "mapdata": "Kartographer\\ApiQueryMapData" }, "ResourceModules": { - "ext.kartographer": { + "ext.kartographer.settings": { + "_info_": "Set JS configuration for Kartographer, like available scaling factors, styles, etc. Used by live & visualeditor resources, loaded by VE ve.ce.MWInlineMapsNode & ve.ce.MWMapsNode", "class": "Kartographer\\DataModule" }, "ext.kartographer.style": { + "_info_": "Styles for maplink, mapframe, fullscreen (TODO: maybe we should break it into separate modules). Loaded by mapframe & maplink tag handlers", "styles": [ "styles/kartographer.less" ], @@ -46,6 +48,7 @@ ] }, "ext.kartographer.site": { + "_info_": "Site-customized css & js, should only be loaded for , fullscreen, and edit. Used by live & fullscreen resources", "class": "ResourceLoaderWikiModule", "scripts": [ "MediaWiki:Kartographer.js" @@ -59,6 +62,7 @@ ] }, "mapbox": { + "_info_": "External mapframe lib, handles drawing of the map. Used by live and leaflet.draw resources", "scripts": [ "lib/mapbox/mapbox-lib.js", "lib/mapbox/mapbox.i18n.js" @@ -79,6 +83,7 @@ ] }, "leaflet.draw": { + "_info_": "External leaflet lib to allow visual geojson editing in the VE map dialog, loaded by editor resource", "dependencies": [ "mapbox" ], @@ -130,13 +135,14 @@ ] }, "ext.kartographer.live": { + "_info_": "Show interactive map - required by , fullscreen, editor. Used by editor resource. Loaded by all tags and ve.ce.MWMapsNode", "dependencies": [ - "mapbox", - "ext.kartographer", - "ext.kartographer.site", - "mediawiki.jqueryMsg", "oojs-ui.styles.icons-media", - "mediawiki.router" + "mediawiki.jqueryMsg", + "mediawiki.router", + "mapbox", + "ext.kartographer.settings", + "ext.kartographer.site" ], "scripts": [ "lib/leaflet.sleep.js", @@ -150,10 +156,12 @@ "desktop" ] }, + "ext.kartographer.fullscreen": { + "_info_": "Loaded when user clicks on a maplink or expands a mapframe, from JS in openFullscreenMap()", "dependencies": [ - "ext.kartographer.site", - "oojs-ui-windows" + "oojs-ui-windows", + "ext.kartographer.site" ], "scripts": [ "modules/kartographer.MapDialog.js" @@ -168,6 +176,7 @@ ] }, "ext.kartographer.editor": { + "_info_": "Loaded by VE map editor dialog - ve.ui.MWMapsDialog", "dependencies": [ "leaflet.draw", "ext.kartographer.live" @@ -178,6 +187,7 @@ ] }, "ext.kartographer
[MediaWiki-commits] [Gerrit] Update mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update mediawiki/mediawiki-codesniffer to 0.7.2 .. Update mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I9371faef4b8a0b9c80ec41d8ba08f4ff4936791e (cherry picked from commit d9210c5cd485025581b0467864bf406effbb71f1) --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 7252f4c..7b132ee 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "justinrainbow/json-schema": "~1.3", - "mediawiki/mediawiki-codesniffer": "0.7.1", + "mediawiki/mediawiki-codesniffer": "0.7.2", "monolog/monolog": "~1.18.2", "nikic/php-parser": "1.4.1", "nmred/kafka-php": "0.1.5", -- To view, visit https://gerrit.wikimedia.org/r/291561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9371faef4b8a0b9c80ec41d8ba08f4ff4936791e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: Hashar Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] InsertMagic: Added examples to description and reference imp... - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/291567 Change subject: InsertMagic: Added examples to description and reference implementation .. InsertMagic: Added examples to description and reference implementation You can now add several examples to the description of a magic word. How this is done can be seen in the Blog extension reference implementation. Change-Id: I7ae654929f0ec3559a5882a22d78d481a335a763 --- M Blog/Blog.class.php M InsertMagic/InsertMagic.setup.php M InsertMagic/i18n/en.json M InsertMagic/i18n/qqq.json M InsertMagic/resources/BS.InsertMagic/Window.js 5 files changed, 41 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/67/291567/1 diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php index 4ffe0c9..2880d3c 100644 --- a/Blog/Blog.class.php +++ b/Blog/Blog.class.php @@ -310,7 +310,12 @@ 'type' => 'tag', 'name' => 'blog', 'desc' => wfMessage( 'bs-blog-tag-blog-desc' )->text(), - 'code' => '', + 'code' => '', + 'examples' => array( + array( + 'code' => '' + ) + ), 'helplink' => 'https://help.bluespice.com/index.php/Blog' ); @@ -328,7 +333,12 @@ 'type' => 'tag', 'name' => 'blogtime', 'desc' => wfMessage( 'bs-blog-tag-blogtime-desc' )->text(), - 'code' => '', + 'code' => '', + 'examples' => array( + array( + 'code' => '' + ) + ), 'helplink' => 'https://help.bluespice.com/index.php/Blog' ); diff --git a/InsertMagic/InsertMagic.setup.php b/InsertMagic/InsertMagic.setup.php index 6bf2c7f..acc7143 100644 --- a/InsertMagic/InsertMagic.setup.php +++ b/InsertMagic/InsertMagic.setup.php @@ -30,6 +30,7 @@ 'bs-insertmagic-label-second', 'bs-insertmagic-label-third', 'bs-insertmagic-label-desc', + 'bs-insertmagic-label-examples', 'bs-insertmagic-label-see-also' ), 'dependencies' => array( diff --git a/InsertMagic/i18n/en.json b/InsertMagic/i18n/en.json index bfb4815..2b71b8c 100644 --- a/InsertMagic/i18n/en.json +++ b/InsertMagic/i18n/en.json @@ -65,5 +65,6 @@ "bs-insertmagic-label-first": "1. Choose tag or magic word", "bs-insertmagic-label-second": "2. Modify code", "bs-insertmagic-label-desc": "Description", - "bs-insertmagic-label-see-also": "See also:" + "bs-insertmagic-label-examples": "Examples", + "bs-insertmagic-label-see-also": "See also" } diff --git a/InsertMagic/i18n/qqq.json b/InsertMagic/i18n/qqq.json index 9a50688..b7d6fc5 100644 --- a/InsertMagic/i18n/qqq.json +++ b/InsertMagic/i18n/qqq.json @@ -68,5 +68,6 @@ "bs-insertmagic-label-first": "Headline text for 1. choose tag or magic word \n {{Identical|1. Choose tag or magic word}}", "bs-insertmagic-label-second": "Headline text for 2. modify code \n {{Identical|2. Modify code}}", "bs-insertmagic-label-desc": "Headline text for description \n {{Identical|Description}}", + "bs-insertmagic-label-examples": "Textlabel above the example section in the description field of the insert magic dialog.", "bs-insertmagic-label-see-also": "Textlabel above the see also link for more information in the description field of the insert magic dialog." } diff --git a/InsertMagic/resources/BS.InsertMagic/Window.js b/InsertMagic/resources/BS.InsertMagic/Window.js index 0043ec6..c741972 100644 --- a/InsertMagic/resources/BS.InsertMagic/Window.js +++ b/InsertMagic/resources/BS.InsertMagic/Window.js @@ -37,7 +37,7 @@ this.tagsStore = Ext.create( 'BS.store.BSApi', { apiAction: 'bs-insertmagic-data-store', - fields: ['id', 'type', 'name', 'desc', 'code', 'helplink' ], + fields: ['id', 'type', 'name', 'desc', 'code', 'examples', 'helplink' ], submitValue: false, remoteSort: false, remoteFilter: false, @@ -174,7 +174,8 @@ var data = { desc : record.get( 'desc' ), type : record.get( 'type' ), - helplink : record.get( 'helplink' ) + helplink : record.get( 'helplink' ), + examples : record.get( 'examples' )
[MediaWiki-commits] [Gerrit] LoginSignupSpecialPage: Load return and returnto params as e... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: LoginSignupSpecialPage: Load return and returnto params as early as possible .. LoginSignupSpecialPage: Load return and returnto params as early as possible They're are needed for a redirect to the target page after a successful login, which is made before the SpecialPage::execute() function is called. Loading basic request varaibles in the execute() function is therefore too late to take effect for the redirect after a successul authentication with a primary provider, which needs to redirect the user to another site. Bug: T135924 Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 (cherry picked from commit 3d1e04e976ccb27e22e71ee0cd8ba53ee2d90780) --- M includes/specialpage/LoginSignupSpecialPage.php 1 file changed, 34 insertions(+), 10 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index bd6b08f..5fe8d7c 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -47,6 +47,7 @@ protected $mEntryErrorType = 'error'; protected $mLoaded = false; + protected $mLoadedRequest = false; protected $mSecureLoginUrl; /** @var string */ @@ -89,19 +90,20 @@ $wgUseMediaWikiUIEverywhere = true; } - /** -* Load data from request. -* @private -* @param string $subPage Subpage of Special:Userlogin -*/ - protected function load( $subPage ) { - global $wgSecureLogin; + protected function setRequest( array $data, $wasPosted = null ) { + parent::setRequest( $data, $wasPosted ); + $this->mLoadedRequest = false; + } - if ( $this->mLoaded ) { + /** +* Load basic request parameters for this Special page. +* @param $subPage +*/ + private function loadRequestParameters( $subPage ) { + if ( $this->mLoadedRequest ) { return; } - $this->mLoaded = true; - + $this->mLoadedRequest = true; $request = $this->getRequest(); $this->mPosted = $request->wasPosted(); @@ -114,6 +116,22 @@ $this->mLanguage = $request->getText( 'uselang' ); $this->mReturnTo = $request->getVal( 'returnto', '' ); $this->mReturnToQuery = $request->getVal( 'returntoquery', '' ); + } + + /** +* Load data from request. +* @private +* @param string $subPage Subpage of Special:Userlogin +*/ + protected function load( $subPage ) { + global $wgSecureLogin; + + $this->loadRequestParameters( $subPage ); + if ( $this->mLoaded ) { + return; + } + $this->mLoaded = true; + $request = $this->getRequest(); $securityLevel = $this->getRequest()->getText( 'force' ); if ( @@ -185,6 +203,12 @@ return $params; } + protected function beforeExecute( $subPage ) { + // finish initializing the class before processing the request - T135924 + $this->loadRequestParameters( $subPage ); + return parent::beforeExecute( $subPage ); + } + /** * @param string|null $subPage */ -- To view, visit https://gerrit.wikimedia.org/r/291566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: Gergő Tisza Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LoginSignupSpecialPage: Load return and returnto params as e... - change (mediawiki/core)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/291566 Change subject: LoginSignupSpecialPage: Load return and returnto params as early as possible .. LoginSignupSpecialPage: Load return and returnto params as early as possible They're are needed for a redirect to the target page after a successful login, which is made before the SpecialPage::execute() function is called. Loading basic request varaibles in the execute() function is therefore too late to take effect for the redirect after a successul authentication with a primary provider, which needs to redirect the user to another site. Bug: T135924 Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 (cherry picked from commit 3d1e04e976ccb27e22e71ee0cd8ba53ee2d90780) --- M includes/specialpage/LoginSignupSpecialPage.php 1 file changed, 34 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/66/291566/1 diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index bd6b08f..5fe8d7c 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -47,6 +47,7 @@ protected $mEntryErrorType = 'error'; protected $mLoaded = false; + protected $mLoadedRequest = false; protected $mSecureLoginUrl; /** @var string */ @@ -89,19 +90,20 @@ $wgUseMediaWikiUIEverywhere = true; } - /** -* Load data from request. -* @private -* @param string $subPage Subpage of Special:Userlogin -*/ - protected function load( $subPage ) { - global $wgSecureLogin; + protected function setRequest( array $data, $wasPosted = null ) { + parent::setRequest( $data, $wasPosted ); + $this->mLoadedRequest = false; + } - if ( $this->mLoaded ) { + /** +* Load basic request parameters for this Special page. +* @param $subPage +*/ + private function loadRequestParameters( $subPage ) { + if ( $this->mLoadedRequest ) { return; } - $this->mLoaded = true; - + $this->mLoadedRequest = true; $request = $this->getRequest(); $this->mPosted = $request->wasPosted(); @@ -114,6 +116,22 @@ $this->mLanguage = $request->getText( 'uselang' ); $this->mReturnTo = $request->getVal( 'returnto', '' ); $this->mReturnToQuery = $request->getVal( 'returntoquery', '' ); + } + + /** +* Load data from request. +* @private +* @param string $subPage Subpage of Special:Userlogin +*/ + protected function load( $subPage ) { + global $wgSecureLogin; + + $this->loadRequestParameters( $subPage ); + if ( $this->mLoaded ) { + return; + } + $this->mLoaded = true; + $request = $this->getRequest(); $securityLevel = $this->getRequest()->getText( 'force' ); if ( @@ -185,6 +203,12 @@ return $params; } + protected function beforeExecute( $subPage ) { + // finish initializing the class before processing the request - T135924 + $this->loadRequestParameters( $subPage ); + return parent::beforeExecute( $subPage ); + } + /** * @param string|null $subPage */ -- To view, visit https://gerrit.wikimedia.org/r/291566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: Gergő Tisza Gerrit-Reviewer: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: Migrate to python3 - change (operations/puppet)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/291565 Change subject: dynamicproxy: Migrate to python3 .. dynamicproxy: Migrate to python3 Change-Id: Ibf7ed28c56c2c0771e88408cb417547b9a44f1b9 --- M modules/dynamicproxy/manifests/api.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/291565/1 diff --git a/modules/dynamicproxy/manifests/api.pp b/modules/dynamicproxy/manifests/api.pp index 0a5bb35..bc26126 100644 --- a/modules/dynamicproxy/manifests/api.pp +++ b/modules/dynamicproxy/manifests/api.pp @@ -14,12 +14,12 @@ mode => '0555', } -require_package('python-flask', 'python-redis', 'python-flask-sqlalchemy') +require_package('python3-flask', 'python3-redis', 'python3-flask-sqlalchemy') uwsgi::app { 'invisible-unicorn': settings => { uwsgi => { -plugins=> 'python', +plugins=> 'python3', master => true, http-socket=> '0.0.0.0:5668', mount => '/dynamicproxy-api=/usr/local/bin/invisible-unicorn.py', -- To view, visit https://gerrit.wikimedia.org/r/291565 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf7ed28c56c2c0771e88408cb417547b9a44f1b9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialUpload: Separate style only module - change (mediawiki/core)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/291564 Change subject: SpecialUpload: Separate style only module .. SpecialUpload: Separate style only module Move the style into a style only module, because it is used independant of the javascript module. Add the new style module as a dependency for the javascript module. Bug: T136364 Change-Id: If34483fdc50dc130a4bcf3d163b34b954f2269bb --- M includes/specials/SpecialUpload.php M resources/Resources.php R resources/src/mediawiki.special/mediawiki.special.upload.styles.css 3 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/291564/1 diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 09111f6..4b731cb 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -368,7 +368,7 @@ $sessionKey = $this->mUpload->stashSession(); // Add styles for the warning, reused from the live preview - $this->getOutput()->addModuleStyles( 'mediawiki.special.upload' ); + $this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' ); $warningHtml = '' . $this->msg( 'uploadwarning' )->escaped() . "\n" . ''; diff --git a/resources/Resources.php b/resources/Resources.php index 343722d..ff4b881 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1906,7 +1906,6 @@ 'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html', ], 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js', - 'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css', 'messages' => [ 'widthheight', 'size-bytes', @@ -1919,6 +1918,7 @@ 'prefs-editing', ], 'dependencies' => [ + 'mediawiki.special.upload.styles', 'jquery.spinner', 'mediawiki.jqueryMsg', 'mediawiki.api', @@ -1929,6 +1929,9 @@ 'user.options', ], ], + 'mediawiki.special.upload.styles' => [ + 'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css', + ], 'mediawiki.special.userlogin.common.styles' => [ 'styles' => [ 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css', diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.css b/resources/src/mediawiki.special/mediawiki.special.upload.styles.css similarity index 100% rename from resources/src/mediawiki.special/mediawiki.special.upload.css rename to resources/src/mediawiki.special/mediawiki.special.upload.styles.css -- To view, visit https://gerrit.wikimedia.org/r/291564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If34483fdc50dc130a4bcf3d163b34b954f2269bb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TheDJ ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable instance restbase2004-b.codfw.wmnet - change (operations/puppet)
Eevans has uploaded a new change for review. https://gerrit.wikimedia.org/r/291563 Change subject: enable instance restbase2004-b.codfw.wmnet .. enable instance restbase2004-b.codfw.wmnet Bug: T134016 Change-Id: If1549aba89c0b4993a1db9ab8e847383c179c846 --- M hieradata/hosts/restbase2004.yaml 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/291563/1 diff --git a/hieradata/hosts/restbase2004.yaml b/hieradata/hosts/restbase2004.yaml index 267b535..287dad4 100644 --- a/hieradata/hosts/restbase2004.yaml +++ b/hieradata/hosts/restbase2004.yaml @@ -5,11 +5,11 @@ listen_address: 10.192.32.137 rpc_address: 10.192.32.137 rpc_interface: eth0 -# b: -#jmx_port: 7190 -#listen_address: 10.192.32.138 -#rpc_address: 10.192.32.138 -#rpc_interface: eth0 + b: +jmx_port: 7190 +listen_address: 10.192.32.138 +rpc_address: 10.192.32.138 +rpc_interface: eth0 # c: #jmx_port: 7191 #listen_address: 10.192.32.139 -- To view, visit https://gerrit.wikimedia.org/r/291563 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1549aba89c0b4993a1db9ab8e847383c179c846 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: make invisible-unicorn.py python3 compatible - change (operations/puppet)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/291562 Change subject: dynamicproxy: make invisible-unicorn.py python3 compatible .. dynamicproxy: make invisible-unicorn.py python3 compatible Change-Id: I9f7af745d0749237882e08b65d086cadb3fac18c --- M modules/dynamicproxy/files/invisible-unicorn.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/62/291562/1 diff --git a/modules/dynamicproxy/files/invisible-unicorn.py b/modules/dynamicproxy/files/invisible-unicorn.py index d28ab76..c580c0b 100644 --- a/modules/dynamicproxy/files/invisible-unicorn.py +++ b/modules/dynamicproxy/files/invisible-unicorn.py @@ -92,7 +92,7 @@ def refresh_route(self, route): key = 'frontend:' + route.domain if not (self.redis.exists(key)): -print "Adding new key: %s " % key +print("Adding new key: %s " % key) self.update_route(route) def update_route(self, route, old_domain=None): @@ -248,7 +248,7 @@ for project in projects: for route in project.routes: -print "Refreshing route: %s " % route +print("Refreshing route: %s " % route) redis_store.refresh_route(route) update_redis_from_db() -- To view, visit https://gerrit.wikimedia.org/r/291562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f7af745d0749237882e08b65d086cadb3fac18c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki/core)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/291561 Change subject: Update mediawiki/mediawiki-codesniffer to 0.7.2 .. Update mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I9371faef4b8a0b9c80ec41d8ba08f4ff4936791e (cherry picked from commit d9210c5cd485025581b0467864bf406effbb71f1) --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/291561/1 diff --git a/composer.json b/composer.json index 7252f4c..7b132ee 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "justinrainbow/json-schema": "~1.3", - "mediawiki/mediawiki-codesniffer": "0.7.1", + "mediawiki/mediawiki-codesniffer": "0.7.2", "monolog/monolog": "~1.18.2", "nikic/php-parser": "1.4.1", "nmred/kafka-php": "0.1.5", -- To view, visit https://gerrit.wikimedia.org/r/291561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9371faef4b8a0b9c80ec41d8ba08f4ff4936791e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: Hashar Gerrit-Reviewer: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c2c26e4..5f81599 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: c2c26e4..5f81599 .. Syncronize VisualEditor: c2c26e4..5f81599 Change-Id: I58d4a4921a31ec80f021493a75dc71cc597c2c21 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index c2c26e4..5f81599 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c2c26e4afa16769ea6478d0871336943fa264995 +Subproject commit 5f815996fcb1c8d46e90b9aeda3f640508e747ad -- To view, visit https://gerrit.wikimedia.org/r/291560 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58d4a4921a31ec80f021493a75dc71cc597c2c21 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c2c26e4..5f81599 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/291560 Change subject: Syncronize VisualEditor: c2c26e4..5f81599 .. Syncronize VisualEditor: c2c26e4..5f81599 Change-Id: I58d4a4921a31ec80f021493a75dc71cc597c2c21 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/60/291560/1 diff --git a/VisualEditor b/VisualEditor index c2c26e4..5f81599 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c2c26e4afa16769ea6478d0871336943fa264995 +Subproject commit 5f815996fcb1c8d46e90b9aeda3f640508e747ad -- To view, visit https://gerrit.wikimedia.org/r/291560 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58d4a4921a31ec80f021493a75dc71cc597c2c21 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RollbackAction: Don't return true, causes '1' to be output - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: RollbackAction: Don't return true, causes '1' to be output .. RollbackAction: Don't return true, causes '1' to be output Bug: T136375 Change-Id: Id994b7ee7044ce18cf245a219ba290970511ea0f --- M includes/actions/RollbackAction.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: TheDJ: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index 65159f2..3e760fd 100644 --- a/includes/actions/RollbackAction.php +++ b/includes/actions/RollbackAction.php @@ -97,7 +97,7 @@ } } - return true; + return; } # NOTE: Permission errors already handled by Action::checkExecute. @@ -142,7 +142,7 @@ ); $de->showDiff( '', '' ); } - return true; + return; } protected function getDescription() { -- To view, visit https://gerrit.wikimedia.org/r/291376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id994b7ee7044ce18cf245a219ba290970511ea0f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Krinkle Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LoginSignupSpecialPage: Load return and returnto params as e... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: LoginSignupSpecialPage: Load return and returnto params as early as possible .. LoginSignupSpecialPage: Load return and returnto params as early as possible They're are needed for a redirect to the target page after a successful login, which is made before the SpecialPage::execute() function is called. Loading basic request varaibles in the execute() function is therefore too late to take effect for the redirect after a successul authentication with a primary provider, which needs to redirect the user to another site. Bug: T135924 Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 --- M includes/specialpage/LoginSignupSpecialPage.php 1 file changed, 34 insertions(+), 10 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index 0e4252c..a7de0c5 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -47,6 +47,7 @@ protected $mEntryErrorType = 'error'; protected $mLoaded = false; + protected $mLoadedRequest = false; protected $mSecureLoginUrl; /** @var string */ @@ -89,19 +90,20 @@ $wgUseMediaWikiUIEverywhere = true; } - /** -* Load data from request. -* @private -* @param string $subPage Subpage of Special:Userlogin -*/ - protected function load( $subPage ) { - global $wgSecureLogin; + protected function setRequest( array $data, $wasPosted = null ) { + parent::setRequest( $data, $wasPosted ); + $this->mLoadedRequest = false; + } - if ( $this->mLoaded ) { + /** +* Load basic request parameters for this Special page. +* @param $subPage +*/ + private function loadRequestParameters( $subPage ) { + if ( $this->mLoadedRequest ) { return; } - $this->mLoaded = true; - + $this->mLoadedRequest = true; $request = $this->getRequest(); $this->mPosted = $request->wasPosted(); @@ -114,6 +116,22 @@ $this->mLanguage = $request->getText( 'uselang' ); $this->mReturnTo = $request->getVal( 'returnto', '' ); $this->mReturnToQuery = $request->getVal( 'returntoquery', '' ); + } + + /** +* Load data from request. +* @private +* @param string $subPage Subpage of Special:Userlogin +*/ + protected function load( $subPage ) { + global $wgSecureLogin; + + $this->loadRequestParameters( $subPage ); + if ( $this->mLoaded ) { + return; + } + $this->mLoaded = true; + $request = $this->getRequest(); $securityLevel = $this->getRequest()->getText( 'force' ); if ( @@ -185,6 +203,12 @@ return $params; } + protected function beforeExecute( $subPage ) { + // finish initializing the class before processing the request - T135924 + $this->loadRequestParameters( $subPage ); + return parent::beforeExecute( $subPage ); + } + /** * @param string|null $subPage */ -- To view, visit https://gerrit.wikimedia.org/r/290048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Anomie Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Gergő Tisza 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 updatedmarker styling override - change (mediawiki...Modern)
jenkins-bot has submitted this change and it was merged. Change subject: Remove updatedmarker styling override .. Remove updatedmarker styling override After I074688562e4da8c7c32d9f2bae67cd601e9b5f65 in core we no longer need a custom style here. Bug: T134515 Change-Id: I9e13fcc2cb05847c156536e329068bcb80447fa8 --- M resources/main.css 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: TheDJ: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/main.css b/resources/main.css index 8c8ce3c..5f61c0e 100644 --- a/resources/main.css +++ b/resources/main.css @@ -686,11 +686,6 @@ font-style: italic; } -span.updatedmarker { - color: black; - background-color: #0f0; -} - .previewnote { text-indent: 3em; color: #c00; -- To view, visit https://gerrit.wikimedia.org/r/291516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e13fcc2cb05847c156536e329068bcb80447fa8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Modern Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused namespace class - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/291533 Change subject: Remove unused namespace class .. Remove unused namespace class Introduced recently but then abandoned. Change-Id: Ifa999f0e60fe1b6d68c63813025c9fd48b79ad5f --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/33/291533/1 diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index 18e06f4..e328f98 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -98,8 +98,6 @@ // Initialization this.$element .addClass( 've-init-mw-desktopArticleTarget' ) - // The following classes can be used here: - .addClass( 've-init-mw-desktopArticleTarget-ns-' + ( mw.config.get( 'wgCanonicalNamespace' ).toLowerCase() || 'main' ) ) .append( this.$originalContent ); if ( history.replaceState ) { -- To view, visit https://gerrit.wikimedia.org/r/291533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa999f0e60fe1b6d68c63813025c9fd48b79ad5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix z-index of surface for debug bar - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/291531 Change subject: Fix z-index of surface for debug bar .. Fix z-index of surface for debug bar Change-Id: I938f2d959cd7cb72c43c2efd666838a9cd9d3e39 --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/31/291531/1 diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css index 31f3960..c44e97a 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css @@ -38,3 +38,10 @@ .ve-init-mw-desktopArticleTarget .redirectMsg a:hover { text-decoration: none; } + +/*! + * Increase z-index of surface container so it appears above the debug bar + */ +.ve-init-mw-desktopArticleTarget #bodyContent { /* stylelint-disable-line selector-no-id */ + z-index: 1; +} -- To view, visit https://gerrit.wikimedia.org/r/291531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I938f2d959cd7cb72c43c2efd666838a9cd9d3e39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T134139: Serialize content in HTML tables using HTML tags - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/291530 Change subject: T134139: Serialize content in HTML tables using HTML tags .. T134139: Serialize content in HTML tables using HTML tags * Mixing HTML and wikitext tags will just result in a mess. * Added new parser tests that pass with this patch and fail without this patch. * TODO: Generalize this strategy to handle lists. Change-Id: I2b760a06d1c68cc10e07a9c75ff190aec0077676 --- M lib/html2wt/WikitextSerializer.js M lib/utils/DOMUtils.js M tests/parserTests.txt 3 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/30/291530/1 diff --git a/lib/html2wt/WikitextSerializer.js b/lib/html2wt/WikitextSerializer.js index a63de6a..176c086 100644 --- a/lib/html2wt/WikitextSerializer.js +++ b/lib/html2wt/WikitextSerializer.js @@ -710,6 +710,12 @@ // for html-stx tags. But, tags should never serialize as HTML. if (!handler && dp.stx === 'html' && nodeName !== 'a') { return htmlElementHandler; + } else if (DU.isTableTag(node) && DU.inHTMLTableTag(node)) { + // FIXME: This strategy is probably applicable more broadly + // (ex: list items in lists, etc.) + // If in a HTML table tag, serialize table tags in the table + // using HTML tags, instead of native wikitext tags + return htmlElementHandler; } // If parent node is a list or table tag in html-syntax, then serialize diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js index 346c0be..c1fe881 100644 --- a/lib/utils/DOMUtils.js +++ b/lib/utils/DOMUtils.js @@ -2195,6 +2195,21 @@ return text.replace(/<(\/?nowiki\s*\/?\s*)>/gi, '<$1>'); }, + isTableTag: function(node) { + return Consts.HTML.TableTags.has(node.nodeName); + }, + + inHTMLTableTag: function(node) { + var p = node.parentNode; + while (this.isTableTag(p)) { + if (this.isLiteralHTMLNode(p)) { + return true; + } + p = p.parentNode; + } + + return false; + }, }; /** diff --git a/tests/parserTests.txt b/tests/parserTests.txt index b6a857a..615f1c9 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -7182,6 +7182,36 @@ |} !! end +!! test +Serialize new table rows in a HTML table using HTML tags +!! options +parsoid={ + "modes": ["wt2wt", "selser"], + "changes": [ +[ "tr", "before", "X" ] + ] +} +!! wikitext +a +!! wikitext/edited +Xa +!! end + +!! test +Serialize new table cells in a HTML row using HTML tags +!! options +parsoid={ + "modes": ["wt2wt", "selser"], + "changes": [ +[ "td", "before", "X" ] + ] +} +!! wikitext +a +!! wikitext/edited +Xa +!! end + ### ### Internal links ### -- To view, visit https://gerrit.wikimedia.org/r/291530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b760a06d1c68cc10e07a9c75ff190aec0077676 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] kafkatee: submodule bump for pep8 fix - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: kafkatee: submodule bump for pep8 fix .. kafkatee: submodule bump for pep8 fix Change-Id: I36d32c858c704c6b75518ae7a702a5f2b35be77d --- M modules/kafkatee 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/kafkatee b/modules/kafkatee index 04fbf11..4990651 16 --- a/modules/kafkatee +++ b/modules/kafkatee -Subproject commit 04fbf11b5da990b86cb260dd3efd87eba1cc91f7 +Subproject commit 49906516ecbf16740172a72d01ea43efd5b570d7 -- To view, visit https://gerrit.wikimedia.org/r/291366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36d32c858c704c6b75518ae7a702a5f2b35be77d Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnishkafka: submodule bump for pep8 fix - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: varnishkafka: submodule bump for pep8 fix .. varnishkafka: submodule bump for pep8 fix Change-Id: Ie80499d9903256a77ef013a9eed538d278875c3a --- M modules/varnishkafka 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/varnishkafka b/modules/varnishkafka index f47b990..cab006d 16 --- a/modules/varnishkafka +++ b/modules/varnishkafka -Subproject commit f47b99098f0ff03462a564ac289ad87b8b48a063 +Subproject commit cab006decefd772bbf169c10515a2f2566ec5c85 -- To view, visit https://gerrit.wikimedia.org/r/291365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie80499d9903256a77ef013a9eed538d278875c3a Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] salt: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: salt: Fix PEP8 violations .. salt: Fix PEP8 violations * F821 undefined name '__opts__' Change-Id: I2f8922f3eb083071f4a3ec89616ab974947cd736 --- M modules/salt/files/keys.py 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/salt/files/keys.py b/modules/salt/files/keys.py index 8facff9..c1d969a 100755 --- a/modules/salt/files/keys.py +++ b/modules/salt/files/keys.py @@ -72,3 +72,8 @@ ret['status'] = 'done' print ret return ret + + +if __name__ == '__main__': +# Make flake8 happy by defining globals +__opts__ = dict() -- To view, visit https://gerrit.wikimedia.org/r/291184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f8922f3eb083071f4a3ec89616ab974947cd736 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ircd_stats.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: ircd_stats.py: Fix PEP8 violations .. ircd_stats.py: Fix PEP8 violations * F401 'sys' imported but unused Change-Id: I72e88c7b4e1b72eaabf47bfba00c7e697766 --- M modules/mw_rc_irc/files/monitor/ircd_stats.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/mw_rc_irc/files/monitor/ircd_stats.py b/modules/mw_rc_irc/files/monitor/ircd_stats.py index 8d14716..9664ae4 100644 --- a/modules/mw_rc_irc/files/monitor/ircd_stats.py +++ b/modules/mw_rc_irc/files/monitor/ircd_stats.py @@ -1,6 +1,5 @@ import diamond.collector import socket -import sys import re -- To view, visit https://gerrit.wikimedia.org/r/291181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72e88c7b4e1b72eaabf47bfba00c7e697766 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] servermon: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: servermon: Fix PEP8 violations .. servermon: Fix PEP8 violations * F403 'from django.conf.urls.defaults import *' used; unable to detect undefined names Change-Id: I2695df1d5667dee3924ee434361513749dfbf218 --- M modules/servermon/files/urls.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/servermon/files/urls.py b/modules/servermon/files/urls.py index b92c3f9..1cfee88 100644 --- a/modules/servermon/files/urls.py +++ b/modules/servermon/files/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls.defaults import * # noqa from django.conf import settings # Uncomment the next two lines to enable the admin & hwdoc: -- To view, visit https://gerrit.wikimedia.org/r/291185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2695df1d5667dee3924ee434361513749dfbf218 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] letsencrypt: Fix flake8 exclusion - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: letsencrypt: Fix flake8 exclusion .. letsencrypt: Fix flake8 exclusion Tox doesn't seem to like the '*/modules/letsencrypt/files/acme_tiny.py' but 'modules/letsencrypt/files/acme_tiny.py' works. Change-Id: Ib97a16b56e4975b681b167a75558286d6423c741 --- M tox.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/tox.ini b/tox.ini index 2a02484..f887c65 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ # E123/E133, E226 and E241/E242 are default ignores # E402: module level import not at top of file ignore = E123,E133,E226,E241,E242,E402 -exclude = */modules/letsencrypt/files/acme_tiny.py +exclude = modules/letsencrypt/files/acme_tiny.py [testenv] deps = -- To view, visit https://gerrit.wikimedia.org/r/291487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib97a16b56e4975b681b167a75558286d6423c741 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/291529 Change subject: Test .. Test Change-Id: Ic90c036539b106a68f57c64d5e8d5a95d3fc4e18 --- M includes/db/DatabaseMysqlBase.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/29/291529/1 diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php index 3ebc3ec..5cdff7d 100644 --- a/includes/db/DatabaseMysqlBase.php +++ b/includes/db/DatabaseMysqlBase.php @@ -1262,6 +1262,8 @@ $vars['wgDBTableOptions'] ); + $vars['wgDBTableOptionsSearch'] = "ENGINE=MyISAM DEFAULT CHARSET=utf8"; + return $vars; } -- To view, visit https://gerrit.wikimedia.org/r/291529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic90c036539b106a68f57c64d5e8d5a95d3fc4e18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wmfelastic.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: wmfelastic.py: Fix PEP8 violations .. wmfelastic.py: Fix PEP8 violations * F841 local variable 'e' is assigned to but never used Change-Id: Ic6b77bd26d7fc63db159c6cfe710ae8d89d7fec7 --- M modules/elasticsearch/files/monitor/wmfelastic.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Gehel: Looks good to me, but someone else must approve Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/elasticsearch/files/monitor/wmfelastic.py b/modules/elasticsearch/files/monitor/wmfelastic.py index 25ccef2..0cdf4c9 100644 --- a/modules/elasticsearch/files/monitor/wmfelastic.py +++ b/modules/elasticsearch/files/monitor/wmfelastic.py @@ -230,7 +230,7 @@ for metric in self.health_metrics: try: gmetrics[metric] = chealth[metric] -except KeyError, e: +except KeyError: self.errors += 1 pass return gmetrics @@ -243,7 +243,7 @@ try: value = self.dict_digger(depth, cstats) gmetrics[m] = value -except KeyError, e: +except KeyError: self.errors += 1 pass return gmetrics @@ -258,7 +258,7 @@ try: value = self.dict_digger(depth, nodestats) gmetrics[m] = value -except KeyError, e: +except KeyError: self.errors += 1 pass return gmetrics -- To view, visit https://gerrit.wikimedia.org/r/291178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6b77bd26d7fc63db159c6cfe710ae8d89d7fec7 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Gehel Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bugfix] Fix test_translateMagicWords test - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] Fix test_translateMagicWords test .. [bugfix] Fix test_translateMagicWords test Bug: T132557 Change-Id: Ia845114619a40e639abdc415e37b793a1024f508 (cherry picked from commit 585a0d6d884cd5ec76f1969d2e6e40755c17b757) --- M tests/cosmetic_changes_tests.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index f864c76..8d28a3c 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test cosmetic_changes module.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -45,11 +45,11 @@ def test_translateMagicWords(self): """Test translateMagicWords method.""" self.assertEqual( -'[[File:Foo.bar|mini]]', +'[[File:Foo.bar|miniatur]]', self.cct.translateMagicWords('[[File:Foo.bar|thumb]]')) self.assertEqual( -'[[File:Foo.bar|mini]]', -self.cct.translateMagicWords('[[File:Foo.bar|miniatur]]')) +'[[File:Foo.bar|miniatur]]', +self.cct.translateMagicWords('[[File:Foo.bar|mini]]')) def test_cleanUpLinks_pipes(self): """Test cleanUpLinks method.""" -- To view, visit https://gerrit.wikimedia.org/r/290927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia845114619a40e639abdc415e37b793a1024f508 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rolematcher.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: rolematcher.py: Fix PEP8 violations .. rolematcher.py: Fix PEP8 violations * E265 block comment should start with '# ' * E501 line too long (n > 100 characters) * F821 undefined name 'httplib' * F841 local variable 'elements' is assigned to but never used Change-Id: I1179884cbfa525d26599383243c6262b7d6d97af --- M modules/udp2log/files/rolematcher.py 1 file changed, 14 insertions(+), 8 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/udp2log/files/rolematcher.py b/modules/udp2log/files/rolematcher.py index f77bd7d..ac02b86 100644 --- a/modules/udp2log/files/rolematcher.py +++ b/modules/udp2log/files/rolematcher.py @@ -1,5 +1,5 @@ -# -*- coding: utf-8 -*- #!/usr/bin/env python +# -*- coding: utf-8 -*- ''' This script parses the packet-loss.log file and for each server entry @@ -15,10 +15,11 @@ PacketLossLogTailer.py is the regular point of entry. ''' -import re -import urllib2 +import httplib import json +import re import sys +import urllib2 numbers = re.compile('([0-9]+)') @@ -90,7 +91,8 @@ for row in data: # pybal outputs python dictionaries but we are not going to use eval(), # hence make the dictionary JSON compatible. -row = row.strip().replace('"', '').replace("'", '"').replace('True', 'true').replace('False', 'false') +row = row.strip().replace('"', '').replace("'", '"') +row = row.replace('True', 'true').replace('False', 'false') if row == '': sections.append(section) section = [] @@ -160,7 +162,6 @@ def init(): matchers = [] -elements = {} for dc, roles in dcs.iteritems(): for role in roles: url = '/'.join([base_url, dc, role]) @@ -172,20 +173,25 @@ start, end = determine_start_end_range(section, hostname) prefix = determine_hostname_prefix(hostname) suffix = determine_hostname_suffix(hostname) -matcher = RoleMatcher('%s_%s_%s' % (dc, role, prefix), '%s([0-9]+)\.%s' % (prefix, suffix), start, end) +matcher = RoleMatcher( +'%s_%s_%s' % (dc, role, prefix), +'%s([0-9]+)\.%s' % (prefix, suffix), start, end) matchers.append(matcher) return matchers if __name__ == '__main__': if len(sys.argv) != 2: -print 'Please specify path to packetloss log file, call this file only for testing purposes.' +print ('Please specify path to packetloss log file, ' + 'call this file only for testing purposes.') sys.exit(-1) else: path = sys.argv[1] matchers = init() -line_matcher = re.compile('^\[(?P[^]]+)\] (?P[^ ]+) lost: \((?P[^ ]+) \+\/- (?P[^)]+)\)%') +line_matcher = re.compile( +r'^\[(?P[^]]+)\] (?P[^ ]+) ' +r'lost: \((?P[^ ]+) \+\/- (?P[^)]+)\)%') fh = open(path, 'r') for line in fh: regMatch = line_matcher.match(line) -- To view, visit https://gerrit.wikimedia.org/r/291177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1179884cbfa525d26599383243c6262b7d6d97af Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: ganglia: Fix PEP8 violations .. ganglia: Fix PEP8 violations * F401 'stat' imported but unused * F401 'traceback' imported but unused * F811 redefinition of unused 'os' from line 50 * F841 local variable 'e' is assigned to but never used Change-Id: I5e7f01eb6061ec5446deba77abfab54f0ca54c42 --- M modules/ganglia/files/plugins/diskstat.py M modules/ganglia/files/plugins/udp2log_socket.py 2 files changed, 1 insertion(+), 4 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/ganglia/files/plugins/diskstat.py b/modules/ganglia/files/plugins/diskstat.py index 12af913..d4a5efb 100644 --- a/modules/ganglia/files/plugins/diskstat.py +++ b/modules/ganglia/files/plugins/diskstat.py @@ -45,7 +45,6 @@ import time import subprocess -import traceback import logging import os import stat @@ -529,7 +528,6 @@ if __name__ == '__main__': from optparse import OptionParser -import os logging.debug('running from cmd line') parser = OptionParser() diff --git a/modules/ganglia/files/plugins/udp2log_socket.py b/modules/ganglia/files/plugins/udp2log_socket.py index 2721464..7da7011 100644 --- a/modules/ganglia/files/plugins/udp2log_socket.py +++ b/modules/ganglia/files/plugins/udp2log_socket.py @@ -25,7 +25,6 @@ from threading import Timer import logging import os -import stat UPDATE_INTERVAL = 5 # seconds @@ -57,7 +56,7 @@ p_index = False try: p_index = cmd.index('-p') -except ValueError, e: +except ValueError: continue ports.append(int(cmd[p_index + 1])) return ports -- To view, visit https://gerrit.wikimedia.org/r/291179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e7f01eb6061ec5446deba77abfab54f0ca54c42 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh 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 asteroids that are being used as locations - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add asteroids that are being used as locations .. Add asteroids that are being used as locations Used as globes for other items on Wikidata. Source: SELECT (count(?item) as ?c) ?globe ?globeLabel WHERE { ?item wdt:P376 ?globe . ?item wdt:P625 ?location . SERVICE wikibase:label { bd:serviceParam wikibase:language "en" . } } GROUP BY ?globe ?globeLabel ORDER BY DESC(?c) Change-Id: I049866d40d8ad4903f2445b6bf1fdf8a164202a3 (cherry picked from commit 9192099fb51570251e440e0be39959b0c8c7c465) --- M pywikibot/families/wikidata_family.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikidata_family.py b/pywikibot/families/wikidata_family.py index 4340f3a..13f5546 100644 --- a/pywikibot/families/wikidata_family.py +++ b/pywikibot/families/wikidata_family.py @@ -56,12 +56,15 @@ 'dione': 'http://www.wikidata.org/entity/Q15040', 'earth': 'http://www.wikidata.org/entity/Q2', 'enceladus': 'http://www.wikidata.org/entity/Q3303', +'eros': 'http://www.wikidata.org/entity/Q16711', 'europa': 'http://www.wikidata.org/entity/Q3143', 'ganymede': 'http://www.wikidata.org/entity/Q3169', +'gaspra': 'http://www.wikidata.org/entity/Q158244', 'hyperion': 'http://www.wikidata.org/entity/Q15037', 'iapetus': 'http://www.wikidata.org/entity/Q17958', 'io': 'http://www.wikidata.org/entity/Q3123', 'jupiter': 'http://www.wikidata.org/entity/Q319', +'lutetia': 'http://www.wikidata.org/entity/Q107556', 'mars': 'http://www.wikidata.org/entity/Q111', 'mercury': 'http://www.wikidata.org/entity/Q308', 'mimas': 'http://www.wikidata.org/entity/Q15034', -- To view, visit https://gerrit.wikimedia.org/r/291199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I049866d40d8ad4903f2445b6bf1fdf8a164202a3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] postgresql.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: postgresql.py: Fix PEP8 violations .. postgresql.py: Fix PEP8 violations * F401 'sys' imported but unused Change-Id: I3b6d49dfb686cd6626c9144f956558577798b1d9 --- M modules/postgresql/files/ganglia/postgresql.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/postgresql/files/ganglia/postgresql.py b/modules/postgresql/files/ganglia/postgresql.py index 8519028..0e948d4 100644 --- a/modules/postgresql/files/ganglia/postgresql.py +++ b/modules/postgresql/files/ganglia/postgresql.py @@ -1,6 +1,5 @@ #!/bin/env python -import sys import os import threading import time -- To view, visit https://gerrit.wikimedia.org/r/291182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b6d49dfb686cd6626c9144f956558577798b1d9 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] udp2log: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: udp2log: Fix PEP8 violations .. udp2log: Fix PEP8 violations * F841 local variable 'check_time' is assigned to but never used Change-Id: I8acf3ffe9878b1d73b0046175cac8ff3c146bba8 --- M modules/udp2log/files/PacketLossLogtailer.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/udp2log/files/PacketLossLogtailer.py b/modules/udp2log/files/PacketLossLogtailer.py index 94089b8..f843902 100644 --- a/modules/udp2log/files/PacketLossLogtailer.py +++ b/modules/udp2log/files/PacketLossLogtailer.py @@ -180,7 +180,7 @@ self.lock.acquire() try: mydata = self.deep_copy() -check_time = self.get_check_duration() +self.get_check_duration() self.reset_state() self.lock.release() except LogtailerStateException, e: -- To view, visit https://gerrit.wikimedia.org/r/291186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8acf3ffe9878b1d73b0046175cac8ff3c146bba8 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wdqs_updater.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: wdqs_updater.py: Fix PEP8 violations .. wdqs_updater.py: Fix PEP8 violations * F401 'subprocess' imported but unused Change-Id: I48302299b66caca165fcffe99147dee6d9dcbd53 --- M modules/wdqs/files/monitor/wdqs_updater.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/wdqs/files/monitor/wdqs_updater.py b/modules/wdqs/files/monitor/wdqs_updater.py index 5fdbd19..85cbe91 100644 --- a/modules/wdqs/files/monitor/wdqs_updater.py +++ b/modules/wdqs/files/monitor/wdqs_updater.py @@ -8,7 +8,6 @@ import diamond.collector import urllib2 import json -import subprocess class WDQSUpdaterCollector(diamond.collector.Collector): -- To view, visit https://gerrit.wikimedia.org/r/291188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48302299b66caca165fcffe99147dee6d9dcbd53 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DBUtil.py: Fix PEP8 violations - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: DBUtil.py: Fix PEP8 violations .. DBUtil.py: Fix PEP8 violations * E129 visually indented line with same indent as next logical line * E231 missing whitespace after ',' * E265 block comment should start with '# ' * E301 expected 1 blank line, found 0 * E302 expected 2 blank lines, found 1 * E501 line too long (n > 100 characters) * F841 local variable 'in_merged' is assigned to but never used Additional changes: * defaultdict polyfill removed (Python >=2.5) * optparse replaced with argparse (Python >= 2.7) * no-op try-catch removed Thanks to Ori Livneh for prodding to clean up problems rather than just hiding them with flake8 control comments. Change-Id: Icc78d23b16d3177c6631c43324bceddf8f02f74c --- M modules/mysql_wmf/files/ganglia/plugins/DBUtil.py 1 file changed, 32 insertions(+), 65 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/mysql_wmf/files/ganglia/plugins/DBUtil.py b/modules/mysql_wmf/files/ganglia/plugins/DBUtil.py index 0e2592f..3a9ed57 100644 --- a/modules/mysql_wmf/files/ganglia/plugins/DBUtil.py +++ b/modules/mysql_wmf/files/ganglia/plugins/DBUtil.py @@ -3,6 +3,7 @@ Copyright (c) 2008 Gilad Raphaelli Adapted for 5.1+ InnoDB status 2012 Asher Feldman +Modified for Python >=2.7 by Bryan Davis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -26,46 +27,10 @@ pure python collections.defaultdict substitute """ -#from collections import defaultdict -try: -from collections import defaultdict -except: -class defaultdict(dict): -def __init__(self, default_factory=None, *a, **kw): -if (default_factory is not None and -not hasattr(default_factory, '__call__')): -raise TypeError('first argument must be callable') -dict.__init__(self, *a, **kw) -self.default_factory = default_factory -def __getitem__(self, key): -try: -return dict.__getitem__(self, key) -except KeyError: -return self.__missing__(key) -def __missing__(self, key): -if self.default_factory is None: -raise KeyError(key) -self[key] = value = self.default_factory() -return value -def __reduce__(self): -if self.default_factory is None: -args = tuple() -else: -args = self.default_factory, -return type(self), args, None, None, self.items() -def copy(self): -return self.__copy__() -def __copy__(self): -return type(self)(self.default_factory, self) -def __deepcopy__(self, memo): -import copy -return type(self)(self.default_factory, - copy.deepcopy(self.items())) -def __repr__(self): -return 'defaultdict(%s, %s)' % (self.default_factory, -dict.__repr__(self)) - +from collections import defaultdict +import argparse import MySQLdb + def longish(x): if len(x): @@ -76,6 +41,7 @@ else: raise ValueError + def hexlongish(x): if len(x): try: @@ -85,16 +51,17 @@ else: raise ValueError + def parse_innodb_status(innodb_status_raw, innodb_version="51fb"): def sumof(status): def new(*idxs): return sum(map(lambda x: longish(status[x]), idxs)) -#new.func_name = 'sumof' #not ok in py2.3 return new innodb_status = defaultdict(int) innodb_status['active_transactions'] +in_merged = False for line in innodb_status_raw: istatus = line.split() @@ -108,8 +75,8 @@ elif "RW-shared spins" in line: if innodb_version == "51fb": -innodb_status['spin_waits'] += isum(2,8) -innodb_status['os_waits'] += isum(5,11) +innodb_status['spin_waits'] += isum(2, 8) +innodb_status['os_waits'] += isum(5, 11) elif innodb_version == "55xdb": innodb_status['spin_waits'] += longish(istatus[2]) innodb_status['os_waits'] += longish(istatus[7]) @@ -168,11 +135,11 @@ innodb_status['ibuf_merges'] = longish(istatus[10]) elif 'merged operations' in line and innodb_version == "55xdb": -in_merged = 1 +in_merged = True -elif 'delete mark' in line and 'in_merged' in vars() and innodb_version == "55xdb": +elif 'delete mark' in line and in_merged and innodb_version == "55xdb": innodb_status['ibuf_inserts'] = longish(istatus[1]) -del in_merged +in_merged = False # LOG
[MediaWiki-commits] [Gerrit] [impr] path support for tests - change (pywikibot...xqbot)
jenkins-bot has submitted this change and it was merged. Change subject: [impr] path support for tests .. [impr] path support for tests Change-Id: I4d8c51ba540134193456af22fd8e58c4d93637a4 --- M tests/afd_notice_tests.py M tests/checkvotes_tests.py M tests/imagereview_tests.py A tests/utils.py M tests/vandalism_tests.py 5 files changed, 24 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/afd_notice_tests.py b/tests/afd_notice_tests.py index 1fe53eb..d3cbea5 100644 --- a/tests/afd_notice_tests.py +++ b/tests/afd_notice_tests.py @@ -9,16 +9,9 @@ __version__ = '$Id $' -import inspect -import os -import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +from tests import utils # noqa import afd_notice import pywikibot diff --git a/tests/checkvotes_tests.py b/tests/checkvotes_tests.py index 17593de..2ae9adc 100644 --- a/tests/checkvotes_tests.py +++ b/tests/checkvotes_tests.py @@ -9,16 +9,9 @@ __version__ = '$Id$' -import inspect -import os -import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +from tests import utils # noqa from pywikibot.comms.http import fetch from checkvotes import SB_TOOL, SB_TOOL2, SB_TOOL3, SB_TOOL_NEW diff --git a/tests/imagereview_tests.py b/tests/imagereview_tests.py index baa9de8..dcf4a27 100644 --- a/tests/imagereview_tests.py +++ b/tests/imagereview_tests.py @@ -9,17 +9,11 @@ __version__ = '$Id $' -import inspect -import os -import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) +from tests import utils # noqa +import imagereview -import imagereview # noqa import pywikibot from pywikibot import Timestamp, config diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 000..568a040 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +"""Support module for test suite.""" +# +# (C) xqt, 2016 +# +# Distributed under the terms of the MIT license. +# +from __future__ import absolute_import, print_function, unicode_literals + +__version__ = '$Id: $' + +import sys + +# Add current directory and parent directory to module search path. +sys.path.insert(0, '..') +sys.path.insert(0, '.') + +del sys diff --git a/tests/vandalism_tests.py b/tests/vandalism_tests.py index fc49eeb..0b9d1ef 100644 --- a/tests/vandalism_tests.py +++ b/tests/vandalism_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test vandalism modules.""" # -# (C) xqt, 2015 +# (C) xqt, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -9,16 +9,9 @@ __version__ = '$Id$' -import inspect -import os -import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +from tests import utils # noqa from vandalism import getAccuser -- To view, visit https://gerrit.wikimedia.org/r/291524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d8c51ba540134193456af22fd8e58c4d93637a4 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clear exceptions in BaseBot.run before processing - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Clear exceptions in BaseBot.run before processing .. Clear exceptions in BaseBot.run before processing Bot classes use sys.exc_info, which can be a stale exception under Python 2. Bug: T136487 Change-Id: I01311cf9071ab45cb38bc5463153e887a76c5138 --- M pywikibot/bot.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7dbb8ef..378f2b2 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1414,6 +1414,10 @@ if PY2: maxint = sys.maxint +# Python 2 does not clear previous exceptions and method `exit` +# relies on sys.exc_info returning exceptions occurring in `run`. +sys.exc_clear() + try: for page in self.generator: try: -- To view, visit https://gerrit.wikimedia.org/r/291523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01311cf9071ab45cb38bc5463153e887a76c5138 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] EditPage: Do not resolve redirect on cancel button - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review. https://gerrit.wikimedia.org/r/291528 Change subject: EditPage: Do not resolve redirect on cancel button .. EditPage: Do not resolve redirect on cancel button Change-Id: I9343c7e97cee7fa6550b186e6a6ffbf3438060a4 --- M includes/EditPage.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/28/291528/1 diff --git a/includes/EditPage.php b/includes/EditPage.php index 8acd036..78adfd9 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3503,6 +3503,9 @@ $cancelParams['oldid'] = $this->oldid; } $attrs = [ 'id' => 'mw-editform-cancel' ]; + if ( $this->getContextTitle()->isRedirect() ) { + $attrs['redirect'] = 'no'; + } return Linker::linkKnown( $this->getContextTitle(), -- To view, visit https://gerrit.wikimedia.org/r/291528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9343c7e97cee7fa6550b186e6a6ffbf3438060a4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] service: Let other methods of deployment work in uwsgi - change (operations/puppet)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/291527 Change subject: service: Let other methods of deployment work in uwsgi .. service: Let other methods of deployment work in uwsgi Change-Id: I5c94f8852b6e2b62f7d4b5df15e8e26de866a713 --- M modules/service/manifests/uwsgi.pp 1 file changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/291527/1 diff --git a/modules/service/manifests/uwsgi.pp b/modules/service/manifests/uwsgi.pp index 0857f4e..cf196f3 100644 --- a/modules/service/manifests/uwsgi.pp +++ b/modules/service/manifests/uwsgi.pp @@ -37,13 +37,16 @@ # [*local_logging*] # Whether to store log entries on the target node as well. Default: true # +# [*deployment*] +# Method of deployment. Default: 'scap3' +# # [*deployment_user*] # The user that will own the service code. Only applicable when -# $deployment ='scap3'. Default: $title +# $deployment = 'scap3'. Default: 'deploy-service' # # [*deployment_manage_user*] # Boolean. Whether or not scap::target manages user. Only applicable -# when $deployment ='scap3'. Default: false +# when $deployment = 'scap3'. Default: true # # === Examples # @@ -67,14 +70,17 @@ $repo = "${title}/deploy", $firejail = true, $local_logging = true, +$deployment = 'scap3', $deployment_user= 'deploy-service', $deployment_manage_user = true, ) { -scap::target { $repo: -service_name => $title, -deploy_user => $deployment_user, -before => Uwsgi::App[$title], -manage_user => $deployment_manage_user, +if $deployment == 'scap3' { +scap::target { $repo: +service_name => $title, +deploy_user => $deployment_user, +before => Uwsgi::App[$title], +manage_user => $deployment_manage_user, +} } # Import all common configuration -- To view, visit https://gerrit.wikimedia.org/r/291527 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c94f8852b6e2b62f7d4b5df15e8e26de866a713 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] parserTests.js: Fix manual changes support for before/after ... - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/291526 Change subject: parserTests.js: Fix manual changes support for before/after selector .. parserTests.js: Fix manual changes support for before/after selector * Using for table content doesn't work since tags can only be inserted in Change-Id: I78a534787bececb4677b12a5b8fe5b193b42809f --- M bin/parserTests.js 1 file changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/26/291526/1 diff --git a/bin/parserTests.js b/bin/parserTests.js index 8d9c2d3..64a0962 100755 --- a/bin/parserTests.js +++ b/bin/parserTests.js @@ -774,17 +774,29 @@ // a good way to get at the text and comment nodes var jquery = { after: function(html) { - var div = this.ownerDocument.createElement('div'); - div.innerHTML = html; - DU.migrateChildren(div, this.parentNode, this.nextSibling); + if (this.parentNode.nodeName === 'TBODY') { + var tbl = this.ownerDocument.createElement('table'); + tbl.innerHTML = html; + DU.migrateChildren(tbl.firstChild, this.parentNode, this.nextSibling); + } else { + var div = this.ownerDocument.createElement('div'); + div.innerHTML = html; + DU.migrateChildren(div, this.parentNode, this.nextSibling); + } }, attr: function(name, val) { this.setAttribute(name, val); }, before: function(html) { - var div = this.ownerDocument.createElement('div'); - div.innerHTML = html; - DU.migrateChildren(div, this.parentNode, this); + if (this.parentNode.nodeName === 'TBODY') { + var tbl = this.ownerDocument.createElement('table'); + tbl.innerHTML = html; + DU.migrateChildren(tbl.firstChild, this.parentNode, this); + } else { + var div = this.ownerDocument.createElement('div'); + div.innerHTML = html; + DU.migrateChildren(div, this.parentNode, this); + } }, removeAttr: function(name) { this.removeAttribute(name); -- To view, visit https://gerrit.wikimedia.org/r/291526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78a534787bececb4677b12a5b8fe5b193b42809f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the builder script less simple - change (operations...toollabs-images)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/291525 Change subject: Make the builder script less simple .. Make the builder script less simple * Generate Dockerfile from Dockerfile.template * Do not build siblings * Add unit tests and flake8 linting with tox * Allow alternate DOCKER_BINARY via environment variable * Allow python3 from PATH for osx and virtualenv runtimes Change-Id: Ifbf155de741dda25636989269bc66c332bc62f6e --- A .gitignore A README.md A base/.dockerignore R base/Dockerfile.template M build.py A java/base/.dockerignore D java/base/Dockerfile A java/base/Dockerfile.template A java/web/.dockerignore D java/web/Dockerfile A java/web/Dockerfile.template A php/base/.dockerignore R php/base/Dockerfile.template A php/web/.dockerignore R php/web/Dockerfile.template A tests/build_tests.py A tox.ini 17 files changed, 164 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images refs/changes/25/291525/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..76b725c --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.py[cod] +/.tox +__pycache__/ +Dockerfile diff --git a/README.md b/README.md new file mode 100644 index 000..3c776ba --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +Tool Labs Images + + +Docker image configuration and management for Wikimedia Tool Labs + +TODO: describe how this works diff --git a/base/.dockerignore b/base/.dockerignore new file mode 100644 index 000..689cf97 --- /dev/null +++ b/base/.dockerignore @@ -0,0 +1 @@ +Dockerfile.template diff --git a/base/Dockerfile b/base/Dockerfile.template similarity index 91% rename from base/Dockerfile rename to base/Dockerfile.template index e6bcc66..2a1fcb1 100644 --- a/base/Dockerfile +++ b/base/Dockerfile.template @@ -1,5 +1,5 @@ # Base toollabs user image -# Name: docker-registry.tools.wmflabs.org/jessie-toollabs +# Name: docker-registry.tools.wmflabs.org/toollabs-base # Source image: Debian Jessie # Sets up: # Extra Apt repo: Tools repo diff --git a/build.py b/build.py index 62c2f15..eb41b6f 100755 --- a/build.py +++ b/build.py @@ -1,11 +1,14 @@ -#!/usr/bin/python3 -import subprocess -import os +#!/usr/bin/env python3 +""" +Build and publish Docker images. +""" import argparse +import os +import subprocess # The docker binary to use for executing commands -DOCKER_BINARY = '/usr/bin/docker' +DOCKER_BINARY = os.environ.get('DOCKER_BINARY', '/usr/bin/docker') # Base path of where the docker images are organized BASE_PATH = os.path.dirname(os.path.abspath(__file__)) @@ -22,8 +25,8 @@ ], 'java/base': [ 'java/web', -] -} +], +}, } @@ -35,7 +38,19 @@ ) +def make_dockerfile(name, registry, image_prefix): +image_dir = os.path.join(BASE_PATH, name) +template_file = os.path.join(image_dir, 'Dockerfile.template') +out_file = os.path.join(image_dir, 'Dockerfile') +kwargs = {'registry': registry, 'image_prefix': image_prefix} +with open(template_file, 'rt') as f_in: +with open(out_file, 'wt') as f_out: +for line in f_in: +f_out.write(expand_template(line, kwargs)) + + def build_image(name, registry, image_prefix): +make_dockerfile(name, registry, image_prefix) subprocess.check_call([ DOCKER_BINARY, 'build', @@ -54,19 +69,23 @@ def lineage_of(name): -def children_of(val): -if type(val) == dict: -children = list(val.keys()) -for k, v in val.items(): +def children_of(node): +if type(node) == dict: +children = list(node.keys()) +for k, v in node.items(): children += children_of(v) return children -return val +return node -def ancestors_of(val, cur_lineage): -if name in val: -return cur_lineage + children_of(val) -if type(val) == dict: -for k, v in val.items(): +def ancestors_of(node, cur_lineage): +if name in node: +cur_lineage.append(name) +if type(node) == dict: +cur_lineage.extend(children_of(node[name])) +return cur_lineage + +if type(node) == dict: +for k, v in node.items(): ret = ancestors_of(v, cur_lineage + [k]) if ret: return ret @@ -75,6 +94,10 @@ return ancestors_of(IMAGES, []) +def expand_template(template, params): +return template.format(**params) + + def main(): argparser = argparse.ArgumentParser() argparser.add_argument( diff --git a/java/base/.dockerignore b/java/base/.dockerignore new file mode 100644 index 000..689cf97 --- /dev/null +++ b/java/base/.dockerignore @@ -0,0 +1 @@ +Dockerfile.template diff --git a/java/base/Dockerfile
[MediaWiki-commits] [Gerrit] [impr] path support for tests - change (pywikibot...xqbot)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/291524 Change subject: [impr] path support for tests .. [impr] path support for tests Change-Id: I4d8c51ba540134193456af22fd8e58c4d93637a4 --- M tests/afd_notice_tests.py M tests/checkvotes_tests.py M tests/imagereview_tests.py A tests/utils.py M tests/vandalism_tests.py 5 files changed, 23 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot refs/changes/24/291524/1 diff --git a/tests/afd_notice_tests.py b/tests/afd_notice_tests.py index 1fe53eb..a9301a6 100644 --- a/tests/afd_notice_tests.py +++ b/tests/afd_notice_tests.py @@ -14,11 +14,7 @@ import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +import utils import afd_notice import pywikibot diff --git a/tests/checkvotes_tests.py b/tests/checkvotes_tests.py index 17593de..684c677 100644 --- a/tests/checkvotes_tests.py +++ b/tests/checkvotes_tests.py @@ -14,11 +14,7 @@ import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +import utils from pywikibot.comms.http import fetch from checkvotes import SB_TOOL, SB_TOOL2, SB_TOOL3, SB_TOOL_NEW diff --git a/tests/imagereview_tests.py b/tests/imagereview_tests.py index baa9de8..f7405d1 100644 --- a/tests/imagereview_tests.py +++ b/tests/imagereview_tests.py @@ -14,11 +14,7 @@ import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +import utils import imagereview # noqa import pywikibot diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 000..568a040 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +"""Support module for test suite.""" +# +# (C) xqt, 2016 +# +# Distributed under the terms of the MIT license. +# +from __future__ import absolute_import, print_function, unicode_literals + +__version__ = '$Id: $' + +import sys + +# Add current directory and parent directory to module search path. +sys.path.insert(0, '..') +sys.path.insert(0, '.') + +del sys diff --git a/tests/vandalism_tests.py b/tests/vandalism_tests.py index fc49eeb..37a7f56 100644 --- a/tests/vandalism_tests.py +++ b/tests/vandalism_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test vandalism modules.""" # -# (C) xqt, 2015 +# (C) xqt, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -14,11 +14,7 @@ import sys import unittest -currentdir = os.path.dirname( -os.path.abspath(inspect.getfile(inspect.currentframe( -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - +import utils from vandalism import getAccuser -- To view, visit https://gerrit.wikimedia.org/r/291524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d8c51ba540134193456af22fd8e58c4d93637a4 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove updatedmarker styling override - change (mediawiki...MonoBook)
jenkins-bot has submitted this change and it was merged. Change subject: Remove updatedmarker styling override .. Remove updatedmarker styling override After I074688562e4da8c7c32d9f2bae67cd601e9b5f65 in core we no longer need a custom style here. Bug: T134515 Change-Id: I923ca72be187497c254132bb73a35d2548981d9d --- M main.css 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/main.css b/main.css index 2ef37ce..705aa9b 100644 --- a/main.css +++ b/main.css @@ -573,11 +573,6 @@ font-style: italic; } -span.updatedmarker { - color: black; - background-color: #0f0; -} - .editExternally { border: 1px solid gray; background-color: #ff; -- To view, visit https://gerrit.wikimedia.org/r/291515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I923ca72be187497c254132bb73a35d2548981d9d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/MonoBook Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bugfix] check for empty template parameters - change (pywikibot...xqbot)
jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] check for empty template parameters .. [bugfix] check for empty template parameters - current script failes for empty parameters; ignore them - use bot mode for request - remove obsolete -dry option Change-Id: Ie5ae8e0c9ba9120afa40fca50f341b88270ef1c2 --- M checkvotes.py 1 file changed, 31 insertions(+), 32 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/checkvotes.py b/checkvotes.py index 3ab9b7e..0c80aeb 100644 --- a/checkvotes.py +++ b/checkvotes.py @@ -7,15 +7,17 @@ ¶ms; --dry If given, doesn't do any real changes, but only shows - what would have been changed. - -adminCheck admin votings -voting Check community votings -sg Check arbcom election """ +# +# (C) xqt, 2010-2016 +# +# Distributed under the terms of the MIT license. +# from __future__ import absolute_import, print_function, unicode_literals __version__ = '$Id: b7d0f7af1cfce7db63fe73ddf71d24191b41d14a $' @@ -149,6 +151,8 @@ if title == 'Meinungsbild-Box' or title == 'BSV-Box': d = {} for x in tmpl[1]: +if '=' not in x: +continue s = x.split('=') d[s[0]] = s[1].strip() if 'jahr' in d: @@ -194,19 +198,16 @@ ignore_server_errors = True -def __init__(self, generator, template, dry, always, blockinfo, **kwargs): +def __init__(self, generator, template, always, blockinfo, **kwargs): """ Constructor. Parameters: * generator - The page generator that determines on which pages to work on. -* dry - If True, doesn't do any real changes, but only shows - what would have been changed. """ super(CheckBot, self).__init__(always=always, **kwargs) self.generator = generator -self.dry = dry self.always = self.getOption('always') self.blockinfo = blockinfo self.template = template @@ -397,11 +398,11 @@ r'\n#\1', []) comment = ', abgelaufene Stimmen entfernt.' continue # Eintrag kann gelöscht werden -path = 'http://tools.wmflabs.org/%s?user=%s&%s' \ +path = 'http://tools.wmflabs.org/%s?mode=bot&user=%s&%s' \ % (SB_TOOL_NEW, userpage.title(asUrl=True).replace('_', '+'), query) else: -path = 'http://tools.wmflabs.org/%s?user=%s&%s' \ +path = 'http://tools.wmflabs.org/%s?mode=bot&user=%s&%s' \ % (SB_TOOL_NEW, userpage.title(asUrl=True).replace('_', '+'), urlPath[1].replace(u'user=', '')) @@ -414,11 +415,22 @@ pywikibot.output('ERROR retrieving %s' % username) pywikibot.exception() continue -if sg: -R = re.compile(r'>Schiedsgerichtswahl: (.+?)') -else: -R = re.compile(r'>Allgemeine Stimmberechtigung <.+?>\((?:alt|neu)\): (.+?)') -result = R.findall(data.content) +rights = {} +for line in data.content.strip().splitlines(): +key, sep, value = line.partition(': ') +key = key.replace('Stimmberechtigung', '').strip() +key = key.replace('Abstimmung', '').strip() +value = True if value == 'Ja' else False if value == 'Nein' else value +rights[key] = value + +if 'Fehler' in rights: +pywikibot.warning(rights['Fehler']) +print(rights) +raise Exception +result = rights['Schiedsgericht'] if sg else rights['Allgemeine'] +if result is False or config.verbose_output: +pywikibot.output('\nBenutzer:%s ist nicht stimmberechtigt' % username) + if self.blockinfo: # write blocking info try: if user.isBlocked(): @@ -448,18 +460,10 @@ if groups and 'bot' in groups: isBot = True pywikibot.output('\nUser:%s is a Bot' % username) -try: -if 'nicht' in result[0] or config.verbose_output: -pywikibot.output('\nBenutzer:%s ist %s' - % (username, result[0])) -except IndexError: -pywikibot.output('%s not found' % username) -print(result) -raise -# continue + # Ändere Eintrag # gesperrte noch prüfen! -if '
[MediaWiki-commits] [Gerrit] mw.ForeignStructuredUpload.BookletLayout: Make licensing lin... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: mw.ForeignStructuredUpload.BookletLayout: Make licensing links clickable again .. mw.ForeignStructuredUpload.BookletLayout: Make licensing links clickable again Plus some code duplication cleanup. Bug: T136008 Change-Id: Ic3fbb4edd5042b81488cb19b149bec0a94948ce5 --- M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js 1 file changed, 20 insertions(+), 9 deletions(-) Approvals: Prtksxna: Looks good to me, but someone else must approve Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js index 16fec73..0f61d97 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js @@ -83,15 +83,26 @@ // Update license messages return msgPromise.then( function () { - booklet.$ownWorkMessage - .msg( 'upload-form-label-own-work-message-' + msgs ) - .find( 'a' ).attr( 'target', '_blank' ); - booklet.$notOwnWorkMessage - .msg( 'upload-form-label-not-own-work-message-' + msgs ) - .find( 'a' ).attr( 'target', '_blank' ); - booklet.$notOwnWorkLocal - .msg( 'upload-form-label-not-own-work-local-' + msgs ) - .find( 'a' ).attr( 'target', '_blank' ); + var $labels; + booklet.$ownWorkMessage.msg( 'upload-form-label-own-work-message-' + msgs ); + booklet.$notOwnWorkMessage.msg( 'upload-form-label-not-own-work-message-' + msgs ); + booklet.$notOwnWorkLocal.msg( 'upload-form-label-not-own-work-local-' + msgs ); + + $labels = $( [ + booklet.$ownWorkMessage[ 0 ], + booklet.$notOwnWorkMessage[ 0 ], + booklet.$notOwnWorkLocal[ 0 ] + ] ); + + // Improve the behavior of links inside these labels, which may point to important + // things like licensing requirements or terms of use + $labels.find( 'a' ) + .attr( 'target', '_blank' ) + .on( 'click', function ( e ) { + // OO.ui.FieldLayout#onLabelClick is trying to prevent default on all clicks, + // which causes the links to not be openable. Don't let it do that. + e.stopPropagation(); + } ); } ); } ) ); -- To view, visit https://gerrit.wikimedia.org/r/290273 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3fbb4edd5042b81488cb19b149bec0a94948ce5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Edokter Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: MarkTraceur Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix count of total pages to be deleted for translation pages - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Fix count of total pages to be deleted for translation pages .. Fix count of total pages to be deleted for translation pages Bug: T51895 Change-Id: I24d8783f49d8082298cf57b84ac88f0583774a76 --- M tag/SpecialPageTranslationDeletePage.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Nikerabbit: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/tag/SpecialPageTranslationDeletePage.php b/tag/SpecialPageTranslationDeletePage.php index 713393d..edcfcbb 100644 --- a/tag/SpecialPageTranslationDeletePage.php +++ b/tag/SpecialPageTranslationDeletePage.php @@ -235,13 +235,13 @@ */ protected function showConfirmation() { $out = $this->getOutput(); + $count = 0; $out->addWikiMsg( 'pt-deletepage-intro' ); - $count = 1; // Base page - $out->wrapWikiMsg( '== $1 ==', 'pt-deletepage-list-pages' ); if ( !$this->singleLanguage() ) { + $count++; $this->printChangeLine( $this->title ); } -- To view, visit https://gerrit.wikimedia.org/r/291493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24d8783f49d8082298cf57b84ac88f0583774a76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Glaisher Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clear exceptions in BaseBot.run before processing - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/291523 Change subject: Clear exceptions in BaseBot.run before processing .. Clear exceptions in BaseBot.run before processing Bot classes use sys.exc_info, which can be a stale exception under Python 2. Bug: T136487 Change-Id: I01311cf9071ab45cb38bc5463153e887a76c5138 --- M pywikibot/bot.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/23/291523/1 diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7dbb8ef..378f2b2 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1414,6 +1414,10 @@ if PY2: maxint = sys.maxint +# Python 2 does not clear previous exceptions and method `exit` +# relies on sys.exc_info returning exceptions occurring in `run`. +sys.exc_clear() + try: for page in self.generator: try: -- To view, visit https://gerrit.wikimedia.org/r/291523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01311cf9071ab45cb38bc5463153e887a76c5138 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up updatedmarker styling mess - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Clean up updatedmarker styling mess .. Clean up updatedmarker styling mess This is the follow-up to d629541076c29ce4a7ec50d69a5e5969b409f16d that b09bfb7bf6b811f9657a606d611a7f889a5e013e meant to be but failed. It updates the right file this time, and removes the old override for old skins. Bug: T134515 Change-Id: I074688562e4da8c7c32d9f2bae67cd601e9b5f65 --- M resources/src/mediawiki.action/mediawiki.action.history.css M resources/src/mediawiki.legacy/oldshared.css 2 files changed, 2 insertions(+), 7 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.action/mediawiki.action.history.css b/resources/src/mediawiki.action/mediawiki.action.history.css index 835383e..95e92ae 100644 --- a/resources/src/mediawiki.action/mediawiki.action.history.css +++ b/resources/src/mediawiki.action/mediawiki.action.history.css @@ -3,7 +3,6 @@ visibility: hidden; } -span.updatedmarker { - color: #000; - background-color: #0f0; +.updatedmarker { + background-color: #b7f430; } diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css index f6c3cdb..7ccf59e 100644 --- a/resources/src/mediawiki.legacy/oldshared.css +++ b/resources/src/mediawiki.legacy/oldshared.css @@ -294,10 +294,6 @@ color: #f00; } -.updatedmarker { - background-color: #b7f430; -} - div.gallerybox { width: 150px; } -- To view, visit https://gerrit.wikimedia.org/r/291514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I074688562e4da8c7c32d9f2bae67cd601e9b5f65 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Edokter Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow providing 'notices' for OOUI HTMLForm fields - change (mediawiki/core)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/291522 Change subject: Allow providing 'notices' for OOUI HTMLForm fields .. Allow providing 'notices' for OOUI HTMLForm fields Only added implementation for OOUI forms. Bug: T104423 Change-Id: I512f3936bc3335df1bdf76505cfc39da6be99bed --- M includes/htmlform/HTMLForm.php M includes/htmlform/HTMLFormField.php 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/22/291522/1 diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index e891c9c..7e6d74f 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -71,6 +71,11 @@ *'help-messages' -- array of message keys/objects. As above, each item can * be an array of msg key and then parameters. * Overwrites 'help'. + *'notice' -- message text for a message to use as a notice in the field. + * Currently used by OOUI form fields only. + *'notice-messages' -- array of message keys/objects to use for notice. + * Overrides 'notice'. + *'notice-message' -- message key or object to use as a notice. *'required'-- passed through to the object, indicating that it * is a required field. *'size'-- the length of text fields diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 9f5e728..5d73676 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -603,6 +603,7 @@ 'align' => $this->getLabelAlignOOUI(), 'help' => $helpText !== null ? new OOUI\HtmlSnippet( $helpText ) : null, 'errors' => $errors, + 'notices' => $this->getNotices(), 'infusable' => $infusable, ]; @@ -841,6 +842,30 @@ } /** +* Determine notices to display for the field. +* +* @since 1.28 +* @return string[] +*/ + function getNotices() { + $notices = []; + + if ( isset( $this->mParams['notice-message'] ) ) { + $notices[] = $this->getMessage( $this->mParams['notice-message'] )->parse(); + } + + if ( isset( $this->mParams['notice-messages'] ) ) { + foreach ( $this->mParams['notice-messages'] as $msg ) { + $notices[] = $this->getMessage( $msg )->parse(); + } + } elseif ( isset( $this->mParams['notice'] ) ) { + $notices[] = $this->mParams['notice']; + } + + return $notices; + } + + /** * @return string HTML */ function getLabel() { -- To view, visit https://gerrit.wikimedia.org/r/291522 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I512f3936bc3335df1bdf76505cfc39da6be99bed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Glaisher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Pass a caching interface to the GoogleClient - change (mediawiki...GoogleLogin)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/291521 Change subject: WIP: Pass a caching interface to the GoogleClient .. WIP: Pass a caching interface to the GoogleClient Currently, a simple implementation which selects the Memcached or Redis servers configured for MediaWiki, if any, and doesn't set a cache when no server is configured. Change-Id: Ica7396744ae9dc5ed558942b27f3c8d0ff6d836d --- M composer.json M includes/GoogleLogin.body.php 2 files changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin refs/changes/21/291521/1 diff --git a/composer.json b/composer.json index 886219e..97984e3 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,8 @@ "description": "Allow users to login to MediaWiki with their Google Account", "license": "MIT", "require": { - "google/apiclient": "^2.0.0@RC" + "google/apiclient": "^2.0.0@RC", + "tedivm/stash": "*" }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", diff --git a/includes/GoogleLogin.body.php b/includes/GoogleLogin.body.php index fd449b4..a6820f8 100755 --- a/includes/GoogleLogin.body.php +++ b/includes/GoogleLogin.body.php @@ -5,6 +5,11 @@ use ConfigFactory; use Google_Client; +use MediaWiki\MediaWikiServices; +use Stash\Driver\FileSystem; +use Stash\Driver\Memcache; +use Stash\Driver\Redis; +use Stash\Pool; class GoogleLogin { /** @var $mGoogleClient Stores an instance of GoogleClient */ @@ -21,7 +26,29 @@ public static function getClient( $returnToUrl, $token ) { if ( empty( self::$mGoogleClient ) ) { $glConfig = self::getGLConfig(); + $config = MediaWikiServices::getInstance()->getMainConfig(); + $objectCaches = $config->get( 'ObjectCaches' ); + $cache = null; + if ( $config->get( 'MainCacheType' ) === CACHE_MEMCACHED ) { + $memcachedServers = $config->get( 'MemCachedServers' ); + $servers = []; + foreach ( $memcachedServers as $host ) { + $servers[] = \IP::splitHostAndPort( $host ); + } + $cache = new Pool( new Memcache( $servers ) ); + } elseif ( isset( $objectCaches['redis'] ) ) { + $redisServers = $objectCaches['redis']['servers']; + $servers = []; + foreach ( $redisServers as $host ) { + $servers[] = \IP::splitHostAndPort( $host ); + } + $cache = new Pool( new Redis( $servers ) ); + } + $client = new Google_Client(); + if ( $cache ) { + $client->setCache( $cache ); + } $client->setClientId( $glConfig->get( 'GLAppId' ) ); $client->setClientSecret( $glConfig->get( 'GLSecret' ) ); $client->setRedirectUri( $returnToUrl ); -- To view, visit https://gerrit.wikimedia.org/r/291521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica7396744ae9dc5ed558942b27f3c8d0ff6d836d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GoogleLogin Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/291520 Change subject: Test .. Test Change-Id: I8a4eeff517891101e56f41dded28a35fe49c8861 --- M maintenance/tables.sql 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/291520/1 diff --git a/maintenance/tables.sql b/maintenance/tables.sql index 89aeb9c..dda3229 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -1178,7 +1178,7 @@ -- Munged version of body text si_text mediumtext NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=binary; CREATE UNIQUE INDEX /*i*/si_page ON /*_*/searchindex (si_page); CREATE FULLTEXT INDEX /*i*/si_title ON /*_*/searchindex (si_title); -- To view, visit https://gerrit.wikimedia.org/r/291520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a4eeff517891101e56f41dded28a35fe49c8861 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialSearch: Use OOUI\ActionFieldLayout for search input a... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: SpecialSearch: Use OOUI\ActionFieldLayout for search input and button .. SpecialSearch: Use OOUI\ActionFieldLayout for search input and button This prevents the button from flipping to a new line if the window or the available width at all is smaller as the width of the input and the button together. Now, the input will be as small as needed for the button to be on the same line. Bug: T134475 Change-Id: Icc68a8e83fc7037b96a5efec2766ffdf453c5413 --- M includes/specials/SpecialSearch.php M resources/src/mediawiki.special/mediawiki.special.search.styles.css 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index e14fcf5..b98ddda1 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -1241,16 +1241,19 @@ 'dataLocation' => 'content', ] ); + $layout = new OOUI\ActionFieldLayout( $searchWidget, new OOUI\ButtonInputWidget( [ + 'type' => 'submit', + 'label' => $this->msg( 'searchbutton' )->text(), + 'flags' => [ 'progressive', 'primary' ], + ] ), [ + 'align' => 'top', + ] ); + $out = Html::hidden( 'title', $this->getPageTitle()->getPrefixedText() ) . Html::hidden( 'profile', $this->profile ) . Html::hidden( 'fulltext', 'Search' ) . - $searchWidget . - new OOUI\ButtonInputWidget( [ - 'type' => 'submit', - 'label' => $this->msg( 'searchbutton' )->text(), - 'flags' => [ 'progressive', 'primary' ], - ] ); + $layout; // Results-info if ( $totalNum > 0 && $this->offset < $totalNum ) { diff --git a/resources/src/mediawiki.special/mediawiki.special.search.styles.css b/resources/src/mediawiki.special/mediawiki.special.search.styles.css index 7be7c84..e8fda84 100644 --- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css +++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css @@ -84,7 +84,6 @@ color: #666; font-size: 95%; } - fieldset#mw-searchoptions { margin: 0; padding: 0.5em 0.75em 0.75em 0.75em; -- To view, visit https://gerrit.wikimedia.org/r/288764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc68a8e83fc7037b96a5efec2766ffdf453c5413 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Edokter Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Ricordisamoa Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ce149e4..c2c26e4 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/291519 Change subject: Syncronize VisualEditor: ce149e4..c2c26e4 .. Syncronize VisualEditor: ce149e4..c2c26e4 Change-Id: I3bcaf28128742681a748af4ad32e5fbde0ca1920 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/19/291519/1 diff --git a/VisualEditor b/VisualEditor index ce149e4..c2c26e4 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ce149e49d7b0c732c937958d1b96a8d599172605 +Subproject commit c2c26e4afa16769ea6478d0871336943fa264995 -- To view, visit https://gerrit.wikimedia.org/r/291519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3bcaf28128742681a748af4ad32e5fbde0ca1920 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ce149e4..c2c26e4 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: ce149e4..c2c26e4 .. Syncronize VisualEditor: ce149e4..c2c26e4 Change-Id: I3bcaf28128742681a748af4ad32e5fbde0ca1920 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index ce149e4..c2c26e4 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ce149e49d7b0c732c937958d1b96a8d599172605 +Subproject commit c2c26e4afa16769ea6478d0871336943fa264995 -- To view, visit https://gerrit.wikimedia.org/r/291519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bcaf28128742681a748af4ad32e5fbde0ca1920 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I989538edb5db68abf441a90149422143db5001ed --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 7657081..c1a46e8 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "fix": "phpcbf", -- To view, visit https://gerrit.wikimedia.org/r/291465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I989538edb5db68abf441a90149422143db5001ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...SmiteSpam)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I300a88e7c8959439f9e0333532cc17e16bd2447a --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 4c8046c..c8970a8 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "license": "GPL-2.0", "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I300a88e7c8959439f9e0333532cc17e16bd2447a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SmiteSpam Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...WebChat)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I7a4a54e27d81e60f9d807e7f07573f393805a9b4 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index f5434bf..98d41d9 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "fix": "phpcbf", -- To view, visit https://gerrit.wikimedia.org/r/291472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a4a54e27d81e60f9d807e7f07573f393805a9b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WebChat Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...Wikidata.org)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I6145eed5bd7dadb35489fca1d6dc103d64c469d3 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index d58989c..398ba9d 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6145eed5bd7dadb35489fca1d6dc103d64c469d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata.org Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...WikimediaPageViewInfo)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Icfd4b11082a86e6e26db022b698bc47ea2dd450e --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index ef16e87..9e0d685 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfd4b11082a86e6e26db022b698bc47ea2dd450e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaPageViewInfo Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...WikidataPageBanner)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I86a3e1410e3fa921b05919e404b7a9585db41cdc --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index ecfbbb0..d43d47d 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "license": "GPL-2.0", "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86a3e1410e3fa921b05919e404b7a9585db41cdc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Ibc1cb3d34e8102b6ce4c50c1de0c17eb9411ff04 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index d1f8db7..b0feadb 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc1cb3d34e8102b6ce4c50c1de0c17eb9411ff04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Also added "composer fix" command. Change-Id: I38faefa8f2c9da5c7d7bcaada7bc89292bd4d3b9 --- M .gitignore M composer.json 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 9bf33d3..f81a7bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .project node_modules/ vendor/ +composer.lock diff --git a/composer.json b/composer.json index bde1d31..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,15 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ "parallel-lint . --exclude vendor", "phpcs -p -s" + ], + "fix": [ + "phpcbf" ] } } -- To view, visit https://gerrit.wikimedia.org/r/291462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38faefa8f2c9da5c7d7bcaada7bc89292bd4d3b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...TopTenPages)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I7e52cfc04009a5bd0df721439f284b6a3c49bb08 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e52cfc04009a5bd0df721439f284b6a3c49bb08 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TopTenPages Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I8538753d09dba636b21aff20ac08fc8054780adc --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8538753d09dba636b21aff20ac08fc8054780adc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...WikiLabels)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: If7789675d7de19a3f3440c8d2ebdada2d7dc1fcc --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7789675d7de19a3f3440c8d2ebdada2d7dc1fcc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLabels Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...UploadsLink)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I3bc582c992668295e01c62ba3a404cb6064692b3 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bc582c992668295e01c62ba3a404cb6064692b3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadsLink Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...TemplateData)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I439ab8dd19534102b12374bcd86d373cc52e9ef7 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I439ab8dd19534102b12374bcd86d373cc52e9ef7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...Sentry)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I00a58613d1f9b36e961f2492fd72ae6834711f99 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 7556395..fe0c6c1 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00a58613d1f9b36e961f2492fd72ae6834711f99 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Sentry Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Also added "composer fix" command. Change-Id: I8da17b799929b7caed0e0a89014c6ab15c39f0c6 --- M .gitignore M composer.json 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 24ebbb9..1228fd6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ NormalizationTest.txt node_modules/ vendor/ +composer.lock diff --git a/composer.json b/composer.json index 35824f6..a927be3 100644 --- a/composer.json +++ b/composer.json @@ -8,22 +8,26 @@ { "name": "Victor Vasiliev", "email": "vasi...@gmail.com" - }, { + }, + { "name": "Tim Starling", "email": "tstarl...@users.mediawiki.org" } ], "require": { - "composer/installers" : ">=1.0.1" + "composer/installers": ">=1.0.1" }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ "parallel-lint . --exclude vendor", "phpcs -p -s" + ], + "fix": [ + "phpcbf" ] } } -- To view, visit https://gerrit.wikimedia.org/r/291457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8da17b799929b7caed0e0a89014c6ab15c39f0c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Anomie Gerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...SandboxLink)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I876aaa2f4f6022f702f9e02660554263177bc9b7 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291456 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I876aaa2f4f6022f702f9e02660554263177bc9b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SandboxLink Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...RelatedArticles)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Idec1615851f319aa63963cc15ec58a3123039f42 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idec1615851f319aa63963cc15ec58a3123039f42 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedArticles Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...QuickSurveys)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I3ad8fd50d81814354b59005a3802ca678a5ba4fd --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291453 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ad8fd50d81814354b59005a3802ca678a5ba4fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...Patroller)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Iba702da1c788aeef7ed6be3ae2b9e3d4289f9028 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 6819cd3..9426deb 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ ], "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291450 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba702da1c788aeef7ed6be3ae2b9e3d4289f9028 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Patroller Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...PronunciationRecording)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I2af86501f3b08968adbae79cc99cf8ef55a0df40 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2af86501f3b08968adbae79cc99cf8ef55a0df40 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PronunciationRecording Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Purodha Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...PageAssessments)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I3878c4e5fae6293634acfccdc3b4b867deae4473 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 56555a1..8a3bbdf 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.*", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3878c4e5fae6293634acfccdc3b4b867deae4473 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageAssessments Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...PageTriage)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Ie451b7db415ba45c07d77b9d545e3ca4c6f526ac --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie451b7db415ba45c07d77b9d545e3ca4c6f526ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...OpenLayers)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I8fb0c06a8833bfec1e2b6aac79f6e65a51cccb46 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index ef31b66..09f8e9e 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fb0c06a8833bfec1e2b6aac79f6e65a51cccb46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenLayers Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...OnlineStatus)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Ibc82264606c2987c01de34858500ed514455cc49 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc82264606c2987c01de34858500ed514455cc49 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OnlineStatus Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...OOJsUIAjaxLogin)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I90baead25b39e5e9bc57d422c169f6374b5a --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 33ad1e1..4653c05 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90baead25b39e5e9bc57d422c169f6374b5a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OOJsUIAjaxLogin Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...Interwiki)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I93f4fe25bb61e34ede9ed26868345b73953e5c4d --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index f5434bf..98d41d9 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "fix": "phpcbf", -- To view, visit https://gerrit.wikimedia.org/r/291432 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93f4fe25bb61e34ede9ed26868345b73953e5c4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Interwiki Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...LoginNotify)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: Iacad04f6f7668d0a60707761b5ee5589ed702d80 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 3d588a5..3b67910 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "description": "MediaWiki extension to notify users if someone tries to login to their account", "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "fix": "phpcbf", -- To view, visit https://gerrit.wikimedia.org/r/291435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacad04f6f7668d0a60707761b5ee5589ed702d80 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LoginNotify Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 - change (mediawiki...MwEmbedSupport)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 .. build: Updating mediawiki/mediawiki-codesniffer to 0.7.2 Change-Id: I62d1103821adfc5eec1f1c31e941c329dc64052d --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index df61058..e50aba3 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.1" + "mediawiki/mediawiki-codesniffer": "0.7.2" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/291442 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62d1103821adfc5eec1f1c31e941c329dc64052d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MwEmbedSupport Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits