[MediaWiki-commits] [Gerrit] Buffer bullets to be emitted with firstChildElt content - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Buffer bullets to be emitted with firstChildElt content
..

Buffer bullets to be emitted with firstChildElt content

 * This content belongs to the first child, and thus should be emitted
   with it so that it gets the right constraints.

Change-Id: If27c3de5916c22a59bff2c51f1e7d162f35af964
---
M lib/html2wt/DOMHandlers.js
M lib/html2wt/SerializerState.js
2 files changed, 35 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/50/257550/1

diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index da1d46f..f5d1c69 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -271,8 +271,10 @@
firstChildElt = 
DU.firstNonSepChildNode(firstChildElt);
}
 
-   if (!firstChildElt || !(firstChildElt.nodeName in 
firstChildNames) || isTplListWithoutSharedPrefix(firstChildElt)) {
+   if (!firstChildElt || !(firstChildElt.nodeName in 
firstChildNames)) {
state.emitChunk(getListBullets(state, node), 
node);
+   } else if (isTplListWithoutSharedPrefix(firstChildElt)) 
{
+   state.bufferChunk(getListBullets(state, node));
}
 
var liHandler = state.serializer.wteHandlers.liHandler
@@ -313,12 +315,11 @@
forceSOL: stx !== 'row',
handle: Promise.method(function(node, state, wrapperUnmodified) 
{
var firstChildElement = DU.firstNonSepChildNode(node);
-   if (!DU.isList(firstChildElement) || 
isTplListWithoutSharedPrefix(firstChildElement)) {
-   if (stx === 'row') {
-   state.emitChunk(':', node);
-   } else {
-   state.emitChunk(getListBullets(state, 
node), node);
-   }
+   var chunk = (stx === 'row') ? ':' : 
getListBullets(state, node);
+   if (!DU.isList(firstChildElement)) {
+   state.emitChunk(chunk, node);
+   } else if 
(isTplListWithoutSharedPrefix(firstChildElement)) {
+   state.bufferChunk(chunk);
}
var liHandler = state.serializer.wteHandlers.liHandler
.bind(state.serializer.wteHandlers, 
node);
@@ -529,9 +530,10 @@
forceSOL: true,
handle: Promise.method(function(node, state, wrapperUnmodified) 
{
var firstChildElement = DU.firstNonSepChildNode(node);
-   if (!DU.isList(firstChildElement) ||
-   
isTplListWithoutSharedPrefix(firstChildElement)) {
+   if (!DU.isList(firstChildElement)) {
state.emitChunk(getListBullets(state, node), 
node);
+   } else if 
(isTplListWithoutSharedPrefix(firstChildElement)) {
+   state.bufferChunk(getListBullets(state, node));
}
var liHandler = state.serializer.wteHandlers.liHandler
.bind(state.serializer.wteHandlers, 
node);
@@ -564,9 +566,10 @@
forceSOL: true,
handle: Promise.method(function(node, state, wrapperUnmodified) 
{
var firstChildElement = DU.firstNonSepChildNode(node);
-   if (!DU.isList(firstChildElement) ||
-   
isTplListWithoutSharedPrefix(firstChildElement)) {
+   if (!DU.isList(firstChildElement)) {
state.emitChunk(getListBullets(state, node), 
node);
+   } else if 
(isTplListWithoutSharedPrefix(firstChildElement)) {
+   state.bufferChunk(getListBullets(state, node));
}
var liHandler = state.serializer.wteHandlers.liHandler
.bind(state.serializer.wteHandlers, 
node);
diff --git a/lib/html2wt/SerializerState.js b/lib/html2wt/SerializerState.js
index 0544cc7..fd668eb 100644
--- a/lib/html2wt/SerializerState.js
+++ b/lib/html2wt/SerializerState.js
@@ -77,6 +77,18 @@
  *
  * singleLineContext
  *Stack used to enforce single-line context
+ *
+ * buffer
+ *Buffered wikitext for scenarios where a single separator applies
+ *to multiple nodes and we don't want to emit the separator prematurely.
+ *
+ *Ex: In list handlers, for nested lists, we implicitly 

[MediaWiki-commits] [Gerrit] Fix minor typo in comment - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix minor typo in comment
..


Fix minor typo in comment

Change-Id: I59fc156987f469c580020c41fd54e990ef3fb9ac
---
M includes/UploadWizardCampaign.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/UploadWizardCampaign.php 
b/includes/UploadWizardCampaign.php
index 6099b7c..01a69a9 100755
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -37,7 +37,7 @@
 
/**
 * Array of templates used in this campaign.
-* Each item is an array with ( namespace, tempalte_title )
+* Each item is an array with ( namespace, template_title )
 * Stored without deduplication
 *
 * @since 1.2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59fc156987f469c580020c41fd54e990ef3fb9ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add .gitignore - change (mediawiki...NotebookViewer)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Add .gitignore
..

Add .gitignore

Change-Id: Iedac0f13f051ba11fba1e8ec1b99ed93407a21fa
---
A .gitignore
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NotebookViewer 
refs/changes/52/257552/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e3913e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+\#*#
+.#*
+composer.lock
+vendor/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedac0f13f051ba11fba1e8ec1b99ed93407a21fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NotebookViewer
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] Update hieradata for trebuchet module - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Update hieradata for trebuchet module
..


Update hieradata for trebuchet module

trebuchet was recently moved from a role to a module. This update is
needed so that labs gets the correct `trebuchet_master` grain which is
needed by the puppet trebuchet provider.

Bug: T119988
Change-Id: I87f919ff6b666ec4969aa95e5db079661f3f2d59
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/staging/common.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 0235c45..7c899f0 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -117,7 +117,7 @@
 "beta::syncsiteresources::user": www-data
 "role::url_downloader::url_downloader_ip": 10.68.16.135
 "zotero::http_proxy": 
deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
-"role::trebuchet::deployment_server": deployment-bastion.eqiad.wmflabs
+"trebuchet::deployment_server": 
deployment-bastion.deployment-prep.eqiad.wmflabs
 "scap::dsh::group_source": 'puppet:///modules/beta/dsh/group'
 "mediawiki::users::mwdeploy_pub_key": 'ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDFwlmBBBJAr1GI+vuYjFh5vq0YIVa5fqE5DZdpzUZISlQ0Kt+9bIr2qNHIj+Jl5Bc6ZY1mkh8l693tAHVx+8tayoiFWYNs9IVsxR+iHgOOhAdDIBXaHaUattdiye5bQmdvJVXaVegckNX2gbmUCOc09jvZvlk3blKFTSEpZRU8dmpXQzKdZgaAq2VTajAegoFnuN9FbC7hzBPA+1NxFNKn94eIeFPSlo5rWr44OEb5Uy3O0B5c6WPM+IgfiygetP+yGL4cKv7qEjZ0Sxok/Rh1lBh1vP1YQ/Mc6tMV0s+kOv7Wz+P88bfU1/uWvy479OZdfh3NQqDTrLzqHwVW1vef
 root@deployment-salt'
 # NOTE: these elasticsearch settings will need to be overloaded on a per-host
diff --git a/hieradata/labs/staging/common.yaml 
b/hieradata/labs/staging/common.yaml
index ac93afe..8644a7b 100644
--- a/hieradata/labs/staging/common.yaml
+++ b/hieradata/labs/staging/common.yaml
@@ -7,7 +7,7 @@
 salt::master::salt_module_roots: { base: [ '/srv/salt/_modules' ] }
 salt::master::salt_returner_roots: { base: [ '/srv/salt/_returners' ] }
 role::deployment::salt_masters::deployment_server: staging-tin.eqiad.wmflabs
-role::trebuchet::deployment_server: staging-tin.eqiad.wmflabs
+trebuchet::deployment_server: staging-tin.staging.eqiad.wmflabs
 elasticsearch::expected_nodes: 3
 elasticsearch::minimum_master_nodes: 3
 elasticsearch::heap_memory: 4G

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87f919ff6b666ec4969aa95e5db079661f3f2d59
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] AQS: Configure Cassandra for AQS in BetaCluster - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: AQS: Configure Cassandra for AQS in BetaCluster
..


AQS: Configure Cassandra for AQS in BetaCluster

We have made an attempt at deploying AQS in deployment-prep using Scap3
onto deployment-aqs01.deployment-prep.eqiad.wmflabs. One of the reasons
the deployment went awry was that the general RB-Cassandra configuration
was used, causing Cassandra on deployment-aqs01 to try to join
RESTBase's cluster (which is not permitted as per FW rules). This patch
makes it set the list of seeds only to itself.

Bug: T116206
Change-Id: I42f8b932b569eb880b6a875f70acc7aad654c205
---
A hieradata/labs/deployment-prep/host/deployment-aqs01.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Thcipriani: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/labs/deployment-prep/host/deployment-aqs01.yaml 
b/hieradata/labs/deployment-prep/host/deployment-aqs01.yaml
new file mode 100644
index 000..bf4c859
--- /dev/null
+++ b/hieradata/labs/deployment-prep/host/deployment-aqs01.yaml
@@ -0,0 +1,2 @@
+cassandra::seeds:
+  - deployment-aqs01.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42f8b932b569eb880b6a875f70acc7aad654c205
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Scaffolding for the Performance Inspector - change (mediawiki...PerformanceInspector)

[Phedenskog (Code Review)]

Phedenskog has uploaded a new change for review.

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

Change subject: Scaffolding for the Performance Inspector
..

Scaffolding for the Performance Inspector

Initial setuip for the Performance Inspector.

Bug: T118204
Change-Id: I9911c8a2c0885dcb80f4c69828adfa5e4ea2eeec
---
A .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A Gruntfile.js
A LICENSE
A PerformanceInspector.hooks.php
A PerformanceInspector.php
A extension.json
A i18n/en.json
A i18n/qqq.json
A modules/ext.PerformanceInspector.startup.js
A package.json
A tests/phpunit/PerformanceInspectorTest.php
A tests/qunit/performanceinspector.test.js
15 files changed, 550 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PerformanceInspector 
refs/changes/51/257551/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..b512c09
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
\ No newline at end of file
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..8305d61
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,4 @@
+{
+   "preset": "wikimedia",
+   "es3": true
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..66e3d48
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,24 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Relaxing
+   "es5": false,
+
+   // Environment
+   "browser": true,
+   "jquery": true,
+
+   "globals": {
+   "mediaWiki": false,
+   "OO": false
+   }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a0d8906
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,32 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
+   var conf = grunt.file.readJSON( 'extension.json' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   'modules/*.js'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..f1537d1
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,347 @@
+The license text below "" applies to all files within this distribution, 
other
+than those that are in a directory which contains files named "LICENSE" or
+"COPYING", or a subdirectory thereof. For those files, the license text 
contained in
+said file overrides any license information contained in directories of 
smaller depth.
+Alternative licenses are typically used for software that is provided by 
external
+parties, and merely packaged with the Semantic MediaWiki release for 
convenience.
+
+
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this 

[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...NotebookViewer)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Initial commit
..

Initial commit

Implements:

 - A NotebookContent that represents a jupyter notebook
 - A rendering pipeline for it that involves (for now!) just
   shelling out to a simple python script (adopted from script
   from @rgbkrk)
 - Uses symfony/process for shelling out
 - Strips all custom JS and CSS from notebooks before rendering
   them

Change-Id: Iaaff2dd22d780fe89a82dd50d88bbb6c1e1c81cb
---
A NotebookContent.php
A NotebookContentHandler.php
A composer.json
A convertor.py
A extension.json
5 files changed, 144 insertions(+), 0 deletions(-)


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

diff --git a/NotebookContent.php b/NotebookContent.php
new file mode 100644
index 000..751e126
--- /dev/null
+++ b/NotebookContent.php
@@ -0,0 +1,48 @@
+
+ * @author Yuvi Panda 
+ */
+
+use Symfony\Component\Process\Process;
+
+/**
+ * Represents the configuration of a Jupyter Notebook
+ */
+class NotebookContent extends TextContent {
+
+   function __construct( $text ) {
+   parent::__construct( $text, 'Notebook' );
+   }
+
+protected function renderNotebook( $content ) {
+$retval = null;
+   $process = new Process( __DIR__ . "/convertor.py" );
+   $process->setInput( $content );
+
+   $process->run();
+   if ( $process->isSuccessful() ) {
+   return $process->getOutput();
+   } else {
+   return "Parsing error";
+   }
+}
+
+   protected function fillParserOutput( Title $title, $revId,
+   ParserOptions $options, $generateHtml, ParserOutput &$output
+   ) {
+   // FIXME: WikiPage::doEditContent generates parser output 
before validation.
+   // As such, native data may be invalid (though output is 
discarded later in that case).
+   if ( $generateHtml && $this->isValid() ) {
+   $output->setText( $this->renderNotebook( 
$this->getNativeData() ) );
+   } else {
+   $output->setText( 'error' );
+}
+}
+}
diff --git a/NotebookContentHandler.php b/NotebookContentHandler.php
new file mode 100644
index 000..d6fab60
--- /dev/null
+++ b/NotebookContentHandler.php
@@ -0,0 +1,26 @@
+
+ * @author Yuvi Panda 
+ */
+
+class NotebookContentHandler extends TextContentHandler {
+
+   public function __construct( $modelId = 'Notebook' ) {
+   parent::__construct( $modelId );
+   }
+
+   public function canBeUsedOn( Title $title ) {
+   return $title->inNamespace( NS_NOTEBOOK );
+   }
+
+   protected function getContentClass() {
+   return 'NotebookContent';
+   }
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..47ae9c2
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+   "require": {
+   "symfony/process": "~2.5"
+   }
+}
diff --git a/convertor.py b/convertor.py
new file mode 100755
index 000..4fae126
--- /dev/null
+++ b/convertor.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import print_function
+import sys
+
+from nbconvert.exporters import HTMLExporter
+from traitlets.config import Config
+
+config = Config({
+"HTMLExporter": {"template_file": "basic"},
+'NbConvertBase': {
+'display_data_priority': [
+'text/html',
+'text/markdown',
+'application/pdf',
+'image/svg+xml',
+'text/latex',
+'image/png',
+'image/jpeg',
+'text/plain',
+]
+}
+})
+ex = HTMLExporter(config=config)
+
+html, extra = ex.from_file(sys.stdin)
+sys.stdout.write(html)
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..9a26427
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,38 @@
+{
+   "name": "NotebookViewer",
+   "version": "0.0.1",
+   "author": [
+   "Yuvi Panda"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:NotebookViwer;,
+   "descriptionmsg": "notebookviewer-desc",
+   "license-name": "MIT",
+   "type": "other",
+   "AutoloadClasses": {
+   "NotebookContent": "NotebookContent.php",
+"NotebookContentHandler": "NotebookContentHandler.php"
+   },
+"namespaces": [
+{
+"id": 2,
+"constant": "NS_NOTEBOOK",
+"name": "Notebook",
+"defaultcontentmodel": "Notebook"
+}
+],
+"ContentHandlers": {
+"Notebook": "NotebookContentHandler"
+},
+   "config": {
+   "NotebookStripJS": true
+   },
+   

[MediaWiki-commits] [Gerrit] Add .gitignore - change (mediawiki...NotebookViewer)

[Legoktm (Code Review)]

Legoktm has submitted this change and it was merged.

Change subject: Add .gitignore
..


Add .gitignore

Change-Id: Iedac0f13f051ba11fba1e8ec1b99ed93407a21fa
---
A .gitignore
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e3913e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+\#*#
+.#*
+composer.lock
+vendor/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedac0f13f051ba11fba1e8ec1b99ed93407a21fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NotebookViewer
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] Add role for NotebookViewer extension - change (mediawiki/vagrant)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Add role for NotebookViewer extension
..

Add role for NotebookViewer extension

Change-Id: I3730f868e93d563a1aa2eb2aab302ea2b762f85f
---
A puppet/modules/role/manifests/notebook.pp
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/54/257554/1

diff --git a/puppet/modules/role/manifests/notebook.pp 
b/puppet/modules/role/manifests/notebook.pp
new file mode 100644
index 000..e37d74f
--- /dev/null
+++ b/puppet/modules/role/manifests/notebook.pp
@@ -0,0 +1,15 @@
+# == Class: role::notebook
+# Sets up the NotebookViewer MW extension
+class role::notebook {
+
+package { [
+'nbconvert',
+'ipython',
+]:
+provider => pip,
+ensure   => present,
+}
+
+mediawiki::extension { 'NotebookViewer':
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3730f868e93d563a1aa2eb2aab302ea2b762f85f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] gitblit: use mw/vendor as the icinga check instead of mw/core - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: gitblit: use mw/vendor as the icinga check instead of mw/core
..


gitblit: use mw/vendor as the icinga check instead of mw/core

Smaller repo -> faster response and less load on antimony.

Change-Id: Ie5a57117ee29702d90ef5d76ebbd1498d4e0ec7b
---
M manifests/role/gitblit.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
index 9ed5379..653b930 100644
--- a/manifests/role/gitblit.pp
+++ b/manifests/role/gitblit.pp
@@ -16,7 +16,7 @@
 
 monitoring::service { 'gitblit_web':
 description   => 'git.wikimedia.org',
-check_command => 
'check_http_url!git.wikimedia.org!/tree/mediawiki%2Fcore.git',
+check_command => 
'check_http_url!git.wikimedia.org!/tree/mediawiki%2Fvendor.git',
 }
 
 nrpe::monitor_service { 'gitblit_process':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5a57117ee29702d90ef5d76ebbd1498d4e0ec7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow special language codes in monolingual text values - change (mediawiki...Wikibase)

[Adrian Lang (Code Review)]

Adrian Lang has uploaded a new change for review.

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

Change subject: Allow special language codes in monolingual text values
..

Allow special language codes in monolingual text values

This does not add names for these language codes, nor does it support them in
the language selector on monolingual text values.

Bug: T72205
Change-Id: I8f948f4888097d0fb6faaedbaa56fd27eed5b224
---
A lib/includes/StaticContentLanguages.php
A lib/includes/UnionContentLanguages.php
A lib/tests/phpunit/StaticContentLanguagesTest.php
A lib/tests/phpunit/UnionContentLanguagesTest.php
M repo/includes/WikibaseRepo.php
5 files changed, 247 insertions(+), 1 deletion(-)


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

diff --git a/lib/includes/StaticContentLanguages.php 
b/lib/includes/StaticContentLanguages.php
new file mode 100644
index 000..2ae4d93
--- /dev/null
+++ b/lib/includes/StaticContentLanguages.php
@@ -0,0 +1,40 @@
+
+ */
+class StaticContentLanguages implements ContentLanguages {
+
+   /**
+* @var string[] Array of language codes
+*/
+   private $languageMap = null;
+
+   /**
+* @param string[] $languageMap
+*/
+   public function __construct( array $languageMap ) {
+   $this->languageMap = $languageMap;
+   }
+
+   /**
+* @return string[] Array of language codes supported as content 
language
+*/
+   public function getLanguages() {
+   return $this->languageMap;
+   }
+
+   /**
+* @param string $languageCode
+*
+* @return bool
+*/
+   public function hasLanguage( $languageCode ) {
+   return in_array( $languageCode, $this->languageMap );
+   }
+
+}
diff --git a/lib/includes/UnionContentLanguages.php 
b/lib/includes/UnionContentLanguages.php
new file mode 100644
index 000..759693b
--- /dev/null
+++ b/lib/includes/UnionContentLanguages.php
@@ -0,0 +1,64 @@
+
+ */
+class UnionContentLanguages implements ContentLanguages {
+
+   /**
+* @var ContentLanguages $a
+*/
+   private $a = null;
+
+   /**
+* @var ContentLanguages $b
+*/
+   private $b = null;
+
+   /**
+* @var string[]|null Array of language codes
+*/
+   private $languageMap = null;
+
+   /**
+* @param ContentLanguages $a
+* @param ContentLanguages $b
+*/
+   public function __construct( ContentLanguages $a, ContentLanguages $b ) 
{
+   $this->a = $a;
+   $this->b = $b;
+   }
+
+   /**
+* @return string[] Array of language codes supported as content 
language
+*/
+   public function getLanguages() {
+   $languageCodes = $this->getLanguageMap();
+   return $languageCodes;
+   }
+
+   /**
+* @param string $languageCode
+*
+* @return bool
+*/
+   public function hasLanguage( $languageCode ) {
+   return in_array( $languageCode, $this->getLanguageMap() );
+   }
+
+   /**
+* @return string[] Array of language codes
+*/
+   private function getLanguageMap() {
+   if ( $this->languageMap === null ) {
+   $this->languageMap = $this->b->getLanguages() + 
$this->a->getLanguages();
+   }
+
+   return $this->languageMap;
+   }
+
+}
diff --git a/lib/tests/phpunit/StaticContentLanguagesTest.php 
b/lib/tests/phpunit/StaticContentLanguagesTest.php
new file mode 100644
index 000..9a6b36a
--- /dev/null
+++ b/lib/tests/phpunit/StaticContentLanguagesTest.php
@@ -0,0 +1,59 @@
+
+ */
+class StaticContentLanguagesTest extends \MediaWikiTestCase {
+
+   /**
+* @dataProvider provideTestGetLanguages
+*/
+   public function testGetLanguages( $expected ) {
+   $contentLanguages = new StaticContentLanguages( $expected );
+   $result = $contentLanguages->getLanguages();
+
+   $this->assertInternalType( 'array', $result );
+
+   $this->assertSame( $expected, $result );
+   }
+
+   public function provideTestGetLanguages() {
+   return array(
+   array( array() ),
+   array( array( 'one' ) ),
+   array( array( 'one', 'two' ) ),
+   );
+   }
+
+   /**
+* @dataProvider provideTestHasLanguage
+*/
+   public function testHasLanguage( $in, $lang, $expected ) {
+   $contentLanguages = new StaticContentLanguages( $in );
+   $result = $contentLanguages->hasLanguage( $lang );
+
+   $this->assertSame( $expected, $result );
+   }
+
+   public function provideTestHasLanguage() {
+   return array(
+  

[MediaWiki-commits] [Gerrit] pybal: fix collection of individual stats via diamond - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: pybal: fix collection of individual stats via diamond
..

pybal: fix collection of individual stats via diamond

Change-Id: I2a9bf3bd1f357c9fe6261fee098538ec3d4614bd
---
M modules/pybal/files/pybal_state.py
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/257315/1

diff --git a/modules/pybal/files/pybal_state.py 
b/modules/pybal/files/pybal_state.py
index 5669dcd..b990989 100644
--- a/modules/pybal/files/pybal_state.py
+++ b/modules/pybal/files/pybal_state.py
@@ -60,10 +60,10 @@
 for label, val in v.items():
 if val:
 acc[label] += 1
-for metric, count in acc.items():
-path = 'pools.{}.{}'.format(name, metric)
-self.publish(path, count)
-self.publish(path + ".ratio", count / total)
+for metric, count in acc.items():
+path = 'pools.{}.{}'.format(name, metric)
+self.publish(path, count)
+self.publish(path + ".ratio", count / total)
 
 def collect(self):
 for pool in self.get_pools():

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a9bf3bd1f357c9fe6261fee098538ec3d4614bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Add a warning endpoint to catch misconfigurations - change (operations...pybal)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Add a warning endpoint to catch misconfigurations
..

Add a warning endpoint to catch misconfigurations

When a pool is configured so that even losing one server would get us
below the depool threshold, something bad is going on - typically
someone has misconfigured the pool; let's raise a warning in this case.

Change-Id: Iaf3f83e6b8ca15819db867ca0bb6953dd12ab6f6
---
M pybal/instrumentation.py
M pybal/pybal.py
2 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/24/257324/1

diff --git a/pybal/instrumentation.py b/pybal/instrumentation.py
index 56263d1..5db9855 100644
--- a/pybal/instrumentation.py
+++ b/pybal/instrumentation.py
@@ -46,6 +46,8 @@
 return PoolsRoot()
 if path == 'alerts':
 return Alerts()
+if path == 'warnings':
+return Warnings()
 else:
 return Resp404()
 
@@ -74,6 +76,10 @@
   for k, v in self.alerting_services.items()])
 
 
+class Warnings(Alerts):
+pass
+
+
 class PoolsRoot(Resource):
 """Pools base resource.
 
diff --git a/pybal/pybal.py b/pybal/pybal.py
index 4f7863b..57c0300 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -364,7 +364,7 @@
 self.pooledDownServers.add(server)
 msg = "Could not depool server " \
   "{} because of too many down!".format(server.host)
-instrumentation.Alerts.addAlert(self.lvsservice.name, msg)
+instrumentation.Alerts.addAlert(self.lvsservice.name, "Depool 
threshold reached")
 log.error(msg, system=self.lvsservice.name)
 
 def repool(self, server):
@@ -453,6 +453,16 @@
 # Assign the updated list of enabled servers to the LVSService instance
 self.assignServers()
 
+# If the pool is too small to allow depooling of any server, let's 
raise
+# an alert too
+if len(self.pooledDownServers) == 0 and not self.canDepool():
+instrumentation.Warnings.addAlert(
+self.lvsservice.name,
+"The pool is too small to allow depooling")
+else:
+# The pool would be able to depool a faulty server, let's clear 
the alert.
+instrumentation.Warnings.delAlert(self.lvsservice.name)
+
 
 class BGPFailover:
 """Class for maintaining a BGP session to a router for IP address 
failover"""

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf3f83e6b8ca15819db867ca0bb6953dd12ab6f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Improve wording of UI based on user feedback - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Improve wording of UI based on user feedback
..


Improve wording of UI based on user feedback

* In a pre-study users identified some problems with the wording
  of the mlp-eval-tool
* This change improves the wording in order to increase
  readability.

Change-Id: Id39f7985a334207d0a4d6dcc2cde0d4a5648b8d9
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 64 insertions(+), 14 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index d11672b..b0a84d1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,12 +17,12 @@
"getequationsbyquery": "Get equations by query",
"xquerygenerator": "XQuery generator",
"mathdebug": "Test Renderer",
-   "math-lp-1-intro": "Dear participant,\n\nthank you for participating in 
the evaluation for improving the math support in Wikipedia and ohter wikis that 
use mathematics. The study evaluates the quality of mathematical formulae in 
MediaWiki, the software that runs Wikipedia, with regard to three aspects:\n\n# 
LaTeX input: Is the formula source code typed correctly? (Using 
\\sin instead of 
sin)\n# Rendering: Is 
the formula displayed correctly? (Even correct LaTeX input might lead to 
unreadable formulae on certain devices.)\n# Semantics: Is the MediaWiki Math 
extension capable of capturing the formulae semantics correctly? 
(f(a+b) might stand for the \"function f applied the 
sum of a and b\" or \"variable f times 
the sum of a plus b\")\n\nIn the following, you will 
be guided through a five step evaluation process.",
+   "math-lp-1-intro": "Dear participant,\n\nthank you for participating in 
the evaluation for improving the math support in Wikipedia and other wikis that 
use mathematics. The study evaluates the quality of mathematical formulae in 
MediaWiki, the software that runs Wikipedia, with regard to three aspects:\n\n# 
LaTeX input: Is the formula source code typed correctly? (Using 
\\sin instead of 
sin)\n# Rendering: Is 
the formula displayed correctly? (Even correct LaTeX input might lead to 
unreadable formulae on certain devices.)\n# Semantics: Is the MediaWiki Math 
extension capable of capturing the formulae semantics correctly? 
(f(a+b) might stand for the \"function f applied the 
sum of a and b\" or \"variable f times 
the sum of a plus b\")\n\nIn the following, you will 
be guided through a five step evaluation process.",
"math-lp-1-head": "Step 1: Select an article you are familiar with",
"math-lp-1-page-label": "Article title",
"math-lp-1-page-help": "This input field below is prefilled with a 
randomly chosen article that contains mathematics. You have three options\n# 
Click \"continue\" to proceed with this article.\n# Type the title of an 
article you want to evaluate and click \"continue\" thereafter.\n# Click 
\"select another random article\" to reload this page and get a new randomly 
selected article.",
"math-lp-2-head": "Step 2: Classify the mathematical expression",
-   "math-lp-2-intro": "In the following, you will see a mathematical 
object that has been entered using the MediaWiki math markup and is treated as 
mathematical expression by the MediaWiki software.",
+   "math-lp-2-intro": "In the following, you will see a mathematical 
expression that has been entered using the MediaWiki math markup and is treated 
as mathematical expression by the MediaWiki software.\n\nIn this step you 
classify the type and domain of the expression since mathematical notation is 
not used in pure math alone.\n\nIf the expression you see is not a complex 
mathematical expression, we recommend to submit the form with 
''{{int:math-lp-new-formula}}''.",
"math-lp-2-content-label": "Select most appropriate type of the 
expression",
"math-lp-2-content-option-1": "complex mathematical expression 
(a²+b²=c²)",
"math-lp-2-content-option-2": "single number (3.14)",
@@ -45,28 +45,52 @@
"math-lp-3-pretty-label": "Which input source is more readable?",
"math-lp-3-pretty-help": "Evaluate the readability of the LaTeX code 
itself, and not of its rendering. The question is disabled if original and 
checked text are the same.",
"math-lp-3-pretty-option-1": "Original user input LaTeX code",
-   "math-lp-3-pretty-option-2": "Texvc checked LaTeX code",
+   "math-lp-3-pretty-option-2": "Security checked LaTeX code",
+   "math-lp-3-pretty-option-3": "I can not say.",
"math-lp-3-assessment-label": "Assessment of the original user input 
LaTeX code",
"math-lp-3-assessment-option-1": "the input is all right",
-   "math-lp-3-assessment-option-2": "the input is ok but has minor 
problems",
+   "math-lp-3-assessment-option-2": "the input has minor problems",

[MediaWiki-commits] [Gerrit] Add rolling_rc to daily_site_stats.sh - change (analytics/limn-wikidata-data)

[Addshore (Code Review)]

Addshore has submitted this change and it was merged.

Change subject: Add rolling_rc to daily_site_stats.sh
..


Add rolling_rc to daily_site_stats.sh

Change-Id: Ic6a1d3d46f58f63bb49431655a35ee781e9353d5
---
M daily_site_stats.sh
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/daily_site_stats.sh b/daily_site_stats.sh
index 584764d..f41e371 100755
--- a/daily_site_stats.sh
+++ b/daily_site_stats.sh
@@ -9,6 +9,7 @@
 ~/wikidata-data/graphite/site_stats/bureaucrats.sh
 ~/wikidata-data/graphite/site_stats/bots.sh
 ~/wikidata-data/graphite/site_stats/propertycreators.sh
+~/wikidata-data/graphite/site_stats/rolling_rc.php
 ~/wikidata-data/graphite/site_stats/pages_by_namespace.php
 ~/wikidata-data/graphite/site_stats/user_languages.php
 ~/wikidata-data/graphite/site_stats/page_size.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6a1d3d46f58f63bb49431655a35ee781e9353d5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Removed last of pre-RL compatibility - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Removed last of pre-RL compatibility
..


Removed last of pre-RL compatibility

Change-Id: Id492ac53ef12cc76911929458a4fc91705a9ef40
---
M SemanticForms.php
M includes/SF_ParserFunctions.php
2 files changed, 119 insertions(+), 157 deletions(-)

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



diff --git a/SemanticForms.php b/SemanticForms.php
index ad5c87a..46dbf45 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -232,134 +232,132 @@
 // Allow for popup windows for file upload
 $GLOBALS['wgEditPageFrameOptions'] = 'SAMEORIGIN';
 
-// register client-side modules
-if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
-   $sfgResourceTemplate = array(
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'SemanticForms'
-   );
-   $GLOBALS['wgResourceModules'] += array(
-   'ext.semanticforms.main' => $sfgResourceTemplate + array(
-   'scripts' => array(
-   'libs/SemanticForms.js',
-   'libs/SF_preview.js'
-   ),
-   'styles' => array(
-   'skins/SemanticForms.css',
-   'skins/SF_jquery_ui_overrides.css',
-   ),
-   'dependencies' => array(
-   'jquery.ui.core',
-   'jquery.ui.autocomplete',
-   'jquery.ui.button',
-   'jquery.ui.sortable',
-   'jquery.ui.widget',
-   'ext.semanticforms.fancybox',
-   'ext.semanticforms.autogrow',
-   'mediawiki.util',
-   'ext.semanticforms.select2',
-   ),
-   'messages' => array(
-   'sf_formerrors_header',
-   'sf_too_few_instances_error',
-   'sf_too_many_instances_error',
-   'sf_blank_error',
-   'sf_not_unique_error',
-   'sf_bad_url_error',
-   'sf_bad_email_error',
-   'sf_bad_number_error',
-   'sf_bad_date_error',
-   'sf_pipe_error',
-   ),
+// Register client-side modules.
+$sfgResourceTemplate = array(
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SemanticForms'
+);
+$GLOBALS['wgResourceModules'] += array(
+   'ext.semanticforms.main' => $sfgResourceTemplate + array(
+   'scripts' => array(
+   'libs/SemanticForms.js',
+   'libs/SF_preview.js'
),
-   'ext.semanticforms.browser' => $sfgResourceTemplate + array(
-   'scripts' => 'libs/jquery.browser.js',
+   'styles' => array(
+   'skins/SemanticForms.css',
+   'skins/SF_jquery_ui_overrides.css',
),
-   'ext.semanticforms.fancybox' => $sfgResourceTemplate + array(
-   'scripts' => 'libs/jquery.fancybox.js',
-   'styles' => 'skins/jquery.fancybox.css',
-   'dependencies' => array( 'ext.semanticforms.browser' ),
+   'dependencies' => array(
+   'jquery.ui.core',
+   'jquery.ui.autocomplete',
+   'jquery.ui.button',
+   'jquery.ui.sortable',
+   'jquery.ui.widget',
+   'ext.semanticforms.fancybox',
+   'ext.semanticforms.autogrow',
+   'mediawiki.util',
+   'ext.semanticforms.select2',
),
-   'ext.semanticforms.dynatree' => $sfgResourceTemplate + array(
-   'dependencies' => array( 'jquery.ui.widget' ),
-   'scripts' => array(
-   'libs/jquery.dynatree.js',
-   'libs/SF_dynatree.js',
-   ),
-   'styles' => 'skins/ui.dynatree.css',
+   'messages' => array(
+   'sf_formerrors_header',
+   'sf_too_few_instances_error',
+   'sf_too_many_instances_error',
+   'sf_blank_error',
+   'sf_not_unique_error',
+   'sf_bad_url_error',
+   'sf_bad_email_error',
+   'sf_bad_number_error',
+   'sf_bad_date_error',

[MediaWiki-commits] [Gerrit] Add missing @author tags - change (mediawiki...ExtensionDistributor)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add missing @author tags
..

Add missing @author tags

Change-Id: Ie565b210b589841015332d20642ae1ce39d02e5b
---
M includes/api/ApiListExtDistBranches.php
M includes/api/ApiListExtDistRepos.php
M includes/providers/ExtDistProvider.php
M includes/providers/GerritExtDistProvider.php
M includes/providers/GithubExtDistProvider.php
M includes/specials/SpecialSkinDistributor.php
6 files changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/includes/api/ApiListExtDistBranches.php 
b/includes/api/ApiListExtDistBranches.php
index f77a450..75dba77 100644
--- a/includes/api/ApiListExtDistBranches.php
+++ b/includes/api/ApiListExtDistBranches.php
@@ -2,6 +2,9 @@
 
 use MediaWiki\Logger\LoggerFactory;
 
+/**
+ * @author Legoktm
+ */
 class ApiListExtDistBranches extends ApiQueryBase {
 
private $providers = array();
diff --git a/includes/api/ApiListExtDistRepos.php 
b/includes/api/ApiListExtDistRepos.php
index ea61cfb..3718b37 100644
--- a/includes/api/ApiListExtDistRepos.php
+++ b/includes/api/ApiListExtDistRepos.php
@@ -2,6 +2,9 @@
 
 use MediaWiki\Logger\LoggerFactory;
 
+/**
+ * @author Legoktm
+ */
 class ApiListExtDistRepos extends ApiQueryBase {
 
public function __construct( ApiQuery $query, $moduleName ) {
diff --git a/includes/providers/ExtDistProvider.php 
b/includes/providers/ExtDistProvider.php
index 0200746..a392799 100644
--- a/includes/providers/ExtDistProvider.php
+++ b/includes/providers/ExtDistProvider.php
@@ -7,6 +7,8 @@
 /**
  * Base ExtensionDistributor provider
  *
+ * @author Legoktm
+ *
  * Parameters that apply to all providers:
  *  proxy (optional) - HTTP proxy used in requests
  *  apiUrl - API endpoint to use
diff --git a/includes/providers/GerritExtDistProvider.php 
b/includes/providers/GerritExtDistProvider.php
index 28ffaa1..d8ae657 100644
--- a/includes/providers/GerritExtDistProvider.php
+++ b/includes/providers/GerritExtDistProvider.php
@@ -4,6 +4,8 @@
  * ExtensionDistributor provider for the Gerrit Code Review system
  * Requires an external service to provide tarballs
  *
+ * @author Legoktm
+ *
  * Example configuration for Wikimedia sites:
  *
  * $wgExtDistAPIConfig = array(
diff --git a/includes/providers/GithubExtDistProvider.php 
b/includes/providers/GithubExtDistProvider.php
index ef01f37..b381f8a 100644
--- a/includes/providers/GithubExtDistProvider.php
+++ b/includes/providers/GithubExtDistProvider.php
@@ -3,6 +3,8 @@
 /**
  * ExtensionDistributor provider for Github.com
  *
+ * @author Legoktm
+ *
  * Provider-specific parameters:
  *  token - OAuth authentication token, see 
https://github.com/blog/1509-personal-api-tokens
  *
diff --git a/includes/specials/SpecialSkinDistributor.php 
b/includes/specials/SpecialSkinDistributor.php
index 7d067d6..759f510 100644
--- a/includes/specials/SpecialSkinDistributor.php
+++ b/includes/specials/SpecialSkinDistributor.php
@@ -2,6 +2,8 @@
 
 /**
  * Special page that allows users to download skins as tar archives.
+ *
+ * @author Legoktm
  */
 class SpecialSkinDistributor extends SpecialBaseDistributor {
 

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

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

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

[MediaWiki-commits] [Gerrit] Fix race condition in clearing the alerts - change (operations...pybal)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Fix race condition in clearing the alerts
..


Fix race condition in clearing the alerts

It could happen that a pool was below the depooling threshold by just
removing one server, and that would mean we would never clear the alert
when that server was repooled.

Change-Id: I9e660931515a39c2f435146a20ea411885483d56
---
M pybal/pybal.py
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/pybal/pybal.py b/pybal/pybal.py
index e34bc66..4f7863b 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -387,6 +387,9 @@
 # See if we can depool any servers that could not be depooled before
 while len(self.pooledDownServers) > 0 and self.canDepool():
 self.depool(self.pooledDownServers.pop())
+
+# See if we can clear the alert
+if len(self.pooledDownServers) == 0:
 instrumentation.Alerts.delAlert(self.lvsservice.name)
 
 def canDepool(self):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e660931515a39c2f435146a20ea411885483d56
Gerrit-PatchSet: 3
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VE: Use MediaSizeWidget with restricted dimensions - change (mediawiki...Graph)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: VE: Use MediaSizeWidget with restricted dimensions
..

VE: Use MediaSizeWidget with restricted dimensions

Depends on I9c4e72c32 in core.

Bug: T119261
Change-Id: I6c41e4a0ad69b6ac58c748e9759e67438b08817c
---
M modules/ve-graph/ve.dm.MWGraphModel.js
M modules/ve-graph/ve.dm.MWGraphNode.js
M modules/ve-graph/ve.ui.MWGraphDialog.js
3 files changed, 41 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph 
refs/changes/19/257319/1

diff --git a/modules/ve-graph/ve.dm.MWGraphModel.js 
b/modules/ve-graph/ve.dm.MWGraphModel.js
index 39ac238..9c4d276 100644
--- a/modules/ve-graph/ve.dm.MWGraphModel.js
+++ b/modules/ve-graph/ve.dm.MWGraphModel.js
@@ -32,6 +32,11 @@
 
 ve.dm.MWGraphModel.static.defaultPadding = 30;
 
+ve.dm.MWGraphModel.static.minDimensions = {
+   width: 60,
+   height: 60
+};
+
 ve.dm.MWGraphModel.static.graphConfigs = {
area: {
mark: {
diff --git a/modules/ve-graph/ve.dm.MWGraphNode.js 
b/modules/ve-graph/ve.dm.MWGraphNode.js
index 0742b66..1545c5d 100644
--- a/modules/ve-graph/ve.dm.MWGraphNode.js
+++ b/modules/ve-graph/ve.dm.MWGraphNode.js
@@ -187,18 +187,15 @@
  * @inheritdoc
  */
 ve.dm.MWGraphNode.prototype.createScalable = function () {
-   var width = ve.getProp( this, 'spec', 'width' ),
-   height = ve.getProp( this, 'spec', 'height' );
+   var width = ve.getProp( this.spec, 'width' ),
+   height = ve.getProp( this.spec, 'height' );
 
return new ve.dm.Scalable( {
currentDimensions: {
width: width,
height: height
},
-   minDimensions: {
-   width: 60,
-   height: 60
-   },
+   minDimensions: ve.dm.MWGraphModel.static.minDimensions,
fixedRatio: false
} );
 };
diff --git a/modules/ve-graph/ve.ui.MWGraphDialog.js 
b/modules/ve-graph/ve.ui.MWGraphDialog.js
index e52ee6d..bc3434d 100644
--- a/modules/ve-graph/ve.ui.MWGraphDialog.js
+++ b/modules/ve-graph/ve.ui.MWGraphDialog.js
@@ -111,15 +111,16 @@
label: ve.msg( 
'graph-ve-dialog-edit-unknown-graph-type-warning' )
} );
 
-   this.sizeWidget = new ve.ui.DimensionsWidget();
+   this.sizeWidget = new ve.ui.MediaSizeWidget( null, {
+   noDefaultDimensions: true,
+   noOriginalDimensions: true
+   } );
 
sizeFieldset = new OO.ui.FieldsetLayout( {
label: ve.msg( 'graph-ve-dialog-edit-size-fieldset' )
} );
 
-   sizeFieldset.addItems( [
-   this.sizeWidget
-   ] );
+   sizeFieldset.addItems( [ this.sizeWidget ] );
 
this.paddingAutoCheckbox = new OO.ui.CheckboxInputWidget( {
value: 'paddingAuto'
@@ -223,14 +224,8 @@
 
// Events
this.rootLayout.connect( this, { set: 'onRootLayoutSet' } );
-
this.graphTypeDropdownInput.connect( this, { change: 
'onGraphTypeInputChange' } );
-
-   this.sizeWidget.connect( this, {
-   widthChange: 'onSizeWidgetWidthChange',
-   heightChange: 'onSizeWidgetHeightChange'
-   } );
-
+   this.sizeWidget.connect( this, { change: 'onSizeWidgetChange' } );
this.paddingAutoCheckbox.connect( this, { change: 
'onPaddingAutoCheckboxChange' } );
this.paddingTable.connect( this, {
change: 'onPaddingTableChange'
@@ -367,8 +362,14 @@
.setValue( graphType );
 
// Size
-   this.sizeWidget.setWidth( graphSize.width );
-   this.sizeWidget.setHeight( graphSize.height );
+   this.sizeWidget.setScalable( new ve.dm.Scalable( {
+   currentDimensions: {
+   width: graphSize.width,
+   height: graphSize.height
+   },
+   minDimensions: ve.dm.MWGraphModel.static.minDimensions,
+   fixedRatio: false
+   } ) );
 
// Padding
this.paddingAutoCheckbox.setSelected( 
this.graphModel.isPaddingAutomatic() );
@@ -533,21 +534,16 @@
 };
 
 /**
- * Handle size widget width changes
+ * Handle size widget changes
  *
- * @param {string} value The new value
+ * @param {Object} dimensions New dimensions
  */
-ve.ui.MWGraphDialog.prototype.onSizeWidgetWidthChange = function ( value ) {
-   this.graphModel.setWidth( parseInt( value ) );
-};
-
-/**
- * Handle size widget height changes
- *
- * @param {string} value The new value
- */
-ve.ui.MWGraphDialog.prototype.onSizeWidgetHeightChange = function ( value ) {
-   this.graphModel.setHeight( parseInt( value ) );
+ve.ui.MWGraphDialog.prototype.onSizeWidgetChange = function ( dimensions ) {
+   if ( this.sizeWidget.isValid() ) {
+   this.graphModel.setWidth( 

[MediaWiki-commits] [Gerrit] Wikidata: set maxSerializedEntitySize to 2500 - change (operations/mediawiki-config)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Wikidata: set maxSerializedEntitySize to 2500
..

Wikidata: set maxSerializedEntitySize to 2500

This is just a bit bigger than the biggest entity.
The code implementing this will be deployed next train.
See 79c339274f737bb72d499ecb1f1aa77e10b82de2 .

Found with:
[wikidatawiki]> select * from revision order by rev_len desc limit 10;
$ curl -o biggest-revision.json --silent 'https://www.'\
'wikidata.org/w/api.php?action=query=revisions'\
'ids=277075022=content=json' &&
 ls --size biggest-revision.json
2488 biggest-revision.json

Change-Id: I6eaa8a0aa3cbb7f8902d281fe3532e10526c
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index da9038a..0d6b919 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -19,6 +19,8 @@
 
 $wgWBSharedSettings = array();
 
+$wgWBSharedSettings['maxSerializedEntitySize'] = 2500;
+
 $wgWBSharedSettings['siteLinkGroups'] = array(
'wikipedia',
'wikibooks',

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

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

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

[MediaWiki-commits] [Gerrit] Add CSS styles that enforce MathML or SVG reflectively - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Add CSS styles that enforce MathML or SVG reflectively
..

Add CSS styles that enforce MathML or SVG reflectively

Change-Id: Ibae976b0e57d9259fbc0c7c60e9776f79bcbbdbe
---
M extension.json
A modules/ext.math-mathml.css
A modules/ext.math-svg.css
3 files changed, 119 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch 
refs/changes/27/257327/1

diff --git a/extension.json b/extension.json
index 47c7356..ef0c503 100644
--- a/extension.json
+++ b/extension.json
@@ -89,6 +89,20 @@
"desktop",
"mobile"
]
+   },
+   "ext.math-svg.styles": {
+   "styles": "ext.math-svg.css",
+   "targets": [
+   "desktop",
+   "mobile"
+   ]
+   },
+   "ext.math-mathml.styles": {
+   "styles": "ext.math-mathml.css",
+   "targets": [
+   "desktop",
+   "mobile"
+   ]
}
},
 
diff --git a/modules/ext.math-mathml.css b/modules/ext.math-mathml.css
new file mode 100644
index 000..4927e38
--- /dev/null
+++ b/modules/ext.math-mathml.css
@@ -0,0 +1,61 @@
+/*
+ * Document   : ext.math
+ * Created on : 23.09.2013, 13:55:00
+ * Author : Physikerwelt (Moritz Schubotz)
+ * Description: Shows browser-dependent math output.
+ */
+@namespace m url('http://www.w3.org/1998/Math/MathML');
+
+/* Default style for MathML. */
+.mwe-math-mathml-inline { display: inline !important; }
+.mwe-math-mathml-display { display: block !important; margin-left: auto; 
margin-right: auto; }
+.mwe-math-mathml-a11y {
+   /* We try to hide the MathML formula in a way that still makes it 
accessible to accessibility tools. */
+   clip: rect(1px, 1px, 1px, 1px);
+   overflow: hidden;
+   position: absolute;
+   width: 1px;
+   height: 1px;
+   opacity: 0;
+}
+m|math {
+   /* Try some popular OpenType MATH fonts before the WOFF fallback */
+   /* We put Cambria before Cambria Math to workaround a bug on Windows
+   (see https://bugzilla.mozilla.org/show_bug.cgi?id=598900) */
+   font-family: Cambria, Cambria Math, Latin Modern Math, STIX Math, 
LatinModernMathWOFF, serif;
+   /* .mw-body-content sets the line-height to 1.6 which is not desired 
for math. For example */
+   /* matrices with brackets are rendered too large. See also 
https://phabricator.wikimedia.org/T106890 */
+   line-height: normal;
+}
+
+/* Default style for the image fallback. */
+/* Note: We had to use !important rules because of conflicts with the style
+generated by Mathoid. See https://gerrit.wikimedia.org/r/#/c/166213/ */
+.mwe-math-fallback-image-inline { display: inline-block; vertical-align: 
middle; }
+.mwe-math-fallback-image-display { display: block; margin-left: auto 
!important; margin-right: auto !important; }
+
+/* Default style for the source fallback. */
+.mwe-math-fallback-source-inline { display: inline; vertical-align: middle; }
+.mwe-math-fallback-source-display { display: block; margin-left: auto; 
margin-right: auto; }
+
+/**
+ * Browser-specific hacks are bad but let's use that for now...
+ * See http://browserhacks.com/
+ */
+
+.mwe-math-mathml-a11y {
+   clip: auto;
+   overflow: visible;
+   position: static;
+   width: auto;
+   height: auto;
+   opacity: 1;
+}
+.mwe-math-mathml-inline + .mwe-math-fallback-image-inline,
+.mwe-math-mathml-display + .mwe-math-fallback-image-display { display: none 
!important; }
+
+
+/* PNG related styles from core */
+img.tex {
+   vertical-align: middle;
+}
diff --git a/modules/ext.math-svg.css b/modules/ext.math-svg.css
new file mode 100644
index 000..634f4b9
--- /dev/null
+++ b/modules/ext.math-svg.css
@@ -0,0 +1,44 @@
+/*
+ * Document   : ext.math
+ * Created on : 23.09.2013, 13:55:00
+ * Author : Physikerwelt (Moritz Schubotz)
+ * Description: Shows browser-dependent math output.
+ */
+@namespace m url('http://www.w3.org/1998/Math/MathML');
+
+/* Default style for MathML. */
+.mwe-math-mathml-inline { display: inline !important; }
+.mwe-math-mathml-display { display: block !important; margin-left: auto; 
margin-right: auto; }
+.mwe-math-mathml-a11y {
+   /* We try to hide the MathML formula in a way that still makes it 
accessible to accessibility tools. */
+   clip: rect(1px, 1px, 1px, 1px);
+   overflow: hidden;
+   position: absolute;
+   width: 1px;
+   height: 1px;
+   opacity: 0;
+}
+m|math {
+   /* Try some popular OpenType MATH fonts before the WOFF fallback */
+   /* We put Cambria 

[MediaWiki-commits] [Gerrit] Fix protocol of short URL service - change (wikidata...rdf)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Fix protocol of short URL service
..

Fix protocol of short URL service

Change-Id: I3456d9fbfb16c2c174f7489d6d0194fc464dbeb3
---
M gui/wikibase/queryService/ui/App.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/34/257334/1

diff --git a/gui/wikibase/queryService/ui/App.js 
b/gui/wikibase/queryService/ui/App.js
index fb682bc..b837c61 100644
--- a/gui/wikibase/queryService/ui/App.js
+++ b/gui/wikibase/queryService/ui/App.js
@@ -6,8 +6,8 @@
 wikibase.queryService.ui.App = ( function( $, mw ) {
"use strict";
 
-   var SHORTURL = 'http://tinyurl.com/create.php?url=';
-   var SHORTURL_API = 'http://tinyurl.com/api-create.php?url=';
+   var SHORTURL = '//tinyurl.com/create.php?url=';
+   var SHORTURL_API = '//tinyurl.com/api-create.php?url=';
var EXPLORE_URL = 'http://www.wikidata.org/entity/Q';
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3456d9fbfb16c2c174f7489d6d0194fc464dbeb3
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] Build 1.0.2e for jessie-wikimedia - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Build 1.0.2e for jessie-wikimedia
..


Build 1.0.2e for jessie-wikimedia

Change-Id: I10bb4ed4f3ef389ae7fbbcf67c4ec5ed3c1e353a
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 8df9f67..c676634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssl (1.0.2e-1~wmf1) jessie-wikimedia; urgency=medium
+
+  * Update to 1.0.2d for CVE-2015-3193, CVE-2015-3194, CVE-2015-3195
+
+ -- Moritz Muehlenhoff   Mon, 07 Dec 2015 13:06:25 +0100
+
 openssl (1.0.2d-1~wmf1) jessie-wikimedia; urgency=high
 
   * Update to 1.0.2d for CVE-2015-1793

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

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

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

[MediaWiki-commits] [Gerrit] TwitterCards ViewFiles now use generic job - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: TwitterCards ViewFiles now use generic job
..

TwitterCards ViewFiles now use generic job

The specific mwext-*-testextension-zend job was no more maintained by
JJB and I deleted them earlier.

PHPUnit tests pass and none of those jobs use dependencies. So migrated
them to the generic job.

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


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

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 42dde88..fc13bc2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6016,7 +6016,7 @@
 
   - name: mediawiki/extensions/TwitterCards
 template:
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/TwitterLogin
 template:
@@ -6095,7 +6095,7 @@
 
   - name: mediawiki/extensions/ViewFiles
 template:
-  - name: extension-unittests
+  - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Views
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Fix inherit documentation of AnnotationContextItems - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Fix inherit documentation of AnnotationContextItems
..

Fix inherit documentation of AnnotationContextItems

Change-Id: I089073b6df9b51c27de7b68a05fb317e308cb236
---
M src/ui/contextitems/ve.ui.LanguageContextItem.js
M src/ui/contextitems/ve.ui.LinkContextItem.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/13/257313/1

diff --git a/src/ui/contextitems/ve.ui.LanguageContextItem.js 
b/src/ui/contextitems/ve.ui.LanguageContextItem.js
index d53c879..4f7831f 100644
--- a/src/ui/contextitems/ve.ui.LanguageContextItem.js
+++ b/src/ui/contextitems/ve.ui.LanguageContextItem.js
@@ -8,7 +8,7 @@
  * Context item for a language.
  *
  * @class
- * @extends ve.ui.LinearContextItem
+ * @extends ve.ui.AnnotationContextItem
  *
  * @param {ve.ui.Context} context Context item is in
  * @param {ve.dm.Model} model Model item is related to
diff --git a/src/ui/contextitems/ve.ui.LinkContextItem.js 
b/src/ui/contextitems/ve.ui.LinkContextItem.js
index 4562614..76cf46c 100644
--- a/src/ui/contextitems/ve.ui.LinkContextItem.js
+++ b/src/ui/contextitems/ve.ui.LinkContextItem.js
@@ -8,7 +8,7 @@
  * Context item for a link.
  *
  * @class
- * @extends ve.ui.LinearContextItem
+ * @extends ve.ui.AnnotationContextItem
  *
  * @param {ve.ui.Context} context Context item is in
  * @param {ve.dm.Model} model Model item is related to

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I089073b6df9b51c27de7b68a05fb317e308cb236
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] MediaDialog: Remove useless empty object arg to media size w... - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: MediaDialog: Remove useless empty object arg to media size 
widget
..

MediaDialog: Remove useless empty object arg to media size widget

Change-Id: Id85498616f80147cd856d4d12bf5a0e58ad66029
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index aff4fb9..df2cab1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -334,7 +334,7 @@
label: ve.msg( 
'visualeditor-dialog-media-size-originalsize-error' )
} );
 
-   this.sizeWidget = new ve.ui.MediaSizeWidget( {} );
+   this.sizeWidget = new ve.ui.MediaSizeWidget();
 
this.$sizeWidgetElements = $( '' ).append(
this.sizeWidget.$element,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id85498616f80147cd856d4d12bf5a0e58ad66029
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Fixes: API error message kills icon layout - change (mediawiki...Wikibase)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Fixes: API error message kills icon layout
..

Fixes: API error message kills icon layout

Bug: T120660
Change-Id: If7b2b1a0c7da5385a291c9634a9fb1ac061a2d03
---
M 
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
 
b/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
index bc5cf42..2081ef9 100755
--- 
a/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
@@ -12,7 +12,7 @@
margin-left: 3px;
padding: 0;
text-decoration: none;
-   width: 11px;
+   min-width: 11px;
 }
 
 .wikibase-toolbar-item .mw-collapsible-toggle {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7b2b1a0c7da5385a291c9634a9fb1ac061a2d03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] Cherrypick three changes from 1.0.2e-1 fixing the build - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Cherrypick three changes from 1.0.2e-1 fixing the build
..

Cherrypick three changes from 1.0.2e-1 fixing the build

Remove all symlinks during clean
Run make depend after configure
Remove openssl_button.* from the doc package

Change-Id: Ic8751eb8ba9d7851c436b70bbcdf20d087f144ea
---
M debian/openssl.docs
M debian/rules
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/openssl 
refs/changes/31/257331/1

diff --git a/debian/openssl.docs b/debian/openssl.docs
index 3183ace..f9dc9f3 100644
--- a/debian/openssl.docs
+++ b/debian/openssl.docs
@@ -1,7 +1,5 @@
 doc/fingerprints.txt
 doc/HOWTO
-doc/openssl_button.gif
-doc/openssl_button.html
 doc/openssl.txt
 doc/README
 doc/standards.txt
diff --git a/debian/rules b/debian/rules
index 628bf5f..e39b1d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,7 @@
 #  perl util/ssldir.pl /usr/lib/ssl
 #  chmod +x debian/libtool
./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
+   make depend
make -f Makefile all
$(MAKE_TEST)
mv libcrypto.a libcrypto.static
@@ -100,6 +101,7 @@
rm -f test/asn1test test/wp_test test/srptest test/jpaketest
rm -f certs/demo/*.0
rm -rf crypto/aes/aes-armv4.S crypto/bn/armv4-gf2m.S 
crypto/modes/ghash-armv4.S crypto/sha/*.S
+   find . -type l -exec rm '{}' \;
dh_clean
 
 install: build

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

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

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

[MediaWiki-commits] [Gerrit] Build 1.0.2e for jessie-wikimedia - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Build 1.0.2e for jessie-wikimedia
..

Build 1.0.2e for jessie-wikimedia

Change-Id: I10bb4ed4f3ef389ae7fbbcf67c4ec5ed3c1e353a
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/openssl 
refs/changes/30/257330/1

diff --git a/debian/changelog b/debian/changelog
index 8df9f67..c676634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssl (1.0.2e-1~wmf1) jessie-wikimedia; urgency=medium
+
+  * Update to 1.0.2d for CVE-2015-3193, CVE-2015-3194, CVE-2015-3195
+
+ -- Moritz Muehlenhoff   Mon, 07 Dec 2015 13:06:25 +0100
+
 openssl (1.0.2d-1~wmf1) jessie-wikimedia; urgency=high
 
   * Update to 1.0.2d for CVE-2015-1793

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

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

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

[MediaWiki-commits] [Gerrit] Add a .gitreview file - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Add a .gitreview file
..

Add a .gitreview file

Change-Id: I1d127dc680c74e641592b66c5ec9783e1668b66a
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/openssl 
refs/changes/36/257336/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..efff854
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/debs/openssl.git
+defaultbranch=master

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

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

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

[MediaWiki-commits] [Gerrit] Add a .gitreview file - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Add a .gitreview file
..


Add a .gitreview file

Change-Id: I1d127dc680c74e641592b66c5ec9783e1668b66a
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..efff854
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/debs/openssl.git
+defaultbranch=master

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

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

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

[MediaWiki-commits] [Gerrit] Also load button icons with JavaScript disabled - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Also load button icons with JavaScript disabled
..

Also load button icons with JavaScript disabled

This also avoids flash of unstyled content.

Bug: T87757
Change-Id: If78ae8c22aae52e481d4d54e3fced26fba8a7b69
---
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M view/resources/jquery/wikibase/toolbar/resources.php
2 files changed, 9 insertions(+), 3 deletions(-)


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

diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 5877d63..91aa9d7 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -333,6 +333,7 @@
'jquery.ui.core.styles',
'jquery.wikibase.statementview.RankSelector.styles',
'jquery.wikibase.toolbar.styles',
+   'jquery.wikibase.toolbarbutton.styles',
) );
 
// make sure required client-side resources will be loaded
diff --git a/view/resources/jquery/wikibase/toolbar/resources.php 
b/view/resources/jquery/wikibase/toolbar/resources.php
index 469b108..951bce1 100644
--- a/view/resources/jquery/wikibase/toolbar/resources.php
+++ b/view/resources/jquery/wikibase/toolbar/resources.php
@@ -111,11 +111,16 @@
'scripts' => array(
'jquery.wikibase.toolbarbutton.js',
),
-   'styles' => array(
-   
'themes/default/jquery.wikibase.toolbarbutton.css',
-   ),
'dependencies' => array(
'jquery.wikibase.toolbaritem',
+   'jquery.wikibase.toolbarbutton.styles',
+   ),
+   ),
+
+   'jquery.wikibase.toolbarbutton.styles' => $moduleTemplate + 
array(
+   'position' => 'top',
+   'styles' => array(
+   
'themes/default/jquery.wikibase.toolbarbutton.css',
),
),
 

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

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

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

[MediaWiki-commits] [Gerrit] LinkInspectorTool: Move link specific code to LinkInspectorTool - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: LinkInspectorTool: Move link specific code to LinkInspectorTool
..

LinkInspectorTool: Move link specific code to LinkInspectorTool

Change-Id: I1b8e9bb8da3f036ee3a9debced60bc2bef28965f
---
M src/ui/tools/ve.ui.InspectorTool.js
1 file changed, 30 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/22/257322/1

diff --git a/src/ui/tools/ve.ui.InspectorTool.js 
b/src/ui/tools/ve.ui.InspectorTool.js
index 89a66b9..a402126 100644
--- a/src/ui/tools/ve.ui.InspectorTool.js
+++ b/src/ui/tools/ve.ui.InspectorTool.js
@@ -40,20 +40,7 @@
// Parent method
ve.ui.InspectorTool.super.prototype.onUpdateState.apply( this, 
arguments );
 
-   if ( !fragment ) {
-   models = [];
-   } else if (
-   this instanceof ve.ui.LinkInspectorTool &&
-   fragment.selection instanceof ve.dm.LinearSelection &&
-   ( ceSurface = this.toolbar.getSurface().getView() ) &&
-   ceSurface.model.selection.range === fragment.selection.range
-   ) {
-   // Ask the CE surface about selected models, so it can give the 
right
-   // answer about links based on the CE selection.
-   models = ceSurface.getSelectedModels();
-   } else {
-   models = fragment.getSelectedModels();
-   }
+   models = this.getSelectedModels( fragment ) ;
 
for ( i = 0, len = models.length; i < len; i++ ) {
if ( this.constructor.static.isCompatibleWith( models[ i ] ) ) {
@@ -61,6 +48,16 @@
break;
}
}
+};
+
+/**
+ * Get list of selected nodes and annotations.
+ *
+ * @param {ve.dm.SurfaceFragment|null} fragment Surface fragment
+ * @return {ve.dm.Model[]} Selected models
+ */
+ve.ui.InspectorTool.prototype.getSelectedModels = function ( fragment ) {
+   return fragment ? fragment.getSelectedModels() : [];
 };
 
 /**
@@ -83,6 +80,25 @@
OO.ui.deferMsg( 'visualeditor-annotationbutton-link-tooltip' );
 ve.ui.LinkInspectorTool.static.modelClasses = [ ve.dm.LinkAnnotation ];
 ve.ui.LinkInspectorTool.static.commandName = 'link';
+
+ve.ui.LinkInspectorTool.prototype.getSelectedModels = function ( fragment ) {
+   var surfaceView,
+   selection = fragment && fragment.getSelection();
+
+   // Ask the CE surface about selected models, so it can give the right
+   // answer about links based on the CE selection.
+   if ( selection instanceof ve.dm.LinearSelection ) {
+   surfaceView = this.toolbar.getSurface().getView();
+   if ( selection.equals( surfaceView.getModel().getSelection() ) 
) {
+   return surfaceView.getSelectedModels();
+   } else {
+   console.log('diff')
+   }
+   }
+
+   return ve.ui.LinkInspectorTool.super.prototype.getSelectedModels.apply( 
this, arguments );
+};
+
 ve.ui.toolFactory.register( ve.ui.LinkInspectorTool );
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b8e9bb8da3f036ee3a9debced60bc2bef28965f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Add tools to extract images from MathObject - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Add tools to extract images from MathObject
..

Add tools to extract images from MathObject

Change-Id: I1343ede69e9dc229812c08a78249c47d80d7280e
---
M MathObject.php
1 file changed, 45 insertions(+), 1 deletion(-)


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

diff --git a/MathObject.php b/MathObject.php
index cd5be76..8dea00f 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -53,7 +53,7 @@
}
 
public static function cloneFromRenderer( MathRenderer $renderer ) {
-   $instance = new MathObject( $renderer->getTex() );
+   $instance = new MathObject( $renderer->getUserInputTex() );
$instance->setMathml( $renderer->getMathml() );
$instance->setSvg( $renderer->getSvg() );
$instance->setMode( $renderer->getMode() );
@@ -491,4 +491,48 @@
}
return '';
}
+
+   public function getSvgWidth() {
+   if ( preg_match( "/width=\"(.*?)(ex|px|em)?\"/", 
$this->getSvg(), $matches ) ) {
+   return $matches;
+   }
+   return 0;
+   }
+
+   public function getSvgHeight() {
+   if ( preg_match( "/height=\"(.*?)(ex|px|em)?\"/", 
$this->getSvg(), $matches ) ) {
+   return $matches;
+   }
+   return 0;
+   }
+
+   public function getReSizedSvgLink( $factor = 2 ) {
+   $width = $this->getSvgWidth();
+   $width = $width[1]*$factor.$width[2];
+   $height = $this->getSvgHeight();
+   $height = $height[1]*$factor.$height[2];
+   $reflector = new ReflectionObject( $this );
+   $method = $reflector->getMethod( 'getFallbackImage' );
+   $method->setAccessible( true );
+   $fbi =  $method->invoke( $this );
+   $fbi = preg_replace( "/width: (.*?)(ex|px|em)/", "width: 
$width", $fbi );
+   $fbi = preg_replace( "/height: (.*?)(ex|px|em)/", "height: 
$height", $fbi );
+   return $fbi;
+   }
+
+   public function getPngWidth() {
+   try{
+   return getimagesizefromstring( $this->getPng() )[0];
+   } catch ( Exception $e ){
+   return 0;
+   }
+   }
+
+   public function getPngHeight() {
+   try{
+   return getimagesizefromstring( $this->getPng() )[0];
+   } catch ( Exception $e ){
+   return 0;
+   }
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1343ede69e9dc229812c08a78249c47d80d7280e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] Add rolling_rc to daily_site_stats.sh - change (analytics/limn-wikidata-data)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add rolling_rc to daily_site_stats.sh
..

Add rolling_rc to daily_site_stats.sh

Change-Id: Ic6a1d3d46f58f63bb49431655a35ee781e9353d5
---
M daily_site_stats.sh
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-wikidata-data 
refs/changes/32/257332/1

diff --git a/daily_site_stats.sh b/daily_site_stats.sh
index 584764d..f41e371 100755
--- a/daily_site_stats.sh
+++ b/daily_site_stats.sh
@@ -9,6 +9,7 @@
 ~/wikidata-data/graphite/site_stats/bureaucrats.sh
 ~/wikidata-data/graphite/site_stats/bots.sh
 ~/wikidata-data/graphite/site_stats/propertycreators.sh
+~/wikidata-data/graphite/site_stats/rolling_rc.php
 ~/wikidata-data/graphite/site_stats/pages_by_namespace.php
 ~/wikidata-data/graphite/site_stats/user_languages.php
 ~/wikidata-data/graphite/site_stats/page_size.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6a1d3d46f58f63bb49431655a35ee781e9353d5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Make all IdleConnection TCP KeepAlive parameters configurable - change (operations...pybal)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Make all IdleConnection TCP KeepAlive parameters configurable
..


Make all IdleConnection TCP KeepAlive parameters configurable

This commit creates several configuration options for TCP KeepAlive
in IdleConnection, instead of using the hardcoded values. The default
values have also been changed to be slightly less aggressive.

Change-Id: I1f5e0993f1901def199e0fb4d3790836dc7db2f2
---
M pybal/monitors/idleconnection.py
1 file changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pybal/monitors/idleconnection.py b/pybal/monitors/idleconnection.py
index 5ac7ea0..1c34634 100644
--- a/pybal/monitors/idleconnection.py
+++ b/pybal/monitors/idleconnection.py
@@ -25,7 +25,10 @@
 
 TIMEOUT_CLEAN_RECONNECT = 3
 MAX_DELAY = 300
-KEEPALIVE_RETRIES = 10
+KEEPALIVE = True
+KEEPALIVE_RETRIES = 3
+KEEPALIVE_IDLE = 10
+KEEPALIVE_INTERVAL = 30
 
 __name__ = 'IdleConnection'
 
@@ -37,8 +40,10 @@
 
 self.toCleanReconnect = self._getConfigInt('timeout-clean-reconnect', 
self.TIMEOUT_CLEAN_RECONNECT)
 self.maxDelay = self._getConfigInt('max-delay', self.MAX_DELAY)
-self.keepAliveRetries = self._getConfigInt('keepalive-retries',
-   self.KEEPALIVE_RETRIES)
+self.keepAlive = self._getConfigBool('keepalive', self.KEEPALIVE)
+self.keepAliveRetries = self._getConfigInt('keepalive-retries', 
self.KEEPALIVE_RETRIES)
+self.keepAliveIdle = self._getConfigInt('keepalive-idle', 
self.KEEPALIVE_IDLE)
+self.keepAliveInterval = self._getConfigInt('keepalive-interval', 
self.KEEPALIVE_INTERVAL)
 
 def run(self):
 """Start the monitoring"""
@@ -96,13 +101,12 @@
 if not self.active:
 return
 
-if self.transport is not None:
+if self.transport is not None and self.keepAlive:
 sock = self.transport.getHandle()
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, 1)
-sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT,
-self.keepAliveRetries)
-sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, 1)
+sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, 
self.keepAliveIdle)
+sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, 
self.keepAliveRetries)
+sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, 
self.keepAliveInterval)
 
 # Set status to up
 self._resultUp()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f5e0993f1901def199e0fb4d3790836dc7db2f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Depool es1019; es1017 at 100% load; Repool es1015 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Depool es1019; es1017 at 100% load; Repool es1015
..


Depool es1019; es1017 at 100% load; Repool es1015

Change-Id: Ifdc6a12de676a2b33b20f1bb4ebf693fc463ec90
References: T120122
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index fb372b2..6e5b93e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -482,13 +482,13 @@
'cluster24' => array(
'10.64.0.6'=> 1, # es1011, master
'10.64.16.186' => 3, # es1013
-#  '10.64.32.184' => 3, # es1015
+   '10.64.32.184' => 1, # es1015
),
# es3
'cluster25' => array(
'10.64.16.187' => 1, # es1014, master
-   '10.64.48.114' => 1, # es1017
-   '10.64.48.116' => 3, # es1019
+   '10.64.48.114' => 3, # es1017
+#  '10.64.48.116' => 3, # es1019
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdc6a12de676a2b33b20f1bb4ebf693fc463ec90
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use getTitle isntead of ->mTitle - change (mediawiki...Wikilog)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Use getTitle isntead of ->mTitle
..

Use getTitle isntead of ->mTitle

Change-Id: I714cc199fbdfc8a30677fc100d5b612d98d15e0d
---
M WikilogItemPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/WikilogItemPage.php b/WikilogItemPage.php
index 6e076fb..c7d4b6c 100644
--- a/WikilogItemPage.php
+++ b/WikilogItemPage.php
@@ -195,7 +195,7 @@
if ( !StubObject::isRealObject( $wgParser ) ) {
$wgParser->_unstub();
}
-   $wgParser->startExternalParse( $this->mTitle, $popts, 
Parser::OT_WIKI );
+   $wgParser->startExternalParse( $this->getTitle(), $popts, 
Parser::OT_WIKI );
 
$text = $wgParser->replaceVariables( $text );
$text = preg_replace( array_keys( $sigs ), array_values( $sigs 
), $text );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I714cc199fbdfc8a30677fc100d5b612d98d15e0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikilog
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Add "Identifiers" section heading for wikidata.org - change (mediawiki...WikimediaMessages)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add "Identifiers" section heading for wikidata.org
..


Add "Identifiers" section heading for wikidata.org

This message is currently unused, but will be used in a few days while
we are working on T117421. When deploying the new feature it would be
good if the message is already translated in the most relevant languages.

This message is here and not in the Wikibase.git because it depends on
configuration and is not part of the Wikibase default settings.

Bug: T120648
Change-Id: I36bd02e66d2629976567590656f4eff9815f5dc6
---
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 4104f37..32154a1 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -171,6 +171,7 @@
"wikimedia-copyrightwarning": "By saving changes, you agree to the 
[https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use], and you 
irrevocably agree to release your contribution under the 
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License
 CC BY-SA 3.0 License] and the 
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
 GFDL].\nYou agree that a hyperlink or URL is sufficient attribution under the 
Creative Commons license.",
"wikimedia-mobile-license-links": "https://creativecommons.org/licenses/by-sa/3.0/\; title=\"Definition of 
the Creative Commons Attribution-ShareAlike License\" target=\"_blank\">CC 
BY-SA 3.0 and https://www.gnu.org/licenses/fdl.html\; 
title=\"Definition of the GFDL\" target=\"_blank\">GFDL",
"wikibase-repo-name": "Wikidata",
+   "wikibase-statementsection-identifiers": "Identifiers",
"wikibase-sitelinks-wikibooks": "Wikibooks",
"wikibase-sitelinks-wikinews": "Wikinews",
"wikibase-sitelinks-wikiquote": "Wikiquote",
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index b7c0a17..d265db9 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -197,6 +197,7 @@
"wikimedia-copyrightwarning": "* Warning: the correct default licenses 
links are to the creativecommons.org 
([https://creativecommons.org/licenses/by-sa/3.0/] or e.g. 
[https://creativecommons.org/licenses/by-sa/3.0/deed.fr]) and fsf.org 
([https://www.gnu.org/copyleft/fdl.html]) pages, which should be used in the 
translations to languages other than English. Customisation may be possible on 
local wikis upon community consensus.\n* Replace Terms_of_Use in the URL with 
Special:MyLanguage/Terms_of_Use/, for example, 
Special:MyLanguage/Terms_of_Use/fr for French.\n* You can translate the terms 
of use at [[m:Terms of use]] and link that version instead, if no translation 
is available on wikimediafoundation.org.\n\nRefers to 
{{msg-mw|Savearticle}}.\n\n{{Identical/Wikimedia-licensing}}",
"wikimedia-mobile-license-links": "Links to the licenses used by most 
Wikimedia projects. Warning: the correct default licenses links are to the 
creativecommons.org ([https://creativecommons.org/licenses/by-sa/3.0/] or e.g. 
[https://creativecommons.org/licenses/by-sa/3.0/deed.fr]) and fsf.org 
([https://www.gnu.org/copyleft/fdl.html]) pages, which should be used in the 
translations to languages other than English. Customisation may be possible on 
local wikis upon community consensus. Refers to 
{{msg-mw|Wikimedia-copyrightwarning}}.",
"wikibase-repo-name": "Site name of Wikibase repository that the 
Wikibase Clients are connected to.  Used in \"WBREPONAME\" magic word in the 
client in messages that refer to it, so to be more clear to end users than 
saying \"Wikibase\" in the user interface.  For example, instead of \"Wikibase 
item changed\" as a summary in recent changes, it can say \"Wikidata item 
changed\" or \"Show Wikidata edits in your watchlist\"\n{{Identical|Wikidata}}",
+   "wikibase-statementsection-identifiers": "Section heading on Wikidata 
entity pages for identifier 
statements.\n{{Related|wikibase-statementsection-statements}}",
"wikibase-sitelinks-wikibooks": "Section heading on Wikidata item page 
for Wikibooks site 
links.\n{{Related|Wikibase-sitelinks}}\n{{Identical|Wikibooks}}",
"wikibase-sitelinks-wikinews": "Section heading on Wikidata item page 
for Wikinews site 
links.\n{{Related|Wikibase-sitelinks}}\n{{Identical|Wikinews}}",
"wikibase-sitelinks-wikiquote": "Section heading on Wikidata item page 
for Wikiquote site 
links.\n{{Related|Wikibase-sitelinks}}\n{{Identical|Wikiquote}}",

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

[MediaWiki-commits] [Gerrit] Browser tests: use mw-selenium 1.6.1 - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Browser tests: use mw-selenium 1.6.1
..

Browser tests: use mw-selenium 1.6.1

Change-Id: I579abe47a3abdff22119082bc34eac22e723bf66
---
M Gemfile
M Gemfile.lock
M tests/browser/features/support/env.rb
3 files changed, 11 insertions(+), 5 deletions(-)


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

diff --git a/Gemfile b/Gemfile
index d06693c..b598511 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org;
 
 gem "csscss", "~> 1.3.3"
-gem 'mediawiki_selenium', '~> 1.5.0'
+gem 'mediawiki_selenium', '~> 1.6.0'
 gem "rubocop", "~> 0.32.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5addadc..110aba8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,13 +42,14 @@
 mediawiki_api (0.5.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (1.5.0)
+mediawiki_selenium (1.6.1)
   cucumber (~> 1.3, >= 1.3.20)
   headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.4, >= 0.4.1)
+  mediawiki_api (~> 0.5, >= 0.5.0)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
+  rspec-core (~> 2.14, >= 2.14.4)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
   thor (~> 0.19, >= 0.19.1)
@@ -73,6 +74,7 @@
   http-cookie (>= 1.0.2, < 2.0)
   mime-types (>= 1.16, < 3.0)
   netrc (~> 0.7)
+rspec-core (2.99.2)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
 rubocop (0.32.1)
@@ -103,5 +105,8 @@
 
 DEPENDENCIES
   csscss (~> 1.3.3)
-  mediawiki_selenium (~> 1.5.0)
+  mediawiki_selenium (~> 1.6.0)
   rubocop (~> 0.32.1)
+
+BUNDLED WITH
+   1.10.5
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index c896240..18ce345 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1,6 +1,7 @@
 require 'mediawiki_selenium'
 
-require 'mediawiki_selenium/support'
+require 'mediawiki_selenium/cucumber'
+require 'mediawiki_selenium/pages'
 require 'mediawiki_selenium/step_definitions'
 
 require_relative 'extensions'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I579abe47a3abdff22119082bc34eac22e723bf66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

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

[MediaWiki-commits] [Gerrit] test commit - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: test commit
..

test commit

Change-Id: I8156c38bb05f39c8cf03e822c5b4d80c3bd1177e
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8156c38bb05f39c8cf03e822c5b4d80c3bd1177e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] Fixes missing vagrant - change (wikimedia...experimental)

[Bearloga (Code Review)]

Bearloga has submitted this change and it was merged.

Change subject: Fixes missing vagrant
..


Fixes missing vagrant

Change-Id: I2eb3e05d3feec820039fc733f76c33da1f5f56e5
---
M Vagrantfile
A initialize.sh
R update-submodules.sh
3 files changed, 17 insertions(+), 1 deletion(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 68b9b2a..89b09a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,7 +9,7 @@
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
-  config.vm.hostname = 'discovery-dashboards'
+  config.vm.hostname = 'search-dashboards'
 
   # Every Vagrant virtual environment requires a box to build off of.
   # The url from where the 'config.vm.box' box will be fetched if it
diff --git a/initialize.sh b/initialize.sh
new file mode 100644
index 000..cd3b7a8
--- /dev/null
+++ b/initialize.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+if [ "$(whoami)" != "root" ]; then
+  echo
+  echo "This script must be run as root:"
+  echo "  sudo bash $0 $*"
+  echo
+  exit 1
+  fi
+
+echo "Installing vagrant..."
+apt-get -y install virtualbox vagrant
+
+vagrant up
diff --git a/update.sh b/update-submodules.sh
similarity index 100%
rename from update.sh
rename to update-submodules.sh

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2eb3e05d3feec820039fc733f76c33da1f5f56e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/experimental
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Fixes missing vagrant - change (wikimedia...experimental)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Fixes missing vagrant
..

Fixes missing vagrant

Change-Id: I2eb3e05d3feec820039fc733f76c33da1f5f56e5
---
M Vagrantfile
A initialize.sh
R update-submodules.sh
3 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/experimental 
refs/changes/21/257321/1

diff --git a/Vagrantfile b/Vagrantfile
index 68b9b2a..89b09a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,7 +9,7 @@
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
-  config.vm.hostname = 'discovery-dashboards'
+  config.vm.hostname = 'search-dashboards'
 
   # Every Vagrant virtual environment requires a box to build off of.
   # The url from where the 'config.vm.box' box will be fetched if it
diff --git a/initialize.sh b/initialize.sh
new file mode 100644
index 000..cd3b7a8
--- /dev/null
+++ b/initialize.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+if [ "$(whoami)" != "root" ]; then
+  echo
+  echo "This script must be run as root:"
+  echo "  sudo bash $0 $*"
+  echo
+  exit 1
+  fi
+
+echo "Installing vagrant..."
+apt-get -y install virtualbox vagrant
+
+vagrant up
diff --git a/update.sh b/update-submodules.sh
similarity index 100%
rename from update.sh
rename to update-submodules.sh

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eb3e05d3feec820039fc733f76c33da1f5f56e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/experimental
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Labs: make labs-ip-alias-dump ignore addressless hosts - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: Labs: make labs-ip-alias-dump ignore addressless hosts
..


Labs: make labs-ip-alias-dump ignore addressless hosts

This can happen if the nova scheduler is broken, or in (rare)
race cases.  Since it's harmless to just skip over the hosts
in those instances, just ignore them.

Bug: T120586
Change-Id: I1cb2df0d13d10762aad9b7d3156f869f0bf6680c
---
M modules/dnsrecursor/files/labs-ip-alias-dump.py
1 file changed, 16 insertions(+), 11 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  coren: Verified; Looks good to me, approved



diff --git a/modules/dnsrecursor/files/labs-ip-alias-dump.py 
b/modules/dnsrecursor/files/labs-ip-alias-dump.py
index ac368ae..6de379e 100644
--- a/modules/dnsrecursor/files/labs-ip-alias-dump.py
+++ b/modules/dnsrecursor/files/labs-ip-alias-dump.py
@@ -37,17 +37,22 @@
 
 for server in client.servers.list():
 serverAddresses = {}
-private = [
-str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'fixed'
-]
-public = [
-str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'floating'
-]
-if public:
-# Match all possible public IPs to all possible private ones
-# Technically there can be more than one floating IP and more than 
one private IP
-# Although this is never practically the case...
-aliases[server.name] = list(itertools.product(public, private))
+try:
+private = [
+str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'fixed'
+]
+public = [
+str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'floating'
+]
+if public:
+# Match all possible public IPs to all possible private ones
+# Technically there can be more than one floating IP and more 
than one private IP
+# Although this is never practically the case...
+aliases[server.name] = list(itertools.product(public, private))
+except KeyError:
+# This can happen if a server doesn't (yet) have any addresses, 
while it's being
+# constructed.  In which case we simply harmlessly ignore it.
+pass
 
 output = 'aliasmapping = {}\n'
 # Sort to prevent flapping around due to random ordering

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cb2df0d13d10762aad9b7d3156f869f0bf6680c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 

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

[MediaWiki-commits] [Gerrit] Cherrypick three changes from 1.0.2e-1 fixing the build - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Cherrypick three changes from 1.0.2e-1 fixing the build
..


Cherrypick three changes from 1.0.2e-1 fixing the build

Remove all symlinks during clean
Run make depend after configure
Remove openssl_button.* from the doc package

Change-Id: Ic8751eb8ba9d7851c436b70bbcdf20d087f144ea
---
M debian/openssl.docs
M debian/rules
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/debian/openssl.docs b/debian/openssl.docs
index 3183ace..f9dc9f3 100644
--- a/debian/openssl.docs
+++ b/debian/openssl.docs
@@ -1,7 +1,5 @@
 doc/fingerprints.txt
 doc/HOWTO
-doc/openssl_button.gif
-doc/openssl_button.html
 doc/openssl.txt
 doc/README
 doc/standards.txt
diff --git a/debian/rules b/debian/rules
index 628bf5f..e39b1d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,7 @@
 #  perl util/ssldir.pl /usr/lib/ssl
 #  chmod +x debian/libtool
./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
+   make depend
make -f Makefile all
$(MAKE_TEST)
mv libcrypto.a libcrypto.static
@@ -100,6 +101,7 @@
rm -f test/asn1test test/wp_test test/srptest test/jpaketest
rm -f certs/demo/*.0
rm -rf crypto/aes/aes-armv4.S crypto/bn/armv4-gf2m.S 
crypto/modes/ghash-armv4.S crypto/sha/*.S
+   find . -type l -exec rm '{}' \;
dh_clean
 
 install: build

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

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

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

[MediaWiki-commits] [Gerrit] pybal: do not overwrite stats for each server - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: pybal: do not overwrite stats for each server
..


pybal: do not overwrite stats for each server

Change-Id: I78c3ee4ab0f1ffbd4ccfdc8707bde70f779ca14e
---
M modules/pybal/files/pybal_state.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/pybal/files/pybal_state.py 
b/modules/pybal/files/pybal_state.py
index b990989..9ed1f30 100644
--- a/modules/pybal/files/pybal_state.py
+++ b/modules/pybal/files/pybal_state.py
@@ -54,8 +54,8 @@
 if total == 0:
 return
 self.publish('pools.{}.total'.format(name), total)
+acc = {u'pooled': 0, u'enabled': 0, u'up': 0}
 for k, v in data.items():
-acc = {u'pooled': 0, u'enabled': 0, u'up': 0}
 del v['weight']
 for label, val in v.items():
 if val:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78c3ee4ab0f1ffbd4ccfdc8707bde70f779ca14e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] pybal: do not overwrite stats for each server - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: pybal: do not overwrite stats for each server
..

pybal: do not overwrite stats for each server

Change-Id: I78c3ee4ab0f1ffbd4ccfdc8707bde70f779ca14e
---
M modules/pybal/files/pybal_state.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/pybal/files/pybal_state.py 
b/modules/pybal/files/pybal_state.py
index b990989..9ed1f30 100644
--- a/modules/pybal/files/pybal_state.py
+++ b/modules/pybal/files/pybal_state.py
@@ -54,8 +54,8 @@
 if total == 0:
 return
 self.publish('pools.{}.total'.format(name), total)
+acc = {u'pooled': 0, u'enabled': 0, u'up': 0}
 for k, v in data.items():
-acc = {u'pooled': 0, u'enabled': 0, u'up': 0}
 del v['weight']
 for label, val in v.items():
 if val:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78c3ee4ab0f1ffbd4ccfdc8707bde70f779ca14e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Fix race condition in clearing the alerts - change (operations...pybal)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Fix race condition in clearing the alerts
..

Fix race condition in clearing the alerts

It could happen that a pool was below the depooling threshold by just
removing one server, and that would mean we would never clear the alert
when that server was repooled.

Change-Id: I9e660931515a39c2f435146a20ea411885483d56
---
M pybal/pybal.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/10/257310/1

diff --git a/pybal/pybal.py b/pybal/pybal.py
index e34bc66..25c8084 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -384,10 +384,13 @@
 # If it had been pooled in down state before, remove it from the list
 self.pooledDownServers.discard(server)
 
+# See if we can clear the alerts:
+if len(self.pooledDownServers) == 0 or self.canDepool():
+instrumentation.Alerts.delAlert(self.lvsservice.name)
+
 # See if we can depool any servers that could not be depooled before
 while len(self.pooledDownServers) > 0 and self.canDepool():
 self.depool(self.pooledDownServers.pop())
-instrumentation.Alerts.delAlert(self.lvsservice.name)
 
 def canDepool(self):
 """Returns a boolean denoting whether another server can be depooled"""

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e660931515a39c2f435146a20ea411885483d56
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] pybal: persist journal logs to disk - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: pybal: persist journal logs to disk
..


pybal: persist journal logs to disk

Currently the pybal service logs directly to the systemd journal
via stdio, and then isn't persisted to actual log files.  This
persists the log data to /var/log/pybal.log with daily logrotate
and 15 days of history.

Change-Id: Iec425f7866ee3e596e5eb5f4a388de46a798fe12
---
A modules/pybal/files/pybal.logrotate.conf
A modules/pybal/files/pybal.rsyslog.conf
M modules/pybal/manifests/init.pp
3 files changed, 28 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/pybal/files/pybal.logrotate.conf 
b/modules/pybal/files/pybal.logrotate.conf
new file mode 100644
index 000..dbe9edd
--- /dev/null
+++ b/modules/pybal/files/pybal.logrotate.conf
@@ -0,0 +1,12 @@
+/var/log/pybal.log
+{
+rotate 15
+daily
+missingok
+notifempty
+delaycompress
+compress
+postrotate
+reload rsyslog >/dev/null 2>&1 || true
+endscript
+}
diff --git a/modules/pybal/files/pybal.rsyslog.conf 
b/modules/pybal/files/pybal.rsyslog.conf
new file mode 100644
index 000..e116d2d
--- /dev/null
+++ b/modules/pybal/files/pybal.rsyslog.conf
@@ -0,0 +1,4 @@
+# NOTE: This file is managed by Puppet.
+
+# rsyslogd pybal config.
+if $programname == 'pybal' then /var/log/pybal.log
diff --git a/modules/pybal/manifests/init.pp b/modules/pybal/manifests/init.pp
index 15bf69a..e6c0154 100644
--- a/modules/pybal/manifests/init.pp
+++ b/modules/pybal/manifests/init.pp
@@ -17,6 +17,18 @@
 require => File['/etc/default/pybal'],
 }
 
+rsyslog::conf { 'pybal':
+source   => 'puppet:///modules/pybal/pybal.rsyslog.conf',
+priority => 75,
+before   => Service['pybal'],
+}
+
+file { '/etc/logrotate.d/pybal':
+ensure => present,
+source => 'puppet:///modules/pybal/pybal.logrotate.conf',
+mode   => '0444',
+}
+
 nrpe::monitor_service { 'pybal':
 description  => 'pybal',
 nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -u root -a 
/usr/sbin/pybal',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec425f7866ee3e596e5eb5f4a388de46a798fe12
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make MediaSizeWidget work without default/original dimensions - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Make MediaSizeWidget work without default/original dimensions
..

Make MediaSizeWidget work without default/original dimensions

Bug: T120653
Change-Id: I9c4e72c327c9eda5e1f50fcb4628fcf68f4bb490
---
M src/ui/widgets/ve.ui.MediaSizeWidget.js
1 file changed, 22 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/14/257314/1

diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js 
b/src/ui/widgets/ve.ui.MediaSizeWidget.js
index fcd5a0a..bd7b543 100644
--- a/src/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -12,8 +12,10 @@
  * @extends OO.ui.Widget
  *
  * @constructor
- * @param {ve.dm.Scalable} scalable A scalable object
+ * @param {ve.dm.Scalable} [scalable] A scalable object
  * @param {Object} [config] Configuration options
+ * @cfg {boolean} [noDefaultDimensions] The item being sized doesn't have 
default dimensions
+ * @cfg {boolean} [noOriginalDimensions] The item being sized doesn't have 
original dimensions
  */
 ve.ui.MediaSizeWidget = function VeUiMediaSizeWidget( scalable, config ) {
var fieldScale, fieldCustom, scalePercentLabel;
@@ -21,7 +23,7 @@
// Configuration
config = config || {};
 
-   this.scalable = scalable || {};
+   this.scalable = scalable;
 
// Parent constructor
OO.ui.Widget.call( this, config );
@@ -31,6 +33,8 @@
this.currentDimensions = {};
this.maxDimensions = {};
this.valid = null;
+   this.noDefaultDimensions = !!config.noDefaultDimensions;
+   this.noOriginalDimensions = !!config.noOriginalDimensions;
 
// Define button select widget
this.sizeTypeSelectWidget = new OO.ui.ButtonSelectWidget( {
@@ -81,10 +85,12 @@
fieldCustom = new OO.ui.FieldLayout(
this.dimensionsWidget, {
align: 'right',
-   label: ve.msg( 
'visualeditor-mediasizewidget-label-custom' ),
classes: [ 've-ui-mediaSizeWidget-section-custom' ]
}
);
+   if ( !this.noDefaultDimensions || !this.noOriginalDimensions ) {
+   fieldCustom.setLabel( ve.msg( 
'visualeditor-mediasizewidget-label-custom' ) );
+   }
 
// Buttons
this.fullSizeButton = new OO.ui.ButtonWidget( {
@@ -93,18 +99,21 @@
} );
 
// Build GUI
-   this.$element
-   .addClass( 've-ui-mediaSizeWidget' )
-   .append(
-   this.sizeTypeSelectWidget.$element,
+   this.$element.addClass( 've-ui-mediaSizeWidget' );
+   if ( !this.noDefaultDimensions ) {
+   this.$element.append( this.sizeTypeSelectWidget.$element );
+   }
+   this.$element.append( fieldCustom.$element );
+   if ( !config.noOriginalDimensions ) {
+   this.$element.append(
// TODO: when upright is supported by Parsoid
// fieldScale.$element,
-   fieldCustom.$element,
this.fullSizeButton.$element,
$( '' )
.addClass( 've-ui-mediaSizeWidget-label-error' )
.append( this.errorLabel.$element )
);
+   }
 
// Events
this.dimensionsWidget.connect( this, {
@@ -204,7 +213,7 @@
 ve.ui.MediaSizeWidget.prototype.onDimensionsChange = function ( type, value ) {
var dimensions = {};
 
-   if ( Number( value ) === 0 ) {
+   if ( Number( value ) === 0 && !this.noDefaultDimensions ) {
this.setSizeType( 'default' );
} else {
this.setSizeType( 'custom' );
@@ -472,6 +481,10 @@
}
this.preventChangeRecursion = true;
 
+   if ( !this.scalable.isFixedRatio() ) {
+   dimensions = ve.extendObject( {}, this.getCurrentDimensions(), 
dimensions );
+   }
+
// Normalize the new dimensions
normalizedDimensions = ve.dm.Scalable.static.getDimensionsFromValue( 
dimensions, this.scalable.getRatio() );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c4e72c327c9eda5e1f50fcb4628fcf68f4bb490
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] pybal: fix collection of individual stats via diamond - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: pybal: fix collection of individual stats via diamond
..


pybal: fix collection of individual stats via diamond

Change-Id: I2a9bf3bd1f357c9fe6261fee098538ec3d4614bd
---
M modules/pybal/files/pybal_state.py
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/pybal/files/pybal_state.py 
b/modules/pybal/files/pybal_state.py
index 5669dcd..b990989 100644
--- a/modules/pybal/files/pybal_state.py
+++ b/modules/pybal/files/pybal_state.py
@@ -60,10 +60,10 @@
 for label, val in v.items():
 if val:
 acc[label] += 1
-for metric, count in acc.items():
-path = 'pools.{}.{}'.format(name, metric)
-self.publish(path, count)
-self.publish(path + ".ratio", count / total)
+for metric, count in acc.items():
+path = 'pools.{}.{}'.format(name, metric)
+self.publish(path, count)
+self.publish(path + ".ratio", count / total)
 
 def collect(self):
 for pool in self.get_pools():

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a9bf3bd1f357c9fe6261fee098538ec3d4614bd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Labs: make labs-ip-alias-dump ignore addressless hosts - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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

Change subject: Labs: make labs-ip-alias-dump ignore addressless hosts
..

Labs: make labs-ip-alias-dump ignore addressless hosts

This can happen if the nova scheduler is broken, or in (rare)
race cases.  Since it's harmless to just skip over the hosts
in those instances, just ignore them.

Bug: T120586
Change-Id: I1cb2df0d13d10762aad9b7d3156f869f0bf6680c
---
M modules/dnsrecursor/files/labs-ip-alias-dump.py
1 file changed, 16 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/257323/1

diff --git a/modules/dnsrecursor/files/labs-ip-alias-dump.py 
b/modules/dnsrecursor/files/labs-ip-alias-dump.py
index ac368ae..6de379e 100644
--- a/modules/dnsrecursor/files/labs-ip-alias-dump.py
+++ b/modules/dnsrecursor/files/labs-ip-alias-dump.py
@@ -37,17 +37,22 @@
 
 for server in client.servers.list():
 serverAddresses = {}
-private = [
-str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'fixed'
-]
-public = [
-str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'floating'
-]
-if public:
-# Match all possible public IPs to all possible private ones
-# Technically there can be more than one floating IP and more than 
one private IP
-# Although this is never practically the case...
-aliases[server.name] = list(itertools.product(public, private))
+try:
+private = [
+str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'fixed'
+]
+public = [
+str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'floating'
+]
+if public:
+# Match all possible public IPs to all possible private ones
+# Technically there can be more than one floating IP and more 
than one private IP
+# Although this is never practically the case...
+aliases[server.name] = list(itertools.product(public, private))
+except KeyError:
+# This can happen if a server doesn't (yet) have any addresses, 
while it's being
+# constructed.  In which case we simply harmlessly ignore it.
+pass
 
 output = 'aliasmapping = {}\n'
 # Sort to prevent flapping around due to random ordering

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

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

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

[MediaWiki-commits] [Gerrit] Synchronized non-WP portals with Meta - change (wikimedia/portals)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Synchronized non-WP portals with Meta
..


Synchronized non-WP portals with Meta

Change-Id: I452a4ceb9e1ab0b6dc23f3b6c1b369edcd5f3a95
---
M prod/wikibooks.org/index.html
M prod/wikiquote.org/index.html
M prod/wikiversity.org/index.html
M prod/wiktionary.org/index.html
4 files changed, 20 insertions(+), 19 deletions(-)

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



diff --git a/prod/wikibooks.org/index.html b/prod/wikibooks.org/index.html
index 61725cd..a3001a9 100644
--- a/prod/wikibooks.org/index.html
+++ b/prod/wikibooks.org/index.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 Wikibooks
 
@@ -118,6 +118,7 @@
 
 
 العربية
+Azərbaycanca
 Català
 Čeština
 Deutsch
@@ -136,7 +137,6 @@
 Norsk (Bokmål)
 Polski
 Português
-Română
 Русский
 Shqip
 Српски / Srpski
@@ -197,6 +197,7 @@
 
 
 العربية
+Azərbaycanca
 Català
 Čeština
 Español
@@ -210,7 +211,6 @@
 Norsk
 Polski
 Português
-Română
 Русский
 Shqip
 Српски 
/ Srpski
@@ -232,7 +232,6 @@
 
 
 Ænglisc
-Azərbaycanca
 Български
 বাংলা
 Чӑвашла
@@ -257,6 +256,7 @@
 Bahasa Melayu
 Occitan
 Қазақша / Qazaqşa / قازاقشا
+Română
 संस्कृतम्
 සිංහල
 Simple English
diff --git a/prod/wikiquote.org/index.html b/prod/wikiquote.org/index.html
index b6b7877..04c7105 100644
--- a/prod/wikiquote.org/index.html
+++ b/prod/wikiquote.org/index.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 Wikiquote
 
@@ -42,7 +42,7 @@
 
 Italiano
 Aforismi e citazioni
-21 000+ voci
+22 000+ voci
 
 
 
diff --git a/prod/wikiversity.org/index.html b/prod/wikiversity.org/index.html
index 057e214..d798f80 100644
--- a/prod/wikiversity.org/index.html
+++ b/prod/wikiversity.org/index.html
@@ -1,7 +1,7 @@
 
 
  
-
+
  
 Wikiversity
 
@@ -35,7 +35,7 @@
 
 English
 Open Learning Community
-23 000+ learning resources
+21 000+ learning resources
 
 
 
diff --git a/prod/wiktionary.org/index.html b/prod/wiktionary.org/index.html
index 9bb8cf3..a8db855 100644
--- a/prod/wiktionary.org/index.html
+++ b/prod/wiktionary.org/index.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 Wiktionary
 
@@ -30,42 +30,42 @@
 
 English
 The free dictionary
-4 253 000+ entries
+4 271 000+ entries
 
 
 
 
 Français
 Le dictionnaire libre
-2 861 000+ articles
+2 868 000+ articles
 
 
 
 
 Русский
 Свободный словарь
-679 000+ статей
+684 000+ статей
 
 
 
 
 Deutsch
 Das freie Wörterbuch
-437 000+ Einträge
+442 000+ Einträge
 
 
 
 
 Polski
 Wolny słownik
-486 000+ stron
+491 000+ stron
 
 
 
 
 Nederlands
 Het vrije woordenboek
-458 000+ artikelen
+462 000+ artikelen
 
 
 
@@ -93,7 +93,7 @@
 
 Svenska
 Den fria ordboken
-486 000+ stavningar
+489 000+ stavningar
 
 
 
@@ -124,6 +124,7 @@
 Español
 Français
 한국어
+Հայերեն
 Ido
 Bahasa Indonesia
 Italiano
@@ -207,6 +208,7 @@
 Ελληνικά
 Español
 한국어
+Հայերեն
 Ido
 Bahasa Indonesia
 Italiano
@@ -261,7 +263,6 @@
 فارسی
 Frysk
 Galego
-Հայերեն
 हिन्दी
 Hrvatski
 Íslenska
@@ -278,6 +279,7 @@
 Kiswahili
 Tagalog
 ภาษาไทย
+Тоҷикӣ
 Українська
 Volapük
 Walon
@@ -303,7 +305,6 @@
 Gaeilge
 Gàidhlig
 Hornjoserbsce
-Interlingua
 Interlingue
 ქართული
 Kaszëbsczi
@@ -331,7 +332,6 @@
 Slovenščina
 Soomaaliga
 Татарча / Tatarça
-Тоҷикӣ
 Türkmençe
 اردو
 ئۇيغۇرچه
@@ -355,6 +355,7 @@
 Gaelg
 ગુજરાતી
 Hausa 
/ هَوُسَا
+Interlingua
 ᐃᓄᒃᑎᑐᑦ / Inuktitut
 Kalaallisut
 Kernewek

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I452a4ceb9e1ab0b6dc23f3b6c1b369edcd5f3a95
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: Mxn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Depool es1019; es1017 at 100% load; Repool es1015 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Depool es1019; es1017 at 100% load; Repool es1015
..

Depool es1019; es1017 at 100% load; Repool es1015

Change-Id: Ifdc6a12de676a2b33b20f1bb4ebf693fc463ec90
References: T120122
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index fb372b2..6e5b93e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -482,13 +482,13 @@
'cluster24' => array(
'10.64.0.6'=> 1, # es1011, master
'10.64.16.186' => 3, # es1013
-#  '10.64.32.184' => 3, # es1015
+   '10.64.32.184' => 1, # es1015
),
# es3
'cluster25' => array(
'10.64.16.187' => 1, # es1014, master
-   '10.64.48.114' => 1, # es1017
-   '10.64.48.116' => 3, # es1019
+   '10.64.48.114' => 3, # es1017
+#  '10.64.48.116' => 3, # es1019
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Add tools to extract images from MathObject - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add tools to extract images from MathObject
..


Add tools to extract images from MathObject

Change-Id: I1343ede69e9dc229812c08a78249c47d80d7280e
---
M MathObject.php
1 file changed, 29 insertions(+), 1 deletion(-)

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



diff --git a/MathObject.php b/MathObject.php
index cd5be76..0eb5839 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -53,7 +53,7 @@
}
 
public static function cloneFromRenderer( MathRenderer $renderer ) {
-   $instance = new MathObject( $renderer->getTex() );
+   $instance = new MathObject( $renderer->getUserInputTex() );
$instance->setMathml( $renderer->getMathml() );
$instance->setSvg( $renderer->getSvg() );
$instance->setMode( $renderer->getMode() );
@@ -491,4 +491,32 @@
}
return '';
}
+
+   public function getSvgWidth() {
+   if ( preg_match( "/width=\"(.*?)(ex|px|em)?\"/", 
$this->getSvg(), $matches ) ) {
+   return $matches;
+   }
+   return 0;
+   }
+
+   public function getSvgHeight() {
+   if ( preg_match( "/height=\"(.*?)(ex|px|em)?\"/", 
$this->getSvg(), $matches ) ) {
+   return $matches;
+   }
+   return 0;
+   }
+
+   public function getReSizedSvgLink( $factor = 2 ) {
+   $width = $this->getSvgWidth();
+   $width = $width[1]*$factor.$width[2];
+   $height = $this->getSvgHeight();
+   $height = $height[1]*$factor.$height[2];
+   $reflector = new ReflectionObject( $this );
+   $method = $reflector->getMethod( 'getFallbackImage' );
+   $method->setAccessible( true );
+   $fbi =  $method->invoke( $this );
+   $fbi = preg_replace( "/width: (.*?)(ex|px|em)/", "width: 
$width", $fbi );
+   $fbi = preg_replace( "/height: (.*?)(ex|px|em)/", "height: 
$height", $fbi );
+   return $fbi;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1343ede69e9dc229812c08a78249c47d80d7280e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Dyiop 
Gerrit-Reviewer: Hcohl 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Whyameri 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove unused uses - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unused uses
..


Remove unused uses

Change-Id: I81c7898141ec290e1c39ed0b8a4a4e869d5cecb9
---
M client/includes/recentchanges/ExternalChangeFactory.php
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
M view/src/ItemView.php
M view/src/PropertyView.php
4 files changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/client/includes/recentchanges/ExternalChangeFactory.php 
b/client/includes/recentchanges/ExternalChangeFactory.php
index 8432179..70e93ba 100644
--- a/client/includes/recentchanges/ExternalChangeFactory.php
+++ b/client/includes/recentchanges/ExternalChangeFactory.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Client\RecentChanges;
 
-use Content;
 use InvalidArgumentException;
 use Language;
 use RecentChange;
diff --git 
a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php 
b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
index bee3e48..6a49c15 100644
--- a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
+++ b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
@@ -9,7 +9,6 @@
 use DataValues\QuantityValue;
 use DataValues\StringValue;
 use DataValues\TimeValue;
-use DataValues\UnDeserializableValue;
 use Language;
 use MediaWikiTestCase;
 use Title;
diff --git a/view/src/ItemView.php b/view/src/ItemView.php
index 2c9c3e8..28d38a3 100644
--- a/view/src/ItemView.php
+++ b/view/src/ItemView.php
@@ -5,7 +5,6 @@
 use InvalidArgumentException;
 use Language;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Services\Statement\Grouper\NullStatementGrouper;
 use Wikibase\DataModel\Services\Statement\Grouper\StatementGrouper;
 use Wikibase\EntityRevision;
 use Wikibase\View\Template\TemplateFactory;
diff --git a/view/src/PropertyView.php b/view/src/PropertyView.php
index 34b8878..59456f5 100644
--- a/view/src/PropertyView.php
+++ b/view/src/PropertyView.php
@@ -7,7 +7,6 @@
 use InvalidArgumentException;
 use Language;
 use Wikibase\DataModel\Entity\Property;
-use Wikibase\DataModel\Services\Statement\Grouper\NullStatementGrouper;
 use Wikibase\DataModel\Services\Statement\Grouper\StatementGrouper;
 use Wikibase\EntityRevision;
 use Wikibase\View\Template\TemplateFactory;

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

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

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

[MediaWiki-commits] [Gerrit] Deactivate tests that depend on Restbase - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Deactivate tests that depend on Restbase
..


Deactivate tests that depend on Restbase

Change-Id: I8156c38bb05f39c8cf03e822c5b4d80c3bd1177e
---
M tests/MathObjectTest.php
M tests/MwsDumpWriterTest.php
2 files changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/tests/MathObjectTest.php b/tests/MathObjectTest.php
index 1d2cb9d..8eb7360 100644
--- a/tests/MathObjectTest.php
+++ b/tests/MathObjectTest.php
@@ -23,7 +23,23 @@
 some more text
  x^3 
 EOT;
+   protected static $hasRestbase;
 
+   public static function setUpBeforeClass() {
+   $rbi = new MathRestbaseInterface();
+   self::$hasRestbase = $rbi->checkBackend( true );
+   }
+
+   /**
+* Sets up the fixture, for example, opens a network connection.
+* This method is called before a test is executed.
+*/
+   protected function setUp() {
+   parent::setUp();
+   if ( !self::$hasRestbase ) {
+   $this->markTestSkipped( "Can not connect to Restbase 
Math interface." );
+   }
+   }
public function test() {
$comment = MathObject::extractMathTagsFromWikiText( 
$this->HTMLComment );
$this->assertEquals( 0, count( $comment ), 'Math tags in 
comments should be ignored.' );
diff --git a/tests/MwsDumpWriterTest.php b/tests/MwsDumpWriterTest.php
index 099122c..3b14888 100644
--- a/tests/MwsDumpWriterTest.php
+++ b/tests/MwsDumpWriterTest.php
@@ -159,6 +159,23 @@
 
 XML;
 // @codingStandardsIgnoreEnd
+   protected static $hasRestbase;
+
+   public static function setUpBeforeClass() {
+   $rbi = new MathRestbaseInterface();
+   self::$hasRestbase = $rbi->checkBackend( true );
+   }
+
+   /**
+* Sets up the fixture, for example, opens a network connection.
+* This method is called before a test is executed.
+*/
+   protected function setUp() {
+   parent::setUp();
+   if ( !self::$hasRestbase ) {
+   $this->markTestSkipped( "Can not connect to Restbase 
Math interface." );
+   }
+   }
 
public function testExtract() {
$revId = 28378;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8156c38bb05f39c8cf03e822c5b4d80c3bd1177e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve wording of UI based on user feedback - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Improve wording of UI based on user feedback
..

Improve wording of UI based on user feedback

* In a pre-study users identified some problems with the wording
  of the mlp-eval-tool
* This change improves the wording in order to increase
  readability.

Change-Id: Id39f7985a334207d0a4d6dcc2cde0d4a5648b8d9
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 64 insertions(+), 14 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index d11672b..b0a84d1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,12 +17,12 @@
"getequationsbyquery": "Get equations by query",
"xquerygenerator": "XQuery generator",
"mathdebug": "Test Renderer",
-   "math-lp-1-intro": "Dear participant,\n\nthank you for participating in 
the evaluation for improving the math support in Wikipedia and ohter wikis that 
use mathematics. The study evaluates the quality of mathematical formulae in 
MediaWiki, the software that runs Wikipedia, with regard to three aspects:\n\n# 
LaTeX input: Is the formula source code typed correctly? (Using 
\\sin instead of 
sin)\n# Rendering: Is 
the formula displayed correctly? (Even correct LaTeX input might lead to 
unreadable formulae on certain devices.)\n# Semantics: Is the MediaWiki Math 
extension capable of capturing the formulae semantics correctly? 
(f(a+b) might stand for the \"function f applied the 
sum of a and b\" or \"variable f times 
the sum of a plus b\")\n\nIn the following, you will 
be guided through a five step evaluation process.",
+   "math-lp-1-intro": "Dear participant,\n\nthank you for participating in 
the evaluation for improving the math support in Wikipedia and other wikis that 
use mathematics. The study evaluates the quality of mathematical formulae in 
MediaWiki, the software that runs Wikipedia, with regard to three aspects:\n\n# 
LaTeX input: Is the formula source code typed correctly? (Using 
\\sin instead of 
sin)\n# Rendering: Is 
the formula displayed correctly? (Even correct LaTeX input might lead to 
unreadable formulae on certain devices.)\n# Semantics: Is the MediaWiki Math 
extension capable of capturing the formulae semantics correctly? 
(f(a+b) might stand for the \"function f applied the 
sum of a and b\" or \"variable f times 
the sum of a plus b\")\n\nIn the following, you will 
be guided through a five step evaluation process.",
"math-lp-1-head": "Step 1: Select an article you are familiar with",
"math-lp-1-page-label": "Article title",
"math-lp-1-page-help": "This input field below is prefilled with a 
randomly chosen article that contains mathematics. You have three options\n# 
Click \"continue\" to proceed with this article.\n# Type the title of an 
article you want to evaluate and click \"continue\" thereafter.\n# Click 
\"select another random article\" to reload this page and get a new randomly 
selected article.",
"math-lp-2-head": "Step 2: Classify the mathematical expression",
-   "math-lp-2-intro": "In the following, you will see a mathematical 
object that has been entered using the MediaWiki math markup and is treated as 
mathematical expression by the MediaWiki software.",
+   "math-lp-2-intro": "In the following, you will see a mathematical 
expression that has been entered using the MediaWiki math markup and is treated 
as mathematical expression by the MediaWiki software.\n\nIn this step you 
classify the type and domain of the expression since mathematical notation is 
not used in pure math alone.\n\nIf the expression you see is not a complex 
mathematical expression, we recommend to submit the form with 
''{{int:math-lp-new-formula}}''.",
"math-lp-2-content-label": "Select most appropriate type of the 
expression",
"math-lp-2-content-option-1": "complex mathematical expression 
(a²+b²=c²)",
"math-lp-2-content-option-2": "single number (3.14)",
@@ -45,28 +45,52 @@
"math-lp-3-pretty-label": "Which input source is more readable?",
"math-lp-3-pretty-help": "Evaluate the readability of the LaTeX code 
itself, and not of its rendering. The question is disabled if original and 
checked text are the same.",
"math-lp-3-pretty-option-1": "Original user input LaTeX code",
-   "math-lp-3-pretty-option-2": "Texvc checked LaTeX code",
+   "math-lp-3-pretty-option-2": "Security checked LaTeX code",
+   "math-lp-3-pretty-option-3": "I can not say.",
"math-lp-3-assessment-label": "Assessment of the original user input 
LaTeX code",
"math-lp-3-assessment-option-1": "the input is all right",
-   "math-lp-3-assessment-option-2": "the input is ok but has minor 
problems",
+   "math-lp-3-assessment-option-2": "the input has 

[MediaWiki-commits] [Gerrit] Removed last of pre-RL compatibility - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Removed last of pre-RL compatibility
..

Removed last of pre-RL compatibility

Change-Id: Id492ac53ef12cc76911929458a4fc91705a9ef40
---
M SemanticForms.php
M includes/SF_ParserFunctions.php
2 files changed, 119 insertions(+), 157 deletions(-)


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

diff --git a/SemanticForms.php b/SemanticForms.php
index ad5c87a..46dbf45 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -232,134 +232,132 @@
 // Allow for popup windows for file upload
 $GLOBALS['wgEditPageFrameOptions'] = 'SAMEORIGIN';
 
-// register client-side modules
-if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
-   $sfgResourceTemplate = array(
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'SemanticForms'
-   );
-   $GLOBALS['wgResourceModules'] += array(
-   'ext.semanticforms.main' => $sfgResourceTemplate + array(
-   'scripts' => array(
-   'libs/SemanticForms.js',
-   'libs/SF_preview.js'
-   ),
-   'styles' => array(
-   'skins/SemanticForms.css',
-   'skins/SF_jquery_ui_overrides.css',
-   ),
-   'dependencies' => array(
-   'jquery.ui.core',
-   'jquery.ui.autocomplete',
-   'jquery.ui.button',
-   'jquery.ui.sortable',
-   'jquery.ui.widget',
-   'ext.semanticforms.fancybox',
-   'ext.semanticforms.autogrow',
-   'mediawiki.util',
-   'ext.semanticforms.select2',
-   ),
-   'messages' => array(
-   'sf_formerrors_header',
-   'sf_too_few_instances_error',
-   'sf_too_many_instances_error',
-   'sf_blank_error',
-   'sf_not_unique_error',
-   'sf_bad_url_error',
-   'sf_bad_email_error',
-   'sf_bad_number_error',
-   'sf_bad_date_error',
-   'sf_pipe_error',
-   ),
+// Register client-side modules.
+$sfgResourceTemplate = array(
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SemanticForms'
+);
+$GLOBALS['wgResourceModules'] += array(
+   'ext.semanticforms.main' => $sfgResourceTemplate + array(
+   'scripts' => array(
+   'libs/SemanticForms.js',
+   'libs/SF_preview.js'
),
-   'ext.semanticforms.browser' => $sfgResourceTemplate + array(
-   'scripts' => 'libs/jquery.browser.js',
+   'styles' => array(
+   'skins/SemanticForms.css',
+   'skins/SF_jquery_ui_overrides.css',
),
-   'ext.semanticforms.fancybox' => $sfgResourceTemplate + array(
-   'scripts' => 'libs/jquery.fancybox.js',
-   'styles' => 'skins/jquery.fancybox.css',
-   'dependencies' => array( 'ext.semanticforms.browser' ),
+   'dependencies' => array(
+   'jquery.ui.core',
+   'jquery.ui.autocomplete',
+   'jquery.ui.button',
+   'jquery.ui.sortable',
+   'jquery.ui.widget',
+   'ext.semanticforms.fancybox',
+   'ext.semanticforms.autogrow',
+   'mediawiki.util',
+   'ext.semanticforms.select2',
),
-   'ext.semanticforms.dynatree' => $sfgResourceTemplate + array(
-   'dependencies' => array( 'jquery.ui.widget' ),
-   'scripts' => array(
-   'libs/jquery.dynatree.js',
-   'libs/SF_dynatree.js',
-   ),
-   'styles' => 'skins/ui.dynatree.css',
+   'messages' => array(
+   'sf_formerrors_header',
+   'sf_too_few_instances_error',
+   'sf_too_many_instances_error',
+   'sf_blank_error',
+   'sf_not_unique_error',
+   'sf_bad_url_error',
+   'sf_bad_email_error',
+   

[MediaWiki-commits] [Gerrit] Imported Upstream version 1.0.2e - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Imported Upstream version 1.0.2e
..


Imported Upstream version 1.0.2e

Change-Id: I4001f8d2a78db1e4f0741aae0e1ad1f192c9c564
---
M CHANGES
A CONTRIBUTING
M Configure
M FAQ
M Makefile
M Makefile.bak
M Makefile.org
M NEWS
M README
M apps/Makefile
M apps/app_rand.c
M apps/apps.c
M apps/asn1pars.c
M apps/ca.c
M apps/ecparam.c
M apps/engine.c
M apps/md4.c
M apps/ocsp.c
M apps/pkcs12.c
M apps/s_cb.c
M apps/s_client.c
M apps/s_server.c
A appveyor.yml
M crypto/aes/asm/aes-586.pl
M crypto/aes/asm/aesni-mb-x86_64.pl
M crypto/aes/asm/aesni-sha1-x86_64.pl
M crypto/aes/asm/aesni-sha256-x86_64.pl
M crypto/aes/asm/aesni-x86.pl
M crypto/aes/asm/vpaes-ppc.pl
M crypto/asn1/asn1_par.c
M crypto/asn1/d2i_pr.c
M crypto/asn1/tasn_dec.c
M crypto/asn1/x_bignum.c
M crypto/asn1/x_pubkey.c
M crypto/asn1/x_x509.c
M crypto/asn1/x_x509a.c
M crypto/bio/b_dump.c
M crypto/bio/bss_file.c
M crypto/bn/asm/armv4-gf2m.pl
M crypto/bn/asm/ia64.S
M crypto/bn/asm/ppc64-mont.pl
M crypto/bn/asm/rsaz-x86_64.pl
M crypto/bn/asm/s390x-gf2m.pl
M crypto/bn/asm/s390x.S
M crypto/bn/asm/x86-gf2m.pl
M crypto/bn/asm/x86_64-gcc.c
M crypto/bn/asm/x86_64-gf2m.pl
M crypto/bn/asm/x86_64-mont.pl
M crypto/bn/asm/x86_64-mont5.pl
M crypto/bn/bn_exp.c
M crypto/bn/bn_gcd.c
M crypto/bn/bn_gf2m.c
M crypto/bn/bn_mont.c
M crypto/bn/bn_recp.c
M crypto/bn/bn_x931p.c
M crypto/bn/bntest.c
M crypto/bn/rsaz_exp.h
M crypto/buffer/buf_str.c
M crypto/buffer/buffer.h
M crypto/cms/cms_enc.c
M crypto/cms/cms_pwri.c
M crypto/cms/cms_sd.c
M crypto/cms/cms_smime.c
M crypto/comp/c_zlib.c
M crypto/conf/conf_def.c
M crypto/conf/conf_sap.c
M crypto/cryptlib.c
D crypto/des/t/test
M crypto/dh/dh.h
M crypto/dh/dhtest.c
M crypto/dsa/dsa_ameth.c
M crypto/dsa/dsa_gen.c
M crypto/ec/Makefile
M crypto/ec/asm/ecp_nistz256-x86_64.pl
M crypto/ec/ec.h
M crypto/ec/ec_asn1.c
M crypto/ec/ec_key.c
M crypto/ecdsa/ecdsa.h
M crypto/ecdsa/ecs_lib.c
M crypto/engine/eng_cryptodev.c
M crypto/engine/eng_list.c
M crypto/evp/e_aes_cbc_hmac_sha256.c
M crypto/evp/e_des3.c
M crypto/evp/encode.c
M crypto/evp/evp_key.c
M crypto/evp/evp_lib.c
M crypto/evp/evp_pbe.c
M crypto/evp/p_lib.c
M crypto/evp/pmeth_gn.c
M crypto/hmac/hm_ameth.c
M crypto/jpake/jpake.c
M crypto/mem_clr.c
M crypto/modes/asm/aesni-gcm-x86_64.pl
M crypto/modes/asm/ghash-armv4.pl
M crypto/modes/asm/ghash-sparcv9.pl
M crypto/modes/asm/ghash-x86.pl
M crypto/modes/asm/ghash-x86_64.pl
M crypto/modes/asm/ghashp8-ppc.pl
M crypto/modes/asm/ghashv8-armx.pl
M crypto/modes/wrap128.c
M crypto/ocsp/ocsp_lib.c
M crypto/ocsp/ocsp_prn.c
M crypto/opensslconf.h
M crypto/opensslconf.h.in
M crypto/opensslv.h
M crypto/pem/pem_info.c
M crypto/pem/pvkfmt.c
M crypto/perlasm/ppc-xlate.pl
M crypto/pkcs12/p12_add.c
M crypto/pkcs12/p12_crpt.c
M crypto/pkcs12/p12_mutl.c
M crypto/pkcs7/pk7_doit.c
M crypto/pkcs7/pk7_smime.c
M crypto/ppccap.c
M crypto/rc4/asm/rc4-x86_64.pl
M crypto/rsa/rsa_ameth.c
M crypto/rsa/rsa_gen.c
M crypto/rsa/rsa_sign.c
M crypto/rsa/rsa_test.c
M crypto/sha/asm/sha1-586.pl
M crypto/sha/asm/sha1-mb-x86_64.pl
M crypto/sha/asm/sha1-x86_64.pl
M crypto/sha/asm/sha256-586.pl
M crypto/sha/asm/sha256-mb-x86_64.pl
M crypto/sha/asm/sha512-586.pl
M crypto/sha/asm/sha512-parisc.pl
M crypto/sha/asm/sha512-x86_64.pl
M crypto/sparccpuid.S
M crypto/sparcv9cap.c
M crypto/srp/srp_vfy.c
M crypto/ts/ts_rsp_verify.c
M crypto/whrlpool/asm/wp-mmx.pl
M crypto/x509/x509_lu.c
M crypto/x509/x509_vfy.c
M crypto/x509/x509_vpm.c
M crypto/x509v3/v3_cpols.c
M crypto/x509v3/v3_ncons.c
M crypto/x509v3/v3_pci.c
M crypto/x509v3/v3_pcia.c
M crypto/x509v3/v3_purp.c
M crypto/x509v3/v3_scts.c
M crypto/x509v3/v3_utl.c
M demos/easy_tls/README
M demos/engines/zencod/hw_zencod.c
M doc/HOWTO/keys.txt
M doc/README
M doc/apps/dgst.pod
M doc/apps/genrsa.pod
M doc/apps/pkcs12.pod
M doc/apps/req.pod
M doc/apps/x509.pod
M doc/crypto/BIO_read.pod
M doc/crypto/BN_rand.pod
M doc/crypto/DSA_generate_parameters.pod
M doc/crypto/EC_GROUP_copy.pod
M doc/crypto/EC_KEY_new.pod
M doc/crypto/EVP_DigestVerifyInit.pod
M doc/crypto/EVP_EncryptInit.pod
M doc/crypto/EVP_SealInit.pod
M doc/crypto/EVP_SignInit.pod
M doc/crypto/X509_check_host.pod
M doc/crypto/buffer.pod
M doc/crypto/d2i_X509_NAME.pod
M doc/crypto/engine.pod
A doc/dir-locals.example.el
A doc/openssl-c-indent.el
D doc/openssl_button.gif
D doc/openssl_button.html
M doc/ssl/SSL_CTX_add_extra_chain_cert.pod
M doc/ssl/SSL_CTX_get0_param.pod
A doc/ssl/SSL_check_chain.pod
M e_os.h
M engines/e_chil.c
D include/openssl/aes.h
D include/openssl/asn1.h
D include/openssl/asn1_mac.h
D include/openssl/asn1t.h
D include/openssl/bio.h
D include/openssl/blowfish.h
D include/openssl/bn.h
D include/openssl/buffer.h
D include/openssl/camellia.h
D include/openssl/cast.h
D include/openssl/cmac.h
D include/openssl/cms.h
D include/openssl/comp.h
D include/openssl/conf.h
D include/openssl/conf_api.h
D include/openssl/crypto.h
D include/openssl/des.h
D 

[MediaWiki-commits] [Gerrit] Update Mathoid driver - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: Update Mathoid driver
..


Update Mathoid driver

* Allow version 1.0.0*
* Add method to get speech text

Change-Id: I3dcfcc7ce1a1c50f83044518de6db6efae97ab2f
---
M includes/MathoidDriver.php
M tests/MathoidDriverTest.php
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/MathoidDriver.php b/includes/MathoidDriver.php
index 2d546a7..a7e9f5e 100644
--- a/includes/MathoidDriver.php
+++ b/includes/MathoidDriver.php
@@ -137,7 +137,7 @@
if ( $res && json_last_error() === JSON_ERROR_NONE ) {
if ( isset( $res->name ) && $res->name === 
'mathoid' ) {
$this->version = $res->version;
-   if ( $this->version === "0.2.9" || 
$this->version === "0.2.10" ) {
+   if ( preg_match( 
"/(0\\.2\\.(9|10)|1.0.0.*)/", $this->version ) ) {
return true;
} else {
return false;
@@ -149,6 +149,9 @@
$logger->warning( "Mathoid server backend does not point to 
mathoid.", array(
'detail' => $res ) );
return false;
+   }
 
+   public function getSpeech() {
+   return $this->doPost( $this->getBackendUrl().'/speech', 
$this->getPostData() );
}
 }
diff --git a/tests/MathoidDriverTest.php b/tests/MathoidDriverTest.php
index 22f6a44..5d4852b 100644
--- a/tests/MathoidDriverTest.php
+++ b/tests/MathoidDriverTest.php
@@ -10,7 +10,6 @@
  * Class MathSearchHooksTest
  */
 class MathoidDriverTest extends MediaWikiTestCase {
-
private static $hasMathoid;
 
 
@@ -38,6 +37,7 @@
$this->assertEquals( '\\sin(x^{2})', $m->getChecked() );
$this->assertEquals( array( 'x' ), $m->getIdentifiers() );
$this->assertEquals( array(), $m->getRequiredPackages() );
+   $this->assertEquals( 'sine left-parenthesis x squared 
right-parenthesis', $m->getSpeech() );
}
 
public function testFail() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dcfcc7ce1a1c50f83044518de6db6efae97ab2f
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix typos in DataTypeDefinitions - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix typos in DataTypeDefinitions
..


Fix typos in DataTypeDefinitions

Change-Id: Ic26389d80c6c89659ae309a9ffd6f938721e0845
---
M lib/includes/DataTypeDefinitions.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/includes/DataTypeDefinitions.php 
b/lib/includes/DataTypeDefinitions.php
index ffccd3f..2f89ce8 100644
--- a/lib/includes/DataTypeDefinitions.php
+++ b/lib/includes/DataTypeDefinitions.php
@@ -31,14 +31,14 @@
 
/**
 * Constant for indicating that callback maps should be returned with 
the "VT:" and "PT:"
-* perfixes in the array keys indicating whether the callback applies 
to a value type or a
+* prefixes in the array keys indicating whether the callback applies 
to a value type or a
 * property data type.
 */
const PREFIXED_MODE = 'prefixed';
 
/**
 * Constant for indicating that callback maps should be returned for 
property data types only,
-* with no perfixes in the array keys, but with fallbacks for value 
types merged into the
+* with no prefixes in the array keys, but with fallbacks for value 
types merged into the
 * definitions for the property data types.
 */
const RESOLVED_MODE = 'resolved';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic26389d80c6c89659ae309a9ffd6f938721e0845
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove INSERT value for page_counter variable - change (mediawiki/core)

[Billm (Code Review)]

Billm has uploaded a new change for review.

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

Change subject: Remove INSERT value for page_counter variable
..

Remove INSERT value for page_counter variable

Change-Id: Ic4debff449b3b9394d029f13b5cda0e576adf780
---
M maintenance/oracle/tables.sql
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/257311/1

diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql
index 12f6518..a332c41 100644
--- a/maintenance/oracle/tables.sql
+++ b/maintenance/oracle/tables.sql
@@ -87,7 +87,7 @@
 
 -- Create a dummy page to satisfy fk contraints especially with revisions
 INSERT INTO _prefix.page
-  VALUES (0, 0, ' ', NULL, 0, 0, 0, 0, current_timestamp, NULL, 0, 0, NULL, 
NULL);
+  VALUES (0, 0, ' ', NULL, 0, 0, 0, current_timestamp, NULL, 0, 0, NULL, NULL);
 
 /*$mw$*/
 CREATE TRIGGER _prefix.page_set_random BEFORE INSERT ON _prefix.page

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

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

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

[MediaWiki-commits] [Gerrit] Also load button icons with JavaScript disabled - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Also load button icons with JavaScript disabled
..


Also load button icons with JavaScript disabled

This also avoids flash of unstyled content.

Bug: T87757
Change-Id: If78ae8c22aae52e481d4d54e3fced26fba8a7b69
---
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M view/resources/jquery/wikibase/toolbar/resources.php
2 files changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index 5877d63..91aa9d7 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -333,6 +333,7 @@
'jquery.ui.core.styles',
'jquery.wikibase.statementview.RankSelector.styles',
'jquery.wikibase.toolbar.styles',
+   'jquery.wikibase.toolbarbutton.styles',
) );
 
// make sure required client-side resources will be loaded
diff --git a/view/resources/jquery/wikibase/toolbar/resources.php 
b/view/resources/jquery/wikibase/toolbar/resources.php
index 469b108..951bce1 100644
--- a/view/resources/jquery/wikibase/toolbar/resources.php
+++ b/view/resources/jquery/wikibase/toolbar/resources.php
@@ -111,11 +111,16 @@
'scripts' => array(
'jquery.wikibase.toolbarbutton.js',
),
-   'styles' => array(
-   
'themes/default/jquery.wikibase.toolbarbutton.css',
-   ),
'dependencies' => array(
'jquery.wikibase.toolbaritem',
+   'jquery.wikibase.toolbarbutton.styles',
+   ),
+   ),
+
+   'jquery.wikibase.toolbarbutton.styles' => $moduleTemplate + 
array(
+   'position' => 'top',
+   'styles' => array(
+   
'themes/default/jquery.wikibase.toolbarbutton.css',
),
),
 

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

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

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

[MediaWiki-commits] [Gerrit] Imported Upstream version 1.0.2e - change (operations...openssl)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Imported Upstream version 1.0.2e
..

Imported Upstream version 1.0.2e

Change-Id: I4001f8d2a78db1e4f0741aae0e1ad1f192c9c564
---
M CHANGES
A CONTRIBUTING
M Configure
M FAQ
M Makefile
M Makefile.bak
M Makefile.org
M NEWS
M README
M apps/Makefile
M apps/app_rand.c
M apps/apps.c
M apps/asn1pars.c
M apps/ca.c
M apps/ecparam.c
M apps/engine.c
M apps/md4.c
M apps/ocsp.c
M apps/pkcs12.c
M apps/s_cb.c
M apps/s_client.c
M apps/s_server.c
A appveyor.yml
M crypto/aes/asm/aes-586.pl
M crypto/aes/asm/aesni-mb-x86_64.pl
M crypto/aes/asm/aesni-sha1-x86_64.pl
M crypto/aes/asm/aesni-sha256-x86_64.pl
M crypto/aes/asm/aesni-x86.pl
M crypto/aes/asm/vpaes-ppc.pl
M crypto/asn1/asn1_par.c
M crypto/asn1/d2i_pr.c
M crypto/asn1/tasn_dec.c
M crypto/asn1/x_bignum.c
M crypto/asn1/x_pubkey.c
M crypto/asn1/x_x509.c
M crypto/asn1/x_x509a.c
M crypto/bio/b_dump.c
M crypto/bio/bss_file.c
M crypto/bn/asm/armv4-gf2m.pl
M crypto/bn/asm/ia64.S
M crypto/bn/asm/ppc64-mont.pl
M crypto/bn/asm/rsaz-x86_64.pl
M crypto/bn/asm/s390x-gf2m.pl
M crypto/bn/asm/s390x.S
M crypto/bn/asm/x86-gf2m.pl
M crypto/bn/asm/x86_64-gcc.c
M crypto/bn/asm/x86_64-gf2m.pl
M crypto/bn/asm/x86_64-mont.pl
M crypto/bn/asm/x86_64-mont5.pl
M crypto/bn/bn_exp.c
M crypto/bn/bn_gcd.c
M crypto/bn/bn_gf2m.c
M crypto/bn/bn_mont.c
M crypto/bn/bn_recp.c
M crypto/bn/bn_x931p.c
M crypto/bn/bntest.c
M crypto/bn/rsaz_exp.h
M crypto/buffer/buf_str.c
M crypto/buffer/buffer.h
M crypto/cms/cms_enc.c
M crypto/cms/cms_pwri.c
M crypto/cms/cms_sd.c
M crypto/cms/cms_smime.c
M crypto/comp/c_zlib.c
M crypto/conf/conf_def.c
M crypto/conf/conf_sap.c
M crypto/cryptlib.c
D crypto/des/t/test
M crypto/dh/dh.h
M crypto/dh/dhtest.c
M crypto/dsa/dsa_ameth.c
M crypto/dsa/dsa_gen.c
M crypto/ec/Makefile
M crypto/ec/asm/ecp_nistz256-x86_64.pl
M crypto/ec/ec.h
M crypto/ec/ec_asn1.c
M crypto/ec/ec_key.c
M crypto/ecdsa/ecdsa.h
M crypto/ecdsa/ecs_lib.c
M crypto/engine/eng_cryptodev.c
M crypto/engine/eng_list.c
M crypto/evp/e_aes_cbc_hmac_sha256.c
M crypto/evp/e_des3.c
M crypto/evp/encode.c
M crypto/evp/evp_key.c
M crypto/evp/evp_lib.c
M crypto/evp/evp_pbe.c
M crypto/evp/p_lib.c
M crypto/evp/pmeth_gn.c
M crypto/hmac/hm_ameth.c
M crypto/jpake/jpake.c
M crypto/mem_clr.c
M crypto/modes/asm/aesni-gcm-x86_64.pl
M crypto/modes/asm/ghash-armv4.pl
M crypto/modes/asm/ghash-sparcv9.pl
M crypto/modes/asm/ghash-x86.pl
M crypto/modes/asm/ghash-x86_64.pl
M crypto/modes/asm/ghashp8-ppc.pl
M crypto/modes/asm/ghashv8-armx.pl
M crypto/modes/wrap128.c
M crypto/ocsp/ocsp_lib.c
M crypto/ocsp/ocsp_prn.c
M crypto/opensslconf.h
M crypto/opensslconf.h.in
M crypto/opensslv.h
M crypto/pem/pem_info.c
M crypto/pem/pvkfmt.c
M crypto/perlasm/ppc-xlate.pl
M crypto/pkcs12/p12_add.c
M crypto/pkcs12/p12_crpt.c
M crypto/pkcs12/p12_mutl.c
M crypto/pkcs7/pk7_doit.c
M crypto/pkcs7/pk7_smime.c
M crypto/ppccap.c
M crypto/rc4/asm/rc4-x86_64.pl
M crypto/rsa/rsa_ameth.c
M crypto/rsa/rsa_gen.c
M crypto/rsa/rsa_sign.c
M crypto/rsa/rsa_test.c
M crypto/sha/asm/sha1-586.pl
M crypto/sha/asm/sha1-mb-x86_64.pl
M crypto/sha/asm/sha1-x86_64.pl
M crypto/sha/asm/sha256-586.pl
M crypto/sha/asm/sha256-mb-x86_64.pl
M crypto/sha/asm/sha512-586.pl
M crypto/sha/asm/sha512-parisc.pl
M crypto/sha/asm/sha512-x86_64.pl
M crypto/sparccpuid.S
M crypto/sparcv9cap.c
M crypto/srp/srp_vfy.c
M crypto/ts/ts_rsp_verify.c
M crypto/whrlpool/asm/wp-mmx.pl
M crypto/x509/x509_lu.c
M crypto/x509/x509_vfy.c
M crypto/x509/x509_vpm.c
M crypto/x509v3/v3_cpols.c
M crypto/x509v3/v3_ncons.c
M crypto/x509v3/v3_pci.c
M crypto/x509v3/v3_pcia.c
M crypto/x509v3/v3_purp.c
M crypto/x509v3/v3_scts.c
M crypto/x509v3/v3_utl.c
M demos/easy_tls/README
M demos/engines/zencod/hw_zencod.c
M doc/HOWTO/keys.txt
M doc/README
M doc/apps/dgst.pod
M doc/apps/genrsa.pod
M doc/apps/pkcs12.pod
M doc/apps/req.pod
M doc/apps/x509.pod
M doc/crypto/BIO_read.pod
M doc/crypto/BN_rand.pod
M doc/crypto/DSA_generate_parameters.pod
M doc/crypto/EC_GROUP_copy.pod
M doc/crypto/EC_KEY_new.pod
M doc/crypto/EVP_DigestVerifyInit.pod
M doc/crypto/EVP_EncryptInit.pod
M doc/crypto/EVP_SealInit.pod
M doc/crypto/EVP_SignInit.pod
M doc/crypto/X509_check_host.pod
M doc/crypto/buffer.pod
M doc/crypto/d2i_X509_NAME.pod
M doc/crypto/engine.pod
A doc/dir-locals.example.el
A doc/openssl-c-indent.el
D doc/openssl_button.gif
D doc/openssl_button.html
M doc/ssl/SSL_CTX_add_extra_chain_cert.pod
M doc/ssl/SSL_CTX_get0_param.pod
A doc/ssl/SSL_check_chain.pod
M e_os.h
M engines/e_chil.c
D include/openssl/aes.h
D include/openssl/asn1.h
D include/openssl/asn1_mac.h
D include/openssl/asn1t.h
D include/openssl/bio.h
D include/openssl/blowfish.h
D include/openssl/bn.h
D include/openssl/buffer.h
D include/openssl/camellia.h
D include/openssl/cast.h
D include/openssl/cmac.h
D include/openssl/cms.h
D include/openssl/comp.h
D include/openssl/conf.h
D include/openssl/conf_api.h
D 

[MediaWiki-commits] [Gerrit] Add CSS styles that enforce MathML or SVG reflectively - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add CSS styles that enforce MathML or SVG reflectively
..


Add CSS styles that enforce MathML or SVG reflectively

Change-Id: Ibae976b0e57d9259fbc0c7c60e9776f79bcbbdbe
---
M extension.json
A modules/ext.math-mathml.css
A modules/ext.math-svg.css
3 files changed, 119 insertions(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 47c7356..ef0c503 100644
--- a/extension.json
+++ b/extension.json
@@ -89,6 +89,20 @@
"desktop",
"mobile"
]
+   },
+   "ext.math-svg.styles": {
+   "styles": "ext.math-svg.css",
+   "targets": [
+   "desktop",
+   "mobile"
+   ]
+   },
+   "ext.math-mathml.styles": {
+   "styles": "ext.math-mathml.css",
+   "targets": [
+   "desktop",
+   "mobile"
+   ]
}
},
 
diff --git a/modules/ext.math-mathml.css b/modules/ext.math-mathml.css
new file mode 100644
index 000..4927e38
--- /dev/null
+++ b/modules/ext.math-mathml.css
@@ -0,0 +1,61 @@
+/*
+ * Document   : ext.math
+ * Created on : 23.09.2013, 13:55:00
+ * Author : Physikerwelt (Moritz Schubotz)
+ * Description: Shows browser-dependent math output.
+ */
+@namespace m url('http://www.w3.org/1998/Math/MathML');
+
+/* Default style for MathML. */
+.mwe-math-mathml-inline { display: inline !important; }
+.mwe-math-mathml-display { display: block !important; margin-left: auto; 
margin-right: auto; }
+.mwe-math-mathml-a11y {
+   /* We try to hide the MathML formula in a way that still makes it 
accessible to accessibility tools. */
+   clip: rect(1px, 1px, 1px, 1px);
+   overflow: hidden;
+   position: absolute;
+   width: 1px;
+   height: 1px;
+   opacity: 0;
+}
+m|math {
+   /* Try some popular OpenType MATH fonts before the WOFF fallback */
+   /* We put Cambria before Cambria Math to workaround a bug on Windows
+   (see https://bugzilla.mozilla.org/show_bug.cgi?id=598900) */
+   font-family: Cambria, Cambria Math, Latin Modern Math, STIX Math, 
LatinModernMathWOFF, serif;
+   /* .mw-body-content sets the line-height to 1.6 which is not desired 
for math. For example */
+   /* matrices with brackets are rendered too large. See also 
https://phabricator.wikimedia.org/T106890 */
+   line-height: normal;
+}
+
+/* Default style for the image fallback. */
+/* Note: We had to use !important rules because of conflicts with the style
+generated by Mathoid. See https://gerrit.wikimedia.org/r/#/c/166213/ */
+.mwe-math-fallback-image-inline { display: inline-block; vertical-align: 
middle; }
+.mwe-math-fallback-image-display { display: block; margin-left: auto 
!important; margin-right: auto !important; }
+
+/* Default style for the source fallback. */
+.mwe-math-fallback-source-inline { display: inline; vertical-align: middle; }
+.mwe-math-fallback-source-display { display: block; margin-left: auto; 
margin-right: auto; }
+
+/**
+ * Browser-specific hacks are bad but let's use that for now...
+ * See http://browserhacks.com/
+ */
+
+.mwe-math-mathml-a11y {
+   clip: auto;
+   overflow: visible;
+   position: static;
+   width: auto;
+   height: auto;
+   opacity: 1;
+}
+.mwe-math-mathml-inline + .mwe-math-fallback-image-inline,
+.mwe-math-mathml-display + .mwe-math-fallback-image-display { display: none 
!important; }
+
+
+/* PNG related styles from core */
+img.tex {
+   vertical-align: middle;
+}
diff --git a/modules/ext.math-svg.css b/modules/ext.math-svg.css
new file mode 100644
index 000..634f4b9
--- /dev/null
+++ b/modules/ext.math-svg.css
@@ -0,0 +1,44 @@
+/*
+ * Document   : ext.math
+ * Created on : 23.09.2013, 13:55:00
+ * Author : Physikerwelt (Moritz Schubotz)
+ * Description: Shows browser-dependent math output.
+ */
+@namespace m url('http://www.w3.org/1998/Math/MathML');
+
+/* Default style for MathML. */
+.mwe-math-mathml-inline { display: inline !important; }
+.mwe-math-mathml-display { display: block !important; margin-left: auto; 
margin-right: auto; }
+.mwe-math-mathml-a11y {
+   /* We try to hide the MathML formula in a way that still makes it 
accessible to accessibility tools. */
+   clip: rect(1px, 1px, 1px, 1px);
+   overflow: hidden;
+   position: absolute;
+   width: 1px;
+   height: 1px;
+   opacity: 0;
+}
+m|math {
+   /* Try some popular OpenType MATH fonts before the WOFF fallback */
+   /* We put Cambria before Cambria Math to workaround a bug on Windows
+  

[MediaWiki-commits] [Gerrit] Use schema_uri for schema, revision data in meta, Add Event o... - change (eventlogging)

[Nuria (Code Review)]

Nuria has submitted this change and it was merged.

Change subject: Use schema_uri for schema,revision data in meta, Add Event 
object wrapper
..


Use schema_uri for schema,revision data in meta, Add Event object wrapper

This commit refactors the recently added helper functions to work with event 
dict meta data
into an Event object.  Event subclasses dict and includes helper functions to 
work with
event meta data.

This commit also expects event schema,revision to be stored in meta.schema_uri 
instead of
in separate schema,revision fields.  This allows for simple URIs like 
schema/revision,
but also allows for more specific URL based schema pointers.

I have removed HTTP API support for getting schemas.  We intend for schemas to 
be
either looked up in a schema repository, or via another http service that is 
not this one.

This also updates config/schemas submodule to be the latest commit

Bug: T114443,T120245

Change-Id: Ib9dd9072c64c206788644a1f9d310da3c34b67c2
---
M bin/eventlogging-devserver
M bin/eventlogging-service
M config/schemas
M eventlogging/__init__.py
M eventlogging/compat.py
A eventlogging/event.py
M eventlogging/handlers.py
M eventlogging/schema.py
M eventlogging/service.py
M eventlogging/topic.py
M eventlogging/utils.py
M tests/__init__.py
M tests/fixtures.py
R tests/fixtures/config/schemas/jsonschema/Echo/7731316.json
R tests/fixtures/config/schemas/jsonschema/EditMetaTest/1.yaml
M tests/fixtures/config/topics.yaml
M tests/test_compat.py
A tests/test_event.py
M tests/test_schema.py
M tests/test_service.py
M tests/test_topic.py
21 files changed, 885 insertions(+), 940 deletions(-)

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



diff --git a/bin/eventlogging-devserver b/bin/eventlogging-devserver
index ba7e7b6..c20e913 100755
--- a/bin/eventlogging-devserver
+++ b/bin/eventlogging-devserver
@@ -9,11 +9,11 @@
 
   To use this, you probably want to set '$wgEventLoggingBaseUri' on your
   test wiki to point at the host and port of this web server. The value
-  '//localhost:8080/event.gif' should work.
+  '//localhost:8100/event.gif' should work.
 
   Example:
 event : {"wiki": "devwiki", "schema": "TrackedPageContentSaveComplete", 
"revision": 7872558, "event": {"revId": 10, "token": "foobar"}}
-url : 
http://localhost:8080/event.gif?%7B%22wiki%22%3A+%22devwiki%22%2C+%22schema%22%3A+%22TrackedPageContentSaveComplete%22%2C+%22revision%22%3A+7872558%2C+%22event%22%3A+%7B%22revId%22%3A+10%2C+%22token%22%3A+%22foobar%22%7D%7D
+url : 
http://localhost:8100/event.gif?%7B%22wiki%22%3A+%22devwiki%22%2C+%22schema%22%3A+%22TrackedPageContentSaveComplete%22%2C+%22revision%22%3A+7872558%2C+%22event%22%3A+%7B%22revId%22%3A+10%2C+%22token%22%3A+%22foobar%22%7D%7D
 
 
   usage: eventlogging-devserver [-h] [--host HOST] [--port PORT]
@@ -21,7 +21,7 @@
   optional arguments:
 -h, --helpshow this help message and exit
 --host HOST   server host (default: 'localhost')
---port PORT   server port (default: 8080)
+--port PORT   server port (default: 8100)
 --append-to PATH  file to append to (default: stdout)
 --verbose print pretty colors to stderr
 
@@ -40,6 +40,7 @@
 import itertools
 
 from wsgiref.simple_server import make_server, WSGIRequestHandler
+from eventlogging import Event
 
 import eventlogging
 import jsonschema
@@ -47,12 +48,11 @@
 from pygments import formatters, highlight, lexers
 from pygments.console import ansiformat
 
-
 argparser = argparse.ArgumentParser(fromfile_prefix_chars='@')
 argparser.add_argument('--host', default='localhost',
help='server host (default: localhost)')
-argparser.add_argument('--port', default=8080, type=int,
-   help='server port (default: 8080)')
+argparser.add_argument('--port', default=8100, type=int,
+   help='server port (default: 8100)')
 argparser.add_argument('--append-to', type=argparse.FileType('a'),
default=sys.stdout,
help='file to append to (optional)')
@@ -111,12 +111,13 @@
 Returns a tuple of (event, errors). If no object was decoded,
 'event' will be None."""
 try:
-event = parser.parse(log_line)
+event_dict = parser.parse(log_line)
+event = Event.factory(event_dict)
 except ValueError as err:
 return None, [err]
 
 try:
-scid = eventlogging.scid_from_event(event)
+scid = event.scid()
 except KeyError as err:
 return event, [err]
 
diff --git a/bin/eventlogging-service b/bin/eventlogging-service
index 4b916b9..0f81834 100755
--- a/bin/eventlogging-service
+++ b/bin/eventlogging-service
@@ -84,15 +84,6 @@
 init_schema_cache(args.schemas_path)
 signal.signal(signal.SIGHUP, sighup_handler)
 
-# TODO: Remove.  This is a temporary hack to allow topic
-# in EventCapsule until we add this 

[MediaWiki-commits] [Gerrit] [WIP] Add more flexible rescore profiles - change (mediawiki...CirrusSearch)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [WIP] Add more flexible rescore profiles
..

[WIP] Add more flexible rescore profiles

This patch adds more flexibility to the rescore profile. In the previous it was
impossible to adjust weights for multiple function score.
Added a new function type 'script' to use lucene expression script engine.

Added the possibility to specify a different profile for prefix search. Useful
to use a complex profile for fulltext search that may not be suited for fast
prefix search.

WIP: want to test on more data with en-suggesty

Bug: T110648

Change-Id: I8b3639317dd86a9cde9633ef490e48dfe4fa4d4b
---
M CirrusSearch.php
M autoload.php
M includes/Search/RescoreBuilders.php
M includes/Searcher.php
M profiles/RescoreProfiles.php
M tests/unit/RescoreBuilderTest.php
6 files changed, 287 insertions(+), 119 deletions(-)


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

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 49135ec..6d1fada 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -805,6 +805,7 @@
  * see profile/RescoreProfiles.php for more info
  */
 $wgCirrusSearchRescoreProfile = $wgCirrusSearchRescoreProfiles['default'];
+$wgCirrusSearchPrefixSearchRescoreProfile = 
$wgCirrusSearchRescoreProfiles['default'];
 
 /**
  * If current wiki has less than this number of results, try to search other 
language wikis.
diff --git a/autoload.php b/autoload.php
index 600b5a3..0bace46 100644
--- a/autoload.php
+++ b/autoload.php
@@ -102,6 +102,7 @@
'CirrusSearch\\Search\\Result' => __DIR__ . 
'/includes/Search/Result.php',
'CirrusSearch\\Search\\ResultSet' => __DIR__ . 
'/includes/Search/ResultSet.php',
'CirrusSearch\\Search\\ResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
+   'CirrusSearch\\Search\\ScriptScoreFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\SearchContext' => __DIR__ . 
'/includes/Search/SearchContext.php',
'CirrusSearch\\Search\\SearchTextBaseQueryBuilder' => __DIR__ . 
'/includes/Search/SearchTextQueryBuilders.php',
'CirrusSearch\\Search\\SearchTextCommonTermsQueryBuilder' => __DIR__ . 
'/includes/Search/SearchTextQueryBuilders.php',
diff --git a/includes/Search/RescoreBuilders.php 
b/includes/Search/RescoreBuilders.php
index 211be93..68ee8a3 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -161,6 +161,20 @@
 
 class FunctionScoreChain {
/**
+* List of allowed function_score param
+* we keep boost and boost_mode even if they do not make sense
+* here since we do not allow to specify the query param.
+* The query will be MatchAll with a score to 1.
+*/
+   private static $functionScoreParams = array(
+   'boost',
+   'boost_mode',
+   'max_boost',
+   'score_mode',
+   'min_score'
+   );
+
+   /**
 * @var SearchContext
 */
private $context;
@@ -175,12 +189,23 @@
 */
private $chain;
 
+   /**
+* @var string the name of the chain
+*/
+   private $chainName;
+
public function __construct( SearchContext $context, $chain ) {
+   $this->chainName = $chain;
$this->context = $context;
$this->functionScore = new FunctionScoreDecorator();
$this->chain = $context->getConfig()->getElement( 
'CirrusSearchRescoreFunctionScoreChains', $chain );
if ( $this->chain === null ) {
throw new InvalidRescoreProfileException( "Unknown 
rescore function chain $chain" );
+   }
+
+   $params = array_intersect_key( $this->chain, array_flip( 
self::$functionScoreParams ) );
+   foreach( $params as $param => $value ) {
+   $this->functionScore->setParam( $param, $value );
}
}
 
@@ -189,7 +214,10 @@
 * needed.
 */
public function buildRescoreQuery() {
-   foreach( $this->chain as $func ) {
+   if ( !isset( $this->chain['functions'] ) ) {
+   throw new InvalidRescoreProfileException( "No functions 
defined in chain {$this->chainName}." );
+   }
+   foreach( $this->chain['functions'] as $func ) {
$impl = $this->getImplementation( $func );
$impl->append( $this->functionScore );
}
@@ -200,19 +228,22 @@
}
 
private function getImplementation( $func ) {
+   $weight = isset ( $func['weight'] ) ? $func['weight'] : 1;
switch( $func['type'] ) {
case 'boostlinks':
-   

[MediaWiki-commits] [Gerrit] Rolling configuration and restart of es1019 - change (operations/puppet)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Rolling configuration and restart of es1019
..


Rolling configuration and restart of es1019

Change-Id: Ifee5aeeb6a4b13f0995ce633f864009990ecb2c8
References: T120122
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index d9acadd..ddc39d4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -902,14 +902,14 @@
 
 # External Storage, Shard 3 (es3) databases
 
-node /^es101[49]\.eqiad\.wmnet/ {
+# temporary extra role for rolling restart
+node /^es101[4]\.eqiad\.wmnet/ {
 class { 'role::mariadb::core':
 shard => 'es3',
 }
 }
 
-# temporary extra role for rolling restart
-node /^es101[7]\.eqiad\.wmnet/ {
+node /^es101[79]\.eqiad\.wmnet/ {
 class { 'role::mariadb::core':
 shard => 'es3',
 p_s   => 'on',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifee5aeeb6a4b13f0995ce633f864009990ecb2c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Rolling configuration and restart of es1019 - change (operations/puppet)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Rolling configuration and restart of es1019
..

Rolling configuration and restart of es1019

Change-Id: Ifee5aeeb6a4b13f0995ce633f864009990ecb2c8
References: T120122
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/257360/1

diff --git a/manifests/site.pp b/manifests/site.pp
index d9acadd..ddc39d4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -902,14 +902,14 @@
 
 # External Storage, Shard 3 (es3) databases
 
-node /^es101[49]\.eqiad\.wmnet/ {
+# temporary extra role for rolling restart
+node /^es101[4]\.eqiad\.wmnet/ {
 class { 'role::mariadb::core':
 shard => 'es3',
 }
 }
 
-# temporary extra role for rolling restart
-node /^es101[7]\.eqiad\.wmnet/ {
+node /^es101[79]\.eqiad\.wmnet/ {
 class { 'role::mariadb::core':
 shard => 'es3',
 p_s   => 'on',

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

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

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

[MediaWiki-commits] [Gerrit] Enhance MLP Eval UI - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Enhance MLP Eval UI
..


Enhance MLP Eval UI

 * Enhance the ui based on a pre-study

Change-Id: I3534beef1d494107cd806177473492a6a1c4fd76
---
M includes/MathHighlighter.php
M includes/MlpEvalForm.php
M includes/special/SpecialMlpEval.php
3 files changed, 259 insertions(+), 88 deletions(-)

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



diff --git a/includes/MathHighlighter.php b/includes/MathHighlighter.php
index 88dd84e..8fc51d1 100644
--- a/includes/MathHighlighter.php
+++ b/includes/MathHighlighter.php
@@ -10,8 +10,9 @@
 * MathHighlighter constructor.
 * @param $fId
 * @param $revId
+* @param bool $highlight
 */
-   public function __construct( $fId, $revId ) {
+   public function __construct( $fId, $revId, $highlight = true ) {
$gen = MathIdGenerator::newFromRevisionId( $revId );
$unique = $gen->getUniqueFromId( $fId );
$wikiText = $gen->getWikiText();
@@ -20,13 +21,14 @@
$length = $this->getEndPos( $tagPos, $wikiText ) - $startPos;
$wikiText = substr( $wikiText, $startPos, $length );
$tag = $gen->getTagFromId( $fId );
-   $wikiText = str_replace( $unique,
-   '' . $tag[3] . '',
-   $wikiText );
+   if ( $highlight ) {
+   $wikiText = str_replace( $unique, ''
+   . $tag[3] . '', $wikiText );
+   }
foreach ( $gen->getMathTags() as $key => $content ) {
$wikiText = str_replace( $key, $content[3], $wikiText );
}
-   $this->wikiText = "== Extract ==\nStart of the 
extract...\n\n$wikiText\n\n...end of the extract";
+   $this->wikiText = $wikiText;
}
 
/**
diff --git a/includes/MlpEvalForm.php b/includes/MlpEvalForm.php
index ba94561..657d46c 100644
--- a/includes/MlpEvalForm.php
+++ b/includes/MlpEvalForm.php
@@ -6,7 +6,7 @@
const OPT_BACK = 1;
const OPT_RETRY = 2;
 
-   private $specialPage;
+   private $eval;
private $step;
 
/**
@@ -14,13 +14,13 @@
 * @param SpecialMlpEval $specialPage
 */
public function __construct( SpecialMlpEval $specialPage ) {
-   $this->specialPage = $specialPage;
+   $this->eval = $specialPage;
$this->step = $specialPage->getStep();
$formDescriptor = array();
$this->addControls( $formDescriptor );
$this->addOptions( $formDescriptor );
parent::__construct( $formDescriptor, 
$specialPage->getContext() );
-   $this->mWasSubmitted = false;
+   // $this->mWasSubmitted = false;
$this->addStateFields();
$this->addButtons();
$this->setSubmitCallback( function(){
@@ -34,7 +34,7 @@
case SpecialMlpEval::STEP_PAGE:
$formDescriptor['1-page'] = array(
'class' => 'HTMLTitleTextField',
-   'default'   => 
$this->specialPage->getRandomPage()->getText()
+   'default'   => 
$this->eval->getRandomPage()->getText()
);
break;
case SpecialMlpEval::STEP_FORMULA:
@@ -48,14 +48,18 @@
);
break;
case SpecialMlpEval::STEP_TEX:
+   $formDescriptor['3-skip'] = array(
+   'type' => 'submit',
+   'value' => 'Skip step.'
+   );
$formDescriptor['3-pretty'] = array(
'type'=> 'radio',
-   'default' => 1,
-   
'disabled'=>!$this->specialPage->isTexInputChanged()
+   'default' => 3,
+   
'disabled'=>!$this->eval->isTexInputChanged()
);
$formDescriptor['3-assessment'] = array(
'type'=> 'radio',
-   'default' => 1,
+   'default' => 4,
);
$formDescriptor['3-problems'] = array(
'type'=> 

[MediaWiki-commits] [Gerrit] Roll out RESTBase usage to Android Beta app: 10% - change (mediawiki...MobileApp)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Roll out RESTBase usage to Android Beta app: 10%
..


Roll out RESTBase usage to Android Beta app: 10%

Added config value for restbaseBetaPercent. Initially set to 10%.
Valid values are [0, 100].

Bug: T118965
Change-Id: I5de7276e28ddbe1b4e220b16d2bf1cfec7daab75
(cherry picked from commit f378bc09dff79746459bec874fb2b29b2be891fb)
---
M config/config.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/config/config.json b/config/config.json
index eabe4f4..1c31381 100644
--- a/config/config.json
+++ b/config/config.json
@@ -3,5 +3,6 @@
 "eventLogSampleRate": 0,
 "disableFullTextSearch": false,
 "searchLogSampleRate": 100,
-"tocLogSampleRate": 100
+"tocLogSampleRate": 100,
+"restbaseBetaPercent": 10
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5de7276e28ddbe1b4e220b16d2bf1cfec7daab75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: wmf/1.27.0-wmf.7
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Labs: make labs-ip-alias-dump ignore addressless hosts" - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Revert "Labs: make labs-ip-alias-dump ignore addressless hosts"
..

Revert "Labs: make labs-ip-alias-dump ignore addressless hosts"

IMO it *should* fail loudly and explicitly. Failing also
prevents puppet from restarting pdns-recursor, which is
important.

This reverts commit 4dca32bbdef2f24971f07db3e0e389f1b4389958.

Change-Id: Id59341dc80183c9c3c81548dce3dfadbf53421ab
---
M modules/dnsrecursor/files/labs-ip-alias-dump.py
1 file changed, 11 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/257368/1

diff --git a/modules/dnsrecursor/files/labs-ip-alias-dump.py 
b/modules/dnsrecursor/files/labs-ip-alias-dump.py
index 6de379e..ac368ae 100644
--- a/modules/dnsrecursor/files/labs-ip-alias-dump.py
+++ b/modules/dnsrecursor/files/labs-ip-alias-dump.py
@@ -37,22 +37,17 @@
 
 for server in client.servers.list():
 serverAddresses = {}
-try:
-private = [
-str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'fixed'
-]
-public = [
-str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'floating'
-]
-if public:
-# Match all possible public IPs to all possible private ones
-# Technically there can be more than one floating IP and more 
than one private IP
-# Although this is never practically the case...
-aliases[server.name] = list(itertools.product(public, private))
-except KeyError:
-# This can happen if a server doesn't (yet) have any addresses, 
while it's being
-# constructed.  In which case we simply harmlessly ignore it.
-pass
+private = [
+str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'fixed'
+]
+public = [
+str(ip['addr']) for ip in server.addresses['public'] if 
ip['OS-EXT-IPS:type'] == 'floating'
+]
+if public:
+# Match all possible public IPs to all possible private ones
+# Technically there can be more than one floating IP and more than 
one private IP
+# Although this is never practically the case...
+aliases[server.name] = list(itertools.product(public, private))
 
 output = 'aliasmapping = {}\n'
 # Sort to prevent flapping around due to random ordering

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

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

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

[MediaWiki-commits] [Gerrit] jsub: Raise default memory allocation to 400M - change (labs/toollabs)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: jsub: Raise default memory allocation to 400M
..


jsub: Raise default memory allocation to 400M

jstart & qcronsub are also affected due to being symlinks to jsub

Bug: T120517
Change-Id: I9595011c3a67f40dcc9086164529fa3226593477
---
M jobutils/bin/jsub
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index 7af0280..43609bd 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -30,7 +30,7 @@
 );
 my %qsargs;
 my @args;
-my $memory = memparse_kb('256M');
+my $memory = memparse_kb('400M');
 my $once = 0;
 my $stderr = 0;
 my $continuous = 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9595011c3a67f40dcc9086164529fa3226593477
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 

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

[MediaWiki-commits] [Gerrit] Fix README - change (mediawiki...Wikibase)

[Code Review]

Matěj Suchánek has uploaded a new change for review.

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

Change subject: Fix README
..

Fix README

Removed whitespace which broke rendering of the link.

Change-Id: I51bfc10afab6bb69d17110b26290087d1afb0ce9
---
M README.md
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/README.md b/README.md
index 5285c68..52f6679 100644
--- a/README.md
+++ b/README.md
@@ -62,5 +62,4 @@
 These extensions are part of the [Wikibase software](http://wikiba.se/) 
created by the Wikidata team
 for the [Wikidata project](https://meta.wikimedia.org/wiki/Wikidata).
 
-The Wikidata project uses the Wikibase software on its [wikidata.org website]
-(https://www.wikidata.org).
+The Wikidata project uses the Wikibase software on its [wikidata.org 
website](https://www.wikidata.org).

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51bfc10afab6bb69d17110b26290087d1afb0ce9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

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

[MediaWiki-commits] [Gerrit] New package version - change (operations...pybal)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: New package version
..


New package version

Change-Id: I229990c1f2907595cdb8256ae5c47703e27cdc66
---
M debian/changelog
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 52fe329..a08c13b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pybal (1.13.2) jessie-wikimedia; urgency=medium
+
+  * Fix a race condition in the alerting
+  * Add config options for IdleConnectionMonitor KeepAlive
+
+ -- Giuseppe Lavagetto   Mon, 07 Dec 2015 17:06:44 
+0100
+
 pybal (1.13.1) jessie-wikimedia; urgency=medium
 
   * Fix alerting typo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I229990c1f2907595cdb8256ae5c47703e27cdc66
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Revert "mediawiki.ForeignStructuredUpload: Always use '|1=' ... - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Revert "mediawiki.ForeignStructuredUpload: Always use '|1=' for 
description templates"
..

Revert "mediawiki.ForeignStructuredUpload: Always use '|1=' for description 
templates"

No comment. No explanation. No justification. No discussion. Not cool.

This reverts commit 5a44c38ec6887e8a37586aeef1768e880802d178.

Change-Id: I3671e1d68c279393b0db5ca4af31ce4583e9322a
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/257350/1

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js 
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index 0117cea..5e79039 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -136,11 +136,12 @@
 * @return {string}
 */
ForeignStructuredUpload.prototype.getDescriptions = function () {
-   var i, desc, templateCalls = [];
+   var i, desc, hasEquals, templateCalls = [];
 
for ( i = 0; i < this.descriptions.length; i++ ) {
desc = this.descriptions[ i ];
-   templateCalls.push( '{{' + desc.language + '|1=' + 
desc.text + '}}' );
+   hasEquals = desc.text.indexOf( '=' ) !== -1;
+   templateCalls.push( '{{' + desc.language + ( hasEquals 
? '|1=' : '|' ) + desc.text + '}}' );
}
 
return templateCalls.join( '\n' );

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

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

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

[MediaWiki-commits] [Gerrit] Fix some language depending phpunit tests by using MediaWiki... - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Fix some language depending phpunit tests by using 
MediaWikiLangTestCase
..

Fix some language depending phpunit tests by using MediaWikiLangTestCase

Some tests fails on wikis with $wgLanguageCode not = 'en', fix this by
setting the correct language context.

Change-Id: Ia72017df59d8beb5c508832584b2431ffab0f77f
---
M tests/phpunit/includes/api/ApiErrorFormatterTest.php
M tests/phpunit/includes/content/CssContentHandlerTest.php
M tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
M tests/phpunit/includes/deferred/LinksUpdateTest.php
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/257353/1

diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php 
b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
index 3e5f355..a08a86e 100644
--- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php
+++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
@@ -3,7 +3,7 @@
 /**
  * @group API
  */
-class ApiErrorFormatterTest extends MediaWikiTestCase {
+class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 
/**
 * @covers ApiErrorFormatter
diff --git a/tests/phpunit/includes/content/CssContentHandlerTest.php 
b/tests/phpunit/includes/content/CssContentHandlerTest.php
index 58735bc..4da8274 100644
--- a/tests/phpunit/includes/content/CssContentHandlerTest.php
+++ b/tests/phpunit/includes/content/CssContentHandlerTest.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/257353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia72017df59d8beb5c508832584b2431ffab0f77f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Enhance MLP Eval UI - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Enhance MLP Eval UI
..

Enhance MLP Eval UI

 * Enhance the ui based on a pre-study

Change-Id: I3534beef1d494107cd806177473492a6a1c4fd76
---
M MathObject.php
M includes/MathHighlighter.php
M includes/MlpEvalForm.php
M includes/special/SpecialMlpEval.php
4 files changed, 287 insertions(+), 88 deletions(-)


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

diff --git a/MathObject.php b/MathObject.php
index cd5be76..0eb5839 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -53,7 +53,7 @@
}
 
public static function cloneFromRenderer( MathRenderer $renderer ) {
-   $instance = new MathObject( $renderer->getTex() );
+   $instance = new MathObject( $renderer->getUserInputTex() );
$instance->setMathml( $renderer->getMathml() );
$instance->setSvg( $renderer->getSvg() );
$instance->setMode( $renderer->getMode() );
@@ -491,4 +491,32 @@
}
return '';
}
+
+   public function getSvgWidth() {
+   if ( preg_match( "/width=\"(.*?)(ex|px|em)?\"/", 
$this->getSvg(), $matches ) ) {
+   return $matches;
+   }
+   return 0;
+   }
+
+   public function getSvgHeight() {
+   if ( preg_match( "/height=\"(.*?)(ex|px|em)?\"/", 
$this->getSvg(), $matches ) ) {
+   return $matches;
+   }
+   return 0;
+   }
+
+   public function getReSizedSvgLink( $factor = 2 ) {
+   $width = $this->getSvgWidth();
+   $width = $width[1]*$factor.$width[2];
+   $height = $this->getSvgHeight();
+   $height = $height[1]*$factor.$height[2];
+   $reflector = new ReflectionObject( $this );
+   $method = $reflector->getMethod( 'getFallbackImage' );
+   $method->setAccessible( true );
+   $fbi =  $method->invoke( $this );
+   $fbi = preg_replace( "/width: (.*?)(ex|px|em)/", "width: 
$width", $fbi );
+   $fbi = preg_replace( "/height: (.*?)(ex|px|em)/", "height: 
$height", $fbi );
+   return $fbi;
+   }
 }
diff --git a/includes/MathHighlighter.php b/includes/MathHighlighter.php
index 88dd84e..ca8ee88 100644
--- a/includes/MathHighlighter.php
+++ b/includes/MathHighlighter.php
@@ -10,8 +10,9 @@
 * MathHighlighter constructor.
 * @param $fId
 * @param $revId
+* @param bool $highlight
 */
-   public function __construct( $fId, $revId ) {
+   public function __construct( $fId, $revId, $highlight = true ) {
$gen = MathIdGenerator::newFromRevisionId( $revId );
$unique = $gen->getUniqueFromId( $fId );
$wikiText = $gen->getWikiText();
@@ -20,9 +21,10 @@
$length = $this->getEndPos( $tagPos, $wikiText ) - $startPos;
$wikiText = substr( $wikiText, $startPos, $length );
$tag = $gen->getTagFromId( $fId );
-   $wikiText = str_replace( $unique,
-   '' . $tag[3] . '',
-   $wikiText );
+   if ( $highlight ) {
+   $wikiText = str_replace( $unique, ''
+   . $tag[3] . '', $wikiText );
+   }
foreach ( $gen->getMathTags() as $key => $content ) {
$wikiText = str_replace( $key, $content[3], $wikiText );
}
diff --git a/includes/MlpEvalForm.php b/includes/MlpEvalForm.php
index ba94561..657d46c 100644
--- a/includes/MlpEvalForm.php
+++ b/includes/MlpEvalForm.php
@@ -6,7 +6,7 @@
const OPT_BACK = 1;
const OPT_RETRY = 2;
 
-   private $specialPage;
+   private $eval;
private $step;
 
/**
@@ -14,13 +14,13 @@
 * @param SpecialMlpEval $specialPage
 */
public function __construct( SpecialMlpEval $specialPage ) {
-   $this->specialPage = $specialPage;
+   $this->eval = $specialPage;
$this->step = $specialPage->getStep();
$formDescriptor = array();
$this->addControls( $formDescriptor );
$this->addOptions( $formDescriptor );
parent::__construct( $formDescriptor, 
$specialPage->getContext() );
-   $this->mWasSubmitted = false;
+   // $this->mWasSubmitted = false;
$this->addStateFields();
$this->addButtons();
$this->setSubmitCallback( function(){
@@ -34,7 +34,7 @@
case SpecialMlpEval::STEP_PAGE:
$formDescriptor['1-page'] = array(

[MediaWiki-commits] [Gerrit] Stop using Title::mNamespace - change (mediawiki...Interlanguage)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Stop using Title::mNamespace
..

Stop using Title::mNamespace

Change-Id: Idb8cddad8d95b86268eac31d746bf8a618af7506
---
M InterlanguageExtension.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/InterlanguageExtension.php b/InterlanguageExtension.php
index 738e63d..4bcbd3a 100644
--- a/InterlanguageExtension.php
+++ b/InterlanguageExtension.php
@@ -261,7 +261,7 @@
$paramTitle = Title::newFromText( $param );
if( $paramTitle ) {
$dbKey = $paramTitle->mDbkeyform;
-   $namespace = $paramTitle->mNamespace;
+   $namespace = $paramTitle->getNamespace();
} else {
//If the title is malformed, try at least this
$dbKey = strtr( $param, ' ', '_' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb8cddad8d95b86268eac31d746bf8a618af7506
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interlanguage
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (06c5ed7) - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to master (06c5ed7)
..

Update VE core submodule to master (06c5ed7)

New changes:
08abcd1 Fix JS error when unselected GeneratedContentNode rerenders
6ebb09f Fix inherit documentation of AnnotationContextItems
6787331 Localisation updates from https://translatewiki.net.
b3d7f93 Localisation updates from https://translatewiki.net.
d9156a2 Make MediaSizeWidget work without default/original dimensions

Change-Id: I36f34365db23bcdf1408af8361ed7242025d1278
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index 73810c1..06c5ed7 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 73810c1ea751325efdebceeba3c1e37511178489
+Subproject commit 06c5ed71b5140cb14d34eb5546f8aa5ed6e184ec

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36f34365db23bcdf1408af8361ed7242025d1278
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mw.UploadWizardDetails: Do not double-escape campaign fields... - change (mediawiki...UploadWizard)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: mw.UploadWizardDetails: Do not double-escape campaign fields' 
labels
..

mw.UploadWizardDetails: Do not double-escape campaign fields' labels

The 'label' field in the definition is wikitext, which is parsed
server-side (people like to use templates and whatnot in there)
and provided here as HTML.

Change-Id: If3de4590fe27230521a3f58cb7e476058cc4616e
---
M resources/mw.UploadWizardDetails.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/66/257366/1

diff --git a/resources/mw.UploadWizardDetails.js 
b/resources/mw.UploadWizardDetails.js
index 1e1cf30..9423dd4 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -132,7 +132,7 @@
if ( field.wikitext ) {
customDetails = new uw.CampaignDetailsWidget( 
field );
customDetailsField = new uw.FieldLayout( 
customDetails, {
-   label: field.label,
+   label: $( $.parseHTML( field.label ) ),
required: !!field.required
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3de4590fe27230521a3f58cb7e476058cc4616e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Depricated use of isEmpty() in page.py and added a seperate ... - change (pywikibot/core)

[Vadiraja.k (Code Review)]

Vadiraja.k has uploaded a new change for review.

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

Change subject: Depricated use of isEmpty() in page.py and added a seperate 
function in interwiki.py to check for empty pages
..

Depricated use of isEmpty() in page.py and added a seperate function in 
interwiki.py to check for empty pages

Change-Id: I3070efc8dd568b6817e65be880e92974feb084ce
---
M pywikibot/page.py
M scripts/interwiki.py
2 files changed, 26 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/67/257367/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index bdcc0b1..971c87a 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -746,6 +746,8 @@
 return Category(Link(self._catredirect, self.site))
 raise pywikibot.IsNotRedirectPage(self)
 
+@deprecate_arg('page')
+@deprecated("interwiki.pageEmptyCheck()")
 def isEmpty(self):
 """Return True if the page text has less than 4 characters.
 
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index fb20f58..3604db4 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -1372,7 +1372,7 @@
 
 # must be behind the page.isRedirectPage() part
 # otherwise a redirect error would be raised
-elif not page.isCategory() and page.isEmpty():
+elif pageEmptyCheck(page):
 globalvar.remove.append(unicode(page))
 if not globalvar.quiet:
 pywikibot.output(u"NOTE: %s is empty. Skipping." % page)
@@ -1839,7 +1839,7 @@
 except pywikibot.NoPage:
 pywikibot.output(u"Not editing %s: page does not exist" % page)
 raise SaveError(u'Page doesn\'t exist')
-if not page.isCategory() and page.isEmpty():
+if pageEmptyCheck(page):
 pywikibot.output(u"Not editing %s: page is empty" % page)
 raise SaveError(u'Page is empty.')
 
@@ -2458,6 +2458,28 @@
 bot.add(page, hints=hintStrings)
 
 
+def pageEmptyCheck(page):
+"""Purpose of this function is to prohibit empty pages being fetched 
into the interlanguage
+links on other sites or getting removed from it (probably because the 
page was vandalized).
+This function leads the program to skip it.
+
+@rtype: bool
+"""
+# Check if the page is in content namespace
+if page.namespace() == 0:
+try:
+# try to get the 50th character, if it exists
+page.text[50]
+return False
+except IndexError:
+return True
+else:
+if page.isEmpty() and not page.isCategory():
+return True
+else:
+return False
+
+
 def main(*args):
 """
 Process command line arguments and invoke bot.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3070efc8dd568b6817e65be880e92974feb084ce
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Vadiraja.k 

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

[MediaWiki-commits] [Gerrit] Breaking: Release version 2.0.0 - change (mediawiki...RelatedArticles)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Breaking: Release version 2.0.0
..

Breaking: Release version 2.0.0

Bug: T119749
Change-Id: I5e159bbe116771b4efef96baa2e85b2dcf783a6f
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e159bbe116771b4efef96baa2e85b2dcf783a6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] Fixed handling of URL values in #forminput - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Fixed handling of URL values in #forminput
..


Fixed handling of URL values in #forminput

Change-Id: I33b58880d2b01e4e6f56f9aa0b84ea4cea0f7b26
---
M includes/SF_ParserFunctions.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/SF_ParserFunctions.php b/includes/SF_ParserFunctions.php
index 6ea5506..f2487d9 100644
--- a/includes/SF_ParserFunctions.php
+++ b/includes/SF_ParserFunctions.php
@@ -255,7 +255,10 @@
if ( count( $elements ) > 1 ) {
$paramName = trim( $elements[0] );
// Parse (and sanitize) parameter values.
-   $value = trim( $parser->recursiveTagParse( 
$elements[1] ) );
+   // We call recursivePreprocess() and not
+   // recursiveTagParse() so that URL values will
+   // not be turned into links.
+   $value = trim( $parser->recursivePreprocess( 
$elements[1] ) );
} else {
$paramName = trim( $param );
$value = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33b58880d2b01e4e6f56f9aa0b84ea4cea0f7b26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Translate project namesapce for jbowiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Translate project namesapce for jbowiki
..


Translate project namesapce for jbowiki

The unusual characters (apostrophe and dot) don't cause any problems with
basic page access and creation.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9c07ba4..c43aae6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2158,6 +2158,7 @@
'itwiktionary' => 'Wikizionario',
'iuwiki' => 'ᐅᐃᑭᐱᑎᐊ',
'jawikinews' => 'ウィキニュース',
+   'jbowiki' => 'uikipedi\'as', // T118067
'kawiki' => 'ვიკიპედია',
'kawikibooks' => 'ვიკიწიგნები',
'kawikiquote' => 'ვიკიციტატა',
@@ -2408,6 +2409,7 @@
'hsbwiktionary' => 'Diskusija_k_Wikisłownikej', // T43328
'huwikinews' => 'Wikihírek-vita',
'iswiktionary' => 'Wikiorðabókarspjall',
+   'jbowiki' => 'casnu_la_.uikipedi\'as.', // T118067
'kbdwiki' => 'Уикипедиэм_и_тепсэлъыхьыгъуэ',
'knwikisource' => 'ವಿಕಿಸೋರ್ಸ್_ಚರ್ಚೆ', // T110806
'kmwiki' => 'ការពិភាក្សាអំពីវិគីភីឌា',
@@ -3145,6 +3147,9 @@
'+jawikiversity' => array(
'Wikiversity_talk' => NS_PROJECT_TALK,
),
+   '+jbowiki' => array(
+   'Wikipedia_talk' => NS_PROJECT_TALK,
+   ),
'+kawikiquote' => array(
'Wikiquote_განხილვა' => NS_PROJECT_TALK,
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c36323377ed564c392f8d95783bf957bafc742f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable cluster-wide import setup on the Beta Cluster - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Enable cluster-wide import setup on the Beta Cluster
..


Enable cluster-wide import setup on the Beta Cluster

(Beta Cluster only for now.)

For labs, we have a hook function "wmfImportSources"
which lazy loads an importation list for the whole WMF
cluster. The setup is actually intended for production,
and is being tested on labs to make sure it works
correctly. Some of the wikis included as import sources
do not exist on the Beta Cluster.

Old config is still used for production.

Bug: T17583
Change-Id: Ib325df7c76837e1936b320d2a2441f10405090cd
---
A docroot/noc/conf/import.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings-labs.php
A wmf-config/import.php
4 files changed, 72 insertions(+), 0 deletions(-)

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



diff --git a/docroot/noc/conf/import.php.txt b/docroot/noc/conf/import.php.txt
new file mode 12
index 000..c8a3ef3
--- /dev/null
+++ b/docroot/noc/conf/import.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/import.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index 1afc39d..c498e69 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -19,6 +19,7 @@
filebackend-labs.php
filebackend.php
flaggedrevs.php
+   import.php
jobqueue-eqiad.php
LegalContactPages.php
AffComContactPages.php
diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 75212b3..36554d6 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -243,4 +243,9 @@
 
 $wgMessageCacheType = CACHE_ACCEL;
 
+// Test of new import source configuration on labs cluster
+$wgImportSources = false;
+include( "$wmfConfigDir/import.php" );
+$wgHooks['ImportSources'][] = 'wmfImportSources';
+
 } # end safeguard
diff --git a/wmf-config/import.php b/wmf-config/import.php
new file mode 100644
index 000..76a9f3a
--- /dev/null
+++ b/wmf-config/import.php
@@ -0,0 +1,65 @@
+ array(),
+   'wiktionary' => array(),
+   'wikibooks' => array(),
+   'wikinews' => array(),
+   'wikiquote' => array(),
+   'wikisource' => array( 'oldwikisource' ),
+   'wikiversity' => array( 'betawikiversity' ),
+   'wikivoyage' => array(),
+   'chapter' => array(),
+   // Add a selection of non-private special wikis
+   'foundation', 'mediawikiwiki', 'nostalgia', 'outreach', 
'strategy',
+   'tenwiki', 'testwiki', 'test2wiki', 'testwikidata', 'usability',
+   'wikidata', 'wikispecies', 'wikitech',
+   'wmania' => array(
+   'wm2005', 'wm2006', 'wm2007', 'wm2008', 'wm2009', 
'wm2010', 'wm2011',
+   'wm2012', 'wm2013', 'wm2014', 'wm2015', 'wm2016',
+   ),
+   );
+
+   // Add all regular language projects as import sources
+   foreach ( $wgConf->getLocalDatabases() as $dbname ) {
+   // No importing from private wikis
+   if ( isset( $privates[$dbname] ) ) {
+   continue;
+   }
+
+   list( $project, $subdomain ) = $wgConf->siteFromDB( $dbname );
+   if ( $project === 'wikimedia' ) {
+   $sources['chapter'][] = $subdomain;
+   } elseif ( $subdomain === 'en' || $subdomain === $lang ) {
+   // Put $lang and en at the top for convenience
+   array_unshift( $sources[$project], $subdomain );
+   } elseif (
+   // Don't list sites under "wikipedia" that are not 
Wikipedias (e.g. meta)
+   ( $project !== 'wikipedia' || isset( 
$wikipedias[$dbname] ) ) &&
+   $subdomain !== 'beta' // Beta Wikiversity is handled 
separately
+   ) {
+   $sources[$project][] = $subdomain;
+   }
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib325df7c76837e1936b320d2a2441f10405090cd
Gerrit-PatchSet: 13
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Calak 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] Bump src to 4119576f for deploy - change (mediawiki...deploy)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bump src to 4119576f for deploy
..

Bump src to 4119576f for deploy

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/52/257352/1

diff --git a/src b/src
index 5874788..4119576 16
--- a/src
+++ b/src
-Subproject commit 587478842816f4e11edb688dcb77de20a38aa8cf
+Subproject commit 4119576fa87f8f24051d2589851fe2d81a4b85d5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7ec64e1e45cb63457be32adb61c9a4bb8bcc44c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] Stop using Title::mTextform - change (mediawiki...TimedMediaHandler)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Stop using Title::mTextform
..

Stop using Title::mTextform

Change-Id: Idd51bda348d9d86916a0becea22005d6bf76774c
---
M WebVideoTranscode/WebVideoTranscode.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/55/257355/1

diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index 87d40c1..33467a8 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -555,7 +555,7 @@
'action' => 'query',
'prop' => 'videoinfo',
'viprop' => 'derivatives',
-   'titles' => MWNamespace::getCanonicalName( NS_FILE ) 
.':'. $file->getTitle()->mTextform
+   'titles' => MWNamespace::getCanonicalName( NS_FILE ) 
.':'. $file->getTitle()->getText()
);
 
$data = $file->repo->fetchImageQuery( $query );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd51bda348d9d86916a0becea22005d6bf76774c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Make MediaSizeWidget work without default/original dimensions - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Make MediaSizeWidget work without default/original dimensions
..


Make MediaSizeWidget work without default/original dimensions

Bug: T120653
Change-Id: I9c4e72c327c9eda5e1f50fcb4628fcf68f4bb490
---
M src/ui/widgets/ve.ui.MediaSizeWidget.js
1 file changed, 22 insertions(+), 9 deletions(-)

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



diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js 
b/src/ui/widgets/ve.ui.MediaSizeWidget.js
index fcd5a0a..bd7b543 100644
--- a/src/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -12,8 +12,10 @@
  * @extends OO.ui.Widget
  *
  * @constructor
- * @param {ve.dm.Scalable} scalable A scalable object
+ * @param {ve.dm.Scalable} [scalable] A scalable object
  * @param {Object} [config] Configuration options
+ * @cfg {boolean} [noDefaultDimensions] The item being sized doesn't have 
default dimensions
+ * @cfg {boolean} [noOriginalDimensions] The item being sized doesn't have 
original dimensions
  */
 ve.ui.MediaSizeWidget = function VeUiMediaSizeWidget( scalable, config ) {
var fieldScale, fieldCustom, scalePercentLabel;
@@ -21,7 +23,7 @@
// Configuration
config = config || {};
 
-   this.scalable = scalable || {};
+   this.scalable = scalable;
 
// Parent constructor
OO.ui.Widget.call( this, config );
@@ -31,6 +33,8 @@
this.currentDimensions = {};
this.maxDimensions = {};
this.valid = null;
+   this.noDefaultDimensions = !!config.noDefaultDimensions;
+   this.noOriginalDimensions = !!config.noOriginalDimensions;
 
// Define button select widget
this.sizeTypeSelectWidget = new OO.ui.ButtonSelectWidget( {
@@ -81,10 +85,12 @@
fieldCustom = new OO.ui.FieldLayout(
this.dimensionsWidget, {
align: 'right',
-   label: ve.msg( 
'visualeditor-mediasizewidget-label-custom' ),
classes: [ 've-ui-mediaSizeWidget-section-custom' ]
}
);
+   if ( !this.noDefaultDimensions || !this.noOriginalDimensions ) {
+   fieldCustom.setLabel( ve.msg( 
'visualeditor-mediasizewidget-label-custom' ) );
+   }
 
// Buttons
this.fullSizeButton = new OO.ui.ButtonWidget( {
@@ -93,18 +99,21 @@
} );
 
// Build GUI
-   this.$element
-   .addClass( 've-ui-mediaSizeWidget' )
-   .append(
-   this.sizeTypeSelectWidget.$element,
+   this.$element.addClass( 've-ui-mediaSizeWidget' );
+   if ( !this.noDefaultDimensions ) {
+   this.$element.append( this.sizeTypeSelectWidget.$element );
+   }
+   this.$element.append( fieldCustom.$element );
+   if ( !config.noOriginalDimensions ) {
+   this.$element.append(
// TODO: when upright is supported by Parsoid
// fieldScale.$element,
-   fieldCustom.$element,
this.fullSizeButton.$element,
$( '' )
.addClass( 've-ui-mediaSizeWidget-label-error' )
.append( this.errorLabel.$element )
);
+   }
 
// Events
this.dimensionsWidget.connect( this, {
@@ -204,7 +213,7 @@
 ve.ui.MediaSizeWidget.prototype.onDimensionsChange = function ( type, value ) {
var dimensions = {};
 
-   if ( Number( value ) === 0 ) {
+   if ( Number( value ) === 0 && !this.noDefaultDimensions ) {
this.setSizeType( 'default' );
} else {
this.setSizeType( 'custom' );
@@ -472,6 +481,10 @@
}
this.preventChangeRecursion = true;
 
+   if ( !this.scalable.isFixedRatio() ) {
+   dimensions = ve.extendObject( {}, this.getCurrentDimensions(), 
dimensions );
+   }
+
// Normalize the new dimensions
normalizedDimensions = ve.dm.Scalable.static.getDimensionsFromValue( 
dimensions, this.scalable.getRatio() );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c4e72c327c9eda5e1f50fcb4628fcf68f4bb490
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add support for the AreYouAHuman/PlayThru CAPTCHA - change (mediawiki...ConfirmEdit)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add support for the AreYouAHuman/PlayThru CAPTCHA
..

Add support for the AreYouAHuman/PlayThru CAPTCHA

Initial support.  Tested with MediaWiki 1.20.2 and 1.21.0.

Update README with mention of Ayah capture in similar manner to
existing entries.
Installing requires some more passages than usual, documented on wiki:
https://www.mediawiki.org/w/index.php?title=Extension:ConfirmEdit=696443#Are_You_A_Human_.28aka_PlayThru.29

Originaly from I632153da66a2cafc99003a622b711a16bae6f7cd

Changes since are converted to extension.json and converted i18n to json
format.

Also added the missing files that are needed for this bit to work.

Change-Id: I0406e64c534e5992985aaab7b3184ed07fbaec77
---
A AyahCaptcha.php
A AyahCaptcha/AreYouAHuman/ayah.php
A AyahCaptcha/AreYouAHuman/ayah_config.php
A AyahCaptcha/AreYouAHuman/change_log.txt
A AyahCaptcha/AreYouAHuman/json.php
A AyahCaptcha/AyahCaptcha.class.php
A AyahCaptcha/AyahCaptcha.php
A AyahCaptcha/extension.json
A AyahCaptcha/i18n/en.json
A AyahCaptcha/i18n/qqq.json
M README.md
11 files changed, 1,504 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/69/257369/1

diff --git a/AyahCaptcha.php b/AyahCaptcha.php
new file mode 100644
index 000..ec370af
--- /dev/null
+++ b/AyahCaptcha.php
@@ -0,0 +1,2 @@
+http://portal.areyouahuman.com/help
+ *- Get an AYAH Publisher Key
+ *   https://portal.areyouahuman.com
+ *- Discussion group
+ *   http://getsatisfaction.com/areyouahuman
+ *
+ * Copyright (c) 2013 AYAH LLC -- http://www.areyouahuman.com
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+// Only define the AYAH class if it does not already exist.
+if ( ! class_exists('AYAH')):
+
+class AYAH {
+   // Set defaults for values that can be specified via the config file or 
passed in via __construct.
+   protected $ayah_publisher_key = '';
+   protected $ayah_scoring_key = '';
+   protected $ayah_web_service_host = 'ws.areyouahuman.com';
+   protected $ayah_debug_mode = FALSE;
+   protected $ayah_use_curl = TRUE;
+
+   protected $session_secret;
+
+   protected $__valid_construct_params = array('publisher_key', 
'scoring_key', 'web_service_host', 'debug_mode', 'use_curl');
+   protected $__message_buffer = array();
+   protected $__version_number = '1.1.7';
+
+   /**
+* Constructor
+* If the session secret exists in input, it grabs it
+* @param $params associative array with keys publisher_key, 
scoring_key, web_service_host
+*
+*/
+   public function __construct($params = array())
+   {
+   // Try to load the ayah_config.php file.
+   if ( ! $this->__load_config_file())
+   {
+   $this->__log("DEBUG", __FUNCTION__, "The 
ayah_config.php file is missing.");
+   }
+
+   // Get and use any valid parameters that were passed in via the 
$params array.
+   foreach ((array)$this->__valid_construct_params as 
$partial_variable_name)
+   {
+   // Build the full variable name...and create an upper 
case version.
+   $variable_name = "ayah_" . $partial_variable_name;
+   $uc_variable_name = strtoupper($variable_name);
+
+   // Check to see if it was passed in via $params.
+   if (isset($params[$partial_variable_name]))
+   {
+   $this->{$variable_name} = 
$params[$partial_variable_name];
+   }
+   // Check to see if it was defined in the ayah_config 
file.
+   elseif (defined($uc_variable_name))
+   {
+   $this->{$variable_name} = 
constant($uc_variable_name);
+   }
+   }
+
+   // Generate some warnings/errors if needed variables are not 
set.
+   if ($this->ayah_publisher_key == "")
+   {
+   $this->__log("ERROR", __FUNCTION__, "Warning: Publisher 
key is not defined.  This won't work.");
+   }
+   else
+   {
+   $this->__log("DEBUG", __FUNCTION__, "Publisher key: 
'$this->ayah_publisher_key'");

[MediaWiki-commits] [Gerrit] Use Article::fetchContent instead of loadContent - change (mediawiki...Offline)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Use Article::fetchContent instead of loadContent
..

Use Article::fetchContent instead of loadContent

even though fetchContent is deprecated loadContent
will be removed first...

Change-Id: I69d30a37acbf82c2f7d79c71c8dc865a009bd8f5
---
M SpecialOffline.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Offline 
refs/changes/46/257346/1

diff --git a/SpecialOffline.php b/SpecialOffline.php
index 28fa4f3..69df5f0 100644
--- a/SpecialOffline.php
+++ b/SpecialOffline.php
@@ -73,7 +73,7 @@
 
//test that our handler is still hooked in
$mw_api_article = new Article(Title::newFromText($entry_title));
-   $mw_api_article->loadContent();
+   $mw_api_article->fetchContent();
$content = $mw_api_article->getContent();
 //wfDebug('got '.strlen($mw_api_article->mContent).' bytes of wml from cache');
$test_hooks = $mw_api_article->mContentLoaded;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69d30a37acbf82c2f7d79c71c8dc865a009bd8f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Offline
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Add Czech alias of Special:Notifications - change (mediawiki...Echo)

[Code Review]

Matěj Suchánek has uploaded a new change for review.

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

Change subject: Add Czech alias of Special:Notifications
..

Add Czech alias of Special:Notifications

Change-Id: I63ae5316d4493798907ef995b091feb2e304c453
---
M Echo.alias.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/51/257351/1

diff --git a/Echo.alias.php b/Echo.alias.php
index d02d230..3b61d19 100644
--- a/Echo.alias.php
+++ b/Echo.alias.php
@@ -49,6 +49,11 @@
'Notifications' => array( 'Benachrichtigungen' ),
 );
 
+/** Czech (čeština) */
+$specialPageAliases['cs'] = array(
+   'Notifications' => array( 'Upozornění' ),
+);
+
 /** Zazaki (Zazaki) */
 $specialPageAliases['diq'] = array(
'Notifications' => array( 'Mengeneyi' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63ae5316d4493798907ef995b091feb2e304c453
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

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

[MediaWiki-commits] [Gerrit] Rights configuration on fa.wikipedia - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Rights configuration on fa.wikipedia
..


Rights configuration on fa.wikipedia

Users could now be added to and removed from the 'autopatroller'
group by sysops.

Bug: T118847
Change-Id: I60fa833adcdcd461e1b23b6a0312561daa165ff7
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 004fbec..e082c1c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8709,7 +8709,6 @@
),
'+fawiki' => array(
'bureaucrat' => array(
-   'patroller',
'Image-reviewer', // T66532
'botadmin', // T71411
'OTRS-member', // T56368
@@ -8721,7 +8720,8 @@
'rollbacker', // T25233
'autopatrol', // T31007
'uploader', // T71171
-   'confirmed' // T87348
+   'confirmed', // T87348
+   'patroller', // T118847
),
'botadmin' => array(
'patroller',
@@ -9354,7 +9354,6 @@
),
'+fawiki' => array(
'bureaucrat' => array(
-   'patroller',
'Image-reviewer', // T66532
'botadmin', // T71411
'OTRS-member', // T56368
@@ -9366,7 +9365,8 @@
'rollbacker', // T25233
'autopatrol', // T31007
'uploader', // T71171
-   'confirmed' // T87348
+   'confirmed', // T87348
+   'patroller', // T118847
),
'botadmin' => array(
'patroller',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60fa833adcdcd461e1b23b6a0312561daa165ff7
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Workaround Mapbox View ProGuard rules - change (apps...wikipedia)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Workaround Mapbox View ProGuard rules
..


Workaround Mapbox View ProGuard rules

Untested.

Bug: T120388
Change-Id: I95192d0e79787479f9d5d77ca84b67cbd00929d6
---
M app/proguard-rules.pro
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9a73c2e..8a29c7b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -79,10 +79,9 @@
 # --- /HockeyApp ---
 
 # --- Mapbox ---
-# TODO: use official rules when 
https://github.com/mapbox/mapbox-android-sdk/issues/363 is resolved.
--dontwarn java.awt.**
--keep class com.nineoldandroids.animation.** {*;}
--keep class com.nineoldandroids.util.Property {*;}
+# TODO: remove when upstream patch is merged: 
https://phabricator.wikimedia.org/T120388
+-keep class com.mapbox.mapboxsdk.views.** { *; }
+
 # --- /Mapbox ---
 
 # --- Wikipedia ---

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95192d0e79787479f9d5d77ca84b67cbd00929d6
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add alias file - change (mediawiki...ConventionExtension)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add alias file
..


Add alias file

Add an alias file for the special pages because without this file errors
will be shown.

Change-Id: I4b3d937390088839ef491c3dff274d5c9a037a79
---
A ConventionExtension.alias.php
M ConventionExtension.php
2 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/ConventionExtension.alias.php b/ConventionExtension.alias.php
new file mode 100644
index 000..6bc1f30
--- /dev/null
+++ b/ConventionExtension.alias.php
@@ -0,0 +1,17 @@
+ array( 'ConferenceSetup' ),
+   'Dashboard' => array( 'Dashboard' ),
+   'AuthorRegister' => array( 'AuthorRegister' ),
+);
\ No newline at end of file
diff --git a/ConventionExtension.php b/ConventionExtension.php
index 01c464e..4ab3d84 100644
--- a/ConventionExtension.php
+++ b/ConventionExtension.php
@@ -113,6 +113,7 @@
 /* message files */
 $wgMessagesDirs['ConventionExtension'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['ConventionExtension'] = $wgCurrentDir . 
'ConventionExtension.i18n.php';
+$wgExtensionMessagesFiles['ConventionExtensionAlias'] = __DIR__ . 
'/ConventionExtension.alias.php';
 $wgExtensionMessagesFiles['ConventionExtensionMagic'] = $wgCurrentDir . 
'ConventionExtension.i18n.magic.php';
 
 /* resource modules */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b3d937390088839ef491c3dff274d5c9a037a79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConventionExtension
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stop using Title::mTextform - change (mediawiki...WYSIWYG)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Stop using Title::mTextform
..

Stop using Title::mTextform

Change-Id: Iee64d7f6e7c49f835f3e2d0aae73e86535bd
---
M WYSIWYG/CKeditorParser.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WYSIWYG 
refs/changes/56/257356/1

diff --git a/WYSIWYG/CKeditorParser.body.php b/WYSIWYG/CKeditorParser.body.php
index 3b004b8..c8f0d04 100644
--- a/WYSIWYG/CKeditorParser.body.php
+++ b/WYSIWYG/CKeditorParser.body.php
@@ -743,7 +743,7 @@
   $val = $cat;
 }
 $appendString .= $linebreak;
-if ($val != $title->mTextform) {
+if ($val != $title->getText()) {
   $appendString .= '' . str_replace('_', ' ', $cat) . '';
 } else {
   $appendString .= '' . 
str_replace('_', ' ', $cat) . '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee64d7f6e7c49f835f3e2d0aae73e86535bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WYSIWYG
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Fix phpunit for wikis with $wgResourceLoaderValidateJS = false - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Fix phpunit for wikis with $wgResourceLoaderValidateJS = false
..

Fix phpunit for wikis with $wgResourceLoaderValidateJS = false

1) ResourceLoaderModuleTest::testValidateScriptFile
Replace invalid syntax with error logging
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'var a = 'this is';
- {
-invalid'
+'mw.log.error("JavaScript parse error: Parse error: Unexpected token;
token } expected in file 'input' on line 3");'

Change-Id: I0271de4bf2d5bcc50eaf5c0e999e16e554985805
---
M tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/257361/1

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
index f700348..c49d701 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
@@ -69,6 +69,8 @@
 * @covers ResourceLoaderModule::validateScriptFile
 */
public function testValidateScriptFile() {
+   $this->setMwGlobals( 'wgResourceLoaderValidateJS', true );
+
$context = $this->getResourceLoaderContext();
 
$module = new ResourceLoaderTestModule( array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0271de4bf2d5bcc50eaf5c0e999e16e554985805
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Enable subpages on custom aliases from 112 to 119 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Enable subpages on custom aliases from 112 to 119
..


Enable subpages on custom aliases from 112 to 119

We've enabled in the past subpages for custom namespaces.
A bunch of them were forgotten for wikis wih a lot of namespaces.

We add a litle more of namespaces in the configuration to help to
cope with the namespaces inflation, from 112 to 119.

For example, T119207 requires a new namespace with subpages,
and it will receive an ID > 110.

Change-Id: I3998a8e29c2b28e01ac17014035bb5d7e94f1345
---
M wmf-config/InitialiseSettings.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 004fbec..a3d871d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3807,6 +3807,14 @@
109 => true,
110 => true,
111 => true,
+   112 => true,
+   113 => true,
+   114 => true,
+   115 => true,
+   116 => true,
+   117 => true,
+   118 => true,
+   119 => true,
),
 
// Wikipedia @{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3998a8e29c2b28e01ac17014035bb5d7e94f1345
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Namespace configuration for en.wiktionary - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Namespace configuration for en.wiktionary
..


Namespace configuration for en.wiktionary

New namespaces:
* 118: Reconstruction
* 119: Reconstruction talk

Add reference to tasks for previous custom namespaces.

Bug: T119207
Change-Id: Ia126f99560741dac291ee690a233f65942ea0ddd
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a3d871d..29d9783 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5672,7 +5672,7 @@
101 => 'Συζήτηση_παραρτήματος',
),
'enwiktionary' => array(
-   100 => 'Appendix',
+   100 => 'Appendix', // T8476
101 => 'Appendix_talk',
102 => 'Concordance',
103 => 'Concordance_talk',
@@ -5684,12 +5684,14 @@
109 => 'Transwiki_talk',
110 => 'Wikisaurus',
111 => 'Wikisaurus_talk',
-   # 112 => 'WT', # Removed these in favor of aliases --catrope 
1/18/2010
+   # 112 => 'WT', // Removed per T24104
# 113 => 'WT_talk',
114 => 'Citations',
115 => 'Citations_talk',
-   116 => 'Sign_gloss',
+   116 => 'Sign_gloss', // T26570
117 => 'Sign_gloss_talk',
+   118 => 'Reconstruction', // T119207
+   119 => 'Reconstruction_talk,'
),
'eowiktionary' => array(
NS_USER => 'Uzanto', // T24426

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia126f99560741dac291ee690a233f65942ea0ddd
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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