date:20170314

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialAllMessages.php: Remove unused attribute langcode

2017-03-14 Thread Fomafix (Code Review)

Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342792 )

Change subject: SpecialAllMessages.php: Remove unused attribute langcode
..

SpecialAllMessages.php: Remove unused attribute langcode

Change-Id: Iaa5fa69eb6e3b4dc66dbf9bde11d992a0e24293d
---
M includes/specials/SpecialAllMessages.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/342792/1

diff --git a/includes/specials/SpecialAllMessages.php 
b/includes/specials/SpecialAllMessages.php
index 49ca9f4..4056709 100644
--- a/includes/specials/SpecialAllMessages.php
+++ b/includes/specials/SpecialAllMessages.php
@@ -67,8 +67,6 @@
wfGetLangObj( $request->getVal( 'lang', $par ) )
);
 
-   $this->langcode = $this->table->lang->getCode();
-
$out->addHTML( $this->table->buildForm() );
$out->addParserOutputContent( $this->table->getFullOutput() );
}

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Use Pillow<3.5.0 on python2.6

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342779 )

Change subject: Use Pillow<3.5.0 on python2.6
..


Use Pillow<3.5.0 on python2.6

Bug: T160486
Change-Id: Icf8a1ef4daabea65f331f843808bb5e40bce7c89
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/requirements.txt b/requirements.txt
index 6b82cb5..b87f833 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,7 +50,8 @@
 python-stdnum
 
 # GUI
-Pillow
+Pillow<3.5.0 ; python_version < '2.7'
+Pillow ; python_version >= '2.7'
 
 # core pagegenerators
 google >= 1.7
diff --git a/setup.py b/setup.py
index 2ba209d..560a408 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@
 'Google': ['google>=1.7'],
 'IRC': [irc_dep],
 'mwparserfromhell': ['mwparserfromhell>=0.3.3'],
-'Tkinter': ['Pillow'],
+'Tkinter': ['Pillow<3.5.0' if PY26 else 'Pillow'],
 # 0.6.1 supports socket.io 1.0, but WMF is using 0.9 (T91393 and T85716)
 'rcstream': ['socketIO-client<0.6.1'],
 'security': ['requests[security]', 'pycparser!=2.14'],
@@ -76,7 +76,7 @@
 })
 
 script_deps = {
-'flickrripper.py': ['Pillow'],
+'flickrripper.py': ['Pillow<3.5.0' if PY26 else 'Pillow'],
 'states_redirect.py': ['pycountry'],
 'weblinkchecker.py': ['memento_client>=0.5.1'],
 'patrol.py': ['mwparserfromhell>=0.3.3'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf8a1ef4daabea65f331f843808bb5e40bce7c89
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rv accidental inclusion of debug code in TemplateParser

2017-03-14 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342791 )

Change subject: rv accidental inclusion of debug code in TemplateParser
..

rv accidental inclusion of debug code in TemplateParser

Follow up 73e08353fb96f5cbd93c6a7004d91c3d0845b446

Change-Id: I59bcff4334be61977a617a4a8726ae90165530e7
---
M includes/TemplateParser.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/342791/1

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index f581a80..924c347 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -121,8 +121,6 @@
$code = $this->compileForEval( $fileContents, $filename 
);
}
 
-   echo "About to eval:\n";
-   echo $code;
$renderer = eval( $code );
if ( !is_callable( $renderer ) ) {
throw new RuntimeException( "Requested template, 
{$templateName}, is not callable" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59bcff4334be61977a617a4a8726ae90165530e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: tests: Remove IE6/IE8 compat in QUnit.tmpIframe() utility

2017-03-14 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342790 )

Change subject: tests: Remove IE6/IE8 compat in QUnit.tmpIframe() utility
..

tests: Remove IE6/IE8 compat in QUnit.tmpIframe() utility

Since we no longer support IE6/IE8 per the ES5 requirement, remove
the async hack in tmpIframe that was previously required.
Rewrite two call sites to run without the setTimeout callback.

This also happens to be the only remaining test code that makes use
of legacy QUnit v1.x interfaces (namely, QUnit.start and QUnit.stop).

Change-Id: I6f9485d33233abb15a719651b236d8a970c64205
---
M tests/testrunner.js
M tests/unit/core.test.js
M tests/unit/util.test.js
3 files changed, 44 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/90/342790/1

diff --git a/tests/testrunner.js b/tests/testrunner.js
index 9845611..f5d9ca3 100644
--- a/tests/testrunner.js
+++ b/tests/testrunner.js
@@ -28,31 +28,14 @@
}() );
 
/**
-* Utility for creating iframes
-*
-* @param {Function} callback Called when the iframe is done
-* @param {HTMLElement} callback.iframe
-* @param {Function} callback.teardown To be called when user is done 
(performs cleanup and resumes
-*  QUnit runner).
+* Utility for creating iframes.
+* @return {HTMLElement}
 */
-   QUnit.tmpIframe = function ( callback ) {
+   QUnit.tmpIframe = function () {
var iframe = document.createElement( 'iframe' );
+   // Will be removed automatically by module teardown
document.getElementById( 'qunit-fixture' ).appendChild( iframe 
);
-
-   // Support IE8: Without "src", the contentWindow has no 
'Object' constructor.
-   // eslint-disable-next-line no-script-url
-   iframe.src = 'javascript:';
-
-   // Support IE6: Iframe contentWindow is populated 
asynchronously.
-   QUnit.stop();
-   setTimeout( function () {
-   callback( iframe, function () {
-
-   iframe.parentNode.removeChild( iframe );
-   iframe = undefined;
-   QUnit.start();
-   } );
-   } );
+   return iframe;
};
 
 }() );
diff --git a/tests/unit/core.test.js b/tests/unit/core.test.js
index f15b794..de8bc86 100644
--- a/tests/unit/core.test.js
+++ b/tests/unit/core.test.js
@@ -1153,27 +1153,24 @@
 
if ( global.document ) {
QUnit.test( 'getHash( iframe Object )', function ( assert ) {
-   var obj, hash;
+   var IframeObject, obj, hash;
 
-   QUnit.tmpIframe( function ( iframe, teardown ) {
-   obj = new iframe.contentWindow.Object();
-   obj.c = 3;
-   obj.b = 2;
-   obj.a = 1;
+   IframeObject = QUnit.tmpIframe().contentWindow.Object;
+   obj = new IframeObject();
+   obj.c = 3;
+   obj.b = 2;
+   obj.a = 1;
 
-   hash = '{"a":1,"b":2,"c":3}';
+   hash = '{"a":1,"b":2,"c":3}';
 
-   assert.strictEqual(
-   oo.getHash( obj ),
-   hash,
-   // This was previously broken when we 
used comparison with "Object" in
-   // oo.getHash.keySortReplacer, because 
they are an instance of the other
-   // window's "Object".
-   'Treat objects constructed by a another 
window as well'
-   );
-
-   teardown();
-   } );
+   assert.strictEqual(
+   oo.getHash( obj ),
+   hash,
+   // This was previously broken when we used 
comparison with "Object" in
+   // oo.getHash.keySortReplacer, because they are 
an instance of the other
+   // window's "Object".
+   'Treat objects constructed by a another window 
as well'
+   );
} );
}
 
diff --git a/tests/unit/util.test.js b/tests/unit/util.test.js
index cb69324..3ae382d 100644
--- a/tests/unit/util.test.js
+++ b/tests/unit/util.test.js
@@ -62,38 +62,34 @@
'instance of Window'
);
 
-   QUnit.tmpIframe( function ( iframe, teardown ) {
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't allow underscore in filter or group names

2017-03-14 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342789 )

Change subject: RCFilters: Don't allow underscore in filter or group names
..

RCFilters: Don't allow underscore in filter or group names

Change-Id: I1b6ca9f337dd48e10705c46ef5027c3156254e01
---
M includes/changes/ChangesListFilter.php
M includes/changes/ChangesListFilterGroup.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
4 files changed, 47 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/342789/1

diff --git a/includes/changes/ChangesListFilter.php 
b/includes/changes/ChangesListFilter.php
index 4ac6387..0b8c31a 100644
--- a/includes/changes/ChangesListFilter.php
+++ b/includes/changes/ChangesListFilter.php
@@ -110,6 +110,8 @@
 */
protected $priority;
 
+   const RESERVED_NAME_CHAR = '_';
+
/**
 * Create a new filter with the specified configuration.
 *
@@ -122,7 +124,8 @@
 *
 * @param array $filterDefinition ChangesListFilter definition
 *
-* $filterDefinition['name'] string Name of filter
+* $filterDefinition['name'] string Name of filter; use lowercase with 
no
+*  punctuation
 * $filterDefinition['cssClassSuffix'] string CSS class suffix, used to 
mark
 *  that a particular row belongs to this filter (when a row is 
included by the
 *  filter) (optional)
@@ -151,6 +154,10 @@
'ChangesListFilterGroup this filter belongs to' 
);
}
 
+   if ( strpos( $filterDefinition['name'], 
self::RESERVED_NAME_CHAR ) !== false ) {
+   throw new MWException( 'Filter names may not contain 
\'' . self::RESERVED_NAME_CHAR . '\'.  Use the naming convention: 
\'lowercase\'' );
+   }
+
$this->name = $filterDefinition['name'];
 
if ( isset( $filterDefinition['cssClassSuffix'] ) ) {
diff --git a/includes/changes/ChangesListFilterGroup.php 
b/includes/changes/ChangesListFilterGroup.php
index a4cc287..ba3d79e 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -123,11 +123,13 @@
 
const DEFAULT_PRIORITY = -100;
 
+   const RESERVED_NAME_CHAR = '_';
+
/**
 * Create a new filter group with the specified configuration
 *
 * @param array $groupDefinition Configuration of group
-* * $groupDefinition['name'] string Group name
+* * $groupDefinition['name'] string Group name; use camelCase with no 
punctuation
 * * $groupDefinition['title'] string i18n key for title (optional, can 
be omitted
 * *  only if none of the filters in the group display in the 
structured UI)
 * * $groupDefinition['type'] string A type constant from a subclass of 
this one
@@ -142,6 +144,10 @@
 * *  changes list entries are filtered out.
 */
public function __construct( array $groupDefinition ) {
+   if ( strpos( $groupDefinition['name'], self::RESERVED_NAME_CHAR 
) !== false ) {
+   throw new MWException( 'Group names may not contain \'' 
. self::RESERVED_NAME_CHAR . '\'.  Use the naming convention: \'camelCase\'' );
+   }
+
$this->name = $groupDefinition['name'];
 
if ( isset( $groupDefinition['title'] ) ) {
diff --git 
a/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php 
b/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
index 0db3a49..8b6870d 100644
--- a/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
+++ b/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
@@ -19,6 +19,18 @@
);
}
 
+   /**
+* @expectedException MWException
+* @expectedExceptionMessage Group names may not contain '_'.  Use the 
naming convention: 'camelCase'
+*/
+   public function testReservedCharacter() {
+   $group = new ChangesListBooleanFilterGroup( [
+   'name' => 'group_name',
+   'priority' => 1,
+   'filters' => [],
+   ] );
+   }
+
public function testAutoPriorities() {
$group = new ChangesListBooleanFilterGroup( [
'name' => 'groupName',
diff --git a/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php 
b/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
index c715988..92e6fac 100644
--- a/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
+++ b/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
@@ -4,6 +4,26 @@
  * @covers ChangesListBooleanFilter
  */
 class

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap3: Prep MediaWiki to be available from /srv/deployment

2017-03-14 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342788 )

Change subject: Scap3: Prep MediaWiki to be available from /srv/deployment
..

Scap3: Prep MediaWiki to be available from /srv/deployment

In the not-so-distant-future we'll be deploying from this actual
directory. For now, we'll need the directory to exist on the
filesystem as we move closer to that assumption.

Change-Id: I9ac8ada1d7bd09853c0bfd77d6a7413e8491f7f6
---
M modules/mediawiki/manifests/scap.pp
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/342788/1

diff --git a/modules/mediawiki/manifests/scap.pp 
b/modules/mediawiki/manifests/scap.pp
index 73d72fd..0c02f93 100644
--- a/modules/mediawiki/manifests/scap.pp
+++ b/modules/mediawiki/manifests/scap.pp
@@ -10,10 +10,11 @@
 include ::scap
 include ::mediawiki::users
 
-$mediawiki_deployment_dir = '/srv/mediawiki'
-$mediawiki_staging_dir= '/srv/mediawiki-staging'
-$scap_bin_dir = '/usr/bin'
-$mediawiki_web_user   = $::mediawiki::users::web
+$mediawiki_deployment_dir  = '/srv/mediawiki'
+$mediawiki_staging_dir = '/srv/mediawiki-staging'
+$mediawiki_scap_deployment_dir = '/srv/deployment/mediawiki'
+$scap_bin_dir  = '/usr/bin'
+$mediawiki_web_user= $::mediawiki::users::web
 
 # /srv/mediawiki is the root path of the MediaWiki deployment tree.
 
@@ -24,6 +25,12 @@
 mode   => '0775',
 }
 
+# As we migrate to scap3, we'll want to have mediawiki available at
+# /srv/deployment/mediawiki
+file { $mediawiki_scap_deployment_dir:
+ensure => 'link',
+target => $mediawiki_deployment_dir,
+}
 
 # /etc/profile.d/mediawiki.sh declares the MEDIAWIKI_DEPLOYMENT_DIR
 # and MEDIAWIKI_STAGING_DIR environment variables and adds scap to

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove salt grain "php" from mediawiki hosts

2017-03-14 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342787 )

Change subject: Remove salt grain "php" from mediawiki hosts
..

Remove salt grain "php" from mediawiki hosts

Been set to absent for some time

Change-Id: Ibdd588f433ab088bd42f55777516d1b0f908e06c
---
M modules/mediawiki/manifests/init.pp
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/342787/1

diff --git a/modules/mediawiki/manifests/init.pp 
b/modules/mediawiki/manifests/init.pp
index 6014b46..d4627ab 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -66,12 +66,6 @@
 mode   => '0555',
 }
 
-# We've set the 'php' grain in the past, but we don't really need it 
anymore
-salt::grain { 'php':
-ensure => absent,
-value  => 'hhvm',
-}
-
 # /var/log/mediawiki contains log files for the MediaWiki jobrunner
 # and for various periodic jobs that are managed by cron.
 file { '/var/log/mediawiki':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added map display of coordinates to auto-generated templates

2017-03-14 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342786 )

Change subject: Added map display of coordinates to auto-generated templates
..


Added map display of coordinates to auto-generated templates

Change-Id: Ie6735813497f121f362736358d6ad49899fd6ba8
---
M Cargo.hooks.php
M Cargo.php
M extension.json
3 files changed, 28 insertions(+), 0 deletions(-)

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



diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index ce84df9..7f83fd4 100755
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -101,6 +101,26 @@
return true;
}
 
+   public static function addTemplateFieldStart( $field, &$fieldStart ) {
+   // If a generated template contains a field of type
+   // 'Coordinates', add a #cargo_display_map call to the
+   // display of that field.
+   if ( $field->getFieldType() == 'Coordinates' ) {
+   $fieldStart .= '{{#cargo_display_map:point=';
+   }
+   return true;
+   }
+
+   public static function addTemplateFieldEnd( $field, &$fieldEnd ) {
+   // If a generated template contains a field of type
+   // 'Coordinates', add (the end of) a #cargo_display_map call
+   // to the display of that field.
+   if ( $field->getFieldType() == 'Coordinates' ) {
+   $fieldEnd .= '}}';
+   }
+   return true;
+   }
+
/**
 * Delete a page
 *
diff --git a/Cargo.php b/Cargo.php
index 9d3a2f9..0beece5 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -59,6 +59,8 @@
 $wgHooks['BaseTemplateToolbox'][] = 'CargoPageValuesAction::addLink';
 $wgHooks['UnknownAction'][] = 'CargoPageValuesAction::show';
 $wgHooks['SkinTemplateNavigation'][] = 'CargoHooks::addPurgeCacheTab';
+$wgHooks['PageForms::TemplateFieldStart'][] = 
'CargoHooks::addTemplateFieldStart';
+$wgHooks['PageForms::TemplateFieldEnd'][] = 'CargoHooks::addTemplateFieldEnd';
 $wgHooks['AdminLinks'][] = 'CargoHooks::addToAdminLinks';
 $wgHooks['PageSchemasRegisterHandlers'][] = 'CargoPageSchemas::registerClass';
 $wgHooks['ResourceLoaderGetConfigVars'][] = 
'CargoHooks::onResourceLoaderGetConfigVars';
diff --git a/extension.json b/extension.json
index e2ba678..2b13531 100755
--- a/extension.json
+++ b/extension.json
@@ -264,6 +264,12 @@
"BaseTemplateToolbox": [
"CargoPageValuesAction::addLink"
],
+   "PageForms::TemplateFieldStart": [
+   "CargoHooks::addTemplateFieldStart"
+   ],
+   "PageForms::TemplateFieldEnd": [
+   "CargoHooks::addTemplateFieldEnd"
+   ],
"AdminLinks": [
"CargoHooks::addToAdminLinks"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6735813497f121f362736358d6ad49899fd6ba8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added map display of coordinates to auto-generated templates

2017-03-14 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342786 )

Change subject: Added map display of coordinates to auto-generated templates
..

Added map display of coordinates to auto-generated templates

Change-Id: Ie6735813497f121f362736358d6ad49899fd6ba8
---
M Cargo.hooks.php
M Cargo.php
M extension.json
3 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/86/342786/2

diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index ce84df9..7f83fd4 100755
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -101,6 +101,26 @@
return true;
}
 
+   public static function addTemplateFieldStart( $field, &$fieldStart ) {
+   // If a generated template contains a field of type
+   // 'Coordinates', add a #cargo_display_map call to the
+   // display of that field.
+   if ( $field->getFieldType() == 'Coordinates' ) {
+   $fieldStart .= '{{#cargo_display_map:point=';
+   }
+   return true;
+   }
+
+   public static function addTemplateFieldEnd( $field, &$fieldEnd ) {
+   // If a generated template contains a field of type
+   // 'Coordinates', add (the end of) a #cargo_display_map call
+   // to the display of that field.
+   if ( $field->getFieldType() == 'Coordinates' ) {
+   $fieldEnd .= '}}';
+   }
+   return true;
+   }
+
/**
 * Delete a page
 *
diff --git a/Cargo.php b/Cargo.php
index 9d3a2f9..0beece5 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -59,6 +59,8 @@
 $wgHooks['BaseTemplateToolbox'][] = 'CargoPageValuesAction::addLink';
 $wgHooks['UnknownAction'][] = 'CargoPageValuesAction::show';
 $wgHooks['SkinTemplateNavigation'][] = 'CargoHooks::addPurgeCacheTab';
+$wgHooks['PageForms::TemplateFieldStart'][] = 
'CargoHooks::addTemplateFieldStart';
+$wgHooks['PageForms::TemplateFieldEnd'][] = 'CargoHooks::addTemplateFieldEnd';
 $wgHooks['AdminLinks'][] = 'CargoHooks::addToAdminLinks';
 $wgHooks['PageSchemasRegisterHandlers'][] = 'CargoPageSchemas::registerClass';
 $wgHooks['ResourceLoaderGetConfigVars'][] = 
'CargoHooks::onResourceLoaderGetConfigVars';
diff --git a/extension.json b/extension.json
index e2ba678..2b13531 100755
--- a/extension.json
+++ b/extension.json
@@ -264,6 +264,12 @@
"BaseTemplateToolbox": [
"CargoPageValuesAction::addLink"
],
+   "PageForms::TemplateFieldStart": [
+   "CargoHooks::addTemplateFieldStart"
+   ],
+   "PageForms::TemplateFieldEnd": [
+   "CargoHooks::addTemplateFieldEnd"
+   ],
"AdminLinks": [
"CargoHooks::addToAdminLinks"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6735813497f121f362736358d6ad49899fd6ba8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Comments

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341477 )

Change subject: Comments
..


Comments

Change-Id: Ifd5ca54fd01546feff13a685885c56fdbe5df1ee
---
M gateway_common/GatewayPage.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index 6aa2602..491add7 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -148,6 +148,10 @@
/**
 * Should be overridden in each derived class to actually handle the 
request
 * Performs gateway-specific checks and either redirects or displays 
form.
+*
+* FIXME: Be more disciplined about how handleRequest fits with
+* handleDonationRequest.  Would it be cleaner to move to a pre and post
+* hook scheme?
 */
protected abstract function handleRequest();
 
@@ -211,6 +215,8 @@
 
if ( $this->adapter && $allowRapid ) {
$page = ResultPages::getFailPage( $this->adapter );
+   // FIXME: Structured data $page rather than a union.  
displayForm
+   // will add the ffname if needed.
if ( !filter_var( $page, FILTER_VALIDATE_URL ) ) {
// If it's not a URL, we're rendering a 
RapidFail form
$this->logger->info( "Displaying fail form 
$page" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd5ca54fd01546feff13a685885c56fdbe5df1ee
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid breaking wikis that were modifying $wgDummyLanguageCodes

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341937 )

Change subject: Avoid breaking wikis that were modifying $wgDummyLanguageCodes
..


Avoid breaking wikis that were modifying $wgDummyLanguageCodes

Follow-up to If73c74ee87d8235381449cab7dcd9f46b0f23590.

Change-Id: I51b7ecf51860bfddea87fcf7cad17295088e1dd9
---
M RELEASE-NOTES-1.29
M includes/DefaultSettings.php
M includes/Setup.php
3 files changed, 15 insertions(+), 7 deletions(-)

Approvals:
  Fomafix: Looks good to me, but someone else must approve
  Krinkle: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 5bc66fd..e0c6e54 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -33,6 +33,8 @@
   feature flag will likely be removed before 1.29 is released.
 * (T158474) "Unknown user" has been added to $wgReservedUsernames.
 * (T156983) $wgRateLimitsExcludedIPs now accepts CIDR ranges as well as single 
IPs.
+* $wgDummyLanguageCodes is deprecated. Additional language code mappings may be
+  added to $wgExtraLanguageCodes instead.
 
 === New features in 1.29 ===
 * (T5233) A cookie can now be set when a user is autoblocked, to track that 
user
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index dce6d3c..192ad08 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2905,6 +2905,14 @@
 ];
 
 /**
+ * Functionally the same as $wgExtraLanguageCodes, but deprecated. Instead of
+ * appending values to this array, append them to $wgExtraLanguageCodes.
+ *
+ * @deprecated since 1.29
+ */
+$wgDummyLanguageCodes = [];
+
+/**
  * Set this to true to replace Arabic presentation forms with their standard
  * forms in the U+0600-U+06FF block. This only works if $wgLanguageCode is
  * set to "ar".
diff --git a/includes/Setup.php b/includes/Setup.php
index e686cd8..5ea96dd 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -403,13 +403,11 @@
$wgCanonicalNamespaceNames = $wgCanonicalNamespaceNames + 
$wgExtraNamespaces;
 }
 
-// Merge in the legacy language codes, unless overridden in the config
-if ( !isset( $wgDummyLanguageCodes ) ) {
-   $wgDummyLanguageCodes = [
-   'qqq' => 'qqq', // Used for message documentation
-   'qqx' => 'qqx', // Used for viewing message keys
-   ] + $wgExtraLanguageCodes + LanguageCode::getDeprecatedCodeMapping();
-}
+// Merge in the legacy language codes, incorporating overrides from the config
+$wgDummyLanguageCodes += [
+   'qqq' => 'qqq', // Used for message documentation
+   'qqx' => 'qqx', // Used for viewing message keys
+] + $wgExtraLanguageCodes + LanguageCode::getDeprecatedCodeMapping();
 
 // These are now the same, always
 // To determine the user language, use $wgLang->getCode()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51b7ecf51860bfddea87fcf7cad17295088e1dd9
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make MessageCache use the immutable text cache during cache ...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341968 )

Change subject: Make MessageCache use the immutable text cache during cache 
rebuilds
..


Make MessageCache use the immutable text cache during cache rebuilds

Only 1 message typically changed per run, so for wikis using
external storage and with many customized messages, this can
make rebuilds considerably faster.

Bug: T158084
Change-Id: Ib668e69a207e3fbeb7871f2f6a102ff1af567368
---
M includes/Revision.php
M includes/cache/MessageCache.php
2 files changed, 39 insertions(+), 13 deletions(-)

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



diff --git a/includes/Revision.php b/includes/Revision.php
index 4b9435a..dca2e1b 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1240,8 +1240,9 @@
 
/**
 * Get revision text associated with an old or archive row
-* $row is usually an object from wfFetchRow(), both the flags and the 
text
-* field must be included.
+*
+* Both the flags and the text field must be included. Including the 
old_id
+* field will activate cache usage as long as the $wiki parameter is 
not set.
 *
 * @param stdClass $row The text data
 * @param string $prefix Table prefix (default 'old_')
@@ -1252,8 +1253,6 @@
 * @return string|false Text the text requested or false on failure
 */
public static function getRevisionText( $row, $prefix = 'old_', $wiki = 
false ) {
-
-   # Get data
$textField = $prefix . 'text';
$flagsField = $prefix . 'flags';
 
@@ -1269,20 +1268,36 @@
return false;
}
 
-   # Use external methods for external objects, text in table is 
URL-only then
+   // Use external methods for external objects, text in table is 
URL-only then
if ( in_array( 'external', $flags ) ) {
$url = $text;
$parts = explode( '://', $url, 2 );
if ( count( $parts ) == 1 || $parts[1] == '' ) {
return false;
}
-   $text = ExternalStore::fetchFromURL( $url, [ 'wiki' => 
$wiki ] );
+
+   if ( isset( $row->old_id ) && $wiki === false ) {
+   // Make use of the wiki-local revision text 
cache
+   $cache = 
MediaWikiServices::getInstance()->getMainWANObjectCache();
+   $text = $cache->getWithSetCallback(
+   $cache->makeKey( 'revisiontext', 
'textid', $row->old_id ),
+   self::getCacheTTL( $cache ),
+   function () use ( $url, $wiki ) {
+   // No negative caching per 
Revision::loadText()
+   return 
ExternalStore::fetchFromURL( $url, [ 'wiki' => $wiki ] );
+   },
+   [ 'pcGroup' => self::TEXT_CACHE_GROUP, 
'pcTTL' => $cache::TTL_PROC_LONG ]
+   );
+   } else {
+   $text = ExternalStore::fetchFromURL( $url, [ 
'wiki' => $wiki ] );
+   }
}
 
// If the text was fetched without an error, convert it
if ( $text !== false ) {
$text = self::decompressRevisionText( $text, $flags );
}
+
return $text;
}
 
