date:20170828

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fixing indentation warning

2017-08-28 Thread Chad (Code Review)

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

Change subject: Fixing indentation warning
..

Fixing indentation warning

Change-Id: Ic7836f1e4696c6764b8e00c299c88407f64815f2
---
M scap/plugins/clean.py
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index 7b3fd8b..4c970ec 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -97,9 +97,8 @@
 ])
 command_list.append([
 'clean-l10n-bootstrap',
-['rm', '-fR', os.path.join(
- self.config['stage_dir'], 'wmf-config',
- 'ExtensionMessages-%s.php' % branch)]
+['rm', '-fR', os.path.join(self.config['stage_dir'], 'wmf-config',
+   'ExtensionMessages-%s.php' % branch)]
 ])
 
 logger = self.get_logger()

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: MWReference: add reference adaptation

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: MWReference: add reference adaptation
..


MWReference: add reference adaptation

* Some misc doc tweaks noticed while inspecting the code
* Introduced TestClient for MT. Speeds up the tests and
  removed dependency on an actual MT client. It also always
  provides consistent results.

Change-Id: I1fb5b29c6d65ad6da83e4b0140138e43a3e84fd2
---
M lib/Adapter.js
A lib/mt/TestClient.js
M lib/mt/index.js
A lib/translationunits/MWReference.js
M lib/translationunits/index.js
M test/adaptation/AdaptationTests.json
M test/translationunits/MWLink.test.json
A test/translationunits/MWReference.test.js
A test/translationunits/MWReference.test.json
9 files changed, 194 insertions(+), 7 deletions(-)

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



diff --git a/lib/Adapter.js b/lib/Adapter.js
index d7aa71d..167a415 100644
--- a/lib/Adapter.js
+++ b/lib/Adapter.js
@@ -23,7 +23,7 @@
/**
 * Get the adapter for the given tag(translation unit).
 * @param {Object} element
-* @return {TranslationUnit}
+* @return {TranslationUnit|null}
 */
getAdapter( element ) {
let name, match = false,
diff --git a/lib/mt/TestClient.js b/lib/mt/TestClient.js
new file mode 100644
index 000..1ba0cca
--- /dev/null
+++ b/lib/mt/TestClient.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const MTClient = require( './MTClient.js' );
+
+class TestClient extends MTClient {
+   /**
+* Translate plain text for tests.
+*
+* @param {string} sourceLang Source language code
+* @param {string} targetLang Target language code
+* @param {string} sourceText Source language text
+* @return {Promise} Promise of the translated text
+*/
+   translateText( sourceLang, targetLang, sourceText ) {
+   return Promise.resolve( 
`[${sourceLang}→${targetLang}]${sourceText}` );
+   }
+}
+
+module.exports = TestClient;
diff --git a/lib/mt/index.js b/lib/mt/index.js
index 505fa97..d05029a 100644
--- a/lib/mt/index.js
+++ b/lib/mt/index.js
@@ -1,8 +1,9 @@
 'use strict';
 
 module.exports = {
-   Apertium: require( './Apertium.js' ),
-   Yandex: require( './Yandex.js' ),
-   Youdao: require( './Youdao.js' ),
-   Matxin: require( './Matxin.js' )
+   Apertium: require( './Apertium' ),
+   Matxin: require( './Matxin' ),
+   TestClient: require( './TestClient' ),
+   Yandex: require( './Yandex' ),
+   Youdao: require( './Youdao' )
 };
diff --git a/lib/translationunits/MWReference.js 
b/lib/translationunits/MWReference.js
new file mode 100644
index 000..ff0294c
--- /dev/null
+++ b/lib/translationunits/MWReference.js
@@ -0,0 +1,65 @@
+'use strict';
+
+const cxutil = require( '../util.js' ),
+   TranslationUnit = require( './TranslationUnit.js' );
+
+/**
+ * This class handles the `` wikitext tag.
+ *
+ * This tag rendered as span with typeof="mw:Extension/ref" and 
rel="dc:references" by parsoid.
+ * By default parsoid also adds data-mw.body.id that refers to the rendered 
element produced by
+ * the `` tag. But here we expect that data-mw.body.html is also 
provided so that
+ * it can be adapted without any dependencies to other sections of the article.
+ */
+class MWReference extends TranslationUnit {}
+
+MWReference.prototype.adapt = cxutil.async( function* () {
+   let refData, refBody, wrappedRefBody, translatedRefBody, 
unwrappedTranslatedRefBody;
+
+   // TODO: This format is not decided yet. We do need to inform client 
about failed
+   // adaptations somehow.
+   // This will be reset later if adaptation is succesful
+   this.node.attributes[ 'data-cx' ] = JSON.stringify( {
+   adapted: false
+   } );
+
+   try {
+   refData = JSON.parse( this.node.attributes[ 'data-mw' ] );
+   } catch ( e ) {
+   this.log( 'error', 'Not-adapting a reference node with non-JSON 
data-mw: ' + this.node.attributes.id );
+   return this.node;
+   }
+
+   if ( !refData ) {
+   this.log( 'error', 'Not-adapting a reference node without 
data-mw: ' + this.node.attributes.id );
+   return this.node;
+   }
+
+   refBody = refData.body && refData.body.html;
+   if ( !refBody ) {
+   this.log( 'debug', 'Not-adapting a reference node without 
data-mw.body.html: ' + this.node.attributes.id );
+   return this.node;
+   }
+
+   // MTClient only accepts content wrapped in block element tags in HTML 
mode.
+   wrappedRefBody = '' + refBody + '';
+   // TODO: Parse recursively instead of just MTing to handle templates
+   // Translate reference contents
+   translatedRefBody = yield this.context.conf.mtClient.translate(
+

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Tests: Group the segmentation tests per language

2017-08-28 Thread Santhosh (Code Review)

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

Change subject: Tests: Group the segmentation tests per language
..

Tests: Group the segmentation tests per language

Segmentation tests were not grouped.

Change-Id: I6668d91bf57224047d8feaf89f658a1fbd2f8128
---
M test/segmentation/CXSegmenter.test.js
1 file changed, 21 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/52/374452/1

diff --git a/test/segmentation/CXSegmenter.test.js 
b/test/segmentation/CXSegmenter.test.js
index 8df4c04..8cc612c 100644
--- a/test/segmentation/CXSegmenter.test.js
+++ b/test/segmentation/CXSegmenter.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var fs = require( 'fs' ),
-   lang, i, len, lang, test, tests,
+const fs = require( 'fs' ),
assert = require( '../utils/assert.js' ),
LinearDoc = require( '../../lib/lineardoc' ),
Segmenter = require( '../../lib/segmentation/CXSegmenter' ),
@@ -14,32 +13,29 @@
return normalizer.getHtml();
 }
 
-function runTest( test ) {
-   var segmenter, result, testData, expectedResultData;
+function runTest( test, lang ) {
+   let testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
 
-   describe( 'Segmentation tests', function () {
-   testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
-
-   segmenter = new Segmenter( testData, lang );
-   segmenter.segment();
-   result = normalize( segmenter.getSegmentedContent() );
-   expectedResultData = normalize(
-   fs.readFileSync( __dirname + '/data/' + test.result, 
'utf8' )
-   );
-   it( 'should not have any errors when: ' + test.desc, function 
() {
-   assert.deepEqual( result, expectedResultData, 
test.source + ': ' + test.desc || '' );
-   } );
+   let segmenter = new Segmenter( testData, lang );
+   segmenter.segment();
+   let result = normalize( segmenter.getSegmentedContent() );
+   let expectedResultData = normalize(
+   fs.readFileSync( __dirname + '/data/' + test.result, 'utf8' )
+   );
+   it( 'should not have any errors when: ' + test.desc, () => {
+   assert.deepEqual( result, expectedResultData, test.source + ': 
' + test.desc || '' );
} );
 }
 
-for ( lang in allTests ) {
-   tests = allTests[ lang ];
-   len = tests.length;
-   for ( i = 0; i < len; i++ ) {
-   test = tests[ i ];
-   if ( test.skip ) {
-   continue;
+for ( let lang in allTests ) {
+   describe( 'Segmentation tests for ' + lang, () => {
+   let tests = allTests[ lang ];
+   let len = tests.length;
+   for ( let i = 0; i < len; i++ ) {
+   if ( tests[ i ].skip ) {
+   continue;
+   }
+   runTest( tests[ i ], lang );
}
-   runTest( test );
-   }
+   } );
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6668d91bf57224047d8feaf89f658a1fbd2f8128
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make it possible to inject a different Preferences object

2017-08-28 Thread Samwilson (Code Review)

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

Change subject: Make it possible to inject a different Preferences object
..

Make it possible to inject a different Preferences object

This makes some changes relating to subclassing Preferences and
PreferencesForm.

Add a new hook 'PreferencesFactory' that is run in the
Preferences::factory() method, to allow extensions to change the
returned Preferences object however they want. See docs/hooks.txt
for details.

Fix the constructor of SpecialPreferences to match that of its
parent, so subclasses can do the same.

Fix the help link of SpecialPreferences to not be hard-coded to
'Help:Preferences' but instead use the title of the special page.

Move the setting of the submit callback for the PreferencesForm
into SpecialPreferences::getFormObject() so that implementors of
this method can provide their own callback.

Bug: T173476
Change-Id: I3f7e9067c2faa915c2b05a2ae01312c3f2fee2ea
---
M includes/Preferences.php
M includes/specials/SpecialPreferences.php
2 files changed, 28 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/374451/1

diff --git a/includes/Preferences.php b/includes/Preferences.php
index c64e8a8..7b8d526 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -67,6 +67,18 @@
];
 
/**
+* Get a new Preferences object.
+* @param User $user The user who owns the preferences.
+* @param IContextSource $contextSource The context in which the 
preferences are being used.
+* @return static
+*/
+   public static function factory( User $user, IContextSource 
$contextSource ) {
+   $preferences = new static();
+   Hooks::run( 'PreferencesFactory', [ $user, $contextSource, 
&$preferences ] );
+   return $preferences;
+   }
+
+   /**
 * @return array
 */
static function getSaveBlacklist() {
@@ -1332,7 +1344,7 @@
$formClass = 'PreferencesForm',
array $remove = []
) {
-   $formDescriptor = self::getPreferences( $user, $context );
+   $formDescriptor = static::getPreferences( $user, $context );
if ( count( $remove ) ) {
$removeKeys = array_flip( $remove );
$formDescriptor = array_diff_key( $formDescriptor, 
$removeKeys );
diff --git a/includes/specials/SpecialPreferences.php 
b/includes/specials/SpecialPreferences.php
index ba5a57e..233615b 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -27,8 +27,16 @@
  * @ingroup SpecialPage
  */
 class SpecialPreferences extends SpecialPage {
-   function __construct() {
-   parent::__construct( 'Preferences' );
+
+   public function __construct(
+   $name = 'Preferences',
+   $restriction = '',
+   $listed = true,
+   $function = false,
+   $file = '',
+   $includable = false
+   ) {
+   parent::__construct( $name, $restriction, $listed, $function, 
$file, $includable );
}
 
public function doesWrites() {
@@ -72,7 +80,7 @@
);
}
 
-   $this->addHelpLink( 'Help:Preferences' );
+   $this->addHelpLink( 'Help:' . $this->getPageTitle()->getText() 
);
 
// Load the user from the master to reduce CAS errors on double 
post (T95839)
if ( $this->getRequest()->wasPosted() ) {
@@ -82,7 +90,6 @@
}
 
$htmlForm = $this->getFormObject( $user, $this->getContext() );
-   $htmlForm->setSubmitCallback( [ 'Preferences', 'tryUISubmit' ] 
);
$sectionTitles = $htmlForm->getPreferenceSections();
 
$prefTabs = '';
@@ -124,7 +131,10 @@
 * @return PreferencesForm|HtmlForm
 */
protected function getFormObject( $user, IContextSource $context ) {
-   return Preferences::getFormObject( $user, $context );
+   $preferences = Preferences::factory( $user, $context );
+   $form = $preferences::getFormObject( $user, $context );
+   $form->setSubmitCallback( [ $preferences, 'tryUISubmit' ] );
+   return $form;
}
 
private function showResetForm() {

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

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

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...EmailAuthorization[master]: Adds request/approve account special pages and hooks.

2017-08-28 Thread Cicalese (Code Review)

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

Change subject: Adds request/approve account special pages and hooks.
..


Adds request/approve account special pages and hooks.

T173378
Change-Id: I97c2c995eb0eeea760824468d3b4453f6e7ccb09
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/EchoEAPresentationModel.php
R includes/EmailAuthorization.alias.php
A includes/EmailAuthorizationApprove.php
M includes/EmailAuthorizationConfig.php
M includes/EmailAuthorizationHooks.php
A includes/EmailAuthorizationRequest.php
R sql/EmailAuth.sql
A sql/EmailRequest.sql
11 files changed, 768 insertions(+), 17 deletions(-)

Approvals:
  Cicalese: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/extension.json b/extension.json
index 0f991aa..4c72bc2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Email Authorization",
-   "version": "1.2",
+   "version": "1.3",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],
@@ -9,7 +9,9 @@
"license-name": "MIT",
"type": "other",
"SpecialPages": {
-   "EmailAuthorizationConfig": "EmailAuthorizationConfig"
+   "EmailAuthorizationConfig": "EmailAuthorizationConfig",
+   "EmailAuthorizationRequest": "EmailAuthorizationRequest",
+   "EmailAuthorizationApprove": "EmailAuthorizationApprove"
},
"MessagesDirs": {
"EmailAuthorization": [
@@ -17,7 +19,7 @@
]
},
"ExtensionMessagesFiles": {
-   "EmailAuthorizationAlias": 
"includes/EmailAuthorizationConfig.alias.php"
+   "EmailAuthorizationAlias": 
"includes/EmailAuthorization.alias.php"
},
"ResourceModules": {
"ext.EmailAuthorization": {
@@ -37,13 +39,22 @@
"AutoloadClasses": {
"EmailAuthorization": "includes/EmailAuthorization.php",
"EmailAuthorizationHooks": 
"includes/EmailAuthorizationHooks.php",
-   "EmailAuthorizationConfig": 
"includes/EmailAuthorizationConfig.php"
+   "EmailAuthorizationConfig": 
"includes/EmailAuthorizationConfig.php",
+   "EmailAuthorizationRequest": 
"includes/EmailAuthorizationRequest.php",
+   "EmailAuthorizationApprove": 
"includes/EmailAuthorizationApprove.php",
+   "EchoEAPresentationModel": 
"includes/EchoEAPresentationModel.php"
},
"Hooks": {
"PluggableAuthUserAuthorization": [ 
"EmailAuthorizationHooks::authorize" ],
"LoadExtensionSchemaUpdates": [
"EmailAuthorizationHooks::loadExtensionSchemaUpdates"
-   ]
+   ],
+   "BeforeCreateEchoEvent": 
"EmailAuthorizationHooks::onBeforeCreateEchoEvent"
+   },
+   "callback": "EmailAuthorizationHooks::onRegistration",
+   "config": {
+   "EmailAuthorization_EnableRequests": false,
+   "EmailAuthorization_RequestFields": []
},
"manifest_version": 1
 }
diff --git a/i18n/en.json b/i18n/en.json
index 3535d27..1e58e35 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,7 +5,7 @@
]
},
"emailauthorization-desc": "Authorize users by email address",
-   "emailauthorizationconfig": "Configure Email Authorization",
+   "emailauthorizationconfig": "Email Authorization Dashboard",
"emailauthorization-config-instructions": "To add or revoke all email 
addresses in a domain use ''@domain'', where ''domain'' is the email domain. 
This will not affect other email addresses explicitly added in that domain.",
"emailauthorization-config-authorized": "''$1'' is authorized.",
"emailauthorization-config-notauthorized": "''$1'' is not authorized.",
@@ -15,7 +15,7 @@
"emailauthorization-config-noauthfound": "No authorized email addresses 
or domains found.",
"emailauthorization-config-nousersfound": "No users found.",
"emailauthorization-config-invalidemail": "''$1'' is not a valid email 
address or domain.",
-   "emailauthorization-config-label-email": "Email",
+   "emailauthorization-config-label-email": "Email Address",
"emailauthorization-config-label-username": "Username",
"emailauthorization-config-label-realname": "Real Name",
"emailauthorization-config-label-userpage": "User Page",
@@ -34,6 +34,29 @@
"emailauthorization-config-button-showauth": "Show authorized email 
addresses and domains",
"emailauthorization-config-button-showall": "Show all wiki users",
"right-emailauthorizationconfig": "Configure user authorization by 
email address",
-   "action-emailauthorizationconfig": "configure email authorization"
-
+

[MediaWiki-commits] [Gerrit] labs...extreg-wos[master]: Major revamp

2017-08-28 Thread Legoktm (Code Review)

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

Change subject: Major revamp
..


Major revamp

* Use flask for rendering frontend
* Get files from Phabricator instead of maintaining local git clones
* Get extension list from ExtensionDistributor

Change-Id: Ic18c7489ac7f618f3dc2cf9dfc071d4784db27b3
---
A app.py
M generate.py
M requirements.txt
R static/wos.css
4 files changed, 101 insertions(+), 66 deletions(-)

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



diff --git a/app.py b/app.py
new file mode 100644
index 000..9b50ef3
--- /dev/null
+++ b/app.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+"""
+extreg-wos creates a list of extensions and their status on conversion
+Copyright (C) 2015-2017 Kunal Mehta 
+Copyright (C) 2016 Reedy 
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see .
+"""
+
+from flask import Flask, jsonify
+import json
+import os
+import toolforge
+
+import generate
+
+
+app = Flask(__name__)
+app.before_request(toolforge.redirect_to_https)
+
+DATA_PATH = os.path.join(os.path.dirname(__file__), 'data.json')
+
+
+def get_data():
+with open(DATA_PATH) as f:
+data = json.load(f)
+
+return data
+
+@app.route('/toolinfo.json')
+def toolinfo():
+return jsonify(
+name='extreg-wos',
+title='Extension registration wall of sadness',
+description='Table showing the progress of extension registration 
through MediaWiki extensions.',
+url='https://tools.wmflabs.org/extreg-wos/',
+keywords='MediaWiki',
+author='Legoktm',
+repository='https://github.com/wikimedia/labs-tools-extreg-wos'
+)
+
+
+@app.route('/data.json')
+def data():
+return jsonify(**get_data())
+
+@app.route('/')
+def main():
+data = get_data()
+return generate.build_html(data)
+
+
+if __name__ == '__main__':
+app.run(debug=True)
diff --git a/generate.py b/generate.py
index f977002..04ffd13 100644
--- a/generate.py
+++ b/generate.py
@@ -22,17 +22,16 @@
 import os
 import phabricator
 import requests
-import subprocess
-import sys
-import wmflabs
+import toolforge
 
-wmflabs.set_user_agent('extreg-wos')
+toolforge.set_user_agent('extreg-wos')
 
 with open('config.json') as f:
 conf = json.load(f)
 
 ON_LABS = os.environ.get('INSTANCEPROJECT') == 'tools'
 phab = phabricator.Phabricator(conf['PHAB_HOST'], conf['PHAB_USER'], 
conf['PHAB_CERT'])
+s = requests.Session()
 
 MW_DIR = '/data/project/extreg-wos/src' if ON_LABS else 
'/home/km/projects/gerrit/mediawiki'
 WMF_TRACKING = 87875
@@ -43,17 +42,12 @@
 
 
 def get_all_things(thing):
-ext_dir = os.path.join(MW_DIR, thing)
-return sorted(
-os.path.join(ext_dir, path)
-for path in os.listdir(ext_dir)
-if not path.startswith('.') and os.path.isdir(os.path.join(ext_dir, 
path))
-)
+return get_repos()[thing]
 
 
 def get_archived():
 data = set()
-r = requests.get(
+r = s.get(
 'https://www.mediawiki.org/w/api.php?action=query' +
 
'=categorymembers=Category:Archived%20extensions=max=json'
 )
@@ -64,8 +58,27 @@
 return data
 
 
+def get_repos():
+r = s.get(
+
'https://www.mediawiki.org/w/api.php?action=query=extdistrepos=2=json'
+)
+j = r.json()
+return j['query']['extdistrepos']
+
+
+def get_phab_file(gerrit_name, path):
+url = 
'https://phabricator.wikimedia.org/r/p/{};browse/master/{}?view=raw'.format(gerrit_name,
 path)
+print('Fetching ' + url)
+r = s.get(url)
+try:
+return r.json()
+except:
+return None
+
+
 def get_bugs(task_id, wmf):
 data = {}
+return data
 blocker_info = phab.request('maniphest.info', {'task_id': task_id})
 for phid in blocker_info['dependsOnTaskPHIDs']:
 phid_info = phab.request('phid.query', {'phids': [phid]})[phid]
@@ -108,7 +121,7 @@
 
 
 {title}
-
+
 
 
 {title}{excite}
@@ -132,7 +145,6 @@
 Version
 
 """.format(converted=converted, total=total, percent=percent, title=title, 
excite=excite)
-
 for name in sorted(data):
 converted_class = 'no'
 converted_text = 'No'
@@ -177,33 +189,7 @@
 
 """.format(generated=datetime.datetime.utcnow())
 
-with open(OUTPUT_DIR + 'index.html', 'w') as f:
-f.write(text)
-

[MediaWiki-commits] [Gerrit] mediawiki...BoilerPlate[master]: Put under "MediaWiki\Extension" namespace

2017-08-28 Thread Legoktm (Code Review)

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

Change subject: Put under "MediaWiki\Extension" namespace
..

Put under "MediaWiki\Extension" namespace

Per T166010, which recommends a singular version.

Change-Id: I0c93e81760b0c883065ff5736884dab26e501b26
---
M BoilerPlate.hooks.php
M extension.json
M specials/SpecialHelloWorld.php
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BoilerPlate 
refs/changes/50/374450/1

diff --git a/BoilerPlate.hooks.php b/BoilerPlate.hooks.php
index 375dbf9..4b31efd 100644
--- a/BoilerPlate.hooks.php
+++ b/BoilerPlate.hooks.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/374450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Move code that lists in-progress renames to GlobalRenameUser...

2017-08-28 Thread Legoktm (Code Review)

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

Change subject: Move code that lists in-progress renames to 
GlobalRenameUserStatus
..

Move code that lists in-progress renames to GlobalRenameUserStatus

This makes it resuable in the future.

Change-Id: I18a7c2a92d65e8d2f028ae613514197ec06c0244
---
M includes/GlobalRename/GlobalRenameUserStatus.php
M includes/specials/SpecialGlobalRenameProgress.php
2 files changed, 43 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/48/374448/1

diff --git a/includes/GlobalRename/GlobalRenameUserStatus.php 
b/includes/GlobalRename/GlobalRenameUserStatus.php
index 2104c22..effc2a0 100644
--- a/includes/GlobalRename/GlobalRenameUserStatus.php
+++ b/includes/GlobalRename/GlobalRenameUserStatus.php
@@ -1,5 +1,4 @@
 
  */
+
+use Wikimedia\Rdbms\IDatabase;
 
 class GlobalRenameUserStatus implements IDBAccessObject {
 
@@ -223,4 +224,39 @@
$fname
);
}
+
+   /**
+* Get a list of all currently in progress renames
+*
+* @param User $forUser User viewing the list, for permissions checks
+* @return string[] old username => new username
+*/
+   public static function getInProgressRenames( User $forUser ) {
+   $dbr = CentralAuthUtils::getCentralSlaveDB();
+   $tables = [ 'renameuser_status' ];
+   if ( !$forUser->isAllowed( 'centralauth-oversight' ) ) {
+   $join_conds = [ 'globaluser' => [
+   'INNER JOIN', [ 'gu_name=ru_newname', 
'gu_hidden=""' ]
+   ] ];
+   $tables[] = 'globaluser';
+   } else {
+   $join_conds = [];
+   }
+
+   $res = $dbr->select(
+   $tables,
+   [ 'ru_oldname', 'ru_newname' ],
+   [],
+   __METHOD__,
+   [ 'DISTINCT' ],
+   $join_conds
+   );
+
+   $ret = [];
+   foreach ( $res as $row ) {
+   $ret[$row->ru_oldname] = $row->ru_newname;
+   }
+
+   return $ret;
+   }
 }
diff --git a/includes/specials/SpecialGlobalRenameProgress.php 
b/includes/specials/SpecialGlobalRenameProgress.php
index 8df5bdc..132c2fd 100644
--- a/includes/specials/SpecialGlobalRenameProgress.php
+++ b/includes/specials/SpecialGlobalRenameProgress.php
@@ -55,38 +55,18 @@
}
 
function showCurrentRenames() {
-   $dbr = CentralAuthUtils::getCentralSlaveDB();
-   $tables = [ 'renameuser_status' ];
-   if ( !$this->getUser()->isAllowed( 'centralauth-oversight' ) ) {
-   $join_conds = [ 'globaluser' => [
-   'INNER JOIN', [ 'gu_name=ru_newname', 
'gu_hidden=""' ]
-   ] ];
-   $tables[] = 'globaluser';
-   } else {
-   $join_conds = [];
-   }
+   $renames = GlobalRenameUserStatus::getInProgressRenames( 
$this->getUser() );
 
-   $res = $dbr->select(
-   $tables,
-   [ 'ru_oldname', 'ru_newname' ],
-   [],
-   __METHOD__,
-   [ 'DISTINCT' ],
-   $join_conds
-   );
+   if ( !$renames ) {
+   return;
+   }
 
$html = "\n";
-   $hasResults = false;
-   foreach ( $res as $row ) {
-   $hasResults = true;
+   foreach ( $renames as $oldname => $newname ) {
$html .= '' .
$this->msg( 'centralauth-rename-progress-item' )
-   ->params( $row->ru_oldname, 
$row->ru_newname )->parse() .
+   ->params( $oldname, $newname )->parse() 
.
"\n";
-   }
-
-   if ( !$hasResults ) {
-   return;
}
 
$html .= "\n";

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: API: Add action=query=globalrenamestatus

2017-08-28 Thread Legoktm (Code Review)

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

Change subject: API: Add action=query=globalrenamestatus
..

API: Add action=query=globalrenamestatus

Equivalent of Special:GlobalRenameStatus for the API.

Change-Id: I0b75a6bf798722aa60319350ea82aed9ae04f9c7
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/49/374449/1

diff --git a/extension.json b/extension.json
index 5d8bda6..8ebbb91 100644
--- a/extension.json
+++ b/extension.json
@@ -160,7 +160,8 @@
"globaluserrights": "ApiGlobalUserRights"
},
"APIMetaModules": {
-   "globaluserinfo": "ApiQueryGlobalUserInfo"
+   "globaluserinfo": "ApiQueryGlobalUserInfo",
+   "globalrenamestatus": "ApiQueryGlobalRenameStatus"
},
"APIListModules": {
"globalgroups": "ApiQueryGlobalGroups",
@@ -208,6 +209,7 @@
"SpecialGlobalGroupPermissions": 
"includes/specials/SpecialGlobalGroupPermissions.php",
"SpecialWikiSets": "includes/specials/SpecialWikiSets.php",
"ApiQueryGlobalUserInfo": 
"includes/api/ApiQueryGlobalUserInfo.php",
+   "ApiQueryGlobalRenameStatus": 
"includes/api/ApiQueryGlobalRenameStatus.php",
"ApiDeleteGlobalAccount": 
"includes/api/ApiDeleteGlobalAccount.php",
"ApiSetGlobalAccountStatus": 
"includes/api/ApiSetGlobalAccountStatus.php",
"ApiQueryGlobalGroups": "includes/api/ApiQueryGlobalGroups.php",
diff --git a/i18n/en.json b/i18n/en.json
index a4717e6..051cedb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -535,6 +535,10 @@
"apihelp-query+globalgroups-param-prop": "What pieces of information to 
include.",
"apihelp-query+globalgroups-example-1": "List global groups",
"apihelp-query+globalgroups-example-2": "Show global groups with the 
rights they grant",
+   "apihelp-query+globalrenamestatus-description": "Show information about 
global renames that are in progress.",
+   "apihelp-query+globalrenamestatus-summary": "Show information about 
global renames that are in progress.",
+   "apihelp-query+globalrenamestatus-param-user": "User that is being 
renamed. Can be either their old name or new name.",
+   "apihelp-query+globalrenamestatus-example-1": "Get information about 
the current global user",
"apihelp-query+globaluserinfo-description": "Show information about a 
global user.",
"apihelp-query+globaluserinfo-summary": "Show information about a 
global user.",
"apihelp-query+globaluserinfo-param-user": "User to get information 
about. Defaults to the current user.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 38403fb..ba5251f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -557,6 +557,10 @@
"apihelp-query+globaluserinfo-param-prop": 
"{{doc-apihelp-param|query+globaluserinfo|prop}}",
"apihelp-query+globaluserinfo-example-1": 
"{{doc-apihelp-example|query+globaluserinfo}}",
"apihelp-query+globaluserinfo-example-2": 
"{{doc-apihelp-example|query+globaluserinfo}}",
+   "apihelp-query+globalrenamestatus-description": 
"{{doc-apihelp-description|query+globalrenamestatus}}",
+   "apihelp-query+globalrenamestatus-summary": 
"{{doc-apihelp-summary|query+globalrenamestatus}}",
+   "apihelp-query+globalrenamestatus-param-user": 
"{{doc-apihelp-param|query+globalrenamestatus|user}}",
+   "apihelp-query+globalrenamestatus-example-1": 
"{{doc-apihelp-example|query+globalrenamestatus}}",
"apihelp-query+wikisets-description": 
"{{doc-apihelp-description|query+wikisets}}",
"apihelp-query+wikisets-summary": 
"{{doc-apihelp-summary|query+wikisets}}",
"apihelp-query+wikisets-param-from": 
"{{doc-apihelp-param|query+wikisets|from}}",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Rename sidebar icon

2017-08-28 Thread GeorgeBarnick (Code Review)

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

Change subject: Rename sidebar icon
..


Rename sidebar icon

Not sure why it was ever called "rightbar" when by default it's on the
left, but it's a nondescriptive filename nonetheless and doesn't make a
difference whether Refreshed is in ltr or rtl mode, so here's a more
descriptive and relevant filename.

Change-Id: Ic2a7da57cf0acaf1f2577b5705e9cb4363c94b9c
---
R refreshed/images/icon-sidebar-toggle.png
M refreshed/styles/screen/main.css
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  GeorgeBarnick: Verified; Looks good to me, approved
  MacFan4000: Looks good to me, but someone else must approve



diff --git a/refreshed/images/icon-rightbar.png 
b/refreshed/images/icon-sidebar-toggle.png
similarity index 100%
rename from refreshed/images/icon-rightbar.png
rename to refreshed/images/icon-sidebar-toggle.png
Binary files differ
diff --git a/refreshed/styles/screen/main.css b/refreshed/styles/screen/main.css
index 0db40e9..4fa3a5f 100755
--- a/refreshed/styles/screen/main.css
+++ b/refreshed/styles/screen/main.css
@@ -172,7 +172,7 @@
top: 0;
right: -3em;
background-color: #194a8d;
-   background-image: url(../../images/icon-rightbar.png);
+   background-image: url(../../images/icon-sidebar-toggle.png);
background-size: 3em;
display: none;
-ms-transition: right 0.2s ease 0s;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2a7da57cf0acaf1f2577b5705e9cb4363c94b9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: GeorgeBarnick 
Gerrit-Reviewer: GeorgeBarnick 
Gerrit-Reviewer: MacFan4000 
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]: WLFilters: set default values

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: WLFilters: set default values
..


WLFilters: set default values

* Respect different default values for 'limit' and 'day'
  in RC and WL.

* Make 'latestrevision' respect 'watchlistextended'

Introducing 2 properties to ChangesListBooleanFilter
* activeValue: The value that defines when a filter is active.
  Most filters are active when they are set to 'true' but
  'extended' has no effect when it is 'true' and applies
  filtering when it is set to false.

* isVisible: Whether this filter is visible anywhere.
  'extended' is not visible in the legacy form but
  it is activated from preference or URL. When
  understanding form submission, it should not be assume
  to be 'false' when not present in the request.

Bug: T171134
Change-Id: I3e48a9f2d9b70f0b9f6d7c6329db9c8e8001ee49
---
M includes/changes/ChangesListBooleanFilter.php
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
5 files changed, 116 insertions(+), 28 deletions(-)

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



diff --git a/includes/changes/ChangesListBooleanFilter.php 
b/includes/changes/ChangesListBooleanFilter.php
index 01e67f5..961cb48 100644
--- a/includes/changes/ChangesListBooleanFilter.php
+++ b/includes/changes/ChangesListBooleanFilter.php
@@ -67,6 +67,20 @@
protected $queryCallable;
 
/**
+* Value that defined when this filter is considered active
+*
+* @var bool $activeValue
+*/
+   protected $activeValue;
+
+   /**
+* Whether this filter is visible somewhere (legacy form or structured 
UI).
+*
+* @var bool $isVisible
+*/
+   protected $isVisible;
+
+   /**
 * Create a new filter with the specified configuration.
 *
 * It infers which UI (it can be either or both) to display the filter 
on based on
@@ -90,6 +104,10 @@
 * to true.  It does not need to be set if the exact same filter is 
simply visible
 * on both.
 * * $filterDefinition['default'] bool Default
+* * $filterDefinition['activeValue'] bool This filter is considered 
active when
+* its value is equal to its activeValue. Default is true.
+* * $filterDefinition['isVisible'] bool This filter is visible in the 
legacy form or
+* structured UI. Default is true.
 * * $filterDefinition['priority'] int Priority integer.  Higher value 
means higher
 * up in the group's filter list.
 * * $filterDefinition['queryCallable'] callable Callable accepting 
parameters, used
@@ -126,6 +144,18 @@
if ( isset( $filterDefinition['queryCallable'] ) ) {
$this->queryCallable = 
$filterDefinition['queryCallable'];
}
+
+   if ( isset( $filterDefinition['activeValue'] ) ) {
+   $this->activeValue = $filterDefinition['activeValue'];
+   } else {
+   $this->activeValue = true;
+   }
+
+   if ( isset( $filterDefinition['isVisible'] ) ) {
+   $this->isVisible = $filterDefinition['isVisible'];
+   } else {
+   $this->isVisible = true;
+   }
}
 
/**
@@ -136,7 +166,7 @@
 */
public function getDefault( $structuredUI = false ) {
return $this->isReplacedInStructuredUi && $structuredUI ?
-   false :
+   !$this->activeValue :
$this->defaultValue;
}
 
@@ -225,4 +255,24 @@
return $opts[ $sibling->getName() ];
} );
}
+
+   /**
+* @param FormOptions $opts Query parameters merged with defaults
+* @param bool $isStructuredUI Whether the structured UI is currently 
enabled
+* @return bool Whether this filter should be considered active
+*/
+   public function isActive( FormOptions $opts, $isStructuredUI ) {
+   if ( $this->isReplacedInStructuredUi && $isStructuredUI ) {
+   return false;
+   }
+
+   return $opts[ $this->getName() ] === $this->activeValue;
+   }
+
+   /**
+* @return bool Whether this filter is visible anywhere
+*/
+   public function isVisible() {
+   return $this->isVisible;
+   }
 }
diff --git a/includes/specialpage/ChangesListSpecialPage.php 
b/includes/specialpage/ChangesListSpecialPage.php
index 52db51a..4d27d35 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Fix having to relogin for Special:CreatePage

2017-08-28 Thread MaxSem (Code Review)

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

Change subject: Fix having to relogin for Special:CreatePage
..

Fix having to relogin for Special:CreatePage

You usually don't need to call parent method from your special
page's execute().

Change-Id: I25b2e98e256484723107971460cc488fc90068d5
---
M includes/SpecialCreatePage.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/47/374447/1

diff --git a/includes/SpecialCreatePage.php b/includes/SpecialCreatePage.php
index bc48154..ec3be2a 100644
--- a/includes/SpecialCreatePage.php
+++ b/includes/SpecialCreatePage.php
@@ -29,7 +29,8 @@
 * @param string|null $subPage
 */
public function execute( $subPage ) {
-   parent::execute( $subPage );
+   $this->setHeaders();
+   $this->outputHeader();
 
$config = MediaWikiServices::getInstance()
->getConfigFactory()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25b2e98e256484723107971460cc488fc90068d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
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]: Set $wgScoreSafeMode to false

2017-08-28 Thread Ebe123 (Code Review)

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

Change subject: Set $wgScoreSafeMode to false
..

Set $wgScoreSafeMode to false

Will permit greater flexibility in Lilypond use.

Bug: T174413
Change-Id: I4f15a048b61fbaf9e696147aa05aa638fbb0e80b
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fa7af44..33e6593 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1077,7 +1077,7 @@
 
 if ( $wmgUseScore ) {
wfLoadExtension( 'Score' );
-   $wgScoreSafeMode = true;
+   $wgScoreSafeMode = false;
$wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
$wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
$wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: $wgScoreSafeMode = false

2017-08-28 Thread Reedy (Code Review)

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

Change subject: $wgScoreSafeMode = false
..

$wgScoreSafeMode = false

Bug: T174413
Change-Id: Ib506ef48786bdcb158ea0bd6c9fdf07477aac554
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fa7af44..a7ef253 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1083,6 +1083,7 @@
$wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;
+   $wgScoreSafeMode = false;
 }
 
 $wgHiddenPrefs[] = 'realname';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VipsScaler[master]: Use full path to binaries

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Use full path to binaries
..

Use full path to binaries

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


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

diff --git a/extension.json b/extension.json
index 381d854..55ea206 100644
--- a/extension.json
+++ b/extension.json
@@ -69,7 +69,7 @@
"remoteSkinPath": "VipsScaler"
},
"config": {
-   "VipsCommand": "vips",
+   "VipsCommand": "/usr/bin/vips",
"VipsOptions": [],
"VipsThumbnailerHost": null,
"VipsTestExpiry": 3600

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e532780bd608be54aac40f8dc3ff8d8750f4d2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VipsScaler
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...PdfHandler[master]: Use full path to binaries

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Use full path to binaries
..

Use full path to binaries

Change-Id: Ide41d292b2ac4c6b448020db0109c0ed74bbc32e
---
M extension.json
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PdfHandler 
refs/changes/43/374443/1

diff --git a/extension.json b/extension.json
index 9f7e240..73aa6f6 100644
--- a/extension.json
+++ b/extension.json
@@ -15,11 +15,11 @@
"PdfOutputExtension": "jpg",
"PdfHandlerDpi": 150,
"PdfCreateThumbnailsInJobQueue": false,
-   "PdfPostProcessor": "convert",
+   "PdfPostProcessor": "/usr/bin/convert",
"PdfHandlerJpegQuality": 95,
-   "PdftoText": "pdftotext",
-   "PdfProcessor": "gs",
-   "PdfInfo": "pdfinfo"
+   "PdftoText": "/usr/bin/pdftotext",
+   "PdfProcessor": "/usr/bin/gs",
+   "PdfInfo": "/usr/bin/pdfinfo"
},
"MessagesDirs": {
"PdfHandler": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide41d292b2ac4c6b448020db0109c0ed74bbc32e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PdfHandler
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Bump versionCode
..


Bump versionCode

Change-Id: Id8179ebf60b3a0f7c4862f3c1389a72289200498
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 7c52951..fa6e1e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 202
+versionCode 203
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8179ebf60b3a0f7c4862f3c1389a72289200498
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
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...rainbow[develop]: Add a tab to track morelike search usage

2017-08-28 Thread Chelsyx (Code Review)

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

Change subject: Add a tab to track morelike search usage
..

Add a tab to track morelike search usage

Bug: https://phabricator.wikimedia.org/T172452
Change-Id: I0d0b107df1f6b46a28b8e2c025d1acf5f0fec327
---
M modules/api.R
M modules/key_performance_metrics/api_usage.R
M tab_documentation/fulltext_basic.md
M tab_documentation/geo_basic.md
M tab_documentation/kpi_api_usage.md
M tab_documentation/language_basic.md
A tab_documentation/morelike_basic.md
M tab_documentation/open_basic.md
M tab_documentation/prefix_basic.md
M ui.R
10 files changed, 45 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/42/374442/1

diff --git a/modules/api.R b/modules/api.R
index 73368cd..8838a99 100644
--- a/modules/api.R
+++ b/modules/api.R
@@ -6,7 +6,17 @@
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Full-text 
via API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
 dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
-dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
+dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = "bottom")
+})
+
+output$morelike_aggregate <- renderDygraph({
+  split_dataset$`cirrus (more like)` %>%
+dplyr::group_by(date) %>%
+dplyr::mutate(All = sum(calls, na.rm = TRUE)) %>%
+tidyr::spread(key = referer_class, value = calls) %>%
+polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_morelike_search)) 
%>%
+polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Morelike 
Search via API usage by day", legend_name = "Searches") %>%
+dyRangeSelector
 })
 
 output$open_aggregate <- renderDygraph({
@@ -17,7 +27,7 @@
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "OpenSearch 
API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
 dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
-dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
+dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$geo_aggregate <- renderDygraph({
@@ -28,7 +38,7 @@
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Geo Search 
API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
 dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
-dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
+dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$language_aggregate <- renderDygraph({
@@ -39,7 +49,7 @@
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Language 
Search API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
 dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
-dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
+dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$prefix_aggregate <- renderDygraph({
@@ -50,5 +60,5 @@
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Prefix 
Search API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
 dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
-dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
+dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = "bottom")
 })
diff --git a/modules/key_performance_metrics/api_usage.R 
b/modules/key_performance_metrics/api_usage.R
index 13a4c3a..b1ba34b 100644
--- a/modules/key_performance_metrics/api_usage.R
+++ b/modules/key_performance_metrics/api_usage.R
@@ -40,7 +40,7 @@
  dyCSS(css = system.file("custom.css", package = "polloi")) %>%
  dyRangeSelector %>%
  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = 
"bottom") %>%
- dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = 
"bottom"))
+ dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = 
"bottom"))
   }
   api_usage_change <- api_usage %>%
 dplyr::mutate(
@@ -63,5 +63,5 @@
dyCSS(css = system.file("custom.css", package = "polloi")) %>%
dyRangeSelector %>%
dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = 
"bottom") %>%
-   dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom"))
+   dyEvent(as.Date("2017-06-29"), "U (new UDF)", labelLoc = "bottom"))
 })
