[MediaWiki-commits] [Gerrit] Improve wording of imageinfo API userid prop - change (mediawiki/core)

2015-09-07 Thread Code Review 
Gergő Tisza has uploaded a new change for review.

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

Change subject: Improve wording of imageinfo API userid prop
..

Improve wording of imageinfo API userid prop

Per 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-query%2Bimageinfo-paramvalue-prop-userid/en

Change-Id: I9a9fd4e7b6ec09d7cc2becdfd0195a7e993176c9
---
M includes/api/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/236509/1

diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 396f5da..425e062 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -725,7 +725,7 @@
"apihelp-query+imageinfo-param-prop": "Which file information to get:",
"apihelp-query+imageinfo-paramvalue-prop-timestamp": "Adds timestamp 
for the uploaded version.",
"apihelp-query+imageinfo-paramvalue-prop-user": "Adds the user who 
uploaded each file version.",
-   "apihelp-query+imageinfo-paramvalue-prop-userid": "Add the user ID that 
uploaded each file version.",
+   "apihelp-query+imageinfo-paramvalue-prop-userid": "Add the ID of the 
user that uploaded each file version.",
"apihelp-query+imageinfo-paramvalue-prop-comment": "Comment on the 
version.",
"apihelp-query+imageinfo-paramvalue-prop-parsedcomment": "Parse the 
comment on the version.",
"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "Adds the 
canonical title of the file.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a9fd4e7b6ec09d7cc2becdfd0195a7e993176c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Update cxserver to 61ebec4 - change (mediawiki...deploy)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Update cxserver to 61ebec4
..


Update cxserver to 61ebec4

*   61ebec4 Merge "Allow empty external link text"
|\
| * 67ce434 Allow empty external link text
* | 4b897b6 config: Add missing nn-da pair
* | f52e9d3 config: Add new Apertium MT pairs
|/
* 3513783 config: Remove non-existing ca-eo pair from MT

Change-Id: I35120134fb04529fb63aa0d2f4c77a1275f790e9
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index e221462..61ebec4 16
--- a/src
+++ b/src
-Subproject commit e221462a942ec8f755865cef7545c9e1bddd94c0
+Subproject commit 61ebec42a4a63f092dec4cefdbbc97f8817a5b64

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35120134fb04529fb63aa0d2f4c77a1275f790e9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mw.widgets.DateInputWidget: Add required config - change (mediawiki/core)

2015-09-07 Thread Prtksxna (Code Review) 
Prtksxna has uploaded a new change for review.

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

Change subject: mw.widgets.DateInputWidget: Add required config
..

mw.widgets.DateInputWidget: Add required config

Change-Id: Ie3691d5239a512e1a4fa882c43c224c2de8d7598
---
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/236507/1

diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 6b7f860..c8093bb 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -75,10 +75,16 @@
 * field when it's empty. Should be the same as `inputFormat`, but 
translated to the user's
 * language. When not given, defaults to a translated version of 
'-MM-DD' or '-MM',
 * depending on `precision`.
+* @cfg {boolean} [required=false] Mark the field as required. Implies 
`indicator: 'required'`.
 */
mw.widgets.DateInputWidget = function MWWDateInputWidget( config ) {
// Config initialization
config = $.extend( { precision: 'day' }, config );
+   if ( config.required ) {
+   if ( config.indicator === undefined ) {
+   config.indicator = 'required';
+   }
+   }
 
var placeholder;
if ( config.placeholder ) {
@@ -128,6 +134,10 @@
} );
 
// Initialization
+   if ( config.required ) {
+   this.$input.attr( 'required', 'required' );
+   this.$input.attr( 'aria-required', 'true' );
+   }
// Move 'tabindex' from this.$input (which is invisible) to the 
visible handle
this.setTabIndexedElement( this.handle.$element );
this.handle.$element

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

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

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

[MediaWiki-commits] [Gerrit] Use flake8-coding - change (pywikibot/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use flake8-coding
..


Use flake8-coding

Change-Id: I3bd2616227eecc2676d1ec9331e52dcb2653
---
M pywikibot/comms/rcstream.py
M pywikibot/compat/__init__.py
M pywikibot/interwiki_graph.py
M pywikibot/userinterfaces/cgi_interface.py
M pywikibot/userinterfaces/win32_unicode.py
M scripts/__init__.py
M scripts/maintenance/__init__.py
M tests/i18n/__init__.py
M tests/pwb/__init__.py
M tests/tools_chars_tests.py
M tests/tools_ip_tests.py
M tests/tools_tests.py
M tox.ini
13 files changed, 14 insertions(+), 3 deletions(-)

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



diff --git a/pywikibot/comms/rcstream.py b/pywikibot/comms/rcstream.py
index 710163d..438823a 100644
--- a/pywikibot/comms/rcstream.py
+++ b/pywikibot/comms/rcstream.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8  -*-
 """
 SocketIO-based rcstream client.
 
diff --git a/pywikibot/compat/__init__.py b/pywikibot/compat/__init__.py
index 49d9f46..fe93354 100644
--- a/pywikibot/compat/__init__.py
+++ b/pywikibot/compat/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8  -*-
 """Package to provide compatibility with compat scripts."""
diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py
index 2263dbc..223307d 100644
--- a/pywikibot/interwiki_graph.py
+++ b/pywikibot/interwiki_graph.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8  -*-
 """Module with the Graphviz drawing calls."""
 #
 # (C) Pywikibot team, 2006-2015
diff --git a/pywikibot/userinterfaces/cgi_interface.py 
b/pywikibot/userinterfaces/cgi_interface.py
index 42424b0..3c83914 100644
--- a/pywikibot/userinterfaces/cgi_interface.py
+++ b/pywikibot/userinterfaces/cgi_interface.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8  -*-
 """CGI user interface."""
 from __future__ import unicode_literals
 
diff --git a/pywikibot/userinterfaces/win32_unicode.py 
b/pywikibot/userinterfaces/win32_unicode.py
index e4b176f..2783d16 100755
--- a/pywikibot/userinterfaces/win32_unicode.py
+++ b/pywikibot/userinterfaces/win32_unicode.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8  -*-
 """Stdout, stderr and argv support for unicode."""
 ##
 # Support for unicode in windows cmd.exe
diff --git a/scripts/__init__.py b/scripts/__init__.py
index ab8c50a..03688c1 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8  -*-
 """THIS DIRECTORY IS TO HOLD BOT SCRIPTS FOR THE NEW FRAMEWORK."""
diff --git a/scripts/maintenance/__init__.py b/scripts/maintenance/__init__.py
index ee430b4..fd43e14 100644
--- a/scripts/maintenance/__init__.py
+++ b/scripts/maintenance/__init__.py
@@ -1,2 +1,3 @@
+# -*- coding: utf-8  -*-
 # THIS DIRECTORY IS TO HOLD BOT SCRIPTS FOR THE NEW FRAMEWORK
 """Maintenance scripts."""
diff --git a/tests/i18n/__init__.py b/tests/i18n/__init__.py
index f1a0213..fdca28a 100644
--- a/tests/i18n/__init__.py
+++ b/tests/i18n/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8  -*-
 """Test i18n data package."""
diff --git a/tests/pwb/__init__.py b/tests/pwb/__init__.py
index fb493b3..56b2f7a 100644
--- a/tests/pwb/__init__.py
+++ b/tests/pwb/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8  -*-
 """Dummy package initialisation."""
diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py
index 5e2006b..f8e5cd4 100644
--- a/tests/tools_chars_tests.py
+++ b/tests/tools_chars_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-"""Test tools.chars package."""
 # -*- coding: utf-8  -*-
+"""Test tools.chars package."""
 #
 # (C) Pywikibot team, 2015
 #
diff --git a/tests/tools_ip_tests.py b/tests/tools_ip_tests.py
index fb9ea1a..b9c3646 100644
--- a/tests/tools_ip_tests.py
+++ b/tests/tools_ip_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-"""Test IP module/regex."""
 # -*- coding: utf-8  -*-
+"""Test IP module/regex."""
 #
 # (C) Pywikibot team, 2012-2015
 #
diff --git a/tests/tools_tests.py b/tests/tools_tests.py
index b60b2a5..dbb8df8 100644
--- a/tests/tools_tests.py
+++ b/tests/tools_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-"""Test tools package alone which don't fit into other tests."""
 # -*- coding: utf-8  -*-
+"""Test tools package alone which don't fit into other tests."""
 #
 # (C) Pywikibot team, 2015
 #
diff --git a/tox.ini b/tox.ini
index 15ecea9..7449e16 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,7 @@
 basepython = python2.7
 deps = flake8
flake8-docstrings
+   flake8-coding
 
 [testenv:flake8-py3]
 commands = flake8 --ignore=D102,D103,E122,E127,E241,E402,E731 {posargs}
@@ -224,6 +225,7 @@
 ignore = E241,E265,E402,E731
 exclude = 
.tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*
 max_line_length = 130
+accept-encodings = utf-8
 
 [pep8]
 ignore = E241,E402,E731

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

Gerrit-MessageType: merged

[MediaWiki-commits] [Gerrit] Fix typo in en.json - change (mediawiki...SmiteSpam)

2015-09-07 Thread Polybuildr (Code Review) 
Polybuildr has uploaded a new change for review.

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

Change subject: Fix typo in en.json
..

Fix typo in en.json

Change-Id: I0a7ced92e34c74dab5f4196cff571ff913691b25
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmiteSpam 
refs/changes/13/236513/1

diff --git a/i18n/en.json b/i18n/en.json
index a1af1b2..92db1d2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,7 +21,7 @@
"smitespamtrustedusers": "SmiteSpam trusted users",
"smitespam-already-trusted": "User \"$1\" already 
{{GENDER:$1|trusted}}.",
"smitespam-trusted-user-message": "Trusted {{GENDER:$1|user}} \"$1\".",
-   "smitespam-userdoesnotexist": "((GENDER:$1|User}} \"$1\" does not 
exist.",
+   "smitespam-userdoesnotexist": "{{GENDER:$1|User}} \"$1\" does not 
exist.",
"smitespam-add-user-label": "Add user:",
"smitespam-trust": "Trust",
"smitespam-trusted": "Trusted",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a7ced92e34c74dab5f4196cff571ff913691b25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmiteSpam
Gerrit-Branch: master
Gerrit-Owner: Polybuildr 

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

[MediaWiki-commits] [Gerrit] Add definitions for LVSes in codfw - change (operations/puppet)

2015-09-07 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

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

Change subject: Add definitions for LVSes in codfw
..

Add definitions for LVSes in codfw

Pybal performs SSH-based health checks: Add definitions to the IP ranges
of these systems so that we can limit the source range to these when defining
ferm rules.

Change-Id: I769846804c1011e81a3683beb3ee7fa1976a3f62
---
M manifests/network.pp
1 file changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/236519/1

diff --git a/manifests/network.pp b/manifests/network.pp
index f14faa6..9d85715 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -242,6 +242,25 @@
 'ipv4' => '10.192.48.0/22',
 'ipv6' => '2620:0:860:104::/64'
 },
+'private1-a-lvs-codfw' => {
+'ipv4' => '10.192.1.0/29',
+'ipv6' => '2620:0:860:101:fe15:b4ff:fe1f::/112'
+},
+'private1-a-2-codfw' => {
+'ipv6' => '2620:0:860:101:10:192:1::/112'
+},
+'private1-b-lvs-codfw' => {
+'ipv4' => '10.192.17.0/29',
+'ipv6' => '2620:0:860:102:fe15:b4ff:fe1f::/112'
+},
+'private1-c-lvs-codfw' => {
+'ipv4' => '10.192.33.0/29',
+'ipv6' => '2620:0:860:103:42a8:f0ff:fe2c::/112'
+},
+'private1-d-lvs-codfw' => {
+'ipv4' => '10.192.49.0/29',
+'ipv6' => '2620:0:860:104:42a8:f0ff:fe2c::/112'
+},
 'private-frack-codfw' => {
 'ipv4' => '10.195.0.0/25',
 },

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

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

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

[MediaWiki-commits] [Gerrit] Phase out {name}-npm job template - change (integration/config)

2015-09-07 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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

Change subject: Phase out {name}-npm job template
..

Phase out {name}-npm job template

The template has been deprecated in favor of the 'npm' job. The last
usage is for mediawiki/core.

Move the template to mediawiki.yaml
Rename it 'mediawiki-core-npm'
Adjust the project list of jobs

No configuration changes.

Will let me disable submodule processing (T103014).

Change-Id: If6b450860bc5c992aa71445738445de860579907
---
M jjb/job-templates.yaml
M jjb/mediawiki.yaml
2 files changed, 14 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/11/236511/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 16eaa76..6e63745 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -68,20 +68,6 @@
 builders:
  - jsduck
 
-# Deprecated non-generic npm job. Use the
-# generic 'npm' job below.
-- job-template:
-name: '{name}-npm'
-node: contintLabsSlave && UbuntuTrusty
-defaults: use-remoteonly-zuul
-concurrent: true
-triggers:
- - zuul
-builders:
- - npm
-publishers:
- - global-teardown
-
 - job:
 name: 'npm'
 node: contintLabsSlave && UbuntuTrusty
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 28fff8b..81938f7 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -18,6 +18,19 @@
  - jsonlint
 
 - job-template:
+name: 'mediawiki-core-npm'
+node: contintLabsSlave && UbuntuTrusty
+defaults: use-remoteonly-zuul
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - npm
+publishers:
+ - global-teardown
+
+
+- job-template:
 name: 'mediawiki-core-qunit'
 node: contintLabsSlave && UbuntuTrusty
 concurrent: true
@@ -331,7 +344,7 @@
   - 'mediawiki-core-jslint'
   - 'mediawiki-core-qunit'
   - 'mediawiki-core-jsduck'
-  - '{name}-npm'
+  - 'mediawiki-core-npm'
   - 'mediawiki-core-jsduck-publish'
   - 'mediawiki-core-doxygen-publish'
   - mediawiki-gate

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6b450860bc5c992aa71445738445de860579907
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Use double-underscore instead of non-ASCII character for cla... - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use double-underscore instead of non-ASCII character for class 
name separator
..


Use double-underscore instead of non-ASCII character for class name separator

MediaWikiParserTest.php generates fake test classes with eval(). It uses
synthetic class names with U+2044 "fraction slash" as a separator, but
this turns out to be an unfortunate choice since in certain terminal
modes, it causes readline to return to the start of the line as if the
"home" key was pressed, without adding a character. This makes it
difficult to paste class names.

Change-Id: I1c66b9caf256b8d0535fb7ed6e52ed842e193f46
---
M tests/phpunit/includes/parser/MediaWikiParserTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php 
b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index df891f5..96ae3be 100644
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -91,7 +91,7 @@
// enough to cause there to be separate names for 
different
// things, which is good enough for our purposes.
$extensionName = basename( dirname( $fileName ) );
-   $testsName = $extensionName . '⁄' . basename( 
$fileName, '.txt' );
+   $testsName = $extensionName . '__' . basename( 
$fileName, '.txt' );
$escapedFileName = strtr( $fileName, array( "'" => 
"\\'", '\\' => '' ) );
$parserTestClassName = ucfirst( $testsName );
// Official spec for class names: 
http://php.net/manual/en/language.oop5.basic.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c66b9caf256b8d0535fb7ed6e52ed842e193f46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jackmcbarn 
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] Revert "Remove unused parameters in view tests" - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Revert "Remove unused parameters in view tests"
..

Revert "Remove unused parameters in view tests"

This reverts commit 4f2537d6d1d3c87337e54f40ab660d3784d970d8.

Change-Id: Iadb60134236f443d676f8f1d74bea5ef0b83a00d
---
M view/tests/phpunit/EntityTermsViewTest.php
M view/tests/phpunit/StatementGroupListViewTest.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/16/236516/1

diff --git a/view/tests/phpunit/EntityTermsViewTest.php 
b/view/tests/phpunit/EntityTermsViewTest.php
index 0c46396..7fe714e 100644
--- a/view/tests/phpunit/EntityTermsViewTest.php
+++ b/view/tests/phpunit/EntityTermsViewTest.php
@@ -133,7 +133,7 @@
/**
 * @dataProvider emptyFingerprintProvider
 */
