date:20180103

[MediaWiki-commits] [Gerrit] operations...scap[master]: add wmflabs config for dumps scap

2018-01-03 Thread ArielGlenn (Code Review)

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

Change subject: add wmflabs config for dumps scap
..


add wmflabs config for dumps scap

Change-Id: I5b2b4fa35987f64cb74811ec39a98faf35752477
---
A dumps_targets_betacluster
M scap.cfg
2 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/dumps_targets_betacluster b/dumps_targets_betacluster
new file mode 100644
index 000..2419e87
--- /dev/null
+++ b/dumps_targets_betacluster
@@ -0,0 +1,2 @@
+deployment-snapshot01.deployment-prep.eqiad.wmflabs
+
diff --git a/scap.cfg b/scap.cfg
index 99348a9..ac1f466 100644
--- a/scap.cfg
+++ b/scap.cfg
@@ -3,3 +3,6 @@
 git_deploy_dir: /srv/deployment
 ssh_user: dumpsgen
 dsh_targets: dumps_targets
+
+[deployment-prep.eqiad.wmflabs]
+dsh_targets: dumps_targets_betacluster

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b2b4fa35987f64cb74811ec39a98faf35752477
Gerrit-PatchSet: 2
Gerrit-Project: operations/dumps/scap
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Thcipriani 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: pagegenerators_tests: Update test_searchitem_language

2018-01-03 Thread Rafidaslam (Code Review)

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

Change subject: pagegenerators_tests: Update test_searchitem_language
..

pagegenerators_tests: Update test_searchitem_language

Update `TestFactoryGeneratorWikibase.test_searchitem_language`
testcase in `tests/pagegenerators_tests.py` to use another
search term in Wikidata.

Bug: T184131
Change-Id: I5b7a69ad96a42dd84bca8b95f9e6302ce5a62c8d
---
M tests/pagegenerators_tests.py
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/01/401901/1

diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 365a7a0..45093d4 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -1220,25 +1220,25 @@
 def test_searchitem_language(self):
 """Test -searchitem with custom language specified."""
 gf = pagegenerators.GeneratorFactory(site=self.site)
-gf.handleArg('-searchitem:pl:abc')
+gf.handleArg('-searchitem:id:awan')
 gf.handleArg('-limit:1')
 gen = gf.getCombinedGenerator()
 self.assertIsNotNone(gen)
-# ABC
+# Awan, (means cloud in Indonesian)
 page1 = next(gen)
-self.assertEqual(page1.title(), 'Q287078')
+self.assertEqual(page1.title(), 'Q8074')
 
 gf = pagegenerators.GeneratorFactory(site=self.site)
-gf.handleArg('-searchitem:en:abc')
+gf.handleArg('-searchitem:en:awan')
 gf.handleArg('-limit:2')
 gen = gf.getCombinedGenerator()
 self.assertIsNotNone(gen)
-# American Broadcasting Company
+# Awan, character in Book of Jubilees
 page1 = next(gen)
-self.assertEqual(page1.title(), 'Q169889')
-# Australian Broadcasting Corporation
+self.assertEqual(page1.title(), 'Q9639242')
+# Awan, surname
 page2 = next(gen)
-self.assertEqual(page2.title(), 'Q781365')
+self.assertEqual(page2.title(), 'Q4829787')
 
 def test_get_category_site(self):
 """Test the getCategory method."""

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiComparePages: Add 'fromsection' and 'tosection' parameters

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: ApiComparePages: Add 'fromsection' and 'tosection' parameters
..


ApiComparePages: Add 'fromsection' and 'tosection' parameters

The deprecated diffing in prop=revisions and such used a 'rvsection'
parameter. To enable migration of things using that, action=compare
needs corresponding section parameters.

Bug: T183823
Change-Id: If1a0e2df614c083b37640418c69cca367ce0e895
---
M includes/api/ApiComparePages.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
M tests/phpunit/includes/api/ApiComparePagesTest.php
4 files changed, 72 insertions(+), 0 deletions(-)

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



diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index eb67bab..5486594 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -94,6 +94,26 @@
$this->dieWithError( 'apierror-baddiff' );
}
 
+   // Extract sections, if told to
+   if ( isset( $params['fromsection'] ) ) {
+   $fromContent = $fromContent->getSection( 
$params['fromsection'] );
+   if ( !$fromContent ) {
+   $this->dieWithError(
+   [ 'apierror-compare-nosuchfromsection', 
wfEscapeWikiText( $params['fromsection'] ) ],
+   'nosuchfromsection'
+   );
+   }
+   }
+   if ( isset( $params['tosection'] ) ) {
+   $toContent = $toContent->getSection( 
$params['tosection'] );
+   if ( !$toContent ) {
+   $this->dieWithError(
+   [ 'apierror-compare-nosuchtosection', 
wfEscapeWikiText( $params['tosection'] ) ],
+   'nosuchtosection'
+   );
+   }
+   }
+
// Get the diff
$context = new DerivativeContext( $this->getContext() );
if ( $relRev && $relRev->getTitle() ) {
@@ -444,6 +464,7 @@
'text' => [
ApiBase::PARAM_TYPE => 'text'
],
+   'section' => null,
'pst' => false,
'contentformat' => [
ApiBase::PARAM_TYPE => 
ContentHandler::getAllContentFormats(),
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index e1360c8..cceed01 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -64,6 +64,7 @@
"apihelp-compare-param-fromid": "First page ID to compare.",
"apihelp-compare-param-fromrev": "First revision to compare.",
"apihelp-compare-param-fromtext": "Use this text instead of the content 
of the revision specified by fromtitle, fromid or 
fromrev.",
+   "apihelp-compare-param-fromsection": "Only use the specified section of 
the specified 'from' content.",
"apihelp-compare-param-frompst": "Do a pre-save transform on 
fromtext.",
"apihelp-compare-param-fromcontentmodel": "Content model of 
fromtext. If not supplied, it will be guessed based on the other 
parameters.",
"apihelp-compare-param-fromcontentformat": "Content serialization 
format of fromtext.",
@@ -72,6 +73,7 @@
"apihelp-compare-param-torev": "Second revision to compare.",
"apihelp-compare-param-torelative": "Use a revision relative to the 
revision determined from fromtitle, fromid or 
fromrev. All of the other 'to' options will be ignored.",
"apihelp-compare-param-totext": "Use this text instead of the content 
of the revision specified by totitle, toid or 
torev.",
+   "apihelp-compare-param-tosection": "Only use the specified section of 
the specified 'to' content.",
"apihelp-compare-param-topst": "Do a pre-save transform on 
totext.",
"apihelp-compare-param-tocontentmodel": "Content model of 
totext. If not supplied, it will be guessed based on the other 
parameters.",
"apihelp-compare-param-tocontentformat": "Content serialization format 
of totext.",
@@ -1675,6 +1677,8 @@
"apierror-chunk-too-small": "Minimum chunk size is $1 
{{PLURAL:$1|byte|bytes}} for non-final chunks.",
"apierror-cidrtoobroad": "$1 CIDR ranges broader than /$2 are not 
accepted.",
"apierror-compare-no-title": "Cannot pre-save transform without a 
title. Try specifying fromtitle or totitle.",
+   "apierror-compare-nosuchfromsection": "There is no section $1 in the 
'from' content.",
+   "apierror-compare-nosuchtosection": "There is no section $1 in the 'to' 
content.",

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: convert dns recursors to single role

2018-01-03 Thread Giuseppe Lavagetto (Code Review)

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

Change subject: site.pp: convert dns recursors to single role
..


site.pp: convert dns recursors to single role

Change-Id: Id448dd97ad201f0a4bf978909c30aa20c80bfd97
---
R hieradata/role/codfw/recursor.yaml
R hieradata/role/common/recursor.yaml
R hieradata/role/eqiad/recursor.yaml
R hieradata/role/esams/recursor.yaml
M manifests/site.pp
A modules/role/manifests/recursor.pp
6 files changed, 14 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/role/codfw/dnsrecursor.yaml 
b/hieradata/role/codfw/recursor.yaml
similarity index 100%
rename from hieradata/role/codfw/dnsrecursor.yaml
rename to hieradata/role/codfw/recursor.yaml
diff --git a/hieradata/role/common/dnsrecursor.yaml 
b/hieradata/role/common/recursor.yaml
similarity index 100%
rename from hieradata/role/common/dnsrecursor.yaml
rename to hieradata/role/common/recursor.yaml
diff --git a/hieradata/role/eqiad/dnsrecursor.yaml 
b/hieradata/role/eqiad/recursor.yaml
similarity index 100%
rename from hieradata/role/eqiad/dnsrecursor.yaml
rename to hieradata/role/eqiad/recursor.yaml
diff --git a/hieradata/role/esams/dnsrecursor.yaml 
b/hieradata/role/esams/recursor.yaml
similarity index 100%
rename from hieradata/role/esams/dnsrecursor.yaml
rename to hieradata/role/esams/recursor.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index ab0787b..8949779 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -10,7 +10,7 @@
 # Node definitions (alphabetic order)
 
 node 'acamar.wikimedia.org' {
-role(dnsrecursor, ntp)
+role(recursor)
 
 # use achernar (directly) + eqiad LVS (avoid self-dep)
 $nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
@@ -19,7 +19,7 @@
 }
 
 node 'achernar.wikimedia.org' {
-role(dnsrecursor, ntp)
+role(recursor)
 
 # use acamar (directly) + eqiad LVS (avoid self-dep)
 $nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
@@ -149,7 +149,7 @@
 
 # DNS recursor
 node 'chromium.wikimedia.org' {
-role(dnsrecursor, ntp)
+role(recursor)
 
 # use hydrogen (directly) + codfw LVS (avoid self-dep)
 $nameservers_override = [ '208.80.154.50', '208.80.153.254' ]
@@ -890,7 +890,7 @@
 
 # DNS recursor
 node 'hydrogen.wikimedia.org' {
-role(dnsrecursor, ntp)
+role(recursor)
 
 # use chromium (directly) + codfw LVS (avoid self-dep)
 $nameservers_override = [ '208.80.154.157', '208.80.153.254' ]
@@ -1391,7 +1391,7 @@
 }
 
 node 'maerlant.wikimedia.org' {
-role(dnsrecursor, ntp)
+role(recursor)
 
 interface::add_ip6_mapped { 'main': }
 }
@@ -1747,7 +1747,7 @@
 }
 
 node 'nescio.wikimedia.org' {
-role(dnsrecursor, ntp)
+role(recursor)
 
 interface::add_ip6_mapped { 'main': }
 }
diff --git a/modules/role/manifests/recursor.pp 
b/modules/role/manifests/recursor.pp
new file mode 100644
index 000..9062f51
--- /dev/null
+++ b/modules/role/manifests/recursor.pp
@@ -0,0 +1,8 @@
+# == class role::recursor
+#
+# Class for configuring production dns recursors that use
+# both class role::dnsrecursor and role::ntp
+class role::recursor {
+require role::dnsrecursor
+require role::ntp
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id448dd97ad201f0a4bf978909c30aa20c80bfd97
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

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

2018-01-03 Thread jenkins-bot (Code Review)

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

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


db-eqiad.php: Depool db1079

Needs alter table

Bug: T174569
Change-Id: I0fb938cdcd0cf88bb252597e0506a758ece95629
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 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 cf47536..dcf3aaa 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
-   'db1086' => 500, # B3 3.6TB 512GB, api
+   # 'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) # T174569
+   'db1086' => 300, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -451,7 +451,7 @@
'db1069' => 1,
],
'api' => [
-   'db1079' => 100,
+   # 'db1079' => 100,
'db1086' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fb938cdcd0cf88bb252597e0506a758ece95629
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 db1079

2018-01-03 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1079

Needs alter table

Bug: T174569
Change-Id: I0fb938cdcd0cf88bb252597e0506a758ece95629
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..dcf3aaa 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
-   'db1086' => 500, # B3 3.6TB 512GB, api
+   # 'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) # T174569
+   'db1086' => 300, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -451,7 +451,7 @@
'db1069' => 1,
],
'api' => [
-   'db1079' => 100,
+   # 'db1079' => 100,
'db1086' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fb938cdcd0cf88bb252597e0506a758ece95629
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] operations/mediawiki-config[master]: db-eqiad.php: Depool db1079

2018-01-03 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1079

Needs alter table

Bug: T174569
Change-Id: I27ca4c0d7e4b5d75fbaa8f27e1b7ab458f3ce76b
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..ba1c825 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
-   'db1086' => 500, # B3 3.6TB 512GB, api
+   # 'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3) # T174569
+   'db1086' => 33300, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -451,7 +451,7 @@
'db1069' => 1,
],
'api' => [
-   'db1079' => 100,
+    # 'db1079' => 100,
'db1086' => 1,
],
'watchlist' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[master]: Update README to remove reference to LuaJIT

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Update README to remove reference to LuaJIT
..


Update README to remove reference to LuaJIT

Change-Id: Ic954826ead590583d39870eb0183206db9fcb60b
---
M README
1 file changed, 1 insertion(+), 11 deletions(-)

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



diff --git a/README b/README
index 97e315e..ad31810 100644
--- a/README
+++ b/README
@@ -1,14 +1,4 @@
 This is a PHP extension. To compile it:
 
- $ phpize
- $ ./configure
- $ make
+For installation instructions, see 
https://www.mediawiki.org/wiki/Extension:Scribunto#LuaSandbox
 
-It requires a few dependencies:
-
- luajit - LUA just in time compiler. http://www.luajit.org/
-
-== Mac OS X ==
-
-Using brew:
- brew install luajit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic954826ead590583d39870eb0183206db9fcb60b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Anomie 
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] mediawiki/vagrant[stretch-migration]: wikimediaproduction: Remove duplicate declaration conflicts

2018-01-03 Thread BryanDavis (Code Review)

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

Change subject: wikimediaproduction: Remove duplicate declaration conflicts
..

wikimediaproduction: Remove duplicate declaration conflicts

Remove duplicate declaration errors caused by included roles that
attempted to install the same extensions.

* Include role::globalusage in role::commons
* Move some configuration from role::commons to role::globalusage
* Include role::labeledsectiontransclusion in role::proofreadpage

Bug: T184153
Change-Id: I3d18c2c5a75f84810769ba377bca122e41c8493d
---
M puppet/modules/role/manifests/commons.pp
M puppet/modules/role/manifests/globalusage.pp
M puppet/modules/role/manifests/proofreadpage.pp
3 files changed, 16 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/98/401898/1

diff --git a/puppet/modules/role/manifests/commons.pp 
b/puppet/modules/role/manifests/commons.pp
index 8f67e6b..6ae76ff 100644
--- a/puppet/modules/role/manifests/commons.pp
+++ b/puppet/modules/role/manifests/commons.pp
@@ -8,6 +8,7 @@
 class role::commons(
 $upload_dir,
 ) {
+include ::role::globalusage
 require ::role::mediawiki
 include ::role::multimedia
 include ::role::thumb_on_404
@@ -29,17 +30,9 @@
 values => template('role/commons/foreign_repo.php.erb'),
 }
 
-mediawiki::extension { 'GlobalUsage':
-needs_update => true,
-settings => {
+mediawiki::settings { 'commons_GlobalUsage':
+values => {
 wgGlobalUsageDatabase => 'commonswiki',
-},
-require  => Mediawiki::Wiki['commons'],
-}
-
-mediawiki::maintenance { 'refresh globalusage table':
-command => '/usr/local/bin/foreachwikiwithextension GlobalUsage 
extensions/GlobalUsage/refreshGlobalimagelinks.php --pages 
existing,nonexisting',
-cwd => $::mediawiki::dir,
-require => Mediawiki::Extension['GlobalUsage'],
+}
 }
 }
diff --git a/puppet/modules/role/manifests/globalusage.pp 
b/puppet/modules/role/manifests/globalusage.pp
index 9040f41..835a16e 100644
--- a/puppet/modules/role/manifests/globalusage.pp
+++ b/puppet/modules/role/manifests/globalusage.pp
@@ -2,5 +2,15 @@
 # Configures a MediaWiki instance with
 # GlobalUsage[https://www.mediawiki.org/wiki/Extension:GlobalUsage]
 class role::globalusage {
-mediawiki::extension { 'GlobalUsage': }
+require ::role::mediawiki
+
+mediawiki::extension { 'GlobalUsage':
+needs_update => true,
+}
+
+mediawiki::maintenance { 'refresh globalusage table':
+command => '/usr/local/bin/foreachwikiwithextension GlobalUsage 
extensions/GlobalUsage/refreshGlobalimagelinks.php --pages 
existing,nonexisting',
+cwd => $::mediawiki::dir,
+require => Mediawiki::Extension['GlobalUsage'],
+}
 }
diff --git a/puppet/modules/role/manifests/proofreadpage.pp 
b/puppet/modules/role/manifests/proofreadpage.pp
index 037fb76..57ff45d 100644
--- a/puppet/modules/role/manifests/proofreadpage.pp
+++ b/puppet/modules/role/manifests/proofreadpage.pp
@@ -3,6 +3,7 @@
 # a text in comparison with scanned images.
 class role::proofreadpage {
 include ::role::parserfunctions
+include ::role::labeledsectiontransclusion
 include ::role::cite
 
 require_package('djvulibre-bin')
@@ -15,8 +16,6 @@
 post_max_size   => '50M',
 },
 }