diff --git a/tab_documentation/fulltext_basic.md 
b/tab_documentation/fulltext_basic.md
index c2a121a..76826cf 100644
--- a/tab_documentation/fulltext_basic.md
+++ b/tab_documentation/fulltext_basic.md
@@ -13,7 +13,7 @@
 --
 
 * '__R__': on

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

2017-08-28 Thread Dbrant (Code Review)

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

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: Id8179ebf60b3a0f7c4862f3c1389a72289200498
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 7c52951..fa6e1e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 202
+versionCode 203
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8179ebf60b3a0f7c4862f3c1389a72289200498
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Swap --output for -o in $wgScoreAbc2Ly shell command

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Swap --output for -o in $wgScoreAbc2Ly shell command
..


Swap --output for -o in $wgScoreAbc2Ly shell command

Bug: T172582
Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
---
M Score.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Score.body.php b/Score.body.php
index eff9052..b7e8342 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' --output=' . wfEscapeShellArg( $destFile )
+   . ' -o ' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[wmf/1.30.0-wmf.15]: Swap --output for -o in $wgScoreAbc2Ly shell command

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Swap --output for -o in $wgScoreAbc2Ly shell command
..


Swap --output for -o in $wgScoreAbc2Ly shell command

Bug: T172582
Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
---
M Score.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Score.body.php b/Score.body.php
index 5f68105..b434f2c 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' --output=' . wfEscapeShellArg( $destFile )
+   . ' -o ' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[wmf/1.30.0-wmf.15]: Swap --output for -o in $wgScoreAbc2Ly shell command

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Swap --output for -o in $wgScoreAbc2Ly shell command
..

Swap --output for -o in $wgScoreAbc2Ly shell command

Bug: T172582
Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
---
M Score.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score 
refs/changes/40/374440/1

diff --git a/Score.body.php b/Score.body.php
index 5f68105..b434f2c 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' --output=' . wfEscapeShellArg( $destFile )
+   . ' -o ' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Swap --output for -o in $wgScoreAbc2Ly shell command

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Swap --output for -o in $wgScoreAbc2Ly shell command
..

Swap --output for -o in $wgScoreAbc2Ly shell command

Bug: T172582
Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
---
M Score.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/Score.body.php b/Score.body.php
index eff9052..b7e8342 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' --output=' . wfEscapeShellArg( $destFile )
+   . ' -o ' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70519b06077fcbd916f61383f199b9f02511502c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Mask jobchron and jobrunner in non-active DC

2017-08-28 Thread Thcipriani (Code Review)

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

Change subject: Mask jobchron and jobrunner in non-active DC
..

Mask jobchron and jobrunner in non-active DC

This should ensure that jobrunner and jobchron are not accidentally
started in the non-active datacenter. Scap should be able to use this
information to avoid attempting automatic restarts when the service is
masked.

Bug: T167104
Change-Id: I09ba869f9a914c76c161ba7d125b6afb5e0e6b91
---
M modules/base/manifests/service_unit.pp
M modules/mediawiki/manifests/jobrunner.pp
2 files changed, 21 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/374438/1

diff --git a/modules/base/manifests/service_unit.pp 
b/modules/base/manifests/service_unit.pp
index 196613c..4cb8292 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -43,6 +43,9 @@
 # [*declare_service*]
 #  Boolean - tells puppet if a service {} stanza is required or not
 #
+# [*mask*]
+#  Boolean - tells puppet if a systemd service should be masked
+#
 # [*service_params*]
 #  An hash of parameters that we want to apply to the service resource
 #
@@ -71,6 +74,7 @@
 $strict   = true,
 $refresh  = true,
 $declare_service  = true,
+$mask = false,
 $service_params   = {},
 ) {
 
@@ -122,12 +126,21 @@
 }
 }
 
