[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: start using discovery-parent-pom

[jenkins-bot (Code Review)]

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

Change subject: start using discovery-parent-pom
..


start using discovery-parent-pom

Change-Id: Ia6e475d3a86d070347fe5abe157e0881aaae2784
---
M blazegraph/pom.xml
M common/pom.xml
M pom.xml
D src/build/checkstyle/checkstyle.xml
D src/build/checkstyle/suppressions.xml
D src/build/forbidden/all.txt
D src/build/forbidden/core.txt
D src/build/forbidden/test.txt
M testTools/pom.xml
M tools/pom.xml
10 files changed, 63 insertions(+), 752 deletions(-)

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



diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 140bb65..091bfe5 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -53,6 +53,10 @@
 jackson-databind
 
 
+com.github.spotbugs
+spotbugs-annotations
+
+
 com.google.code.gson
 gson
 
@@ -162,24 +166,15 @@
 
 
 
-com.carrotsearch.randomizedtesting
-junit4-maven-plugin
-
-
 org.apache.maven.plugins
-maven-checkstyle-plugin
-
-
-org.apache.maven.plugins
-maven-jar-plugin
-
-
-org.apache.maven.plugins
-maven-javadoc-plugin
-
-
-org.apache.maven.plugins
-maven-source-plugin
+maven-enforcer-plugin
+
+
+enforce-rules
+
+none
+
+
 
 
 
diff --git a/common/pom.xml b/common/pom.xml
index a7fea33..da03212 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,8 +20,8 @@
 
 
 
-com.google.code.findbugs
-findbugs-annotations
+com.github.spotbugs
+spotbugs-annotations
 
 
 org.slf4j
@@ -38,27 +38,5 @@
 
 
 wikidata-query-common-${project.version}
-
-
-com.carrotsearch.randomizedtesting
-junit4-maven-plugin
-
-
-org.apache.maven.plugins
-maven-checkstyle-plugin
-
-
-org.apache.maven.plugins
-maven-jar-plugin
-
-
-org.apache.maven.plugins
-maven-javadoc-plugin
-
-
-org.apache.maven.plugins
-maven-source-plugin
-
-
 
 
diff --git a/pom.xml b/pom.xml
index b2a9d4e..edcd8be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 4.0.0
 
-org.sonatype.oss
-oss-parent
-7
+org.wikimedia.discovery
+discovery-parent-pom
+1.6
 
 org.wikidata.query.rdf
 parent
@@ -34,10 +34,6 @@
 
 
 
-
-3.3.1
-
-
 
 testTools
 common
@@ -49,7 +45,7 @@
 
 
 
scm:git:https://gerrit.wikimedia.org/r/wikidata/query/rdf
-
scm:git:https://gerrit.wikimedia.org/r/wikidata/query/rdf
+
scm:git:ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
 
https://gerrit.wikimedia.org/r/#/admin/projects/wikidata/query/rdf
 
 
@@ -58,23 +54,11 @@
 

 
 
-
-
-ossrh
-
https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
-ossrh
-https://oss.sonatype.org/content/repositories/snapshots
-
-
-
 
 2.1.5-SNAPSHOT
 2.2.3
 9.2.3.v20140905
 1.2.3
-UTF-8
 2.7.12
 1.7.10
 
@@ -229,16 +213,6 @@
 com.github.rholder
 guava-retrying
 2.0.0
-
-
-com.google.code.findbugs
-findbugs-annotations
-3.0.1
-
-
-com.google.code.findbugs
-jsr305
-3.0.2
 
 
 com.google.code.gson
@@ -598,12 +572,6 @@
 1.3
 test
 
-
 
 org.mockito
 mockito-core
@@ -767,175 +735,50 @@
 
 
 org.apache.maven.plugins
-maven-assembly-plugin
-3.0.0
-
-
-   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb-replica: Increase table cache definition

[Marostegui (Code Review)]

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

Change subject: labsdb-replica: Increase table cache definition
..


labsdb-replica: Increase table cache definition

Make table_definition_cache the same on the new replicas

Bug: T179041
Change-Id: I9b02ce7a1fcab52bfc2d88b250523f66c54727a1
---
M modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
index 05d500f..0085d5e 100644
--- a/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
@@ -71,7 +71,7 @@
 slave_type_conversions = ALL_NON_LOSSY
 
 table_open_cache   = 5000
-table_definition_cache = 4000
+table_definition_cache = 5
 
 default-storage-engine = InnoDB
 innodb_file_per_table  = 1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b02ce7a1fcab52bfc2d88b250523f66c54727a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] operations/puppet[production]: labsdb-replica: Increase table cache definition

[Marostegui (Code Review)]

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

Change subject: labsdb-replica: Increase table cache definition
..

labsdb-replica: Increase table cache definition

Make table_definition_cache the same on the new replicas

Bug: T179041
Change-Id: I9b02ce7a1fcab52bfc2d88b250523f66c54727a1
---
M modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/386576/1

diff --git 
a/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb 
b/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
index 05d500f..0085d5e 100644
--- a/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/labsdb-replica.my.cnf.erb
@@ -71,7 +71,7 @@
 slave_type_conversions = ALL_NON_LOSSY
 
 table_open_cache   = 5000
-table_definition_cache = 4000
+table_definition_cache = 5
 
 default-storage-engine = InnoDB
 innodb_file_per_table  = 1

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

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

___
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: Depool db1060

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Depool db1060
..


db-eqiad.php: Depool db1060

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: I8f2b155026fc54379ca38da944d82446057dd06d
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f58388f..a29d769 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -115,7 +115,7 @@
's2' => [
'db1054' => 0,   # A3 2.8TB  96GB, master
'db1021' => 0,   # B1 1.4TB  64GB, vslow, dump
-   'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743
+   # 'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743 #T174509
'db1074' => 300, # A2 3.6TB 512GB, api
'db1076' => 500, # B1 3.6TB 512GB
'db1090' => 1, # C3 3.6TB 512GB # temporary watchlist and rc
@@ -285,7 +285,7 @@
'db1021' => 1,
],
'api' => [
-   'db1060' => 2,
+   # 'db1060' => 2,
'db1074' => 1,
],
'watchlist' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1060

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1060
..

db-eqiad.php: Depool db1060

Going to optimize pagelinks and templatelinks

Bug: T174509
Change-Id: I8f2b155026fc54379ca38da944d82446057dd06d
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f58388f..a29d769 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -115,7 +115,7 @@
's2' => [
'db1054' => 0,   # A3 2.8TB  96GB, master
'db1021' => 0,   # B1 1.4TB  64GB, vslow, dump
-   'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743
+   # 'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743 #T174509
'db1074' => 300, # A2 3.6TB 512GB, api
'db1076' => 500, # B1 3.6TB 512GB
'db1090' => 1, # C3 3.6TB 512GB # temporary watchlist and rc
@@ -285,7 +285,7 @@
'db1021' => 1,
],
'api' => [
-   'db1060' => 2,
+   # 'db1060' => 2,
'db1074' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f2b155026fc54379ca38da944d82446057dd06d
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] apps...wikipedia[master]: Bump JAVA_VERSION to 1.8

[Mholloway (Code Review)]

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

Change subject: Bump JAVA_VERSION to 1.8
..

Bump JAVA_VERSION to 1.8

Have fun!

https://developer.android.com/studio/write/java8-support.html

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


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

diff --git a/app/build.gradle b/app/build.gradle
index 579476e..25060dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@
 return "2.6.${android.defaultConfig.versionCode}-${label}-${date}"
 }
 
-final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_7
+final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_8
 android {
 // Keep version in sync with /project.properties
 compileSdkVersion 26

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5ce2a805190c0af95358ad253381f29b5af8485
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]: Gradle -> 4.1

[Mholloway (Code Review)]

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

Change subject: Gradle -> 4.1
..

Gradle -> 4.1

https://docs.gradle.org/4.1/release-notes.html

Change-Id: I2466a9a4d273955f5f153eecc895760df7228639
---
M gradle/wrapper/gradle-wrapper.jar
M gradle/wrapper/gradle-wrapper.properties
M gradlew
3 files changed, 4 insertions(+), 5 deletions(-)


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

diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index 765f741..7a3265e 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 6acef2a..f16d266 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Feb 27 16:23:10 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/gradlew b/gradlew
index 4453cce..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -33,11 +33,11 @@
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
 echo "$*"
 }
 
