[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.ExtraParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Change-Id: I9a296b226da68191c2a460de71d791e1d9e286f2
---
M Babel.class.php
M composer.json
M phpcs.xml
3 files changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/Babel.class.php b/Babel.class.php
index 654c784..343d2c5 100644
--- a/Babel.class.php
+++ b/Babel.class.php
@@ -31,7 +31,7 @@
 * Render the Babel tower.
 *
 * @param Parser $parser
-* @param string [$parameter,...]
+* @param string $parameter,...
 * @return string Babel tower.
 */
public static function Render( Parser $parser ) {
diff --git a/composer.json b/composer.json
index 711d034..7a93cea 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.10.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index 10cc5e4..38cd2f2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,15 @@
 
 
-   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
.



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a296b226da68191c2a460de71d791e1d9e286f2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Define variables before they are used on service.pp

[Jcrespo (Code Review)]

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

Change subject: mariadb: Define variables before they are used on service.pp
..

mariadb: Define variables before they are used on service.pp

Silly bug fix- I am too tired.

Bug: T169514
Change-Id: I792649333cdf7323f2ce068224a44d1729436517
---
M modules/mariadb/manifests/service.pp
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/363845/1

diff --git a/modules/mariadb/manifests/service.pp 
b/modules/mariadb/manifests/service.pp
index 3aaabfe..7f9224f 100644
--- a/modules/mariadb/manifests/service.pp
+++ b/modules/mariadb/manifests/service.pp
@@ -22,12 +22,6 @@
 $override = false,
 ) {
 
-if $basedir == 'undefined' {
-$initd_basedir = "/opt/${package}"
-} else {
-$initd_basedir = $basedir
-}
-
 # stretch and later use systemd, others use init.d
 if os_version('debian >= stretch') {
 # On stretch+, default to MariaDB 10.1
@@ -87,6 +81,12 @@
 $installed_package = $package
 }
 
+if $basedir == 'undefined' {
+$initd_basedir = "/opt/${installed_package}"
+} else {
+$initd_basedir = $basedir
+}
+
 file { "${initd_basedir}/service":
 ensure  => present,
 owner   => 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I792649333cdf7323f2ce068224a44d1729436517
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] translatewiki[master]: Add more times for autosync.sh

[Nikerabbit (Code Review)]

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

Change subject: Add more times for autosync.sh
..

Add more times for autosync.sh

Because  why not.

Change-Id: I6cdff505fe824dea47de2d87e19c2590bcfd4b76
---
M puppet/modules/wiki/templates/wikimaintenance.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/44/363844/1

diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb 
b/puppet/modules/wiki/templates/wikimaintenance.erb
index e609c80..6011e66 100644
--- a/puppet/modules/wiki/templates/wikimaintenance.erb
+++ b/puppet/modules/wiki/templates/wikimaintenance.erb
@@ -1,6 +1,6 @@
 # file managed by puppet
 @weekly www-data find /www/translatewiki.net/docroot/images/thumb/ -name 
"*.png" -type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1> /dev/null
 @weekly <%= @user %> nice php 
/srv/mediawiki/targets/production/maintenance/generateSitemap.php --fspath 
/www/translatewiki.net/docroot/sitemap/ --skip-redirects --urlpath 
https://translatewiki.net/sitemap/
-48 6,10,13,16,20,22 * * * <%= @user %> <%= @config %>/bin/autosync.sh > 
/dev/null
+48 6,8,10,12,14,16,18,20,22 * * * <%= @user %> <%= @config %>/bin/autosync.sh 
> /dev/null
 48 7,13,21 * * * <%= @user %> <%= @config %>/bin/autosync-mediawiki.sh > 
/dev/null
 */10 * * * * root test -z "$(/bin/systemctl status mw-jobrunner | grep running 
-o)" && <%= @config %>/bin/udpcast JobQueue is not running

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cdff505fe824dea47de2d87e19c2590bcfd4b76
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Extract main logic from creation logic in Update class.

[Gehel (Code Review)]

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

Change subject: Extract main logic from creation logic in Update class.
..

Extract main logic from creation logic in Update class.

Splitting creation from core logic allows to reuse that core logic more
easily in another context.

Change-Id: I267c4d9cbd1881fb9f12c4a39cafffce1d5242c3
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
A tools/src/main/java/org/wikidata/query/rdf/tool/Updater.java
R 
tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdaterIntegrationTestBase.java
M tools/src/test/java/org/wikidata/query/rdf/tool/IOBlastingIntegrationTest.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/MultipleResultsQueryIntegrationTest.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/WikibaseDateExtensionIntegrationTest.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/WikibaseGeoExtensionIntegrationTest.java
7 files changed, 325 insertions(+), 298 deletions(-)


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

diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index afed6ff..9973412 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -1,22 +1,13 @@
 package org.wikidata.query.rdf.tool;
 
-import com.codahale.metrics.JmxReporter;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.commons.lang3.time.DateUtils;
-import org.openrdf.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.wikidata.query.rdf.common.uri.WikibaseUris;
 import org.wikidata.query.rdf.tool.change.Change;
-import org.wikidata.query.rdf.tool.change.Change.Batch;
 import org.wikidata.query.rdf.tool.change.IdListChangeSource;
 import org.wikidata.query.rdf.tool.change.IdRangeChangeSource;
 import org.wikidata.query.rdf.tool.change.RecentChangesPoller;
-import org.wikidata.query.rdf.tool.exception.ContainedException;
-import org.wikidata.query.rdf.tool.exception.RetryableException;
 import org.wikidata.query.rdf.tool.options.UpdateOptions;
 import org.wikidata.query.rdf.tool.rdf.Munger;
 import org.wikidata.query.rdf.tool.rdf.RdfRepository;
@@ -26,22 +17,13 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import static java.lang.Thread.currentThread;
 import static org.wikidata.query.rdf.tool.options.OptionsUtils.handleOptions;
 import static 
org.wikidata.query.rdf.tool.options.OptionsUtils.mungerFromOptions;
 import static 
org.wikidata.query.rdf.tool.wikibase.WikibaseRepository.inputDateFormat;
@@ -49,13 +31,13 @@
 
 /**
  * Update tool.
- *
- * @param  type of update batch
  */
-// TODO fan out complexity
-@SuppressWarnings("checkstyle:classfanoutcomplexity")
-public class Update implements Runnable {
+public final class Update {
 private static final Logger log = LoggerFactory.getLogger(Update.class);
+
+private Update() {
+// this class should never be instantiated
+}
 
 /**
  * Run updates configured from the command line.
@@ -87,7 +69,7 @@
 new LinkedBlockingQueue(), 
threadFactory.build());
 
 Munger munger = mungerFromOptions(options);
-new Update<>(changeSource, wikibaseRepository, rdfRepository, 
munger, executor,
+new Updater<>(changeSource, wikibaseRepository, rdfRepository, 
munger, executor,
 options.pollDelay(), uris, options.verify()).run();
 }
 }
@@ -99,8 +81,8 @@
  * logged to the user
  */
 @SuppressWarnings("checkstyle:cyclomaticcomplexity")
-private static Change.Source 
buildChangeSource(UpdateOptions options, RdfRepository rdfRepository,
-
WikibaseRepository wikibaseRepository) {
+private static Change.Source 
buildChangeSource(UpdateOptions options, RdfRepository rdfRepository,
+   
WikibaseRepository wikibaseRepository) {
 if (options.idrange() != null) {
 String[] ids = options.idrange().split("-");

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: move Options classes to their own package

[Gehel (Code Review)]

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

Change subject: move Options classes to their own package
..

move Options classes to their own package

This is a first step to split Update and Munge classes in smaller components.
At the moment, those classes act as main class, option parsing, object
factories and business logic. Splitting those fucntions will help refactor
the code further.

Change-Id: I5cc0ad63436cb936eb66fe0ada5057be9274a30e
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Munge.java
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
A tools/src/main/java/org/wikidata/query/rdf/tool/options/MungeOptions.java
R tools/src/main/java/org/wikidata/query/rdf/tool/options/OptionsUtils.java
A tools/src/main/java/org/wikidata/query/rdf/tool/options/UpdateOptions.java
M tools/src/test/java/org/wikidata/query/rdf/tool/Proxy.java
6 files changed, 85 insertions(+), 82 deletions(-)


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

diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Munge.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Munge.java
index 9a2e70a..af428a9 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Munge.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Munge.java
@@ -1,7 +1,7 @@
 package org.wikidata.query.rdf.tool;
 
-import static org.wikidata.query.rdf.tool.OptionsUtils.handleOptions;
-import static org.wikidata.query.rdf.tool.OptionsUtils.mungerFromOptions;
+import static org.wikidata.query.rdf.tool.options.OptionsUtils.handleOptions;
+import static 
org.wikidata.query.rdf.tool.options.OptionsUtils.mungerFromOptions;
 import static org.wikidata.query.rdf.tool.StreamUtils.utf8;
 
 import java.io.IOException;
@@ -39,16 +39,13 @@
 import org.wikidata.query.rdf.common.uri.Ontology;
 import org.wikidata.query.rdf.common.uri.SchemaDotOrg;
 import org.wikidata.query.rdf.common.uri.WikibaseUris;
-import org.wikidata.query.rdf.tool.OptionsUtils.BasicOptions;
-import org.wikidata.query.rdf.tool.OptionsUtils.MungerOptions;
-import org.wikidata.query.rdf.tool.OptionsUtils.WikibaseOptions;
+import org.wikidata.query.rdf.tool.options.MungeOptions;
 import org.wikidata.query.rdf.tool.exception.ContainedException;
 import org.wikidata.query.rdf.tool.rdf.Munger;
 import org.wikidata.query.rdf.tool.rdf.NormalizingRdfHandler;
 import org.wikidata.query.rdf.tool.rdf.PrefixRecordingRdfHandler;
 
 import com.codahale.metrics.Meter;
-import com.lexicalscope.jewel.cli.Option;
 
 import fi.iki.elonen.NanoHTTPD;
 
@@ -60,31 +57,11 @@
 private static final Logger log = LoggerFactory.getLogger(Munge.class);
 
 /**
- * CLI options for use with JewelCli.
- */
-@SuppressWarnings("checkstyle:javadocmethod")
-public interface Options extends BasicOptions, MungerOptions, 
WikibaseOptions {
-@Option(shortName = "f", defaultValue = "-", description = "Source 
file (or uri) to munge. Default is - aka stdin.")
-String from();
-
-@Option(shortName = "t", defaultValue = "-", description = 
"Destination of munge. Use port: to start an "
-+ "http server on that port. Default is - aka stdout. If the 
file's parent directories don't exist then they "
-+ "will be created ala mkdir -p.")
-String to();
-
-@Option(defaultValue = "0", description = "Chunk size in entities. If 
specified then the \"to\" option must be a java "
-+ "format string containing a single format identifier which 
is replaced with the chunk number port:. "
-+ "%08d.ttl is a pretty good choice for format string. If 
\"to\" is in port form then every http request will "
-+ "get the next chunk. Must be greater than 0 and less than " 
+ Integer.MAX_VALUE + ".")
-int chunkSize();
-}
-
-/**
  * Run a bulk munge configured from the command line.
  */
 @SuppressWarnings("checkstyle:illegalcatch")
 public static void main(String[] args) {
-Options options = handleOptions(Options.class, args);
+MungeOptions options = handleOptions(MungeOptions.class, args);
 WikibaseUris uris = new WikibaseUris(options.wikibaseHost());
 Munger munger = mungerFromOptions(options);
 
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 39d7af4..afed6ff 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -5,15 +5,11 @@
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.lexicalscope.jewel.cli.Option;
 import org.apache.commons.lang3.time.DateUtils;
 import 

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Remove redundant or useless PHPCS rules

[jenkins-bot (Code Review)]

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

Change subject: Remove redundant or useless PHPCS rules
..


Remove redundant or useless PHPCS rules

* Squiz.Classes.DuplicateProperty only applies to JavaScript files
* Both sniffs in PSR2.Files are already included in the default
MediaWiki ruleset
* Generic.PHP.CharacterBeforePHPOpeningTag is already in the MediaWiki
ruleset

Change-Id: Ifa9da4171cc29e732b9d048d862ea02ed9d7b139
---
M phpcs.xml
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/phpcs.xml b/phpcs.xml
index 4b5dd82..8c0a60f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -12,11 +12,7 @@

 

-   
 
-   
-
-   




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa9da4171cc29e732b9d048d862ea02ed9d7b139
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: new public servers add base + firewall

[Rush (Code Review)]

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

Change subject: labtest: new public servers add base + firewall
..


labtest: new public servers add base + firewall

Bug: T168893
Bug: T168892
Bug: T168894
Change-Id: I1c1e16d7f75b686cbb1a9ef0dc7e1de3c0e679e4
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 9587e08..93fe113 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1029,6 +1029,11 @@
 
 }
 
+node 'labtestcontrol2003.wikimedia.org' {
+include ::base::firewall
+include ::standard
+}
+
 node 'labtestpuppetmaster2001.wikimedia.org' {
 include ::standard
 include ::base::firewall
@@ -1042,6 +1047,11 @@
 include ::base::firewall
 }
 
+node /labtestservices200[23]\.wikimedia\.org/ {
+include ::base::firewall
+include ::standard
+}
+
 # Primary graphite machines
 node 'graphite1001.eqiad.wmnet' {
 role(graphite::production, statsd, performance::site, graphite::alerts,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: new public servers add base + firewall

[Rush (Code Review)]

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

Change subject: labtest: new public servers add base + firewall
..

labtest: new public servers add base + firewall

Bug: T168893
Bug: T168892
Bug: T168894
Change-Id: I1c1e16d7f75b686cbb1a9ef0dc7e1de3c0e679e4
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9587e08..93fe113 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1029,6 +1029,11 @@
 
 }
 
+node 'labtestcontrol2003.wikimedia.org' {
+include ::base::firewall
+include ::standard
+}
+
 node 'labtestpuppetmaster2001.wikimedia.org' {
 include ::standard
 include ::base::firewall
@@ -1042,6 +1047,11 @@
 include ::base::firewall
 }
 
+node /labtestservices200[23]\.wikimedia\.org/ {
+include ::base::firewall
+include ::standard
+}
+
 # Primary graphite machines
 node 'graphite1001.eqiad.wmnet' {
 role(graphite::production, statsd, performance::site, graphite::alerts,

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: build: Bump grunt clean and stylelint to latest

[jenkins-bot (Code Review)]

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

Change subject: build: Bump grunt clean and stylelint to latest
..


build: Bump grunt clean and stylelint to latest

 grunt-contrib-clean  1.0.0  →  1.1.0
 grunt-stylelint  0.7.0  →  0.8.0

Also, explicitly add stylelint which is now required as a peer.

Change-Id: Idd1f03e9853e5799bce15b6dbfcf858245229ce8
---
M package.json
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 2f7edd3..9ac2929 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
 "eslint-config-wikimedia": "0.4.0",
 "grunt": "1.0.1",
 "grunt-banana-checker": "0.6.0",
-"grunt-contrib-clean": "1.0.0",
+"grunt-contrib-clean": "1.1.0",
 "grunt-contrib-concat": "1.0.1",
 "grunt-contrib-copy": "1.0.0",
 "grunt-contrib-watch": "1.0.0",
@@ -33,7 +33,7 @@
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
 "grunt-karma": "2.0.0",
-"grunt-stylelint": "0.7.0",
+"grunt-stylelint": "0.8.0",
 "grunt-tyops": "0.1.0",
 "karma": "1.1.2",
 "karma-chrome-launcher": "1.0.1",
@@ -42,6 +42,7 @@
 "karma-mocha-reporter": "2.2.3",
 "karma-qunit": "1.0.0",
 "qunitjs": "1.23.1",
+"stylelint": "7.8.0",
 "stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd1f03e9853e5799bce15b6dbfcf858245229ce8
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Show legend of Special:SpecialPages more gradually

[Umherirrender (Code Review)]

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

Change subject: Show legend of Special:SpecialPages more gradually
..

Show legend of Special:SpecialPages more gradually

The legend is shown when restricted or cached pages are shown, but for
cached pages the legend does not contains a text, because there is no
default styling of cached special pages.
Break the note into two messages and disable the message for cached
pages for default. Wikis having style for cached pages can use this
message to create a legend.

Change-Id: Iec429d450ba7019bbd2cd2301a8280a562341387
---
M includes/specials/SpecialSpecialpages.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 27 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/363842/1

diff --git a/includes/specials/SpecialSpecialpages.php 
b/includes/specials/SpecialSpecialpages.php
index 451669c..4f29082 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -130,9 +130,29 @@
);
}
 
-   if ( $includesRestrictedPages || $includesCachedPages ) {
-   $out->wrapWikiMsg( "$1", 'specialpages-note-top' );
-   $out->wrapWikiMsg( "\n$1\n", 'specialpages-note' );
+   // add legend
+   $notes = [];
+   if ( $includesRestrictedPages ) {
+   $restricedMsg = $this->msg( 
'specialpages-note-restricted' );
+   if ( !$restricedMsg->isDisabled() ) {
+   $notes[] = $restricedMsg->plain();
+   }
+   }
+   if ( $includesCachedPages ) {
+   $cachedMsg = $this->msg( 'specialpages-note-cached' );
+   if ( !$cachedMsg->isDisabled() ) {
+   $notes[] = $cachedMsg->plain();
+   }
+   }
+   if ( $notes !== [] ) {
+   $out->wrapWikiMsg(
+   "$1", 'specialpages-note-top'
+   );
+   $out->addWikiText(
+   "\n" .
+   implode( "\n", $notes ) .
+   "\n"
+   );
}
}
 }
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 7d107d9..a88e21d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3773,7 +3773,8 @@
"specialpages": "Special pages",
"specialpages-summary": "",
"specialpages-note-top": "Legend",
-   "specialpages-note": "* Normal special pages.\n* Restricted special pages.",
+   "specialpages-note-restricted": "* Normal special pages.\n* Restricted special pages.",
+   "specialpages-note-cached": "-",
"specialpages-group-maintenance": "Maintenance reports",
"specialpages-group-other": "Other special pages",
"specialpages-group-login": "Login / create account",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 4d854d9..b25b019 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -3963,7 +3963,8 @@
"specialpages": "{{doc-special|SpecialPages|unlisted=1}}\nDisplay name 
of link to [[Special:SpecialPages]] shown on all pages in the toolbox.\n\nSee 
also:\n* {{msg-mw|Specialpages}}\n* {{msg-mw|Accesskey-t-specialpages}}\n* 
{{msg-mw|Tooltip-t-specialpages}}\n{{Identical|Special page}}",
"specialpages-summary": "{{doc-specialpagesummary|specialpages}}",
"specialpages-note-top": "Heading for 
{{msg-mw|specialpages-note}}.\n{{Identical|Legend}}",
-   "specialpages-note": "Footer note for the [[Special:SpecialPages]] 
page",
+   "specialpages-note-restricted": "Footer note for the 
[[Special:SpecialPages]] page",
+   "specialpages-note-cached": "{{ignore}}\nFooter note for the 
[[Special:SpecialPages]] page",
"specialpages-group-maintenance": 
"{{doc-special-group|like=[[Special:DoubleRedirects]], [[Special:LonelyPages]] 
and [[Special:WantedPages]]}}",
"specialpages-group-other": 
"{{doc-special-group|like=[[Special:AdminLinks]] and [[Special:BookSources]]}}",
"specialpages-group-login": 
"{{doc-special-group|like=[[Special:UserLogin]]}}",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make chunkedUpload match upload behavior

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363841 )

Change subject: Make chunkedUpload match upload behavior
..

Make chunkedUpload match upload behavior

.upload will upload the entire file, then reject the promise
if it has warnings.
This also happened in chunkedUpload, but a warning could already
be present after uploading only 1 chunk & that rejection would
cause the entire chain of chunks to stop.
Instead, it'll now keep uploading all chunks & then reject with
the complete upload data.

Also fixed how abort is dealt with when retrying because of
network issues.

Change-Id: I8ecef2271359a9505c8c5fa22883b0df55e9e914
---
M resources/src/mediawiki/api/upload.js
1 file changed, 76 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/363841/1

diff --git a/resources/src/mediawiki/api/upload.js 
b/resources/src/mediawiki/api/upload.js
index 9814142..42778ee 100644
--- a/resources/src/mediawiki/api/upload.js
+++ b/resources/src/mediawiki/api/upload.js
@@ -391,7 +391,7 @@
 * @return {jQuery.Promise}
 */
uploadChunk: function ( file, data, start, end, filekey, 
retries ) {
-   var upload, retry,
+   var upload,
api = this,
chunk = this.slice( file, start, end );
 
@@ -400,22 +400,6 @@
// In such case, it could be useful to try again: a 
network hickup
// doesn't necessarily have to result in upload 
failure...
retries = retries === undefined ? 1 : retries;
-   retry = function ( code, result ) {
-   var deferred = $.Deferred(),
-   callback = function () {
-   api.uploadChunk( file, data, 
start, end, filekey, retries - 1 )
-   .then( 
deferred.resolve, deferred.reject );
-   };
-
-   // Don't retry if the request failed because we 
aborted it (or
-   // if it's another kind of request failure)
-   if ( code !== 'http' || result.textStatus === 
'abort' ) {
-   return deferred.reject( code, result );
-   }
-
-   setTimeout( callback, 1000 );
-   return deferred.promise();
-   };
 
data.filesize = file.size;
data.chunk = chunk;
@@ -429,16 +413,82 @@
 
upload = this.uploadWithFormData( file, data );
return upload.then(
-   null,
-   // If the call fails, we may want to 
try again...
-   retries === 0 ? null : retry,
-   function ( fraction ) {
-   // Since we're only uploading 
small parts of a file, we
-   // need to adjust the reported 
progress to reflect where
-   // we actually are in the 
combined upload
-   return ( start + fraction * ( 
end - start ) ) / file.size;
+   null,
+   function ( code, result ) {
+   var retry;
+
+   // uploadWithFormData will reject 
uploads with warnings, but
+   // these warnings could be "harmless" 
or recovered from
+   // (e.g. exists-normalized, when it'll 
be renamed later)
+   // In the case of (only) a warning, we 
still want to
+   // continue the chunked upload until it 
completes: then
+   // reject it - at least it's been fully 
uploaded by then and
+   // failure handlers have a complete 
result object (including
+   // possibly more warnings, e.g. 
duplicate)
+   // This matches .upload, which also 
completes the upload.
+   if ( result.upload && 
result.upload.warnings && code in result.upload.warnings ) {
+   if ( end === file.size ) {
+   // uploaded last chunk 
= reject with result data
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Fix service for hosts with a default package

[Jcrespo (Code Review)]

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

Change subject: mariadb: Fix service for hosts with a default package
..


mariadb: Fix service for hosts with a default package

$package probably should be defined on the role everywhere, for
now we will allow to not set a default, and default to sane
options.

This fixes previous deployment of f13be9f5a2949f, which failed due
to not being able to create local variables on puppet with the
same name than a parameter.

Bug: T169514
Change-Id: I0ee40fa099446eee59a2255631a04ff8337e3309
---
M modules/mariadb/manifests/service.pp
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/modules/mariadb/manifests/service.pp 
b/modules/mariadb/manifests/service.pp
index 6247a22..3aaabfe 100644
--- a/modules/mariadb/manifests/service.pp
+++ b/modules/mariadb/manifests/service.pp
@@ -32,9 +32,11 @@
 if os_version('debian >= stretch') {
 # On stretch+, default to MariaDB 10.1
 if $package == 'undefined' {
-$package = 'wmf-mariadb101'
+$installed_package = 'wmf-mariadb101'
+} else {
+$installed_package = $package
 }
-case $package {
+case $installed_package {
 'wmf-mysql57', 'wmf-mysql80': { $vendor = 'mysql' }
 default:  { $vendor = 'mariadb' }
 }
@@ -80,7 +82,9 @@
 } else {
 # Before stretch, default to MariaDB 10.0
 if $package == 'undefined' {
-$package = 'wmf-mariadb10'
+$installed_package = 'wmf-mariadb10'
+} else {
+$installed_package = $package
 }
 
 file { "${initd_basedir}/service":
@@ -89,7 +93,7 @@
 group   => 'root',
 mode=> '0755',
 content => template('mariadb/mariadb.server.erb'),
-require => Package[$package],
+require => Package[$installed_package],
 }
 
 file { '/etc/init.d/mysql':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ee40fa099446eee59a2255631a04ff8337e3309
Gerrit-PatchSet: 4
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] integration/config[master]: Add revi <w...@ymhong.com> to whitelist.

[jenkins-bot (Code Review)]

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

Change subject: Add revi  to whitelist.
..


Add revi  to whitelist.

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0c7b4c5..c5d369b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -242,6 +242,7 @@
 | wikimedia\.org@eddie-sh\.de
 | wikiposta@gmail\.com
 | wiki@strainu\.ro
+| wiki@ymhong\.com
 | wirth@hallowelt\.biz
 | xietaoecho@gmail\.com
 | yaron57@gmail\.com
@@ -458,6 +459,7 @@
- ^washuu@gmail\.com$ # Alexia
- ^wctaiwan@gmail\.com$
- ^wiki@physikerwelt\.de$
+   - ^wiki@ymhong\.com$ # revi
- ^wikimedia\.org@eddie-sh\.de$ # EddieGP
- ^wirth@hallowelt\.biz$ # Pwirth
- ^yaron57@gmail\.com$

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f3f629c15d5540cb494741264346e4b5497abe9
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Revi 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix service for hosts with a default package (fwup. f13be9f5...

[Jcrespo (Code Review)]

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

Change subject: Fix service for hosts with a default package (fwup. 
f13be9f5a2949f)
..

Fix service for hosts with a default package (fwup. f13be9f5a2949f)

$package probably should be defined on the role everywhere, for
now we will allow to not set a default, and default to sane
options.

This fixes previous deployment of f13be9f5a2949f, which failed due
to not being able to create local variables on puppet with the
same name than a parameter.

Bug: T169514
Change-Id: I0ee40fa099446eee59a2255631a04ff8337e3309
---
M modules/mariadb/manifests/service.pp
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/363840/1

diff --git a/modules/mariadb/manifests/service.pp 
b/modules/mariadb/manifests/service.pp
index 6247a22..20d3971 100644
--- a/modules/mariadb/manifests/service.pp
+++ b/modules/mariadb/manifests/service.pp
@@ -32,9 +32,11 @@
 if os_version('debian >= stretch') {
 # On stretch+, default to MariaDB 10.1
 if $package == 'undefined' {
-$package = 'wmf-mariadb101'
+$installed_package = 'wmf-mariadb101'
+} else {
+$installed_package = $package;
 }
-case $package {
+case $installed_package {
 'wmf-mysql57', 'wmf-mysql80': { $vendor = 'mysql' }
 default:  { $vendor = 'mariadb' }
 }
@@ -80,7 +82,9 @@
 } else {
 # Before stretch, default to MariaDB 10.0
 if $package == 'undefined' {
-$package = 'wmf-mariadb10'
+$installed_package = 'wmf-mariadb10'
+} else {
+$installed_package = $package;
 }
 
 file { "${initd_basedir}/service":
@@ -89,7 +93,7 @@
 group   => 'root',
 mode=> '0755',
 content => template('mariadb/mariadb.server.erb'),
-require => Package[$package],
+require => Package[$installed_package],
 }
 
 file { '/etc/init.d/mysql':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ee40fa099446eee59a2255631a04ff8337e3309
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] operations/puppet[production]: Recommendation API: Add the beta scap source

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360686 )

Change subject: Recommendation API: Add the beta scap source
..


Recommendation API: Add the beta scap source

Bug: T165760
Change-Id: I9b85fd0a6981de4afd534f6c7e176f2f021fcc11
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index ea62082..e7587cb 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -312,5 +312,8 @@
   # RESTBase
   restbase/deploy: {}
 
+  # Recommendation API
+  recommendation-api/deploy: {}
+
 prometheus_nodes:
   - deployment-prometheus01.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b85fd0a6981de4afd534f6c7e176f2f021fcc11
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Whitelist more cirrus vars

[Tjones (Code Review)]

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

Change subject: Whitelist more cirrus vars
..


Whitelist more cirrus vars

this is useful when debugging on relforge

Change-Id: I73ce584c630f638c3cc13e73eb6d0828c1388c87
---
M CirrusSearch.php
1 file changed, 13 insertions(+), 2 deletions(-)

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



diff --git a/CirrusSearch.php b/CirrusSearch.php
index 43b2079..0d3bcd3 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -821,8 +821,6 @@
'phraseRescoreWindowSize',
'functionRescoreWindowSize',
'moreAccurateScoringMode',
-   'phraseSuggestMaxErrors',
-   'phraseSuggestConfidence',
'phraseSuggestUseText',
'phraseSuggestUseOpeningText',
'indexedRedirects',
@@ -852,6 +850,19 @@
'cacheWarmers',
'boostLinks',
'indexAllocation',
+   'fullTextQueryBuilderProfile',
+   'rescoreProfile',
+   'prefixSearchRescoreProfile',
+   'similarityProfile',
+   'crossProjectProfiles',
+   'crossProjectOrder',
+   'crossProjectSearchBlackList',
+   'extraIndexBoostTemplates',
+   'enableCrossProjectSearch',
+   'enableAltLanguage',
+   'enableArchive',
+   'useIcuFolding',
+   'useIcuTokenizer',
 ];
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73ce584c630f638c3cc13e73eb6d0828c1388c87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] php-session-serializer[master]: Bump minimum PHP version to 5.5.9

[jenkins-bot (Code Review)]

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

Change subject: Bump minimum PHP version to 5.5.9
..


Bump minimum PHP version to 5.5.9

Change-Id: I26869e1473990f1d4abcc96c9aa0b76b24883ebb
---
M .travis.yml
M composer.json
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index e52d774..5d7b980 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 sudo: false
 language: php
 php:
-  - "5.3"
-  - "5.4"
   - "5.5"
   - "5.6"
   - "7.0"
diff --git a/composer.json b/composer.json
index 1d6e758..96288d1 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
]
},
"require": {
-   "php": ">=5.3.3",
+   "php": ">=5.5.9",
"mediawiki/at-ease": "^1.0",
"psr/log": "^1.0"
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26869e1473990f1d4abcc96c9aa0b76b24883ebb
Gerrit-PatchSet: 1
Gerrit-Project: php-session-serializer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] php-session-serializer[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Also added "composer fix" command.

Change-Id: I6db75e841da62765c1fe2b5466bc4684536ab227
---
M composer.json
M phpcs.xml
M src/Wikimedia/PhpSessionSerializer.php
M tests/Wikimedia/PhpSessionSerializerTest.php
4 files changed, 211 insertions(+), 205 deletions(-)

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



diff --git a/composer.json b/composer.json
index 07cc9c1..1d6e758 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
-   "mediawiki/mediawiki-codesniffer": "0.5.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.0",
"phpunit/phpunit": "^4.8"
},
"scripts": {
@@ -30,6 +30,9 @@
"phpunit $PHPUNIT_ARGS",
"phpcs -p -s"
],
-   "cover": "phpunit --coverage-html coverage"
+   "cover": "phpunit --coverage-html coverage",
+   "fix": [
+   "phpcbf"
+   ]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index 06c43bc..4d6deb4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,9 @@
 
 
-   
+   
+   
+   
+   
.


diff --git a/src/Wikimedia/PhpSessionSerializer.php 
b/src/Wikimedia/PhpSessionSerializer.php
index e2ccfa8..b5aa6d6 100644
--- a/src/Wikimedia/PhpSessionSerializer.php
+++ b/src/Wikimedia/PhpSessionSerializer.php
@@ -58,11 +58,11 @@
 * @throws \\DomainException
 */
public static function setSerializeHandler() {
-   $formats = array(
+   $formats = [
'php_serialize',
'php',
'php_binary',
-   );
+   ];
 
// First, try php_serialize since that's the only one that 
doesn't suck in some way.
\MediaWiki\suppressWarnings();
@@ -186,7 +186,7 @@
 
if ( $error !== null ) {
self::$logger->error( 'Value unserialization failed: ' 
. $error );
-   return array( false, null );
+   return [ false, null ];
}
 
$serialized = serialize( $ret );
@@ -195,11 +195,11 @@
self::$logger->error(
'Value unserialization failed: read value does 
not match original string'
);
-   return array( false, null );
+   return [ false, null ];
}
 
$string = substr( $string, $l );
-   return array( true, $ret );
+   return [ true, $ret ];
}
 
/**
@@ -241,7 +241,7 @@
throw new \InvalidArgumentException( '$data must be a 
string' );
}
 
-   $ret = array();
+   $ret = [];
while ( $data !== '' && $data !== false ) {
$i = strpos( $data, '|' );
if ( $i === false ) {
@@ -312,7 +312,7 @@
throw new \InvalidArgumentException( '$data must be a 
string' );
}
 
-   $ret = array();
+   $ret = [];
while ( $data !== '' && $data !== false ) {
$l = ord( $data[0] );
if ( strlen( $data ) < ( $l & 127 ) + 1 ) {
diff --git a/tests/Wikimedia/PhpSessionSerializerTest.php 
b/tests/Wikimedia/PhpSessionSerializerTest.php
index e3452f6..1d16961 100644
--- a/tests/Wikimedia/PhpSessionSerializerTest.php
+++ b/tests/Wikimedia/PhpSessionSerializerTest.php
@@ -85,7 +85,7 @@
 
protected static function initTestData() {
self::$longKey = str_pad( 'long key ', 128, '-' );
-   self::$standardArray = array(
+   self::$standardArray = [
'true' => true,
'false' => false,
'int' => 42,
@@ -95,15 +95,15 @@
'-inf' => -INF,
'string' => 'string',
'empty string' => '',
-   'array' => array( 0, 1, 100 => 100, 3 => 3, 2 => 2, 
'foo' => 'bar' ),
-   'empty array' => array(),
-   'object' => (object)array( 'foo' => 'foo' ),
+   'array' => [ 0, 1, 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Support multiple instances directly on the module

[Jcrespo (Code Review)]

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

Change subject: mariadb: Support multiple instances directly on the module
..


mariadb: Support multiple instances directly on the module

Also use it on a new role dbstore_multiinstance as a test.

The idea is to have a common mariadb::config, and then one
resouce mariadb::instance usage for each mysql run, with its own
datadir, tmpdir, port and socket. The custom config should include
the extra config files on /etc/mysql/mysqld.config.d and either
init.d or systemd (with mariadb@.service) should be able to
handle the different configs.

Many questions are still left about the details, such as monitoring
- this is just a first test approximation.

Bug: T169514
Change-Id: Ib313d12e6784700e0afaccd443acb181b7a0e1d4
---
A modules/mariadb/manifests/instance.pp
M modules/mariadb/manifests/service.pp
A modules/mariadb/templates/instance.cnf.erb
A modules/role/manifests/mariadb/dbstore_multiinstance.pp
A modules/role/templates/mariadb/mysqld_config/dbstore3.my.cnf
5 files changed, 223 insertions(+), 1 deletion(-)

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



diff --git a/modules/mariadb/manifests/instance.pp 
b/modules/mariadb/manifests/instance.pp
new file mode 100644
index 000..8a8362d
--- /dev/null
+++ b/modules/mariadb/manifests/instance.pp
@@ -0,0 +1,39 @@
+# Setups additional instances for hosts that hosts more
+# than one instance
+define mariadb::instance(
+$port,
+$datadir = 'undefined',
+$tmpdir  = 'undefined',
+$socket  = 'undefined',
+) {
+if $datadir == 'undefined' {
+$datadir = "/srv/sqldata.${title}"
+}
+if $tmpdir == 'undefined' {
+$tmpdir  = "/srv/tmp.${title}"
+}
+if $tmpdir == 'undefined' {
+$socket  = "/run/mysqld/mysqld.${title}.sock"
+}
+
+file { $datadir:
+ensure => directory,
+owner  => 'mysql',
+group  => 'mysql',
+mode   => '0755',
+}
+
+file { $tmpdir:
+ensure => directory,
+owner  => 'mysql',
+group  => 'mysql',
+mode   => '0755',
+}
+
+file { "/etc/mysql/mysqld.conf.d/${title}.cnf":
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => template('mariadb/instance.cnf.erb'),
+}
+}
diff --git a/modules/mariadb/manifests/service.pp 
b/modules/mariadb/manifests/service.pp
index fc2f4af..6247a22 100644
--- a/modules/mariadb/manifests/service.pp
+++ b/modules/mariadb/manifests/service.pp
@@ -14,7 +14,7 @@
 # With $manage = true this class will set $ensure and $enabled as specified.
 
 class mariadb::service (
-$package  = 'wmf-mariadb10',
+$package  = 'undefined',
 $basedir  = 'undefined',
 $manage   = false,
 $ensure   = stopped,
@@ -30,6 +30,10 @@
 
 # stretch and later use systemd, others use init.d
 if os_version('debian >= stretch') {
+# On stretch+, default to MariaDB 10.1
+if $package == 'undefined' {
+$package = 'wmf-mariadb101'
+}
 case $package {
 'wmf-mysql57', 'wmf-mysql80': { $vendor = 'mysql' }
 default:  { $vendor = 'mariadb' }
@@ -74,6 +78,11 @@
 }
 }
 } else {
+# Before stretch, default to MariaDB 10.0
+if $package == 'undefined' {
+$package = 'wmf-mariadb10'
+}
+
 file { "${initd_basedir}/service":
 ensure  => present,
 owner   => 'root',
diff --git a/modules/mariadb/templates/instance.cnf.erb 
b/modules/mariadb/templates/instance.cnf.erb
new file mode 100644
index 000..9aefd5f
--- /dev/null
+++ b/modules/mariadb/templates/instance.cnf.erb
@@ -0,0 +1,4 @@
+[mysqld@<%= @title %>]
+datadir=<%= @datadir %>
+socket=<%= @socket %>
+port=<%= @port %>
diff --git a/modules/role/manifests/mariadb/dbstore_multiinstance.pp 
b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
new file mode 100644
index 000..802b32c
--- /dev/null
+++ b/modules/role/manifests/mariadb/dbstore_multiinstance.pp
@@ -0,0 +1,56 @@
+class role::mariadb::dbstore_multiinstance {
+system::role { 'mariadb::core':
+description => 'DBStore multi-instance server',
+}
+
+include ::standard
+include ::base::firewall
+include role::mariadb::monitor
+#TODO: Custom firewall rules
+
+#TODO: define one group per shard
+class {'mariadb::groups':
+mysql_group => 'dbstore',
+mysql_shard => 's1',
+mysql_role  => 'slave',
+socket  => '/run/mysqld/mysqld.s1.sock',
+}
+
+class {'mariadb::packages_wmf': }
+class {'mariadb::service':
+multiinstance => true,
+# for now we will keep things simple, we probably should have a
+# higher-level interface with templates
+override  => 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update reference screenshots

[jenkins-bot (Code Review)]

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

Change subject: Update reference screenshots
..


Update reference screenshots

Change-Id: I9ae016a494acaba855bf0040ff9a44a610b7c556
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditHelpViewTest.testWidth-480dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditHelpViewTest.testWidth-720dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testTheme-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testTheme-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-480dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-720dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-720dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditViewTest.testFocus-480dp-en-ltr-font1.0x-dark-saving.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditViewTest.testFocus-480dp-en-ltr-font1.0x-dark-unsaved.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditViewTest.testFocus-480dp-en-ltr-font1.0x-light-saving.png
M 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: WiP: GlobalAvtionsMenu: Better alingment for icons

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363839 )

Change subject: WiP: GlobalAvtionsMenu: Better alingment for icons
..

WiP: GlobalAvtionsMenu: Better alingment for icons

See ERM6718

Change-Id: I76cbaa139e38e5313ebb0060b4e1356ae1dc9cb4
---
M WikiAdmin/WikiAdmin.class.php
1 file changed, 9 insertions(+), 2 deletions(-)


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

diff --git a/WikiAdmin/WikiAdmin.class.php b/WikiAdmin/WikiAdmin.class.php
index 1dd5596..bdc388e 100644
--- a/WikiAdmin/WikiAdmin.class.php
+++ b/WikiAdmin/WikiAdmin.class.php
@@ -202,17 +202,24 @@
$aModulParams['iconCls'] = 'bs-icon-text';
}
 
+   $sIcon = Html::element(
+   'span',
+   [
+   'class' =>  'bs-admin-link ' . 
$aModulParams['iconCls']
+   ],
+   ''
+   );
$sLink = Html::element(
'a',
array(
'id' => 'bs-admin-'.$skeyLower,
'href' => $sUrl,
'title' => $sModulLabel,
-   'class' => 'bs-admin-link ' . 
$aModulParams['iconCls']
+   'class' => 'bs-admin-link'
),
$sModulLabel
);
-   $aOutSortable[$sModulLabel] = ''.$sLink.'';
+   $aOutSortable[$sModulLabel] = 
''.$sIcon.$sLink.'';
}
 
// Allow other extensions to add to the admin menu

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cbaa139e38e5313ebb0060b4e1356ae1dc9cb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] HtmlFormatter[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

Also add a "composer fix" command, and output the sniff code when
running phpcs.

Change-Id: Ie9e3ed31b07bf2d503fc0504cefd429f06e33f81
---
M composer.json
M src/HtmlFormatter.php
M tests/HtmlFormatterTest.php
3 files changed, 19 insertions(+), 17 deletions(-)

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



diff --git a/composer.json b/composer.json
index 73901a7..23a6297 100644
--- a/composer.json
+++ b/composer.json
@@ -20,13 +20,14 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"phpunit/phpunit": "4.7.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.1"
+   "mediawiki/mediawiki-codesniffer": "0.10.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
"phpunit",
-   "phpcs -p"
-   ]
+   "phpcs -sp"
+   ],
+   "fix": "phpcbf"
}
 }
diff --git a/src/HtmlFormatter.php b/src/HtmlFormatter.php
index e93ab1f..1e64564 100644
--- a/src/HtmlFormatter.php
+++ b/src/HtmlFormatter.php
@@ -25,7 +25,7 @@
 
 class HtmlFormatter {
/**
-* @var DOMDocument
+* @var \DOMDocument
 */
private $doc;
 
@@ -45,7 +45,7 @@
 
/**
 * Turns a chunk of HTML into a proper document
-* @param string $html
+* @param string $html HTML to wrap
 * @return string
 */
public static function wrapHTML( $html ) {
@@ -62,7 +62,7 @@
}
 
/**
-* @return DOMDocument DOM to manipulate
+* @return \DOMDocument DOM to manipulate
 */
public function getDoc() {
if ( !$this->doc ) {
@@ -88,7 +88,7 @@
 
/**
 * Sets whether images/videos/sounds should be removed from output
-* @param bool $flag
+* @param bool $flag Whether to remove or not
 */
public function setRemoveMedia( $flag = true ) {
$this->removeMedia = $flag;
@@ -182,7 +182,7 @@
foreach ( $removals['CLASS'] as $classToRemove ) {
$elements = $xpath->query( '//*[contains(@class, "' . 
$classToRemove . '")]' );
 
-   /** @var $element DOMElement */
+   /** @var $element \DOMElement */
foreach ( $elements as $element ) {
$classes = $element->getAttribute( 'class' );
if ( \preg_match( "/\b$classToRemove\b/", 
$classes ) && $element->parentNode ) {
@@ -207,7 +207,7 @@
 
/**
 * Removes a list of elelments from DOMDocument
-* @param array|DOMNodeList $elements
+* @param array|\DOMNodeList $elements
 * @return array Array of removed elements
 */
private function removeElements( $elements ) {
@@ -218,7 +218,7 @@
$list[] = $element;
}
}
-   /** @var $element DOMElement */
+   /** @var $element \DOMElement */
foreach ( $list as $element ) {
if ( $element->parentNode ) {
$element->parentNode->removeChild( $element );
@@ -260,12 +260,11 @@
 * specify the $element in the method it'll change the underlying dom 
and you won't be able to get
 * it back.
 *
-* @param DOMElement|string|null $element ID of element to get HTML 
from or
+* @param \DOMElement|string|null $element ID of element to get HTML 
from or
 *   false to get it from the whole tree
 * @return string Processed HTML
 */
public function getText( $element = null ) {
-
if ( $this->doc ) {
if ( $element !== null && !( $element instanceof 
\DOMElement ) ) {
$element = $this->doc->getElementById( $element 
);
@@ -309,10 +308,10 @@
 * values to parameters passed by reference. For example, if given 
'#toc' as the
 * $selector parameter, it will assign 'ID' as the $type and 'toc' as 
the $rawName.
 * @param string $selector CSS selector to parse
-* @param string $type The type of selector (ID, CLASS, TAG_CLASS, or 
TAG)
-* @param string $rawName The raw name of the selector
+* @param string &$type The type of selector (ID, CLASS, TAG_CLASS, or 
TAG)
+* @param string &$rawName The raw name of the selector
 * @return bool Whether the selector was successfully recognised
-  

[MediaWiki-commits] [Gerrit] cdb[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Also added "composer fix" command.

Change-Id: I6ed9bb11678983ea6cb0cf220c36bdd799353cbb
---
M composer.json
M phpcs.xml
M src/Reader/Hash.php
M src/Reader/PHP.php
M src/Writer/PHP.php
M tests/CdbTest.php
M tests/Reader/HashTest.php
7 files changed, 30 insertions(+), 21 deletions(-)

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



diff --git a/composer.json b/composer.json
index 728a5b3..5580e61 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "0.5.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.0"
},
"scripts": {
"test": [
@@ -39,6 +39,9 @@
"phpunit $PHPUNIT_ARGS",
"phpcs -p -s"
],
-   "cover": "phpunit --coverage-html coverage"
+   "cover": "phpunit --coverage-html coverage",
+   "fix": [
+   "phpcbf"
+   ]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index e086bd4..01c8457 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,12 @@
 
 
-   
+   
+   
+   
+   
+   
+   
+   
.
coverage
vendor
diff --git a/src/Reader/Hash.php b/src/Reader/Hash.php
index 8eaf670..cbc1807 100644
--- a/src/Reader/Hash.php
+++ b/src/Reader/Hash.php
@@ -61,7 +61,7 @@
 * Close the file. Optional, you can just let the variable go out of 
scope.
 */
public function close() {
-   $this->data = array();
+   $this->data = [];
$this->keys = null;
}
 
diff --git a/src/Reader/PHP.php b/src/Reader/PHP.php
index c388141..8506cfd 100644
--- a/src/Reader/PHP.php
+++ b/src/Reader/PHP.php
@@ -192,7 +192,7 @@
static $lookups;
 
if ( !$lookups ) {
-   $lookups = array();
+   $lookups = [];
for ( $i = 1; $i < 256; $i++ ) {
$lookups[ chr( $i ) ] = $i;
}
diff --git a/src/Writer/PHP.php b/src/Writer/PHP.php
index 2fd5405..374c6b6 100644
--- a/src/Writer/PHP.php
+++ b/src/Writer/PHP.php
@@ -52,7 +52,7 @@
$this->throwException(
'Unable to open CDB file "' . 
$this->tmpFileName . '" for write.' );
}
-   $this->hplist = array();
+   $this->hplist = [];
$this->numentries = 0;
$this->pos = 2048; // leaving space for the pointer array, 256 
* 8
if ( fseek( $this->handle, $this->pos ) == -1 ) {
@@ -122,10 +122,10 @@
 * @param int $h
 */
protected function addend( $keylen, $datalen, $h ) {
-   $this->hplist[] = array(
+   $this->hplist[] = [
'h' => $h,
'p' => $this->pos
-   );
+   ];
 
$this->numentries++;
$this->posplus( 8 );
@@ -163,7 +163,7 @@
}
 
// Fill in $starts with the *end* indexes
-   $starts = array();
+   $starts = [];
$pos = 0;
for ( $i = 0; $i < 256; ++$i ) {
$pos += $counts[$i];
@@ -177,7 +177,7 @@
$packedTables = array_fill( 0, $this->numentries, false 
);
} else {
// array_fill(): Number of elements must be positive
-   $packedTables = array();
+   $packedTables = [];
}
foreach ( $this->hplist as $item ) {
$packedTables[--$starts[255 & $item['h']]] = $item;
@@ -192,9 +192,9 @@
$len = $count + $count;
$final .= pack( 'VV', $this->pos, $len );
 
-   $hashtable = array();
+   $hashtable = [];
for ( $u = 0; $u < $len; ++$u ) {
-   $hashtable[$u] = array( 'h' => 0, 'p' => 0 );
+ 

[MediaWiki-commits] [Gerrit] cdb[master]: Revert "tests: Avoid use of ':class' to fix test run on PHP ...

[jenkins-bot (Code Review)]

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

Change subject: Revert "tests: Avoid use of ':class' to fix test run on PHP 5.4"
..


Revert "tests: Avoid use of ':class' to fix test run on PHP 5.4"

The minimum version is now 5.5.

This reverts commit 065b26bb4fdd7f172bec2f183def58ab293432bb.

Change-Id: Ibb3b727ddc5a930ed2ceb6f3467aed022d1e3d7b
---
M tests/CdbTest.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tests/CdbTest.php b/tests/CdbTest.php
index 2ea5a15..2ed655e 100644
--- a/tests/CdbTest.php
+++ b/tests/CdbTest.php
@@ -58,7 +58,7 @@
 */
public function testReaderOpen() {
$this->assertInstanceOf(
-   'Cdb\Reader',
+   Reader::class,
Reader::open( $this->phpCdbFile )
);
}
@@ -68,7 +68,7 @@
 */
public function testWriterOpen() {
$this->assertInstanceOf(
-   'Cdb\Writer',
+   Writer::class,
Writer::open( $this->phpCdbFile )
);
}
@@ -165,7 +165,7 @@
public function testDestruct() {
$w = new Writer\PHP( $this->phpCdbFile );
$this->assertInstanceOf(
-   'Cdb\Writer\PHP',
+   Writer\PHP::class,
$w
);
$w = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb3b727ddc5a930ed2ceb6f3467aed022d1e3d7b
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Documentation: Fix return value of IDatabase::insertSelect()

[jenkins-bot (Code Review)]

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

Change subject: Documentation: Fix return value of IDatabase::insertSelect()
..


Documentation: Fix return value of IDatabase::insertSelect()

Implementation at Database returns bool, not IResultWrapper

Change-Id: Ic560bfcb45f0e9cd1f4e8334e3b5dfc4e682452a
---
M includes/libs/rdbms/database/IDatabase.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/libs/rdbms/database/IDatabase.php 
b/includes/libs/rdbms/database/IDatabase.php
index 7c6413c..e463ea3 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -1252,7 +1252,7 @@
 * @param array $selectJoinConds Join conditions for the SELECT part of 
the query, see
 *IDatabase::select() for details.
 *
-* @return IResultWrapper
+* @return bool
 */
public function insertSelect( $destTable, $srcTable, $varMap, $conds,
$fname = __METHOD__,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic560bfcb45f0e9cd1f4e8334e3b5dfc4e682452a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Martineznovo 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] cdb[master]: Bump minimum PHP version to 5.5.9

[jenkins-bot (Code Review)]

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

Change subject: Bump minimum PHP version to 5.5.9
..


Bump minimum PHP version to 5.5.9

And add 7.0 and 7.1 to travis-ci

Change-Id: Ib04332e437e14eaf0808fb83e4c7b83024562787
---
M .travis.yml
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 19a0ad5..ca6ccdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 php:
-  - "5.3"
-  - "5.4"
   - "5.5"
   - "5.6"
+  - "7.0"
+  - "7.1"
   - "hhvm"
 sudo: false
 env:
diff --git a/composer.json b/composer.json
index 2c17e96..728a5b3 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
]
},
"require": {
-   "php": ">=5.3.2"
+   "php": ">=5.5.9"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib04332e437e14eaf0808fb83e4c7b83024562787
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] RunningStat[master]: Bump minimum PHP version requirement to 5.5.9

[jenkins-bot (Code Review)]

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

Change subject: Bump minimum PHP version requirement to 5.5.9
..


Bump minimum PHP version requirement to 5.5.9

Change-Id: I97397e243679a4b0b723ffbc385e554c0e5fcfc9
---
M .travis.yml
M composer.json
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 8c4bb1f..5d7b980 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 sudo: false
 language: php
 php:
-  - "5.3.3"
-  - "5.3"
-  - "5.4"
   - "5.5"
   - "5.6"
   - "7.0"
diff --git a/composer.json b/composer.json
index 5b84a88..b64affd 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
]
},
"require": {
-   "php": ">=5.3.3"
+   "php": ">=5.5.9"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97397e243679a4b0b723ffbc385e554c0e5fcfc9
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] RunningStat[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Also added "composer fix" command.

Change-Id: I5b8d30d0b0b82a3471e500ea1c8b2ae8e9006f8d
---
M composer.json
M phpcs.xml
M src/PSquare.php
M src/RunningStat.php
M tests/PSquareTest.php
M tests/RunningStatTest.php
6 files changed, 70 insertions(+), 61 deletions(-)

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



diff --git a/composer.json b/composer.json
index 685eedb..5b84a88 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,9 @@
}
],
"autoload": {
-   "classmap": ["src/"]
+   "classmap": [
+   "src/"
+   ]
},
"require": {
"php": ">=5.3.3"
@@ -18,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
"phpunit/phpunit": "4.8.*",
-   "mediawiki/mediawiki-codesniffer": "^0.5.0.0"
+   "mediawiki/mediawiki-codesniffer": "0.10.0"
},
"scripts": {
"test": [
@@ -26,6 +28,9 @@
"phpunit $PHPUNIT_ARGS",
"phpcs -p -s"
],
-   "cover": "phpunit --coverage-html coverage/"
+   "cover": "phpunit --coverage-html coverage/",
+   "fix": [
+   "phpcbf"
+   ]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index 06c43bc..91282e4 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,10 @@
 
 
-   
+   
+   
+   
+   
+   
.


diff --git a/src/PSquare.php b/src/PSquare.php
index 0a392af..18cfffa 100644
--- a/src/PSquare.php
+++ b/src/PSquare.php
@@ -39,13 +39,13 @@
private $p;
 
/** @var float[] Height of each marker. **/
-   private $heights = array();
+   private $heights = [];
 
/** @var int[] Position of each marker. **/
-   private $positions = array();
+   private $positions = [];
 
/** @var float[] Desired position of each marker. **/
-   private $desired = array();
+   private $desired = [];
 
/** @var int Number of observations. **/
private $numObservations = 0;
@@ -57,9 +57,9 @@
 */
public function __construct( $p = 0.5 ) {
$this->p = $p;
-   $this->positions = array( 0, 1, 2, 3, 4 );
-   $this->desired = array( 0, ( 2 * $p ), ( 4 * $p ), 2 + ( 2 * $p 
), 4 );
-   $this->increments = array( 0, ( $p / 2 ), $p, ( ( 1 + $p ) / 2 
), 1 );
+   $this->positions = [ 0, 1, 2, 3, 4 ];
+   $this->desired = [ 0, ( 2 * $p ), ( 4 * $p ), 2 + ( 2 * $p ), 4 
];
+   $this->increments = [ 0, ( $p / 2 ), $p, ( ( 1 + $p ) / 2 ), 1 
];
}
 
/**
diff --git a/src/RunningStat.php b/src/RunningStat.php
index 737e7d7..e0f5501 100644
--- a/src/RunningStat.php
+++ b/src/RunningStat.php
@@ -81,7 +81,7 @@
 * @param int|float $x Value to add
 */
public function addObservation( $x ) {
-   $x = (float) $x;
+   $x = (float)$x;
 
$this->min = min( $this->min, $x );
$this->max = max( $this->max, $x );
diff --git a/tests/PSquareTest.php b/tests/PSquareTest.php
index a3c3167..b6b31b1 100644
--- a/tests/PSquareTest.php
+++ b/tests/PSquareTest.php
@@ -47,79 +47,79 @@
$ps->addObservation( 3.39 );
 
$ps->addObservation( 22.37 );
-   $this->assertAttributeEquals( array( 0, 1, 2, 3, 5 ), 
'positions', $ps );
-   $this->assertAttributeEquals( array( 0, 1.25, 2.5, 3.75, 5 ), 
'desired', $ps, '', 0.1 );
-   $this->assertAttributeEquals( array( 0.02, 0.15, 0.74, 0.83, 
22.37 ), 'heights', $ps, '', 0.1 );
+   $this->assertAttributeEquals( [ 0, 1, 2, 3, 5 ], 'positions', 
$ps );
+   $this->assertAttributeEquals( [ 0, 1.25, 2.5, 3.75, 5 ], 
'desired', $ps, '', 0.1 );
+   $this->assertAttributeEquals( [ 0.02, 0.15, 0.74, 0.83, 22.37 
], 'heights', $ps, '', 0.1 );
 
$ps->addObservation( 10.15 );
-   $this->assertAttributeEquals( array( 0, 1, 2, 4, 6 ), 
'positions', $ps );
-   $this->assertAttributeEquals( array( 0, 1.5, 3, 4.5, 6 ), 
'desired', $ps, '', 0.1 );
-   $this->assertAttributeEquals( array( 0.02, 0.15, 0.74, 4.47, 
22.37 ), 'heights', $ps, '', 

[MediaWiki-commits] [Gerrit] mediawiki...GoogleLogin[master]: Enable some phpcs rules

[jenkins-bot (Code Review)]

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

Change subject: Enable some phpcs rules
..


Enable some phpcs rules

The following rules are now enabled and the code is fixed accordingly:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Change-Id: I957412e6bfec60fa9064701cc3020c8e88fe7b17
---
M includes/GoogleLogin.body.php
M includes/GoogleLogin.hooks.php
M includes/GoogleUser.php
M includes/alloweddomains/AllowedDomainsStore.php
M includes/alloweddomains/EmailDomain.php
M includes/alloweddomains/MutableAllowedDomainsStore.php
M phpcs.xml
7 files changed, 45 insertions(+), 38 deletions(-)

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



diff --git a/includes/GoogleLogin.body.php b/includes/GoogleLogin.body.php
index 2e918cf..81edee3 100755
--- a/includes/GoogleLogin.body.php
+++ b/includes/GoogleLogin.body.php
@@ -6,19 +6,19 @@
 
 use Google_Client;
 use GoogleLogin\AllowedDomains\AllowedDomainsStore;
-use GoogleLogin\AllowedDomains\CachedAllowedDomainsStore;
 use GoogleLogin\AllowedDomains\EmailDomain;
-use GoogleLogin\AllowedDomains\MutableAllowedDomainsStore;
 use MediaWiki\MediaWikiServices;
 
 class GoogleLogin {
-   /** @var $mGoogleClient Stores an instance of GoogleClient */
+   /** @var Google_Client $mGoogleClient Stores an instance of 
GoogleClient */
private static $mGoogleClient;
-   /** @var $mConfig Config object created for GoogleLogin extension */
+   /** @var \Config $mConfig object created for GoogleLogin extension */
private static $mConfig;
 
/**
 * Returns an prepared instance of Google client to do requests with to 
Google API
+* @param string $returnToUrl The URL to set for the redirectURI
+* @param string $token The token to set for the Goolge_Client state
 * @return Google_Client
 */
public static function getClient( $returnToUrl, $token ) {
diff --git a/includes/GoogleLogin.hooks.php b/includes/GoogleLogin.hooks.php
index 267107b..509645c 100644
--- a/includes/GoogleLogin.hooks.php
+++ b/includes/GoogleLogin.hooks.php
@@ -48,9 +48,11 @@
}
 
/**
-* Handles Updates to the UserMergeAccountFields of the UserMerge 
extension.
+* MergeAccountFromTo hook handler
 *
-* @param array &$updateFields
+* @param \User &$oldUser The user to "merge from"
+* @param \User &$newUser The user to "merge to"
+* @return bool
 */
public static function onMergeAccountFromTo( &$oldUser, &$newUser ) {
// check, if
@@ -79,7 +81,8 @@
 * Handle, what data needs to be deleted from the GoogleLogin tables 
when a user is
 * deleted through the UserMerge extension.
 *
-* @param array &$tablesToDelete
+* @param array &$tablesToDelete Array of table => user_id_field to 
delete
+* @return bool
 */
public static function onUserMergeAccountDeleteTables( &$tablesToDelete 
) {
$tablesToDelete['user_google_user'] = 'user_id';
@@ -91,10 +94,10 @@
 * AuthChangeFormFields hook handler. Give the "Login with Google" 
button a larger
 * weight as the LocalPasswordAuthentication Log in button.
 *
-* @param array $requests
-* @param array $fieldInfo
-* @param array $formDescriptor
-* @param $action
+* @param array $requests AuthenticationRequests for the current auth 
attempt
+* @param array $fieldInfo Array of field information
+* @param array &$formDescriptor Array of fields in a descriptor format
+* @param string $action one of the AuthManager::ACTION_* constants.
 */
public static function onAuthChangeFormFields( array $requests, array 
$fieldInfo,
array &$formDescriptor, $action
@@ -114,9 +117,9 @@
/**
 * Add GoogleLogin management events to Echo
 *
-* @param array $notifications Echo notifications
-* @param array $notificationCategories Echo categories
-* @param array $icons Echo icons
+* @param array &$notifications Echo notifications
+* @param array &$notificationCategories Echo categories
+* @param array &$icons Echo icons
 * @return bool
 */
public static function onBeforeCreateEchoEvent(
@@ -147,8 +150,8 @@
/**
 * Bundle GoogleLogin echo notifications if they're made from the same 
administrator.
 *
-* @param \EchoEvent $event
-* @param String 

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Pickle extension

[Umherirrender (Code Review)]

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

Change subject: Remove Pickle extension
..


Remove Pickle extension

Bug: T167610
Change-Id: Icc4b96e25ed22bf9626e82301891dcf4edf005a1
---
M .gitmodules
D Pickle
2 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 7f256a3..aa89675 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1922,10 +1922,6 @@
path = PhpTagsWiki
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PhpTagsWiki
branch = .
-[submodule "Pickle"]
-   path = Pickle
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Pickle
-   branch = .
 [submodule "PictureGame"]
path = PictureGame
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PictureGame
diff --git a/Pickle b/Pickle
deleted file mode 16
index 97e8774..000
--- a/Pickle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97e8774b197cca9f9cd4ee90a098c260a2385aab

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc4b96e25ed22bf9626e82301891dcf4edf005a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Change-Id: I1f26ccbd6c2cff74982166bfa43b9a693a8850d3
---
M composer.json
M includes/Hooks/ApiHooksHandler.php
M includes/Scoring.php
M maintenance/CheckModelVersions.php
M maintenance/CleanDuplicateScores.php
M maintenance/DumpThresholds.php
M maintenance/PopulateDatabase.php
M maintenance/PurgeScoreCache.php
M phpcs.xml
M tests/phpunit/includes/CacheTest.php
10 files changed, 28 insertions(+), 19 deletions(-)

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



diff --git a/composer.json b/composer.json
index 91d0813..15fdc96 100644
--- a/composer.json
+++ b/composer.json
@@ -1,14 +1,14 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.10.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
"parallel-lint . --exclude vendor",
-   "phpcs -p"
+   "phpcs -s -p"
]
}
 }
diff --git a/includes/Hooks/ApiHooksHandler.php 
b/includes/Hooks/ApiHooksHandler.php
index 53c5685..4a328fa 100644
--- a/includes/Hooks/ApiHooksHandler.php
+++ b/includes/Hooks/ApiHooksHandler.php
@@ -308,7 +308,7 @@
$logger->info( "Scoring errored for $revision: 
$mssg\n" );
} );
$cacheableScores = $cache->filterScores( $loadedScores, 
$cacheableRevids );
-   DeferredUpdates::addCallableUpdate( function() use ( 
$cache, $cacheableScores ) {
+   DeferredUpdates::addCallableUpdate( function () use ( 
$cache, $cacheableScores ) {
$cache->storeScores( $cacheableScores );
} );
 
diff --git a/includes/Scoring.php b/includes/Scoring.php
index 32e4f5c..b3da76a 100644
--- a/includes/Scoring.php
+++ b/includes/Scoring.php
@@ -24,8 +24,8 @@
}
 
$params = [
-   'models' => implode( '|', (array) $models ),
-   'revids' => implode( '|', (array) $revisions ),
+   'models' => implode( '|', (array)$models ),
+   'revids' => implode( '|', (array)$revisions ),
];
 
if ( $this->originalRequest === null ) {
diff --git a/maintenance/CheckModelVersions.php 
b/maintenance/CheckModelVersions.php
index 9f12e3d..d9c02ca 100644
--- a/maintenance/CheckModelVersions.php
+++ b/maintenance/CheckModelVersions.php
@@ -4,9 +4,9 @@
 
 use Maintenance;
 
-require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
-   : __DIR__ . '/../../../maintenance/Maintenance.php' );
+   : __DIR__ . '/../../../maintenance/Maintenance.php';
 
 /**
  * @ingroup Maintenance
diff --git a/maintenance/CleanDuplicateScores.php 
b/maintenance/CleanDuplicateScores.php
index 1add144..994e290 100644
--- a/maintenance/CleanDuplicateScores.php
+++ b/maintenance/CleanDuplicateScores.php
@@ -5,9 +5,9 @@
 use Maintenance;
 use MediaWiki\MediaWikiServices;
 
-require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
-   : __DIR__ . '/../../../maintenance/Maintenance.php' );
+   : __DIR__ . '/../../../maintenance/Maintenance.php';
 
 /**
  * @ingroup Maintenance
diff --git a/maintenance/DumpThresholds.php b/maintenance/DumpThresholds.php
index e3a01da..5e1695f 100644
--- a/maintenance/DumpThresholds.php
+++ b/maintenance/DumpThresholds.php
@@ -4,9 +4,9 @@
 
 use Maintenance;
 
-require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
-   : __DIR__ . '/../../../maintenance/Maintenance.php' );
+   : __DIR__ . 

[MediaWiki-commits] [Gerrit] mediawiki...GWToolset[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

[jenkins-bot (Code Review)]

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.ExtraParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
* MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Change-Id: Id98f147b80e9fa4a78eedf2b194c73f0dc10d11f
---
M composer.json
M includes/Forms/MetadataMappingForm.php
M includes/Handlers/UploadHandler.php
M includes/Handlers/Xml/XmlMappingHandler.php
M includes/Helpers/WikiChecks.php
M includes/Jobs/UploadMediafileJob.php
M includes/Utils.php
M maintenance/cleanupGWTFileBackend.php
M phpcs.xml
9 files changed, 18 insertions(+), 11 deletions(-)

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



diff --git a/composer.json b/composer.json
index e3e4a41..579fe1f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "mediawiki/mediawiki-codesniffer": "0.10.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/Forms/MetadataMappingForm.php 
b/includes/Forms/MetadataMappingForm.php
index c522b4c..bb2a4c4 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -29,7 +29,6 @@
 * an html form
 */
public static function getForm( FormHandler $Handler, array 
&$user_options ) {
-
$linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
$template_link = '[[Template:' .
Utils::sanitizeString( 
$user_options['gwtoolset-mediawiki-template-name'] ) .
diff --git a/includes/Handlers/UploadHandler.php 
b/includes/Handlers/UploadHandler.php
index 6437b7b..16817ca 100644
--- a/includes/Handlers/UploadHandler.php
+++ b/includes/Handlers/UploadHandler.php
@@ -286,7 +286,7 @@
 * url is to a script that returns the media file
 *   $url = https://www.rijksmuseum.nl/mediabin.jsp?id=RP-P-1956-764
 *   $url = 
'http://europeanastatic.eu/api/image?uri=http%3A%2F%2Fcollections.smvk.se
-
%3A8080%2Fcarlotta-em%2Fguest%2F1422401%2F13%2Fbild.jpg=LARGE=IMAGE';
+*   
%3A8080%2Fcarlotta-em%2Fguest%2F1422401%2F13%2Fbild.jpg=LARGE=IMAGE';
 *
 * url is redirected to another url that actually serves the media file
 *   $url = 'http://www.rijksmuseum.nl/media/assets/AK-RAK-1978-3';
@@ -746,7 +746,6 @@
public function saveMediafileViaJob(
array $user_options, array $options, array $whitelisted_post
) {
-
if ( count( $this->mediafile_jobs ) > 
(int)$user_options['gwtoolset-mediafile-throttle'] ) {
throw new MWException(
wfMessage( 'gwtoolset-developer-issue' )
diff --git a/includes/Handlers/Xml/XmlMappingHandler.php 
b/includes/Handlers/Xml/XmlMappingHandler.php
index 3f11e35..2d19574 100644
--- a/includes/Handlers/Xml/XmlMappingHandler.php
+++ b/includes/Handlers/Xml/XmlMappingHandler.php
@@ -148,7 +148,6 @@
 
// cycle over all of the elements in the record element provided
foreach ( $DOMNodeList as $DOMNodeElement ) {
-
// if the current element is not one that was mapped, 
skip it
if ( !array_key_exists(
$DOMNodeElement->tagName,
diff --git a/includes/Helpers/WikiChecks.php b/includes/Helpers/WikiChecks.php
index 0c7e461..50fc29f 100644
--- a/includes/Helpers/WikiChecks.php
+++ b/includes/Helpers/WikiChecks.php
@@ -186,7 +186,6 @@
 * @return {Status}
 */
public static function pageIsReadyForThisUser( SpecialPage $SpecialPage 
) {
-
$Status = self::verifyXMLReaderExists();
if ( !$Status->ok ) {
return $Status;
diff --git a/includes/Jobs/UploadMediafileJob.php 
b/includes/Jobs/UploadMediafileJob.php
index fa7044a..ceb3424 100755
--- a/includes/Jobs/UploadMediafileJob.php
+++ b/includes/Jobs/UploadMediafileJob.php
@@ -77,7 +77,7 @@
$oldUser = $wgUser;

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove advertise new feature in main menu

[jenkins-bot (Code Review)]

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

Change subject: Remove advertise new feature in main menu
..


Remove advertise new feature in main menu

Remove code relating to pointer overlays in main menu

It's not being used (since Gather) and has been
neglected, is broken and cannot be trusted.

If we need to use this again we should revert this patch and
fix the problems.

Change-Id: I52bf15ea45bdad954822a0d91aef0f7661524de3
---
M resources/skins.minerva.mainMenu.styles/mainmenu.less
M resources/skins.minerva.mainMenu/MainMenu.js
M skinStyles/mobile.pointerOverlay/minerva.less
3 files changed, 0 insertions(+), 62 deletions(-)

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



diff --git a/resources/skins.minerva.mainMenu.styles/mainmenu.less 
b/resources/skins.minerva.mainMenu.styles/mainmenu.less
index 9bc9fcd..4379032 100644
--- a/resources/skins.minerva.mainMenu.styles/mainmenu.less
+++ b/resources/skins.minerva.mainMenu.styles/mainmenu.less
@@ -26,23 +26,6 @@
position: relative;
 }
 
-.main-menu-button {
-   &.indicator-circle {
-   overflow: initial;
-   &:after {
-   content: '';
-   background-color: @colorProgressive;
-   width: 0.65em;
-   height: 0.65em;
-   position: absolute;
-   top: -0.4em;
-   right: 0.6em;
-   border: 0.2em solid #fff;
-   border-radius: 0.5em;
-   }
-   }
-}
-
 // needs to be more specific than .overlay rules
 .notifications-overlay.navigation-drawer {
right: 0;
diff --git a/resources/skins.minerva.mainMenu/MainMenu.js 
b/resources/skins.minerva.mainMenu/MainMenu.js
index 5a45472..babda9b 100644
--- a/resources/skins.minerva.mainMenu/MainMenu.js
+++ b/resources/skins.minerva.mainMenu/MainMenu.js
@@ -35,44 +35,6 @@
},
 
/**
-* Advertise a new feature in the main menu.
-* @param {string} selector to an element inside the main menu
-* @param {string} msg a message to show in the pointer
-* @return {jQuery.Deferred} with the PointerOverlay as the 
only argument.
-* @throws exception when you try to advertise more than one 
feature.
-*/
-   advertiseNewFeature: function ( selector, msg ) {
-   var d = $.Deferred(),
-   self = this;
-   if ( this._hasNewFeature ) {
-   throw new Error( 'A new feature is already 
being advertised.' );
-   } else {
-   this._hasNewFeature = true;
-   }
-   $( function () {
-   var $activator = $( self.activator ).eq( 0 );
-   $activator.addClass( 'indicator-circle' );
-   mw.loader.using( 'mobile.pointerOverlay' 
).done( function () {
-   $activator.one( 'click', function () {
-   var po,
-   PointerOverlay = 
require( 'mobile.pointerOverlay' );
-
-   po = new PointerOverlay( {
-   appendToElement: 
self.$el.parent(),
-   alignment: 'left',
-   summary: msg,
-   target: self.$( 
selector )
-   } );
-   po.show();
-   d.resolve( po );
-   $activator.removeClass( 
'indicator-circle' );
-   } );
-   } );
-   } );
-   return d;
-   },
-
-   /**
 * Turn on event logging on the existing main menu by reading 
`event-name` data
 * attributes on elements.
 */
diff --git a/skinStyles/mobile.pointerOverlay/minerva.less 
b/skinStyles/mobile.pointerOverlay/minerva.less
index 9d626a0..de7373b 100644
--- a/skinStyles/mobile.pointerOverlay/minerva.less
+++ b/skinStyles/mobile.pointerOverlay/minerva.less
@@ -89,10 +89,3 @@
}
}
 }
-
-.navigation-drawer {
-   .pointer-overlay {
-   right: auto;
-   width: @menuWidth;
-   }
-}

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Remove unused method

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Remove unused method
..


Hygiene: Remove unused method

Change-Id: Iab2d49c8df9f9cd6aa8ee748b206b728d213fb5d
---
M app/src/test/java/org/wikipedia/language/TranslationTests.java
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/app/src/test/java/org/wikipedia/language/TranslationTests.java 
b/app/src/test/java/org/wikipedia/language/TranslationTests.java
index 8c905e2..0e90a53 100644
--- a/app/src/test/java/org/wikipedia/language/TranslationTests.java
+++ b/app/src/test/java/org/wikipedia/language/TranslationTests.java
@@ -161,15 +161,6 @@
 }
 }
 
-private void checkTranslationHasNoParameter(String lang, Map.Entry entry) {
-String val1 = "[val1]";
-if (entry.getValue().contains(val1)) {
-final String msg = lang + ":" + entry.getKey() + " = " + 
entry.getValue() + "' contains " + val1;
-L.e(msg);
-mismatches.append(msg).append("\n");
-}
-}
-
 private void checkTranslationHasParameter(String lang, Map.Entry entry, String paramName, Object val1, String alternateFormat) {
 String subject = String.format(new Locale(lang), entry.getValue(), 
val1);
 if (!subject.contains(String.format(paramName, val1))

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

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

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

[MediaWiki-commits] [Gerrit] operations/software[master]: Update to mariadb 10.1.25, support multi-instance, move unit...

[Jcrespo (Code Review)]

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

Change subject: Update to mariadb 10.1.25, support multi-instance, move unit 
path
..


Update to mariadb 10.1.25, support multi-instance, move unit path

Bug: T169514
Change-Id: Id065733120595050ba3cf66b712007a101e84ba4
---
M dbtools/control-mariadb-10.1-jessie
M dbtools/control-mariadb-10.1-stretch
M dbtools/control-mariadb-client-10.1-jessie
M dbtools/control-mariadb-client-10.1-stretch
M dbtools/mariadb-deb
A dbtools/mariadb@.service
6 files changed, 191 insertions(+), 11 deletions(-)

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



diff --git a/dbtools/control-mariadb-10.1-jessie 
b/dbtools/control-mariadb-10.1-jessie
index 8680b1b..5323962 100644
--- a/dbtools/control-mariadb-10.1-jessie
+++ b/dbtools/control-mariadb-10.1-jessie
@@ -1,5 +1,5 @@
 Package: wmf-mariadb101
-Version: 10.1.24-1
+Version: 10.1.25-1
 Section: misc
 Priority: optional
 Architecture: amd64
diff --git a/dbtools/control-mariadb-10.1-stretch 
b/dbtools/control-mariadb-10.1-stretch
index a3fb124..d7affa3 100644
--- a/dbtools/control-mariadb-10.1-stretch
+++ b/dbtools/control-mariadb-10.1-stretch
@@ -1,5 +1,5 @@
 Package: wmf-mariadb101
-Version: 10.1.24-1
+Version: 10.1.25-1
 Section: misc
 Priority: optional
 Architecture: amd64
diff --git a/dbtools/control-mariadb-client-10.1-jessie 
b/dbtools/control-mariadb-client-10.1-jessie
index 55085fb..862f24d 100644
--- a/dbtools/control-mariadb-client-10.1-jessie
+++ b/dbtools/control-mariadb-client-10.1-jessie
@@ -1,5 +1,5 @@
 Package: wmf-mariadb101-client
-Version: 10.1.23-1
+Version: 10.1.25-1
 Section: misc
 Priority: optional
 Architecture: amd64
diff --git a/dbtools/control-mariadb-client-10.1-stretch 
b/dbtools/control-mariadb-client-10.1-stretch
index dd9d157..e25c712 100644
--- a/dbtools/control-mariadb-client-10.1-stretch
+++ b/dbtools/control-mariadb-client-10.1-stretch
@@ -1,5 +1,5 @@
 Package: wmf-mariadb101-client
-Version: 10.1.23-1
+Version: 10.1.25-1
 Section: misc
 Priority: optional
 Architecture: amd64
diff --git a/dbtools/mariadb-deb b/dbtools/mariadb-deb
index e51c8c3..a18587d 100755
--- a/dbtools/mariadb-deb
+++ b/dbtools/mariadb-deb
@@ -65,8 +65,9 @@
 if [[ ! "$(cat /etc/debian_version)" < "9" ]]; then
 initinstall="/bin/systemctl daemon-reload"
 initrm="/bin/systemctl daemon-reload"
-mkdir -p $makedir/etc/systemd/system
-cat $vendor.service | sed "s:BASEDIR:/opt/${optname}/:g" > 
$makedir/etc/systemd/system/$vendor.service
+mkdir -p $makedir/lib/systemd/system
+cat $vendor.service | sed "s:BASEDIR:${basedir}/:g" > 
$makedir/lib/systemd/system/$vendor.service
+cat $vendor@.service | sed "s:BASEDIR:${basedir}/:g" > 
$makedir/lib/systemd/system/$vendor@.service
 fi
 
 postinst="$makedir/DEBIAN/postinst"
@@ -79,12 +80,12 @@
 
 echo "removing unneeded files"
 # suite test
-rm -Rf $makedir/opt/$optname/mysql-test
+rm -Rf $makedir/$basedir/mysql-test
 # embebbed mysql & test binaries
-rm -f $makedir/opt/$optname/bin/mysql_client_test_embedded
-rm -f $makedir/opt/$optname/bin/mysqltest_embedded
-rm -f $makedir/opt/$optname/bin/mysql_embedded
-rm -f $makedir/opt/$optname/bin/mysql_client_test
+rm -f $makedir/$basedir/bin/mysql_client_test_embedded
+rm -f $makedir/$basedir/bin/mysqltest_embedded
+rm -f $makedir/$basedir/bin/mysql_embedded
+rm -f $makedir/$basedir/bin/mysql_client_test
 
 # making root the owner
 
diff --git a/dbtools/mariadb@.service b/dbtools/mariadb@.service
new file mode 100644
index 000..c7e8360
--- /dev/null
+++ b/dbtools/mariadb@.service
@@ -0,0 +1,179 @@
+# Multi instance version of mariadb. For if you run multiple versions at once.
+# Also used for mariadb@bootstrap to bootstrap Galera.
+#
+# create config file /etc/mysql/mysqld.conf.d/my{instancename}.cnf
+#
+# start as systemctl start mariadb@{instancename}.server
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# Thanks to:
+# Daniel Black
+# Erkan Yanar
+# David Strauss
+# and probably others
+# Inspired from 
https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-db/mysql-init-scripts/files/mysqld_at.service
+
+# Lightly customized for WMF needs by Jaime Crespo
+
+[Unit]
+Description=MariaDB database server
+After=network.target
+
+ConditionPathExists=/etc/mysql/mysqld.conf.d/%I.cnf
+
+[Install]
+WantedBy=multi-user.target
+Alias=mysql.service
+Alias=mysqld.service
+
+
+[Service]
+
+##
+## Core requirements
+##
+
+Type=notify
+
+# Setting this to true can break replication and the Type=notify settings
+# See also bind-address mysqld option.
+PrivateNetwork=false
+

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Activate perfield_builder by default on relforge profiles

[DCausse (Code Review)]

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

Change subject: Activate perfield_builder by default on relforge profiles
..

Activate perfield_builder by default on relforge profiles

this is closer to production defaults.

Change-Id: Ibc3f292c297961da35df88a1c33b28be5e60e55f
---
M tests/relforge/RelForgeSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/tests/relforge/RelForgeSettings.php 
b/tests/relforge/RelForgeSettings.php
index edc12ef..d20e365 100644
--- a/tests/relforge/RelForgeSettings.php
+++ b/tests/relforge/RelForgeSettings.php
@@ -40,6 +40,7 @@
 // Move to prod like defaults now
 $wgCirrusSearchSimilarityProfile = 'wmf_defaults';
 $wgCirrusSearchRescoreProfile = 'wsum_inclinks';
+$wgCirrusSearchFullTextQueryBuilderProfile = 'perfield_builder';
 
 // Activate devel options useful for relforge
 $wgCirrusSearchDevelOptions = [

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Move TranslationTests to plain JUnit, pt. 2

[jenkins-bot (Code Review)]

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

Change subject: Move TranslationTests to plain JUnit, pt. 2
..


Move TranslationTests to plain JUnit, pt. 2

Updates and re-enables plurals checking

Bug: T139546
Bug: T169917
Change-Id: I25cff0910cba552b2ecfe4ac5c26b02b917b674f
---
M app/src/test/java/org/wikipedia/language/TranslationTests.java
1 file changed, 15 insertions(+), 35 deletions(-)

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



diff --git a/app/src/test/java/org/wikipedia/language/TranslationTests.java 
b/app/src/test/java/org/wikipedia/language/TranslationTests.java
index 5c76a8a..8c905e2 100644
--- a/app/src/test/java/org/wikipedia/language/TranslationTests.java
+++ b/app/src/test/java/org/wikipedia/language/TranslationTests.java
@@ -15,8 +15,10 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -77,9 +79,7 @@
 Map hasFloatFirstParams = new 
StringCollector(POSSIBLE_PARAM_FLOAT_FIRST).collect(dir.getName(), doc);
 Map hasFloatThirdParams = new 
StringCollector(POSSIBLE_PARAM_FLOAT_THIRD).collect(dir.getName(), doc);
 Map hasTextUtilTemplateParams = new 
StringCollector("^1").collect(dir.getName(), doc);
-
-// TODO: handle in follow-up patch
-// List hasPluralRes = collectPluralResources();
+List hasPlurals = collectPluralResources(doc);
 
 if (!lang.equals("qq")) {
 for (Map.Entry entry : hasTags.entrySet()) {
@@ -88,7 +88,6 @@
 || entry.getKey().equals("notification_talk")
 || entry.getKey().equals("notification_reverted")
 || entry.getKey().equals("notification_thanks")) {
-// exceptions of the rule
 continue;
 }
 expectContains(lang, entry, "<", "");
@@ -124,9 +123,9 @@
 for (Map.Entry entry : 
hasTextUtilTemplateParams.entrySet()) {
 checkTranslationHasParameter(lang, entry, "^1", 
"[templateParam]", null);
 }
-/*for (Res res : pluralRes) {
-checkPluralHasOther(res);
-}*/
+for (Element elem : hasPlurals) {
+checkPluralHasOther(lang, elem);
+}
 }
 }
 assertThat("\n" + mismatches.toString(), mismatches.length(), is(0));
@@ -210,20 +209,13 @@
 }
 }
 
-/*private void checkPluralHasOther(Res res) {
-L.i(myLocale + ":" + res.name);
-try {
-final int paramOther = 42;
-getQuantityString(res.id, 0);
-getQuantityString(res.id, 1);
-getQuantityString(res.id, 2);
-getQuantityString(res.id, paramOther);
-} catch (Exception e) {
-final String msg = myLocale + ":" + res.name + " plural is missing 
'other'";
+private void checkPluralHasOther(String lang, Element elem) {
+if (elem.getElementsByAttributeValue("quantity", "other").size() <= 0) 
{
+final String msg = lang + ":" + elem.attr("name") + " plural is 
missing 'other'";
 L.e(msg);
 mismatches.append(msg).append("\n");
 }
-}*/
+}
 
 private boolean hasBadName(File pathname) {
 for (String name : BAD_NAMES) {
@@ -267,7 +259,6 @@
 // don't care about appcompat string; and preference string 
resources don't get translated
 assertParameterFormats(lang, name, value);
 
-// Find parameter
 boolean found = findParameter(value);
 if ((!negate && found) || (negate && !found)) {
 result.put(name, value);
@@ -319,20 +310,9 @@
 }
 }
 
-/*private List collectPluralResources() {
-final List resources = new ArrayList<>();
-final R.plurals pluralResources = new R.plurals();
-final Class c = R.plurals.class;
-final Field[] fields = c.getDeclaredFields();
-
-for (int i = 0, max = fields.length; i < max; i++) {
-final String name;
-final int resourceId;
-name = fields[i].getName();
-resourceId = fields[i].getInt(pluralResources);
-resources.add(new Res(resourceId, name));
-}
-
-return resources;
-}*/
+private List collectPluralResources(Document doc) {
+List result = new ArrayList<>();
+result.addAll(doc.select("plurals"));
+return result;
+}
 }

-- 
To 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Move TranslationTests to plain JUnit, pt. 1

[jenkins-bot (Code Review)]

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

Change subject: Move TranslationTests to plain JUnit, pt. 1
..


Move TranslationTests to plain JUnit, pt. 1

Stops depending on an Android system context for Resource handling and
instead iterates over the various strings.xml files, leveraging jsoup to
parse the strings directly from the XML and test them.

To follow: restore plurals testing.  (I'm sure jsoup can handle this
similarly, just trying to break things up a bit for ease of reviewing.)

Bug: T139546
Bug: T169917
Change-Id: Ie743651ac5a87f5956471759ec614c7a834a0fef
---
D app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
M app/src/main/res/values-ckb/strings.xml
A app/src/test/java/org/wikipedia/language/TranslationTests.java
3 files changed, 339 insertions(+), 417 deletions(-)

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



diff --git a/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java 
b/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
deleted file mode 100644
index 9e479e5..000
--- a/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
+++ /dev/null
@@ -1,416 +0,0 @@
-package org.wikipedia.test;
-
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.annotation.PluralsRes;
-import android.support.annotation.StringRes;
-import android.util.DisplayMetrics;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-import org.wikipedia.R;
-import org.wikipedia.model.BaseModel;
-import org.wikipedia.util.ConfigurationCompat;
-import org.wikipedia.util.log.L;
-
-import java.lang.reflect.Field;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.fail;
-
-/**
- * Tests to make sure that the string resources don't cause any issues. Mainly 
the goal is to test
- * all translations, but even the default strings are tested.
- *
- * TODO: check content_license_html is valid HTML
- */
-public class TranslationTests {
-// todo: consider regular expressions.
-private static final String POSSIBLE_PARAM_FLOAT_FIRST = "%1$.2f";
-private static final String POSSIBLE_PARAM_FLOAT_THIRD = "%3$.2f";
-
-/** Add more if needed, but then also add some tests. */
-private static final String[] POSSIBLE_PARAMS = new String[] {"%s", 
"%1$s", "%2$s", "%d",
-"%1$d", "%2$d", "%.2f", POSSIBLE_PARAM_FLOAT_FIRST, 
POSSIBLE_PARAM_FLOAT_THIRD, "^1"};
-
-private final StringBuilder mismatches = new StringBuilder();
-
-@Test public void testAllTranslations() {
-setLocale(Locale.ROOT.toString());
-String defaultLang = Locale.getDefault().getLanguage();
-List tagRes = new ResourceCollector("<", 
"").collectParameterResources(defaultLang);
-List noTagRes = new ResourceCollector("<", 
"").not().collectParameterResources(defaultLang);
-List stringParamRes = new 
ResourceCollector("%s").collectParameterResources(defaultLang);
-List twoStringParamRes = new 
ResourceCollector("%2$s").collectParameterResources(defaultLang);
-List twoDecimalParamRes = new 
ResourceCollector("%2$d").collectParameterResources(defaultLang);
-List decimalParamRes = new 
ResourceCollector("%d").collectParameterResources(defaultLang);
-List floatParamRes = new 
ResourceCollector("%.2f").collectParameterResources(defaultLang);
-List floatFirstParamRes = new 
ResourceCollector(POSSIBLE_PARAM_FLOAT_FIRST).collectParameterResources(defaultLang);
-List floatThirdParamRes = new 
ResourceCollector(POSSIBLE_PARAM_FLOAT_THIRD).collectParameterResources(defaultLang);
-List textUtilTemplateParamRes = new 
ResourceCollector("^1").collectParameterResources(defaultLang);
-List pluralRes = collectPluralResources();
-// todo: flag usage of templates {{}}.
-
-AssetManager assetManager = getResources().getAssets();
-for (String lang : assetManager.getLocales()) {
-L.i("locale=" + (lang.equals("") ? "DEFAULT" : lang));
-setLocale(lang);
-checkAllStrings(lang);
-
-// commented out during the transition from 1 param to 0
-//
checkTranslationHasNoParameter(R.string.saved_pages_search_empty_message);
-//
checkTranslationHasNoParameter(R.string.history_search_empty_message);
-
-if (!lang.startsWith("qq")) {
-// tag (html) parameters
-for (Res res : tagRes) {
-

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update reference screenshots

[Mholloway (Code Review)]

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

Change subject: Update reference screenshots
..

Update reference screenshots

Change-Id: I9ae016a494acaba855bf0040ff9a44a610b7c556
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditHelpViewTest.testWidth-480dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditHelpViewTest.testWidth-720dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testFocus-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testTheme-480dp-en-ltr-font1.0x-dark.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testTheme-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-480dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-480dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-720dp-en-ltr-font1.0x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditSuccessViewTest.testWidth-720dp-en-ltr-font1.5x-light.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditViewTest.testFocus-480dp-en-ltr-font1.0x-dark-saving.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditViewTest.testFocus-480dp-en-ltr-font1.0x-dark-unsaved.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditViewTest.testFocus-480dp-en-ltr-font1.0x-light-saving.png
M 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceCategoryManager[master]: Added icons and action column

[jenkins-bot (Code Review)]

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

Change subject: Added icons and action column
..


Added icons and action column

See ERM#6654

Change-Id: I325f0a78a086150fae2f2a289b443e386e92da63
---
M extension.json
M resources/BS.BlueSpiceCategoryManager/Model.js
M resources/BS.BlueSpiceCategoryManager/TreePanel.js
A resources/bluespice.categorymanager.css
4 files changed, 100 insertions(+), 18 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7e05e5e..a76e1bd 100644
--- a/extension.json
+++ b/extension.json
@@ -35,6 +35,9 @@
"scripts": [
"bluespice.categorymanager.js"
],
+   "styles": [
+   "bluespice.categorymanager.css"
+   ],
"dependencies": [
"ext.bluespice.extjs",
"ext.bluespice.extjs.BS.deferred",
diff --git a/resources/BS.BlueSpiceCategoryManager/Model.js 
b/resources/BS.BlueSpiceCategoryManager/Model.js
index 0e70951..42a0a31 100644
--- a/resources/BS.BlueSpiceCategoryManager/Model.js
+++ b/resources/BS.BlueSpiceCategoryManager/Model.js
@@ -1,7 +1,21 @@
 Ext.define( 'BS.BlueSpiceCategoryManager.Model', {
extend: 'BS.model.Category',
fields: [
-   { name: 'text', type: 'string' },
+   {
+   name: 'text', type: 'string', convert: function ( 
value, record ) {
+   return mw.html.element( 'a' , {
+   'href': mw.Title.makeTitle( 
bs.ns.NS_CATEGORY, record.raw.text ).getUrl(),
+   'class': (record.raw.leaf ? 
'bs-icon-tag' : 'bs-icon-tags' ),
+   'target': '_blank'
+   },
+   value );
+   }
+   },
+   {
+   name: 'categoryName', type: 'string', convert: function 
( value, record ) {
+   return record.raw.text;
+   }
+   },
{
name: 'leaf', type: 'boolean', convert: function ( 
value, record ) {
return false;
@@ -11,15 +25,6 @@
name: 'loaded', type: 'boolean', convert: function ( 
value, record ) {
return record.raw.leaf;
}
-   },
-   {
-   name: 'href', type: 'string', convert: function ( 
value, record ) {
-   var catTitle = mw.Title.makeTitle( 
bs.ns.NS_CATEGORY, record.get( 'text' ) );
-   return catTitle.getUrl();
-   }
-   },
-   {
-   name: 'hrefTarget', type: 'string', defaultValue: 
'_blank'
}
]
 } );
\ No newline at end of file
diff --git a/resources/BS.BlueSpiceCategoryManager/TreePanel.js 
b/resources/BS.BlueSpiceCategoryManager/TreePanel.js
index 8bd22cd..2ad4ef0 100644
--- a/resources/BS.BlueSpiceCategoryManager/TreePanel.js
+++ b/resources/BS.BlueSpiceCategoryManager/TreePanel.js
@@ -32,13 +32,17 @@
model: 'BS.BlueSpiceCategoryManager.Model'
});
 
+   var me = this;
+
this.treePanel = new Ext.tree.Panel({
useArrows: true,
height: 500,
rootVisible: false,
displayField: 'text',
store: this.store,
+   rowLines: true,
viewConfig: {
+   stripeRows : true,
plugins: {
ptype: 'treeviewdragdrop',
dragText: mw.message( 
'bs-categorymanager-draganddrop-text' ).plain(),
@@ -48,9 +52,34 @@
expandDelay: 250,
allowParentInserts: true
}
-   }
+   },
+   columns : [{
+   xtype: 'treecolumn', //this is so we know which 
column will show the tree
+   flex: 2,
+   dataIndex: 'text',
+   sortable: false
+   },
+   new Ext.grid.column.Action({
+   header: 
mw.message('bs-extjs-actions-column-header').plain(),
+   flex: 0,
+  

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Move linear model -> source text conversion to ElementLinear...

[Esanders (Code Review)]

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

Change subject: Move linear model -> source text conversion to ElementLinearData
..

Move linear model -> source text conversion to ElementLinearData

Here it can be re-used by others who may need to extract sections
of source from a document.

Change-Id: I465a3f6a8afcd6536293999eb40c01daeb9d905b
---
M src/dm/lineardata/ve.dm.ElementLinearData.js
M src/ui/ve.ui.Surface.js
2 files changed, 28 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/34/363834/1

diff --git a/src/dm/lineardata/ve.dm.ElementLinearData.js 
b/src/dm/lineardata/ve.dm.ElementLinearData.js
index c53355d..f3b4e75 100644
--- a/src/dm/lineardata/ve.dm.ElementLinearData.js
+++ b/src/dm/lineardata/ve.dm.ElementLinearData.js
@@ -758,6 +758,33 @@
 };
 
 /**
+ * Get the data as original source text (source mode only)
+ *
+ * Split paragraphs are converted to single line breaks. It is assumed the
+ * document contains nothing but plain text and paragraph elements.
+ *
+ * @param {ve.Range} [range] Range to get the data for. The whole data set if 
not specified.
+ * @return {string} Data as original source text
+ */
+ve.dm.ElementLinearData.prototype.getSourceText = function ( range ) {
+   var i,
+   data = this.data,
+   text = '';
+
+   range = range || new ve.Range( 0, this.getLength() );
+
+   for ( i = range.start; i < range.end; i++ ) {
+   if ( data[ i ].type === '/paragraph' && data[ i + 1 ].type === 
'paragraph' ) {
+   text += '\n';
+   } else if ( !data[ i ].type ) {
+   text += data[ i ];
+   }
+   }
+
+   return text;
+};
+
+/**
  * Get an offset at a distance to an offset that passes a validity test.
  *
  * - If {offset} is not already valid, one step will be used to move it to a 
valid one.
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 99ea13e..c6c0a23 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -207,22 +207,10 @@
  * @return {HTMLDocument} HTML document
  */
 ve.ui.Surface.prototype.getDom = function () {
-   var i, l, text, data;
-
// Optimized converter for source mode, which contains only
// plain text or paragraphs.
if ( this.getMode() === 'source' ) {
-   text = '';
-   data = this.getModel().getDocument().data.data;
-   for ( i = 0, l = data.length; i < l; i++ ) {
-   if ( data[ i ].type === '/paragraph' && data[ i + 1 
].type === 'paragraph' ) {
-   text += '\n';
-   } else if ( !data[ i ].type ) {
-   text += data[ i ];
-   }
-   }
-
-   return text;
+   return this.getModel().getDocument().data.getSourceText();
}
return ve.dm.converter.getDomFromModel( this.getModel().getDocument() );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I465a3f6a8afcd6536293999eb40c01daeb9d905b
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] mediawiki...BlueSpiceExtensions[master]: ExtendedSearch: removed ExtendedSearchAdmin

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363833 )

Change subject: ExtendedSearch: removed ExtendedSearchAdmin
..

ExtendedSearch: removed ExtendedSearchAdmin

It is not needed anymore.

ERM#6267

Manual cherry-pick from https://.wikimedia.org/r/#/c/362397/

Change-Id: I99630af5c6caa082e48c35afa6fcc3a9f39a32f5
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/extension.json
M ExtendedSearch/i18n/en.json
D ExtendedSearch/includes/ExtendedSearchAdmin.class.php
D ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.alias.php
D ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.class.php
D ExtendedSearch/resources/bluespice.extendedSearch.admin.js
D ExtendedSearch/resources/images/bs-searchindex-delete.png
D ExtendedSearch/resources/images/bs-searchindex-optimization.png
D ExtendedSearch/resources/images/bs-searchindex-rebuild.png
10 files changed, 2 insertions(+), 375 deletions(-)


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

diff --git a/ExtendedSearch/ExtendedSearch.class.php 
b/ExtendedSearch/ExtendedSearch.class.php
index 839f919..ffa4ddd 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -44,21 +44,6 @@
private $sWikiID = '';
 
/**
-* Constructor of ExtendedSearch class
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::'.__METHOD__ );
-WikiAdmin::registerModuleClass( 'ExtendedSearchAdmin', array(
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_suche_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-extendedsearchadmin-label',
-   'iconCls' => 'bs-icon-magnifying-glass'
-   ) );
-
-   wfProfileOut( 'BS::'.__METHOD__ );
-   }
-
-   /**
 * Initialization of ExtendedSearch extension
 */
protected function initExt() {
@@ -167,7 +152,6 @@
$wgAjaxExportList[] = 'ExtendedSearch::getRequestJson';
$wgAjaxExportList[] = 'ExtendedSearchBase::getAutocompleteData';
$wgAjaxExportList[] = 
'ExtendedSearchBase::getRecentSearchTerms';
-   $wgAjaxExportList[] = 'ExtendedSearchAdmin::getProgressBar';
 
$bsgExtendedSearchBoostQuerySettings = array(
'namespace' => array(
diff --git a/ExtendedSearch/extension.json b/ExtendedSearch/extension.json
index 724792f..3e82d45 100644
--- a/ExtendedSearch/extension.json
+++ b/ExtendedSearch/extension.json
@@ -19,8 +19,7 @@
},
"callback": "ExtendedSearch::onRegistration",
"SpecialPages": {
-   "SpecialExtendedSearch": "SpecialExtendedSearch",
-   "ExtendedSearchAdmin": "SpecialExtendedSearchAdmin"
+   "SpecialExtendedSearch": "SpecialExtendedSearch"
},
"APIModules": {
"feedextendedsearch": "ApiFeedExtendedSearch"
@@ -31,8 +30,7 @@
]
},
"ExtensionMessagesFiles": {
-   "ExtendedSearchAlias": 
"languages/SpecialExtendedSearch.alias.php",
-   "ExtendedSearchAdminAlias": 
"includes/specials/SpecialExtendedSearchAdmin.alias.php"
+   "ExtendedSearchAlias": 
"languages/SpecialExtendedSearch.alias.php"
},
"AutoloadClasses": {
"ApiFeedExtendedSearch": "api/ApiFeedExtendedSearch.php",
@@ -53,7 +51,6 @@
"BuildIndexMwSingleFile": 
"includes/BuildIndex/BuildIndexMwSingleFile.class.php",
"BuildIndexMwSpecialLinked": 
"includes/BuildIndex/BuildIndexMwSpecialLinked.class.php",
"BuildIndexMwLinked": 
"includes/BuildIndex/BuildIndexMwLinked.class.php",
-   "ExtendedSearchAdmin": "includes/ExtendedSearchAdmin.class.php",
"ExtendedSearchBase": "includes/ExtendedSearchBase.class.php",
"SearchIndex": "includes/SearchIndex/SearchIndex.class.php",
"SearchOptions": "includes/SearchIndex/SearchOptions.class.php",
@@ -71,7 +68,6 @@
"ViewMoreLikeThis": "views/view.MoreLikeThis.php",
"ViewExtendedSearchResultEntry": 
"views/view.ExtendedSearchResultEntry.php",
"SpecialExtendedSearch": 
"includes/specials/SpecialExtendedSearch.class.php",
-   "SpecialExtendedSearchAdmin": 
"includes/specials/SpecialExtendedSearchAdmin.class.php",
"TagCloudSearchStatsHandler": 
"includes/Handler/TagCloudSearchStatsHandler.class.php"
},
"ResourceModules": {
@@ -91,9 +87,6 @@
"dependencies": [
"jquery.ui.autocomplete"
]
-   },
-   

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Whitelist more cirrus vars

[DCausse (Code Review)]

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

Change subject: Whitelist more cirrus vars
..

Whitelist more cirrus vars

this is useful when debugging on relforge

Change-Id: I73ce584c630f638c3cc13e73eb6d0828c1388c87
---
M CirrusSearch.php
1 file changed, 13 insertions(+), 2 deletions(-)


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

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 43b2079..0d3bcd3 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -821,8 +821,6 @@
'phraseRescoreWindowSize',
'functionRescoreWindowSize',
'moreAccurateScoringMode',
-   'phraseSuggestMaxErrors',
-   'phraseSuggestConfidence',
'phraseSuggestUseText',
'phraseSuggestUseOpeningText',
'indexedRedirects',
@@ -852,6 +850,19 @@
'cacheWarmers',
'boostLinks',
'indexAllocation',
+   'fullTextQueryBuilderProfile',
+   'rescoreProfile',
+   'prefixSearchRescoreProfile',
+   'similarityProfile',
+   'crossProjectProfiles',
+   'crossProjectOrder',
+   'crossProjectSearchBlackList',
+   'extraIndexBoostTemplates',
+   'enableCrossProjectSearch',
+   'enableAltLanguage',
+   'enableArchive',
+   'useIcuFolding',
+   'useIcuTokenizer',
 ];
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MultiWriteBagOStuff: Fix async writes of mutable objects

[Anomie (Code Review)]

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

Change subject: MultiWriteBagOStuff: Fix async writes of mutable objects
..

MultiWriteBagOStuff: Fix async writes of mutable objects

If someone writes an object into a BagOStuff, they typically expect that
later changes to the object will not affect the value stored.
MultiWriteBagOStuff's async write handling was violating this
expectation, which is potentially causing T168040.

Bug: T168040
Change-Id: Ie897b900befdc8998614af06f9339cd07665703e
---
M includes/libs/objectcache/MultiWriteBagOStuff.php
M tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
2 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/363831/1

diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php 
b/includes/libs/objectcache/MultiWriteBagOStuff.php
index 687c67c..d94578d 100644
--- a/includes/libs/objectcache/MultiWriteBagOStuff.php
+++ b/includes/libs/objectcache/MultiWriteBagOStuff.php
@@ -181,6 +181,12 @@
$ret = true;
$args = array_slice( func_get_args(), 3 );
 
+   if ( $count > 1 && $asyncWrites ) {
+   // Deep-clone $args to prevent misbehavior when 
something writes an
+   // object to the BagOStuff then modifies it afterwards, 
e.g. T168040.
+   $args = unserialize( serialize( $args ) );
+   }
+
foreach ( $this->caches as $i => $cache ) {
if ( $i >= $count ) {
break; // ignore the lower tiers
diff --git 
a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
index 775709f..4a9f6cc 100644
--- a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
@@ -81,22 +81,26 @@
 */
public function testSetDelayed() {
$key = wfRandomString();
-   $value = wfRandomString();
+   $value = (object)[ 'v' => wfRandomString() ];
+   $expectValue = clone $value;
 
// XXX: DeferredUpdates bound to transactions in CLI mode
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
$this->cache->set( $key, $value );
 
+   // Test that later changes to $value don't affect the saved 
value (e.g. T168040)
+   $value->v = 'bogus';
+
// Set in tier 1
-   $this->assertEquals( $value, $this->cache1->get( $key ), 
'Written to tier 1' );
+   $this->assertEquals( $expectValue, $this->cache1->get( $key ), 
'Written to tier 1' );
// Not yet set in tier 2
$this->assertEquals( false, $this->cache2->get( $key ), 'Not 
written to tier 2' );
 
$dbw->commit();
 
// Set in tier 2
-   $this->assertEquals( $value, $this->cache2->get( $key ), 
'Written to tier 2' );
+   $this->assertEquals( $expectValue, $this->cache2->get( $key ), 
'Written to tier 2' );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Fix for Gruppenverwaltung in Global actions alignment

[ItSpiderman (Code Review)]

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

Change subject: Fix for Gruppenverwaltung in Global actions alignment
..

Fix for Gruppenverwaltung in Global actions alignment

Change-Id: If94848be026b9d1dfbacae86f22711d4196a937a
ERM: #6718
---
M resources/bluespice/bluespice.icons.css
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/30/363830/1

diff --git a/resources/bluespice/bluespice.icons.css 
b/resources/bluespice/bluespice.icons.css
index bcfc1d5..978770e 100644
--- a/resources/bluespice/bluespice.icons.css
+++ b/resources/bluespice/bluespice.icons.css
@@ -166,6 +166,7 @@
 
 .bs-icon-group:before{
content: "\e972";
+   font-size: 0.8em;
 }
 
 .bs-icon-register-box:before{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If94848be026b9d1dfbacae86f22711d4196a937a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Final design rework of onboarding screens.

[jenkins-bot (Code Review)]

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

Change subject: Final design rework of onboarding screens.
..


Final design rework of onboarding screens.

- Made an even more generalized OnboardingFragment that hosts a ViewPager
  which pages between different onboarding views, while maintaining
  certain fixed elements in place (the pager dot indicator, the skip
  button, the background gradient, etc).
- The Initial and DescriptionEditing onboarding workflows are now
  derivatives of the base OnboardingFragment, with just a few simple
  overrides.

Bug: T166393
Bug: T169106
Change-Id: Ib44245c81470581481d1624c29397361fa705a5c
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/src/androidTest/java/org/wikipedia/descriptions/DescriptionEditTutorialPageViewTest.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialPage.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialPagerAdapter.java
M app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
A app/src/main/java/org/wikipedia/onboarding/OnboardingFragment.java
M app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java
A app/src/main/res/drawable/ic_chevron_forward_white_24dp.xml
M app/src/main/res/drawable/illustration_onboarding_explore.png
M app/src/main/res/drawable/onboarding_gradient_background.xml
M app/src/main/res/layout-land/view_onboarding_page.xml
A app/src/main/res/layout/fragment_onboarding_pager.xml
D app/src/main/res/layout/fragment_single_pager.xml
M app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml
M app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml
M app/src/main/res/layout/inflate_initial_onboarding_page_one.xml
M app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
M app/src/main/res/layout/inflate_initial_onboarding_page_two.xml
M app/src/main/res/layout/view_onboarding_page.xml
M app/src/main/res/values/attrs.xml
M 

[MediaWiki-commits] [Gerrit] mediawiki...ansible-wikifarm[master]: Fix bug in clone when changing wiki name

[Cicalese (Code Review)]

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

Change subject: Fix bug in clone when changing wiki name
..

Fix bug in clone when changing wiki name

Change-Id: Ibbfe3c74bd5e386f7e990d846972076142fa3ba3
---
M clone_wiki_push.yml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/ansible-wikifarm 
refs/changes/29/363829/2

diff --git a/clone_wiki_push.yml b/clone_wiki_push.yml
index c713d38..aee468b 100644
--- a/clone_wiki_push.yml
+++ b/clone_wiki_push.yml
@@ -55,7 +55,7 @@
 dest={{ CLONE_DIRECTORY }}
 
 - name: archive destination wiki instance directory
-  shell: tar cfj {{ CLONE_DIRECTORY }}/{{ TO_WIKI_NAME | 
default(FROM_WIKI_NAME) }}-{{ TO_MW_HOST }}.tar.bz2 -C {{ MW_INSTANCE_DIRECTORY 
}} {{ FROM_WIKI_NAME }}
+  shell: tar cfj {{ CLONE_DIRECTORY }}/{{ TO_WIKI_NAME | 
default(FROM_WIKI_NAME) }}-{{ TO_MW_HOST }}.tar.bz2 -C {{ MW_INSTANCE_DIRECTORY 
}} {{ TO_WIKI_NAME | default(FROM_WIKI_NAME) }}
 
 - name: remove destination wiki instance directory
   file:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbfe3c74bd5e386f7e990d846972076142fa3ba3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/ansible-wikifarm
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "install_server: Change db1098 MAC address to the one...

[Jcrespo (Code Review)]

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

Change subject: Revert "install_server: Change db1098 MAC address to the one 
that shows link"
..


Revert "install_server: Change db1098 MAC address to the one that shows link"

Revert to the first network card, as apparently we cannot boot from the second.

This reverts commit 0bd1d7bb5646fa3d815f251b5390d99b6590ce6d.

Change-Id: I84e58622cdc542d43742cec38bdb1d0f773d95b2
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 5b1b672..e03025f 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1300,7 +1300,7 @@
 }
 
 host db1098 {
-hardware ethernet 18:66:DA:F8:D5:E1;
+hardware ethernet 18:66:DA:F8:D5:E0;
 fixed-address db1098.eqiad.wmnet;
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix possible crash(es) when saving images from Gallery or Feed.

[jenkins-bot (Code Review)]

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

Change subject: Fix possible crash(es) when saving images from Gallery or Feed.
..


Fix possible crash(es) when saving images from Gallery or Feed.

Half-hygiene, half crash fix:
This patch brings our entire logic of saving images more up-to-date with
our current patterns and practices. It removes the necessity to pass and
persist Activity and Context instances in several places, and introduces
proper Callback behavior that we know and love.

It should also fix the following crash, if not a few others:
https://rink.hockeyapp.net/manage/apps/226649/app_versions/204/crash_reasons/173113217

Change-Id: Ifc04526b8ce6107ee190c41644fb8a24c91d282c
---
M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java
M app/src/main/java/org/wikipedia/gallery/ImagePipelineBitmapGetter.java
M app/src/main/java/org/wikipedia/gallery/MediaDownloadReceiver.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
5 files changed, 95 insertions(+), 69 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java 
b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
index f9fcdde..2d7e224 100644
--- a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.ColorInt;
@@ -55,6 +56,7 @@
 import org.wikipedia.views.ViewUtil;
 import org.wikipedia.views.WikiErrorView;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -64,7 +66,8 @@
 import static org.wikipedia.util.UriUtil.handleExternalLink;
 import static org.wikipedia.util.UriUtil.resolveProtocolRelativeUrl;
 
-public class GalleryActivity extends ThemedActionBarActivity implements 
LinkPreviewDialog.Callback {
+public class GalleryActivity extends ThemedActionBarActivity implements 
LinkPreviewDialog.Callback,
+GalleryItemFragment.Callback {
 public static final int ACTIVITY_RESULT_PAGE_SELECTED = 1;
 
 public static final String EXTRA_PAGETITLE = "pageTitle";
@@ -92,9 +95,6 @@
 @Nullable private ViewPager.OnPageChangeListener pageChangeListener;
 
 @Nullable private GalleryFunnel funnel;
-@Nullable protected GalleryFunnel getFunnel() {
-return funnel;
-}
 
 /**
  * If we have an intent that tells us a specific image to jump to within 
the gallery,
@@ -109,7 +109,8 @@
 
 private ViewPager galleryPager;
 private GalleryItemAdapter galleryAdapter;
-private MediaDownloadReceiver downloadReceiver;
+private MediaDownloadReceiver downloadReceiver = new 
MediaDownloadReceiver();
+private MediaDownloadReceiverCallback downloadReceiverCallback = new 
MediaDownloadReceiverCallback();
 
 /**
  * Cache that stores GalleryItem information for each corresponding media 
item in
@@ -171,7 +172,6 @@
 super.onCreate(savedInstanceState);
 // force the theme to dark...
 setTheme(Theme.DARK.getResourceId());
-downloadReceiver = new MediaDownloadReceiver(this);
 
 getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, 
WindowManager.LayoutParams.FLAG_FULLSCREEN);
 setContentView(R.layout.activity_gallery);
@@ -276,12 +276,32 @@
 public void onResume() {
 super.onResume();
 registerReceiver(downloadReceiver, new 
IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+downloadReceiver.setCallback(downloadReceiverCallback);
 }
 
 @Override
 public void onPause() {
 super.onPause();
+downloadReceiver.setCallback(null);
 unregisterReceiver(downloadReceiver);
+}
+
+@Override
+public void onDownload(@NonNull GalleryItem item) {
+funnel.logGallerySave(pageTitle, item.getName());
+downloadReceiver.download(this, item);
+FeedbackUtil.showMessage(this, R.string.gallery_save_progress);
+}
+
+@Override
+public void onShare(@NonNull GalleryItem item, @Nullable Bitmap bitmap, 
@NonNull String subject, @NonNull PageTitle title) {
+funnel.logGalleryShare(pageTitle, item.getName());
+if (bitmap != null) {
+ShareUtil.shareImage(this, bitmap, new 
File(item.getUrl()).getName(), subject,
+title.getCanonicalUri());
+} else {
+ShareUtil.shareText(this, title);
+}
 }
 
 private class GalleryPageChangeListener extends 
ViewPager.SimpleOnPageChangeListener {
@@ -331,10 +351,6 @@
   

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Phan: ignore PhanUndeclaredConstant

[Hashar (Code Review)]

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

Change subject: Phan: ignore PhanUndeclaredConstant
..

Phan: ignore PhanUndeclaredConstant

repo/Wikibase.i18n.namespaces.php dynamically generates constant
whenever they are missing. Something Phan can not catch.

Bug: T169980
Change-Id: Ieb3a8357d4d1f9435c47b09c74edc3995ba165e7
---
M tests/phan/config.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/tests/phan/config.php b/tests/phan/config.php
index aa05e75..e08ded8 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -352,6 +352,8 @@
"PhanUndeclaredClassConstant",
// approximate error count: 14
"PhanUndeclaredClassMethod",
+   // approximate error count: 54
+   "PhanUndeclaredConstant",
// approximate error count: 139
"PhanUndeclaredMethod",
// approximate error count: 25

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb3a8357d4d1f9435c47b09c74edc3995ba165e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
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] mediawiki...CirrusSearch[master]: Fix phan warnings

[Gehel (Code Review)]

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

Change subject: Fix phan warnings
..


Fix phan warnings

- missing import (relates to T169904)
- ParserCache::getInstance() deprecated

Change-Id: I7c46652aa94d3c2fd0a1bcbcdfa443d52f30acba
---
M includes/Search/EmptyResultSet.php
M includes/Updater.php
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/Search/EmptyResultSet.php 
b/includes/Search/EmptyResultSet.php
index 35a6999..5038dda 100644
--- a/includes/Search/EmptyResultSet.php
+++ b/includes/Search/EmptyResultSet.php
@@ -2,6 +2,8 @@
 
 namespace CirrusSearch\Search;
 
+use SearchResultSet;
+
 /**
  * An empty set of results from Elasticsearch.
  *
diff --git a/includes/Updater.php b/includes/Updater.php
index 4d0a69d..aef82bc 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -4,6 +4,7 @@
 
 use Hooks as MWHooks;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 use CirrusSearch\Search\CirrusIndexField;
 use ParserCache;
 use TextContent;
@@ -364,8 +365,8 @@
 
if ( !$skipParse ) {
$contentHandler = $page->getContentHandler();
-   $output = 
$contentHandler->getParserOutputForIndexing( $page,
-   $forceParse ? null : 
ParserCache::singleton() );
+   $parserCache = $forceParse ? null : 
MediaWikiServices::getInstance()->getParserCache();
+   $output = 
$contentHandler->getParserOutputForIndexing( $page, $parserCache );
 
$fieldDefinitions = 
$contentHandler->getFieldsForSearchIndex( $engine );
foreach ( 
$contentHandler->getDataForSearchIndex( $page, $output, $engine ) as

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c46652aa94d3c2fd0a1bcbcdfa443d52f30acba
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.

[jenkins-bot (Code Review)]

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

Change subject: Localisation updates from https://translatewiki.net.
..


Localisation updates from https://translatewiki.net.

Change-Id: I3dafbdf5db614422a9c8f03776b726597e3a737a
---
M app/src/main/res/values-ar/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-cs/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-ja/strings.xml
M app/src/main/res/values-jv/strings.xml
6 files changed, 14 insertions(+), 10 deletions(-)

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



diff --git a/app/src/main/res/values-ar/strings.xml 
b/app/src/main/res/values-ar/strings.xml
index ad7a004..8780c57 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -16,6 +16,7 @@
   ارجع إلى الخلف
   امسح التاريخ
   أزيلت %s من القائمة
+  أُزيلت {{PLURAL:|مقالة|مقالتان| 
مقالات|%d مقالة}} من التاريخ
   رجوع
   هذه الصفحة غير موجودة.
   مسح تاريخ التصفح
@@ -280,6 +281,7 @@
   هذه المقالة موجودة بالفعل في هذه 
القائمة
   عرض القائمة
   مقالة واحدة، 
%1$.2f ميجابايت
+  {{PLURAL:%1$d|مقالة|مقالتان|%1$d
 مقالات|%1$d مقالة}}، %2$.2f ميغابايت
   رتب
   فرز حسب الاسم
   رتب حسب الاسم (عكسي)
diff --git a/app/src/main/res/values-ca/strings.xml 
b/app/src/main/res/values-ca/strings.xml
index c15a9da..b95bb52 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -131,7 +131,7 @@
   Permetre a Viquimedia 
recollir informació sobre com utilitzeu l\'aplicació, a fi de poder-la 
millorar
   Envia informes 
d\'error
   Permet que 
l\'aplicació enviï informes d\'error de forma automàtica a HockeyApp / un 
proveïdor de serveis, de manera que podem revisar-ho i corregir-ho de la manera 
més fàcil i ràpida.
-  Enllaços a dominis bloquejats 
(%s) detectats. Esborreu-los i torneu-ho a provar.
+  Enllaços a dominis blocats (%s) 
detectats. Esborreu-los i torneu-ho a provar.
   Cerca a l\'historial
   No s\'ha pogut mostrar 
l\'enllaç
   La pàgina està 
semiprotegida.
@@ -158,9 +158,9 @@
   Un producte de la a 
href=\"http://m.wikimediafoundation.org/wiki/Home\"Fundació 
Wikimedia/a
   Quant a
   S\'ha modificat la pàgina. Segur que 
voleu sortir sense desar-ne els canvis?
-  Bloquejat
-  S\'ha bloquejat l\'edició 
des del vostre compte en aquest wiki.
-  S\'ha bloquejat l\'edició des 
de la vostra IP.
+  Blocat
+  S\'ha blocat l\'edició 
des del vostre compte en aquest wiki.
+  S\'ha blocat l\'edició des de 
la vostra IP.
   Com heu millorat la pàgina?
   Següent
   Publica
diff --git a/app/src/main/res/values-cs/strings.xml 
b/app/src/main/res/values-cs/strings.xml
index f108575..69990e5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -263,7 +263,7 @@
   Například
   Místa k navštívení
   Oblíbená zvířata
-  Prohledejte vesmír!
+  Průzkum vesmíru
   Jasně
   Nastavení
   Diskutovat s uživatelem
diff --git a/app/src/main/res/values-es/strings.xml 
b/app/src/main/res/values-es/strings.xml
index a619007..3566578 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -308,7 +308,7 @@
   Por ejemplo
   Lugares que visitar
   Animales favoritos
-  ¡El 
espacio!
+  Exploración 
espacial
   Entendido
   Sin descripción…
   No tienes artículos añadidos a esta 
lista.
@@ -329,6 +329,7 @@
   Sincronizar listas de 
lectura
   Ahora tus listas de lectura 
pueden guardarse en tu cuenta de Wikipedia. Simplemente accede a tu cuenta y 
tus listas de lectura se sincronizarán automáticamente.
   Esto eliminará cualquier 
lista de lectura previamente sincronizada del almacenamiento remoto. 
¿Procedemos?
+  El artículo se está 
descargado y estará disponible sin conexión cuándo haya completado.
   Preferencias
   Discute con el usuario
   Mensaje nuevo en Wikipedia
@@ -410,7 +411,7 @@
   Listas de lectura 
sincronizadas
   Crear listas de lectura a 
partir de artículos que quieres leer más tarde, incluso cuando estés sin 
conexión. a href=\"#login\"Inicia sesión o crea/a tu cuenta de 
Wikipedia para mantener tus listas de lectura sincronizadas.
   Enviar datos anónimos
-  Ayuda a mejorar la aplicación 
aportando información de como la usa. Los datos obtenidos son anónimos. a 
href=\"#privacy\"Leer más/a
+  Ayuda a mejorar la aplicación 
aportando información de cómo la usas. Los datos obtenidos son anónimos. a 
href=\"#privacy\"Leer más/a
   Enviar datos de uso
   Sincronizar tus listas de 
lectura
   Mantente al tanto de 
tus aportes
diff --git a/app/src/main/res/values-ja/strings.xml 
b/app/src/main/res/values-ja/strings.xml
index 190f5b6..6e3bb4a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -89,6 +89,7 @@
   選択した項目を削除
   bigウィ/bigキペディbigア/big
   利用者名
+  パスワードを忘れた場合はこちら
   

[MediaWiki-commits] [Gerrit] operations/software[master]: s2.hosts: Add dbstore2002 port 3312

[jenkins-bot (Code Review)]

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

Change subject: s2.hosts: Add dbstore2002 port 3312
..


s2.hosts: Add dbstore2002 port 3312

dbstore2002 now replicates s2 on port 3312

Bug: T169510
Change-Id: Icdf437db7738c8b90c4ae662d00fac859a310a96
---
M dbtools/s2.hosts
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dbtools/s2.hosts b/dbtools/s2.hosts
index 22f3f27..24339cb 100644
--- a/dbtools/s2.hosts
+++ b/dbtools/s2.hosts
@@ -1,3 +1,4 @@
+dbstore2002.codfw.wmnet3312
 dbstore2001.codfw.wmnet3306
 db2035.codfw.wmnet 3306
 db2041.codfw.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdf437db7738c8b90c4ae662d00fac859a310a96
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Reconcile synced reading lists when a different user logs in.

[jenkins-bot (Code Review)]

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

Change subject: Reconcile synced reading lists when a different user logs in.
..


Reconcile synced reading lists when a different user logs in.

Bug: T162763
Change-Id: I50f6815a745de942bfb4f368d7bbd2c790e76435
---
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values/preference_keys.xml
3 files changed, 31 insertions(+), 3 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
index d5c0bb4..db95513 100644
--- 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
+++ 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.auth.AccountUtil;
@@ -26,6 +27,7 @@
 import org.wikipedia.util.log.L;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -91,7 +93,13 @@
 }
 }
 
-if ((remoteReadingLists == null) || (remoteReadingLists.rev() < 
localRev)) {
+if (Prefs.hasReadingListsCurrentUser()
+&& 
!Prefs.isReadingListsCurrentUser(AccountUtil.getUserName())) {
+reconcileAsRightJoin(remoteReadingLists);
+if (remoteReadingLists != null) {
+Prefs.setReadingListSyncRev(remoteReadingLists.rev());
+}
+} else if ((remoteReadingLists == null) || (remoteReadingLists.rev() < 
localRev)) {
 if (localRev == 0) {
 // If this is the first time we're syncing, bump the rev 
explicitly.
 bumpRev();
@@ -110,6 +118,7 @@
 deleteRemoteReadingLists();
 }
 }
+Prefs.setReadingListsCurrentUser(AccountUtil.getUserName());
 }
 
 private void deleteRemoteReadingLists() {
@@ -140,9 +149,10 @@
 Prefs.setReadingListSyncRev(Prefs.getReadingListSyncRev() + 1);
 }
 
-private void reconcileAsRightJoin(@NonNull RemoteReadingLists 
remoteReadingLists) {
+private void reconcileAsRightJoin(@Nullable RemoteReadingLists 
remoteReadingLists) {
 List localLists = 
ReadingListData.instance().queryMruLists(null);
-List remoteLists = remoteReadingLists.lists();
+List remoteLists = remoteReadingLists == null
+? Collections.emptyList() : 
remoteReadingLists.lists();
 
 // Remove any pages that already exist in local lists from remote 
lists.
 // At the end of this loop, whatever is left in remoteLists will be 
added.
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 2d74d6f..67a7820 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -4,6 +4,7 @@
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 
 import com.google.gson.reflect.TypeToken;
 
@@ -19,6 +20,7 @@
 import org.wikipedia.page.tabs.Tab;
 import org.wikipedia.theme.Theme;
 import org.wikipedia.util.ReleaseUtil;
+import org.wikipedia.util.StringUtil;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -511,5 +513,20 @@
 setBoolean(R.string.preference_key_initial_onboarding_enabled, 
enabled);
 }
 
+public static void setReadingListsCurrentUser(@Nullable String userName) {
+setString(R.string.preference_key_reading_lists_current_user_hash,
+TextUtils.isEmpty(userName) ? "" : 
StringUtil.md5string(userName));
+}
+
+public static boolean hasReadingListsCurrentUser() {
+return 
!TextUtils.isEmpty(getString(R.string.preference_key_reading_lists_current_user_hash,
 ""));
+}
+
+public static boolean isReadingListsCurrentUser(@Nullable String userName) 
{
+return !TextUtils.isEmpty(userName)
+&& 
getString(R.string.preference_key_reading_lists_current_user_hash, "")
+.equals(StringUtil.md5string(userName));
+}
+
 private Prefs() { }
 }
diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 0506b19..1449bd4 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -56,4 +56,5 @@
 readingListLoginReminder
 

[MediaWiki-commits] [Gerrit] operations/software[master]: s2.hosts: Add dbstore2002 port 3312

[Marostegui (Code Review)]

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

Change subject: s2.hosts: Add dbstore2002 port 3312
..

s2.hosts: Add dbstore2002 port 3312

dbstore2002 now replicates s2 on port 3312

Bug: T169510
Change-Id: Icdf437db7738c8b90c4ae662d00fac859a310a96
---
M dbtools/s2.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/27/363827/1

diff --git a/dbtools/s2.hosts b/dbtools/s2.hosts
index 22f3f27..24339cb 100644
--- a/dbtools/s2.hosts
+++ b/dbtools/s2.hosts
@@ -1,3 +1,4 @@
+dbstore2002.codfw.wmnet3312
 dbstore2001.codfw.wmnet3306
 db2035.codfw.wmnet 3306
 db2041.codfw.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdf437db7738c8b90c4ae662d00fac859a310a96
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations...puppet-compiler[master]: Rationalize and centralize directory references

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/363216 )

Change subject: Rationalize and centralize directory references
..


Rationalize and centralize directory references

We had references to files and directories all across the code, which
would need to be coordinated across different points of the source if we
wanted to change anything.

Create a submodule to manage shared file structures.

Change-Id: I984b42e20d02954ab9394b0e3934900e0fa1d2fb
---
M puppet_compiler/controller.py
A puppet_compiler/directories.py
M puppet_compiler/prepare.py
M puppet_compiler/presentation/html.py
M puppet_compiler/puppet.py
M puppet_compiler/tests/fixtures/exit_nodiff
A puppet_compiler/tests/test_directories.py
M puppet_compiler/tests/test_hostworker.py
M puppet_compiler/tests/test_prepare.py
M puppet_compiler/tests/test_puppet.py
M puppet_compiler/worker.py
M tox.ini
12 files changed, 189 insertions(+), 108 deletions(-)

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



diff --git a/puppet_compiler/controller.py b/puppet_compiler/controller.py
index 8043fbd..0fed5bf 100644
--- a/puppet_compiler/controller.py
+++ b/puppet_compiler/controller.py
@@ -1,10 +1,9 @@
-import os
 import re
 import sys
 
 import yaml
 
-from puppet_compiler import prepare, _log, threads, worker, nodegen
+from puppet_compiler import prepare, _log, threads, worker, nodegen, 
directories
 from puppet_compiler.presentation import html
 """
 How data are organized:
@@ -51,8 +50,9 @@
 
 self.count = 0
 self.pick_hosts(host_list)
+directories.FHS.setup(job_id, self.config['base'])
 self.m = prepare.ManageCode(self.config, job_id, change_id)
-self.outdir = os.path.join(self.config['base'], 'output', str(job_id))
+self.outdir = directories.FHS.output_dir
 # State of all nodes
 self.state = {'noop': set(), 'diff': set(),
   'err': set(), 'fail': set()}
@@ -107,7 +107,7 @@
 # work is executed in the main thread via
 # Controller.on_node_compiled
 for host in self.hosts:
-h = worker.HostWorker(self.m, host, self.outdir)
+h = worker.HostWorker(self.config['puppet_var'], host)
 threadpool.add(h.run_host, hostname=host)
 threadpool.fetch(self.on_node_compiled)
 index = html.Index(self.outdir)
diff --git a/puppet_compiler/directories.py b/puppet_compiler/directories.py
new file mode 100644
index 000..214f776
--- /dev/null
+++ b/puppet_compiler/directories.py
@@ -0,0 +1,50 @@
+import os
+
+
+class FHS(object):
+base_dir = None
+prod_dir = None
+change_dir = None
+diff_dir = None
+output_dir = None
+
+@classmethod
+def setup(cls, job_id, base):
+cls.base_dir = os.path.join(base, str(job_id))
+cls.prod_dir = os.path.join(cls.base_dir, 'production')
+cls.change_dir = os.path.join(cls.base_dir, 'change')
+cls.diff_dir = os.path.join(cls.base_dir, 'diffs')
+cls.output_dir = os.path.join(base, 'output', str(job_id))
+
+
+class HostFiles(object):
+
+def __init__(self, hostname):
+self.hostname = hostname
+self.outdir = os.path.join(FHS.output_dir, self.hostname)
+
+def file_for(self, env, what):
+if env in ['prod', 'change']:
+suffix = ""
+else:
+suffix = "-%s" % env
+
+if what == 'diff':
+return os.path.join(FHS.diff_dir, self.hostname + suffix + '.diff')
+
+if env == 'prod':
+base = FHS.prod_dir
+else:
+base = FHS.change_dir
+
+if what == 'catalog':
+ext = '.pson'
+elif what == 'errors':
+ext = '.err'
+else:
+raise ValueError('Unrecognized object: %s' % what)
+return os.path.join(base, 'catalogs', self.hostname + suffix + ext)
+
+def outfile_for(self, env, what):
+name = os.basename(self.file_for(env, what))
+return os.path.join(self.output_dir, env + '.' + name)
diff --git a/puppet_compiler/prepare.py b/puppet_compiler/prepare.py
index b3b9de9..670c6bc 100644
--- a/puppet_compiler/prepare.py
+++ b/puppet_compiler/prepare.py
@@ -6,6 +6,7 @@
 import shutil
 import requests
 from puppet_compiler import _log
+from puppet_compiler.directories import FHS
 
 LDAP_YAML_PATH = '/etc/ldap.yaml'
 
@@ -22,18 +23,17 @@
 private_modules = ['passwords', 'contacts', 'privateexim']
 
 def __init__(self, config, jobid, changeid, realm='production'):
-self.base_dir = os.path.join(config['base'],
- str(jobid))
+self.base_dir = FHS.base_dir
 self.puppet_src = config['puppet_src']
 self.puppet_private = config['puppet_private']
 self.puppet_var = config['puppet_var']
 self.change_id = changeid
 

[MediaWiki-commits] [Gerrit] operations...puppet-compiler[master]: Force integer pool size

[jenkins-bot (Code Review)]

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

Change subject: Force integer pool size
..


Force integer pool size

Change-Id: Ic5acca4a9cbdc2b98c7f0a9165f6ef7fa0988390
---
M puppet_compiler/threads.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet_compiler/threads.py b/puppet_compiler/threads.py
index c5f632b..f5d290d 100644
--- a/puppet_compiler/threads.py
+++ b/puppet_compiler/threads.py
@@ -53,7 +53,7 @@
 class ThreadOrchestrator(object):
 
 def __init__(self, pool_size=4):
-self.pool_size = pool_size
+self.pool_size = int(pool_size)
 self._TP = []
 self._payload_queue = queue.Queue()
 self._incoming_queue = queue.Queue()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5acca4a9cbdc2b98c7f0a9165f6ef7fa0988390
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/puppet-compiler
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: lock the version of all jetty arifacts

[Gehel (Code Review)]

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

Change subject: lock the version of all jetty arifacts
..

lock the version of all jetty arifacts

We are using a specific version of jetty. To ensure that no conflict arrises
if we introduce new dependencies, we should ensure that all the jetty
artifacts used (including transitive dependencies) are locked to the correct
version.

Change-Id: I4f6eaa3613b32152b9c9dfb51667c62fff207239
---
M pom.xml
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/pom.xml b/pom.xml
index 8b142c1..35c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,6 +338,11 @@
   
   
 org.eclipse.jetty
+jetty-io
+${jetty.version}
+  
+  
+org.eclipse.jetty
 jetty-runner
 ${jetty.version}
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f6eaa3613b32152b9c9dfb51667c62fff207239
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel 

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

[MediaWiki-commits] [Gerrit] operations...puppet-compiler[master]: Force integer pool size

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363826 )

Change subject: Force integer pool size
..

Force integer pool size

Change-Id: Ic5acca4a9cbdc2b98c7f0a9165f6ef7fa0988390
---
M puppet_compiler/threads.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/puppet-compiler 
refs/changes/26/363826/1

diff --git a/puppet_compiler/threads.py b/puppet_compiler/threads.py
index c5f632b..f5d290d 100644
--- a/puppet_compiler/threads.py
+++ b/puppet_compiler/threads.py
@@ -53,7 +53,7 @@
 class ThreadOrchestrator(object):
 
 def __init__(self, pool_size=4):
-self.pool_size = pool_size
+self.pool_size = int(pool_size)
 self._TP = []
 self._payload_queue = queue.Queue()
 self._incoming_queue = queue.Queue()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5acca4a9cbdc2b98c7f0a9165f6ef7fa0988390
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/puppet-compiler
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] mediawiki...BlueSpiceExtensions[REL1_27]: ExtendedSearch: removed ExtendedSearchAdmin

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/362397 )

Change subject: ExtendedSearch: removed ExtendedSearchAdmin
..


ExtendedSearch: removed ExtendedSearchAdmin

It is not needed anymore.

ERM#6267

Needs merge to master.

Change-Id: I44b9ecde3298b76d75dbeff3624ecadd2217e722
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/extension.json
M ExtendedSearch/i18n/en.json
D ExtendedSearch/includes/ExtendedSearchAdmin.class.php
D ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.alias.php
D ExtendedSearch/includes/specials/SpecialExtendedSearchAdmin.class.php
D ExtendedSearch/resources/bluespice.extendedSearch.admin.js
D ExtendedSearch/resources/images/bs-searchindex-delete.png
D ExtendedSearch/resources/images/bs-searchindex-optimization.png
D ExtendedSearch/resources/images/bs-searchindex-rebuild.png
10 files changed, 2 insertions(+), 374 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/ExtendedSearch/ExtendedSearch.class.php 
b/ExtendedSearch/ExtendedSearch.class.php
index 06310bb..e3b3576 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -44,21 +44,6 @@
private $sWikiID = '';
 
/**
-* Constructor of ExtendedSearch class
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::'.__METHOD__ );
-WikiAdmin::registerModuleClass( 'ExtendedSearchAdmin', array(
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_suche_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-extendedsearchadmin-label',
-   'iconCls' => 'bs-icon-magnifying-glass'
-   ) );
-
-   wfProfileOut( 'BS::'.__METHOD__ );
-   }
-
-   /**
 * Initialization of ExtendedSearch extension
 */
protected function initExt() {
@@ -167,7 +152,6 @@
$wgAjaxExportList[] = 'ExtendedSearch::getRequestJson';
$wgAjaxExportList[] = 'ExtendedSearchBase::getAutocompleteData';
$wgAjaxExportList[] = 
'ExtendedSearchBase::getRecentSearchTerms';
-   $wgAjaxExportList[] = 'ExtendedSearchAdmin::getProgressBar';
 
$bsgExtendedSearchBoostQuerySettings = array(
'namespace' => array(
diff --git a/ExtendedSearch/extension.json b/ExtendedSearch/extension.json
index 49a6f59..9f6324a 100644
--- a/ExtendedSearch/extension.json
+++ b/ExtendedSearch/extension.json
@@ -19,8 +19,7 @@
},
"callback": "ExtendedSearch::onRegistration",
"SpecialPages": {
-   "SpecialExtendedSearch": "SpecialExtendedSearch",
-   "ExtendedSearchAdmin": "SpecialExtendedSearchAdmin"
+   "SpecialExtendedSearch": "SpecialExtendedSearch"
},
"APIModules": {
"feedextendedsearch": "ApiFeedExtendedSearch"
@@ -31,8 +30,7 @@
]
},
"ExtensionMessagesFiles": {
-   "ExtendedSearchAlias": 
"languages/SpecialExtendedSearch.alias.php",
-   "ExtendedSearchAdminAlias": 
"includes/specials/SpecialExtendedSearchAdmin.alias.php"
+   "ExtendedSearchAlias": 
"languages/SpecialExtendedSearch.alias.php"
},
"AutoloadClasses": {
"ApiFeedExtendedSearch": "api/ApiFeedExtendedSearch.php",
@@ -53,7 +51,6 @@
"BuildIndexMwSingleFile": 
"includes/BuildIndex/BuildIndexMwSingleFile.class.php",
"BuildIndexMwSpecialLinked": 
"includes/BuildIndex/BuildIndexMwSpecialLinked.class.php",
"BuildIndexMwLinked": 
"includes/BuildIndex/BuildIndexMwLinked.class.php",
-   "ExtendedSearchAdmin": "includes/ExtendedSearchAdmin.class.php",
"ExtendedSearchBase": "includes/ExtendedSearchBase.class.php",
"SearchIndex": "includes/SearchIndex/SearchIndex.class.php",
"SearchOptions": "includes/SearchIndex/SearchOptions.class.php",
@@ -71,7 +68,6 @@
"ViewMoreLikeThis": "views/view.MoreLikeThis.php",
"ViewExtendedSearchResultEntry": 
"views/view.ExtendedSearchResultEntry.php",
"SpecialExtendedSearch": 
"includes/specials/SpecialExtendedSearch.class.php",
-   "SpecialExtendedSearchAdmin": 
"includes/specials/SpecialExtendedSearchAdmin.class.php",
"TagCloudSearchStatsHandler": 
"includes/Handler/TagCloudSearchStatsHandler.class.php"
},
"ResourceModules": {
@@ -91,9 +87,6 @@
"dependencies": [
"jquery.ui.autocomplete"
]
-   },
-   "ext.bluespice.extendedsearch.admin": {
-   "scripts": 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceCategoryManager[master]: Added icons and action column

[Nasty (Code Review)]

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

Change subject: Added icons and action column
..

Added icons and action column

See ERM#6654

Change-Id: I325f0a78a086150fae2f2a289b443e386e92da63
---
M extension.json
M i18n/fr.json
M resources/BS.BlueSpiceCategoryManager/Model.js
M resources/BS.BlueSpiceCategoryManager/TreePanel.js
A resources/bluespice.categorymanager.css
5 files changed, 104 insertions(+), 17 deletions(-)


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

diff --git a/extension.json b/extension.json
index 7e05e5e..a76e1bd 100644
--- a/extension.json
+++ b/extension.json
@@ -35,6 +35,9 @@
"scripts": [
"bluespice.categorymanager.js"
],
+   "styles": [
+   "bluespice.categorymanager.css"
+   ],
"dependencies": [
"ext.bluespice.extjs",
"ext.bluespice.extjs.BS.deferred",
diff --git a/i18n/fr.json b/i18n/fr.json
index 6021b11..d6046ad 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,7 +1,8 @@
 {
"@metadata": {
"authors": [
-   "Gomoko"
+   "Gomoko",
+   "Wladek92"
]
},
"bluespicecategorymanager": "Gestionnaire de catégorie",
@@ -12,5 +13,6 @@
"bs-categorymanager-dlg-new-title": "Créer une catégorie",
"bs-categorymanager-dlg-new-prompt": "Veuillez saisir le nom :",
"bs-categorymanager-removecategoryconfirm-text": "Êtes-vous sûr de 
vouloir supprimer cette catégorie ?",
-   "bs-categorymanager-removecategoryconfirm-title": "Supprimer la 
catégorie"
+   "bs-categorymanager-removecategoryconfirm-title": "Supprimer la 
catégorie",
+   "bs-categorymanager-addcategory-dialog-error-title": "Echec dans la 
création de catégorie"
 }
diff --git a/resources/BS.BlueSpiceCategoryManager/Model.js 
b/resources/BS.BlueSpiceCategoryManager/Model.js
index 0e70951..bceaaaf 100644
--- a/resources/BS.BlueSpiceCategoryManager/Model.js
+++ b/resources/BS.BlueSpiceCategoryManager/Model.js
@@ -1,7 +1,21 @@
 Ext.define( 'BS.BlueSpiceCategoryManager.Model', {
extend: 'BS.model.Category',
fields: [
-   { name: 'text', type: 'string' },
+   {
+   name: 'text', type: 'string', convert: function ( 
value, record ) {
+   return mw.html.element( 'a' , {
+   'href': mw.Title.makeTitle( 
bs.ns.NS_CATEGORY, record.raw.text ).getUrl(),
+   'class': (record.raw.leaf ? 
'bs-icon-tag' : 'bs-icon-tags' ),
+   'target': '_blank'
+   },
+   value );
+   }
+   },
+   {
+   name: 'categoryName', type: 'string', convert: function 
( value, record ) {
+   return record.raw.text;
+   }
+   },
{
name: 'leaf', type: 'boolean', convert: function ( 
value, record ) {
return false;
@@ -13,13 +27,13 @@
}
},
{
-   name: 'href', type: 'string', convert: function ( 
value, record ) {
-   var catTitle = mw.Title.makeTitle( 
bs.ns.NS_CATEGORY, record.get( 'text' ) );
-   return catTitle.getUrl();
+   name: 'icon', type: 'string', convert: function ( 
value, record ) {
+   return '';
+   }
+   },{
+   name: 'iconCls', type: 'string', convert: function ( 
value, record ) {
+   return '';
}
-   },
-   {
-   name: 'hrefTarget', type: 'string', defaultValue: 
'_blank'
}
]
 } );
\ No newline at end of file
diff --git a/resources/BS.BlueSpiceCategoryManager/TreePanel.js 
b/resources/BS.BlueSpiceCategoryManager/TreePanel.js
index 8bd22cd..9dc8f21 100644
--- a/resources/BS.BlueSpiceCategoryManager/TreePanel.js
+++ b/resources/BS.BlueSpiceCategoryManager/TreePanel.js
@@ -32,13 +32,17 @@
model: 'BS.BlueSpiceCategoryManager.Model'
});
 
+   var me = this;
+
this.treePanel = new Ext.tree.Panel({
useArrows: true,
height: 500,
rootVisible: false,
displayField: 'text',
 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add missing import

[jenkins-bot (Code Review)]

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

Change subject: Add missing import
..


Add missing import

Change-Id: I38b5dc9c5ea2d707fd7854031be71de967508548
---
M includes/ConstraintCheck/Helper/SparqlHelper.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/ConstraintCheck/Helper/SparqlHelper.php 
b/includes/ConstraintCheck/Helper/SparqlHelper.php
index 54e63b6..08780f3 100644
--- a/includes/ConstraintCheck/Helper/SparqlHelper.php
+++ b/includes/ConstraintCheck/Helper/SparqlHelper.php
@@ -7,6 +7,7 @@
 use MediawikiStatsdDataFactory;
 use MediaWiki\MediaWikiServices;
 use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\Rdf\RdfVocabulary;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38b5dc9c5ea2d707fd7854031be71de967508548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
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] mediawiki...TwoColConflict[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/363823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
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] mediawiki...RevisionSlider[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/22/363822/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/363822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
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] mediawiki...InterwikiSorting[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/363820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiSorting
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] mediawiki...LoginNotify[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/363821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
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] mediawiki...cxserver[master]: Enable machine translation for Dutch (nl)

[KartikMistry (Code Review)]

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

Change subject: Enable machine translation for Dutch (nl)
..

Enable machine translation for Dutch (nl)

Bug: T129190
Change-Id: Iefcf4152114371e323f7aa5bab7c79e0b75f33de
---
M registry.wikimedia.yaml
1 file changed, 181 insertions(+), 0 deletions(-)


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

diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml
index 89fc40e..0f3dd1c 100644
--- a/registry.wikimedia.yaml
+++ b/registry.wikimedia.yaml
@@ -755,6 +755,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -844,6 +845,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -933,6 +935,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1022,6 +1025,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -,6 +1115,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1201,6 +1206,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1290,6 +1296,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1379,6 +1386,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1468,6 +1476,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1557,6 +1566,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1646,6 +1656,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1735,6 +1746,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1824,6 +1836,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -1913,6 +1926,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2002,6 +2016,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2092,6 +2107,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2181,6 +2197,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2271,6 +2288,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2360,6 +2378,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2449,6 +2468,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2538,6 +2558,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2627,6 +2648,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2716,6 +2738,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2805,6 +2828,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2894,6 +2918,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -2983,6 +3008,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3072,6 +3098,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3161,6 +3188,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3250,6 +3278,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3339,6 +3368,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3428,6 +3458,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3517,6 +3548,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3606,6 +3638,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3695,6 +3728,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3784,6 +3818,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3873,6 +3908,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -3962,6 +3998,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -4052,6 +4089,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -4141,6 +4179,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -4230,6 +4269,7 @@
   - my
   - nb
   - ne
+  - nl
   - pa
   - pap
   - pl
@@ -4319,6 +4359,7 @@
   - my
   - nb
   - 

[MediaWiki-commits] [Gerrit] mediawiki...FileImporter[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileImporter 
refs/changes/18/363818/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/363818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FileImporter
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] mediawiki...ElectronPdfService[master]: Jenkins job validation (DO NOT SUBMIT)

[Hashar (Code Review)]

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/363817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
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] operations/mediawiki-config[master]: db-eqiad.php: db1079 as sanitarium3 master for s7

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: db1079 as sanitarium3 master for s7
..

db-eqiad.php: db1079 as sanitarium3 master for s7

I am thinking about using db1079 as sanitarium 3 master (db1102) for s7 to get
the last shard pending imported.

Bug: T153743
Change-Id: I10f686bde7202efd6dca0fcf3d2b1cea0e6de7fa
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 79b2bee..13f9e58 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,7 +162,7 @@
'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
 #  'db1039' => 0,   # B2 1.4TB  64GB
-   'db1079' => 300, # A2 3.6TB 512GB, api
+   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Import SearchResultSet from EmptyResultSet

[DCausse (Code Review)]

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

Change subject: Import SearchResultSet from EmptyResultSet
..

Import SearchResultSet from EmptyResultSet

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


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

diff --git a/includes/Search/EmptyResultSet.php 
b/includes/Search/EmptyResultSet.php
index 35a6999..5038dda 100644
--- a/includes/Search/EmptyResultSet.php
+++ b/includes/Search/EmptyResultSet.php
@@ -2,6 +2,8 @@
 
 namespace CirrusSearch\Search;
 
+use SearchResultSet;
+
 /**
  * An empty set of results from Elasticsearch.
  *

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump Phan 0.7..0.8 for mediawiki extensions

[jenkins-bot (Code Review)]

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

Change subject: Bump Phan 0.7..0.8 for mediawiki extensions
..


Bump Phan 0.7..0.8 for mediawiki extensions

Affects:

CirrusSearch
Cognate
ElectronPdfService
FileImporter
InterwikiSorting
LoginNotify
RevisionSlider
TwoColConflict
Wikibase

Updates:
mwext-php70-phan-jessie

Bug: T169904
Change-Id: Ie414d17b42db6deab42545b3fc18f910093e2393
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index a511262..1f75889 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -393,7 +393,7 @@
  - shell: |
 cd $WORKSPACE/src
 mkdir -p $WORKSPACE/log
-composer require etsy/phan:0.7 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
+composer require etsy/phan:0.8 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
 PHAN=$WORKSPACE/src/vendor/bin/phan ./tests/phan/bin/phan 
./extensions/$EXT_NAME -m checkstyle
 mv $WORKSPACE/src/extensions/$EXT_NAME/tests/phan/issues/latest 
$WORKSPACE/log/phan-issues
 publishers:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Added the bluespice logo as own font #6773

[Pwirth (Code Review)]

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

Change subject: BSFoundation: Added the bluespice logo as own font #6773
..

BSFoundation: Added the bluespice logo as own font #6773

Change-Id: Ie47c10b63a056b53d0ff137d74960a12c94fef53
---
A resources/bluespice-logo/bluespice-logo.css
A resources/bluespice-logo/bluespice-logo.eot
A resources/bluespice-logo/bluespice-logo.svg
A resources/bluespice-logo/bluespice-logo.ttf
A resources/bluespice-logo/bluespice-logo.woff
M resources/bluespice/bluespice.icons.css
M resources/bs.icons.php
7 files changed, 87 insertions(+), 0 deletions(-)


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

diff --git a/resources/bluespice-logo/bluespice-logo.css 
b/resources/bluespice-logo/bluespice-logo.css
new file mode 100644
index 000..7ed8220
--- /dev/null
+++ b/resources/bluespice-logo/bluespice-logo.css
@@ -0,0 +1,26 @@
+@font-face {
+   font-family: 'bluespice-logo';
+   src: url('bluespice-logo.eot?hwknpc');
+   src: url('bluespice-logo.eot?hwknpc#iefix') format('embedded-opentype'),
+   url('bluespice-logo.ttf?hwknpc') format('truetype'),
+   url('bluespice-logo.woff?hwknpc') format('woff'),
+   url('bluespice-logo.svg?hwknpc#bluespice-logo') format('svg');
+   font-weight: normal;
+   font-style: normal;
+}
+
+.icon-bluespice-logo:before {
+   font-family: 'bluespice-logo' !important;
+   content: "\e900";
+}
+.icon-bluespice-logo-color:before {
+   font-family: 'bluespice-logo' !important;
+   content: "\e900";
+   color: rgb(62, 83, 137);
+}
+.icon-bluespice-logo-color:after {
+   font-family: 'bluespice-logo' !important;
+   content: "\e901";
+   margin: -1em;
+   color: rgb(183, 58, 58);
+}
diff --git a/resources/bluespice-logo/bluespice-logo.eot 
b/resources/bluespice-logo/bluespice-logo.eot
new file mode 100644
index 000..2857c85
--- /dev/null
+++ b/resources/bluespice-logo/bluespice-logo.eot
Binary files differ
diff --git a/resources/bluespice-logo/bluespice-logo.svg 
b/resources/bluespice-logo/bluespice-logo.svg
new file mode 100644
index 000..a016e4f
--- /dev/null
+++ b/resources/bluespice-logo/bluespice-logo.svg
@@ -0,0 +1,29 @@
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; >
+http://www.w3.org/2000/svg;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/bluespice-logo/bluespice-logo.ttf 
b/resources/bluespice-logo/bluespice-logo.ttf
new file mode 100644
index 000..52e3651
--- /dev/null
+++ b/resources/bluespice-logo/bluespice-logo.ttf
Binary files differ
diff --git a/resources/bluespice-logo/bluespice-logo.woff 
b/resources/bluespice-logo/bluespice-logo.woff
new file mode 100644
index 000..24c6374
--- /dev/null
+++ b/resources/bluespice-logo/bluespice-logo.woff
Binary files differ
diff --git a/resources/bluespice/bluespice.icons.css 
b/resources/bluespice/bluespice.icons.css
index bcfc1d5..75c47b6 100644
--- a/resources/bluespice/bluespice.icons.css
+++ b/resources/bluespice/bluespice.icons.css
@@ -31,6 +31,17 @@
font-style: normal;
 }
 
+@font-face {
+   font-family: 'bluespice-logo';
+   src:  url('../bluespice-logo/bluespice-logo.eot?hwknpc');
+   src:  url('../bluespice-logo/bluespice-logo.eot?hwknpc#iefix') 
format('embedded-opentype'),
+   url('../bluespice-logo/bluespice-logo.ttf?hwknpc') 
format('truetype'),
+   url('../bluespice-logo/bluespice-logo.woff?hwknpc') 
format('woff'),
+   
url('../bluespice-logo/bluespice-logo.svg?hwknpc#bluespice-logo') format('svg');
+   font-weight: normal;
+   font-style: normal;
+}
+
 [class^="icon-"], [class*=" icon-"] {
   /* use !important to prevent issues with browser extensions that change 
fonts */
   font-family: 'icomoon' !important;
@@ -436,4 +447,20 @@
 
 .icon-pencil:before {
content: "\e905";
+}
+
+.icon-bluespice-logo:before {
+   font-family: 'bluespice-logo' !important;
+   content: "\e900";
+}
+.icon-bluespice-logo-color:before {
+   font-family: 'bluespice-logo' !important;
+   content: "\e900";
+   color: rgb(62, 83, 137);
+}
+.icon-bluespice-logo-color:after {
+   font-family: 'bluespice-logo' !important;
+   content: "\e901";
+   margin: -1em;
+   color: rgb(183, 58, 58);
 }
\ No newline at end of file
diff --git a/resources/bs.icons.php b/resources/bs.icons.php
index 668d7c6..b44fca0 100644
--- a/resources/bs.icons.php
+++ b/resources/bs.icons.php
@@ -13,6 +13,10 @@
$icons = 'fontawesome.css';
$icons2 = 'fontawesome/fontawesome.css';
break;
+   case 'bluespice-logo':
+   $icons = 'bluespice-logo.css';
+   $icons2 = 'bluespice-logo/bluespice-logo.css';
+   break;
case 'bluespice' :
 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add missing import

[Lucas Werkmeister (WMDE) (Code Review)]

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363812 )

Change subject: Add missing import
..

Add missing import

Change-Id: I38b5dc9c5ea2d707fd7854031be71de967508548
---
M includes/ConstraintCheck/Helper/SparqlHelper.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/includes/ConstraintCheck/Helper/SparqlHelper.php 
b/includes/ConstraintCheck/Helper/SparqlHelper.php
index 54e63b6..08780f3 100644
--- a/includes/ConstraintCheck/Helper/SparqlHelper.php
+++ b/includes/ConstraintCheck/Helper/SparqlHelper.php
@@ -7,6 +7,7 @@
 use MediawikiStatsdDataFactory;
 use MediaWiki\MediaWikiServices;
 use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\Rdf\RdfVocabulary;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38b5dc9c5ea2d707fd7854031be71de967508548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Remove unused method

[Mholloway (Code Review)]

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

Change subject: Hygiene: Remove unused method
..

Hygiene: Remove unused method

Change-Id: Iab2d49c8df9f9cd6aa8ee748b206b728d213fb5d
---
M app/src/test/java/org/wikipedia/language/TranslationTests.java
1 file changed, 0 insertions(+), 9 deletions(-)


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

diff --git a/app/src/test/java/org/wikipedia/language/TranslationTests.java 
b/app/src/test/java/org/wikipedia/language/TranslationTests.java
index 8c905e2..0e90a53 100644
--- a/app/src/test/java/org/wikipedia/language/TranslationTests.java
+++ b/app/src/test/java/org/wikipedia/language/TranslationTests.java
@@ -161,15 +161,6 @@
 }
 }
 
-private void checkTranslationHasNoParameter(String lang, Map.Entry entry) {
-String val1 = "[val1]";
-if (entry.getValue().contains(val1)) {
-final String msg = lang + ":" + entry.getKey() + " = " + 
entry.getValue() + "' contains " + val1;
-L.e(msg);
-mismatches.append(msg).append("\n");
-}
-}
-
 private void checkTranslationHasParameter(String lang, Map.Entry entry, String paramName, Object val1, String alternateFormat) {
 String subject = String.format(new Locale(lang), entry.getValue(), 
val1);
 if (!subject.contains(String.format(paramName, val1))

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Move TranslationTests to plain JUnit, pt. 2

[Mholloway (Code Review)]

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

Change subject: Move TranslationTests to plain JUnit, pt. 2
..

Move TranslationTests to plain JUnit, pt. 2

Updates and re-enables plurals checking

Bug: T139546
Bug: T169917
Change-Id: I25cff0910cba552b2ecfe4ac5c26b02b917b674f
---
M app/src/test/java/org/wikipedia/language/TranslationTests.java
1 file changed, 15 insertions(+), 35 deletions(-)


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

diff --git a/app/src/test/java/org/wikipedia/language/TranslationTests.java 
b/app/src/test/java/org/wikipedia/language/TranslationTests.java
index 5c76a8a..8c905e2 100644
--- a/app/src/test/java/org/wikipedia/language/TranslationTests.java
+++ b/app/src/test/java/org/wikipedia/language/TranslationTests.java
@@ -15,8 +15,10 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -77,9 +79,7 @@
 Map hasFloatFirstParams = new 
StringCollector(POSSIBLE_PARAM_FLOAT_FIRST).collect(dir.getName(), doc);
 Map hasFloatThirdParams = new 
StringCollector(POSSIBLE_PARAM_FLOAT_THIRD).collect(dir.getName(), doc);
 Map hasTextUtilTemplateParams = new 
StringCollector("^1").collect(dir.getName(), doc);
-
-// TODO: handle in follow-up patch
-// List hasPluralRes = collectPluralResources();
+List hasPlurals = collectPluralResources(doc);
 
 if (!lang.equals("qq")) {
 for (Map.Entry entry : hasTags.entrySet()) {
@@ -88,7 +88,6 @@
 || entry.getKey().equals("notification_talk")
 || entry.getKey().equals("notification_reverted")
 || entry.getKey().equals("notification_thanks")) {
-// exceptions of the rule
 continue;
 }
 expectContains(lang, entry, "<", "");
@@ -124,9 +123,9 @@
 for (Map.Entry entry : 
hasTextUtilTemplateParams.entrySet()) {
 checkTranslationHasParameter(lang, entry, "^1", 
"[templateParam]", null);
 }
-/*for (Res res : pluralRes) {
-checkPluralHasOther(res);
-}*/
+for (Element elem : hasPlurals) {
+checkPluralHasOther(lang, elem);
+}
 }
 }
 assertThat("\n" + mismatches.toString(), mismatches.length(), is(0));
@@ -210,20 +209,13 @@
 }
 }
 
-/*private void checkPluralHasOther(Res res) {
-L.i(myLocale + ":" + res.name);
-try {
-final int paramOther = 42;
-getQuantityString(res.id, 0);
-getQuantityString(res.id, 1);
-getQuantityString(res.id, 2);
-getQuantityString(res.id, paramOther);
-} catch (Exception e) {
-final String msg = myLocale + ":" + res.name + " plural is missing 
'other'";
+private void checkPluralHasOther(String lang, Element elem) {
+if (elem.getElementsByAttributeValue("quantity", "other").size() <= 0) 
{
+final String msg = lang + ":" + elem.attr("name") + " plural is 
missing 'other'";
 L.e(msg);
 mismatches.append(msg).append("\n");
 }
-}*/
+}
 
 private boolean hasBadName(File pathname) {
 for (String name : BAD_NAMES) {
@@ -267,7 +259,6 @@
 // don't care about appcompat string; and preference string 
resources don't get translated
 assertParameterFormats(lang, name, value);
 
-// Find parameter
 boolean found = findParameter(value);
 if ((!negate && found) || (negate && !found)) {
 result.put(name, value);
@@ -319,20 +310,9 @@
 }
 }
 
-/*private List collectPluralResources() {
-final List resources = new ArrayList<>();
-final R.plurals pluralResources = new R.plurals();
-final Class c = R.plurals.class;
-final Field[] fields = c.getDeclaredFields();
-
-for (int i = 0, max = fields.length; i < max; i++) {
-final String name;
-final int resourceId;
-name = fields[i].getName();
-resourceId = fields[i].getInt(pluralResources);
-resources.add(new Res(resourceId, name));
-}
-
-return resources;
-}*/
+private List collectPluralResources(Document doc) {
+List result = new ArrayList<>();
+result.addAll(doc.select("plurals"));
+return result;
+}
 }

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump Phan 0.7..0.8 for mediawiki extensions

[Hashar (Code Review)]

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

Change subject: Bump Phan 0.7..0.8 for mediawiki extensions
..

Bump Phan 0.7..0.8 for mediawiki extensions

Affects:

CirrusSearch
Cognate
ElectronPdfService
FileImporter
InterwikiSorting
LoginNotify
RevisionSlider
TwoColConflict
Wikibase

Updates:
mwext-php70-phan-jessie

Bug: T169904
Change-Id: Ie414d17b42db6deab42545b3fc18f910093e2393
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/09/363809/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index a511262..1f75889 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -393,7 +393,7 @@
  - shell: |
 cd $WORKSPACE/src
 mkdir -p $WORKSPACE/log
-composer require etsy/phan:0.7 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
+composer require etsy/phan:0.8 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
 PHAN=$WORKSPACE/src/vendor/bin/phan ./tests/phan/bin/phan 
./extensions/$EXT_NAME -m checkstyle
 mv $WORKSPACE/src/extensions/$EXT_NAME/tests/phan/issues/latest 
$WORKSPACE/log/phan-issues
 publishers:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie414d17b42db6deab42545b3fc18f910093e2393
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] apps...wikipedia[master]: Fix format string translations

[jenkins-bot (Code Review)]

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

Change subject: Fix format string translations
..


Fix format string translations

...which are currently broken again.

N.B. I can't actually view these in action on any of my devices as they
are currently configured, but this gets at least gets the translation
tests passing again.

Change-Id: I6227bc66478e84b470a103a73fd2fc39b0d162eb
---
M app/src/main/res/values-ckb/strings.xml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/app/src/main/res/values-ckb/strings.xml 
b/app/src/main/res/values-ckb/strings.xml
index 7af2df9..29e25dc 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -279,8 +279,8 @@
   زیادکرا بۆ پێڕستی 
خوێندنەوە.
   ئەم وتارە ھەر لەنێو ئەو پێڕستە 
بووە.
   پێڕستی بینین
-  1 وتار، 
%1$.٢f MiB
-  %1$d وتار، 
%2$.٢f MiB
+  1 وتار، 
%1$.2f MiB
+  %1$d وتار، 
%2$.2f MiB
   %1$d لە ١ 
وتار بەردەستە بۆ خوێندنەوەی بەبێ ئینتەرنێت.
   %1$d لە %2$d 
وتار بەردەستە بەبێ ئینتەرنێت، %3$.٢f MiB
   ڕیزکردن

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6227bc66478e84b470a103a73fd2fc39b0d162eb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump Phan 0.7..0.8 for mediawiki/core

[jenkins-bot (Code Review)]

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

Change subject: Bump Phan 0.7..0.8 for mediawiki/core
..


Bump Phan 0.7..0.8 for mediawiki/core

Update mediawiki-core-php70-phan-jessie

Bug: T169904
Change-Id: I3affc6b66e21710f1f311520ddbe69122f025155
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 7d02443..d656f6b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -443,7 +443,7 @@
 dir: '$WORKSPACE/src'
  - shell: |
 cd $WORKSPACE/src
-composer require etsy/phan:0.7 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
+composer require etsy/phan:0.8 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
 PHAN=vendor/bin/phan ./tests/phan/bin/phan -m checkstyle
 publishers:
  - castor-save

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

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

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

[MediaWiki-commits] [Gerrit] operations...puppet-compiler[master]: [WiP] Add future parser run mode

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363808 )

Change subject: [WiP] Add future parser run mode
..

[WiP] Add future parser run mode

Change-Id: I5fc3eabd8704518dfeb17ebeab583010ca774690
---
M puppet_compiler/presentation/html.py
M puppet_compiler/puppet.py
M puppet_compiler/state.py
A puppet_compiler/templates/hostpage.future.jinja2
A puppet_compiler/templates/index.future.jinja2
M puppet_compiler/worker.py
6 files changed, 211 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/puppet-compiler 
refs/changes/08/363808/1

diff --git a/puppet_compiler/presentation/html.py 
b/puppet_compiler/presentation/html.py
index a24a5ba..90f6162 100644
--- a/puppet_compiler/presentation/html.py
+++ b/puppet_compiler/presentation/html.py
@@ -8,12 +8,24 @@
 
 
 class Host(object):
+tpl = 'hostpage.jinja2'
+page_name = 'index.html'
 
 def __init__(self, hostname, files, retcode):
 self.retcode = retcode
 self.hostname = hostname
 self.outdir = files.outdir
 self.diff_file = files.file_for('change', 'diff')
+
+def _retcode_to_desc(self):
+if self.retcode == 'noop':
+return 'no change'
+elif self.retcode == 'diff':
+return 'changes detected'
+elif self.retcode == 'error':
+return 'change fails'
+else:
+return 'compiler failure'
 
 def htmlpage(self):
 """
@@ -24,39 +36,52 @@
 if self.retcode == 'diff':
 with open(self.diff_file, 'r') as f:
 data['diffs'] = f.read()
-if self.retcode == 'noop':
-data['desc'] = 'no change'
-elif self.retcode == 'diff':
-data['desc'] = 'changes detected'
-elif self.retcode == 'error':
-data['desc'] = 'change fails'
-else:
-data['desc'] = 'compiler failure'
-t = env.get_template('hostpage.jinja2')
+data['desc'] = self._retcode_to_desc()
+t = env.get_template(self.tpl)
 page = t.render(host=self.hostname, jid=job_id, chid=change_id, **data)
-with open(os.path.join(self.outdir, 'index.html'), 'w') as f:
+with open(os.path.join(self.outdir, self.page_name), 'w') as f:
 f.write(page)
 
 
-class Index(object):
-default_mode = 'change'
+class FutureHost(Host):
+tpl = 'hostpage.future.jinja2'
+page_name = 'index-future.html'
 
-def __init__(self, outdir, mode):
-if mode == self.default_mode:
-filename = "index.html"
-self.url = ""
-else:
-self.url = 'index%s.html' % mode
-filename = self.url
-self.outfile = os.path.join(outdir, filename)
+def __init__(self, hostname, files, retcode):
+super(FutureHost, self).__init__(hostname, files, retcode)
+self.diff_file = files.file_for('future', 'diff')
+
+def _retcode_to_desc(self):
+if self.retcode == 'break':
+return 'change breaks the current parser'
+elif self.retcode == 'error':
+return 'change is not compatible with the future parser'
+elif self.retcode == 'ok':
+return 'change works with both parsers'
+elif self.retcode == 'diff':
+return 'change works with both parsers, with diffs'
+
+
+class Index(object):
+ tpl = 'index.jinja2'
+
+def __init__(self, outdir):
+filename = "index.html"
+self.url = ""
+self.outfile = os.path.join(outdir, self.page_name)
 
 def render(self, state):
 """
 Render the index page with info coming from state
 """
 _log.debug("Rendering the main index page")
-t = env.get_template('index.jinja2')
+t = env.get_template(self.tpl)
 # TODO: support multiple modes
 page = t.render(state, jid=job_id, chid=change_id)
 with open(self.outfile, 'w') as f:
 f.write(page)
+
+
+class FutureIndex(Index):
+tpl = 'index.future.jinja2'
+page_name = 'index-future.html'
diff --git a/puppet_compiler/puppet.py b/puppet_compiler/puppet.py
index 7ab0f9e..dd07307 100644
--- a/puppet_compiler/puppet.py
+++ b/puppet_compiler/puppet.py
@@ -45,12 +45,12 @@
 f.write(line)
 
 
-def diff(env, hostname):
+def diff(env, hostname, base='prod'):
 """
 Compute the diffs between the two changes
 """
 hostfiles = HostFiles(hostname)
-prod_catalog = hostfiles.file_for('prod', 'catalog')
+prod_catalog = hostfiles.file_for(base, 'catalog')
 change_catalog = hostfiles.file_for(env, 'catalog')
 output = hostfiles.file_for(env, 'diff')
 cmd = ['puppet', 'catalog', 'diff', '--show_resource_diff',
diff --git a/puppet_compiler/state.py b/puppet_compiler/state.py
index 51035da..bb076e5 100644
--- a/puppet_compiler/state.py
+++ 

[MediaWiki-commits] [Gerrit] integration/config[master]: Bump Phan 0.7..0.8 for mediawiki/core

[Hashar (Code Review)]

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

Change subject: Bump Phan 0.7..0.8 for mediawiki/core
..

Bump Phan 0.7..0.8 for mediawiki/core

Update mediawiki-core-php70-phan-jessie

Bug: T169904
Change-Id: I3affc6b66e21710f1f311520ddbe69122f025155
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/07/363807/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 7d02443..d656f6b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -443,7 +443,7 @@
 dir: '$WORKSPACE/src'
  - shell: |
 cd $WORKSPACE/src
-composer require etsy/phan:0.7 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
+composer require etsy/phan:0.8 --prefer-dist --dev --no-progress 
--ansi --profile -v # todo don't hardcode version here
 PHAN=vendor/bin/phan ./tests/phan/bin/phan -m checkstyle
 publishers:
  - castor-save

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3affc6b66e21710f1f311520ddbe69122f025155
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] mediawiki...BlueSpiceFoundation[REL1_27]: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

[jenkins-bot (Code Review)]

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

Change subject: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"
..


Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

See ERM6682 for details

Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
---
M resources/bluespice/images/bs-logo.png
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/resources/bluespice/images/bs-logo.png 
b/resources/bluespice/images/bs-logo.png
index a924d71..425631e 100644
--- a/resources/bluespice/images/bs-logo.png
+++ b/resources/bluespice/images/bs-logo.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

[jenkins-bot (Code Review)]

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

Change subject: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"
..


Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

See ERM6682 for details

Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
---
M resources/bluespice/images/bs-logo.png
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/resources/bluespice/images/bs-logo.png 
b/resources/bluespice/images/bs-logo.png
index a924d71..425631e 100644
--- a/resources/bluespice/images/bs-logo.png
+++ b/resources/bluespice/images/bs-logo.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363806 )

Change subject: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"
..

Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

See ERM6682 for details

Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
---
M resources/bluespice/images/bs-logo.png
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/resources/bluespice/images/bs-logo.png 
b/resources/bluespice/images/bs-logo.png
index a924d71..425631e 100644
--- a/resources/bluespice/images/bs-logo.png
+++ b/resources/bluespice/images/bs-logo.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] mediawiki...VoteNY[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Also split VoteClass.php into:
- includes/Vote.class.php
- includes/VoteStars.class.php

Bug: T160849
Change-Id: Icb51972383d6342f292fe62d9ec93a189d4dbeca
---
M extension.json
R includes/Vote.class.php
R includes/VoteNY.alias.php
R includes/VoteNY.hooks.php
R includes/VoteNY.i18n.magic.php
A includes/VoteStars.class.php
R includes/api/ApiVoteNY.php
R includes/specials/SpecialTopRatings.php
R resources/css/Vote.css
R resources/images/star_half.gif
R resources/images/star_off.gif
R resources/images/star_on.gif
R resources/images/star_voted.gif
R resources/js/Vote.js
R sql/vote.mysql
R sql/vote.postgres
16 files changed, 136 insertions(+), 136 deletions(-)

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



diff --git a/extension.json b/extension.json
index a2e26bf..a39a648 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "VoteNY",
-   "version": "2.8.1",
+   "version": "2.9.0",
"author": [
"Aaron Wright",
"David Pean",
@@ -22,15 +22,15 @@
"voteny": "ApiVoteNY"
},
"ExtensionMessagesFiles": {
-   "VoteNYAlias": "VoteNY.alias.php",
-   "VoteNYMagic": "VoteNY.i18n.magic.php"
+   "VoteNYAlias": "includes/VoteNY.alias.php",
+   "VoteNYMagic": "includes/VoteNY.i18n.magic.php"
},
"AutoloadClasses": {
-   "ApiVoteNY": "ApiVoteNY.php",
-   "Vote": "VoteClass.php",
-   "VoteStars": "VoteClass.php",
-   "SpecialTopRatings": "SpecialTopRatings.php",
-   "VoteHooks": "VoteHooks.php"
+   "ApiVoteNY": "includes/api/ApiVoteNY.php",
+   "Vote": "includes/Vote.class.php",
+   "VoteStars": "includes/VoteStars.class.php",
+   "SpecialTopRatings": "includes/specials/SpecialTopRatings.php",
+   "VoteHooks": "includes/VoteNY.hooks.php"
},
"Hooks": {
"ParserFirstCallInit": [
@@ -56,7 +56,7 @@
},
"ResourceModules": {
"ext.voteNY.scripts": {
-   "scripts": "Vote.js",
+   "scripts": "resources/js/Vote.js",
"messages": [
"voteny-link",
"voteny-unvote-link"
@@ -65,7 +65,7 @@
"position": "bottom"
},
"ext.voteNY.styles": {
-   "styles": "Vote.css",
+   "styles": "resources/css/Vote.css",
"position": "top"
}
},
diff --git a/VoteClass.php b/includes/Vote.class.php
similarity index 64%
rename from VoteClass.php
rename to includes/Vote.class.php
index 1b44378..8ead420 100644
--- a/VoteClass.php
+++ b/includes/Vote.class.php
@@ -242,126 +242,3 @@
return $output;
}
 }
-
-/**
- * Class for generating star rating stars.
- */
-class VoteStars extends Vote {
-
-   public $maxRating = 5;
-
-   /**
-* Displays voting stars
-*
-* @param bool $voted Has the user already voted? False by default
-* @return string HTML output
-*/
-   function display( $voted = false ) {
-   global $wgUser;
-
-   $overall_rating = $this->getAverageVote();
-
-   if ( $voted ) {
-   $display_stars_rating = $voted;
-   } else {
-   $display_stars_rating = $this->getAverageVote();
-   }
-
-   $id = '';
-
-   // Should probably be $this->PageID or something?
-   // 'cause we define $id just above as an empty string...duh
-   $output = '';
-   $output .= '';
-   $output .= '' . $overall_rating . 
'';
-   $output .= '';
-   $output .= '';
-   $output .= $this->displayStars( $id, $display_stars_rating, 
$voted );
-   $count = $this->count();
-   if ( isset( $count ) ) {
-   $output .= ' (' .
-   wfMessage( 'voteny-votes', $count )->parse() . 
')';
-   }
-   $already_voted = $this->UserAlreadyVoted();
-   if ( $already_voted && $wgUser->isLoggedIn() ) {
-   $output .= '' .
-   wfMessage( 'voteny-gave-this', $already_voted 
)->parse() .
-   " 
-   PageID}\" 
data-vote-id=\"{$id}\">("
-   . wfMessage( 'voteny-remove' )->plain() .
-   

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/363805 )

Change subject: Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"
..

Rename "BlueSpice for MediaWiki" to "BlueSpice MediaWiki"

See ERM6682 for details

Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
---
M resources/bluespice/images/bs-logo.png
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/05/363805/1

diff --git a/resources/bluespice/images/bs-logo.png 
b/resources/bluespice/images/bs-logo.png
index a924d71..425631e 100644
--- a/resources/bluespice/images/bs-logo.png
+++ b/resources/bluespice/images/bs-logo.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7129adfedd7cb3729cc317b62fa89c08c81ea54e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] mediawiki...SportsTeams[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Bug: T160849
Change-Id: I8588c693233a265b9b06c95f8b4b57ae667c7b04
---
M extension.json
R includes/SportsTeams.alias.php
R includes/SportsTeams.class.php
R includes/SportsTeams.hooks.php
R includes/SportsTeamsUserProfile.class.php
R includes/api/ApiSportsTeams.php
R includes/specials/SpecialAddFan.php
R includes/specials/SpecialFanHome.php
R includes/specials/SpecialRemoveFan.php
R includes/specials/SpecialSimilarFans.php
R includes/specials/SpecialSportsManagerLogo.php
R includes/specials/SpecialSportsTeamsManager.php
R includes/specials/SpecialSportsTeamsManagerLogo.php
R includes/specials/SpecialTopNetworks.php
R includes/specials/SpecialUpdateFavoriteTeams.php
R includes/specials/SpecialViewFans.php
R resources/css/SportsTeams.css
R resources/css/SportsTeamsManager.css
R resources/images/closeIcon.gif
R resources/js/DoubleCombo.js
R resources/js/FanHome.js
R resources/js/SportsTeamsUserProfile.js
R resources/js/UpdateFavoriteTeams.js
R sql/sportsteams.sql
24 files changed, 28 insertions(+), 28 deletions(-)

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



diff --git a/extension.json b/extension.json
index 19ceb2a..683a445 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "SportsTeams",
-   "version": "3.4.1",
+   "version": "3.5.0",
"author": [
"Aaron Wright",
"Ashish Datta",
@@ -43,44 +43,44 @@
]
},
"ExtensionMessagesFiles": {
-   "SportsTeamsAlias": "SportsTeams.alias.php"
+   "SportsTeamsAlias": "includes/SportsTeams.alias.php"
},
"AutoloadClasses": {
-   "SportsTeams": "SportsTeamsClass.php",
-   "SportsTeamsUserProfile": "SportsTeamsUserProfile.php",
-   "AddFan": "SpecialAddFan.php",
-   "FanHome": "SpecialFanHome.php",
-   "RemoveFan": "SpecialRemoveFan.php",
-   "SimilarFans": "SpecialSimilarFans.php",
-   "SportsManagerLogo": "SpecialSportsManagerLogo.php",
-   "SportsTeamsManager": "SpecialSportsTeamsManager.php",
-   "SportsTeamsManagerLogo": "SpecialSportsTeamsManagerLogo.php",
-   "TopNetworks": "SpecialTopNetworks.php",
-   "UpdateFavoriteTeams": "SpecialUpdateFavoriteTeams.php",
-   "ViewFans": "SpecialViewFans.php",
-   "ApiSportsTeams": "ApiSportsTeams.php",
-   "SportsTeamsHooks": "SportsTeamsHooks.php"
+   "SportsTeams": "includes/SportsTeams.class.php",
+   "SportsTeamsUserProfile": 
"includes/SportsTeamsUserProfile.class.php",
+   "AddFan": "includes/specials/SpecialAddFan.php",
+   "FanHome": "includes/specials/SpecialFanHome.php",
+   "RemoveFan": "includes/specials/SpecialRemoveFan.php",
+   "SimilarFans": "includes/specials/SpecialSimilarFans.php",
+   "SportsManagerLogo": 
"includes/specials/SpecialSportsManagerLogo.php",
+   "SportsTeamsManager": 
"includes/specials/SpecialSportsTeamsManager.php",
+   "SportsTeamsManagerLogo": 
"includes/specials/SpecialSportsTeamsManagerLogo.php",
+   "TopNetworks": "includes/specials/SpecialTopNetworks.php",
+   "UpdateFavoriteTeams": 
"includes/specials/SpecialUpdateFavoriteTeams.php",
+   "ViewFans": "includes/specials/SpecialViewFans.php",
+   "ApiSportsTeams": "includes/api/ApiSportsTeams.php",
+   "SportsTeamsHooks": "includes/SportsTeams.hooks.php"
},
"ResourceModules": {
"ext.sportsTeams": {
-   "styles": "SportsTeams.css",
+   "styles": "resources/css/SportsTeams.css",
"position": "top"
},
"ext.sportsTeams.fanHome": {
-   "scripts": "FanHome.js",
+   "scripts": "resources/js/FanHome.js",
"dependencies": [ "mediawiki.api" ],
"position": "top"
},
"ext.sportsTeams.doubleCombo": {
-   "scripts": "DoubleCombo.js",
+   "scripts": "resources/js/DoubleCombo.js",
"position": "bottom"
},
"ext.sportsTeams.manager": {
-   "styles": "SportsTeamsManager.css",
+   "styles": "resources/css/SportsTeamsManager.css",
"position": "top"
},
"ext.sportsTeams.userProfile": {
-   "scripts": 

[MediaWiki-commits] [Gerrit] mediawiki...RandomGameUnit[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Bug: T160849
Change-Id: If4e48776597974ae9c97f086dfe41f086e51f369
---
M extension.json
R includes/RandomGameUnit.class.php
R resources/css/RandomGameUnit.css
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 163b012..0db8171 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "RandomGameUnit",
-   "version": "2.5",
+   "version": "2.6.0",
"author": [
"Aaron Wright",
"David Pean",
@@ -24,14 +24,14 @@
]
},
"AutoloadClasses": {
-   "RandomGameUnit": "RandomGameUnit.class.php"
+   "RandomGameUnit": "includes/RandomGameUnit.class.php"
},
"Hooks": {
"ParserFirstCallInit": "RandomGameUnit::registerTag"
},
"ResourceModules": {
"ext.RandomGameUnit.css": {
-   "styles": "RandomGameUnit.css",
+   "styles": "resources/css/RandomGameUnit.css",
"position": "top"
}
},
diff --git a/RandomGameUnit.class.php b/includes/RandomGameUnit.class.php
similarity index 100%
rename from RandomGameUnit.class.php
rename to includes/RandomGameUnit.class.php
diff --git a/RandomGameUnit.css b/resources/css/RandomGameUnit.css
similarity index 100%
rename from RandomGameUnit.css
rename to resources/css/RandomGameUnit.css

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4e48776597974ae9c97f086dfe41f086e51f369
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomGameUnit
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SiteMetrics[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Bug: T160849
Change-Id: If8616502ce325362156575b67619d5b6dee0015a
---
M extension.json
R includes/SiteMetrics.alias.php
R includes/specials/SpecialSiteMetrics.php
R resources/css/SiteMetrics.css
4 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 56762bf..abc4111 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "SiteMetrics",
-   "version": "1.4.1",
+   "version": "1.5.0",
"author": [
"Aaron Wright",
"David Pean",
@@ -16,10 +16,10 @@
]
},
"ExtensionMessagesFiles": {
-   "SiteMetricsAliases": "SiteMetrics.alias.php"
+   "SiteMetricsAliases": "includes/SiteMetrics.alias.php"
},
"AutoloadClasses": {
-   "SiteMetrics": "SpecialSiteMetrics.php"
+   "SiteMetrics": "includes/specials/SpecialSiteMetrics.php"
},
"SpecialPages": {
"SiteMetrics": "SiteMetrics"
@@ -30,7 +30,7 @@
},
"ResourceModules": {
"ext.siteMetrics": {
-   "styles": "SiteMetrics.css",
+   "styles": "resources/css/SiteMetrics.css",
"position": "top"
}
},
diff --git a/SiteMetrics.alias.php b/includes/SiteMetrics.alias.php
similarity index 100%
rename from SiteMetrics.alias.php
rename to includes/SiteMetrics.alias.php
diff --git a/SpecialSiteMetrics.php b/includes/specials/SpecialSiteMetrics.php
similarity index 100%
rename from SpecialSiteMetrics.php
rename to includes/specials/SpecialSiteMetrics.php
diff --git a/SiteMetrics.css b/resources/css/SiteMetrics.css
similarity index 100%
rename from SiteMetrics.css
rename to resources/css/SiteMetrics.css

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8616502ce325362156575b67619d5b6dee0015a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SiteMetrics
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Bug: T160849
Change-Id: I073dfe4d44a036830285fdbf12d477b948be9f11
---
M extension.json
R includes/RandomUsersWithAvatars.class.php
R resources/css/ext.randomuserswithavatars.css
3 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 6eb7bd8..5264fca 100644
--- a/extension.json
+++ b/extension.json
@@ -15,7 +15,7 @@
]
},
"AutoloadClasses": {
-   "RandomUsersWithAvatars": "RandomUsersWithAvatars.class.php"
+   "RandomUsersWithAvatars": 
"includes/RandomUsersWithAvatars.class.php"
},
"Hooks": {
"ParserFirstCallInit": [
@@ -28,7 +28,7 @@
},
"ResourceModules": {
"ext.randomuserswithavatars": {
-   "styles": "ext.randomuserswithavatars.css",
+   "styles": 
"resources/css/ext.randomuserswithavatars.css",
"position": "top"
}
},
diff --git a/RandomUsersWithAvatars.class.php 
b/includes/RandomUsersWithAvatars.class.php
similarity index 100%
rename from RandomUsersWithAvatars.class.php
rename to includes/RandomUsersWithAvatars.class.php
diff --git a/ext.randomuserswithavatars.css 
b/resources/css/ext.randomuserswithavatars.css
similarity index 100%
rename from ext.randomuserswithavatars.css
rename to resources/css/ext.randomuserswithavatars.css

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I073dfe4d44a036830285fdbf12d477b948be9f11
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomFeaturedUser[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Bug: T160849
Change-Id: I71cfdc2e3504f5f3828353578514b1ee039207b4
---
M extension.json
R includes/RandomFeaturedUser.class.php
R resources/css/RandomFeaturedUser.css
R sql/user_points_archive.sql
R sql/user_points_monthly.sql
R sql/user_points_weekly.sql
6 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 56db04e..5870de0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "RandomFeaturedUser",
-   "version": "1.5",
+   "version": "1.6.0",
"author": [
"David Pean",
"Jack Phoenix"
@@ -22,14 +22,14 @@
]
},
"AutoloadClasses": {
-   "RandomFeaturedUser": "RandomFeaturedUser.class.php"
+   "RandomFeaturedUser": "includes/RandomFeaturedUser.class.php"
},
"Hooks": {
"ParserFirstCallInit": 
"RandomFeaturedUser::onParserFirstCallInit"
},
"ResourceModules": {
"ext.RandomFeaturedUser.css": {
-   "styles": "RandomFeaturedUser.css",
+   "styles": "resources/css/RandomFeaturedUser.css",
"position": "top"
}
},
diff --git a/RandomFeaturedUser.class.php 
b/includes/RandomFeaturedUser.class.php
similarity index 100%
rename from RandomFeaturedUser.class.php
rename to includes/RandomFeaturedUser.class.php
diff --git a/RandomFeaturedUser.css b/resources/css/RandomFeaturedUser.css
similarity index 100%
rename from RandomFeaturedUser.css
rename to resources/css/RandomFeaturedUser.css
diff --git a/user_points_archive.sql b/sql/user_points_archive.sql
similarity index 100%
rename from user_points_archive.sql
rename to sql/user_points_archive.sql
diff --git a/user_points_monthly.sql b/sql/user_points_monthly.sql
similarity index 100%
rename from user_points_monthly.sql
rename to sql/user_points_monthly.sql
diff --git a/user_points_weekly.sql b/sql/user_points_weekly.sql
similarity index 100%
rename from user_points_weekly.sql
rename to sql/user_points_weekly.sql

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71cfdc2e3504f5f3828353578514b1ee039207b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomFeaturedUser
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Also split MiniAjaxUpload.php into:
- includes/specials/SpecialPollAjaxUpload.php
- includes/upload/PollAjaxUploadForm.class.php
- includes/upload/PollUpload.class.php

Bug: T160849
Change-Id: I86f0d0bef425f819b5d5ae6f591703cca2433f02
---
D MiniAjaxUpload.php
M extension.json
R includes/Poll.class.php
R includes/PollNY.alias.php
R includes/PollNY.hooks.php
R includes/PollNY.namespaces.php
R includes/PollPage.class.php
R includes/api/ApiPollNY.php
R includes/specials/SpecialAdminPoll.php
R includes/specials/SpecialCreatePoll.php
A includes/specials/SpecialPollAjaxUpload.php
R includes/specials/SpecialRandomPoll.php
R includes/specials/SpecialUpdatePoll.php
R includes/specials/SpecialViewPoll.php
R includes/templates/CreatePoll.template.php
A includes/upload/PollAjaxUploadForm.class.php
A includes/upload/PollUpload.class.php
R resources/css/Poll.css
R resources/js/Poll.js
R sql/poll.sql
20 files changed, 584 insertions(+), 584 deletions(-)

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



diff --git a/MiniAjaxUpload.php b/MiniAjaxUpload.php
deleted file mode 100644
index 53d5661..000
--- a/MiniAjaxUpload.php
+++ /dev/null
@@ -1,566 +0,0 @@
-
- * @date 21 July 2013
- * @note Based on 1.16 core SpecialUpload.php (GPL-licensed) by Bryan et al.
- * @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=22
- */
-class SpecialPollAjaxUpload extends SpecialUpload {
-   /**
-* Constructor: initialise object
-* Get data POSTed through the form and assign them to the object
-*
-* @param $request WebRequest: Data posted.
-*/
-   public function __construct() {
-   SpecialPage::__construct( 'PollAjaxUpload', 'upload', false );
-   }
-
-   /**
-* apparently you don't need to (re)declare the protected/public class
-* member variables here, so I removed them.
-*/
-
-   /**
-* Initialize instance variables from request and create an Upload 
handler
-*
-* What was changed here: $this->mIgnoreWarning is now unconditionally 
true
-* and mUpload uses PollUpload instead of UploadBase
-*
-* @param $request WebRequest: The request to extract variables from
-*/
-   protected function loadRequest() {
-   $this->mRequest = $request = $this->getRequest();
-   $this->mSourceType= $request->getVal( 'wpSourceType', 
'file' );
-   $this->mUpload= PollUpload::createFromRequest( 
$request );
-   $this->mUploadClicked = $request->wasPosted()
-   && ( $request->getCheck( 'wpUpload' )
-   || $request->getCheck( 'wpUploadIgnoreWarning' 
) );
-
-   // Guess the desired name from the filename if not provided
-   $this->mDesiredDestName   = $request->getText( 'wpDestFile' );
-   if( !$this->mDesiredDestName && $request->getFileName( 
'wpUploadFile' ) !== null ) {
-   $this->mDesiredDestName = $request->getFileName( 
'wpUploadFile' );
-   }
-   $this->mComment   = $request->getText( 
'wpUploadDescription' );
-   $this->mLicense   = $request->getText( 'wpLicense' );
-
-   $this->mDestWarningAck= $request->getText( 
'wpDestFileWarningAck' );
-   $this->mIgnoreWarning = true;//$request->getCheck( 
'wpIgnoreWarning' ) || $request->getCheck( 'wpUploadIgnoreWarning' );
-   $this->mWatchthis = $request->getBool( 'wpWatchthis' ) 
&& $this->getUser()->isLoggedIn();
-   $this->mCopyrightStatus   = $request->getText( 
'wpUploadCopyStatus' );
-   $this->mCopyrightSource   = $request->getText( 'wpUploadSource' 
);
-
-   $this->mForReUpload   = $request->getBool( 'wpForReUpload' 
); // updating a file
-   $this->mCancelUpload  = $request->getCheck( 
'wpCancelUpload' )
-|| $request->getCheck( 'wpReUpload' ); 
// b/w compat
-
-   // If it was posted check for the token (no remote POST'ing 
with user credentials)
-   $token = $request->getVal( 'wpEditToken' );
-   if( $this->mSourceType == 'file' && $token == null ) {
-   // Skip token check for file uploads as that can't be 
faked via JS...
-   // Some client-side tools don't expect to need to send 
wpEditToken
-   // with their submissions, as that's new in 1.16.
-   $this->mTokenOk = true;
-   } else {
-   $this->mTokenOk = 

[MediaWiki-commits] [Gerrit] mediawiki...PictureGame[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Also split AjaxUploadForm.php into:
- includes/specials/SpecialPictureGameAjaxUpload.php
- includes/upload/PictureGameUploadForm.class.php
- includes/upload/PictureGameUpload.class.php

Bug: T160849
Change-Id: I2ded75216eced88a136c8c8216156f3c61a74a3a
---
D AjaxUploadForm.php
M extension.json
R includes/PictureGame.alias.php
R includes/PictureGame.hooks.php
A includes/specials/SpecialPictureGameAjaxUpload.php
R includes/specials/SpecialPictureGameHome.php
A includes/upload/PictureGameAjaxUploadForm.class.php
A includes/upload/PictureGameUpload.class.php
R resources/css/adminpanel.css
R resources/css/editpanel.css
R resources/css/gallery.css
R resources/css/maingame.css
R resources/css/startgame.css
R resources/js/PictureGame.js
14 files changed, 626 insertions(+), 626 deletions(-)

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



diff --git a/AjaxUploadForm.php b/AjaxUploadForm.php
deleted file mode 100644
index ba43f58..000
--- a/AjaxUploadForm.php
+++ /dev/null
@@ -1,608 +0,0 @@
-
- * @date 22 July 2013
- * @note Based on 1.16 core SpecialUpload.php (GPL-licensed) by Bryan et al.
- * @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=22
- */
-class SpecialPictureGameAjaxUpload extends SpecialUpload {
-   /**
-* Constructor: initialise object
-* Get data POSTed through the form and assign them to the object
-*
-* @param $request WebRequest: Data posted.
-*/
-   public function __construct() {
-   SpecialPage::__construct( 'PictureGameAjaxUpload', 'upload', 
false );
-   }
-
-   /**
-* apparently you don't need to (re)declare the protected/public class
-* member variables here, so I removed them.
-*/
-
-   /**
-* Initialize instance variables from request and create an Upload 
handler
-*
-* What was changed here: $this->mIgnoreWarning is now unconditionally 
true
-* and mUpload uses PictureGameUpload instead of UploadBase
-*/
-   protected function loadRequest() {
-   $this->mRequest = $request = $this->getRequest();
-   $this->mSourceType= $request->getVal( 'wpSourceType', 
'file' );
-   $this->mUpload= 
PictureGameUpload::createFromRequest( $request );
-   $this->mUploadClicked = $request->wasPosted()
-   && ( $request->getCheck( 'wpUpload' )
-   || $request->getCheck( 'wpUploadIgnoreWarning' 
) );
-
-   // Guess the desired name from the filename if not provided
-   $this->mDesiredDestName   = $request->getText( 'wpDestFile' );
-   if( !$this->mDesiredDestName && $request->getFileName( 
'wpUploadFile' ) !== null ) {
-   $this->mDesiredDestName = $request->getFileName( 
'wpUploadFile' );
-   }
-   $this->mComment   = $request->getText( 
'wpUploadDescription' );
-   $this->mLicense   = $request->getText( 'wpLicense' );
-
-   $this->mDestWarningAck= $request->getText( 
'wpDestFileWarningAck' );
-   $this->mIgnoreWarning = true;//$request->getCheck( 
'wpIgnoreWarning' ) || $request->getCheck( 'wpUploadIgnoreWarning' );
-   $this->mWatchthis = $request->getBool( 'wpWatchthis' ) 
&& $this->getUser()->isLoggedIn();
-   $this->mCopyrightStatus   = $request->getText( 
'wpUploadCopyStatus' );
-   $this->mCopyrightSource   = $request->getText( 'wpUploadSource' 
);
-
-   $this->mForReUpload   = $request->getBool( 'wpForReUpload' 
); // updating a file
-   $this->mCancelUpload  = $request->getCheck( 
'wpCancelUpload' )
-|| $request->getCheck( 'wpReUpload' ); 
// b/w compat
-
-   // If it was posted check for the token (no remote POST'ing 
with user credentials)
-   $token = $request->getVal( 'wpEditToken' );
-   if( $this->mSourceType == 'file' && $token == null ) {
-   // Skip token check for file uploads as that can't be 
faked via JS...
-   // Some client-side tools don't expect to need to send 
wpEditToken
-   // with their submissions, as that's new in 1.16.
-   $this->mTokenOk = true;
-   } else {
-   $this->mTokenOk = $this->getUser()->matchEditToken( 
$token );
-   }
-   }
-
-   /**
-* Special page entry point
-*
-* What was changed here: the setArticleBodyOnly() line below was added,
-* 

[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Also split QuestionGameUpload.php into:
- includes/specials/SpecialQuestionGameUpload.php
- includes/upload/QuestionGameUploadForm.class.php
- includes/upload/QuizFileUpload.class.php

Bug: T160849
Change-Id: I7f15282548f6e7302054fb04e3e889360827df37
---
M extension.json
R includes/QuizGame.alias.php
R includes/QuizGame.hooks.php
R includes/QuizGameLogFormatter.class.php
R includes/api/ApiQuizGame.php
R includes/api/ApiQuizGameVote.php
R includes/specials/SpecialQuestionGameUpload.php
R includes/specials/SpecialQuizGameHome.php
R includes/specials/SpecialQuizLeaderboard.php
R includes/specials/SpecialQuizRecalcStats.php
R includes/specials/SpecialViewQuizzes.php
A includes/upload/QuestionGameUploadForm.class.php
A includes/upload/QuizFileUpload.class.php
R resources/css/questiongame.css
R resources/js/QuizGame.js
R sql/quizgame.sql
16 files changed, 281 insertions(+), 279 deletions(-)

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



diff --git a/extension.json b/extension.json
index fad595f..bde0add 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "QuizGame",
-   "version": "3.7.1",
+   "version": "3.8.0",
"author": [
"Aaron Wright",
"Ashish Datta",
@@ -33,20 +33,20 @@
"quizgamevote": "ApiQuizGameVote"
},
"ExtensionMessagesFiles": {
-   "QuizGameAlias": "QuizGame.alias.php"
+   "QuizGameAlias": "includes/QuizGame.alias.php"
},
"AutoloadClasses": {
-   "ApiQuizGame": "api/ApiQuizGame.php",
-   "ApiQuizGameVote": "api/ApiQuizGameVote.php",
-   "QuizGameLogFormatter": "QuizGameLogFormatter.php",
-   "QuizGameHome": "QuestionGameHome.body.php",
-   "SpecialQuestionGameUpload": "QuestionGameUpload.php",
-   "QuestionGameUploadForm": "QuestionGameUpload.php",
-   "QuizFileUpload": "QuestionGameUpload.php",
-   "QuizLeaderboard": "QuizLeaderboard.php",
-   "QuizRecalcStats": "RecalculateStats.php",
-   "ViewQuizzes": "ViewQuizzes.php",
-   "QuizGameHooks": "QuizGameHooks.php"
+   "ApiQuizGame": "includes/api/ApiQuizGame.php",
+   "ApiQuizGameVote": "includes/api/ApiQuizGameVote.php",
+   "QuizGameLogFormatter": 
"includes/QuizGameLogFormatter.class.php",
+   "QuizGameHome": "includes/specials/SpecialQuizGameHome.php",
+   "SpecialQuestionGameUpload": 
"includes/specials/SpecialQuestionGameUpload.php",
+   "QuestionGameUploadForm": 
"includes/upload/QuestionGameUploadForm.class.php",
+   "QuizFileUpload": "includes/upload/QuizFileUpload.class.php",
+   "QuizLeaderboard": 
"includes/specials/SpecialQuizLeaderboard.php",
+   "QuizRecalcStats": 
"includes/specials/SpecialQuizRecalcStats.php",
+   "ViewQuizzes": "includes/specials/SpecialViewQuizzes.php",
+   "QuizGameHooks": "includes/QuizGame.hooks.php"
},
"Hooks": {
"SkinTemplateNavigation::SpecialPage": [
@@ -68,7 +68,7 @@
},
"ResourceModules": {
"ext.quizGame": {
-   "scripts": "js/QuizGame.js",
+   "scripts": "resources/js/QuizGame.js",
"messages": [
"quizgame-create-error-numanswers", 
"quizgame-create-error-noquestion",
"quizgame-create-error-numcorrect", 
"quizgame-js-reloading",
@@ -95,7 +95,7 @@
"position": "bottom"
},
"ext.quizGame.css": {
-   "styles": "questiongame.css",
+   "styles": "resources/css/questiongame.css",
"position": "top"
}
},
diff --git a/QuizGame.alias.php b/includes/QuizGame.alias.php
similarity index 100%
rename from QuizGame.alias.php
rename to includes/QuizGame.alias.php
diff --git a/QuizGameHooks.php b/includes/QuizGame.hooks.php
similarity index 98%
rename from QuizGameHooks.php
rename to includes/QuizGame.hooks.php
index dc8d2aa..c30f089 100644
--- a/QuizGameHooks.php
+++ b/includes/QuizGame.hooks.php
@@ -73,7 +73,7 @@
 */
public static function addTables( $updater ) {
$dir = dirname( __FILE__ );
-   $file = "$dir/quizgame.sql";
+   $file = "$dir/../sql/quizgame.sql";
$updater->addExtensionUpdate( array( 'addTable', 
'quizgame_questions', $file, true ) );
$updater->addExtensionUpdate( array( 

[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Reorganize directory structure + file renaming

[jenkins-bot (Code Review)]

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

Change subject: Reorganize directory structure + file renaming
..


Reorganize directory structure + file renaming

Bug: T160849
Change-Id: Ied149582ebfa277485548e54233172ccf240f8aa
---
M extension.json
R includes/Link.class.php
R includes/LinkFeed.class.php
R includes/LinkFilter.alias.php
R includes/LinkFilter.hooks.php
R includes/LinkFilter.namespaces.php
A includes/LinkList.class.php
R includes/LinkPage.class.php
R includes/api/ApiLinkFilter.php
R includes/specials/SpecialLinkApprove.php
R includes/specials/SpecialLinkEdit.php
R includes/specials/SpecialLinkRedirect.php
R includes/specials/SpecialLinkSubmit.php
R includes/specials/SpecialLinksHome.php
R resources/css/LinkFilter.css
R resources/js/LinkFilter.js
R sql/link.sql
R sql/patch-columns_for_user_stats.sql
18 files changed, 121 insertions(+), 121 deletions(-)

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



diff --git a/extension.json b/extension.json
index 3781179..d5d485c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "LinkFilter",
-   "version": "3.4.1",
+   "version": "3.5.0",
"author": [
"Aaron Wright",
"David Pean",
@@ -63,21 +63,21 @@
"linkfilter": "ApiLinkFilter"
},
"ExtensionMessagesFiles": {
-   "LinkFilterAlias": "Link.alias.php",
-   "LinkNamespaces": "Link.namespaces.php"
+   "LinkFilterAlias": "includes/LinkFilter.alias.php",
+   "LinkNamespaces": "includes/LinkFilter.namespaces.php"
},
"AutoloadClasses": {
-   "ApiLinkFilter": "ApiLinkFilter.php",
-   "Link": "LinkClass.php",
-   "LinkList": "LinkClass.php",
-   "LinkPage": "LinkPage.php",
-   "LinkFeed": "LinkFeed.php",
-   "LinkFilterHooks": "LinkFilterHooks.php",
-   "LinkApprove": "SpecialLinkApprove.php",
-   "LinkEdit": "SpecialLinkEdit.php",
-   "LinksHome": "SpecialLinksHome.php",
-   "LinkRedirect": "SpecialLinkRedirect.php",
-   "LinkSubmit": "SpecialLinkSubmit.php"
+   "ApiLinkFilter": "includes/api/ApiLinkFilter.php",
+   "Link": "includes/Link.class.php",
+   "LinkList": "includes/LinkList.class.php",
+   "LinkPage": "includes/LinkPage.class.php",
+   "LinkFeed": "includes/LinkFeed.class.php",
+   "LinkFilterHooks": "includes/LinkFilter.hooks.php",
+   "LinkApprove": "includes/specials/SpecialLinkApprove.php",
+   "LinkEdit": "includes/specials/SpecialLinkEdit.php",
+   "LinksHome": "includes/specials/SpecialLinksHome.php",
+   "LinkRedirect": "includes/specials/SpecialLinkRedirect.php",
+   "LinkSubmit": "includes/specials/SpecialLinkSubmit.php"
},
"Hooks": {
"TitleMoveComplete": [
@@ -114,11 +114,11 @@
},
"ResourceModules": {
"ext.linkFilter.styles": {
-   "styles": "LinkFilter.css",
+   "styles": "resources/css/LinkFilter.css",
"position": "top"
},
"ext.linkFilter.scripts": {
-   "scripts": "LinkFilter.js",
+   "scripts": "resources/js/LinkFilter.js",
"dependencies": [ "mediawiki.api" ],
"messages": [
"linkfilter-admin-accept-success", 
"linkfilter-admin-reject-success",
diff --git a/LinkClass.php b/includes/Link.class.php
similarity index 71%
rename from LinkClass.php
rename to includes/Link.class.php
index a1e9be0..5a92564 100644
--- a/LinkClass.php
+++ b/includes/Link.class.php
@@ -286,107 +286,3 @@
return $link;
}
 }
-
-class LinkList {
-
-   /**
-* Constructor
-* @private
-*/
-   /* private */ function __construct() {
-   }
-
-   /**
-* @param $status Integer: link status
-* @param $type Integer: link type (one of Link::$link_types integers)
-* @param $limit Integer: LIMIT for SQL query, 0 by default.
-* @param $page Integer: used to build the OFFSET in the SQL query.
-* @param $order String: ORDER BY clause for SQL query.
-*/
-   public function getLinkList( $status, $type, $limit = 0, $page = 0, 
$order = 'link_submit_date' ) {
-   $dbr = wfGetDB( DB_SLAVE );
-
-   $params['ORDER BY'] = "$order DESC";
-   if ( $limit ) {
-   $params['LIMIT'] = $limit;
-   }
-   if ( $page ) {
-   $params['OFFSET'] = $page * $limit - ( $limit );
- 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BlueSpiceVisualEditor: Additional toggles for table function...

[jenkins-bot (Code Review)]

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

Change subject: BlueSpiceVisualEditor: Additional toggles for table function 
and style
..


BlueSpiceVisualEditor: Additional toggles for table function and style

Table style and functionality can now be set using menu buttons. This
is more intuitive than using the formats menu. The formats menu
was also made more consistant by removing redundant options.

There was a light face-lift for link and table buttons. Also, the order
of buttons was rearranged.

Patch Set 2: Implemented CR

ERM#6712

Change-Id: Ifd96a82fc3e9842d783bf71461d6c3174e0d09d2
---
M InsertLink/resources/images/button_insert-link-16px.png
M InsertLink/resources/images/button_insert-unlink-16px.png
M THIRD_PARTY_LICENSES.md
M VisualEditor/VisualEditor.class.php
M VisualEditor/extension.json
M VisualEditor/i18n/de.json
M VisualEditor/i18n/en.json
M VisualEditor/i18n/qqq.json
M VisualEditor/resources/bluespice.visualEditor.css
D VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwswitch.gif
D 
VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtabledeletecolumn.gif
D VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtabledeleterow.gif
A VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtablefunctions.png
D 
VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtableinsertcolumnafter.gif
D 
VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtableinsertcolumnbefore.gif
D 
VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtableinsertrowafter.gif
D 
VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtableinsertrowbefore.gif
A VisualEditor/resources/tiny_mce_plugins/bsactions/images/hwtablestyles.png
M VisualEditor/resources/tiny_mce_plugins/bsactions/plugin.js
19 files changed, 191 insertions(+), 106 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  Raimond Spekking: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/InsertLink/resources/images/button_insert-link-16px.png 
b/InsertLink/resources/images/button_insert-link-16px.png
index 49b4380..4204484 100644
--- a/InsertLink/resources/images/button_insert-link-16px.png
+++ b/InsertLink/resources/images/button_insert-link-16px.png
Binary files differ
diff --git a/InsertLink/resources/images/button_insert-unlink-16px.png 
b/InsertLink/resources/images/button_insert-unlink-16px.png
index 16493fb..0f12135 100644
--- a/InsertLink/resources/images/button_insert-unlink-16px.png
+++ b/InsertLink/resources/images/button_insert-unlink-16px.png
Binary files differ
diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
index 92b0e02..545fd5b 100644
--- a/THIRD_PARTY_LICENSES.md
+++ b/THIRD_PARTY_LICENSES.md
@@ -38,6 +38,7 @@
 | Font | Author | Version | License |
 |:|:---|:|:---|
 | [DejaVu](https://dejavu-fonts.github.io/) | Bitstream | 2.33 | 
[DejaVu](https://dejavu-fonts.github.io/License.html) |
+| [FontAwesome](http://fontawesome.io) | Dave Gandy | 3.0 | [SIL 
1.1](http://fontawesome.io/license) |
 | [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) |
 
 License texts
diff --git a/VisualEditor/VisualEditor.class.php 
b/VisualEditor/VisualEditor.class.php
index 1f0fa2c..213acc2 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -84,18 +84,18 @@
//'inline' => true,
'menu' => false,
'toolbar1' => array(
-   'bswiki', /* 'bsswitch', */ 'bssave', '|', 'undo', 
'redo', '|',
-   'searchreplace', 'paste', '|', 'bssignature', 'unlink', 
'|',
-   'table', '|', 'bstableaddrowbefore',
-   'bstableaddrowafter', 'bstabledeleterow', 
'bstableaddcolumnbefore',
-   'bstableaddcolumnafter', 'bstabledeletecolumn'
+   'bswiki', 'bssave', 'fullscreen', '|', 'undo', 'redo', 
'|',
+   'searchreplace', 'paste', '|', 'styleselect', 
'bsheadings',  '|',
+   'bssignature', 'unlink',
),
'toolbar2' => array(
'bold', 'italic', 'underline', 'strikethrough', '|',
'bullist', 'numlist', '|', 'outdent', 'indent', '|',
'charmap', 'bslinebreak', '|',
-   'styleselect', 'bsheadings', 'forecolor', 
'removeformat', '|',
-   'fullscreen'
+   'forecolor', 'removeformat', '|',
+   'table', '|', 'bstableaddrowbefore',
+   'bstableaddrowafter', 'bstabledeleterow', 
'bstableaddcolumnbefore',
+   'bstableaddcolumnafter', 'bstabledeletecolumn', 
'bstablefunctions', 'bstablestyles'
),
  

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Remove Settings box when Quiz is set to simple

[jenkins-bot (Code Review)]

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

Change subject: Remove Settings box when Quiz is set to simple
..


Remove Settings box when Quiz is set to simple

Due to the change for T161317, the settings table was being displayed even when
the display is set to simple.This change modifies the mustache templates to
remove the settings box.

Bug:T169529
Change-Id: I2a51df9bfb0fac7a6b1bc8e988836a2d81f6f095
---
M Quiz.class.php
M templates/Quiz.mustache
M templates/Setting.mustache
3 files changed, 44 insertions(+), 37 deletions(-)

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



diff --git a/Quiz.class.php b/Quiz.class.php
index b5c3330..7ef1d2c 100644
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -131,6 +131,8 @@
$settingsTable = $templateParser->processTemplate(
'Setting',
[
+   'isSettingFirstRow' => ( !$this->mDisplaySimple 
|| $this->mBeingCorrected || $this->mState === 'error' ),
+   'isSettingOtherRow' => ( !$this->mDisplaySimple 
|| $this->mBeingCorrected ),
'notSimple' => !$this->mDisplaySimple,
'corrected' => $this->mBeingCorrected,
'shuffle' => $this->mShuffle,
diff --git a/templates/Quiz.mustache b/templates/Quiz.mustache
index aaa30e8..155cbec 100644
--- a/templates/Quiz.mustache
+++ b/templates/Quiz.mustache
@@ -1,9 +1,9 @@
 


-   
-   {{{ settingsTable }}}
-   
+   {{#settingsTable }}
+   {{{ . }}}
+   {{/settingsTable }}



diff --git a/templates/Setting.mustache b/templates/Setting.mustache
index 547b580..15f30a4 100644
--- a/templates/Setting.mustache
+++ b/templates/Setting.mustache
@@ -1,41 +1,47 @@
-
-   {{# notSimple}}
-   {{ wfMessage.quiz_added }}
-   
-   {{/ notSimple}}
-   {{# corrected}}
-   
-   {{ 
wf.Message.quiz_colorRight }}
-   {{/corrected}}
-   {{# error}}
-   {{^ corrected}}
-   
-   {{ wfMessage.quiz_colorError }}
+{{# isSettingFirstRow}}
+   
+   {{# notSimple}}
+   {{ wfMessage.quiz_added }}
+   
+   {{/ notSimple}}
+   {{# corrected}}
+   
+   {{ 
wf.Message.quiz_colorRight }}
{{/corrected}}
-   {{/ error}}
+   {{# error}}
+   {{^ corrected}}
+   
+   {{ wfMessage.quiz_colorError }}
+   {{/corrected}}
+   {{/ error}}

+{{/ isSettingFirstRow}}
+{{# isSettingOtherRow}}

-   {{# notSimple}}
-   {{ wfMessage.quiz_cutoff }}
-   
-   {{/ notSimple}}
-   {{# corrected}}
-   
-   {{ 
wfMessage.quiz_colorWrong }}
-   {{/ corrected}}
+   {{# notSimple}}
+   {{ wfMessage.quiz_cutoff }}
+   
+   {{/ notSimple}}
+   {{# corrected}}
+   
+   {{ 
wfMessage.quiz_colorWrong }}
+   {{/ corrected}}

+{{/ isSettingOtherRow}}
+{{# isSettingOtherRow}}

-   {{# notSimple}}
-   {{{ wfMessage.quiz_ignoreCoef }}}
-   
-   {{/ notSimple}}
-   {{# corrected}}
-   
-   {{ wfMessage.quiz_colorNA 
}}
-   {{/ corrected}}
+   {{# notSimple}}
+   {{{ wfMessage.quiz_ignoreCoef }}}
+   
+   {{/ notSimple}}
+   {{# corrected}}
+   
+   {{ 
wfMessage.quiz_colorNA }}
+   {{/ corrected}}

+{{/ isSettingOtherRow}}
+{{# notSimple}}

-   {{# notSimple}}
{{# shuffle}}
{{^ corrected}}
{{# shuffleDisplay}}
@@ -55,6 +61,5 @@
{{ wfMessage.quiz_colorError }}
{{/ corrected}}
{{/ error}}
-   {{/ notSimple}}
-
-
+   
+{{/ notSimple}}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a51df9bfb0fac7a6b1bc8e988836a2d81f6f095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Harjotsingh 
Gerrit-Reviewer: Mvolz 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: BSSkin: Set the font-weight of the icons in personal info to...

[Pwirth (Code Review)]

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

Change subject: BSSkin: Set the font-weight of the icons in personal info to 
100 #6773
..

BSSkin: Set the font-weight of the icons in personal info to 100 #6773

Change-Id: I3c5a4e97fcf4ad103a3cc59cc38ffbdf8a430673
---
M resources/components/extension.notifications.less
M resources/components/skin.font.less
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/03/363803/1

diff --git a/resources/components/extension.notifications.less 
b/resources/components/extension.notifications.less
index 8f9eb68..9c0b6bb 100644
--- a/resources/components/extension.notifications.less
+++ b/resources/components/extension.notifications.less
@@ -86,9 +86,11 @@
#pt-notifications-alert > a:before{
content: "\e96d";
font-family: 'entypo';
+   font-weight: 100;
}
#pt-notifications-message > a:before{
content: "\e945";
+   font-weight: 100;
}
#pi-review > a:before{
content: "\e9a1";
diff --git a/resources/components/skin.font.less 
b/resources/components/skin.font.less
index a47a1d1..dae43e5 100644
--- a/resources/components/skin.font.less
+++ b/resources/components/skin.font.less
@@ -197,9 +197,11 @@
#bs-personal-info{
li a:before{
color: @bs-color-dark-grey;
+   font-weight: 100 !important;
}
li a:hover:before{
color: @bs-color-dark-blue;
+   font-weight: 100 !important;
}
}
span.bs-personal-not-loggedin a,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c5a4e97fcf4ad103a3cc59cc38ffbdf8a430673
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Pwirth 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Update BetaFeatures icon, use new template and cleanup slightly

[Esanders (Code Review)]

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

Change subject: Update BetaFeatures icon, use new template and cleanup slightly
..

Update BetaFeatures icon, use new template and cleanup slightly

Change-Id: I29b596aef4a203d0b5e5bad5616d3a52284e147b
---
M CodeMirror.hooks.php
D resources/images/codemirror-beta-LTR.svg
D resources/images/codemirror-beta-RTL.svg
A resources/images/codemirror-beta-ltr.svg
A resources/images/codemirror-beta-rtl.svg
5 files changed, 118 insertions(+), 197 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/02/363802/1

diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 34364fa..028d953 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -161,8 +161,8 @@
'label-message' => 'codemirror-beta-title',
'desc-message' => 'codemirror-beta-desc',
'screenshot' => [
-   'ltr' => $wgExtensionAssetsPath . 
'/CodeMirror/resources/images/codemirror-beta-LTR.svg',
-   'rtl' => $wgExtensionAssetsPath . 
'/CodeMirror/resources/images/codemirror-beta-RTL.svg'
+   'ltr' => $wgExtensionAssetsPath . 
'/CodeMirror/resources/images/codemirror-beta-ltr.svg',
+   'rtl' => $wgExtensionAssetsPath . 
'/CodeMirror/resources/images/codemirror-beta-rtl.svg'
],
'info-link' => 
'https://meta.wikimedia.org/wiki/Community_Tech/Wikitext_editor_syntax_highlighting',
'discussion-link' => 
'https://meta.wikimedia.org/wiki/Talk:Community_Tech/Wikitext_editor_syntax_highlighting'
diff --git a/resources/images/codemirror-beta-LTR.svg 
b/resources/images/codemirror-beta-LTR.svg
deleted file mode 100644
index 36e08df..000
--- a/resources/images/codemirror-beta-LTR.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-http://www.w3.org/2000/svg; viewBox="0 0 264 162" width="264" 
height="162">
-
-   .st0{fill:#3466CC;}
-   .st1{fill:#E5E5E5;}
-   .st2{fill:#FF;}
-   .st3{opacity:6.00e-02;enable-background:new;}
-   .st4{opacity:7.00e-02;enable-background:new;}
-   
.st5{opacity:0.25;fill:none;stroke:#FF;stroke-width:0.5;stroke-miterlimit:10;enable-background:new
;}
-   .st6{fill:#00AF89;}
-   .st7{opacity:0.23;fill:#F5A623;enable-background:new;}
-   .st8{fill:#F5A623;}
-
-
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-   
-   
-
-
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-
-
-
-
-
-
-
-   
-
-
-   
-   
-   
-   
-   
-   
-   
-
-
diff --git a/resources/images/codemirror-beta-RTL.svg 
b/resources/images/codemirror-beta-RTL.svg
deleted file mode 100644
index c791296..000
--- a/resources/images/codemirror-beta-RTL.svg
+++ /dev/null
@@ -1,98 +0,0 @@
-http://www.w3.org/2000/svg; viewBox="0 0 264 162" width="264" 
height="162">
-
-   .st0{fill:#3466CC;}
-   .st1{fill:#E5E5E5;}
-   .st2{fill:#FF;}
-   .st3{opacity:6.00e-02;enable-background:new;}
-   .st4{opacity:7.00e-02;enable-background:new;}
-   
.st5{opacity:0.25;fill:none;stroke:#FF;stroke-width:0.5;stroke-miterlimit:10;enable-background:new
;}
-   .st6{fill:#00AF89;}
-   .st7{opacity:0.23;fill:#F5A623;enable-background:new;}
-   .st8{fill:#F5A623;}
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-  

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Checklist: Filter actual checklists from template namespace

[jenkins-bot (Code Review)]

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

Change subject: Checklist: Filter actual checklists from template namespace
..


Checklist: Filter actual checklists from template namespace

In the checklist panel, only templates are shown that match these
criteria
* only list items in the included text
* line length < 60

Change-Id: I0c1b6b776cbb7c2b97d07a09e87cd6b0f2063656
(cherry picked from commit b84c966c007059a2dbcd54b11cb747ecca7dd22a)
---
M Checklist/Checklist.class.php
M Checklist/resources/BS.Checklist/Window.js
2 files changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/Checklist/Checklist.class.php b/Checklist/Checklist.class.php
index 31c5ff6..f6fb227 100644
--- a/Checklist/Checklist.class.php
+++ b/Checklist/Checklist.class.php
@@ -44,6 +44,7 @@
 
public static $iCheckboxCounter = 0;
public static $bCheckboxFound = false;
+   public static $iChecklistMaxItemLength = 60;
 
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
@@ -103,10 +104,11 @@
if ( is_object( $oTitle ) ) {
$oWikiPage = WikiPage::newFromID( 
$oTitle->getArticleID() );
if ( is_object( $oWikiPage ) ) {
-   $sContent = 
$oWikiPage->getContent()->getNativeData();
-   $aLines = explode( "\n", $sContent );
+   $sContent = 
$oWikiPage->getContent()->preloadTransform( $oWikiPage->getTitle(), new 
ParserOptions() )->getNativeData();
+   $aLines = explode( "\n", trim( $sContent ) );
foreach ( $aLines as $sLine ) {
-   if ( strpos( $sLine, '*' ) !== 0 ) 
continue;
+   if ( strpos( $sLine, '*' ) !== 0 ) 
return array();
+   if ( strlen( $sLine ) > 
self::$iChecklistMaxItemLength ) return array();
$sNewLine = trim( substr( $sLine, 1 ) );
$aOptions[] = $sNewLine;
}
diff --git a/Checklist/resources/BS.Checklist/Window.js 
b/Checklist/resources/BS.Checklist/Window.js
index c21e7d5..4255302 100644
--- a/Checklist/resources/BS.Checklist/Window.js
+++ b/Checklist/resources/BS.Checklist/Window.js
@@ -166,7 +166,7 @@
*/
},
onSelect: function( sender, records, index, eOpts) {
-   
+
this.bsListItems.setValue( records.get( 'listOptions' ) );
this.listSelected = records;
this.setDirty( false );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c1b6b776cbb7c2b97d07a09e87cd6b0f2063656
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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