-file { $path:
-ensure  => $ensure,
-content => $content,
-mode=> $i_mode,
-owner   => 'root',
-group   => 'root',
+if $initscript == 'systemd' and $mask {
+file { $path:
+ensure => 'link',
+target => '/dev/null',
+owner  => 'root',
+group  => 'root',
+}
+} else {
+file { $path:
+ensure  => $ensure,
+content => $content,
+mode=> $i_mode,
+owner   => 'root',
+group   => 'root',
+}
 }
 
 if $declare_service {
diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index fa00b81..66506df 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -75,12 +75,14 @@
 systemd=> systemd_template('jobrunner'),
 upstart=> upstart_template('jobrunner'),
 service_params => $params,
+mask   => !$running,
 }
 
 base::service_unit { 'jobchron':
 systemd=> systemd_template('jobchron'),
 upstart=> upstart_template('jobchron'),
 service_params => $params,
+mask   => !$running,
 }
 
 if $::initsystem == 'systemd' {

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Don't destroy WebView explicitly.

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Don't destroy WebView explicitly.
..


Don't destroy WebView explicitly.

Explicitly calling destroy() on the WebView seems to be having adverse
effects on the most recent version of the System WebView, whereby all
subsequent instances of the WebView can enter a bad state.

We started calling destroy() to resolve memory leaks that were found
previously, but basic functionality of the WebView obviously takes
priority. We'll need to re-audit memory leaks and fix any ones related to
the WebView in a different way (if they still exist).

Bug: T174401
Change-Id: I13e9967ceb6b76af978542c9482732b0b9bb351b
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/views/ObservableWebView.java
2 files changed, 3 insertions(+), 10 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 462cf51..7bb1465 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -333,7 +333,9 @@
 bridge.cleanup();
 tabsProvider.setTabsProviderListener(null);
 toolbarHideHandler.setScrollView(null);
-webView.destroy();
+webView.clearAllListeners();
+((ViewGroup) webView.getParent()).removeView(webView);
+webView = null;
 super.onDestroyView();
 }
 
diff --git a/app/src/main/java/org/wikipedia/views/ObservableWebView.java 
b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
index 9996e0d..e786804 100755
--- a/app/src/main/java/org/wikipedia/views/ObservableWebView.java
+++ b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
@@ -7,7 +7,6 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
 import android.webkit.WebView;
 
 import org.wikipedia.WikipediaApp;
@@ -133,14 +132,6 @@
 public ObservableWebView(Context context, AttributeSet attrs, int 
defStyle) {
 super(context, attrs, defStyle);
 init();
-}
-
-@Override public void destroy() {
-clearAllListeners();
-if (getParent() != null) {
-((ViewGroup) getParent()).removeView(this);
-}
-super.destroy();
 }
 
 private void init() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13e9967ceb6b76af978542c9482732b0b9bb351b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
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...Score[wmf/1.30.0-wmf.15]: Only escape argument value

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Only escape argument value
..


Only escape argument value

Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
(cherry picked from commit dc8c5f0c8587c0a520dd0556e70a73ccca6a7a72)
---
M Score.body.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/Score.body.php b/Score.body.php
index 84e3a89..5f68105 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -164,7 +164,7 @@
}
self::$backend = new FSFileBackend( [
'name'   => 'score-backend',
-   'wikiId' => wfWikiId(),
+   'wikiId' => wfWikiID(),
'lockManager'=> new 
NullLockManager( [] ),
'containerPaths' => [ 'score-render' => 
$dir ],
'fileMode'   => 0777,
@@ -504,7 +504,7 @@
 *  Score::generateHTML().
 * @parma $metaData array to hold information about images
 *
-* @return Array of file names placed in the remote dest dir, with the
+* @return array of file names placed in the remote dest dir, with the
 *  file names in each key.
 *
 * @throws ScoreException on error.
@@ -761,7 +761,7 @@
/* Run timidity */
$cmd = wfEscapeShellArg( $wgScoreTimidity )
. ' -Ov' // Vorbis output
-   . ' ' . wfEscapeShellArg( '--output-file=' . 
$factoryOgg )
+   . ' --output-file=' . wfEscapeShellArg( $factoryOgg )
. ' ' . wfEscapeShellArg( $sourceFile )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' ' . wfEscapeShellArg( '--output=' . $destFile )
+   . ' --output=' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -877,7 +877,7 @@
/**
 * get length of ogg vorbis file
 *
-* @param $path file system path to file
+* @param string $path file system path to file
 *
 * @return float duration in seconds
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Reedy 
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/mediawiki-config[master]: Revert "Disable firejail profile for wgScoreAbc2Ly"

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Disable firejail profile for wgScoreAbc2Ly"
..


Revert "Disable firejail profile for wgScoreAbc2Ly"

This reverts commit 8f6ab85f7974090f8526a159b884eaba64ee24c2.

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index cd6759b..fa7af44 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1079,7 +1079,7 @@
wfLoadExtension( 'Score' );
$wgScoreSafeMode = true;
$wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
-   // $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
+   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
$wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I439a6a0765bb3a669008f1e8734c5bd0919c8c23
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Urbanecm 
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...Score[wmf/1.30.0-wmf.15]: Only escape argument value

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Only escape argument value
..

Only escape argument value

Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
(cherry picked from commit dc8c5f0c8587c0a520dd0556e70a73ccca6a7a72)
---
M Score.body.php
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/Score.body.php b/Score.body.php
index 84e3a89..5f68105 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -164,7 +164,7 @@
}
self::$backend = new FSFileBackend( [
'name'   => 'score-backend',
-   'wikiId' => wfWikiId(),
+   'wikiId' => wfWikiID(),
'lockManager'=> new 
NullLockManager( [] ),
'containerPaths' => [ 'score-render' => 
$dir ],
'fileMode'   => 0777,
@@ -504,7 +504,7 @@
 *  Score::generateHTML().
 * @parma $metaData array to hold information about images
 *
-* @return Array of file names placed in the remote dest dir, with the
+* @return array of file names placed in the remote dest dir, with the
 *  file names in each key.
 *
 * @throws ScoreException on error.
@@ -761,7 +761,7 @@
/* Run timidity */
$cmd = wfEscapeShellArg( $wgScoreTimidity )
. ' -Ov' // Vorbis output
-   . ' ' . wfEscapeShellArg( '--output-file=' . 
$factoryOgg )
+   . ' --output-file=' . wfEscapeShellArg( $factoryOgg )
. ' ' . wfEscapeShellArg( $sourceFile )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' ' . wfEscapeShellArg( '--output=' . $destFile )
+   . ' --output=' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -877,7 +877,7 @@
/**
 * get length of ogg vorbis file
 *
-* @param $path file system path to file
+* @param string $path file system path to file
 *
 * @return float duration in seconds
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Only escape argument value

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Only escape argument value
..


Only escape argument value

Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
---
M Score.body.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/Score.body.php b/Score.body.php
index 87b6635..eff9052 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -164,7 +164,7 @@
}
self::$backend = new FSFileBackend( [
'name'   => 'score-backend',
-   'wikiId' => wfWikiId(),
+   'wikiId' => wfWikiID(),
'lockManager'=> new 
NullLockManager( [] ),
'containerPaths' => [ 'score-render' => 
$dir ],
'fileMode'   => 0777,
@@ -504,7 +504,7 @@
 *  Score::generateHTML().
 * @parma $metaData array to hold information about images
 *
-* @return Array of file names placed in the remote dest dir, with the
+* @return array of file names placed in the remote dest dir, with the
 *  file names in each key.
 *
 * @throws ScoreException on error.
@@ -761,7 +761,7 @@
/* Run timidity */
$cmd = wfEscapeShellArg( $wgScoreTimidity )
. ' -Ov' // Vorbis output
-   . ' ' . wfEscapeShellArg( '--output-file=' . 
$factoryOgg )
+   . ' --output-file=' . wfEscapeShellArg( $factoryOgg )
. ' ' . wfEscapeShellArg( $sourceFile )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' ' . wfEscapeShellArg( '--output=' . $destFile )
+   . ' --output=' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -877,7 +877,7 @@
/**
 * get length of ogg vorbis file
 *
-* @param $path file system path to file
+* @param string $path file system path to file
 *
 * @return float duration in seconds
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Ebe123 
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/mediawiki-config[master]: Add list for wikis that would have categories dumped into RDF

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Add list for wikis that would have categories dumped into RDF
..


Add list for wikis that would have categories dumped into RDF

Bug: T173892
Change-Id: I271a7712e5ff4cb855d38d9eec9f910878a90b0b
---
A dblists/categories-rdf.dblist
A docroot/noc/conf/categories-rdf.dblist
2 files changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/dblists/categories-rdf.dblist b/dblists/categories-rdf.dblist
new file mode 100644
index 000..286f697
--- /dev/null
+++ b/dblists/categories-rdf.dblist
@@ -0,0 +1,2 @@
+testwiki
+test2wiki
diff --git a/docroot/noc/conf/categories-rdf.dblist 
b/docroot/noc/conf/categories-rdf.dblist
new file mode 12
index 000..c62bfa6
--- /dev/null
+++ b/docroot/noc/conf/categories-rdf.dblist
@@ -0,0 +1 @@
+../../../dblists/categories-rdf.dblist
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I271a7712e5ff4cb855d38d9eec9f910878a90b0b
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Daniel Kinzler 
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...WikimediaEvents[wmf/1.30.0-wmf.15]: Turn off Cirrus MLR AB Test

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Turn off Cirrus MLR AB Test
..


Turn off Cirrus MLR AB Test

Bug: T171214
Change-Id: I48d48ab9d3664982f77158cadf0aca0e875c6c7b
(cherry picked from commit c82f98dfce4966b6e7c80534805eea17adeb9bf0)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index b1f1c78..768e650 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -118,7 +118,7 @@
// at the 1:2000 sampling. Sampling increased 
to 1:500, so 56k sessions
// per day.  Those 56k sessions will be split 
15k to dashboards, and
// 7k per bucket, for ~50k per bucket in a week.
-   validBuckets = [ 'control', 'ltr-20', 
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
-   test: 80,
-   subTest: 0.96
+   test: 2000,
+   subTest: null
},
enwiktionary: {
test: 40,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48d48ab9d3664982f77158cadf0aca0e875c6c7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: EBernhardson 
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...WikimediaEvents[wmf/1.30.0-wmf.15]: Disable human search relevance MVP

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Disable human search relevance MVP
..


Disable human search relevance MVP

Bug: T171742
Change-Id: I9e789910a0a4e63456b650aff4b18ac9cb243823
(cherry picked from commit 4a5d9759d1ca6c45a0bf539195ea3de98bbbf9c2)
---
M extension.json
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 22f3a14..63a8487 100644
--- a/extension.json
+++ b/extension.json
@@ -167,8 +167,7 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js",
-   
"ext.wikimediaEvents.humanSearchRelevance.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js"
],
"minerva": []
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e789910a0a4e63456b650aff4b18ac9cb243823
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: EBernhardson 
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...ArticleCreationWorkflow[master]: Add eventlogging for link clicks on Special:CreatePage

2017-08-28 Thread Niharika29 (Code Review)

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

Change subject: Add eventlogging for link clicks on Special:CreatePage
..

Add eventlogging for link clicks on Special:CreatePage

Bug: T173766
Change-Id: I4a2801f569f0665a71f03ebc5fd5b4f339bfcde4
---
M extension.json
M includes/SpecialCreatePage.php
A modules/acw.eventlogging.js
3 files changed, 34 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/36/374436/1

diff --git a/extension.json b/extension.json
index 9f72e64..fab2759 100644
--- a/extension.json
+++ b/extension.json
@@ -25,6 +25,17 @@
"i18n"
]
},
+   "ResourceFileModulePaths": {
+   "localBasePath": "modules",
+   "remoteExtPath": "ArticleCreationWorkflow/modules"
+   },
+   "ResourceModules": {
+   "ext.acw.eventlogging": {
+   "scripts": [
+   "acw.eventlogging.js"
+   ]
+   }
+   },
"ExtensionMessagesFiles": {
"ArticleCreationWorkflowAliases": 
"ArticleCreationWorkflow.alias.php"
},
diff --git a/includes/SpecialCreatePage.php b/includes/SpecialCreatePage.php
index bc48154..5cf8768 100644
--- a/includes/SpecialCreatePage.php
+++ b/includes/SpecialCreatePage.php
@@ -51,6 +51,7 @@
return;
}
 
+   $this->getOutput()->addModules( 'ext.acw.eventlogging' );
$this->getOutput()->addWikiText( $landingPageMessage->params( 
$destTitleText )->text() );
}
 }
diff --git a/modules/acw.eventlogging.js b/modules/acw.eventlogging.js
new file mode 100644
index 000..8367417
--- /dev/null
+++ b/modules/acw.eventlogging.js
@@ -0,0 +1,22 @@
+/*
+ Track link clicks on Special:CreatePage
+ */
+
+( function ( $, mw ) {
+
+   function trackData( interactionType, link, sampling ) {
+   mw.loader.using( 'schema.ArticleCreationWorkflow' ).then( 
function () {
+   mw.eventLog.logEvent( 'ArticleCreationWorkflow', {
+   interactionType: interactionType,
+   link: link,
+   sampling: sampling ? sampling : false
+   } );
+   } );
+   }
+
+   $( '#bodyContent' ).find( 'a' ).click( function ( event ) {
+   var $link = $( this ).attr( 'href' );
+   trackData( 'click', $link );
+   } );
+
+} ( jQuery, mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a2801f569f0665a71f03ebc5fd5b4f339bfcde4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Icinga: Add basic monitoring for routers' active RE

2017-08-28 Thread Ayounsi (Code Review)

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

Change subject: Icinga: Add basic monitoring for routers' active RE
..

Icinga: Add basic monitoring for routers' active RE

Bug: T174397
Change-Id: Ibfc003bb76ce50e4db2d95d6cf66eff36bf28e3f
---
M modules/netops/manifests/monitoring.pp
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/374435/1

diff --git a/modules/netops/manifests/monitoring.pp 
b/modules/netops/manifests/monitoring.pp
index 79f4f11..84b9cbf 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -30,7 +30,8 @@
 'cr1-codfw'  => { ipv4 => '208.80.153.192',  ipv6 => 
'2620:0:860:::1', bgp => true, },
 'cr2-codfw'  => { ipv4 => '208.80.153.193',  ipv6 => 
'2620:0:860:::2', bgp => true, },
 'mr1-codfw'  => { ipv4 => '208.80.153.196',  ipv6 => 
'2620:0:860:::6', },
-'pfw3-codfw' => { ipv4 => '208.80.153.197', parents => ['cr1-codfw', 
'cr2-codfw'], bgp => true, alarms => false, },
+'pfw-codfw'  => { ipv4 => '208.80.153.195',  },
+'pfw3-codfw' => { ipv4 => '208.80.153.197',  parents => ['cr1-codfw', 
'cr2-codfw'], bgp => true, alarms => false, },
 # eqdfw
 'cr1-eqdfw'  => { ipv4 => '208.80.153.198',  ipv6 => 
'2620:0:860:::5', bgp => true, },
 # esams
@@ -51,6 +52,15 @@
 'mr1-codfw.oob' => { ipv4 => '216.117.46.36',   },
 'mr1-esams.oob' => { ipv4 => '164.138.24.90',   },
 'mr1-ulsfo.oob' => { ipv4 => '209.237.234.242', },
+'re0.cr1-eqiad' => { ipv4 => '10.65.0.12',  parents => 
['mr1-eqiad'] },
+'re0.cr2-eqiad' => { ipv4 => '10.65.0.14',  parents => 
['mr1-eqiad'] },
+'re0.cr1-codfw' => { ipv4 => '10.193.0.10', parents => 
['mr1-codfw'] },
+'re0.cr2-codfw' => { ipv4 => '10.193.0.12', parents => 
['mr1-codfw'] },
+'re0.cr1-esams' => { ipv4 => '10.21.0.116', parents => 
['mr1-esams'] },
+'re0.cr2-esams' => { ipv4 => '10.21.0.117', parents => 
['mr1-esams'] },
+'re0.cr1-ulsfo' => { ipv4 => '10.128.128.2',parents => 
['mr1-ulsfo'] },
+'re0.cr2-ulsfo' => { ipv4 => '10.128.128.3',parents => 
['mr1-ulsfo'] },
+
 }
 create_resources(netops::check, $oob)
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Target pushPin icon for size, not all icons

2017-08-28 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Target pushPin icon for size, not all icons
..

RCFilters: Target pushPin icon for size, not all icons

Whoops.

Bug: T173264
Change-Id: Icb92c55a5b067d77138bae93f4db96309c72a223
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/374434/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index e7433e2..9dccc24 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -12,7 +12,7 @@
vertical-align: middle;
}
 
-   .oo-ui-iconElement-icon {
+   .mw-rcfilters-ui-savedLinksListItemWidget-icon .oo-ui-iconElement-icon {
// Since we made the rows narrower (height smaller than usual)
// then the icon needs to be slightly smaller as well, so that
// when we toggle 'default' the icon doesn't bounce the option

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Don't destroy WebView explicitly.

2017-08-28 Thread Dbrant (Code Review)

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

Change subject: Don't destroy WebView explicitly.
..

Don't destroy WebView explicitly.

Explicitly calling destroy() on the WebView seems to be having adverse
effects on the most recent version of the System WebView, whereby all
subsequent instances of the WebView can enter a bad state.

We started calling destroy() to resolve memory leaks that were found
previously, but basic functionality of the WebView obviously takes
priority. We'll need to re-audit memory leaks and fix any ones related to
the WebView in a different way (if they still exist).

Bug: T174401
Change-Id: I13e9967ceb6b76af978542c9482732b0b9bb351b
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/views/ObservableWebView.java
2 files changed, 3 insertions(+), 10 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 462cf51..7bb1465 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -333,7 +333,9 @@
 bridge.cleanup();
 tabsProvider.setTabsProviderListener(null);
 toolbarHideHandler.setScrollView(null);
-webView.destroy();
+webView.clearAllListeners();
+((ViewGroup) webView.getParent()).removeView(webView);
+webView = null;
 super.onDestroyView();
 }
 
diff --git a/app/src/main/java/org/wikipedia/views/ObservableWebView.java 
b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
index 9996e0d..e786804 100755
--- a/app/src/main/java/org/wikipedia/views/ObservableWebView.java
+++ b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
@@ -7,7 +7,6 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
 import android.webkit.WebView;
 
 import org.wikipedia.WikipediaApp;
@@ -133,14 +132,6 @@
 public ObservableWebView(Context context, AttributeSet attrs, int 
defStyle) {
 super(context, attrs, defStyle);
 init();
-}
-
-@Override public void destroy() {
-clearAllListeners();
-if (getParent() != null) {
-((ViewGroup) getParent()).removeView(this);
-}
-super.destroy();
 }
 
 private void init() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13e9967ceb6b76af978542c9482732b0b9bb351b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.15]: Disable human search relevance MVP

2017-08-28 Thread EBernhardson (Code Review)

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

Change subject: Disable human search relevance MVP
..

Disable human search relevance MVP

Bug: T171742
Change-Id: I9e789910a0a4e63456b650aff4b18ac9cb243823
(cherry picked from commit 4a5d9759d1ca6c45a0bf539195ea3de98bbbf9c2)
---
M extension.json
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index 22f3a14..63a8487 100644
--- a/extension.json
+++ b/extension.json
@@ -167,8 +167,7 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js",
-   
"ext.wikimediaEvents.humanSearchRelevance.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js"
],
"minerva": []
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e789910a0a4e63456b650aff4b18ac9cb243823
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.15]: Turn off Cirrus MLR AB Test

2017-08-28 Thread EBernhardson (Code Review)

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

Change subject: Turn off Cirrus MLR AB Test
..

Turn off Cirrus MLR AB Test

Bug: T171214
Change-Id: I48d48ab9d3664982f77158cadf0aca0e875c6c7b
(cherry picked from commit c82f98dfce4966b6e7c80534805eea17adeb9bf0)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index b1f1c78..768e650 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -118,7 +118,7 @@
// at the 1:2000 sampling. Sampling increased 
to 1:500, so 56k sessions
// per day.  Those 56k sessions will be split 
15k to dashboards, and
// 7k per bucket, for ~50k per bucket in a week.
-   validBuckets = [ 'control', 'ltr-20', 
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
-   test: 80,
-   subTest: 0.96
+   test: 2000,
+   subTest: null
},
enwiktionary: {
test: 40,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48d48ab9d3664982f77158cadf0aca0e875c6c7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add --quiet to abc2ly firejail

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Add --quiet to abc2ly firejail
..

Add --quiet to abc2ly firejail

Change-Id: I40fbe246dad9281aa0bdbe9a73d5b8dfaa1a431f
---
M modules/mediawiki/files/mediawiki-firejail-abc2ly
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/374430/1

diff --git a/modules/mediawiki/files/mediawiki-firejail-abc2ly 
b/modules/mediawiki/files/mediawiki-firejail-abc2ly
index 3b12f2a..e9a11d5 100644
--- a/modules/mediawiki/files/mediawiki-firejail-abc2ly
+++ b/modules/mediawiki/files/mediawiki-firejail-abc2ly
@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 
 import sys, subprocess
-subprocess.call(['/usr/bin/firejail', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/abc2ly'] + 
sys.argv[1:])
+subprocess.call(['/usr/bin/firejail', '--quiet', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/abc2ly'] + 
sys.argv[1:])

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Turn off Cirrus MLR AB Test

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Turn off Cirrus MLR AB Test
..


Turn off Cirrus MLR AB Test

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

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index b1f1c78..768e650 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -118,7 +118,7 @@
// at the 1:2000 sampling. Sampling increased 
to 1:500, so 56k sessions
// per day.  Those 56k sessions will be split 
15k to dashboards, and
// 7k per bucket, for ~50k per bucket in a week.
-   validBuckets = [ 'control', 'ltr-20', 
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
+   validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname' 
),
// Provides a place to handle 
wiki-specific sampling,
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
-   test: 80,
-   subTest: 0.96
+   test: 2000,
+   subTest: null
},
enwiktionary: {
test: 40,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48d48ab9d3664982f77158cadf0aca0e875c6c7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
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...WikimediaEvents[master]: Disable human search relevance MVP

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Disable human search relevance MVP
..


Disable human search relevance MVP

Bug: T171742
Change-Id: I9e789910a0a4e63456b650aff4b18ac9cb243823
---
M extension.json
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 22f3a14..63a8487 100644
--- a/extension.json
+++ b/extension.json
@@ -167,8 +167,7 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js",
-   
"ext.wikimediaEvents.humanSearchRelevance.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js"
],
"minerva": []
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e789910a0a4e63456b650aff4b18ac9cb243823
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
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] operations/mediawiki-config[master]: Revert "Disable firejail profile for wgScoreAbc2Ly"

2017-08-28 Thread Reedy (Code Review)

Hello Urbanecm, jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Disable firejail profile for wgScoreAbc2Ly"
..

Revert "Disable firejail profile for wgScoreAbc2Ly"

This reverts commit 8f6ab85f7974090f8526a159b884eaba64ee24c2.

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index cd6759b..fa7af44 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1079,7 +1079,7 @@
wfLoadExtension( 'Score' );
$wgScoreSafeMode = true;
$wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
-   // $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
+   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
$wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I439a6a0765bb3a669008f1e8734c5bd0919c8c23
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Urbanecm 
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...Score[master]: Only escape argument value

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Only escape argument value
..

Only escape argument value

Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
---
M Score.body.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score 
refs/changes/28/374428/1

diff --git a/Score.body.php b/Score.body.php
index 87b6635..eff9052 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -164,7 +164,7 @@
}
self::$backend = new FSFileBackend( [
'name'   => 'score-backend',
-   'wikiId' => wfWikiId(),
+   'wikiId' => wfWikiID(),
'lockManager'=> new 
NullLockManager( [] ),
'containerPaths' => [ 'score-render' => 
$dir ],
'fileMode'   => 0777,
@@ -504,7 +504,7 @@
 *  Score::generateHTML().
 * @parma $metaData array to hold information about images
 *
-* @return Array of file names placed in the remote dest dir, with the
+* @return array of file names placed in the remote dest dir, with the
 *  file names in each key.
 *
 * @throws ScoreException on error.
@@ -761,7 +761,7 @@
/* Run timidity */
$cmd = wfEscapeShellArg( $wgScoreTimidity )
. ' -Ov' // Vorbis output
-   . ' ' . wfEscapeShellArg( '--output-file=' . 
$factoryOgg )
+   . ' --output-file=' . wfEscapeShellArg( $factoryOgg )
. ' ' . wfEscapeShellArg( $sourceFile )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -851,7 +851,7 @@
/* Convert to LilyPond file */
$cmd = wfEscapeShellArg( $wgScoreAbc2Ly )
. ' -s'
-   . ' ' . wfEscapeShellArg( '--output=' . $destFile )
+   . ' --output=' . wfEscapeShellArg( $destFile )
. ' ' . wfEscapeShellArg( $factoryAbc )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc );
@@ -877,7 +877,7 @@
/**
 * get length of ogg vorbis file
 *
-* @param $path file system path to file
+* @param string $path file system path to file
 *
 * @return float duration in seconds
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: firstboot: Prevent non-root logins while NFS mounts aren't a...

2017-08-28 Thread Madhuvishy (Code Review)

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

Change subject: firstboot: Prevent non-root logins while NFS mounts aren't 
available
..


firstboot: Prevent non-root logins while NFS mounts aren't available

Bug: T171508
Change-Id: If8e07f5e231150cfe8eb3fc6ac662e35ebc27c3d
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 36 insertions(+), 0 deletions(-)

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



diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index 0b714a1..f93be69 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -2,6 +2,9 @@
 
 set -x
 
+# Prevent non-root logins while the VM is being setup
+echo "VM is work in progress" > /etc/nologin
+
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
 systemctl restart rsyslog.service
@@ -186,3 +189,18 @@
 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff 
--waitforcert=10 --certname=${fqdn} --server=${master}
 apt-get update
 puppet agent -t
+
+# Ensure all NFS mounts are mounted
+mount_attempts=1
+until [ $mount_attempts -gt 10 ]
+do
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+((mount_attempts++))
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+# Sleep for 10s before next attempt
+sleep 10
+done
+
+# Remove the non-root login restriction
+rm /etc/nologin
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index c8c18aa..dcd1784 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -x
 
+# Prevent non-root logins while the VM is being setup
+echo "VM is work in progress" > /etc/nologin
+
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
 restart rsyslog
@@ -120,3 +123,18 @@
 apt-get -y install openssh-server
 
 puppet agent -t
+
+# Ensure all NFS mounts are mounted
+mount_attempts=1
+until [ $mount_attempts -gt 10 ]
+do
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+((mount_attempts++))
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+# Sleep for 10s before next attempt
+sleep 10
+done
+
+# Remove the non-root login restriction
+rm /etc/nologin

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8e07f5e231150cfe8eb3fc6ac662e35ebc27c3d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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...mobileapps[master]: Add read-html route

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Add read-html route
..


Add read-html route

Now using parsoid-dom-utils to add  elements and split up the
DOM based on  elements. Note that  elements can be
nested but we stop compiling section text for the current section when
we encounter the start of next sub-section.

Added check for sectioning in Parsoid. We don't want to repeat sectioning
once Parsoid provides that for us (T114072).

One exception is the section parsing for the Wiktionary definition
endpoint: this one currently uses the old methods (just renamed to
have the 'old' suffix) since adding the  elements requires
changing the definition parsing significantly. That's probably worthy
of a separate commit.

Renamed parseSection.js to parsoidSectionsForDivs.js. Also moved over the
other code responsible for dealing with sections.

Bug: T162179
Change-Id: I4d408349f40f9289e63a6f6f3b955cf403f48fc3
---
M lib/mobile-util.js
D lib/parseSection.js
M lib/parsoid-access.js
A lib/parsoidSections.js
A lib/parsoidSectionsFromDivs.js
M package.json
A routes/read-html.js
A test/features/read-html/pagecontent.js
M test/lib/parsoid/parsoid-sections-test.js
9 files changed, 268 insertions(+), 107 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 7f47f13..12bb059 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -8,6 +8,7 @@
 
 mUtil.CONTENT_TYPES = {
 mobileSections: { name: 'mobile-sections', version: '0.12.2' },
+readHtml: { name: 'ReadHtml', version: '0.1.0' },
 definition: { name: 'definition', version: '0.7.2' },
 random: { name: 'random', version: '0.6.0' },
 announcements: { name: 'announcements', version: '0.1.0' },
diff --git a/lib/parseSection.js b/lib/parseSection.js
deleted file mode 100644
index 16934de..000
--- a/lib/parseSection.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-
-function parse(sectionDiv, startingNode) {
-let nextNode;
-const nextSection = {};
-let node = startingNode;
-
-while (node) {
-if (!(/^H[2-6]$/.test(node.tagName))) {
-nextNode = node.nextSibling;
-sectionDiv.appendChild(node);
-node = nextNode;
-continue;
-} else {
-nextSection.toclevel = parseInt(node.tagName.charAt(1), 10) - 1;
-nextSection.line = node.innerHTML.trim();
-nextSection.anchor = node.id;
-node = node.nextSibling;
-break;
-}
-}
-return { sectionDiv, nextNode: node, nextSection };
-}
-
-module.exports = parse;
diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index a9de6ef..70aa177 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -8,9 +8,10 @@
 const sUtil = require('./util');
 const api = require('./api-util');
 const mwapi = require('./mwapi');
-const parseSection = require('./parseSection');
 const parseProperty = require('./parseProperty');
 const parseDefinition = require('./parseDefinition');
+const parsoidSections = require('./parsoidSections');
+const parsoidSectionsForDefinitions = require('./parsoidSectionsFromDivs');
 const transforms = require('./transforms');
 const HTTPError = sUtil.HTTPError;
 
@@ -45,73 +46,6 @@
 
 return api.restApiGet(app, domain, path, restReq);
 });
-}
-
-/**
- * @param {!document} doc the parsed DOM Document of the Parsoid output
- */
-function addSectionDivs(doc) {
-// TODO: update once Parsoid emits section tags, see 
https://phabricator.wikimedia.org/T114072#1711063
-let i = 0;
-let output;
-let sectionDiv;
-const node = doc.body.firstChild;
-
-sectionDiv = doc.createElement('div');
-sectionDiv.id = `section_${i}`;
-sectionDiv.className = 'toclevel_1';
-output = parseSection(sectionDiv, node);
-i++;
-
-if (output.nextNode) {
-doc.body.insertBefore(output.sectionDiv, output.nextNode);
-} else {
-doc.body.appendChild(output.sectionDiv);
-}
-
-while (output.nextNode) {
-const section = output.nextSection;
-sectionDiv = doc.createElement('div');
-sectionDiv.id = `section_${i}`;
-sectionDiv.className = `toclevel_${section.toclevel}`;
-sectionDiv.title = section.line;
-sectionDiv.setAttribute('data-anchor', section.anchor);
-output = parseSection(sectionDiv, output.nextNode);
-if (output.nextNode) {
-doc.body.insertBefore(output.sectionDiv, output.nextNode);
-} else {
-doc.body.appendChild(output.sectionDiv);
-}
-i++;
-}
-}
-
-/**
- * @param {!document} doc the parsed DOM Document of the Parsoid output
- * @return {!sections[]} an array of section JSON elements
- */
-function getSectionsText(doc) {
-// TODO: update once

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Align SVGs to color palette and optimize

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Align SVGs to color palette and optimize
..


Align SVGs to color palette and optimize

Aligning remaining SVGs to WikimediaUI color palette.
Also:
 - Aligning markup to each other, among others adding XML declaration
   throughout or removing unnecessary `standalone=no` attribute.
 - Optimizing with SVGO while prettifying markup. Savings between
   5 and 21% of file size.

Bug: T146799
Bug: T172850
Change-Id: Icd9cff8d9c20f660a2f2ad182d33e44d29b8c6bf
---
M resources/mobile.ajax.styles/images/refresh.svg
M resources/mobile.editor.common/images/editSourceNormal.svg
M resources/mobile.editor.common/images/editVeNormal.svg
M resources/mobile.issues.images/blue-triangle.svg
M resources/mobile.issues.images/gray-triangle.svg
M resources/mobile.overlay.images/back-ltr.svg
M resources/mobile.overlay.images/back-rtl.svg
M resources/mobile.overlay.images/close.svg
M resources/mobile.references.images/cite.svg
M resources/mobile.search.images/clear.svg
M resources/mobile.search.images/search-content.svg
M resources/mobile.special.mobilediff.images/bytes-added.svg
M resources/mobile.special.mobilediff.images/bytes-neutral.svg
M resources/mobile.special.mobilediff.images/bytes-removed.svg
M resources/mobile.startup.images/error.svg
M resources/mobile.startup/images/error.svg
M resources/mobile.toc.images/contents-ltr.svg
17 files changed, 17 insertions(+), 17 deletions(-)

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



diff --git a/resources/mobile.ajax.styles/images/refresh.svg 
b/resources/mobile.ajax.styles/images/refresh.svg
index 8f789bb..c78e702 100644
--- a/resources/mobile.ajax.styles/images/refresh.svg
+++ b/resources/mobile.ajax.styles/images/refresh.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; width="40" height="40" viewBox="0 0 40 
40">
\ No newline at end of file
+http://www.w3.org/2000/svg; 
width="40" height="40" viewBox="0 0 40 40">
\ No newline at end of file
diff --git a/resources/mobile.editor.common/images/editSourceNormal.svg 
b/resources/mobile.editor.common/images/editSourceNormal.svg
index 08f81d8..c7aeafd 100644
--- a/resources/mobile.editor.common/images/editSourceNormal.svg
+++ b/resources/mobile.editor.common/images/editSourceNormal.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; viewBox="0 0 32 32">
\ No newline at end of file
+http://www.w3.org/2000/svg; 
viewBox="0 0 32 32">
\ No newline at end of file
diff --git a/resources/mobile.editor.common/images/editVeNormal.svg 
b/resources/mobile.editor.common/images/editVeNormal.svg
index f1e8f4e..00e8ce3 100644
--- a/resources/mobile.editor.common/images/editVeNormal.svg
+++ b/resources/mobile.editor.common/images/editVeNormal.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; viewBox="0 0 32 32">
\ No newline at end of file
+http://www.w3.org/2000/svg; 
viewBox="0 0 32 32">
\ No newline at end of file
diff --git a/resources/mobile.issues.images/blue-triangle.svg 
b/resources/mobile.issues.images/blue-triangle.svg
index ba83c4b..4e47ed4 100644
--- a/resources/mobile.issues.images/blue-triangle.svg
+++ b/resources/mobile.issues.images/blue-triangle.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
width="80" height="80" viewBox="0 0 80 80">
\ No newline at end of file
+http://www.w3.org/2000/svg; 
width="80" height="80" viewBox="0 0 80 80">
\ No newline at end of file
diff --git a/resources/mobile.issues.images/gray-triangle.svg 
b/resources/mobile.issues.images/gray-triangle.svg
index 16530bc..c9ce44a 100644
--- a/resources/mobile.issues.images/gray-triangle.svg
+++ b/resources/mobile.issues.images/gray-triangle.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; 
width="80" height="80" viewBox="0 0 80 80">
\ No newline at end of file
+http://www.w3.org/2000/svg; 
width="80" height="80" viewBox="0 0 80 80">
\ No newline at end of file
diff --git a/resources/mobile.overlay.images/back-ltr.svg 
b/resources/mobile.overlay.images/back-ltr.svg
index 1dff18c..3b766fd 100644
--- a/resources/mobile.overlay.images/back-ltr.svg
+++ b/resources/mobile.overlay.images/back-ltr.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg;>
\ No newline at end of file
+http://www.w3.org/2000/svg; 
viewBox="0 0 24 24">
\ No newline at end of file
diff --git a/resources/mobile.overlay.images/back-rtl.svg 
b/resources/mobile.overlay.images/back-rtl.svg
index 32917ca..797d667 100644
--- a/resources/mobile.overlay.images/back-rtl.svg
+++ b/resources/mobile.overlay.images/back-rtl.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg; viewBox="0 0 24 24">
\ No newline at end of file
+http://www.w3.org/2000/svg; 
viewBox="0 0 24 24">
\ No newline at end of file
diff --git a/resources/mobile.overlay.images/close.svg 
b/resources/mobile.overlay.images/close.svg
index b064db4..2cc66fc 100644
--- a/resources/mobile.overlay.images/close.svg
+++ b/resources/mobile.overlay.images/close.svg
@@ -1 +1 @@

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable jQuery 3 on nlwiki, svwiki, plwiki

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Enable jQuery 3 on nlwiki, svwiki, plwiki
..


Enable jQuery 3 on nlwiki, svwiki, plwiki

* svwiki: Confirmed by @Nirmox on T124742.
* plwiki: Confirmed by MatmaRex on IRC.
* nlwiki: (Myself).

Bug: T124742
Change-Id: I1c9c9c0ebf9d0bb2a1b5b7dec36016e3572c8344
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8ce7b8a..f2fd9d7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14900,6 +14900,11 @@
'test2wiki' => true,
'testwikidatawiki' => true,
'mediawikiwiki' => true,
+
+   // opt-in (T124742)
+   'nlwiki' => true, // @Krinkle
+   'plwiki' => true, // @MatmaRex
+   'svwiki' => true, // @Nirmos
 ],
 
 'wgCiteResponsiveReferences' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c9c9c0ebf9d0bb2a1b5b7dec36016e3572c8344
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Use composer unittests for some Semantic* extensions

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Use composer unittests for some Semantic* extensions
..


Use composer unittests for some Semantic* extensions

Change-Id: Id20e1f5eda7da6e9ee02812a8abc82e29226075d
---
M zuul/layout.yaml
1 file changed, 16 insertions(+), 16 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 72cd78d..cee9320 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4968,7 +4968,7 @@
 
   - name: mediawiki/extensions/PhpTagsSMW
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/PhpTagsSPARQL
@@ -5402,7 +5402,7 @@
 
   - name: mediawiki/extensions/SolrStore
 template:
-  - name: extension-unittests-composer
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SoundManager2Button
@@ -6167,17 +6167,17 @@
 
   - name: mediawiki/extensions/VIKI
 template:
- - name: extension-unittests-generic
+ - name: extension-unittests-composer
  - name: mwgate-npm
 
   - name: mediawiki/extensions/VikiSemanticTitle
 template:
- - name: extension-unittests-generic
+ - name: extension-unittests-composer
  - name: mwgate-npm
 
   - name: mediawiki/extensions/VikiTitleIcon
 template:
- - name: extension-unittests-generic
+ - name: extension-unittests-composer
  - name: mwgate-npm
 
   - name: mediawiki/extensions/WebCache
@@ -6473,7 +6473,7 @@
 
   - name: mediawiki/extensions/SemanticACL
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticBundle
@@ -6488,7 +6488,7 @@
 
   - name: mediawiki/extensions/SemanticExpressiveness
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticGenealogy
@@ -6498,45 +6498,45 @@
 
   - name: mediawiki/extensions/SemanticImageAnnotator
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
 
   - name: mediawiki/extensions/SemanticImageInput
 template:
-  - name: extension-unittests-composer
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticInternalObjects
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticLinks
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticMediaWiki
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
 
   - name: mediawiki/extensions/SemanticPageMaker
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticPageSeries
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticTasks
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticTitle
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticUpdateOnPurge

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable firejail profile for wgScoreAbc2Ly

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Disable firejail profile for wgScoreAbc2Ly
..


Disable firejail profile for wgScoreAbc2Ly

Bug: T172582
Change-Id: Id43f46b5e259decc77a3e9a226aa7c6c16254100
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fa7af44..cd6759b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1079,7 +1079,7 @@
wfLoadExtension( 'Score' );
$wgScoreSafeMode = true;
$wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
-   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
+   // $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
$wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id43f46b5e259decc77a3e9a226aa7c6c16254100
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Urbanecm 
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]: openstack: remove redis replication rule