@@ -1559,15 +1574,14 @@
}
 
/**
-* Lazy-load the revision's text.
-* Currently hardcoded to the 'text' table storage engine.
+* Get the text cache TTL
 *
-* @return string|bool The revision's text, or false on failure
+* @param WANObjectCache $cache
+* @return integer
 */
-   private function loadText() {
+   private static function getCacheTTL( WANObjectCache $cache ) {
global $wgRevisionCacheExpiry;
 
-   $cache = ObjectCache::getMainWANInstance();
if ( $cache->getQoS( $cache::ATTR_EMULATION ) <= 
$cache::QOS_EMULATION_SQL ) {
// Do not cache RDBMs blobs in...the RDBMs store
$ttl = $cache::TTL_UNCACHEABLE;
@@ -1575,10 +1589,22 @@
$ttl = $wgRevisionCacheExpiry ?: 
$cache::TTL_UNCACHEABLE;
}
 
+   return $ttl;
+   }
+
+   /**
+* Lazy-load the revision's text.
+* Currently hardcoded to the 'text' table storage engine.
+*
+* @return string|bool The revision's text, or false on failure
+*/
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Better path traversal prevention in TemplateParser.

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342561 )

Change subject: Better path traversal prevention in TemplateParser.
..


Better path traversal prevention in TemplateParser.

In practise this probably doesn't matter, since template names
are not user controlled, and php isn't stupid enough to fall for
tricks with nulls (afaict). Nonetheless, the code from Title is
only meant to prevent url traversal, it is not meant to prevent
file system path traversal.

Change-Id: Id690576326d03744acc8fbbe78f4b7a4b4c04d7e
---
M includes/TemplateParser.php
M tests/phpunit/includes/TemplateParserTest.php
2 files changed, 43 insertions(+), 11 deletions(-)

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



diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 470a75c..f581a80 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -54,18 +54,11 @@
 * @throws UnexpectedValueException If $templateName attempts upwards 
directory traversal
 */
protected function getTemplateFilename( $templateName ) {
-   // Prevent upwards directory traversal using same methods as 
Title::secureAndSplit
+   // Prevent path traversal. Based on Language::isValidCode().
+   // This is for paranoia. The $templateName should never come 
from
+   // untrusted input.
if (
-   strpos( $templateName, '.' ) !== false &&
-   (
-   $templateName === '.' || $templateName === '..' 
||
-   strpos( $templateName, './' ) === 0 ||
-   strpos( $templateName, '../' ) === 0 ||
-   strpos( $templateName, '/./' ) !== false ||
-   strpos( $templateName, '/../' ) !== false ||
-   substr( $templateName, -2 ) === '/.' ||
-   substr( $templateName, -3 ) === '/..'
-   )
+   strcspn( $templateName, ":/\\\000&<>'\"%" ) !== strlen( 
$templateName )
) {
throw new UnexpectedValueException( "Malformed 
\$templateName: $templateName" );
}
@@ -128,6 +121,8 @@
$code = $this->compileForEval( $fileContents, $filename 
);
}
 
+   echo "About to eval:\n";
+   echo $code;
$renderer = eval( $code );
if ( !is_callable( $renderer ) ) {
throw new RuntimeException( "Requested template, 
{$templateName}, is not callable" );
diff --git a/tests/phpunit/includes/TemplateParserTest.php 
b/tests/phpunit/includes/TemplateParserTest.php
index 469f45a..2bd9086 100644
--- a/tests/phpunit/includes/TemplateParserTest.php
+++ b/tests/phpunit/includes/TemplateParserTest.php
@@ -52,6 +52,43 @@
'UnexpectedValueException'
],
[
+   "\000../foobar",
+   [],
+   false,
+   'UnexpectedValueException'
+   ],
+   [
+   '/',
+   [],
+   false,
+   'UnexpectedValueException'
+   ],
+   [
+   // Allegedly this can strip ext in windows.
+   'baz<',
+   [],
+   false,
+   'UnexpectedValueException'
+   ],
+   [
+   '\\foo',
+   [],
+   false,
+   'UnexpectedValueException'
+   ],
+   [
+   'C:\bar',
+   [],
+   false,
+   'UnexpectedValueException'
+   ],
+   [
+   "foo\000bar",
+   [],
+   false,
+   'UnexpectedValueException'
+   ],
+   [
'nonexistenttemplate',
[],
false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id690576326d03744acc8fbbe78f4b7a4b4c04d7e
Gerrit-PatchSet: 2

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove integration/* repos from trebuchet

2017-03-14 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342785 )

Change subject: Remove integration/* repos from trebuchet
..

Remove integration/* repos from trebuchet

Most of these are deployed directly via git::clone, some aren't
deployed at all anymore. In any case, they aren't being deployed
by Trebuchet

After this lands, can remove the entire /srv/deployment/integration
directory tree from tin & mira

Change-Id: I5bc2832ba5bbaa7990a617f73bc9d5d0db933740
---
M hieradata/common/role/deployment.yaml
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/342785/1

diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index 6cef155..dfe895f 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -1,13 +1,4 @@
 role::deployment::repo_config:
-  integration/mediawiki-tools-codesniffer:
-upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/codesniffer
-  integration/phpunit:
-upstream: https://gerrit.wikimedia.org/r/integration/phpunit
-  integration/php-coveralls:
-upstream: https://gerrit.wikimedia.org/r/integration/php-coveralls
-  integration/slave-scripts:
-upstream: https://gerrit.wikimedia.org/r/integration/jenkins
-checkout_submodules: true
   jobrunner/jobrunner:
 upstream: https://gerrit.wikimedia.org/r/mediawiki/services/jobrunner
 service_name: jobrunner

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

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

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

[MediaWiki-commits] [Gerrit] analytics...source[master]: Do not filter test.wikipedia.org

2017-03-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342784 )

Change subject: Do not filter test.wikipedia.org
..

Do not filter test.wikipedia.org

Bug: T160484
Change-Id: Ie18f8892a8a0db3c8d4bb8de5afaac01627b68ef
---
M 
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/84/342784/1

diff --git 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
index f14db41..01f2a97 100644
--- 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
+++ 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
@@ -54,7 +54,7 @@
 );
 
 private final Pattern uriHostProjectDomainPattern = Pattern.compile(
-"^((?!www)(?!test)(?!donate)(?!arbcom)([a-zA-Z0-9-_]+)\\.)*" // 
not starting with "www" "test", "donate" or "arbcom"
+"^((?!www)(?!donate)(?!arbcom)([a-zA-Z0-9-_]+)\\.)*" // not 
starting with "www" "test", "donate" or "arbcom"
 + "(wik(ibooks|"// 
match project domains ending in .org
 + "inews|ipedia|iquote|isource|tionary|iversity|ivoyage))\\.org$"
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie18f8892a8a0db3c8d4bb8de5afaac01627b68ef
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
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] wikimedia...crm[master]: Set street address to NULL where placeholder info has been u...

2017-03-14 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342783 )

Change subject: Set street address to NULL where placeholder info has been used.
..

Set street address to NULL where placeholder info has been used.

Bug: T158268
Change-Id: Ic78faed9589fafc1a1ed170f5c47e1363b27075a
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/83/342783/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 399e107..6980bb1 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2827,3 +2827,32 @@
   wmf_civicrm_update_7485();
   wmf_civicrm_update_7490();
 }
+
+/**
+ * Set street address/ postal_code to NULL where placeholder info has been 
used.
+ *
+ * Note that all addresses in the DB with N0NE PROVIDED or 0 postal_code have a
+ * country_id so this is really precautionary, but we would want to delete the
+ * address if it were blank, rather than update it.
+ *
+ * Bug: T158268
+ */
+function wmf_civicrm_update_7510() {
+  civicrm_initialize();
+  CRM_Core_DAO::executeQuery("
+UPDATE civicrm_address
+SET street_address = NULL
+WHERE street_address = 'N0NE PROVIDED'
+AND country_id IS NOT NULL
+"
+  );
+  // sorry can't be bothered trying to write it into one query :-(
+  // would need IF & I am undercaffeinated right now.
+  CRM_Core_DAO::executeQuery("
+UPDATE civicrm_address
+SET postal_code = NULL
+WHERE postal_code = '0'
+AND country_id IS NOT NULL
+"
+  );
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic78faed9589fafc1a1ed170f5c47e1363b27075a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Add test.wikipedia to the pageview whitelist

2017-03-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342782 )

Change subject: Add test.wikipedia to the pageview whitelist
..

Add test.wikipedia to the pageview whitelist

Bug: T160484
Change-Id: I874316853c8173338f428c3aed5b90ef4049a4a3
---
M static_data/pageview/whitelist/whitelist.tsv
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/82/342782/1

diff --git a/static_data/pageview/whitelist/whitelist.tsv 
b/static_data/pageview/whitelist/whitelist.tsv
index 3829463..bbcf38d 100644
--- a/static_data/pageview/whitelist/whitelist.tsv
+++ b/static_data/pageview/whitelist/whitelist.tsv
@@ -720,6 +720,7 @@
 projectte.wikiquote2015-10-12 00:00:00
 projectte.wikisource   2015-10-12 00:00:00
 projectte.wiktionary   2015-10-12 00:00:00
+projecttest.wikipedia  2015-10-12 00:00:00
 projecttg.wikibooks2015-10-12 00:00:00
 projecttg.wikipedia2015-10-12 00:00:00
 projecttg.wiktionary   2015-10-12 00:00:00

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I874316853c8173338f428c3aed5b90ef4049a4a3
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
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] operations/mediawiki-config[master]: Fix issues with ORES models:

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342767 )

Change subject: Fix issues with ORES models:
..


Fix issues with ORES models:

* Use the right $wgOresWikiId.  Currently this means 'enwiki'
  really uses 'enwiki', everything else uses 'testwiki'.
* Temporarily turn off 'goodfaith' everywhere except 'enwiki'
  until T160467 is deployed.
* Make an 'enwiki' wgOresModels, like 'wikipedia' except that
  'goodfaith' is true.
* Use alphabetical order for consistency.

Change-Id: I18ea0bfe528610508310e2fb745800a907f6536d
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 896f131..effa2c9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -297,7 +297,6 @@
 
 if ( $wmgUseORES ) {
wfLoadExtension( 'ORES' );
-   $wgOresWikiId = 'testwiki';
$wgOresBaseUrl = 'https://ores-beta.wmflabs.org/';
 }
 
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c900797..0a59c3e 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -431,13 +431,22 @@
'wgOresModels' => [
'default' => [
'damaging' => true,
+   'goodfaith' => false,
'reverted' => true,
+   'wp10' => false,
+   ],
+   // This is separate because
+   // it uses the real wgOresWikiId
+   // below.
+   'enwiki' => [
+   'damaging' => true,
'goodfaith' => true,
+   'reverted' => false,
'wp10' => false,
],
'wikipedia' => [
'damaging' => true,
-   'goodfaith' => true,
+   'goodfaith' => false,
'reverted' => false,
'wp10' => false,
], // T127661

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18ea0bfe528610508310e2fb745800a907f6536d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342781 )

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

f6bbf39 Rerun previous blank_address updates with slightly wider catchment.
bf70d74 Do not record dummy data 'N0NE PROVIDED' to the database,

Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
1 file changed, 0 insertions(+), 75 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index fc576b6..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
-  }
-
-  public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name = 
'Mouse'");
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   */
-  public function testAddressImportVoidData() {
-$msg = array(
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   *
-   * In this case the contact already exists.
-   */
-  public function testAddressImportVoidDataContactExists() {
-$msg = array(
-  'contact_id' => $this->contactID,
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-03-14 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342781 )

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

f6bbf39 Rerun previous blank_address updates with slightly wider catchment.
bf70d74 Do not record dummy data 'N0NE PROVIDED' to the database,

Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
---
D sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
1 file changed, 0 insertions(+), 75 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/81/342781/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
deleted file mode 100644
index fc576b6..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-callAPISuccess('Contact', 'create', array(
-  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org')
-);
-$this->contactID = $contact['id'];
-  }
-
-  public function tearDown() {
-CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name = 
'Mouse'");
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   */
-  public function testAddressImportVoidData() {
-$msg = array(
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-  /**
-   * Test creating an address with void data does not create an address.
-   *
-   * In this case the contact already exists.
-   */
-  public function testAddressImportVoidDataContactExists() {
-$msg = array(
-  'contact_id' => $this->contactID,
-  'currency' => 'USD',
-  'date' => time(),
-  'last_name' => 'Mouse',
-  'email' => 'nob...@wikimedia.org',
-  'gateway' => 'test_gateway',
-  'gateway_txn_id' => mt_rand(),
-  'gross' => '1.23',
-  'payment_method' => 'cc',
-  'street_address' => 'N0NE PROVIDED',
-  'postal_code' => 0,
-);
-
-$contribution = wmf_civicrm_contribution_message_import($msg);
-$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
-$this->assertEquals(0, $addresses['count']);
-  }
-
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9457db14826598d314afc081587c6aec602fe4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.20.0

2017-03-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342780 )

Change subject: Tag v0.20.0
..

Tag v0.20.0

Change-Id: I0c8bbd37bd91cf249e8142028f0886e3bf96af12
---
M History.md
M package.json
2 files changed, 48 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/80/342780/1

diff --git a/History.md b/History.md
index afbf42d..950ea9b 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,51 @@
 # OOjs UI Release History
+## v0.20.0 / 2017-03-15
+### Breaking changes
+* [BREAKING CHANGE] Element#scrollIntoView: Drop `complete` config option 
(James D. Forrester)
+* [BREAKING CHANGE] Element#scrollIntoView: Remove deprecated `complete` 
config parameter (James D. Forrester)
+* [BREAKING CHANGE] LabelElement: Remove deprecated `fitLabel` function (James 
D. Forrester)
+* [BREAKING CHANGE] MessageDialog: Drop the deprecated '`verbose`' flag (James 
D. Forrester)
+* [BREAKING CHANGE] PopupWidget#setAlignment: Remove backwards-compatibility 
(James D. Forrester)
+* [BREAKING CHANGE] Remove CapsuleMultiSelectWidget (James D. Forrester)
+* [BREAKING CHANGE] Remove TextInputMenuSelectWidget (James D. Forrester)
+* [BREAKING CHANGE] TextInputWidget: Remove `type=date`/`month` support 
(Geoffrey Mon)
+* [BREAKING CHANGE] icons: Drop '`*Undo`' icons, deprecated in 0.18.3 (James 
D. Forrester)
+* [BREAKING CHANGE] icons: Drop '`beta`' and '`ribbonPrize`', deprecated in 
0.18.3 (James D. Forrester)
+* [BREAKING CHANGE] icons: Drop '`betaLaunch`', deprecated in 0.18.3 (James D. 
Forrester)
+* [BREAKING CHANGE] icons: Drop status flags from Wikimedia (logos) icon pack 
(Volker E)
+
+### Deprecations
+* [DEPRECATING CHANGE] ActionWidget/Set: Warn for methods using the 'resize' 
event (Prateek Saxena)
+
+### Features
+* Use `` rather than `` for inline-ish widgets (Bartosz Dziewoński)
+* CapsuleMultiselectWidget: Call updateInputSize when adding, removing items 
(Prateek Saxena)
+* DropdownInputWidget: Add support for 'optgroup' (Prateek Saxena)
+* FieldLayout: Use `` rather than `` when possible (Bartosz 
Dziewoński)
+
+### Styles
+* DropdownInputWidget: Tweak PHP widget's disabled styling (Bartosz Dziewoński)
+* NumberInputWidget: Set input to 100% height (Volker E)
+* MediaWiki theme: Add unit to `line-height` for Chrome (Volker E)
+* MediaWiki theme: Align “framed” ButtonWidgets cross-browser (Volker E)
+* MediaWiki theme: Ensure theme color in disabled TextInputWidget on Safari 
(Volker E)
+* MediaWiki theme: Ensure vertical alignment of dialog top bar items (Volker E)
+* MediaWiki theme: Fix TextInputWidget's IconElement `max-height` (Volker E)
+* MediaWiki theme: Fix appearance of ComboBoxInputWidget PHP (Volker E)
+* MediaWiki theme: Use color palette color for dialog top bar (Volker E)
+* MediaWiki theme: Vertically align label in SelectFileWidget (Volker E)
+
+### Code
+* DropdownInputWidget: Remove accidental patterned background in PHP (Bartosz 
Dziewoński)
+* MediaWiki theme: Align WindowManager to CSS Coding Guidelines (Volker E)
+* MediaWiki theme: Indicators shouldn't provide global '`progressive`' flag 
(Volker E)
+* MediaWiki theme: Simplify Radio- & Checkbox*optionWidget label rules (Volker 
E)
+* build: Bump various devDependencies to master (James D. Forrester)
+* build: Exclude demos/vendor from composer test too (James D. Forrester)
+* demos: Add ButtonGroupWidget (icon and text) demo (Volker E)
+* demos: Add disabled DropdownInputWidget demo (Bartosz Dziewoński)
+
+
 ## v0.19.5 / 2017-03-07
 ### Deprecations
 * [DEPRECATING CHANGE] icons: Move 'add' from core to 'interactions' pack 
(James D. Forrester)
diff --git a/package.json b/package.json
index 0e6baa8..1e34391 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.19.5",
+  "version": "0.20.0",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temporary fix to avoid referencing AuthManagerStatsdHandler ...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342778 )

Change subject: Temporary fix to avoid referencing AuthManagerStatsdHandler 
when not loaded
..


Temporary fix to avoid referencing AuthManagerStatsdHandler when not loaded

Follows-up 54757af61bff61.

> Class undefined: AuthManagerStatsdHandler
> in includes/libs/ObjectFactory.php:71

Change-Id: I3c6fb9de9be758f0ae46e9cafd9803c3f7fca97e
---
M wmf-config/logging.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index 2fecd36..a92fbd4 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -178,7 +178,10 @@
],
 ];
 
-if ( $wmgLogAuthmanagerMetrics ) {
+if (
+   $wmgLogAuthmanagerMetrics
+   && $wmgUseWikimediaEvents // T160490
+) {
// authmanager is the old name, but it has been repurposed
// to be a more generic log channel; authevents is the new name
$wmgMonologConfig['loggers']['authmanager'] = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c6fb9de9be758f0ae46e9cafd9803c3f7fca97e
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Vertically align label in SelectFileWidget

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342589 )

Change subject: MediaWiki theme: Vertically align label in SelectFileWidget
..


MediaWiki theme: Vertically align label in SelectFileWidget

Align SelectFileWidget's label vertically by positioning it
the same way like TextInputwidget.

Also:

- clarify Less variable name,
- remove unnecessary property, and
- set disabled IndicatorElement opacity lower as in widgets
elsewhere.

Change-Id: I43f34a1b5254d8604f2e08c2836fce953cf6643c
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 15 insertions(+), 11 deletions(-)

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



diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index d653379..4e803eb 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -111,8 +111,8 @@
 @border-width-medium: 2px;
 
 @padding-widget-default: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px` at base `font-size: 12.8px`
-@padding-input-top: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default; 
// equals `0.625em`≈`8px` at base `font-size: 12.8px`
 @padding-vertical-label: 4 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.3125em`≈`4px` at base `font-size: 12.8px`
+@padding-top-input: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default; 
// equals `0.625em`≈`8px` at base `font-size: 12.8px`
 
 @box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
 @box-shadow-menu: @box-shadow-dialog;
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 92db35d..4fd2dbc 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -164,7 +164,7 @@
position: relative;
min-height: @min-height-button-default;
border-radius: @border-radius-default;
-   padding: @padding-input-top 1em @padding-widget-default;
+   padding: @padding-top-input 1em @padding-widget-default;
}
 
&.oo-ui-iconElement > .oo-ui-buttonElement-button {
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 716616c..692e800 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -267,9 +267,10 @@
.oo-ui-box-sizing( border-box );
display: block;
right: @size-icon + 0.5em; // With close, no indicator
-   margin: 0;
-   padding-left: 0.5em;
-   line-height: 2.3;
+   padding-top: @padding-top-input;
+   padding-left: @padding-widget-default;
+   padding-bottom: @padding-widget-default;
+   line-height: 1.172em;
white-space: nowrap;
}
 
@@ -281,14 +282,14 @@
}
 
&-clearButton {
-   top: 0;
+   top: -1px; // Addresses `border-width`
right: 0; // With close, no indicator
min-width: @size-icon-min;
width: @size-icon;
margin-right: 0;
 
.oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
-   height: 2.3em;
+   height: @size-default;
}
}
 
@@ -383,9 +384,12 @@
border-color: @border-color-disabled;
text-shadow: @text-shadow-disabled;
 
-   > .oo-ui-iconElement-icon,
-   > .oo-ui-indicatorElement-indicator {
+   > .oo-ui-iconElement-icon {
opacity: @opacity-disabled;
+   }
+
+   > .oo-ui-indicatorElement-indicator {
+   opacity: @opacity-disabled-indicator;
}
}
}
@@ -779,7 +783,7 @@
color: @color-emphasized;
border: @border-default;
border-radius: @border-radius-default;
-   padding: @padding-input-top @padding-widget-default 
@padding-widget-default;
+   padding: @padding-top-input @padding-widget-default 
@padding-widget-default;
}
 
input {
@@ -902,7 +906,7 @@
> .oo-ui-labelElement-label {
color: @color-subtle;
margin-top: 1px; // making up for `border` on `input`
-   padding: @padding-input-top @padding-widget-default 
@padding-widget-default; // same as `input` above
+   padding: @padding-top-input @padding-widget-default 
@padding-widget-default; // same as `input` above
line-height: 1.172em;
}
 

-- 
To view,

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Use Pillow<3.5.0 on python2.6

2017-03-14 Thread Dalba (Code Review)

Dalba has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342779 )

Change subject: Use Pillow<3.5.0 on python2.6
..

Use Pillow<3.5.0 on python2.6

Bug: T160486
Change-Id: Icf8a1ef4daabea65f331f843808bb5e40bce7c89
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/79/342779/1

diff --git a/requirements.txt b/requirements.txt
index 6b82cb5..b87f833 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,7 +50,8 @@
 python-stdnum
 
 # GUI
-Pillow
+Pillow<3.5.0 ; python_version < '2.7'
+Pillow ; python_version >= '2.7'
 
 # core pagegenerators
 google >= 1.7
diff --git a/setup.py b/setup.py
index 2ba209d..560a408 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@
 'Google': ['google>=1.7'],
 'IRC': [irc_dep],
 'mwparserfromhell': ['mwparserfromhell>=0.3.3'],
-'Tkinter': ['Pillow'],
+'Tkinter': ['Pillow<3.5.0' if PY26 else 'Pillow'],
 # 0.6.1 supports socket.io 1.0, but WMF is using 0.9 (T91393 and T85716)
 'rcstream': ['socketIO-client<0.6.1'],
 'security': ['requests[security]', 'pycparser!=2.14'],
@@ -76,7 +76,7 @@
 })
 
 script_deps = {
-'flickrripper.py': ['Pillow'],
+'flickrripper.py': ['Pillow<3.5.0' if PY26 else 'Pillow'],
 'states_redirect.py': ['pycountry'],
 'weblinkchecker.py': ['memento_client>=0.5.1'],
 'patrol.py': ['mwparserfromhell>=0.3.3'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf8a1ef4daabea65f331f843808bb5e40bce7c89
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temporary fix to avoid referencing AuthManagerStatsdHandler ...

2017-03-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342778 )

Change subject: Temporary fix to avoid referencing AuthManagerStatsdHandler 
when not loaded
..

Temporary fix to avoid referencing AuthManagerStatsdHandler when not loaded

Change-Id: I3c6fb9de9be758f0ae46e9cafd9803c3f7fca97e
---
M wmf-config/logging.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/78/342778/1

diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index 2fecd36..57abf9a 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -178,7 +178,7 @@
],
 ];
 
-if ( $wmgLogAuthmanagerMetrics ) {
+if ( $wmgLogAuthmanagerMetrics && $wmgUseWikimediaEvents ) {
// authmanager is the old name, but it has been repurposed
// to be a more generic log channel; authevents is the new name
$wmgMonologConfig['loggers']['authmanager'] = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c6fb9de9be758f0ae46e9cafd9803c3f7fca97e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] operations/puppet[production]: mediawiki::maintenance: convert to profile/role (WIP)

2017-03-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342777 )

Change subject: mediawiki::maintenance: convert to profile/role (WIP)
..

mediawiki::maintenance: convert to profile/role (WIP)