-   public function testGetHtml_isMarkedAsEmptyValue( Fingerprint 
$fingerprint ) {
+   public function testGetHtml_isMarkedAsEmptyValue( Fingerprint 
$fingerprint, $expectedPlaceholder ) {
$entityTermsView = $this->getEntityTermsView();
$html = $entityTermsView->getHtml( $fingerprint, null, '', new 
TextInjector() );
 
diff --git a/view/tests/phpunit/StatementGroupListViewTest.php 
b/view/tests/phpunit/StatementGroupListViewTest.php
index 1526518..50df479 100644
--- a/view/tests/phpunit/StatementGroupListViewTest.php
+++ b/view/tests/phpunit/StatementGroupListViewTest.php
@@ -141,7 +141,7 @@
 
$claimHtmlGenerator->expects( $this->any() )
->method( 'getHtmlForClaim' )
-   ->will( $this->returnCallback( function( Statement 
$statement ) {
+   ->will( $this->returnCallback( function( Statement 
$statement, $editSectionHtml = null ) {
return $statement->getGuid();
} ) );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb60134236f443d676f8f1d74bea5ef0b83a00d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Remove @since tags from private properties and methods - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Remove @since tags from private properties and methods
..

Remove @since tags from private properties and methods

This also drops an unused property.

This is a direct follow-up for the stuff that became private in
I3dbe3f7.

Change-Id: Iaf3a38006892e512272973d36c83bb4d844ab1e3
---
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/ValueParserFactory.php
M repo/includes/specials/SpecialNewProperty.php
M repo/includes/store/sql/EntityPerPageBuilder.php
M repo/includes/store/sql/SqlIdGenerator.php
M repo/includes/store/sql/TermSearchKeyBuilder.php
11 files changed, 0 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/20/236520/1

diff --git a/repo/includes/ChangeOp/ChangeOpMainSnak.php 
b/repo/includes/ChangeOp/ChangeOpMainSnak.php
index 1689d43..d55892c 100644
--- a/repo/includes/ChangeOp/ChangeOpMainSnak.php
+++ b/repo/includes/ChangeOp/ChangeOpMainSnak.php
@@ -25,15 +25,11 @@
 class ChangeOpMainSnak extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var Snak
 */
private $snak;
diff --git a/repo/includes/ChangeOp/ChangeOpQualifier.php 
b/repo/includes/ChangeOp/ChangeOpQualifier.php
index 31d861e..ae3d6f8 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifier.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifier.php
@@ -22,22 +22,16 @@
 class ChangeOpQualifier extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var Snak
 */
private $snak;
 
/**
-* @since 0.4
-*
 * @var string
 */
private $snakHash;
diff --git a/repo/includes/ChangeOp/ChangeOpQualifierRemove.php 
b/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
index 85253ee..fdd5999 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
@@ -20,15 +20,11 @@
 class ChangeOpQualifierRemove extends ChangeOpBase {
 
/**
-* @since 0.5
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.5
-*
 * @var string
 */
private $snakHash;
diff --git a/repo/includes/ChangeOp/ChangeOpReference.php 
b/repo/includes/ChangeOp/ChangeOpReference.php
index 61cbe5e..4829a69 100644
--- a/repo/includes/ChangeOp/ChangeOpReference.php
+++ b/repo/includes/ChangeOp/ChangeOpReference.php
@@ -23,29 +23,21 @@
 class ChangeOpReference extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var Reference
 */
private $reference;
 
/**
-* @since 0.4
-*
 * @var string
 */
private $referenceHash;
 
/**
-* @since 0.5
-*
 * @var int|null
 */
private $index;
diff --git a/repo/includes/ChangeOp/ChangeOpReferenceRemove.php 
b/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
index 499be38..2b7e874 100644
--- a/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
@@ -20,15 +20,11 @@
 class ChangeOpReferenceRemove extends ChangeOpBase {
 
/**
-* @since 0.5
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.5
-*
 * @var string
 */
private $referenceHash;
diff --git a/repo/includes/ChangeOp/ChangeOpStatementRank.php 
b/repo/includes/ChangeOp/ChangeOpStatementRank.php
index b3ac655..517cbb5 100644
--- a/repo/includes/ChangeOp/ChangeOpStatementRank.php
+++ b/repo/includes/ChangeOp/ChangeOpStatementRank.php
@@ -20,15 +20,11 @@
 class ChangeOpStatementRank extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var integer
 */
private $rank;
diff --git a/repo/includes/ValueParserFactory.php 
b/repo/includes/ValueParserFactory.php
index 0325045..15bf299 100644
--- a/repo/includes/ValueParserFactory.php
+++ b/repo/includes/ValueParserFactory.php
@@ -20,8 +20,6 @@
/**
 * Maps parser id to

[MediaWiki-commits] [Gerrit] New parserTests.php features - change (mediawiki/core)

2015-09-07 Thread Tim Starling (Code Review) 
Tim Starling has uploaded a new change for review.

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

Change subject: New parserTests.php features
..

New parserTests.php features

Features to support T89331 analysis:

* Support dwdiff for word-level diffing
* Add --mark-ws feature which produces cleaner diffs when line breaks
  differ
* Add optional normalization of parser test output, allowing significant
  differences to be separated from insignificant differences.

Change-Id: I0e151caad1f8b2f97bf20b219f26f3101be82506
---
M tests/parser/parserTest.inc
M tests/parserTests.php
2 files changed, 94 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/236508/1

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index cc0df7a..a90a3c6 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -81,6 +81,9 @@
 
public $regex = "";
private $savedGlobals = array();
+   private $useDwdiff = false;
+   private $markWhitespace = false;
+   private $normalizationFunctions = array();
 
/**
 * Sets terminal colorization and diff/quick modes depending on OS and
@@ -115,6 +118,18 @@
|| isset( $options['compare'] ) ) ); // 
redundant output
 
$this->showOutput = isset( $options['show-output'] );
+   $this->useDwdiff = isset( $options['dwdiff'] );
+   $this->markWhitespace = isset( $options['mark-ws'] );
+
+   if ( isset( $options['norm'] ) ) {
+   foreach ( explode( ',', $options['norm'] ) as $func ) {
+   if ( in_array( $func, array( 'removeTbody', 
'trimWhitespace' ) ) ) {
+   $this->normalizationFunctions[] = $func;
+   } else {
+   echo "Warning: unknown normalization 
option \"$func\"\n";
+   }
+   }
+   }
 
if ( isset( $options['filter'] ) ) {
$options['regex'] = $options['filter'];
@@ -666,6 +681,9 @@
}
 
$this->teardownGlobals();
+
+   $result = ParserTestResultNormalizer::normalize( $result, 
$this->normalizationFunctions );
+   $out = ParserTestResultNormalizer::normalize( $out, 
$this->normalizationFunctions );
 
$testResult = new ParserTestResult( $desc );
$testResult->expected = $result;
@@ -1433,6 +1451,16 @@
protected function quickDiff( $input, $output,
$inFileTail = 'expected', $outFileTail = 'actual'
) {
+   if ( $this->markWhitespace ) {
+   $pairs = array(
+   "\n" => '¶',
+   ' ' => '·',
+   "\t" => '→'
+   );
+   $input = strtr( $input, $pairs );
+   $output = strtr( $output, $pairs );
+   }
+
# Windows, or at least the fc utility, is retarded
$slash = wfIsWindows() ? '\\' : '/';
$prefix = wfTempDir() . "{$slash}mwParser-" . mt_rand();
@@ -1448,14 +1476,22 @@
 
global $wgDiff3;
// we assume that people with diff3 also have usual diff
-   $shellCommand = ( wfIsWindows() && !$wgDiff3 ) ? 'fc' : 'diff 
-au';
+   if ( $this->useDwdiff ) {
+   $shellCommand = 'dwdiff -Pc';
+   } else {
+   $shellCommand = ( wfIsWindows() && !$wgDiff3 ) ? 'fc' : 
'diff -au';
+   }
 
$diff = wfShellExec( "$shellCommand $shellInfile $shellOutfile" 
);
 
unlink( $infile );
unlink( $outfile );
 
-   return $this->colorDiff( $diff );
+   if ( $this->useDwdiff ) {
+   return $diff;
+   } else {
+   return $this->colorDiff( $diff );
+   }
}
 
/**
@@ -1663,3 +1699,49 @@
return true;
}
 }
+
+class ParserTestResultNormalizer {
+   var $doc, $xpath, $invalid;
+
+   static public function normalize( $text, $funcs ) {
+   $norm = new self( $text );
+   if ( $norm->invalid ) {
+   return $text;
+   }
+   foreach ( $funcs as $func ) {
+   $norm->$func();
+   }
+   return $norm->serialize();
+   }
+
+   protected function __construct( $text ) {
+   $this->doc = new DOMDocument('1.0', 'utf-8');
+   if ( !@$this->doc->loadXML( '' . $text . 
'' ) ) {
+   $this->invalid = true;
+   }
+

[MediaWiki-commits] [Gerrit] Use mocks in QuantityDetailsFormatterTest - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Use mocks in QuantityDetailsFormatterTest
..

Use mocks in QuantityDetailsFormatterTest

This makes the test independent from the BasicQuantityUnitFormatter
class. I'm doing this in preparation for T108808 but submitting it
as a separate patch for easier review.

Bug: T108808
Change-Id: I74ec577610ec6846ee0fc7fcbfce5d30d109068f
---
M lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
1 file changed, 16 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/10/236510/1

diff --git a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php 
b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
index 93b6050..8c5e4f0 100644
--- a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
+++ b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
@@ -5,7 +5,6 @@
 use DataValues\NumberValue;
 use DataValues\QuantityValue;
 use ValueFormatters\BasicNumberLocalizer;
-use ValueFormatters\BasicQuantityUnitFormatter;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
 use Wikibase\Lib\QuantityDetailsFormatter;
@@ -19,15 +18,23 @@
  *
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
+ * @author Thiemo Mättig
  */
 class QuantityDetailsFormatterTest extends \PHPUnit_Framework_TestCase {
 
private function newFormatter( FormatterOptions $options = null ) {
$numberLocalizer = new BasicNumberLocalizer();
-   $unitFormatter = new BasicQuantityUnitFormatter();
-   $formatter = new QuantityDetailsFormatter( $numberLocalizer, 
$unitFormatter, $options );
 
-   return $formatter;
+   $unitFormatter = $this->getMockBuilder( 
'ValueFormatters\QuantityUnitFormatter' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $unitFormatter->expects( $this->any() )
+   ->method( 'applyUnit' )
+   ->will( $this->returnCallback( function( $unit, 
$numberText ) {
+   return $numberText . ' ' . $unit;
+   } ) );
+
+   return new QuantityDetailsFormatter( $numberLocalizer, 
$unitFormatter, $options );
}
 
/**
@@ -51,11 +58,11 @@
$options,
'@' . implode( '.*',
array(
-   
']*>[^<>]*5[^<>]*1[^<>]*',
-   ']*>[^<>]*5[^<>]*',
-   ']*>[^<>]*6[^<>]*',
-   ']*>[^<>]*4[^<>]*',
-   ']*>[^<>]*1[^<>]*',
+   
']*>[^<>]*\b5\b[^<>]*1[^<>]*',
+   
']*>[^<>]*\b5\b[^<>]*',
+   
']*>[^<>]*\b6\b[^<>]*',
+   
']*>[^<>]*\b4\b[^<>]*',
+   
']*>[^<>]*\b1\b[^<>]*',
)
) . '@s'
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74ec577610ec6846ee0fc7fcbfce5d30d109068f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Format unit as a link in QuantityDetailsFormatter, if possible - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Format unit as a link in QuantityDetailsFormatter, if possible
..

Format unit as a link in QuantityDetailsFormatter, if possible

This should, in my opinion, fix T108808. More clean-up is necesarry,
especially because this heavily conflicts with I5b8ba0f. However, I
suggest to merge *this* patch first. I will rebase I5b8ba0f later.

The logic is as follow: The QuantityDetailsFormatter asks the given
QuantityUnitFormatter to append the unit to an empty string. Three
things can happen:

1. If the result is empty, it was obviously a unitless unit (unually
"1"). The formatter displays the original unit as it is, escaped.

2. If the result is identical to the original unit, QuantityUnitFormatter
obviously failed. Again, the unit is shown as it is, escaped.

3. Otherwise, the unit was obviously a valid concept URI and can be used
as an href="..." in a link. Yes, this means we are encoding a little bit
of knowledge about implementation details of the EntityLabelUnitFormatter
into the QuantityDetailsFormatter. I will fix this in a later patch, after
I5b8ba0f is rebased and merged.

Bug: T108808
Change-Id: I1fccc9254da217481355cbeaccdcf0bbcaa1d288
---
M lib/includes/formatters/QuantityDetailsFormatter.php
M lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
2 files changed, 57 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/15/236515/1

diff --git a/lib/includes/formatters/QuantityDetailsFormatter.php 
b/lib/includes/formatters/QuantityDetailsFormatter.php
index 16dc315..711fa59 100644
--- a/lib/includes/formatters/QuantityDetailsFormatter.php
+++ b/lib/includes/formatters/QuantityDetailsFormatter.php
@@ -22,6 +22,7 @@
  *
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
+ * @author Thiemo Mättig
  */
 class QuantityDetailsFormatter extends ValueFormatterBase {
 
@@ -88,13 +89,19 @@
$this->formatNumber( $value->getUpperBound(), 
$value->getUnit() ) );
$html .= $this->renderLabelValuePair( 'lowerBound',
$this->formatNumber( $value->getLowerBound(), 
$value->getUnit() ) );
-   $html .= $this->renderLabelValuePair( 'unit', htmlspecialchars( 
$value->getUnit() ) );
+   $html .= $this->renderLabelValuePair( 'unit', 
$this->formatUnit( $value->getUnit() ) );
 
$html .= Html::closeElement( 'table' );
 
return $html;
}
 
+   /**
+* @param DecimalValue $number
+* @param string $unit URI
+*
+* @return string HTML
+*/
private function formatNumber( DecimalValue $number, $unit ) {
$text = $this->decimalFormatter->format( $number );
$text = $this->unitFormatter->applyUnit( $unit, $text );
@@ -102,6 +109,22 @@
}
 
/**
+* @param string $unit URI
+*
+* @return string HTML
+*/
+   private function formatUnit( $unit ) {
+   // FIXME: Use VocabularyUriFormatter introduced in 
https://gerrit.wikimedia.org/r/235495
+   $formattedUnit = trim( $this->unitFormatter->applyUnit( $unit, 
'' ) );
+
+   if ( $formattedUnit === '' || $formattedUnit === $unit ) {
+   return htmlspecialchars( $unit );
+   }
+
+   return Html::element( 'a', array( 'href' => $unit ), 
$formattedUnit );
+   }
+
+   /**
 * @param string $fieldName
 * @param string $valueHtml HTML
 *
diff --git a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php 
b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
index 1e7ce71..1187bb1 100644
--- a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
+++ b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
@@ -29,6 +29,11 @@
$unitFormatter->expects( $this->any() )
->method( 'applyUnit' )
->will( $this->returnCallback( function( $unit, 
$numberText ) {
+   if ( $unit === '1' ) {
+   return $numberText;
+   } elseif ( preg_match( 
'@^http://www\.wikidata\.org/entity/(.*)@', $unit, $matches ) ) {
+   $unit = $matches[1];
+   }
return $numberText . ' ' . $unit;
} ) );
 
@@ -62,6 +67,34 @@
)
) . '@s'
),
+   'Unit 1' => array(
+   QuantityValue::newFromNumber( '+5', '1', '+6', 
'+4' ),
+   '@1@'
+   ),

[MediaWiki-commits] [Gerrit] Use mocks in QuantityDetailsFormatterTest - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use mocks in QuantityDetailsFormatterTest
..


Use mocks in QuantityDetailsFormatterTest

This makes the test independent from the BasicQuantityUnitFormatter
class. I'm doing this in preparation for T108808 but submitting it
as a separate patch for easier review.

Bug: T108808
Change-Id: I74ec577610ec6846ee0fc7fcbfce5d30d109068f
---
M lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
1 file changed, 16 insertions(+), 9 deletions(-)

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



diff --git a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php 
b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
index 93b6050..8c5e4f0 100644
--- a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
+++ b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
@@ -5,7 +5,6 @@
 use DataValues\NumberValue;
 use DataValues\QuantityValue;
 use ValueFormatters\BasicNumberLocalizer;
-use ValueFormatters\BasicQuantityUnitFormatter;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
 use Wikibase\Lib\QuantityDetailsFormatter;
@@ -19,15 +18,23 @@
  *
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
+ * @author Thiemo Mättig
  */
 class QuantityDetailsFormatterTest extends \PHPUnit_Framework_TestCase {
 
private function newFormatter( FormatterOptions $options = null ) {
$numberLocalizer = new BasicNumberLocalizer();
-   $unitFormatter = new BasicQuantityUnitFormatter();
-   $formatter = new QuantityDetailsFormatter( $numberLocalizer, 
$unitFormatter, $options );
 
-   return $formatter;
+   $unitFormatter = $this->getMockBuilder( 
'ValueFormatters\QuantityUnitFormatter' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $unitFormatter->expects( $this->any() )
+   ->method( 'applyUnit' )
+   ->will( $this->returnCallback( function( $unit, 
$numberText ) {
+   return $numberText . ' ' . $unit;
+   } ) );
+
+   return new QuantityDetailsFormatter( $numberLocalizer, 
$unitFormatter, $options );
}
 
/**
@@ -51,11 +58,11 @@
$options,
'@' . implode( '.*',
array(
-   
']*>[^<>]*5[^<>]*1[^<>]*',
-   ']*>[^<>]*5[^<>]*',
-   ']*>[^<>]*6[^<>]*',
-   ']*>[^<>]*4[^<>]*',
-   ']*>[^<>]*1[^<>]*',
+   
']*>[^<>]*\b5\b[^<>]*1[^<>]*',
+   
']*>[^<>]*\b5\b[^<>]*',
+   
']*>[^<>]*\b6\b[^<>]*',
+   
']*>[^<>]*\b4\b[^<>]*',
+   
']*>[^<>]*\b1\b[^<>]*',
)
) . '@s'
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74ec577610ec6846ee0fc7fcbfce5d30d109068f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Properly create interwiki redirect titles - change (mediawiki...CirrusSearch)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Properly create interwiki redirect titles
..


Properly create interwiki redirect titles

When rendering interwiki results this wasn't taking the interwiki
prefix into account.

Change-Id: I508531bbfd58b957816cddb1d76606517cd633eb
---
M includes/Search/Result.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, but someone else must approve
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  DCausse: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index df85ecd..04b1bdb 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -190,7 +190,7 @@
);
return null;
}
-   return Title::makeTitleSafe( $best[ 'namespace' ], $best[ 
'title' ] );
+   return Title::makeTitleSafe( $best[ 'namespace' ], $best[ 
'title' ], '', $this->interwiki );
}
 
private function findSectionTitle() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I508531bbfd58b957816cddb1d76606517cd633eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] In LocalFile normalize integer fields to integers - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: In LocalFile normalize integer fields to integers
..


In LocalFile normalize integer fields to integers

File::getWidth() etc. should return an integer not a numeric string.

Bug: T111089
Change-Id: Ic767fb6cf3db0be9810b7bfa369c209ec05a6e58
---
M includes/filerepo/file/LocalFile.php
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Subramanya Sastry: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index 4070553..d2c37e6 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -502,9 +502,17 @@
$decoded['mime'] = $decoded['major_mime'] . '/' . 
$decoded['minor_mime'];
}
 
-   # Trim zero padding from char/binary field
+   // Trim zero padding from char/binary field
$decoded['sha1'] = rtrim( $decoded['sha1'], "\0" );
 
+   // Normalize some fields to integer type, per their database 
definition.
+   // Use unary + so that overflows will be upgraded to double 
instead of
+   // being trucated as with intval(). This is important to allow 
>2GB
+   // files on 32-bit systems.
+   foreach ( array( 'size', 'width', 'height', 'bits' ) as $field 
) {
+   $decoded[$field] = +$decoded[$field];
+   }
+
return $decoded;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic767fb6cf3db0be9810b7bfa369c209ec05a6e58
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Subramanya Sastry 
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 double-escaping issue in QuantityDetailsFormatter - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix double-escaping issue in QuantityDetailsFormatter
..

Fix double-escaping issue in QuantityDetailsFormatter

This fixes an actual bug I found while working on T108808. The HTML
was double escaped. I rework the tests a lot to cover much more cases
and in preperation for what is to follow in the next patches.

Bug: T108808
Change-Id: I10cd2d00ca15e700b60afa3423cf953118234d32
---
M lib/includes/formatters/QuantityDetailsFormatter.php
M lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
2 files changed, 38 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/12/236512/1

diff --git a/lib/includes/formatters/QuantityDetailsFormatter.php 
b/lib/includes/formatters/QuantityDetailsFormatter.php
index cf93bf1..16dc315 100644
--- a/lib/includes/formatters/QuantityDetailsFormatter.php
+++ b/lib/includes/formatters/QuantityDetailsFormatter.php
@@ -45,7 +45,11 @@
 * @param QuantityUnitFormatter $unitFormatter
 * @param FormatterOptions|null $options
 */
-   public function __construct( NumberLocalizer $numberLocalizer, 
QuantityUnitFormatter $unitFormatter, FormatterOptions $options = null ) {
+   public function __construct(
+   NumberLocalizer $numberLocalizer,
+   QuantityUnitFormatter $unitFormatter,
+   FormatterOptions $options = null
+   ) {
parent::__construct( $options );
 
$this->unitFormatter = $unitFormatter;
@@ -99,7 +103,7 @@
 
/**
 * @param string $fieldName
-* @param string $valueHtml
+* @param string $valueHtml HTML
 *
 * @return string HTML for the label/value pair
 */
@@ -108,7 +112,7 @@
 
$html .= Html::element( 'th', array( 'class' => 'wb-quantity-' 
. $fieldName ),
$this->getFieldLabel( $fieldName )->text() );
-   $html .= Html::element( 'td', array( 'class' => 'wb-quantity-' 
. $fieldName ),
+   $html .= Html::rawElement( 'td', array( 'class' => 
'wb-quantity-' . $fieldName ),
$valueHtml );
 
$html .= Html::closeElement( 'tr' );
diff --git a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php 
b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
index 8c5e4f0..1e7ce71 100644
--- a/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
+++ b/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php
@@ -4,9 +4,9 @@
 
 use DataValues\NumberValue;
 use DataValues\QuantityValue;
+use PHPUnit_Framework_TestCase;
 use ValueFormatters\BasicNumberLocalizer;
-use ValueFormatters\FormatterOptions;
-use ValueFormatters\ValueFormatter;
+use ValueFormatters\NumberLocalizer;
 use Wikibase\Lib\QuantityDetailsFormatter;
 
 /**
@@ -20,11 +20,9 @@
  * @author Daniel Kinzler
  * @author Thiemo Mättig
  */
-class QuantityDetailsFormatterTest extends \PHPUnit_Framework_TestCase {
+class QuantityDetailsFormatterTest extends PHPUnit_Framework_TestCase {
 
-   private function newFormatter( FormatterOptions $options = null ) {
-   $numberLocalizer = new BasicNumberLocalizer();
-
+   private function newFormatter( NumberLocalizer $numberLocalizer = null 
) {
$unitFormatter = $this->getMockBuilder( 
'ValueFormatters\QuantityUnitFormatter' )
->disableOriginalConstructor()
->getMock();
@@ -34,28 +32,26 @@
return $numberText . ' ' . $unit;
} ) );
 
-   return new QuantityDetailsFormatter( $numberLocalizer, 
$unitFormatter, $options );
+   return new QuantityDetailsFormatter(
+   $numberLocalizer ?: new BasicNumberLocalizer(),
+   $unitFormatter
+   );
}
 
/**
 * @dataProvider quantityFormatProvider
 */
-   public function testFormat( $value, $options, $pattern ) {
-   $formatter = $this->newFormatter( $options );
+   public function testFormat( $value, $pattern ) {
+   $formatter = $this->newFormatter();
 
$html = $formatter->format( $value );
$this->assertRegExp( $pattern, $html );
}
 
public function quantityFormatProvider() {
-   $options = new FormatterOptions( array(
-   ValueFormatter::OPT_LANG => 'en'
-   ) );
-
return array(
array(
QuantityValue::newFromNumber( '+5', '1', '+6', 
'+4' ),
-   $options,
'@' . implode( '.*',
array(

[MediaWiki-commits] [Gerrit] Use Amercan spelling - change (mediawiki...Gather)

2015-09-07 Thread Purodha (Code Review) 
Purodha has uploaded a new change for review.

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

Change subject: Use Amercan spelling
..

Use Amercan spelling

Change-Id: I73b634369b1be6511f360425b92ee961244038dc
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/17/236517/1

diff --git a/i18n/en.json b/i18n/en.json
index 5db3a5c..2162fd0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -81,7 +81,7 @@
"gather-new-collection-failed-toast": "There was a problem creating 
your \"$1\" list.",
"gather-add-failed-toast": "There was a problem adding the item to your 
\"$1\" list.",
"gather-add-title-invalid-toast": "There was an issue with the title 
you entered. Please try something else",
-   "gather-collection-content-tutorial-heading": "Start a list of your 
favorite interests that you can bookmark for later or share with others.",
+   "gather-collection-content-tutorial-heading": "Start a list of your 
favourite interests that you can bookmark for later or share with others.",
"gather-collection-content-tutorial-subheading": "Or, add this to your 
'''watchlist''' to follow changes to the article.",
"gather-add-to-collection-summary": "{{GENDER:$2|Add}} $1 to a list, a 
list of pages that you can bookmark and share!",
"gather-add-to-collection-confirm": "Start a list",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73b634369b1be6511f360425b92ee961244038dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Purodha 

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

[MediaWiki-commits] [Gerrit] remove BoilerPlate files now in separate extension - change (mediawiki...examples)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: remove BoilerPlate files now in separate extension
..


remove BoilerPlate files now in separate extension

BoilerPlate needs to be a separate top-level extensions/BoilerPlate so
it can participate in Continuous Integration.  I8f7b7cb021 implements
that, making its subdirectory here within extensions/examples obsolete.

Bug: T94279
Change-Id: I3be7b845e8c03d03e5f1dc8cb20856c44263aa88
---
D BoilerPlate/.jscsrc
D BoilerPlate/.jshintrc
D BoilerPlate/BoilerPlate.hooks.php
D BoilerPlate/BoilerPlate.i18n.alias.php
D BoilerPlate/BoilerPlate.php
D BoilerPlate/Gruntfile.js
D BoilerPlate/README
D BoilerPlate/composer.json
D BoilerPlate/i18n/af.json
D BoilerPlate/i18n/ast.json
D BoilerPlate/i18n/bcl.json
D BoilerPlate/i18n/be-tarask.json
D BoilerPlate/i18n/br.json
D BoilerPlate/i18n/ca.json
D BoilerPlate/i18n/ce.json
D BoilerPlate/i18n/da.json
D BoilerPlate/i18n/de.json
D BoilerPlate/i18n/dsb.json
D BoilerPlate/i18n/en-gb.json
D BoilerPlate/i18n/en.json
D BoilerPlate/i18n/eo.json
D BoilerPlate/i18n/es.json
D BoilerPlate/i18n/fa.json
D BoilerPlate/i18n/fi.json
D BoilerPlate/i18n/fo.json
D BoilerPlate/i18n/fr.json
D BoilerPlate/i18n/frp.json
D BoilerPlate/i18n/gl.json
D BoilerPlate/i18n/he.json
D BoilerPlate/i18n/hsb.json
D BoilerPlate/i18n/ht.json
D BoilerPlate/i18n/hu.json
D BoilerPlate/i18n/ia.json
D BoilerPlate/i18n/id.json
D BoilerPlate/i18n/it.json
D BoilerPlate/i18n/ja.json
D BoilerPlate/i18n/kn.json
D BoilerPlate/i18n/ko.json
D BoilerPlate/i18n/ksh.json
D BoilerPlate/i18n/lb.json
D BoilerPlate/i18n/map-bms.json
D BoilerPlate/i18n/mk.json
D BoilerPlate/i18n/mr.json
D BoilerPlate/i18n/ms.json
D BoilerPlate/i18n/mt.json
D BoilerPlate/i18n/nb.json
D BoilerPlate/i18n/nl.json
D BoilerPlate/i18n/oc.json
D BoilerPlate/i18n/pl.json
D BoilerPlate/i18n/pms.json
D BoilerPlate/i18n/ps.json
D BoilerPlate/i18n/pt-br.json
D BoilerPlate/i18n/pt.json
D BoilerPlate/i18n/qqq.json
D BoilerPlate/i18n/roa-tara.json
D BoilerPlate/i18n/ru.json
D BoilerPlate/i18n/si.json
D BoilerPlate/i18n/sv.json
D BoilerPlate/i18n/ta.json
D BoilerPlate/i18n/te.json
D BoilerPlate/i18n/tl.json
D BoilerPlate/i18n/uk.json
D BoilerPlate/i18n/yi.json
D BoilerPlate/i18n/zh-hans.json
D BoilerPlate/i18n/zh-hant.json
D BoilerPlate/modules/ext.BoilerPlate.foo.css
D BoilerPlate/modules/ext.BoilerPlate.foo.js
D BoilerPlate/modules/ext.BoilerPlate.js
D BoilerPlate/package.json
D BoilerPlate/specials/SpecialHelloWorld.php
M Example/Example.php
71 files changed, 1 insertion(+), 841 deletions(-)

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



diff --git a/BoilerPlate/.jscsrc b/BoilerPlate/.jscsrc
deleted file mode 100644
index 9d22e3f..000
--- a/BoilerPlate/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "preset": "wikimedia"
-}
diff --git a/BoilerPlate/.jshintrc b/BoilerPlate/.jshintrc
deleted file mode 100644
index d43c482..000
--- a/BoilerPlate/.jshintrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "es3": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-   "strict": false,
-
-   // Environment
-   "browser": true,
-
-   "globals": {
-   "mw": false,
-   "$": false
-   }
-}
diff --git a/BoilerPlate/BoilerPlate.hooks.php 
b/BoilerPlate/BoilerPlate.hooks.php
deleted file mode 100644
index e96cba0..000
--- a/BoilerPlate/BoilerPlate.hooks.php
+++ /dev/null
@@ -1,11 +0,0 @@
- array( 'HelloWorld' ),
-);
diff --git a/BoilerPlate/BoilerPlate.php b/BoilerPlate/BoilerPlate.php
deleted file mode 100644
index 822af05..000
--- a/BoilerPlate/BoilerPlate.php
+++ /dev/null
@@ -1,60 +0,0 @@
-http://mediawiki.org/wiki/Extension:BoilerPlate
- *
- * @file
- * @ingroup Extensions
- * @author Your Name, 2015
- */
-
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'BoilerPlate',
-   'author' => array(
-   'Your Name',
-   ),
-   'version'  => '0.0.0',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:BoilerPlate',
-   'descriptionmsg' => 'boilerplate-desc',
-   'license-name' => 'MIT',
-);
-
-/* Setup */
-
-// Register files
-$wgAutoloadClasses['BoilerPlateHooks'] = __DIR__ . '/BoilerPlate.hooks.php';
-$wgAutoloadClasses['SpecialHelloWorld'] = __DIR__ . 
'/specials/SpecialHelloWorld.php';
-$wgMessagesDirs['BoilerPlate'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['BoilerPlateAlias'] = __DIR__ . 
'/BoilerPlate.i18n.alias.php';
-
-// Register hooks
-#$wgHooks['NameOfHook'][] = 'BoilerPlateHooks::onNameOfHook';
-
-// Register special pages
-$wgSpecialPages['HelloWorld'] = 'SpecialHelloWorld';
-
-// Register modules
-$wgResourceModules['ext.boilerPlate.foo'] = array(
-   'scripts'

[MediaWiki-commits] [Gerrit] initial release (v 0.1.1) - change (mediawiki...PhpTagsStorage)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: initial release (v 0.1.1)
..


initial release (v 0.1.1)

There are two PhpTags objects:
* Storage
* PageData

Bug: T94872
Change-Id: Idffbdda34a3dae2c7570691f86b263ae3ea7aafb
---
A PhpTagsStorage.hooks.php
A PhpTagsStorage.json
A PhpTagsStorage.php
A i18n/en.json
A i18n/qqq.json
A includes/PageData.php
A includes/Storage.php
A includes/Storage/Field.php
A includes/Storage/PageDataUpdate.php
A includes/Storage/PageTemplatesUpdate.php
A includes/Storage/Schema.php
A includes/Storage/SchemaUpdate.php
A sql/storage.sql
A tests/phpunit/!!!firstInit_Test.php
A tests/phpunit/StorageWikiPage_Test.php
A tests/phpunit/Storage_Test.php
16 files changed, 1,128 insertions(+), 0 deletions(-)

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



diff --git a/PhpTagsStorage.hooks.php b/PhpTagsStorage.hooks.php
new file mode 100644
index 000..59ef574
--- /dev/null
+++ b/PhpTagsStorage.hooks.php
@@ -0,0 +1,93 @@
+
+ * @licence GNU General Public Licence 2.0 or later
+ */
+class PhpTagsStorageHooks {
+
+   /**
+*
+* @return boolean
+*/
+   public static function onParserFirstCallInit() {
+   if ( !defined( 'PHPTAGS_VERSION' ) ) {
+   throw new MWException( "\n\nYou need to have the 
PhpTags extension installed in order to use the PhpTags Storage extension." );
+   }
+   $needVersion = '5.1.4';
+   if ( version_compare( PHPTAGS_VERSION, $needVersion, '<' ) ) {
+   throw new MWException( "\n\nThis version of the PhpTags 
Storage extension requires the PhpTags extension $needVersion or above.\n You 
have " . PHPTAGS_VERSION . ". Please update it." );
+   }
+   if ( PHPTAGS_HOOK_RELEASE != 8 ) {
+   throw new MWException( "\n\nThis version of the PhpTags 
Storage extension is outdated and not compatible with current version of the 
PhpTags extension.\n Please update it." );
+   }
+   return true;
+   }
+
+   /**
+*
+* @return boolean
+*/
+   public static function onPhpTagsRuntimeFirstInit() {
+   \PhpTags\Hooks::addJsonFile( __DIR__ . '/PhpTagsStorage.json', 
PHPTAGS_STORAGE_VERSION );
+   return true;
+   }
+
+   /**
+*
+* @param \Title $title
+* @param \Content $old
+* @param bool $recursive
+* @param \ParserOutput $parserOutput
+* @param array $updates
+* @return boolean
+*/
+   public static function onSecondaryDataUpdates( $title, $old, 
$recursive, $parserOutput, &$updates ) {
+   wfDebugLog( 'PhpTags Storage', __METHOD__ );
+// echo __METHOD__ . '( ' . $title->getArticleID() . " )\n";
+   \PhpTagsObjects\Storage::onDataUpdates( $title->getArticleID(), 
$updates );
+   return true;
+   }
+
+   /**
+*
+* @param \WikiPage $page
+* @param type $content
+* @param array $updates
+*/
+   public static function onWikiPageDeletionUpdates( $page, $content, 
&$updates ) {
+   wfDebugLog( 'PhpTags Storage', __METHOD__ );
+   $titleID = $page->getTitle()->getArticleID();
+// echo __METHOD__ . '( ' . $titleID . " )\n";
+   PhpTagsStorage\Schema::onPageDelete( $titleID );
+   PhpTagsObjects\Storage::onDataUpdates( $titleID, $updates );
+   }
+
+   public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater ) {
+   $updater->addExtensionTable( 'phptags_schemas', __DIR__ . 
'/sql/storage.sql' );
+   $updater->addExtensionTable( 'phptags_page_templates', __DIR__ 
. '/sql/storage.sql' );
+   return true;
+   }
+
+   /**
+*
+* @param array $files
+* @return boolean
+*/
+   public static function onUnitTestsList( &$files ) {
+   $testDir = __DIR__ . '/tests/phpunit';
+   $files = array_merge( $files, glob( "$testDir/*Test.php" ) );
+   return true;
+   }
+
+   public static function onParserTestTables( &$tables ) {
+   $tables[] = 'phptags_schemas';
+   $tables[] = 'phptags_page_templates';
+   }
+
+}
diff --git a/PhpTagsStorage.json b/PhpTagsStorage.json
new file mode 100644
index 000..5d8fef2
--- /dev/null
+++ b/PhpTagsStorage.json
@@ -0,0 +1,48 @@
+{
+   "objects": {
+   "Storage": {
+   "class": "Storage",
+   "METHODS": {
+   "__construct": {
+   "parameters": [
+   { "type": "array", "name": 
"structure" }
+   ],
+

[MediaWiki-commits] [Gerrit] In namespaceDupes.php, fix link tables - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: In namespaceDupes.php, fix link tables
..


In namespaceDupes.php, fix link tables

* Fix link destinations where a link was previously made to the
  pseudo-namespace. Don't do this for --source-pseudo-namespace since it
  only makes sense when the PDBK is essentially unchanged.
* Update pl_from_namespace, il_from_namespace and tl_from_namespace when
  moving a page.
* Run LinksDeletionUpdate::doUpdate() when deleting a page, so that
  referential integrity is preserved.

Change-Id: I584ead93d6267d1a2928ecbcdf8a4cd8e5aeef94
---
M maintenance/namespaceDupes.php
1 file changed, 167 insertions(+), 23 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  Reedy: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 96e01fe..088f677 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -39,8 +39,11 @@
 */
protected $db;
 
-   private $resolvableCount = 0;
+   private $resolvablePages = 0;
private $totalPages = 0;
+
+   private $resolvableLinks = 0;
+   private $totalLinks = 0;
 
public function __construct() {
parent::__construct();
@@ -172,7 +175,43 @@
}
 
$this->output( "{$this->totalPages} pages to fix, " .
-   "{$this->resolvableCount} were resolvable.\n" );
+   "{$this->resolvablePages} were resolvable.\n\n" );
+
+   foreach ( $spaces as $name => $ns ) {
+   if ( $ns != 0 ) {
+   // Fix up link destinations for non-interwiki 
links only.
+   //
+   // For example if a page has [[Foo:Bar]] and 
then a Foo namespace
+   // is introduced, pagelinks needs to be updated 
to have
+   // page_namespace = NS_FOO.
+   //
+   // If instead an interwiki prefix was 
introduced called "Foo",
+   // the link should instead be moved to the 
iwlinks table. If a new
+   // language is introduced called "Foo", or if 
there is a pagelink
+   // [[fr:Bar]] when interlanguage magic links 
are turned on, the
+   // link would have to be moved to the langlinks 
table. Let's put
+   // those cases in the too-hard basket for now. 
The consequences are
+   // not especially severe.
+   //
+   // @fixme Handle interwiki links, and pagelinks 
to Category:, File:
+   // which probably need reparsing.
+
+   $this->checkLinkTable( 'pagelinks', 'pl', $ns, 
$name, $options );
+   $this->checkLinkTable( 'templatelinks', 'tl', 
$ns, $name, $options );
+
+   // The redirect table has interwiki links 
randomly mixed in, we
+   // need to filter those out. For example 
[[w:Foo:Bar]] would
+   // have rd_interwiki=w and rd_namespace=0, 
which would match the
+   // query for a conflicting namespace "Foo" if 
filtering wasn't done.
+   $this->checkLinkTable( 'redirect', 'rd', $ns, 
$name, $options,
+   array( 'rd_interwiki' => null ) );
+   $this->checkLinkTable( 'redirect', 'rd', $ns, 
$name, $options,
+   array( 'rd_interwiki' => '' ) );
+   }
+   }
+
+   $this->output( "{$this->totalLinks} links to fix, " .
+   "{$this->resolvableLinks} were resolvable.\n" );
 
return $ok;
}
@@ -215,7 +254,8 @@
 
// Find the new title and determine the action to take
 
-   $newTitle = $this->getDestinationTitle( $ns, $name, 
$row, $options );
+   $newTitle = $this->getDestinationTitle( $ns, $name,
+   $row->page_namespace, $row->page_title, 
$options );
$logStatus = false;
if ( !$newTitle ) {
$logStatus = 'invalid title';
@@ -271,24 +311,99 @@
$newTitle->getPrefixedDBkey() . 
" (merge)$dryRunNote\n" );
 
if ( $options['fix'] ) {
-   $pageOK = $this->mergePage( 
$row->page_id, $newTitle );
+

[MediaWiki-commits] [Gerrit] Fix and test JSON API output - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix and test JSON API output
..


Fix and test JSON API output

In ResultBuilder::addTermList() and ResultBuilder::addRemovedTerm()
set array type to 'kvp' with $kvpKeyName = 'language', and
ApiResult::META_KVP_MERGE = true, like LabelsChanger
and DescriptionsChanger expect it to be.

Abstract some methods out of ApiXmlFormatTest into ApiFormatTestCase,
extended by ApiJsonFormatTest.

Change-Id: If8830bb76a685ef45a94c869e94e051db88866e7
---
M repo/includes/api/ResultBuilder.php
A repo/tests/phpunit/data/api/setlabel-removed.json
A repo/tests/phpunit/data/api/setlabel.json
A repo/tests/phpunit/includes/api/ApiFormatTestCase.php
A repo/tests/phpunit/includes/api/ApiJsonFormatTest.php
M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
6 files changed, 256 insertions(+), 88 deletions(-)

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



diff --git a/repo/includes/api/ResultBuilder.php 
b/repo/includes/api/ResultBuilder.php
index c7ce9fe..707aa8b 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -646,6 +646,10 @@
private function addTermList( TermList $termList, $name, $tag, $path ) {
$serializer = $this->serializerFactory->newTermListSerializer();
$value = $serializer->serialize( $termList );
+   if ( $this->addMetaData ) {
+   ApiResult::setArrayType( $value, 'kvp', 'language' );
+   $value[ApiResult::META_KVP_MERGE] = true;
+   }
$this->setList( $path, $name, $value, $tag );
}
 
@@ -662,6 +666,10 @@
'removed' => '',
)
);
+   if ( $this->addMetaData ) {
+   ApiResult::setArrayType( $value, 'kvp', 'language' );
+   $value[ApiResult::META_KVP_MERGE] = true;
+   }
$this->setList( $path, $name, $value, $tag );
}
 
diff --git a/repo/tests/phpunit/data/api/setlabel-removed.json 
b/repo/tests/phpunit/data/api/setlabel-removed.json
new file mode 100644
index 000..f0f873d
--- /dev/null
+++ b/repo/tests/phpunit/data/api/setlabel-removed.json
@@ -0,0 +1,13 @@
+{
+   "entity": {
+   "labels": {
+   "en-gb": {
+   "language": "en-gb",
+   "removed": ""
+   }
+   },
+   "id": "$itemIdUnderTest",
+   "type": "item"
+   },
+   "success": 1
+}
diff --git a/repo/tests/phpunit/data/api/setlabel.json 
b/repo/tests/phpunit/data/api/setlabel.json
new file mode 100644
index 000..5f9b4fe
--- /dev/null
+++ b/repo/tests/phpunit/data/api/setlabel.json
@@ -0,0 +1,13 @@
+{
+   "entity": {
+   "labels": {
+   "en-gb": {
+   "language": "en-gb",
+   "value": "enGbLabel"
+   }
+   },
+   "id": "$itemIdUnderTest",
+   "type": "item"
+   },
+   "success": 1
+}
diff --git a/repo/tests/phpunit/includes/api/ApiFormatTestCase.php 
b/repo/tests/phpunit/includes/api/ApiFormatTestCase.php
new file mode 100644
index 000..418121f
--- /dev/null
+++ b/repo/tests/phpunit/includes/api/ApiFormatTestCase.php
@@ -0,0 +1,115 @@
+
+ * @author Adam Shorland
+ */
+abstract class ApiFormatTestCase extends \MediaWikiTestCase {
+
+   /**
+* @var PropertyId|null
+*/
+   protected $lastPropertyId;
+
+   /**
+* @var PropertyId|null
+*/
+   protected $lastItemId;
+
+   /**
+* @param string $moduleClass
+* @param string $moduleName
+* @param array $params
+* @param bool $needsToken
+*
+* @return ApiMain
+*/
+   protected function getApiModule( $moduleClass, $moduleName, array 
$params, $needsToken = false ) {
+   global $wgUser;
+
+   if ( $needsToken ) {
+   $params['token'] = $wgUser->getEditToken();
+   }
+   $request = new FauxRequest( $params, true );
+   $main = new ApiMain( $request );
+
+   return new $moduleClass( $main, $moduleName );
+   }
+
+   protected function getNewEntityRevision( $withData = false ) {
+   $entityRevision = $this->storeNewItem();
+
+   if ( $withData ) {
+   $this->storeNewProperty();
+   $entityRevision = $this->storePresetDataInStatement( 
$entityRevision, $this->lastPropertyId );
+   }
+
+   return $entityRevision;
+   }
+
+   protected function storeNewProperty() {
+   global $wgUser;
+
+

[MediaWiki-commits] [Gerrit] Phase out {name}-npm job template - change (integration/config)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Phase out {name}-npm job template
..


Phase out {name}-npm job template

The template has been deprecated in favor of the 'npm' job. The last
usage is for mediawiki/core.

Move the template to mediawiki.yaml
Rename it 'mediawiki-core-npm'
Adjust the project list of jobs

No configuration changes.

Will let me disable submodule processing (T103014).

Change-Id: If6b450860bc5c992aa71445738445de860579907
---
M jjb/job-templates.yaml
M jjb/mediawiki.yaml
2 files changed, 14 insertions(+), 15 deletions(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 16eaa76..6e63745 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -68,20 +68,6 @@
 builders:
  - jsduck
 
-# Deprecated non-generic npm job. Use the
-# generic 'npm' job below.
-- job-template:
-name: '{name}-npm'
-node: contintLabsSlave && UbuntuTrusty
-defaults: use-remoteonly-zuul
-concurrent: true
-triggers:
- - zuul
-builders:
- - npm
-publishers:
- - global-teardown
-
 - job:
 name: 'npm'
 node: contintLabsSlave && UbuntuTrusty
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 28fff8b..81938f7 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -18,6 +18,19 @@
  - jsonlint
 
 - job-template:
+name: 'mediawiki-core-npm'
+node: contintLabsSlave && UbuntuTrusty
+defaults: use-remoteonly-zuul
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - npm
+publishers:
+ - global-teardown
+
+
+- job-template:
 name: 'mediawiki-core-qunit'
 node: contintLabsSlave && UbuntuTrusty
 concurrent: true
@@ -331,7 +344,7 @@
   - 'mediawiki-core-jslint'
   - 'mediawiki-core-qunit'
   - 'mediawiki-core-jsduck'
-  - '{name}-npm'
+  - 'mediawiki-core-npm'
   - 'mediawiki-core-jsduck-publish'
   - 'mediawiki-core-doxygen-publish'
   - mediawiki-gate

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6b450860bc5c992aa71445738445de860579907
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix typo in en.json - change (mediawiki...SmiteSpam)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix typo in en.json
..


Fix typo in en.json

Change-Id: I0a7ced92e34c74dab5f4196cff571ff913691b25
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index a1af1b2..92db1d2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,7 +21,7 @@
"smitespamtrustedusers": "SmiteSpam trusted users",
"smitespam-already-trusted": "User \"$1\" already 
{{GENDER:$1|trusted}}.",
"smitespam-trusted-user-message": "Trusted {{GENDER:$1|user}} \"$1\".",
-   "smitespam-userdoesnotexist": "((GENDER:$1|User}} \"$1\" does not 
exist.",
+   "smitespam-userdoesnotexist": "{{GENDER:$1|User}} \"$1\" does not 
exist.",
"smitespam-add-user-label": "Add user:",
"smitespam-trust": "Trust",
"smitespam-trusted": "Trusted",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a7ced92e34c74dab5f4196cff571ff913691b25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmiteSpam
Gerrit-Branch: master
Gerrit-Owner: Polybuildr 
Gerrit-Reviewer: Polybuildr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] SmartList: Fixed issue with whitspace on category filter - change (mediawiki...BlueSpiceExtensions)

2015-09-07 Thread Dvogel hallowelt (Code Review) 
Dvogel hallowelt has uploaded a new change for review.

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

Change subject: SmartList: Fixed issue with whitspace on category filter
..

SmartList: Fixed issue with whitspace on category filter

makeCategoriesFilterCondition: categorie names trimmed and whitespace
replaced with underscore.

Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
---
M SmartList/SmartList.class.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/14/236514/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 0390363..ff41b73 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -803,7 +803,6 @@
} elseif( $aArgs['mode'] == 'whatlinkshere' ) {
//PW(25.02.2015) TODO:
//There could be filters - see Special:Whatlinkshere
-
$oTargetTitle = empty( $aArgs['target'] )
? $this->getContext()->getTitle()
: Title::newFromText( $aArgs['target'] )
@@ -1326,8 +1325,8 @@
$aCategories = explode( ',', $aArgs['categories'] );
$iCnt = count( $aCategories );
for ( $i = 0; $i < $iCnt; $i++ ) {
-   $aCategories[$i] = str_replace( ' ', '_', 
$aCategories[$i] );
-   $aCategories[$i] = "'" . trim( ucfirst( 
$aCategories[$i] ) ) . "'";
+   $sName = Category::newFromName(trim( 
$aCategories[$i] ))->getName();
+   $aCategories[$i] = "'" . $sName. "'" ;
}
$aArgs['categories'] = implode( ',', $aCategories );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] MediaWiki Theme: Replace triangle arrow indicators with chev... - change (oojs/ui)

2015-09-07 Thread Prtksxna (Code Review) 
Prtksxna has uploaded a new change for review.

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

Change subject: MediaWiki Theme: Replace triangle arrow indicators with chevrons
..

MediaWiki Theme: Replace triangle arrow indicators with chevrons

The designs for the DropDownWidget in M55, and for ComboBoxWidget in
M54 use a different down arrow indicator than what we have currently.

Bug: T111550
Change-Id: I92d96671ffa0b60f7d38ce01e8e2561121fceb76
---
M src/themes/mediawiki/images/indicators/arrow-down.svg
M src/themes/mediawiki/images/indicators/arrow-ltr.svg
M src/themes/mediawiki/images/indicators/arrow-rtl.svg
M src/themes/mediawiki/images/indicators/arrow-up.svg
M src/themes/mediawiki/tools.less
5 files changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/18/236518/1

diff --git a/src/themes/mediawiki/images/indicators/arrow-down.svg 
b/src/themes/mediawiki/images/indicators/arrow-down.svg
index f5c76f3..0e00e24 100644
--- a/src/themes/mediawiki/images/indicators/arrow-down.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-down.svg
@@ -1,6 +1,6 @@
 
-http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 24 
24">
 
-
+
 
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-ltr.svg 
b/src/themes/mediawiki/images/indicators/arrow-ltr.svg
index 059372d..e14712f 100644
--- a/src/themes/mediawiki/images/indicators/arrow-ltr.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-ltr.svg
@@ -1,6 +1,6 @@
 
-http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 24 
24">
 
-
+
 
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-rtl.svg 
b/src/themes/mediawiki/images/indicators/arrow-rtl.svg
index c6498e8..000857c 100644
--- a/src/themes/mediawiki/images/indicators/arrow-rtl.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-rtl.svg
@@ -1,6 +1,6 @@
 
-http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 24 
24">
 
-
+
 
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-up.svg 
b/src/themes/mediawiki/images/indicators/arrow-up.svg
index 5eada07..876321a 100644
--- a/src/themes/mediawiki/images/indicators/arrow-up.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-up.svg
@@ -1,6 +1,6 @@
 
-http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 24 
24">
 
-
+
 
 
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index e4789f5..20a291a 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -245,7 +245,6 @@
margin: 0.78125em 0.5em;
top: 0;
right: 0;
-   opacity: 0.3;
 
.oo-ui-toolbar-narrow & {
right: -0.3125em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92d96671ffa0b60f7d38ce01e8e2561121fceb76
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] [FEAT] upload: Scan directory non-recursively - change (pywikibot/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: [FEAT] upload: Scan directory non-recursively
..


[FEAT] upload: Scan directory non-recursively

Adds an `-recursive` option to scan a directory recursively (the current
default state) and otherwise it just scans the files in a directory.

Change-Id: I5127196ac2554cebd56286bb18b182b4999625b6
---
M scripts/upload.py
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/scripts/upload.py b/scripts/upload.py
index 29eaf4a..fbf4c10 100755
--- a/scripts/upload.py
+++ b/scripts/upload.py
@@ -27,6 +27,8 @@
 is defined for all. It will also require a valid file name and
 description. It'll only overwrite files if -ignorewarn includes
 the 'exists' warning.
+  -recursiveWhen the filename is a directory it also uploads the files from
+the subdirectories.
 
 It is possible to combine -abortonwarn and -ignorewarn so that if the specific
 warning is given it won't apply the general one but more specific one. So if it
@@ -513,6 +515,7 @@
 chunk_size = 0
 chunk_size_regex = r'^-chunked(?::(\d+(?:\.\d+)?)[ \t]*(k|ki|m|mi)?b?)?$'
 chunk_size_regex = re.compile(chunk_size_regex, re.I)
+recursive = False
 
 # process all global bot args
 # returns a list of non-global args, i.e. args for upload.py
@@ -522,6 +525,8 @@
 keepFilename = True
 always = True
 verifyDescription = False
+elif arg == '-recursive':
+recursive = True
 elif arg.startswith('-keep'):
 keepFilename = True
 elif arg.startswith('-filename:'):
@@ -598,6 +603,9 @@
 if os.path.isdir(url):
 file_list = []
 for directory_info in os.walk(url):
+if not recursive:
+# Do not visit any subdirectories
+directory_info[1][:] = []
 for dir_file in directory_info[2]:
 file_list.append(os.path.join(directory_info[0], dir_file))
 url = file_list

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5127196ac2554cebd56286bb18b182b4999625b6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve wording of imageinfo API userid prop - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Improve wording of imageinfo API userid prop
..


Improve wording of imageinfo API userid prop

Per 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-query%2Bimageinfo-paramvalue-prop-userid/en

Change-Id: I9a9fd4e7b6ec09d7cc2becdfd0195a7e993176c9
---
M includes/api/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 396f5da..425e062 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -725,7 +725,7 @@
"apihelp-query+imageinfo-param-prop": "Which file information to get:",
"apihelp-query+imageinfo-paramvalue-prop-timestamp": "Adds timestamp 
for the uploaded version.",
"apihelp-query+imageinfo-paramvalue-prop-user": "Adds the user who 
uploaded each file version.",
-   "apihelp-query+imageinfo-paramvalue-prop-userid": "Add the user ID that 
uploaded each file version.",
+   "apihelp-query+imageinfo-paramvalue-prop-userid": "Add the ID of the 
user that uploaded each file version.",
"apihelp-query+imageinfo-paramvalue-prop-comment": "Comment on the 
version.",
"apihelp-query+imageinfo-paramvalue-prop-parsedcomment": "Parse the 
comment on the version.",
"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "Adds the 
canonical title of the file.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a9fd4e7b6ec09d7cc2becdfd0195a7e993176c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stats: Separate total and language graph, and show draft cou... - change (mediawiki...ContentTranslation)

2015-09-07 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

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

Change subject: Stats: Separate total and language graph, and show draft count 
in graph
..

Stats: Separate total and language graph, and show draft count in graph

This is in preparation for showing deletion stats and weekly trend
graphs.

Showing both total and language specific stats is difficult to
understand because the difference is widening fast. So separated them.

ApiQueryContentTranslationLanguageTrend now return cumulative count
for translations in progress as well. Soon it should retun
cumulative deleted stats too.

Bug: T105192
Bug: T90538
Change-Id: Ifd4bd0e3a92ac022428edf3915552ea99142dbfb
---
M api/ApiQueryContentTranslationLanguageTrend.php
M includes/Translation.php
M modules/stats/ext.cx.stats.js
M modules/stats/styles/ext.cx.stats.less
4 files changed, 196 insertions(+), 47 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/29/236529/1

diff --git a/api/ApiQueryContentTranslationLanguageTrend.php 
b/api/ApiQueryContentTranslationLanguageTrend.php
index cd5bf33..e8b9e43 100644
--- a/api/ApiQueryContentTranslationLanguageTrend.php
+++ b/api/ApiQueryContentTranslationLanguageTrend.php
@@ -32,7 +32,10 @@
$result->addValue(
array( 'query' ),
'contenttranslationlangtrend',
-   ContentTranslation\Translation::getTrend( $source, 
$target, $interval )
+   array(
+   'translations' => 
ContentTranslation\Translation::getPublishTrend( $source, $target, $interval ),
+   'drafts' => 
ContentTranslation\Translation::getDraftTrend( $source, $target, $interval )
+   )
);
}
 
diff --git a/includes/Translation.php b/includes/Translation.php
index c0a7c98..59c4a2d 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -211,10 +211,90 @@
}
 
/**
+* Get time-wise cumulative number of drafts for given
+* language pairs, with given interval.
+*/
+   public static function getDraftTrend( $source, $target, $interval ) {
+   $dbr = Database::getConnection( DB_SLAVE );
+
+   $draftCondition = $dbr->makeList(
+   array(
+   'translation_status' => 'draft',
+   'translation_target_url IS NULL'
+   ),
+   LIST_AND
+   );
+
+   $groupBy = null;
+
+   if ( $interval === 'week' ) {
+   $groupBy = array(
+   'GROUP BY' => array(
+   
'YEARWEEK(translation_last_updated_timestamp)',
+   ),
+   );
+   } elseif ( $interval === 'month' ) {
+   $groupBy = array(
+   'GROUP BY' => array(
+   
'YEAR(translation_last_updated_timestamp), 
MONTH(translation_last_updated_timestamp)',
+   ),
+   );
+   }
+
+   $conditions = array( $draftCondition );
+
+   if ( $source !== null ) {
+   $conditions['translation_source_language'] = $source;
+   }
+
+   if ( $target !== null ) {
+   $conditions['translation_target_language'] = $target;
+   }
+
+   $rows = $dbr->select(
+   array( 'translations' => 'cx_translations' ),
+   array(
+   "DATE_FORMAT( 
translations.translation_last_updated_timestamp, '%Y-%m-%d' ) AS date",
+   '(' . $dbr->selectSQLText(
+   'cx_translations',
+   'count(*)',
+   $dbr->makeList( array(
+   
'translation_last_updated_timestamp <= 
MAX(translations.translation_last_updated_timestamp)',
+   $dbr->makeList( $conditions, 
LIST_AND ),
+   ),
+   LIST_AND )
+   ) . ') translatons_count',
+   ),
+   $dbr->makeList( $conditions, LIST_AND ),
+   __METHOD__,
+   $groupBy
+   );
+
+   $prev = 0;
+   $result = array();
+   foreach ( $rows as $row ) {
+   $count = (int)$row->translatons_count;
+   $result[] = array(
+

[MediaWiki-commits] [Gerrit] WIP: Deletion count graph - change (mediawiki...ContentTranslation)

2015-09-07 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

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

Change subject: WIP: Deletion count graph
..

WIP: Deletion count graph

Change-Id: I8581d07c00dac6228ba5cc8b465acf431a1163e3
---
M api/ApiQueryContentTranslationLanguageTrend.php
M includes/Translation.php
M modules/stats/ext.cx.stats.js
3 files changed, 81 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/38/236538/1

diff --git a/api/ApiQueryContentTranslationLanguageTrend.php 
b/api/ApiQueryContentTranslationLanguageTrend.php
index db17780..3aff780 100644
--- a/api/ApiQueryContentTranslationLanguageTrend.php
+++ b/api/ApiQueryContentTranslationLanguageTrend.php
@@ -35,7 +35,8 @@
array(
'translations' =>

ContentTranslation\Translation::getPublishTrend( $source, $target, $interval ),
-   'drafts' => 
ContentTranslation\Translation::getDraftTrend( $source, $target, $interval )
+   'drafts' => 
ContentTranslation\Translation::getDraftTrend( $source, $target, $interval ),
+   'deletions' =>  
ContentTranslation\Translation::getDeletionTrend( $interval )
)
);
}
diff --git a/includes/Translation.php b/includes/Translation.php
index 59c4a2d..cae0cfc 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -291,6 +291,62 @@
}
 
/**
+* Get time-wise cumulative number of drafts for given
+* language pairs, with given interval.
+*/
+   public static function getDeletionTrend( $interval ) {
+   $dbr = wfGetDB( DB_SLAVE );
+
+   $conditions = array(
+   'ar_namespace' => 0,
+   'ct_tag' => 'contenttranslation',
+   'ar_rev_id = ct_rev_id'
+   );
+   $groupBy = null;
+
+   if ( $interval === 'week' ) {
+   $groupBy = array(
+   'GROUP BY' => array(
+   'YEARWEEK(ar_timestamp)',
+   ),
+   );
+   } elseif ( $interval === 'month' ) {
+   $groupBy = array(
+   'GROUP BY' => array(
+   'YEAR(ar_timestamp), 
MONTH(ar_timestamp)',
+   ),
+   );
+   }
+
+   $rows = $dbr->select(
+   array( 'change_tag', 'archive' ),
+   array( 'ar_timestamp', 'count(ar_page_id) as count' ),
+   $conditions,
+   __METHOD__,
+   $groupBy
+   );
+
+   $prev = 0;
+   $count = 0;
+   $result = array();
+   foreach ( $rows as $row ) {
+   $count += (int)$row->count;
+   $result[] = array(
+   'date' => $interval === 'week' ?
+   // Week end date
+   date( 'Y-m-d', strtotime( 
$row->ar_timestamp . ' + ' .
+   ( 6 - date( 'w', strtotime( 
$row->ar_timestamp ) ) ) . ' days' ) ) :
+   date( 'Y-m', strtotime( 
$row->ar_timestamp ) ),
+   'count' => $count,
+   'delta' => $count - $prev,
+   );
+   $prev = $count;
+   }
+
+   return $result;
+   }
+
+   /**
 * Get time-wise cumulative number of translations for given
 * language pairs, with given interval.
 */
diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js
index 769cba3..6b46e22 100644
--- a/modules/stats/ext.cx.stats.js
+++ b/modules/stats/ext.cx.stats.js
@@ -67,6 +67,7 @@
self.totalDraftTrend = mergeAndFill( 
self.totalTranslationTrend, totalTrend.drafts );
self.languageDraftTrend = mergeAndFill( 
self.languageTranslationTrend, languageTrend.drafts );
self.languageDraftTrend = mergeAndFill( 
self.totalDraftTrend, self.languageDraftTrend );
+   self.languageDeletionTrend = mergeAndFill( 
self.languageTranslationTrend, totalTrend.deletions );
self.renderHighlights();
self.drawCumulativeGraph( 'count' );
self.drawLanguageCumulativeGraph( 'count' );
@@ -499,6 +500,28 @@
} ),
datasets: [

[MediaWiki-commits] [Gerrit] Fix bug in jquery.ui.TemplatedWidget.tests.js - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix bug in jquery.ui.TemplatedWidget.tests.js
..

Fix bug in jquery.ui.TemplatedWidget.tests.js

This was found by JSHint 2.9. This is split from Iebe5ce9.

Change-Id: Ia7d67360ce3fde1fd6e23a1ca2027ee21f85768a
---
M view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/42/236542/1

diff --git a/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js 
b/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
index dab7e11..265100d 100644
--- a/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
+++ b/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
@@ -22,8 +22,9 @@
 
/**
 * @param {Object} templateShortCuts
+* @param {jQuery} $subject
 */
-   function checkShortCuts( templateShortCuts ) {
+   function checkShortCuts( templateShortCuts, $subject ) {
$.each( templateShortCuts, function( key, selector ) {
assert.ok(
$subject.data( 'TemplatedWidget' )[key] 
instanceof $,
@@ -57,7 +58,7 @@
);
 
if( testSets[i][1].templateShortCuts ) {
-   checkShortCuts( testSets[i][1].templateShortCuts );
+   checkShortCuts( testSets[i][1].templateShortCuts, 
$subject );
}
 
$subject.data( 'TemplatedWidget' ).destroy();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7d67360ce3fde1fd6e23a1ca2027ee21f85768a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] build: Upgrade to jscs 2.1.0 - change (mediawiki...MassMessage)

2015-09-07 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: build: Upgrade to jscs 2.1.0
..

build: Upgrade to jscs 2.1.0

...but don't require spaces inside of square brackets.

* content.js: Use dot syntax to set properties
* special.js: Move var declaration to top of function

Change-Id: If6e6d8e156ca73a4f61a116f8372ce7c609e7bf5
---
M .jscsrc
M modules/ext.MassMessage.content.js
M modules/ext.MassMessage.special.js
M package.json
4 files changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage 
refs/changes/21/236521/1

diff --git a/.jscsrc b/.jscsrc
index 9d22e3f..fa4cac9 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,3 +1,5 @@
 {
-   "preset": "wikimedia"
+   "preset": "wikimedia",
+   "disallowSpacesInsideBrackets": true,
+   "requireSpacesInsideBrackets": false
 }
diff --git a/modules/ext.MassMessage.content.js 
b/modules/ext.MassMessage.content.js
index 03bfa9d..51576c5 100644
--- a/modules/ext.MassMessage.content.js
+++ b/modules/ext.MassMessage.content.js
@@ -21,7 +21,7 @@
title: title
};
if ( missing ) {
-   targetAttribs['class'] = 'new';
+   targetAttribs.class = 'new';
}
targetLink = mw.html.element( 'a', 
targetAttribs, title );
} else {
diff --git a/modules/ext.MassMessage.special.js 
b/modules/ext.MassMessage.special.js
index a3d17c4..05c1bd1 100644
--- a/modules/ext.MassMessage.special.js
+++ b/modules/ext.MassMessage.special.js
@@ -2,16 +2,15 @@
$( function () {
'use strict';
 
-   // Limit edit summaries to 240 bytes
-   // Modified from 
mediawiki-core/resources/mediawiki.special/mediawiki.special.movePage.js
-   $( '#mw-massmessage-form-subject' ).byteLimit();
-
// Dynamic page title validation
var $spamlist = $( '#mw-massmessage-form-spamlist' ),
$spamliststatus = $( '' )
.attr( 'id', 
'mw-massmessage-form-spamlist-status' )
.insertAfter( $spamlist );
 
+   // Limit edit summaries to 240 bytes
+   $( '#mw-massmessage-form-subject' ).byteLimit();
+
function checkPageTitle() {
var api = new mw.Api(),
pagetitle = $spamlist.val();
diff --git a/package.json b/package.json
index 93beca9..064530e 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.2",
 "grunt-banana-checker": "0.2.2",
-"grunt-jscs": "1.8.0",
+"grunt-jscs": "2.1.0",
 "grunt-jsonlint": "1.0.4"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6e6d8e156ca73a4f61a116f8372ce7c609e7bf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] build: Upgrade jscs to 2.1.0 - change (mediawiki...UrlShortener)

2015-09-07 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: build: Upgrade jscs to 2.1.0
..

build: Upgrade jscs to 2.1.0

Change-Id: I0a110fec18d466489f35ca9b7adb480066538bbf
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UrlShortener 
refs/changes/24/236524/1

diff --git a/package.json b/package.json
index 108147a..4e0a774 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.2.2",
-"grunt-jscs": "1.8.0",
+"grunt-jscs": "2.1.0",
 "grunt-jsonlint": "1.0.4",
 "grunt-tyops": "0.1.0"
   }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a110fec18d466489f35ca9b7adb480066538bbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] SmartList: Fixed issue with whitspace on category filter - change (mediawiki...BlueSpiceExtensions)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: SmartList: Fixed issue with whitspace on category filter
..


SmartList: Fixed issue with whitspace on category filter

makeCategoriesFilterCondition: categorie names trimmed and whitespace
replaced with underscore.

patchset2: removing illegal category names

Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
---
M SmartList/SmartList.class.php
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 13efda7..2bb18ec 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -808,7 +808,6 @@
} elseif( $aArgs['mode'] == 'whatlinkshere' ) {
//PW(25.02.2015) TODO:
//There could be filters - see Special:Whatlinkshere
-
$oTargetTitle = empty( $aArgs['target'] )
? $this->getContext()->getTitle()
: Title::newFromText( $aArgs['target'] )
@@ -1333,8 +1332,12 @@
$aCategories = explode( ',', $aArgs['categories'] );
$iCnt = count( $aCategories );
for ( $i = 0; $i < $iCnt; $i++ ) {
-   $aCategories[$i] = str_replace( ' ', '_', 
$aCategories[$i] );
-   $aCategories[$i] = "'" . trim( ucfirst( 
$aCategories[$i] ) ) . "'";
+   $oCategory = Category::newFromName( trim( 
$aCategories[$i] ) );
+   if( $oCategory === false ) {
+   unset( $aCategories[$i] );
+   continue;
+   }
+   $aCategories[$i] = "'" . $oCategory->getName() 
. "'" ;
}
$aArgs['categories'] = implode( ',', $aCategories );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] SmartList: Fixed issue with whitspace on category filter - change (mediawiki...BlueSpiceExtensions)

2015-09-07 Thread Tweichart (Code Review) 
Tweichart has uploaded a new change for review.

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

Change subject: SmartList: Fixed issue with whitspace on category filter
..

SmartList: Fixed issue with whitspace on category filter

makeCategoriesFilterCondition: categorie names trimmed and whitespace
replaced with underscore.

patchset2: removing illegal category names

Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
---
M SmartList/SmartList.class.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/25/236525/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 13efda7..2bb18ec 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -808,7 +808,6 @@
} elseif( $aArgs['mode'] == 'whatlinkshere' ) {
//PW(25.02.2015) TODO:
//There could be filters - see Special:Whatlinkshere
-
$oTargetTitle = empty( $aArgs['target'] )
? $this->getContext()->getTitle()
: Title::newFromText( $aArgs['target'] )
@@ -1333,8 +1332,12 @@
$aCategories = explode( ',', $aArgs['categories'] );
$iCnt = count( $aCategories );
for ( $i = 0; $i < $iCnt; $i++ ) {
-   $aCategories[$i] = str_replace( ' ', '_', 
$aCategories[$i] );
-   $aCategories[$i] = "'" . trim( ucfirst( 
$aCategories[$i] ) ) . "'";
+   $oCategory = Category::newFromName( trim( 
$aCategories[$i] ) );
+   if( $oCategory === false ) {
+   unset( $aCategories[$i] );
+   continue;
+   }
+   $aCategories[$i] = "'" . $oCategory->getName() 
. "'" ;
}
$aArgs['categories'] = implode( ',', $aCategories );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] Use Site instead of MediaWikiSite in OtherProjectsSitesGener... - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Use Site instead of MediaWikiSite in 
OtherProjectsSitesGeneratorTest
..

Use Site instead of MediaWikiSite in OtherProjectsSitesGeneratorTest

This test obviously does not need anything from the specialized class,
it can simply use the base class and that way avoid a dependency.

Change-Id: I94885a23f679a1629700d0ab03e8340e52399c52
---
M client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
1 file changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/26/236526/1

diff --git a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php 
b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
index 5a3f9a7..e042552 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Client\Tests;
 
-use MediaWikiSite;
 use Site;
 use Wikibase\Client\OtherProjectsSitesGenerator;
 use Wikibase\Test\MockSiteStore;
@@ -107,43 +106,43 @@
$site->setLanguageCode( 'fr' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'enwiki' );
$site->setGroup( 'wikipedia' );
$site->setLanguageCode( 'en' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'frwiki' );
$site->setGroup( 'wikipedia' );
$site->setLanguageCode( 'fr' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'frwikisource' );
$site->setGroup( 'wikisource' );
$site->setLanguageCode( 'fr' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'nlwikisource' );
$site->setGroup( 'wikisource' );
$site->setLanguageCode( 'nl' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'eswiki' );
$site->setGroup( 'wikipedia' );
$site->setLanguageCode( 'es' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'commonswiki' );
$site->setGroup( 'commons' );
$site->setLanguageCode( 'en' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'wikidatawiki' );
$site->setGroup( 'wikidata' );
$site->setLanguageCode( 'en' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94885a23f679a1629700d0ab03e8340e52399c52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] SmartList: Fixed issue with whitspace on category filter - change (mediawiki...BlueSpiceExtensions)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: SmartList: Fixed issue with whitspace on category filter
..


SmartList: Fixed issue with whitspace on category filter

makeCategoriesFilterCondition: categorie names trimmed and whitespace
replaced with underscore.

patchset2: removing illegal category names

Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
---
M SmartList/SmartList.class.php
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 0390363..87bb173 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -803,7 +803,6 @@
} elseif( $aArgs['mode'] == 'whatlinkshere' ) {
//PW(25.02.2015) TODO:
//There could be filters - see Special:Whatlinkshere
-
$oTargetTitle = empty( $aArgs['target'] )
? $this->getContext()->getTitle()
: Title::newFromText( $aArgs['target'] )
@@ -1326,8 +1325,12 @@
$aCategories = explode( ',', $aArgs['categories'] );
$iCnt = count( $aCategories );
for ( $i = 0; $i < $iCnt; $i++ ) {
-   $aCategories[$i] = str_replace( ' ', '_', 
$aCategories[$i] );
-   $aCategories[$i] = "'" . trim( ucfirst( 
$aCategories[$i] ) ) . "'";
+   $oCategory = Category::newFromName( trim( 
$aCategories[$i] ) );
+   if( $oCategory === false ) {
+   unset( $aCategories[$i] );
+   continue;
+   }
+   $aCategories[$i] = "'" . $oCategory->getName() 
. "'" ;
}
$aArgs['categories'] = implode( ',', $aCategories );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Report ArticlePlaceholder changed to #wikidata-feed - change (labs...grrrit)

2015-09-07 Thread Addshore (Code Review) 
Addshore has uploaded a new change for review.

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

Change subject: Report ArticlePlaceholder changed to #wikidata-feed
..

Report ArticlePlaceholder changed to #wikidata-feed

Bug: T109927
Change-Id: I7e4e2367c7e1558591bac9d118328a139312ab09
---
M config.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/27/236527/1

diff --git a/config.yaml b/config.yaml
index 1849044..f4fabab 100644
--- a/config.yaml
+++ b/config.yaml
@@ -148,6 +148,7 @@
 mediawiki/extensions/DataValueImplementations:
 mediawiki/extensions/ValueView:
 mediawiki/extensions/Capiunto:
+mediawiki/extensions/ArticlePlaceholder:
 "#wikimedia-multimedia":
 mediawiki/extensions/CommonsMetadata.*:
 mediawiki/extensions/MultimediaViewer.*:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e4e2367c7e1558591bac9d118328a139312ab09
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Report Wikidata.org to #wikidata-feed - change (labs...wikibugs2)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Report Wikidata.org to #wikidata-feed
..


Report Wikidata.org to #wikidata-feed

Bug: T109927
Change-Id: I34932e9f6cff1853bb1d25f3e73c9fc3c3923267
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/channels.yaml b/channels.yaml
index 1473a8e..8501ae4 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -25,6 +25,7 @@
 - MediaWiki-extensions-WikibaseClient
 - Wikimedia-Wikidata
 - ArticlePlaceholder
+- Wikidata.org
 
 "#wikimedia-collaboration":
 # teams

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34932e9f6cff1853bb1d25f3e73c9fc3c3923267
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Report ArticlePlaceholder to #wikidata-feed - change (labs...wikibugs2)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Report ArticlePlaceholder to #wikidata-feed
..


Report ArticlePlaceholder to #wikidata-feed

Bug: T109927
Change-Id: I2f4b22f814e86b600cdd48707ed3f7d7ca43276b
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/channels.yaml b/channels.yaml
index 2548e1a..1473a8e 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -24,6 +24,7 @@
 - MediaWiki-extensions-WikibaseRepository
 - MediaWiki-extensions-WikibaseClient
 - Wikimedia-Wikidata
+- ArticlePlaceholder
 
 "#wikimedia-collaboration":
 # teams

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f4b22f814e86b600cdd48707ed3f7d7ca43276b
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Report WikimediaBadges changes to #wikidata-feed - change (labs...grrrit)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Report WikimediaBadges changes to #wikidata-feed
..


Report WikimediaBadges changes to #wikidata-feed

Bug: T109927
Change-Id: I262f5e369299cb61a5d173168d052bcd5c6940e8
---
M config.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/config.yaml b/config.yaml
index f4fabab..d23e85c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -149,6 +149,7 @@
 mediawiki/extensions/ValueView:
 mediawiki/extensions/Capiunto:
 mediawiki/extensions/ArticlePlaceholder:
+mediawiki/extensions/WikimediaBadges:
 "#wikimedia-multimedia":
 mediawiki/extensions/CommonsMetadata.*:
 mediawiki/extensions/MultimediaViewer.*:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I262f5e369299cb61a5d173168d052bcd5c6940e8
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [WIP] wbeditentity: use specific summary if only label or de... - change (mediawiki...Wikibase)

2015-09-07 Thread Ricordisamoa (Code Review) 
Ricordisamoa has uploaded a new change for review.

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

Change subject: [WIP] wbeditentity: use specific summary if only label or 
description changes
..

[WIP] wbeditentity: use specific summary if only label or description changes

Bug: T67846
Change-Id: Ia95e4aef9b67858bc8f0ca1e320b9af6cdd1a2da
---
M repo/includes/api/EditEntity.php
1 file changed, 22 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/37/236537/1

diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 4304cf9..89c3f92 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -12,6 +12,8 @@
 use Title;
 use UsageException;
 use Wikibase\ChangeOp\ChangeOp;
+use Wikibase\ChangeOp\ChangeOpLabel;
+use Wikibase\ChangeOp\ChangeOpDescription;
 use Wikibase\ChangeOp\ChangeOps;
 use Wikibase\ChangeOp\FingerprintChangeOpFactory;
 use Wikibase\ChangeOp\SiteLinkChangeOpFactory;
@@ -252,10 +254,15 @@
 
$changeOps = $this->getChangeOps( $data, $entity );
 
-   $this->applyChangeOp( $changeOps, $entity );
+   $applied = false;
+   $summary = $this->getSummary( $params, $entity, 
$changeOps->getChangeOps(), $applied );
+
+   if ( !$applied ) {
+   $this->applyChangeOp( $changeOps, $entity );
+   }
 
$this->buildResult( $entity );
-   return $this->getSummary( $params );
+   return $summary;
}
 
/**
@@ -263,12 +270,23 @@
 *
 * @return Summary
 */
-   private function getSummary( array $params ) {
+   private function getSummary( array $params, Entity &$entity, array 
$changeOps, &$applied ) {
//TODO: Construct a nice and meaningful summary from the 
changes that get applied!
//  Perhaps that could be based on the resulting diff?]
$summary = $this->createSummary( $params );
if ( isset( $params['id'] ) xor ( isset( $params['site'] ) && 
isset( $params['title'] ) ) ) {
-   $summary->setAction( $params['clear'] === false ? 
'update' : 'override' );
+   if ( $params['clear'] !== false ) {
+   $summary->setAction( 'override' );
+   } elseif (
+   count( $changeOps ) === 1 &&
+   ( $changeOps[0] instanceof ChangeOpLabel || 
$changeOps[0] instanceof ChangeOpDescription )
+   ) {
+   $summary->setModuleName( $changeOps[0] 
instanceof ChangeOpLabel ? 'wbsetlabel' : 'wbsetdescription' );
+   $this->applyChangeOp( $changeOps[0], $entity, 
$summary );
+   $applied = true;
+   } else {
+   $summary->setAction( 'update' );
+   }
} else {
$summary->setAction( 'create' );
}#

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia95e4aef9b67858bc8f0ca1e320b9af6cdd1a2da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 

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

[MediaWiki-commits] [Gerrit] Do not use "$" jQuery shortcut in JSDoc tags - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Do not use "$" jQuery shortcut in JSDoc tags
..


Do not use "$" jQuery shortcut in JSDoc tags

This is split from Iebe5ce9.

Change-Id: Ibb49a76fabdf78bc0fa9ea1d7072b909a4f57661
---
M view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
index 0f394d1..00a0283 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
@@ -82,7 +82,7 @@
/**
 * Short-cut to the `listview` widget used by the `snaklistview` to 
manage the `snakview`
 * widgets.
-* @property {$.wikibase.listview}
+* @property {jQuery.wikibase.listview}
 * @private
 */
_listview: null,
diff --git 
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js 
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
index 6cc4db2..08a50ae 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
@@ -675,7 +675,7 @@
/**
 * Returns a string representing the state a snaklistview's 
snakviews are in.
 *
-* @param {$.wikibase.snaklistview} snaklistview
+* @param {jQuery.wikibase.snaklistview} snaklistview
 * @return {string}
 */
function getSnakviewStates( snaklistview ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb49a76fabdf78bc0fa9ea1d7072b909a4f57661
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use Americam spelling - change (mediawiki...Translate)

2015-09-07 Thread Purodha (Code Review) 
Purodha has uploaded a new change for review.

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

Change subject: Use Americam spelling
..

Use Americam spelling

Change-Id: Iae32c6db0bb26496c49e2dea50cca07f9b46d0ca
---
M i18n/sandbox/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/31/236531/1

diff --git a/i18n/sandbox/en.json b/i18n/sandbox/en.json
index b295030..072f276 100644
--- a/i18n/sandbox/en.json
+++ b/i18n/sandbox/en.json
@@ -37,7 +37,7 @@
"tsb-delete-userpage-summary": "Deleting the user page of a sandbox 
user",
"translationstash": "Welcome",
"translate-translationstash-welcome": "Welcome {{GENDER:$1|$1}}, you 
are a new translator",
-   "translate-translationstash-welcome-note": "Become familiar with the 
translation tools. Translate some messages and get full-translator rights to 
participate in your favorite projects.",
+   "translate-translationstash-welcome-note": "Become familiar with the 
translation tools. Translate some messages and get full-translator rights to 
participate in your favourite projects.",
"translate-translationstash-initialtranslation": "Your initial 
translation",
"translate-translationstash-translations": "$1 completed 
{{PLURAL:$1|translation|translations}}",
"translate-translationstash-skip-button-label": "Try another",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae32c6db0bb26496c49e2dea50cca07f9b46d0ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Purodha 

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

[MediaWiki-commits] [Gerrit] Report Wikidata.org to #wikidata-feed - change (labs...wikibugs2)

2015-09-07 Thread Addshore (Code Review) 
Addshore has uploaded a new change for review.

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

Change subject: Report Wikidata.org to #wikidata-feed
..

Report Wikidata.org to #wikidata-feed

Bug: T109927
Change-Id: I34932e9f6cff1853bb1d25f3e73c9fc3c3923267
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/32/236532/1

diff --git a/channels.yaml b/channels.yaml
index 1473a8e..8501ae4 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -25,6 +25,7 @@
 - MediaWiki-extensions-WikibaseClient
 - Wikimedia-Wikidata
 - ArticlePlaceholder
+- Wikidata.org
 
 "#wikimedia-collaboration":
 # teams

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34932e9f6cff1853bb1d25f3e73c9fc3c3923267
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Add // @codingStandardsIgnore around very very long line in ... - change (mediawiki/core)

2015-09-07 Thread Polybuildr (Code Review) 
Polybuildr has uploaded a new change for review.

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

Change subject: Add // @codingStandardsIgnore around very very long line in 
Language.php
..

Add // @codingStandardsIgnore around very very long line in Language.php

Change-Id: Ic681d3eb4e02443b06386ae390536912a8fc4566
---
M languages/Language.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/236536/1

diff --git a/languages/Language.php b/languages/Language.php
index b698beb..530f279 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -167,9 +167,11 @@
 * Generated by UnicodeJS (see tools/strongDir) from the UCD; see
 * https://git.wikimedia.org/summary/unicodejs.git .
 */
+   // @codingStandardsIgnoreStart
// @codeCoverageIgnoreStart
static private $strongDirRegex =

[MediaWiki-commits] [Gerrit] Convert SpecialMergeItems to HTMLForm in 'ooui' mode - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Convert SpecialMergeItems to HTMLForm in 'ooui' mode
..


Convert SpecialMergeItems to HTMLForm in 'ooui' mode

Bug: T48248
Change-Id: I2b666e550122f4d5f3e3464a7df614654ddcc57e
---
M repo/includes/specials/SpecialMergeItems.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
2 files changed, 61 insertions(+), 106 deletions(-)

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



diff --git a/repo/includes/specials/SpecialMergeItems.php 
b/repo/includes/specials/SpecialMergeItems.php
index 5007f93..e1b699c 100644
--- a/repo/includes/specials/SpecialMergeItems.php
+++ b/repo/includes/specials/SpecialMergeItems.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Repo\Specials;
 
 use Exception;
+use HTMLForm;
 use Html;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\EntityIdParser;
@@ -177,7 +178,7 @@
 * @param string $summary
 */
private function mergeItems( ItemId $fromId, ItemId $toId, array 
$ignoreConflicts, $summary ) {
-   $this->tokenCheck->checkRequestToken( $this->getRequest(), 
'token' );
+   $this->tokenCheck->checkRequestToken( $this->getRequest(), 
'wpEditToken' );
 
/** @var EntityRevision $newRevisionFrom  */
/** @var EntityRevision $newRevisionTo */
@@ -199,112 +200,52 @@
protected function createForm() {
$this->getOutput()->addModuleStyles( array( 'wikibase.special' 
) );
 
+   $pre = '';
if ( $this->getUser()->isAnon() ) {
-   $this->getOutput()->addHTML(
-   Html::rawElement(
-   'p',
-   array( 'class' => 'warning' ),
-   $this->msg(
-   'wikibase-anonymouseditwarning',
-   $this->msg( 
'wikibase-entity-item' )->text()
-   )->parse()
-   )
+   $pre = Html::rawElement(
+   'p',
+   array( 'class' => 'warning' ),
+   $this->msg(
+   'wikibase-anonymouseditwarning',
+   $this->msg( 'wikibase-entity-item' 
)->text()
+   )->parse()
);
}
 
-   // Form header
-   $this->getOutput()->addHTML(
-   Html::openElement(
-   'form',
-   array(
-   'method' => 'post',
-   'action' => 
$this->getPageTitle()->getFullUrl(),
-   'name' => 'mergeitems',
-   'id' => 'wb-mergeitems-form1',
-   'class' => 'wb-form'
-   )
-   )
-   . Html::openElement(
-   'fieldset',
-   array( 'class' => 'wb-fieldset' )
-   )
-   . Html::element(
-   'legend',
-   array( 'class' => 'wb-legend' ),
-   $this->msg( 'special-mergeitems' )->text()
-   )
-   );
-
-   // Form elements
-   $this->getOutput()->addHTML( $this->getFormElements() );
-
-   // Form body
-   $this->getOutput()->addHTML(
-   Html::element( 'br' )
-   . Html::input(
-   'wikibase-mergeitems-submit',
-   $this->msg( 'wikibase-mergeitems-submit' 
)->text(),
-   'submit',
-   array(
-   'id' => 'wb-mergeitems-submit',
-   'class' => 'wb-button'
-   )
-   )
-   . Html::input(
-   'token',
-   $this->getUser()->getEditToken(),
-   'hidden'
-   )
-   . Html::closeElement( 'fieldset' )
-   . Html::closeElement( 'form' )
-   );
+   HTMLForm::factory( 'ooui', $this->getFormElements(), 
$this->getContext() )
+   ->setId( 'wb-mergeitems-form1' )
+   ->setPreText( $pre )
+   ->setHeaderText( $this->msg(

[MediaWiki-commits] [Gerrit] QA: Run language browser tests per commit - change (mediawiki...MobileFrontend)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: QA: Run language browser tests per commit
..


QA: Run language browser tests per commit

This inserts the interwiki link if it doesn't exist.

Bug: T107910
Change-Id: I030d13a3784a0f09014648b5eab9c8115e7df996
---
M tests/browser/LocalSettings.php
M tests/browser/README.mediawiki
M tests/browser/features/language.feature
3 files changed, 17 insertions(+), 6 deletions(-)

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



diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index e9d3cd0..59739ee 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -3,3 +3,19 @@
 $wgRightsUrl = "http://creativecommons.org/licenses/by-sa/3.0/;;
 // Allow users to edit privacy link.
 $wgGroupPermissions['user']['editinterface'] = true;
+
+
+// Make languages.feature test work.
+try {
+   $dbw = wfGetDB( DB_MASTER );
+   $dbw->insert( 'interwiki',
+   array(
+   'iw_prefix' => 'es',
+   'iw_url' => 'http://wikifoo.org/es/index.php/$1',
+   'iw_local' => 0,
+   'iw_trans' => 0,
+   )
+   );
+} catch ( Exception $e ) {
+   // Pass - interwiki link already exists.
+}
diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
index 6addaf9..97eb080 100644
--- a/tests/browser/README.mediawiki
+++ b/tests/browser/README.mediawiki
@@ -14,10 +14,6 @@
 * Create an account and store the username in MEDIAWIKI_USER which has
 ** an edit count of greater than 0
 ** Ensure user has bureaucrat and admin rights (set via Special:UserRights)
-* Setup a Spanish Interwiki link using sql:
-
-INSERT INTO interwiki (iw_prefix, iw_url, iw_local, iw_trans) VALUES ("es", 
"http://wikifoo.org/es/index.php/$1;, 0, 0);
-
 
 = MobileFrontend Extension =
 
diff --git a/tests/browser/features/language.feature 
b/tests/browser/features/language.feature
index 85ebd6d..b5d96fe 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -1,4 +1,3 @@
-# FIXME: this assumes that the main page has more than one language
 @chrome @en.m.wikipedia.beta.wmflabs.org @firefox @test2.m.wikipedia.org
 Feature: Language selection
 
@@ -8,7 +7,7 @@
 When I click the language button
   And I see the language overlay
 
-  @smoke
+  @smoke @integration
   Scenario: Closing language overlay (overlay button)
 When I click the language overlay close button
 Then I should not see the languages overlay

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I030d13a3784a0f09014648b5eab9c8115e7df996
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] QA: Run ui links tests per commit - change (mediawiki...MobileFrontend)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: QA: Run ui links tests per commit
..


QA: Run ui links tests per commit

* Adds a LocalSettings.php to the test build
* Update README with changes (visualEditor is not included in smoke tests
any more)
* In browser tests enable interface editing for all users (add note in
README about not including this in production)
* Test against `Selenium UI test` rather than the Main Page to avoid running
test on cached HTML.
* Add an additional step to allow debugging in future that visits the privacy 
link
message page to check it was created.

Change-Id: Icdc055f2e97a98d81a5f8fdd63689a5ac3c88fbf
---
A tests/browser/LocalSettings.php
M tests/browser/README.mediawiki
M tests/browser/features/step_definitions/create_page_api_steps.rb
M tests/browser/features/ui_links.feature
4 files changed, 20 insertions(+), 22 deletions(-)

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



diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
new file mode 100644
index 000..e9d3cd0
--- /dev/null
+++ b/tests/browser/LocalSettings.php
@@ -0,0 +1,5 @@
+http://creativecommons.org/licenses/by-sa/3.0/;;
+// Allow users to edit privacy link.
+$wgGroupPermissions['user']['editinterface'] = true;
diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
index 1601146..6addaf9 100644
--- a/tests/browser/README.mediawiki
+++ b/tests/browser/README.mediawiki
@@ -1,13 +1,15 @@
 = Setup =
-Unfortunately there are various tweaks you will need to make to any
-instance you run these tests against See
-[https://bugzilla.wikimedia.org/show_bug.cgi?id=56057 bug 56057].
+Include the LocalSettings.php in this folder into your MediaWiki 
LocalSettings.php.
+Note including this in a production instance is not advised given it fiddles 
with permissions.
 
-These include:
-* GeoData extension must be installed for the purpose of the nearby tests
+
+include_once "$IP/extensions/MobileFrontend/tests/browser/LocalSettings.php";
+
+
+Further tweaks may be necessary to run tests that are not tagged @integration:
 * Ensure you have [//www.mediawiki.org/wiki/Extension:ConfirmEdit 
Extension:ConfirmEdit] installed
 ** and setup with FancyCaptcha
-* The VisualEditor, Cite, and Echo extensions should be installed to run the 
full suite of smoke tests
+* The VisualEditor, Cite, and Echo extensions should be installed to run the 
full suite of tests
 * Create an account Selenium_newuser which has an edit count of 0
 * Create an account and store the username in MEDIAWIKI_USER which has
 ** an edit count of greater than 0
@@ -16,18 +18,6 @@
 
 INSERT INTO interwiki (iw_prefix, iw_url, iw_local, iw_trans) VALUES ("es", 
"http://wikifoo.org/es/index.php/$1;, 0, 0);
 
-* In LocalSettings.php place the following code:
-
-   # required for browser tests ui_links.feature
-   $wgRightsText = 'Creative Commons Attribution 3.0';
-   $wgRightsUrl = "http://creativecommons.org/licenses/by-sa/3.0/;;
-
-
-Note a few caveats with browser tests:
-* Random page tests may fail on a timeout
-* Nearby page may fail currently if your browser does not always allow 
geolocation tests
-   ** Nearby tests currently check articles near your current location and 
assume there is
-   an article nearby.
 
 = MobileFrontend Extension =
 
diff --git a/tests/browser/features/step_definitions/create_page_api_steps.rb 
b/tests/browser/features/step_definitions/create_page_api_steps.rb
index 6d343e0..711b90a 100644
--- a/tests/browser/features/step_definitions/create_page_api_steps.rb
+++ b/tests/browser/features/step_definitions/create_page_api_steps.rb
@@ -70,8 +70,10 @@
 end
 
 Given(/^the wiki has a terms of use$/) do
-  api.create_page 'MediaWiki:mobile-frontend-terms-url', 'Terms_of_use'
+  api.create_page 'MediaWiki:mobile-frontend-terms-url', 
'http://m.wikimediafoundation.org/wiki/Terms_of_Use'
   api.create_page 'MediaWiki:mobile-frontend-terms-text', 'Terms of use'
+  # force a visit to check its existence
+  visit(ArticlePage, using_params: { article_name: 
'MediaWiki:Mobile-frontend-terms-url?action=info' })
 end
 
 Given(/^the page "(.*?)" exists and has at least "(\d+)" edits$/) do |title, 
min_edit_count|
diff --git a/tests/browser/features/ui_links.feature 
b/tests/browser/features/ui_links.feature
index 0cd44fa..33f27dc 100644
--- a/tests/browser/features/ui_links.feature
+++ b/tests/browser/features/ui_links.feature
@@ -4,17 +4,18 @@
   Background:
 Given I am using the mobile site
 
-  @smoke
+  @smoke @integration
   Scenario: Check existence of important UI components on the main page
 Given the wiki has a terms of use
-  And I am on the "Main Page" page
+  And the page "Selenium UI test" exists
+  And I am on the "Selenium UI test" page
 Then I should see the history link
   And I should see the switch to desktop link

[MediaWiki-commits] [Gerrit] Clean up code around PropertyInfoBuilder - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Clean up code around PropertyInfoBuilder
..

Clean up code around PropertyInfoBuilder

This is a direct follow up for I363e38f. Stuff I found while reviewing
I363e38f (while it was already merged).

Bug: T95285
Change-Id: Ia6418b8753a64e7796e81857ed82ae602d0795a4
---
M repo/includes/PropertyInfoBuilder.php
M repo/includes/content/ItemHandler.php
M repo/includes/content/PropertyHandler.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
4 files changed, 23 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/39/236539/1

diff --git a/repo/includes/PropertyInfoBuilder.php 
b/repo/includes/PropertyInfoBuilder.php
index b87b16d..b0f1351 100644
--- a/repo/includes/PropertyInfoBuilder.php
+++ b/repo/includes/PropertyInfoBuilder.php
@@ -7,7 +7,6 @@
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Statement\StatementList;
 
 /**
@@ -23,7 +22,7 @@
/**
 * @var PropertyId|null
 */
-   private $formatterUrlProperty = null;
+   private $formatterUrlProperty;
 
/**
 * @param PropertyId|null $formatterUrlProperty
@@ -33,8 +32,12 @@
}
 
/**
+* @see PropertyInfoTable::setPropertyInfo
+*
 * @param Property $property
-* @return array
+*
+* @return array Information to be stored in the "pi_info" column of 
the "wb_property_info"
+* table. Must be an array and can contain anything that can be encoded 
by json_encode.
 */
public function buildPropertyInfo( Property $property ) {
$info = array(
@@ -51,7 +54,9 @@
 
/**
 * @param StatementList $statements
-* @return string|null
+*
+* @return string|null The string value of the main snak of the first 
best
+* "formatterUrlProperty" statements, if such exists. Null otherwise.
 */
private function getFormatterUrl( StatementList $statements ) {
if ( $this->formatterUrlProperty === null ) {
@@ -63,9 +68,8 @@
return null;
}
 
-   /** @var Statement $statement */
-   $statementArray = $bestStatements->toArray();
-   $mainSnak = $statementArray[0]->getMainSnak();
+   $statement = reset( $bestStatements );
+   $mainSnak = $statement->getMainSnak();
if ( !( $mainSnak instanceof PropertyValueSnak ) ) {
return null;
}
diff --git a/repo/includes/content/ItemHandler.php 
b/repo/includes/content/ItemHandler.php
index d0a350d..3202c8c 100644
--- a/repo/includes/content/ItemHandler.php
+++ b/repo/includes/content/ItemHandler.php
@@ -78,7 +78,7 @@
}
 
/**
-* @return array
+* @return string[]
 */
public function getActionOverrides() {
return array(
diff --git a/repo/includes/content/PropertyHandler.php 
b/repo/includes/content/PropertyHandler.php
index a665853..049aa39 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -61,6 +61,7 @@
 * @param ValidatorErrorLocalizer $errorLocalizer
 * @param EntityIdParser $entityIdParser
 * @param PropertyInfoStore $infoStore
+* @param PropertyInfoBuilder $propertyInfoBuilder
 * @param callable|null $legacyExportFormatDetector
 */
public function __construct(
@@ -108,7 +109,7 @@
}
 
/**
-* @return array
+* @return string[]
 */
public function getActionOverrides() {
return array(
diff --git a/repo/includes/store/sql/PropertyInfoTableBuilder.php 
b/repo/includes/store/sql/PropertyInfoTableBuilder.php
index 3c3020b..b342b86 100644
--- a/repo/includes/store/sql/PropertyInfoTableBuilder.php
+++ b/repo/includes/store/sql/PropertyInfoTableBuilder.php
@@ -71,6 +71,12 @@
 */
private $batchSize = 100;
 
+   /**
+* @param PropertyInfoTable $propertyInfoTable
+* @param EntityLookup $entityLookup
+* @param PropertyInfoBuilder $propertyInfoBuilder
+* @param bool $useRedirectTargetColumn
+*/
public function __construct(
PropertyInfoTable $propertyInfoTable,
EntityLookup $entityLookup,
@@ -264,6 +270,9 @@
);
}
 
+   /**
+* @param string $msg
+*/
private function reportMessage( $msg ) {
if ( $this->reporter ) {
$this->reporter->reportMessage( $msg );

-- 
To view, visit

[MediaWiki-commits] [Gerrit] Remove @since tags from private properties and methods - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove @since tags from private properties and methods
..


Remove @since tags from private properties and methods

This also drops an unused property.

This is a direct follow-up for the stuff that became private in
I3dbe3f7.

Change-Id: Iaf3a38006892e512272973d36c83bb4d844ab1e3
---
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/ValueParserFactory.php
M repo/includes/specials/SpecialNewProperty.php
M repo/includes/store/sql/EntityPerPageBuilder.php
M repo/includes/store/sql/SqlIdGenerator.php
M repo/includes/store/sql/TermSearchKeyBuilder.php
11 files changed, 0 insertions(+), 56 deletions(-)

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



diff --git a/repo/includes/ChangeOp/ChangeOpMainSnak.php 
b/repo/includes/ChangeOp/ChangeOpMainSnak.php
index 1689d43..d55892c 100644
--- a/repo/includes/ChangeOp/ChangeOpMainSnak.php
+++ b/repo/includes/ChangeOp/ChangeOpMainSnak.php
@@ -25,15 +25,11 @@
 class ChangeOpMainSnak extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var Snak
 */
private $snak;
diff --git a/repo/includes/ChangeOp/ChangeOpQualifier.php 
b/repo/includes/ChangeOp/ChangeOpQualifier.php
index 31d861e..ae3d6f8 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifier.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifier.php
@@ -22,22 +22,16 @@
 class ChangeOpQualifier extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var Snak
 */
private $snak;
 
/**
-* @since 0.4
-*
 * @var string
 */
private $snakHash;
diff --git a/repo/includes/ChangeOp/ChangeOpQualifierRemove.php 
b/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
index 85253ee..fdd5999 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
@@ -20,15 +20,11 @@
 class ChangeOpQualifierRemove extends ChangeOpBase {
 
/**
-* @since 0.5
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.5
-*
 * @var string
 */
private $snakHash;
diff --git a/repo/includes/ChangeOp/ChangeOpReference.php 
b/repo/includes/ChangeOp/ChangeOpReference.php
index 61cbe5e..4829a69 100644
--- a/repo/includes/ChangeOp/ChangeOpReference.php
+++ b/repo/includes/ChangeOp/ChangeOpReference.php
@@ -23,29 +23,21 @@
 class ChangeOpReference extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var Reference
 */
private $reference;
 
/**
-* @since 0.4
-*
 * @var string
 */
private $referenceHash;
 
/**
-* @since 0.5
-*
 * @var int|null
 */
private $index;
diff --git a/repo/includes/ChangeOp/ChangeOpReferenceRemove.php 
b/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
index 499be38..2b7e874 100644
--- a/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
@@ -20,15 +20,11 @@
 class ChangeOpReferenceRemove extends ChangeOpBase {
 
/**
-* @since 0.5
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.5
-*
 * @var string
 */
private $referenceHash;
diff --git a/repo/includes/ChangeOp/ChangeOpStatementRank.php 
b/repo/includes/ChangeOp/ChangeOpStatementRank.php
index b3ac655..517cbb5 100644
--- a/repo/includes/ChangeOp/ChangeOpStatementRank.php
+++ b/repo/includes/ChangeOp/ChangeOpStatementRank.php
@@ -20,15 +20,11 @@
 class ChangeOpStatementRank extends ChangeOpBase {
 
/**
-* @since 0.4
-*
 * @var string
 */
private $statementGuid;
 
/**
-* @since 0.4
-*
 * @var integer
 */
private $rank;
diff --git a/repo/includes/ValueParserFactory.php 
b/repo/includes/ValueParserFactory.php
index 0325045..15bf299 100644
--- a/repo/includes/ValueParserFactory.php
+++ b/repo/includes/ValueParserFactory.php
@@ -20,8 +20,6 @@
/**
 * Maps parser id to ValueParser class or builder callback.
 *
-* @since 0.5

[MediaWiki-commits] [Gerrit] Report ArticlePlaceholder to #wikidata-feed - change (labs...wikibugs2)

2015-09-07 Thread Addshore (Code Review) 
Addshore has uploaded a new change for review.

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

Change subject: Report ArticlePlaceholder to #wikidata-feed
..

Report ArticlePlaceholder to #wikidata-feed

Bug: T109927
Change-Id: I2f4b22f814e86b600cdd48707ed3f7d7ca43276b
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/30/236530/1

diff --git a/channels.yaml b/channels.yaml
index 2548e1a..1473a8e 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -24,6 +24,7 @@
 - MediaWiki-extensions-WikibaseRepository
 - MediaWiki-extensions-WikibaseClient
 - Wikimedia-Wikidata
+- ArticlePlaceholder
 
 "#wikimedia-collaboration":
 # teams

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4b22f814e86b600cdd48707ed3f7d7ca43276b
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Fix bug in jquery.ui.TemplatedWidget.tests.js - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix bug in jquery.ui.TemplatedWidget.tests.js
..


Fix bug in jquery.ui.TemplatedWidget.tests.js

This was found by JSHint 2.9. This is split from Iebe5ce9.

Change-Id: Ia7d67360ce3fde1fd6e23a1ca2027ee21f85768a
---
M view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js 
b/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
index dab7e11..265100d 100644
--- a/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
+++ b/view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js
@@ -22,8 +22,9 @@
 
/**
 * @param {Object} templateShortCuts
+* @param {jQuery} $subject
 */
-   function checkShortCuts( templateShortCuts ) {
+   function checkShortCuts( templateShortCuts, $subject ) {
$.each( templateShortCuts, function( key, selector ) {
assert.ok(
$subject.data( 'TemplatedWidget' )[key] 
instanceof $,
@@ -57,7 +58,7 @@
);
 
if( testSets[i][1].templateShortCuts ) {
-   checkShortCuts( testSets[i][1].templateShortCuts );
+   checkShortCuts( testSets[i][1].templateShortCuts, 
$subject );
}
 
$subject.data( 'TemplatedWidget' ).destroy();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7d67360ce3fde1fd6e23a1ca2027ee21f85768a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: JanZerebecki 
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: Upgrade jscs to 2.1.0 - change (mediawiki...ExtensionDistributor)

2015-09-07 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: build: Upgrade jscs to 2.1.0
..

build: Upgrade jscs to 2.1.0

And also make sure we lint Gruntfile.js

Change-Id: I938ef587674ffeb8fa61bf06c12ffd659f354d10
---
M Gruntfile.js
M package.json
M resources/ext.extensiondistributor.special.js
3 files changed, 6 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor 
refs/changes/23/236523/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 4b3af9b..d9a02ca 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,11 +6,11 @@
 
 /*jshint node:true */
 module.exports = function ( grunt ) {
+   var conf = grunt.file.readJSON( 'extension.json' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jscs' );
-   var conf = grunt.file.readJSON( 'extension.json' );
 
grunt.initConfig( {
jshint: {
@@ -18,7 +18,8 @@
jshintrc: true
},
all: [
-   'resources/*.js'
+   'resources/*.js',
+   '*.js'
]
},
jscs: {
diff --git a/package.json b/package.json
index d1d076e..6ea343d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.2",
 "grunt-banana-checker": "0.2.2",
-"grunt-jscs": "1.8.0",
+"grunt-jscs": "2.1.0",
 "grunt-jsonlint": "1.0.4"
   }
 }
diff --git a/resources/ext.extensiondistributor.special.js 
b/resources/ext.extensiondistributor.special.js
index 9c25126..1b1a7ee 100644
--- a/resources/ext.extensiondistributor.special.js
+++ b/resources/ext.extensiondistributor.special.js
@@ -14,12 +14,12 @@
}
 
function processAPIResponse( data ) {
-   var info = 
data.query.extdistbranches[distributorType][selector.getValue()],
+   var info = data.query.extdistbranches[ distributorType 
][ selector.getValue() ],
options = [],
versionSelector,
versionButton;
$.each( mw.config.get( 'wgExtDistSnapshotRefs' ), 
function ( i, value ) {
-   if ( info[value] ) {
+   if ( info[ value ] ) {
options.push( { data: value, label: 
mw.msg( 'extdist-branch-' + value ) } );
}
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I938ef587674ffeb8fa61bf06c12ffd659f354d10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Change uses of mw.user.anonymous() to mw.user.isAnon() - change (mediawiki...ArticleFeedbackv5)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Change uses of mw.user.anonymous() to mw.user.isAnon()
..


Change uses of mw.user.anonymous() to mw.user.isAnon()

mw.user.anonymous() was removed in MW 1.25, core Change-Id:
I3be1cfecb79faee5701708136ede133870b9940d, which was submitted in late
September 2014 (!).

Change-Id: Ie17d07cb74b9a893ffad1c048155843caffbbbaf
---
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.utils.js
4 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js 
b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
index b2d655a..618e75d 100644
--- a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
+++ b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
@@ -9,7 +9,7 @@
if ( mw.config.get( 'wgArticleFeedbackv5Watchlist' ) && mw.config.get( 
'wgArticleFeedbackv5WatchlistLink' ) ) {
 
// Check if we're not dealing with anon user
-   if ( mw.user.anonymous() ) {
+   if ( mw.user.isAnon() ) {
return;
}
 
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index 6268b12..3596b99 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -148,7 +148,7 @@
/**
 * Is this an anonymous user?
 */
-   $.articleFeedbackv5.anonymous = mw.user.anonymous();
+   $.articleFeedbackv5.anonymous = mw.user.isAnon();
 
/**
 * If not, what's their user id?
diff --git 
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index d7e2a77..3b072b4 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -164,7 +164,7 @@
 */
$.articleFeedbackv5special.setup = function() {
// Get the user type
-   if ( mw.user.anonymous() ) {
+   if ( mw.user.isAnon() ) {
$.articleFeedbackv5special.userType = 'anon';
} else if ( mw.config.get( 'wgArticleFeedbackv5Permissions' 
)['aft-oversighter'] ) {
$.articleFeedbackv5special.userType = 'oversighter';
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.utils.js 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.utils.js
index 1ab837b..9cc4c09 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.utils.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.utils.js
@@ -107,7 +107,7 @@
// if user is logged in, showing on action=purge is OK,
// but if user is logged out, action=purge shows a form 
instead of the article,
// so return false in that case.
-   enable &= !( mw.config.get( 'wgAction' ) == 'purge' && 
mw.user.anonymous() );
+   enable &= !( mw.config.get( 'wgAction' ) == 'purge' && 
mw.user.isAnon() );
 
// current revision
enable &= mw.util.getParamValue( 'diff' ) == null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie17d07cb74b9a893ffad1c048155843caffbbbaf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove all unused use clauses - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove all unused use clauses
..


Remove all unused use clauses

I used a regex to find these. Here it is for reference:
(?s)\buse\s+(?:\w+\\)*(\b\w+\b)\s*;(?!.*\b\1\b)
Run this in case-sensitive mode and you will also find
cases where a class name is written in different
capitalization.

Change-Id: Ic26b8d34a31fe3439447f5dde65eb9d9566118d6
---
M client/includes/LangLinkHandler.php
M client/includes/Usage/Sql/EntityUsageTable.php
M client/includes/specials/SpecialPagesWithBadges.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M repo/Wikibase.php
M repo/includes/Interactors/TermIndexSearchInteractor.php
M repo/includes/api/EntitySearchHelper.php
M repo/includes/api/SearchEntities.php
M repo/includes/specials/SpecialListProperties.php
M repo/tests/phpunit/SnakConstructionServiceTest.php
M repo/tests/phpunit/includes/ValidatorBuildersTest.php
M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M repo/tests/phpunit/includes/api/ApiFormatTestCase.php
M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
M repo/tests/phpunit/includes/api/CreateClaimTest.php
M repo/tests/phpunit/includes/api/RemoveClaimsTest.php
M repo/tests/phpunit/includes/api/SearchEntitiesTest.php
M repo/tests/phpunit/includes/api/SetClaimTest.php
M repo/tests/phpunit/includes/api/SetClaimValueTest.php
M repo/tests/phpunit/includes/api/SetQualifierTest.php
M repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
M repo/tests/phpunit/maintenance/dumpJsonTest.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
M view/src/EntityView.php
25 files changed, 2 insertions(+), 53 deletions(-)

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



diff --git a/client/includes/LangLinkHandler.php 
b/client/includes/LangLinkHandler.php
index ec9ac8b..1bebff2 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -7,7 +7,6 @@
 use SiteStore;
 use Title;
 use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
-use Wikibase\Client\ParserOutputDataUpdater;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
 use Wikibase\DataModel\SiteLink;
diff --git a/client/includes/Usage/Sql/EntityUsageTable.php 
b/client/includes/Usage/Sql/EntityUsageTable.php
index c98cf53..72bbcc1 100644
--- a/client/includes/Usage/Sql/EntityUsageTable.php
+++ b/client/includes/Usage/Sql/EntityUsageTable.php
@@ -4,7 +4,6 @@
 
 use ArrayIterator;
 use DatabaseBase;
-use Exception;
 use InvalidArgumentException;
 use Iterator;
 use Wikibase\Client\Usage\EntityUsage;
diff --git a/client/includes/specials/SpecialPagesWithBadges.php 
b/client/includes/specials/SpecialPagesWithBadges.php
index e5d623b..9a7d71c 100644
--- a/client/includes/specials/SpecialPagesWithBadges.php
+++ b/client/includes/specials/SpecialPagesWithBadges.php
@@ -6,7 +6,6 @@
 use Html;
 use InvalidArgumentException;
 use Linker;
-use OutOfBoundsException;
 use QueryPage;
 use Skin;
 use Title;
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php 
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index efce1ff..9c9eadc 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -8,9 +8,6 @@
 use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
 use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
 use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
-use Wikibase\Client\ParserOutputDataUpdater;
-use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\SiteLink;
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a45ea35..9d9f489 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -30,8 +30,6 @@
  * @licence GNU GPL v2+
  */
 
-use ValueParsers\ValueParser;
-
 if ( !defined( 'MEDIAWIKI' ) ) {
die( 'Not an entry point.' );
 }
diff --git a/repo/includes/Interactors/TermIndexSearchInteractor.php 
b/repo/includes/Interactors/TermIndexSearchInteractor.php
index 68ac9ce..15b9f20 100644
--- a/repo/includes/Interactors/TermIndexSearchInteractor.php
+++ b/repo/includes/Interactors/TermIndexSearchInteractor.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Repo\Interactors;
 
-use OutOfBoundsException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Term\Term;
 use Wikibase\LanguageFallbackChainFactory;
diff --git a/repo/includes/api/EntitySearchHelper.php 
b/repo/includes/api/EntitySearchHelper.php
index db24043..1cc5209 100644
--- a/repo/includes/api/EntitySearchHelper.php
+++ b/repo/includes/api/EntitySearchHelper.php
@@ -3,7 +3,6 @@
 
 namespace Wikibase\Repo\Api;
 
-use OutOfBoundsException;
 use

[MediaWiki-commits] [Gerrit] Replace MediaWikiSite with Site in WikibaseClientTest - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Replace MediaWikiSite with Site in WikibaseClientTest
..

Replace MediaWikiSite with Site in WikibaseClientTest

An other test that obviously (otherwise it would fail) does not need
the specialized class.

Change-Id: I1d439010d5e031fde6dc57d9ebc120683e842ee0
---
M client/tests/phpunit/includes/WikibaseClientTest.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/34/236534/1

diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php 
b/client/tests/phpunit/includes/WikibaseClientTest.php
index 42966e2..9aa4292 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -3,7 +3,7 @@
 namespace Wikibase\Client\Tests;
 
 use Language;
-use MediaWikiSite;
+use Site;
 use SiteStore;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\Item;
@@ -136,7 +136,7 @@
private function getSiteStore() {
$siteStore = new MockSiteStore();
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'enwiki' );
$site->setGroup( 'wikipedia' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d439010d5e031fde6dc57d9ebc120683e842ee0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Report ArticlePlaceholder changed to #wikidata-feed - change (labs...grrrit)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Report ArticlePlaceholder changed to #wikidata-feed
..


Report ArticlePlaceholder changed to #wikidata-feed

Bug: T109927
Change-Id: I7e4e2367c7e1558591bac9d118328a139312ab09
---
M config.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/config.yaml b/config.yaml
index 1849044..f4fabab 100644
--- a/config.yaml
+++ b/config.yaml
@@ -148,6 +148,7 @@
 mediawiki/extensions/DataValueImplementations:
 mediawiki/extensions/ValueView:
 mediawiki/extensions/Capiunto:
+mediawiki/extensions/ArticlePlaceholder:
 "#wikimedia-multimedia":
 mediawiki/extensions/CommonsMetadata.*:
 mediawiki/extensions/MultimediaViewer.*:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e4e2367c7e1558591bac9d118328a139312ab09
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP Fix WrongPass MediawikiApi::LoginError error for VisualE... - change (integration/config)

2015-09-07 Thread Zfilipin (Code Review) 
Zfilipin has uploaded a new change for review.

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

Change subject: WIP Fix WrongPass MediawikiApi::LoginError error for 
VisualEditor Jenkins job
..

WIP Fix WrongPass MediawikiApi::LoginError error for VisualEditor Jenkins job

Bug: T111510
Change-Id: Ie837eee07a07f39e5789fa4b55a0b054b9806c2e
---
M jjb/macro-browsertests.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/236540/1

diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 5cacf6e..39a5e41 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -51,9 +51,11 @@
   if [ ! -f "{folder}/browser/environments.yml" ]; then
   export MEDIAWIKI_API_URL
   export MEDIAWIKI_URL
-  export MEDIAWIKI_USER
   fi
 
+  # T111510
+  export MEDIAWIKI_USER
+
   # Export the MW user password regardless, as passwords are not kept
   # in test suite configurations
   export MEDIAWIKI_PASSWORD

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie837eee07a07f39e5789fa4b55a0b054b9806c2e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] Sweet spot for all string length tests in ValidatorBuildersTest - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Sweet spot for all string length tests in ValidatorBuildersTest
..


Sweet spot for all string length tests in ValidatorBuildersTest

This patch:
a) fixes all issues found while reviewing Ib91b1c0.
b) Reduces the number of characters in all "to long" checks to the
sweet spot where the checks start to fail.

Bug: T71
Change-Id: If7831820b29c4eb043aa20653f2fd213dbaee468
---
M repo/includes/ValidatorBuilders.php
M repo/tests/phpunit/includes/ValidatorBuildersTest.php
2 files changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/repo/includes/ValidatorBuilders.php 
b/repo/includes/ValidatorBuilders.php
index 60d01ea..d014795 100644
--- a/repo/includes/ValidatorBuilders.php
+++ b/repo/includes/ValidatorBuilders.php
@@ -77,8 +77,8 @@
 * @param EntityLookup $lookup
 * @param EntityIdParser $idParser
 * @param string[] $urlSchemes
-* @param ContentLanguages $contentLanguages
 * @param string $vocabularyBaseUri The base URI for vocabulary 
concepts.
+* @param ContentLanguages $contentLanguages
 */
public function __construct(
EntityLookup $lookup,
@@ -282,12 +282,12 @@
$validators[] = new TypeValidator( 'string' );
$validators[] = new StringLengthValidator( 2, $maxLength );
 
-   $urlValidators = new UrlSchemeValidators();
-   $urlSchemeValidators = $urlValidators->getValidators( 
$urlSchemes );
-   $validators[] = new UrlValidator( $urlSchemeValidators );
+   $urlValidatorsBuilder = new UrlSchemeValidators();
+   $urlValidators = $urlValidatorsBuilder->getValidators( 
$urlSchemes );
+   $validators[] = new UrlValidator( $urlValidators );
 
if ( $prefix !== null ) {
-   //XXX: we may want to allow http AND https.
+   // FIXME: It's currently not possible to allow both 
http and https at this point.
$validators[] = $this->getPrefixValidator( $prefix, 
'bad-prefix' );
}
 
@@ -301,7 +301,7 @@
 * @return RegexValidator
 */
private function getPrefixValidator( $prefix, $errorCode ) {
-   $regex = '!^' . preg_quote( $prefix, '!' ) . '!';
+   $regex = '/^' . preg_quote( $prefix, '/' ) . '/';
return new RegexValidator( $regex, false, $errorCode );
}
 
diff --git a/repo/tests/phpunit/includes/ValidatorBuildersTest.php 
b/repo/tests/phpunit/includes/ValidatorBuildersTest.php
index 2233c01..ae05d22 100644
--- a/repo/tests/phpunit/includes/ValidatorBuildersTest.php
+++ b/repo/tests/phpunit/includes/ValidatorBuildersTest.php
@@ -80,7 +80,7 @@
array( 'commonsMedia', 'Foo.jpg', false, 'StringValue 
expected, string supplied' ),
array( 'commonsMedia', new NumberValue( 7 ), false, 
'StringValue expected' ),
array( 'commonsMedia', new StringValue( '' ), false, 
'empty string should be invalid' ),
-   array( 'commonsMedia', new StringValue( str_repeat( 
'x', 250 ) . '.jpg' ), false, 'name too long' ),
+   array( 'commonsMedia', new StringValue( str_repeat( 
'x', 237 ) . '.jpg' ), false, 'name too long' ),
array( 'commonsMedia', new StringValue( 'Foo' ), false, 
'no file extension' ),
array( 'commonsMedia', new StringValue( 'Foo.jpg' ), 
true, 'this should be good' ),
array( 'commonsMedia', new StringValue( 'Foo#bar.jpg' 
), false, 'illegal character: hash' ),
@@ -97,7 +97,7 @@
array( 'string', new StringValue( '' ), false, 'empty 
string should be invalid' ),
array( 'string', new StringValue( 'Foo' ), true, 
'simple string' ),
array( 'string', new StringValue( 'Äöü' ), true, 
'Unicode support' ),
-   array( 'string', new StringValue( str_repeat( 'x', 390 
) ), true, 'long, but not too long' ),
+   array( 'string', new StringValue( str_repeat( 'x', 400 
) ), true, 'long, but not too long' ),
array( 'string', new StringValue( str_repeat( 'x', 401 
) ), false, 'too long' ),
array( 'string', new StringValue( ' Foo' ), false, 
'string with leading space' ),
array( 'string', new StringValue( 'Foo ' ), false, 
'string with trailing space' ),
@@ -116,7 +116,7 @@
array(
'time',
new TimeValue( '+2013-06-06T00:00:00Z', 0, 0, 
0, TimeValue::PRECISION_DAY,
-   $wikidataUri . 'Q' .

[MediaWiki-commits] [Gerrit] Update spec and tests for newly added lead section fields - change (mediawiki...mobileapps)

2015-09-07 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged.

Change subject: Update spec and tests for newly added lead section fields
..


Update spec and tests for newly added lead section fields

Follow-up from https://gerrit.wikimedia.org/r/#/c/235678/

Bug: T111407
Change-Id: Ie29629b87d0ba869fd618ddb0716c847c2ca9ddb
---
M spec.yaml
M test/features/mobile-html-sections/pagecontent.js
2 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Mobrovac: Looks good to me, approved



diff --git a/spec.yaml b/spec.yaml
index 975d44c..8a4479e 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -96,6 +96,7 @@
 revision: /.+/
 lastmodified: /.+/
 displaytitle: /.+/
+normalizedtitle: /.+/
 description: main page of a Wikimedia project
 protection: /.+/
 editable: /.+/
@@ -127,6 +128,7 @@
   revision: /.+/
   lastmodified: /.+/
   displaytitle: /.+/
+  normalizedtitle: /.+/
   description: main page of a Wikimedia project
   protection: /.+/
   editable: /.+/
@@ -148,6 +150,7 @@
   revision: /.+/
   lastmodified: /.+/
   displaytitle: /.+/
+  normalizedtitle: /.+/
   description: /.+/
   protection: /.+/
   editable: /.+/
@@ -173,6 +176,7 @@
   revision: /.+/
   lastmodified: /.+/
   displaytitle: /.+/
+  normalizedtitle: /.+/
   description: /.+/
   protection: /.+/
   editable: /.+/
diff --git a/test/features/mobile-html-sections/pagecontent.js 
b/test/features/mobile-html-sections/pagecontent.js
index 42947aa..709bffb 100644
--- a/test/features/mobile-html-sections/pagecontent.js
+++ b/test/features/mobile-html-sections/pagecontent.js
@@ -38,6 +38,7 @@
 assert.deepEqual(res.status, 200);
 assert.ok(lead.lastmodified.startsWith('201'), 
lead.lastmodified + ' should start with 201'); // 2015-
 assert.deepEqual(lead.displaytitle, 'Main Page');
+assert.deepEqual(lead.normalizedtitle, 'Main Page');
 assert.deepEqual(lead.description, 'main page of a Wikimedia 
project');
 assert.deepEqual(lead.protection, {
 "edit": [
@@ -57,7 +58,7 @@
 assert.ok(lead.media.items.length > 0, 'Expected at least one 
media item');
 });
 });
-it('Obama (redirect) should have a lead image and many media items', 
function() {
+it('Obama (redirect) should have a lead image, expected properties, and 
many media items', function() {
 return preq.get({ uri: server.config.uri + 
'en.wikipedia.org/v1/page/mobile-html-sections/Obama' })
 .then(function(res) {
 var lead = res.body.lead;
@@ -70,6 +71,8 @@
 assert.contains(lead.image.urls["1024"], 
"//upload.wikimedia.org/wikipedia/commons/thumb");
 assert.contains(lead.image.urls["1024"], "1024px-");
 
+assert.deepEqual(lead.description, "44th President of the 
United States");
+assert.deepEqual(lead.redirected, "Barack Obama");
 assert.ok(lead.media.items.length > 3, 'Expected many media 
items');
 
 var remaining = res.body.remaining;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie29629b87d0ba869fd618ddb0716c847c2ca9ddb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] New addition elasticsearch20[0-2][0-9] - change (operations/dns)

2015-09-07 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: New addition elasticsearch20[0-2][0-9]
..


New addition elasticsearch20[0-2][0-9]

ref T111080

Change-Id: Icd85c95b04a13b0883b20cc1b8141af3d47b5735
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 48 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index b85998f..687d305 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2634,6 +2634,12 @@
 127 1H IN PTR   cp2006.codfw.wmnet.
 128 1H IN PTR   maps-test2001.codfw.wmnet.
 129 1H IN PTR   maps-test2002.codfw.wmnet.
+130 1H IN PTR   elastic2001.codfw.wmnet.
+131 1H IN PTR   elastic2002.codfw.wmnet.
+132 1H IN PTR   elastic2003.codfw.wmnet.
+133 1H IN PTR   elastic2004.codfw.wmnet.
+134 1H IN PTR   elastic2005.codfw.wmnet.
+135 1H IN PTR   elastic2006.codfw.wmnet.
 
 $ORIGIN 1.192.{{ zonename }}.
 1   1H IN PTR   lvs2001.codfw.wmnet.
@@ -2794,6 +2800,12 @@
 140 1H IN PTR   pybal-test2002.codfw.wmnet. ; VM on the 
ganeti01.svc.codfw.wmnet cluster
 141 1H IN PTR   pybal-test2003.codfw.wmnet. ; VM on the 
ganeti01.svc.codfw.wmnet cluster
 142 1H IN PTR   pybal-testsvc.codfw.wmnet.  ; service IP
+143 1H IN PTR   elastic2007.codfw.wmnet.
+144 1H IN PTR   elastic2008.codfw.wmnet.
+145 1H IN PTR   elastic2009.codfw.wmnet.
+146 1H IN PTR   elastic2010.codfw.wmnet.
+147 1H IN PTR   elastic2011.codfw.wmnet.
+148 1H IN PTR   elastic2012.codfw.wmnet.
 
 $ORIGIN 17.192.{{ zonename }}.
 1   1H IN PTR   vl2018-eth1.lvs2001.codfw.wmnet.
@@ -2937,6 +2949,12 @@
 115 1H IN PTR   cp2016.codfw.wmnet.
 116 1H IN PTR   cp2017.codfw.wmnet.
 117 1H IN PTR   cp2018.codfw.wmnet.
+118 1H IN PTR   elastic2013.codfw.wmnet.
+119 1H IN PTR   elastic2014.codfw.wmnet.
+120 1H IN PTR   elastic2015.codfw.wmnet.
+121 1H IN PTR   elastic2016.codfw.wmnet.
+122 1H IN PTR   elastic2017.codfw.wmnet.
+123 1H IN PTR   elastic2018.codfw.wmnet.
 
 
 $ORIGIN 33.192.{{ zonename }}.
@@ -2986,6 +3004,12 @@
 28  1H IN PTR   cp2024.codfw.wmnet.
 29  1H IN PTR   cp2025.codfw.wmnet.
 30  1H IN PTR   cp2026.codfw.wmnet.
+31  1H IN PTR   elastic2019.codfw.wmnet.
+32  1H IN PTR   elastic2020.codfw.wmnet.
+33  1H IN PTR   elastic2021.codfw.wmnet.
+34  1H IN PTR   elastic2022.codfw.wmnet.
+35  1H IN PTR   elastic2023.codfw.wmnet.
+36  1H IN PTR   elastic2024.codfw.wmnet.
 
 
 $ORIGIN 49.192.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 054e255..6b1810b 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2258,6 +2258,30 @@
 db2070  1H  IN A10.192.48.22
 dbstore2001 1H  IN A10.192.0.32
 dbstore2002 1H  IN A10.192.32.19
+elastic2001 1H  IN A10.192.0.130
+elastic2002 1H  IN A10.192.0.131
+elastic2003 1H  IN A10.192.0.132
+elastic2004 1H  IN A10.192.0.133
+elastic2005 1H  IN A10.192.0.134
+elastic2006 1H  IN A10.192.0.135
+elastic2007 1H  IN A10.192.16.143
+elastic2008 1H  IN A10.192.16.144
+elastic2009 1H  IN A10.192.16.145
+elastic2010 1H  IN A10.192.16.146
+elastic2011 1H  IN A10.192.16.147
+elastic2012 1H  IN A10.192.16.148
+elastic2013 1H  IN A10.192.32.118
+elastic2014 1H  IN A10.192.32.119
+elastic2015 1H  IN A10.192.32.120
+elastic2016 1H  IN A10.192.32.121
+elastic2017 1H  IN A10.192.32.122
+elastic2018 1H  IN A10.192.32.123
+elastic2019 1H  IN A10.192.48.31
+elastic2020 1H  IN A10.192.48.32
+elastic2021 1H  IN A10.192.48.33
+elastic2022 1H  IN A10.192.48.34
+elastic2023 1H  IN A10.192.48.35
+elastic2024 1H  IN A10.192.48.36
 es2001  1H  IN A10.192.0.25
 es2002  1H  IN A10.192.0.26
 es2003  1H  IN A10.192.16.27

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd85c95b04a13b0883b20cc1b8141af3d47b5735
Gerrit-PatchSet: 5
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Rush 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Papaul 
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 TODO file - change (operations...debdeploy)

2015-09-07 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

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

Change subject: Add TODO file
..

Add TODO file

Change-Id: Ib67ada8cbed630c28ca8b60d195f3bf12bafbdc1
---
A docs/TODO
1 file changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/debdeploy 
refs/changes/50/236550/1

diff --git a/docs/TODO b/docs/TODO
new file mode 100644
index 000..24053d5
--- /dev/null
+++ b/docs/TODO
@@ -0,0 +1,17 @@
+
+Bugs:
+
+
+Refinements to existing functionality:
+- Bash completion for commands and options
+- Add a command to generate a YAML file interactively
+- Write initiated deployment jobs into a logfile
+- Provide logrotate configs
+- Display a warning if a host matches twice for a given grain
+
+New feature work:
+- Central package database to easily search for affected binary packages
+- Add a generic notification mechanism if an update has been deployed
+  and create a WMF-specific IRC notification which updates "server admin log"
+- Make the logging configurable and add a WMF-specific logging method for
+  Logstash

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib67ada8cbed630c28ca8b60d195f3bf12bafbdc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Minor: rename lib/service-util.js to lib/util.js - change (mediawiki...mobileapps)

2015-09-07 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review.

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

Change subject: Minor: rename lib/service-util.js to lib/util.js
..

Minor: rename lib/service-util.js to lib/util.js

lib/util.js is inherited from the service template, but its file name
was changed to lib/service-util.js in
https://gerrit.wikimedia.org/r/#/c/234558/ . Keeping the name consistent
allows us to keep the history of the shared files compatible, and also
eases updating the mobile content service to future releases of the
service template.

This is basically a revert of dca052d

Change-Id: I0d0b747ff02edab95ac2f09706f407a8a084c7ca
---
M app.js
M doc/template.md
M lib/mwapi.js
R lib/util.js
M routes/info.js
M routes/mobile-html-sections.js
M routes/mobile-html.js
M routes/mobile-text.js
M routes/root.js
9 files changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/53/236553/1

diff --git a/app.js b/app.js
index d36a7aa..434e77b 100644
--- a/app.js
+++ b/app.js
@@ -7,7 +7,7 @@
 var compression = require('compression');
 var bodyParser = require('body-parser');
 var fs = BBPromise.promisifyAll(require('fs'));
-var sUtil = require('./lib/service-util');
+var sUtil = require('./lib/util');
 var packageInfo = require('./package.json');
 var yaml = require('js-yaml');
 
diff --git a/doc/template.md b/doc/template.md
index d2a3ae5..f9d28ad 100644
--- a/doc/template.md
+++ b/doc/template.md
@@ -57,8 +57,7 @@
 - [`app.js`](../app.js) - contains the application declaration and loading 
logic
 - [`routes`](../routes/) - contains the definitions of the loaded routes; this
   is where most of your coding is to take place
-- [`lib/service-util.js`](../lib/service-util.js) - contains some service
-  utility functions and classes
+- [`lib/util.js`](../lib/util.js) - contains some utility functions and classes
 - [`static`](../static/) - this is where served static files go (HTML, CSS,
   client-side JS, etc.)
 - [`test`](../test/) - contains the test files for the example routes in the
diff --git a/lib/mwapi.js b/lib/mwapi.js
index 8b87830..80770fa 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -5,7 +5,7 @@
 'use strict';
 
 var preq = require('preq');
-var sUtil = require('../lib/service-util');
+var sUtil = require('../lib/util');
 
 // shortcut
 var HTTPError = sUtil.HTTPError;
diff --git a/lib/service-util.js b/lib/util.js
similarity index 100%
rename from lib/service-util.js
rename to lib/util.js
diff --git a/routes/info.js b/routes/info.js
index ce20744..5dd2590 100644
--- a/routes/info.js
+++ b/routes/info.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var sUtil = require('../lib/service-util');
+var sUtil = require('../lib/util');
 
 
 /**
diff --git a/routes/mobile-html-sections.js b/routes/mobile-html-sections.js
index 7fbb223..6a016b3 100644
--- a/routes/mobile-html-sections.js
+++ b/routes/mobile-html-sections.js
@@ -14,7 +14,7 @@
 var BBPromise = require('bluebird');
 var preq = require('preq');
 var mUtil = require('../lib/mobile-util');
-var sUtil = require('../lib/service-util');
+var sUtil = require('../lib/util');
 var transforms = require('../lib/transforms');
 var mwapi = require('../lib/mwapi');
 var gallery = require('../lib/gallery');
diff --git a/routes/mobile-html.js b/routes/mobile-html.js
index b8b8230..e2fc96b 100644
--- a/routes/mobile-html.js
+++ b/routes/mobile-html.js
@@ -18,7 +18,7 @@
 var BBPromise = require('bluebird');
 var preq = require('preq');
 var domino = require('domino');
-var sUtil = require('../lib/service-util');
+var sUtil = require('../lib/util');
 var util = require('util');
 var transforms = require('../lib/transforms');
 var mwapi = require('../lib/mwapi');
diff --git a/routes/mobile-text.js b/routes/mobile-text.js
index b8f864d..9bc2cfc 100644
--- a/routes/mobile-text.js
+++ b/routes/mobile-text.js
@@ -15,7 +15,7 @@
 //var BBPromise = require('bluebird');
 var preq = require('preq');
 var domino = require('domino');
-var sUtil = require('../lib/service-util');
+var sUtil = require('../lib/util');
 var mwapi = require('../lib/mwapi');
 
 // shortcut
diff --git a/routes/root.js b/routes/root.js
index a6f6acc..3b34d8e 100644
--- a/routes/root.js
+++ b/routes/root.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var sUtil = require('../lib/service-util');
+var sUtil = require('../lib/util');
 
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d0b747ff02edab95ac2f09706f407a8a084c7ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] labs: Allow NFS to be turned off on a per-instance level - change (operations/puppet)

2015-09-07 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: labs: Allow NFS to be turned off on a per-instance level
..


labs: Allow NFS to be turned off on a per-instance level

Change-Id: I806359c2e4f9cd2ffa9755e6177c0ceebf1af190
---
M manifests/role/labs.pp
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 472be6a..d528e70 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -47,7 +47,10 @@
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 $dumps_server = 'labstore1003.eqiad.wmnet'
 
-if mount_nfs_volume($::labsproject, 'home') {
+# Allows per-host overriding of NFS mounts
+$mount_nfs = hiera('mount_nfs', true)
+
+if mount_nfs_volume($::labsproject, 'home') and $mount_nfs {
 # Note that this is the same export as for /data/project
 exec { 'block-for-home-export':
 command => "/usr/local/sbin/block-for-export ${nfs_server} 
project/${::labsproject} 180",
@@ -75,7 +78,7 @@
 }
 }
 
-if mount_nfs_volume($::labsproject, 'project') {
+if mount_nfs_volume($::labsproject, 'project') and $mount_nfs {
 exec { 'block-for-project-export':
 command => "/usr/local/sbin/block-for-export ${nfs_server} 
project/${::labsproject} 180",
 require => [File['/etc/modprobe.d/nfs-no-idmap'], 
File['/usr/local/sbin/block-for-export']],
@@ -97,7 +100,7 @@
 }
 }
 
-if mount_nfs_volume($::labsproject, 'scratch') {
+if mount_nfs_volume($::labsproject, 'scratch') and $mount_nfs {
 # We don't need to block for this one because it's always exported for 
everyone.
 file { '/data/scratch':
 ensure  => directory,
@@ -125,7 +128,7 @@
 
 }
 
-if mount_nfs_volume($::labsproject, 'statistics') {
+if mount_nfs_volume($::labsproject, 'statistics') and $mount_nfs {
 file { '/public/statistics':
 ensure  => directory,
 require => File['/public'],
@@ -141,7 +144,7 @@
 }
 }
 
-if mount_nfs_volume($::labsproject, 'dumps') {
+if mount_nfs_volume($::labsproject, 'dumps') and $mount_nfs {
 file { '/public/dumps':
 ensure  => directory,
 require => File['/public'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I806359c2e4f9cd2ffa9755e6177c0ceebf1af190
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
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 EventLogging schema dependencies - change (mediawiki...MobileFrontend)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix EventLogging schema dependencies
..


Fix EventLogging schema dependencies

Fixes Iba22cb40

The first two entries in the getEventLoggingSchemas() returned array would
be ignored, because of how PHP array addition works:

var_dump( array(
'mobile.startup',
'mobile.settings'
) + array(
'MobileWebBrowse',
'MobileWebDiffClickTracking',
'MobileWebMainMenuClickTracking'
) );

Result:
array(3) {
  [0]=>
  string(14) "mobile.startup"
  [1]=>
  string(15) "mobile.settings"
  [2]=>
  string(30) "MobileWebMainMenuClickTracking"
}

Isn't PHP great?

Bug: T110272
Change-Id: I623f6182c2012fa5a16b1e18b9083517ba50ebae
---
M includes/MobileFrontend.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index b48f071..114e62a 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -981,10 +981,10 @@
}
 
$loggingSchemasModule = $mfResourceFileModuleBoilerplate + 
array(
-   'dependencies' => array(
+   'dependencies' => array_merge( array(
'mobile.startup',
'mobile.settings',
-   ) + $schemaModules,
+   ), $schemaModules ),
'scripts' => $scripts,
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I623f6182c2012fa5a16b1e18b9083517ba50ebae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Robmoen 
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 extension.json, remove php entry point - change (mediawiki...Babel)

2015-09-07 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Add extension.json, remove php entry point
..

Add extension.json, remove php entry point

Change-Id: Ib1f66527ad24902e2b033fd29db2331694fef3a6
---
M Babel.class.php
M Babel.php
A extension.json
3 files changed, 75 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel 
refs/changes/60/236560/1

diff --git a/Babel.class.php b/Babel.class.php
index cf8e897..b730e94 100644
--- a/Babel.class.php
+++ b/Babel.class.php
@@ -22,6 +22,13 @@
 */
protected static $title;
 
+   public static function registerExtension() {
+   // Configuration setttings.
+   // Language names and codes constant database files, the 
defaults should suffice.
+   $GLOBALS['wgBabelLanguageCodesCdb'] = __DIR__ . '/codes.cdb';
+   $GLOBALS['wgBabelLanguageNamesCdb'] = __DIR__ . '/names.cdb';
+   }
+
/**
 * Render the Babel tower.
 *
diff --git a/Babel.php b/Babel.php
index 83fd195..6eed60c 100644
--- a/Babel.php
+++ b/Babel.php
@@ -15,8 +15,16 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( 'Invalid entry point.' );
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'Babel' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $GLOBALS['wgMessagesDirs']['Babel'] = __DIR__ . '/i18n';
+   $GLOBALS['wgExtensionMessagesFiles']['BabelMagic'] = __DIR__ . 
'/Babel.i18n.magic.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for Babel extension. Please 
use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return true;
 }
 
 $GLOBALS['wgExtensionCredits']['parserhook'][] = array(
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..a87ced6
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,58 @@
+{
+   "name": "Babel",
+   "version": "1.9.1",
+   "author": "Robert Leverington",
+   "url": "https://www.mediawiki.org/wiki/Extension:Babel;,
+   "descriptionmsg": "babel-desc",
+   "license-name": "GPL-2.0+",
+   "type": "parserhook",
+   "callback": "Babel::registerExtension",
+   "MessagesDirs": {
+   "Babel": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "BabelMagic": "Babel.i18n.magic.php"
+   },
+   "AutoloadClasses": {
+   "Babel": "Babel.class.php",
+   "BabelLanguageCodes": "BabelLanguageCodes.class.php",
+   "BabelStatic": "BabelStatic.class.php",
+   "BabelAutoCreate": "BabelAutoCreate.class.php"
+   },
+   "ResourceModules": {
+   "ext.babel": {
+   "position": "top",
+   "styles": "resources/ext.babel.css"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteExtPath": "Babel"
+   },
+   "Hooks": {
+   "ParserFirstCallInit": [
+   "BabelStatic::onParserFirstCallInit"
+   ],
+   "UserGetReservedNames": [
+   "BabelAutoCreate::onUserGetReservedNames"
+   ]
+   },
+   "config": {
+   "BabelCategoryNames": {
+   "0": "%code%-0",
+   "1": "%code%-1",
+   "2": "%code%-2",
+   "3": "%code%-3",
+   "4": "%code%-4",
+   "5": "%code%-5",
+   "N": "%code%-N"
+   },
+   "BabelMainCategory": "%code%",
+   "BabelDefaultLevel": "N",
+   "BabelUseUserLanguage": false,
+   "BabelPreferISO639_3": false
+   },
+   "manifest_version": 1
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1f66527ad24902e2b033fd29db2331694fef3a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
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] beta apache config: fix instances of 'wikibooks' that were c... - change (operations/puppet)

2015-09-07 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

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

Change subject: beta apache config: fix instances of 'wikibooks' that were 
copy+pasted everywhere
..

beta apache config: fix instances of 'wikibooks' that were copy+pasted 
everywhere

and just delete wikispecies.conf

Change-Id: I2cfc5d599ea294fb60dab04138dd1a96ebec5264
---
M modules/mediawiki/files/apache/beta/sites/testwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikinews.conf
M modules/mediawiki/files/apache/beta/sites/wikiquote.conf
M modules/mediawiki/files/apache/beta/sites/wikisource.conf
D modules/mediawiki/files/apache/beta/sites/wikispecies.conf
M modules/mediawiki/files/apache/beta/sites/wikiversity.conf
M modules/mediawiki/files/apache/beta/sites/wmflabs.conf
M modules/mediawiki/manifests/web/beta_sites.pp
8 files changed, 15 insertions(+), 102 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/236563/1

diff --git a/modules/mediawiki/files/apache/beta/sites/testwiki.conf 
b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
index 4b2169b..4cab289 100644
--- a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
+++ b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
@@ -18,9 +18,9 @@
 
 
 # First grab the subdomain from HTTP_HOST
-#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikibooks\.org
+#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikimedia\.org
 # Now use it
-#RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikibooks/%1/$1 
[R=302]
+#RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikimedia/%1/$1 
[R=302]
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikinews.conf 
b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
index debd278..0022d0f 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikinews.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikinews.conf
@@ -30,15 +30,15 @@
 # Make robots.txt editable via Mediawiki:robots.txt
 RewriteRule ^/robots.txt$ /w/robots.php [L]
 
-# Send www.de.wikibooks.org -> de.wikibooks.org
+# Send www.de.wikinews.org -> de.wikinews.org
 RewriteCond %{HTTP_HOST} www.([a-z-]+).wikinews.(com|net|org)
 RewriteRule ^(.*)$ http://%1.wikinews.org$1 [R=301,L]
 
 # Uploads to the host-specific directory
 # First grab the subdomain from HTTP_HOST
-#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikibooks\.org
+#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikinews\.org
 # Now use it
-#RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikibooks/%1/$1 
[R=302]
+#RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikinews/%1/$1 
[R=302]
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/wikinews.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf 
b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
index 1e86d8e..6d7fc8d 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikiquote.conf
@@ -30,15 +30,15 @@
 # Make robots.txt editable via Mediawiki:robots.txt
 RewriteRule ^/robots.txt$ /w/robots.php [L]
 
-# Send www.de.wikibooks.org -> de.wikibooks.org
+# Send www.de.wikiquote.org -> de.wikiquote.org
 RewriteCond %{HTTP_HOST} www.([a-z-]+).wikiquote.(com|net|org)
 RewriteRule ^(.*)$ http://%1.wikiquote.org$1 [R=301,L]
 
 # Uploads to the host-specific directory
 # First grab the subdomain from HTTP_HOST
-#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikibooks\.org
+#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikiquote\.org
 # Now use it
-#RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikibooks/%1/$1 
[R=302]
+#RewriteRule ^/upload/(.*)$ http://upload.wikimedia.org/wikiquote/%1/$1 
[R=302]
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/wikiquote.org/w/index.php
diff --git a/modules/mediawiki/files/apache/beta/sites/wikisource.conf 
b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
index 6aea7db..bde7beb 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikisource.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikisource.conf
@@ -30,15 +30,15 @@
 # Make robots.txt editable via Mediawiki:robots.txt
 RewriteRule ^/robots.txt$ /w/robots.php [L]
 
-# Send www.de.wikibooks.org -> de.wikibooks.org
+# Send www.de.wikisource.org -> de.wikisource.org
 RewriteCond %{HTTP_HOST} www.([a-z-]+).wikisource.(com|net|org)
 RewriteRule ^(.*)$ http://%1.wikisource.org$1 [R=301,L]
 
 # Uploads to the host-specific directory
 # First grab the subdomain from HTTP_HOST
-#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikibooks\.org
+#RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikisource\.org
 # Now use it
-#RewriteRule

[MediaWiki-commits] [Gerrit] Revert "Remove unused parameters in view tests" - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Remove unused parameters in view tests"
..


Revert "Remove unused parameters in view tests"

This reverts commit 4f2537d6d1d3c87337e54f40ab660d3784d970d8.

Change-Id: Iadb60134236f443d676f8f1d74bea5ef0b83a00d
---
M view/tests/phpunit/EntityTermsViewTest.php
M view/tests/phpunit/StatementGroupListViewTest.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/view/tests/phpunit/EntityTermsViewTest.php 
b/view/tests/phpunit/EntityTermsViewTest.php
index 0c46396..7fe714e 100644
--- a/view/tests/phpunit/EntityTermsViewTest.php
+++ b/view/tests/phpunit/EntityTermsViewTest.php
@@ -133,7 +133,7 @@
/**
 * @dataProvider emptyFingerprintProvider
 */
-   public function testGetHtml_isMarkedAsEmptyValue( Fingerprint 
$fingerprint ) {
+   public function testGetHtml_isMarkedAsEmptyValue( Fingerprint 
$fingerprint, $expectedPlaceholder ) {
$entityTermsView = $this->getEntityTermsView();
$html = $entityTermsView->getHtml( $fingerprint, null, '', new 
TextInjector() );
 
diff --git a/view/tests/phpunit/StatementGroupListViewTest.php 
b/view/tests/phpunit/StatementGroupListViewTest.php
index 1526518..50df479 100644
--- a/view/tests/phpunit/StatementGroupListViewTest.php
+++ b/view/tests/phpunit/StatementGroupListViewTest.php
@@ -141,7 +141,7 @@
 
$claimHtmlGenerator->expects( $this->any() )
->method( 'getHtmlForClaim' )
-   ->will( $this->returnCallback( function( Statement 
$statement ) {
+   ->will( $this->returnCallback( function( Statement 
$statement, $editSectionHtml = null ) {
return $statement->getGuid();
} ) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadb60134236f443d676f8f1d74bea5ef0b83a00d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WPB title should use Mediawiki:Pagetitle - change (mediawiki...WikidataPageBanner)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: WPB title should use Mediawiki:Pagetitle
..


WPB title should use Mediawiki:Pagetitle

WikidataPageBanner should use Mediawiki:Pagetitle to set the title page instead
of only using $out->getTitle()

Bug: T111593
Change-Id: I3c95aa2b8a53e2feecf2351b9bc15e5ed05076a4
---
M includes/WikidataPageBanner.hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/WikidataPageBanner.hooks.php 
b/includes/WikidataPageBanner.hooks.php
index ba7d5f2..6596aa9 100644
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -42,9 +42,11 @@
$out->addModuleStyles( 
'ext.WikidataPageBanner.toc.styles' );
}
$out->prependHtml( $banner );
+   $htmlTitle = $out->getHTMLTitle();
// hide primary title
$out->setPageTitle( '' );
-   $out->setHTMLTitle( $out->getTitle() );
+   // set html title again, because above call 
also empties the  tag
+   $out->setHTMLTitle( $htmlTitle );
// set articlebanner property on OutputPage
// FIXME: This is currently only needed to 
support testing
$out->setProperty( 'articlebanner', $bannername 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c95aa2b8a53e2feecf2351b9bc15e5ed05076a4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit 
Gerrit-Reviewer: Jdlrobson 
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 EventLogging schema dependencies - change (mediawiki...MobileFrontend)

2015-09-07 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

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

Change subject: Fix EventLogging schema dependencies
..

Fix EventLogging schema dependencies

Fixes Iba22cb40

The first two entries in the getEventLoggingSchemas() returned array would
be ignored, because of how PHP array addition works:

var_dump( array(
'mobile.startup',
'mobile.settings'
) + array(
'MobileWebBrowse',
'MobileWebDiffClickTracking',
'MobileWebMainMenuClickTracking'
) );

Result:
array(3) {
  [0]=>
  string(14) "mobile.startup"
  [1]=>
  string(15) "mobile.settings"
  [2]=>
  string(30) "MobileWebMainMenuClickTracking"
}

Isn't PHP great?

Bug: T110272
Change-Id: I623f6182c2012fa5a16b1e18b9083517ba50ebae
(cherry picked from commit 17238d9ece590e59d1513a1d2ba362750cee24a8)
---
M includes/MobileFrontend.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/58/236558/1

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 8187fc6..5b113fe 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1000,10 +1000,10 @@
}
 
$loggingSchemasModule = $mfResourceFileModuleBoilerplate + 
array(
-   'dependencies' => array(
+   'dependencies' => array_merge( array(
'mobile.startup',
'mobile.settings',
-   ) + $schemaModules,
+   ), $schemaModules ),
'scripts' => $scripts,
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I623f6182c2012fa5a16b1e18b9083517ba50ebae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf21
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Adds * wildcard as an attribute specifier in HTMLTags Extens... - change (mediawiki...HTMLTags)

2015-09-07 Thread Gerrit Patch Uploader (Code Review) 
Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Adds * wildcard as an attribute specifier in HTMLTags Extension 
For example, a configuration line could read $wgHTMLTagsAttributes['img'] = 
array( '*' ); to allow IMG tags with any set of attributes, without needing to 
come up with a comprehensive list.
..

Adds * wildcard as an attribute specifier in HTMLTags Extension
For example, a configuration line could read $wgHTMLTagsAttributes['img'] = 
array( '*' ); to allow IMG tags with any set of attributes, without needing to 
come up with a comprehensive list.

Change-Id: Ie94c15535c5b1872d2219fd938a7449c96f7223c
---
M HTMLTags_body.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HTMLTags 
refs/changes/59/236559/1

diff --git a/HTMLTags_body.php b/HTMLTags_body.php
index cb8aeb4..f477b7d 100644
--- a/HTMLTags_body.php
+++ b/HTMLTags_body.php
@@ -46,7 +46,8 @@
$attributes = array();
foreach ( $args as $key => $value ) {
if ( $key == 'tagname' ) { continue; }
-   if ( in_array( $key, $wgHTMLTagsAttributes[$tagName] ) 
) {
+   if ( in_array( $key, $wgHTMLTagsAttributes[$tagName] )
+  || in_array( '*', $wgHTMLTagsAttributes[$tagName] ) ) {
$value = $parser->replaceVariables( $value, 
$frame );
// Prevent JS injection into, for instance,
// the "href" attribute.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie94c15535c5b1872d2219fd938a7449c96f7223c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HTMLTags
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] mw.trackSubscriber: Log platform as phone vs. desktop - change (mediawiki...VisualEditor)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: mw.trackSubscriber: Log platform as phone vs. desktop
..


mw.trackSubscriber: Log platform as phone vs. desktop

Change-Id: I71c25f28098c72ed779117da9c243dc3a87e611d
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/init/ve.init.mw.trackSubscriber.js
4 files changed, 16 insertions(+), 1 deletion(-)

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



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 3ec9f60..05e206f 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -115,6 +115,8 @@
}
 };
 
+ve.init.mw.DesktopArticleTarget.static.platformType = 'desktop';
+
 /* Events */
 
 /**
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index 0675fb7..103de84 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -72,6 +72,9 @@
 
 ve.init.mw.MobileArticleTarget.static.name = 'mobile';
 
+// FIXME Some of these users will be on tablets, check for this
+ve.init.mw.MobileArticleTarget.static.platformType = 'phone';
+
 /* Methods */
 
 /**
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index ae0d760..f9e0ed6 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -245,12 +245,22 @@
 
 /**
  * Type of integration. Used by ve.init.mw.trackSubscriber.js for event 
tracking.
+ *
  * @static
  * @property {string}
  * @inheritable
  */
 ve.init.mw.Target.static.integrationType = 'page';
 
+/**
+ * Type of platform. Used by ve.init.mw.trackSubscriber.js for event tracking.
+ *
+ * @static
+ * @property {string}
+ * @inheritable
+ */
+ve.init.mw.Target.static.platformType = 'other';
+
 /* Static Methods */
 
 /**
diff --git a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js 
b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
index c815a1e..958a708 100644
--- a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
+++ b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
@@ -98,7 +98,7 @@
version: 1,
action: action,
editor: 'visualeditor',
-   platform: 'desktop', // FIXME
+   platform: ve.init && ve.init.target && 
ve.init.target.constructor.static.platformType || 'other',
integration: ve.init && ve.init.target && 
ve.init.target.constructor.static.integrationType || 'page',
'page.id': mw.config.get( 'wgArticleId' ),
'page.title': mw.config.get( 'wgPageName' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71c25f28098c72ed779117da9c243dc3a87e611d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
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] Syncronize VisualEditor: 4633179..31bdb77 - change (mediawiki/extensions)

2015-09-07 Thread Jenkins-mwext-sync (Code Review) 
Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 4633179..31bdb77
..


Syncronize VisualEditor: 4633179..31bdb77

Change-Id: I8b789f31c2217c9f43d195189152be79412415cb
---
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 4633179..31bdb77 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4633179b10dcb344c92278e99257cacb4d0ec9ba
+Subproject commit 31bdb77d63951eeec184e370131710b21ba7c695

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b789f31c2217c9f43d195189152be79412415cb
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: 4633179..31bdb77 - change (mediawiki/extensions)

2015-09-07 Thread Jenkins-mwext-sync (Code Review) 
Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 4633179..31bdb77
..

Syncronize VisualEditor: 4633179..31bdb77

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/61/236561/1

diff --git a/VisualEditor b/VisualEditor
index 4633179..31bdb77 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4633179b10dcb344c92278e99257cacb4d0ec9ba
+Subproject commit 31bdb77d63951eeec184e370131710b21ba7c695

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b789f31c2217c9f43d195189152be79412415cb
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] Use compound matching for minion targeting - change (operations...debdeploy)

2015-09-07 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

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

Change subject: Use compound matching for minion targeting
..

Use compound matching for minion targeting

Change-Id: Ieb65c3d4d0af2c3e8784e3ec7340df9f7afc54ef
---
M debian/changelog
M docs/TODO
M master/debdeploy
3 files changed, 84 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/debdeploy 
refs/changes/62/236562/1

diff --git a/debian/changelog b/debian/changelog
index 15cd1bb..b0cbe9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@
 
   * Add a Salt returner for local logging
   * Add workaround for Salt bug writing out it's return status to stdout
+  * Use compound matching to properly support server groups with
+overlapping grains
 
  -- Moritz Muehlenhoff   Mon, 07 Sep 2015 15:20:01 
+0200
 
diff --git a/docs/TODO b/docs/TODO
index 24053d5..95272f6 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -7,7 +7,6 @@
 - Add a command to generate a YAML file interactively
 - Write initiated deployment jobs into a logfile
 - Provide logrotate configs
-- Display a warning if a host matches twice for a given grain
 
 New feature work:
 - Central package database to easily search for affected binary packages
diff --git a/master/debdeploy b/master/debdeploy
index c22d292..6559956 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -47,90 +47,91 @@
 print opt.updatefile, "hasn't been deployed yet for this 
server group (identified by grain", i, ")"
 sys.exit(0)
 
+# The jid is identical for all minions in a debdeploy run
 if rollback_mode:
 jid = joblogdb.get_rollbackid(opt.updatefile, i)
 else:
 jid = joblogdb.get_jobid(opt.updatefile, i)
 
-# SaltRunner always emits its status on stdout, 
https://github.com/saltstack/salt/issues/21392
-# Can be dropped once fixed upstream
-with open('/dev/null', 'w') as discard_output:
-oldstdout = sys.stdout
-sys.stdout = discard_output
-job = runner.cmd('jobs.print_job', (jid,))
-sys.stdout = oldstdout
-if not job:
-print "Job " + str(jid) + " hasn't finished yet, please check 
again later"
-sys.exit(0)
+# SaltRunner always emits its status on stdout, 
https://github.com/saltstack/salt/issues/21392
+# Can be dropped once fixed upstream
+with open('/dev/null', 'w') as discard_output:
+oldstdout = sys.stdout
+sys.stdout = discard_output
+job = runner.cmd('jobs.print_job', (jid,))
+sys.stdout = oldstdout
+if not job:
+print "Job " + str(jid) + " hasn't finished yet, please check again 
later"
+sys.exit(0)
 
-res = job[jid]['Result']
-if not res:
-print "Job hasn't finished yet, please check again later"
-sys.exit(0)
+res = job[jid]['Result']
+if not res:
+print "Job hasn't finished yet, please check again later"
+sys.exit(0)
 
-amount_of_hosts += len(res.keys())
+amount_of_hosts += len(res.keys())
 
-for host in res:
-added = res[host]['return']['additions']
-removed = res[host]['return']['removals']
-updated = res[host]['return']['updated']
-restart = res[host]['return']['restart']
+for host in res:
+added = res[host]['return']['additions']
+removed = res[host]['return']['removals']
+updated = res[host]['return']['updated']
+restart = res[host]['return']['restart']
 
-print host + ":"
-if added:
-print "  Added packages:", host['return']['additions']
-for added_pkg in host['return']['additions']:
-if not add_cnt.get(added_pkg, None):
-add_cnt[added_pkg] = 1
-else:
-add_cnt[added_pkg] += 1
-
-elif removed:
-print "  Removed packages:", host['return']['removals']
-for removed_pkg in host['return']['removals']:
-if not remove_cnt.get(removed_pkg, None):
-remove_cnt[removed_pkg] = 1
-else:
-remove_cnt[removed_pkg] += 1
-
-elif len(updated.keys()) > 0:
-print "  Updated packages:"
-for k in updated:
-print "" + k + ": " + updated[k][0] + " -> " + 
updated[k][1]
-
-updated_idx = k + ": " + updated[k][0] + " -> " + 
updated[k][1]
-if not update_cnt.get(updated_idx, None):
-update_cnt[updated_idx] = 1
-else:
-update_cnt[updated_idx] += 1
-
-else:
-print "  No

[MediaWiki-commits] [Gerrit] Use Site instead of MediaWikiSite in OtherProjectsSitesGener... - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use Site instead of MediaWikiSite in 
OtherProjectsSitesGeneratorTest
..


Use Site instead of MediaWikiSite in OtherProjectsSitesGeneratorTest

This test obviously does not need anything from the specialized class,
it can simply use the base class and that way avoid a dependency.

Change-Id: I94885a23f679a1629700d0ab03e8340e52399c52
---
M client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
1 file changed, 7 insertions(+), 8 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php 
b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
index 5a3f9a7..e042552 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Client\Tests;
 
-use MediaWikiSite;
 use Site;
 use Wikibase\Client\OtherProjectsSitesGenerator;
 use Wikibase\Test\MockSiteStore;
@@ -107,43 +106,43 @@
$site->setLanguageCode( 'fr' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'enwiki' );
$site->setGroup( 'wikipedia' );
$site->setLanguageCode( 'en' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'frwiki' );
$site->setGroup( 'wikipedia' );
$site->setLanguageCode( 'fr' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'frwikisource' );
$site->setGroup( 'wikisource' );
$site->setLanguageCode( 'fr' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'nlwikisource' );
$site->setGroup( 'wikisource' );
$site->setLanguageCode( 'nl' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'eswiki' );
$site->setGroup( 'wikipedia' );
$site->setLanguageCode( 'es' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'commonswiki' );
$site->setGroup( 'commons' );
$site->setLanguageCode( 'en' );
$sites[] = $site;
 
-   $site = new MediaWikiSite();
+   $site = new Site();
$site->setGlobalId( 'wikidatawiki' );
$site->setGroup( 'wikidata' );
$site->setLanguageCode( 'en' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94885a23f679a1629700d0ab03e8340e52399c52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Jeroen De Dauw 
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 EventLogging schema dependencies - change (mediawiki...MobileFrontend)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix EventLogging schema dependencies
..


Fix EventLogging schema dependencies

Fixes Iba22cb40

The first two entries in the getEventLoggingSchemas() returned array would
be ignored, because of how PHP array addition works:

var_dump( array(
'mobile.startup',
'mobile.settings'
) + array(
'MobileWebBrowse',
'MobileWebDiffClickTracking',
'MobileWebMainMenuClickTracking'
) );

Result:
array(3) {
  [0]=>
  string(14) "mobile.startup"
  [1]=>
  string(15) "mobile.settings"
  [2]=>
  string(30) "MobileWebMainMenuClickTracking"
}

Isn't PHP great?

Bug: T110272
Change-Id: I623f6182c2012fa5a16b1e18b9083517ba50ebae
(cherry picked from commit 17238d9ece590e59d1513a1d2ba362750cee24a8)
---
M includes/MobileFrontend.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 8187fc6..5b113fe 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1000,10 +1000,10 @@
}
 
$loggingSchemasModule = $mfResourceFileModuleBoilerplate + 
array(
-   'dependencies' => array(
+   'dependencies' => array_merge( array(
'mobile.startup',
'mobile.settings',
-   ) + $schemaModules,
+   ), $schemaModules ),
'scripts' => $scripts,
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I623f6182c2012fa5a16b1e18b9083517ba50ebae
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf21
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mw.widgets.DateInputWidget: Add required config - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: mw.widgets.DateInputWidget: Add required config
..


mw.widgets.DateInputWidget: Add required config

Change-Id: Ie3691d5239a512e1a4fa882c43c224c2de8d7598
---
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 6b7f860..c8093bb 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -75,10 +75,16 @@
 * field when it's empty. Should be the same as `inputFormat`, but 
translated to the user's
 * language. When not given, defaults to a translated version of 
'-MM-DD' or '-MM',
 * depending on `precision`.
+* @cfg {boolean} [required=false] Mark the field as required. Implies 
`indicator: 'required'`.
 */
mw.widgets.DateInputWidget = function MWWDateInputWidget( config ) {
// Config initialization
config = $.extend( { precision: 'day' }, config );
+   if ( config.required ) {
+   if ( config.indicator === undefined ) {
+   config.indicator = 'required';
+   }
+   }
 
var placeholder;
if ( config.placeholder ) {
@@ -128,6 +134,10 @@
} );
 
// Initialization
+   if ( config.required ) {
+   this.$input.attr( 'required', 'required' );
+   this.$input.attr( 'aria-required', 'true' );
+   }
// Move 'tabindex' from this.$input (which is invisible) to the 
visible handle
this.setTabIndexedElement( this.handle.$element );
this.handle.$element

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3691d5239a512e1a4fa882c43c224c2de8d7598
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: 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] Avoid querying the namespace index when doing a morelike query - change (mediawiki...CirrusSearch)

2015-09-07 Thread DCausse (Code Review) 
DCausse has uploaded a new change for review.

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

Change subject: Avoid querying the namespace index when doing a morelike query
..

Avoid querying the namespace index when doing a morelike query

Since Mobile app switched to morelike: as a default "See also" query
we are getting about 100 morelike queries per second.
This patches saves about 100 ns lookups per second.

Bug:T111244
Change-Id: Ied5add52e8a6a3d8d650599425b6e9a60402260d
---
M includes/CirrusSearch.php
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/64/236564/1

diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 9359c2e..e03436e 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -130,11 +130,6 @@
$searcher->addSuggestPrefix( '~' );
}
 
-   if ( $this->lastNamespacePrefix ) {
-   $searcher->addSuggestPrefix( $this->lastNamespacePrefix 
);
-   } else {
-   $searcher->updateNamespacesFromQuery( $term );
-   }
// TODO remove this when we no longer have to support core 
versions without
// Ie946150c6796139201221dfa6f7750c210e97166
if ( method_exists( $this, 'getSort' ) ) {
@@ -154,6 +149,12 @@
$term = substr( $term, strlen( 
self::MORE_LIKE_THIS_JUST_WIKIBASE_PREFIX ) );
$status = $this->moreLikeThis( $term, $searcher, 
Searcher::MORE_LIKE_THESE_ONLY_WIKIBASE );
} else {
+   # Namespace lookup should not be done for morelike 
special syntax (T111244)
+   if ( $this->lastNamespacePrefix ) {
+   $searcher->addSuggestPrefix( 
$this->lastNamespacePrefix );
+   } else {
+   $searcher->updateNamespacesFromQuery( $term );
+   }
$highlightingConfig = 
FullTextResultsType::HIGHLIGHT_ALL;
if ( $request ) {
if ( $request->getVal( 'cirrusSuppressSuggest' 
) !== null ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied5add52e8a6a3d8d650599425b6e9a60402260d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Add // @codingStandardsIgnore around very very long line in ... - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add // @codingStandardsIgnore around very very long line in 
Language.php
..


Add // @codingStandardsIgnore around very very long line in Language.php

Bug: T110238
Change-Id: Ic681d3eb4e02443b06386ae390536912a8fc4566
---
M languages/Language.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/languages/Language.php b/languages/Language.php
index b47442d..1613536 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -167,9 +167,11 @@
 * Generated by UnicodeJS (see tools/strongDir) from the UCD; see
 * https://git.wikimedia.org/summary/unicodejs.git .
 */
+   // @codingStandardsIgnoreStart
// @codeCoverageIgnoreStart
static private $strongDirRegex =

[MediaWiki-commits] [Gerrit] labs: Allow NFS to be turned off on a per-instance level - change (operations/puppet)

2015-09-07 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: labs: Allow NFS to be turned off on a per-instance level
..

labs: Allow NFS to be turned off on a per-instance level

Change-Id: I806359c2e4f9cd2ffa9755e6177c0ceebf1af190
---
M manifests/role/labs.pp
1 file changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/236543/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 472be6a..d528e70 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -47,7 +47,10 @@
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 $dumps_server = 'labstore1003.eqiad.wmnet'
 
-if mount_nfs_volume($::labsproject, 'home') {
+# Allows per-host overriding of NFS mounts
+$mount_nfs = hiera('mount_nfs', true)
+
+if mount_nfs_volume($::labsproject, 'home') and $mount_nfs {
 # Note that this is the same export as for /data/project
 exec { 'block-for-home-export':
 command => "/usr/local/sbin/block-for-export ${nfs_server} 
project/${::labsproject} 180",
@@ -75,7 +78,7 @@
 }
 }
 
-if mount_nfs_volume($::labsproject, 'project') {
+if mount_nfs_volume($::labsproject, 'project') and $mount_nfs {
 exec { 'block-for-project-export':
 command => "/usr/local/sbin/block-for-export ${nfs_server} 
project/${::labsproject} 180",
 require => [File['/etc/modprobe.d/nfs-no-idmap'], 
File['/usr/local/sbin/block-for-export']],
@@ -97,7 +100,7 @@
 }
 }
 
-if mount_nfs_volume($::labsproject, 'scratch') {
+if mount_nfs_volume($::labsproject, 'scratch') and $mount_nfs {
 # We don't need to block for this one because it's always exported for 
everyone.
 file { '/data/scratch':
 ensure  => directory,
@@ -125,7 +128,7 @@
 
 }
 
-if mount_nfs_volume($::labsproject, 'statistics') {
+if mount_nfs_volume($::labsproject, 'statistics') and $mount_nfs {
 file { '/public/statistics':
 ensure  => directory,
 require => File['/public'],
@@ -141,7 +144,7 @@
 }
 }
 
-if mount_nfs_volume($::labsproject, 'dumps') {
+if mount_nfs_volume($::labsproject, 'dumps') and $mount_nfs {
 file { '/public/dumps':
 ensure  => directory,
 require => File['/public'],

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

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

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

[MediaWiki-commits] [Gerrit] Remove requirement that an "alphabetic" sort order must be d... - change (mediawiki...Wikibase)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove requirement that an "alphabetic" sort order must be 
defined
..


Remove requirement that an "alphabetic" sort order must be defined

This came up while working on T103044.

Bug: T111023
Change-Id: I827e8e0d0291354902e4c3cf694a9dab3db80c89
---
M client/includes/InterwikiSorter.php
M client/tests/phpunit/includes/InterwikiSorterTest.php
2 files changed, 27 insertions(+), 24 deletions(-)

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



diff --git a/client/includes/InterwikiSorter.php 
b/client/includes/InterwikiSorter.php
index b70c9b7..ba27823 100644
--- a/client/includes/InterwikiSorter.php
+++ b/client/includes/InterwikiSorter.php
@@ -2,8 +2,6 @@
 
 namespace Wikibase;
 
-use InvalidArgumentException;
-
 /**
  * Language sorting utility functions.
  *
@@ -15,6 +13,11 @@
  * @author Thiemo Mättig
  */
 class InterwikiSorter {
+
+   /**
+* @see Documentation of "sort" and "interwikiSortOrders" options in 
docs/options.wiki.
+*/
+   const SORT_CODE = 'code';
 
/**
 * @var array[]
@@ -42,16 +45,8 @@
 * @param string $sort
 * @param array[] $sortOrders
 * @param string[] $sortPrepend
-*
-* @throws InvalidArgumentException
 */
-   public function __construct( $sort, array $sortOrders, array 
$sortPrepend ) {
-   if ( !array_key_exists( 'alphabetic', $sortOrders ) ) {
-   throw new InvalidArgumentException(
-   'alphabetic interwiki sorting order is missing 
from Wikibase Client settings.'
-   );
-   }
-
+   public function __construct( $sort, array $sortOrders = array(), array 
$sortPrepend = array() ) {
$this->sort = $sort;
$this->sortOrders = $sortOrders;
$this->sortPrepend = $sortPrepend;
@@ -129,22 +124,16 @@
 * @return int[]
 */
private function buildSortOrder( $sort, array $sortOrders ) {
-   $sortOrder = $sortOrders['alphabetic'];
-
-   if ( $sort === 'alphabetic' ) {
-   // do nothing
-   } elseif ( $sort === 'code' ) {
+   if ( $sort === self::SORT_CODE ) {
// The concept of known/unknown languages is irrelevant 
in strict code order.
$sortOrder = array();
+   } elseif ( !array_key_exists( $sort, $sortOrders ) ) {
+   // Something went wrong, but we can use default "code" 
order.
+   wfDebugLog( __CLASS__, __FUNCTION__
+   . ': Invalid or unknown sort order specified 
for interwiki links.' );
+   $sortOrder = array();
} else {
-   if ( array_key_exists( $sort, $sortOrders ) ) {
-   $sortOrder = $sortOrders[$sort];
-   } else {
-   // something went wrong but we can use default 
order
-   trigger_error( __CLASS__
-   . ' : invalid or unknown sort order 
specified for interwiki links.', E_USER_WARNING );
-   sort( $sortOrder );
-   }
+   $sortOrder = $sortOrders[$sort];
}
 
if ( $this->sortPrepend !== array() ) {
diff --git a/client/tests/phpunit/includes/InterwikiSorterTest.php 
b/client/tests/phpunit/includes/InterwikiSorterTest.php
index e0d8243..cc4d15c 100644
--- a/client/tests/phpunit/includes/InterwikiSorterTest.php
+++ b/client/tests/phpunit/includes/InterwikiSorterTest.php
@@ -101,6 +101,13 @@
array( 'e' ), // prepend
array( 'e', 'a', 'b', 'c', 'd', 'f' )
),
+   'Code w/o alphabetic' => array(
+   array( 'c', 'b', 'a' ),
+   'code',
+   array(),
+   array(),
+   array( 'a', 'b', 'c' )
+   ),
array(
array( 'a', 'b', 'k', 'x' ),
'alphabetic',
@@ -108,6 +115,13 @@
array(),
array( 'x', 'k', 'a', 'b' )
),
+   'Fall back to code order' => array(
+   array( 'b', 'a' ),
+   'invalid',
+   array(),
+   array(),
+   array( 'a', 'b' )
+   )
);
}
 

--

[MediaWiki-commits] [Gerrit] Fix $.each loop over array of strings in toolbarcontroller.js - change (mediawiki...Wikibase)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix $.each loop over array of strings in toolbarcontroller.js
..

Fix $.each loop over array of strings in toolbarcontroller.js

When resolving the iterated array elements via "this", they are String
objects, not string literals. This is the same in both browsers I tested,
current Firefox and IE9.

In the function jQuery.wikibase.toolbarcontroller.definition there is a
"typeof === string" check. This fails for String objects.

The relevant code was introduced in https://gerrit.wikimedia.org/r/180423
I wonder why it never failed before. We found this when debugging with IE9.

Bug: T111699
Change-Id: Ic25ba72770f84e2005de51ab29ed11f7b1b967e1
---
M view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js
M 
view/resources/jquery/wikibase/toolbar/controller/jquery.wikibase.toolbarcontroller.js
2 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/57/236557/1

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js
index 5e33cba..1ee2d0b 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js
@@ -100,8 +100,8 @@
.prop( 'lang', this.options.value.getLanguageCode() )
.prop( 'dir', $.util.getDirectionality( 
this.options.value.getLanguageCode() ) );
 
-   $.each( this.options.value.getTexts(), function() {
-   self.$list.append( mw.wbTemplate( 
'wikibase-aliasesview-list-item', this ) );
+   $.each( this.options.value.getTexts(), function( index, 
text ) {
+   self.$list.append( mw.wbTemplate( 
'wikibase-aliasesview-list-item', text ) );
} );
}
 
diff --git 
a/view/resources/jquery/wikibase/toolbar/controller/jquery.wikibase.toolbarcontroller.js
 
b/view/resources/jquery/wikibase/toolbar/controller/jquery.wikibase.toolbarcontroller.js
index 39e2b8b..097d224 100644
--- 
a/view/resources/jquery/wikibase/toolbar/controller/jquery.wikibase.toolbarcontroller.js
+++ 
b/view/resources/jquery/wikibase/toolbar/controller/jquery.wikibase.toolbarcontroller.js
@@ -46,9 +46,8 @@
this.options.toolbars = this.options.toolbars || {};
 
$.each( this.options.toolbars, function( type, ids ) {
-   $.each( ids, function() {
-   var id = this,
-   def = 
$.wikibase.toolbarcontroller.definition( type, id );
+   $.each( ids, function( index, id ) {
+   var def = 
$.wikibase.toolbarcontroller.definition( type, id );
 
if( !def ) {
throw new Error( 'Missing 
toolbar controller definition for type "'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic25ba72770f84e2005de51ab29ed11f7b1b967e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Fix abstract field to be abstractNote - change (mediawiki...citoid)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix abstract field to be abstractNote
..


Fix abstract field to be abstractNote

Currently the abstract field is called 'abstract'-
the field in Zotero (which we use internally) is
called 'abstractNote'.

This is a breaking change for scripts using the
abstract field.

Bug: T107444
Change-Id: If324c9e7f4d482a3d05e27f0a3f2c7df6c85f315
---
M lib/translators/general.js
M lib/translators/openGraph.js
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/translators/general.js b/lib/translators/general.js
index d35d9a2..30fd921 100644
--- a/lib/translators/general.js
+++ b/lib/translators/general.js
@@ -34,7 +34,7 @@
 exports.general = {
authorlink: null,
canonical: makeTranslator('url'),
-   description: makeTranslator('abstract'),
+   description: makeTranslator('abstractNote'),
publisher: null,
robots: null,
shortlink: null,
diff --git a/lib/translators/openGraph.js b/lib/translators/openGraph.js
index ae484f0..234db25 100644
--- a/lib/translators/openGraph.js
+++ b/lib/translators/openGraph.js
@@ -32,7 +32,7 @@
url: makeTranslator('url'), // general OG property, common to all 
Zotero types
image: null, // general OG property, unused in any Zotero type //could 
possible put in archive location?
audio: null, // general OG property, unused in Zotero in any Zotero 
type //could possibly put in archive location?
-   description: makeTranslator('abstract'), // general OG property, 
abstract common to all Zotero types
+   description: makeTranslator('abstractNote'), // general OG property, 
abstractNote common to all Zotero types
locale: null, // general OG property, common to all Zotero types
determiner: null,  // general OG property, unused in any Zotero type
'locale:alternate': null, // general OG property, unused in any Zotero 
type

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If324c9e7f4d482a3d05e27f0a3f2c7df6c85f315
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Mvolz 
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 incategory, insource and intitle with double quoted values - change (mediawiki...CirrusSearch)

2015-09-07 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix incategory, insource and intitle with double quoted values
..

Fix incategory, insource and intitle with double quoted values

This partly reverts Id6f5801. The problem is that some functions require
the double quotes to be present. In my opinion all these cases should
be unified to be similar: They should acceps multi-word queries with
spaces and not split these into separate queries.

Bug: T110855
Bug: T111293
Change-Id: Ia83358dd23be661681c884d0b7679e4b9691d0c4
---
M includes/Hooks.php
M includes/Search/Filters.php
2 files changed, 21 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/44/236544/1

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 6251554..727c075 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -826,8 +826,8 @@
 
/**
 * Pick $num random entries from $array.
-* @var $array array array to pick from
-* @var $num int number of entries to pick
+* @param array $array Array to pick from
+* @param int $num Number of entries to pick
 * @return array of entries from $array
 */
private static function pickFromArray( $array, $num ) {
diff --git a/includes/Search/Filters.php b/includes/Search/Filters.php
index baf0fa4..e9c6c59 100644
--- a/includes/Search/Filters.php
+++ b/includes/Search/Filters.php
@@ -1,6 +1,8 @@
 fixupWholeQueryString(
-   $escaper->fixupQueryStringPart( $value ) );
+   $escaper->fixupQueryStringPart( '"' . $value . '"' ) );
$field = $fieldF( $queryString );
$query = new \Elastica\Query\QueryString( $queryString );
$query->setFields( array( $field ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia83358dd23be661681c884d0b7679e4b9691d0c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Use a proper StringParser instead of NullParser for StringVa... - change (mediawiki...Wikibase)

2015-09-07 Thread Daniel Kinzler (Code Review) 
Daniel Kinzler has uploaded a new change for review.

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

Change subject: Use a proper StringParser instead of NullParser for 
StringValues.
..

Use a proper StringParser instead of NullParser for StringValues.

So far, we had a NullParser defiend for parsing values for the commonsMedia,
url, and string data types. Since NullParser always returns an UnknownValue,
this setup was not actually usable by the frontend, causing special case
handling to be implemented in JS. To avoid this, we can now use the new
StringParser.

Using StringParser also allows us to apply unicode normalization to all
incoming string values.

This restores what was already implemented with I226f0dff9.

Bug: T104873
Change-Id: Ifefc996e5fe8d498d4014060086ec1f8a673ee2f
---
M repo/WikibaseRepo.datatypes.php
1 file changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/45/236545/1

diff --git a/repo/WikibaseRepo.datatypes.php b/repo/WikibaseRepo.datatypes.php
index 69674e5..62682b2 100644
--- a/repo/WikibaseRepo.datatypes.php
+++ b/repo/WikibaseRepo.datatypes.php
@@ -19,11 +19,12 @@
  */
 
 use DataValues\Geo\Parsers\GlobeCoordinateParser;
-use ValueParsers\NullParser;
 use ValueParsers\QuantityParser;
+use ValueParsers\StringParser;
 use ValueParsers\ValueParser;
 use Wikibase\Lib\EntityIdValueParser;
 use Wikibase\Lib\Parsers\TimeParserFactory;
+use Wikibase\Lib\WikibaseStringValueNormalizer;
 use Wikibase\Parsers\MonolingualTextParser;
 use Wikibase\Repo\WikibaseRepo;
 
@@ -39,8 +40,10 @@
return new EntityIdValueParser( $repo->getEntityIdParser() );
};
 
-   $newNullParser = function( ValueParsers\ParserOptions $options ) {
-   return new NullParser();
+   $newStringParser = function( ValueParsers\ParserOptions $options ) {
+   $repo = WikibaseRepo::getDefaultInstance();
+   $normalizer = new WikibaseStringValueNormalizer( 
$repo->getStringNormalizer() );
+   return new StringParser( $normalizer );
};
 
return array(
@@ -49,7 +52,7 @@
$factory = 
WikibaseRepo::getDefaultValidatorBuilders();
return $factory->buildStringValidators();
},
-   'parser-factory-callback' => $newNullParser, //TODO: 
use StringParser
+   'parser-factory-callback' => $newStringParser,
 
),
'globe-coordinate' => array(
@@ -86,7 +89,7 @@
$factory = 
WikibaseRepo::getDefaultValidatorBuilders();
return $factory->buildStringValidators();
},
-   'parser-factory-callback' => $newNullParser, //TODO: 
use StringParser
+   'parser-factory-callback' => $newStringParser,
),
'time' => array(
'validator-factory-callback' => function () {
@@ -103,7 +106,7 @@
$factory = 
WikibaseRepo::getDefaultValidatorBuilders();
return $factory->buildUrlValidators();
},
-   'parser-factory-callback' => $newNullParser, //TODO: 
use StringParser
+   'parser-factory-callback' => $newStringParser,
),
'wikibase-item' => array(
'validator-factory-callback' => function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifefc996e5fe8d498d4014060086ec1f8a673ee2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

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

[MediaWiki-commits] [Gerrit] Add a Salt returner for local logging - change (operations...debdeploy)

2015-09-07 Thread Muehlenhoff (Code Review) 
Muehlenhoff has submitted this change and it was merged.

Change subject: Add a Salt returner for local logging
..


Add a Salt returner for local logging

Also add a workaround for Salt bug writing out it's return status to stdout

Change-Id: I7e61b64afb1c6b43a22fa3513ab93ff9e04fb26d
---
M debian/changelog
M debian/debdeploy-minion.install
M master/debdeploy
A minion/debdeploy-log.py
4 files changed, 30 insertions(+), 3 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 0a9e091..15cd1bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debdeploy (0.0.5-1) jessie-wikimedia; urgency=medium
+
+  * Add a Salt returner for local logging
+  * Add workaround for Salt bug writing out it's return status to stdout
+
+ -- Moritz Muehlenhoff   Mon, 07 Sep 2015 15:20:01 
+0200
+
 debdeploy (0.0.4-1) jessie-wikimedia; urgency=medium
 
   * Implement list-server-groups command
diff --git a/debian/debdeploy-minion.install b/debian/debdeploy-minion.install
index 270b344..e77960b 100644
--- a/debian/debdeploy-minion.install
+++ b/debian/debdeploy-minion.install
@@ -1,3 +1,4 @@
 minion/debdeploy-minion.py /usr/lib/python2.7/dist-packages/salt/modules/
 minion/debdeploy_restart.py /usr/lib/python2.7/dist-packages/salt/modules/
+minion/debdeploy-log.py /usr/lib/python2.7/dist-packages/salt/returners/
 
diff --git a/master/debdeploy b/master/debdeploy
index 5912645..c22d292 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -53,8 +53,12 @@
 jid = joblogdb.get_jobid(opt.updatefile, i)
 
 # SaltRunner always emits its status on stdout, 
https://github.com/saltstack/salt/issues/21392
-# TODO: Needs some kludge to suppress it
-job = runner.cmd('jobs.print_job', (jid,))
+# Can be dropped once fixed upstream
+with open('/dev/null', 'w') as discard_output:
+oldstdout = sys.stdout
+sys.stdout = discard_output
+job = runner.cmd('jobs.print_job', (jid,))
+sys.stdout = oldstdout
 if not job:
 print "Job " + str(jid) + " hasn't finished yet, please check 
again later"
 sys.exit(0)
@@ -212,7 +216,7 @@
 
 if opt.verbose:
 print "Grain:", i
-jid = client.cmd_async(i, 'debdeploy-minion.deploy', [source, 
update_type, update.fixes], expr_form='grain')
+jid = client.cmd_async(i, 'debdeploy-minion.deploy', [source, 
update_type, update.fixes], expr_form='grain', ret='debdeploy-log')
 logging.info("Initiated rollout for " + source + " on grain " + i + 
"(salt job id: " + str(jid) + ")")
 joblogdb.add_job(update_file, i, jid)
 
diff --git a/minion/debdeploy-log.py b/minion/debdeploy-log.py
new file mode 100644
index 000..e6cabb2
--- /dev/null
+++ b/minion/debdeploy-log.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+'''
+This returner logs the package status update to /var/log/debdeploy.log
+'''
+
+import datetime
+
+def returner(ret):
+with open("/var/log/debdeploy.log", "a") as log:
+indented = [datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S ") + l 
for l in ret['return']['aptlog'].splitlines()]
+log.write("\n".join(indented))
+
+# Local variables:
+# mode: python
+# End:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e61b64afb1c6b43a22fa3513ab93ff9e04fb26d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Add TODO file - change (operations...debdeploy)

2015-09-07 Thread Muehlenhoff (Code Review) 
Muehlenhoff has submitted this change and it was merged.

Change subject: Add TODO file
..


Add TODO file

Change-Id: Ib67ada8cbed630c28ca8b60d195f3bf12bafbdc1
---
A docs/TODO
1 file changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/docs/TODO b/docs/TODO
new file mode 100644
index 000..24053d5
--- /dev/null
+++ b/docs/TODO
@@ -0,0 +1,17 @@
+
+Bugs:
+
+
+Refinements to existing functionality:
+- Bash completion for commands and options
+- Add a command to generate a YAML file interactively
+- Write initiated deployment jobs into a logfile
+- Provide logrotate configs
+- Display a warning if a host matches twice for a given grain
+
+New feature work:
+- Central package database to easily search for affected binary packages
+- Add a generic notification mechanism if an update has been deployed
+  and create a WMF-specific IRC notification which updates "server admin log"
+- Make the logging configurable and add a WMF-specific logging method for
+  Logstash

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib67ada8cbed630c28ca8b60d195f3bf12bafbdc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-09-07T14:36:03+0000 - change (mediawiki...Wikidata)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: New Wikidata Build - 2015-09-07T14:36:03+
..


New Wikidata Build - 2015-09-07T14:36:03+

Change-Id: Iac5b87bd7656f4a0e2e904fd419294398288ef52
---
M composer.json
M composer.lock
M extensions/Constraints/composer.json
A extensions/Constraints/i18n/ja.json
M extensions/Constraints/i18n/uk.json
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/PropertySuggester/PropertySuggester.php
M extensions/PropertySuggester/README.md
M extensions/PropertySuggester/composer.json
M extensions/PropertySuggester/i18n/en.json
M extensions/PropertySuggester/i18n/qqq.json
M extensions/PropertySuggester/src/PropertySuggester/GetSuggestions.php
M extensions/PropertySuggester/src/PropertySuggester/ResultBuilder.php
M 
extensions/PropertySuggester/tests/phpunit/PropertySuggester/SuggestionGeneratorTest.php
M extensions/Quality/composer.json
M extensions/Quality/i18n/gl.json
M extensions/Quality/i18n/ja.json
M extensions/Quality/i18n/roa-tara.json
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/WikibaseClient.i18n.alias.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/i18n/af.json
M extensions/Wikibase/client/i18n/ar.json
M extensions/Wikibase/client/i18n/as.json
M extensions/Wikibase/client/i18n/ast.json
M extensions/Wikibase/client/i18n/bn.json
M extensions/Wikibase/client/i18n/ca.json
M extensions/Wikibase/client/i18n/de.json
M extensions/Wikibase/client/i18n/en.json
M extensions/Wikibase/client/i18n/es.json
M extensions/Wikibase/client/i18n/et.json
M extensions/Wikibase/client/i18n/eu.json
M extensions/Wikibase/client/i18n/fr.json
M extensions/Wikibase/client/i18n/gl.json
M extensions/Wikibase/client/i18n/he.json
M extensions/Wikibase/client/i18n/ja.json
M extensions/Wikibase/client/i18n/kk-cyrl.json
M extensions/Wikibase/client/i18n/km.json
M extensions/Wikibase/client/i18n/ksh.json
M extensions/Wikibase/client/i18n/lb.json
M extensions/Wikibase/client/i18n/lt.json
M extensions/Wikibase/client/i18n/mk.json
M extensions/Wikibase/client/i18n/nap.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/client/i18n/pl.json
M extensions/Wikibase/client/i18n/ps.json
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/qqq.json
M extensions/Wikibase/client/i18n/roa-tara.json
M extensions/Wikibase/client/i18n/sv.json
M extensions/Wikibase/client/i18n/uk.json
M extensions/Wikibase/client/i18n/vec.json
A extensions/Wikibase/client/i18n/wo.json
M extensions/Wikibase/client/i18n/zh-hans.json
M extensions/Wikibase/client/i18n/zh-hant.json
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M extensions/Wikibase/client/includes/DataAccess/Scribunto/EntityAccessor.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/WikibaseLuaBindings.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
M extensions/Wikibase/client/includes/InterwikiSorter.php
M extensions/Wikibase/client/includes/LangLinkHandler.php
M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTableBuilder.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTracker.php
M extensions/Wikibase/client/includes/Usage/UsageTrackingTermLookup.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/includes/serializers/ClientEntitySerializer.php
A extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
M extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/includes/store/sql/PagePropsEntityIdLookup.php
M extensions/Wikibase/client/maintenance/updateSubscriptions.php
M extensions/Wikibase/client/resources/wikibase.client.PageConnector.js
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaEntityBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php
M

[MediaWiki-commits] [Gerrit] [IMPROV] tox: Remove duplication - change (pywikibot/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: [IMPROV] tox: Remove duplication
..


[IMPROV] tox: Remove duplication

Instead of having the error codes copied from everywhere just define the error
codes for flake8 once and reuse them for the different tests.

Change-Id: Ia612a8632b69978163df39a13afdcd018996f05a
---
M tox.ini
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/tox.ini b/tox.ini
index 7449e16..efeea0b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@
 
 [params]
 nose_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py)
+flake8_ignore = D102,D103,E122,E127,{[flake8]ignore}
 
 [testenv]
 setenv =
@@ -18,14 +19,14 @@
 deps = unittest2
 
 [testenv:flake8]
-commands = flake8 --ignore=D102,D103,E122,E127,E241,E402,E731 {posargs}
+commands = flake8 --ignore={[params]flake8_ignore} {posargs}
 basepython = python2.7
 deps = flake8
flake8-docstrings
flake8-coding
 
 [testenv:flake8-py3]
-commands = flake8 --ignore=D102,D103,E122,E127,E241,E402,E731 {posargs}
+commands = flake8 --ignore={[params]flake8_ignore} {posargs}
 basepython = python3
 deps = flake8
flake8-docstrings
@@ -222,7 +223,7 @@
 commands = {posargs}
 
 [flake8]
-ignore = E241,E265,E402,E731
+ignore = E241,E402,E731
 exclude = 
.tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*
 max_line_length = 130
 accept-encodings = utf-8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia612a8632b69978163df39a13afdcd018996f05a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Repool es1004 after maintenance; pool es1018 for the first time - change (operations/mediawiki-config)

2015-09-07 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

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

Change subject: Repool es1004 after maintenance; pool es1018 for the first time
..

Repool es1004 after maintenance; pool es1018 for the first time

Change-Id: I07de32500796a28b4db0645d6c24208ba1138a22
References: T105843
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/54/236554/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d1cecff..cef4f3a 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -17,9 +17,10 @@
'10.64.0.25'   => 1, # es1001
'10.64.16.40'  => 1, # es1002
'10.64.16.41'  => 1, # es1003
-#  '10.64.16.42'  => 1, # es1004
+   '10.64.16.42'  => 1, # es1004
'10.64.0.7'=> 1, # es1012
'10.64.32.185' => 1, # es1016
+   '10.64.48.115' => 1, # es1018
 );
 
 $wgLBFactoryConf = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07de32500796a28b4db0645d6c24208ba1138a22
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] Bug Fix : Highlights were removed after the first check and ... - change (mediawiki...LanguageTool)

2015-09-07 Thread Ankita-ks (Code Review) 
Ankita-ks has uploaded a new change for review.

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

Change subject: Bug Fix : Highlights were removed after the first check and did 
not reappear
..

Bug Fix : Highlights were removed after the first check and did not reappear

Change-Id: If90e1164e87cc65a4ead747d5fa1c65c0d8518e1
---
M extension.json
D modules/ext.LanguageToolAction.js
M modules/ext.LanguageToolDialog.js
3 files changed, 1 insertion(+), 248 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool 
refs/changes/46/236546/1

diff --git a/extension.json b/extension.json
index 8bf5d4f..f9793eb 100644
--- a/extension.json
+++ b/extension.json
@@ -19,7 +19,6 @@
"ext.LanguageTool": {
"scripts": [
"ext.LanguageTool.js",
-   "ext.LanguageToolAction.js",
"ext.LanguageToolCommand.js",
"ext.LanguageToolDialog.js"
],
diff --git a/modules/ext.LanguageToolAction.js 
b/modules/ext.LanguageToolAction.js
deleted file mode 100644
index ac1de27..000
--- a/modules/ext.LanguageToolAction.js
+++ /dev/null
@@ -1,246 +0,0 @@
-( function () {
-'use strict';
-
-/*!
- * VisualEditor UserInterface LanguageToolAction class.
- *
- * @copyright 2011-2015
- * Ankita Kumari
- * Eran Rosenthal
- * Amir E. Aharoni
- */
-
-/**
- * LanguageTool action.
- *
- * @class
- * @extends ve.ui.Action
- *
- * @constructor
- * @param {ve.ui.Surface} surface Surface to act on
- */
-mw.languageToolAction = function VeUiLanguageToolAction( surface ) {
-   // Parent constructor
-   ve.ui.Action.call( this, surface );
-
-   this.surfaceModel = this.surface.getModel();
-   this.surrogateAttribute = 'onkeypress';
-   this.surrogateAttributeDelimiter = '---#---';
-   this.ignoredRulesIds = [ 'SENTENCE_WHITESPACE' ];
-   this.ignoredSpellingErrors = [];
-   this.$errors = $( '' ).addClass( 'hiddenSpellError' );
-   this.initialFragment = null;
-   this.fragments = [];
-   this.cssNames = [];
-
-   this.surface.$selections.append( this.$errors );
-};
-
-/* Inheritance */
-
-OO.inheritClass( mw.languageToolAction, ve.ui.Action );
-
-/* Static Properties */
-
-mw.languageToolAction.static.name = 'languageTool';
-
-/**
- * List of allowed methods for the action.
- *
- * @static
- * @property
- */
-mw.languageToolAction.static.methods = [ 'send' ];
-
-/* Methods */
-
-/**
- * Send text to LanguageTool server
- *
- * @method
- * @return {NULL} Action was executed
- */
-mw.languageToolAction.prototype.send = function () {
-   var model, data, mapper, i, textArray, text, lang,
-   self = this;
-
-   model = ve.init.target.getSurface().getModel();
-
-   data = model.getDocument().data.getData();
-
-   mapper = [];
-   for ( i = 0; i < data.length; i++ ) {
-   if ( ( typeof data[ i ] ) === 'string' || ( typeof data[ i ][ 0 
] ) === 'string' ) {
-   mapper.push( i );
-   }
-   }
-
-   textArray = [];
-   for ( i = 0; i < mapper.length; i++ ) {
-   if ( ( typeof data[ mapper[ i ] ] ) === 'string' ) {
-   textArray[ i ] = data[ mapper[ i ] ];
-   } else {
-   textArray[ i ] = data[ mapper[ i ] ][ 0 ];
-   }
-   }
-
-   text = textArray.join( '' );
-
-   // TODO: Get the language from VE's data model
-   lang = mw.config.get( 'wgPageContentLanguage' );
-
-   $.ajax( {
-   type: 'POST',
-   dataType: 'xml',
-   url: 'http://tools.wmflabs.org/languageproofing/',
-   data: { language: lang, text: text }
-   } ).done( function ( responseXML ) {
-   self.openDialog.apply( self, [ responseXML, mapper ] );
-   } );
-
-   return;
-};
-
-mw.languageToolAction.prototype.openDialog = function ( responseXML, mapper ) {
-   var languageCode, previousSpanStart, cssName,
-   suggestionIndex, suggestion, spanStart, spanEnd,
-   range, fragment, ruleId;
-
-   this.suggestions = this.processXML( responseXML );
-
-   // TODO: Get the language from VE's data model
-   languageCode = mw.config.get( 'wgPageContentLanguage' );
-   previousSpanStart = -1;
-
-   // iterate backwards as we change the text and thus modify positions:
-   for ( suggestionIndex = this.suggestions.length - 1; suggestionIndex >= 
0; suggestionIndex-- ) {
-   suggestion = this.suggestions[ suggestionIndex ];
-
-   if ( !suggestion.used ) {
-   spanStart = suggestion.offset;
-   spanEnd = spanStart + suggestion.errorlength;
-
-   if ( previousSpanStart !== -1 && spanEnd > 
previousSpanStart ) {
-

[MediaWiki-commits] [Gerrit] Add a Salt returner for local logging - change (operations...debdeploy)

2015-09-07 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

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

Change subject: Add a Salt returner for local logging
..

Add a Salt returner for local logging

Also add a workaround for Salt bug writing out it's return status to stdout

Change-Id: I7e61b64afb1c6b43a22fa3513ab93ff9e04fb26d
---
M debian/changelog
M debian/debdeploy-minion.install
M master/debdeploy
A minion/debdeploy-log.py
4 files changed, 30 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/debdeploy 
refs/changes/49/236549/1

diff --git a/debian/changelog b/debian/changelog
index 0a9e091..15cd1bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debdeploy (0.0.5-1) jessie-wikimedia; urgency=medium
+
+  * Add a Salt returner for local logging
+  * Add workaround for Salt bug writing out it's return status to stdout
+
+ -- Moritz Muehlenhoff   Mon, 07 Sep 2015 15:20:01 
+0200
+
 debdeploy (0.0.4-1) jessie-wikimedia; urgency=medium
 
   * Implement list-server-groups command
diff --git a/debian/debdeploy-minion.install b/debian/debdeploy-minion.install
index 270b344..e77960b 100644
--- a/debian/debdeploy-minion.install
+++ b/debian/debdeploy-minion.install
@@ -1,3 +1,4 @@
 minion/debdeploy-minion.py /usr/lib/python2.7/dist-packages/salt/modules/
 minion/debdeploy_restart.py /usr/lib/python2.7/dist-packages/salt/modules/
+minion/debdeploy-log.py /usr/lib/python2.7/dist-packages/salt/returners/
 
diff --git a/master/debdeploy b/master/debdeploy
index 5912645..c22d292 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -53,8 +53,12 @@
 jid = joblogdb.get_jobid(opt.updatefile, i)
 
 # SaltRunner always emits its status on stdout, 
https://github.com/saltstack/salt/issues/21392
-# TODO: Needs some kludge to suppress it
-job = runner.cmd('jobs.print_job', (jid,))
+# Can be dropped once fixed upstream
+with open('/dev/null', 'w') as discard_output:
+oldstdout = sys.stdout
+sys.stdout = discard_output
+job = runner.cmd('jobs.print_job', (jid,))
+sys.stdout = oldstdout
 if not job:
 print "Job " + str(jid) + " hasn't finished yet, please check 
again later"
 sys.exit(0)
@@ -212,7 +216,7 @@
 
 if opt.verbose:
 print "Grain:", i
-jid = client.cmd_async(i, 'debdeploy-minion.deploy', [source, 
update_type, update.fixes], expr_form='grain')
+jid = client.cmd_async(i, 'debdeploy-minion.deploy', [source, 
update_type, update.fixes], expr_form='grain', ret='debdeploy-log')
 logging.info("Initiated rollout for " + source + " on grain " + i + 
"(salt job id: " + str(jid) + ")")
 joblogdb.add_job(update_file, i, jid)
 
diff --git a/minion/debdeploy-log.py b/minion/debdeploy-log.py
new file mode 100644
index 000..e6cabb2
--- /dev/null
+++ b/minion/debdeploy-log.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+'''
+This returner logs the package status update to /var/log/debdeploy.log
+'''
+
+import datetime
+
+def returner(ret):
+with open("/var/log/debdeploy.log", "a") as log:
+indented = [datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S ") + l 
for l in ret['return']['aptlog'].splitlines()]
+log.write("\n".join(indented))
+
+# Local variables:
+# mode: python
+# End:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e61b64afb1c6b43a22fa3513ab93ff9e04fb26d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Followup on 10c63bbb: Handle [[[Foo]]] and [[[[Foo]]]] properly - change (mediawiki...parsoid)

2015-09-07 Thread Subramanya Sastry (Code Review) 
Subramanya Sastry has uploaded a new change for review.

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

Change subject: Followup on 10c63bbb: Handle [[[Foo]]] and Foo properly
..

Followup on 10c63bbb: Handle [[[Foo]]] and Foo properly

* The old fix was broken. It only dealt with [[[Foo]]] in sol posn.
* I've added FIXME with edge cases -- unsure that they are not
  worthy of attention right away.
* Updated test that passes with this patch but fails without.

Change-Id: I44e05059d807a685095fa0f607b7c9beda83fc1e
---
M lib/pegTokenizer.pegjs.txt
M tests/parserTests.txt
2 files changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/48/236548/1

diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 767956e..773fef0 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -288,10 +288,13 @@
   ) { return r; }
 / & '{' r:tplarg_or_template_or_broken { return r; }
 / & '}' r:broken_template { return r; }
- // Eat three opening brackets as text, but handle '' differently
- // so, that 'Foo' parses as '[[Foo]]'
-/ (!'[' / sol) '[[[' !'[' { return '[[['; }
-/ & '[' r:( wikilink / extlink ) { return r; }
+/ & '[' r:( wikilink / extlink ) {  return r; }
+ // Eat three opening brackets as text,
+ // but handle  differently. Foo parses as '[[Foo]]'
+ // FIXME: 5 and higher # of brackets parse differently here and in PHP 
parser
+ // Those are edge cases and I won't bother
+/ '[[' & wikilink { return '[['; }
+/ '[[[' { return '[[['; }
 / & "'" r:quote { return r; }
 
 /* Headings  */
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fdd2579..0e0af30 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7161,8 +7161,10 @@
 Link with 3 brackets
 !! wikitext
 [[[Main Page]]]
+Foo [[[Main Page]]]
 !! html
 [[[Main Page]]]
+Foo [[[Main Page]]]
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e05059d807a685095fa0f607b7c9beda83fc1e
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] elasticsearch partman and autoinstall - change (operations/puppet)

2015-09-07 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: elasticsearch partman and autoinstall
..


elasticsearch partman and autoinstall

We have two disk arrangements. Eqiad will be raid0
and Codfw will be raid1.

Bug: T111080
Change-Id: I18952e792d1349b0c7b0e6778854de461e7aafe8
---
M modules/install_server/files/autoinstall/netboot.cfg
R modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
C modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
3 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index b9653cf..f7d0de6 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -66,7 +66,8 @@
d-i-test) echo partman/raid1-lvm-conf.cfg ;; \
eeden|hooft|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
-   elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
+   elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
+   elastic20[0-2][0-9]|elastic203[0-1]) echo 
partman/elasticsearch-raid1.cfg ;; \
bromine|etherpad[12]001|fermium|krypton|planet1001) echo 
partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
francium|tungsten) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg 
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
similarity index 94%
rename from modules/install_server/files/autoinstall/partman/elasticsearch.cfg
rename to 
modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
index 9a0d925..377b15a 100644
--- a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg
+++ b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
@@ -5,7 +5,7 @@
 # * layout:
 #   - /  : ext3, RAID1, 30GB
 #   - swap: RAID1, 1GB
-#   - /var/lib/elasticserach: ext4, RAID0, rest of the space on both drives.
+#   - /var/lib/elasticsearch: ext4, RAID0, rest of the space on both drives.
 #
 #   (This file was duplicated from raid1-30G.cfg.)
 
diff --git a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg 
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
similarity index 82%
copy from modules/install_server/files/autoinstall/partman/elasticsearch.cfg
copy to modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
index 9a0d925..6442e24 100644
--- a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg
+++ b/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
@@ -3,11 +3,10 @@
 # * two disks, sda & sdb
 # * primary partitions, no LVM
 # * layout:
-#   - /  : ext3, RAID1, 30GB
+#   - /   : ext3, RAID1, 30GB
 #   - swap: RAID1, 1GB
-#   - /var/lib/elasticserach: ext4, RAID0, rest of the space on both drives.
+#   - /var/lib/elasticsearch: ext4, RAID1
 #
-#   (This file was duplicated from raid1-30G.cfg.)
 
 d-ipartman-auto/method string  raid
 d-ipartman-md/device_remove_md boolean true
@@ -26,7 +25,7 @@
$primary{ } method{ raid }  \
.   \
10001000-1  raid\
-   $primary{ } method{ raid }  
\
+   $primary{ } method{ keep }  
\
.
 
 # Parameters are:
@@ -39,7 +38,7 @@
1   2   0   swap-   \
/dev/sda2#/dev/sdb2 \
.   \
-   0   2   0   ext4/var/lib/elasticsearch  \
+   1   2   0   ext4/var/lib/elasticsearch  \
/dev/sda3#/dev/sdb3 \
.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18952e792d1349b0c7b0e6778854de461e7aafe8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] ParserOptions: added comment regarding editsections usage. - change (mediawiki/core)

2015-09-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: ParserOptions: added comment regarding editsections usage.
..


ParserOptions: added comment regarding editsections usage.

// @note: as of Feb 2015, core never sets the editsection flag, since it uses
//  tags to inject editsections on the fly. However, extensions
// may be using it by calling ParserOption::optionUsed resp. 
ParserOutput::registerOption
// directly. At least Wikibase does at this point in time.

Change-Id: Ief95ecb3ae1f5699b788dd3dad0eaf1aa6cc163c
---
M includes/parser/ParserOptions.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/includes/parser/ParserOptions.php 
b/includes/parser/ParserOptions.php
index 4459047..1073aed 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -802,6 +802,10 @@
 
$confstr .= $wgRenderHashAppend;
 
+   // @note: as of Feb 2015, core never sets the editsection flag, 
since it uses
+   //  tags to inject editsections on the fly. 
However, extensions
+   // may be using it by calling ParserOption::optionUsed resp. 
ParserOutput::registerOption
+   // directly. At least Wikibase does at this point in time.
if ( !in_array( 'editsection', $forOptions ) ) {
$confstr .= '!*';
} elseif ( !$this->mEditSection ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief95ecb3ae1f5699b788dd3dad0eaf1aa6cc163c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Platonides 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [IMPROV] tox: Remove duplication - change (pywikibot/core)

2015-09-07 Thread XZise (Code Review) 
XZise has uploaded a new change for review.

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

Change subject: [IMPROV] tox: Remove duplication
..

[IMPROV] tox: Remove duplication

Instead of having the error codes copied from everywhere just define the error
codes for flake8 once and reuse them for the different tests.

Change-Id: Ia612a8632b69978163df39a13afdcd018996f05a
---
M tox.ini
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/47/236547/1

diff --git a/tox.ini b/tox.ini
index 7449e16..efeea0b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@
 
 [params]
 nose_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py)
+flake8_ignore = D102,D103,E122,E127,{[flake8]ignore}
 
 [testenv]
 setenv =
@@ -18,14 +19,14 @@
 deps = unittest2
 
 [testenv:flake8]
-commands = flake8 --ignore=D102,D103,E122,E127,E241,E402,E731 {posargs}
+commands = flake8 --ignore={[params]flake8_ignore} {posargs}
 basepython = python2.7
 deps = flake8
flake8-docstrings
flake8-coding
 
 [testenv:flake8-py3]
-commands = flake8 --ignore=D102,D103,E122,E127,E241,E402,E731 {posargs}
+commands = flake8 --ignore={[params]flake8_ignore} {posargs}
 basepython = python3
 deps = flake8
flake8-docstrings
@@ -222,7 +223,7 @@
 commands = {posargs}
 
 [flake8]
-ignore = E241,E265,E402,E731
+ignore = E241,E402,E731
 exclude = 
.tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*
 max_line_length = 130
 accept-encodings = utf-8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia612a8632b69978163df39a13afdcd018996f05a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-09-07T14:36:03+0000 - change (mediawiki...Wikidata)

2015-09-07 Thread WikidataBuilder (Code Review) 
WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-09-07T14:36:03+
..

New Wikidata Build - 2015-09-07T14:36:03+

Change-Id: Iac5b87bd7656f4a0e2e904fd419294398288ef52
---
M composer.json
M composer.lock
M extensions/Constraints/composer.json
A extensions/Constraints/i18n/ja.json
M extensions/Constraints/i18n/uk.json
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/PropertySuggester/PropertySuggester.php
M extensions/PropertySuggester/README.md
M extensions/PropertySuggester/composer.json
M extensions/PropertySuggester/i18n/en.json
M extensions/PropertySuggester/i18n/qqq.json
M extensions/PropertySuggester/src/PropertySuggester/GetSuggestions.php
M extensions/PropertySuggester/src/PropertySuggester/ResultBuilder.php
M 
extensions/PropertySuggester/tests/phpunit/PropertySuggester/SuggestionGeneratorTest.php
M extensions/Quality/composer.json
M extensions/Quality/i18n/gl.json
M extensions/Quality/i18n/ja.json
M extensions/Quality/i18n/roa-tara.json
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/WikibaseClient.i18n.alias.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/i18n/af.json
M extensions/Wikibase/client/i18n/ar.json
M extensions/Wikibase/client/i18n/as.json
M extensions/Wikibase/client/i18n/ast.json
M extensions/Wikibase/client/i18n/bn.json
M extensions/Wikibase/client/i18n/ca.json
M extensions/Wikibase/client/i18n/de.json
M extensions/Wikibase/client/i18n/en.json
M extensions/Wikibase/client/i18n/es.json
M extensions/Wikibase/client/i18n/et.json
M extensions/Wikibase/client/i18n/eu.json
M extensions/Wikibase/client/i18n/fr.json
M extensions/Wikibase/client/i18n/gl.json
M extensions/Wikibase/client/i18n/he.json
M extensions/Wikibase/client/i18n/ja.json
M extensions/Wikibase/client/i18n/kk-cyrl.json
M extensions/Wikibase/client/i18n/km.json
M extensions/Wikibase/client/i18n/ksh.json
M extensions/Wikibase/client/i18n/lb.json
M extensions/Wikibase/client/i18n/lt.json
M extensions/Wikibase/client/i18n/mk.json
M extensions/Wikibase/client/i18n/nap.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/client/i18n/pl.json
M extensions/Wikibase/client/i18n/ps.json
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/qqq.json
M extensions/Wikibase/client/i18n/roa-tara.json
M extensions/Wikibase/client/i18n/sv.json
M extensions/Wikibase/client/i18n/uk.json
M extensions/Wikibase/client/i18n/vec.json
A extensions/Wikibase/client/i18n/wo.json
M extensions/Wikibase/client/i18n/zh-hans.json
M extensions/Wikibase/client/i18n/zh-hant.json
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M extensions/Wikibase/client/includes/DataAccess/Scribunto/EntityAccessor.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/WikibaseLuaBindings.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
M extensions/Wikibase/client/includes/InterwikiSorter.php
M extensions/Wikibase/client/includes/LangLinkHandler.php
M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTable.php
M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTableBuilder.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTracker.php
M extensions/Wikibase/client/includes/Usage/UsageTrackingTermLookup.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/includes/serializers/ClientEntitySerializer.php
A extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
M extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/includes/store/sql/PagePropsEntityIdLookup.php
M extensions/Wikibase/client/maintenance/updateSubscriptions.php
M extensions/Wikibase/client/resources/wikibase.client.PageConnector.js
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/SnakSerializationRendererTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaEntityBindingsTest.php
M

[MediaWiki-commits] [Gerrit] Avoid overlap of personal menu with the logo - change (mediawiki...MonoBook)

2015-09-07 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Avoid overlap of personal menu with the logo
..

Avoid overlap of personal menu with the logo

Bug: T111687
Change-Id: I7a399d89fe9405b31cbb4563dc7f72e120caf018
---
M main.css
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/52/236552/1

diff --git a/main.css b/main.css
index 7269573..fddca14 100644
--- a/main.css
+++ b/main.css
@@ -309,7 +309,10 @@
border: none;
line-height: 1.4em;
color: #2f6fab;
-   padding: 0 2em 0 3em;
+   padding: 0;
+   padding-right: 2em;
+   /* Avoid overlap with the logo. */
+   padding-left: 14em;
margin: 0;
text-align: right;
list-style-type: none;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a399d89fe9405b31cbb4563dc7f72e120caf018
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

  1   2   3   >