2017-08-28 Thread Rush (Code Review)

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

Change subject: openstack: remove redis replication rule
..

openstack: remove redis replication rule

This has been cruft since the tampa migration.

Bug: T171494
Change-Id: I4dca3ad821f993af7f6cd481e8ccfb92f9d5013e
---
M modules/role/manifests/labs/openstack/nova/controller.pp
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/374427/1

diff --git a/modules/role/manifests/labs/openstack/nova/controller.pp 
b/modules/role/manifests/labs/openstack/nova/controller.pp
index b9c829e..5ae03bb 100644
--- a/modules/role/manifests/labs/openstack/nova/controller.pp
+++ b/modules/role/manifests/labs/openstack/nova/controller.pp
@@ -44,9 +44,6 @@
 spice_consoles => {
 rule  => 'saddr (0.0.0.0/0) proto (udp tcp) dport 6082 ACCEPT;',
 },
-keystone_redis_replication => {
-rule  => "saddr (${spare_master}) proto tcp dport (6379) ACCEPT;",
-},
 # keystone admin API only for openstack services that might need it
 keystone_admin => {
 rule  => "saddr (${labs_nodes} ${spare_master} ${api_host}

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...rainbow[develop]: Use new UDF and break api calls down by referer class

2017-08-28 Thread Bearloga (Code Review)

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

Change subject: Use new UDF and break api calls down by referer class
..


Use new UDF and break api calls down by referer class

Bug: T172452
Change-Id: I0c3fad23abb3931223d0b6212c1f8a969a251f72
---
M modules/api.R
M modules/key_performance_metrics/api_usage.R
M tab_documentation/fulltext_basic.md
M tab_documentation/geo_basic.md
M tab_documentation/kpi_api_usage.md
M tab_documentation/language_basic.md
M tab_documentation/open_basic.md
M tab_documentation/prefix_basic.md
M utils.R
9 files changed, 45 insertions(+), 16 deletions(-)

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



diff --git a/modules/api.R b/modules/api.R
index 7e8e7ff..73368cd 100644
--- a/modules/api.R
+++ b/modules/api.R
@@ -1,39 +1,54 @@
 output$cirrus_aggregate <- renderDygraph({
   split_dataset$cirrus %>%
+tidyr::spread(key = referer_class, value = calls) %>%
+dplyr::mutate(All = ifelse(is.na(All), rowSums(.[, -c(1, 2)], na.rm = 
TRUE), All)) %>%
 polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_fulltext_search)) 
%>%
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Full-text 
via API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
-dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$open_aggregate <- renderDygraph({
   split_dataset$open %>%
+tidyr::spread(key = referer_class, value = calls) %>%
+dplyr::mutate(All = ifelse(is.na(All), rowSums(.[, -c(1, 2)], na.rm = 
TRUE), All)) %>%
 polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_open_search)) %>%
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "OpenSearch 
API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
-dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$geo_aggregate <- renderDygraph({
   split_dataset$geo %>%
+tidyr::spread(key = referer_class, value = calls) %>%
+dplyr::mutate(All = ifelse(is.na(All), rowSums(.[, -c(1, 2)], na.rm = 
TRUE), All)) %>%
 polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_geo_search)) %>%
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Geo Search 
API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
-dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$language_aggregate <- renderDygraph({
   split_dataset$language %>%
+tidyr::spread(key = referer_class, value = calls) %>%
+dplyr::mutate(All = ifelse(is.na(All), rowSums(.[, -c(1, 2)], na.rm = 
TRUE), All)) %>%
 polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_language_search)) 
%>%
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Language 
Search API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
-dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
 })
 
 output$prefix_aggregate <- renderDygraph({
   split_dataset$prefix %>%
+tidyr::spread(key = referer_class, value = calls) %>%
+dplyr::mutate(All = ifelse(is.na(All), rowSums(.[, -c(1, 2)], na.rm = 
TRUE), All)) %>%
 polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_prefix_search)) 
%>%
 polloi::make_dygraph(xlab = "Date", ylab = "Searches", title = "Prefix 
Search API usage by day", legend_name = "Searches") %>%
 dyRangeSelector %>%
-dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
+dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom") 
%>%
+dyEvent(as.Date("2017-08-14"), "U (new UDF)", labelLoc = "bottom")
 })
diff --git a/modules/key_performance_metrics/api_usage.R 
b/modules/key_performance_metrics/api_usage.R
index 271b030..13a4c3a 100644
--- a/modules/key_performance_metrics/api_usage.R
+++ b/modules/key_performance_metrics/api_usage.R
@@ -2,6 +2,11 @@
   smooth_level <- input$smoothing_kpi_api_usage
   start_date <- Sys.Date() - switch(input$kpi_summary_date_range_selector, all 
= NA, daily = 1,

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable firejail profile for wgScoreAbc2Ly

2017-08-28 Thread Reedy (Code Review)

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

Change subject: Disable firejail profile for wgScoreAbc2Ly
..

Disable firejail profile for wgScoreAbc2Ly

Bug: T172582
Change-Id: Id43f46b5e259decc77a3e9a226aa7c6c16254100
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fa7af44..cd6759b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1079,7 +1079,7 @@
wfLoadExtension( 'Score' );
$wgScoreSafeMode = true;
$wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
-   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
+   // $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
$wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Show only relevant languages in New translation

2017-08-28 Thread Petar.petkovic (Code Review)

Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374425 )

Change subject: Show only relevant languages in New translation
..

Show only relevant languages in New translation

- Show only source languages the article exists in,
and make bold target languages where the article does not exist.
- Fix validation on embedded New translation dialog.

Bug: T111094
Change-Id: Ia7c11f00a2125bec0d17471b426b44655209c595
---
M modules/source/ext.cx.source.selector.js
1 file changed, 194 insertions(+), 40 deletions(-)


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

diff --git a/modules/source/ext.cx.source.selector.js 
b/modules/source/ext.cx.source.selector.js
index f500149..7404e4c 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -25,18 +25,26 @@
 
// Boolean property indicating if CXSourceSelector is used as
// modal dialog or embedded
-   this.embedded = !!options.container && options.container 
instanceof jQuery;
+   this.isEmbedded = !!options.container && options.container 
instanceof jQuery;
 
-   this.sourceLanguages = [];
-   this.targetLanguages = [];
-   this.sourceLanguage = null;
-   this.targetLanguage = null;
// this.$container is used for both types of CXSourceSelector - 
embedded and modal dialog
// Embedded version - $container field gets DOM container 
passed through options parameter
// Dialog version - $container fields gets created in 
renderAsDialog method of this class
-   this.$container = this.embedded ? options.container : null;
+   this.$container = this.isEmbedded ? options.container : null;
+
+   // this.sourceLanguages and this.targetLanguages are arrays of 
language codes retrieved from cx-server
+   // Represents all possible source/target language codes
+   this.sourceLanguages = [];
+   this.targetLanguages = [];
+   // this.sourceLanguage and this.targetLanguage are selected 
source/target languages respectively
+   this.sourceLanguage = null;
+   this.targetLanguage = null;
+   // this.sourceTitles is a map of language codes to article 
titles in those languages
+   this.sourceTitles = {};
+
this.$selectedItem = null;
this.$selectedItemImage = null;
+   this.$selectedItemLink = null;
this.$selectedItemInfo = null;
this.$languageFilter = null;
this.$sourceLanguage = null;
@@ -130,8 +138,8 @@
this.sourcePageSelector.setValue( 
this.options.sourceTitle );
}
 