Change-Id: I59853e79fe909e2526b8f5480abe8c9af0bcc634
---
M manifests/site.pp
R modules/profile/manifests/mediawiki/maintenance/server.pp
A modules/role/manifests/mediawiki_maintenance_server.pp
3 files changed, 8 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/342777/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 54a1059..6c6257b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2700,16 +2700,9 @@
 role(icinga, tendril, tcpircbot, certspotter)
 }
 
-# https://wikitech.wikimedia.org/wiki/Terbium
-node 'terbium.eqiad.wmnet' {
-role(mariadb::maintenance, mediawiki::maintenance, openldap::management)
-include ::role::noc::site
-include ::ldap::role::client::labs
-include ::base::firewall
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
+# mediawiki maintenance servers (https://wikitech.wikimedia.org/wiki/Terbium)
+node 'terbium.eqiad.wmnet', 'wasat.codfw.wmnet' {
+role('mediawiki_maintenance_server')
 }
 
 # Thumbor servers for MediaWiki image scaling
diff --git a/modules/role/manifests/mediawiki/maintenance.pp 
b/modules/profile/manifests/mediawiki/maintenance/server.pp
similarity index 100%
rename from modules/role/manifests/mediawiki/maintenance.pp
rename to modules/profile/manifests/mediawiki/maintenance/server.pp
diff --git a/modules/role/manifests/mediawiki_maintenance_server.pp 
b/modules/role/manifests/mediawiki_maintenance_server.pp
new file mode 100644
index 000..07e4c4c
--- /dev/null
+++ b/modules/role/manifests/mediawiki_maintenance_server.pp
@@ -0,0 +1,5 @@
+class role::mediawiki_maintenance_server {
+
+include ::standard
+include ::profile::mediawiki::maintenance::server
+}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Benevity loosening, handle multiple contact use in the past.

2017-03-14 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342776 )

Change subject: Benevity loosening, handle multiple contact use in the past.
..

Benevity loosening, handle multiple contact use in the past.

Our last situation (hopefully) seems to be a scenario where previous Benevity 
enterers have
spread their love over a range of similar contact records. In this case we 
can't choose the
'right' one, because probably they should just be merged.

Major Gifts were not very keen on doing any manual tidy up on them so 
alternative
solution is to create a new one, but after the first new contribution under the 
new
system we should be able to differentiate & prioritise this new one as it 
should be
the only one with a relationship. So, do that.

If more than one has a relationship then, give up, propagate new ones each time 
forever.

Hopefully that won't happy, but that seems to be preferred to manual 
intervention as
an overall philosophy.

Bug: T115044
Change-Id: I4e49774d0944ad16667f159b676aa191fad1a381
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
2 files changed, 91 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/76/342776/1

diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index bfc4bb7..b42eec2 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -272,17 +272,24 @@
 return false;
   }
   elseif ($contacts['count'] > 1) {
+$possibleContacts = array();
 $contactID = NULL;
 foreach ($contacts['values'] as $contact) {
   if 
($this->isContactEmployedByOrganization($msg['matching_organization_name'], 
$contact)) {
-if ($contactID) {
-  throw new WmfException('IMPORT_CONTRIB', 'Ambiguous contact');
+$possibleContacts[] = $contact['id'];
+  }
+  if (count($possibleContacts) > 1) {
+foreach ($possibleContacts as $index => $possibleContactID) {
+  if (
+$contacts['values'][$possibleContactID]['current_employer']
+!== 
$this->getOrganizationResolvedName($msg['matching_organization_name'])
+  ) {
+unset($possibleContacts[$index]);
+  }
 }
-$contactID = $contact['id'];
   }
 }
-
-return $contactID ? $contactID : FALSE;
+return (count($possibleContacts) == 1) ? reset($possibleContacts) : 
FALSE;
   }
   return FALSE;
 }
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index d8e0221..d3fb4f6 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -298,6 +298,85 @@
   }
 
   /**
+   * Test that import creates new if there are multiple choices based on 
previous soft credit history.
+   *
+   * If we try to disambiguate our contact using soft credit history and there 
is more than
+   * one match, we give up & create a new one. In future this one should get 
used
+   * as it will have an employee relationship.
+   */
+  function testImportSucceedIndividualCreateIfAmbiguousPreviousSoftCredit() {
+$organization = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
+));
+$betterMinnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org',
+));
+foreach (array($minnie, $betterMinnie) as $mouse) {
+  // Create a contribution on the organisation, soft credited to each 
mouse..
+  $this->callAPISuccess('Contribution', 'create', array(
+'total_amount' => 4,
+'financial_type_id' => 'Donation',
+'soft_credit_to' => $mouse['id'],
+'contact_id' => $organization['id'],
+  ));
+}
+
+$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
+$contributions = $this->callAPISuccess('Contribution', 'get', 
array('contact_id' => array('IN' => array($minnie['id'], 
$betterMinnie['id'];
+$this->assertEquals(0, $contributions['count']);
+
+$newestMouse = $this->callAPISuccessGetSingle('Contact', array(
+  'id' => array('NOT IN' =>

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.16]: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342775 )

Change subject: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4
..


Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
(cherry picked from commit 2134e21b4b62b9a5f1f8614dc57502ec7ab7cfee)
---
M RelatedSites.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5fbac5a..a113977 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -129,7 +129,7 @@
 * @return bool
 */
public static function onSidebarBeforeOutput( $skin, &$bar ) {
-   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
+   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
) ?: [];
 
$relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make Page Previews use RESTBase on "stage 0" wikis

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340697 )

Change subject: Make Page Previews use RESTBase on "stage 0" wikis
..


Make Page Previews use RESTBase on "stage 0" wikis

Per T136602, the stage 0 Wikipedias are: it-, ru- el-, ca-, and hewiki.

Bug: T158221
Change-Id: I066906c5f5a2365074fc3f19290fd28ba5b45013
---
M wmf-config/InitialiseSettings.php
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 75740ff..35700ab 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13285,6 +13285,18 @@
'default' => 0.05,
 ],
 
+'wgPopupsAPIUseRESTBase' => [
+   'default' => false,
+
+   // T158221: Make Page Previews use RESTBase for the following "stage 0" 
wikis
+   // (see T136602 for more detail of the release plan for Page Previews).
+   'itwiki' => true,
+   'ruwiki' => true,
+   'elwiki' => true,
+   'cawiki' => true,
+   'hewiki' => true,
+],
+
 'wmgULSCompactLanguageLinksBetaFeature' => [
'default' => true,
'testwiki' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I066906c5f5a2365074fc3f19290fd28ba5b45013
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Phuedx 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.15]: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342774 )

Change subject: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4
..


Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
(cherry picked from commit 2134e21b4b62b9a5f1f8614dc57502ec7ab7cfee)
---
M RelatedSites.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5fbac5a..a113977 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -129,7 +129,7 @@
 * @return bool
 */
public static function onSidebarBeforeOutput( $skin, &$bar ) {
-   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
+   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
) ?: [];
 
$relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.16]: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

2017-03-14 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342775 )

Change subject: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4
..

Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
(cherry picked from commit 2134e21b4b62b9a5f1f8614dc57502ec7ab7cfee)
---
M RelatedSites.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedSites 
refs/changes/75/342775/1

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5fbac5a..a113977 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -129,7 +129,7 @@
 * @return bool
 */
public static function onSidebarBeforeOutput( $skin, &$bar ) {
-   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
+   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
) ?: [];
 
$relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.15]: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

2017-03-14 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342774 )

Change subject: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4
..

Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
(cherry picked from commit 2134e21b4b62b9a5f1f8614dc57502ec7ab7cfee)
---
M RelatedSites.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedSites 
refs/changes/74/342774/1

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5fbac5a..a113977 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -129,7 +129,7 @@
 * @return bool
 */
public static function onSidebarBeforeOutput( $skin, &$bar ) {
-   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
+   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
) ?: [];
 
$relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Ensure theme color in disabled TextInputWid...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342769 )

Change subject: MediaWiki theme: Ensure theme color in disabled TextInputWidget 
on Safari
..


MediaWiki theme: Ensure theme color in disabled TextInputWidget on Safari

Ensuring sufficient color contrast of disabled TextInputWidget on Safari
by applying vendor-specific CSS property.

Bug: T160478
Change-Id: I1fea55df53933fc57141918691f84def2719ad96
---
M src/themes/mediawiki/widgets.less
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 716616c..53ab9e8 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -858,6 +858,8 @@
input,
textarea {
background-color: @background-color-disabled;
+   // Support: Safari
+   -webkit-text-fill-color: @color-disabled;
color: @color-disabled;
text-shadow: @text-shadow-disabled;
border-color: @border-color-disabled;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fea55df53933fc57141918691f84def2719ad96
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.16]: mw.widgets.SearchInputWidget: Do not pass `type: 'search'` t...

2017-03-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342773 )

Change subject: mw.widgets.SearchInputWidget: Do not pass `type: 'search'` to 
TextInputWidget
..

mw.widgets.SearchInputWidget: Do not pass `type: 'search'` to TextInputWidget

Causes deprecation warnings.

Most of this code is copy-pasted from OO.ui.SearchInputWidget.

Bug: T148471
Change-Id: I81d52ba938a8b90c5d2c173f1f2682d9e3300e43
(cherry picked from commit e218f21d444dbdf32b6541ff1a54fca2cf8776f8)
---
M includes/widget/SearchInputWidget.php
M resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
2 files changed, 70 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/342773/1

diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
index 0d71629..49510da 100644
--- a/includes/widget/SearchInputWidget.php
+++ b/includes/widget/SearchInputWidget.php
@@ -31,7 +31,6 @@
public function __construct( array $config = [] ) {
$config = array_merge( [
'maxLength' => null,
-   'type' => 'search',
'icon' => 'search',
], $config );
 
@@ -56,6 +55,10 @@
$this->addClasses( [ 'mw-widget-searchInputWidget' ] );
}
 
+   protected function getInputElement( $config ) {
+   return ( new \OOUI\Tag( 'input' ) )->setAttributes( [ 'type' => 
'search' ] );
+   }
+
protected function getJavaScriptClassName() {
return 'mw.widgets.SearchInputWidget';
}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 0a73bef..7880b55 100755
--- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@ -30,7 +30,6 @@
var $form = config.$input ? config.$input.closest( 'form' ) : 
$();
 
config = $.extend( {
-   type: 'search',
icon: 'search',
maxLength: undefined,
performSearchOnClick: true,
@@ -67,6 +66,12 @@
)
} );
}.bind( this ) );
+
+   this.$element.addClass( 'oo-ui-textInputWidget-type-search' );
+   this.updateSearchIndicator();
+   this.connect( this, {
+   disable: 'onDisable'
+   } );
};
 
/* Setup */
@@ -76,6 +81,66 @@
/* Methods */
 
/**
+* @inheritdoc
+* @protected
+*/
+   mw.widgets.SearchInputWidget.prototype.getInputElement = function () {
+   return $( '' ).attr( 'type', 'search' );
+   };
+
+   /**
+* @inheritdoc
+*/
+   mw.widgets.SearchInputWidget.prototype.onIndicatorMouseDown = function 
( e ) {
+   if ( e.which === OO.ui.MouseButtons.LEFT ) {
+   // Clear the text field
+   this.setValue( '' );
+   this.$input[ 0 ].focus();
+   return false;
+   }
+   };
+
+   /**
+* Update the 'clear' indicator displayed on type: 'search' text
+* fields, hiding it when the field is already empty or when it's not
+* editable.
+*/
+   mw.widgets.SearchInputWidget.prototype.updateSearchIndicator = function 
() {
+   if ( this.getValue() === '' || this.isDisabled() || 
this.isReadOnly() ) {
+   this.setIndicator( null );
+   } else {
+   this.setIndicator( 'clear' );
+   }
+   };
+
+   /**
+* @inheritdoc
+*/
+   mw.widgets.SearchInputWidget.prototype.onChange = function () {
+   mw.widgets.SearchInputWidget.parent.prototype.onChange.call( 
this );
+   this.updateSearchIndicator();
+   };
+
+   /**
+* Handle disable events.
+*
+* @param {boolean} disabled Element is disabled
+* @private
+*/
+   mw.widgets.SearchInputWidget.prototype.onDisable = function () {
+   this.updateSearchIndicator();
+   };
+
+   /**
+* @inheritdoc
+*/
+   mw.widgets.SearchInputWidget.prototype.setReadOnly = function ( state ) 
{
+   mw.widgets.SearchInputWidget.parent.prototype.setReadOnly.call( 
this, state );
+   this.updateSearchIndicator();
+   return this;
+   };
+
+   /**
 * @inheritdoc mw.widgets.TitleWidget
 */
mw.widgets.SearchInputWidget.prototype.getSuggestionsPromise = function 
() {

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.widgets.SearchInputWidget: Do not pass `type: 'search'` t...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342718 )

Change subject: mw.widgets.SearchInputWidget: Do not pass `type: 'search'` to 
TextInputWidget
..


mw.widgets.SearchInputWidget: Do not pass `type: 'search'` to TextInputWidget

Causes deprecation warnings.

Most of this code is copy-pasted from OO.ui.SearchInputWidget.

Bug: T148471
Change-Id: I81d52ba938a8b90c5d2c173f1f2682d9e3300e43
---
M includes/widget/SearchInputWidget.php
M resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
2 files changed, 70 insertions(+), 2 deletions(-)

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



diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
index 0d71629..49510da 100644
--- a/includes/widget/SearchInputWidget.php
+++ b/includes/widget/SearchInputWidget.php
@@ -31,7 +31,6 @@
public function __construct( array $config = [] ) {
$config = array_merge( [
'maxLength' => null,
-   'type' => 'search',
'icon' => 'search',
], $config );
 
@@ -56,6 +55,10 @@
$this->addClasses( [ 'mw-widget-searchInputWidget' ] );
}
 
+   protected function getInputElement( $config ) {
+   return ( new \OOUI\Tag( 'input' ) )->setAttributes( [ 'type' => 
'search' ] );
+   }
+
protected function getJavaScriptClassName() {
return 'mw.widgets.SearchInputWidget';
}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 0a73bef..7880b55 100755
--- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@ -30,7 +30,6 @@
var $form = config.$input ? config.$input.closest( 'form' ) : 
$();
 
config = $.extend( {
-   type: 'search',
icon: 'search',
maxLength: undefined,
performSearchOnClick: true,
@@ -67,6 +66,12 @@
)
} );
}.bind( this ) );
+
+   this.$element.addClass( 'oo-ui-textInputWidget-type-search' );
+   this.updateSearchIndicator();
+   this.connect( this, {
+   disable: 'onDisable'
+   } );
};
 
/* Setup */
@@ -76,6 +81,66 @@
/* Methods */
 
/**
+* @inheritdoc
+* @protected
+*/
+   mw.widgets.SearchInputWidget.prototype.getInputElement = function () {
+   return $( '' ).attr( 'type', 'search' );
+   };
+
+   /**
+* @inheritdoc
+*/
+   mw.widgets.SearchInputWidget.prototype.onIndicatorMouseDown = function 
( e ) {
+   if ( e.which === OO.ui.MouseButtons.LEFT ) {
+   // Clear the text field
+   this.setValue( '' );
+   this.$input[ 0 ].focus();
+   return false;
+   }
+   };
+
+   /**
+* Update the 'clear' indicator displayed on type: 'search' text
+* fields, hiding it when the field is already empty or when it's not
+* editable.
+*/
+   mw.widgets.SearchInputWidget.prototype.updateSearchIndicator = function 
() {
+   if ( this.getValue() === '' || this.isDisabled() || 
this.isReadOnly() ) {
+   this.setIndicator( null );
+   } else {
+   this.setIndicator( 'clear' );
+   }
+   };
+
+   /**
+* @inheritdoc
+*/
+   mw.widgets.SearchInputWidget.prototype.onChange = function () {
+   mw.widgets.SearchInputWidget.parent.prototype.onChange.call( 
this );
+   this.updateSearchIndicator();
+   };
+
+   /**
+* Handle disable events.
+*
+* @param {boolean} disabled Element is disabled
+* @private
+*/
+   mw.widgets.SearchInputWidget.prototype.onDisable = function () {
+   this.updateSearchIndicator();
+   };
+
+   /**
+* @inheritdoc
+*/
+   mw.widgets.SearchInputWidget.prototype.setReadOnly = function ( state ) 
{
+   mw.widgets.SearchInputWidget.parent.prototype.setReadOnly.call( 
this, state );
+   this.updateSearchIndicator();
+   return this;
+   };
+
+   /**
 * @inheritdoc mw.widgets.TitleWidget
 */
mw.widgets.SearchInputWidget.prototype.getSuggestionsPromise = function 
() {

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable WikimediaEvents extension on closed wikis

2017-03-14 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342148 )

Change subject: Disable WikimediaEvents extension on closed wikis
..


Disable WikimediaEvents extension on closed wikis

Deployment:
- InitialiseSettings.php must sync before CommonSettings.php!

Bug: T158721
Change-Id: Ib9e99cb6490d3fa7bb85a1485c17ac132f64102d
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7b4eea0..0e10cf2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2933,9 +2933,12 @@
wfLoadExtension( 'Campaigns' );
}
 
-   wfLoadExtension( 'WikimediaEvents' );
-   $wgWMEStatsdBaseUri = '/beacon/statsv';
-   $wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
+   // Depends on EventLogging
+   if ( $wmgUseWikimediaEvents ) {
+   wfLoadExtension( 'WikimediaEvents' );
+   $wgWMEStatsdBaseUri = '/beacon/statsv';
+   $wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
+   }
 
// Depends on EventLogging
if ( $wmgUseNavigationTiming ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 72163c4..75740ff 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16897,6 +16897,11 @@
'default' => true,
 ],
 
+'wmgUseWikimediaEvents' => [
+   'default' => true,
+   'closed' => false, // T158721
+],
+
 'wmgUseNavigationTiming' => [
'default' => true,
'wikitech' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9e99cb6490d3fa7bb85a1485c17ac132f64102d
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] PopupWidget#setAlignment: Remove backwards...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332362 )

Change subject: [BREAKING CHANGE] PopupWidget#setAlignment: Remove 
backwards-compatibility
..


[BREAKING CHANGE] PopupWidget#setAlignment: Remove backwards-compatibility

These were deprecated in v0.11.0 as part of our RTL support work.