-
-mediawiki::extension { 'LabeledSectionTransclusion': }
 
 mediawiki::extension { 'ProofreadPage':
 needs_update => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d18c2c5a75f84810769ba377bca122e41c8493d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add lazy loading of images in query results and display in rows

2018-01-03 Thread StudentSydney (Code Review)

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

Change subject: Add lazy loading of images in query results and display in rows
..

Add lazy loading of images in query results and display in rows

Load 8 images at a time in parallel, and continue loading well below the 
current window. Display
images in rows, each row full of items of a uniorm height within the row and 
all rows of uniform
width. The current display doesn't load lazily and doesn't shpw the images in 
the propper order.
I tried a masonry diaplay but it is too akward to have the final row totally 
staggard when
images are of unusual heights.

Bug: T166216
Change-Id: I0cf79007fd6cbb728c593b233c84222a32c95242
---
M embed.html
M index.html
M style.less
M wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js
M wikibase/tests/index.html
M wikibase/tests/queryService/ui/resultBrowser/ResultBrowser.test.js
6 files changed, 283 insertions(+), 129 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/97/401897/1

diff --git a/embed.html b/embed.html
index 72cbf8a..70ea199 100644
--- a/embed.html
+++ b/embed.html
@@ -6,6 +6,12 @@
 
 Wikidata Query Service
 
+
+
+
+less.watch()
+
+   
 
 
 
@@ -21,11 +27,6 @@
 
 
 
-
-
-
-
-less.watch()
 
 
 
@@ -131,7 +132,6 @@



-   
https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/Result_Views;>


@@ -148,8 +148,12 @@


Test result
-   Test error
 
+   Test error
+   
+   
+   Loading...
+   


  Explorer
diff --git a/index.html b/index.html
index ad0a129..9c252bb 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,13 @@

Wikidata Query Service
 
+   
+   
+   
+   
+   less.watch()
+   
+   
 


@@ -33,11 +40,6 @@


 
-   
-   
-   
-   less.watch()
-   
 


@@ -312,7 +314,6 @@



-



@@ -368,7 +369,6 @@



-   

 

diff --git a/style.less b/style.less
index da2b69a..42bd246 100644
--- a/style.less
+++ b/style.less
@@ -405,14 +405,51 @@
color: rgba( 51, 122, 183, 0.45 );
 }
 
-/* masonry */
-.masonry {
+/* image grid */
+.img-grid {
width: 95%;
margin: 3em auto;
margin: 1.5em auto;
padding: 0;
font-size: 0.85em;
 }
+.item.hidden {
+   visibility: hidden;
+}
+.item-row {
+   width: 100%;
+}
+.hidden-row {
+   height: 50px;
+   visibility: hidden;
+}
+.item {
+   background: #fff;
+   padding: 1em;
+   margin: 0 0.75em 1.5em;
+   box-sizing: border-box;
+   -moz-box-sizing: border-box;
+   -webkit-box-sizing: border-box;
+   box-shadow: 2px 2px 4px 0 #ccc;
+   display: inline-block;
+}
+.item-img {
+   width: 100%;
+}
+.summary>div {
+   height: 1.5em;
+}
+.summary>div>span {
+   white-space: nowrap;
+text-overflow: ellipsis;
+display: block;
+overflow: hidden;
+}
+.summary .glyphicon {
+   display: inline;
+}
+
+/* loading spinner */
 #loading-spinner {
display: none;
color: #777;
@@ -421,54 +458,8 @@
margin: 0 auto 20px;
display: block;
 }
-.item {
-   display: inline-block;
-   background: #fff;
-   padding: 1em;
-   margin: 0 0 1.5em;
-   width: 20%;
-   box-sizing: border-box;
-   -moz-box-sizing: border-box;
-   -webkit-box-sizing: border-box;
-   box-shadow: 2px 2px 4px 0 #ccc;
-   visibility: hidden;
-}
-.item>a>img {
-   width: 100%;
-}
 
-@media only screen and ( min-width: 400px ) {
-   .item {
-   width: ~"calc( 50% - 10px )";
-   }
-}
-
-@media only screen and ( min-width: 700px ) {
-   .item {
-   width: ~"calc( 33.33% - 10px )";
-   }
-}
-
-@media only screen and ( min-width: 900px ) {
-   .item {
-   width: ~"calc( 25% - 10px )";
-   }
-}
-
-@media only screen and ( min-width: 1100px ) {
-   .item {
-   width: ~"calc( 20% - 10px )";
-   }
-}
-@media only screen and ( min-width: 1280px ) {
-   .wrapper {
-   width: 1260px;
-   }
-}
-/*
-   ActionBar
-*/
-
+/* ActionBar */
 .action-bar .progress {
height: 30px;
font-size: 30px;
diff --git

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: thumbor: pass vars to systemd service template

2018-01-03 Thread BryanDavis (Code Review)

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

Change subject: thumbor: pass vars to systemd service template
..

thumbor: pass vars to systemd service template

Bug: T184152
Change-Id: Iab373e7c7f505af865144b7681cab26519567eee
---
M puppet/modules/thumbor/manifests/service.pp
R puppet/modules/thumbor/templates/systemd/thumbor.epp
2 files changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/96/401896/1

diff --git a/puppet/modules/thumbor/manifests/service.pp 
b/puppet/modules/thumbor/manifests/service.pp
index 56c54b0..b8187c0 100644
--- a/puppet/modules/thumbor/manifests/service.pp
+++ b/puppet/modules/thumbor/manifests/service.pp
@@ -27,12 +27,12 @@
 $port = $name
 
 systemd::service { "thumbor-${port}":
-ensure => 'present',
-require=> [
+ensure => 'present',
+require=> [
 Package['python-thumbor-wikimedia'],
 File['/etc/firejail/thumbor.profile'],
 ],
-service_params => {
+service_params => {
 subscribe => [
 File[
 '/etc/tinyrgb.icc',
@@ -41,7 +41,13 @@
 $cfg_files,
 ],
 },
-template_name  => 'thumbor',
+template_name  => 'thumbor',
+epp_template   => true,
+template_variables => {
+'port'=> $port,
+'tmp_dir' => $tmp_dir,
+'cfg_dir' => $cfg_dir,
+},
 }
 
 file { "/usr/lib/tmpfiles.d/thumbor@${port}.conf":
diff --git a/puppet/modules/thumbor/templates/systemd/thumbor.erb 
b/puppet/modules/thumbor/templates/systemd/thumbor.epp
similarity index 66%
rename from puppet/modules/thumbor/templates/systemd/thumbor.erb
rename to puppet/modules/thumbor/templates/systemd/thumbor.epp
index 8de1750..0279833 100644
--- a/puppet/modules/thumbor/templates/systemd/thumbor.erb
+++ b/puppet/modules/thumbor/templates/systemd/thumbor.epp
@@ -9,7 +9,7 @@
 SyslogIdentifier=thumbor
 MemoryMax=1G
 # To assign CPU affinity we consider that the base port is 8889 (Thumbor's 
default + 1)
-ExecStart=/usr/bin/taskset -c <%= Integer(@port) - 8889 %> /usr/bin/firejail 
--profile=/etc/firejail/thumbor.profile --env=TMPDIR=<%= @tmp_dir 
%>/thumbor@<%= @port %> --env=MAGICK_TEMPORARY_PATH=<%= @tmp_dir %>/thumbor@<%= 
@port %> --env=MAGICK_DISK_LIMIT=900MB --env=MAGICK_MEMORY_LIMIT=900MB -- 
/usr/bin/thumbor -p <%= @port %> -c <%= @cfg_dir %>
+ExecStart=/usr/bin/taskset -c <%= Integer($port) - 8889 %> /usr/bin/firejail 
--profile=/etc/firejail/thumbor.profile --env=TMPDIR=<%= $tmp_dir 
%>/thumbor@<%= $port %> --env=MAGICK_TEMPORARY_PATH=<%= $tmp_dir %>/thumbor@<%= 
$port %> --env=MAGICK_DISK_LIMIT=900MB --env=MAGICK_MEMORY_LIMIT=900MB -- 
/usr/bin/thumbor -p <%= $port %> -c <%= $cfg_dir %>
 Restart=always
 
 [Install]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab373e7c7f505af865144b7681cab26519567eee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikitech: use existing roles

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: wikitech: use existing roles
..


wikitech: use existing roles

Bug: T184155
Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
---
M puppet/modules/role/manifests/wikitech.pp
1 file changed, 6 insertions(+), 17 deletions(-)

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



diff --git a/puppet/modules/role/manifests/wikitech.pp 
b/puppet/modules/role/manifests/wikitech.pp
index c86a59b..4dea813 100644
--- a/puppet/modules/role/manifests/wikitech.pp
+++ b/puppet/modules/role/manifests/wikitech.pp
@@ -3,25 +3,20 @@
 # Provisions a MediaWiki instance similar to https://wikitech.wikimedia.org/.
 #
 class role::wikitech {
+include ::role::categorytree
+include ::role::checkuser
 include ::role::cite
 include ::role::codeeditor
 include ::role::echo
 include ::role::gadgets
+include ::role::nuke
+include ::role::oathauth
 include ::role::parserfunctions
+include ::role::renameuser
 include ::role::scribunto
+include ::role::titleblacklist
 include ::role::wikieditor
 include ::role::wikilove
-
-# Alas, if only SMW didn't require composer
-# mediawiki::extension { [ 'SemanticForms', 'SemanticResultFormats' ]:
-# needs_update  => true,
-# require   => Mediawiki::Extension[ 'SemanticMediaWiki' ],
-# }
-#
-# mediawiki::extension { 'SemanticMediaWiki':
-# needs_update  => true,
-# require   => Mediawiki::Extension['Validator'],
-# }
 
 mediawiki::extension { 'LdapAuthentication':
 needs_update => true,
@@ -44,15 +39,9 @@
 }
 
 mediawiki::extension { [
-'CategoryTree',
-'CheckUser',
 'Collection',
 'DynamicSidebar',
-'Nuke',
-'OATHAuth',
 'OpenStackManager',
-'Renameuser',
-'TitleBlacklist',
 ]:
 needs_update  => true,
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikitech: use existing roles

2018-01-03 Thread BryanDavis (Code Review)

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

Change subject: wikitech: use existing roles
..

wikitech: use existing roles

Bug: T184155
Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
---
M puppet/modules/role/manifests/wikitech.pp
1 file changed, 6 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/95/401895/1

diff --git a/puppet/modules/role/manifests/wikitech.pp 
b/puppet/modules/role/manifests/wikitech.pp
index c86a59b..4dea813 100644
--- a/puppet/modules/role/manifests/wikitech.pp
+++ b/puppet/modules/role/manifests/wikitech.pp
@@ -3,25 +3,20 @@
 # Provisions a MediaWiki instance similar to https://wikitech.wikimedia.org/.
 #
 class role::wikitech {
+include ::role::categorytree
+include ::role::checkuser
 include ::role::cite
 include ::role::codeeditor
 include ::role::echo
 include ::role::gadgets
+include ::role::nuke
+include ::role::oathauth
 include ::role::parserfunctions
+include ::role::renameuser
 include ::role::scribunto
+include ::role::titleblacklist
 include ::role::wikieditor
 include ::role::wikilove
-
-# Alas, if only SMW didn't require composer
-# mediawiki::extension { [ 'SemanticForms', 'SemanticResultFormats' ]:
-# needs_update  => true,
-# require   => Mediawiki::Extension[ 'SemanticMediaWiki' ],
-# }
-#
-# mediawiki::extension { 'SemanticMediaWiki':
-# needs_update  => true,
-# require   => Mediawiki::Extension['Validator'],
-# }
 
 mediawiki::extension { 'LdapAuthentication':
 needs_update => true,
@@ -44,15 +39,9 @@
 }
 
 mediawiki::extension { [
-'CategoryTree',
-'CheckUser',
 'Collection',
 'DynamicSidebar',
-'Nuke',
-'OATHAuth',
 'OpenStackManager',
-'Renameuser',
-'TitleBlacklist',
 ]:
 needs_update  => true,
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[master]: Update README to remove reference to LuaJIT

2018-01-03 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401894 )

Change subject: Update README to remove reference to LuaJIT
..

Update README to remove reference to LuaJIT

Change-Id: Ic954826ead590583d39870eb0183206db9fcb60b
---
M README
1 file changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/94/401894/1

diff --git a/README b/README
index 97e315e..ad31810 100644
--- a/README
+++ b/README
@@ -1,14 +1,4 @@
 This is a PHP extension. To compile it:
 
- $ phpize
- $ ./configure
- $ make
+For installation instructions, see 
https://www.mediawiki.org/wiki/Extension:Scribunto#LuaSandbox
 
-It requires a few dependencies:
-
- luajit - LUA just in time compiler. http://www.luajit.org/
-
-== Mac OS X ==
-
-Using brew:
- brew install luajit

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic954826ead590583d39870eb0183206db9fcb60b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Handle CheckMatrix fields

2018-01-03 Thread Samwilson (Code Review)

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

Change subject: Handle CheckMatrix fields
..

Handle CheckMatrix fields

Bug: T172585
Change-Id: Ic862cc69f8d6a3703fecd86510c79766c4d1c4d5
---
M includes/GlobalPreferencesFactory.php
M includes/Hooks.php
M resources/ext.GlobalPreferences.special.js
3 files changed, 22 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalPreferences 
refs/changes/93/401893/1

diff --git a/includes/GlobalPreferencesFactory.php 
b/includes/GlobalPreferencesFactory.php
index edc1b90..06db523 100644
--- a/includes/GlobalPreferencesFactory.php
+++ b/includes/GlobalPreferencesFactory.php
@@ -69,6 +69,7 @@
'CirrusSearch\HTMLCompletionProfileSettings',
'NewHTMLCheckField',
'HTMLFeatureField',
+   'HTMLCheckMatrix',
];
 
/**
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7f04f90..bd2dd72 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -82,16 +82,26 @@
 
$prefs = [];
foreach ( $formData as $name => $value ) {
+   // If this is the '-global' counterpart of a preference.
if ( substr( $name, -strlen( 'global' ) ) === 'global' 
&& $value === true ) {
+   // Determine the real name of the preference.
$realName = substr( $name, 0, -strlen( 
'-global' ) );
if ( isset( $formData[$realName] ) ) {
+   // Store normal preference values.
$prefs[$realName] = 
$formData[$realName];
+
} else {
-   // FIXME: Handle checkbox matrixes 
properly
-   /*
-   var_dump($realName);
-   var_dump($name);
-   */
+   // If the real-named preference isn't 
set, this must be a CheckMatrix value
+   // where the preference names are of 
the form "$realName-$column-$row"
+   // (we also have to remove the 
"$realName-global" entry).
+   $checkMatrix = preg_grep( 
"/^$realName/", array_keys( $formData ) );
+   unset( $checkMatrix[ array_search( 
$name, $checkMatrix ) ] );
+   $checkMatrixVals = array_intersect_key( 
$formData, array_flip( $checkMatrix ) );
+   $prefs = array_merge( $prefs, 
$checkMatrixVals );
+   // Also store a global $realName 
preference for benefit of the the
+   // 'globalize-this' checkbox.
+   $prefs[ $realName ] = true;
+
}
}
}
diff --git a/resources/ext.GlobalPreferences.special.js 
b/resources/ext.GlobalPreferences.special.js
index ed1d045..d736fa5 100644
--- a/resources/ext.GlobalPreferences.special.js
+++ b/resources/ext.GlobalPreferences.special.js
@@ -25,12 +25,15 @@
$rows,
 
// The current preference's inputs (can be multiple, 
and not all will have the same name).
-   $inputs = $( ':input[name="' + name + '"]' ).parents( 
'.mw-input' ).find( ':input' );
+   $inputs = $( ':input[name="' + name + '"], 
:input[name="' + name + '[]"]' )
+   .parents( '.mw-input' )
+   .find( ':input' )
+   .not( '.checkmatrix-forced' );
 
-   // All the labels for this preference (not all have for='').
+   // All the labels for this preference (not all have for='' nor 
are even labels).
$labels = $inputs
.closest( fieldSelector )
-   .find( 'label' )
+   .find( 'label, td' )
.not( '[for$="-global"]' );
 
// Collect the related rows. The main field row is sometimes 
followed by a help-tip row.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic862cc69f8d6a3703fecd86510c79766c4d1c4d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: wikilabels: add missing config dependency

2018-01-03 Thread Code Review

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

Change subject: wikilabels: add missing config dependency
..

wikilabels: add missing config dependency

Bug: T183605
Change-Id: I55b25663463e147afc95055cb0096fa0beaab885
---
M puppet/modules/wikilabels/manifests/init.pp
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/92/401892/1

diff --git a/puppet/modules/wikilabels/manifests/init.pp 
b/puppet/modules/wikilabels/manifests/init.pp
index e00556d..de67b6a 100644
--- a/puppet/modules/wikilabels/manifests/init.pp
+++ b/puppet/modules/wikilabels/manifests/init.pp
@@ -52,6 +52,13 @@
 }
 $repo_dir = "${deploy_dir}/src/wikilabels"
 