-   // !this.embedded is extra check, second one may be sufficient
-   if ( !this.embedded && this.options.targetTitle ) {
+   // !this.isEmbedded is extra check, second one may be sufficient
+   if ( !this.isEmbedded && this.options.targetTitle ) {
this.$targetTitleInput.val( this.options.targetTitle );
}
 
@@ -208,7 +216,8 @@
 * @param {string} language A language code
 */
CXSourceSelector.prototype.setSourceLanguage = function ( language ) {
-   var langProps, currentSource;
+   var langProps, currentSource,
+   languagesArticleExistsIn = Object.keys( 
this.sourceTitles );
 
// Do not allow selection of invalid source languages under any 
circumstances
if ( !this.isValidSource( language ) ) {
@@ -240,7 +249,8 @@
.text( $.uls.data.getAutonym( this.sourceLanguage ) );
mw.storage.set( 'cxSourceLanguage', this.sourceLanguage );
this.sourcePageSelector.setLanguage( this.sourceLanguage );
-   this.fillTargetLanguages( this.targetLanguages );
+
+   this.fillTargetLanguages( languagesArticleExistsIn );
};
 
/**
@@ -268,7 +278,7 @@
lang: this.targetLanguage,
dir: $.uls.data.getDir( this.targetLanguage )
};
-   if ( !this.embedded ) {
+   if ( !this.isEmbedded ) {
this.$targetTitleInput.prop( langProps );
}
this.$targetLanguage.prop( langProps )
@@ -277,13 +287,54 @@
mw.storage.set( 'cxTargetLanguage', this.targetLanguage );
};
 
+   /*
+   * Fill the source language dropdown with source languages
+   * for which selected article exists
+   * @param {array} sourceLanguages - array of language codes used to 
populate ULS
+   */
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Enable mediawiki.hlist on mobile

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Enable mediawiki.hlist on mobile
..


Enable mediawiki.hlist on mobile

Bug: T42062
Change-Id: Iee059a6605cf12a073954378f49ddc721a7e016a
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index a0fa45d..1ebe210 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1056,6 +1056,7 @@
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.hlist' => [
+   'targets' => [ 'desktop', 'mobile' ],
'styles' => [
'resources/src/mediawiki/mediawiki.hlist-allskins.less',
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee059a6605cf12a073954378f49ddc721a7e016a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Pmiazga 
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]: openstack: remove legacy firewall rules for controller

2017-08-28 Thread Rush (Code Review)

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

Change subject: openstack: remove legacy firewall rules for controller
..

openstack: remove legacy firewall rules for controller

* DNS has long been served from labservices*
* wikitech_ssh_public seems to serve no modern
  purpose and should not exist afaict.

Bug: T171494
Change-Id: Ib12427ac86915b08852d08cddb9a1b99b0324b8e
---
M modules/role/manifests/labs/openstack/nova/controller.pp
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/374424/1

diff --git a/modules/role/manifests/labs/openstack/nova/controller.pp 
b/modules/role/manifests/labs/openstack/nova/controller.pp
index 28db88c..b9c829e 100644
--- a/modules/role/manifests/labs/openstack/nova/controller.pp
+++ b/modules/role/manifests/labs/openstack/nova/controller.pp
@@ -41,12 +41,6 @@
 $labs_networks = join($network::constants::labs_networks, ' ')
 
 $fwrules = {
-wikitech_ssh_public => {
-rule  => 'saddr (0.0.0.0/0) proto tcp dport (ssh) ACCEPT;',
-},
-dns_public => {
-rule  => 'saddr (0.0.0.0/0) proto (udp tcp) dport 53 ACCEPT;',
-},
 spice_consoles => {
 rule  => 'saddr (0.0.0.0/0) proto (udp tcp) dport 6082 ACCEPT;',
 },

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: RCFilters: Enable on watchlist for Beta Labs

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Enable on watchlist for Beta Labs
..


RCFilters: Enable on watchlist for Beta Labs

Change-Id: I4920818c923e8fafce458a37e7be3f3dccc4c81b
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index f698dab..9264695 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -557,6 +557,10 @@
'default' => true,
],
 
+   'wgStructuredChangeFiltersOnWatchlist' => [
+   'default' => true,
+   ],
+
// Enable page previews for everyone in labs (T162672)
//
// Note well that the Popups extension is only loaded when 
either
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 680c530..8ce7b8a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18965,6 +18965,10 @@
 'wgEnableRcFiltersBetaFeature' => [
'default' => true,
 ],
+'wgStructuredChangeFiltersOnWatchlist' => [
+   'default' => false,
+],
+
 ### End (roughly) of general extensions 
 
 'wgUseTidy' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4920818c923e8fafce458a37e7be3f3dccc4c81b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Urbanecm 
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...Score[master]: Add option to use `-dsafe` argument in Lilypond command

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Add option to use `-dsafe` argument in Lilypond command
..


Add option to use `-dsafe` argument in Lilypond command

This change makes the `-dsafe` argument from the Lilypond command
optional, to be disabled through the use of $wgScoreSafeMode. As now it
can be disabled, the README recommends the use of a jail/Firejail
before doing so. This change would allow Lilypond to be more flexible,
including the use of variables, and more customizations to the score,
while preventing the execution of malicious code

This change resolves T171372 and its subtasks, even though the subtasks
appear to be unrelated. The were nonetheless all caused by the very
restrictive `safe` argument, of which Firejail supersedes.

Two related patches I5a0579b0e and I011db0e9a will enable Firejail in
Wikimedia wikis. This should not be merged until the two other patches
have come through.

Bug: T172582
Bug: T171372
Bug: T161293
Bug: T60526
Bug: T54883
Change-Id: I926fbe6b31b7ef95a0994c6a460972e46a07b4ae
---
M README
M Score.body.php
M extension.json
3 files changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/README b/README
index a9b2a4d..782e7c5 100644
--- a/README
+++ b/README
@@ -7,6 +7,10 @@
 LilyPond installation. If you want the extension to trim the score files for
 you, you will also need ImageMagick.
 
+By default, this extension runs in a safe mode, preventing malicious code in
+tags, but also preventing many of Lilypond's features. It is recommended to run
+the executables from Firejail.
+
 The extension is also capable of creating Ogg/Vorbis files from the MIDI files
 generated by LilyPond. If you want to make use of this functionality, you need
 to have the TimedMediaHandler extension installed, see
@@ -37,6 +41,8 @@
$wgScoreTimidty = '/path/to/your/timidty/executable'; /* if you want MIDI to
 Vorbis conversion 
*/
$wgScoreTrim = true; /* Set to false if you don't want score trimming */
+   $wgScoreSafeMode = false; /* Set to true if the Lilypond executable is
+running in a Firejail or equivalent */
 
to your LocalSettings.php file. If you get unexpected out-of-memory errors,
you may also have to increase $wgMaxShellMemory (see
diff --git a/Score.body.php b/Score.body.php
index 84e3a89..87b6635 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -510,7 +510,7 @@
 * @throws ScoreException on error.
 */
private static function generatePngAndMidi( $code, $options, &$metaData 
) {
-   global $wgScoreLilyPond, $wgScoreTrim;
+   global $wgScoreLilyPond, $wgScoreTrim, $wgScoreSafeMode;
 
if ( !is_executable( $wgScoreLilyPond ) ) {
throw new ScoreException( wfMessage( 
'score-notexecutable', $wgScoreLilyPond ) );
@@ -556,11 +556,11 @@
// Note that if Lilypond is compiled against Guile 2.0+, this
// probably won't do anything.
$env = [ 'LILYPOND_GC_YIELD' => '25' ];
+   $mode = $wgScoreSafeMode ? ' -dsafe' : '';
 
$cmd = wfEscapeShellArg( $wgScoreLilyPond )
-   . ' ' . wfEscapeShellArg( '-dsafe=#t' )
. ' -dmidi-extension=midi' // midi needed for Windows 
to generate the file
-   . ' -dbackend=ps --png --header=texidoc '
+   . $mode . ' -dbackend=ps --png --header=texidoc '
. wfEscapeShellArg( $factoryLy )
. ' 2>&1';
$output = wfShellExec( $cmd, $rc2, $env );
diff --git a/extension.json b/extension.json
index f585433..37ea627 100644
--- a/extension.json
+++ b/extension.json
@@ -71,6 +71,7 @@
"ScoreLilyPond": "/usr/bin/lilypond",
"ScoreAbc2Ly": "/usr/bin/abc2ly",
"ScoreTimidity": "/usr/bin/timidity",
+   "ScoreSafeMode": true,
"ScorePath": false,
"ScoreDirectory": false,
"ScoreFileBackend": false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I926fbe6b31b7ef95a0994c6a460972e46a07b4ae
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Ebe123 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] integration/config[master]: Use composer unittests for some Semantic* extensions

2017-08-28 Thread Umherirrender (Code Review)

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

Change subject: Use composer unittests for some Semantic* extensions
..

Use composer unittests for some Semantic* extensions

Change-Id: Id20e1f5eda7da6e9ee02812a8abc82e29226075d
---
M zuul/layout.yaml
1 file changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/374423/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 72cd78d..cee9320 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4968,7 +4968,7 @@
 
   - name: mediawiki/extensions/PhpTagsSMW
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/PhpTagsSPARQL
@@ -5402,7 +5402,7 @@
 
   - name: mediawiki/extensions/SolrStore
 template:
-  - name: extension-unittests-composer
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SoundManager2Button
@@ -6167,17 +6167,17 @@
 
   - name: mediawiki/extensions/VIKI
 template:
- - name: extension-unittests-generic
+ - name: extension-unittests-composer
  - name: mwgate-npm
 
   - name: mediawiki/extensions/VikiSemanticTitle
 template:
- - name: extension-unittests-generic
+ - name: extension-unittests-composer
  - name: mwgate-npm
 
   - name: mediawiki/extensions/VikiTitleIcon
 template:
- - name: extension-unittests-generic
+ - name: extension-unittests-composer
  - name: mwgate-npm
 
   - name: mediawiki/extensions/WebCache
@@ -6473,7 +6473,7 @@
 
   - name: mediawiki/extensions/SemanticACL
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticBundle
@@ -6488,7 +6488,7 @@
 
   - name: mediawiki/extensions/SemanticExpressiveness
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticGenealogy
@@ -6498,45 +6498,45 @@
 
   - name: mediawiki/extensions/SemanticImageAnnotator
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
 
   - name: mediawiki/extensions/SemanticImageInput
 template:
-  - name: extension-unittests-composer
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticInternalObjects
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticLinks
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticMediaWiki
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
 
   - name: mediawiki/extensions/SemanticPageMaker
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticPageSeries
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticTasks
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticTitle
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticUpdateOnPurge

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Enable mediawiki.hlist on mobile

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Enable mediawiki.hlist on mobile
..

Enable mediawiki.hlist on mobile

Bug: T42062
Change-Id: Iee059a6605cf12a073954378f49ddc721a7e016a
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/374421/1

diff --git a/resources/Resources.php b/resources/Resources.php
index a0fa45d..1ebe210 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1056,6 +1056,7 @@
'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.hlist' => [
+   'targets' => [ 'desktop', 'mobile' ],
'styles' => [
'resources/src/mediawiki/mediawiki.hlist-allskins.less',
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: just check for Unicode support

2017-08-28 Thread MaxSem (Code Review)

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

Change subject: WIP: just check for Unicode support
..

WIP: just check for Unicode support

...instead of maintaining a browser blacklist

Change-Id: I20c2e396d7dfd6a3b23b94b218f94a847522576b
---
M includes/DefaultSettings.php
M includes/EditPage.php
M languages/i18n/en.json
3 files changed, 32 insertions(+), 164 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/374422/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5d95964..2f720fd 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2973,46 +2973,9 @@
 $wgLegacyEncoding = false;
 
 /**
- * Browser Blacklist for unicode non compliant browsers. Contains a list of
- * regexps : "/regexp/"  matching problematic browsers. These browsers will
- * be served encoded unicode in the edit box instead of real unicode.
+ * @deprecated since 1.30, does nothing
  */
-$wgBrowserBlackList = [
-   /**
-* Netscape 2-4 detection
-* The minor version may contain strings such as "Gold" or "SGoldC-SGI"
-* Lots of non-netscape user agents have "compatible", so it's useful 
to check for that
-* with a negative assertion. The [UIN] identifier specifies the level 
of security
-* in a Netscape/Mozilla browser, checking for it rules out a number of 
fakers.
-* The language string is unreliable, it is missing on NS4 Mac.
-*
-* Reference: http://www.psychedelix.com/agents/index.shtml
-*/
-   '/^Mozilla\/2\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
-   '/^Mozilla\/3\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
-   '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
-
-   /**
-* MSIE on Mac OS 9 is teh sux0r, converts þ to , ð to ,
-* Þ to  and Ð to 
-*
-* Known useragents:
-* - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)
-* - Mozilla/4.0 (compatible; MSIE 5.15; Mac_PowerPC)
-* - Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)
-* - [...]
-*
-* @link 
https://en.wikipedia.org/w/index.php?diff=12356041=12355864
-* @link https://en.wikipedia.org/wiki/Template%3AOS9
-*/
-   '/^Mozilla\/4\.0 \(compatible; MSIE \d+\.\d+; Mac_PowerPC\)/',
-
-   /**
-* Google wireless transcoder, seems to eat a lot of chars alive
-* 
https://it.wikipedia.org/w/index.php?title=Luciano_Ligabue=prev=8857361
-*/
-   '/^Mozilla\/4\.0 \(compatible; MSIE 6.0; Windows NT 5.0; Google 
Wireless Transcoder;\)/'
-];
+$wgBrowserBlackList = [];
 
 /**
  * If set to true, the MediaWiki 1.4 to 1.5 schema conversion will
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0e1438f..f4f87bd 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -41,6 +41,11 @@
  */
 class EditPage {
/**
+* Used for Unicode support checks
+*/
+   const UNICODE_CHECK = 'яþ';
+
+   /**
 * Status: Article successfully updated
 */
const AS_SUCCESS_UPDATE = 200;
@@ -176,6 +181,11 @@
 * $wgContentHandlerUseDB being false
 */
const AS_CANNOT_USE_CUSTOM_MODEL = 241;
+
+   /**
+* Status: edit rejected because browser doesn't support Unicode.
+*/
+   const AS_UNICODE_NOT_SUPPORTED = 242;
 
/**
 * HTML id and name for the beginning of the edit form.
@@ -865,7 +875,7 @@
# These fields need to be checked for encoding.
# Also remove trailing whitespace, but don't remove 
_initial_
# whitespace from the text boxes. This may be 
significant formatting.
-   $this->textbox1 = $this->safeUnicodeInput( $request, 
'wpTextbox1' );
+   $this->textbox1 = rtrim( $request->getText( 
'wpTextbox1' ) );
if ( !$request->getCheck( 'wpTextbox2' ) ) {
// Skip this if wpTextbox2 has input, it 
indicates that we came
// from a conflict page with raw page text, not 
a custom form
@@ -1546,6 +1556,7 @@
 
case self::AS_CANNOT_USE_CUSTOM_MODEL:
case self::AS_PARSE_ERROR:
+   case self::AS_UNICODE_NOT_SUPPORTED:
$wgOut->addWikiText( '' . 
"\n" . $status->getWikiText() . '' );
return true;
 
@@ -1743,6 +1754,13 @@
wfDebug( "Hook 'EditPage::attemptSave' aborted article 
saving\n" );
$status->fatal( 'hookaborted' );
$status->value = self::AS_HOOK_ERROR;
+   return $status;
+   }
+
+   $check = $wgRequest->getText(

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: update diff test results

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: update diff test results
..


Hygiene: update diff test results

Change-Id: I92cbbaa613d4c0abac0145fab7b788bcaa33fa4c
---
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section22-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section23-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section25-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section22-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section23-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section25-text.html
14 files changed, 34 insertions(+), 34 deletions(-)

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



diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 324152a..90f4cf4 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -92,14 +92,14 @@
   },
   {
 "id": 11,
-"text": "\n\nhttps://upload.wikimedia.org/wikipedia/commons/7/79/Big_Buck_Bunny_small.ogv\;
 type=\"video/ogg; codecs=theora, vorbis\" data-file-width=\"240\" 
data-file-height=\"134\" data-title=\"Original Ogg file, 240 × 134 (277 kbps)\" 
data-shorttitle=\"Ogg source\" id=\"mwWQ\">https://upload.wikimedia.org/wikipedia/commons/transcoded/7/79/Big_Buck_Bunny_small.ogv/Big_Buck_Bunny_small.ogv.160p.webm\;
 type=\"video/webm; codecs=vp8, vorbis\" data-width=\"240\" 
data-height=\"134\" data-title=\"Low bandwidth WebM (160P)\" 
data-shorttitle=\"WebM 160P\" id=\"mwWg\">https://upload.wikimedia.org/wikipedia/commons/transcoded/7/79/Big_Buck_Bunny_small.ogv/Big_Buck_Bunny_small.ogv.160p.ogv\;
 type=\"video/ogg; codecs=theora, vorbis\" data-width=\"240\" 
data-height=\"134\" data-title=\"Low bandwidth Ogg video (160P)\" 
data-shorttitle=\"Ogg 160P\" id=\"mwWw\">\n\n",
+"text": "\n\nhttps://upload.wikimedia.org/wikipedia/commons/7/79/Big_Buck_Bunny_small.ogv\;
 type=\"video/ogg; codecs=theora, vorbis\" data-file-width=\"240\" 
data-file-height=\"134\" data-title=\"Original Ogg file, 240 × 134 (277 kbps)\" 
data-shorttitle=\"Ogg source\" id=\"mwWQ\">https://upload.wikimedia.org/wikipedia/commons/transcoded/7/79/Big_Buck_Bunny_small.ogv/Big_Buck_Bunny_small.ogv.160p.webm\;
 type=\"video/webm; codecs=vp8, vorbis\" data-width=\"240\" 
data-height=\"134\" data-title=\"Low bandwidth WebM (160P)\" 
data-shorttitle=\"WebM 160P\" id=\"mwWg\">\n\n",
 "toclevel": 1,
 "line": "Video",
 "anchor": "Video"
   },
   {
 "id": 12,
-"text": "\n\"WP:TPA\" redirects here. For talk page archiving, 
see Help:Archiving a talk page.\nA perfect 
Wikipedia article...\nIs on a notable topic.\nFills a gap not 
provided by existing or related articles.\nHas an 
appropriate structure.\n\n",
+"text": "\n\"WP:TPA\" redirects here. For talk page archiving, 
see Help:Archiving a talk page.\nA perfect 
Wikipedia article...\nIs on a notable topic.\nFills a gap not 
provided by existing or related articles.\nHas an 
appropriate structure.\n\n",
 "toclevel": 1,
 "line": "From Wikipedia:The perfect article",
 "anchor": "From_Wikipedia:The_perfect_article"
@@ -120,7 +120,7 @@
   },
   {
 "id": 15,
-"text": "\n\nShortcut:\nMOS:BODY\nFurther information: 
Help:Section and Wikipedia:Manual of Style 
§Article titles, headings, and sections\n\nBody sections appear after the lead and table of 
contents

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Run Lilypond from Firejail

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Run Lilypond from Firejail
..


Run Lilypond from Firejail

This change changes the path to the Lilypond executable to a script
provided by Puppet encapsulating it with Firejail.

Bug: T172582
Depends-On: I011db0e9a2d9da825cf3ac02bfba23b562e052f6
Change-Id: I5a0579b0e5adf4b4498cd8663bcb878ef0f34626
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 05d1eff..fa7af44 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1077,6 +1077,10 @@
 
 if ( $wmgUseScore ) {
wfLoadExtension( 'Score' );
+   $wgScoreSafeMode = true;
+   $wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
+   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
+   $wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a0579b0e5adf4b4498cd8663bcb878ef0f34626
Gerrit-PatchSet: 8
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ebe123 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Muehlenhoff 
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]: further tweaking of kafka-jumbo.cfg

2017-08-28 Thread RobH (Code Review)

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

Change subject: further tweaking of kafka-jumbo.cfg
..


further tweaking of kafka-jumbo.cfg

tweaking the partman recipe

Change-Id: I59d2174d0d4c57eda1a46f198bf7140262089ea0
---
M modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg 
b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
index 93c5ee9..3d7b584 100644
--- a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
+++ b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
@@ -14,11 +14,8 @@
 d-ipartman-lvm/confirm_nooverwrite boolean true
 d-ipartman/confirm boolean true
 
-# standardize vg name for snapshots (otherwise uses hostname)
-d-ipartman-auto-lvm/new_vg_name string tank
-
 d-ipartman-auto/expert_recipe  string  \
-   4 4 4 ext4  \
+   4 4 1200 ext4   \
$primary{ } \
$bootable{ }\
method{ format }\

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59d2174d0d4c57eda1a46f198bf7140262089ea0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
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]: further tweaking of kafka-jumbo.cfg

2017-08-28 Thread RobH (Code Review)

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

Change subject: further tweaking of kafka-jumbo.cfg
..

further tweaking of kafka-jumbo.cfg

tweaking the partman recipe

Change-Id: I59d2174d0d4c57eda1a46f198bf7140262089ea0
---
M modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
1 file changed, 1 insertion(+), 4 deletions(-)


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

diff --git a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg 
b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
index 93c5ee9..3d7b584 100644
--- a/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
+++ b/modules/install_server/files/autoinstall/partman/kafka-jumbo.cfg
@@ -14,11 +14,8 @@
 d-ipartman-lvm/confirm_nooverwrite boolean true
 d-ipartman/confirm boolean true
 
-# standardize vg name for snapshots (otherwise uses hostname)
-d-ipartman-auto-lvm/new_vg_name string tank
-
 d-ipartman-auto/expert_recipe  string  \
-   4 4 4 ext4  \
+   4 4 1200 ext4   \
$primary{ } \
$bootable{ }\
method{ format }\

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Minimize saved query before comparison

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Minimize saved query before comparison
..


RCFilters: Minimize saved query before comparison

Bug: T174193
Change-Id: I8e9345e8899fd27565930896e62c4d3be235ad58
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
1 file changed, 32 insertions(+), 1 deletion(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index a7f3d23..d87ef734 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -18,6 +18,7 @@
OO.EmitterList.call( this );
 
this.default = config.default;
+   this.baseState = {};
 
// Events
this.aggregate( { update: 'itemUpdate' } );
@@ -171,15 +172,45 @@
 * @return {mw.rcfilters.dm.SavedQueryItemModel} Matching item model
 */
mw.rcfilters.dm.SavedQueriesModel.prototype.findMatchingQuery = 
function ( fullQueryComparison ) {
+   var model = this;
+
+   fullQueryComparison = this.getDifferenceFromBase( 
fullQueryComparison );
+
return this.getItems().filter( function ( item ) {
+   var comparedData = model.getDifferenceFromBase( 
item.getData() );
return OO.compare(
-   item.getData(),
+   comparedData,
fullQueryComparison
);
} )[ 0 ];
};
 
/**
+* Get a minimal representation of the state for comparison
+*
+* @param {Object} state Given state
+* @return {Object} Minimal state
+*/
+   mw.rcfilters.dm.SavedQueriesModel.prototype.getDifferenceFromBase = 
function ( state ) {
+   var result = { filters: {}, highlights: {}, invert: 
state.invert },
+   baseState = this.baseState;
+
+   // XOR results
+   $.each( state.filters, function ( name, value ) {
+   if ( baseState.filters !== undefined && 
baseState.filters[ name ] !== value ) {
+   result.filters[ name ] = value;
+   }
+   } );
+
+   $.each( state.highlights, function ( name, value ) {
+   if ( baseState.highlights !== undefined && 
baseState.highlights[ name ] !== value && name !== 'highlight' ) {
+   result.highlights[ name ] = value;
+   }
+   } );
+
+   return result;
+   };
+   /**
 * Get query by its identifier
 *
 * @param {string} queryID Query identifier

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e9345e8899fd27565930896e62c4d3be235ad58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Sbisson 
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...MinervaNeue[master]: Switch to @colorGray5 for wikitable borders

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Switch to @colorGray5 for wikitable borders
..


Switch to @colorGray5 for wikitable borders

Bug: T168029
Change-Id: I4507aae9f44538ec024ecc4c5d6219efc10be51e
---
M resources/skins.minerva.content.styles/tables.less
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/resources/skins.minerva.content.styles/tables.less 
b/resources/skins.minerva.content.styles/tables.less
index be4f454..7ebea51 100644
--- a/resources/skins.minerva.content.styles/tables.less
+++ b/resources/skins.minerva.content.styles/tables.less
@@ -22,9 +22,9 @@
// For skinning normal data tables
// Compare with mediawiki.legacy/shared.css
&.wikitable {
-   border: 1px solid @grayLight;
+   border: 1px solid @colorGray5;
// Note older browsers will fall back to @grayLight
-   border-color: fade( @grayLight, 20 );
+   border-color: fade( @colorGray5, 30 );
 
// We only style cells that are direct children of the 
wikitable table since
// table tags may be used for non-table purposes within 
the cells.
@@ -32,9 +32,9 @@
> tr > td,
> * > tr > th,
> * > tr > td {
-   border: 1px solid @grayLight;
+   border: 1px solid @colorGray5;
// Note older browsers will fall back to 
@grayLight
-   border-color: fade( @grayLight, 20 );
+   border-color: fade( @colorGray5, 30 );
padding: 0.2em;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4507aae9f44538ec024ecc4c5d6219efc10be51e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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]: Same namespace for global mail blacklist as for global spam ...

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Same namespace for global mail blacklist as for global spam 
blacklist.
..


Same namespace for global mail blacklist as for global spam blacklist.

Local page has been created & protected.

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f3d4195..05d1eff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -841,7 +841,7 @@
$wgBlacklistSettings = [
'email' => [
'files' => [
-   
'https://meta.wikimedia.org/w/index.php?title=MediaWiki:Email-blacklist=raw_ver=1'
+   
'https://meta.wikimedia.org/w/index.php?title=Email_blacklist=raw_ver=1'
],
],
'spam' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib66ca24c9d31017dcefd5b52b648e66580e69528
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Steinsplitter 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Stryn 
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...MinervaNeue[master]: Hygiene: Merge skins.minerva.print.styles with skins.minerva...

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Hygiene: Merge skins.minerva.print.styles with 
skins.minerva.base.styles
..

Hygiene: Merge skins.minerva.print.styles with skins.minerva.base.styles

We no longer need to keep this as a separate entry point now we do not
feature flag our print styles

Please enter the commit message for your changes. Lines starting

Change-Id: I6bf12980aa929e84f239931beb0a505809231830
---
M includes/skins/SkinMinerva.php
D resources/skins.minerva.base.styles/print.less
R resources/skins.minerva.base.styles/print/article.less
R resources/skins.minerva.base.styles/print/blockquotes.less
R resources/skins.minerva.base.styles/print/footer.less
R resources/skins.minerva.base.styles/print/header.less
R resources/skins.minerva.base.styles/print/references.less
A resources/skins.minerva.base.styles/print/styles.less
D resources/skins.minerva.print.styles/styles.less
M skin.json
10 files changed, 48 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/18/374418/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 03a7863..12d8ec2 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -317,8 +317,6 @@
public function initPage( OutputPage $out ) {
parent::initPage( $out );
$styles = [];
-   // FIXME: Merge this module with skins.minerva.base.styles
-   $styles[] = 'skins.minerva.print.styles';
 
$out->addModuleStyles( $styles );
$out->addJsConfigVars( $this->getSkinConfigVariables() );
diff --git a/resources/skins.minerva.base.styles/print.less 
b/resources/skins.minerva.base.styles/print.less
deleted file mode 100644
index 7f247bc..000
--- a/resources/skins.minerva.base.styles/print.less
+++ /dev/null
@@ -1,29 +0,0 @@
-@media print {
-   .noprint,
-   .banner-container,
-   .header,
-   .pre-content,
-   .post-content {
-   display: none;
-   }
-
-   h1,
-   h2,
-   h3,
-   h4,
-   h5,
-   h6 {
-   page-break-after: avoid;
-   }
-
-   table,
-   figure,
-   img,
-   .lazy-image-placeholder {
-   page-break-inside: avoid;
-   }
-
-   img {
-   max-width: 100%;
-   }
-}
diff --git a/resources/skins.minerva.print.styles/article.less 
b/resources/skins.minerva.base.styles/print/article.less
similarity index 100%
rename from resources/skins.minerva.print.styles/article.less
rename to resources/skins.minerva.base.styles/print/article.less
diff --git a/resources/skins.minerva.print.styles/blockquotes.less 
b/resources/skins.minerva.base.styles/print/blockquotes.less
similarity index 100%
rename from resources/skins.minerva.print.styles/blockquotes.less
rename to resources/skins.minerva.base.styles/print/blockquotes.less
diff --git a/resources/skins.minerva.print.styles/footer.less 
b/resources/skins.minerva.base.styles/print/footer.less
similarity index 100%
rename from resources/skins.minerva.print.styles/footer.less
rename to resources/skins.minerva.base.styles/print/footer.less
diff --git a/resources/skins.minerva.print.styles/header.less 
b/resources/skins.minerva.base.styles/print/header.less
similarity index 100%
rename from resources/skins.minerva.print.styles/header.less
rename to resources/skins.minerva.base.styles/print/header.less
diff --git a/resources/skins.minerva.print.styles/references.less 
b/resources/skins.minerva.base.styles/print/references.less
similarity index 100%
rename from resources/skins.minerva.print.styles/references.less
rename to resources/skins.minerva.base.styles/print/references.less
diff --git a/resources/skins.minerva.base.styles/print/styles.less 
b/resources/skins.minerva.base.styles/print/styles.less
new file mode 100644
index 000..e3bca04
--- /dev/null
+++ b/resources/skins.minerva.base.styles/print/styles.less
@@ -0,0 +1,47 @@
+@media print {
+   .noprint,
+   .banner-container,
+   .header,
+   .pre-content,
+   .post-content {
+   display: none;
+   }
+
+   h1,
+   h2,
+   h3,
+   h4,
+   h5,
+   h6 {
+   page-break-after: avoid;
+   }
+
+   table,
+   figure,
+   img,
+   .lazy-image-placeholder {
+   page-break-inside: avoid;
+   }
+
+   img {
+   max-width: 100%;
+   }
+}
+
+@media print and ( max-device-width: @deviceWidthTablet ) {
+   // Chrome: override the default margins and reveal the footer
+   // Experimental technology (see 
https://developer.mozilla.org/en-US/docs/Web/CSS/@page/size)
+   @page {
+   margin: 50px 0;
+   }
+
+   html {
+   padding: 0 50px;
+   }
+
+   @import

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Hygiene: Remove FIXMEs now enough time has passed

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Hygiene: Remove FIXMEs now enough time has passed
..

Hygiene: Remove FIXMEs now enough time has passed

Routine maintenance - all FIXME statements suggest these can
be removed. W00t!

Change-Id: I645dca1fa4d9e80d506e907b0be78a5aef0e2f12
---
M resources/skins.minerva.base.styles/footer.less
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.content.styles/lists.less
M resources/skins.minerva.tablet.scripts/toc.js
M skinStyles/mediawiki.action.edit.styles/minerva.less
5 files changed, 1 insertion(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/17/374417/1

diff --git a/resources/skins.minerva.base.styles/footer.less 
b/resources/skins.minerva.base.styles/footer.less
index b0a0d0f..b3739df 100644
--- a/resources/skins.minerva.base.styles/footer.less
+++ b/resources/skins.minerva.base.styles/footer.less
@@ -31,11 +31,6 @@
position: absolute;
right: -1em;
 
-   // FIXME: Remove pseudo selector rule in 1 weeks time [T145479]
-   &:before {
-   .transform( rotate( -90deg ) );
-   }
-
.client-nojs & {
// Certain browsers e.g. Opera Mini do not support css 
transforms
// We assume that we do not run JS on these browsers so 
hide the chevron
@@ -68,11 +63,6 @@
font-size: 0.875em;
}
}
-}
-
-// FIXME: Remove pseudo selector rule in 1 weeks time [T145479]
-.rtl footer .indicator:before {
-   .transform( rotate( 90deg ) );
 }
 
 @media ( min-width: @deviceWidthTablet ) {
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 74668e9..31f3dec 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -150,21 +150,6 @@
}
 }
 
-// Make search input more visible for users on small screens.
-// Opera Mini doesn't support placeholders.
-// FIXME: As soon as HeaderV2 feature flag is removed this entire block can 
disappear as a search icon
-// will now be shown on Opera Mini instead.
-@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
-   .header {
-   .search {
-   border: 1px solid @grayLight;
-   // Remove the space for the search icon inside the 
search bar and increase height to size of button
-   padding: 0.5em 0.1em;
-   background: none;  // so that the icon doesn't overlap 
with the placeholder
-   }
-   }
-}
-
 #searchInput {
cursor: text;
 }
@@ -177,8 +162,6 @@
 }
 
 .search-box {
-   // FIXME: remove when micro.tap in stable and rule from common-js.less 
too
-   -webkit-tap-highlight-color: rgba( 255, 255, 255, 0 );
 
.search {
@searchIconSize: 20px;
diff --git a/resources/skins.minerva.content.styles/lists.less 
b/resources/skins.minerva.content.styles/lists.less
index 31aff13..9d41525 100644
--- a/resources/skins.minerva.content.styles/lists.less
+++ b/resources/skins.minerva.content.styles/lists.less
@@ -1,10 +1,3 @@
-@import 'mediawiki.mixins.less';
-@import 'minerva.variables.less';
-@import 'minerva.mixins.less';
-
-// FIXME: Delete this in 7 days time (T42062)
-@import '../../skinStyles/mediawiki.hlist/minerva.less';
-
 .content {
ul {
list-style: square inside;
diff --git a/resources/skins.minerva.tablet.scripts/toc.js 
b/resources/skins.minerva.tablet.scripts/toc.js
index c4c6b83..ba26354 100644
--- a/resources/skins.minerva.tablet.scripts/toc.js
+++ b/resources/skins.minerva.tablet.scripts/toc.js
@@ -15,9 +15,7 @@
$toc = $( '#toc' ),
enableToc = mw.config.get( 'wgMinervaTocEnabled' );
 
-   if ( enableToc ||
-   // Fallback for old cached HTML, added 26 June, 2014
-   ( enableToc === null && sections.length > 0 && 
!page.isMainPage() ) ) {
+   if ( enableToc ) {
toc = new TableOfContents( {
sections: sections
} );
diff --git a/skinStyles/mediawiki.action.edit.styles/minerva.less 
b/skinStyles/mediawiki.action.edit.styles/minerva.less
index c5c8e63..4558d9b 100644
--- a/skinStyles/mediawiki.action.edit.styles/minerva.less
+++ b/skinStyles/mediawiki.action.edit.styles/minerva.less
@@ -1,7 +1,4 @@
 // Additional Styles for no-js editing mode
-
-// FIXME: `mobile.` LESS modules should not import `minerva.` LESS modules.
-// Move Minerva specific rules into skinStyles.
 @import 'minerva.mixins';
 
 .editHelp, .cancelLink, .mw-editButtons-pipe-separator {

-- 
To view, visit

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use correct table to find deletes.

2017-08-28 Thread Smalyshev (Code Review)

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

Change subject: Use correct table to find deletes.
..

Use correct table to find deletes.

Timestamps in archive table are revision creation timestamp,
and thus unsuitable for retreving deletes by timestamp.

This patch switches to using logging table, where timestamp is the actual
deletion timestamp, plus we check that there is an archive entry for this
title, to ensure the delete wasn't reversed. It is not perfect but it's
reasonable approximation for now.

Bug: T171921
Change-Id: Ie3c3ce292cd6a0c5264157a582544d98b3a6d48b
---
M maintenance/forceSearchIndex.php
1 file changed, 14 insertions(+), 12 deletions(-)


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

diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 7adffc7..5d4c51a 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -385,24 +385,28 @@
$dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
$it = new BatchRowIterator(
$dbr,
-   'archive',
-   [ 'ar_namespace', 'ar_title', 'ar_timestamp' ],
+   'logging',
+   [ 'log_timestamp' ],
$this->mBatchSize
);
 
-   $this->attachPageConditions( $dbr, $it, 'ar' );
-   $this->attachTimestampConditions( $dbr, $it, 'ar' );
-   $it->addConditions( [ 'ar_page_id IS NOT NULL' ] );
+   $this->attachPageConditions( $dbr, $it, 'log' );
+   $this->attachTimestampConditions( $dbr, $it, 'log' );
+   $it->addConditions( [
+   'log_type' => 'delete',
+   'log_action' => 'delete',
+   'EXISTS(select * from archive where ar_title = 
log_title and ar_namespace = log_namespace)',
+   ] );
 
-   $it->setFetchColumns( [ 'ar_timestamp', 'ar_namespace', 
'ar_title', 'ar_page_id' ] );
+   $it->setFetchColumns( [ 'log_timestamp', 'log_namespace', 
'log_title', 'log_page' ] );
 
return new CallbackIterator( $it, function ( $batch ) {
$titlesToDelete = [];
$docIdsToDelete = [];
$archive = [];
foreach ( $batch as $row ) {
-   $title = Title::makeTitle( $row->ar_namespace, 
$row->ar_title );
-   $id = $this->getSearchConfig()->makeId( 
$row->ar_page_id );
+   $title = Title::makeTitle( $row->log_namespace, 
$row->log_title );
+   $id = $this->getSearchConfig()->makeId( 
$row->log_page );
$titlesToDelete[] = $title;
$docIdsToDelete[] = $id;
$archive[] = [
@@ -415,10 +419,8 @@
'titlesToDelete' => $titlesToDelete,
'docIdsToDelete' => $docIdsToDelete,
'archive' => $archive,
-   'endingAt' => isset( $title )
-   ? substr( preg_replace(
-   '/[^' . Title::legalChars() . 
']/', '_', $title->getPrefixedDBkey()
-   ), 0, 30 )
+   'endingAt' => isset( $row )
+   ? ( new MWTimestamp( 
$row->log_timestamp ) )->getTimestamp( TS_ISO_8601 )
: 'unknown',
];
} );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] WLFilters: convert 'edit watchlist' button to new UX

2017-08-28 Thread Sbisson (Code Review)

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

Change subject: [WIP] WLFilters: convert 'edit watchlist' button to new UX
..

[WIP] WLFilters: convert 'edit watchlist' button to new UX

Bug: T172030
Change-Id: Ifcde40c66fbb6543d4f2aebfc8499c03533b8b91
---
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
A 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.EditWatchlistButtonWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
9 files changed, 132 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/374415/1

diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index 862863a..0336e8e 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -104,6 +104,10 @@

'wgStructuredChangeFiltersSavedQueriesPreferenceName',
'rcfilters-wl-saved-queries'
);
+   $output->addJsConfigVars(
+   'wgStructuredChangeFiltersWatchlistItemCount',
+   $this->countItems()
+   );
}
}
 
@@ -795,21 +799,25 @@
$showUpdatedMarker = $this->getConfig()->get( 
'ShowUpdatedMarker' );
 
// Show watchlist header
-   $form .= "";
+   $watchlistHeader = '';
if ( $numItems == 0 ) {
-   $form .= $this->msg( 'nowatchlist' )->parse() . "\n";
+   $watchlistHeader .= $this->msg( 'nowatchlist' 
)->parse() . "\n";
} else {
-   $form .= $this->msg( 'watchlist-details' )->numParams( 
$numItems )->parse() . "\n";
+   $watchlistHeader .= $this->msg( 'watchlist-details' 
)->numParams( $numItems )->parse() . "\n";
if ( $this->getConfig()->get( 'EnotifWatchlist' )
&& $user->getOption( 'enotifwatchlistpages' )
) {
-   $form .= $this->msg( 'wlheader-enotif' 
)->parse() . "\n";
+   $watchlistHeader .= $this->msg( 
'wlheader-enotif' )->parse() . "\n";
}
if ( $showUpdatedMarker ) {
-   $form .= $this->msg( 'wlheader-showupdated' 
)->parse() . "\n";
+   $watchlistHeader .= $this->msg( 
'wlheader-showupdated' )->parse() . "\n";
}
}
-   $form .= "";
+   $form .= Html::rawElement(
+   'p',
+   [ 'class' => 'watchlistDetails' ],
+   $watchlistHeader
+   );
 
if ( $numItems > 0 && $showUpdatedMarker ) {
$form .= Xml::openElement( 'form', [ 'method' => 'post',
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a44b3cf..196614a 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1469,6 +1469,8 @@
"rcfilters-liveupdates-button-title-on": "Turn off live updates",
"rcfilters-liveupdates-button-title-off": "Display new changes as they 
happen",
"rcfilters-watchlist-markSeen-button": "Mark all changes as seen",
+   "rcfilters-watchlist-editWatchlist-button": "Edit your list of watched 
pages",
+   "rcfilters-watchlist-details": "{{PLURAL:$1|$1 page|$1 pages}} on your 
watchlist (plus talk pages). ",
"rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since 
$3, $4 (up to $1 shown).",
"rclistfromreset": "Reset date selection",
"rclistfrom": "Show new changes starting from $2, $3",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 036a941..294df43 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1659,6 +1659,8 @@
"rcfilters-liveupdates-button-title-on": "Title for the button to 
enable or disable live updates on [[Special:RecentChanges]] when the feature is 
ON.",
"rcfilters-liveupdates-button-title-off": "Title for the button to 
enable or disable live updates on [[Special:RecentChanges]] when the feature is 
OFF.",
"rcfilters-watchlist-markSeen-button": "Label for the button to mark 
all changes as seen on [[Special:Watchlist]] when using the structured filters 
interface.",
+   "rcfilters-watchlist-editWatchlist-button": "Label for the button to 
edit the

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Drop Android2 check for search

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Drop Android2 check for search
..


Drop Android2 check for search

Android2 is a grade C browser so this code will never be run in
MediaWiki.

Change-Id: I184df4fbea3743d54b24e3782c4d1debf7ff9095
---
M resources/skins.minerva.scripts/search.js
1 file changed, 9 insertions(+), 15 deletions(-)

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



diff --git a/resources/skins.minerva.scripts/search.js 
b/resources/skins.minerva.scripts/search.js
index 10d73ee..2f188b1 100644
--- a/resources/skins.minerva.scripts/search.js
+++ b/resources/skins.minerva.scripts/search.js
@@ -2,8 +2,7 @@
var SearchOverlay = M.require( 'mobile.search/SearchOverlay' ),
SearchGateway = M.require( 'mobile.search.api/SearchGateway' ),
router = require( 'mediawiki.router' ),
-   searchLogger = M.require( 'mobile.search/MobileWebSearchLogger' 
),
-   browser = M.require( 'mobile.startup/Browser' ).getSingleton();
+   searchLogger = M.require( 'mobile.search/MobileWebSearchLogger' 
);
 
/**
 * Reveal the search overlay
@@ -39,18 +38,13 @@
return;
}
 
-   // See https://phabricator.wikimedia.org/T76882 for why we disable 
search on Android 2
-   if ( browser.isAndroid2() ) {
-   $( 'body' ).addClass( 'client-use-basic-search' );
-   } else {
-   // don't use focus event 
(https://bugzilla.wikimedia.org/show_bug.cgi?id=47499)
-   //
-   // focus() (see SearchOverlay#show) opens virtual keyboard only 
if triggered
-   // from user context event, so using it in route callback won't 
work
-   // 
http://stackoverflow.com/questions/6837543/show-virtual-keyboard-on-mobile-phones-in-javascript
-   $( '#searchInput, #searchIcon' ).on( 'click', openSearchOverlay 
)
-   // Apparently needed for main menu to work correctly.
-   .prop( 'readonly', true );
-   }
+   // don't use focus event 
(https://bugzilla.wikimedia.org/show_bug.cgi?id=47499)
+   //
+   // focus() (see SearchOverlay#show) opens virtual keyboard only if 
triggered
+   // from user context event, so using it in route callback won't work
+   // 
http://stackoverflow.com/questions/6837543/show-virtual-keyboard-on-mobile-phones-in-javascript
+   $( '#searchInput, #searchIcon' ).on( 'click', openSearchOverlay )
+   // Apparently needed for main menu to work correctly.
+   .prop( 'readonly', true );
 
 }( mw.mobileFrontend, jQuery ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I184df4fbea3743d54b24e3782c4d1debf7ff9095
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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...Popups[master]: Don't use ES6 Number.isNaN

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Don't use ES6 Number.isNaN
..


Don't use ES6 Number.isNaN

Number.isNaN is a new function introduced in ECMAScript 6.
MediaWiki only requires ECMAScript 5 supports from browsers.
Notably, Opera 12 does not have Number.isNaN. Instead, use
the global isNaN function (which behaves the same except for
non-numeric inputs).

Change-Id: If436cd26b21ce0336dfbc37144f6226e7b948e5e
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/userSettings.js
3 files changed, 3 insertions(+), 3 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: If436cd26b21ce0336dfbc37144f6226e7b948e5e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
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...MinervaNeue[master]: Switch to @colorGray5 for wikitable borders

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Switch to @colorGray5 for wikitable borders
..

Switch to @colorGray5 for wikitable borders

Bug: T168029
Change-Id: I4507aae9f44538ec024ecc4c5d6219efc10be51e
---
M resources/skins.minerva.content.styles/tables.less
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/14/374414/1

diff --git a/resources/skins.minerva.content.styles/tables.less 
b/resources/skins.minerva.content.styles/tables.less
index be4f454..61fca31 100644
--- a/resources/skins.minerva.content.styles/tables.less
+++ b/resources/skins.minerva.content.styles/tables.less
@@ -22,9 +22,9 @@
// For skinning normal data tables
// Compare with mediawiki.legacy/shared.css
&.wikitable {
-   border: 1px solid @grayLight;
+   border: 1px solid @colorGray5;
// Note older browsers will fall back to @grayLight
-   border-color: fade( @grayLight, 20 );
+   border-color: fade( @colorGray5, 20 );
 
// We only style cells that are direct children of the 
wikitable table since
// table tags may be used for non-table purposes within 
the cells.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4507aae9f44538ec024ecc4c5d6219efc10be51e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: update diff test results

2017-08-28 Thread BearND (Code Review)

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

Change subject: Hygiene: update diff test results
..

Hygiene: update diff test results

Change-Id: I92cbbaa613d4c0abac0145fab7b788bcaa33fa4c
---
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section22-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section23-text.html
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section25-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section11-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section12-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section22-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section23-text.html
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section25-text.html
14 files changed, 34 insertions(+), 34 deletions(-)


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

diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 324152a..90f4cf4 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -92,14 +92,14 @@
   },
   {
 "id": 11,
-"text": "\n\nhttps://upload.wikimedia.org/wikipedia/commons/7/79/Big_Buck_Bunny_small.ogv\;
 type=\"video/ogg; codecs=theora, vorbis\" data-file-width=\"240\" 
data-file-height=\"134\" data-title=\"Original Ogg file, 240 × 134 (277 kbps)\" 
data-shorttitle=\"Ogg source\" id=\"mwWQ\">https://upload.wikimedia.org/wikipedia/commons/transcoded/7/79/Big_Buck_Bunny_small.ogv/Big_Buck_Bunny_small.ogv.160p.webm\;
 type=\"video/webm; codecs=vp8, vorbis\" data-width=\"240\" 
data-height=\"134\" data-title=\"Low bandwidth WebM (160P)\" 
data-shorttitle=\"WebM 160P\" id=\"mwWg\">https://upload.wikimedia.org/wikipedia/commons/transcoded/7/79/Big_Buck_Bunny_small.ogv/Big_Buck_Bunny_small.ogv.160p.ogv\;
 type=\"video/ogg; codecs=theora, vorbis\" data-width=\"240\" 
data-height=\"134\" data-title=\"Low bandwidth Ogg video (160P)\" 
data-shorttitle=\"Ogg 160P\" id=\"mwWw\">\n\n",
+"text": "\n\nhttps://upload.wikimedia.org/wikipedia/commons/7/79/Big_Buck_Bunny_small.ogv\;
 type=\"video/ogg; codecs=theora, vorbis\" data-file-width=\"240\" 
data-file-height=\"134\" data-title=\"Original Ogg file, 240 × 134 (277 kbps)\" 
data-shorttitle=\"Ogg source\" id=\"mwWQ\">https://upload.wikimedia.org/wikipedia/commons/transcoded/7/79/Big_Buck_Bunny_small.ogv/Big_Buck_Bunny_small.ogv.160p.webm\;
 type=\"video/webm; codecs=vp8, vorbis\" data-width=\"240\" 
data-height=\"134\" data-title=\"Low bandwidth WebM (160P)\" 
data-shorttitle=\"WebM 160P\" id=\"mwWg\">\n\n",
 "toclevel": 1,
 "line": "Video",
 "anchor": "Video"
   },
   {
 "id": 12,
-"text": "\n\"WP:TPA\" redirects here. For talk page archiving, 
see Help:Archiving a talk page.\nA perfect 
Wikipedia article...\nIs on a notable topic.\nFills a gap not 
provided by existing or related articles.\nHas an 
appropriate structure.\n\n",
+"text": "\n\"WP:TPA\" redirects here. For talk page archiving, 
see Help:Archiving a talk page.\nA perfect 
Wikipedia article...\nIs on a notable topic.\nFills a gap not 
provided by existing or related articles.\nHas an 
appropriate structure.\n\n",
 "toclevel": 1,
 "line": "From Wikipedia:The perfect article",
 "anchor": "From_Wikipedia:The_perfect_article"
@@ -120,7 +120,7 @@
   },
   {
 "id": 15,
-"text": "\n\nShortcut:\nMOS:BODY\nFurther information: 
Help:Section and Wikipedia:Manual of Style 
§Article titles, headings, and sections\n\nBody sections appear after the lead and table of

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Show CTA at bottom of anonymous editor warning

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Show CTA at bottom of anonymous editor warning
..

Show CTA at bottom of anonymous editor warning

Bug: T164628
Change-Id: I7e10409e2854d803f8de4167f18fe4a67ed3ddee
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
M resources/mobile.editor.common/editor.less
M resources/mobile.editor.overlay/EditorOverlay.js
6 files changed, 12 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index 585f996..ce8b660 100644
--- a/extension.json
+++ b/extension.json
@@ -478,7 +478,8 @@
"22": "mobile-frontend-editor-switch-confirm",
"23": "mobile-frontend-editor-switch-editor",
"24": 
"mobile-frontend-editor-switch-visual-editor",
-   "25": "mobile-frontend-editor-anonwarning"
+   "25": "mobile-frontend-editor-anonwarning",
+   "26": "mobile-frontend-anon-cta-message"
}
},
"mobile.editor.overlay": {
@@ -1358,4 +1359,4 @@
"includes/ServiceWiring.php"
],
"manifest_version": 1
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index fbab860..7ec7b70 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -37,6 +37,7 @@
"Yuvaraj Pandian"
]
},
+   "mobile-frontend-anon-cta-message": "Log in or create an account to 
track your edits",
"abusefilter-edit-builder-vars-user-mobile": "Whether or not a user is 
editing through the mobile interface",
"mobile-frontend-account-create-captcha-placeholder": "Enter 
confirmation code",
"mobile-frontend-categories-heading": "Categories",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f40de40..8218510 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -38,6 +38,7 @@
"Arthur2e5"
]
},
+   "mobile-frontend-anon-cta-message": "Call to action, shown to anonymous 
editors before they edit",
"abusefilter-edit-builder-vars-user-mobile": "AbuseFilter extension 
rule variable that allows distinguishing edits based on if they have been made 
using the editor of MobileFrontend or not.",
"mobile-frontend-account-create-captcha-placeholder": "Placeholder for 
captcha input field",
"mobile-frontend-categories-heading": "Title of the list of categories 
this page is categorized in.\n{{Identical|Category}}",
diff --git a/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan 
b/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
index 5a116d5..16a3325 100644
--- a/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
+++ b/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan
@@ -5,4 +5,5 @@
{{#loginButton}}{{>button}}{{/loginButton}}
{{#signupButton}}{{>button}}{{/signupButton}}

+   {{ctaMessage}}
 
\ No newline at end of file
diff --git a/resources/mobile.editor.common/editor.less 
b/resources/mobile.editor.common/editor.less
index 2166df7..79288c2 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -14,6 +14,11 @@
.mw-ui-button {
margin-bottom: 15px;
}
+   > p {
+   text-align: center;
+   font-style: italic;
+   font-size: 0.875em;
+   }
}
 
.preview {
diff --git a/resources/mobile.editor.overlay/EditorOverlay.js 
b/resources/mobile.editor.overlay/EditorOverlay.js
index 1024a08..f7261d1 100644
--- a/resources/mobile.editor.overlay/EditorOverlay.js
+++ b/resources/mobile.editor.overlay/EditorOverlay.js
@@ -67,6 +67,7 @@
 * @cfg {mw.Api} defaults.api an api module to retrieve pages
 */
defaults: $.extend( {}, EditorOverlayBase.prototype.defaults, {
+   ctaMessage: mw.msg( 'mobile-frontend-anon-cta-message' 
),
loginButton: new Button( {
block: true,
label: mw.msg( 
'mobile-frontend-watchlist-cta-button-login' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e10409e2854d803f8de4167f18fe4a67ed3ddee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson

[MediaWiki-commits] [Gerrit] integration/config[master]: Cleanup SemanticMediaWiki test config

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Cleanup SemanticMediaWiki test config
..


Cleanup SemanticMediaWiki test config

Change generic unittest to composer unittest
to install SemanticMediaWiki over composer

SemanticSifter: Already in composer
SemanticGenealogy: I5584b9c3c860bb6df51347132a7aa987cfecab33
SemanticImageInput: I48715c8bd06ceebb3086d86f44f7fe87c9a6a383
SolrStore: I5567c5b738f282548b0fc1c5d98c29b24259656e

Change-Id: I44d6cb59c5bdfed10c7a0a088f07b58e0960e44e
---
M zuul/layout.yaml
M zuul/parameter_functions.py
2 files changed, 5 insertions(+), 9 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 54d9a52..72cd78d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5273,7 +5273,7 @@
 
   - name: mediawiki/extensions/SemanticHighcharts
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticRating
@@ -5283,7 +5283,7 @@
 
   - name: mediawiki/extensions/SemanticSifter
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticWebBrowser
@@ -5402,8 +5402,7 @@
 
   - name: mediawiki/extensions/SolrStore
 template:
-  - name: mwgate-composer
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SoundManager2Button
@@ -6494,7 +6493,7 @@
 
   - name: mediawiki/extensions/SemanticGenealogy
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticImageAnnotator
@@ -6503,7 +6502,7 @@
 
   - name: mediawiki/extensions/SemanticImageInput
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-composer
   - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticInternalObjects
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 6abc2cf..7cf452a 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -212,11 +212,8 @@
 'QuizGame': ['SocialProfile'],
 'RelatedArticles': ['BetaFeatures', 'MobileFrontend'],
 'Score': ['VisualEditor'],
-'SemanticImageInput': ['SemanticMediaWiki'],
-'SemanticSifter': ['SemanticMediaWiki'],
 'SimpleSAMLphp': ['PluggableAuth'],
 'SimpleSurvey': ['PrefSwitch'],
-'SolrStore': ['SemanticMediaWiki'],
 'SpellingDictionary': ['UniversalLanguageSelector'],
 'Spreadsheet': ['PHPExcel'],
 'SyntaxHighlight_GeSHi': ['VisualEditor'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44d6cb59c5bdfed10c7a0a088f07b58e0960e44e
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VIKI[master]: Install SemanticMediaWiki over composer

2017-08-28 Thread Umherirrender (Code Review)

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

Change subject: Install SemanticMediaWiki over composer
..

Install SemanticMediaWiki over composer

Needed to run automatic tests with jenkins

Change-Id: I1e9385e842a96c38697003cd2070de3ade952071
---
M .gitignore
M Gruntfile.js
A composer.json
3 files changed, 18 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VIKI 
refs/changes/09/374409/1

diff --git a/.gitignore b/.gitignore
index a7abe44..9008a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 vendor/
-
+composer.lock
+extensions/
diff --git a/Gruntfile.js b/Gruntfile.js
index a45071e..66b2ac3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,8 @@
all: [
'**/*.json',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
}
} );
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..ed05954
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+   "require": {
+   "mediawiki/semantic-media-wiki": ">=1.9"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude extensions"
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e9385e842a96c38697003cd2070de3ade952071
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VIKI
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...VikiTitleIcon[master]: Install SemanticMediaWiki over composer

2017-08-28 Thread Umherirrender (Code Review)

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

Change subject: Install SemanticMediaWiki over composer
..

Install SemanticMediaWiki over composer

Needed to run automatic tests with jenkins

Change-Id: I1588349cba6be7995d41dd6fd4d52ce36408a2ad
---
M .gitignore
M Gruntfile.js
A composer.json
3 files changed, 18 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VikiTitleIcon 
refs/changes/11/374411/1

diff --git a/.gitignore b/.gitignore
index a7abe44..9008a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 vendor/
-
+composer.lock
+extensions/
diff --git a/Gruntfile.js b/Gruntfile.js
index a45071e..66b2ac3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,8 @@
all: [
'**/*.json',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
}
} );
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..ed05954
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+   "require": {
+   "mediawiki/semantic-media-wiki": ">=1.9"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude extensions"
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1588349cba6be7995d41dd6fd4d52ce36408a2ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VikiTitleIcon
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...VikiSemanticTitle[master]: Install SemanticMediaWiki over composer

2017-08-28 Thread Umherirrender (Code Review)

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

Change subject: Install SemanticMediaWiki over composer
..

Install SemanticMediaWiki over composer

Needed to run automatic tests with jenkins

Change-Id: Ie92ce516f1f2569d3669e7ded7ed449ca338a0c4
---
M .gitignore
M Gruntfile.js
A composer.json
3 files changed, 18 insertions(+), 2 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index a7abe44..9008a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 vendor/
-
+composer.lock
+extensions/
diff --git a/Gruntfile.js b/Gruntfile.js
index a45071e..66b2ac3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,8 @@
all: [
'**/*.json',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
}
} );
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..ed05954
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+   "require": {
+   "mediawiki/semantic-media-wiki": ">=1.9"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude extensions"
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie92ce516f1f2569d3669e7ded7ed449ca338a0c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VikiSemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Bump versionCode
..


Bump versionCode

Change-Id: Id7c9e555c267a770c8c1bb2f7394da174c70d472
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 661ac4b..7c52951 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 201
+versionCode 202
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7c9e555c267a770c8c1bb2f7394da174c70d472
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Add spacing to anonymous editing message

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Add spacing to anonymous editing message
..

Add spacing to anonymous editing message

(Call to action will be added in a follow up)

Bug: T164628
Change-Id: I4ce7171d3247e61f36e14d1bd090c91e67d0a1aa
---
M resources/mobile.editor.common/editor.less
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/resources/mobile.editor.common/editor.less 
b/resources/mobile.editor.common/editor.less
index 57df50a..1c25820 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -4,6 +4,17 @@
 .editor-overlay {
.box-sizing( border-box );
 
+   .anonwarning {
+   margin-top: 16px;
+
+   .anonmsg {
+   margin-bottom: 19px;
+   }
+   .mw-ui-button {
+   margin-bottom: 15px;
+   }
+   }
+
.preview {
display: none;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ce7171d3247e61f36e14d1bd090c91e67d0a1aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

2017-08-28 Thread Dbrant (Code Review)

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

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: Id7c9e555c267a770c8c1bb2f7394da174c70d472
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 661ac4b..7c52951 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 201
+versionCode 202
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7c9e555c267a770c8c1bb2f7394da174c70d472
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: metrics::search::srp_survtime: Track search results page dwe...

2017-08-28 Thread Chelsyx (Code Review)

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

Change subject: metrics::search::srp_survtime: Track search results page dwell 
time
..


metrics::search::srp_survtime: Track search results page dwell time

Bug: T170468
Change-Id: I694a2f24cd831428ad95872dea085f8307994b4a
---
M docs/README.Rmd
M docs/README.md
M modules/metrics/search/config.yaml
A modules/metrics/search/srp_survtime
A modules/metrics/search/srp_survtime.R
5 files changed, 136 insertions(+), 4 deletions(-)

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



diff --git a/docs/README.Rmd b/docs/README.Rmd
index c03b43d..c7d27c0 100644
--- a/docs/README.Rmd
+++ b/docs/README.Rmd
@@ -1,12 +1,12 @@
 ---
 output: md_document
 note: >
-  Needs to be knit into Markdown and rsync'd to 
stat1002:/a/published-datasets/discovery/README.md
+  Needs to be knit into Markdown and rsync'd to 
stat1005:/srv/published-datasets/discovery/README.md
 ---
 
 # Discovery Datasets
 
-These files are generated by Discovery's 
[Golden](https://github.com/wikimedia/wikimedia-discovery-golden/) data 
retrieval codebase that executes daily and uses 
[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater) 
infrastructure. These datasets provide the metrics that are used by 
[Discovery's Dashboards](https://discovery.wmflabs.org/)
+These files are generated by Discovery's 
[Golden](https://github.com/wikimedia/wikimedia-discovery-golden/) data 
retrieval codebase that executes daily and uses 
[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Systems/Reportupdater)
 infrastructure. These datasets provide the metrics that are used by 
[Discovery's Dashboards](https://discovery.wmflabs.org/)
 
 Last updated on `r format(Sys.Date(), "%d %B %Y")`
 
diff --git a/docs/README.md b/docs/README.md
index f1ea48c..8af2aa3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,11 +4,11 @@
 These files are generated by Discovery's
 [Golden](https://github.com/wikimedia/wikimedia-discovery-golden/) data
 retrieval codebase that executes daily and uses
-[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater)
+[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Systems/Reportupdater)
 infrastructure. These datasets provide the metrics that are used by
 [Discovery's Dashboards](https://discovery.wmflabs.org/)
 
-Last updated on 01 August 2017
+Last updated on 28 August 2017
 
 Daily Metrics
 -
@@ -145,6 +145,9 @@
 Wikipedia search results pages; broken up by language, destination
 type (SERP vs not), and access method (desktop vs mobile web);
 exlcudes known automata
+-   **srp\_survtime.tsv**: Estimates (via survival analysis) of how long
+Wikipedia searchers stay on full-text search results page after
+getting there from autocomplete search.
 
 wdqs/
 -
diff --git a/modules/metrics/search/config.yaml 
b/modules/metrics/search/config.yaml
index 82f1c3f..56ec39b 100644
--- a/modules/metrics/search/config.yaml
+++ b/modules/metrics/search/config.yaml
@@ -162,3 +162,9 @@
 starts: 2017-06-01
 funnel: true
 type: script
+srp_survtime:
+description: Estimates (via survival analysis) of how long Wikipedia 
searchers stay on full-text search results page after getting there from 
autocomplete search.
+granularity: days
+starts: 2017-04-01
+funnel: true
+type: script
diff --git a/modules/metrics/search/srp_survtime 
b/modules/metrics/search/srp_survtime
new file mode 100755
index 000..08e2682
--- /dev/null
+++ b/modules/metrics/search/srp_survtime
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+Rscript modules/metrics/search/srp_survtime.R -d $1
diff --git a/modules/metrics/search/srp_survtime.R 
b/modules/metrics/search/srp_survtime.R
new file mode 100644
index 000..e24f99d
--- /dev/null
+++ b/modules/metrics/search/srp_survtime.R
@@ -0,0 +1,120 @@
+#!/usr/bin/env Rscript
+
+source("config.R")
+.libPaths(r_library)
+suppressPackageStartupMessages({
+  library("optparse")
+  library("glue")
+  library("magrittr")
+})
+
+option_list <- list(
+  make_option(c("-d", "--date"), default = NA, action = "store", type = 
"character")
+)
+
+# Get command line options, if help option encountered print help and exit,
+# otherwise if options not found on command line then set defaults:
+opt <- parse_args(OptionParser(option_list = option_list))
+
+if (is.na(opt$date)) {
+  quit(save = "no", status = 1)
+}
+
+mmdd <- format(as.Date(opt$date), "%Y%m%d")
+revision_number <- dplyr::case_when(
+  as.Date(opt$date) < "2017-02-10" ~ "15922352",
+  as.Date(opt$date) < "2017-06-29" ~ "16270835",
+  TRUE ~ "16909631"
+)
+
+query <- glue("SELECT
+  timestamp AS ts, wiki,
+  event_uniqueId AS event_id,
+  event_searchSessionId AS session_id,
+  event_pageViewId AS page_id,
+  event_action AS event,
+  event_checkin AS checkin,
+

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Encode human search relevance survey into html output

2017-08-28 Thread EBernhardson (Code Review)

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

Change subject: Encode human search relevance survey into html output
..

Encode human search relevance survey into html output

Moves the search relevance configuration from javascript into php
configuration so it can be run on a larger number of pages without
exploding the size of javascript delivered to everyone with all
that config.

The downside of this approach is that because the config is cached
into the page html any updates have to work their way through varnish
caching. For the initial test this should be fine, and in the future
when we are doing larger scale collection we just have to keep in mind
that configuration changes take around 7 days to propogate.

Bug: T174387
Change-Id: I7ae522155e67610d25b5857d7b3918559bce8bc7
---
M WikimediaEventsHooks.php
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
3 files changed, 26 insertions(+), 211 deletions(-)


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

diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 0d8b7e5..4185754 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -644,4 +644,12 @@
);
}
 
+   public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
+   global $wgWMESearchRelevancePages;
+   $articleId = $out->getTitle()->getArticleID();
+   if ( isset( $wgWMESearchRelevancePages[$articleId] ) ) {
+   $vars['wgWMESearchRelevancePages'] = 
$wgWMESearchRelevancePages[$articleId];
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 63a8487..4b1b718 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,9 @@
],
"ChangesListSpecialPageStructuredFilters": [

"WikimediaEventsHooks::onChangesListSpecialPageStructuredFilters"
+   ],
+   "MakeGlobalVariablesScript": [
+   "WikimediaEventsHooks::onMakeGlobalVariablesScript"
]
},
"MessagesDirs": {
@@ -167,7 +170,8 @@
],
"skinScripts": {
"default": [
-   
"ext.wikimediaEvents.searchSatisfaction.js"
+   
"ext.wikimediaEvents.searchSatisfaction.js",
+   "ext.wikimediaEvents.humanSearchRel.js"
],
"minerva": []
},
@@ -219,7 +223,8 @@
"config": {
"WMEReadingDepthSamplingRate": 0.005,
"WMEReadingDepthEnabled": false,
-   "WMEStatsdBaseUri": false
+   "WMEStatsdBaseUri": false,
+   "wgWMESearchRelevancePages": []
},
"manifest_version": 1
 }
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js 
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 7ac..435c6d8 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -21,216 +21,18 @@
return;
}
 
-   // For the MVP we are simply hardcoding the list of queries and 
articles.
-   // If the MVP shows to return data that isn't complete junk this will be
-   // revisited, perhaps embedding the desired queries into cached page 
render
-   // or some such. oneIn values are tuned for approximately 1000 
impressions
-   // per week.
-   var config = {
-   429700: {
-   oneIn: 12,
-   queries: [ 'search engine' ]
-   },
-   1140230: {
-   oneIn: 1,
-   queries: [ 'sailor soldier tinker spy' ]
-   },
-   4184791: {
-   oneIn: 1,
-   queries: [ '10 items or fewer' ]
-   },
-   28203916: {
-   oneIn: 1,
-   queries: [ 'block buster' ]
-   },
-   1692813: {
-   oneIn: 1,
-   queries: [ 'sailor soldier tinker spy' ]
-   },
-   4059023: {
-   oneIn: 9,
-   queries: [ 'search engine' ]
-   },
-   12432: {
-   oneIn: 2,
-   queries: [ 'what is a genius iq?' ]
-   },
-   54255761: {
-   oneIn: 1,
-   queries: [ 'who is v for vendetta?' ]
-   },
-   15170457: {
-

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Drop Android2 check for search

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Drop Android2 check for search
..

Drop Android2 check for search

Android2 is a grade C browser so this code will never be run in
MediaWiki.

Change-Id: I184df4fbea3743d54b24e3782c4d1debf7ff9095
---
M resources/skins.minerva.scripts/search.js
1 file changed, 8 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/05/374405/1

diff --git a/resources/skins.minerva.scripts/search.js 
b/resources/skins.minerva.scripts/search.js
index 10d73ee..6bbdf9c 100644
--- a/resources/skins.minerva.scripts/search.js
+++ b/resources/skins.minerva.scripts/search.js
@@ -39,18 +39,13 @@
return;
}
 
-   // See https://phabricator.wikimedia.org/T76882 for why we disable 
search on Android 2
-   if ( browser.isAndroid2() ) {
-   $( 'body' ).addClass( 'client-use-basic-search' );
-   } else {
-   // don't use focus event 
(https://bugzilla.wikimedia.org/show_bug.cgi?id=47499)
-   //
-   // focus() (see SearchOverlay#show) opens virtual keyboard only 
if triggered
-   // from user context event, so using it in route callback won't 
work
-   // 
http://stackoverflow.com/questions/6837543/show-virtual-keyboard-on-mobile-phones-in-javascript
-   $( '#searchInput, #searchIcon' ).on( 'click', openSearchOverlay 
)
-   // Apparently needed for main menu to work correctly.
-   .prop( 'readonly', true );
-   }
+   // don't use focus event 
(https://bugzilla.wikimedia.org/show_bug.cgi?id=47499)
+   //
+   // focus() (see SearchOverlay#show) opens virtual keyboard only if 
triggered
+   // from user context event, so using it in route callback won't work
+   // 
http://stackoverflow.com/questions/6837543/show-virtual-keyboard-on-mobile-phones-in-javascript
+   $( '#searchInput, #searchIcon' ).on( 'click', openSearchOverlay )
+   // Apparently needed for main menu to work correctly.
+   .prop( 'readonly', true );
 
 }( mw.mobileFrontend, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I184df4fbea3743d54b24e3782c4d1debf7ff9095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove checks for Android2

2017-08-28 Thread Jdlrobson (Code Review)

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

Change subject: Hygiene: Remove checks for Android2
..

Hygiene: Remove checks for Android2

Android2 is now a grade C browser, so we don't run JS there,
thus this code is dead.

Change-Id: I2086f7083e94e4ea5a79436317ac43fc31a622fa
---
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.editor.common/editor.less
M resources/mobile.startup/browser.js
M tests/qunit/mobile.startup/test_browser.js
4 files changed, 1 insertion(+), 43 deletions(-)


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

diff --git a/resources/mobile.editor.common/EditorOverlayBase.js 
b/resources/mobile.editor.common/EditorOverlayBase.js
index ebb2f9f..9033b1a 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -258,10 +258,6 @@
},
/** @inheritdoc **/
postRender: function () {
-   // Add a class so editor can make some Android 2 
specific customisations.
-   if ( browser.isAndroid2() ) {
-   this.$el.addClass( 'android-2' );
-   }
// log edit attempt
this.log( {
action: 'ready'
diff --git a/resources/mobile.editor.common/editor.less 
b/resources/mobile.editor.common/editor.less
index 264ac8d..57df50a 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -58,9 +58,3 @@
min-width: 30px;
}
 }
-
-// FIXME: high line-height (1.5) causes weird behavior in textareas on
-// Android 2.x, remove this if we don't want to support editor there
-.android2.editor-overlay textarea {
-   line-height: 1.2;
-}
diff --git a/resources/mobile.startup/browser.js 
b/resources/mobile.startup/browser.js
index faa2c23..1675301 100644
--- a/resources/mobile.startup/browser.js
+++ b/resources/mobile.startup/browser.js
@@ -36,9 +36,6 @@
function Browser( ua, $container ) {
this.userAgent = ua;
this.$el = $container;
-   if ( this.isAndroid2() ) {
-   this.lockViewport();
-   }
this._fixIosLandscapeBug();
}
 
@@ -97,14 +94,6 @@
}
},
/**
-* Determine if a device is Android 2.
-* @method
-* @return {boolean}
-*/
-   isAndroid2: memoize( function () {
-   return /Android 2/.test( this.userAgent );
-   } ),
-   /**
 * Determine if a device has a widescreen.
 * @method
 * @return {boolean}
@@ -138,13 +127,6 @@
 * @return {boolean}
 */
supportsAnimations: memoize( function () {
-   // don't trust Android 2.x, really
-   // animations cause textareas to misbehave on it
-   // (http://stackoverflow.com/a/5734984/365238)
-   if ( this.isAndroid2() ) {
-   return false;
-   }
-
return this.supportsCSSProperty( 'animationName' ) &&
this.supportsCSSProperty( 'transform' ) &&
this.supportsCSSProperty( 'transition' );
diff --git a/tests/qunit/mobile.startup/test_browser.js 
b/tests/qunit/mobile.startup/test_browser.js
index 319a731..bc86891 100644
--- a/tests/qunit/mobile.startup/test_browser.js
+++ b/tests/qunit/mobile.startup/test_browser.js
@@ -21,7 +21,7 @@
assert.strictEqual( browser5.isIos( 5 ), true );
} );
 
-   QUnit.test( 'Methods are cached', 15, function ( assert ) {
+   QUnit.test( 'Methods are cached', 8, function ( assert ) {
var ipad = new Browser( 'Mozilla/5.0 (iPad; CPU OS 7_0 like Mac 
OS X) AppleWebKit/537.51.1 (KHTML, like Gecko)', $html ),
iphone = new Browser( 'Mozilla/5.0 (iPhone; CPU iPhone 
OS 8_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/8.0 
Mobile/11A465 Safari/9537.53', $html ),
android2 = new Browser( 'Android 2', $html );
@@ -34,28 +34,14 @@
// cache and don't interfere with one another
assert.strictEqual( ipad.isIos(), true );
assert.strictEqual( ipad.isIos( 8 ), false );
-   assert.strictEqual( ipad.isAndroid2(), false );
-   assert.strictEqual( android2.isAndroid2(), true );
assert.strictEqual( android2.isIos( 8 ), false );

[MediaWiki-commits] [Gerrit] labs...heritage[wikidata]: Allow skipping some configs during full harvest.

2017-08-28 Thread Lokal Profil (Code Review)

Lokal Profil has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374403 )

Change subject: Allow skipping some configs during full harvest.
..

Allow skipping some configs during full harvest.

Adds the `-skip_wd` command line argument which skips all wikidata/sparql
harvesting.
Adds the `skip` config setting which, when set to true, skips that
particular config file from harvesting.

In both cases harvesting is allowed if a particular language-country
combination is provided.

Bug: T174334
Change-Id: I79cba7c655e68c6814838f59ba5b96a858a79505
---
M erfgoedbot/update_database.py
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/03/374403/1

diff --git a/erfgoedbot/update_database.py b/erfgoedbot/update_database.py
index c459085..2a112fb 100755
--- a/erfgoedbot/update_database.py
+++ b/erfgoedbot/update_database.py
@@ -503,6 +503,7 @@
 countrycode = u''
 lang = u''
 fullUpdate = True
+skip_wd_harvest = False
 daysBack = 2  # Default 2 days. Runs every night so can miss one night.
 conn = None
 cursor = None
@@ -518,6 +519,8 @@
 daysBack = int(value)
 elif option == u'-fullupdate':  # does nothing since already default
 fullUpdate = True
+elif option == u'-skip_wd':
+skip_wd_harvest = True
 else:
 raise Exception(
 u'Bad parameters. Expected "-countrycode", "-langcode", '
@@ -547,6 +550,9 @@
 u'be used together.')
 else:
 for (countrycode, lang), countryconfig in 
mconfig.countries.iteritems():
+if ((skip_wd_harvest and (countryconfig.get('type') == 'sparql'))
+or countryconfig.get('skip')):
+continue
 pywikibot.log(
 u'Working on countrycode "%s" in language "%s"' % (
 countrycode, lang))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79cba7c655e68c6814838f59ba5b96a858a79505
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: wikidata
Gerrit-Owner: Lokal Profil 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for duplicate results with multiple "HOLDS" in query

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Fix for duplicate results with multiple "HOLDS" in query
..


Fix for duplicate results with multiple "HOLDS" in query

Change-Id: I7a1cb97bda6693f6ab3c76d9703295efd711aa10
---
M CargoSQLQuery.php
1 file changed, 46 insertions(+), 8 deletions(-)

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



diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index e56a7ad..88e89a0 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -374,10 +374,16 @@
} else {
$cargoTable2 = $table2;
}
-   $this->mJoinConds[$table2] = array(
-   $cargoJoinCond['joinType'],
+   $joinCondConds = array(
$cargoTable1 . '.' . $cargoJoinCond['field1'] . 
'=' .
$cargoTable2 . '.' . $cargoJoinCond['field2']
+   );
+   if ( array_key_exists( 'extraCond', $cargoJoinCond ) ) {
+   $joinCondConds[] = $cargoJoinCond['extraCond'];
+   }
+   $this->mJoinConds[$table2] = array(
+   $cargoJoinCond['joinType'],
+   $joinCondConds
);
}
}
@@ -633,11 +639,15 @@
 * the regex beginning from a non-valid identifier character to word
 * boundary.
 */
-   function substVirtualFieldName( &$subject, $pattern, $replacement, 
&$found ) {
+   function substVirtualFieldName( &$subject, $pattern, $replacement, 
&$found, &$fullExpression ) {
if ( preg_match( $pattern, $subject ) ) {
$pattern = str_replace( '([^\w$,]|^)', '\b', $pattern);
$pattern = str_replace( '([^\w$.,]|^)', '\b', $pattern);
$subject = preg_replace( $pattern, $replacement, 
$subject );
+   $pattern2 = '/' . $replacement . 
'\s*([\'"]?[^\'"]*[\'"]?)/i'; // To capture string in quotes or a number
+   if ( preg_match( $pattern2, $subject, $matches ) ) {
+   $fullExpression = $matches[0];
+   }
$found = true;
}
}
@@ -680,6 +690,7 @@
 
// "where"
$matches = array();
+   $numHoldsExpressions = 0;
foreach ( $virtualFields as $virtualField ) {
$fieldName = $virtualField['fieldName'];
$tableAlias = $virtualField['tableAlias'];
@@ -702,6 +713,7 @@
CargoUtils::getSQLFieldPattern( $fieldName, 
false ) . '\s+'
);
 
+   $fullExpression = null;
for ( $i = 0 ; $i < 2 ; $i++ ) {
if ( preg_match( $patternSimple[$i], 
$this->mWhereStr ) ) {
 
@@ -709,28 +721,32 @@
$this->mWhereStr,
$patternRoot[$i] . 
'HOLDS\s+NOT\s+LIKE' . $patternSuffix,
"$replacementFieldName NOT LIKE 
",
-   $fieldReplaced
+   $fieldReplaced,
+   $fullExpression
);
 
$this->substVirtualFieldName(
$this->mWhereStr,
$patternRoot[$i] . 
'HOLDS\s+LIKE' . $patternSuffix,
"$replacementFieldName LIKE ",
-   $fieldReplaced
+   $fieldReplaced,
+   $fullExpression
);
 
$this->substVirtualFieldName(
$this->mWhereStr,
$patternRoot[$i] . 
'HOLDS\s+NOT' . $patternSuffix,
"$replacementFieldName!=",
-   $fieldReplaced
+   $fieldReplaced,
+   $fullExpression
);
 
$this->substVirtualFieldName(
$this->mWhereStr,

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Minimize saved query before comparison

2017-08-28 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Minimize saved query before comparison
..

RCFilters: Minimize saved query before comparison

Bug: T174193
Change-Id: I8e9345e8899fd27565930896e62c4d3be235ad58
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
1 file changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/374402/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index a7f3d23..d87ef734 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -18,6 +18,7 @@
OO.EmitterList.call( this );
 
this.default = config.default;
+   this.baseState = {};
 
// Events
this.aggregate( { update: 'itemUpdate' } );
@@ -171,15 +172,45 @@
 * @return {mw.rcfilters.dm.SavedQueryItemModel} Matching item model
 */
mw.rcfilters.dm.SavedQueriesModel.prototype.findMatchingQuery = 
function ( fullQueryComparison ) {
+   var model = this;
+
+   fullQueryComparison = this.getDifferenceFromBase( 
fullQueryComparison );
+
return this.getItems().filter( function ( item ) {
+   var comparedData = model.getDifferenceFromBase( 
item.getData() );
return OO.compare(
-   item.getData(),
+   comparedData,
fullQueryComparison
);
} )[ 0 ];
};
 
/**
+* Get a minimal representation of the state for comparison
+*
+* @param {Object} state Given state
+* @return {Object} Minimal state
+*/
+   mw.rcfilters.dm.SavedQueriesModel.prototype.getDifferenceFromBase = 
function ( state ) {
+   var result = { filters: {}, highlights: {}, invert: 
state.invert },
+   baseState = this.baseState;
+
+   // XOR results
+   $.each( state.filters, function ( name, value ) {
+   if ( baseState.filters !== undefined && 
baseState.filters[ name ] !== value ) {
+   result.filters[ name ] = value;
+   }
+   } );
+
+   $.each( state.highlights, function ( name, value ) {
+   if ( baseState.highlights !== undefined && 
baseState.highlights[ name ] !== value && name !== 'highlight' ) {
+   result.highlights[ name ] = value;
+   }
+   } );
+
+   return result;
+   };
+   /**
 * Get query by its identifier
 *
 * @param {string} queryID Query identifier

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for duplicate results with multiple "HOLDS" in query

2017-08-28 Thread Yaron Koren (Code Review)

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

Change subject: Fix for duplicate results with multiple "HOLDS" in query
..

Fix for duplicate results with multiple "HOLDS" in query

Change-Id: I7a1cb97bda6693f6ab3c76d9703295efd711aa10
---
M CargoSQLQuery.php
1 file changed, 46 insertions(+), 8 deletions(-)


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

diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index e56a7ad..88e89a0 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -374,10 +374,16 @@
} else {
$cargoTable2 = $table2;
}
-   $this->mJoinConds[$table2] = array(
-   $cargoJoinCond['joinType'],
+   $joinCondConds = array(
$cargoTable1 . '.' . $cargoJoinCond['field1'] . 
'=' .
$cargoTable2 . '.' . $cargoJoinCond['field2']
+   );
+   if ( array_key_exists( 'extraCond', $cargoJoinCond ) ) {
+   $joinCondConds[] = $cargoJoinCond['extraCond'];
+   }
+   $this->mJoinConds[$table2] = array(
+   $cargoJoinCond['joinType'],
+   $joinCondConds
);
}
}
@@ -633,11 +639,15 @@
 * the regex beginning from a non-valid identifier character to word
 * boundary.
 */
-   function substVirtualFieldName( &$subject, $pattern, $replacement, 
&$found ) {
+   function substVirtualFieldName( &$subject, $pattern, $replacement, 
&$found, &$fullExpression ) {
if ( preg_match( $pattern, $subject ) ) {
$pattern = str_replace( '([^\w$,]|^)', '\b', $pattern);
$pattern = str_replace( '([^\w$.,]|^)', '\b', $pattern);
$subject = preg_replace( $pattern, $replacement, 
$subject );
+   $pattern2 = '/' . $replacement . 
'\s*([\'"]?[^\'"]*[\'"]?)/i'; // To capture string in quotes or a number
+   if ( preg_match( $pattern2, $subject, $matches ) ) {
+   $fullExpression = $matches[0];
+   }
$found = true;
}
}
@@ -680,6 +690,7 @@
 
// "where"
$matches = array();
+   $numHoldsExpressions = 0;
foreach ( $virtualFields as $virtualField ) {
$fieldName = $virtualField['fieldName'];
$tableAlias = $virtualField['tableAlias'];
@@ -702,6 +713,7 @@
CargoUtils::getSQLFieldPattern( $fieldName, 
false ) . '\s+'
);
 
+   $fullExpression = null;
for ( $i = 0 ; $i < 2 ; $i++ ) {
if ( preg_match( $patternSimple[$i], 
$this->mWhereStr ) ) {
 
@@ -709,28 +721,32 @@
$this->mWhereStr,
$patternRoot[$i] . 
'HOLDS\s+NOT\s+LIKE' . $patternSuffix,
"$replacementFieldName NOT LIKE 
",
-   $fieldReplaced
+   $fieldReplaced,
+   $fullExpression
);
 
$this->substVirtualFieldName(
$this->mWhereStr,
$patternRoot[$i] . 
'HOLDS\s+LIKE' . $patternSuffix,
"$replacementFieldName LIKE ",
-   $fieldReplaced
+   $fieldReplaced,
+   $fullExpression
);
 
$this->substVirtualFieldName(
$this->mWhereStr,
$patternRoot[$i] . 
'HOLDS\s+NOT' . $patternSuffix,
"$replacementFieldName!=",
-   $fieldReplaced
+   $fieldReplaced,
+   $fullExpression
);
 
$this->substVirtualFieldName(
$this->mWhereStr,

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Grand renaming: the sequel

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Grand renaming: the sequel
..


Grand renaming: the sequel

Update to align with current mocks.

Also updates both code and presentation so as not to refer to the comp
date as a download date.

Bug: T172546
Change-Id: Ib59e20475530112fd5f60610bc75fb8549ccec6f
---
M app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
M app/src/main/java/org/wikipedia/page/Page.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/res/values-ar/strings.xml
M app/src/main/res/values-ast/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fa/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-hi/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-iw/strings.xml
M app/src/main/res/values-jv/strings.xml
M app/src/main/res/values-kab/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-ms/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-nl/strings.xml
M app/src/main/res/values-pt-rBR/strings.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sd/strings.xml
M app/src/main/res/values-su/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
34 files changed, 42 insertions(+), 65 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java 
b/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
index 0df6965..8049ac6 100644
--- a/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
+++ b/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
@@ -72,7 +72,7 @@
@NonNull final 
DialogInterface.OnClickListener onRemoveClick) {
 new AlertDialog.Builder(context)
 .setMessage(R.string.compilation_remove_confirm)
-.setPositiveButton(R.string.compilation_remove_confirm_yes, 
new DialogInterface.OnClickListener() {
+.setPositiveButton(android.R.string.yes, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialogInterface, int 
i) {
 remove(compilation);
@@ -80,7 +80,7 @@
 onRemoveClick.onClick(dialogInterface, i);
 }
 })
-.setNegativeButton(R.string.compilation_remove_confirm_no, 
null)
+.setNegativeButton(android.R.string.no, null)
 .show();
 }
 
diff --git a/app/src/main/java/org/wikipedia/page/Page.java 
b/app/src/main/java/org/wikipedia/page/Page.java
index 30836a7..77a11e6 100755
--- a/app/src/main/java/org/wikipedia/page/Page.java
+++ b/app/src/main/java/org/wikipedia/page/Page.java
@@ -4,9 +4,9 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 
+import org.wikipedia.offline.Compilation;
 import org.wikipedia.settings.RbSwitch;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,7 +20,8 @@
 @NonNull private final List sections;
 @NonNull private final PageProperties pageProperties;
 
-@Nullable private Date compilationDownloadDate;
+@Nullable private String compName;
+@Nullable private long compTimestamp;
 
 /**
  * An indicator what payload version the page content was originally 
retrieved from.
@@ -94,15 +95,20 @@
 }
 
 public boolean isFromOfflineCompilation() {
-return compilationDownloadDate != null;
+return compName != null;
 }
 
-@Nullable public Date getCompilationDownloadDate() {
-return compilationDownloadDate;
+@Nullable public long getCompilationTimestamp() {
+return compTimestamp;
 }
 
-public void setCompilationDownloadDate(@NonNull Date date) {
-this.compilationDownloadDate = date;
+@Nullable public String getCompilationName() {
+return compName;
+}
+
+public void setCompilation(@NonNull Compilation comp) {
+this.compName = comp.name();
+this.compTimestamp = comp.timestamp();
 }
 
 /** For old PHP API */
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...Wikispeech[master]: build: Replace jshint and jscs with eslint; bump everything ...

2017-08-28 Thread Jforrester (Code Review)

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

Change subject: build: Replace jshint and jscs with eslint; bump everything else
..

build: Replace jshint and jscs with eslint; bump everything else

 grunt-banana-checker   0.4.0  →   0.6.0
 grunt-jsonlint 1.0.4  →   1.1.0
 grunt-stylelint   ^0.7.0  →   0.8.0

Change-Id: I331b05e963d8b61296f3633b409b914ee2399d38
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.wikispeech.js
M package.json
A tests/qunit/.eslintrc.json
M tests/qunit/ext.wikispeech.highlighter.test.js
M tests/qunit/ext.wikispeech.test.js
10 files changed, 83 insertions(+), 112 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikispeech 
refs/changes/01/374401/1

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..3931182
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "mediaWiki": false
+   },
+   "rules": {}
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index a031ea4..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "preset": "wikimedia"
-}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index b512c09..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 95facb2..000
--- a/.jshintrc
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-   "predef": [
-   "mediaWiki",
-   "jQuery",
-   "QUnit",
-   "sinon",
-   "JSON"
-   ],
-
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "es3": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-   "strict": false,
-
-   // Environment
-   "browser": true,
-
-   "globals": {
-   "mw": false,
-   "$": false
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index f2d6f3b..1ded3a3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,27 +1,19 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
 module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
+   grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
-   grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
-   },
+   eslint: {
all: [
'*.js',
'modules/**/*.js',
'tests/**/*.js'
]
},
-   jscs: {
-   src: '<%= jshint.all %>'
-   },
-   banana: conf.MessagesDirs,
jsonlint: {
all: [
'*.json',
@@ -30,6 +22,7 @@
'!vendor/**'
]
},
+   banana: conf.MessagesDirs,
stylelint: {
options: {
formatter: 'string',
@@ -46,8 +39,7 @@
grunt.registerTask(
'test',
[
-   'jshint',
-   'jscs',
+   'eslint',
'jsonlint',
'banana',
'stylelint'
diff --git a/modules/ext.wikispeech.js b/modules/ext.wikispeech.js
index 065399d..5380360 100644
--- a/modules/ext.wikispeech.js
+++ b/modules/ext.wikispeech.js
@@ -697,11 +697,10 @@
url: serverUrl,
method: 'POST',
data: {
-   // jscs:disable 
requireCamelCaseOrUpperCaseIdentifiers
lang: mw.config.get( 
'wgPageContentLanguage' ),
+   // eslint-disable-next-line camelcase
input_type: 'text',
input: text
-   // jscs:enable 
requireCamelCaseOrUpperCaseIdentifiers
},
dataType: 'json',

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: No longer allow searching in local packs.

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: No longer allow searching in local packs.
..


No longer allow searching in local packs.

Bug: T163591
Change-Id: I2ae740577556efa88291ae5aa5dc44989c3c76bd
---
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
1 file changed, 10 insertions(+), 81 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index e6b06e3..9f5c4d0 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -7,16 +7,11 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.ShareCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SimpleItemAnimator;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,7 +20,6 @@
 
 import org.wikipedia.R;
 import org.wikipedia.activity.FragmentUtil;
-import org.wikipedia.history.SearchActionModeCallback;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.util.ShareUtil;
@@ -62,9 +56,7 @@
 private CompilationItemAdapter adapter = new CompilationItemAdapter();
 private ItemCallback itemCallback = new ItemCallback();
 
-private SearchCallback searchActionModeCallback = new SearchCallback();
 @NonNull private List displayedItems = new ArrayList<>();
-private String currentSearchQuery;
 
 public interface Callback {
 void onRequestUpdateCompilations();
@@ -120,27 +112,6 @@
 super.onDestroyView();
 }
 
-@Override
-public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-inflater.inflate(R.menu.menu_local_compilations, menu);
-}
-
-@Override
-public void onPrepareOptionsMenu(Menu menu) {
-super.onPrepareOptionsMenu(menu);
-}
-
-@Override
-public boolean onOptionsItemSelected(MenuItem item) {
-switch (item.getItemId()) {
-case R.id.menu_search_compilations:
-((AppCompatActivity) 
getActivity()).startSupportActionMode(searchActionModeCallback);
-return true;
-default:
-return super.onOptionsItemSelected(item);
-}
-}
-
 @OnClick({R.id.compilations_add_button, 
R.id.compilation_empty_search_button}) void onAddCompilationClick() {
 startActivity(RemoteCompilationsActivity.newIntent(getContext()));
 }
@@ -181,7 +152,12 @@
 }
 
 private void update() {
-setSearchQuery(currentSearchQuery);
+displayedItems.clear();
+displayedItems.addAll(OfflineManager.instance().compilations());
+countText.setText(getString(R.string.offline_compilations_found_count, 
displayedItems.size()));
+adapter.notifyDataSetChanged();
+updateEmptyState();
+
 long totalBytes = 0;
 for (Compilation c : OfflineManager.instance().compilations()) {
 totalBytes += c.size();
@@ -189,25 +165,7 @@
 diskUsageView.update(totalBytes);
 }
 
-private void setSearchQuery(@Nullable String query) {
-currentSearchQuery = query;
-displayedItems.clear();
-if (TextUtils.isEmpty(query)) {
-displayedItems.addAll(OfflineManager.instance().compilations());
-} else {
-query = query.toUpperCase();
-for (Compilation c : OfflineManager.instance().compilations()) {
-if (c.name().toUpperCase().contains(query.toUpperCase())) {
-displayedItems.add(c);
-}
-}
-}
-countText.setText(getString(R.string.offline_compilations_found_count, 
displayedItems.size()));
-adapter.notifyDataSetChanged();
-updateEmptyState(query);
-}
-
-private void updateEmptyState(@Nullable String searchQuery) {
+private void updateEmptyState() {
 if (lastError != null) {
 errorView.setError(lastError);
 errorView.setVisibility(View.VISIBLE);
@@ -219,15 +177,9 @@
 }
 errorView.setVisibility(View.GONE);
 progressBar.setVisibility(updating ? View.VISIBLE : View.GONE);
-if (TextUtils.isEmpty(searchQuery)) {
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable JobQueueEventBus on all wikis

2017-08-28 Thread Ppchelko (Code Review)

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

Change subject: Enable JobQueueEventBus on all wikis
..

Enable JobQueueEventBus on all wikis

Change-Id: I89770fd2a682d19f1dc01255b45a72a79a3e61e5
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 680c530..ae57980 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19200,12 +19200,11 @@
 ],
 
 'wmgDebugJobQueueEventBus' => [
-   'default' => false,
-   'mediawikiwiki' => true,
-   'test2wiki' => true,
-   'testwiki' => true,
-   'testwikidatawiki' => true,
-   'group1' => true,
+'default' => true,
+'wikitech' => false,
+'private' => false,
+'loginwiki' => false,
+'votewiki' => false,
 ],
 
 'wmgUseCapiunto' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticTasks[master]: Install SemanticMediaWiki over composer

2017-08-28 Thread Umherirrender (Code Review)

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

Change subject: Install SemanticMediaWiki over composer
..

Install SemanticMediaWiki over composer

Needed to run automatic tests with jenkins

Change-Id: Icabbfbcb88b63f84264a43cc0c1acdf9551936bf
---
M .gitignore
M Gruntfile.js
A composer.json
3 files changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTasks 
refs/changes/97/374397/1

diff --git a/.gitignore b/.gitignore
index e62fc28..914b66c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 node_modules/
 vendor/
+composer.lock
+extensions/
 
 .svn
 *~
diff --git a/Gruntfile.js b/Gruntfile.js
index 2db815f..3ab3f9e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,14 +12,16 @@
all: [
'**/*.js',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
},
jsonlint: {
all: [
'**/*.json',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
}
} );
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..a457196
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+   "require": {
+   "mediawiki/semantic-media-wiki": ">=1.7"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude extensions"
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icabbfbcb88b63f84264a43cc0c1acdf9551936bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticTasks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageSeries[master]: Install SemanticMediaWiki over composer

2017-08-28 Thread Umherirrender (Code Review)

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

Change subject: Install SemanticMediaWiki over composer
..

Install SemanticMediaWiki over composer

Needed to run automatic tests with jenkins

Change-Id: I46215c4b222fadae0276fc1e953d11b1f60af020
---
M .gitignore
M Gruntfile.js
A composer.json
3 files changed, 20 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageSeries 
refs/changes/98/374398/1

diff --git a/.gitignore b/.gitignore
index e62fc28..914b66c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 node_modules/
 vendor/
+composer.lock
+extensions/
 
 .svn
 *~
diff --git a/Gruntfile.js b/Gruntfile.js
index 2db815f..3ab3f9e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,14 +12,16 @@
all: [
'**/*.js',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
},
jsonlint: {
all: [
'**/*.json',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
}
} );
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..a457196
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+   "require": {
+   "mediawiki/semantic-media-wiki": ">=1.7"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude extensions"
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46215c4b222fadae0276fc1e953d11b1f60af020
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageSeries
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: metrics::search::srp_survtime: Track search results page dwe...

2017-08-28 Thread Bearloga (Code Review)

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

Change subject: metrics::search::srp_survtime: Track search results page dwell 
time
..

metrics::search::srp_survtime: Track search results page dwell time

Bug: T170468
Change-Id: I694a2f24cd831428ad95872dea085f8307994b4a
---
M docs/README.Rmd
M docs/README.md
M modules/metrics/search/config.yaml
A modules/metrics/search/srp_survtime
A modules/metrics/search/srp_survtime.R
5 files changed, 136 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/96/374396/1

diff --git a/docs/README.Rmd b/docs/README.Rmd
index c03b43d..c7d27c0 100644
--- a/docs/README.Rmd
+++ b/docs/README.Rmd
@@ -1,12 +1,12 @@
 ---
 output: md_document
 note: >
-  Needs to be knit into Markdown and rsync'd to 
stat1002:/a/published-datasets/discovery/README.md
+  Needs to be knit into Markdown and rsync'd to 
stat1005:/srv/published-datasets/discovery/README.md
 ---
 
 # Discovery Datasets
 
-These files are generated by Discovery's 
[Golden](https://github.com/wikimedia/wikimedia-discovery-golden/) data 
retrieval codebase that executes daily and uses 
[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater) 
infrastructure. These datasets provide the metrics that are used by 
[Discovery's Dashboards](https://discovery.wmflabs.org/)
+These files are generated by Discovery's 
[Golden](https://github.com/wikimedia/wikimedia-discovery-golden/) data 
retrieval codebase that executes daily and uses 
[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Systems/Reportupdater)
 infrastructure. These datasets provide the metrics that are used by 
[Discovery's Dashboards](https://discovery.wmflabs.org/)
 
 Last updated on `r format(Sys.Date(), "%d %B %Y")`
 
diff --git a/docs/README.md b/docs/README.md
index f1ea48c..8af2aa3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,11 +4,11 @@
 These files are generated by Discovery's
 [Golden](https://github.com/wikimedia/wikimedia-discovery-golden/) data
 retrieval codebase that executes daily and uses
-[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater)
+[Reportupdater](https://wikitech.wikimedia.org/wiki/Analytics/Systems/Reportupdater)
 infrastructure. These datasets provide the metrics that are used by
 [Discovery's Dashboards](https://discovery.wmflabs.org/)
 
-Last updated on 01 August 2017
+Last updated on 28 August 2017
 
 Daily Metrics
 -
@@ -145,6 +145,9 @@
 Wikipedia search results pages; broken up by language, destination
 type (SERP vs not), and access method (desktop vs mobile web);
 exlcudes known automata
+-   **srp\_survtime.tsv**: Estimates (via survival analysis) of how long
+Wikipedia searchers stay on full-text search results page after
+getting there from autocomplete search.
 
 wdqs/
 -
diff --git a/modules/metrics/search/config.yaml 
b/modules/metrics/search/config.yaml
index 82f1c3f..56ec39b 100644
--- a/modules/metrics/search/config.yaml
+++ b/modules/metrics/search/config.yaml
@@ -162,3 +162,9 @@
 starts: 2017-06-01
 funnel: true
 type: script
+srp_survtime:
+description: Estimates (via survival analysis) of how long Wikipedia 
searchers stay on full-text search results page after getting there from 
autocomplete search.
+granularity: days
+starts: 2017-04-01
+funnel: true
+type: script
diff --git a/modules/metrics/search/srp_survtime 
b/modules/metrics/search/srp_survtime
new file mode 100755
index 000..08e2682
--- /dev/null
+++ b/modules/metrics/search/srp_survtime
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+Rscript modules/metrics/search/srp_survtime.R -d $1
diff --git a/modules/metrics/search/srp_survtime.R 
b/modules/metrics/search/srp_survtime.R
new file mode 100644
index 000..e24f99d
--- /dev/null
+++ b/modules/metrics/search/srp_survtime.R
@@ -0,0 +1,120 @@
+#!/usr/bin/env Rscript
+
+source("config.R")
+.libPaths(r_library)
+suppressPackageStartupMessages({
+  library("optparse")
+  library("glue")
+  library("magrittr")
+})
+
+option_list <- list(
+  make_option(c("-d", "--date"), default = NA, action = "store", type = 
"character")
+)
+
+# Get command line options, if help option encountered print help and exit,
+# otherwise if options not found on command line then set defaults:
+opt <- parse_args(OptionParser(option_list = option_list))
+
+if (is.na(opt$date)) {
+  quit(save = "no", status = 1)
+}
+
+mmdd <- format(as.Date(opt$date), "%Y%m%d")
+revision_number <- dplyr::case_when(
+  as.Date(opt$date) < "2017-02-10" ~ "15922352",
+  as.Date(opt$date) < "2017-06-29" ~ "16270835",
+  TRUE ~ "16909631"
+)
+
+query <- glue("SELECT
+  timestamp AS ts, wiki,
+  event_uniqueId AS event_id,
+  event_searchSessionId AS session_id,
+  event_pageViewId AS page_id,
+  event_action AS event,
+

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Rename -lang argument -langcode

2017-08-28 Thread jenkins-bot (Code Review)

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

Change subject: Rename -lang argument -langcode
..


Rename -lang argument -langcode

The -lang argument gets captured by pywikibot before it reaches erfgoedbot.
As a result we have had to rely on the `lang = pywikibot.Site().language()` 
hack.

With our docker testing setup this has caused problems as the default project,
when no user-config is present was changed to test wikipedia which only has one
language (en), thereby overriding our -lang argument.

Also any script recieving an unexpected argument will now raise an exception,
note however that again since '-lang' is a pywikibot parameter we cannot
detect if the user accidentally passed this.

Bug: T166528
Change-Id: Ic2d7785efef02b2d67fc926d81da1251afb2e653
---
M README.md
M erfgoedbot/add_coord_to_articles.py
M erfgoedbot/add_object_location_monuments.py
M erfgoedbot/categorize_images.py
M erfgoedbot/images_of_monuments_without_id.py
M erfgoedbot/missing_commonscat_links.py
M erfgoedbot/top_streets.py
M erfgoedbot/unused_monument_images.py
M erfgoedbot/update_database.py
M erfgoedbot/update_id_dump.py
10 files changed, 104 insertions(+), 31 deletions(-)

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



diff --git a/README.md b/README.md
index 461c0de..6c6db8f 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
 docker-compose -f docker-compose-bot.yml up --build -d
 
 # Run the bot to harvest a country
-docker-compose -f docker-compose-bot.yml run --rm bot python 
erfgoedbot/update_database.py -countrycode:ge -lang:ka -log
+docker-compose -f docker-compose-bot.yml run --rm bot python 
erfgoedbot/update_database.py -countrycode:ge -langcode:ka -log
 
 # Update the monuments_all table
 docker-compose -f docker-compose-bot.yml run --rm db mysql -h db 
s51138__heritage_p --user=heritage --password=password < 
erfgoedbot/sql/fill_table_monuments_all.sql
diff --git a/erfgoedbot/add_coord_to_articles.py 
b/erfgoedbot/add_coord_to_articles.py
index 3e75b55..df651fa 100644
--- a/erfgoedbot/add_coord_to_articles.py
+++ b/erfgoedbot/add_coord_to_articles.py
@@ -12,7 +12,7 @@
 python add_coord_to_articles.py
 
 # work on specific country-lang
-python add_coord_to_articles.py -countrycode:XX -lang:YY
+python add_coord_to_articles.py -countrycode:XX -langcode:YY
 
 '''
 import re
@@ -283,6 +283,7 @@
 
 def main():
 countrycode = u''
+lang = u''
 connMon = None
 cursorMon = None
 
@@ -292,14 +293,22 @@
 option, sep, value = arg.partition(':')
 if option == '-countrycode':
 countrycode = value
+elif option == '-langcode':
+lang = value
+else:
+raise Exception(
+u'Bad parameters. Expected "-countrycode", "-langcode" or '
+u'pywikibot args. Found "{}"'.format(option))
 
-if countrycode:
-lang = pywikibot.getSite().language()
+if countrycode and lang:
 if not mconfig.countries.get((countrycode, lang)):
 pywikibot.output(u'I have no config for countrycode "%s" in 
language "%s"' % (countrycode, lang))
 return False
 pywikibot.output(u'Working on countrycode "%s" in language "%s"' % 
(countrycode, lang))
 processCountry(countrycode, lang, mconfig.countries.get((countrycode, 
lang)), wikiData.get(lang), connMon, cursorMon)
+elif countrycode or lang:
+raise Exception(u'The "countrycode" and "langcode" arguments must '
+u'be used together.')
 else:
 for (countrycode, lang), countryconfig in 
mconfig.countries.iteritems():
 pywikibot.output(u'Working on countrycode "%s" in language "%s"' % 
(countrycode, lang))
diff --git a/erfgoedbot/add_object_location_monuments.py 
b/erfgoedbot/add_object_location_monuments.py
index b61d421..11f0a24 100644
--- a/erfgoedbot/add_object_location_monuments.py
+++ b/erfgoedbot/add_object_location_monuments.py
@@ -198,6 +198,7 @@
 
 def main():
 countrycode = u''
+lang = u''
 
 # Connect database, we need that
 (conn, cursor) = connect_to_monuments_database()
@@ -210,11 +211,16 @@
 option, sep, value = arg.partition(':')
 if option == '-countrycode':
 countrycode = value
+elif option == '-langcode':
+lang = value
+else:
+raise Exception(
+u'Bad parameters. Expected "-countrycode", "-langcode" or '
+u'pywikibot args. Found "{}"'.format(option))
 
-lang = pywikibot.getSite().language()
 pywikibot.setSite(pywikibot.getSite(u'commons', u'commons'))
 
-if countrycode:
+if countrycode and lang:
 if not mconfig.countries.get((countrycode, lang)):
 pywikibot.output(
 u'I have no config for countrycode "%s" in language "%s"' % 
(countrycode, lang))

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Grand renaming: the sequel

2017-08-28 Thread Mholloway (Code Review)

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

Change subject: Grand renaming: the sequel
..

Grand renaming: the sequel

Update to align with current mocks.

Also updates both code and presentation so as not to refer to the comp
date as a download date.

Bug: T172546
Change-Id: Ib59e20475530112fd5f60610bc75fb8549ccec6f
---
M app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
M app/src/main/java/org/wikipedia/page/Page.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
7 files changed, 42 insertions(+), 38 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java 
b/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
index 0df6965..8049ac6 100644
--- a/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
+++ b/app/src/main/java/org/wikipedia/offline/DownloadManagerObserver.java
@@ -72,7 +72,7 @@
@NonNull final 
DialogInterface.OnClickListener onRemoveClick) {
 new AlertDialog.Builder(context)
 .setMessage(R.string.compilation_remove_confirm)
-.setPositiveButton(R.string.compilation_remove_confirm_yes, 
new DialogInterface.OnClickListener() {
+.setPositiveButton(android.R.string.yes, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialogInterface, int 
i) {
 remove(compilation);
@@ -80,7 +80,7 @@
 onRemoveClick.onClick(dialogInterface, i);
 }
 })
-.setNegativeButton(R.string.compilation_remove_confirm_no, 
null)
+.setNegativeButton(android.R.string.no, null)
 .show();
 }
 
diff --git a/app/src/main/java/org/wikipedia/page/Page.java 
b/app/src/main/java/org/wikipedia/page/Page.java
index 30836a7..77a11e6 100755
--- a/app/src/main/java/org/wikipedia/page/Page.java
+++ b/app/src/main/java/org/wikipedia/page/Page.java
@@ -4,9 +4,9 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 
+import org.wikipedia.offline.Compilation;
 import org.wikipedia.settings.RbSwitch;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,7 +20,8 @@
 @NonNull private final List sections;
 @NonNull private final PageProperties pageProperties;
 
-@Nullable private Date compilationDownloadDate;
+@Nullable private String compName;
+@Nullable private long compTimestamp;
 
 /**
  * An indicator what payload version the page content was originally 
retrieved from.
@@ -94,15 +95,20 @@
 }
 
 public boolean isFromOfflineCompilation() {
-return compilationDownloadDate != null;
+return compName != null;
 }
 
-@Nullable public Date getCompilationDownloadDate() {
-return compilationDownloadDate;
+@Nullable public long getCompilationTimestamp() {
+return compTimestamp;
 }
 
-public void setCompilationDownloadDate(@NonNull Date date) {
-this.compilationDownloadDate = date;
+@Nullable public String getCompilationName() {
+return compName;
+}
+
+public void setCompilation(@NonNull Compilation comp) {
+this.compName = comp.name();
+this.compTimestamp = comp.timestamp();
 }
 
 /** For old PHP API */
diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java 
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index ae22167..a299b47 100644
--- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
@@ -58,7 +58,6 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -480,8 +479,7 @@
 sendMarginPayload();
 OfflineManager.HtmlResult result = OfflineManager.instance()
 .getHtmlForTitle(model.getTitle().getDisplayText());
-Date downloadDate = new Date(result.compilation().timestamp());
-page.setCompilationDownloadDate(downloadDate);
+page.setCompilation(result.compilation());
 JSONObject zimPayload = setLeadSectionMetadata(new JSONObject(), 
page)
 .put("zimhtml", result.html())
 .put("fromRestBase", false)
@@ -499,7 +497,7 @@
 //give it our

1 2 3 4 >

1 - 100 of 360 matches

Mail list logo