Change-Id: Ie619ac8aec61af96b2d4c98124d98397ab4aa723
---
M src/widgets/PopupWidget.js
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 80484db..ae993ac 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -514,12 +514,6 @@
  *  `backwards` or `forwards`.
  */
 OO.ui.PopupWidget.prototype.setAlignment = function ( align ) {
-   // Transform values deprecated since v0.11.0
-   if ( align === 'left' || align === 'right' ) {
-   OO.ui.warnDeprecation( 'PopupWidget#setAlignment parameter 
value `' + align + '` is deprecated. Use `force-right` or `force-left` 
instead.' );
-   align = { left: 'force-right', right: 'force-left' }[ align ];
-   }
-
// Validate alignment
if ( [ 'force-left', 'force-right', 'backwards', 'forwards', 'center' 
].indexOf( align ) > -1 ) {
this.align = align;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie619ac8aec61af96b2d4c98124d98397ab4aa723
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: [WIP] Update logstash to 5.2.2

2017-03-14 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342772 )

Change subject: [WIP] Update logstash to 5.2.2
..

[WIP] Update logstash to 5.2.2

Mostly untested but it installs, starts, and doesn't complain a whole
lot. Plenty of testing still to go.

Changes:
* This new version of logstash gets stuck in a boot loop OOM'ing with
  the previously set 64m ram, increase to 128m. Additionally moved
  setting from defaults file to jvm.options, which is the new standard
  for elastic.co packages.
* update jdk from 7 to 8 to match logstash new requirements
* upstream packaging no longer includes both sets of startup scripts, so
  removes the kludge that previously deleted the upstart scripts.
* Adds new logstash::plugin define, as plugins are now handled with a
  script rather than all bundled together into a single contrib package.
* Remove /etc/defaults/logstash, this is no longer used in 5.x.

Hacks to resolve:
* Need to add logstash-5.2.2.deb to wikimedia experimental repo and
  remove the step that manually downloads 5.2.2.

Bug: T154473
Change-Id: I4f23fd402d13ad33c8b6a72fc96b3b39be6ba364
---
M puppet/hieradata/common.yaml
M puppet/modules/logstash/manifests/init.pp
A puppet/modules/logstash/manifests/plugin.pp
D puppet/modules/logstash/templates/default.erb
A puppet/modules/logstash/templates/jvm.options.erb
M puppet/modules/role/manifests/elk.pp
6 files changed, 169 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/72/342772/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index f92f630..1c72b9a 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -164,8 +164,8 @@
 kibana::deploy_dir: "%{hiera('mwv::vendor_dir')}/kibana"
 kibana::default_route: /dashboard/elasticsearch/default
 
-logstash::heap_memory_mb: 64
-logstash::filter_workers: 1
+logstash::heap_memory_mb: 128
+logstash::pipeline_workers: 1
 logstash::output::elasticsearch::host: 127.0.0.1
 logstash::output::elasticsearch::replication: async
 logstash::output::elasticsearch::manage_indices: true
diff --git a/puppet/modules/logstash/manifests/init.pp 
b/puppet/modules/logstash/manifests/init.pp
index 0e30ec2..fc0b130 100644
--- a/puppet/modules/logstash/manifests/init.pp
+++ b/puppet/modules/logstash/manifests/init.pp
@@ -6,30 +6,40 @@
 #
 # == Parameters:
 # - $heap_memory_mb: amount of memory to allocate to logstash in megabytes.
-# - $filter_workers: number of worker threads to run to process filters
+# - $pipeline_workers: number of worker threads to run to use for
+#  filter/output processing
 #
 # == Sample usage:
 #
 #   class { 'logstash':
 #   heap_memory_mb => 128,
-#   filter_workers => 3,
+#   pipeline_workers => 3,
 #   }
 #
 class logstash(
 $heap_memory_mb,
-$filter_workers,
+$pipeline_workers,
 ) {
-require_package('openjdk-7-jre-headless')
+require_package('openjdk-8-jre-headless')
 
 package { 'logstash':
 ensure  => present,
-require => Package['openjdk-7-jre-headless'],
+require => Package['openjdk-8-jre-headless'],
 }
 
-file { '/etc/default/logstash':
-content => template('logstash/default.erb'),
-require => Package['logstash'],
-notify  => Service['logstash'],
+# Temporary hax: Download logstash until latest versoin
+# is added to wikimedia experimental
+exec { 'fetch_logstash_deb':
+command => 'wget -O /root/logstash-5.2.2.deb 
https://artifacts.elastic.co/downloads/logstash/logstash-5.2.2.deb',
+onlyif  => 'test ! -f /root/logstash-5.2.2.deb',
+notify  => Exec['install_logstash_deb'],
+}
+exec { 'install_logstash_deb':
+command => 'dpkg --force-confold -i /root/logstash-5.2.2.deb',
+onlyif  => 'test "$(sha1sum /root/logstash-5.2.2.deb)" = 
"d8b54402f0f343e850bb18ab97bba9a595101b67 /root/logstash-5.2.2.deb"',
+before  => Package['logstash'],
+require => Package['openjdk-8-jre-headless'],
+refreshonly => true,
 }
 
 file { '/etc/logstash/conf.d':
@@ -41,31 +51,35 @@
 require => Package['logstash'],
 }
 
-service { 'logstash':
-ensure => running,
-provider   => 'debian',
-enable => true,
-hasstatus  => true,
-hasrestart => true,
-require=> Package['logstash'],
+file { '/etc/logstash/logstash.yml':
+ensure  => file,
+content => "pipeline.workers: ${pipeline_workers}",
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+before  => Service['logstash'],
+notify  => Service['logstash'],
 }
 
-# Upstream package provides both sysv and upstart startup scripts. Remove
-# the upstart versions so that Puppet and `service logstash ...` don't
-# fight

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbos...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342763 )

Change subject: [BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbose' 
flag
..


[BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbose' flag

This was deprecated in v0.18.4.

Change-Id: Ie48bfde92f1d02e08dc8eb75e17821d1479c70a0
---
M demos/pages/dialogs.js
M src/dialogs/MessageDialog.js
M src/themes/apex/windows.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/windows.less
6 files changed, 10 insertions(+), 32 deletions(-)

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



diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index 979c28a..ad1cc53 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -127,12 +127,11 @@
}
},
{
-   name: 'Message dialog (verbose)',
+   name: 'Message dialog (lengthy)',
dialogClass: OO.ui.MessageDialog,
data: {
title: 'Continue?',
-   message: 'Lorem ipsum dolor sit 
amet, consectetur adipiscing elit. Pellentesque quis laoreet elit. Nam eu velit 
ullamcorper, volutpat elit sed, viverra massa. Aenean congue aliquam lorem, et 
laoreet risus condimentum vel. Praesent nec imperdiet mauris. Nunc eros magna, 
iaculis sit amet ante id, dapibus tristique lorem. Praesent in feugiat lorem, 
sit amet porttitor eros. Donec sapien turpis, pretium eget ligula id, 
scelerisque tincidunt diam. Pellentesque a venenatis tortor, at luctus nisl. 
Quisque vel urna a enim mattis rutrum. Morbi eget consequat nisl. Nam tristique 
molestie diam ac consequat. Nam varius adipiscing mattis. Praesent sodales 
volutpat nulla lobortis iaculis. Quisque vel odio eget diam posuere imperdiet. 
Fusce et iaculis odio. Donec in nibh ut dui accumsan vehicula quis et massa.',
-   verbose: true
+   message: 'Lorem ipsum dolor sit 
amet, consectetur adipiscing elit. Pellentesque quis laoreet elit. Nam eu velit 
ullamcorper, volutpat elit sed, viverra massa. Aenean congue aliquam lorem, et 
laoreet risus condimentum vel. Praesent nec imperdiet mauris. Nunc eros magna, 
iaculis sit amet ante id, dapibus tristique lorem. Praesent in feugiat lorem, 
sit amet porttitor eros. Donec sapien turpis, pretium eget ligula id, 
scelerisque tincidunt diam. Pellentesque a venenatis tortor, at luctus nisl. 
Quisque vel urna a enim mattis rutrum. Morbi eget consequat nisl. Nam tristique 
molestie diam ac consequat. Nam varius adipiscing mattis. Praesent sodales 
volutpat nulla lobortis iaculis. Quisque vel odio eget diam posuere imperdiet. 
Fusce et iaculis odio. Donec in nibh ut dui accumsan vehicula quis et massa.'
}
},
{
diff --git a/src/dialogs/MessageDialog.js b/src/dialogs/MessageDialog.js
index 110d10b..19078a8 100644
--- a/src/dialogs/MessageDialog.js
+++ b/src/dialogs/MessageDialog.js
@@ -69,12 +69,6 @@
 OO.ui.MessageDialog.static.size = 'small';
 
 /**
- * @static
- * @deprecated since v0.18.4 as default; TODO: Remove
- */
-OO.ui.MessageDialog.static.verbose = true;
-
-/**
  * Dialog title.
  *
  * The title of a confirmation dialog describes what a progressive action will 
do. The
@@ -190,11 +184,6 @@
);
this.message.setLabel(
data.message !== undefined ? data.message : 
this.constructor.static.message
-   );
-   // @deprecated since v0.18.4 as default; TODO: Remove 
and make default instead.
-   this.message.$element.toggleClass(
-   'oo-ui-messageDialog-message-verbose',
-   data.verbose !== undefined ? data.verbose : 
this.constructor.static.verbose
);
}, this );
 };
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 80778c7..533bbab 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -35,15 +35,10 @@
}
 
&-message {
-   font-size: 0.9em;
-   line-height: 1.25em;
+   font-size: 1.1em;
+   line-height: 1.5em;
color: #666;
-
-   &-verbose {
-   font-size: 1.1em;
-   line-height: 1.5em;
-   text-align: left;
-   }
+   text-align: left;
}

[MediaWiki-commits] [Gerrit] operations/puppet[production]: RT: convert to role/profile-model

2017-03-14 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342771 )

Change subject: RT: convert to role/profile-model
..

RT: convert to role/profile-model

Change-Id: Id8c2d00fadaf06be84b8f5253ea2421b982767f4
---
M manifests/site.pp
R modules/profile/manifests/requesttracker/server.pp
A modules/role/manifests/requesttracker_server.pp
3 files changed, 12 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/342771/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 54a1059..0062777 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2737,12 +2737,7 @@
 
 # replaced magnesium (RT) (T119112 T123713)
 node 'ununpentium.wikimedia.org' {
-role(requesttracker::server)
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-
+role(requesttracker_server)
 }
 
 # Ganglia Web UI
diff --git a/modules/role/manifests/requesttracker/server.pp 
b/modules/profile/manifests/requesttracker/server.pp
similarity index 81%
rename from modules/role/manifests/requesttracker/server.pp
rename to modules/profile/manifests/requesttracker/server.pp
index 427bded..849d5d6 100644
--- a/modules/role/manifests/requesttracker/server.pp
+++ b/modules/profile/manifests/requesttracker/server.pp
@@ -1,6 +1,7 @@
-#  Production RT
-class role::requesttracker::server {
-system::role { 'requesttracker::server': description => 'RT server' }
+# server running "Request Tracker"
+# https://bestpractical.com/request-tracker
+class profile::requesttracker::server {
+system::role { 'role::requesttracker::server': description => 'RT server' }
 
 include passwords::misc::rt
 include ::standard
diff --git a/modules/role/manifests/requesttracker_server.pp 
b/modules/role/manifests/requesttracker_server.pp
new file mode 100644
index 000..1bf3638
--- /dev/null
+++ b/modules/role/manifests/requesttracker_server.pp
@@ -0,0 +1,7 @@
+class role::requesttracker_server {
+
+include ::standard
+include ::profile::requesttracker::server
+interface::add_ip6_mapped { 'main': }
+
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Documentation

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342762 )

Change subject: Documentation
..


Documentation

Fix phpDoc errors

Change-Id: I2142530d4c811b28156f2f331c94a21cf1c1149e
---
M bin/mwcomposer.php
M bin/mwscript.php
M bin/validate-schema.php
M src/AbstractMediaWikiFarmScript.php
M src/MediaWikiFarm.php
M src/MediaWikiFarmComposerAutoloader.php
M src/MediaWikiFarmComposerScript.php
M src/MediaWikiFarmScript.php
M src/Yaml.php
M src/main.php
M www/api.php
M www/img_auth.php
M www/index.php
M www/load.php
M www/opensearch_desc.php
15 files changed, 29 insertions(+), 2 deletions(-)

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



diff --git a/bin/mwcomposer.php b/bin/mwcomposer.php
index 97dbeca..c1372fc 100644
--- a/bin/mwcomposer.php
+++ b/bin/mwcomposer.php
@@ -2,6 +2,7 @@
 /**
  * Wrapper around Composer to create as many autoloaders as MediaWiki 
extensions.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
diff --git a/bin/mwscript.php b/bin/mwscript.php
index 14751bf..1767d71 100644
--- a/bin/mwscript.php
+++ b/bin/mwscript.php
@@ -2,6 +2,7 @@
 /**
  * Entry point for CLI scripts in the context of a MediaWiki farm.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
diff --git a/bin/validate-schema.php b/bin/validate-schema.php
index 758b5a6..b4aa8cc 100644
--- a/bin/validate-schema.php
+++ b/bin/validate-schema.php
@@ -3,6 +3,8 @@
  * Validate the files 'config/farms.[yml|json|php]' against 
'docs/farms-schema.json'.
  *
  * This files is mostly inspired from the README 
https://github.com/justinrainbow/json-schema
+ *
+ * @package MediaWikiFarm
  */
 // @codeCoverageIgnoreStart
 
diff --git a/src/AbstractMediaWikiFarmScript.php 
b/src/AbstractMediaWikiFarmScript.php
index ea407a4..8ef2bf7 100644
--- a/src/AbstractMediaWikiFarmScript.php
+++ b/src/AbstractMediaWikiFarmScript.php
@@ -2,6 +2,7 @@
 /**
  * Script class.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 89e60aa..5339e58 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -2,6 +2,7 @@
 /**
  * Class MediaWikiFarm.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
@@ -186,6 +187,7 @@
 * @mediawikifarm-const
 *
 * @param string|null $key Key of the wanted section or null for the 
whole array.
+* @param string|null $key2 Subkey (specific to each entry) or null for 
the whole entry.
 * @return array MediaWiki configuration, either entire, either a part 
depending on the parameter.
 */
function getConfiguration( $key = null, $key2 = null ) {
@@ -219,6 +221,7 @@
 * @param string $entryPoint Name of the entry point, e.g. 'index.php', 
'load.php'…
 * @param string|null $host Host name (string) or null to use the 
global variables HTTP_HOST or SERVER_NAME.
 * @param array $state Parameters, see object property $state.
+* @param array $environment Environment which determines a given 
configuration.
 * @return string $entryPoint Identical entry point as passed in input.
 */
static function load( $entryPoint = '', $host = null, $state = array(), 
$environment = array() ) {
diff --git a/src/MediaWikiFarmComposerAutoloader.php 
b/src/MediaWikiFarmComposerAutoloader.php
index 41a8752..a6edfda 100644
--- a/src/MediaWikiFarmComposerAutoloader.php
+++ b/src/MediaWikiFarmComposerAutoloader.php
@@ -1,8 +1,9 @@
 getConfiguration( 'composer' 
);
foreach( $extensions as $extension ) {
diff --git a/src/MediaWikiFarmComposerScript.php 
b/src/MediaWikiFarmComposerScript.php
index ae3c9d9..f46e232 100644
--- a/src/MediaWikiFarmComposerScript.php
+++ b/src/MediaWikiFarmComposerScript.php
@@ -2,6 +2,7 @@
 /**
  * Wrapper around Composer to create as many autoloaders as MediaWiki 
extensions.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
@@ -264,6 +265,15 @@

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.16]: Fixing search results percentage width

2017-03-14 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342770 )

Change subject: Fixing search results percentage width
..

Fixing search results percentage width

The width of search results on SpecialSearch
page was set to 60% to accomodate the interwiki
results sidebar. As seen on:
https://phabricator.wikimedia.org/T149806

This modification should be moved to the
interwikiwidget.styles.less file so it doesn't
interfere with results when the intwiki
widget is not active.

Bug: T159806
Change-Id: Ib9bdc501c8b0eccbcc84abe399a38d10c9a5d20f
(cherry picked from commit e952ff32fbf411ea04254737d889d9de6ed93c07)
---
M 
resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
M resources/src/mediawiki.special/mediawiki.special.search.styles.css
2 files changed, 12 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/342770/1

diff --git 
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
 
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
index 04da3db..0b0f912 100644
--- 
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
+++ 
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
@@ -1,16 +1,6 @@
 /* interwiki search results */
 /*==*/
 
-#mw-interwiki-results {
-   width: 30%;
-   display: inline-block;
-   margin-left: 10%;
-}
-
-.searchresults .mw-search-createlink {
-   float: left;
-}
-
 .iw-headline {
font-weight: bold;
font-size: 1rem;
@@ -187,37 +177,20 @@
text-align: right;
 }
 
-/* no results
-span the interwiki results across the bottom of the page.
-*/
+/* desktop only */
 
-.mw-search-nonefound ~ #mw-search-interwiki {
-   width: 100%;
-}
+@media only screen and ( min-width: @deviceWidthTablet ) {
 
-.mw-search-nonefound ~ #mw-search-interwiki .iw-resultset {
-   width: 30%;
-   max-width: 300px;
-   margin-left: 0.5em;
-   margin-right: 0.5em;
-}
-
-/* mobile */
-/* stylelint-disable declaration-no-important */
-@media only screen and ( max-width: 768px ) {
#mw-interwiki-results {
-   width: 100%;
-   margin-left: 0;
+   width: 30%;
+   display: inline-block; /* used to align iw sidebar with the top 
of the main search results*/
+   margin-left: 10%;
}
-   .mw-search-results {
-   max-width: none !important;
-   }
-   .iw-resultset {
-   width: 100% !important;
-   margin-left: 0 !important;
-   margin-right: 0 !important;
-   max-width: none !important;
+   .searchresults .mw-search-createlink,
+   .searchresults .mw-search-nonefound,
+   .searchresults .mw-search-results {
+   float: left;
+   width: 60%;
}
 
 }
-/* stylelint-enable declaration-no-important */
diff --git 
a/resources/src/mediawiki.special/mediawiki.special.search.styles.css 
b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
index 89f5132..72ede97 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
@@ -32,9 +32,9 @@
 
 .mw-search-results {
margin: 0;
-   float: left;
-   max-width: 60%;
+   max-width: 38em;
 }
+
 .mw-search-visualclear {
clear: both;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9bdc501c8b0eccbcc84abe399a38d10c9a5d20f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Jdrewniak 

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[master]: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342768 )

Change subject: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4
..


Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
---
M RelatedSites.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5fbac5a..a113977 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -129,7 +129,7 @@
 * @return bool
 */
public static function onSidebarBeforeOutput( $skin, &$bar ) {
-   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
+   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
) ?: [];
 
$relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.15]: DMOZ is closing today, don't display links to it

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342759 )

Change subject: DMOZ is closing today, don't display links to it
..


DMOZ is closing today, don't display links to it

Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
---
M RelatedSites.class.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5b0b101..5fbac5a 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -80,6 +80,11 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // HACK: DMOZ is dead, don't display links to it
+   if ( $title->getInterwiki() === 'dmoz' ) {
+   continue;
+   }
+
// Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
$linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title->getInterwiki() );
$linkText = $linkTextMsg->isDisabled() ?
@@ -126,11 +131,11 @@
public static function onSidebarBeforeOutput( $skin, &$bar ) {
$relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
 
-   if ( !$relatedSites ) {
+   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
+
+   if ( !$relatedSitesUrls ) {
return true;
}
-
-   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 
// build relatedsites 's
$relatedSites = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.16]: DMOZ is closing today, don't display links to it

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342760 )

Change subject: DMOZ is closing today, don't display links to it
..


DMOZ is closing today, don't display links to it

Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
---
M RelatedSites.class.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5b0b101..5fbac5a 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -80,6 +80,11 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // HACK: DMOZ is dead, don't display links to it
+   if ( $title->getInterwiki() === 'dmoz' ) {
+   continue;
+   }
+
// Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
$linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title->getInterwiki() );
$linkText = $linkTextMsg->isDisabled() ?
@@ -126,11 +131,11 @@
public static function onSidebarBeforeOutput( $skin, &$bar ) {
$relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
 
-   if ( !$relatedSites ) {
+   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
+
+   if ( !$relatedSitesUrls ) {
return true;
}
-
-   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 
// build relatedsites 's
$relatedSites = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add --tidy option to maintenance/parse.php

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342409 )

Change subject: Add --tidy option to maintenance/parse.php
..


Add --tidy option to maintenance/parse.php

Change-Id: I6ec08237bd15ee2d824164a0493b7fff9ef312db
---
M maintenance/parse.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/maintenance/parse.php b/maintenance/parse.php
index 17a8d2e..6279a34 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -68,6 +68,7 @@
false,
true
);
+   $this->addOption( 'tidy', 'Tidy the output' );
$this->addArg( 'file', 'File containing wikitext (Default: 
stdin)', false );
}
 
@@ -127,10 +128,14 @@
 * @return ParserOutput
 */
protected function parse( $wikitext ) {
+   $options = new ParserOptions;
+   if ( $this->getOption( 'tidy' ) ) {
+   $options->setTidy( true );
+   }
return $this->parser->parse(
$wikitext,
$this->getTitle(),
-   new ParserOptions()
+   $options
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ec08237bd15ee2d824164a0493b7fff9ef312db
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Added testing for error counts, and disabled it

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342556 )

Change subject: Added testing for error counts, and disabled it
..


Added testing for error counts, and disabled it

Added tests for error counts, fixed a couple of resulting issues.
Reconsidered the utility of this approach, and hid the feature behind a
hard-coded option.

Change-Id: Ia9d36da83f9d3bf4c78a9efcf160f171e38fa3b3
---
M src/Tokenizer/Tokenizer.php
M src/TreeBuilder/InTable.php
M src/TreeBuilder/TreeBuilder.php
M tests/phpunit/TokenizerTest.php
M tests/phpunit/TreeBuilderTest.php
5 files changed, 48 insertions(+), 14 deletions(-)

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



diff --git a/src/Tokenizer/Tokenizer.php b/src/Tokenizer/Tokenizer.php
index 78b2383..0d84b15 100644
--- a/src/Tokenizer/Tokenizer.php
+++ b/src/Tokenizer/Tokenizer.php
@@ -675,9 +675,6 @@
 
if ( isset( $m[self::MD_DT_PUBLIC_WS] ) && 
$m[self::MD_DT_PUBLIC_WS][1] >= 0 ) {
// PUBLIC keyword found
-   if ( !$igerr && !$eof && !strlen( 
$m[self::MD_DT_PUBLIC_WS][0] ) ) {
-   $this->error( 'missing whitespace', 
$m[self::MD_DT_PUBLIC_WS][1] );
-   }
$public = $this->interpretDoctypeQuoted( $m,
self::MD_DT_PUBLIC_DQ, self::MD_DT_PUBLIC_SQ, 
$quirks );
if ( $public === null ) {
@@ -685,6 +682,8 @@
if ( !$eof && !$igerr ) {
$this->error( 'missing public 
identifier', $m[self::MD_DT_PUBLIC_WS][1] );
}
+   } elseif ( !$igerr && !$eof && !strlen( 
$m[self::MD_DT_PUBLIC_WS][0] ) ) {
+   $this->error( 'missing whitespace', 
$m[self::MD_DT_PUBLIC_WS][1] );
}
 
// Check for a system ID after the public ID
@@ -699,14 +698,13 @@
}
} elseif ( isset( $m[self::MD_DT_SYSTEM_WS] ) && 
$m[self::MD_DT_SYSTEM_WS][1] >= 0 ) {
// SYSTEM keyword found
-   if ( !$igerr && !strlen( $m[self::MD_DT_SYSTEM_WS][0] ) 
) {
-   $this->error( 'missing whitespace', 
$m[self::MD_DT_SYSTEM_WS][1] );
-   }
$system = $this->interpretDoctypeQuoted( $m,
self::MD_DT_SYSTEM_DQ, self::MD_DT_SYSTEM_SQ, 
$quirks );
if ( $system === null ) {
$quirks = true;
$this->error( 'missing system identifier', 
$m[self::MD_DT_SYSTEM_WS][1] );
+   } elseif ( !$igerr && !strlen( 
$m[self::MD_DT_SYSTEM_WS][0] ) ) {
+   $this->error( 'missing whitespace', 
$m[self::MD_DT_SYSTEM_WS][1] );
}
 
}
diff --git a/src/TreeBuilder/InTable.php b/src/TreeBuilder/InTable.php
index 4b03fb0..5827c7f 100644
--- a/src/TreeBuilder/InTable.php
+++ b/src/TreeBuilder/InTable.php
@@ -168,6 +168,7 @@
break;
 
default:
+   $builder->error( 'unexpected end tag in table, 
fostering', $sourceStart );
$builder->fosterParenting = true;
$dispatcher->inBody->endTag( $name, $sourceStart, 
$sourceLength );
$builder->fosterParenting = false;
diff --git a/src/TreeBuilder/TreeBuilder.php b/src/TreeBuilder/TreeBuilder.php
index 3523773..fe2a212 100644
--- a/src/TreeBuilder/TreeBuilder.php
+++ b/src/TreeBuilder/TreeBuilder.php
@@ -252,13 +252,22 @@
 * @param array $allowed An array with the HTML element names in the key
 */
public function checkUnclosed( $allowed, $pos ) {
+   if ( $this->ignoreErrors ) {
+   return;
+   }
+
$stack = $this->stack;
+   $unclosedErrors = [];
for ( $i = $stack->length() - 1; $i >= 0; $i-- ) {
$unclosedName = $stack->item( $i )->htmlName;
if ( !isset( $allowed[$unclosedName] ) ) {
-   $this->error( "closing unclosed 
<$unclosedName>", $pos );
+   $unclosedErrors[$unclosedName] = true;
}
}
+   if ( $unclosedErrors ) {
+   $names = implode( ', ', array_keys( $unclosedErrors ) );
+   $this->error( "closing unclosed $names", $pos );
+   }
}
 
/**
diff --git a/tests/phpunit/TokenizerTest.php b/tests/phpunit/TokenizerTest.php
index 5322471..db9cdb9 100644
--- a/tests/phpunit/TokenizerTest.php
+++

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Ensure theme color in disabled TextInputWid...

2017-03-14 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342769 )

Change subject: MediaWiki theme: Ensure theme color in disabled TextInputWidget 
on Safari
..

MediaWiki theme: Ensure theme color in disabled TextInputWidget on Safari

Ensuring sufficient color contrast of disabled TextInputWidget on Safari
by applying vendor-specific CSS property.

Bug: T160478
Change-Id: I1fea55df53933fc57141918691f84def2719ad96
---
M src/themes/mediawiki/widgets.less
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/69/342769/1

diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 716616c..ef9e4f3 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -861,6 +861,8 @@
color: @color-disabled;
text-shadow: @text-shadow-disabled;
border-color: @border-color-disabled;
+   // Support: Safari
+   -webkit-text-fill-color: @color-disabled;
}
.oo-ui-iconElement-icon,
.oo-ui-indicatorElement-indicator {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fixing search results percentage width

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340111 )

Change subject: Fixing search results percentage width
..


Fixing search results percentage width

The width of search results on SpecialSearch
page was set to 60% to accomodate the interwiki
results sidebar. As seen on:
https://phabricator.wikimedia.org/T149806

This modification should be moved to the
interwikiwidget.styles.less file so it doesn't
interfere with results when the intwiki
widget is not active.

Bug: T159806
Change-Id: Ib9bdc501c8b0eccbcc84abe399a38d10c9a5d20f
---
M 
resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
M resources/src/mediawiki.special/mediawiki.special.search.styles.css
2 files changed, 12 insertions(+), 39 deletions(-)

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



diff --git 
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
 
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
index 04da3db..0b0f912 100644
--- 
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
+++ 
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
@@ -1,16 +1,6 @@
 /* interwiki search results */
 /*==*/
 
-#mw-interwiki-results {
-   width: 30%;
-   display: inline-block;
-   margin-left: 10%;
-}
-
-.searchresults .mw-search-createlink {
-   float: left;
-}
-
 .iw-headline {
font-weight: bold;
font-size: 1rem;
@@ -187,37 +177,20 @@
text-align: right;
 }
 
-/* no results
-span the interwiki results across the bottom of the page.
-*/
+/* desktop only */
 
-.mw-search-nonefound ~ #mw-search-interwiki {
-   width: 100%;
-}
+@media only screen and ( min-width: @deviceWidthTablet ) {
 
-.mw-search-nonefound ~ #mw-search-interwiki .iw-resultset {
-   width: 30%;
-   max-width: 300px;
-   margin-left: 0.5em;
-   margin-right: 0.5em;
-}
-
-/* mobile */
-/* stylelint-disable declaration-no-important */
-@media only screen and ( max-width: 768px ) {
#mw-interwiki-results {
-   width: 100%;
-   margin-left: 0;
+   width: 30%;
+   display: inline-block; /* used to align iw sidebar with the top 
of the main search results*/
+   margin-left: 10%;
}
-   .mw-search-results {
-   max-width: none !important;
-   }
-   .iw-resultset {
-   width: 100% !important;
-   margin-left: 0 !important;
-   margin-right: 0 !important;
-   max-width: none !important;
+   .searchresults .mw-search-createlink,
+   .searchresults .mw-search-nonefound,
+   .searchresults .mw-search-results {
+   float: left;
+   width: 60%;
}
 
 }
-/* stylelint-enable declaration-no-important */
diff --git 
a/resources/src/mediawiki.special/mediawiki.special.search.styles.css 
b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
index 89f5132..72ede97 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
@@ -32,9 +32,9 @@
 
 .mw-search-results {
margin: 0;
-   float: left;
-   max-width: 60%;
+   max-width: 38em;
 }
+
 .mw-search-visualclear {
clear: both;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9bdc501c8b0eccbcc84abe399a38d10c9a5d20f
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jdrewniak 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[master]: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

2017-03-14 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342768 )

Change subject: Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4
..

Unbreak after my If1df8ac607186eaca0d63399fe933e5306e8f1e4

Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
---
M RelatedSites.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedSites 
refs/changes/68/342768/1

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5fbac5a..a113977 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -129,7 +129,7 @@
 * @return bool
 */
public static function onSidebarBeforeOutput( $skin, &$bar ) {
-   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
+   $relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
) ?: [];
 
$relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41f558211b7c37958e7b878c8de9a78a1ea56d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix issues with ORES models:

2017-03-14 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342767 )

Change subject: Fix issues with ORES models:
..

Fix issues with ORES models:

* Use the right $wgOresWikiId.  Currently this means 'enwiki'
  really uses 'enwiki', everything else uses 'testwiki'.
* Temporarily turn off 'goodfaith' everywhere except 'enwiki'
  until T160467 is deployed.
* Make an 'enwiki' wgOresModels, like 'wikipedia' except that
  'goodfaith' is true.
* Use alphabetical order for consistency.

Change-Id: I18ea0bfe528610508310e2fb745800a907f6536d
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/67/342767/1

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 896f131..effa2c9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -297,7 +297,6 @@
 
 if ( $wmgUseORES ) {
wfLoadExtension( 'ORES' );
-   $wgOresWikiId = 'testwiki';
$wgOresBaseUrl = 'https://ores-beta.wmflabs.org/';
 }
 
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c900797..0a59c3e 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -431,13 +431,22 @@
'wgOresModels' => [
'default' => [
'damaging' => true,
+   'goodfaith' => false,
'reverted' => true,
+   'wp10' => false,
+   ],
+   // This is separate because
+   // it uses the real wgOresWikiId
+   // below.
+   'enwiki' => [
+   'damaging' => true,
'goodfaith' => true,
+   'reverted' => false,
'wp10' => false,
],
'wikipedia' => [
'damaging' => true,
-   'goodfaith' => true,
+   'goodfaith' => false,
'reverted' => false,
'wp10' => false,
], // T127661

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18ea0bfe528610508310e2fb745800a907f6536d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove unused message keys from MobileFrontEnd.

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338543 )

Change subject: Remove unused message keys from MobileFrontEnd.
..


Remove unused message keys from MobileFrontEnd.

Jdlrobson ran the silver searcher script,
which identified keys that are not referred to
in either resources or includes folders. They are
removed in this patch.

Bug: T157739
Change-Id: I249e57f12b30cb74061cf9dc2c5b7dee96e2dd80
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 0 insertions(+), 124 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 01635fe..0fe73e8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -41,10 +41,6 @@
"beta-feature-minerva": "Enable mobile skin ({{int:skinname-minerva}}) 
on desktop",
"beta-feature-minerva-description": "Make the skin used on mobile 
devices a selectable desktop skin under the \"{{int:prefs-rendering}}\" 
preferences tab.",
"mobile-frontend-account-create-captcha-placeholder": "Enter 
confirmation code",
-   "mobile-frontend-account-create-email-placeholder": "Email address 
(optional)",
-   "mobile-frontend-account-create-submit": "Sign up",
-   "mobile-frontend-app-title": "Mobile App",
-   "mobile-frontend-back-to-top-of-section": "Jump back a section",
"mobile-frontend-categories-heading": "Categories",
"mobile-frontend-categories-subheading": "The page belongs to the 
following categories:",
"mobile-frontend-categories-nocat": "This page doesn't belong to any 
category, yet.",
@@ -57,16 +53,13 @@
"mobile-frontend-categories-add-wait": "Saving categories, please 
wait.",
"mobile-frontend-categories-normal": "Content based",
"mobile-frontend-categories-hidden": "Organizational",
-   "mobile-frontend-changeslist-ip": "Anonymous user",
"mobile-frontend-changeslist-nocomment": "no edit summary",
"mobile-frontend-cite-error-title": "Error loading citations",
"mobile-frontend-cite-error": "A problem occurred while attempting to 
load citations due to a bad revision identifier.",
"mobile-frontend-cite-none-available": "There are no citations 
available for this page.",
"mobile-frontend-clear-search": "Clear",
-   "mobile-frontend-contribution-summary": "All edits made by 
{{GENDER:$1|[[User:$1|$1]]}}",
"mobile-frontend-cookies-required": "Cookies are required to switch 
view modes. Please enable them and try again.",
"mobile-frontend-copyright": "Content is available under $1 unless 
otherwise noted.",
-   "mobile-frontend-current-language": "{{#language:{{CONTENTLANG",
"mobile-frontend-desc": "Mobile Frontend",
"mobile-frontend-diffview-404-desc": "The ID for the revision you 
requested does not exist.",
"mobile-frontend-diffview-404-title": "Bad revision",
@@ -76,19 +69,13 @@
"mobile-frontend-diffview-bytesremoved": "$1 {{PLURAL:$1|byte|bytes}} 
removed",
"mobile-frontend-diffview-comma": "$1, $2",
"mobile-frontend-diffview-editcount": "$1 
{{PLURAL:$1|edit|edits}}",
-   "mobile-frontend-diffview-explained": "The following lines were added 
(+) and removed (-):",
"mobile-frontend-diffview-title": "Changes",
-   "mobile-frontend-disable-images": "Disable images on mobile site",
-   "mobile-frontend-dismiss-notification": "dismiss this notification",
"mobile-frontend-donate-image-anon": "Please log in to view the uploads 
page.",
-   "mobile-frontend-donate-image-heading": "Your recent contributions",
"mobile-frontend-donate-image-login-action": "Media on 
{{SITENAME}} is donated by people like you.Log in to share your 
media.",
"mobile-frontend-donate-image-nouploads": "No uploads.",
-   "mobile-frontend-donate-image-signup-action": "Sign up to share your 
media with the world.",
"mobile-frontend-donate-image-title": "Uploads",
"mobile-frontend-donate-image-title-username": "Uploads by $1",
"mobile-frontend-donate-image-title-you": "Uploads by you",
-   "mobile-frontend-drawer-cancel": "Cancel",
"mobile-frontend-pointer-dismiss": "Dismiss",
"mobile-frontend-edit-login-action": "Help improve 
{{SITENAME}}.Log in to edit.",
"mobile-frontend-edit-signup-action": "Help improve 
{{SITENAME}}.Sign up to edit.",
@@ -117,7 +104,6 @@
"mobile-frontend-editor-licensing-with-terms": "By saving changes, you 
agree to the $1 and agree to release your contribution under the $2 
{{PLURAL:$3|license|licenses}}.",
"mobile-frontend-editor-terms-link": "[$1 Terms of Use]",
"mobile-frontend-editor-new-page-confirm": "{{GENDER:$1|Are you sure 
you want to create}} a new page on {{SITENAME}}?",
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Remove references to tools-precise-dev