+$cfg_file = "${repo_dir}/config/999-vagrant.yaml"
+file { $cfg_file:
+ensure  => present,
+content => template('wikilabels/wikilabels.yaml.erb'),
+require => Virtualenv::Package['wikilabels'],
+}
+
 $db_script = "${deploy_dir}/bin/create_wikilabels_db.sh"
 file { $db_script:
 ensure  => present,
@@ -79,18 +86,12 @@
 require =>[
   Exec['create wikilabels database'],
   Virtualenv::Package['wikilabels'],
+  File[$cfg_file],
 ],
 }
 
 apache::reverse_proxy { 'wikilabels':
 port => $port,
-}
-
-$cfg_file = "${repo_dir}/config/999-vagrant.yaml"
-file { $cfg_file:
-ensure  => present,
-content => template('wikilabels/wikilabels.yaml.erb'),
-require => Virtualenv::Package['wikilabels'],
 }
 
 systemd::service { 'wikilabels':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55b25663463e147afc95055cb0096fa0beaab885
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Prevent page scroll to top while clicking on language settin...

2018-01-03 Thread Santhosh (Code Review)

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

Change subject: Prevent page scroll to top while clicking on language settings 
icon
..

Prevent page scroll to top while clicking on language settings icon

If the language settings window is not visible, all calculations
will go wrong and page will scroll to 0 position.

So call scrollIntoView only when the element is visible.

The $.fn.scrollIntoView defined in jquery.uls core may be unnecessary
now since it is available natively on DOM elements.

Bug: T178188
Change-Id: I461fa9eb7c51cd277bebd3a04cfcc0eed9793c4e
---
M resources/js/ext.uls.languagesettings.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/91/401891/1

diff --git a/resources/js/ext.uls.languagesettings.js 
b/resources/js/ext.uls.languagesettings.js
index e39f3a6..b806d19 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -149,7 +149,9 @@
var $this = $( this );
 
$this.data( 'module' ).render();
-   languageSettings.$window.scrollIntoView();
+   if ( languageSettings.$window.is( ':visible' ) 
) {
+   
languageSettings.$window.scrollIntoView();
+   }
$settingsMenuItems.find( '.menu-section' 
).removeClass( 'active' );
$this.addClass( 'active' );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I461fa9eb7c51cd277bebd3a04cfcc0eed9793c4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Compile the base puppet catalog on CI

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Compile the base puppet catalog on CI
..


Compile the base puppet catalog on CI

Add rspec-puppet tasks at the root of the repository so one can easily
compile the catalogues.
First for a dummy host that has no role applied, and if successful for
each roles. That is done serially which is quite slow.

Add the fast :compile_host task to the default commands being run by CI.
It is fast enough.

Bug: T183570
X-Notable-Event: Happy-New-Gregorian-Year
Depends-On: Iedfd61c022f39d32f6d803a39579bb5d121537ed
Change-Id: I4ca7a2b80d7b0ffb8b3fcef40c498b8c5dfc1ba0
---
M Rakefile
M puppet/spec/spec_helper.rb
2 files changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/Rakefile b/Rakefile
index fcb34f7..6bb1eff 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,12 +39,25 @@
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '-I tests/spec --default-path tests'
 end
+
+desc 'Compile default host Puppet catalog'
+RSpec::Core::RakeTask.new(:compile_host) do |t|
+  t.rspec_opts = '--format doc -I puppet/spec --default-path puppet --pattern 
spec/hosts/\*_spec.rb'
+end
+desc 'Compile Puppet roles'
+RSpec::Core::RakeTask.new(:compile_roles) do |t|
+  t.rspec_opts = '-I puppet/spec --default-path puppet --exclude-pattern 
spec/hosts/\*_spec.rb'
+end
+# Compile host first since it is fairly fast
+desc 'Compile puppet catalogs'
+task compile: [:compile_host, :compile_roles]
+
 RuboCop::RakeTask.new(:rubocop)
 
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
-task test: [:clean, :syntax, :spec, :rubocop, :cucumber, :lint, :doc]
+task test: [:clean, :syntax, :spec, :rubocop, :cucumber, :lint, :doc, 
:compile_host]
 
 desc 'Generate all documentations'
 task :doc do
diff --git a/puppet/spec/spec_helper.rb b/puppet/spec/spec_helper.rb
index ee86e07..a6e487d 100644
--- a/puppet/spec/spec_helper.rb
+++ b/puppet/spec/spec_helper.rb
@@ -1,4 +1,5 @@
 require 'rspec-puppet'
+require 'fileutils'
 
 def puppet_path
   File.expand_path(File.join(__FILE__, '../..'))
@@ -14,6 +15,7 @@
   conf = File.read(File.join(puppet_path, 'hiera.yaml'))
   conf.gsub!(%r{/vagrant/puppet}, puppet_path)
 
+  FileUtils.mkdir_p(fixture_path)
   fixture = File.join(fixture_path, 'hiera.yaml')
   File.write(fixture, conf)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ca7a2b80d7b0ffb8b3fcef40c498b8c5dfc1ba0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertTemplate[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertTemplate 
refs/changes/85/401885/1

diff --git a/extension.json b/extension.json
index 75290cc..7fc4903 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "BlueSpiceInsertTemplate",
"version": "3.0.0-alpha",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"url": 
"https://www.mediawiki.org/wiki/Extension:BlueSpiceInsertTemplate;,
"author": [
"Josef Konrad",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67967bc2b46001ddbd352272110da37cd65a3619
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertTemplate
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...BlueSpiceNamespaceManager[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceNamespaceManager 
refs/changes/88/401888/1

diff --git a/extension.json b/extension.json
index c399168..7d4c0f2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceNamespaceManager",
-   "license-name":"GPL-3.0",
+   "license-name":"GPL-3.0-only",
"version": "3.0.0",
"url": "https://help.bluespice.com/index.php/Namespacemanager;,
"author":   [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a4a1af4cc58c8369d8fe24ec385f9d6833ed012
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
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...BlueSpicePageAccess[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageAccess 
refs/changes/89/401889/1

diff --git a/extension.json b/extension.json
index b459997..58327fd 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpicePageAccess",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/PageAccess;,
"author": "Marc Reymann",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If590a6e33210d7f33fb66addcbd2228b764f8955
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageAccess
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...BlueSpicePageTemplates[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageTemplates 
refs/changes/90/401890/1

diff --git a/extension.json b/extension.json
index 4e5b23c..f6559d6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpicePageTemplates",
-   "license-name" : "GPL-3.0",
+   "license-name" : "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/PageTemplates;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d412fc9130a8242756db4f4182da08ac9057f88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
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...BlueSpiceInsertLink[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertLink 
refs/changes/83/401883/1

diff --git a/extension.json b/extension.json
index 6c2a325..f67fce2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInsertLink",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/InsertLink;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71dbfa7a763352faa00a50dd1635558c0c88daf4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertLink
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...BlueSpiceInsertMagic[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertMagic 
refs/changes/84/401884/1

diff --git a/extension.json b/extension.json
index 04db7b7..e3016c8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInsertMagic",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/InsertMagic;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida170cf2f03196c254db2bccf73160437f31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertMagic
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...BlueSpiceNamespaceCSS[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceNamespaceCSS 
refs/changes/87/401887/1

diff --git a/extension.json b/extension.json
index d2100c0..b02d72c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceNamespaceCSS",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/NamespaceCss;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7837421f3c5105ebb6880dfa3d23e60e41e5df3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceCSS
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...BlueSpiceInterWikiLinks[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInterWikiLinks 
refs/changes/86/401886/1

diff --git a/extension.json b/extension.json
index 89e085b..18cc51f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInterWikiLinks",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Interwikilinks;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad35824d6695300aeb4c0da26b9684966603381d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
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...BlueSpiceHideTitle[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceHideTitle 
refs/changes/80/401880/1

diff --git a/extension.json b/extension.json
index 50f6527..d610fa5 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceHideTitle",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/HideTitle;,
"author": "Markus Glaser",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bc0aa659ffb8062071cc1d7a0e6bbe6f828c190
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceHideTitle
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...BlueSpiceInsertFile[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertFile 
refs/changes/82/401882/1

diff --git a/extension.json b/extension.json
index 8cb2738..9c7e4ec 100644
--- a/extension.json
+++ b/extension.json
@@ -9,7 +9,7 @@
],
"descriptionmsg": "bs-insertfile-desc",
"type": "bluespice",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"bsgExtensions": {
"BlueSpiceInsertFile": {
"className": "InsertFile",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib27d02a23a567218363ad3bef31aae0f3aa033d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertFile
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...BlueSpiceInsertCategory[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertCategory 
refs/changes/81/401881/1

diff --git a/extension.json b/extension.json
index 75399cd..b0008a3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInsertCategory",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/InsertCategory;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I300331c597116e1d8753c6090e0420a42c880896
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertCategory
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...BlueSpiceGroupManager[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceGroupManager 
refs/changes/79/401879/1

diff --git a/extension.json b/extension.json
index 65f7790..4220b7c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceGroupManager",
-   "license-name":"GPL-3.0",
+   "license-name":"GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/GroupManager;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56262824a9a3d08e5d1ab3d0fd2240b74113026d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceGroupManager
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...BlueSpiceFoundation[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib0cb154dc94b86cea0295ab8077191f38b263692
---
M THIRD_PARTY_LICENSES.md
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
index 5370240..30f58d7 100644
--- a/THIRD_PARTY_LICENSES.md
+++ b/THIRD_PARTY_LICENSES.md
@@ -30,7 +30,7 @@
 | Font | Author | Version | License |
 |:|:---|:|:---|
 | [FontAwesome](http://fontawesome.io) | Dave Gandy | 3.0 | [SIL 
1.1](http://fontawesome.io/license) |
-| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) |
+| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0-only](https://www.gnu.org/licenses/gpl-3.0.txt) |
 
 License texts
 =
diff --git a/extension.json b/extension.json
index d1d1ed8..46871b6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceFoundation",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"author": [
"[http://www.hallowelt.com Hallo Welt! GmbH]"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0cb154dc94b86cea0295ab8077191f38b263692
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
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...BlueSpiceExtensions[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I816955698af35a721b67859b2ddbb9ad4384ae83
---
M Flexiskin/extension.json
M THIRD_PARTY_LICENSES.md
M extension.json
3 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/Flexiskin/extension.json b/Flexiskin/extension.json
index 8a90095..bc4e67b 100644
--- a/Flexiskin/extension.json
+++ b/Flexiskin/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Flexiskin",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/FlexiSkin;,
"author": [
diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
index 175436b..adac4a6 100644
--- a/THIRD_PARTY_LICENSES.md
+++ b/THIRD_PARTY_LICENSES.md
@@ -10,11 +10,11 @@
 | [ExtJS-Patches](https://github.com/dnorman/ExtJS-Patches) | Daniel Norman | 
- | [MIT](https://opensource.org/licenses/MIT) |
 | [Instant Avatars](http://phoboslab.org/log/2008/12/instant-avatars) | 
Dominic Szablewski | - | unlicensed |
 | [jquery-textcomplete](https://github.com/yuku-t/jquery-textcomplete) | Yuku 
Takahashi | 0.3.3 | [MIT](https://opensource.org/licenses/MIT) |
-| [PHP Identicons](https://sourceforge.net/projects/identicons/) | Bong Cosca 
| 1.0.1 | [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) |
+| [PHP Identicons](https://sourceforge.net/projects/identicons/) | Bong Cosca 
| 1.0.1 | [GPL-3.0-only](https://www.gnu.org/licenses/gpl-3.0.txt) |
 | [Solr-php-client](https://github.com/PTCInc/solr-php-client) | Donovan 
Jimenez, PTC Inc. | - | 
[BSD-modified](https://opensource.org/licenses/BSD-3-Clause) |
 | [SyntaxHighlighter](http://alexgorbatchev.com/SyntaxHighlighter/download/) | 
Alex Gorbatchev | 3.0.83 | [MIT](https://opensource.org/licenses/MIT) |
-| [TinyMCE](https://www.tinymce.com) | Moxiecode Systems AB | 4.6.4 | 
[LGPL-2.1](http://www.tinymce.com/license) |
-| [xhtmlrenderer](https://github.com/flyingsaucerproject/flyingsaucer) | 
Patrick Wright | 9.0.9 | 
[LGPL-2.1](https://github.com/flyingsaucerproject/flyingsaucer/blob/master/LICENSE-LGPL-2.1.txt)
 |
+| [TinyMCE](https://www.tinymce.com) | Moxiecode Systems AB | 4.6.4 | 
[LGPL-2.1-only](http://www.tinymce.com/license) |
+| [xhtmlrenderer](https://github.com/flyingsaucerproject/flyingsaucer) | 
Patrick Wright | 9.0.9 | 
[LGPL-2.1-only](https://github.com/flyingsaucerproject/flyingsaucer/blob/master/LICENSE-LGPL-2.1-only.txt)
 |
 | [Solr](http://lucene.apache.org/solr/) | Apache Software Foundation | 4.5.0 
| [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) |
 
 Images
@@ -40,7 +40,7 @@
 |:|:---|:|:---|
 | [DejaVu](https://dejavu-fonts.github.io/) | Bitstream | 2.33 | 
[DejaVu](https://dejavu-fonts.github.io/License.html) |
 | [FontAwesome](http://fontawesome.io) | Dave Gandy | 3.0 | [SIL 
1.1](http://fontawesome.io/license) |
-| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) |
+| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0-only](https://www.gnu.org/licenses/gpl-3.0.txt) |
 
 License texts
 =
diff --git a/extension.json b/extension.json
index dd904eb..fc6509d 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceExtensions",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://www.mediawiki.org/wiki/BlueSpice;,
"author": [ "Hallo Welt! GmbH" ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I816955698af35a721b67859b2ddbb9ad4384ae83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
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...BlueSpiceCountThings[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceCountThings 
refs/changes/70/401870/1

diff --git a/extension.json b/extension.json
index 0ee14d6..a37fe75 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceCountThings",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/CountThings;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ab7ce489c3640d2c120257dcc95f5fcf3aa72c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceCountThings
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...BlueSpiceExtendedStatistics[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtendedStatistics
 refs/changes/76/401876/1

diff --git a/extension.json b/extension.json
index 5ac219d..f8eb8bd 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceExtendedStatistics",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/ExtendedStatistics;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46646a764592c07eb3b9e2cc7696145fd7b51d8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedStatistics
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...BlueSpiceEmoticons[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceEmoticons 
refs/changes/73/401873/1

diff --git a/extension.json b/extension.json
index dc446d4..133b4f7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceEmoticons",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Emoticons;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I701c660fcde8553736c7e424a84410fdad0049d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceEmoticons
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...BlueSpiceDashboards[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceDashboards 
refs/changes/71/401871/1

diff --git a/extension.json b/extension.json
index d36d21d..cc650b0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceDashboards",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/DashBoards;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9ae3670aec5cbbe00d5974136f14befd55e8ebd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceDashboards
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...BlueSpiceContextMenu[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Id50a2de3eb1935b3aeb0c9923f03bbe44044f6f8
---
M THIRD_PARTY_LICENSES.md
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
index 0165ca1..c32b205 100644
--- a/THIRD_PARTY_LICENSES.md
+++ b/THIRD_PARTY_LICENSES.md
@@ -21,7 +21,7 @@
 |:|:---|:|:---|
 | [DejaVu](https://dejavu-fonts.github.io/) | Bitstream | 2.33 | 
[DejaVu](https://dejavu-fonts.github.io/License.html) |
 | [FontAwesome](http://fontawesome.io) | Dave Gandy | 3.0 | [SIL 
1.1](http://fontawesome.io/license) |
-| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.txt) |
+| [IcoMoon](https://icomoon.io/#icons-icomoon) | Keyamoon | - | 
[GPL-3.0-only](https://www.gnu.org/licenses/gpl-3.0.txt) |
 
 License texts
 =
diff --git a/extension.json b/extension.json
index 1e3f272..068e423 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceContextMenu",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/ContextMenu;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id50a2de3eb1935b3aeb0c9923f03bbe44044f6f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceContextMenu
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...BlueSpiceExtendedFilelist[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index e546393..d6f5a53 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "BlueSpiceExtendedFilelist",
"version": "3.0.0-alpha",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"url": "https://help.bluespice.com;,
"author": [
"Dejan Savuljesku"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e7aa494034bbad12f5872f3eab433f25887bcc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedFilelist
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...BlueSpiceEditNotifyConnector[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceEditNotifyConnector
 refs/changes/72/401872/1

diff --git a/extension.json b/extension.json
index 351bc15..2301623 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceEditNotifyConnector",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": 
"https://www.mediawiki.org/wiki/Extension:BlueSpiceEditNotifyConnector;,
"descriptionmsg": "bluespiceeditnotifyconnector-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6571354cfd42ac63324621984ab5c5aa6334273
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceEditNotifyConnector
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...BlueSpiceExtendedSearch[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 58239ff..63ec8e8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceExtendedSearch",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"author": [
"Robert Vogel"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97547c37f31cb15dc62af45e28714a881f980113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
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...BlueSpiceCategoryManager[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 1d92590..2fcce48 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
"url": "https://help.bluespice.com/wiki/CategoryManager;,
"descriptionmsg": "bluespicecategorymanager-desc",
"version": "2.27.2",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "bluespice",
"SpecialPages": {
"BlueSpiceCategoryManager": "SpecialBlueSpiceCategoryManager"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71770fb0e7ea8202536da997e5829a950b0bdf69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceCategoryManager
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...BlueSpiceChecklist[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceChecklist 
refs/changes/67/401867/1

diff --git a/extension.json b/extension.json
index 78ddda1..9c8fdc0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceChecklist",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/CheckList;,
"author": "Markus Glaser",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4ac02ffd302849d9a6b34306a28d9adbcd0a2a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceChecklist
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...BlueSpiceBlog[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceBlog 
refs/changes/65/401865/1

diff --git a/extension.json b/extension.json
index 3cd56fe..6d53f14 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceBlog",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Blog;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id294d0506b2f7b4971415dbc9ccb8d97d59f4747
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceBlog
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...BlueSpiceConfigManager[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 8cb43c5..da38667 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
"Stephan Muggli"
],
"descriptionmsg": "bs-preferences-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "bluespice",
"bsgExtensions": {
"BlueSpiceConfigManager": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd758c3923b65fbecb66e81bf3ec9f2938a4e675
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceConfigManager
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...BlueSpiceAvatars[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 1136107..f21ad71 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceAvatars",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Avatars;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f483773abe761c400b758c0b9f0e8c7e04abc83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAvatars
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...BlueSpiceAbout[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 1199cad..fa7d31d 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceAbout",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/AboutBlueSpice;,
"author": "Markus Glaser",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87dd6bc27bf3f12b9e24b5c448d4ce6ed177004a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAbout
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...BlueSpiceAuthors[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceAuthors 
refs/changes/63/401863/1

diff --git a/extension.json b/extension.json
index f0a2cdd..e1c2ed6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceAuthors",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Authors;,
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeea07db6c37684545c6ef0a80b5056da5d14407
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAuthors
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...BlogPage[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage 
refs/changes/61/401861/1

diff --git a/extension.json b/extension.json
index 75e33b8..93cf7e8 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,7 @@
"David Pean",
"Jack Phoenix"
],
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"url": "https://www.mediawiki.org/wiki/Extension:BlogPage;,
"descriptionmsg": "blogpage-desc",
"type": "other",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id27d09a3dbbb9c567d737c8856476b413dbe04c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
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...Blackout[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 6cfc5e8..782d14f 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Blackout;,
"descriptionmsg": "blackout-desc",
-   "license-name": "GPL-1.0+",
+   "license-name": "GPL-1.0-or-later",
"type": "other",
"MessagesDirs": {
"Blackout": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1800bc1204264f1d0e88486d68758cf73a6ffed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Blackout
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...BlockAndNuke[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib701457f964bf2ae76dc6a5478c1823ce9d57d9e
---
M extension.json
M maintenance/blockAndNukeSpammers.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index b706ce0..5561d70 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BlockAndNuke;,
"descriptionmsg": "blockandnuke-desc",
-   "license-name": "GPL-3.0+",
+   "license-name": "GPL-3.0-or-later",
"type": "specialpage",
"GroupPermissions": {
"sysop": {
diff --git a/maintenance/blockAndNukeSpammers.php 
b/maintenance/blockAndNukeSpammers.php
index dbcd5d2..2b79f1f 100644
--- a/maintenance/blockAndNukeSpammers.php
+++ b/maintenance/blockAndNukeSpammers.php
@@ -7,7 +7,7 @@
  * PLEASE USE WITH CAUTION. ALL USERS *NOT* IN THE WHITELIST WILL BE BLOCKED 
AND ITS
  * CONTRIBUTIONS DELETED!
  *
- * @license GPL-3.0+ 
+ * @license GPL-3.0-or-later 
  */
 
 require_once dirname( dirname( dirname( __DIR__ ) ) ) . 
'/maintenance/Maintenance.php';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib701457f964bf2ae76dc6a5478c1823ce9d57d9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
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...BiblioPlus[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I25e0685910bbd16f055b6efeeb21913d3ab4418c
---
M BiblioPlus.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/BiblioPlus.php b/BiblioPlus.php
index ed491d1..71f7441 100644
--- a/BiblioPlus.php
+++ b/BiblioPlus.php
@@ -170,7 +170,7 @@
'version' => $wgBiblioPlusVersion,
'author' => array( 'Karen Eddy', 'Code from the Biblio extension by 
Martin Jambon' ),
'url' => 'https://www.mediawiki.org/wiki/Extension:BiblioPlus',
-   'license-name' => 'GPL-2.0+',
+   'license-name' => 'GPL-2.0-or-later',
 );
 
 $moduleTemplate = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25e0685910bbd16f055b6efeeb21913d3ab4418c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BiblioPlus
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...BibManager[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: If0736e497e02f7c856f30a246c32176c4c271f83
---
M doc/Hooks.txt
M doc/LICENCE.txt
M doc/MANUAL.txt
M doc/development/BibTeX-standard-fields.html
M doc/development/fixture.sql
M maintenance/BibManagerExportRepo.php
M maintenance/BibManagerImportRepo.php
7 files changed, 1,210 insertions(+), 1,210 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BibManager 
refs/changes/57/401857/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0736e497e02f7c856f30a246c32176c4c271f83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BibManager
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...BetaFeatures[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index dc15655..0c62221 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BetaFeatures;,
"descriptionmsg": "betafeatures-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"config": {
"BetaFeaturesWhitelist": null,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8882f62a367fd998b1b4c2fb1d175e65269360d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
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...Babel[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index b82550c..a1c0915 100644
--- a/extension.json
+++ b/extension.json
@@ -11,7 +11,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Babel;,
"descriptionmsg": "babel-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "parserhook",
"MessagesDirs": {
"Babel": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia62065c0353433ce1003167eca8d34ace2962f47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
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...BatchUserRights[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 910a39d..80c8884 100644
--- a/extension.json
+++ b/extension.json
@@ -4,7 +4,7 @@
"author": "[http://www.seancolombo.com Sean Colombo]",
"url": "https://www.mediawiki.org/wiki/Extension:BatchUserRights;,
"descriptionmsg": "batchuserrights-desc",
-   "license-name": "GPL-3.0+",
+   "license-name": "GPL-3.0-or-later",
"type": "specialpage",
"AvailableRights": [
"batchuserrights"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id777697293db510c4d9173b58c233a4a47f78b38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BatchUserRights
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...BaseHooks[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BaseHooks 
refs/changes/54/401854/1

diff --git a/extension.json b/extension.json
index c53f56a..d6ebc13 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:BaseHooks;,
"descriptionmsg": "basehooks-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"MessagesDirs": {
"BaseHooks": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40e8647eac8bba2055ff8a634943bb8678357a65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BaseHooks
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...Awesomeness[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ie6867165fc05f4d7f23b03e5481de9524e742586
---
M Awesomeness.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/Awesomeness.php b/Awesomeness.php
index 2680654..955ede0 100644
--- a/Awesomeness.php
+++ b/Awesomeness.php
@@ -40,7 +40,7 @@
),
'url' => 'https://www.mediawiki.org/wiki/Extension:Awesomeness',
'descriptionmsg' => 'awesomeness-desc',
-   'license-label' => 'GPL-2.0+'
+   'license-label' => 'GPL-2.0-or-later'
 );
 
 // Register extension messages and other localisation.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6867165fc05f4d7f23b03e5481de9524e742586
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Awesomeness
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...AutoCreateCategoryPages[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index f670b97..586b480 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "AutoCreateCategoryPages",
"version": "1.0.3",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"author": [
"Merrick Schaefer",
"Mark Johnston",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I527e61ab20ff1bd73ff4ce9251188fe93fefb098
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AutoCreateCategoryPages
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...AuthorProtect[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 57a91a7..c5f1a4b 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AuthorProtect;,
"descriptionmsg": "authorprotect-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"AutoloadClasses": {
"AuthorProtect": "AuthorProtect.hooks.php",
"AuthorProtectAction": "AuthorProtectAction.php"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6788479a938c6bd791d4cade85688aae8ff4341e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AuthorProtect
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...ArticleToCategory2[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index a761b0e..e2dd700 100644
--- a/extension.json
+++ b/extension.json
@@ -9,7 +9,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:ArticleToCategory2;,
"descriptionmsg": "articletocategory2-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"AutoloadClasses": {
"ArticleToCategory2Hooks": "ArticleToCategory2.hooks.php"
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I197a93ae87b9babebec38e2d95eb888cfb9c0f54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleToCategory2
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...Auth_remoteuser[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index f54b3f4..b42084b 100644
--- a/extension.json
+++ b/extension.json
@@ -34,7 +34,7 @@
"i18n"
]
},
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"SessionProviders": {
"Auth_remoteuser": {
"class": 
"MediaWiki\\Extensions\\Auth_remoteuser\\AuthRemoteuserSessionProvider"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9464739ae83ee2d92be004033d204fa980e3c7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Auth_remoteuser
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...AutoGallery[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 4ec85c0..08f2070 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "AutoGallery",
-   "license-name": "AGPL-3.0+",
+   "license-name": "AGPL-3.0-or-later",
"author": [
"Kunal Mehta"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24d3570d6cd34f982494e934fafff40267c1aefd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AutoGallery
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...ArticlePlaceholder[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ie32002ea43e8fbc4df7e4d7862bee0b82124b14c
---
M extension.json
M includes/BaseTemplateToolboxHookHandler.php
M includes/ItemNotabilityFilter.php
M package.json
M tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
M tests/phpunit/includes/ItemNotabilityFilterTest.php
M 
tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
M 
tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
8 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/extension.json b/extension.json
index fee1f7f..4c91dac 100644
--- a/extension.json
+++ b/extension.json
@@ -6,7 +6,7 @@
"url": "https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
"descriptionmsg": "articleplaceholder-desc",
"type": "other",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"requires": {
"MediaWiki": ">= 1.31.0"
},
diff --git a/includes/BaseTemplateToolboxHookHandler.php 
b/includes/BaseTemplateToolboxHookHandler.php
index cfc1c30..986ff2c 100644
--- a/includes/BaseTemplateToolboxHookHandler.php
+++ b/includes/BaseTemplateToolboxHookHandler.php
@@ -16,7 +16,7 @@
 /**
  * Add Wikibase item link in toolbox for placeholders: Handler for the 
"BaseTemplateToolbox" hook.
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Marius Hoch < h...@online.de >
  */
 class BaseTemplateToolboxHookHandler {
diff --git a/includes/ItemNotabilityFilter.php 
b/includes/ItemNotabilityFilter.php
index 548665d..3974a62 100644
--- a/includes/ItemNotabilityFilter.php
+++ b/includes/ItemNotabilityFilter.php
@@ -15,7 +15,7 @@
  * @author Lucie-Aimée Kaffee
  * @author Marius Hoch
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  */
 class ItemNotabilityFilter {
 
diff --git a/package.json b/package.json
index faf5b41..8bc479c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
"name": "articleplaceholder",
-   "license": "GPL-2.0+",
+   "license": "GPL-2.0-or-later",
"version": "0.0.1",
"repository": {
"type": "git",
diff --git a/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php 
b/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
index 5b97348..f5822f2 100644
--- a/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
+++ b/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
@@ -19,7 +19,7 @@
  *
  * @covers ArticlePlaceholder\BaseTemplateToolboxHookHandler
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Marius Hoch < h...@online.de >
  */
 class BaseTemplateToolboxHookHandlerTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/ItemNotabilityFilterTest.php 
b/tests/phpunit/includes/ItemNotabilityFilterTest.php
index a5bd277..c927acf 100644
--- a/tests/phpunit/includes/ItemNotabilityFilterTest.php
+++ b/tests/phpunit/includes/ItemNotabilityFilterTest.php
@@ -23,7 +23,7 @@
  *
  * @covers ArticlePlaceholder\ItemNotabilityFilter
  *
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Marius Hoch
  * @author Lucie-Aimée Kaffee
  */
diff --git 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
index a593c91..372f1be 100644
--- 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
+++ 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js
@@ -1,5 +1,5 @@
 /**
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Jonas Kress
  */
 ( function ( $, QUnit, sinon, mw ) {
diff --git 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
index 40496d9..5218dbe 100644
--- 
a/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
+++ 
b/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js
@@ -1,5 +1,5 @@
 /**
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Jonas Kress
  */

[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I400ab367e3c45337aa525ec4f03cfb99344a11c3
---
M ApprovedRevs.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/ApprovedRevs.php b/ApprovedRevs.php
index 30e6316..a0a1725 100644
--- a/ApprovedRevs.php
+++ b/ApprovedRevs.php
@@ -33,7 +33,7 @@
'author'  => array( 'Yaron Koren', '...' ),
'url' => 
'https://www.mediawiki.org/wiki/Extension:Approved_Revs',
'descriptionmsg'  => 'approvedrevs-desc',
-   'license-name'=> 'GPL-2.0+'
+   'license-name'=> 'GPL-2.0-or-later'
 );
 
 // global variables
diff --git a/extension.json b/extension.json
index 432667c..2926463 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:Approved_Revs;,
"descriptionmsg": "approvedrevs-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "hook",
"requires": {
"MediaWiki": ">= 1.27.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I400ab367e3c45337aa525ec4f03cfb99344a11c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
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...AntiSpoof[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 2454207..f170d5e 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
"author": "Brion Vibber",
"url": "https://www.mediawiki.org/wiki/Extension:AntiSpoof;,
"descriptionmsg": "antispoof-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "antispam",
"requires": {
"MediaWiki": ">= 1.27.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37e26fade42de1cba7f3d699a94d0c6f393394eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
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...ActiveAbstract[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 4383ff3..a0ac795 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:ActiveAbstract;,
"descriptionmsg": "activeabstract-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"requires": {
"MediaWiki": ">= 1.25.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8de3cdac01f8904c77e4619f1014f20b22c31c67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ActiveAbstract
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...ArticleFeedbackv5[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/45/401845/1

diff --git a/extension.json b/extension.json
index cd8ff0a..dd8de97 100644
--- a/extension.json
+++ b/extension.json
@@ -18,7 +18,7 @@
"Matthias Mullie",
"Jack Phoenix"
],
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"requires": {
"MediaWiki": ">= 1.28.0"
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9906a1ae32383559cf3c7448962e53e80fa4062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
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...AddThis[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I7b7b65ced20bbfd8d59b85a15e40e598d68dbcf8
---
M AddThis.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/AddThis.php b/AddThis.php
index 02a2a65..a640066 100644
--- a/AddThis.php
+++ b/AddThis.php
@@ -195,7 +195,7 @@
],
'descriptionmsg' => 'addthis-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AddThis',
-   'license-name' => 'GPL-2.0'
+   'license-name' => 'GPL-2.0-only'
 ];
 
 $wgAutoloadClasses['AddThis'] = __DIR__ . '/AddThis.body.php';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b7b65ced20bbfd8d59b85a15e40e598d68dbcf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AddThis
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...ApiFeatureUsage[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 7ae1b91..4b65a38 100644
--- a/extension.json
+++ b/extension.json
@@ -4,7 +4,7 @@
"author": "Brad Jorsch",
"url": "https://www.mediawiki.org/wiki/Extension:ApiFeatureUsage;,
"descriptionmsg": "apifeatureusage-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "specialpage",
"requires": {
"MediaWiki": ">= 1.29.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a657f2c24b1a00b5af6debe92fcd6f14589e31f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
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...Flow[master]: Remove unused access to (Special)CheckUser object

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused access to (Special)CheckUser object
..


Remove unused access to (Special)CheckUser object

This is an alternative for the workaround presented in Id2634a5. I
followed all code paths and could not find any usage of the
CheckUserRow::checkUser property I'm removing in this patch. Nor could
I find any usage of the CheckUserRow class.

The more general question is: Why does a FormatterRow need access to
the entirety of this specific special page?

Id2634a5 might still be valueable as it is easier to backport.

Bug: T182834
Change-Id: Ibe814999870ba621232049c3ec209d953754d80f
---
M Hooks.php
M extension.json
M includes/Formatter/CheckUserQuery.php
3 files changed, 6 insertions(+), 17 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index 858d865..ec52bfd 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -557,7 +557,7 @@
}
}
 
-   public static function onSpecialCheckUserGetLinksFromRow( 
SpecialCheckUser $checkUser, $row, &$links ) {
+   public static function onSpecialCheckUserGetLinksFromRow( SpecialPage 
$specialCheckUser, $row, &$links ) {
if ( !$row->cuc_type == RC_FLOW ) {
return true;
}
@@ -569,11 +569,11 @@
$query = Container::get( 'query.checkuser' );
// @todo: create hook to allow batch-loading this data, 
instead of doing piecemeal like this
$query->loadMetadataBatch( [ $row ] );
-   $row = $query->getResult( $checkUser, $row );
+   $row = $query->getResult( $row );
if ( $row !== false ) {
/** @var Flow\Formatter\CheckUserFormatter 
$formatter */
$formatter = Container::get( 
'formatter.checkuser' );
-   $replacement = $formatter->format( $row, 
$checkUser->getContext() );
+   $replacement = $formatter->format( $row, 
$specialCheckUser->getContext() );
}
} catch ( Exception $e ) {
wfDebugLog( 'Flow', __METHOD__ . ': Exception 
formatting cu ' . json_encode( $row ) . ' ' . $e );
diff --git a/extension.json b/extension.json
index 7eb3e04..2c99f0e 100644
--- a/extension.json
+++ b/extension.json
@@ -1043,7 +1043,6 @@
"Flow\\Formatter\\ChangesListQuery": 
"includes/Formatter/ChangesListQuery.php",
"Flow\\Formatter\\CheckUserFormatter": 
"includes/Formatter/CheckUserFormatter.php",
"Flow\\Formatter\\CheckUserQuery": 
"includes/Formatter/CheckUserQuery.php",
-   "Flow\\Formatter\\CheckUserRow": 
"includes/Formatter/CheckUserQuery.php",
"Flow\\Formatter\\ContributionsFormatter": 
"includes/Formatter/ContributionsFormatter.php",
"Flow\\Formatter\\ContributionsQuery": 
"includes/Formatter/ContributionsQuery.php",
"Flow\\Formatter\\ContributionsRow": 
"includes/Formatter/ContributionsQuery.php",
diff --git a/includes/Formatter/CheckUserQuery.php 
b/includes/Formatter/CheckUserQuery.php
index bc5023e..55e365e 100644
--- a/includes/Formatter/CheckUserQuery.php
+++ b/includes/Formatter/CheckUserQuery.php
@@ -4,7 +4,6 @@
 
 use Flow\Exception\FlowException;
 use Flow\Model\UUID;
-use CheckUser;
 
 class CheckUserQuery extends AbstractQuery {
/**
@@ -66,12 +65,11 @@
}
 
/**
-* @param CheckUser $checkUser
 * @param \StdClass $row
-* @return CheckUserRow|null
+* @return FormatterRow|bool
 * @throws FlowException
 */
-   public function getResult( CheckUser $checkUser, $row ) {
+   public function getResult( $row ) {
if ( $row->cuc_type != RC_FLOW || !$row->cuc_comment ) {
return false;
}
@@ -88,9 +86,8 @@
}
$revision = $this->revisionCache[$alpha];
 
-   $res = new CheckUserRow;
+   $res = new FormatterRow();
$this->buildResult( $revision, 'cuc_timestamp', $res );
-   $res->checkUser = $checkUser;
 
return $res;
}
@@ -133,11 +130,4 @@
 
return [ $workflowId, $revisionId, $postId ];
}
-}
-
-class CheckUserRow extends FormatterRow {
-   /**
-* @var CheckUser
-*/
-   public $checkUser;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe814999870ba621232049c3ec209d953754d80f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow

[MediaWiki-commits] [Gerrit] mediawiki...AccountInfo[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 200ddf9..b4264ec 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AccountInfo;,
"descriptionmsg": "accountinfo-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"SpecialPages": {
"AccountInfo": "MediaWiki\\AccountInfo\\SpecialAccountInfo"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b5a80bdd6358a48edcfd8177380bd6f643ca641
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AccountInfo
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...AbuseFilter[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/35/401835/1

diff --git a/extension.json b/extension.json
index a652d05..f4f3c7c 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AbuseFilter;,
"descriptionmsg": "abusefilter-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "antispam",
"requires": {
"MediaWiki": ">= 1.31.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7a48d3a432f12ce1c27fe989e85a80335a25801
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
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...AdvancedSearch[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/41/401841/1

diff --git a/extension.json b/extension.json
index ddd3003..5a226c0 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Extension:AdvancedSearch;,
"descriptionmsg": "advancedsearch-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"type": "other",
"requires": {
"MediaWiki": ">= 1.31.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec3190d087b8d1154b9f9c519cc097cc47eb95da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
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...AdminLinks[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I66ecea278aec764e9fa6b0ca91b227588ae2669c
---
M AdminLinks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/AdminLinks.php b/AdminLinks.php
index 8a63a5e..43add3b 100644
--- a/AdminLinks.php
+++ b/AdminLinks.php
@@ -14,7 +14,7 @@
'author' => 'Yaron Koren',
'url' => 'https://www.mediawiki.org/wiki/Extension:Admin_Links',
'descriptionmsg' => 'adminlinks-desc',
-   'license-name' => 'GPL-2.0+'
+   'license-name' => 'GPL-2.0-or-later'
);
 
$GLOBALS['wgAdminLinksIP'] = __DIR__ . '/';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66ecea278aec764e9fa6b0ca91b227588ae2669c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
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...AccessControl[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


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

diff --git a/extension.json b/extension.json
index 8497f39..5aadcab 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
"type": "parserhook",
"url": "https://www.mediawiki.org/wiki/Extension:AccessControl;,
"descriptionmsg": "accesscontrol-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"AutoloadClasses": {
"AccessControlHooks": "AccessControl.hooks.php"
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I301e3e5f96c9e8a70d4174737c03376efb852e90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AccessControl
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...ORES[master]: Minor fixes to ORES\Hooks

2018-01-03 Thread Ladsgroup (Code Review)

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

Change subject: Minor fixes to ORES\Hooks
..

Minor fixes to ORES\Hooks

 - Adding ExtensionRegistry as it's being used
 - Turning one hook handler to a static method
   I wonder how that even worked up to now.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/34/401834/1

diff --git a/includes/Hooks.php b/includes/Hooks.php
index f0161cf..d86189a 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -18,6 +18,7 @@
 
 use BetaFeatures;
 use DatabaseUpdater;
+use ExtensionRegistry;
 use Exception;
 use JobQueueGroup;
 use IContextSource;
@@ -116,7 +117,7 @@
 *
 * @param \stdClass[] $rows
 */
-   public function onRecentChangesPurgeRows( array $rows ) {
+   public static function onRecentChangesPurgeRows( array $rows ) {
$revIds = [];
foreach ( $rows as $row ) {
$revIds[] = $row->rc_this_oldid;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3077a9cac445a8927e54fc2c2bf8ec50a35d291d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.31.0-wmf.15]: Fix CheckUser type check thingy

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix CheckUser type check thingy
..


Fix CheckUser type check thingy

CheckUser changed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Bug: T182834
Change-Id: Id2634a5789c0fcb15bc551a08613a5d681d0ad85
---
M Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Hooks.php b/Hooks.php
index ce482be..c51e46f 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -556,7 +556,7 @@
}
}
 
-   public static function onSpecialCheckUserGetLinksFromRow( CheckUser 
$checkUser, $row, &$links ) {
+   public static function onSpecialCheckUserGetLinksFromRow( 
SpecialCheckUser $checkUser, $row, &$links ) {
if ( !$row->cuc_type == RC_FLOW ) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2634a5789c0fcb15bc551a08613a5d681d0ad85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Fix CheckUser type check thingy

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix CheckUser type check thingy
..


Fix CheckUser type check thingy

CheckUser changed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Bug: T182834
Change-Id: Id2634a5789c0fcb15bc551a08613a5d681d0ad85
---
M Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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

Objections:
  Thiemo Kreuz (WMDE): There's a problem with this change, please improve



diff --git a/Hooks.php b/Hooks.php
index 0034c0b..7d22c40 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -556,7 +556,7 @@
}
}
 
-   public static function onSpecialCheckUserGetLinksFromRow( CheckUser 
$checkUser, $row, &$links ) {
+   public static function onSpecialCheckUserGetLinksFromRow( 
SpecialCheckUser $checkUser, $row, &$links ) {
if ( !$row->cuc_type == RC_FLOW ) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2634a5789c0fcb15bc551a08613a5d681d0ad85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thiemo Kreuz (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/core[master]: Added Tests for ListToggle

2018-01-03 Thread Ryan10145 (Code Review)

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

Change subject: Added Tests for ListToggle
..

Added Tests for ListToggle

Bug: T183898
Change-Id: I1c6cd8ea21127db56701cc6073fa880b2180d846
---
A tests/phpunit/includes/ListToggleTest.php
1 file changed, 31 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/401833/1

diff --git a/tests/phpunit/includes/ListToggleTest.php 
b/tests/phpunit/includes/ListToggleTest.php
new file mode 100644
index 000..92e0907
--- /dev/null
+++ b/tests/phpunit/includes/ListToggleTest.php
@@ -0,0 +1,31 @@
+getOutput();
+   $listToggle = new ListToggle( $output );
+
+   $this->assertInstanceOf('ListToggle', $listToggle);
+   }
+
+   /**
+* @covers ListToggle::getHTML
+*/
+   public function testGetHTML() {
+   $specialpage = new SpecialPage( 'TestPage' );
+   $output = $specialpage->getOutput();
+   $listToggle = new ListToggle( $output );
+
+   $html = $listToggle->getHTML();
+   $this->assertRegExp('//',
+   $html);
+   }
+}
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.31.0-wmf.15]: Fix CheckUser type check thingy

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Fix CheckUser type check thingy
..

Fix CheckUser type check thingy

CheckUser changed in I39c60b2d059d1cb2c1c0d3a4206232d961536697

Bug: T182834
Change-Id: Id2634a5789c0fcb15bc551a08613a5d681d0ad85
---
M Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/Hooks.php b/Hooks.php
index ce482be..c51e46f 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -556,7 +556,7 @@
}
}
 
-   public static function onSpecialCheckUserGetLinksFromRow( CheckUser 
$checkUser, $row, &$links ) {
+   public static function onSpecialCheckUserGetLinksFromRow( 
SpecialCheckUser $checkUser, $row, &$links ) {
if ( !$row->cuc_type == RC_FLOW ) {
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2634a5789c0fcb15bc551a08613a5d681d0ad85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ic1b4b83b11f4d57b7617fcea5d3a5a24d498f3ec
---
M ContentTranslation.alias.php
M ContentTranslation.hooks.php
M api/ApiContentTranslationConfiguration.php
M api/ApiContentTranslationDelete.php
M api/ApiContentTranslationPublish.php
M api/ApiContentTranslationSave.php
M api/ApiContentTranslationSuggestionList.php
M api/ApiContentTranslationToken.php
M api/ApiQueryContentTranslation.php
M api/ApiQueryContentTranslationCorpora.php
M api/ApiQueryContentTranslationLanguageTrend.php
M api/ApiQueryContentTranslationStats.php
M api/ApiQueryContentTranslationSuggestions.php
M api/ApiQueryLangLinksCount.php
M api/ApiQueryPublishedTranslations.php
M api/ApiQueryTranslatorStats.php
M composer.json
M extension.json
M includes/AbuseFilterCheck.php
M includes/CorporaLookup.php
M includes/RestbaseClient.php
M includes/Stats.php
M includes/TranslationStorageManager.php
M includes/TranslationUnit.php
M modules/base/ext.cx.model.js
M modules/base/ext.cx.sitemapper.js
M modules/campaigns/ext.cx.campaigns.contributionsmenu.js
M modules/campaigns/ext.cx.campaigns.newarticle.js
M modules/campaigns/ext.cx.campaigns.newarticle.veloader.js
M modules/dashboard/ext.cx.dashboard.js
M modules/dashboard/ext.cx.recommendtool.client.js
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/ext.cx.translationlist.js
M modules/editor/ext.cx.editor.js
M modules/entrypoint/ext.cx.betafeature.notification.js
M modules/entrypoint/ext.cx.contributions.init.js
M modules/entrypoint/ext.cx.contributions.js
M modules/entrypoint/ext.cx.entrypoint.js
M modules/entrypoint/ext.cx.interlanguagelink.js
M modules/eventlogging/ext.cx.eventlogging.js
M modules/publish/ext.cx.publish.dialog.js
M modules/publish/ext.cx.publish.js
M modules/publish/ext.cx.wikibase.link.js
M modules/source/ext.cx.SelectedSourcePage.js
M modules/source/ext.cx.SourcePageSelector.js
M modules/source/ext.cx.source.js
M modules/stats/ext.cx.stats.js
M modules/tools/ext.cx.tools.categories.js
M modules/tools/ext.cx.tools.dictionary.js
M modules/tools/ext.cx.tools.formatter.js
M modules/tools/ext.cx.tools.gallery.js
M modules/tools/ext.cx.tools.images.js
M modules/tools/ext.cx.tools.instructions.js
M modules/tools/ext.cx.tools.js
M modules/tools/ext.cx.tools.link.js
M modules/tools/ext.cx.tools.manager.js
M modules/tools/ext.cx.tools.mt.card.js
M modules/tools/ext.cx.tools.mt.js
M modules/tools/ext.cx.tools.mtabuse.js
M modules/tools/ext.cx.tools.poem.js
M modules/tools/ext.cx.tools.reference.js
M modules/tools/ext.cx.tools.template.card.js
M modules/tools/ext.cx.tools.template.editor.js
M modules/tools/ext.cx.tools.template.js
M modules/tours/ext.cx.tours.publish.init.js
M modules/translation/ext.cx.translation.aligner.js
M modules/translation/ext.cx.translation.conflict.js
M modules/translation/ext.cx.translation.js
M modules/translation/ext.cx.translation.loader.js
M modules/translation/ext.cx.translation.progress.js
M modules/translation/ext.cx.translation.storage.js
M modules/ui/legacy/mw.cx.ui.SourceColumn.js
M modules/ui/legacy/mw.cx.ui.ToolsColumn.js
M modules/ui/legacy/mw.cx.ui.TranslationColumn.js
M modules/ui/legacy/mw.cx.ui.TranslationView.js
M modules/ui/mw.cx.ui.js
M modules/ui/widgets/mw.cx.ui.PageSelectorWidget.js
M modules/ui/widgets/mw.cx.ui.PublishSettingsWidget.js
M modules/ui/widgets/mw.cx.ui.TitleOptionWidget.js
M modules/util/ext.cx.util.js
M modules/util/ext.cx.util.selection.js
M modules/widgets/feedback/ext.cx.feedback.js
M modules/widgets/overlay/ext.cx.overlay.js
M modules/widgets/progressbar/ext.cx.progressbar.js
M modules/widgets/spinner/ext.cx.spinner.js
M modules/widgets/templates/mw.cx.widgets.TemplateParamOptionWidget.js
M modules/widgets/translator/ext.cx.translator.js
M scripts/dump-corpora.php
M scripts/fix-stats.php
M scripts/manage-lists.php
M specials/SpecialContentTranslation.php
M specials/SpecialContentTranslationStats.php
M tests/qunit/base/ext.cx.sitemapper.test.js
M tests/qunit/dm/mw.cx.dm.Translation.test.js
M tests/qunit/publish/ext.cx.publish.prepare.test.js
M tests/qunit/publish/ext.cx.publish.test.js
M tests/qunit/tools/ext.cx.tools.categories.test.js
M tests/qunit/tools/ext.cx.tools.mtabuse.test.js
M tests/qunit/tools/ext.cx.tools.template.test.js
M tests/qunit/translation/ext.cx.translation.loader.test.js
M tests/qunit/translation/ext.cx.translation.test.js
M tests/qunit/ui/mw.cx.ui.Infobar.test.js
102 files changed, 102 insertions(+), 102 deletions(-)


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

diff

[MediaWiki-commits] [Gerrit] mediawiki...AbsenteeLandlord[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: If489db7629188be7597e305e01487804b6928d36
---
M AbsenteeLandlord.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/AbsenteeLandlord.php b/AbsenteeLandlord.php
index 8e164f9..f675c6d 100644
--- a/AbsenteeLandlord.php
+++ b/AbsenteeLandlord.php
@@ -14,7 +14,7 @@
'path' => __FILE__,
'name' => 'Absentee Landlord',
'author' => [ 'Ryan Schmidt', 'Tim Laqua' ],
-   'license-name' => 'GPL-2.0+',
+   'license-name' => 'GPL-2.0-or-later',
'version' => '1.3.0',
'descriptionmsg' => 'absenteelandlord-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AbsenteeLandlord',
diff --git a/extension.json b/extension.json
index 71df5e5..e98377c 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,7 @@
"Ryan Schmidt",
"Tim Laqua"
],
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"url": "https://www.mediawiki.org/wiki/Extension:AbsenteeLandlord;,
"descriptionmsg": "absenteelandlord-desc",
"type": "other",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If489db7629188be7597e305e01487804b6928d36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbsenteeLandlord
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...ORES[master]: Rename and cleanup Scoring.php

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Rename and cleanup Scoring.php
..


Rename and cleanup Scoring.php

Bug: T184142
Change-Id: Ic756af5f7978e8fa8db464dbd17698b6ff15cd2f
---
M includes/FetchScoreJob.php
M includes/Hooks.php
M includes/Hooks/ApiHooksHandler.php
M includes/Parser/ScoreParser.php
R includes/ScoreFetcher.php
A includes/ScoreLookup.php
M maintenance/PopulateDatabase.php
R tests/phpunit/includes/ScoreFetcherTest.php
8 files changed, 88 insertions(+), 37 deletions(-)

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



diff --git a/includes/FetchScoreJob.php b/includes/FetchScoreJob.php
index 83e831d..6bdc88b 100644
--- a/includes/FetchScoreJob.php
+++ b/includes/FetchScoreJob.php
@@ -68,7 +68,7 @@
}
 
$logger->info( 'Fetching scores for revision ' . json_encode( 
$this->params ) );
-   $scoring = Scoring::instance();
+   $scoring = ScoreFetcher::instance();
if ( isset( $this->params['originalRequest'] ) ) {
$scoring->setOriginalRequest( 
$this->params['originalRequest'] );
}
@@ -77,14 +77,14 @@
} else {
$models = null;
}
-   $scores = $scoring->getScores( $this->params['revid'], $models, 
$this->params['extra_params'] );
+   $scores = $scoring->getScores( $this->params['revid'], $models, 
$this->params['precache'] );
$scoreStorage = MediaWikiServices::getInstance()->getService( 
'ORESScoreStorage' );
 
$success = true;
$scoreStorage->storeScores(
$scores,
function ( $mssg, $revision ) use ( &$success, $logger 
) {
-   $logger->warning( "Scoring errored for 
$revision: $mssg\n" );
+   $logger->warning( "ScoreFetcher errored for 
$revision: $mssg\n" );
$success = false;
}
);
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 9e4d751..f0161cf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -102,7 +102,7 @@
'userAgent' => $request->getHeader( 
'User-Agent' ),
],
'models' => $models,
-   'extra_params' => [ 'precache' => 'true' ],
+   'precache' => true,
] );
JobQueueGroup::singleton()->push( $job );
$logger->debug( 'Job pushed for {revid}', [
diff --git a/includes/Hooks/ApiHooksHandler.php 
b/includes/Hooks/ApiHooksHandler.php
index a1ea636..cc43094 100644
--- a/includes/Hooks/ApiHooksHandler.php
+++ b/includes/Hooks/ApiHooksHandler.php
@@ -35,7 +35,7 @@
 use ORES\FetchScoreJob;
 use ORES\Hooks;
 use ORES\Parser\ScoreParser;
-use ORES\Scoring;
+use ORES\ScoreFetcher;
 use ORES\WatchedItemQueryServiceExtension;
 use RequestContext;
 use Title;
@@ -322,7 +322,7 @@
}
}
 
-   $loadedScores = Scoring::instance()->getScores( $revids 
);
+   $loadedScores = ScoreFetcher::instance()->getScores( 
$revids );
 
// Filter loaded scores to store cacheable ones
$cacheableScores = array_intersect_key( $loadedScores, 
array_flip( $cacheableRevids ) );
@@ -361,7 +361,7 @@
} catch ( InvalidArgumentException $exception ) {
$logger = LoggerFactory::getInstance( 'ORES' );
$mssg = $exception->getMessage();
-   $logger->info( "Scoring errored for $revid: $mssg\n" );
+   $logger->info( "ScoreFetcher errored for $revid: 
$mssg\n" );
return [];
}
$scores = [];
diff --git a/includes/Parser/ScoreParser.php b/includes/Parser/ScoreParser.php
index 7075d2a..65e4597 100644
--- a/includes/Parser/ScoreParser.php
+++ b/includes/Parser/ScoreParser.php
@@ -37,11 +37,11 @@
}
 
/**
-* Convert data returned by Scoring::getScores() into 
ores_classification rows
+* Convert data returned by ScoreFetcher::getScores() into 
ores_classification rows
 *
 * @note No row is generated for class 0
 * @param int $revision Revision being processed
-* @param array $revisionData Data returned by Scoring::getScores() for 
the revision.
+* @param array $revisionData Data returned by 
ScoreFetcher::getScores() for the revision.
 *
 * @return array[]
 * @throws RuntimeException
diff --git a/includes/Scoring.php b/includes/ScoreFetcher.php

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Update model version when model lookup can't find the model

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Update model version when model lookup can't find the model
..


Update model version when model lookup can't find the model

Bug: T184127
Change-Id: Ifc8defbba602c76bd926ca4e43c82ef62816e52c
---
M includes/ScoreFetcher.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/ScoreFetcher.php b/includes/ScoreFetcher.php
index 4d3d8b3..1fbd843 100644
--- a/includes/ScoreFetcher.php
+++ b/includes/ScoreFetcher.php
@@ -16,6 +16,7 @@
 
 namespace ORES;
 
+use InvalidArgumentException;
 use MediaWiki\MediaWikiServices;
 use WebRequest;
 
@@ -89,7 +90,12 @@
}
 
$modelLookup = MediaWikiServices::getInstance()->getService( 
'ORESModelLookup' );
-   $storageVersion = $modelLookup->getModelVersion( $model );
+   try {
+   $storageVersion = $modelLookup->getModelVersion( $model 
);
+   } catch ( InvalidArgumentException $exception ) {
+   $storageVersion = null;
+   }
+
$responseVersion = $modelOutputs['version'];
 
if ( $storageVersion === $responseVersion ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc8defbba602c76bd926ca4e43c82ef62816e52c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Awight 
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]: peopleweb: access based on roles, not host names

2018-01-03 Thread Dzahn (Code Review)

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

Change subject: peopleweb: access based on roles, not host names
..

peopleweb: access based on roles, not host names

Change-Id: Ie65c9eea8c0151425135300c4e99b6afe9e31a74
---
R hieradata/role/common/microsites/peopleweb.yaml
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/401829/1

diff --git a/hieradata/hosts/rutherfordium.yaml 
b/hieradata/role/common/microsites/peopleweb.yaml
similarity index 100%
rename from hieradata/hosts/rutherfordium.yaml
rename to hieradata/role/common/microsites/peopleweb.yaml

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Ensure project name is set on 2nd loop when saving

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Ensure project name is set on 2nd loop when saving
..


Ensure project name is set on 2nd loop when saving

Also move top-level and other classes into a common namespace.

Bug: T182937
Change-Id: I1a5ef32df6c3164ff0f9bf8d2a0260d6d1a9c935
---
M extension.json
R src/Hooks.php
M src/NamespaceSelect.php
R src/PageAssessmentsDAO.php
M src/SpecialPage.php
M tests/phpunit/PageAssessmentsTest.php
6 files changed, 87 insertions(+), 24 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7387269..cfa78a8 100644
--- a/extension.json
+++ b/extension.json
@@ -19,13 +19,13 @@
"pageassessments": "ApiQueryPageAssessments"
},
"AutoloadClasses": {
-   "PageAssessmentsHooks": "PageAssessmentsHooks.php",
-   "PageAssessmentsBody": "PageAssessmentsBody.php",
"ApiQueryPageAssessments": "api/ApiQueryPageAssessments.php",
"ApiQueryProjectPages": "api/ApiQueryProjectPages.php",
"ApiQueryProjects": "api/ApiQueryProjects.php",
-   "PageAssessments\\SpecialPage": "src/SpecialPage.php",
-   "PageAssessments\\NamespaceSelect": "src/NamespaceSelect.php"
+   "MediaWiki\\Extension\\PageAssessments\\Hooks": "src/Hooks.php",
+   "MediaWiki\\Extension\\PageAssessments\\NamespaceSelect": 
"src/NamespaceSelect.php",
+   "MediaWiki\\Extension\\PageAssessments\\PageAssessmentsDAO": 
"src/PageAssessmentsDAO.php",
+   "MediaWiki\\Extension\\PageAssessments\\SpecialPage": 
"src/SpecialPage.php"
},
"ExtensionMessagesFiles": {
"PageAssessmentsMagic": "PageAssessments.i18n.magic.php",
@@ -33,16 +33,16 @@
},
"Hooks": {
"ParserFirstCallInit": [
-   "PageAssessmentsHooks::onParserFirstCallInit"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onParserFirstCallInit"
],
"LoadExtensionSchemaUpdates": [
-   "PageAssessmentsHooks::onLoadExtensionSchemaUpdates"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onLoadExtensionSchemaUpdates"
],
"LinksUpdateComplete": [
-   "PageAssessmentsHooks::onLinksUpdateComplete"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onLinksUpdateComplete"
],
"ArticleDeleteComplete": [
-   "PageAssessmentsHooks::onArticleDeleteComplete"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onArticleDeleteComplete"
]
},
"MessagesDirs": {
@@ -64,7 +64,7 @@
}
},
"SpecialPages": {
-   "PageAssessments": "PageAssessments\\SpecialPage"
+   "PageAssessments": 
"MediaWiki\\Extension\\PageAssessments\\SpecialPage"
},
"config": {
"PageAssessmentsOnTalkPages": true,
diff --git a/PageAssessmentsHooks.php b/src/Hooks.php
similarity index 84%
rename from PageAssessmentsHooks.php
rename to src/Hooks.php
index fae597b..80a17d7 100644
--- a/PageAssessmentsHooks.php
+++ b/src/Hooks.php
@@ -17,17 +17,30 @@
  *
  * Hooks for PageAssessments extension
  *
+ * @file
  * @ingroup Extensions
  */
 
-class PageAssessmentsHooks {
+namespace MediaWiki\Extension\PageAssessments;
+
+use Article;
+use Content;
+use DatabaseUpdater;
+use LinksUpdate;
+use LogEntry;
+use Parser;
+use RequestContext;
+use User;
+
+class Hooks {
 
/**
 * Register the parser function hook
 * @param Parser &$parser
 */
-   public static function onParserFirstCallInit( &$parser ) {
-   $parser->setFunctionHook( 'assessment', 
'PageAssessmentsBody::cacheAssessment' );
+   public static function onParserFirstCallInit( Parser &$parser ) {
+   $callback = PageAssessmentsDAO::class . '::cacheAssessment';
+   $parser->setFunctionHook( 'assessment', $callback );
}
 
/**
@@ -57,7 +70,7 @@
if ( $title->isTalkPage() ) {
$title = $title->getSubjectPage();
}
-   PageAssessmentsBody::doUpdates( $title, 
$assessmentData, $ticket );
+   PageAssessmentsDAO::doUpdates( $title, $assessmentData, 
$ticket );
}
}
 
@@ -66,7 +79,7 @@
 * @param DatabaseUpdater $updater DatabaseUpdater object
 */
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater = null ) {
-   $dbDir = __DIR__ . '/db';
+   $dbDir = __DIR__ . '/../db';

[MediaWiki-commits] [Gerrit] mediawiki...3D[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/3D 
refs/changes/28/401828/1

diff --git a/extension.json b/extension.json
index 50a6c70..adea519 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
"url": "https://www.mediawiki.org/wiki/Extension:3d;,
"namemsg": "3d",
"descriptionmsg": "3d-desc",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"requires": {
"MediaWiki": ">= 1.31.0",
"extensions": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfec051e1bc55c89329fd1445415952237d55c40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/3D
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]: Move testwiki2 from group0 to group1

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Move testwiki2 from group0 to group1
..


Move testwiki2 from group0 to group1

Per the discussion in bug

Bug: T182326
Change-Id: I7bc0c001758a1d24e404057422369cb28259772b
---
M dblists/group0.dblist
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/dblists/group0.dblist b/dblists/group0.dblist
index 9ac731a..1e646d6 100644
--- a/dblists/group0.dblist
+++ b/dblists/group0.dblist
@@ -94,7 +94,6 @@
 suwikibooks
 swwikibooks
 tenwiki
-test2wiki
 testwiki
 testwikidatawiki
 thwikinews

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc0c001758a1d24e404057422369cb28259772b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
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...CirrusSearch[master]: Do not throw if request was performed by other engine.

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Do not throw if request was performed by other engine.
..


Do not throw if request was performed by other engine.

This could happen if CirrusSearch extension is enabled, but the
search engine configuration ($wgSearchType) selects other engine.

In this case, we should not throw exceptions but should just ignore
the results.

Change-Id: I84a5fc717a0e811d9cb18f8bea86daa8e977b7d4
---
M includes/ElasticsearchIntermediary.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index ab67f91..0521f9c 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -108,7 +108,9 @@
 */
public static function setResultPages( array $matches ) {
if ( self::$requestLogger === null ) {
-   throw new \RuntimeException( 'No search request was 
made' );
+   // This could happen if Cirrus is not the active engine,
+   // but the hook is still loaded. In this case, do 
nothing.
+   return;
} else {
self::$requestLogger->setResultPages( $matches );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84a5fc717a0e811d9cb18f8bea86daa8e977b7d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
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...ORES[master]: Update model version when model lookup can't find the model

2018-01-03 Thread Ladsgroup (Code Review)

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

Change subject: Update model version when model lookup can't find the model
..

Update model version when model lookup can't find the model

Bug: T184127
Change-Id: Ifc8defbba602c76bd926ca4e43c82ef62816e52c
---
M includes/ScoreFetcher.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/ScoreFetcher.php b/includes/ScoreFetcher.php
index 4d3d8b3..1fbd843 100644
--- a/includes/ScoreFetcher.php
+++ b/includes/ScoreFetcher.php
@@ -16,6 +16,7 @@
 
 namespace ORES;
 
+use InvalidArgumentException;
 use MediaWiki\MediaWikiServices;
 use WebRequest;
 
@@ -89,7 +90,12 @@
}
 
$modelLookup = MediaWikiServices::getInstance()->getService( 
'ORESModelLookup' );
-   $storageVersion = $modelLookup->getModelVersion( $model );
+   try {
+   $storageVersion = $modelLookup->getModelVersion( $model 
);
+   } catch ( InvalidArgumentException $exception ) {
+   $storageVersion = null;
+   }
+
$responseVersion = $modelOutputs['version'];
 
if ( $storageVersion === $responseVersion ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc8defbba602c76bd926ca4e43c82ef62816e52c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

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

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



diff --git a/extension.json b/extension.json
index 4ad3f8a..bb3a455 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Linter",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"url": "https://www.mediawiki.org/wiki/Extension:Linter;,
"author": [
"Kunal Mehta",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecbc1b73bf7a4f3e52f8a4ed4aba9442707516ab
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Do not throw if request was performed by other engine.

2018-01-03 Thread Smalyshev (Code Review)

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

Change subject: Do not throw if request was performed by other engine.
..

Do not throw if request was performed by other engine.

This could happen if CirrusSearch extension is enabled, but the
search engine configuration ($wgSearchType) selects other engine.

In this case, we should not throw exceptions but should just ignore
the results.

Change-Id: I84a5fc717a0e811d9cb18f8bea86daa8e977b7d4
---
M includes/ElasticsearchIntermediary.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index ab67f91..0521f9c 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -108,7 +108,9 @@
 */
public static function setResultPages( array $matches ) {
if ( self::$requestLogger === null ) {
-   throw new \RuntimeException( 'No search request was 
made' );
+   // This could happen if Cirrus is not the active engine,
+   // but the hook is still loaded. In this case, do 
nothing.
+   return;
} else {
self::$requestLogger->setResultPages( $matches );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84a5fc717a0e811d9cb18f8bea86daa8e977b7d4
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...Linter[master]: Use SPDX 3.0 license identifier

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..

Use SPDX 3.0 license identifier

https://spdx.org/licenses/

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


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

diff --git a/extension.json b/extension.json
index 4ad3f8a..bb3a455 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Linter",
-   "license-name": "GPL-2.0+",
+   "license-name": "GPL-2.0-or-later",
"url": "https://www.mediawiki.org/wiki/Extension:Linter;,
"author": [
"Kunal Mehta",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecbc1b73bf7a4f3e52f8a4ed4aba9442707516ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
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/core[master]: Bump dev dependency composer/spdx-licenses to 1.2.0

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Bump dev dependency composer/spdx-licenses to 1.2.0
..


Bump dev dependency composer/spdx-licenses to 1.2.0

Notably, this includes support for SPDX 3.0.

https://github.com/composer/spdx-licenses/compare/1.1.4...1.2.0

Deprecated license identifiers will still be accepted, but in the future we
can start warning that they are deprecated.

Bug: T183858
Change-Id: I819ce40f24d8447a20c266b2f1fa454e966dd5a5
---
M RELEASE-NOTES-1.31
M composer.json
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index a496b02..4eb4c01 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -42,6 +42,8 @@
 
  Upgraded external libraries 
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
+* Updated composer/spdx-licenses from 1.1.4 to
+  1.2.0 (development dependency).
 * …
 
  New external libraries 
diff --git a/composer.json b/composer.json
index ee050d5..6b3e8f7 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
"zordius/lightncandy": "0.23"
},
"require-dev": {
-   "composer/spdx-licenses": "1.1.4",
+   "composer/spdx-licenses": "1.2.0",
"hamcrest/hamcrest-php": "^2.0",
"jakub-onderka/php-parallel-lint": "0.9.2",
"jetbrains/phpstorm-stubs": 
"dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I819ce40f24d8447a20c266b2f1fa454e966dd5a5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Rename and cleanup Scoring.php

2018-01-03 Thread Ladsgroup (Code Review)

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

Change subject: Rename and cleanup Scoring.php
..

Rename and cleanup Scoring.php

Bug: T184142
Change-Id: Ic756af5f7978e8fa8db464dbd17698b6ff15cd2f
---
M includes/FetchScoreJob.php
M includes/Hooks.php
M includes/Hooks/ApiHooksHandler.php
M includes/Parser/ScoreParser.php
R includes/ScoreFetcher.php
A includes/ScoreLookup.php
M maintenance/PopulateDatabase.php
R tests/phpunit/includes/ScoreFetcherTest.php
8 files changed, 80 insertions(+), 38 deletions(-)


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

diff --git a/includes/FetchScoreJob.php b/includes/FetchScoreJob.php
index 83e831d..6bdc88b 100644
--- a/includes/FetchScoreJob.php
+++ b/includes/FetchScoreJob.php
@@ -68,7 +68,7 @@
}
 
$logger->info( 'Fetching scores for revision ' . json_encode( 
$this->params ) );
-   $scoring = Scoring::instance();
+   $scoring = ScoreFetcher::instance();
if ( isset( $this->params['originalRequest'] ) ) {
$scoring->setOriginalRequest( 
$this->params['originalRequest'] );
}
@@ -77,14 +77,14 @@
} else {
$models = null;
}
-   $scores = $scoring->getScores( $this->params['revid'], $models, 
$this->params['extra_params'] );
+   $scores = $scoring->getScores( $this->params['revid'], $models, 
$this->params['precache'] );
$scoreStorage = MediaWikiServices::getInstance()->getService( 
'ORESScoreStorage' );
 
$success = true;
$scoreStorage->storeScores(
$scores,
function ( $mssg, $revision ) use ( &$success, $logger 
) {
-   $logger->warning( "Scoring errored for 
$revision: $mssg\n" );
+   $logger->warning( "ScoreFetcher errored for 
$revision: $mssg\n" );
$success = false;
}
);
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 9e4d751..f0161cf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -102,7 +102,7 @@
'userAgent' => $request->getHeader( 
'User-Agent' ),
],
'models' => $models,
-   'extra_params' => [ 'precache' => 'true' ],
+   'precache' => true,
] );
JobQueueGroup::singleton()->push( $job );
$logger->debug( 'Job pushed for {revid}', [
diff --git a/includes/Hooks/ApiHooksHandler.php 
b/includes/Hooks/ApiHooksHandler.php
index a1ea636..cc43094 100644
--- a/includes/Hooks/ApiHooksHandler.php
+++ b/includes/Hooks/ApiHooksHandler.php
@@ -35,7 +35,7 @@
 use ORES\FetchScoreJob;
 use ORES\Hooks;
 use ORES\Parser\ScoreParser;
-use ORES\Scoring;
+use ORES\ScoreFetcher;
 use ORES\WatchedItemQueryServiceExtension;
 use RequestContext;
 use Title;
@@ -322,7 +322,7 @@
}
}
 
-   $loadedScores = Scoring::instance()->getScores( $revids 
);
+   $loadedScores = ScoreFetcher::instance()->getScores( 
$revids );
 
// Filter loaded scores to store cacheable ones
$cacheableScores = array_intersect_key( $loadedScores, 
array_flip( $cacheableRevids ) );
@@ -361,7 +361,7 @@
} catch ( InvalidArgumentException $exception ) {
$logger = LoggerFactory::getInstance( 'ORES' );
$mssg = $exception->getMessage();
-   $logger->info( "Scoring errored for $revid: $mssg\n" );
+   $logger->info( "ScoreFetcher errored for $revid: 
$mssg\n" );
return [];
}
$scores = [];
diff --git a/includes/Parser/ScoreParser.php b/includes/Parser/ScoreParser.php
index 7075d2a..65e4597 100644
--- a/includes/Parser/ScoreParser.php
+++ b/includes/Parser/ScoreParser.php
@@ -37,11 +37,11 @@
}
 
/**
-* Convert data returned by Scoring::getScores() into 
ores_classification rows
+* Convert data returned by ScoreFetcher::getScores() into 
ores_classification rows
 *
 * @note No row is generated for class 0
 * @param int $revision Revision being processed
-* @param array $revisionData Data returned by Scoring::getScores() for 
the revision.
+* @param array $revisionData Data returned by 
ScoreFetcher::getScores() for the revision.
 *
 * @return array[]
 * @throws RuntimeException
diff --git a/includes/Scoring.php

[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: Putting MassMessage Extension in PHP namespace MediaWiki\Mas...

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Putting MassMessage Extension in PHP namespace 
MediaWiki\MassMessage
..


Putting MassMessage Extension in PHP namespace MediaWiki\MassMessage

Considering the Outreachy/15 project for refactoring MassMessage
Extension (see here: T178431), putting
the extension in a PHP namespace is one of the todos.

Bug: T178215
Change-Id: I370f865f04571dccca52cc1edbc3d00cf003bc51
---
M MassMessage.hooks.php
M extension.json
M includes/ApiEditMassMessageList.php
M includes/ApiMassMessage.php
M includes/ApiQueryMMSites.php
M includes/MassMessage.php
M includes/MassMessageTargets.php
M includes/SpecialCreateMassMessageList.php
M includes/SpecialEditMassMessageList.php
M includes/SpecialMassMessage.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
M includes/content/MassMessageListDiffEngine.php
M includes/job/MassMessageJob.php
M includes/job/MassMessageServerSideJob.php
M includes/job/MassMessageSubmitJob.php
M includes/logging/MassMessageFailureLogFormatter.php
M includes/logging/MassMessageSendLogFormatter.php
M includes/logging/MassMessageSkipLogFormatter.php
M maintenance/sendMessages.php
M tests/phpunit/MassMessageApiTestCase.php
M tests/phpunit/MassMessageTargetsTest.php
M tests/phpunit/MassMessageTest.php
M tests/phpunit/MassMessageTestCase.php
M tests/phpunit/api/ApiEditMassMessageListTest.php
M tests/phpunit/api/ApiMassMessageTest.php
M tests/phpunit/api/ApiQueryMMSitesTest.php
M tests/phpunit/content/MassMessageContentHandlerTest.php
M tests/phpunit/content/MassMessageContentTest.php
M tests/phpunit/job/MassMessageJobTest.php
M tests/phpunit/job/MassMessageSubmitJobTest.php
31 files changed, 310 insertions(+), 85 deletions(-)

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



diff --git a/MassMessage.hooks.php b/MassMessage.hooks.php
index db2a4af..15da813 100644
--- a/MassMessage.hooks.php
+++ b/MassMessage.hooks.php
@@ -4,6 +4,15 @@
  * Hooks!
  */
 
+namespace MediaWiki\MassMessage;
+
+use SpecialPage;
+use OutputPage;
+use Parser;
+use Skin;
+use EchoEvent;
+use User;
+
 class MassMessageHooks {
 
/**
@@ -12,7 +21,8 @@
 * @return bool
 */
public static function onParserFirstCallInit( Parser &$parser ) {
-   $parser->setFunctionHook( 'target', 
'MassMessageHooks::outputParserFunction' );
+   $parser->setFunctionHook( 'target',
+   
'MediaWiki\\MassMessage\\MassMessageHooks::outputParserFunction' );
return true;
}
 
diff --git a/extension.json b/extension.json
index eac1821..91c79ec 100644
--- a/extension.json
+++ b/extension.json
@@ -31,14 +31,14 @@
"MassMessageMagic": "MassMessage.i18n.magic.php"
},
"APIModules": {
-   "massmessage": "ApiMassMessage",
-   "editmassmessagelist": "ApiEditMassMessageList"
+   "massmessage": "MediaWiki\\MassMessage\\ApiMassMessage",
+   "editmassmessagelist": 
"MediaWiki\\MassMessage\\ApiEditMassMessageList"
},
"LogTypes": [
"massmessage"
],
"APIListModules": {
-   "mmsites": "ApiQueryMMSites"
+   "mmsites": "MediaWiki\\MassMessage\\ApiQueryMMSites"
},
"MessagesDirs": {
"MassMessage": [
@@ -52,38 +52,38 @@
},
"Hooks": {
"ParserFirstCallInit": [
-   "MassMessageHooks::onParserFirstCallInit"
+   
"MediaWiki\\MassMessage\\MassMessageHooks::onParserFirstCallInit"
],
"SpecialStatsAddExtra": [
-   "MassMessageHooks::onSpecialStatsAddExtra"
+   
"MediaWiki\\MassMessage\\MassMessageHooks::onSpecialStatsAddExtra"
],
"APIQuerySiteInfoStatisticsInfo": [
-   "MassMessageHooks::onAPIQuerySiteInfoStatisticsInfo"
+   
"MediaWiki\\MassMessage\\MassMessageHooks::onAPIQuerySiteInfoStatisticsInfo"
],
"RenameUserPreRename": [
-   "MassMessageHooks::onRenameUserPreRename"
+   
"MediaWiki\\MassMessage\\MassMessageHooks::onRenameUserPreRename"
],
"UserGetReservedNames": [
-   "MassMessageHooks::onUserGetReservedNames"
+   
"MediaWiki\\MassMessage\\MassMessageHooks::onUserGetReservedNames"
],
"BeforeEchoEventInsert": [
-   "MassMessageHooks::onBeforeEchoEventInsert"
+   
"MediaWiki\\MassMessage\\MassMessageHooks::onBeforeEchoEventInsert"
],
"SkinTemplateNavigation": [
-

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add sniff to use namespaced PHPUnit\Framework\TestCase

2018-01-03 Thread Legoktm (Code Review)

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

Change subject: Add sniff to use namespaced PHPUnit\Framework\TestCase
..

Add sniff to use namespaced PHPUnit\Framework\TestCase

PHPUnit 6 introduced namespaces, but those changes were backported to
PHPUnit 4 to make the migration easier.

In preparation for the PHPUnit version upgrade, move to the namespaced
version. This requires a minimum of PHPUnit 4.8.35/5.4.3, which
MediaWiki has been using for a while now.

Bug: T184137
Change-Id: I1021dba1a74a4afcf2aa4fe33232e06fdedf271f
---
A MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
M MediaWiki/Tests/MediaWikiStandardTest.php
A MediaWiki/Tests/files/Usage/phpunit_usage.php
A MediaWiki/Tests/files/Usage/phpunit_usage.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage.php.fixed
A MediaWiki/Tests/files/Usage/phpunit_usage2.php
A MediaWiki/Tests/files/Usage/phpunit_usage2.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage2.php.fixed
A MediaWiki/Tests/files/Usage/phpunit_usage3.php
A MediaWiki/Tests/files/Usage/phpunit_usage3.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage3.php.fixed
M composer.json
12 files changed, 161 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/23/401823/1

diff --git a/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php 
b/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
new file mode 100644
index 000..4c646be
--- /dev/null
+++ b/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
@@ -0,0 +1,78 @@
+
+ *
+ * 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.
+ *
+ */
+
+namespace MediaWiki\Sniffs\Usage;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Converts PHPUnit_Framework_TestCase to the new
+ * PHPUnit 6 namespaced PHPUnit\Framework\Testcase
+ *
+ * The namespaced classes were backported in 4.8.35,
+ * so this is compatible with 4.8.35+ and 5.4.3+
+ */
+class PHPUnitClassUsageSniff implements Sniff {
+   /**
+* Only look for classes that extend something
+*
+* @return array|int[]
+*/
+   public function register() {
+   return [ T_EXTENDS ];
+   }
+
+   /**
+* @param File $phpcsFile File object
+* @param int $stackPtr Position of extends token
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $tokens = $phpcsFile->getTokens();
+   $classPtr = $phpcsFile->findPrevious( T_CLASS, $stackPtr );
+   if ( $classPtr === false ) {
+   // interface Foo extends .. which we don't care about
+   return;
+   }
+   $phpunitPtr = $phpcsFile->findNext( T_STRING, $stackPtr );
+   $phpunitToken = $tokens[$phpunitPtr];
+   if ( $phpunitToken['content'] !== 'PHPUnit_Framework_TestCase' 
) {
+   return;
+   }
+
+   $fix = $phpcsFile->addFixableWarning(
+   'Namespaced PHPUnit TestCase class should be used 
instead',
+   $phpunitPtr,
+   'NotNamespaced'
+   );
+   if ( $fix ) {
+   $new = 'PHPUnit\\Framework\\TestCase';
+   // If this file is namespaced, we need a leading \
+   $inANamespace = $phpcsFile->findPrevious( T_NAMESPACE, 
$classPtr ) !== false;
+   $classNameWithSlash = 
$phpcsFile->findExtendedClassName( $classPtr );
+   // But make sure it doesn't already have a slash...
+   $hashLeadingSlash = $classNameWithSlash[0] === '\\';
+   if ( $inANamespace && !$hashLeadingSlash ) {
+   $new = '\\' . $new;
+   }
+   $phpcsFile->fixer->replaceToken( $phpunitPtr, $new );
+   }
+   }
+}
diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 8a28bb3..b1295af 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -20,7 +20,7 @@
 
 namespace

[MediaWiki-commits] [Gerrit] research...wheels[master]: Rebuilds wheels using Debian Stretch

2018-01-03 Thread Halfak (Code Review)

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

Change subject: Rebuilds wheels using Debian Stretch
..

Rebuilds wheels using Debian Stretch

Change-Id: I7424733b19e05f1f1d03666b4be8bb9a9531c31e
---
R Flask-0.10.1-cp35-none-any.whl
A Flask_Jsonpify-1.5.0-cp35-none-any.whl
D Flask_Jsonpify-1.5.0-py3-none-any.whl
A Jinja2-2.10-py2.py3-none-any.whl
D Jinja2-2.9.6-py2.py3-none-any.whl
D MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl
A MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl
R PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
D Werkzeug-0.12.2-py2.py3-none-any.whl
A Werkzeug-0.14.1-py2.py3-none-any.whl
D amqp-1.4.9-py2.py3-none-any.whl
A amqp-2.2.2-py2.py3-none-any.whl
A anyjson-0.3.3-cp35-none-any.whl
D anyjson-0.3.3-py3-none-any.whl
D billiard-3.3.0.23-py3-none-any.whl
A billiard-3.5.0.3-py3-none-any.whl
D celery-3.1.25-py2.py3-none-any.whl
A celery-4.1.0-py2.py3-none-any.whl
A certifi-2017.11.5-py2.py3-none-any.whl
D certifi-2017.7.27.1-py2.py3-none-any.whl
M docopt-0.6.2-py2.py3-none-any.whl
A docutils-0.14-py3-none-any.whl
R itsdangerous-0.24-cp35-none-any.whl
A json2tsv-0.1.2-py2.py3-none-any.whl
D kombu-3.0.37-py2.py3-none-any.whl
A kombu-4.1.0-py2.py3-none-any.whl
D mmh3-2.3.1-cp34-cp34m-linux_x86_64.whl
A mmh3-2.3.1-cp35-cp35m-linux_x86_64.whl
R more_itertools-2.2-cp35-none-any.whl
A mwbase-0.0.6-py3-none-any.whl
D mwparserfromhell-0.4.4-cp34-cp34m-linux_x86_64.whl
A mwparserfromhell-0.4.4-cp35-cp35m-linux_x86_64.whl
A mwreverts-0.0.6-py2.py3-none-any.whl
D mwreverts-0.1.5-py2.py3-none-any.whl
D mysqltsv-0.0.7-cp34-none-any.whl
A mysqltsv-0.0.7-cp35-none-any.whl
R nltk-3.0.5-cp35-none-any.whl
D nose-1.3.7-py3-none-any.whl
R numpy-1.10.4-cp35-cp35m-manylinux1_x86_64.whl
A para-0.0.5-cp35-none-any.whl
D para-0.0.6-py3-none-any.whl
D pip-9.0.1-py2.py3-none-any.whl
A py-1.5.2-py2.py3-none-any.whl
R pyenchant-1.6.11-cp35-none-any.whl
A pytest-3.2.5-py2.py3-none-any.whl
D revscoring-2.0.10-py2.py3-none-any.whl
A revscoring-2.1.0-py2.py3-none-any.whl
D scikit_learn-0.17.1-cp34-cp34m-manylinux1_x86_64.whl
A scikit_learn-0.17.1-cp35-cp35m-manylinux1_x86_64.whl
D scipy-0.17.1-cp34-cp34m-manylinux1_x86_64.whl
A scipy-0.17.1-cp35-cp35m-manylinux1_x86_64.whl
A socketIO_client-0.5.6-cp35-none-any.whl
A sseclient-0.0.18-cp35-none-any.whl
D sseclient-0.0.18-py3-none-any.whl
A statistics-1.0.3.5-cp35-none-any.whl
D statsd-3.2.1-py2.py3-none-any.whl
A statsd-3.2.2-py2.py3-none-any.whl
A stopit-1.1.1-cp35-none-any.whl
D stopit-1.1.1-py3-none-any.whl
R textstat-0.3.1-cp35-none-any.whl
A vine-1.1.4-py2.py3-none-any.whl
A websocket_client-0.46.0-py2.py3-none-any.whl
62 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/22/401822/1

diff --git a/Flask-0.10.1-py3-none-any.whl b/Flask-0.10.1-cp35-none-any.whl
similarity index 93%
rename from Flask-0.10.1-py3-none-any.whl
rename to Flask-0.10.1-cp35-none-any.whl
index 12109b9..b8e0ef5 100644
--- a/Flask-0.10.1-py3-none-any.whl
+++ b/Flask-0.10.1-cp35-none-any.whl
Binary files differ
diff --git a/Flask_Jsonpify-1.5.0-cp35-none-any.whl 
b/Flask_Jsonpify-1.5.0-cp35-none-any.whl
new file mode 100644
index 000..d4784b4
--- /dev/null
+++ b/Flask_Jsonpify-1.5.0-cp35-none-any.whl
Binary files differ
diff --git a/Flask_Jsonpify-1.5.0-py3-none-any.whl 
b/Flask_Jsonpify-1.5.0-py3-none-any.whl
deleted file mode 100644
index de8c6bb..000
--- a/Flask_Jsonpify-1.5.0-py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/Jinja2-2.10-py2.py3-none-any.whl b/Jinja2-2.10-py2.py3-none-any.whl
new file mode 100644
index 000..7bc4e35
--- /dev/null
+++ b/Jinja2-2.10-py2.py3-none-any.whl
Binary files differ
diff --git a/Jinja2-2.9.6-py2.py3-none-any.whl 
b/Jinja2-2.9.6-py2.py3-none-any.whl
deleted file mode 100644
index 9fb201e..000
--- a/Jinja2-2.9.6-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl 
b/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl
deleted file mode 100644
index ed26616..000
--- a/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl
+++ /dev/null
Binary files differ
diff --git a/MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl 
b/MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl
new file mode 100644
index 000..7041c1b
--- /dev/null
+++ b/MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl
Binary files differ
diff --git a/PyYAML-3.11-cp34-cp34m-linux_x86_64.whl 
b/PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
similarity index 87%
rename from PyYAML-3.11-cp34-cp34m-linux_x86_64.whl
rename to PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
index 5f249f6..bc62a30 100644
--- a/PyYAML-3.11-cp34-cp34m-linux_x86_64.whl
+++ b/PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
Binary files differ
diff --git a/Werkzeug-0.12.2-py2.py3-none-any.whl 
b/Werkzeug-0.12.2-py2.py3-none-any.whl
deleted file mode 100644
index 9a81bf8..000
--- a/Werkzeug-0.12.2-py2.py3-none-any.whl
+++ /dev/null

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Switch to using PreferencesFactory, and improve UI

2018-01-03 Thread jenkins-bot (Code Review)

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

Change subject: Switch to using PreferencesFactory, and improve UI
..


Switch to using PreferencesFactory, and improve UI

This refactors the extension to use the new PreferencesFactory
service and moves each preference's 'enable this globally?'
toggle to the side of the preferences form to make it easier to
see what's enabled and what's not. It also introduces a
'select-all' toggle for each tab of the preferences form.

Bug: T173476
Bug: T68869
Change-Id: I3c10dfeacf02367e90f84a3e572ecf3f4048e02a
---
M .stylelintrc.json
M extension.json
M i18n/en.json
M i18n/qqq.json
D includes/GlobalPreferences.php
A includes/GlobalPreferencesFactory.php
A includes/GlobalPreferencesForm.php
M includes/Hooks.php
M includes/SpecialGlobalPreferences.php
A includes/Storage.php
M resources/ext.GlobalPreferences.special.css
M resources/ext.GlobalPreferences.special.js
M resources/ext.GlobalPreferences.special.nojs.css
A tests/phpunit/GlobalPreferencesTest.php
14 files changed, 781 insertions(+), 363 deletions(-)

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



diff --git a/.stylelintrc.json b/.stylelintrc.json
index 2c90730..d691e9d 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,3 +1,6 @@
 {
-   "extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia",
+   "rules": {
+   "selector-no-id": null
+   }
 }
diff --git a/extension.json b/extension.json
index 8245339..4824a25 100644
--- a/extension.json
+++ b/extension.json
@@ -23,9 +23,11 @@
"GlobalPreferencesAlias": "GlobalPreferences.alias.php"
},
"AutoloadClasses": {
-   "GlobalPreferences\\GlobalPreferences": 
"includes/GlobalPreferences.php",
"GlobalPreferences\\Hooks": "includes/Hooks.php",
-   "GlobalPreferences\\SpecialGlobalPreferences": 
"includes/SpecialGlobalPreferences.php"
+   "GlobalPreferences\\SpecialGlobalPreferences": 
"includes/SpecialGlobalPreferences.php",
+   "GlobalPreferences\\GlobalPreferencesFactory": 
"includes/GlobalPreferencesFactory.php",
+   "GlobalPreferences\\GlobalPreferencesForm": 
"includes/GlobalPreferencesForm.php",
+   "GlobalPreferences\\Storage": "includes/Storage.php"
},
"Hooks": {
"UserLoadOptions": [
@@ -39,11 +41,11 @@
],
"LoadExtensionSchemaUpdates": [
"GlobalPreferences\\Hooks::onLoadExtensionSchemaUpdates"
+   ],
+   "MediaWikiServices": [
+   "GlobalPreferences\\Hooks::onMediaWikiServices"
]
},
-   "ExtensionFunctions": [
-   "GlobalPreferences\\Hooks::onExtensionFunctions"
-   ],
"ResourceFileModulePaths": {
"localBasePath": "resources",
"remoteExtPath": "GlobalPreferences/resources"
@@ -51,7 +53,8 @@
"ResourceModules": {
"ext.GlobalPreferences.special": {
"styles": "ext.GlobalPreferences.special.css",
-   "scripts": "ext.GlobalPreferences.special.js"
+   "scripts": "ext.GlobalPreferences.special.js",
+   "messages": [ "globalprefs-select-all" ]
},
"ext.GlobalPreferences.special.nojs": {
"styles": "ext.GlobalPreferences.special.nojs.css"
diff --git a/i18n/en.json b/i18n/en.json
index 0e37692..119902e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,13 +5,14 @@
]
},
"globalprefs-desc": "Allows users to set global preferences",
-   "globalprefs-set-globally": "This preference has been set globally and 
must be modified through [[Special:GlobalPreferences|your global 
preferences]].",
-   "globalprefs-check-label": "Use this preference on all wikis",
+   "globalprefs-set-globally": "This preference has been set globally and 
must be modified through [[Special:GlobalPreferences#$1|your global 
preferences]].",
+   "tooltip-globalprefs-check-label": "Make this setting global",
"globalprefs-error-header": "Error",
"globalprefs-notglobal": "Your account is not a global account and 
cannot set global preferences.",
"globalpreferences": "Global preferences",
"globalprefs-info-label": "Global preferences:",
"globalprefs-info-link": "Set your global preferences",
"globalprefs-reset-intro": "You can use this page to disable all global 
preferences and return to your local preferences.\nThis cannot be undone.",
-   "globalprefs-restoreprefs": "Remove all global preferences (in all 
sections)"
+   "globalprefs-restoreprefs": "Remove all global preferences (in all 
sections)",
+

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Add debugging information to flakey test

2018-01-03 Thread Jdlrobson (Code Review)

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

Change subject: Add debugging information to flakey test
..

Add debugging information to flakey test

Occasionally for unknown reasons this test fails to make an assertion.
Rather than doing that we'll make an assertion that always fails with the 
exception
that caused it. This should help us identify and fix the culprit.

Bug: T179959
Change-Id: I0c1d57dd0292bef605f05a22f984cd81b0131a96
---
M tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git 
a/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js 
b/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
index 79511ca..21ec573 100644
--- a/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
+++ b/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
@@ -69,7 +69,9 @@
return referencesGateway.getReference( '#cite_note-1', page 
).always( function () {
return referencesGateway.getReference( '#cite_note-2', 
page ).done( function ( ref ) {
assert.strictEqual( ref.text, 'real lazy 2' );
-   } );
+   } ).catch( function ( err ) {
+   assert.ok( false, err );
+   } )
} );
} );
 

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

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

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

1 2 3 4 >

1 - 100 of 365 matches

Mail list logo