-die ( ) {
+die () {
 echo
 echo "$*"
 echo
@@ -155,7 +155,7 @@
 fi
 
 # Escape application args
-save ( ) {
+save () {
 for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ; 
done
 echo " "
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2466a9a4d273955f5f153eecc895760df7228639
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]: Android Gradle Plugin -> 3.0.0

[Mholloway (Code Review)]

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

Change subject: Android Gradle Plugin -> 3.0.0
..

Android Gradle Plugin -> 3.0.0

Bumps the Android Gradle Plugin to 3.0.0 and makes the minimum required
changes to compile.  Primarily this involved adding a "default" flavor
dimension so that all product flavors could be assigned to a flavor
dimension as now required.[1]

Additionally, I updated now-deprecated dependency configuration names to
their new counterparts.[2]

Please see the full Android Gradle Plugin 3.0.0 migration guide for
details.

https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html

[1] 
https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#flavor_dimensions
[2] 
https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#new_configurations

Change-Id: I7df1b28de77a49d7104a260b1d1c2bb2ca72bca6
---
M app/build.gradle
M build.gradle
2 files changed, 52 insertions(+), 41 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index c797876..579476e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,45 +94,55 @@
 }
 }
 
+flavorDimensions 'default'
+
 productFlavors {
 dev {
 versionName computeVersionName('dev')
 applicationIdSuffix 'dev'
 signingConfig signingConfigs.debug
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
+dimension 'default'
 }
 prod {
 versionName computeVersionName('r')
 signingConfig signingConfigs.prod
+dimension 'default'
 }
 releasesprod {
 versionName computeVersionName('releasesprod')
 signingConfig signingConfigs.prod
+dimension 'default'
 }
 alpha {
 versionName computeVersionName('alpha')
 applicationIdSuffix 'alpha'
 signingConfig signingConfigs.debug
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
+dimension 'default'
 }
 beta {
 versionName computeVersionName('beta')
 applicationIdSuffix 'beta'
 signingConfig signingConfigs.prod
+dimension 'default'
 }
 amazon {
 versionName computeVersionName('amazon')
 signingConfig signingConfigs.prod
+dimension 'default'
 }
 fdroid {
 versionName computeVersionName('fdroid')
 signingConfig signingConfigs.prod
+dimension 'default'
 }
 custom {
 versionName computeVersionName(customChannel)
 // next line is for injecting a custom channel value into the 
custom/AndroidManifest.xml
 manifestPlaceholders = 
[customChannel:getProperty('customChannel').toString()]
 signingConfig signingConfigs.prod
+dimension 'default'
 }
 }
 
@@ -167,37 +177,37 @@
 String mockitoCore = 'org.mockito:mockito-core:1.9.5'
 String leakCanaryVersion = '1.5'
 
-compile "com.android.support:support-compat:$supportVersion"
-compile "com.android.support:support-core-utils:$supportVersion"
-compile "com.android.support:support-core-ui:$supportVersion"
-compile "com.android.support:support-fragment:$supportVersion"
+implementation "com.android.support:support-compat:$supportVersion"
+implementation "com.android.support:support-core-utils:$supportVersion"
+implementation "com.android.support:support-core-ui:$supportVersion"
+implementation "com.android.support:support-fragment:$supportVersion"
 
-compile "com.android.support:cardview-v7:$supportVersion"
-compile "com.android.support:design:$supportVersion"
-compile "com.android.support:recyclerview-v7:$supportVersion"
-compile "com.android.support:palette-v7:$supportVersion"
-compile "com.android.support:preference-v14:$supportVersion"
+implementation "com.android.support:cardview-v7:$supportVersion"
+implementation "com.android.support:design:$supportVersion"
+implementation "com.android.support:recyclerview-v7:$supportVersion"
+implementation "com.android.support:palette-v7:$supportVersion"
+implementation "com.android.support:preference-v14:$supportVersion"
 
-compile "com.facebook.fresco:animated-gif:$frescoVersion"
-compile "com.facebook.fresco:fresco:$frescoVersion"
-compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"
-compile 'com.google.code.gson:gson:2.8.1'
-compile 'com.romandanylyk:pageindicatorview:0.1.2'
-compile "com.squareup.okhttp3:okhttp-urlconnection:$okHttpVersion" // for 
JavaNetCookieJar
-compile 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Generate clover.xml with code coverage results

[Legoktm (Code Review)]

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

Change subject: Generate clover.xml with code coverage results
..

Generate clover.xml with code coverage results

Bug: T179051
Change-Id: I5781a726d38804a52120142943e9f3db9c5e05d2
---
M Gruntfile.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/71/386571/1

diff --git a/Gruntfile.js b/Gruntfile.js
index ad7c4cb..2d98d29 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -458,6 +458,7 @@
remapIstanbulReporter: {
reports: {
'text-summary': null,
+   clover: 'coverage/clover.xml',
html: 'coverage/'
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Remove compatibility with pre-1.27 MediaWiki

[jenkins-bot (Code Review)]

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

Change subject: Remove compatibility with pre-1.27 MediaWiki
..


Remove compatibility with pre-1.27 MediaWiki

Change-Id: I3f7fd7b11d5f710ae4e940b7001aa6948cf3
---
M extension.json
M includes/Hooks.php
2 files changed, 3 insertions(+), 42 deletions(-)

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



diff --git a/extension.json b/extension.json
index 580334d..0b1344d 100644
--- a/extension.json
+++ b/extension.json
@@ -9,6 +9,7 @@
"license-name": "MIT",
"type": "other",
"requires": {
+   "MediaWiki": ">= 1.27.0",
"extensions": {
"Echo": "*"
}
@@ -37,14 +38,8 @@
"EchoGetBundleRules": [
"LoginNotify\\Hooks::onEchoGetBundleRules"
],
-   "LoginAuthenticateAudit": [
-   "LoginNotify\\Hooks::onLoginAuthenticateAudit"
-   ],
"AuthManagerLoginAuthenticateAudit": [

"LoginNotify\\Hooks::onAuthManagerLoginAuthenticateAudit"
-   ],
-   "AddNewAccount": [
-   "LoginNotify\\Hooks::onAddNewAccount"
],
"LocalUserCreated": [
"LoginNotify\\Hooks::onLocalUserCreated"
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 88fb06e..ed92467 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -10,7 +10,6 @@
 
 use EchoAttributeManager;
 use EchoEvent;
-use LoginForm;
 use MediaWiki\Auth\AuthenticationResponse;
 use User;
 
@@ -97,24 +96,7 @@
}
 
/**
-* Old hook for pre 1.27 or wikis with auth manager disabled.
-*
-* @todo Doesn't catch CAPTCHA or throttle failures
-*
-* @param User $user User in question.
-* @param string $pass The password (parameter not used).
-* @param int $retval A LoginForm constant (e.g. LoginForm::SUCCESS).
-*/
-   public static function onLoginAuthenticateAudit( User $user, $pass, 
$retval ) {
-   if ( $retval === LoginForm::WRONG_PASS ) {
-   self::doFailedLogin( $user );
-   } elseif ( $retval === LoginForm::SUCCESS ) {
-   self::doSuccessfulLogin( $user );
-   }
-   }
-
-   /**
-* Hook for login auditing post 1.27
+* Hook for login auditing
 *
 * @param AuthenticationResponse $ret Is login successful?
 * @param User|null $user User object on successful auth
@@ -165,23 +147,7 @@
}
 
/**
-* Deprecated since v1.27
-*
-* Set a cookie saying this is a known computer when creating an 
account.
-*
-* @todo This still sets cookies if user creates an account while 
logged in as someone else.
-* @param User $user The user that has been created.
-* @param bool $byMail Account created by email
-*/
-   public static function onAddNewAccount( User $user, $byMail ) {
-   if ( !$byMail ) {
-   $loginNotify = new LoginNotify();
-   $loginNotify->setCurrentAddressAsKnown( $user );
-   }
-   }
-
-   /**
-* Hook for new account creation since v1.27
+* Hook handler for new account creation.
 *
 * Called immediately after a local user has been created and saved to 
the database
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f7fd7b11d5f710ae4e940b7001aa6948cf3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: Generate clover.xml with code coverage results

[Legoktm (Code Review)]

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

Change subject: Generate clover.xml with code coverage results
..

Generate clover.xml with code coverage results

Bug: T179051
Change-Id: I56ab586b258fc1cbf11521fdde2ad275da2ca62e
---
M Gruntfile.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/70/386570/1

diff --git a/Gruntfile.js b/Gruntfile.js
index ae64640..591c7c6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -155,7 +155,8 @@
reports: {
'text-summary': null,
html: 'coverage/',
-   lcovonly: 'coverage/lcov.info'
+   lcovonly: 'coverage/lcov.info',
+   clover: 'coverage/clover.xml'
}
}
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56ab586b258fc1cbf11521fdde2ad275da2ca62e
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Generate clover.xml with code coverage results

[Legoktm (Code Review)]

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

Change subject: Generate clover.xml with code coverage results
..

Generate clover.xml with code coverage results

Bug: T179051
Change-Id: Iaa4883d202b2afc53d909c978435833695497497
---
M Gruntfile.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/69/386569/1

diff --git a/Gruntfile.js b/Gruntfile.js
index ca45bd8..cf9d582 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -324,7 +324,8 @@
reporters: [
{ type: 'json-summary', dir: 
'coverage/' },
{ type: 'html', dir: 
'coverage/' },
-   { type: 'text-summary', dir: 
'coverage/' }
+   { type: 'text-summary', dir: 
'coverage/' },
+   { type: 'clover', dir: 
'coverage/' }
],
// 
https://github.com/karma-runner/karma-coverage/blob/v1.1.1/docs/configuration.md#check
check: {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa4883d202b2afc53d909c978435833695497497
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] unicodejs[master]: Generate clover.xml with code coverage results

[Legoktm (Code Review)]

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

Change subject: Generate clover.xml with code coverage results
..

Generate clover.xml with code coverage results

Bug: T179051
Change-Id: I0101632875a49db68ac8fed143fd83be0925d35b
---
M Gruntfile.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/unicodejs refs/changes/68/386568/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 3702b7f..ee31498 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -50,7 +50,8 @@
} },
reporters: [
{ type: 'text-summary' },
-   { type: 'html', dir: 
'coverage/' }
+   { type: 'html', dir: 
'coverage/' },
+   { type: 'clover', dir: 
'coverage/' }
]
}
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0101632875a49db68ac8fed143fd83be0925d35b
Gerrit-PatchSet: 1
Gerrit-Project: unicodejs
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enabling signature button in Projekt namespace on sewikimedia

[Code Review]

Jon Harald Søby has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386567 )

Change subject: Enabling signature button in Projekt namespace on sewikimedia
..

Enabling signature button in Projekt namespace on sewikimedia

Bug: T175363
Change-Id: Id8d09474e5a38bee787ea8152d395815cb9f723d
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 45dd5a3..93cf6a7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12030,6 +12030,7 @@
'+plwiki' => [ NS_USER, 100, 102 ], // T133978; 100 -> Portal, 102 -> 
Wikiproject
'+ruwiki' => [ 104 ], // T125509
'+ruwikinews' => [ 102 ], // T132241 - Комментарии
+   '+sewikimedia' => [ 100 ], // T175363 - Projekt
'+trwiki' => [ 102 ], // T166522 - Vikiproje
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d09474e5a38bee787ea8152d395815cb9f723d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jon Harald Søby 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Drop FastStringSearch support

[jenkins-bot (Code Review)]

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

Change subject: Drop FastStringSearch support
..


Drop FastStringSearch support

This PHP extension doesn't have any speed benefits over our minimum
required PHP and so isn't used in WMF production anymore.

Change-Id: I4883643908f765eee5db6b3ca88eed179264e93f
---
M includes/parser/AbuseFilterParser.php
1 file changed, 4 insertions(+), 11 deletions(-)

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



diff --git a/includes/parser/AbuseFilterParser.php 
b/includes/parser/AbuseFilterParser.php
index b866f81..1eb70f7 100644
--- a/includes/parser/AbuseFilterParser.php
+++ b/includes/parser/AbuseFilterParser.php
@@ -1139,17 +1139,10 @@
return $str;
}, $values );
 
-   if ( function_exists( 'fss_prep_search' ) ) {
-   $fss = fss_prep_search( $values );
-   $result = fss_exec_search( $fss, $string );
-
-   return ( $result !== false );
-   } else {
-   foreach ( $values as $needle ) {
-   // Bug #60203: Keep empty parameters from 
causing PHP warnings
-   if ( $needle !== '' && strpos( $string, $needle 
) !== false ) {
-   return true;
-   }
+   foreach ( $values as $needle ) {
+   // Bug #60203: Keep empty parameters from causing PHP 
warnings
+   if ( $needle !== '' && strpos( $string, $needle ) !== 
false ) {
+   return true;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4883643908f765eee5db6b3ca88eed179264e93f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dbarratt 
Gerrit-Reviewer: Dmaza 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: composer.json: Document PHP version requirement

[jenkins-bot (Code Review)]

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

Change subject: composer.json: Document PHP version requirement
..


composer.json: Document PHP version requirement

Change-Id: I86914ae8d2d9941a0be57457d883bbe2a8684d22
---
M composer.json
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/composer.json b/composer.json
index 7d3cf3e..672564a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,7 @@
 {
+"require": {
+"php": ">= 5.5.9"
+},
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9",
 "mediawiki/mediawiki-codesniffer": "0.7.2",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86914ae8d2d9941a0be57457d883bbe2a8684d22
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/libraryupgrader[master]: Add integration/docroot

[jenkins-bot (Code Review)]

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

Change subject: Add integration/docroot
..


Add integration/docroot

For next round.

Change-Id: Iba3acf7cad6dc342670f2a7e27b27d2387fbdd4c
---
M upgrade.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/upgrade.py b/upgrade.py
index c8b8a40..0bacab6 100755
--- a/upgrade.py
+++ b/upgrade.py
@@ -52,6 +52,7 @@
 'base-convert',
 'cdb',
 'css-sanitizer',
+'integration/docroot',
 'oojs',
 'oojs/ui',
 'php-session-serializer',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3acf7cad6dc342670f2a7e27b27d2387fbdd4c
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Publish clover.xml files for machine-readable coverage infor...

[jenkins-bot (Code Review)]

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

Change subject: Publish clover.xml files for machine-readable coverage 
information
..


Publish clover.xml files for machine-readable coverage information

Bug: T146970
Change-Id: Ifd6dcd73ad6aa185ac098b3ec19eb928fe048e9f
---
M jjb/misc.yaml
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index baddfaf..50f3dea 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -30,7 +30,9 @@
  # php5-xdebug. And also slow.
  - shell: |
  rm -rf coverage
- php5 ./vendor/bin/phpunit --coverage-html coverage/
+ php5 ./vendor/bin/phpunit --coverage-clover clover.xml 
--coverage-html coverage/
+ mv clover.xml coverage/clover.xml
+
  - cover-publish:
 src: 'coverage'
 dest: '$DOC_PROJECT'

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

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

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

[MediaWiki-commits] [Gerrit] labs/libraryupgrader[master]: Add integration/docroot

[Legoktm (Code Review)]

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

Change subject: Add integration/docroot
..

Add integration/docroot

For next round.

Change-Id: Iba3acf7cad6dc342670f2a7e27b27d2387fbdd4c
---
M upgrade.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/libraryupgrader 
refs/changes/66/386566/1

diff --git a/upgrade.py b/upgrade.py
index c8b8a40..0bacab6 100755
--- a/upgrade.py
+++ b/upgrade.py
@@ -52,6 +52,7 @@
 'base-convert',
 'cdb',
 'css-sanitizer',
+'integration/docroot',
 'oojs',
 'oojs/ui',
 'php-session-serializer',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba3acf7cad6dc342670f2a7e27b27d2387fbdd4c
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Page: Don't call flush() in handleDirIndex()

[Legoktm (Code Review)]

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

Change subject: Page: Don't call flush() in handleDirIndex()
..

Page: Don't call flush() in handleDirIndex()

This allows people to add content after the directory index.

Change-Id: Icb04171c84c90098e27476ff9b77ae9447534d8f
---
M org/wikimedia/doc/cover/dir.php
M org/wikimedia/doc/cover/index.php
M org/wikimedia/doc/dir.php
M shared/Page.php
4 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/64/386564/1

diff --git a/org/wikimedia/doc/cover/dir.php b/org/wikimedia/doc/cover/dir.php
index 7727dfd..85c5827 100644
--- a/org/wikimedia/doc/cover/dir.php
+++ b/org/wikimedia/doc/cover/dir.php
@@ -4,3 +4,4 @@
 $p = DocPage::newDirIndex( 'Coverage: ', Page::INDEX_PREFIX | 
Page::INDEX_ALLOW_SKIP );
 $p->setRootDir( dirname( __DIR__ ) );
 $p->handleDirIndex();
+$p->flush();
diff --git a/org/wikimedia/doc/cover/index.php 
b/org/wikimedia/doc/cover/index.php
index a60785c..5dfe310 100644
--- a/org/wikimedia/doc/cover/index.php
+++ b/org/wikimedia/doc/cover/index.php
@@ -4,3 +4,4 @@
 $p = DocPage::newDirIndex( 'Coverage' );
 $p->setRootDir( dirname( __DIR__ ) );
 $p->handleDirIndex();
+$p->flush();
diff --git a/org/wikimedia/doc/dir.php b/org/wikimedia/doc/dir.php
index 4b0b03f..b48605c 100644
--- a/org/wikimedia/doc/dir.php
+++ b/org/wikimedia/doc/dir.php
@@ -4,3 +4,4 @@
 $p = DocPage::newDirIndex( '', Page::INDEX_PREFIX | Page::INDEX_PARENT_PREFIX 
| Page::INDEX_ALLOW_SKIP );
 $p->setRootDir( __DIR__ );
 $p->handleDirIndex();
+$p->flush();
diff --git a/shared/Page.php b/shared/Page.php
index bafb8ba..a1bc6e1 100644
--- a/shared/Page.php
+++ b/shared/Page.php
@@ -400,8 +400,6 @@
}
$this->addHtmlContent( '' );
}
-
-   $this->flush();
}
 
public static function error( $msg, $statusCode = 500 ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb04171c84c90098e27476ff9b77ae9447534d8f
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: composer.json: Document PHP version requirement

[Legoktm (Code Review)]

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

Change subject: composer.json: Document PHP version requirement
..

composer.json: Document PHP version requirement

Change-Id: I86914ae8d2d9941a0be57457d883bbe2a8684d22
---
M composer.json
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/63/386563/1

diff --git a/composer.json b/composer.json
index 7d3cf3e..672564a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,7 @@
 {
+"require": {
+"php": ">= 5.5.9"
+},
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9",
 "mediawiki/mediawiki-codesniffer": "0.7.2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86914ae8d2d9941a0be57457d883bbe2a8684d22
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Revert "Add fundraising test via announcement cards in France"

[jenkins-bot (Code Review)]

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

Change subject: Revert "Add fundraising test via announcement cards in France"
..


Revert "Add fundraising test via announcement cards in France"

The announcement period is over. No need to serve this anymore.

This reverts most of commit 5c32b64.
Left some of the test improvements and a useful comment in the route.

Bug: T177001
Change-Id: Ib32b954eff14779145877cbe9db98bd664482166
---
M lib/mobile-util.js
M routes/announcements.js
M spec.yaml
M test/features/announcements/announcements.js
4 files changed, 78 insertions(+), 66 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 1653a98..cee4c5d 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -119,10 +119,6 @@
 return (domain === 'en.wikipedia.org' || domain === 
'en.wikipedia.beta.wmflabs.org');
 };
 
-mUtil.isFrenchWikipedia = function(domain) {
-return (domain === 'fr.wikipedia.org');
-};
-
 mUtil.removeFragment = function(href) {
 if (href.indexOf('#') > -1) {
 return href.substring(0, href.indexOf('#'));
diff --git a/routes/announcements.js b/routes/announcements.js
index 7007029..f37b786 100644
--- a/routes/announcements.js
+++ b/routes/announcements.js
@@ -8,53 +8,63 @@
  */
 const router = sUtil.router();
 
-function getFrwikiAnnouncements() {
+/* eslint-disable max-len */
+function getEnwikiAnnouncements() {
 // Notes: for iOS 'text' and 'action.title': HTML is not supported.
 // iOS uses image_url instead of the image Android uses.
 // iOS caption_HTML should be wrapped in  tag.
-
-// image_url: 
"https://upload.wikimedia.org/wikipedia/commons/8/8f/Reading_list_survey_-_iOS.png;,
-// image: 
"https://upload.wikimedia.org/wikipedia/commons/5/52/Reading_list_survey.png;,
-
 return [
-{
-id: "FR1017FRIOS",
-type: "fundraising",
-start_time: "2017-10-05T00:00:00Z",
-end_time: "2017-10-19T00:00:00Z",
-platforms: [
-"iOSApp",
-],
-text: "Le moment est venu de faire appel à vous.\n\nChers lecteurs 
en France, nous irons droit au but : aujourd’hui, nous vous demandons d’aider 
Wikipédia. Afin de protéger notre indépendance, nous ne diffuserons jamais de 
publicité. Nous sommes soutenus par des dons d’environ 10 € en moyenne. Nos 
lecteurs sont très peu nombreux à faire des dons. Si chaque personne qui lit ce 
message donnait 2 €, cela permettrait à Wikipédia de continuer à prospérer de 
nombreuses années. Le prix d’un café, c’est tout ce dont nous avons besoin. Si 
Wikipédia vous est utile, prenez une minute afin de maintenir cette plate-forme 
en ligne et lui permettre de continuer de croître. Merci.", // 
eslint-disable-line max-len
-action: {
-title: "Continuer",
-url: 
"https://donate.wikimedia.org/?uselang=fr_medium=WikipediaAppFeed_campaign=iOS_source=app_201710_FR_control;
-},
-caption_HTML: "Un
 problème pour faire un don ? | Autres
 façons de donner | Questions
 fréquentes",
-countries: [
-"FR"
-]
-},
-{
-id: "FR1017FRANDROID",
-type: "fundraising",
-start_time: "2017-10-05T00:00:00Z",
-end_time: "2017-10-19T00:00:00Z",
-platforms: [
-"AndroidApp"
-],
-text: "Le moment est venu de faire appel à vous.Chers 
lecteurs en France, nous irons droit au but : aujourd’hui, nous vous demandons 
d’aider Wikipédia. Afin de protéger notre indépendance, nous ne diffuserons 
jamais de publicité. Nous sommes soutenus par des dons d’environ 10 € en 
moyenne. Nos lecteurs sont très peu nombreux à faire des dons. Si chaque 
personne qui lit ce message donnait 2 €, cela permettrait à Wikipédia de 
continuer à prospérer de nombreuses années. Le prix d’un café, c’est tout ce 
dont nous avons besoin. Si Wikipédia vous est utile, prenez une minute afin de 
maintenir cette plate-forme en ligne et lui permettre de continuer de croître. 
Merci.", // eslint-disable-line max-len
-action: {
-title: "Continuer",
-url: 
"https://donate.wikimedia.org/?uselang=fr_medium=WikipediaAppFeed_campaign=Android_source=app_201710_FR_control;
-},
-caption_HTML: "Un
 problème pour faire un don ? | Autres
 façons de donner | Questions
 fréquentes",
-countries: [
-"FR"
-]
-}
+// {
+// id: "EN0517SURVEYIOS",
+// type: "survey",
+// start_time: "2017-05-26T00:00:00Z",
+// end_time: "2017-05-29T00:00:00Z",
+// platforms: [
+// "iOSApp",
+// 

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Show code coverage percent on index page

[Legoktm (Code Review)]

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

Change subject: Show code coverage percent on index page
..

Show code coverage percent on index page

For doc.wikimedia.org/cover/, show the normal listing of
sub-directories, but also show a progress bar with that repository's
code coverage percentage if a clover.xml file from PHPUnit is present.

Bug: T146970
Change-Id: I186f19ed7a7be964f3351979856b083a486fd733
---
M org/wikimedia/doc/cover/index.php
M shared/Page.php
2 files changed, 139 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/65/386565/1

diff --git a/org/wikimedia/doc/cover/index.php 
b/org/wikimedia/doc/cover/index.php
index 5dfe310..889fdce 100644
--- a/org/wikimedia/doc/cover/index.php
+++ b/org/wikimedia/doc/cover/index.php
@@ -1,7 +1,140 @@
 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 require_once __DIR__ . '/../../../../shared/DocPage.php';
 
-$p = DocPage::newDirIndex( 'Coverage' );
+/**
+ * Show a dashboard of code coverage results on the main index page
+ */
+class CoveragePage extends DocPage {
+
+   /**
+* Defaults from phpunit/src/Util/Configuration.php
+*/
+   const COVERAGE_LOW = 50;
+   const COVERAGE_HIGH = 90;
+
+   /**
+* Lists directory similar to dir index, but
+* includes a progress bar
+*/
+   public function handleCoverageIndex() {
+   // Get list of directories with clover.xml
+   $results = glob( __DIR__ . '/*/clover.xml' );
+   $this->embedCSS( file_get_contents( __DIR__ . '/cover.css' ) );
+   $this->addHtmlContent( '' 
);
+   $html = '';
+   foreach ( $results as $clover ) {
+   $info = $this->parseClover( $clover );
+   $dirName = htmlspecialchars( basename( dirname( $clover 
) ) );
+   $safeName = htmlspecialchars( $info['name'] );
+   $percent = sprintf( '%.2f', $info['percent'] );
+   $color = $this->getLevelColor( $info['percent'] );
+   $html .= <<
+   
+   $safeName
+   
+   
+   $percent%
+   
+   
+   
+
+HTML;
+   }
+   $this->addHtmlContent( "$html" );
+   }
+
+   /**
+* Get data out of the clover.xml file
+*
+* @param string $fname
+* @return array|bool false on failure
+*/
+   protected function parseClover( $fname ) {
+   $contents = file_get_contents( $fname );
+   if ( !$contents ) {
+   // Race condition?
+   return false;
+   }
+
+   $xml = new SimpleXMLElement( $contents );
+   $metrics = $xml->project->metrics;
+   $percent = (
+   (int)$metrics['coveredmethods'] +
+   (int)$metrics['coveredconditionals'] +
+   (int)$metrics['coveredstatements'] +
+   (int)$metrics['coveredelements']
+   ) / (
+   (int)$metrics['methods'] +
+   (int)$metrics['conditionals'] +
+   (int)$metrics['statements'] +
+   (int)$metrics['elements']
+   );
+   return [
+   'name' => (string)$xml->project->package['name'],
+   'percent' => $percent * 100,
+   ];
+   }
+
+   /**
+* Get the CSS class for the progress bar,
+* based on code in PHP_CodeCoverage
+*
+* @param float $percent
+* @return string
+*/
+   protected function getLevelColor( $percent ) {
+   if ( $percent <= self::COVERAGE_LOW ) {
+   return 'danger';
+   } elseif ( $percent >= self::COVERAGE_HIGH ) {
+   return 'success';
+   } else {
+   // In the middle
+   return 'warning';
+   

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add test which uses EmptyInterwikiResolver

[Smalyshev (Code Review)]

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

Change subject: Add test which uses EmptyInterwikiResolver
..

Add test which uses EmptyInterwikiResolver

Change-Id: I87287732f3b69fb63cb96984cf0b3f0b5102dfa1
---
M tests/unit/InterwikiResolverTest.php
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/tests/unit/InterwikiResolverTest.php 
b/tests/unit/InterwikiResolverTest.php
index cd9b0e4..21be747 100644
--- a/tests/unit/InterwikiResolverTest.php
+++ b/tests/unit/InterwikiResolverTest.php
@@ -2,6 +2,7 @@
 
 namespace CirrusSearch\Test;
 
+use CirrusSearch\EmptyInterwikiResolver;
 use MediaWiki\MediaWikiServices;
 use CirrusSearch\CirrusTestCase;
 use CirrusSearch\CirrusConfigInterwikiResolver;
@@ -347,4 +348,13 @@
\MediaWiki\restoreWarnings();
return $fileContent;
}
+
+   public function testEmptyResolver() {
+   $config = new HashSearchConfig( [ '_wikiID' => 'dummy' ] );
+   $resolver = MediaWikiServices::getInstance()
+   ->getService( InterwikiResolverFactory::SERVICE )
+   ->getResolver( $config );
+   $this->assertInstanceOf( EmptyInterwikiResolver::class, 
$resolver );
+   }
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: EmptyInterwikiResolver doesn't fully implement InterwikiReso...

[jenkins-bot (Code Review)]

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

Change subject: EmptyInterwikiResolver doesn't fully implement InterwikiResolver
..


EmptyInterwikiResolver doesn't fully implement InterwikiResolver

Not sure how this made it through CI, but tests no longer
pass because this interface isn't fuly implemented. Update
the implementation for recent changes.

Change-Id: I922aa64a5394b335aa28d2d112d72ae9457460e4
---
M includes/EmptyInterwikiResolver.php
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/includes/EmptyInterwikiResolver.php 
b/includes/EmptyInterwikiResolver.php
index 89d4623..66b49b7 100644
--- a/includes/EmptyInterwikiResolver.php
+++ b/includes/EmptyInterwikiResolver.php
@@ -11,6 +11,13 @@
}
 
/**
+* @return SearchConfig[] configs of sister projects indexed by 
interwiki prefix
+*/
+   public function getSisterProjectConfigs() {
+   return [];
+   }
+
+   /**
 * @param string $wikiId
 * @return string|null the interwiki identified for this $wikiId or 
null if none found
 */
@@ -25,4 +32,12 @@
public function getSameProjectWikiByLang( $lang ) {
return [];
}
+
+   /**
+* @param string $lang
+* @return SearchConfig[] zero or one element array: [] or [ interwiki 
-> SearchConfig ]
+*/
+   public function getSameProjectConfigByLang( $lang ) {
+   return [];
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I922aa64a5394b335aa28d2d112d72ae9457460e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Smalyshev 
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] mediawiki...CirrusSearch[master]: Strip highlighting before converting to html

[jenkins-bot (Code Review)]

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

Change subject: Strip highlighting before converting to html
..


Strip highlighting before converting to html

Result::stripHighlighting was called on two separate kinds of
highlighting, both before and after converting to HTML. Normalize so we
always stripHighlighting against the original highlight, rather than the
html version.

Bug: T178522
Change-Id: I07db7d9543e0160b56a54ea00ec64d8b498b481b
---
M includes/Search/Result.php
M tests/unit/Search/ResultTest.php
2 files changed, 49 insertions(+), 29 deletions(-)

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



diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index 151f291..0ffc7a9 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -111,7 +111,7 @@
 
if ( isset( $highlights[ 'heading' ] ) ) {
$this->sectionSnippet = $this->escapeHighlightedText( 
$highlights[ 'heading' ][ 0 ] );
-   $this->sectionTitle = $this->findSectionTitle();
+   $this->sectionTitle = $this->findSectionTitle( 
$highlights[ 'heading' ][ 0 ] );
}
 
if ( isset( $highlights[ 'category' ] ) ) {
@@ -227,9 +227,9 @@
/**
 * @return Title
 */
-   private function findSectionTitle() {
+   private function findSectionTitle( $highlighted ) {
return $this->getTitle()->createFragmentTarget( 
Sanitizer::escapeIdForLink(
-   $this->stripHighlighting( $this->sectionSnippet )
+   $this->stripHighlighting( $highlighted )
) );
}
 
diff --git a/tests/unit/Search/ResultTest.php b/tests/unit/Search/ResultTest.php
index 78a046f..743889d 100644
--- a/tests/unit/Search/ResultTest.php
+++ b/tests/unit/Search/ResultTest.php
@@ -3,27 +3,17 @@
 namespace CirrusSearch\Search;
 
 use CirrusSearch\CirrusTestCase;
+use CirrusSearch\Searcher;
 use MediaWiki\MediaWikiServices;
 
 /**
  * @group CirrusSearch
  */
 class ResultTest extends CirrusTestCase {
-   public function testInterwikiResults() {
-   $this->setMwGlobals( [
-   'wgCirrusSearchWikiToNameMap' => [
-   'es' => 'eswiki',
-   ],
-   ] );
-   $config = MediaWikiServices::getInstance()
-   ->getConfigFactory()
-   ->makeConfig( 'CirrusSearch' );
 
-   $elasticaResultSet = $this->getMockBuilder( 
\Elastica\ResultSet::class )
-   ->disableOriginalConstructor()
-   ->getMock();
-
-   $data = [
+   // @TODO In php 5.6 this could be a constant
+   private function exampleHit() {
+   return [
'_index' => 'eswiki_content_123456',
'_source' => [
'namespace' => NS_MAIN,
@@ -42,12 +32,32 @@
'heading' => [ '...' ],
],
];
-   $elasticaResult = new \Elastica\Result( $data );
-   $result = new Result(
-   $elasticaResultSet,
-   $elasticaResult,
-   $config
+   }
+
+   public function testHighlightedSectionSnippet() {
+   $data = $this->exampleHit();
+   $data['highlight']['heading'] = [ 
Searcher::HIGHLIGHT_PRE_MARKER . 'stuff' . Searcher::HIGHLIGHT_POST_MARKER ];
+
+   $result = $this->mockResult( $data );
+   $this->assertEquals(
+   Searcher::HIGHLIGHT_PRE . 'stuff' . 
Searcher::HIGHLIGHT_POST,
+   $result->getSectionSnippet()
);
+   $this->assertEquals(
+   'stuff',
+   $result->getSectionTitle()->getFragment()
+   );
+   }
+
+   public function testInterwikiResults() {
+   $this->setMwGlobals( [
+   'wgCirrusSearchWikiToNameMap' => [
+   'es' => 'eswiki',
+   ],
+   ] );
+
+   $data = $this->exampleHit();
+   $result = $this->mockResult( $data );
 
$this->assertTrue( $result->getTitle()->isExternal(), 
'isExternal' );
$this->assertTrue( $result->getRedirectTitle()->isExternal(), 
'redirect isExternal' );
@@ -57,17 +67,27 @@
// do not match
$data['_source']['namespace'] = NS_HELP;
$data['_source']['namespace_text'] = 'Help';
-   $elasticaResult = new \Elastica\Result( $data );
-
- 

[MediaWiki-commits] [Gerrit] operations/dns[master]: setting new misc systems in ulsfo mgmt dns entries

[RobH (Code Review)]

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

Change subject: setting new misc systems in ulsfo mgmt dns entries
..


setting new misc systems in ulsfo mgmt dns entries

settign via asset tag to enable remote setup

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 6ef6a27..c4a9813 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2823,6 +2823,10 @@
 11  1H  IN PTR  frbackup4001.mgmt.ulsfo.wmnet.
 12  1H  IN PTR  WMF7218.mgmt.ulsfo.wmnet.
 
+15  1H  IN PTR  WMF7215.mgmt.ulsfo.wmnet.
+16  1H  IN PTR  WMF7216.mgmt.ulsfo.wmnet.
+
+
 105 1H  IN PTR  cp4005.mgmt.ulsfo.wmnet.
 106 1H  IN PTR  cp4006.mgmt.ulsfo.wmnet.
 107 1H  IN PTR  cp4007.mgmt.ulsfo.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 494d102..562921a 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4578,6 +4578,8 @@
 WMF5814  1H  IN A10.128.129.132
 WMF7213  1H  IN A10.128.129.5
 WMF7214  1H  IN A10.128.129.6
+WMF7215  1H  IN A10.128.129.15
+WMF7216  1H  IN A10.128.129.16
 WMF7217  1H  IN A10.128.129.7
 WMF7218  1H  IN A10.128.129.12
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I093d0b8d18aa03ad034c466e01595a60917f34d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: setting new misc systems in ulsfo mgmt dns entries

[RobH (Code Review)]

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

Change subject: setting new misc systems in ulsfo mgmt dns entries
..

setting new misc systems in ulsfo mgmt dns entries

settign via asset tag to enable remote setup

Change-Id: I093d0b8d18aa03ad034c466e01595a60917f34d2
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/61/386561/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 6ef6a27..d6bf93c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2821,7 +2821,10 @@
 
 10  1H  IN PTR  bast4001.mgmt.ulsfo.wmnet.
 11  1H  IN PTR  frbackup4001.mgmt.ulsfo.wmnet.
-12  1H  IN PTR  WMF7218.mgmt.ulsfo.wmnet.
+
+15  1H  IN PTR  WMF7215.mgmt.ulsfo.wmnet.
+16  1H  IN PTR  WMF7216.mgmt.ulsfo.wmnet.
+
 
 105 1H  IN PTR  cp4005.mgmt.ulsfo.wmnet.
 106 1H  IN PTR  cp4006.mgmt.ulsfo.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 494d102..562921a 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4578,6 +4578,8 @@
 WMF5814  1H  IN A10.128.129.132
 WMF7213  1H  IN A10.128.129.5
 WMF7214  1H  IN A10.128.129.6
+WMF7215  1H  IN A10.128.129.15
+WMF7216  1H  IN A10.128.129.16
 WMF7217  1H  IN A10.128.129.7
 WMF7218  1H  IN A10.128.129.12
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I093d0b8d18aa03ad034c466e01595a60917f34d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix group for dissemin

[jenkins-bot (Code Review)]

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

Change subject: Fix group for dissemin
..


Fix group for dissemin

Change-Id: I8728d6f137600f44d70835a92ea835f8a73ef703
---
M repoconfig.commit.json
M repoconfig.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index dc6a5b4..99edf48 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -62,7 +62,7 @@
}
},
"dissemin": {
-   "group": "dissemin",
+   "group": "dissemin-*",
"repos": {
"dissemin": {
"type": "github",
diff --git a/repoconfig.json b/repoconfig.json
index f499585..67abc1a 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -62,7 +62,7 @@
}
},
"dissemin": {
-   "group": "dissemin",
+   "group": "dissemin-*",
"repos": {
"dissemin": {
"type": "github",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8728d6f137600f44d70835a92ea835f8a73ef703
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix group for dissemin

[Nikerabbit (Code Review)]

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

Change subject: Fix group for dissemin
..

Fix group for dissemin

Change-Id: I8728d6f137600f44d70835a92ea835f8a73ef703
---
M repoconfig.commit.json
M repoconfig.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/60/386560/1

diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index dc6a5b4..99edf48 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -62,7 +62,7 @@
}
},
"dissemin": {
-   "group": "dissemin",
+   "group": "dissemin-*",
"repos": {
"dissemin": {
"type": "github",
diff --git a/repoconfig.json b/repoconfig.json
index f499585..67abc1a 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -62,7 +62,7 @@
}
},
"dissemin": {
-   "group": "dissemin",
+   "group": "dissemin-*",
"repos": {
"dissemin": {
"type": "github",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8728d6f137600f44d70835a92ea835f8a73ef703
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] operations/dns[master]: correction of ulsfo mgmt asset tags

[RobH (Code Review)]

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

Change subject: correction of ulsfo mgmt asset tags
..


correction of ulsfo mgmt asset tags

lvs4007 has wmf7217 not wmf7215, which is another host.

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index ce2c989..6ef6a27 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2817,7 +2817,7 @@
 6   1H  IN PTR  lvs4006.mgmt.ulsfo.wmnet.
 6   1H  IN PTR  WMF7214.mgmt.ulsfo.wmnet.
 7   1H  IN PTR  lvs4007.mgmt.ulsfo.wmnet.
-7   1H  IN PTR  WMF7215.mgmt.ulsfo.wmnet.
+7   1H  IN PTR  WMF7217.mgmt.ulsfo.wmnet.
 
 10  1H  IN PTR  bast4001.mgmt.ulsfo.wmnet.
 11  1H  IN PTR  frbackup4001.mgmt.ulsfo.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 5e38bff..494d102 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4578,7 +4578,7 @@
 WMF5814  1H  IN A10.128.129.132
 WMF7213  1H  IN A10.128.129.5
 WMF7214  1H  IN A10.128.129.6
-WMF7215  1H  IN A10.128.129.7
+WMF7217  1H  IN A10.128.129.7
 WMF7218  1H  IN A10.128.129.12
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b9582850b51dd4c945a9aab8f763470d74806f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: correction of ulsfo mgmt asset tags

[RobH (Code Review)]

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

Change subject: correction of ulsfo mgmt asset tags
..

correction of ulsfo mgmt asset tags

lvs4007 has wmf7217 not wmf7215, which is another host.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/59/386559/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index ce2c989..6ef6a27 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2817,7 +2817,7 @@
 6   1H  IN PTR  lvs4006.mgmt.ulsfo.wmnet.
 6   1H  IN PTR  WMF7214.mgmt.ulsfo.wmnet.
 7   1H  IN PTR  lvs4007.mgmt.ulsfo.wmnet.
-7   1H  IN PTR  WMF7215.mgmt.ulsfo.wmnet.
+7   1H  IN PTR  WMF7217.mgmt.ulsfo.wmnet.
 
 10  1H  IN PTR  bast4001.mgmt.ulsfo.wmnet.
 11  1H  IN PTR  frbackup4001.mgmt.ulsfo.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 5e38bff..494d102 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4578,7 +4578,7 @@
 WMF5814  1H  IN A10.128.129.132
 WMF7213  1H  IN A10.128.129.5
 WMF7214  1H  IN A10.128.129.6
-WMF7215  1H  IN A10.128.129.7
+WMF7217  1H  IN A10.128.129.7
 WMF7218  1H  IN A10.128.129.12
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b9582850b51dd4c945a9aab8f763470d74806f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T133334: Ref marker in caption in data-mw

[jenkins-bot (Code Review)]

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

Change subject: T14: Ref marker in caption in data-mw
..


T14: Ref marker in caption in data-mw

 * Replace ref markers instead of waiting for cleanup to remove them
   since that doesn't happen on embedded html.

Change-Id: Ied746f025a0ac7f14d922aff6640fef3aa4b55b0
---
M lib/ext/Cite/index.js
M lib/wt2html/pp/handlers/cleanup.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 17 insertions(+), 24 deletions(-)

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



diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index e54eb75..e6c7cf3 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -482,8 +482,10 @@
span.appendChild(refLink);
 
if (!nestedInReferences) {
-   node.parentNode.insertBefore(span, node);
+   node.parentNode.replaceChild(span, node);
} else {
+   // We don't need to delete the node now since it'll be removed 
in
+   // `insertReferencesIntoDOM` when all the children all cleaned 
out.
nestedRefsHTML.push(DU.ppToXML(span), '\n');
}
 
@@ -654,7 +656,6 @@
child, referencesId, referencesGroup, 
nestedRefsHTML);
}
}
-
child = nextChild;
}
 };
@@ -715,7 +716,6 @@
}
}
}
-
child = nextChild;
}
 };
diff --git a/lib/wt2html/pp/handlers/cleanup.js 
b/lib/wt2html/pp/handlers/cleanup.js
index a546282..4a69b89 100644
--- a/lib/wt2html/pp/handlers/cleanup.js
+++ b/lib/wt2html/pp/handlers/cleanup.js
@@ -4,31 +4,24 @@
 var Util = require('../../../utils/Util.js').Util;
 var Consts = require('../../../config/WikitextConstants.js').WikitextConstants;
 
-// Extension/ref/Marker nodes are now processed on the final top-level dom only
-// and have to be preserved all the way till that time. So, don't strip them
-// from non-top level DOMs. Since  tags can be templated, we don't want
-// a "mw:Transclusion mw:Extension/ref/Marker" meta tag to be stripped.
-// So, we are using an exact match regexp here.
-var nonTopLevelRE = /^mw:(StartTag|EndTag|TSRMarker|Transclusion)\/?[^\s]*$/;
-
-// For top-level DOMs, we cannot have any of these types left behind.
-var topLevelRE = 
/(?:^|\s)mw:(StartTag|EndTag|Extension\/ref\/Marker|TSRMarker|Transclusion)\/?[^\s]*/;
-
 function stripMarkerMetas(rtTestMode, node, env, atTopLevel) {
var metaType = node.getAttribute("typeof");
if (!metaType) {
return true;
}
 
+   // Extension/ref/Marker nodes are now processed on the final top-level 
dom only
+   // and have to be preserved all the way till that time.
+   console.assert(!atTopLevel || 
!metaType.match(/mw:Extension\/ref\/Marker/),
+   'Found a top level reference marker.');
+
// Sometimes a non-tpl meta node might get the mw:Transclusion typeof
// element attached to it. So, check if the node has data-mw,
-   // in which case we also have to keep it, except if it's also a 
mw:extension/ref/Marker
-   // in which case it'll have data-mw but we have to remove the node.
-   var metaTestRE = atTopLevel ? topLevelRE : nonTopLevelRE;
+   // in which case we also have to keep it.
+   var metaTestRE = 
/(?:^|\s)mw:(StartTag|EndTag|TSRMarker|Transclusion)\/?[^\s]*/;
+
if ((!rtTestMode && metaType === "mw:Placeholder/StrippedTag")
-   || (metaTestRE.test(metaType) &&
-   (!DU.validDataMw(node) ||
-   metaType.match(/mw:Extension\/ref\/Marker/ {
+   || (metaTestRE.test(metaType) && 
!DU.validDataMw(node))) {
var nextNode = node.nextSibling;
DU.deleteNode(node);
// stop the traversal, since this node is no longer in the DOM.
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index acd73e1..187710b 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -409,7 +409,7 @@
 add("html2html", "Link to image page- image page normally doesn't exists, 
hence edit link\nAdd test with existing image page\n#Image:test", "[/index.php?title=File:Testaction=editredlink=1
 Image:test]\n");
 add("html2html", "T20784  Link to non-existent image page with caption should 
use caption as link text", "[/index.php?title=File:Testaction=editredlink=1
 caption]\n");
 add("html2html", "SVG thumbnails with invalid language code", "\n");
-add("html2html", "T93580: 3. Templated  inside inline images", "\n\n↑  foo");
+add("html2html", "T93580: 3. Templated  inside inline images", "\n\n↑  foo");
 add("html2html", "Subpage link", 

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Cosmetic changes to CargoGalleryFormat.php

[jenkins-bot (Code Review)]

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

Change subject: Cosmetic changes to CargoGalleryFormat.php
..


Cosmetic changes to CargoGalleryFormat.php

Change-Id: Id5caa9fde4d33d53ee4e9b649d62269001fb43c3
---
M formats/CargoGalleryFormat.php
1 file changed, 7 insertions(+), 4 deletions(-)

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



diff --git a/formats/CargoGalleryFormat.php b/formats/CargoGalleryFormat.php
index e1c741b..bde95e9 100644
--- a/formats/CargoGalleryFormat.php
+++ b/formats/CargoGalleryFormat.php
@@ -2,15 +2,18 @@
 /**
  * @author Yaron Koren
  * @ingroup Cargo
+ *
+ * Defines the 'gallery' format, which matches the output of MediaWiki's
+ *  tag.
  */
 
 class CargoGalleryFormat extends CargoDisplayFormat {
 
function allowedParameters() {
-   return array( 'mode','show bytes','show filename','per 
row','image width','image height' );
+   return array( 'mode', 'show bytes', 'show filename', 'per row', 
'image width', 'image height' );
}
 
-   function getFileTitles( $valuesTable, $fieldDescriptions, 
$captionField, $altField, $linkField ) {  
+   function getFileTitles( $valuesTable, $fieldDescriptions, 
$captionField, $altField, $linkField ) {
$fileField = null;
foreach ( $fieldDescriptions as $field => $fieldDesc ) {
if ( $fieldDesc->mType == 'File' ) {
@@ -39,12 +42,12 @@
'caption' => $caption,
'alt' => $alt,
'link' => $link
-   );  
+   );
}
}
 
$files = array();
-   foreach( $fileNames as $f ) {
+   foreach ( $fileNames as $f ) {
if ( $usingPageName ) {
$title = Title::newFromText( $f['title'] );
if ( $title == null || $title->getNamespace() 
!= NS_FILE ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: There's only one refInRefProcessor

[jenkins-bot (Code Review)]

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

Change subject: There's only one refInRefProcessor
..


There's only one refInRefProcessor

 * Avoid the unnecessary binding.

Change-Id: I80e558a86eb7197ce39a07062499ec58f170a3af
---
M lib/ext/Cite/index.js
1 file changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index 61b3add..e54eb75 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -385,8 +385,10 @@
});
 };
 
-References.prototype.extractRefFromNode = function(node, refsData,
-   refInRefProcessor, referencesAboutId, referencesGroup, 
nestedRefsHTML) {
+var _processRefs;
+
+References.prototype.extractRefFromNode = function(node, refsData, cite,
+   referencesAboutId, referencesGroup, nestedRefsHTML) {
var nestedInReferences = referencesAboutId !== undefined;
var dp = DU.getDataParsoid(node);
// SSS FIXME: Need to clarify semantics here.
@@ -407,7 +409,7 @@
 
if (dp.hasRefInRef) {
var html = DU.ppToDOM(content);
-   refInRefProcessor(html);
+   _processRefs(cite, refsData, html);
content = DU.ppToXML(html, { innerXML: true });
}
 
@@ -637,9 +639,7 @@
  *foo 
  *bar 
  *  */
-var _processRefs, _processRefsInReferences;
-
-_processRefsInReferences = function(cite, refsData, node, referencesId,
+var _processRefsInReferences = function(cite, refsData, node, referencesId,

referencesGroup, nestedRefsHTML) {
var child = node.firstChild;
while (child !== null) {
@@ -647,8 +647,7 @@
if (DU.isElt(child)) {
var typeOf = child.getAttribute('typeof');
if 
((/(?:^|\s)mw:Extension\/ref\/Marker(?=$|\s)/).test(typeOf)) {
-   cite.references.extractRefFromNode(child, 
refsData,
-   _processRefs.bind(null, cite, refsData),
+   cite.references.extractRefFromNode(child, 
refsData, cite,
referencesId, referencesGroup, 
nestedRefsHTML);
} else if (child.hasChildNodes()) {
_processRefsInReferences(cite, refsData,
@@ -667,8 +666,7 @@
if (DU.isElt(child)) {
var typeOf = child.getAttribute('typeof');
if 
((/(?:^|\s)mw:Extension\/ref\/Marker(?=$|\s)/).test(typeOf)) {
-   cite.references.extractRefFromNode(child, 
refsData,
-   _processRefs.bind(null, cite, 
refsData));
+   cite.references.extractRefFromNode(child, 
refsData, cite);
} else if 
((/(?:^|\s)mw:Extension\/references(?=$|\s)/).test(typeOf)) {
var referencesId = child.getAttribute("about");
var referencesGroup = 
DU.getDataParsoid(child).group;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80e558a86eb7197ce39a07062499ec58f170a3af
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: Request information from site via API

[Dbrant (Code Review)]

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

Change subject: Request information from site via API
..

Request information from site via API

Instead of requiring people to insert information about their site,
with this change, the user can input the path to the api.php (without
the api.php) and save to request the information of the wiki.

Change-Id: Ie96c40413c21931a773b4082ca0934dbc0c925ca
---
M 
app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
A app/src/main/java/org/wikipedia/settings/SiteInfo.java
A app/src/main/java/org/wikipedia/settings/SiteInfoClient.java
M app/src/main/res/values/dev_settings_strings.xml
M app/src/main/res/xml/developer_preferences.xml
5 files changed, 154 insertions(+), 3 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
 
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
index 54288da..1f97a96 100644
--- 
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
+++ 
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceFragmentCompat;
@@ -29,8 +30,7 @@
  * @param newValue   The new value of the Preference.
  * @return True to update the state of the Preference with the new 
value.
  */
-@Override
-public boolean onPreferenceChange(Preference preference, Object 
newValue) {
+@Override public boolean onPreferenceChange(Preference preference, 
Object newValue) {
 setUseRestBasePreference((Boolean) newValue);
 return true;
 }
@@ -87,6 +87,21 @@
 setUpCrashButton(findPreference(getCrashButtonKey()));
 setUpUserOptionButton(findPreference(getUserOptionButtonKey()));
 
setUpRemoteLogButton(findPreference(R.string.preference_key_remote_log));
+setUpMediaWikiBaseUri((EditTextPreference) 
findPreference(R.string.preference_key_mediawiki_base_uri));
+}
+
+private void setUpMediaWikiBaseUri(final EditTextPreference pref) {
+pref.setOnPreferenceChangeListener(new 
Preference.OnPreferenceChangeListener() {
+@Override public boolean onPreferenceChange(Preference preference, 
final Object newValue) {
+SiteInfoClient siteInfoClient = new SiteInfoClient((String) 
newValue, getActivity());
+siteInfoClient.request(new SiteInfoClient.Callback() {
+public void onSuccess(SiteInfo info) {
+pref.setText(info.general().server());
+}
+});
+return true;
+}
+});
 }
 
 
diff --git a/app/src/main/java/org/wikipedia/settings/SiteInfo.java 
b/app/src/main/java/org/wikipedia/settings/SiteInfo.java
new file mode 100644
index 000..a23ff17
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/settings/SiteInfo.java
@@ -0,0 +1,47 @@
+package org.wikipedia.settings;
+
+import android.support.annotation.NonNull;
+import org.wikipedia.json.annotations.Required;
+
+import java.util.Map;
+
+/**
+ * A class which can hold information about the site used in the app. The data 
is normally
+ * populated from a request to the siteinfo and wikibase query-meta api 
endpoint of MediaWiki.
+ */
+class SiteInfo {
+@NonNull @SuppressWarnings("unused,NullableProblems") private Map wikibase;
+@NonNull @SuppressWarnings("unused,NullableProblems") @Required private 
General general;
+
+@NonNull public General general() {
+return general;
+}
+
+static class General {
+@NonNull @SuppressWarnings("unused,NullableProblems") private String 
mainpage;
+@NonNull @SuppressWarnings("unused,NullableProblems") private String 
lang;
+@NonNull @SuppressWarnings("unused,NullableProblems") private String 
articlepath;
+@NonNull @SuppressWarnings("unused,NullableProblems") private String 
scriptpath;
+@NonNull @SuppressWarnings("unused,NullableProblems") private String 
server;
+
+@NonNull public String server() {
+return server;
+}
+
+@NonNull public String articlePath() {
+return articlepath;
+}
+
+@NonNull public String scriptPath() {
+return scriptpath;
+}
+
+@NonNull public String lang() {
+return lang;
+}
+
+@NonNull public String mainPage() {
+return mainpage;
+   

[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: WIP: Add new settings for wikibase usage in the app apart fr...

[Dbrant (Code Review)]

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

Change subject: WIP: Add new settings for wikibase usage in the app apart from 
wikidata
..

WIP: Add new settings for wikibase usage in the app apart from wikidata

This change needs to introduce some new dev-settings to make support for
non-wikidata Wikibase installations supported by the app. This includes:

 * Wikibase base URL
 * MediaWiki content language code (the language code does not need to be
   part of the subdomain of the base URL)
 * MediaWiki dbname (needed for the Wikibase edit description feature, as
   Wikibase requires the site parameter for setting the description, ask
   in T165809 why)

These settings are automatically recognized when the base URI is set to
an URL which points to the api.php and wikibase is installed in this wiki.

Bug: T165786
Change-Id: Ib1abd7d345284e4b1f680765b3ef6d73fb3411d5
---
M app/src/main/java/org/wikipedia/Constants.java
M app/src/main/java/org/wikipedia/dataclient/WikiSite.java
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
M 
app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/java/org/wikipedia/settings/SiteInfo.java
M app/src/main/java/org/wikipedia/wikidata/EntityClient.java
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/xml/developer_preferences.xml
11 files changed, 124 insertions(+), 11 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/Constants.java 
b/app/src/main/java/org/wikipedia/Constants.java
index 8d42d6e..e842089 100644
--- a/app/src/main/java/org/wikipedia/Constants.java
+++ b/app/src/main/java/org/wikipedia/Constants.java
@@ -8,6 +8,7 @@
 public static final int USER_OPTION_ROW_FRAGMENT_LOADER_ID = 102;
 
 public static final String WIKIPEDIA_URL = "https://wikipedia.org/;;
+public static final String WIKIDATA_URL = "https://www.wikidata.org/;;
 public static final String PLAIN_TEXT_MIME_TYPE = "text/plain";
 
 public static final String ACCEPT_HEADER_PREFIX = "accept: 
application/json; charset=utf-8; "
diff --git a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java 
b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
index 7b04016..1df752b 100644
--- a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
+++ b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
@@ -198,6 +198,9 @@
 }
 
 @NonNull public String dbName() {
+if (Prefs.getWikiId() != null) {
+return Prefs.getWikiId();
+}
 return subdomain() + "wiki";
 }
 
@@ -275,6 +278,10 @@
 final int minLengthForSubdomain = 3;
 if (parts.length < minLengthForSubdomain
 || parts.length == minLengthForSubdomain && 
parts[0].equals("m")) {
+if (Prefs.getWikiLangCode() != null) {
+return Prefs.getWikiLangCode();
+}
+
 // ""
 // wikipedia.org
 // m.wikipedia.org
diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
index 51bf924..4705070 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java
@@ -94,8 +94,13 @@
   boolean loggedIn,
   @NonNull final Callback cb) {
 
-Call call = 
service.edit(pageTitle.getWikiSite().languageCode(),
-pageTitle.getWikiSite().languageCode(), 
pageTitle.getWikiSite().dbName(),
+String languageCode = pageTitle.getWikiSite().languageCode();
+if (languageCode.isEmpty()) {
+languageCode = 
WikipediaApp.getInstance().getAppOrSystemLanguageCode();
+}
+
+Call call = service.edit(languageCode, languageCode,
+pageTitle.getWikiSite().dbName(),
 pageTitle.getPrefixedText(), description, editToken,
 loggedIn ? "user" : null);
 call.enqueue(new retrofit2.Callback() {
diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
index e2f471f..4c5177a 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -150,7 +150,6 @@
 }
 
 private class EditViewCallback implements DescriptionEditView.Callback {
-

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Cosmetic changes to CargoGalleryFormat.php

[Yaron Koren (Code Review)]

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

Change subject: Cosmetic changes to CargoGalleryFormat.php
..

Cosmetic changes to CargoGalleryFormat.php

Change-Id: Id5caa9fde4d33d53ee4e9b649d62269001fb43c3
---
M formats/CargoGalleryFormat.php
1 file changed, 7 insertions(+), 4 deletions(-)


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

diff --git a/formats/CargoGalleryFormat.php b/formats/CargoGalleryFormat.php
index e1c741b..bde95e9 100644
--- a/formats/CargoGalleryFormat.php
+++ b/formats/CargoGalleryFormat.php
@@ -2,15 +2,18 @@
 /**
  * @author Yaron Koren
  * @ingroup Cargo
+ *
+ * Defines the 'gallery' format, which matches the output of MediaWiki's
+ *  tag.
  */
 
 class CargoGalleryFormat extends CargoDisplayFormat {
 
function allowedParameters() {
-   return array( 'mode','show bytes','show filename','per 
row','image width','image height' );
+   return array( 'mode', 'show bytes', 'show filename', 'per row', 
'image width', 'image height' );
}
 
-   function getFileTitles( $valuesTable, $fieldDescriptions, 
$captionField, $altField, $linkField ) {  
+   function getFileTitles( $valuesTable, $fieldDescriptions, 
$captionField, $altField, $linkField ) {
$fileField = null;
foreach ( $fieldDescriptions as $field => $fieldDesc ) {
if ( $fieldDesc->mType == 'File' ) {
@@ -39,12 +42,12 @@
'caption' => $caption,
'alt' => $alt,
'link' => $link
-   );  
+   );
}
}
 
$files = array();
-   foreach( $fileNames as $f ) {
+   foreach ( $fileNames as $f ) {
if ( $usingPageName ) {
$title = Title::newFromText( $f['title'] );
if ( $title == null || $title->getNamespace() 
!= NS_FILE ) {

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: WIP: Use MediaWiki API for Random page if restbase is turned...

[Dbrant (Code Review)]

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

Change subject: WIP: Use MediaWiki API for Random page if restbase is turned off
..

WIP: Use MediaWiki API for Random page if restbase is turned off

Until now, random pages will work with restbase only, or when the user has
lists and pages can be selected randomly from there. If a third-party wiki
does not have restbase, the random page will now be retrieved using the
mediawiki api endpoint query->random.

Things to do:
 * The tests are failing for some reason, clarifying with Bernd.

Bug: T165960
Change-Id: Ie37fb2004c9a9785f53689385f293134ee43d2f0
---
A app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryRandom.java
M app/src/main/java/org/wikipedia/random/RandomArticleRequestHandler.java
M app/src/main/java/org/wikipedia/random/RandomSummaryClient.java
M app/src/test/java/org/wikipedia/random/RandomSummaryClientTest.java
4 files changed, 170 insertions(+), 43 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryRandom.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryRandom.java
new file mode 100644
index 000..6a0a09d
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryRandom.java
@@ -0,0 +1,65 @@
+package org.wikipedia.dataclient.mwapi;
+
+import android.support.annotation.Nullable;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.wikipedia.dataclient.ServiceError;
+import org.wikipedia.dataclient.page.PageSummary;
+import org.wikipedia.model.BaseModel;
+
+/**
+ * A class representing a response from the random query api.
+ */
+public class MwQueryRandom extends BaseModel implements PageSummary {
+@SuppressWarnings("unused") @Nullable private MwQuery query;
+@SuppressWarnings("unused") @SerializedName("error") @Nullable
+private MwServiceError error;
+
+@Override
+public boolean hasError() {
+return error != null;
+}
+
+@Override @Nullable
+public ServiceError getError() {
+return error;
+}
+
+@Override @Nullable
+public String getTitle() {
+if (query != null && query.getFirstRandom() != null) {
+return query.getFirstRandom().getTitle();
+}
+return null;
+}
+
+@Override @Nullable
+public String getExtract() {
+return null;
+}
+
+@Override @Nullable
+public String getThumbnailUrl() {
+return null;
+}
+
+private static class MwQuery {
+@SuppressWarnings("unused,MismatchedReadAndWriteOfArray")
+@Nullable private MwRandom[] random;
+
+@Nullable
+MwRandom getFirstRandom() {
+return random != null && random.length >= 1 ? random[0] : null;
+}
+}
+
+private static class MwRandom {
+@SuppressWarnings("unused") @Nullable private String title;
+
+@Nullable
+public String getTitle() {
+return this.title;
+}
+}
+}
diff --git 
a/app/src/main/java/org/wikipedia/random/RandomArticleRequestHandler.java 
b/app/src/main/java/org/wikipedia/random/RandomArticleRequestHandler.java
index 919abbd..bafe871 100644
--- a/app/src/main/java/org/wikipedia/random/RandomArticleRequestHandler.java
+++ b/app/src/main/java/org/wikipedia/random/RandomArticleRequestHandler.java
@@ -5,10 +5,10 @@
 
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.concurrency.CallbackTask;
-import org.wikipedia.dataclient.restbase.page.RbPageSummary;
 import org.wikipedia.offline.OfflineManager;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.readinglist.page.database.ReadingListPageDao;
+import org.wikipedia.settings.RbSwitch;
 import org.wikipedia.util.log.L;
 
 import retrofit2.Call;
@@ -20,14 +20,14 @@
 }
 
 public static void getRandomPage(@NonNull final Callback cb) {
-new 
RandomSummaryClient().request(WikipediaApp.getInstance().getWikiSite(), new 
RandomSummaryClient.Callback() {
+RandomSummaryClient.Callback callback = new 
RandomSummaryClient.Callback() {
 @Override
-public void onSuccess(@NonNull Call call, @NonNull 
PageTitle title) {
+public void onSuccess(@NonNull Call call, @NonNull PageTitle 
title) {
 cb.onSuccess(title);
 }
 
 @Override
-public void onError(@NonNull Call call, @NonNull 
Throwable t) {
+public void onError(@NonNull Call call, @NonNull Throwable t) {
 L.w("Failed to get random card from network. Falling back to 
compilations.", t);
 if (OfflineManager.hasCompilation()) {
 getRandomPageFromCompilation(cb);
@@ -35,7 +35,14 @@
 getRandomPageFromReadingLists(cb, t);
 }
 }
-});
+};

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Remove unnecessary serialize/parse of references content

[jenkins-bot (Code Review)]

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

Change subject: Remove unnecessary serialize/parse of references content
..


Remove unnecessary serialize/parse of references content

 * Also, change the input parameter of buildDOMFragmentTokens
   to uniformly accepts a , rather than a doc or string,
   so that we can pass it nodes from our dummy document.

Change-Id: I4bb44573fe7203277d51e804a4a6423100a34f03
---
M lib/ext/Cite/index.js
M lib/ext/Gallery/index.js
M lib/utils/DOMUtils.js
M lib/wt2html/tt/DOMFragmentBuilder.js
M lib/wt2html/tt/LinkHandler.js
M lib/wt2html/tt/TemplateHandler.js
M tests/parserTestsParserHook.js
7 files changed, 31 insertions(+), 20 deletions(-)

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



diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index 72c7f5c..61b3add 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -323,14 +323,21 @@
// Emit a marker mw:DOMFragment for the references
// token so that the dom post processor can generate
// and emit references at this point in the DOM.
-   var emitReferencesFragment = function(toks, refsBody) {
-   var dummyOl = dummyDoc.createElement('ol');
-   DU.addAttributes(dummyOl, {
+   var emitReferencesFragment = function(toks, body) {
+   var ol;
+   if (body) {
+   ol = body.ownerDocument.createElement('ol');
+   DU.migrateChildren(body, ol);
+   } else {
+   ol = dummyDoc.createElement('ol');
+   body = dummyDoc.createElement('body');
+   }
+   body.appendChild(ol);
+   DU.addAttributes(ol, {
'class': 'mw-references references',
typeof: 'mw:Extension/references',
about: referencesId,
});
-   dummyOl.innerHTML = refsBody || '';
var olProcessor = function(ol) {
var dp = DU.getDataParsoid(ol);
dp.src = refsTok.getAttribute('source');
@@ -346,7 +353,7 @@
tokens: DU.buildDOMFragmentTokens(
manager.env,
refsTok,
-   dummyOl.outerHTML,
+   body,
olProcessor,
// The  HTML above is wrapper HTML added on 
and doesn't
// have any DSR on it. We want DSR added to it.
@@ -373,7 +380,7 @@
emptyContentCB: emitReferencesFragment,
endCB: emitReferencesFragment,
documentCB: function(refsDoc) {
-   emitReferencesFragment([], DU.ppToXML(refsDoc.body, { 
innerXML: true }));
+   emitReferencesFragment([], refsDoc.body);
},
});
 };
diff --git a/lib/ext/Gallery/index.js b/lib/ext/Gallery/index.js
index 6cdef35..6687985 100644
--- a/lib/ext/Gallery/index.js
+++ b/lib/ext/Gallery/index.js
@@ -231,7 +231,7 @@
src: dataAttribs.src,
});
};
-   var tokens = DU.buildDOMFragmentTokens(env, extToken, doc, 
addAttrs, {
+   var tokens = DU.buildDOMFragmentTokens(env, extToken, doc.body, 
addAttrs, {
isForeignContent: true, setDSR: true,
});
cb({ tokens: tokens });
diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js
index 7d7407f..db8d74f 100644
--- a/lib/utils/DOMUtils.js
+++ b/lib/utils/DOMUtils.js
@@ -1965,8 +1965,8 @@
 * @param {Token} token
 *The token that generated the DOM.
 *
-* @param {Node|String} docOrHTML
-*The DOM (or HTML string) that the token expanded to.
+* @param {Node} body
+*The DOM that the token expanded to.
 *
 * @param {Function} addAttrsCB
 *Callback that adds additional attributes to the generated tokens.
@@ -1975,14 +1975,10 @@
 *Options to be passed onto the encapsulation code
 *See encapsulateExpansionHTML's doc. for more info about these 
options.
 */
-   buildDOMFragmentTokens: function(env, token, docOrHTML, addAttrsCB, 
opts) {
-   var body, nodes;
-   if (docOrHTML.constructor === String) {
-   body = DU.ppToDOM(docOrHTML);
-   } else {
-   body = docOrHTML.body;
-   }
+   buildDOMFragmentTokens: function(env, token, body, addAttrsCB, opts) {
+   console.assert(DU.isBody(body), 'DOMFragment expected body 
node.');
 
+   var nodes;

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Add negative weight to disambig entities""

[Smalyshev (Code Review)]

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

Change subject: Revert "Revert "Add negative weight to disambig entities""
..

Revert "Revert "Add negative weight to disambig entities""

This reverts commit fc02c31e37d313008604fe08431b7c0707be6c87.
Reinstates patch https://gerrit.wikimedia.org/r/#/c/386464/

Should be merged only after I874d2d00a83476cfcb1db0e06ad8a0c0fee9d05b
is deployed.

Bug: T148411
Change-Id: I3864f47bab7aad08b0c15053301442ff50598b24
---
M wmf-config/Wikibase-production.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 3b531f4..e60077b 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -135,6 +135,9 @@
$wgWBQualityConstraintsSparqlEndpoint = 
$wgWBRepoSettings['sparqlEndpoint'];
$wgWBQualityConstraintsSparqlMaxMillis = 5000; // limit SPARQL 
queries to just 5 seconds for now
$wgWBQualityConstraintsTypeCheckMaxEntities = 10; // only check 
few entities in PHP => fall back to SPARQL very quickly
+   // T148411: Use profile that demotes disambigs by default
+   
$wgWBRepoSettings['entitySearch']['defaultPrefixRescoreProfile'] = 
'wikibase_prefix_boost';
+   $wgWBRepoSettings['entitySearch']['statementBoost'] = [ 
'P31=Q4167410' => '-10' ];
}
 
if ( $wgDBname === 'wikidatawiki' ) {

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Unicode section links on Russian projects

[MaxSem (Code Review)]

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

Change subject: Enable Unicode section links on Russian projects
..

Enable Unicode section links on Russian projects

Bug: T175725
Change-Id: Ie11263618c4ce413557c2a8a58214f1987ec0bcb
---
M wmf-config/InitialiseSettings.php
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 45dd5a3..8589c18 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19647,6 +19647,15 @@
'default' => [ 'legacy', 'html5' ],
'testwiki' => [ 'html5', 'legacy' ],
'test2wiki' => [ 'html5', 'legacy' ],
+   'ruwiki' => [ 'html5', 'legacy' ],
+   'ruwikibooks' => [ 'html5', 'legacy' ],
+   'ruwikimedia' => [ 'html5', 'legacy' ],
+   'ruwikinews' => [ 'html5', 'legacy' ],
+   'ruwikiquote' => [ 'html5', 'legacy' ],
+   'ruwikisource' => [ 'html5', 'legacy' ],
+   'ruwikiversity' => [ 'html5', 'legacy' ],
+   'ruwikivoyage' => [ 'html5', 'legacy' ],
+   'ruwiktionary' => [ 'html5', 'legacy' ],
 ],
 
 'wmgUse3d' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add negative weight to disambig entities"

[jenkins-bot (Code Review)]

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

Change subject: Revert "Add negative weight to disambig entities"
..


Revert "Add negative weight to disambig entities"

 legoktm: hmm doesn't really work... looks
like the code that was needed didn't get into this branch :(
 so revert for now and I'll submit it later when
next branch is cut

This reverts commit ee5decc09f8f0995019335e7e4fdfbf361a269f0.

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

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



diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index e60077b..3b531f4 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -135,9 +135,6 @@
$wgWBQualityConstraintsSparqlEndpoint = 
$wgWBRepoSettings['sparqlEndpoint'];
$wgWBQualityConstraintsSparqlMaxMillis = 5000; // limit SPARQL 
queries to just 5 seconds for now
$wgWBQualityConstraintsTypeCheckMaxEntities = 10; // only check 
few entities in PHP => fall back to SPARQL very quickly
-   // T148411: Use profile that demotes disambigs by default
-   
$wgWBRepoSettings['entitySearch']['defaultPrefixRescoreProfile'] = 
'wikibase_prefix_boost';
-   $wgWBRepoSettings['entitySearch']['statementBoost'] = [ 
'P31=Q4167410' => '-10' ];
}
 
if ( $wgDBname === 'wikidatawiki' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b4a569b1f7467f21f9ab1977e10af211d3cf8eb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add negative weight to disambig entities"

[Legoktm (Code Review)]

Hello Smalyshev, Daniel Kinzler, Aude, Urbanecm, Hoo man, EBernhardson, 
jenkins-bot, Thiemo Mättig (WMDE), DCausse, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "Add negative weight to disambig entities"  
legoktm: hmm doesn't really work... looks like the code that was needed didn't 
get into this branch :(  so revert for now and I'll submit it later 
when next branch is cut
..

Revert "Add negative weight to disambig entities"
 legoktm: hmm doesn't really work... looks
like the code that was needed didn't get into this branch :(
 so revert for now and I'll submit it later when
next branch is cut

This reverts commit ee5decc09f8f0995019335e7e4fdfbf361a269f0.

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


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

diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index e60077b..3b531f4 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -135,9 +135,6 @@
$wgWBQualityConstraintsSparqlEndpoint = 
$wgWBRepoSettings['sparqlEndpoint'];
$wgWBQualityConstraintsSparqlMaxMillis = 5000; // limit SPARQL 
queries to just 5 seconds for now
$wgWBQualityConstraintsTypeCheckMaxEntities = 10; // only check 
few entities in PHP => fall back to SPARQL very quickly
-   // T148411: Use profile that demotes disambigs by default
-   
$wgWBRepoSettings['entitySearch']['defaultPrefixRescoreProfile'] = 
'wikibase_prefix_boost';
-   $wgWBRepoSettings['entitySearch']['statementBoost'] = [ 
'P31=Q4167410' => '-10' ];
}
 
if ( $wgDBname === 'wikidatawiki' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b4a569b1f7467f21f9ab1977e10af211d3cf8eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
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...VisualEditor[wmf/1.31.0-wmf.5]: MWInternalLinkContextItem: increase specificity to override ...

[jenkins-bot (Code Review)]

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

Change subject: MWInternalLinkContextItem: increase specificity to override 
OOUI changes
..


MWInternalLinkContextItem: increase specificity to override OOUI changes

OOUI 8e31b2f273 increased changed various icon CSS rules, and increased their
specificity. Increase ours to match. This restores the correct size/ratio of
the images in the link context item.

Bug: T178933
Change-Id: I4f1a6dde363cf99f7665dc83f4b0fa6b1dd3c29e
(cherry picked from commit ab1e5d58d41699c47b5e3ce2ba6d42930347d7e8)
---
M modules/ve-mw/ui/styles/contextitems/ve.ui.MWInternalLinkContextItem.css
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/modules/ve-mw/ui/styles/contextitems/ve.ui.MWInternalLinkContextItem.css 
b/modules/ve-mw/ui/styles/contextitems/ve.ui.MWInternalLinkContextItem.css
index 60c38a1..4f4f569 100644
--- a/modules/ve-mw/ui/styles/contextitems/ve.ui.MWInternalLinkContextItem.css
+++ b/modules/ve-mw/ui/styles/contextitems/ve.ui.MWInternalLinkContextItem.css
@@ -10,7 +10,7 @@
white-space: normal;
 }
 
-.ve-ui-mwInternalLinkContextItem-withImage .oo-ui-iconElement-icon {
+.ve-ui-mwInternalLinkContextItem-withImage > 
.oo-ui-iconElement.oo-ui-iconElement-icon {
float: left;
width: 3.75em;
height: 3.75em;
@@ -25,7 +25,7 @@
background-size: cover;
 }
 
-.ve-ui-mwInternalLinkContextItem-withImage 
.ve-ui-mwInternalLinkContextItem-hasImage {
+.ve-ui-mwInternalLinkContextItem-withImage > 
.ve-ui-mwInternalLinkContextItem-hasImage.oo-ui-iconElement-icon {
border: 0;
background-size: cover;
opacity: 1;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f1a6dde363cf99f7665dc83f4b0fa6b1dd3c29e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.31.0-wmf.5
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[generic_mediawiki]: Added MediaWiki flavour

[Dbrant (Code Review)]

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

Change subject: Added MediaWiki flavour
..

Added MediaWiki flavour

Since, we are not using any suffix here, we had to modify the appId
function in build.gradle in order to avoid a conflict with the
provider authority.

Modified some drawables and strings to use the MediaWiki ones. This
is still work in progress for other subtask.

Refactored the activity_about layout in order to avoid code duplication.
Corrected strings for the MediaWiki specific flavour.

Replaced Wikipedia in strings.

Bug: T165783
Change-Id: Ie1df1f17668a40ad1c1101fce9f21beae213575c
---
M app/build.gradle
A app/src/main/res/layout/about_logo_image.xml
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
A app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable-xxxhdpi/w_nav_mark.png
A app/src/mediawiki/res/drawable/wp_wordmark.png
A app/src/mediawiki/res/layout/about_logo_image.xml
A app/src/mediawiki/res/mipmap-hdpi/launcher.png
A app/src/mediawiki/res/mipmap-mdpi/launcher.png
A app/src/mediawiki/res/mipmap-xhdpi/launcher.png
A app/src/mediawiki/res/mipmap-xxhdpi/launcher.png
A app/src/mediawiki/res/mipmap-xxxhdpi/launcher.png
A app/src/mediawiki/res/values/strings.xml
A app/src/mediawiki/res/values/strings_no_translate.xml
18 files changed, 61 insertions(+), 9 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index c797876..a2f3913 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -134,6 +134,12 @@
 manifestPlaceholders = 
[customChannel:getProperty('customChannel').toString()]
 signingConfig signingConfigs.prod
 }
+mediawiki {
+applicationId 'org.mediawiki'
+versionName computeVersionName('mediawiki')
+signingConfig signingConfigs.prod
+testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
+}
 }
 
 packagingOptions {
@@ -261,6 +267,6 @@
 
 private String appId(ProductFlavor flavor) {
 String suffix = flavor.applicationIdSuffix
-String id = android.defaultConfig.applicationId + (suffix ? ".$suffix" : 
'')
+String id = flavor.applicationId + (suffix ? ".$suffix" : '')
 return id
 }
diff --git a/app/src/main/res/layout/about_logo_image.xml 
b/app/src/main/res/layout/about_logo_image.xml
new file mode 100644
index 000..fa61352
--- /dev/null
+++ b/app/src/main/res/layout/about_logo_image.xml
@@ -0,0 +1,10 @@
+
+http://schemas.android.com/apk/res/android;
+xmlns:tools="http://schemas.android.com/tools;
+android:id="@+id/about_logo_image"
+android:layout_width="48dp"
+android:layout_height="48dp"
+android:src="@drawable/w_nav_mark"
+android:tint="?attr/secondary_text_color"
+android:contentDescription="@null"
+tools:showIn="@layout/activity_about" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml 
b/app/src/main/res/layout/activity_about.xml
index 0b1532e..36b2f8f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -15,15 +15,9 @@
 android:padding="24dp"
 android:gravity="center"
 >
-
+
+
 Name of the 
application.\n{{Identical|Wikipedia}}
   Name of the beta version of the 
application.\n{{Identical|Wikipedia Beta}}
   Name of the alpha version of the 
application.
+  Name of the generic MediaWiki version of 
the application.
   Wikimedia\'s name.\n{{Identical|Wikimedia}}
   Hint text for the search box
   Hint text for the search box when 
searching browsing history
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index abfe5e2..d85eb42 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 Wikipedia
 Wikipedia 
Beta
 Wikipedia 
Alpha
+MediaWiki
 
 Wikimedia
 
diff --git a/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png 
b/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
new file mode 100644
index 000..283a8f8
--- /dev/null
+++ b/app/src/mediawiki/res/drawable-hdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png 
b/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
new file mode 100644
index 000..af89eb0
--- /dev/null
+++ b/app/src/mediawiki/res/drawable-xhdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png 
b/app/src/mediawiki/res/drawable-xxhdpi/w_nav_mark.png
new file mode 100644
index 000..2119207
--- /dev/null
+++ 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add negative weight to disambig entities

[jenkins-bot (Code Review)]

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

Change subject: Add negative weight to disambig entities
..


Add negative weight to disambig entities

This will demote them in prefix match ranking.

Bug: T148411
Change-Id: I9543452589c7ee11c4f6bf874c1c97001af65470
---
M wmf-config/Wikibase-production.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 3b531f4..e60077b 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -135,6 +135,9 @@
$wgWBQualityConstraintsSparqlEndpoint = 
$wgWBRepoSettings['sparqlEndpoint'];
$wgWBQualityConstraintsSparqlMaxMillis = 5000; // limit SPARQL 
queries to just 5 seconds for now
$wgWBQualityConstraintsTypeCheckMaxEntities = 10; // only check 
few entities in PHP => fall back to SPARQL very quickly
+   // T148411: Use profile that demotes disambigs by default
+   
$wgWBRepoSettings['entitySearch']['defaultPrefixRescoreProfile'] = 
'wikibase_prefix_boost';
+   $wgWBRepoSettings['entitySearch']['statementBoost'] = [ 
'P31=Q4167410' => '-10' ];
}
 
if ( $wgDBname === 'wikidatawiki' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9543452589c7ee11c4f6bf874c1c97001af65470
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change threshold for slow AbuseFilter logging to 800ms

[jenkins-bot (Code Review)]

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

Change subject: Change threshold for slow AbuseFilter logging to 800ms
..


Change threshold for slow AbuseFilter logging to 800ms

Bug: T179039
Change-Id: Ib765b991684ea5a89f639e6eb153267dec9542ea
---
M wmf-config/abusefilter.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index ae98e71..3638e2d 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -32,6 +32,8 @@
 // T113164 Change default AbuseFilter IP block duration to not indefinite
 $wgAbuseFilterAnonBlockDuration = '1 week';
 
+$wgAbuseFilterSlowFilterRuntimeLimit = 800;
+
 // Custom permissions
 switch ( $wgDBname ) {
case 'arwiki':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib765b991684ea5a89f639e6eb153267dec9542ea
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dmaza 
Gerrit-Reviewer: Dbarratt 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
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[generic_mediawiki]: Only request aggregated feed content for WP hosts

[Dbrant (Code Review)]

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

Change subject: Only request aggregated feed content for WP hosts
..

Only request aggregated feed content for WP hosts

The aggregated feed content is highly specific to Wikipedia. It would
make sense to also check for the wiki site being a Wikipedia site
(instead of RESTBase being enabled).

Bug: T166920
Change-Id: I6c347b53b0835dfba85172cd9f71eefad4375acd
---
M app/src/main/java/org/wikipedia/dataclient/WikiSite.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
4 files changed, 23 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java 
b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
index 7b04016..4a036fa 100644
--- a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
+++ b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
@@ -108,6 +108,13 @@
 }
 
 /**
+ * @return true if this WikiSite is pointing to a wikipedia.org domain.
+ */
+public boolean isWikipedia() {
+return uri.getHost().endsWith(".wikipedia.org");
+}
+
+/**
  * Like {@link #authority()} but with a "m." between the language 
subdomain and the rest of the host.
  * Examples:
  *
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 3397f09..9bc91bc 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -25,16 +25,16 @@
 }
 
 @Override
-protected void buildScript(int age) {
+protected void buildScript(int age, boolean isWikipedia) {
 boolean online = DeviceUtil.isOnline();
 
 conditionallyAddPendingClient(new SearchClient(), age == 0);
 conditionallyAddPendingClient(new OfflineCompilationClient(), age == 0 
&& !online && OfflineManager.hasCompilation() && isPreBetaRelease());
 conditionallyAddPendingClient(new OnboardingClient(), age == 0);
-conditionallyAddPendingClient(new AnnouncementClient(), age == 0 && 
online);
-conditionallyAddPendingClient(new AggregatedFeedContentClient(), 
online);
+conditionallyAddPendingClient(new AnnouncementClient(), age == 0 && 
isWikipedia && online);
+conditionallyAddPendingClient(new AggregatedFeedContentClient(), 
isWikipedia && online);
 addPendingClient(new ContinueReadingClient());
-conditionallyAddPendingClient(new OnThisDayClient(), online && 
isPreBetaRelease());
+conditionallyAddPendingClient(new OnThisDayClient(), isWikipedia && 
online && isPreBetaRelease());
 conditionallyAddPendingClient(new MainPageClient(), age == 0);
 conditionallyAddPendingClient(new BecauseYouReadClient(), online);
 conditionallyAddPendingClient(new RandomClient(), age == 0);
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
index f5fc669..04cbb42 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -80,7 +80,7 @@
 currentAge++;
 }
 
-buildScript(currentAge);
+buildScript(currentAge, wiki.isWikipedia());
 requestCard(wiki);
 }
 
@@ -112,7 +112,7 @@
 requestCard(wiki);
 }
 
-protected abstract void buildScript(int age);
+protected abstract void buildScript(int age, boolean isWikipedia);
 
 void addPendingClient(FeedClient client) {
 pendingClients.add(client);
diff --git a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java 
b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
index b394001..8d9802d 100644
--- a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
+++ b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
@@ -163,6 +163,16 @@
 assertThat(subject.dbName(), is("nowiki"));
 }
 
+@Test public void testIsWikipediaTrue() {
+WikiSite subject = WikiSite.forLanguageCode("test");
+assertThat(subject.isWikipedia(), is(true));
+}
+
+@Test public void testIsWikipediaFalse() {
+WikiSite subject = new WikiSite("bogus.org");
+assertThat(subject.isWikipedia(), is(false));
+}
+
 @Test public void testPath() {
 WikiSite subject = WikiSite.forLanguageCode("test");
 assertThat(subject.path("Segment"), is("/w/Segment"));

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

Gerrit-MessageType: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Add legoktm's new ed25519 key

[Ayounsi (Code Review)]

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

Change subject: admin: Add legoktm's new ed25519 key
..


admin: Add legoktm's new ed25519 key

Change-Id: I46e87e6b53bd3fa1bb7fd116f487bd2bc7621807
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 3f7d791..045739e 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1333,6 +1333,7 @@
 realname: Kunal Mehta
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDcTXNrkmB903Zj9nhqrQ6gW4WZ1UhaM67CpeaX7TDWRfArOscoD+ByXJdboZALxG1Of8kku0PfMrQWrtEiyLbpEdt3Y6mraTPwgx6eMu4juK+NkaJYRSQYkf+jxqheKWYYKjF1HK0I9SxnM4mrAKTMmjtp6X/6FQaAtDVa1rTQzlBEgYJIdl5Ik/pv2Py5dsYrgv3KXn9NBiOkdDiVgae26iGcpIi3Z6CA5fR8LRdRdP/GUjNJAF01pzlIMoMlh0Q1u+t6nUXWUBnUnogFU+hPAk/yq4XA9HZ7vADDKgeTyCzvSEMM7TcjElVgDwou9qhaleVxV7GXWpcVac1e9DlN
 lego...@wikimedia.org
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5ILLgZDBO7XQCmYSuuwxMGnLO1w1Ceyo6o9QAwg4IhnnH 
lego...@wikimedia.org
 uid: 2552
 email: kme...@wikimedia.org
   howief:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46e87e6b53bd3fa1bb7fd116f487bd2bc7621807
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: Get the default set of pageprops in getMetadataActionApi

[jenkins-bot (Code Review)]

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

Change subject: Fix: Get the default set of pageprops in getMetadataActionApi
..


Fix: Get the default set of pageprops in getMetadataActionApi

The MW API parameter for specifying a subset of pageprops to return is
'ppprop', not 'pageprops'.  We have been receiving an API warning and
the default subset.  Actually, this seems to suit our purposes fine.  Less
code is better, so let's just go ahead and keep using the default subset.

Change-Id: I9e390d16a2b60bbcde6acb26f2fb2432fd62f320
---
M lib/mwapi.js
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/lib/mwapi.js b/lib/mwapi.js
index 7d22e01..5414184 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -164,8 +164,6 @@
 lllimit: 'max',
 pilicense: 'any',
 pithumbsize: mwapi.LEAD_IMAGE_XL,
-pageprops: ['wikibase_item',
-'disambiguation', 'displaytitle', 'normalizedtitle'].join('|'),
 wbptterms: 'description',
 inprop: ['protection'].join('|'),
 rvprop: ['ids', 'timestamp', 'user', 'contentmodel'].join('|'),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e390d16a2b60bbcde6acb26f2fb2432fd62f320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: Exclude private/compare-sections contents from eslint

[jenkins-bot (Code Review)]

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

Change subject: Fix: Exclude private/compare-sections contents from eslint
..


Fix: Exclude private/compare-sections contents from eslint

These weren't actually being excluded, apparently because of the
intervening subfolders before the .json contents.  Excluding the whole
directory excludes them as expected.

Change-Id: Idaa56aab56c221def54ae044146067dccd0775cc
---
M .eslintignore
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/.eslintignore b/.eslintignore
index 1b5a54d..99c70f9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
-private/compare-sections/*.json
+private/compare-sections/
 private/top-pages/top-pages.*.json
 test/diff/results/page_definition-enwiktionary-*.json
 test/diff/results/page_*MCS_Test_Frankenstein.json
-tmp/
\ No newline at end of file
+tmp/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idaa56aab56c221def54ae044146067dccd0775cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: Get the default set of pageprops in getMetadataActionApi

[Mholloway (Code Review)]

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

Change subject: Fix: Get the default set of pageprops in getMetadataActionApi
..

Fix: Get the default set of pageprops in getMetadataActionApi

The MW API parameter for specifying a subset of pageprops to return is
'ppprop', not 'pageprops'.  We have been receiving an API warning and
the default subset.  Actually, this seems to suit our purposes fine.  Less
code is better, so let's just go ahead and keep using the default subset.

Change-Id: I9e390d16a2b60bbcde6acb26f2fb2432fd62f320
---
M lib/mwapi.js
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/lib/mwapi.js b/lib/mwapi.js
index 7d22e01..5414184 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -164,8 +164,6 @@
 lllimit: 'max',
 pilicense: 'any',
 pithumbsize: mwapi.LEAD_IMAGE_XL,
-pageprops: ['wikibase_item',
-'disambiguation', 'displaytitle', 'normalizedtitle'].join('|'),
 wbptterms: 'description',
 inprop: ['protection'].join('|'),
 rvprop: ['ids', 'timestamp', 'user', 'contentmodel'].join('|'),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e390d16a2b60bbcde6acb26f2fb2432fd62f320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
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] mediawiki...Wikibase[wmf/1.31.0-wmf.5]: Make search for titles be always uppercase

[Smalyshev (Code Review)]

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

Change subject: Make search for titles be always uppercase
..

Make search for titles be always uppercase

Fortunately, wikidata titles are uppercase.
We may need better solution, but that may require full
reindex.

Bug: T179045
Change-Id: I83259e34b49b18ae8d4bff0ccb8c7738c0ea0d05
(cherry picked from commit 4f91ffb6dba082aee721a402f602e85add2c0107)
---
M repo/includes/Search/Elastic/EntitySearchElastic.php
M repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M repo/tests/phpunit/data/entitySearch/search_en.expected
M repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A repo/tests/phpunit/data/entitySearch/search_id.expected
A repo/tests/phpunit/data/entitySearch/search_id.query
8 files changed, 187 insertions(+), 6 deletions(-)


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

diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php 
b/repo/includes/Search/Elastic/EntitySearchElastic.php
index 5e94101..b80bfcc 100644
--- a/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -187,7 +187,9 @@
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
$labelsQuery->addMust( $dismax );
-   $titleMatch = new Term( [ 'title.keyword' => $text ] );
+   // TODO: this is a bit hacky, better way would be to make the 
field case-insensitive
+   // or add new subfiled which is case-insensitive
+   $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text 
) ] );
 
// Match either labels or exact match to title
$query->addShould( $labelsQuery );
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 48d79ef..4a28724 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -129,7 +129,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 48ef5ea..81b6ba1 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -129,7 +129,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index bc3b388..2163aca 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -59,7 +59,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en.expected 
b/repo/tests/phpunit/data/entitySearch/search_en.expected
index 857c6bf..e745659 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -69,7 +69,7 @@
 },
 {
 "term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
index c6a9848..939a7d7 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
@@ -59,7 +59,7 @@
 },
 {
 "term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
 }
 }
 ],
diff --git 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change threshold for slow AbuseFilter logging to 800ms

[Dmaza (Code Review)]

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

Change subject: Change threshold for slow AbuseFilter logging to 800ms
..

Change threshold for slow AbuseFilter logging to 800ms

Bug: T179039
Change-Id: Ib765b991684ea5a89f639e6eb153267dec9542ea
---
M wmf-config/abusefilter.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index ae98e71..3638e2d 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -32,6 +32,8 @@
 // T113164 Change default AbuseFilter IP block duration to not indefinite
 $wgAbuseFilterAnonBlockDuration = '1 week';
 
+$wgAbuseFilterSlowFilterRuntimeLimit = 800;
+
 // Custom permissions
 switch ( $wgDBname ) {
case 'arwiki':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make search for titles be always uppercase

[jenkins-bot (Code Review)]

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

Change subject: Make search for titles be always uppercase
..


Make search for titles be always uppercase

Fortunately, wikidata titles are uppercase.
We may need better solution, but that may require full
reindex.

Bug: T179045
Change-Id: I83259e34b49b18ae8d4bff0ccb8c7738c0ea0d05
---
M repo/includes/Search/Elastic/EntitySearchElastic.php
M repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M repo/tests/phpunit/data/entitySearch/search_en.expected
M repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A repo/tests/phpunit/data/entitySearch/search_id.expected
A repo/tests/phpunit/data/entitySearch/search_id.query
8 files changed, 187 insertions(+), 6 deletions(-)

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



diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php 
b/repo/includes/Search/Elastic/EntitySearchElastic.php
index d9d8eec..9dd9755 100644
--- a/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -190,7 +190,9 @@
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
$labelsQuery->addMust( $dismax );
-   $titleMatch = new Term( [ 'title.keyword' => $text ] );
+   // TODO: this is a bit hacky, better way would be to make the 
field case-insensitive
+   // or add new subfiled which is case-insensitive
+   $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text 
) ] );
 
// Match either labels or exact match to title
$query->addShould( $labelsQuery );
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 48d79ef..4a28724 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -129,7 +129,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 48ef5ea..81b6ba1 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -129,7 +129,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index bc3b388..2163aca 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -59,7 +59,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en.expected 
b/repo/tests/phpunit/data/entitySearch/search_en.expected
index 857c6bf..e745659 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -69,7 +69,7 @@
 },
 {
 "term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
index c6a9848..939a7d7 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
@@ -59,7 +59,7 @@
 },
 {
 "term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_id.expected 
b/repo/tests/phpunit/data/entitySearch/search_id.expected
new file 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Unicode to ICU mappings for versions 58 and 59

[Reedy (Code Review)]

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

Change subject: Add Unicode to ICU mappings for versions 58 and 59
..

Add Unicode to ICU mappings for versions 58 and 59

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/386546/1

diff --git a/includes/collation/IcuCollation.php 
b/includes/collation/IcuCollation.php
index efda596..23f02de 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -551,6 +551,8 @@
$versionPrefix = substr( $icuVersion, 0, 3 );
// Source: http://site.icu-project.org/download
$map = [
+   '59.' => '9.0',
+   '58.' => '9.0',
'57.' => '8.0',
'56.' => '8.0',
'55.' => '7.0',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: Exclude private/compare-sections contents from eslint

[Mholloway (Code Review)]

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

Change subject: Fix: Exclude private/compare-sections contents from eslint
..

Fix: Exclude private/compare-sections contents from eslint

These weren't actually being excluded, apparently because of the
intervening subfolders before the .json contents.  Excluding the whole
directory excludes them as expected.

Change-Id: Idaa56aab56c221def54ae044146067dccd0775cc
---
M .eslintignore
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/.eslintignore b/.eslintignore
index 1b5a54d..99c70f9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
-private/compare-sections/*.json
+private/compare-sections/
 private/top-pages/top-pages.*.json
 test/diff/results/page_definition-enwiktionary-*.json
 test/diff/results/page_*MCS_Test_Frankenstein.json
-tmp/
\ No newline at end of file
+tmp/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaa56aab56c221def54ae044146067dccd0775cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
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] mediawiki...mobileapps[master]: Hygiene: add tests for new Parsoid section elements

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: add tests for new Parsoid section elements
..


Hygiene: add tests for new Parsoid section elements

To prepare for T114072.

Change-Id: I643641d557aa4bfa7cf037e8eb7ec28f0d3b19f9
---
A test/lib/parsoid/parsoid-sections-section-elements-tests.js
M test/lib/parsoid/parsoid-sections-test.js
2 files changed, 99 insertions(+), 1 deletion(-)

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



diff --git a/test/lib/parsoid/parsoid-sections-section-elements-tests.js 
b/test/lib/parsoid/parsoid-sections-section-elements-tests.js
new file mode 100644
index 000..3c94847
--- /dev/null
+++ b/test/lib/parsoid/parsoid-sections-section-elements-tests.js
@@ -0,0 +1,98 @@
+'use strict';
+
+const assert = require('../../utils/assert.js');
+const domino = require('domino');
+const parsoidSectionsUsingSectionTags = 
require('../../../lib/parsoidSectionsUsingSectionTags');
+
+describe('lib:parsoid-sections (section elements)', function() {
+/* eslint-disable prefer-template */
+
+this.timeout(2); // eslint-disable-line no-invalid-this
+
+function assertSection0(sections) {
+assert.deepEqual(sections[0].id, 0);
+assert.deepEqual(sections[0].text, 'text0', 
JSON.stringify(sections[0], null, 2));
+}
+
+function assertSection1(sections, extraText = '') {
+assert.deepEqual(sections[1].id, 1);
+assert.deepEqual(sections[1].toclevel, 1);
+assert.deepEqual(sections[1].line, 'foo');
+assert.deepEqual(sections[1].anchor, 'foo');
+assert.deepEqual(sections[1].text, `text1${extraText}`);
+}
+
+function assertSection2(sections) {
+assert.deepEqual(sections[2].id, 2);
+assert.deepEqual(sections[2].toclevel, 2);
+// assert.deepEqual(sections[2].line, 'Funny section !@#$');
+assert.deepEqual(sections[2].anchor, 'Funny_section_.21.40.23.24');
+assert.deepEqual(sections[2].text, 'text2');
+}
+
+
+it('getSectionsText(empty) should produce an empty lead section', () => {
+const doc = domino.createDocument('');
+const sections = parsoidSectionsUsingSectionTags.getSectionsText(doc);
+assert.deepEqual(sections.length, 1);
+assert.deepEqual(sections[0].id, 0);
+assert.deepEqual(sections[0].text, '');
+});
+
+it('getSectionsText() with just text should produce a lead section', () => 
{
+const doc = domino.createDocument('text0');
+const sections = parsoidSectionsUsingSectionTags.getSectionsText(doc);
+assert.deepEqual(sections.length, 1);
+assertSection0(sections);
+});
+
+it('getSectionsText() with one h2 should produce two sections', () => {
+const doc = domino.createDocument('text0' +
+'footext1');
+const sections = parsoidSectionsUsingSectionTags.getSectionsText(doc);
+assert.deepEqual(sections.length, 2);
+assertSection0(sections);
+assertSection1(sections);
+});
+
+it('getSectionsText() with one h2 and h3 should produce three sections', 
() => {
+const doc = domino.createDocument('text0' +
+'footext1' +
+'' +
+'Funny section 
!@#$%^&*()text2' +
+'');
+const sections = parsoidSectionsUsingSectionTags.getSectionsText(doc);
+assert.deepEqual(sections.length, 3);
+assertSection0(sections);
+assertSection1(sections);
+assertSection2(sections);
+});
+
+// From T175305 
http://localhost:8000/fy.wikipedia.org/v3/page/html/De_Kanto%27s
+it('getSectionsText() with one h2 inside div should not produce another 
section', () => {
+const sectionInDiv = '' +
+'bar';
+const doc = domino.createDocument('text0' +
+'footext1' + 
sectionInDiv +
+'');
+const sections = parsoidSectionsUsingSectionTags.getSectionsText(doc);
+assert.deepEqual(sections.length, 2);
+assertSection0(sections);
+assertSection1(sections, sectionInDiv);
+});
+
+// same as above but using h3 instead of h2 in extra 
+it('getSectionsText() with one h3 inside div should not produce another 
section', () => {
+const sectionInDiv = '' +
+'bar';
+const doc = domino.createDocument('text0' +
+'footext1' + 
sectionInDiv +
+'');
+const sections = parsoidSectionsUsingSectionTags.getSectionsText(doc);
+assert.deepEqual(sections.length, 2);
+assertSection0(sections);
+assertSection1(sections, sectionInDiv);
+});
+
+/* eslint-enable prefer-template */
+});
diff --git a/test/lib/parsoid/parsoid-sections-test.js 
b/test/lib/parsoid/parsoid-sections-test.js
index 26f1396..04622b9 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make search for titles be always uppercase

[Smalyshev (Code Review)]

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

Change subject: Make search for titles be always uppercase
..

Make search for titles be always uppercase

Fortunately, wikidata titles are uppercase.
We may need better solution, but that may require full
reindex.

Bug: T179045
Change-Id: I83259e34b49b18ae8d4bff0ccb8c7738c0ea0d05
---
M repo/includes/Search/Elastic/EntitySearchElastic.php
M repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M repo/tests/phpunit/data/entitySearch/search_en.expected
M repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A repo/tests/phpunit/data/entitySearch/search_id.expected
A repo/tests/phpunit/data/entitySearch/search_id.query
8 files changed, 187 insertions(+), 6 deletions(-)


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

diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php 
b/repo/includes/Search/Elastic/EntitySearchElastic.php
index d9d8eec..9dd9755 100644
--- a/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -190,7 +190,9 @@
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
$labelsQuery->addMust( $dismax );
-   $titleMatch = new Term( [ 'title.keyword' => $text ] );
+   // TODO: this is a bit hacky, better way would be to make the 
field case-insensitive
+   // or add new subfiled which is case-insensitive
+   $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text 
) ] );
 
// Match either labels or exact match to title
$query->addShould( $labelsQuery );
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 48d79ef..4a28724 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -129,7 +129,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 48ef5ea..81b6ba1 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -129,7 +129,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index bc3b388..2163aca 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -59,7 +59,7 @@
 },
 {
 "term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en.expected 
b/repo/tests/phpunit/data/entitySearch/search_en.expected
index 857c6bf..e745659 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -69,7 +69,7 @@
 },
 {
 "term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
index c6a9848..939a7d7 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
@@ -59,7 +59,7 @@
 },
 {
 "term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
 }
 }
 ],
diff --git a/repo/tests/phpunit/data/entitySearch/search_id.expected 
b/repo/tests/phpunit/data/entitySearch/search_id.expected

[MediaWiki-commits] [Gerrit] integration/config[master]: Publish clover.xml files for machine-readable coverage infor...

[Legoktm (Code Review)]

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

Change subject: Publish clover.xml files for machine-readable coverage 
information
..

Publish clover.xml files for machine-readable coverage information

Bug: T146970
Change-Id: Ifd6dcd73ad6aa185ac098b3ec19eb928fe048e9f
---
M jjb/misc.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/43/386543/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index baddfaf..50f3dea 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -30,7 +30,9 @@
  # php5-xdebug. And also slow.
  - shell: |
  rm -rf coverage
- php5 ./vendor/bin/phpunit --coverage-html coverage/
+ php5 ./vendor/bin/phpunit --coverage-clover clover.xml 
--coverage-html coverage/
+ mv clover.xml coverage/clover.xml
+
  - cover-publish:
 src: 'coverage'
 dest: '$DOC_PROJECT'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Get section number from Parsoid

[jenkins-bot (Code Review)]

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

Change subject: Get section number from Parsoid
..


Get section number from Parsoid

Get section number from Parsoid's section element data-section-number
attribute.

Bug: T158635
Change-Id: Ie6347bf3d75b76d8be09e7669dd45f97a55f2714
---
M lib/parsoidSectionsUsingSectionTags.js
1 file changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/lib/parsoidSectionsUsingSectionTags.js 
b/lib/parsoidSectionsUsingSectionTags.js
index 20a1307..05182ca 100644
--- a/lib/parsoidSectionsUsingSectionTags.js
+++ b/lib/parsoidSectionsUsingSectionTags.js
@@ -41,6 +41,12 @@
 return sectionText;
 }
 
+function getSectionNumber(sectionElement) {
+const sectionNumberString = sectionElement
+&& sectionElement.getAttribute('data-section-number');
+return sectionNumberString ? parseInt(sectionNumberString, 10) : undefined;
+}
+
 /**
  * Gets the sections array, including HTML string and metadata for all sections
  * (id, anchor, line, toclevel).
@@ -60,7 +66,11 @@
 for (let i = 1; i < sectionElements.length; i++) {
 const currentSection = {};
 const currentSectionElement = sectionElements[i];
-currentSection.id = i;
+currentSection.id = getSectionNumber(currentSectionElement);
+if (currentSection.id < 0) {
+continue;
+}
+
 const childEl = currentSectionElement.firstChild;
 
 if (childEl && /^H[1-6]$/.test(childEl.tagName)) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6347bf3d75b76d8be09e7669dd45f97a55f2714
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove unused mediawiki.ui 'checked' icons

[jenkins-bot (Code Review)]

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

Change subject: Remove unused mediawiki.ui 'checked' icons
..


Remove unused mediawiki.ui 'checked' icons

Removing unused mediawiki.ui 'checked' image, which was in use before
the switch to the unified checkbox with blue and white appearance.

Change-Id: I4ba88583a2ed59b44a1f7bbffe823468af8e3874
---
D resources/src/mediawiki.ui/components/images/checked.png
D resources/src/mediawiki.ui/components/images/checked.svg
2 files changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.ui/components/images/checked.png 
b/resources/src/mediawiki.ui/components/images/checked.png
deleted file mode 100644
index 672a824..000
--- a/resources/src/mediawiki.ui/components/images/checked.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.ui/components/images/checked.svg 
b/resources/src/mediawiki.ui/components/images/checked.svg
deleted file mode 100644
index aca2b2b..000
--- a/resources/src/mediawiki.ui/components/images/checked.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg; 
width="24" height="24">

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ba88583a2ed59b44a1f7bbffe823468af8e3874
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Prtksxna 
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]: EmptyInterwikiResolver doesn't fully implement InterwikiReso...

[EBernhardson (Code Review)]

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

Change subject: EmptyInterwikiResolver doesn't fully implement InterwikiResolver
..

EmptyInterwikiResolver doesn't fully implement InterwikiResolver

Not sure how this made it through CI, but tests no longer
pass because this interface isn't fuly implemented. Update
the implementation for recent changes.

Change-Id: I922aa64a5394b335aa28d2d112d72ae9457460e4
---
M includes/EmptyInterwikiResolver.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/includes/EmptyInterwikiResolver.php 
b/includes/EmptyInterwikiResolver.php
index 89d4623..7ee37f8 100644
--- a/includes/EmptyInterwikiResolver.php
+++ b/includes/EmptyInterwikiResolver.php
@@ -10,6 +10,10 @@
return [];
}
 
+   public function getSisterProjectConfigs() {
+   return [];
+   }
+
/**
 * @param string $wikiId
 * @return string|null the interwiki identified for this $wikiId or 
null if none found
@@ -25,4 +29,8 @@
public function getSameProjectWikiByLang( $lang ) {
return [];
}
+
+   public function getSameProjectConfigByLang( $lang ) {
+   return [];
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: fix spotbug warnings

[jenkins-bot (Code Review)]

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

Change subject: fix spotbug warnings
..


fix spotbug warnings

New spotbug version finds a few more minor issues with checking return
values from guava's checkNotNull. This is a good occasion to move to the
more standard java.util.Objects.requireNonNull().

Change-Id: I0788fb112602d70b386cd934171181ade0aef6aa
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceFactory.java
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ServiceConfig.java
M tools/src/main/java/org/wikidata/query/rdf/tool/change/IdListChangeSource.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/change/IdRangeChangeSource.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
7 files changed, 25 insertions(+), 16 deletions(-)

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



diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
index e10baae..0acfb8f 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
@@ -1,5 +1,8 @@
 package org.wikidata.query.rdf.blazegraph.mwapi;
 
+import static java.util.Objects.requireNonNull;
+import static 
org.wikidata.query.rdf.blazegraph.mwapi.MWApiServiceFactory.paramNameToURI;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -23,11 +26,8 @@
 import com.bigdata.rdf.sparql.ast.eval.ServiceParams;
 import com.bigdata.rdf.sparql.ast.service.ServiceNode;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-
-import static 
org.wikidata.query.rdf.blazegraph.mwapi.MWApiServiceFactory.paramNameToURI;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -85,7 +85,7 @@
 Map outputVars = new HashMap<>();
 // Parse input params
 final JsonNode params = json.get("params");
-Preconditions.checkNotNull(params, "Missing params node");
+requireNonNull(params, "Missing params node");
 params.fieldNames().forEachRemaining(paramName -> {
 if (fixedParams.containsKey(paramName)
 || inputVars.contains(paramName)) {
@@ -109,10 +109,10 @@
 
 // Parse output params
 final JsonNode output = json.get("output");
-Preconditions.checkNotNull(params, "Missing output node");
+requireNonNull(params, "Missing output node");
 String items = output.get("items").asText();
 final JsonNode vars = output.get("vars");
-Preconditions.checkNotNull(vars, "Missing vars node");
+requireNonNull(vars, "Missing vars node");
 vars.fieldNames().forEachRemaining(paramName -> {
 if (inputVars.contains(paramName)
 || fixedParams.containsKey(paramName)) {
@@ -227,7 +227,7 @@
 List vars = new ArrayList<>(outputVars.size());
 
 final GraphPatternGroup group = 
serviceNode.getGraphPattern();
-Preconditions.checkNotNull(serviceNode, "Group node is null?");
+requireNonNull(serviceNode, "Group node is null?");
 
 String prefix = paramNameToURI("").stringValue();
 group.iterator().forEachRemaining(node -> {
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceFactory.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceFactory.java
index 921e7a9..2a7a0e0 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceFactory.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceFactory.java
@@ -1,5 +1,7 @@
 package org.wikidata.query.rdf.blazegraph.mwapi;
 
+import static java.util.Objects.requireNonNull;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -35,7 +37,6 @@
 import com.bigdata.rdf.sparql.ast.service.ServiceNode;
 import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
 import com.bigdata.rdf.store.BD;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 
 /**
@@ -127,7 +128,7 @@
 public BigdataServiceCall create(ServiceCallCreateParams params, final 
ServiceParams serviceParams) {
 ServiceNode serviceNode = params.getServiceNode();
 
-Preconditions.checkNotNull(serviceNode, "Missing service node?");
+

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Update restbase to b71c10b"

[Mobrovac (Code Review)]

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

Change subject: Revert "Update restbase to b71c10b"
..


Revert "Update restbase to b71c10b"

This reverts commit 4cbf9ff0055d8175cca064cdf86853276dad7b01.

Change-Id: Id6ea04a0b0d80347df8c13bff47fd083815509fa
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/restbase b/restbase
index b71c10b..bb8393e 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit b71c10b23bff3783386d8edf199be4106b276865
+Subproject commit bb8393e104b1183e4014ded83e42f460f2e7b641

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6ea04a0b0d80347df8c13bff47fd083815509fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Update restbase to b71c10b"

[Mobrovac (Code Review)]

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

Change subject: Revert "Update restbase to b71c10b"
..

Revert "Update restbase to b71c10b"

This reverts commit 4cbf9ff0055d8175cca064cdf86853276dad7b01.

Change-Id: Id6ea04a0b0d80347df8c13bff47fd083815509fa
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/41/386541/1

diff --git a/restbase b/restbase
index b71c10b..bb8393e 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit b71c10b23bff3783386d8edf199be4106b276865
+Subproject commit bb8393e104b1183e4014ded83e42f460f2e7b641

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6ea04a0b0d80347df8c13bff47fd083815509fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] labs/private[master]: openstack: add new puppetmaster profile dummy secrets

[Rush (Code Review)]

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

Change subject: openstack: add new puppetmaster profile dummy secrets
..


openstack: add new puppetmaster profile dummy secrets

Change-Id: Ied857ddc734aa7d62bb258cd1ccbe72ddf032d37
---
A hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
A hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml 
b/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
new file mode 100644
index 000..7eb86fa
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
@@ -0,0 +1 @@
+profile::openstack::labtest::puppetmaster::encapi::db_pass: 'a'
diff --git a/hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml 
b/hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml
new file mode 100644
index 000..b58360c
--- /dev/null
+++ b/hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml
@@ -0,0 +1 @@
+profile::openstack::main::puppetmaster::encapi::db_pass: 'a'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied857ddc734aa7d62bb258cd1ccbe72ddf032d37
Gerrit-PatchSet: 2
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 

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

[MediaWiki-commits] [Gerrit] labs/private[master]: openstack: add new puppetmaster profile dummy secrets

[Rush (Code Review)]

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

Change subject: openstack: add new puppetmaster profile dummy secrets
..

openstack: add new puppetmaster profile dummy secrets

Change-Id: Ied857ddc734aa7d62bb258cd1ccbe72ddf032d37
---
A hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
A hieradata/codfw/profile/openstack/main.yaml
A hieradata/codfw/profile/openstack/main/nova.yaml
A hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml
4 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/40/386540/1

diff --git a/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml 
b/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
new file mode 100644
index 000..7eb86fa
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
@@ -0,0 +1 @@
+profile::openstack::labtest::puppetmaster::encapi::db_pass: 'a'
diff --git a/hieradata/codfw/profile/openstack/main.yaml 
b/hieradata/codfw/profile/openstack/main.yaml
new file mode 100644
index 000..9d9626b
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/main.yaml
@@ -0,0 +1 @@
+profile::openstack::main::nova_controller: "labcontrol2001.wikimedia.org"
diff --git a/hieradata/codfw/profile/openstack/main/nova.yaml 
b/hieradata/codfw/profile/openstack/main/nova.yaml
new file mode 100644
index 000..8f8d289
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/main/nova.yaml
@@ -0,0 +1,2 @@
+profile::openstack::main::nova::dhcp_start: '10.196.16.4'
+profile::openstack::main::nova::dhcp_domain: 'codfw.labtest'
diff --git a/hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml 
b/hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml
new file mode 100644
index 000..b58360c
--- /dev/null
+++ b/hieradata/eqiad/profile/openstack/main/puppetmaster/encapi.yaml
@@ -0,0 +1 @@
+profile::openstack::main::puppetmaster::encapi::db_pass: 'a'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied857ddc734aa7d62bb258cd1ccbe72ddf032d37
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Rush 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "[Config] Enable double-processing for summaries for ...

[Ppchelko (Code Review)]

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

Change subject: Revert "[Config] Enable double-processing for summaries for all 
wikis"
..


Revert "[Config] Enable double-processing for summaries for all wikis"

This reverts commit f19a8bf7e1c5805b490f9865a07a78d9d4668aa4.

Change-Id: Id7a78cc8fe3bf5f2e967c83230b365b5837f4d4d
---
M scap/vars.yaml
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/scap/vars.yaml b/scap/vars.yaml
index 7e068f3..995dd1d 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -32,7 +32,18 @@
 cxserver_uri: https://cxserver-beta.wmflabs.org
 aqs_uri: https://wikimedia.org/api/rest_v1/metrics
 new_storage_enabled:
-  - '/.*/'
+  - 'ru.wikipedia.org'
+  - 'wikimediafoundation.org'
+  - '/wikimedia\.org$/'
+  - '/\.wikidata\.org$/'
+  - '/\.wiktionary\.org$/'
+  - '/\.wikibooks\.org$/'
+  - '/wikisource\.org$/'
+  - '/\.wikiquote\.org$/'
+  - '/\.wikinews\.org$/'
+  - '/\.wikiversity\.org$/'
+  - '/\.wikivoyage\.org$/'
+  - '/\.mediawiki\.org$/'
 port: 7231
 salt_key: '123456'
 page_size: 10

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7a78cc8fe3bf5f2e967c83230b365b5837f4d4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "[Config] Enable double-processing for summaries for ...

[Mobrovac (Code Review)]

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

Change subject: Revert "[Config] Enable double-processing for summaries for all 
wikis"
..

Revert "[Config] Enable double-processing for summaries for all wikis"

This reverts commit f19a8bf7e1c5805b490f9865a07a78d9d4668aa4.

Change-Id: Id7a78cc8fe3bf5f2e967c83230b365b5837f4d4d
---
M scap/vars.yaml
1 file changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/39/386539/1

diff --git a/scap/vars.yaml b/scap/vars.yaml
index 7e068f3..995dd1d 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -32,7 +32,18 @@
 cxserver_uri: https://cxserver-beta.wmflabs.org
 aqs_uri: https://wikimedia.org/api/rest_v1/metrics
 new_storage_enabled:
-  - '/.*/'
+  - 'ru.wikipedia.org'
+  - 'wikimediafoundation.org'
+  - '/wikimedia\.org$/'
+  - '/\.wikidata\.org$/'
+  - '/\.wiktionary\.org$/'
+  - '/\.wikibooks\.org$/'
+  - '/wikisource\.org$/'
+  - '/\.wikiquote\.org$/'
+  - '/\.wikinews\.org$/'
+  - '/\.wikiversity\.org$/'
+  - '/\.wikivoyage\.org$/'
+  - '/\.mediawiki\.org$/'
 port: 7231
 salt_key: '123456'
 page_size: 10

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7a78cc8fe3bf5f2e967c83230b365b5837f4d4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Reserve IPs for eqsin RIPE atlas

[Ayounsi (Code Review)]

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

Change subject: Reserve IPs for eqsin RIPE atlas
..


Reserve IPs for eqsin RIPE atlas

Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
3 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 02486c4..ba02b4e 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -28,6 +28,8 @@
 ; 2001:0df2:e500:201::/64 - sandbox1-eqsin
 $ORIGIN 1.0.2.0.{{ zonename }}.
 
+0.2.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
 ; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3: -- LVS Public Service IPs 
(in use)
 ; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1: --- LVS high-traffic1 
(Text)
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index d2911ba..34bdc9c 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -18,6 +18,9 @@
 
 ; 103.102.166.0/28 (0-15) - public1-eqsin
 ; 103.102.166.16/28 (16-31) - sandbox1-eqsin
+
+20 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1df29ba..ddde353 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -247,6 +247,8 @@
 ripe-atlas-esams 1H IN  2620:0:862:201:91:198:174:132
 ripe-atlas-ulsfo 1H IN A198.35.26.244
 ripe-atlas-ulsfo 1H IN  2620:0:863:201:198:35:26:244
+ripe-atlas-eqsin 1H IN A103.102.166.20
+ripe-atlas-eqsin 1H IN  2001:0df2:e500:201:103:102:166:20
 seaborgium  1H  IN A208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
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/dns[master]: Reserve IPs for eqsin RIPE atlas

[Ayounsi (Code Review)]

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

Change subject: Reserve IPs for eqsin RIPE atlas
..

Reserve IPs for eqsin RIPE atlas

Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
3 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/38/386538/1

diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 02486c4..ba02b4e 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -28,6 +28,8 @@
 ; 2001:0df2:e500:201::/64 - sandbox1-eqsin
 $ORIGIN 1.0.2.0.{{ zonename }}.
 
+0.2.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
 ; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3: -- LVS Public Service IPs 
(in use)
 ; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1: --- LVS high-traffic1 
(Text)
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index d2911ba..34bdc9c 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -18,6 +18,9 @@
 
 ; 103.102.166.0/28 (0-15) - public1-eqsin
 ; 103.102.166.16/28 (16-31) - sandbox1-eqsin
+
+20 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1df29ba..ddde353 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -247,6 +247,8 @@
 ripe-atlas-esams 1H IN  2620:0:862:201:91:198:174:132
 ripe-atlas-ulsfo 1H IN A198.35.26.244
 ripe-atlas-ulsfo 1H IN  2620:0:863:201:198:35:26:244
+ripe-atlas-eqsin 1H IN A103.102.166.20
+ripe-atlas-eqsin 1H IN  2001:0df2:e500:201:103:102:166:20
 seaborgium  1H  IN A208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I3ce9692a57fba794ec00f3f0e738e77da127574f
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ce9692a57fba794ec00f3f0e738e77da127574f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TopLists
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...UpdateMediaWiki[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I6b2682717c5c04c30ce6a0b172ad99669fe8ffc4
---
A Gruntfile.js
A package.json
2 files changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b2682717c5c04c30ce6a0b172ad99669fe8ffc4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UpdateMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...SemanticImageAnnotator[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I8e0b8fc7b8ba70cc366c790ed9b84fbb0780aec7
---
A Gruntfile.js
A package.json
2 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e0b8fc7b8ba70cc366c790ed9b84fbb0780aec7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticImageAnnotator
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...Video[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I764ce254f846d0b3c03c765ad57af79e2a4eab78
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 98b092a..e7eb7e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *~
 *.kate-swp
 .*.swp
+/node_modules
+/vendor
+/composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I764ce254f846d0b3c03c765ad57af79e2a4eab78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...WantedPagesFromNS[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ib382febed43d6bf7e0cd4c53529aa80c7e744752
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib382febed43d6bf7e0cd4c53529aa80c7e744752
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WantedPagesFromNS
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...PopcornEditor[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I35766789033b927555a7a48d8c879afd355c0ae9
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35766789033b927555a7a48d8c879afd355c0ae9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PopcornEditor
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...QuizTabulate[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ia892e4fb95eac5fbf018ee13fde0d6caf1954763
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia892e4fb95eac5fbf018ee13fde0d6caf1954763
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuizTabulate
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...PopupPages[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I8876d63db426730f44232002a9a08c9c8f9353aa
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 34 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 98b092a..e7eb7e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *~
 *.kate-swp
 .*.swp
+/node_modules
+/vendor
+/composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8876d63db426730f44232002a9a08c9c8f9353aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PopupPages
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...SportsTeams[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: If7ba6d433cda268160563ac38008635e35f34406
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7ba6d433cda268160563ac38008635e35f34406
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SportsTeams
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...QuickGV[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I15c4c89e6c2bcc35b28319e8d8eee49ffd90947e
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15c4c89e6c2bcc35b28319e8d8eee49ffd90947e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickGV
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...DonationInterface[master]: Handle PaymentActionCompleted in batch mode

[Mepps (Code Review)]

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

Change subject: Handle PaymentActionCompleted in batch mode
..

Handle PaymentActionCompleted in batch mode

Change-Id: I3c0cd53715b30e37b9ac728bf40ebcd6f1e1683a
---
M paypal_gateway/express_checkout/paypal_express.adapter.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
A 
tests/phpunit/includes/Responses/paypal_ec/GetExpressCheckoutDetails_Complete.testresponse
3 files changed, 46 insertions(+), 17 deletions(-)


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

diff --git a/paypal_gateway/express_checkout/paypal_express.adapter.php 
b/paypal_gateway/express_checkout/paypal_express.adapter.php
index a509b37..3565b03 100644
--- a/paypal_gateway/express_checkout/paypal_express.adapter.php
+++ b/paypal_gateway/express_checkout/paypal_express.adapter.php
@@ -439,12 +439,17 @@
break;
case 'GetExpressCheckoutDetails':
$this->checkResponseAck( $response );
-
// Merge response into our transaction data.
// TODO: Use getFormattedData instead.
// FIXME: We don't want to allow overwriting of 
ctid, need a
// blacklist of protected fields.
$this->addResponseData( $this->unstageKeys( 
$response ) );
+
+   // Complete if payment already finalized
+   if ( $this->isBatchProcessor() && 
$response['CHECKOUTSTATUS'] && $response['CHECKOUTSTATUS'] === 
'PaymentActionCompleted' ) {
+   $this->finalizeInternalStatus( 
FinalStatus::COMPLETE );
+   break;
+   }
 
$this->runAntifraudFilters();
if ( $this->getValidationAction() !== 'process' 
) {
@@ -555,22 +560,24 @@
ResponseCodes::UNKNOWN );
}
 
-   if ( $this->getData_Unstaged_Escaped( 'recurring' ) ) {
-   // Set up recurring billing agreement.
-   $this->addRequestData( array(
-   'date' => time()
-   ) );
-   $resultData = $this->do_transaction( 
'CreateRecurringPaymentsProfile' );
-   if ( !$resultData->getCommunicationStatus() ) {
-   throw new ResponseProcessingException(
-   'Failed to create a recurring profile', 
ResponseCodes::UNKNOWN );
-   }
-   } else {
-   // One-time payment, or initial payment in a 
subscription.
-   $resultData = $this->do_transaction( 
'DoExpressCheckoutPayment' );
-   if ( !$resultData->getCommunicationStatus() ) {
-   $this->finalizeInternalStatus( 
FinalStatus::FAILED );
-   return PaymentResult::newFailure();
+   if ( $this->getFinalStatus() !== FinalStatus::COMPLETE ) {
+   if ( $this->getData_Unstaged_Escaped( 'recurring' ) ) {
+   // Set up recurring billing agreement.
+   $this->addRequestData( array(
+   'date' => time()
+   ) );
+   $resultData = $this->do_transaction( 
'CreateRecurringPaymentsProfile' );
+   if ( !$resultData->getCommunicationStatus() ) {
+   throw new ResponseProcessingException(
+   'Failed to create a recurring 
profile', ResponseCodes::UNKNOWN );
+   }
+   } else {
+   // One-time payment, or initial payment in a 
subscription.
+   $resultData = $this->do_transaction( 
'DoExpressCheckoutPayment' );
+   if ( !$resultData->getCommunicationStatus() ) {
+   $this->finalizeInternalStatus( 
FinalStatus::FAILED );
+   return PaymentResult::newFailure();
+   }
}
}
return PaymentResult::fromResults(
diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php 
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
index 5cb91a4..8a719de 100644
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
@@ -400,6 +400,27 @@
 

[MediaWiki-commits] [Gerrit] operations/dns[master]: eqsin revdns: strawman subnet plan

[Ayounsi (Code Review)]

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

Change subject: eqsin revdns: strawman subnet plan
..


eqsin revdns: strawman subnet plan

Bug: T156256
Change-Id: Ie3b68e5929a945efe2eebd58787f606eeedd294e
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
3 files changed, 49 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index ab6bc01..02486c4 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -13,4 +13,32 @@
 1D  IN NS   ns1.wikimedia.org.
 1D  IN NS   ns2.wikimedia.org.
 
+; 2001:0df2:e500::/48
 ; APNIC space, reserved for eqsin
+
+; 2001:0df2:e500:0::/56 - eqsin public subnets
+; 2001:0df2:e500:1::/64 - public1-eqsin
+$ORIGIN 1.0.0.0.{{ zonename }}.
+
+; 2001:0df2:e500:100::/56 - eqsin private subnets
+; 2001:0df2:e500:101::/64 - private1-eqsin
+$ORIGIN 1.0.1.0.{{ zonename }}.
+
+; 2001:0df2:e500:200::/56 - eqsin sandbox subnets
+; 2001:0df2:e500:201::/64 - sandbox1-eqsin
+$ORIGIN 1.0.2.0.{{ zonename }}.
+
+; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
+; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3: -- LVS Public Service IPs 
(in use)
+; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1: --- LVS high-traffic1 
(Text)
+$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+; -- 2001:0df2:e500:ed1a::2:0/111 (::2:0 - ::3: --- LVS high-traffic2 
(Multimedia & Misc)
+$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+
+; 2001:0df2:e500:fe00::/56 - Infrastructure IPs
+$ORIGIN 0.0.e.f.{{ zonename }}.
+
+; 2001:0df2:e500:::/56 - Loopback IPs
+$ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 433371e..ce2c989 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2895,6 +2895,15 @@
 131 1H  IN PTR  cp4031.ulsfo.wmnet.
 132 1H  IN PTR  cp4032.ulsfo.wmnet.
 
+; EQSIN (10.132.0.0/16)
+; 10.132.0.0/16 - eqsin
+; 10.132.0.0/17 - eqsin private
+; 10.132.0.0/24 - private1-eqsin
+$ORIGIN 0.132.{{ zonename }}.
+; 10.132.128.0/17 - eqsin mgmt
+$ORIGIN 128.132.{{ zonename }}.
+$ORIGIN 129.132.{{ zonename }}.
+
 ;
 ; CODFW (10.192.0.0/12)
 ;
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index ab6bc01..d2911ba 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -13,4 +13,16 @@
 1D  IN NS   ns1.wikimedia.org.
 1D  IN NS   ns2.wikimedia.org.
 
+; 103.102.166.0/24 (103.102.166.0 - 103.102.166.255)
 ; APNIC space, reserved for eqsin
+
+; 103.102.166.0/28 (0-15) - public1-eqsin
+; 103.102.166.16/28 (16-31) - sandbox1-eqsin
+; 103.102.166.32/27 (32-63) - unused
+; 103.102.166.64/26 (64-127) - unused
+; 103.102.166.128/27 (128-159) - Infrastructure Space
+; 103.102.166.160/27 (160-191) - unused
+; 103.102.166.192/27 (192-223) - unused
+; 103.102.166.224/27 (224-255) - LVS Service IPs
+; - 103.102.166.224/28 (224-239) -- LVS high-traffic1 (Text)
+; - 103.102.166.240/28 (240-255) -- high-traffic2 (Multimedia & Misc)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b68e5929a945efe2eebd58787f606eeedd294e
Gerrit-PatchSet: 6
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
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...MsCatSelect[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ic564bec9f26606cbe2326e8a466dddc2d1231876
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 34 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 496ee2c..4a7e302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+/node_modules
+/vendor
+/composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic564bec9f26606cbe2326e8a466dddc2d1231876
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCatSelect
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...Memento[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I42964adc1218b47ea57c872e0d8a335319a7571f
---
A Gruntfile.js
A package.json
2 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..89a3b25
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'Memento/i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42964adc1218b47ea57c872e0d8a335319a7571f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Memento
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...ImageRating[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ifadb0c2395fef284b3f730571ac11105d95b943f
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifadb0c2395fef284b3f730571ac11105d95b943f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageRating
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...MsCalendar[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I5437a96f7314d3cd00064a09de3490400eb75a10
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 34 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 496ee2c..4a7e302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+/node_modules
+/vendor
+/composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5437a96f7314d3cd00064a09de3490400eb75a10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...MiniInvite[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I80d0573d0fea6c9e7375b61d19c36fcf670f72cf
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80d0573d0fea6c9e7375b61d19c36fcf670f72cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MiniInvite
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...GoToShell[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Iad5f135e50d158cdaeeca039687bed46fc5feff0
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad5f135e50d158cdaeeca039687bed46fc5feff0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoToShell
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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]: R, Shiny Server, and Discovery Computing fixes

[Bearloga (Code Review)]

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

Change subject: R, Shiny Server, and Discovery Computing fixes
..

R, Shiny Server, and Discovery Computing fixes

+ r_lang: Fixes permissions and group ownership
+ shiny_server: Fixes permissions and group ownership
+ profile::discovery_computing::base: Fixes which
  Python libraries are installed
+ profile::discovery_computing::deep_learning: Fixes
  which Python libraries are installed
+ profile::discovery_computing::machine_learning:
  Fixes resource name typo

Bug: T178096
Change-Id: I19a3f016d63034e60a714fe78a82270049128bbb
---
M modules/profile/manifests/discovery_computing/base.pp
M modules/profile/manifests/discovery_computing/deep_learning.pp
M modules/profile/manifests/discovery_computing/machine_learning.pp
M modules/r_lang/manifests/init.pp
M modules/shiny_server/manifests/init.pp
5 files changed, 35 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/386536/1

diff --git a/modules/profile/manifests/discovery_computing/base.pp 
b/modules/profile/manifests/discovery_computing/base.pp
index 4c56d77..b880892 100644
--- a/modules/profile/manifests/discovery_computing/base.pp
+++ b/modules/profile/manifests/discovery_computing/base.pp
@@ -16,18 +16,27 @@
 }
 
 $essentials = [
-'build-essential',   # for building stuff
-'virtualenv',# Python virtual environment creator
-'python-pip',# for installing py libs
-'python-setuptools', # also for installing py libs
-'python-wheel',  # built-package format for Python
-'liblapack-dev', # Library of linear algebra routines
-'libgsl0-dev',   # GNU Scientific Library
-'python-dev',# header files and a static library for Python
-'python-numpy',  # numerical library for Python
-'python-scipy',  # scientific tools for Python
-'python-pandas', # data structures for "relational" or "labeled" 
data
-'python-requests',   # HTTP library for Python
+'liblapack-dev',  # Library of linear algebra routines
+'libgsl0-dev',# GNU Scientific Library
+'build-essential',# for building stuff
+# Python libraries:
+'virtualenv', # virtual environment creator
+'python-pip',
+'python3-pip',
+'python-setuptools',
+'python3-setuptools',
+'python-wheel',   # built-package format
+'python3-wheel',
+'python-dev', # header files and a static library
+'python3-dev',
+'python-numpy',   # numerical library
+'python3-numpy',
+'python-scipy',   # scientific tools
+'python3-scipy',
+'python-pandas',  # data structures for "relational" or "labeled" 
data
+'python3-pandas',
+'python-requests',# HTTP library
+'python3-requests',
 ]
 require_package($essentials)
 
diff --git a/modules/profile/manifests/discovery_computing/deep_learning.pp 
b/modules/profile/manifests/discovery_computing/deep_learning.pp
index c2edf4a..42bb88b 100644
--- a/modules/profile/manifests/discovery_computing/deep_learning.pp
+++ b/modules/profile/manifests/discovery_computing/deep_learning.pp
@@ -9,11 +9,12 @@
 require profile::discovery_computing::base
 
 $pkgs = [
-'python-h5py',  # Python interface to HDF5 (required for saving 
Keras models to disk)
-'python-html5lib',  # HTML parser (required for TensorFlow)
-'caffe-cpu',# Fast, open framework for Deep Learning
-'python-caffe-cpu', # Python3 interface of Caffe
-'python-skimage',   # Python 3 modules for image processing
+'python-h5py',   # Python interface to HDF5 (required for saving 
Keras models to disk)
+'python-html5lib',   # HTML parser (required for TensorFlow)
+'caffe-cpu', # Fast, open framework for Deep Learning
+'python3-caffe-cpu', # Python3 interface to Caffe
+'python-skimage',# Python2 modules for image processing
+'python3-skimage',   # Python3 modules for image processing
 ]
 require_package($pkgs)
 
diff --git a/modules/profile/manifests/discovery_computing/machine_learning.pp 
b/modules/profile/manifests/discovery_computing/machine_learning.pp
index 15ac535..55022b2 100644
--- a/modules/profile/manifests/discovery_computing/machine_learning.pp
+++ b/modules/profile/manifests/discovery_computing/machine_learning.pp
@@ -12,8 +12,8 @@
 require profile::discovery_computing::base
 
 $python_packages = [
-'python-sklearn',# Python modules for machine learning and 
data mining
-'python-sklearn-pandas', # Pandas integration with sklearn
+'python-sklearn',  # Python 2 modules for machine learning and 

[MediaWiki-commits] [Gerrit] mediawiki...EditOwn[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Id4862a100d62c5c66fe50ab273cbe7f551999b9b
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4862a100d62c5c66fe50ab273cbe7f551999b9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditOwn
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...Wikibase[master]: Set links weight back to old value

[jenkins-bot (Code Review)]

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

Change subject: Set links weight back to old value
..


Set links weight back to old value

Seems to work better and matches what we had before for non-disambig
entities.

Bug: T148411
Change-Id: Id77d20cb17533478115dbbce14bf4d25803732d3
---
M repo/config/ElasticSearchRescoreFunctions.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/config/ElasticSearchRescoreFunctions.php 
b/repo/config/ElasticSearchRescoreFunctions.php
index 303fb52..f6f4ee0 100644
--- a/repo/config/ElasticSearchRescoreFunctions.php
+++ b/repo/config/ElasticSearchRescoreFunctions.php
@@ -28,7 +28,7 @@
[
// Incoming links: k = 50
'type' => 'satu',
-   'weight' => '0.5',
+   'weight' => '0.6',
'params' => [ 'field' => 'incoming_links', 
'missing' => 0, 'a' => 2 , 'k' => 50 ]
],
[

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id77d20cb17533478115dbbce14bf4d25803732d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Thiemo Mättig (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...Challenge[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I48eeba512d0ef4a3f7e486af08d199c2608febb3
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48eeba512d0ef4a3f7e486af08d199c2608febb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Challenge
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...ArticleToCategory2[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ib42cb447226b1e88368f2b086299fe5f3b00534b
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..07e6e47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..f6f1804
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib42cb447226b1e88368f2b086299fe5f3b00534b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleToCategory2
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...ArticleRatings[master]: Add grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ied60433ff144bbf39012eef71909512e25d6fb46
---
A Gruntfile.js
A package.json
2 files changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied60433ff144bbf39012eef71909512e25d6fb46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleRatings
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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...CirrusSearch[master]: Strip highlighting before converting to html

[EBernhardson (Code Review)]

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

Change subject: Strip highlighting before converting to html
..

Strip highlighting before converting to html

Result::stripHighlighting was called on two separate kinds of
highlighting, both before and after converting to HTML. Normalize so we
always stripHighlighting against the original highlight, rather than the
html version.

Bug: T178522
Change-Id: I07db7d9543e0160b56a54ea00ec64d8b498b481b
---
M includes/Search/Result.php
M tests/unit/Search/ResultTest.php
2 files changed, 59 insertions(+), 42 deletions(-)


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

diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index 151f291..0ffc7a9 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -111,7 +111,7 @@
 
if ( isset( $highlights[ 'heading' ] ) ) {
$this->sectionSnippet = $this->escapeHighlightedText( 
$highlights[ 'heading' ][ 0 ] );
-   $this->sectionTitle = $this->findSectionTitle();
+   $this->sectionTitle = $this->findSectionTitle( 
$highlights[ 'heading' ][ 0 ] );
}
 
if ( isset( $highlights[ 'category' ] ) ) {
@@ -227,9 +227,9 @@
/**
 * @return Title
 */
-   private function findSectionTitle() {
+   private function findSectionTitle( $highlighted ) {
return $this->getTitle()->createFragmentTarget( 
Sanitizer::escapeIdForLink(
-   $this->stripHighlighting( $this->sectionSnippet )
+   $this->stripHighlighting( $highlighted )
) );
}
 
diff --git a/tests/unit/Search/ResultTest.php b/tests/unit/Search/ResultTest.php
index 78a046f..fc71d7d 100644
--- a/tests/unit/Search/ResultTest.php
+++ b/tests/unit/Search/ResultTest.php
@@ -3,51 +3,58 @@
 namespace CirrusSearch\Search;
 
 use CirrusSearch\CirrusTestCase;
+use CirrusSearch\Searcher;
 use MediaWiki\MediaWikiServices;
 
 /**
  * @group CirrusSearch
  */
 class ResultTest extends CirrusTestCase {
+
+   const EXAMPLE_HIT = [
+   '_index' => 'eswiki_content_123456',
+   '_source' => [
+   'namespace' => NS_MAIN,
+   'namespace_text' => '',
+   'title' => 'Main Page',
+   'wiki' => 'eswiki',
+   'redirect' => [
+   [
+   'title' => 'Main',
+   'namespace' => NS_MAIN,
+   ],
+   ],
+   ],
+   'highlight' => [
+   'redirect.title' => [ 'Main' ],
+   'heading' => [ '...' ],
+   ],
+   ];
+
+   public function testHighlightedSectionSnippet() {
+   $data = self::EXAMPLE_HIT;
+   $data['highlight']['heading'] = [ 
Searcher::HIGHLIGHT_PRE_MARKER . 'stuff' . Searcher::HIGHLIGHT_POST_MARKER ];
+
+   $result = $this->mockResult( $data );
+   $this->assertEquals(
+   Searcher::HIGHLIGHT_PRE . 'stuff' . 
Searcher::HIGHLIGHT_POST,
+   $result->getSectionSnippet()
+   );
+   $this->assertEquals(
+   'stuff',
+   $result->getSectionTitle()->getFragment()
+   );
+   }
+
public function testInterwikiResults() {
$this->setMwGlobals( [
'wgCirrusSearchWikiToNameMap' => [
'es' => 'eswiki',
],
] );
-   $config = MediaWikiServices::getInstance()
-   ->getConfigFactory()
-   ->makeConfig( 'CirrusSearch' );
 
-   $elasticaResultSet = $this->getMockBuilder( 
\Elastica\ResultSet::class )
-   ->disableOriginalConstructor()
-   ->getMock();
-
-   $data = [
-   '_index' => 'eswiki_content_123456',
-   '_source' => [
-   'namespace' => NS_MAIN,
-   'namespace_text' => '',
-   'title' => 'Main Page',
-   'wiki' => 'eswiki',
-   'redirect' => [
-   [
-   'title' => 'Main',
-   'namespace' => NS_MAIN,
-   ],
-   ],
-   ],
-   'highlight' => [
-  

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: create script to compare old and new sectioning code

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: create script to compare old and new sectioning code
..


Hygiene: create script to compare old and new sectioning code

The output of this allows us to have more confidence when changing
the sectioning code. It could probably be used for other changes, too.
This script requires some extensive setup. See the comments at the
beginning of the script file.

Bug: T178707
Change-Id: I0a8116ec8fe9278a31e8dea781ee646251b83c94
---
M .eslintignore
M .gitignore
A scripts/compare-sections.js
3 files changed, 144 insertions(+), 0 deletions(-)

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



diff --git a/.eslintignore b/.eslintignore
index 9065f89..1b5a54d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
+private/compare-sections/*.json
 private/top-pages/top-pages.*.json
 test/diff/results/page_definition-enwiktionary-*.json
 test/diff/results/page_*MCS_Test_Frankenstein.json
diff --git a/.gitignore b/.gitignore
index 28e4a2d..bb8bd8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 .DS_Store
 tmp/
 /fixtures/
+/private/compare-sections/
diff --git a/scripts/compare-sections.js b/scripts/compare-sections.js
new file mode 100755
index 000..62f636e
--- /dev/null
+++ b/scripts/compare-sections.js
@@ -0,0 +1,142 @@
+#!/usr/bin/env node
+
+'use strict';
+
+/*
+  Setup notes before running this script:
+  * Start two local Parsoid instances on ports 8000 and 8001. The latter would 
get the new code.
+  * Start two local MCS instances on ports 6927 and 6928.
+  * Change the config.dev.yaml also to hook up with the respective local 
Parsoid installations, e.g.
+  * v1) MCS:6927 -> Parsoid:8000
+  * v2) MCS:6928 -> Parsoid:8001
+  * and towards the end of the config.dev.yaml also change the restbase_req 
uri value to
+  * v1) uri: http://0.0.0.0:8000/{{domain}}/v3/{+path}
+  * v2) uri: http://0.0.0.0:8001/{{domain}}/v3/{+path}
+  * Run the script from the script folder.
+
+  Arguments: provide a single argument which is the language code for the 
Wikipedia project.
+
+  Example:
+  $ cd scripts
+  $ ./compare-sections.js en
+
+  The output will be in the private/compare-sections folder. Since the output 
is much larger than
+  for text extracts each page gets it's own file.
+  Note: the output will be massaged to allow for easier diffing by reducing 
uninteresting variances
+  and by adding line breaks at strategic points.
+*/
+
+const BBPromise = require('bluebird');
+const fs = require('fs');
+const mkdir = require('mkdirp');
+const preq = require('preq');
+
+const DELAY = 10; // delay between requests in ms
+const topPagesDir = '../private/top-pages';
+const outDir = '../private/compare-sections';
+
+let lang;
+let topPages;
+
+let oldDirName;
+let newDirName;
+
+const uriForOldMobileSections = (title, rev, lang) => {
+return 
`http://localhost:6927/${lang}.wikipedia.org/v1/page/mobile-sections/${encodeURIComponent(title)}/${rev}`;
+};
+
+const uriForNewSections = (title, rev, lang) => {
+return 
`http://localhost:6928/${lang}.wikipedia.org/v1/page/mobile-sections/${encodeURIComponent(title)}/${rev}`;
+};
+
+/**
+ * Remove some values which vary between implementation but don't have 
anything to do with
+ * sectioning.
+ */
+const simplifyExtractValue = (value) => {
+return value && value
+.replace(/"revision": "\w+",/, '"revision": "ZZZ",')
+.replace(/"lastmodified": "\w+",/, '"lastmodified": "ZZZ",')
+.replace(/"user": "\w+",/, '"user": "ZZZ",')
+.replace(/"gender": "\w+",/, '"gender": "ZZZ",')
+.replace(/#ImageMap_\d+_\d+/g, '#ImageMap_0_000')
+.replace(/)/g, "$1\n")
+.replace(/()/g, "$1\n")
+.replace(/(.{50}[^<>]{0,50}>?)/g, "$1\n")
+// ^ keep lines to a reasonable width (try to break near HTML tags)
+;
+};
+
+const getExtractHtml = (response) => {
+if (response.status !== 200) {
+return `!! STATUS = ${response.status} !!\n`;
+}
+return simplifyExtractValue(JSON.stringify(response.body, null, 2));
+};
+
+const writeFile = (dir, title, rev, value) => {
+const file = 
fs.createWriteStream(`${dir}_${encodeURIComponent(title)}-${rev}.json`,
+{ flags: 'w' });
+file.write(`${value}\n`);
+file.end();
+};
+
+const compareExtracts = (filePrefix, oldExtract, newExtract, counter, title, 
rev) => {
+writeFile(`${oldDirName}/${filePrefix}`, title, rev, oldExtract);
+writeFile(`${newDirName}/${filePrefix}`, title, rev, newExtract);
+};
+
+const fetchExtract = (uri) => {
+return preq.get({ uri })
+.then((response) => {
+return BBPromise.delay(DELAY, getExtractHtml(response));
+}).catch((err) => {
+return BBPromise.resolve(`!!! ${err} "${uri}" !!!`);
+

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Refactor and document seperator serialization

[jenkins-bot (Code Review)]

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

Change subject: Refactor and document seperator serialization
..


Refactor and document seperator serialization

 * The impetus here was to answer if it's safe to call `emitChunk`
   multiple times per node.

   It should be, and indeed we do in several places.  The first call
   resets the separator state, which clears the constraints.  Guards
   are made explicit here so that when it's called `again`, original
   separators won't get reused.

 * The legitimate case for making subsequent calls with the same node,
   (ie. `lastSourceNode` being the same) is when there're no children
   and an end tag must go out.  See the note in the table handler where
   necessary contraints are shoehorned in.

 * Removes `lastSourceSep` which has been obsolete since 8c95d797.
   That refactor put the update after resetting so that it was always
   effectively empty.  Presumably that was the right thing to do.

Change-Id: I92953d00580bf8ad7d5e34a0d804931991da1e43
---
M lib/html2wt/DOMHandlers.js
M lib/html2wt/LinkHandler.js
M lib/html2wt/SerializerState.js
M lib/html2wt/WikitextSerializer.js
M lib/html2wt/separators.js
M tests/parserTests.txt
6 files changed, 152 insertions(+), 114 deletions(-)

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



diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index f1731b7..3165aa6 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -551,7 +551,7 @@
// FIXME: Should this also check for tabs and plain space
// chars interspersed with newlines?
if (dp.src.match(/^\n+$/)) {
-   state.setSep((state.sep.src || '') + dp.src);
+   state.appendSep(dp.src);
} else {
state.serializer.emitWikitext(dp.src, node);
}
@@ -689,7 +689,7 @@
}
if (!state.sep.constraints) {
// Special case hack for "{|\n|}" since 
state.sep is
-   // cleared in SSP.pushSep after a 
separator is emitted.
+   // cleared in SSP.emitSep after a 
separator is emitted.
// However, for {|\n|}, the  tag 
has no element
// children which means lastchild -> 
parent constraint
// is never computed and set here.
@@ -1005,7 +1005,7 @@
state.emitChunk(content, node);
 
// Preserve separator source
-   state.setSep((trailingNL && trailingNL[0]) || 
'');
+   state.appendSep((trailingNL && trailingNL[0]) 
|| '');
});
}),
sepnls: {
diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 6b52024..ad3dd31 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -665,7 +665,7 @@
// content string wasn't appropriate).
state.emitChunk(magicLinkMatch[0] === 'ISBN' ?
new WikiLinkText(serialized, node, 
wiki, 'mw:WikiLink') :
-   new ExtLinkText(serialized, node, wiki, 
'mw:ExtLink'));
+   new ExtLinkText(serialized, node, wiki, 
'mw:ExtLink'), node);
} else {
state.emitChunk(new MagicLinkText(serialized, 
node), node);
}
diff --git a/lib/html2wt/SerializerState.js b/lib/html2wt/SerializerState.js
index eb93757..f9b3b94 100644
--- a/lib/html2wt/SerializerState.js
+++ b/lib/html2wt/SerializerState.js
@@ -24,7 +24,12 @@
  *Separator information:
  *- constraints: min/max number of newlines
  *- text: collected separator text from DOM text/comment nodes
- *- lastSourceNode: -- to be documented --
+ *- lastSourceNode: Seems to be bookkeeping to make sure we don't reuse
+ *  original separators when `emitChunk` is called
+ *  consecutively on the same node.  However, it also
+ *  differs from `state.prevNode` in that it only gets
+ *  updated when a node calls `emitChunk` so that nodes
+ *  serializing `justChildren` don't mix up `buildSep`.
  *
  * onSOL
  *Is the serializer at the start of a new wikitext line?
@@ -161,20 +166,22 @@
 };
 
 /**
+ * Appends the seperator source and updates the SOL state if necessary
  */
-SSP.setSep = function(src) {
-   this.sep.src = src;
+SSP.appendSep = function(src) {
+   this.sep.src = (this.sep.src || '') +