2017-03-14 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342713 )

Change subject: labs: Remove references to tools-precise-dev
..


labs: Remove references to tools-precise-dev

Bug: T160466
Change-Id: I48ae0eeccb8cc3aac3f919c76f9751522606ebf6
---
M modules/toollabs/files/host_aliases
M modules/toollabs/templates/mail-relay.exim4.conf.erb
2 files changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/modules/toollabs/files/host_aliases 
b/modules/toollabs/files/host_aliases
index e7ba5c2..21b6b33 100644
--- a/modules/toollabs/files/host_aliases
+++ b/modules/toollabs/files/host_aliases
@@ -12,7 +12,6 @@
 tools-exec-1410.eqiad.wmflabs tools-exec-1410.tools.eqiad.wmflabs
 tools-exec-cyberbot.eqiad.wmflabs tools-exec-cyberbot.tools.eqiad.wmflabs
 tools-mail.eqiad.wmflabs tools-mail.tools.eqiad.wmflabs
-tools-precise-dev.eqiad.wmflabs tools-precise-dev.tools.eqiad.wmflabs
 tools-services-01.eqiad.wmflabs tools-services-01.tools.eqiad.wmflabs
 tools-submit.eqiad.wmflabs tools-submit.tools.eqiad.wmflabs
 tools-webgrid-generic-1401.eqiad.wmflabs 
tools-webgrid-generic-1401.tools.eqiad.wmflabs
diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb 
b/modules/toollabs/templates/mail-relay.exim4.conf.erb
index ff8693e..2b6d93a 100644
--- a/modules/toollabs/templates/mail-relay.exim4.conf.erb
+++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb
@@ -32,7 +32,6 @@
tools-bastion-01.eqiad.wmflabs : \
tools-checker-02.eqiad.wmflabs : \
tools-mail.eqiad.wmflabs : \
-   tools-precise-dev.eqiad.wmflabs : \
tools-services-01.eqiad.wmflabs : \
tools-submit.eqiad.wmflabs : \
tools-webgrid-generic-1401.eqiad.wmflabs : \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48ae0eeccb8cc3aac3f919c76f9751522606ebf6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prepare feed coordinator for improved event logging.

2017-03-14 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342765 )

Change subject: Prepare feed coordinator for improved event logging.
..

Prepare feed coordinator for improved event logging.

This improves the way that FeedCoordinator communicates back with
FeedFragment. Most importantly, we remove the update() callback, and use
only the insert() and remove() callbacks. This means that we will no
longer need to call notifyDataSetChanged(), which is great because it
messes with the view hierarchy of the RecyclerView, and could interfere
with our usage of onAttachedToWindow() for eventlogging purposes.

(i.e. when we call notifyDataSetChanged(), all the views get detached()
and re-attached(), which would cause a spurious event.)

Bug: T149125
Change-Id: Icc54fea1ed997151d34a2ad98efad0ebd3f4cee2
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
2 files changed, 20 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/65/342765/1

diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
index 2ef5252..7ec53d7 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -21,8 +21,6 @@
 private static final int MAX_HIDDEN_CARDS = 100;
 
 public interface FeedUpdateListener {
-// todo: should we remove update?
-void update(List cards);
 void insert(Card card, int pos);
 void remove(Card card, int pos);
 }
@@ -65,7 +63,7 @@
 }
 pendingClients.clear();
 cards.clear();
-appendProgressCard(cards);
+insertCard(progressCard, 0);
 }
 
 public void more(@NonNull WikiSite wiki) {
@@ -88,20 +86,14 @@
 
 public int dismissCard(@NonNull Card card) {
 int position = cards.indexOf(card);
-cards.remove(card);
 addHiddenCard(card);
-if (updateListener != null) {
-updateListener.remove(card, position);
-}
+removeCard(card, position);
 return position;
 }
 
-public void insertCard(@NonNull Card card, int position) {
-cards.add(position, card);
+public void undoDismissCard(@NonNull Card card, int position) {
 unHideCard(card);
-if (updateListener != null) {
-updateListener.insert(card, position);
-}
+insertCard(card, position);
 }
 
 protected abstract void buildScript(int age);
@@ -134,12 +126,9 @@
 public void success(@NonNull List cardList) {
 for (Card card : cardList) {
 if (!isCardHidden(card)) {
-cards.add(card);
+int progressPos = cards.indexOf(progressCard);
+insertCard(card, progressPos >= 0 ? progressPos : 
cards.size());
 }
-}
-appendProgressCard(cards);
-if (updateListener != null) {
-updateListener.update(cards);
 }
 //noinspection ConstantConditions
 requestNextCard(wiki);
@@ -152,10 +141,18 @@
 }
 }
 
-private void appendProgressCard(List cards) {
-// todo: can we consolidate remove / add operations on list?
-cards.remove(progressCard);
-cards.add(progressCard);
+private void insertCard(@NonNull Card card, int position) {
+cards.add(position, card);
+if (updateListener != null) {
+updateListener.insert(card, position);
+}
+}
+
+private void removeCard(@NonNull Card card, int position) {
+cards.remove(card);
+if (updateListener != null) {
+updateListener.remove(card, position);
+}
 }
 
 private void addHiddenCard(@NonNull Card card) {
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 116a31a..03b8742 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -36,8 +36,6 @@
 import org.wikipedia.util.UriUtil;
 import org.wikipedia.views.ExploreOverflowView;
 
-import java.util.List;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -104,20 +102,12 @@
 public void onRefresh() {
 funnel.refresh(coordinator.getAge());
 coordinator.reset();
+feedAdapter.notifyDataSetChanged();
 coordinator.more(app.getWikiSite());
 }
 });
 
 coordinator.setFeedUpdateListener(new 
FeedCoordinator.FeedUpdateListener() {
-@Override public void update(List cards) {
-if

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Supercharge eventlogging for the feed.

2017-03-14 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342766 )

Change subject: Supercharge eventlogging for the feed.
..

Supercharge eventlogging for the feed.

This updates our FeedFunnel to make use of the new additions to the feed
schema:

- This is now a TimedFunnel, meaning that each event will include how long
  the feed has been in view at the time of the event.
- This introduces a "cardShown" event, which is fired when any feed card
  is attached to the current window (an "impression" of sorts).
- This also introduces a "cardClicked" event, which is fired when the user
  interacts with any of the cards.
- We also introduce "enter" and "exit" events for when the feed itself is
  resumed and paused, respectively.

Bug: T149125
Change-Id: I1c0c23fa469824ff942ac1b13e5c8ce5aefdc055
---
M app/src/main/java/org/wikipedia/analytics/FeedFunnel.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.java
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/java/org/wikipedia/feed/progress/ProgressCardView.java
M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
M app/src/main/java/org/wikipedia/feed/view/FeedCardView.java
M app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
15 files changed, 108 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/66/342766/1

diff --git a/app/src/main/java/org/wikipedia/analytics/FeedFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/FeedFunnel.java
index b3fb63e..cfdfc42 100644
--- a/app/src/main/java/org/wikipedia/analytics/FeedFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/FeedFunnel.java
@@ -5,14 +5,52 @@
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.feed.model.CardType;
 
-public class FeedFunnel extends Funnel {
+import java.util.Arrays;
+import java.util.List;
+
+public class FeedFunnel extends TimedFunnel {
 private static final String SCHEMA_NAME = "MobileWikiAppFeed";
-private static final int REVISION = 15734713;
+private static final int REVISION = 16432467;
+
+private static List EXCLUDED_CARDS = 
Arrays.asList(CardType.SEARCH_BAR, CardType.PROGRESS);
 
 public FeedFunnel(WikipediaApp app) {
 super(app, SCHEMA_NAME, REVISION, Funnel.SAMPLE_LOG_100);
 }
 
+public void enter() {
+resetDuration();
+log(
+"action", "enter"
+);
+}
+
+public void exit() {
+log(
+"action", "exit"
+);
+}
+
+public void cardShown(@NonNull CardType cardType) {
+if (EXCLUDED_CARDS.contains(cardType)) {
+return;
+}
+log(
+"action", "cardShown",
+"cardType", cardType.code()
+);
+}
+
+public void cardClicked(@NonNull CardType cardType) {
+if (EXCLUDED_CARDS.contains(cardType)) {
+return;
+}
+log(
+"action", "cardClicked",
+"cardType", cardType.code()
+);
+}
+
 public void requestMore(int age) {
 log(
 "action", "more",
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 03b8742..d96ab8e 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -137,6 +137,18 @@
 }
 
 @Override
+public void onResume() {
+super.onResume();
+funnel.enter();
+}
+
+@Override
+public void onPause() {
+super.onPause();
+funnel.exit();
+}
+
+@Override
 public void onDestroyView() {
 coordinator.setFeedUpdateListener(null);
 swipeRefreshLayout.setOnRefreshListener(null);
@@ -211,6 +223,13 @@
 
 private class FeedCallback implements FeedAdapter.Callback {
 @Override
+public void onShowCard(@Nullable Card card) {
+if (card != null) {
+funnel.cardShown(card.type());
+}
+}
+
+@Override
 public void onRequestMore() {
 funnel.requestMore(coordinator.getAge());
 coordinator.more(app.getWikiSite());
@@ -222,9 +241,10 @@
 }
 
 @Override
-

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Add unit to `line-height` for Chrome

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342758 )

Change subject: MediaWiki theme: Add unit to `line-height` for Chrome
..


MediaWiki theme: Add unit to `line-height` for Chrome

Adding `em` unit to `line-height` for correct treatment in Chrome
as it renders `14px` instead of `15px` otherwise. Follow-up to
I9a2d3975927

Change-Id: I78614e72cd7dd12b901b3f12b3ec21bb222e0767
---
M src/themes/mediawiki/elements.less
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 92db35d..c67a843 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -187,7 +187,7 @@
}
 
&.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
-   line-height: 1.172; // equals `15px`
+   line-height: 1.172em; // Firefox needs a value, Chrome 
the unit; equals `15px` at base `font-size: 12.8px`
}
 
&.oo-ui-iconElement {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78614e72cd7dd12b901b3f12b3ec21bb222e0767
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Re-enable sistersearch AB test

2017-03-14 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342764 )

Change subject: Re-enable sistersearch AB test
..

Re-enable sistersearch AB test

Enables sistersearch AB test for a eight different language wikis.
Sampling is setup to achievly roughly 2k sessions per bucket over
a week of testing.

This is the same code as the first run of the sistersearch AB test, but
with more wikis enabled.

Change-Id: I9954e71d9ad9e87172b72d11444ee85e9e1ba4e5
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 76 insertions(+), 3 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 494ac8d..577624e 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,13 +113,54 @@
function initialize( session ) {
 
var sessionId = session.get( 'sessionId' ),
-   // No sub-tests currently running
-   validBuckets = [],
+   // List of valid sub-test buckets
+   validBuckets = [
+   'recall_sidebar_results',
+   'no_sidebar'
+   ],
+   // Sampling to use when choosing which users 
should participate in test
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Currently unused, but 
provides a place
// to handle wiki-specific 
sampling
subTests = {
+   arwiki: {
+   // 1 in 25 
users search sessions will be recorded
+   // by event 
logging
+   test: 25,
+   // 1 in 8 (of 
the 1 in 25) will be reserved for
+   // 
dashboarding. The other 7 in 8 are split equally
+   // into buckets.
+   subTest: 8
+   },
+   cawiki: {
+   test: 6,
+   subTest: 34
+   },
+   dewiki: {
+   test: 108,
+   subTest: 2
+   },
+   fawiki: {
+   test: 8,
+   subTest: 25
+   },
+   frwiki: {
+   test: 70,
+   subTest: 3
+   },
+   itwiki: {
+   test: 42,
+   subTest: 5
+   },
+   plwiki: {
+   test: 35,
+   subTest: 6
+   },
+   ruwiki: {
+   test: 71,
+   subTest: 3
+   }
};
 
if ( subTests[ dbName ] ) {
@@ -181,6 +222,8 @@
return;
}
 
+

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbos...

2017-03-14 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342763 )

Change subject: [BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbose' 
flag
..

[BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbose' flag

This was deprecated in v0.18.4.

Change-Id: Ie48bfde92f1d02e08dc8eb75e17821d1479c70a0
---
M demos/pages/dialogs.js
M src/dialogs/MessageDialog.js
M src/themes/apex/windows.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/windows.less
6 files changed, 10 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/63/342763/1

diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index 979c28a..ad1cc53 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -127,12 +127,11 @@
}
},
{
-   name: 'Message dialog (verbose)',
+   name: 'Message dialog (lengthy)',
dialogClass: OO.ui.MessageDialog,
data: {
title: 'Continue?',
-   message: 'Lorem ipsum dolor sit 
amet, consectetur adipiscing elit. Pellentesque quis laoreet elit. Nam eu velit 
ullamcorper, volutpat elit sed, viverra massa. Aenean congue aliquam lorem, et 
laoreet risus condimentum vel. Praesent nec imperdiet mauris. Nunc eros magna, 
iaculis sit amet ante id, dapibus tristique lorem. Praesent in feugiat lorem, 
sit amet porttitor eros. Donec sapien turpis, pretium eget ligula id, 
scelerisque tincidunt diam. Pellentesque a venenatis tortor, at luctus nisl. 
Quisque vel urna a enim mattis rutrum. Morbi eget consequat nisl. Nam tristique 
molestie diam ac consequat. Nam varius adipiscing mattis. Praesent sodales 
volutpat nulla lobortis iaculis. Quisque vel odio eget diam posuere imperdiet. 
Fusce et iaculis odio. Donec in nibh ut dui accumsan vehicula quis et massa.',
-   verbose: true
+   message: 'Lorem ipsum dolor sit 
amet, consectetur adipiscing elit. Pellentesque quis laoreet elit. Nam eu velit 
ullamcorper, volutpat elit sed, viverra massa. Aenean congue aliquam lorem, et 
laoreet risus condimentum vel. Praesent nec imperdiet mauris. Nunc eros magna, 
iaculis sit amet ante id, dapibus tristique lorem. Praesent in feugiat lorem, 
sit amet porttitor eros. Donec sapien turpis, pretium eget ligula id, 
scelerisque tincidunt diam. Pellentesque a venenatis tortor, at luctus nisl. 
Quisque vel urna a enim mattis rutrum. Morbi eget consequat nisl. Nam tristique 
molestie diam ac consequat. Nam varius adipiscing mattis. Praesent sodales 
volutpat nulla lobortis iaculis. Quisque vel odio eget diam posuere imperdiet. 
Fusce et iaculis odio. Donec in nibh ut dui accumsan vehicula quis et massa.'
}
},
{
diff --git a/src/dialogs/MessageDialog.js b/src/dialogs/MessageDialog.js
index 110d10b..19078a8 100644
--- a/src/dialogs/MessageDialog.js
+++ b/src/dialogs/MessageDialog.js
@@ -69,12 +69,6 @@
 OO.ui.MessageDialog.static.size = 'small';
 
 /**
- * @static
- * @deprecated since v0.18.4 as default; TODO: Remove
- */
-OO.ui.MessageDialog.static.verbose = true;
-
-/**
  * Dialog title.
  *
  * The title of a confirmation dialog describes what a progressive action will 
do. The
@@ -190,11 +184,6 @@
);
this.message.setLabel(
data.message !== undefined ? data.message : 
this.constructor.static.message
-   );
-   // @deprecated since v0.18.4 as default; TODO: Remove 
and make default instead.
-   this.message.$element.toggleClass(
-   'oo-ui-messageDialog-message-verbose',
-   data.verbose !== undefined ? data.verbose : 
this.constructor.static.verbose
);
}, this );
 };
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 80778c7..533bbab 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -35,15 +35,10 @@
}
 
&-message {
-   font-size: 0.9em;
-   line-height: 1.25em;
+   font-size: 1.1em;
+   line-height: 1.5em;
color: #666;
-
-   &-verbose {
-   font-size: 1.1em;
-   line-height: 1.5em;
-   text-align: left;
-   }
+   text-align: left;
}

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[master]: DMOZ is closing today, don't display links to it

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342753 )

Change subject: DMOZ is closing today, don't display links to it
..


DMOZ is closing today, don't display links to it

Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
---
M RelatedSites.class.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5b0b101..5fbac5a 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -80,6 +80,11 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // HACK: DMOZ is dead, don't display links to it
+   if ( $title->getInterwiki() === 'dmoz' ) {
+   continue;
+   }
+
// Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
$linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title->getInterwiki() );
$linkText = $linkTextMsg->isDisabled() ?
@@ -126,11 +131,11 @@
public static function onSidebarBeforeOutput( $skin, &$bar ) {
$relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
 
-   if ( !$relatedSites ) {
+   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
+
+   if ( !$relatedSitesUrls ) {
return true;
}
-
-   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 
// build relatedsites 's
$relatedSites = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] icons: Drop '*Undo' icons, deprecated in 0...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326826 )

Change subject: [BREAKING CHANGE] icons: Drop '*Undo' icons, deprecated in 
0.18.3
..


[BREAKING CHANGE] icons: Drop '*Undo' icons, deprecated in 0.18.3

Change-Id: Ic90e3c5ab20da215972cdb7637258701601e840d
---
M src/themes/apex/icons-moderation.json
M src/themes/mediawiki/icons-moderation.json
2 files changed, 0 insertions(+), 24 deletions(-)

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



diff --git a/src/themes/apex/icons-moderation.json 
b/src/themes/apex/icons-moderation.json
index c8385e4..b32ffbb 100644
--- a/src/themes/apex/icons-moderation.json
+++ b/src/themes/apex/icons-moderation.json
@@ -3,10 +3,6 @@
"intro": "@import '../../../../src/styles/common';",
"images": {
"block": { "file": "images/icons/block.svg" },
-   "blockUndo": { "file": {
-   "ltr": "images/icons/unBlock-ltr.svg",
-   "rtl": "images/icons/unBlock-rtl.svg"
-   }, "deprecated": "Renamed since v0.18.3, use 'unBlock' 
instead." },
"unBlock": { "file": {
"ltr": "images/icons/unBlock-ltr.svg",
"rtl": "images/icons/unBlock-rtl.svg"
@@ -15,10 +11,6 @@
"ltr": "images/icons/flag-ltr.svg",
"rtl": "images/icons/flag-rtl.svg"
} },
-   "flagUndo": { "file": {
-   "ltr": "images/icons/unFlag-ltr.svg",
-   "rtl": "images/icons/unFlag-rtl.svg"
-   }, "deprecated": "Renamed since v0.18.3, use 'unFlag' instead." 
},
"unFlag": { "file": {
"ltr": "images/icons/unFlag-ltr.svg",
"rtl": "images/icons/unFlag-rtl.svg"
@@ -39,10 +31,6 @@
"ltr": "images/icons/unTrash-ltr.svg",
"rtl": "images/icons/unTrash-rtl.svg"
} },
-   "trashUndo": { "file": {
-   "ltr": "images/icons/unTrash-ltr.svg",
-   "rtl": "images/icons/unTrash-rtl.svg"
-   }, "deprecated": "Renamed since v0.18.3, use 'unTrash' 
instead." },
"ongoingConversation": {
"file": {
"ltr": 
"images/icons/ongoingConversation-ltr.svg",
diff --git a/src/themes/mediawiki/icons-moderation.json 
b/src/themes/mediawiki/icons-moderation.json
index b4acff1..0a1ccd7 100644
--- a/src/themes/mediawiki/icons-moderation.json
+++ b/src/themes/mediawiki/icons-moderation.json
@@ -23,10 +23,6 @@
},
"images": {
"block": { "file": "images/icons/block.svg", "variants": [ 
"destructive" ] },
-   "blockUndo": { "file": {
-   "ltr": "images/icons/unBlock-ltr.svg",
-   "rtl": "images/icons/unBlock-rtl.svg"
-   }, "deprecated": "Renamed since v0.18.3, use 'unBlock' 
instead." },
"unBlock": { "file": {
"ltr": "images/icons/unBlock-ltr.svg",
"rtl": "images/icons/unBlock-rtl.svg"
@@ -39,10 +35,6 @@
"ltr": "images/icons/unFlag-ltr.svg",
"rtl": "images/icons/unFlag-rtl.svg"
} },
-   "flagUndo": { "file": {
-   "ltr": "images/icons/unFlag-ltr.svg",
-   "rtl": "images/icons/unFlag-rtl.svg"
-   }, "deprecated": "Renamed since v0.18.3, use 'unFlag' instead." 
},
"lock": { "file": {
"ltr": "images/icons/lock-ltr.svg",
"rtl": "images/icons/lock-rtl.svg"
@@ -62,10 +54,6 @@
"ltr": "images/icons/unTrash-ltr.svg",
"rtl": "images/icons/unTrash-rtl.svg"
} },
-   "trashUndo": { "file": {
-   "ltr": "images/icons/unTrash-ltr.svg",
-   "rtl": "images/icons/unTrash-rtl.svg"
-   }, "deprecated": "Renamed since v0.18.3, use 'unTrash' 
instead." },
"ongoingConversation": {
"file": {
"ltr": 
"images/icons/ongoingConversation-ltr.svg",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic90e3c5ab20da215972cdb7637258701601e840d
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Documentation

2017-03-14 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342762 )

Change subject: Documentation
..

Documentation

Fix phpDoc errors

Change-Id: I2142530d4c811b28156f2f331c94a21cf1c1149e
---
M bin/mwcomposer.php
M bin/mwscript.php
M bin/validate-schema.php
M src/AbstractMediaWikiFarmScript.php
M src/MediaWikiFarm.php
M src/MediaWikiFarmComposerAutoloader.php
M src/MediaWikiFarmComposerScript.php
M src/MediaWikiFarmScript.php
M src/Yaml.php
M src/main.php
M www/api.php
M www/img_auth.php
M www/index.php
M www/load.php
M www/opensearch_desc.php
15 files changed, 29 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/62/342762/1

diff --git a/bin/mwcomposer.php b/bin/mwcomposer.php
index 97dbeca..c1372fc 100644
--- a/bin/mwcomposer.php
+++ b/bin/mwcomposer.php
@@ -2,6 +2,7 @@
 /**
  * Wrapper around Composer to create as many autoloaders as MediaWiki 
extensions.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
diff --git a/bin/mwscript.php b/bin/mwscript.php
index 14751bf..1767d71 100644
--- a/bin/mwscript.php
+++ b/bin/mwscript.php
@@ -2,6 +2,7 @@
 /**
  * Entry point for CLI scripts in the context of a MediaWiki farm.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
diff --git a/bin/validate-schema.php b/bin/validate-schema.php
index 758b5a6..b4aa8cc 100644
--- a/bin/validate-schema.php
+++ b/bin/validate-schema.php
@@ -3,6 +3,8 @@
  * Validate the files 'config/farms.[yml|json|php]' against 
'docs/farms-schema.json'.
  *
  * This files is mostly inspired from the README 
https://github.com/justinrainbow/json-schema
+ *
+ * @package MediaWikiFarm
  */
 // @codeCoverageIgnoreStart
 
diff --git a/src/AbstractMediaWikiFarmScript.php 
b/src/AbstractMediaWikiFarmScript.php
index ea407a4..8ef2bf7 100644
--- a/src/AbstractMediaWikiFarmScript.php
+++ b/src/AbstractMediaWikiFarmScript.php
@@ -2,6 +2,7 @@
 /**
  * Script class.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 89e60aa..5339e58 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -2,6 +2,7 @@
 /**
  * Class MediaWikiFarm.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
@@ -186,6 +187,7 @@
 * @mediawikifarm-const
 *
 * @param string|null $key Key of the wanted section or null for the 
whole array.
+* @param string|null $key2 Subkey (specific to each entry) or null for 
the whole entry.
 * @return array MediaWiki configuration, either entire, either a part 
depending on the parameter.
 */
function getConfiguration( $key = null, $key2 = null ) {
@@ -219,6 +221,7 @@
 * @param string $entryPoint Name of the entry point, e.g. 'index.php', 
'load.php'…
 * @param string|null $host Host name (string) or null to use the 
global variables HTTP_HOST or SERVER_NAME.
 * @param array $state Parameters, see object property $state.
+* @param array $environment Environment which determines a given 
configuration.
 * @return string $entryPoint Identical entry point as passed in input.
 */
static function load( $entryPoint = '', $host = null, $state = array(), 
$environment = array() ) {
diff --git a/src/MediaWikiFarmComposerAutoloader.php 
b/src/MediaWikiFarmComposerAutoloader.php
index 41a8752..a6edfda 100644
--- a/src/MediaWikiFarmComposerAutoloader.php
+++ b/src/MediaWikiFarmComposerAutoloader.php
@@ -1,8 +1,9 @@
 getConfiguration( 'composer' 
);
foreach( $extensions as $extension ) {
diff --git a/src/MediaWikiFarmComposerScript.php 
b/src/MediaWikiFarmComposerScript.php
index ae3c9d9..f46e232 100644
--- a/src/MediaWikiFarmComposerScript.php
+++ b/src/MediaWikiFarmComposerScript.php
@@ -2,6 +2,7 @@
 /**
  * Wrapper around Composer to create as many autoloaders as MediaWiki 
extensions.
  *
+ * @package MediaWikiFarm
  * @author Sébastien Beyou ~ Seb35 
  * @license GPL-3.0+ GNU General Public License v3.0 ou version ultérieure
  * @license AGPL-3.0+ GNU Affero General Public License v3.0 ou version 
ultérieure
@@ -264,6

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.16

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342761 )

Change subject: group0 wikis to 1.29.0-wmf.16
..


group0 wikis to 1.29.0-wmf.16

Change-Id: I9e16353389020f22c92aaa2a2411b73455d17ae3
---
M php
M wikiversions.json
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/php b/php
index b2849a0..e51633e 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.15
\ No newline at end of file
+php-1.29.0-wmf.16
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 1a064df..d9d1a9b 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -481,7 +481,7 @@
 "maiwiki": "php-1.29.0-wmf.15",
 "map_bmswiki": "php-1.29.0-wmf.15",
 "mdfwiki": "php-1.29.0-wmf.15",
-"mediawikiwiki": "php-1.29.0-wmf.15",
+"mediawikiwiki": "php-1.29.0-wmf.16",
 "metawiki": "php-1.29.0-wmf.15",
 "mgwiki": "php-1.29.0-wmf.15",
 "mgwikibooks": "php-1.29.0-wmf.15",
@@ -751,9 +751,9 @@
 "tawiktionary": "php-1.29.0-wmf.15",
 "tcywiki": "php-1.29.0-wmf.15",
 "tenwiki": "php-1.29.0-wmf.15",
-"test2wiki": "php-1.29.0-wmf.15",
-"testwiki": "php-1.29.0-wmf.15",
-"testwikidatawiki": "php-1.29.0-wmf.15",
+"test2wiki": "php-1.29.0-wmf.16",
+"testwiki": "php-1.29.0-wmf.16",
+"testwikidatawiki": "php-1.29.0-wmf.16",
 "tetwiki": "php-1.29.0-wmf.15",
 "tewiki": "php-1.29.0-wmf.15",
 "tewikibooks": "php-1.29.0-wmf.15",
@@ -883,7 +883,7 @@
 "zawikiquote": "php-1.29.0-wmf.15",
 "zawiktionary": "php-1.29.0-wmf.15",
 "zeawiki": "php-1.29.0-wmf.15",
-"zerowiki": "php-1.29.0-wmf.15",
+"zerowiki": "php-1.29.0-wmf.16",
 "zh_classicalwiki": "php-1.29.0-wmf.15",
 "zh_min_nanwiki": "php-1.29.0-wmf.15",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.15",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e16353389020f22c92aaa2a2411b73455d17ae3
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.16

2017-03-14 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342761 )

Change subject: group0 wikis to 1.29.0-wmf.16
..

group0 wikis to 1.29.0-wmf.16

Change-Id: I9e16353389020f22c92aaa2a2411b73455d17ae3
---
M php
M wikiversions.json
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/61/342761/1

diff --git a/php b/php
index b2849a0..e51633e 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.15
\ No newline at end of file
+php-1.29.0-wmf.16
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 1a064df..d9d1a9b 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -481,7 +481,7 @@
 "maiwiki": "php-1.29.0-wmf.15",
 "map_bmswiki": "php-1.29.0-wmf.15",
 "mdfwiki": "php-1.29.0-wmf.15",
-"mediawikiwiki": "php-1.29.0-wmf.15",
+"mediawikiwiki": "php-1.29.0-wmf.16",
 "metawiki": "php-1.29.0-wmf.15",
 "mgwiki": "php-1.29.0-wmf.15",
 "mgwikibooks": "php-1.29.0-wmf.15",
@@ -751,9 +751,9 @@
 "tawiktionary": "php-1.29.0-wmf.15",
 "tcywiki": "php-1.29.0-wmf.15",
 "tenwiki": "php-1.29.0-wmf.15",
-"test2wiki": "php-1.29.0-wmf.15",
-"testwiki": "php-1.29.0-wmf.15",
-"testwikidatawiki": "php-1.29.0-wmf.15",
+"test2wiki": "php-1.29.0-wmf.16",
+"testwiki": "php-1.29.0-wmf.16",
+"testwikidatawiki": "php-1.29.0-wmf.16",
 "tetwiki": "php-1.29.0-wmf.15",
 "tewiki": "php-1.29.0-wmf.15",
 "tewikibooks": "php-1.29.0-wmf.15",
@@ -883,7 +883,7 @@
 "zawikiquote": "php-1.29.0-wmf.15",
 "zawiktionary": "php-1.29.0-wmf.15",
 "zeawiki": "php-1.29.0-wmf.15",
-"zerowiki": "php-1.29.0-wmf.15",
+"zerowiki": "php-1.29.0-wmf.16",
 "zh_classicalwiki": "php-1.29.0-wmf.15",
 "zh_min_nanwiki": "php-1.29.0-wmf.15",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.15",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e16353389020f22c92aaa2a2411b73455d17ae3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] icons: Drop 'beta' and 'ribbonPrize', depr...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330306 )

Change subject: [BREAKING CHANGE] icons: Drop 'beta' and 'ribbonPrize', 
deprecated in 0.18.3
..


[BREAKING CHANGE] icons: Drop 'beta' and 'ribbonPrize', deprecated in 0.18.3

Change-Id: I27c2a34fadb0a9f30efc47d3e8058aea6ffbbafd
---
M src/themes/apex/icons-interactions.json
D src/themes/apex/images/icons/beta.svg
D src/themes/apex/images/icons/ribbonPrize.svg
M src/themes/mediawiki/icons-interactions.json
D src/themes/mediawiki/images/icons/beta.svg
D src/themes/mediawiki/images/icons/ribbonPrize.svg
6 files changed, 0 insertions(+), 22 deletions(-)

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



diff --git a/src/themes/apex/icons-interactions.json 
b/src/themes/apex/icons-interactions.json
index 936d0db..5b6ac3c 100644
--- a/src/themes/apex/icons-interactions.json
+++ b/src/themes/apex/icons-interactions.json
@@ -9,7 +9,6 @@
},
"images": {
"add": { "file": "images/icons/add.svg" },
-   "beta": { "file": "images/icons/beta.svg", "deprecated": 
"Deprecated since v0.18.3, don't use." },
"bookmark": { "file": {
"ltr": "images/icons/bookmark-ltr.svg",
"rtl": "images/icons/bookmark-rtl.svg"
@@ -49,7 +48,6 @@
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
-   "ribbonPrize": { "file": "images/icons/ribbonPrize.svg", 
"deprecated": "Deprecated since v0.18.3, don't use." },
"subtract": { "file": "images/icons/subtract.svg" },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
diff --git a/src/themes/apex/images/icons/beta.svg 
b/src/themes/apex/images/icons/beta.svg
deleted file mode 100644
index 51a5c78..000
--- a/src/themes/apex/images/icons/beta.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
-
diff --git a/src/themes/apex/images/icons/ribbonPrize.svg 
b/src/themes/apex/images/icons/ribbonPrize.svg
deleted file mode 100644
index 45df8b7..000
--- a/src/themes/apex/images/icons/ribbonPrize.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
-
-
diff --git a/src/themes/mediawiki/icons-interactions.json 
b/src/themes/mediawiki/icons-interactions.json
index 1a9288c..f693e3f 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -23,7 +23,6 @@
},
"images": {
"add": { "file": "images/icons/add.svg", "variants": [ 
"constructive", "progressive" ] },
-   "beta": { "file": "images/icons/beta.svg", "deprecated": 
"Deprecated since v0.18.3, don't use." },
"bookmark": { "file": {
"ltr": "images/icons/bookmark-ltr.svg",
"rtl": "images/icons/bookmark-rtl.svg"
@@ -66,7 +65,6 @@
"ltr": "images/icons/printer-ltr.svg",
"rtl": "images/icons/printer-rtl.svg"
} },
-   "ribbonPrize": { "file": "images/icons/ribbonPrize.svg", 
"deprecated": "Deprecated since v0.18.3, don't use." },
"subtract": { "file": "images/icons/subtract.svg" },
"sun": { "file": {
"ltr": "images/icons/sun-ltr.svg",
diff --git a/src/themes/mediawiki/images/icons/beta.svg 
b/src/themes/mediawiki/images/icons/beta.svg
deleted file mode 100644
index 51a5c78..000
--- a/src/themes/mediawiki/images/icons/beta.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
-
diff --git a/src/themes/mediawiki/images/icons/ribbonPrize.svg 
b/src/themes/mediawiki/images/icons/ribbonPrize.svg
deleted file mode 100644
index 45df8b7..000
--- a/src/themes/mediawiki/images/icons/ribbonPrize.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
-
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27c2a34fadb0a9f30efc47d3e8058aea6ffbbafd
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.16]: DMOZ is closing today, don't display links to it

2017-03-14 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342760 )

Change subject: DMOZ is closing today, don't display links to it
..

DMOZ is closing today, don't display links to it

Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
---
M RelatedSites.class.php
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5b0b101..5fbac5a 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -80,6 +80,11 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // HACK: DMOZ is dead, don't display links to it
+   if ( $title->getInterwiki() === 'dmoz' ) {
+   continue;
+   }
+
// Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
$linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title->getInterwiki() );
$linkText = $linkTextMsg->isDisabled() ?
@@ -126,11 +131,11 @@
public static function onSidebarBeforeOutput( $skin, &$bar ) {
$relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
 
-   if ( !$relatedSites ) {
+   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
+
+   if ( !$relatedSitesUrls ) {
return true;
}
-
-   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 
// build relatedsites 's
$relatedSites = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[wmf/1.29.0-wmf.15]: DMOZ is closing today, don't display links to it

2017-03-14 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342759 )

Change subject: DMOZ is closing today, don't display links to it
..

DMOZ is closing today, don't display links to it

Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
---
M RelatedSites.class.php
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5b0b101..5fbac5a 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -80,6 +80,11 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // HACK: DMOZ is dead, don't display links to it
+   if ( $title->getInterwiki() === 'dmoz' ) {
+   continue;
+   }
+
// Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
$linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title->getInterwiki() );
$linkText = $linkTextMsg->isDisabled() ?
@@ -126,11 +131,11 @@
public static function onSidebarBeforeOutput( $skin, &$bar ) {
$relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
 
-   if ( !$relatedSites ) {
+   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
+
+   if ( !$relatedSitesUrls ) {
return true;
}
-
-   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 
// build relatedsites 's
$relatedSites = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy PageViewInfo to testwiki

2017-03-14 Thread Code Review

Gergő Tisza has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342683 )

Change subject: Deploy PageViewInfo to testwiki
..


Deploy PageViewInfo to testwiki

Bug: T125917
Change-Id: I9fd167df125aac5b9c91359b355b0b0baaf22207
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
5 files changed, 10 insertions(+), 5 deletions(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index c5c6865..896f131 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -313,10 +313,6 @@
$wgDefaultUserOptions['compact-language-links'] = 0;
 }
 
-if ( $wmgUsePageViewInfo ) {
-   wfLoadExtension( 'PageViewInfo' );
-}
-
 if ( $wmgUseEmailAuth ) {
wfLoadExtension( 'EmailAuth' );
// make it do something testable
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5e3a050..7b4eea0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3493,6 +3493,10 @@
wfLoadExtension( 'Kartographer' );
 }
 
+if ( $wmgUsePageViewInfo ) {
+   wfLoadExtension( 'PageViewInfo' );
+}
+
 if ( $wgDBname === 'foundationwiki' ) {
// Foundationwiki has raw html enabled. Attempt to prevent people
// from accidentally violating the privacy policy with external scripts.
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f97409c..72163c4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18303,6 +18303,11 @@
'wikipedia' => 0.001,
 ],
 
+'wmgUsePageViewInfo' => [
+   'default' => false,
+   'testwiki' => true,
+],
+
 ];
 
 ### WMF Labs override #
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 22613ed..74c0728 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -91,6 +91,7 @@
 $IP/extensions/PagedTiffHandler/extension.json
 $IP/extensions/PageImages/extension.json
 $IP/extensions/PageTriage/PageTriage.php
+$IP/extensions/PageViewInfo/extension.json
 $IP/extensions/ParserFunctions/extension.json
 $IP/extensions/ParsoidBatchAPI/extension.json
 $IP/extensions/PdfHandler/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 16d4035..774c01f 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -3,6 +3,5 @@
 $IP/extensions/EmailAuth/extension.json
 $IP/extensions/Linter/extension.json
 $IP/extensions/Newsletter/extension.json
-$IP/extensions/PageViewInfo/extension.json
 $IP/extensions/PerformanceInspector/extension.json
 $IP/extensions/Sentry/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fd167df125aac5b9c91359b355b0b0baaf22207
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Add unit to `line-height` for Chrome

2017-03-14 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342758 )

Change subject: MediaWiki theme: Add unit to `line-height` for Chrome
..

MediaWiki theme: Add unit to `line-height` for Chrome

Adding `em` unit to `line-height` for correct treatment in Chrome
as it renders `14px` instead of `15px` otherwise. Follow-up to
I9a2d3975927

Change-Id: I78614e72cd7dd12b901b3f12b3ec21bb222e0767
---
M src/themes/mediawiki/elements.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/342758/1

diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 92db35d..c67a843 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -187,7 +187,7 @@
}
 
&.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
-   line-height: 1.172; // equals `15px`
+   line-height: 1.172em; // Firefox needs a value, Chrome 
the unit; equals `15px` at base `font-size: 12.8px`
}
 
&.oo-ui-iconElement {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Comments and whitespace

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341469 )

Change subject: Comments and whitespace
..


Comments and whitespace

Change-Id: I4893f342187d54bdfb2a14427519f1486d8a6814
---
M gateway_common/GatewayPage.php
M gateway_common/PaymentResult.php
M gateway_common/gateway.adapter.php
M tests/phpunit/GatewayPageTest.php
4 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index d084fee..3ad093b 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -231,7 +231,7 @@
$output->redirect( $page );
}
 
-   public function redirect ( $url, $responsecode = '302' ) {
+   public function redirect( $url, $responsecode = '302' ) {
// Do we need to pop out of an iframe?
if ( $this->isReturnFramed() ) {
$this->logger->info(
diff --git a/gateway_common/PaymentResult.php b/gateway_common/PaymentResult.php
index 52be563..77acb8f 100644
--- a/gateway_common/PaymentResult.php
+++ b/gateway_common/PaymentResult.php
@@ -111,6 +111,7 @@
 * @param string $finalStatus final transaction status.
 *
 * @return PaymentResult
+* TODO: rename to fromResponse
 */
public static function fromResults( PaymentTransactionResponse 
$response, $finalStatus ) {
if ( $finalStatus === FinalStatus::FAILED ) {
@@ -121,7 +122,7 @@
}
if ( $response->getErrors() ) {
// TODO: We will probably want the ability to refresh 
to a new form
-   // as well and display errors at the same time.
+   // and display errors at the same time.
return PaymentResult::newRefresh( 
$response->getErrors() );
}
if ( $response->getRedirect() ) {
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index eb20905..84b980d 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1418,7 +1418,9 @@
// Feed the message into the pending queue, so the CRM queue 
consumer
// can read it to fill in donor details when it gets a partial 
message
$this->sendPendingMessage();
+
// Avoid 'bad ffname' logspam on return and try again links.
+   // TODO: deprecate
$this->session_pushFormName( $this->getData_Unstaged_Escaped( 
'ffname' ) );
}
 
@@ -1442,6 +1444,8 @@
 *@see getFormattedResponse.  Type depends on 
$this->getResponseType
 * @throws ResponseProcessingException with an actionable error code 
and any
 * variables to retry
+*
+* TODO: Move response parsing to a separate class.
 */
protected function processResponse( $response ) {
$this->transaction_response->setCommunicationStatus( true );
diff --git a/tests/phpunit/GatewayPageTest.php 
b/tests/phpunit/GatewayPageTest.php
index 022db06..27edc9c 100644
--- a/tests/phpunit/GatewayPageTest.php
+++ b/tests/phpunit/GatewayPageTest.php
@@ -92,6 +92,7 @@
TestingGenericAdapter::$fakeGlobals['FallbackCurrency'] = 'OMR';
TestingGenericAdapter::$fakeGlobals['NotifyOnConvert'] = true;
TestingGenericAdapter::$acceptedCurrencies[] = 'OMR';
+   // FIXME: Relies on app default exchange rate.  Set explicitly 
instead.
$this->setUpAdapter();
 
$this->page->validateForm();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4893f342187d54bdfb2a14427519f1486d8a6814
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Check for maintenance mode before anything

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341470 )

Change subject: Check for maintenance mode before anything
..


Check for maintenance mode before anything

Change-Id: I4fd92eb94ea61b03352c01fc5c6c7f86c2de78eb
---
M gateway_common/GatewayPage.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index 3ad093b..6aa2602 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -76,6 +76,12 @@
$wgLang = $this->getContext()->getLanguage(); // 
BackCompat
}
 
+   if( $wgContributionTrackingFundraiserMaintenance
+   || $wgContributionTrackingFundraiserMaintenanceUnsched 
){
+   $this->redirect( 
Title::newFromText('Special:FundraiserMaintenance')->getFullURL(), '302' );
+   return;
+   }
+
$gatewayName = $this->getGatewayIdentifier();
$className = DonationInterface::getAdapterClassForGateway( 
$gatewayName );
DonationInterface::initializeSmashPig( $gatewayName );
@@ -119,12 +125,6 @@
if ( $this->adapter->getGlobal( 'Enabled' ) !== true ) {
$this->logger->info( 'Displaying fail page for disabled 
gateway' );
$this->displayFailPage();
-   return;
-   }
-
-   if( $wgContributionTrackingFundraiserMaintenance
-   || $wgContributionTrackingFundraiserMaintenanceUnsched 
){
-   $this->redirect( 
Title::newFromText('Special:FundraiserMaintenance')->getFullURL(), '302' );
return;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fd92eb94ea61b03352c01fc5c6c7f86c2de78eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: More verbose test titles

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341468 )

Change subject: More verbose test titles
..


More verbose test titles

Change-Id: I4b955b2fd647441b473f70d3abe274b0220aa273
---
M tests/phpunit/GatewayPageTest.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/tests/phpunit/GatewayPageTest.php 
b/tests/phpunit/GatewayPageTest.php
index 621276f..022db06 100644
--- a/tests/phpunit/GatewayPageTest.php
+++ b/tests/phpunit/GatewayPageTest.php
@@ -73,7 +73,7 @@
parent::tearDown();
}
 
-   public function testFallbackWithNotification() {
+   public function testCurrencyFallbackWithNotification() {
TestingGenericAdapter::$fakeGlobals['NotifyOnConvert'] = true;
$this->setUpAdapter();
 
@@ -88,7 +88,7 @@
$this->assertEquals( 'USD', 
$this->adapter->getData_Unstaged_Escaped( 'currency_code' ) );
}
 
-   public function testFallbackIntermediateConversion() {
+   public function testCurrencyFallbackIntermediateConversion() {
TestingGenericAdapter::$fakeGlobals['FallbackCurrency'] = 'OMR';
TestingGenericAdapter::$fakeGlobals['NotifyOnConvert'] = true;
TestingGenericAdapter::$acceptedCurrencies[] = 'OMR';
@@ -103,7 +103,7 @@
$this->assertEquals( 'OMR', 
$this->adapter->getData_Unstaged_Escaped( 'currency_code' ) );
}
 
-   public function testFallbackWithoutNotification() {
+   public function testCurrencyFallbackWithoutNotification() {
TestingGenericAdapter::$fakeGlobals['NotifyOnConvert'] = false;
$this->setUpAdapter();
 
@@ -117,7 +117,7 @@
$this->assertEquals( 'USD', 
$this->adapter->getData_Unstaged_Escaped( 'currency_code' ) );
}
 
-   public function testFallbackAlwaysNotifiesIfOtherErrors() {
+   public function testCurrencyFallbackAlwaysNotifiesIfOtherErrors() {
TestingGenericAdapter::$fakeGlobals['NotifyOnConvert'] = false;
$this->setUpAdapter( array( 'email' => 'notanemail' ) );
 
@@ -142,7 +142,7 @@
$this->assertEquals( 'BBD', 
$this->adapter->getData_Unstaged_Escaped( 'currency_code' ) );
}
 
-   public function testFallbackByCountry() {
+   public function testCurrencyFallbackByCountry() {
// With 'FallbackCurrencyByCountry', we need to return a single 
supported currency
TestingGenericAdapter::$acceptedCurrencies = array( 'USD' );
TestingGenericAdapter::$fakeGlobals = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b955b2fd647441b473f70d3abe274b0220aa273
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.16]: Add PageViewInfo submodule

2017-03-14 Thread Code Review

Gergő Tisza has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342747 )

Change subject: Add PageViewInfo submodule
..


Add PageViewInfo submodule

Normally this would be done by make-wmf-branch but I forgot to
update it in time.

Bug: T125917
Change-Id: I3df4954f88922d87f9dc52095e17eea96c04399f
---
M .gitmodules
A extensions/PageViewInfo
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index 498ef1e..ae37431 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -674,3 +674,7 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.29.0-wmf.16
+[submodule "extensions/PageViewInfo"]
+   path = extensions/PageViewInfo
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PageViewInfo
+   branch = wmf/1.29.0-wmf.16
diff --git a/extensions/PageViewInfo b/extensions/PageViewInfo
new file mode 16
index 000..20cfbcc
--- /dev/null
+++ b/extensions/PageViewInfo
@@ -0,0 +1 @@
+Subproject commit 20cfbcc068760d510dd65e4ecfe6d07be9ea2534

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3df4954f88922d87f9dc52095e17eea96c04399f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.15]: Add PageViewInfo submodule

2017-03-14 Thread Code Review

Gergő Tisza has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342745 )

Change subject: Add PageViewInfo submodule
..


Add PageViewInfo submodule

Normally this would be done by make-wmf-branch but I forgot to
update it in time.

Bug: T125917
Change-Id: I78b9bc4c8570197b9295671a8db1e98d6e6f1d97
---
M .gitmodules
A extensions/PageViewInfo
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index 530f080..7b607d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -674,3 +674,7 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.29.0-wmf.15
+[submodule "extensions/PageViewInfo"]
+   path = extensions/PageViewInfo
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PageViewInfo
+   branch = wmf/1.29.0-wmf.15
diff --git a/extensions/PageViewInfo b/extensions/PageViewInfo
new file mode 16
index 000..20cfbcc
--- /dev/null
+++ b/extensions/PageViewInfo
@@ -0,0 +1 @@
+Subproject commit 20cfbcc068760d510dd65e4ecfe6d07be9ea2534

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78b9bc4c8570197b9295671a8db1e98d6e6f1d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Element#scrollIntoView: Drop `complete` co...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332358 )

Change subject: [BREAKING CHANGE] Element#scrollIntoView: Drop `complete` 
config option
..


[BREAKING CHANGE] Element#scrollIntoView: Drop `complete` config option

This config option was deprecated since v0.15.4; use the returned promise 
instead.

Change-Id: Ia269793a3aa19ebe6158e263348116c978598b5c
---
M src/Element.js
1 file changed, 1 insertion(+), 13 deletions(-)

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



diff --git a/src/Element.js b/src/Element.js
index b47f5c4..1baeaca 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -594,22 +594,16 @@
  * @param {string} [config.duration='fast'] jQuery animation duration value
  * @param {string} [config.direction] Scroll in only one direction, e.g. 'x' 
or 'y', omit
  *  to scroll in both directions
- * @param {Function} [config.complete] Function to call when scrolling 
completes.
- *  Deprecated since 0.15.4, use the return promise instead.
  * @return {jQuery.Promise} Promise which resolves when the scroll is complete
  */
 OO.ui.Element.static.scrollIntoView = function ( el, config ) {
-   var position, animations, callback, container, $container, 
elementDimensions, containerDimensions, $window,
+   var position, animations, container, $container, elementDimensions, 
containerDimensions, $window,
deferred = $.Deferred();
 
// Configuration initialization
config = config || {};
 
animations = {};
-   callback = typeof config.complete === 'function' && config.complete;
-   if ( callback ) {
-   OO.ui.warnDeprecation( 'Element#scrollIntoView: The `complete` 
callback config option is deprecated. Use the return promise instead.' );
-   }
container = this.getClosestScrollableContainer( el, config.direction );
$container = $( container );
elementDimensions = this.getDimensions( el );
@@ -652,16 +646,10 @@
if ( !$.isEmptyObject( animations ) ) {
$container.stop( true ).animate( animations, config.duration 
=== undefined ? 'fast' : config.duration );
$container.queue( function ( next ) {
-   if ( callback ) {
-   callback();
-   }
deferred.resolve();
next();
} );
} else {
-   if ( callback ) {
-   callback();
-   }
deferred.resolve();
}
return deferred.promise();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia269793a3aa19ebe6158e263348116c978598b5c
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RelatedSites[master]: DMOZ is closing today, don't display links to it

2017-03-14 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342753 )

Change subject: DMOZ is closing today, don't display links to it
..

DMOZ is closing today, don't display links to it

Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
---
M RelatedSites.class.php
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedSites 
refs/changes/53/342753/1

diff --git a/RelatedSites.class.php b/RelatedSites.class.php
index 5b0b101..5fbac5a 100644
--- a/RelatedSites.class.php
+++ b/RelatedSites.class.php
@@ -80,6 +80,11 @@
 
$title = Title::newFromText( $site );
if ( $title ) {
+   // HACK: DMOZ is dead, don't display links to it
+   if ( $title->getInterwiki() === 'dmoz' ) {
+   continue;
+   }
+
// Use the same system message keys as the core 
$wgExtraInterlanguageLinkPrefixes feature
$linkTextMsg = wfMessage( 'interlanguage-link-' 
. $title->getInterwiki() );
$linkText = $linkTextMsg->isDisabled() ?
@@ -126,11 +131,11 @@
public static function onSidebarBeforeOutput( $skin, &$bar ) {
$relatedSites = $skin->getOutput()->getProperty( 'RelatedSites' 
);
 
-   if ( !$relatedSites ) {
+   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
+
+   if ( !$relatedSitesUrls ) {
return true;
}
-
-   $relatedSitesUrls = self::getRelatedSitesUrls( $relatedSites );
 
// build relatedsites 's
$relatedSites = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1df8ac607186eaca0d63399fe933e5306e8f1e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedSites
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Simplify Radio- & Checkbox*optionWidget lab...

2017-03-14 Thread VolkerE (Code Review)

VolkerE has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342571 )

Change subject: MediaWiki theme: Simplify Radio- & Checkbox*optionWidget label 
rules
..


MediaWiki theme: Simplify Radio- & Checkbox*optionWidget label rules

Simplify RadioOptionWidget and CheckboxMultioptionWidget label's
vertical spacing rules, also introducing new Less variables and
cleanup leftover not applied or duplicated selectors & properties.

Change-Id: I2566370006c86d0580dfa691c915d6f2b6cf3dea
---
M src/styles/widgets/CheckboxMultioptionWidget.less
M src/styles/widgets/RadioOptionWidget.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
4 files changed, 9 insertions(+), 20 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/styles/widgets/CheckboxMultioptionWidget.less 
b/src/styles/widgets/CheckboxMultioptionWidget.less
index 9314071..42cb97a 100644
--- a/src/styles/widgets/CheckboxMultioptionWidget.less
+++ b/src/styles/widgets/CheckboxMultioptionWidget.less
@@ -1,8 +1,6 @@
 @import '../common';
 
 .oo-ui-checkboxMultioptionWidget {
-   cursor: default;
-
.oo-ui-checkboxInputWidget,
&.oo-ui-labelElement .oo-ui-labelElement-label {
display: inline-block;
diff --git a/src/styles/widgets/RadioOptionWidget.less 
b/src/styles/widgets/RadioOptionWidget.less
index 9a83997..c8641bd 100644
--- a/src/styles/widgets/RadioOptionWidget.less
+++ b/src/styles/widgets/RadioOptionWidget.less
@@ -1,8 +1,6 @@
 @import '../common';
 
 .oo-ui-radioOptionWidget {
-   cursor: default;
-
.oo-ui-radioInputWidget,
&.oo-ui-labelElement .oo-ui-labelElement-label {
display: inline-block;
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index c9d2138..d653379 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -61,7 +61,7 @@
 @border-toolbar: @border-width-default solid #c8ccd1;
 
 // Box Sizes
-@min-width-button-default: 40 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.125em`≈`40px` at base `font-size: 
12.8px` // equals `40px` at base `font-size: 0.8em`
+@min-width-button-default: 40 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.125em`≈`40px` at base `font-size: 12.8px`
 @min-width-button-combo-widget: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.5em`≈`32px` at base `font-size: 12.8px`
 @min-height-button-default: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 @min-height-toggleswitch: 26px; // equals `16px` @size-toggleswitch-grip-min + 
4px*2 distance top/bottom + 1px*2 border top/bottom
@@ -112,6 +112,7 @@
 
 @padding-widget-default: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px` at base `font-size: 12.8px`
 @padding-input-top: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default; 
// equals `0.625em`≈`8px` at base `font-size: 12.8px`
+@padding-vertical-label: 4 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.3125em`≈`4px` at base `font-size: 12.8px`
 
 @box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
 @box-shadow-menu: @box-shadow-dialog;
@@ -152,8 +153,8 @@
 @border-color-input-binary: @border-color-default-active;
 @border-color-input-binary-active: @color-progressive-active;
 @border-color-input-binary-on: @color-progressive;
+@padding-start-input-binary-label: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.46875em`≈`6px` at base `font-size: 
12.8px`
 @box-shadow-input-binary: 0 0 0 1px rgba( 0, 0, 0, 0.1 );
-@padding-input-binary-label: 0.25em 0.25em 0.25em 0.46875em;
 
 // Theme mixins
 
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 36592df..97c9b86 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -527,7 +527,7 @@
margin-top: 0;
 
.oo-ui-fieldLayout-body {
-   padding: 0.25em 0;
+   padding: @padding-vertical-label 0;
 
.oo-ui-labelElement-label {
line-height: @line-height-input-binary-label;
@@ -757,7 +757,7 @@
margin-top: 0;
 
.oo-ui-fieldLayout-body {
-   padding: 0.25em 0;
+   padding: @padding-vertical-label 0;
 
.oo-ui-labelElement-label {
line-height: @line-height-input-binary-label;
@@ -1127,7 +1127,6 @@
 
 .theme-oo-ui-optionWidget () {
border: 0;
-   padding: 0.25em 0.5em;
 
.oo-ui-labelElement-label {
line-height: @line-height-default;
@@ -1181,17 +1180,10 @@
 }
 
 .theme-oo-ui-radioOptionWidget () {
-   padding: 0.25em 0;
-   background-color: transparent;

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Remove TextInputMenuSelectWidget

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332359 )

Change subject: [BREAKING CHANGE] Remove TextInputMenuSelectWidget
..


[BREAKING CHANGE] Remove TextInputMenuSelectWidget

This was a alias for FloatingMenuSelectWidget with no additional
functionality. It was deprecated in v0.12.5.

Change-Id: Iaddaa801f0645c25b83f3f2670f12ff70c593ad5
---
M src/widgets/FloatingMenuSelectWidget.js
1 file changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/src/widgets/FloatingMenuSelectWidget.js 
b/src/widgets/FloatingMenuSelectWidget.js
index f42da1e..bd79c25 100644
--- a/src/widgets/FloatingMenuSelectWidget.js
+++ b/src/widgets/FloatingMenuSelectWidget.js
@@ -75,20 +75,3 @@
 
return this;
 };
-
-/*
- * The old name for the FloatingMenuSelectWidget widget, provided for 
backwards-compatibility.
- *
- * @class
- * @extends OO.ui.FloatingMenuSelectWidget
- *
- * @constructor
- * @deprecated since v0.12.5.
- */
-OO.ui.TextInputMenuSelectWidget = function OoUiTextInputMenuSelectWidget() {
-   OO.ui.warnDeprecation( 'TextInputMenuSelectWidget is deprecated. Use 
the FloatingMenuSelectWidget instead.' );
-   // Parent constructor
-   OO.ui.TextInputMenuSelectWidget.parent.apply( this, arguments );
-};
-
-OO.inheritClass( OO.ui.TextInputMenuSelectWidget, 
OO.ui.FloatingMenuSelectWidget );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaddaa801f0645c25b83f3f2670f12ff70c593ad5
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.16]: Add PageViewInfo submodule

2017-03-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342747 )

Change subject: Add PageViewInfo submodule
..

Add PageViewInfo submodule

Normally this would be done by make-wmf-branch but I forgot to
update it in time.

Bug: T125917
Change-Id: I3df4954f88922d87f9dc52095e17eea96c04399f
---
M .gitmodules
A extensions/PageViewInfo
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/342747/1

diff --git a/.gitmodules b/.gitmodules
index 498ef1e..ae37431 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -674,3 +674,7 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.29.0-wmf.16
+[submodule "extensions/PageViewInfo"]
+   path = extensions/PageViewInfo
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PageViewInfo
+   branch = wmf/1.29.0-wmf.16
diff --git a/extensions/PageViewInfo b/extensions/PageViewInfo
new file mode 16
index 000..20cfbcc
--- /dev/null
+++ b/extensions/PageViewInfo
@@ -0,0 +1 @@
+Subproject commit 20cfbcc068760d510dd65e4ecfe6d07be9ea2534

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3df4954f88922d87f9dc52095e17eea96c04399f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.15]: Add PageViewInfo submodule

2017-03-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342745 )

Change subject: Add PageViewInfo submodule
..

Add PageViewInfo submodule

Normally this would be done by make-wmf-branch but I forgot to
update it in time.

Bug: T125917
Change-Id: I78b9bc4c8570197b9295671a8db1e98d6e6f1d97
---
M .gitmodules
A extensions/PageViewInfo
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/342745/1

diff --git a/.gitmodules b/.gitmodules
index 530f080..7b607d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -674,3 +674,7 @@
path = vendor
url = https://gerrit.wikimedia.org/r/mediawiki/vendor
branch = wmf/1.29.0-wmf.15
+[submodule "extensions/PageViewInfo"]
+   path = extensions/PageViewInfo
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PageViewInfo
+   branch = wmf/1.29.0-wmf.15
diff --git a/extensions/PageViewInfo b/extensions/PageViewInfo
new file mode 16
index 000..20cfbcc
--- /dev/null
+++ b/extensions/PageViewInfo
@@ -0,0 +1 @@
+Subproject commit 20cfbcc068760d510dd65e4ecfe6d07be9ea2534

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78b9bc4c8570197b9295671a8db1e98d6e6f1d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.15
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy PageViewInfo to group0

2017-03-14 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342728 )

Change subject: Deploy PageViewInfo to group0
..

Deploy PageViewInfo to group0

$wgPageViewInfoWikimediaDomain defaults to $wgServerName so there
is no need to set it by hand.

Bug: T125917
Change-Id: I9a2f8b5652183fac42c0ebb11af4cf17b2edbad0
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/28/342728/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 72163c4..9739d5e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18305,7 +18305,7 @@
 
 'wmgUsePageViewInfo' => [
'default' => false,
-   'testwiki' => true,
+   'group0' => true,
 ],
 
 ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a2f8b5652183fac42c0ebb11af4cf17b2edbad0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] mediawiki/core[master]: mw.widgets.SearchInputWidget: Do not pass `type: 'search'` t...

2017-03-14 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342718 )

Change subject: mw.widgets.SearchInputWidget: Do not pass `type: 'search'` to 
TextInputWidget
..

mw.widgets.SearchInputWidget: Do not pass `type: 'search'` to TextInputWidget

Causes deprecation warnings.

This patch loses the 'x' thingie at the end of the field, which
previously allowed clearing the input by clicking it. I'm not sure if
anyone actually uses it. I can reimplement it if it's wanted.

Bug: T148471
Change-Id: I81d52ba938a8b90c5d2c173f1f2682d9e3300e43
---
M includes/widget/SearchInputWidget.php
M resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/342718/1

diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
index 0d71629..49510da 100644
--- a/includes/widget/SearchInputWidget.php
+++ b/includes/widget/SearchInputWidget.php
@@ -31,7 +31,6 @@
public function __construct( array $config = [] ) {
$config = array_merge( [
'maxLength' => null,
-   'type' => 'search',
'icon' => 'search',
], $config );
 
@@ -56,6 +55,10 @@
$this->addClasses( [ 'mw-widget-searchInputWidget' ] );
}
 
+   protected function getInputElement( $config ) {
+   return ( new \OOUI\Tag( 'input' ) )->setAttributes( [ 'type' => 
'search' ] );
+   }
+
protected function getJavaScriptClassName() {
return 'mw.widgets.SearchInputWidget';
}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 0a73bef..2849787 100755
--- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@ -30,7 +30,6 @@
var $form = config.$input ? config.$input.closest( 'form' ) : 
$();
 
config = $.extend( {
-   type: 'search',
icon: 'search',
maxLength: undefined,
performSearchOnClick: true,
@@ -76,6 +75,14 @@
/* Methods */
 
/**
+* @inheritdoc
+* @protected
+*/
+   mw.widgets.SearchInputWidget.prototype.getInputElement = function () {
+   return $( '' ).attr( 'type', 'search' );
+   };
+
+   /**
 * @inheritdoc mw.widgets.TitleWidget
 */
mw.widgets.SearchInputWidget.prototype.getSuggestionsPromise = function 
() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81d52ba938a8b90c5d2c173f1f2682d9e3300e43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add PageViewInfo to make-wmf-branch/config.json

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342694 )

Change subject: Add PageViewInfo to make-wmf-branch/config.json
..


Add PageViewInfo to make-wmf-branch/config.json

Bug: T125917
Change-Id: I490e0fc1a2b3de2bb05f085ea74d7b3e4d33f8b5
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index a527a29..15469d5 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -98,6 +98,7 @@
"PageForms",
"PageImages",
"PageTriage",
+   "PageViewInfo",
"ParserFunctions",
"ParsoidBatchAPI",
"PdfHandler",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I490e0fc1a2b3de2bb05f085ea74d7b3e4d33f8b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Remove references to tools-precise-dev

2017-03-14 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342713 )

Change subject: labs: Remove references to tools-precise-dev
..

labs: Remove references to tools-precise-dev

Bug: T160466
Change-Id: I48ae0eeccb8cc3aac3f919c76f9751522606ebf6
---
M modules/toollabs/files/host_aliases
M modules/toollabs/templates/mail-relay.exim4.conf.erb
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/342713/1

diff --git a/modules/toollabs/files/host_aliases 
b/modules/toollabs/files/host_aliases
index e7ba5c2..21b6b33 100644
--- a/modules/toollabs/files/host_aliases
+++ b/modules/toollabs/files/host_aliases
@@ -12,7 +12,6 @@
 tools-exec-1410.eqiad.wmflabs tools-exec-1410.tools.eqiad.wmflabs
 tools-exec-cyberbot.eqiad.wmflabs tools-exec-cyberbot.tools.eqiad.wmflabs
 tools-mail.eqiad.wmflabs tools-mail.tools.eqiad.wmflabs
-tools-precise-dev.eqiad.wmflabs tools-precise-dev.tools.eqiad.wmflabs
 tools-services-01.eqiad.wmflabs tools-services-01.tools.eqiad.wmflabs
 tools-submit.eqiad.wmflabs tools-submit.tools.eqiad.wmflabs
 tools-webgrid-generic-1401.eqiad.wmflabs 
tools-webgrid-generic-1401.tools.eqiad.wmflabs
diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb 
b/modules/toollabs/templates/mail-relay.exim4.conf.erb
index ff8693e..2b6d93a 100644
--- a/modules/toollabs/templates/mail-relay.exim4.conf.erb
+++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb
@@ -32,7 +32,6 @@
tools-bastion-01.eqiad.wmflabs : \
tools-checker-02.eqiad.wmflabs : \
tools-mail.eqiad.wmflabs : \
-   tools-precise-dev.eqiad.wmflabs : \
tools-services-01.eqiad.wmflabs : \
tools-submit.eqiad.wmflabs : \
tools-webgrid-generic-1401.eqiad.wmflabs : \

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update `` support for Parsoid changes

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340554 )

Change subject: Update `` support for Parsoid changes
..


Update `` support for Parsoid changes

After 79ccfb9372cb57afa569036ef39ead13abfba673, MediaWiki's ``
tags get rendered as `` in Parsoid HTML.
MediaWiki's indent-pre syntax (block indented by a single space) is
still rendered as `` in Parsoid HTML, however.

Indent-pre is still handled by MWPreformattedNode (no changes).
Introducing MWPreNode, which will handle `` extension tags,
and MWPreDialog to change its contents (and allow converting
to MWPreformattedNode).

Pieces copied from MWGalleryNode, MWLinkNodeInspector, CommentInspector.

Possible future improvements:
* Add a specific icon for MWPreContextItem
* Avoid API roundtrips for rendering (but rendering wikitext 
  is not as simple as it looks)
* Consider a way to insert these other than '

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Upgrade http-request to 6.0

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342709 )

Change subject: Upgrade http-request to 6.0
..

Upgrade http-request to 6.0

Bug: T160393
Change-Id: I0922351e3c91c69ea0a7ad37608f17a40386d6cf
---
M lib/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/09/342709/1

diff --git a/lib/build.gradle b/lib/build.gradle
index 5821d2e..4298806 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -14,7 +14,7 @@
 
 dependencies {
 compile 'org.json:json:20140107'
-compile 'com.github.kevinsawicki:http-request:5.6'
+compile 'com.github.kevinsawicki:http-request:6.0'
 testCompile 'junit:junit:4.12'
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0922351e3c91c69ea0a7ad37608f17a40386d6cf
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Upgrade ch.netzwerg.release to 1.2.3

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342711 )

Change subject: Upgrade ch.netzwerg.release to 1.2.3
..

Upgrade ch.netzwerg.release to 1.2.3

Bug: T160393
Change-Id: I069f6cb0c962e2330f3b9d23877617895e64e9c7
---
M lib/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/11/342711/1

diff --git a/lib/build.gradle b/lib/build.gradle
index a5307a1..e64c380 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -2,7 +2,7 @@
 // projects depending on this module. Plugins must appear at the start of
 // the file.
 plugins {
-id 'ch.netzwerg.release' version '1.1.0'
+id 'ch.netzwerg.release' version '1.2.3'
 }
 
 apply plugin: 'java'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I069f6cb0c962e2330f3b9d23877617895e64e9c7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Bump JAVA_VERSION to 1.8

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342705 )

Change subject: Bump JAVA_VERSION to 1.8
..

Bump JAVA_VERSION to 1.8

Bug: T160393
Change-Id: I4310ab4dd0e4ec394c74ada0c45591f77e3c2cf1
---
M lib/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/05/342705/1

diff --git a/lib/build.gradle b/lib/build.gradle
index f65a428..5821d2e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -18,7 +18,7 @@
 testCompile 'junit:junit:4.12'
 }
 
-final JAVA_VERSION = JavaVersion.VERSION_1_7
+final JAVA_VERSION = JavaVersion.VERSION_1_8
 if (JavaVersion.current() != JAVA_VERSION) {
 throw new IllegalStateException("Incorrect Java Development Kit version; 
expected "
 + JAVA_VERSION + " but found " + JavaVersion.current())

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4310ab4dd0e4ec394c74ada0c45591f77e3c2cf1
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Hygiene: Fix Javadoc errors

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342706 )

Change subject: Hygiene: Fix Javadoc errors
..

Hygiene: Fix Javadoc errors

Bug: T160393
Change-Id: If14d767d623afcc8d9e98da91537f5f7519da1a3
---
M lib/src/main/java/org/mediawiki/api/json/Api.java
M lib/src/main/java/org/mediawiki/api/json/ApiResult.java
M lib/src/main/java/org/mediawiki/api/json/package-info.java
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/06/342706/1

diff --git a/lib/src/main/java/org/mediawiki/api/json/Api.java 
b/lib/src/main/java/org/mediawiki/api/json/Api.java
index 3f25881..9536184 100644
--- a/lib/src/main/java/org/mediawiki/api/json/Api.java
+++ b/lib/src/main/java/org/mediawiki/api/json/Api.java
@@ -178,7 +178,7 @@
  *
  * @param action The https://www.mediawiki.org/wiki/API:Main_page#The_action;>action to 
start building
  *   a request for.
- * @return A {@link RequestBuilder} instance that can be used to add 
parameters & execute the request.
+ * @return A {@link RequestBuilder} instance that can be used to add 
parameters and execute the request.
  */
 public RequestBuilder action(final String action) {
 return new RequestBuilder(this, action);
diff --git a/lib/src/main/java/org/mediawiki/api/json/ApiResult.java 
b/lib/src/main/java/org/mediawiki/api/json/ApiResult.java
index 0bae119..9faff4a 100644
--- a/lib/src/main/java/org/mediawiki/api/json/ApiResult.java
+++ b/lib/src/main/java/org/mediawiki/api/json/ApiResult.java
@@ -41,7 +41,7 @@
 
 private JSONArray resultArray;
 /**
- * Start the network request & return the response as a JSON Array.
+ * Start the network request and return the response as a JSON Array.
  * Locally cache the result too, so multiple calls to this method will 
succeeed.
  *
  * Use this when a JSON Array is returned by the API. So far, only 
action=opensearch.
@@ -68,7 +68,7 @@
 
 private JSONObject resultObject;
 /**
- * Start the network request & return the response as a JSON Object.
+ * Start the network request and return the response as a JSON Object.
  * Locally cache the result too, so multiple calls to this method will 
succeeed.
  *
  * @return A {@link JSONObject} object with the results of the API query.
@@ -117,7 +117,7 @@
 /**
  * Get the Map of headers returned for the response. Note that this must 
be called after asArray or asObject.
  *
- * @return Map
+ * @return MapString, ListString
  * @throws NullPointerException
  */
 public Map getHeaders() throws NullPointerException {
diff --git a/lib/src/main/java/org/mediawiki/api/json/package-info.java 
b/lib/src/main/java/org/mediawiki/api/json/package-info.java
index baec768..d3bd6df 100644
--- a/lib/src/main/java/org/mediawiki/api/json/package-info.java
+++ b/lib/src/main/java/org/mediawiki/api/json/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Client wrapper for connecting to a MediaWiki installation's API.
  *
- * Contains classes to connect to a MediaWiki instance & perform actions on
+ * Contains classes to connect to a MediaWiki instance and perform actions on
  * its API. Tries to be as lightweight as possible.
  *
  * @author Yuvi Panda

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If14d767d623afcc8d9e98da91537f5f7519da1a3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Update gradle-nexus-plugin to 2.3.1

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342708 )

Change subject: Update gradle-nexus-plugin to 2.3.1
..

Update gradle-nexus-plugin to 2.3.1

Bug: T160393
Change-Id: I2b93e76d726f16a3e813acce2496e48a6b7b2e0c
---
M build.gradle
M deploy.gradle
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/08/342708/1

diff --git a/build.gradle b/build.gradle
index b949865..c7426e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 jcenter()
 }
 dependencies {
-classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1'
+classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
 }
 }
 
diff --git a/deploy.gradle b/deploy.gradle
index f1c3d9b..e09e8af 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'nexus'
+apply plugin: 'com.bmuschko.nexus'
 
 modifyPom {
 project {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b93e76d726f16a3e813acce2496e48a6b7b2e0c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Upgrade org.json to 20160810

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342710 )

Change subject: Upgrade org.json to 20160810
..

Upgrade org.json to 20160810

Bug: T160393
Change-Id: I1939097d122099c8070536d1b7a69be69c705cbd
---
M lib/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/10/342710/1

diff --git a/lib/build.gradle b/lib/build.gradle
index 4298806..a5307a1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -13,7 +13,7 @@
 archivesBaseName = 'json'
 
 dependencies {
-compile 'org.json:json:20140107'
+compile 'org.json:json:20160810'
 compile 'com.github.kevinsawicki:http-request:6.0'
 testCompile 'junit:junit:4.12'
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1939097d122099c8070536d1b7a69be69c705cbd
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] apps...java-mwapi[master]: Upgrade Gradle wrapper to 3.4

2017-03-14 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342707 )

Change subject: Upgrade Gradle wrapper to 3.4
..

Upgrade Gradle wrapper to 3.4

Bug: T160393
Change-Id: I8b030c71e3e0251f9006672cd1d7e7493070591f
---
M gradle/wrapper/gradle-wrapper.jar
M gradle/wrapper/gradle-wrapper.properties
M gradlew
M gradlew.bat
4 files changed, 47 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/07/342707/1

diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..adb519f 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index e3c86d9..2c3ebea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 08 17:31:56 MDT 2015
+#Tue Mar 14 17:02:19 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##
 ##
@@ -6,11 +6,29 @@
 ##
 ##
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to 
pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ls=`ls -ld "$PRG"`
+link=`expr "$ls" : '.*-> \(.*\)$'`
+if expr "$link" : '/.*' > /dev/null; then
+PRG="$link"
+else
+PRG=`dirname "$PRG"`"/$link"
+fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to 
pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -30,6 +48,7 @@
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
 cygwin=true
@@ -40,30 +59,10 @@
   MINGW* )
 msys=true
 ;;
+  NONSTOP* )
+nonstop=true
+;;
 esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-ls=`ls -ld "$PRG"`
-link=`expr "$ls" : '.*-> \(.*\)$'`
-if expr "$link" : '/.*' > /dev/null; then
-PRG="$link"
-else
-PRG=`dirname "$PRG"`"/$link"
-fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; 
then
 MAX_FD_LIMIT=`ulimit -H -n`
 if [ $? -eq 0 ] ; then
 if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
 if $cygwin ; then
 APP_HOME=`cygpath --path --mixed "$APP_HOME"`
 CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+JAVACMD=`cygpath --unix "$JAVACMD"`
 
 # We build the pattern for arguments to be converted via cygpath
 ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
 esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the 
shell quoting and substitution rules
-function splitJvmOpts() {
-JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ; 
done
+echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" 
org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and 
substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS 
"\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" 
org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Adds models and updates requirements.

2017-03-14 Thread Ladsgroup (Code Review)

Ladsgroup has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342704 )

Change subject: Adds models and updates requirements.
..


Adds models and updates requirements.

Bug: T160279
Change-Id: I532c97934884a69f9c3a6fc2fca1639024e0965b
---
M config/00-main.yaml
M frozen-requirements.txt
M requirements.txt
M submodules/editquality
M submodules/ores
M submodules/wheels
6 files changed, 40 insertions(+), 5 deletions(-)

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



diff --git a/config/00-main.yaml b/config/00-main.yaml
index 3a04c78..e67ac88 100644
--- a/config/00-main.yaml
+++ b/config/00-main.yaml
@@ -40,8 +40,10 @@
   - enwiki
   - enwiktionary
   - eswiki
+  - eswikibooks
   - etwiki
   - fawiki
+  - fiwiki
   - frwiki
   - hewiki
   - huwiki
@@ -136,12 +138,25 @@
 precache:
   reverted:
 "on": ["edit"]
+  eswikibooks:
+extractor: eswikibooks_api
+scorer_models:
+  reverted: eswikibooks_revert
+precache:
+  reverted:
+"on": ["edit"]
   etwiki:
 extractor: etwiki_api
 scorer_models:
   reverted: etwiki_revert
+  damaging: etwiki_damaging
+  goodfaith: etwiki_goodfaith
 precache:
   reverted:
+"on": ["edit"]
+  damaging:
+"on": ["edit"]
+  goodfaith:
 "on": ["edit"]
   fawiki:
 extractor: fawiki_api
@@ -155,6 +170,13 @@
   reverted:
 "on": ["edit"]
   goodfaith:
+"on": ["edit"]
+  fiwiki:
+extractor: fiwiki_api
+scorer_models:
+  reverted: fiwiki_revert
+precache:
+  reverted:
 "on": ["edit"]
   frwiki:
 extractor: frwiki_api
@@ -271,6 +293,7 @@
 scorer_models:
   reverted: testwiki_revert
   damaging: testwiki_revert
+  goodfaith: testwiki_revert
 precache:
   reverted:
 "on": ["edit"]
@@ -333,10 +356,14 @@
 host: https://en.wiktionary.org
   eswiki_api:
 host: https://es.wikipedia.org
+  eswikibooks_api:
+host: https://es.wikibooks.org
   etwiki_api:
 host: https://et.wikipedia.org
   fawiki_api:
 host: https://fa.wikipedia.org
+  fiwiki_api:
+host: https://fi.wikipedia.org
   frwiki_api:
 host: https://fr.wikipedia.org
   hewiki_api:
@@ -400,14 +427,22 @@
 model_file: submodules/editquality/models/enwiktionary.reverted.rf.model
   eswiki_revert:
 model_file: 
submodules/editquality/models/eswiki.reverted.gradient_boosting.model
+  eswikibooks_revert:
+model_file: 
submodules/editquality/models/eswikibooks.reverted.gradient_boosting.model
   etwiki_revert:
 model_file: 
submodules/editquality/models/etwiki.reverted.gradient_boosting.model
+  etwiki_damaging:
+model_file: 
submodules/editquality/models/etwiki.damaging.gradient_boosting.model
+  etwiki_goodfaith:
+model_file: 
submodules/editquality/models/etwiki.goodfaith.gradient_boosting.model
   fawiki_damaging:
 model_file: 
submodules/editquality/models/fawiki.damaging.gradient_boosting.model
   fawiki_goodfaith:
 model_file: 
submodules/editquality/models/fawiki.goodfaith.gradient_boosting.model
   fawiki_revert:
 model_file: 
submodules/editquality/models/fawiki.reverted.gradient_boosting.model
+  fiwiki_revert:
+model_file: 
submodules/editquality/models/fiwiki.reverted.gradient_boosting.model
   frwiki_revert:
 model_file: 
submodules/editquality/models/frwiki.reverted.gradient_boosting.model
   frwiki_wp10:
diff --git a/frozen-requirements.txt b/frozen-requirements.txt
index e5b0e6c..a4f4b60 100644
--- a/frozen-requirements.txt
+++ b/frozen-requirements.txt
@@ -37,7 +37,7 @@
 pywikibase==0.0.4
 redis==2.10.5
 requests==2.9.1
-revscoring==1.3.6
+revscoring==1.3.8
 scikit-learn==0.17.1
 scipy==0.17.0
 six==1.10.0
diff --git a/requirements.txt b/requirements.txt
index da63b29..2fb3999 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,6 @@
 editquality >= 0.4.1, < 0.4.999
 ores >= 0.7.3, < 0.7.999
 redis >= 2.10.5, < 2.10.999
-revscoring >= 1.2.6, < 1.2.999
+revscoring >= 1.3.6, < 1.3.999
 statsd >= 3.2.1, < 3.2.999
 wikiclass >= 0.3.1, < 0.3.999
diff --git a/submodules/editquality b/submodules/editquality
index 164cd3e..0e23620 16
--- a/submodules/editquality
+++ b/submodules/editquality
@@ -1 +1 @@
-Subproject commit 164cd3e789d364dec89fdeef973fc52aa954141f
+Subproject commit 0e2362054e22ba7a9cc692a857a8b7e2070a1ff2
diff --git a/submodules/ores b/submodules/ores
index 0346fbd..2095225 16
--- a/submodules/ores
+++ b/submodules/ores
@@ -1 +1 @@
-Subproject commit 0346fbd730387f6531fd2259ba2712332c625b8b
+Subproject commit 209522504b9030aa164058309494cccdd1f05c55
diff --git a/submodules/wheels b/submodules/wheels
index 167d8bc..9ae5385 16
--- a/submodules/wheels
+++ b/submodules/wheels
@@ -1 +1 @@
-Subproject commit 167d8bcb85ed517637e20fd0b1c16e6ddf56bdbf
+Subproject commit

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Remove CapsuleMultiSelectWidget

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332356 )

Change subject: [BREAKING CHANGE] Remove CapsuleMultiSelectWidget
..


[BREAKING CHANGE] Remove CapsuleMultiSelectWidget

This alias for CapsuleMultiselectWidget has been deprecated since v0.17.3.

Change-Id: I3dc7c96c43e7465c4c462ed4e3b7d37c7f3aa082
---
M src/widgets/CapsuleMultiselectWidget.js
1 file changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/src/widgets/CapsuleMultiselectWidget.js 
b/src/widgets/CapsuleMultiselectWidget.js
index fca8e95..805c2ed 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -827,20 +827,3 @@
}
return this;
 };
-
-/**
- * The old name for the CapsuleMultiselectWidget widget, provided for 
backwards-compatibility.
- *
- * @class
- * @extends OO.ui.CapsuleMultiselectWidget
- *
- * @constructor
- * @deprecated since 0.17.3; use OO.ui.CapsuleMultiselectWidget instead
- */
-OO.ui.CapsuleMultiSelectWidget = function OoUiCapsuleMultiSelectWidget() {
-   OO.ui.warnDeprecation( 'CapsuleMultiSelectWidget is deprecated. Use the 
CapsuleMultiselectWidget instead.' );
-   // Parent constructor
-   OO.ui.CapsuleMultiSelectWidget.parent.apply( this, arguments );
-};
-
-OO.inheritClass( OO.ui.CapsuleMultiSelectWidget, 
OO.ui.CapsuleMultiselectWidget );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dc7c96c43e7465c4c462ed4e3b7d37c7f3aa082
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Minor follow-ups to 4a892c8fb

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342689 )

Change subject: Minor follow-ups to 4a892c8fb
..


Minor follow-ups to 4a892c8fb

* Fix "obvious obvious" typo in message
* Use instanceof instead of getName()

Change-Id: I22729875c788549ae9f08cdc3f303d2777af511c
---
M i18n/en.json
M includes/Hooks.php
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 7fb37e3..5912924 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -32,7 +32,7 @@
"ores-rcfilters-goodfaith-maybebad-label": "May be bad faith",
"ores-rcfilters-goodfaith-maybebad-desc": "Finds most bad-faith edits 
but with a lower accuracy.",
"ores-rcfilters-goodfaith-bad-label": "Likely bad faith",
-   "ores-rcfilters-goodfaith-bad-desc": "With medium accuracy, finds the 
most obvious obvious 25% of bad-faith edits.",
+   "ores-rcfilters-goodfaith-bad-desc": "With medium accuracy, finds the 
most obvious 25% of bad-faith edits.",
"prefs-ores" : "Revision scoring",
"apihelp-query+ores-description": "Return ORES configuration and model 
data for this wiki.",
"apihelp-query+ores-example-simple": "Fetch ORES data:",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 975331f..576d899 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -23,6 +23,8 @@
 use RequestContext;
 use Skin;
 use SpecialContributions;
+use SpecialRecentChanges;
+use SpecialWatchlist;
 use User;
 use Xml;
 
@@ -162,9 +164,9 @@
);
$clsp->registerFilterGroup( $newDamagingGroup );
 
-   if ( $clsp->getName() === 'Recentchanges' ) {
+   if ( $clsp instanceof SpecialRecentChanges ) {
$damagingDefault = $clsp->getUser()->getOption( 
'oresRCHideNonDamaging' );
-   } elseif ( $clsp->getName() === 'Watchlist' ) {
+   } elseif ( $clsp instanceof SpecialWatchlist ) {
$damagingDefault = $clsp->getUser()->getOption( 
'oresWatchlistHideNonDamaging' );
} else {
$damagingDefault = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22729875c788549ae9f08cdc3f303d2777af511c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Mattflaschen 
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] apps...wikipedia[master]: Hygiene: Don't attempt to set ANDROID_HOME in periodic test ...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342267 )

Change subject: Hygiene: Don't attempt to set ANDROID_HOME in periodic test 
script
..


Hygiene: Don't attempt to set ANDROID_HOME in periodic test script

By the point this script is run, the Jenkins Android Emulator plugin will
already by using an SDK it's located previously, so setting it here is
ineffective.

In order to point the Jenkins plugin at the SDK we want, we'll have to set
the env variable globally (I0571c6de766ad523ce9c4c77af48db69a3b92c9a).

Change-Id: I4dcad776123293a1c5629b15cf14a3f0d7ee7bc4
---
M scripts/apps-android-wikipedia-periodic-test
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/scripts/apps-android-wikipedia-periodic-test 
b/scripts/apps-android-wikipedia-periodic-test
index 77bad8c..46f7c5d 100755
--- a/scripts/apps-android-wikipedia-periodic-test
+++ b/scripts/apps-android-wikipedia-periodic-test
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-export ANDROID_HOME="$PWD/.sdk"
-
 ./gradlew clean testAllAlphaRelease 
-Pandroid.testInstrumentationRunnerArguments.size=small 
-Dorg.gradle.jvmargs=-Xmx4096M -Dorg.gradle.daemon=true
 
 scripts/diff-screenshots
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4dcad776123293a1c5629b15cf14a3f0d7ee7bc4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
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] mediawiki...deploy[master]: Adds models and updates requirements.

2017-03-14 Thread Halfak (Code Review)

Halfak has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342704 )

Change subject: Adds models and updates requirements.
..

Adds models and updates requirements.

Change-Id: I532c97934884a69f9c3a6fc2fca1639024e0965b
---
M config/00-main.yaml
M frozen-requirements.txt
M requirements.txt
M submodules/editquality
M submodules/ores
M submodules/wheels
6 files changed, 40 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy 
refs/changes/04/342704/1

diff --git a/config/00-main.yaml b/config/00-main.yaml
index 3a04c78..e67ac88 100644
--- a/config/00-main.yaml
+++ b/config/00-main.yaml
@@ -40,8 +40,10 @@
   - enwiki
   - enwiktionary
   - eswiki
+  - eswikibooks
   - etwiki
   - fawiki
+  - fiwiki
   - frwiki
   - hewiki
   - huwiki
@@ -136,12 +138,25 @@
 precache:
   reverted:
 "on": ["edit"]
+  eswikibooks:
+extractor: eswikibooks_api
+scorer_models:
+  reverted: eswikibooks_revert
+precache:
+  reverted:
+"on": ["edit"]
   etwiki:
 extractor: etwiki_api
 scorer_models:
   reverted: etwiki_revert
+  damaging: etwiki_damaging
+  goodfaith: etwiki_goodfaith
 precache:
   reverted:
+"on": ["edit"]
+  damaging:
+"on": ["edit"]
+  goodfaith:
 "on": ["edit"]
   fawiki:
 extractor: fawiki_api
@@ -155,6 +170,13 @@
   reverted:
 "on": ["edit"]
   goodfaith:
+"on": ["edit"]
+  fiwiki:
+extractor: fiwiki_api
+scorer_models:
+  reverted: fiwiki_revert
+precache:
+  reverted:
 "on": ["edit"]
   frwiki:
 extractor: frwiki_api
@@ -271,6 +293,7 @@
 scorer_models:
   reverted: testwiki_revert
   damaging: testwiki_revert
+  goodfaith: testwiki_revert
 precache:
   reverted:
 "on": ["edit"]
@@ -333,10 +356,14 @@
 host: https://en.wiktionary.org
   eswiki_api:
 host: https://es.wikipedia.org
+  eswikibooks_api:
+host: https://es.wikibooks.org
   etwiki_api:
 host: https://et.wikipedia.org
   fawiki_api:
 host: https://fa.wikipedia.org
+  fiwiki_api:
+host: https://fi.wikipedia.org
   frwiki_api:
 host: https://fr.wikipedia.org
   hewiki_api:
@@ -400,14 +427,22 @@
 model_file: submodules/editquality/models/enwiktionary.reverted.rf.model
   eswiki_revert:
 model_file: 
submodules/editquality/models/eswiki.reverted.gradient_boosting.model
+  eswikibooks_revert:
+model_file: 
submodules/editquality/models/eswikibooks.reverted.gradient_boosting.model
   etwiki_revert:
 model_file: 
submodules/editquality/models/etwiki.reverted.gradient_boosting.model
+  etwiki_damaging:
+model_file: 
submodules/editquality/models/etwiki.damaging.gradient_boosting.model
+  etwiki_goodfaith:
+model_file: 
submodules/editquality/models/etwiki.goodfaith.gradient_boosting.model
   fawiki_damaging:
 model_file: 
submodules/editquality/models/fawiki.damaging.gradient_boosting.model
   fawiki_goodfaith:
 model_file: 
submodules/editquality/models/fawiki.goodfaith.gradient_boosting.model
   fawiki_revert:
 model_file: 
submodules/editquality/models/fawiki.reverted.gradient_boosting.model
+  fiwiki_revert:
+model_file: 
submodules/editquality/models/fiwiki.reverted.gradient_boosting.model
   frwiki_revert:
 model_file: 
submodules/editquality/models/frwiki.reverted.gradient_boosting.model
   frwiki_wp10:
diff --git a/frozen-requirements.txt b/frozen-requirements.txt
index e5b0e6c..a4f4b60 100644
--- a/frozen-requirements.txt
+++ b/frozen-requirements.txt
@@ -37,7 +37,7 @@
 pywikibase==0.0.4
 redis==2.10.5
 requests==2.9.1
-revscoring==1.3.6
+revscoring==1.3.8
 scikit-learn==0.17.1
 scipy==0.17.0
 six==1.10.0
diff --git a/requirements.txt b/requirements.txt
index da63b29..2fb3999 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,6 @@
 editquality >= 0.4.1, < 0.4.999
 ores >= 0.7.3, < 0.7.999
 redis >= 2.10.5, < 2.10.999
-revscoring >= 1.2.6, < 1.2.999
+revscoring >= 1.3.6, < 1.3.999
 statsd >= 3.2.1, < 3.2.999
 wikiclass >= 0.3.1, < 0.3.999
diff --git a/submodules/editquality b/submodules/editquality
index 164cd3e..0e23620 16
--- a/submodules/editquality
+++ b/submodules/editquality
@@ -1 +1 @@
-Subproject commit 164cd3e789d364dec89fdeef973fc52aa954141f
+Subproject commit 0e2362054e22ba7a9cc692a857a8b7e2070a1ff2
diff --git a/submodules/ores b/submodules/ores
index 0346fbd..2095225 16
--- a/submodules/ores
+++ b/submodules/ores
@@ -1 +1 @@
-Subproject commit 0346fbd730387f6531fd2259ba2712332c625b8b
+Subproject commit 209522504b9030aa164058309494cccdd1f05c55
diff --git a/submodules/wheels b/submodules/wheels
index 167d8bc..9ae5385 16
--- a/submodules/wheels
+++ b/submodules/wheels
@@ -1 +1 @@
-Subproject commit 167d8bcb85ed517637e20fd0b1c16e6ddf56bdbf
+Subproject commit

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Element#scrollIntoView: Remove deprecated ...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/320431 )

Change subject: [BREAKING CHANGE] Element#scrollIntoView: Remove deprecated 
`complete` config parameter
..


[BREAKING CHANGE] Element#scrollIntoView: Remove deprecated `complete` config 
parameter

Deprecated since 0.15.4. Instead, use the return promise.

Change-Id: I808540316a7caa992f060dbf9a5d626639e801e2
---
M src/Element.js
1 file changed, 1 insertion(+), 13 deletions(-)

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



diff --git a/src/Element.js b/src/Element.js
index c1f6be7..3b9085d 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -667,22 +667,16 @@
  * @param {string} [config.duration='fast'] jQuery animation duration value
  * @param {string} [config.direction] Scroll in only one direction, e.g. 'x' 
or 'y', omit
  *  to scroll in both directions
- * @param {Function} [config.complete] Function to call when scrolling 
completes.
- *  Deprecated since 0.15.4, use the return promise instead.
  * @return {jQuery.Promise} Promise which resolves when the scroll is complete
  */
 OO.ui.Element.static.scrollIntoView = function ( el, config ) {
-   var position, animations, callback, container, $container, 
elementDimensions, containerDimensions, $window,
+   var position, animations, container, $container, elementDimensions, 
containerDimensions, $window,
deferred = $.Deferred();
 
// Configuration initialization
config = config || {};
 
animations = {};
-   callback = typeof config.complete === 'function' && config.complete;
-   if ( callback ) {
-   OO.ui.warnDeprecation( 'Element#scrollIntoView: The `complete` 
callback config option is deprecated. Use the return promise instead.' );
-   }
container = this.getClosestScrollableContainer( el, config.direction );
$container = $( container );
elementDimensions = this.getDimensions( el );
@@ -725,16 +719,10 @@
if ( !$.isEmptyObject( animations ) ) {
$container.stop( true ).animate( animations, config.duration 
=== undefined ? 'fast' : config.duration );
$container.queue( function ( next ) {
-   if ( callback ) {
-   callback();
-   }
deferred.resolve();
next();
} );
} else {
-   if ( callback ) {
-   callback();
-   }
deferred.resolve();
}
return deferred.promise();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I808540316a7caa992f060dbf9a5d626639e801e2
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] TextInputWidget: Remove type=date/month su...

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/319073 )

Change subject: [BREAKING CHANGE] TextInputWidget: Remove type=date/month 
support
..


[BREAKING CHANGE] TextInputWidget: Remove type=date/month support

This should be handled by DateInputWidget now.
(see I8f80e27304a916bba16ed255c8e78073f9da3813)

Change-Id: Ibf9988461015fb6468e62bfedfa59989dc225018
---
M php/widgets/TextInputWidget.php
M src/widgets/TextInputWidget.js
2 files changed, 2 insertions(+), 6 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  VolkerE: Looks good to me, approved



diff --git a/php/widgets/TextInputWidget.php b/php/widgets/TextInputWidget.php
index 0531256..20cf035 100644
--- a/php/widgets/TextInputWidget.php
+++ b/php/widgets/TextInputWidget.php
@@ -42,7 +42,7 @@
/**
 * @param array $config Configuration options
 * @param string $config['type'] HTML tag `type` attribute: 'text', 
'password', 'search', 'email',
-*   'url', 'date', 'month' or 'number'. Ignored if `multiline` is 
true. (default: 'text')
+*   'url' or 'number'. Ignored if `multiline` is true. (default: 
'text')
 *
 *   Some values of `type` result in additional behaviors:
 *   - `search`: implies `icon: 'search'` and `indicator: 'clear'`; 
when clicked, the indicator
@@ -189,8 +189,6 @@
'search',
'email',
'url',
-   'date',
-   'month',
'number'
];
return in_array( $config['type'], $allowedTypes ) ? 
$config['type'] : 'text';
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index f3c88ce..b208bfa 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -27,7 +27,7 @@
  * @constructor
  * @param {Object} [config] Configuration options
  * @cfg {string} [type='text'] The value of the HTML `type` attribute: 'text', 
'password', 'search',
- *  'email', 'url', 'date', 'month' or 'number'. Ignored if `multiline` is 
true.
+ *  'email', 'url' or 'number'. Ignored if `multiline` is true.
  *
  *  Some values of `type` result in additional behaviors:
  *
@@ -554,8 +554,6 @@
'search',
'email',
'url',
-   'date',
-   'month',
'number'
];
return allowedTypes.indexOf( config.type ) !== -1 ? config.type : 
'text';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf9988461015fb6468e62bfedfa59989dc225018
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Sn1per 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't use $this as a function argument

2017-03-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342496 )

Change subject: Don't use $this as a function argument
..


Don't use $this as a function argument

PHP 7.1 adds the limitation that $this cannot be used as a function
parameter. Ensure forward compatability by renaming the parameters.

Bug: T160144
Change-Id: I33d2ab1ffeeeb32e3a467cc146ee8feef0255258
---
M tests/phpunit/includes/search/SearchIndexFieldTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/search/SearchIndexFieldTest.php 
b/tests/phpunit/includes/search/SearchIndexFieldTest.php
index a5a1b7a..6b12229 100644
--- a/tests/phpunit/includes/search/SearchIndexFieldTest.php
+++ b/tests/phpunit/includes/search/SearchIndexFieldTest.php
@@ -46,7 +46,7 @@
$this->assertFalse( $field1->merge( $field2 ) );
 
$field1->setMergeCallback(
-   function ( $this, $that ) {
+   function ( $a, $b ) {
return "test";
}
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33d2ab1ffeeeb32e3a467cc146ee8feef0255258
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
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] mediawiki/core[wmf/1.29.0-wmf.16]: Make sure Swift store operations close the source file handle

2017-03-14 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342703 )

Change subject: Make sure Swift store operations close the source file handle
..

Make sure Swift store operations close the source file handle

Bug: T159607
Change-Id: I9a8907a20ba83f33cc5fc96bc15a1728770f656a
(cherry picked from commit 17c686a802016269c69789d92ddedb7c35f5c1a7)
---
M includes/libs/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/342703/1

diff --git a/includes/libs/filebackend/SwiftFileBackend.php 
b/includes/libs/filebackend/SwiftFileBackend.php
index c50dfd7..631f6fd 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -348,6 +348,8 @@
};
 
$opHandle = new SwiftFileOpHandle( $this, $handler, $reqs );
+   $opHandle->resourcesToClose[] = $handle;
+
if ( !empty( $params['async'] ) ) { // deferred
$status->value = $opHandle;
} else { // actually write the object in Swift

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a8907a20ba83f33cc5fc96bc15a1728770f656a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Aaron Schulz 

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

1 2 3 4 >

1 - 100 of 344 matches

Mail list logo