date:20170405

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

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db2047"
..


Revert "db-eqiad.php: Depool db2047"

This reverts commit 3ba4a8029df8e37bb0edf5cfa2fd318b890a77b2.

Change-Id: I44c6d12cb24338c970c88ea5e6f82590d00d3acf
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 24ed8ae..1f7e24b 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -145,7 +145,7 @@
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
'db2040' => 200, # C6 2.9TB 160GB, rc, log
-#  'db2047' => 400, # C6 2.9TB 160GB #T160390
+   'db2047' => 400, # C6 2.9TB 160GB
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
'db2068' => 300, # D6 3.3TB 160GB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44c6d12cb24338c970c88ea5e6f82590d00d3acf
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

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

2017-04-05 Thread Marostegui (Code Review)

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db2047"
..

Revert "db-eqiad.php: Depool db2047"

This reverts commit 3ba4a8029df8e37bb0edf5cfa2fd318b890a77b2.

Change-Id: I44c6d12cb24338c970c88ea5e6f82590d00d3acf
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 24ed8ae..1f7e24b 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -145,7 +145,7 @@
's7' => [
'db2029' => 0,   # B6 2.9TB  96GB, master
'db2040' => 200, # C6 2.9TB 160GB, rc, log
-#  'db2047' => 400, # C6 2.9TB 160GB #T160390
+   'db2047' => 400, # C6 2.9TB 160GB
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
'db2068' => 300, # D6 3.3TB 160GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44c6d12cb24338c970c88ea5e6f82590d00d3acf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Allow mw.config and mediaWiki.config in tests

2017-04-05 Thread Fomafix (Code Review)

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

Change subject: Allow mw.config and mediaWiki.config in tests
..

Allow mw.config and mediaWiki.config in tests

This change is needed for I2694d8289d8e154b3aef7b54a23a8a6f114074e3 in core.

Change-Id: Ic2699223e45c2065638fdaf8d87ca470a8fd92d1
---
M client/tests/phpunit/includes/Modules/SiteModuleTest.php
M lib/tests/phpunit/Modules/RepoAccessModuleTest.php
M lib/tests/phpunit/Modules/SitesModuleTest.php
M lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
M repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
5 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/client/tests/phpunit/includes/Modules/SiteModuleTest.php 
b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
index b24b956..2f4a3e1 100644
--- a/client/tests/phpunit/includes/Modules/SiteModuleTest.php
+++ b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
@@ -29,7 +29,7 @@
public function testGetScript() {
$module = new SiteModule();
$script = $module->getScript( $this->getContext() );
-   $this->assertStringStartsWith( 
'mw.config.set({"wbCurrentSite":', $script );
+   $this->assertContains( '.config.set({"wbCurrentSite":', $script 
);
$this->assertStringEndsWith( '});', $script );
}
 
diff --git a/lib/tests/phpunit/Modules/RepoAccessModuleTest.php 
b/lib/tests/phpunit/Modules/RepoAccessModuleTest.php
index 1fb31f9..98c2033 100644
--- a/lib/tests/phpunit/Modules/RepoAccessModuleTest.php
+++ b/lib/tests/phpunit/Modules/RepoAccessModuleTest.php
@@ -28,7 +28,7 @@
public function testGetScript() {
$module = new RepoAccessModule();
$script = $module->getScript( $this->getContext() );
-   $this->assertStringStartsWith( 'mw.config.set({"wbRepo":', 
$script );
+   $this->assertContains( '.config.set({"wbRepo":', $script );
$this->assertStringEndsWith( '});', $script );
}
 
diff --git a/lib/tests/phpunit/Modules/SitesModuleTest.php 
b/lib/tests/phpunit/Modules/SitesModuleTest.php
index c222570..6117562 100644
--- a/lib/tests/phpunit/Modules/SitesModuleTest.php
+++ b/lib/tests/phpunit/Modules/SitesModuleTest.php
@@ -37,7 +37,7 @@
public function testGetScript() {
$module = new SitesModule();
$script = $module->getScript( $this->getContext() );
-   $this->assertStringStartsWith( 
'mw.config.set({"wbSiteDetails":', $script );
+   $this->assertContains( '.config.set({"wbSiteDetails":', $script 
);
$this->assertStringEndsWith( '});', $script );
}
 
diff --git a/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php 
b/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
index 18e4694..1aaef2d 100644
--- a/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
+++ b/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
@@ -67,7 +67,7 @@
 
$result = $worker->getScript( $languageCode );
 
-   $this->assertEquals( 'mw.config.set({"wbSiteDetails":' . 
$expected . '});', $result );
+   $this->assertContains( '.config.set({"wbSiteDetails":' . 
$expected . '});', $result );
}
 
public function getScriptProvider() {
diff --git a/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php 
b/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
index 7f98725..b3d5916 100644
--- a/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
+++ b/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
@@ -31,7 +31,7 @@
->method( $this->anything() );
 
$script = $this->newInstance()->getScript( $context );
-   $this->assertStringStartsWith( 'mw.config.set({', $script );
+   $this->assertContains( '.config.set({', $script );
$this->assertContains( 'dummyKey', $script );
$this->assertContains( 'dummyValue', $script );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2699223e45c2065638fdaf8d87ca470a8fd92d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

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

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db1070"
..


Revert "db-eqiad.php: Depool db1070"

This reverts commit 001b454df239f248a66bf8188da2577ff79ea5bb.

Change-Id: I27d206100d72eef9ba3b55730020193c1b1efce8
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 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 3c7fc54..f9774f5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -141,10 +141,10 @@
'db1049' => 0,   # B1 2.8TB  64GB, master
'db1026' => 1,   # B1 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1045' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-#  'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump #ROW based 
replication - master for db1095 #T137191
-   'db1071' => 50,  # D1 2.8TB 160GB, api #temporary vslow - 
#T137191
+   'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump #ROW based 
replication - master for db1095 #T137191
+   'db1071' => 50,  # D1 2.8TB 160GB, api
'db1082' => 300, # A2 3.6TB 512GB, api
-   'db1087' => 200, # C2 3.6TB 512GB #temporary api - #T137191
+   'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
],
's6' => [
@@ -352,13 +352,13 @@
],
's5' => [
'vslow' => [
-   'db1071' => 1,
+   'db1070' => 1,
],
'dump' => [
-   'db1071' => 1,
+   'db1070' => 1,
],
'api' => [
-   'db1087' => 1,
+   'db1071' => 1,
'db1082' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27d206100d72eef9ba3b55730020193c1b1efce8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Organize examples into their own directory

2017-04-05 Thread Awight (Code Review)

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

Change subject: Organize examples into their own directory
..

Organize examples into their own directory

Change-Id: I4635c1a1aa1b6ea6bba9e70b335319a874b1d9d4
---
R examples/job.example.yaml
R examples/process-control.example.yaml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/88/346688/1

diff --git a/job.example.yaml b/examples/job.example.yaml
similarity index 91%
rename from job.example.yaml
rename to examples/job.example.yaml
index 523bcd4..233a01d 100644
--- a/job.example.yaml
+++ b/examples/job.example.yaml
@@ -1,5 +1,5 @@
-# Copy this job to your configured `job_directory` and give it a name, like
-# `purge_binge.yaml`.
+# Copy this job to /var/lib/process-control/ or your configured `job_directory`
+# and give name it according to the job, like `purge_binge.yaml`.
 
 #
 # Verbose job name.  The short, machine name is taken from the base file name.
diff --git a/process-control.example.yaml 
b/examples/process-control.example.yaml
similarity index 100%
rename from process-control.example.yaml
rename to examples/process-control.example.yaml

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4635c1a1aa1b6ea6bba9e70b335319a874b1d9d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

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

2017-04-05 Thread Marostegui (Code Review)

Hello Florianschmidtwelzow, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1070"
..

Revert "db-eqiad.php: Depool db1070"

This reverts commit 001b454df239f248a66bf8188da2577ff79ea5bb.

Change-Id: I27d206100d72eef9ba3b55730020193c1b1efce8
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 981bec3..e05d8ac 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -141,10 +141,10 @@
'db1049' => 0,   # B1 2.8TB  64GB, master
'db1026' => 1,   # B1 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1045' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-#  'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump #ROW based 
replication - master for db1095 #T137191
-   'db1071' => 50,  # D1 2.8TB 160GB, api #temporary vslow - 
#T137191
+   'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump #ROW based 
replication - master for db1095 #T137191
+   'db1071' => 50,  # D1 2.8TB 160GB, api
'db1082' => 300, # A2 3.6TB 512GB, api
-   'db1087' => 200, # C2 3.6TB 512GB #temporary api - #T137191
+   'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
],
's6' => [
@@ -352,13 +352,13 @@
],
's5' => [
'vslow' => [
-   'db1071' => 1,
+   'db1070' => 1,
],
'dump' => [
-   'db1071' => 1,
+   'db1070' => 1,
],
'api' => [
-   'db1087' => 1,
+   'db1071' => 1,
'db1082' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27d206100d72eef9ba3b55730020193c1b1efce8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Rename test to match new class name

2017-04-05 Thread Awight (Code Review)

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

Change subject: Rename test to match new class name
..

Rename test to match new class name

Change-Id: I80f29574c96d94e92290066422f33378752d05d0
---
R tests/test_runner.py
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/86/346686/1

diff --git a/tests/test_job_runner.py b/tests/test_runner.py
similarity index 100%
rename from tests/test_job_runner.py
rename to tests/test_runner.py

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80f29574c96d94e92290066422f33378752d05d0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update: [Wikipedia Android] mark wikidata description guide ...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Update: [Wikipedia Android] mark wikidata description guide url 
optional
..


Update: [Wikipedia Android] mark wikidata description guide url optional

Bug: T156405
Change-Id: I0c4fad73105047fa8d2042e6599eba636d14018f
---
M groups/Wikimedia/WikimediaMobile-android.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml 
b/groups/Wikimedia/WikimediaMobile-android.yaml
index c946a67..9021dbf 100644
--- a/groups/Wikimedia/WikimediaMobile-android.yaml
+++ b/groups/Wikimedia/WikimediaMobile-android.yaml
@@ -57,3 +57,4 @@
   optional:
 - wikipedia-android-strings-privacy_policy_url
 - wikipedia-android-strings-terms_of_use_url
+- wikipedia-android-strings-wikidata_description_guide_url

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c4fad73105047fa8d2042e6599eba636d14018f
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Sniedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: make logfile path statically

2017-04-05 Thread Awight (Code Review)

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

Change subject: make logfile path statically
..

make logfile path statically

This would be useful for reuse.

Change-Id: Ic096594a7d90cf64ed9dae35ac73cb8ef4c222c0
---
M processcontrol/output_streamer.py
1 file changed, 17 insertions(+), 17 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/80/346680/1

diff --git a/processcontrol/output_streamer.py 
b/processcontrol/output_streamer.py
index ba77ede..4735580 100644
--- a/processcontrol/output_streamer.py
+++ b/processcontrol/output_streamer.py
@@ -7,6 +7,22 @@
 from . import config
 
 
+def make_logfile_path(slug, start_time):
+"""
+Makes the output file path and creates parent directory if needed
+"""
+output_directory = config.GlobalConfiguration().get("output_directory")
+assert os.access(output_directory, os.W_OK)
+
+# per-job directory
+job_log_directory = output_directory + "/" + slug
+if not os.path.exists(job_log_directory):
+os.makedirs(job_log_directory)
+
+timestamp = start_time.strftime("%Y%m%d-%H%M%S")
+return "{logdir}/{name}-{timestamp}.log".format(logdir=job_log_directory, 
name=slug, timestamp=timestamp)
+
+
 class OutputStreamer(object):
 
 def __init__(self, process, slug, start_time):
@@ -14,8 +30,7 @@
 self.err_stream = process.stderr
 self.pid = process.pid
 self.slug = slug
-self.start_time = start_time
-self.filename = self.make_logfile_path()
+self.filename = make_logfile_path(slug, start_time)
 self.logger = None
 self.threads = {}
 self.log_handlers = []
@@ -46,21 +61,6 @@
 self.logger.error(line)
 else:
 self.logger.info(line)
-
-def make_logfile_path(self):
-"""
-Makes the output file path and creates parent directory if needed
-"""
-output_directory = config.GlobalConfiguration().get("output_directory")
-assert os.access(output_directory, os.W_OK)
-
-# per-job directory
-job_directory = output_directory + "/" + self.slug
-if not os.path.exists(job_directory):
-os.makedirs(job_directory)
-
-timestamp = self.start_time.strftime("%Y%m%d-%H%M%S")
-return "{logdir}/{name}-{timestamp}.log".format(logdir=job_directory, 
name=self.slug, timestamp=timestamp)
 
 def init_logger(self):
 if self.logger is not None:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic096594a7d90cf64ed9dae35ac73cb8ef4c222c0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Call a slug what it is

2017-04-05 Thread Awight (Code Review)

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

Change subject: Call a slug what it is
..

Call a slug what it is

Change-Id: Ibe004d848462e58b0fabc974de9474ecf9dd29de
---
M bin/run-job
1 file changed, 10 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/79/346679/1

diff --git a/bin/run-job b/bin/run-job
index eec5f9f..7df6344 100755
--- a/bin/run-job
+++ b/bin/run-job
@@ -10,10 +10,12 @@
 
 
 def list_jobs():
-   for job_name in job_spec.list():
+   for job_slug in job_spec.list():
try:
-   job = job_spec.load(job_name)
-   message = "{job} - {human_name}".format(job=job_name, 
human_name=job.name)
+   # FIXME: Nicer if this inner loop moved to Job rather 
than having
+   # status come from an ephemeral runner.
+   job = job_spec.load(job_slug)
+   message = "{job} - {name}".format(job=job_slug, 
name=job.name)
status = runner.JobRunner(job).status()
if status is not None:
message += "" + yaml.dump(status).strip()
@@ -22,14 +24,17 @@
if job.description is not None:
message += "\n" + job.description
except AssertionError:
-   message = "{job} ***Invalid 
configuration***".format(job=job_name)
+   message = "{job} ***Invalid 
configuration***".format(job=job_slug)
print(message)
 
 
 if __name__ == "__main__":
-   parser = argparse.ArgumentParser(description="Run and maintain 
process-control jobs.")
+   # TODO: Change the function name or move responsibilities beyond "run" 
to a
+   # new script.
+   parser = argparse.ArgumentParser(description="Run or query 
`process-control` jobs.")
parser.add_argument("-j", "--job", help="Run a given job.", type=str)
parser.add_argument("-l", "--list-jobs", help="Print a summary of 
available jobs.", action='store_true')
+   # TODO: --kill-job, --disable-group, --enable-group
args = parser.parse_args()
 
if args.job:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe004d848462e58b0fabc974de9474ecf9dd29de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Log actual commandline rather than redundant parent job slug.

2017-04-05 Thread Awight (Code Review)

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

Change subject: Log actual commandline rather than redundant parent job slug.
..

Log actual commandline rather than redundant parent job slug.

Change-Id: I2e57112fa528037a0db16f9389bc4320eaf528f9
---
M processcontrol/output_streamer.py
M processcontrol/runner.py
2 files changed, 12 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/81/346681/1

diff --git a/processcontrol/output_streamer.py 
b/processcontrol/output_streamer.py
index 4735580..39e767b 100644
--- a/processcontrol/output_streamer.py
+++ b/processcontrol/output_streamer.py
@@ -25,11 +25,12 @@
 
 class OutputStreamer(object):
 
-def __init__(self, process, slug, start_time):
+def __init__(self, process, slug, cmdline, start_time):
 self.out_stream = process.stdout
 self.err_stream = process.stderr
 self.pid = process.pid
 self.slug = slug
+self.cmdline = cmdline
 self.filename = make_logfile_path(slug, start_time)
 self.logger = None
 self.threads = {}
@@ -37,8 +38,17 @@
 
 def start(self):
 self.init_logger()
+
+self.log_header()
+
 self.start_reading(self.out_stream, "stdout")
 self.start_reading(self.err_stream, "stderr", is_error_stream=True)
+
+def log_header(self):
+# TODO: maybe expose the header as a configurable template.
+self.logger.info("===")
+self.logger.info("{cmdline} ({pid})".format(cmdline=self.cmdline, 
pid=self.pid))
+self.logger.info("---")
 
 def start_reading(self, stream, stream_name, is_error_stream=False):
 thread = threading.Thread(
@@ -81,12 +91,6 @@
 console_handler = logging.StreamHandler(sys.stdout)
 self.log_handlers.append(console_handler)
 self.logger.addHandler(console_handler)
-
-# FIXME: gets written for each subprocess, so the name=slug is not
-# quite right.  Should be the commandline?
-self.logger.info("===")
-self.logger.info("{name} ({pid})".format(name=self.slug, pid=self.pid))
-self.logger.info("---")
 
 def stop(self):
 for thread in self.threads.values():
diff --git a/processcontrol/runner.py b/processcontrol/runner.py
index 3aef5ae..5ee090a 100644
--- a/processcontrol/runner.py
+++ b/processcontrol/runner.py
@@ -66,7 +66,7 @@
 command = shlex.split(command_string)
 
 self.process = subprocess.Popen(command, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE, env=self.job.environment)
-streamer = output_streamer.OutputStreamer(self.process, self.job.slug, 
self.start_time)
+streamer = output_streamer.OutputStreamer(self.process, self.job.slug, 
command_string, self.start_time)
 self.logfile = streamer.filename
 streamer.start()
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e57112fa528037a0db16f9389bc4320eaf528f9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: typos: add (requires_os|os_version)\([^)]*[[:upper:]]

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: typos: add (requires_os|os_version)\([^)]*[[:upper:]]
..

typos: add (requires_os|os_version)\([^)]*[[:upper:]]

suggested by Hashar on I125315f2ef75fc894924acb
to catch uppercase os_version/require_os that
Faidon is standardizing to lowercase

Change-Id: Ic232ddda064420fc12e13499eaedf83062a98fbc
---
M typos
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/346677/1

diff --git a/typos b/typos
index 94d9435..b6fb876 100644
--- a/typos
+++ b/typos
@@ -22,3 +22,4 @@
 criticial
 puppte
 pupet
+(requires_os|os_version)\([^)]*[[:upper:]]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic232ddda064420fc12e13499eaedf83062a98fbc
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] operations/puppet[production]: vagrant: remove precise support

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: vagrant: remove precise support
..


vagrant: remove precise support

Remove support for Ubuntu precise, not used anymore.

Change-Id: Ie377abc168ee1d475a17767ca882d2f4a6847c7e
---
M modules/vagrant/manifests/init.pp
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/modules/vagrant/manifests/init.pp 
b/modules/vagrant/manifests/init.pp
index 95ad755..4c7118c 100644
--- a/modules/vagrant/manifests/init.pp
+++ b/modules/vagrant/manifests/init.pp
@@ -10,8 +10,6 @@
 class vagrant(
 $vagrant_home = '/srv/vagrant-data',
 ) {
-requires_os('Ubuntu >= Trusty || Debian >= Jessie')
-
 package { 'vagrant':
 ensure => present,
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie377abc168ee1d475a17767ca882d2f4a6847c7e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Dzahn 
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] mediawiki...Babel[master]: Use tabs to indent in json

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Use tabs to indent in json
..


Use tabs to indent in json

Change-Id: Ibbf94dbcca69a03a95873f7b22c77ee0a9ec8d1f
---
M i18n/crh.json
M i18n/gan.json
M i18n/got.json
M i18n/tt.json
M i18n/zh-cn.json
M i18n/zh-hk.json
M i18n/zh-sg.json
M i18n/zh-tw.json
M i18n/zh.json
M package.json
10 files changed, 145 insertions(+), 145 deletions(-)

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



diff --git a/i18n/crh.json b/i18n/crh.json
index e1d67d7..0e1df8d 100644
--- a/i18n/crh.json
+++ b/i18n/crh.json
@@ -1,14 +1,14 @@
 {
-"@metadata": {
-"authors": [
-"Don Alessandro"
-]
-},
-"babel-0": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|iç bilmey]].",
-"babel-1": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|başlanğıç 
seviyede]] bile.",
-"babel-2": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|orta seviyede]] 
bile.",
-"babel-3": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|yahşı]] bile.",
-"babel-4": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|ana tili kibi]] 
bile.",
-"babel-5": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|ihtisasiy 
seviyede]] bile.",
-"babel-N": "Bu qullanıcınıñ [[$1|ana tili]] [[$2|Qırımtatar tili]]dir."
+   "@metadata": {
+   "authors": [
+   "Don Alessandro"
+   ]
+   },
+   "babel-0": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|iç bilmey]].",
+   "babel-1": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|başlanğıç 
seviyede]] bile.",
+   "babel-2": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|orta seviyede]] 
bile.",
+   "babel-3": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|yahşı]] bile.",
+   "babel-4": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|ana tili kibi]] 
bile.",
+   "babel-5": "Bu qullanıcı [[$2|Qırımtatar tili]]ni [[$1|ihtisasiy 
seviyede]] bile.",
+   "babel-N": "Bu qullanıcınıñ [[$1|ana tili]] [[$2|Qırımtatar tili]]dir."
 }
\ No newline at end of file
diff --git a/i18n/gan.json b/i18n/gan.json
index fb25658..1b83d0b 100644
--- a/i18n/gan.json
+++ b/i18n/gan.json
@@ -1,28 +1,28 @@
 {
-"@metadata": {
-"authors": [
-"Symane"
-]
-},
-"babel": "巴別用戶資料",
-"babel-desc": "加隻#babel處理功能去容許自動產生一隻巴別用戶盒欄，同到含到可自定化嗰模板",
-"babel-url": "Project:巴別",
-"babel-autocreate-abort": "倷特試要求嗰用戶名已經自動係[[$1|Babel]]嗰分類，咁就登記不正。",
-"babel-autocreate-reason": "自動建立[[$1|Babel]]分類頁。",
-"babel-autocreate-text-levels": "箇隻分類嗰用戶都有 $2 語言嗰 $1 水平嗰交流能力。",
-"babel-autocreate-text-main": "箇隻分類嗰用戶都有 $1 語言嗰知識。",
-"babel-0": "箇隻用戶[[$1|冇滴子]][[$2|$3]]嗰水平（或者好艱難去聽轉佢）。",
-"babel-1": "箇隻用戶有[[$1|滴把子]]嗰[[$2|$3]]水平。",
-"babel-2": "箇隻用戶有[[$1|一般子]]嗰[[$2|$3]]水平。",
-"babel-3": "箇隻用戶有[[$1|蠻靚]]嗰[[$2|$3]]水平。",
-"babel-4": "箇隻用戶有[[$1|好喫價]]嗰[[$2|$3]]水平。",
-"babel-5": "箇隻用戶有[[$1|專業]]嗰[[$2|$3]]能力。",
-"babel-N": "箇隻用戶曉得[[$2|$3]]嗰[[$1|母語]]。",
-"babel-0-n": "箇隻用戶[[$1|冇滴子]][[$2|贛語]]嗰水平（或者好艱難去聽轉佢）。",
-"babel-1-n": "箇隻用戶有[[$1|滴把子]]嗰[[$2|贛語]]水平。",
-"babel-2-n": "箇隻用戶有[[$1|一般子]]嗰[[$2|贛語]]水平。",
-"babel-3-n": "箇隻用戶有[[$1|蠻靚]]嗰[[$2|贛語]]水平。",
-"babel-4-n": "箇隻用戶有[[$1|好喫價]]嗰[[$2|贛語]]水平。",
-"babel-5-n": "箇隻用戶有[[$1|專業]]嗰[[$2|贛語]]能力。",
-"babel-N-n": "箇隻用戶曉得[[$2|贛語]]嗰[[$1|母語]]。"
+   "@metadata": {
+   "authors": [
+   "Symane"
+   ]
+   },
+   "babel": "巴別用戶資料",
+   "babel-desc": "加隻#babel處理功能去容許自動產生一隻巴別用戶盒欄，同到含到可自定化嗰模板",
+   "babel-url": "Project:巴別",
+   "babel-autocreate-abort": "倷特試要求嗰用戶名已經自動係[[$1|Babel]]嗰分類，咁就登記不正。",
+   "babel-autocreate-reason": "自動建立[[$1|Babel]]分類頁。",
+   "babel-autocreate-text-levels": "箇隻分類嗰用戶都有 $2 語言嗰 $1 水平嗰交流能力。",
+   "babel-autocreate-text-main": "箇隻分類嗰用戶都有 $1 語言嗰知識。",
+   "babel-0": "箇隻用戶[[$1|冇滴子]][[$2|$3]]嗰水平（或者好艱難去聽轉佢）。",
+   "babel-1": "箇隻用戶有[[$1|滴把子]]嗰[[$2|$3]]水平。",
+   "babel-2": "箇隻用戶有[[$1|一般子]]嗰[[$2|$3]]水平。",
+   "babel-3": "箇隻用戶有[[$1|蠻靚]]嗰[[$2|$3]]水平。",
+   "babel-4": "箇隻用戶有[[$1|好喫價]]嗰[[$2|$3]]水平。",
+   "babel-5": "箇隻用戶有[[$1|專業]]嗰[[$2|$3]]能力。",
+   "babel-N": "箇隻用戶曉得[[$2|$3]]嗰[[$1|母語]]。",
+   "babel-0-n": "箇隻用戶[[$1|冇滴子]][[$2|贛語]]嗰水平（或者好艱難去聽轉佢）。",
+   "babel-1-n": "箇隻用戶有[[$1|滴把子]]嗰[[$2|贛語]]水平。",
+   "babel-2-n": "箇隻用戶有[[$1|一般子]]嗰[[$2|贛語]]水平。",
+   "babel-3-n": "箇隻用戶有[[$1|蠻靚]]嗰[[$2|贛語]]水平。",
+   "babel-4-n": "箇隻用戶有[[$1|好喫價]]嗰[[$2|贛語]]水平。",
+   "babel-5-n": "箇隻用戶有[[$1|專業]]嗰[[$2|贛語]]能力。",
+   "babel-N-n": "箇隻用戶曉得[[$2|贛語]]嗰[[$1|母語]]。"
 }
\ No newline at end of file
diff --git a/i18n/got.json b/i18n/got.json
index 8acbeaa..b4a0fa4 100644
--- a/i18n/got.json
+++ b/i18n/got.json
@@ -1,8 +1,8 @@
 {
-"@metadata": {
-"authors": [
-"Purodha"
-]
-},
-"babel-url": "Project:Babilu"
+   "@metadata": {
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs_vagrant: remove precise support

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: labs_vagrant: remove precise support
..


labs_vagrant: remove precise support

Remove support for Ubuntu precise, not used anymore.

Change-Id: I46cf50573f48294c546fb8adba46c68f3db12dcb
---
M modules/labs_vagrant/manifests/init.pp
1 file changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/modules/labs_vagrant/manifests/init.pp 
b/modules/labs_vagrant/manifests/init.pp
index 2c8158d..00f5937 100644
--- a/modules/labs_vagrant/manifests/init.pp
+++ b/modules/labs_vagrant/manifests/init.pp
@@ -39,20 +39,13 @@
 group  => 'wikidev',
 }
 
-# precise-compat branch should be checked out if this is a precise 
installation
-if $::lsbdistcodename == 'precise' {
-$branch_name = 'precise-compat'
-} else {
-$branch_name = 'master'
-}
-
 git::clone { 'vagrant':
 directory => $install_directory,
 origin=> 'https://gerrit.wikimedia.org/r/mediawiki/vagrant',
 owner => 'vagrant',
 group => 'wikidev',
 shared=> true,
-branch=> $branch_name,
+branch=> 'master',
 }
 
 file { "${install_directory}/logs":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46cf50573f48294c546fb8adba46c68f3db12dcb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Dzahn 
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] mediawiki/core[master]: Add ar_ prefix back to usertext_timestamp USE INDEX

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Add ar_ prefix back to usertext_timestamp USE INDEX
..


Add ar_ prefix back to usertext_timestamp USE INDEX

This is the correct/canonical index name. For usages on mysql it will
map to the unprefixed version.

Bug: T154872
Change-Id: Ie2daf7b33428855ac59c85bf04a99a9bca7feba1
---
M includes/api/ApiQueryDeletedrevs.php
M includes/specials/pagers/DeletedContribsPager.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/ApiQueryDeletedrevs.php 
b/includes/api/ApiQueryDeletedrevs.php
index 2bb4d03..b68a868 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -250,7 +250,7 @@
$this->addOption( 'LIMIT', $limit + 1 );
$this->addOption(
'USE INDEX',
-   [ 'archive' => ( $mode == 'user' ? 'usertext_timestamp' 
: 'name_title_timestamp' ) ]
+   [ 'archive' => ( $mode == 'user' ? 
'ar_usertext_timestamp' : 'name_title_timestamp' ) ]
);
if ( $mode == 'all' ) {
if ( $params['unique'] ) {
diff --git a/includes/specials/pagers/DeletedContribsPager.php 
b/includes/specials/pagers/DeletedContribsPager.php
index a1f6b84..78e1092 100644
--- a/includes/specials/pagers/DeletedContribsPager.php
+++ b/includes/specials/pagers/DeletedContribsPager.php
@@ -129,7 +129,7 @@
$condition = [];
 
$condition['ar_user_text'] = $this->target;
-   $index = 'usertext_timestamp';
+   $index = 'ar_usertext_timestamp';
 
return [ $index, $condition ];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2daf7b33428855ac59c85bf04a99a9bca7feba1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Set backoff to only work for recent changes

2017-04-05 Thread Smalyshev (Code Review)

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

Change subject: Set backoff to only work for recent changes
..

Set backoff to only work for recent changes

But keep using continuations for older ones. This does not resolve T162230
completely since you can still get stuck with short batch size but makes it
a bit better.

Bug: T162230
Change-Id: Ic548cbedb76b6fbe750fc1d50c79038c41844ae5
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/change/RecentChangesPollerUnitTest.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepositoryIntegrationTest.java
5 files changed, 183 insertions(+), 119 deletions(-)


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

diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index b93a952..5d13798 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -1,6 +1,5 @@
 package org.wikidata.query.rdf.tool;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.wikidata.query.rdf.tool.OptionsUtils.handleOptions;
 import static org.wikidata.query.rdf.tool.OptionsUtils.mungerFromOptions;
 import static 
org.wikidata.query.rdf.tool.wikibase.WikibaseRepository.inputDateFormat;
@@ -25,6 +24,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.time.DateUtils;
 import org.openrdf.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -326,11 +326,11 @@
  * super good and because its not big deal to recheck if we
  * have some updates.
  */
-leftOffDate = new Date(batch.leftOffDate().getTime() - 
SECONDS.toMillis(1));
+leftOffDate = DateUtils.addSeconds(leftOffDate, -1);
 if (oldDate == null || !oldDate.equals(leftOffDate)) {
 // Do not update repo with the same date
-oldDate = leftOffDate;
 rdfRepository.updateLeftOffTime(leftOffDate);
+oldDate = leftOffDate;
 }
 }
 // TODO wrap all retry-able exceptions in a special exception
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
index 09ca176..12700e2 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.time.DateUtils;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.slf4j.Logger;
@@ -39,6 +40,15 @@
  * Size of the batches to poll against wikibase.
  */
 private final int batchSize;
+/**
+ * How much to back off for recent fetches, in seconds.
+ */
+private static final int BACKOFF_TIME = 10;
+/**
+ * How old should the change be to not apply backoff.
+ * The number is in minutes.
+ */
+private static final int BACKOFF_THRESHOLD = 5;
 
 public RecentChangesPoller(WikibaseRepository wikibase, Date 
firstStartTime, int batchSize) {
 this.wikibase = wikibase;
@@ -73,12 +83,20 @@
 private final Set seenIDs;
 
 /**
+ * Continue from last request. Can be null.
+ */
+private final JSONObject lastContinue;
+
+/**
  * A batch that will next continue using the continue parameter.
  */
-private Batch(ImmutableList changes, long advanced, String 
leftOff, Date nextStartTime, Set seenIDs) {
+private Batch(ImmutableList changes, long advanced,
+String leftOff, Date nextStartTime, JSONObject lastContinue,
+Set seenIDs) {
 super(changes, advanced, leftOff);
 leftOffDate = nextStartTime;
 this.seenIDs = seenIDs;
+this.lastContinue = lastContinue;
 }
 
 @Override
@@ -93,8 +111,8 @@
 
 @Override
 public String leftOffHuman() {
-return WikibaseRepository.inputDateFormat().format(leftOffDate);
-// + " (next: " + nextContinue.get("rccontinue").toString() + ")";
+return WikibaseRepository.inputDateFormat().format(leftOffDate)
++ " (next: "

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Bump mobile-sections subminor version number

2017-04-05 Thread BearND (Code Review)

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

Change subject: Bump mobile-sections subminor version number
..

Bump mobile-sections subminor version number

Enough DOM transformations have changed to warrant a change.

Change-Id: Ib0195dfe1357eb899f6563a35781e4801219
---
M lib/mobile-util.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 0479b5a..e5c7b8a 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -7,7 +7,7 @@
 
 
 mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.9.3' },
+mobileSections: { name: 'mobile-sections', version: '0.10.0' },
 definition: { name: 'definition', version: '0.7.1' },
 
 random: { name: 'random', version: '0.6.0' },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0195dfe1357eb899f6563a35781e4801219
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add wikibase:reference predicate

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Add wikibase:reference predicate
..


Add wikibase:reference predicate

Change-Id: I4a352ba7550ce6e76ae6b8628325b98031c7d784
---
M wikibase/queryService/ui/editor/hint/Sparql.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wikibase/queryService/ui/editor/hint/Sparql.js 
b/wikibase/queryService/ui/editor/hint/Sparql.js
index 62effb2..122f2b0 100755
--- a/wikibase/queryService/ui/editor/hint/Sparql.js
+++ b/wikibase/queryService/ui/editor/hint/Sparql.js
@@ -30,7 +30,7 @@
// property predicates
'wikibase:rank', 'wikibase:badge', 
'wikibase:propertyType', 'wikibase:directClaim',
'wikibase:claim', 'wikibase:statementProperty', 
'wikibase:statementValue',
-   'wikibase:qualifier', 'wikibase:qualifierValue', 
'wikibase:referenceValue',
+   'wikibase:qualifier', 'wikibase:qualifierValue', 
'wikibase:reference', 'wikibase:referenceValue',
'wikibase:statementValueNormalized', 
'wikibase:qualifierValueNormalized',
'wikibase:referenceValueNormalized', 'wikibase:novalue',
// entity types

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a352ba7550ce6e76ae6b8628325b98031c7d784
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
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]: Phabricator: Use base:service_unit for aphlict

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: Phabricator: Use base:service_unit for aphlict
..


Phabricator: Use base:service_unit for aphlict

This should be nearly ready to run in production.

Bug: T112765
Change-Id: Idf788704f4bf083fab5834563ef329b973dc74fe
---
M modules/phabricator/manifests/aphlict.pp
D modules/phabricator/templates/aphlict-upstart.conf.erb
D modules/phabricator/templates/aphlict.service.erb
A modules/phabricator/templates/initscripts/aphlict.systemd.erb
A modules/phabricator/templates/initscripts/aphlict.upstart.erb
5 files changed, 50 insertions(+), 65 deletions(-)

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



diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index c5ac86a..881db01 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -26,11 +26,11 @@
 File[$node_modules] ~> Service['aphlict']
 
 if $ensure == 'present' {
-$link = 'link'
 $directory = 'directory'
+$service_ensure = 'running'
 } else {
-$link = 'absent'
 $directory = 'absent'
+$service_ensure = 'stopped'
 }
 
 
@@ -46,34 +46,6 @@
 owner   => $user,
 group   => $group,
 mode=> '0644',
-}
-
-if $::initsystem == 'upstart' {
-# upstart init conf file
-$init_file = '/etc/init/aphlict.conf'
-$init_source = 'aphlict-upstart.conf.erb'
-} else {
-# systemd service unit
-$init_file = '/etc/systemd/system/aphlict.service'
-$init_source = 'aphlict.service.erb'
-}
-
-file { '/etc/init.d/aphlict':
-ensure => $link,
-target => "${phabdir}/bin/aphlict",
-}
-
-file { $init_file:
-content => template("phabricator/${init_source}"),
-mode=> '0644',
-owner   => 'root',
-group   => 'root',
-}
-
-service { 'aphlict':
-ensure => running,
-provider   => $::initsystem,
-hasrestart => true,
 }
 
 file { '/var/run/aphlict/':
@@ -101,10 +73,23 @@
 }
 
 user { $user:
-gid=> 'aphlict',
+gid=> $group,
 shell  => '/bin/false',
 home   => '/var/run/aphlict',
 system => true,
 }
 
+base::service_unit { 'aphlict':
+ensure => $ensure,
+systemd=> true,
+upstart=> true,
+sysvinit   => false,
+require=> User[$user],
+service_params => {
+ensure => $service_ensure,
+provider   => $::initsystem,
+hasrestart => false,
+},
+}
+
 }
diff --git a/modules/phabricator/templates/aphlict-upstart.conf.erb 
b/modules/phabricator/templates/aphlict-upstart.conf.erb
deleted file mode 100644
index aabd55b..000
--- a/modules/phabricator/templates/aphlict-upstart.conf.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-# aphlict - Phabricator notification server
-#
-# Routes real-time notifications to websocket clients
-
-description "Phabricator notification websocket server"
-
-setuid <%= @user %>
-setgid <%= @group %>
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-respawn limit 10 5
-umask 022
-
-expect stop
-
-exec <%= @aphlict_cmd %>
diff --git a/modules/phabricator/templates/aphlict.service.erb 
b/modules/phabricator/templates/aphlict.service.erb
deleted file mode 100644
index b02dbbc..000
--- a/modules/phabricator/templates/aphlict.service.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Aphlict - Phabricator notification service
-After=network.target auditd.service
-
-[Service]
-User=<%= @user %>
-Group=<%= @group %>
-ExecStart=<%= @aphlict_cmd %>
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Alias=aphlict.service
diff --git a/modules/phabricator/templates/initscripts/aphlict.systemd.erb 
b/modules/phabricator/templates/initscripts/aphlict.systemd.erb
new file mode 100644
index 000..81dccb0
--- /dev/null
+++ b/modules/phabricator/templates/initscripts/aphlict.systemd.erb
@@ -0,0 +1,15 @@
+[Unit]
+Description=Aphlict - Phabricator notification service
+After=network.target auditd.service
+
+[Service]
+User=<%= scope.lookupvar('phabricator::aphlict::user') %>
+Group=<%= scope.lookupvar('phabricator::aphlict::group') %>
+ExecStart=<%= scope.lookupvar('phabricator::aphlict::aphlict_cmd') %>
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+Alias=aphlict.service
diff --git a/modules/phabricator/templates/initscripts/aphlict.upstart.erb 
b/modules/phabricator/templates/initscripts/aphlict.upstart.erb
new file mode 100644
index 000..109fd67
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Improve code coverage

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: resourceloader: Improve code coverage
..


resourceloader: Improve code coverage

* Missing cases for StartupModule::getModuleRegistrations
  (now 100% covered)
  - Raw modules are omitted from the manifest.
E.g. The base modules ('jquery', 'mediawiki') are raw modules
that we don't register client side (they can't load themselves).
  - Exceptions from getVersionHash() are caught.
  - Oversized versions are re-hashed.

* Missing cases for ResourceLoader::makeLoaderRegisterScript.
  (now 100% covered)

* Missing cases for ResourceLoader::getModule.
  (now 100% covered)

Change-Id: If9717a48195fc6ae776da5d0e86f323d7f60426d
---
M tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
2 files changed, 127 insertions(+), 3 deletions(-)

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



diff --git 
a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
index 1b756be..1e09e92 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
@@ -8,7 +8,7 @@
] );
}
 
-   public static function provideGetModuleRegistrations() {
+   public function provideGetModuleRegistrations() {
return [
[ [
'msg' => 'Empty registry',
@@ -32,6 +32,88 @@
 [
 "test.blank",
 "{blankVer}"
+]
+] );',
+   ] ],
+   [ [
+   'msg' => 'Omit raw modules from registry',
+   'modules' => [
+   'test.raw' => new 
ResourceLoaderTestModule( [ 'isRaw' => true ] ),
+   'test.blank' => new 
ResourceLoaderTestModule(),
+   ],
+   'out' => '
+mw.loader.addSource( {
+"local": "/w/load.php"
+} );
+mw.loader.register( [
+[
+"test.blank",
+"{blankVer}"
+]
+] );',
+   ] ],
+   [ [
+   'msg' => 'Version falls back gracefully if 
getVersionHash throws',
+   'modules' => [
+   'test.fail' => (
+   ( $mock = 
$this->getMockBuilder( 'ResourceLoaderTestModule' )
+   ->setMethods( [ 
'getVersionHash' ] )->getMock() )
+   && $mock->method( 
'getVersionHash' )->will(
+   $this->throwException( 
new Exception )
+   )
+   ) ? $mock : $mock
+   ],
+   'out' => '
+mw.loader.addSource( {
+"local": "/w/load.php"
+} );
+mw.loader.register( [
+[
+"test.fail",
+""
+]
+] );
+mw.loader.state( {
+"test.fail": "error"
+} );',
+   ] ],
+   [ [
+   'msg' => 'Use version from getVersionHash',
+   'modules' => [
+   'test.version' => (
+   ( $mock = 
$this->getMockBuilder( 'ResourceLoaderTestModule' )
+   ->setMethods( [ 
'getVersionHash' ] )->getMock() )
+   && $mock->method( 
'getVersionHash' )->willReturn( '1234567' )
+   ) ? $mock : $mock
+   ],
+   'out' => '
+mw.loader.addSource( {
+"local": "/w/load.php"
+} );
+mw.loader.register( [
+[
+"test.version",
+"1234567"
+]
+] );',
+   ] ],
+   [ [
+   'msg' => 'Re-hash version from getVersionHash 
if too long',
+   'modules' => [
+   'test.version' => (
+   ( $mock = 
$this->getMockBuilder( 'ResourceLoaderTestModule' )
+   ->setMethods( [ 
'getVersionHash' ] )->getMock() )
+   && $mock->method( 
'getVersionHash' )->willReturn( '12345678' )
+   ) ? $mock : $mock
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Disable md5 in ssh

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: Gerrit: Disable md5 in ssh
..


Gerrit: Disable md5 in ssh

This mac is way insecure and most if not everyone should be using at least sha1.

Change-Id: Id2614c8a37d7183bbf2f8f9e911592b9de582e5d
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 816324d..a13e63e 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -168,6 +168,7 @@
 threads = 8
 batchThreads = 2
 idleTimeout = 864000
+mac = -hmac-md5, -hmac-md5-96
 [theme]
 backgroundColor = fff
 topMenuColor = fff

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2614c8a37d7183bbf2f8f9e911592b9de582e5d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Reduce contention during view-based category count refreshes

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Reduce contention during view-based category count refreshes
..


Reduce contention during view-based category count refreshes

Bug: T162121
Change-Id: I05b539922508d5e73979ccc8ea1c148b16dd13db
---
M includes/CategoryViewer.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 31369b0..0205d70 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -742,7 +742,13 @@
$totalcnt = $rescnt;
$category = $this->cat;
DeferredUpdates::addCallableUpdate( function () use ( 
$category ) {
-   $category->refreshCounts();
+   # Avoid excess contention on the same category 
(T162121)
+   $dbw = wfGetDB( DB_MASTER );
+   $name = __METHOD__ . ':' . md5( $this->mName );
+   $scopedLock = $dbw->getScopedLockAndFlush( 
$name, __METHOD__, 1 );
+   if ( $scopedLock ) {
+   $category->refreshCounts();
+   }
} );
} else {
// Case 3: hopeless.  Don't give a total count at all.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05b539922508d5e73979ccc8ea1c148b16dd13db
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
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]: resourceloader: Improve code coverage

2017-04-05 Thread Krinkle (Code Review)

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

Change subject: resourceloader: Improve code coverage
..

resourceloader: Improve code coverage

* Missing cases for StartupModule::getModuleRegistrations
  (now 100% covered)
  - Raw modules are omitted from the manifest.
E.g. The base modules ('jquery', 'mediawiki') are raw modules
that we don't register client side (they can't load themselves).
  - Exceptions from getVersionHash() are caught.
  - Oversized versions are re-hashed.

* Missing cases for ResourceLoader::makeLoaderRegisterScript.
  (now 100% covered)

* Missing cases for ResourceLoader::getModule.
  (now 100% covered)

Change-Id: If9717a48195fc6ae776da5d0e86f323d7f60426d
---
M tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
2 files changed, 127 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/346674/1

diff --git 
a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
index 1b756be..1e09e92 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
@@ -8,7 +8,7 @@
] );
}
 
-   public static function provideGetModuleRegistrations() {
+   public function provideGetModuleRegistrations() {
return [
[ [
'msg' => 'Empty registry',
@@ -32,6 +32,88 @@
 [
 "test.blank",
 "{blankVer}"
+]
+] );',
+   ] ],
+   [ [
+   'msg' => 'Omit raw modules from registry',
+   'modules' => [
+   'test.raw' => new 
ResourceLoaderTestModule( [ 'isRaw' => true ] ),
+   'test.blank' => new 
ResourceLoaderTestModule(),
+   ],
+   'out' => '
+mw.loader.addSource( {
+"local": "/w/load.php"
+} );
+mw.loader.register( [
+[
+"test.blank",
+"{blankVer}"
+]
+] );',
+   ] ],
+   [ [
+   'msg' => 'Version falls back gracefully if 
getVersionHash throws',
+   'modules' => [
+   'test.fail' => (
+   ( $mock = 
$this->getMockBuilder( 'ResourceLoaderTestModule' )
+   ->setMethods( [ 
'getVersionHash' ] )->getMock() )
+   && $mock->method( 
'getVersionHash' )->will(
+   $this->throwException( 
new Exception )
+   )
+   ) ? $mock : $mock
+   ],
+   'out' => '
+mw.loader.addSource( {
+"local": "/w/load.php"
+} );
+mw.loader.register( [
+[
+"test.fail",
+""
+]
+] );
+mw.loader.state( {
+"test.fail": "error"
+} );',
+   ] ],
+   [ [
+   'msg' => 'Use version from getVersionHash',
+   'modules' => [
+   'test.version' => (
+   ( $mock = 
$this->getMockBuilder( 'ResourceLoaderTestModule' )
+   ->setMethods( [ 
'getVersionHash' ] )->getMock() )
+   && $mock->method( 
'getVersionHash' )->willReturn( '1234567' )
+   ) ? $mock : $mock
+   ],
+   'out' => '
+mw.loader.addSource( {
+"local": "/w/load.php"
+} );
+mw.loader.register( [
+[
+"test.version",
+"1234567"
+]
+] );',
+   ] ],
+   [ [
+   'msg' => 'Re-hash version from getVersionHash 
if too long',
+   'modules' => [
+   'test.version' => (
+   ( $mock = 
$this->getMockBuilder( 'ResourceLoaderTestModule' )
+   ->setMethods( [ 
'getVersionHash' ] )->getMock() )
+   && $mock->method( 
'getVersionHash' )->willReturn( '12345678' )
+   ) ? $mock : $mock
+   ],
+

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Make email addresses coming from the external authentication...

2017-04-05 Thread Cicalese (Code Review)

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

Change subject: Make email addresses coming from the external authentication 
source be automatically confirmed.
..

Make email addresses coming from the external authentication source be 
automatically confirmed.

Change-Id: If343e7ae884cdf8c3d7eca6ded8d0917784d0886
---
M PluggableAuthPrimaryAuthenticationProvider.php
M extension.json
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth 
refs/changes/61/346561/3

diff --git a/PluggableAuthPrimaryAuthenticationProvider.php 
b/PluggableAuthPrimaryAuthenticationProvider.php
index 28f132c..3cad816 100644
--- a/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/PluggableAuthPrimaryAuthenticationProvider.php
@@ -85,7 +85,10 @@
} else {
wfDebug( 'User does not have editmyprivateinfo 
right or has just been created.' );
$user->mRealName = $realname;
-   $user->mEmail = $email;
+   if ( $email && Sanitizer::validateEmail( $email 
) ) {
+   $user->mEmail = $email;
+   $user->confirmEmail();
+   }
$user->saveSettings();
wfDebug( 'Saved updated real name and email 
address.' );
}
diff --git a/extension.json b/extension.json
index 1a1346e..3f3f05e 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PluggableAuth",
-   "version": "2.1",
+   "version": "2.2",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If343e7ae884cdf8c3d7eca6ded8d0917784d0886
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: HermannSchwaerzler 
Gerrit-Reviewer: MarkAHershberger 
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...PluggableAuth[master]: Make email addresses coming from the external authentication...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Make email addresses coming from the external authentication 
source be automatically confirmed.
..


Make email addresses coming from the external authentication source be 
automatically confirmed.

Change-Id: If343e7ae884cdf8c3d7eca6ded8d0917784d0886
---
M PluggableAuthPrimaryAuthenticationProvider.php
M extension.json
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/PluggableAuthPrimaryAuthenticationProvider.php 
b/PluggableAuthPrimaryAuthenticationProvider.php
index 28f132c..3cad816 100644
--- a/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/PluggableAuthPrimaryAuthenticationProvider.php
@@ -85,7 +85,10 @@
} else {
wfDebug( 'User does not have editmyprivateinfo 
right or has just been created.' );
$user->mRealName = $realname;
-   $user->mEmail = $email;
+   if ( $email && Sanitizer::validateEmail( $email 
) ) {
+   $user->mEmail = $email;
+   $user->confirmEmail();
+   }
$user->saveSettings();
wfDebug( 'Saved updated real name and email 
address.' );
}
diff --git a/extension.json b/extension.json
index 1a1346e..3f3f05e 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PluggableAuth",
-   "version": "2.1",
+   "version": "2.2",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If343e7ae884cdf8c3d7eca6ded8d0917784d0886
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: HermannSchwaerzler 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Unify `padding` on ButtonElement

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: MediaWiki theme: Unify `padding` on ButtonElement
..


MediaWiki theme: Unify `padding` on ButtonElement

Unifying `padding` & positioning of labels/icons/indicators on
ButtonElement and derived widgets.
Also:
 - fixing IE 9 issue with `min-width` of framed icon-only buttons
and removing corresponding hack,
 - bringing frameless `:focus` state closer to framed button.

Bug: T161177
Change-Id: Ice3e3dc8e1c492934d44ab7d98fe3c31e600be35
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 130 insertions(+), 58 deletions(-)

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



diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index d3ba9b5..1eadeb9 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -78,6 +78,10 @@
 @size-toggleswitch-grip-min: 16px;
 @size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px`
 
+@start-framed-icon-only: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px`; HACK: We have to break 
with `@padding-start-input-text-icon` to perfectly center in 
`@min-width-button-default`
+@start-framed-indicator-only: 13 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `1.09375em`≈`14px`; `@size-indicator + 2 * 
@border-width-default`
+@start-framed-square-indicator-only: 9 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.703125em`≈`9px`
+
 @width-button-combo-widget: @min-width-button-combo-widget;
 
 @height-icon-element: 100%;
@@ -89,6 +93,7 @@
 @border-disabled-filled: @border-width-default solid 
@border-color-disabled-filled;
 @border-dialog: @border-default;
 @border-dialog-bar: @border-width-default solid @border-color-dialog-bar;
+@border-frameless: @border-width-default solid @color-default-light;
 @border-menu: @border-default;
 
 @border-color-default: #a2a9b1;
@@ -106,11 +111,13 @@
 @border-color-dialog-bar: #c8ccd1;
 
 @border-radius-default: 2px;
+@border-radius-frameless: 1px; // Together with `@box-shadow-frameless` it 
results in well rounded border
 
 @border-width-default: 1px;
 @border-width-medium: 2px;
 
 @padding-default: @padding-top-default @padding-horizontal-default 
@padding-bottom-default;
+@padding-frameless: @padding-vertical-label 0;
 @padding-input-text: @padding-top-default @padding-horizontal-input-text 
@padding-bottom-default;
 @padding-menu: @padding-top-menu @padding-horizontal-default 
@padding-bottom-menu;
 @padding-menu-large: ( @padding-top-menu * 1.5 ) @padding-horizontal-default ( 
@padding-bottom-menu * 1.5 );
@@ -122,6 +129,10 @@
 @padding-bottom-default: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px`
 @padding-bottom-menu: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
 @padding-start-input-text-icon: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // As long as we have whitespace in icon canvas, we 
need reduced `padding-left`.
+@padding-start-icon: @size-icon;
+@padding-start-icon-only: 26 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.03125em`≈`26px`; 
@min-width-button-default - @padding-horizontal-default - 2 * 
@border-width-default;
+@padding-start-indicator-only: @padding-start-icon-only;
+@padding-start-indicator-plus: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 @padding-start-input-text-icon-label: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 
 @box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
@@ -131,6 +142,7 @@
 @box-shadow-widget: inset 0 0 0 1px @background-color-default;
 @box-shadow-widget-focus: inset 0 0 0 1px @color-progressive;
 @box-shadow-progressive-focus: inset 0 0 0 1px @color-progressive, inset 0 0 0 
2px @color-default-light;
+@box-shadow-frameless-focus: 0 0 0 2px @color-progressive;
 @box-shadow-input-binary-active: inset 0 0 0 1px @color-progressive-active;
 @box-shadow-readonly-focus: inset 0 0 0 1px #c8ccd1;
 @box-shadow-erroneous-focus: inset 0 0 0 1px @color-erroneous;
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index eabe88c..738291b 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -4,18 +4,68 @@
 
 .theme-oo-ui-buttonElement () {
> .oo-ui-buttonElement-button {
+   position: relative;
font-weight: bold;
text-decoration: none;
 
&:focus {
-   border-radius: @border-radius-default;
outline: 0;
+   }
+
+   > .oo-ui-iconElement-icon,
+   >

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: multiple os_version changes

2017-04-05 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346673 )

Change subject: wmflib: multiple os_version changes
..

wmflib: multiple os_version changes

- Remove Ruby 1.8 compatibility code
- Emit a more helpful error message when lsb-release isn't installed
- Lowercase distribution names in the code ("Jessie" isn't right)
- Emit a warning when a check is performed against an old/obsolete
  distributions. This will help tracking down dead code across the tree
  without using error-prone greps.

Change-Id: I13e89e4ea8ff042ed2f4a81c5a7489752648d04d
---
M modules/wmflib/lib/puppet/parser/functions/os_version.rb
1 file changed, 69 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/346673/1

diff --git a/modules/wmflib/lib/puppet/parser/functions/os_version.rb 
b/modules/wmflib/lib/puppet/parser/functions/os_version.rb
index 553a5d2..3ea4a54 100644
--- a/modules/wmflib/lib/puppet/parser/functions/os_version.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/os_version.rb
@@ -24,68 +24,95 @@
 module Puppet::Parser::Functions
   os_versions = {
 'Ubuntu' => {
-  'Hardy'=> '8.04',
-  'Intrepid' => '8.10',
-  'Jaunty'   => '9.04',
-  'Karmic'   => '9.10',
-  'Lucid'=> '10.04',
-  'Maverick' => '10.10',
-  'Natty'=> '11.04',
-  'Oneiric'  => '11.10',
-  'Precise'  => '12.04',
-  'Quantal'  => '12.10',
-  'Raring'   => '13.04',
-  'Saucy'=> '13.10',
-  'Trusty'   => '14.04',
-  'Utopic'   => '14.10',
-  'Vivid'=> '15.04',
-  'Wily' => '15.10',
-  'Xenial'   => '16.04',
-  'Yakkety'  => '16.10',
+  'hardy'=> '8.04',
+  'intrepid' => '8.10',
+  'jaunty'   => '9.04',
+  'karmic'   => '9.10',
+  'lucid'=> '10.04',
+  'maverick' => '10.10',
+  'natty'=> '11.04',
+  'oneiric'  => '11.10',
+  'precise'  => '12.04',
+  'quantal'  => '12.10',
+  'raring'   => '13.04',
+  'saucy'=> '13.10',
+  'trusty'   => '14.04',
+  'utopic'   => '14.10',
+  'vivid'=> '15.04',
+  'wily' => '15.10',
+  'xenial'   => '16.04',
+  'yakkety'  => '16.10',
+  'zesty'=> '17.04',
 },
 'Debian' => {
-  'Wheezy'  => '7',
-  'Jessie'  => '8',
-  'Stretch' => '9',
-  'Buster'  => '10',
+  'wheezy'  => '7',
+  'jessie'  => '8',
+  'stretch' => '9',
+  'buster'  => '10',
 }
   }
 
-  newfunction(:os_version, :type => :rvalue, :arity => 1) do |args|
-self_release = lookupvar('lsbdistrelease').capitalize
-self_id = lookupvar('lsbdistid').capitalize
+  # minimum supported version per OS; a warning will be emitted if a comparison
+  # is made against a version lower than these
+  min_supported_versions = {
+'Debian' => '8',
+'Ubuntu' => '14.04',
+  }
 
-fail(ArgumentError, 'os_version(): string argument required') unless 
args.first.is_a?(String)
+  newfunction(:os_version, :type => :rvalue, :arity => 1) do |args|
+self_release = lookupvar('lsbdistrelease')
+self_id = lookupvar('lsbdistid')
+
+if self_release.nil? || self_id.nil?
+  fail('os_version(): LSB facts are not set; is lsb-release installed?')
+end
+
+unless args.first.is_a?(String)
+  fail(ArgumentError, 'os_version(): string argument required')
+end
 
 clauses = args.first.split('||').map(&:strip)
-
 clauses.any? do |clause|
-  unless /^(\w+) *([<>=]*) *([\w\.]+)$/ =~ clause
+  unless /^(?\w+) *(?[<>=]*) *(?[\w\.]+)$/ =~ clause
 fail(ArgumentError, "os_version(): invalid expression '#{clause}'")
   end
-  # for ruby 1.8; replace with named groups with ruby >= 1.9
-  other_id = Regexp.last_match(1)
-  operator = Regexp.last_match(2)
-  other_release = Regexp.last_match(3)
 
-  [other_id, other_release].each(&:capitalize!)
+  # OS names are in caps, distributions in lowercase
+  other_id = id.capitalize
+  other_release = release.downcase
 
-  next unless self_id == other_id
-
+  # if a codename was passed, get the numeric release
   if os_versions[other_id].key?(other_release)
+other_release = os_versions[other_id][other_release]
 other_was_codename = true
-  end
-
-  other_release = os_versions[other_id][other_release] || other_release
-
-  unless /^[\d.]+$/ =~ other_release
+  elsif /^[\d.]+$/ !~ other_release
 fail(ArgumentError,
  "os_version(): unknown #{other_id} release '#{other_release}'")
   end
 
+  # emit a warning if the release given to compare with is not supported
+  min_version = min_supported_versions[other_id]
+  if Puppet::Util::Package.versioncmp(other_release, min_version) < 0 ||
+(Puppet::Util::Package.versioncmp(other_release, min_version) == 0 &&
+(operator

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Reduce contention during view-based category count refreshes

2017-04-05 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346672 )

Change subject: Reduce contention during view-based category count refreshes
..

Reduce contention during view-based category count refreshes

Bug: T162121
Change-Id: I05b539922508d5e73979ccc8ea1c148b16dd13db
---
M includes/CategoryViewer.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/346672/1

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 31369b0..f624f25 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -742,7 +742,12 @@
$totalcnt = $rescnt;
$category = $this->cat;
DeferredUpdates::addCallableUpdate( function () use ( 
$category ) {
-   $category->refreshCounts();
+   # Avoid excess contention on the same category 
(T162121)
+   $name = __METHOD__ . ':' . md5( $this->mName );
+   $scopedLock = wfGetDB( DB_MASTER 
)->getScopedLockAndFlush( $name );
+   if ( $scopedLock ) {
+   $category->refreshCounts();
+   }
} );
} else {
// Case 3: hopeless.  Don't give a total count at all.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05b539922508d5e73979ccc8ea1c148b16dd13db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Add some extra spacing around H1s and H2s

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Add some extra spacing around H1s and H2s
..


Add some extra spacing around H1s and H2s

Bug: T161559
Change-Id: I0d10d39313c11fddefadff7ab13c262bd6606ed0
---
M resources/mode/mediawiki/mediawiki.css
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/resources/mode/mediawiki/mediawiki.css 
b/resources/mode/mediawiki/mediawiki.css
index 74783e9..55aec4a 100644
--- a/resources/mode/mediawiki/mediawiki.css
+++ b/resources/mode/mediawiki/mediawiki.css
@@ -14,8 +14,8 @@
 .cm-mw-comment { color: #aaa; font-weight: normal; }
 .cm-mw-apostrophes-bold, .cm-mw-apostrophes-italic { color: #08f; }
 
-pre.cm-mw-section-1 { font-size: 1.8em; }
-pre.cm-mw-section-2 { font-size: 1.5em; }
+pre.cm-mw-section-1 { font-size: 1.8em; line-height: 1.2em; }
+pre.cm-mw-section-2 { font-size: 1.5em; line-height: 1.2em; }
 pre.cm-mw-section-3 { font-weight: bold; }
 pre.cm-mw-section-4 { font-weight: bold; }
 pre.cm-mw-section-5 { font-weight: bold; }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d10d39313c11fddefadff7ab13c262bd6606ed0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Kaldari 
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]: typos: add 'pupet' and 'puppte'

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: typos: add 'pupet' and 'puppte'
..


typos: add 'pupet' and 'puppte'

Change-Id: I7f57519eff23fa3baa59504ee92d883b65eb2a77
---
M typos
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/typos b/typos
index ed786ae..94d9435 100644
--- a/typos
+++ b/typos
@@ -20,3 +20,5 @@
 (?https://gerrit.wikimedia.org/r/346282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f57519eff23fa3baa59504ee92d883b65eb2a77
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Zppix 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: phabricator: provision /home/phd

2017-04-05 Thread BryanDavis (Code Review)

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

Change subject: phabricator: provision /home/phd
..

phabricator: provision /home/phd

Give hhvm a place to create hhbc files by ensuring that the phd user's
homedir exists.

Change-Id: I498cc90dd8094c8fda148dd4e5f61aa68cda2f5d
---
M puppet/modules/phabricator/manifests/init.pp
1 file changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/71/346671/1

diff --git a/puppet/modules/phabricator/manifests/init.pp 
b/puppet/modules/phabricator/manifests/init.pp
index 21fa02f..aff9f76 100644
--- a/puppet/modules/phabricator/manifests/init.pp
+++ b/puppet/modules/phabricator/manifests/init.pp
@@ -111,9 +111,22 @@
 managehome => false,
 system => true,
 }
+file { '/home/phd':
+ensure => 'directory',
+owner => 'phd',
+group => 'phd',
+mode  => '0755',
+require => [
+User['phd'],
+Group['phd'],
+],
+}
 phabricator::config { 'phd.user':
 value   => 'phd',
-require => User['phd'],
+require => [
+User['phd'],
+File['/home/phd'],
+],
 }
 
 # Repository hosting

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: [WIP] Implement "description" field

2017-04-05 Thread Awight (Code Review)

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

Change subject: [WIP] Implement "description" field
..

[WIP] Implement "description" field

Change-Id: I16be5ff71a292c77143bff0c0f2c24f2f478f327
---
M bin/run-job
M job.example.yaml
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/70/346670/1

diff --git a/bin/run-job b/bin/run-job
index 4c1a005..733efa9 100755
--- a/bin/run-job
+++ b/bin/run-job
@@ -17,6 +17,7 @@
status = runner.JobRunner(job).status()
if status is not None:
message += "" + yaml.dump(status).strip()
+   if job.description is not None
except AssertionError:
message = "{job} ***Invalid 
configuration***".format(job=job_name)
print(message)
diff --git a/job.example.yaml b/job.example.yaml
index 523fbeb..523bcd4 100644
--- a/job.example.yaml
+++ b/job.example.yaml
@@ -6,6 +6,13 @@
 #
 name: Take This Job and Shove It
 
+#
+# Optional text explaining the job.
+#
+description: >
+Create TPS report in the basement, execute in triplicate and shoot it down
+the pneumatic tube.  Wait three weeks for delivery.
+
 # The commandline that will be run.  This is executed from Python and not from
 # a shell, so globbing, redirecting, and other trickery will not work.  Please
 # give the full path to executables as in a crontab.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16be5ff71a292c77143bff0c0f2c24f2f478f327
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: repool frdb1001

2017-04-05 Thread Jgreen (Code Review)

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

Change subject: repool frdb1001
..


repool frdb1001

Change-Id: Ic4ff61b8da68cdcb112fd8a5aed929b9b3c6e8ad
---
M templates/wmnet
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index faefa43..cbd8b69 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -14,8 +14,7 @@
 
 ; CROSS-COLO FUNDRAISING SERVICE ALIASES
 fundraisingdb-write 5M  IN CNAMEdb1025.frack.eqiad.wmnet.
-;fundraisingdb-read  5M  IN CNAMEfrdb1001.frack.eqiad.wmnet.
-fundraisingdb-read  5M  IN CNAMEdb1025.frack.eqiad.wmnet.
+fundraisingdb-read  5M  IN CNAMEfrdb1001.frack.eqiad.wmnet.
 
 ;
 ; EQIAD

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: repool frdb1001

2017-04-05 Thread Jgreen (Code Review)

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

Change subject: repool frdb1001
..

repool frdb1001

Change-Id: Ic4ff61b8da68cdcb112fd8a5aed929b9b3c6e8ad
---
M templates/wmnet
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/69/346669/1

diff --git a/templates/wmnet b/templates/wmnet
index faefa43..cbd8b69 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -14,8 +14,7 @@
 
 ; CROSS-COLO FUNDRAISING SERVICE ALIASES
 fundraisingdb-write 5M  IN CNAMEdb1025.frack.eqiad.wmnet.
-;fundraisingdb-read  5M  IN CNAMEfrdb1001.frack.eqiad.wmnet.
-fundraisingdb-read  5M  IN CNAMEdb1025.frack.eqiad.wmnet.
+fundraisingdb-read  5M  IN CNAMEfrdb1001.frack.eqiad.wmnet.
 
 ;
 ; EQIAD

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: DHCP: remove backup4001

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: DHCP: remove backup4001
..


DHCP: remove backup4001

as Jeff Green said:

"We should remove the DHCP entry altogether.
The box that was backup4001 failed and is, afaik,
powered down and will be decomissioned.
The replacement will be in frack/codfw."

Bug: T161904
Change-Id: I5f16c8e291f27cb4ce2d08edf563f37952de0a26
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index f81249f..d1ef40c 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -235,11 +235,6 @@
 fixed-address auth2001.codfw.wmnet;
 }
 
-host backup4001 {
-hardware ethernet F0:1F:AF:D8:72:9A;
-fixed-address backup4001.ulsfo.wmnet;
-}
-
 host baham {
 hardware ethernet D4:AE:52:B3:90:36;
 fixed-address baham.wikimedia.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f16c8e291f27cb4ce2d08edf563f37952de0a26
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jgreen 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ArticleTarget: building summary in source mode, strip links ...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: ArticleTarget: building summary in source mode, strip links 
from section titles
..


ArticleTarget: building summary in source mode, strip links from section titles

Bug: T162017
Change-Id: I76e96d1e36f7bad0b3e17d8bb842c6ad1172f8cc
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 53c67a9..8c9830d 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -2055,10 +2055,21 @@
this.goToHeading( headingNode );
}
} else if ( mode === 'source' ) {
+   // With elements of extractSectionTitle + 
stripSectionName TODO:
+   // Arguably, we should just throw this through the API 
and then do
+   // the same extract-text pass we do in visual mode. 
Would save us
+   // having to think about wikitext here.
headingText = 
surface.getModel().getDocument().data.getText(
false,

surface.getModel().getDocument().getDocumentNode().children[ 0 ].getRange()
-   ).replace( /^\s*=+\s*(.*?)\s*=+\s*$/, '$1' );
+   )
+   // Extract the title
+   .replace( /^\s*=+\s*(.*?)\s*=+\s*$/, '$1' )
+   // Remove links
+   .replace( /\[\[:?([^[|]+)\|([^[]+)\]\]/, '$2' )
+   .replace( /\[\[:?([^[]+)\|?\]\]/, '$1' )
+   .replace( new RegExp( '\\[(?:' + 
ve.init.platform.getUnanchoredExternalLinkUrlProtocolsRegExp().source + ')([^ 
]+?) ([^\\[]+)\\]', 'i' ), '$3' )
+   ;
}
if ( headingText ) {
this.initialEditSummary =

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: phpunit: Remove unused assertEmpty() fallback for PHPUnit 3 ...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: phpunit: Remove unused assertEmpty() fallback for PHPUnit 3 
compat
..


phpunit: Remove unused assertEmpty() fallback for PHPUnit 3 compat

We always run with PHPUnit 4. We're also forward-compatible with
PHPUnit 5 (albeit with deprecation notices).

PHPUnit 3 is no longer supported.

Keep __call() to make it easy to re-introduce back-compat or
future-compat logic in the future (like the next patch does).

Change-Id: I4f836db12d43fb22c4c38c0e1401675d751d7841
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 0 insertions(+), 10 deletions(-)

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



diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index bb7267a..564c0ff 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1298,7 +1298,6 @@
 */
public function __call( $func, $args ) {
static $compatibility = [
-   'assertEmpty' => 'assertEmpty2', // assertEmpty was 
added in phpunit 3.7.32
];
 
if ( isset( $compatibility[$func] ) ) {
@@ -1306,15 +1305,6 @@
} else {
throw new MWException( "Called non-existent $func 
method on " . static::class );
}
-   }
-
-   /**
-* Used as a compatibility method for phpunit < 3.7.32
-* @param string $value
-* @param string $msg
-*/
-   private function assertEmpty2( $value, $msg ) {
-   $this->assertTrue( $value == '', $msg );
}
 
private static function unprefixTable( &$tableName, $ind, $prefix ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f836db12d43fb22c4c38c0e1401675d751d7841
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: BryanDavis 
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...Popups[master]: Pass event to showSettings

2017-04-05 Thread Jdlrobson (Code Review)

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

Change subject: Pass event to showSettings
..

Pass event to showSettings

The parameter is expected and not optional.

Bug: T162324
Change-Id: I9dea04eb7435f9349e60d477f5701ec5dd655ebd
---
M src/renderer.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/src/renderer.js b/src/renderer.js
index 2045823..876c1a5 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -280,7 +280,7 @@
.click( function ( event ) {
event.stopPropagation();
 
-   behavior.showSettings();
+   behavior.showSettings( event );
} );
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: psr3: Update monolog version

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: psr3: Update monolog version
..


psr3: Update monolog version

Update monolog library version to match require-dev constraints from
MediaWiki's composer.json. Also switch from tilde constraint
(>=1.18.2,<1.19.0) to caret constraint (>=1.22.0,<2.0) to make things
a bit more future proof. Monolog is pretty good at following semver.

Change-Id: I20d6a4f28741e7379c2c6ea598bd5dd6e2232e47
---
M puppet/modules/role/manifests/psr3.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/role/manifests/psr3.pp 
b/puppet/modules/role/manifests/psr3.pp
index f07b526..0ed6c9c 100644
--- a/puppet/modules/role/manifests/psr3.pp
+++ b/puppet/modules/role/manifests/psr3.pp
@@ -4,7 +4,7 @@
 class role::psr3 {
 mediawiki::composer::require { 'monolog/monolog for psr3 role':
 package => 'monolog/monolog',
-version => '~1.18.2',
+version => '^1.22',
 }
 
 mediawiki::settings { 'psr3': # the elk role depends on this

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20d6a4f28741e7379c2c6ea598bd5dd6e2232e47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
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] wikimedia...process-control[master]: Handle commandline param like other fields.

2017-04-05 Thread Awight (Code Review)

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

Change subject: Handle commandline param like other fields.
..

Handle commandline param like other fields.

Change-Id: Iab17d09434914b4fde7a0dc06b8c3ff32e1df54f
---
M processcontrol/job_wrapper.py
1 file changed, 10 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/67/346667/1

diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 7d9817a..25f958c 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -66,6 +66,14 @@
 str_env = {k: str(v) for k, v in 
self.config.get("environment").items()}
 self.environment.update(str_env)
 
+command = self.config.get("command")
+if hasattr(command, "encode"):
+# Is stringlike, so cast to a list and handle along with the plural
+# case below.
+command = [command]
+
+self.commands = command
+
 def run(self):
 # Check that we are the service user.
 service_user = str(self.global_config.get("user"))
@@ -86,16 +94,9 @@
 timer = threading.Timer(timeout_seconds, self.fail_timeout)
 timer.start()
 
-command = self.config.get("command")
-
-if hasattr(command, "encode"):
-# Is stringlike, so cast to a list and handle along with the plural
-# case below.
-command = [command]
-
 try:
-for line in command:
-self.run_command(line)
+for command_line in self.commands:
+self.run_command(command_line)
 finally:
 lock.end()
 if self.timeout > 0:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab17d09434914b4fde7a0dc06b8c3ff32e1df54f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Replace arrows with chevrons and increase c...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: MediaWiki theme: Replace arrows with chevrons and increase 
contrast
..


MediaWiki theme: Replace arrows with chevrons and increase contrast

Replacing arrows with chevrons as indicators to align to designs and
increasing contrast on active chevrons in toolbars. Also replacing
fixed `opacity` value with Less variable.

Bug: T111550
Bug: T157190
Bug: T161653
Change-Id: I6f1acedd33272fbabdc896e2b1c2b71b24e89eba
---
M src/themes/apex/images/icons/articles-ltr.svg
M src/themes/apex/images/icons/articles-rtl.svg
M src/themes/mediawiki/images/icons/articles-ltr.svg
M src/themes/mediawiki/images/icons/articles-rtl.svg
M src/themes/mediawiki/images/indicators/arrow-down.svg
M src/themes/mediawiki/images/indicators/arrow-ltr.svg
M src/themes/mediawiki/images/indicators/arrow-rtl.svg
M src/themes/mediawiki/images/indicators/arrow-up.svg
M src/themes/mediawiki/tools.less
9 files changed, 15 insertions(+), 18 deletions(-)

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



diff --git a/src/themes/apex/images/icons/articles-ltr.svg 
b/src/themes/apex/images/icons/articles-ltr.svg
index 9dd3404..c194497 100644
--- a/src/themes/apex/images/icons/articles-ltr.svg
+++ b/src/themes/apex/images/icons/articles-ltr.svg
@@ -1,4 +1,4 @@
-
+
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
 
 
diff --git a/src/themes/apex/images/icons/articles-rtl.svg 
b/src/themes/apex/images/icons/articles-rtl.svg
index b57dae2..40a9348 100644
--- a/src/themes/apex/images/icons/articles-rtl.svg
+++ b/src/themes/apex/images/icons/articles-rtl.svg
@@ -1,4 +1,4 @@
-
+
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
 
 
diff --git a/src/themes/mediawiki/images/icons/articles-ltr.svg 
b/src/themes/mediawiki/images/icons/articles-ltr.svg
index 9dd3404..c194497 100644
--- a/src/themes/mediawiki/images/icons/articles-ltr.svg
+++ b/src/themes/mediawiki/images/icons/articles-ltr.svg
@@ -1,4 +1,4 @@
-
+
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
 
 
diff --git a/src/themes/mediawiki/images/icons/articles-rtl.svg 
b/src/themes/mediawiki/images/icons/articles-rtl.svg
index b57dae2..40a9348 100644
--- a/src/themes/mediawiki/images/icons/articles-rtl.svg
+++ b/src/themes/mediawiki/images/icons/articles-rtl.svg
@@ -1,4 +1,4 @@
-
+
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
 
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-down.svg 
b/src/themes/mediawiki/images/indicators/arrow-down.svg
index f5c76f3..d3e55d1 100644
--- a/src/themes/mediawiki/images/indicators/arrow-down.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-down.svg
@@ -1,6 +1,4 @@
 
 http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
-
-
-
+   
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-ltr.svg 
b/src/themes/mediawiki/images/indicators/arrow-ltr.svg
index 059372d..e99855b 100644
--- a/src/themes/mediawiki/images/indicators/arrow-ltr.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-ltr.svg
@@ -1,6 +1,4 @@
 
 http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
-
-
-
+   
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-rtl.svg 
b/src/themes/mediawiki/images/indicators/arrow-rtl.svg
index c6498e8..1647501 100644
--- a/src/themes/mediawiki/images/indicators/arrow-rtl.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-rtl.svg
@@ -1,6 +1,4 @@
 
 http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
-
-
-
+   
 
diff --git a/src/themes/mediawiki/images/indicators/arrow-up.svg 
b/src/themes/mediawiki/images/indicators/arrow-up.svg
index 5eada07..ca93281 100644
--- a/src/themes/mediawiki/images/indicators/arrow-up.svg
+++ b/src/themes/mediawiki/images/indicators/arrow-up.svg
@@ -1,6 +1,4 @@
 
 http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
-
-
-
+   
 
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index aec9939..a0dc7f5 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -318,7 +318,7 @@
width: 0.9375em;
height: 100%;
margin: 0 0.5em;
-   opacity: 0.3;
+   opacity: @opacity-icon-default;
 
.oo-ui-toolbar-narrow & {
right: -0.3125em;
@@ -390,7 +390,12 @@
}
}
 
-   &-handle {
+   > .oo-ui-popupToolGroup-handle {
+   .oo-ui-transition(
+   background-color @transition-ease-quick,
+

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix incorrect index name in new 1.28.0 installations

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix incorrect index name in new 1.28.0 installations
..


Fix incorrect index name in new 1.28.0 installations

This index name should be the same in new installations as in all other
MySQL installations. This is necessary so that
Special:DeletedContributions does not give an SQL error. Release notes
will go in the 1.28 branch.

Bug: T154872
Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3
---
M RELEASE-NOTES-1.28
M includes/installer/MysqlUpdater.php
A maintenance/archives/patch-rename-ar_usertext_timestamp.sql
3 files changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 265c5b2..7354b5d 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -15,6 +15,7 @@
 * (T145635) Fix too long index error when installing with MSSQL
 * (T156184) $wgRawHtml will no longer apply to internationalization messages.
 * (T160519) CACHE_ANYTHING will not be CACHE_ACCEL if no accelerator is 
installed.
+* (T154872) Fix incorrect ar_usertext_timestamp index names in new 1.28 
installs.
 
 == MediaWiki 1.28 ==
 
diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index a637ce0..b4dbe25 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -291,6 +291,7 @@
[ 'addField', 'change_tag', 'ct_id', 
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id', 
'patch-tag_summary-ts_id.sql' ],
[ 'modifyField', 'recentchanges', 'rc_ip', 
'patch-rc_ip_modify.sql' ],
+   [ 'addIndex', 'archive', 'usertext_timestamp', 
'patch-rename-ar_usertext_timestamp.sql' ],
];
}
 
diff --git a/maintenance/archives/patch-rename-ar_usertext_timestamp.sql 
b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
new file mode 100644
index 000..658c179
--- /dev/null
+++ b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
@@ -0,0 +1,7 @@
+-- Rename the archive.ar_usertext_timestamp index to usertext_timestamp.
+-- This is for MySQL only and is only necessary on wikis freshly installed on
+-- 1.28.0 when bug T154872 was present. The patch will probably be removed in
+-- 1.29 since we plan on renaming the index properly to ar_usertext_timestamp.
+ALTER TABLE /*$wgDBprefix*/archive
+   DROP INDEX ar_usertext_timestamp,
+   ADD INDEX usertext_timestamp (ar_user_text,ar_timestamp);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jjanes 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
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]: [WIP] phpunit: Avoid use of deprecated getMock for PHPUnit 5...

2017-04-05 Thread Krinkle (Code Review)

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

Change subject: [WIP] phpunit: Avoid use of deprecated getMock for PHPUnit 5 
compat
..

[WIP] phpunit: Avoid use of deprecated getMock for PHPUnit 5 compat

The default will remain PHPUnit 4.x due to PHP 5.5 support.

But, we should allow developers to run tests with newer PHPUnit
versions which are noticably faster (especially for code coverage
reports).

* 

  PHPUnit 5 deprecates the getMock() shortcut for getMockBuilder()->getMock().
  It instead introduces the shortcut createMock() which has better defaults
  than getMockBuilder(). For example, it sets 'disableArgumentCloning' and
  other things by default.

  Going forward, code should either use getMockBuilder directly or the
  new createMock method. This patch backports the createMock method to
  MediaWikiTestCase so that we can start using it.

Change-Id: I091c0289b21d2b1c876adba89529dc3e72b99af2
---
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php
M tests/phpunit/includes/WatchedItemStoreUnitTest.php
M tests/phpunit/includes/WatchedItemUnitTest.php
M tests/phpunit/includes/api/ApiMainTest.php
M tests/phpunit/includes/auth/AuthManagerTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
M tests/phpunit/includes/session/SessionTest.php
M tests/phpunit/includes/site/SiteExporterTest.php
M tests/phpunit/includes/specials/SpecialPreferencesTest.php
M tests/phpunit/maintenance/MaintenanceTest.php
M tests/phpunit/tests/MediaWikiTestCaseTest.php
12 files changed, 55 insertions(+), 34 deletions(-)


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

diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index 564c0ff..ddd9b06 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1298,6 +1298,7 @@
 */
public function __call( $func, $args ) {
static $compatibility = [
+   'createMock' => 'createMock2',
];
 
if ( isset( $compatibility[$func] ) ) {
@@ -1307,6 +1308,23 @@
}
}
 
+/**
+ * Return a test double for the specified class.
+ *
+ * @param string $originalClassName
+ * @return PHPUnit_Framework_MockObject_MockObject
+ * @throws Exception
+ */
+private function createMock2( $originalClassName ) {
+return $this->getMockBuilder( $originalClassName )
+->disableOriginalConstructor()
+->disableOriginalClone()
+->disableArgumentCloning()
+// New in phpunit-mock-objects 3.2 (phpunit 5.4.0)
+// ->disallowMockingUnknownTypes()
+->getMock();
+}
+
private static function unprefixTable( &$tableName, $ind, $prefix ) {
$tableName = substr( $tableName, strlen( $prefix ) );
}
diff --git a/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php 
b/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php
index bdec0a5..630fa27 100644
--- a/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php
+++ b/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php
@@ -66,7 +66,7 @@
 * @return PHPUnit_Framework_MockObject_MockObject|User
 */
private function getMockNonAnonUserWithId( $id ) {
-   $mock = $this->getMock( User::class );
+   $mock = $this->createMock( User::class );
$mock->expects( $this->any() )
->method( 'isAnon' )
->will( $this->returnValue( false ) );
@@ -142,7 +142,7 @@
}
 
private function getMockAnonUser() {
-   $mock = $this->getMock( User::class );
+   $mock = $this->createMock( User::class );
$mock->expects( $this->any() )
->method( 'isAnon' )
->will( $this->returnValue( true ) );
diff --git a/tests/phpunit/includes/WatchedItemStoreUnitTest.php 
b/tests/phpunit/includes/WatchedItemStoreUnitTest.php
index 0bd0bcc..b71e8f4 100644
--- a/tests/phpunit/includes/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/WatchedItemStoreUnitTest.php
@@ -13,7 +13,7 @@
 * @return PHPUnit_Framework_MockObject_MockObject|IDatabase
 */
private function getMockDb() {
-   return $this->getMock( IDatabase::class );
+   return $this->createMock( IDatabase::class );
}
 
/**
@@ -63,7 +63,7 @@
 * @return PHPUnit_Framework_MockObject_MockObject|User
 */
private function getMockNonAnonUserWithId( $id ) {
-   $mock = $this->getMock( User::class );
+   $mock = $this->createMock(

[MediaWiki-commits] [Gerrit] operations/puppet[production]: installserver: remove precise support

2017-04-05 Thread Dzahn (Code Review)

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

Change subject: installserver: remove precise support
..


installserver: remove precise support

Strip precise backwards-compatibility statements and the
precise-installer.

Change-Id: If84cc7bf3786d8d777a46ba923ac05826b0da53b
---
D modules/install_server/files/autoinstall/precise.cfg
M modules/install_server/files/autoinstall/scripts/early_command.sh
M modules/install_server/files/autoinstall/scripts/late_command.sh
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
D modules/install_server/files/tftpboot/precise-installer/pxelinux.cfg/boot.txt
D 
modules/install_server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-115200
D 
modules/install_server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-57600
D 
modules/install_server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS0-9600
D 
modules/install_server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS1-115200
D 
modules/install_server/files/tftpboot/precise-installer/pxelinux.cfg/ttyS1-57600
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/adtxt.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/exithelp.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f1.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f10.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f2.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f3.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f4.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f5.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f6.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f7.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f8.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/f9.txt
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/menu.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/prompt.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/rqtxt.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/splash.png
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/stdmenu.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/syslinux.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/txt.cfg
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/boot-screens/vesamenu.c32
D 
modules/install_server/files/tftpboot/precise-installer/ubuntu-installer/amd64/pxelinux.cfg/default
D modules/install_server/files/tftpboot/precise-installer/version.info
M modules/role/manifests/installserver/proxy.pp
33 files changed, 3 insertions(+), 414 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/precise.cfg 
b/modules/install_server/files/autoinstall/precise.cfg
deleted file mode 12
index 93467be..000
--- a/modules/install_server/files/autoinstall/precise.cfg
+++ /dev/null
@@ -1 +0,0 @@
-trusty.cfg
\ No newline at end of file
diff --git a/modules/install_server/files/autoinstall/scripts/early_command.sh 
b/modules/install_server/files/autoinstall/scripts/early_command.sh
index d5a57e0..0a348e3 100644
--- a/modules/install_server/files/autoinstall/scripts/early_command.sh
+++ b/modules/install_server/files/autoinstall/scripts/early_command.sh
@@ -3,26 +3,14 @@
 set -e
 
 ## redo network configuration statically
-# at least trusty has ip under /sbin
-if [ -x /sbin/ip -o -x /bin/ip ]; then
-   IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' 
-f 6 | cut -d '/' -f 1)
-else
-   IP=$(ifconfig | grep "inet addr" | cut -d ' ' -f 12 | sed 's/addr://' | 
grep -v 127\.0\.0\.1)
-fi
-
-# netcfg backwards-compatible notes:
-# - disable_autoconfig is needed for >= precise
-# - disable_dhcp is supported but deprecated in favor of disable_autoconfig
-#   starting with netcfg 1.101 (wheezy/trusty)
-# - kill-all-dhcp has replaced killall.sh since netcfg 1.86 (>= wheezy/trusty)
+IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | 
cut -d '/' -f 1)
 
 cat > /tmp/static_net.cfg

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Get browser info from new userAgent field

2017-04-05 Thread Bearloga (Code Review)

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

Change subject: Get browser info from new userAgent field
..


Get browser info from new userAgent field

Bug: T162178
Change-Id: Ib292a1b87338c596125618b29ad16b7a82e48141
---
M modules/metrics/portal/user_agents.R
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/modules/metrics/portal/user_agents.R 
b/modules/metrics/portal/user_agents.R
index 20097b1..e7b36c0 100644
--- a/modules/metrics/portal/user_agents.R
+++ b/modules/metrics/portal/user_agents.R
@@ -53,7 +53,16 @@
   # Get user agent data
   wmf::set_proxies() # To allow for the latest YAML to be retrieved.
   uaparser::update_regexes()
-  ua_data <- 
data.table::as.data.table(uaparser::parse_agents(results$user_agent, fields = 
c("browser", "browser_major")))
+  ua_data <- data.table::rbindlist(lapply(results$user_agent, function(x){
+if (grepl("^\\{", x)){
+  temp <- unlist(jsonlite::fromJSON(x)[c("browser_family", 
"browser_major")])
+  names(temp)[1] <- "browser"
+  temp <- as.data.frame(as.list(temp))
+  return(temp)
+} else {
+  return(uaparser::parse_agents(x, fields = c("browser", "browser_major")))
+}
+  }), fill = TRUE)
   ua_data <- ua_data[, j = list(amount = .N), by = c("browser", 
"browser_major")]
   ua_data$date <- results$date[1]
   ua_data$percent <- round((ua_data$amount/sum(ua_data$amount)) * 100, 2)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib292a1b87338c596125618b29ad16b7a82e48141
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: psr3: Update monolog version

2017-04-05 Thread BryanDavis (Code Review)

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

Change subject: psr3: Update monolog version
..

psr3: Update monolog version

Update monolog library version to match require-dev constraints from
MediaWiki's composer.json. Also switch from tilde constraint
(>=1.18.2,<1.19.0) to caret constraint (>=1.22.0,<2.0) to make things
a bit more future proof. Monolog is pretty good at following semver.

Change-Id: I20d6a4f28741e7379c2c6ea598bd5dd6e2232e47
---
M puppet/modules/role/manifests/psr3.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/65/346665/1

diff --git a/puppet/modules/role/manifests/psr3.pp 
b/puppet/modules/role/manifests/psr3.pp
index f07b526..0ed6c9c 100644
--- a/puppet/modules/role/manifests/psr3.pp
+++ b/puppet/modules/role/manifests/psr3.pp
@@ -4,7 +4,7 @@
 class role::psr3 {
 mediawiki::composer::require { 'monolog/monolog for psr3 role':
 package => 'monolog/monolog',
-version => '~1.18.2',
+version => '^1.22',
 }
 
 mediawiki::settings { 'psr3': # the elk role depends on this

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Use pixel instead of em for distancing the hig...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters UI: Use pixel instead of em for distancing the 
highlight dots
..


RCFilters UI: Use pixel instead of em for distancing the highlight dots

Also, make the circles slightly bigger; the 5px value made the circles
look slightly squarish, so we increase the radius by 1 pixel to 6px.

Bug: T161258
Change-Id: I483dc698ba15380990ded097caec24b408fba43a
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
index 1ef49e2..3060f25 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
@@ -11,9 +11,9 @@
 
 // Result list circle indicators
 // Defined and used in mw.rcfilters.ui.ChangesListWrapperWidget.less
-@result-circle-margin: 0.1em;
+@result-circle-margin: 3px;
 @result-circle-general-margin: 0.5em;
 // In these small sizes, 'em' appears
 // squished and inconsistent.
 // Pixels are better for this use case:
-@result-circle-diameter: 5px;
+@result-circle-diameter: 6px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I483dc698ba15380990ded097caec24b408fba43a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Document a bit

2017-04-05 Thread Awight (Code Review)

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

Change subject: Document a bit
..

Document a bit

Change-Id: I879936947ff4af826b173059e742637f9aeefaed
---
M README.md
A job.example.yaml
M process-control.example.yaml
3 files changed, 90 insertions(+), 42 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/64/346664/1

diff --git a/README.md b/README.md
index 60b662e..e59c26c 100644
--- a/README.md
+++ b/README.md
@@ -8,59 +8,47 @@
 Configuration
 ===
 
-Global configuration must be created before you can run jobs (FIXME: works out
-of the box).  Copy the file 
/usr/share/doc/process-control/process-control.example.yaml
-to /etc/fundraising/process-control.yaml
+Global configuration must be created before you can run jobs (FIXME: Make this
+work out-of-the-box).  Copy the file
+/usr/share/doc/process-control/process-control.example.yaml
+to /etc/fundraising/process-control.yaml and customize it for your machine.
+
+You'll need to pick a service user, and make /var/log/process-control writable
+by that user.
 
 Job descriptions
 ===
 
-A job description file has the following format,
-
-```yaml
-name: Take This Job and Shove It
-
-# The commandline that will be run.  This is executed from Python and not from
-# a shell, so globbing and other trickery will not work.  Please give a full
-# path to the executable.
-#
-# Alternatively, a job can be configured as a list of several commands.  These
-# are executed in sequence, and execution stops at the first failure.
-#
-#command:
-## Run sub-jobs, each with their own lock and logfiles.
-#- /usr/bin/run-job prepare_meal
-#- /usr/bin/run-job mangia
-#- /usr/bin/run-job clean_up_from_meal
-#
-command: /usr/local/bin/timecard --start 9:00 --end 5:30
-
-# Optional schedule, in Vixie cron format:
-# minute hour day-of-month month day-of-week
-schedule: "*/5 * * * *"
-
-# Optional flag to prevent scheduled job execution.  The job
-# can still be run as a single-shot.
-disabled: true
-
-# Optional timeout in minutes, after which your job will be
-# aborted.  Defaults to no timeout.
-timeout: 30
-
-# Optional environment variables.
-environment:
-   PYTHONPATH: /usr/share/invisible/pie
-```
+Each job is described in a YAML file under the /var/lib/process-control
+directory (by default).  See `job.example.yaml` for the available keys and
+their meaninings.
 
 Running
 ===
+
 Jobs can be run by name,
 run-job job-a-thon
 which will look for a job configuration in 
`/var/lib/process-control/job-a-thon.yaml`.
 
-Some actions are shoehorned in, and can be accessed like:
+Other actions on jobs can be accessed like:
 run-job --list-jobs
-   run-job --kill-job job-a-thon
+
+Scheduled Jobs
+==
+
+Any job that includes a `schedule` key and does not have `disabled: true` can
+be automatically scheduled.  The schedule value is given as a five-term Vixie
+crontab (man 5 crontab), but aliases like `@daily` are not allowed.
+
+A script `cron-generate` will read all scheduled jobs and write entries to
+/etc/cron.d/process-control, or the configured `output_crontab`.  For example,
+a job `yak` with the schedule `30 12 * * *` will be written 
+
+Cron-generate takes no arguments, its configuration is read from /etc.
+
+cron-generate
+
+All cron jobs 
 
 Failure detection
 ==
@@ -74,11 +62,23 @@
 * Non-zero subprocess exit code.
 * Timeout.
 
+Security
+==
+
+This tool was written for a typical environment where software developers and
+operations engineers have different permissions.  The design is supposed to
+make it reasonably safe for a group of developers to make auditable changes to
+job configuration without help from operations engineers, and it should not be
+possible for users to escalate privileges to anything but running processes as
+the service user.
+
+It should also not be possible to run arbitrary job descriptions from a user's
+home directory.  We recommend deploying the `job_directory` in a way that all
+changes can be audited.
 
 TODO
 
 
-* Syslog actions, at least when tweezing new crontabs.
 * Log invocations.
 * Prevent future job runs when unrecoverable failure conditions are detected.
 * Fine-tuning of failure detection.
diff --git a/job.example.yaml b/job.example.yaml
new file mode 100644
index 000..8115936
--- /dev/null
+++ b/job.example.yaml
@@ -0,0 +1,42 @@
+# Copy this job to your configured `job_directory` and give it a name, like
+# `purge_binge.yaml`.
+
+# Verbose job name.  The short, machine name is taken from the base file name.
+name: Take This Job and Shove It
+
+# The commandline that will be run.  This is executed from Python and not from
+# a shell, so globbing, redirecting, and other trickery will not work.  Please
+# give the full path to executables as in a crontab.
+#
+# Alternatively, a job can be configured

[MediaWiki-commits] [Gerrit] mediawiki...Dashiki[master]: Fix bad config syntax

2017-04-05 Thread Milimetric (Code Review)

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

Change subject: Fix bad config syntax
..


Fix bad config syntax

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

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



diff --git a/extension.json b/extension.json
index 2dff856..45799a1 100644
--- a/extension.json
+++ b/extension.json
@@ -17,12 +17,12 @@
"Dashiki\\DashikiView": "includes/DashikiView.php"
},
"JsonConfigModels": {
-   "Dashiki": {
+   "JsonConfig.Dashiki": {
"view": "Dashiki\\DashikiView"
}
},
"JsonConfigs": {
-   "Dashiki": {
+   "JsonConfig.Dashiki": {
"pattern": "/^Dashiki\\:./",
"isLocal": true
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6e31b90c3cd4b01afc58697b44657a20eaced5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...Dashiki[master]: Fix bad config syntax

2017-04-05 Thread Milimetric (Code Review)

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

Change subject: Fix bad config syntax
..

Fix bad config syntax

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


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

diff --git a/extension.json b/extension.json
index 2dff856..45799a1 100644
--- a/extension.json
+++ b/extension.json
@@ -17,12 +17,12 @@
"Dashiki\\DashikiView": "includes/DashikiView.php"
},
"JsonConfigModels": {
-   "Dashiki": {
+   "JsonConfig.Dashiki": {
"view": "Dashiki\\DashikiView"
}
},
"JsonConfigs": {
-   "Dashiki": {
+   "JsonConfig.Dashiki": {
"pattern": "/^Dashiki\\:./",
"isLocal": true
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6e31b90c3cd4b01afc58697b44657a20eaced5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Update to jQuery 3

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: build: Update to jQuery 3
..


build: Update to jQuery 3

Change-Id: I96da155143654de4e94c6f828eb260997bd9b20c
---
M README.md
M package.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/README.md b/README.md
index a869ac0..ec14576 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@
 
 This build assumes jQuery is present and omits various chunks of code in 
favour of references to jQuery.
 
-jQuery 1.8.3 or higher is recommended.
+jQuery 3.0.0 or higher is required.
 
 Versioning
 --
diff --git a/package.json b/package.json
index 1d17cae..dc24d1b 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-karma": "2.0.0",
-"jquery": "1.11.3",
+"jquery": "3.2.1",
 "karma": "1.5.0",
 "karma-chrome-launcher": "2.0.0",
 "karma-coverage": "1.1.1",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96da155143654de4e94c6f828eb260997bd9b20c
Gerrit-PatchSet: 2
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
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]: phpunit: Remove unused assertEmpty() fallback for PHPUnit 3 ...

2017-04-05 Thread Krinkle (Code Review)

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

Change subject: phpunit: Remove unused assertEmpty() fallback for PHPUnit 3 
compat
..

phpunit: Remove unused assertEmpty() fallback for PHPUnit 3 compat

We always run with PHPUnit 4. We're also forward-compatible with
PHPUnit 5 (albeit with deprecation notices).

PHPUnit 3 is no longer supported.

Change-Id: I4f836db12d43fb22c4c38c0e1401675d751d7841
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 0 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/346662/1

diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index bb7267a..c238b1b 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1287,36 +1287,6 @@
}
}
 
-   /**
-* @since 1.18
-*
-* @param string $func
-* @param array $args
-*
-* @return mixed
-* @throws MWException
-*/
-   public function __call( $func, $args ) {
-   static $compatibility = [
-   'assertEmpty' => 'assertEmpty2', // assertEmpty was 
added in phpunit 3.7.32
-   ];
-
-   if ( isset( $compatibility[$func] ) ) {
-   return call_user_func_array( [ $this, 
$compatibility[$func] ], $args );
-   } else {
-   throw new MWException( "Called non-existent $func 
method on " . static::class );
-   }
-   }
-
-   /**
-* Used as a compatibility method for phpunit < 3.7.32
-* @param string $value
-* @param string $msg
-*/
-   private function assertEmpty2( $value, $msg ) {
-   $this->assertTrue( $value == '', $msg );
-   }
-
private static function unprefixTable( &$tableName, $ind, $prefix ) {
$tableName = substr( $tableName, strlen( $prefix ) );
}

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

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

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

[MediaWiki-commits] [Gerrit] oojs/core[master]: util: Simplify isPlainObject and fix two false positives

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: util: Simplify isPlainObject and fix two false positives
..


util: Simplify isPlainObject and fix two false positives

We already covered the following cases properly:
* Objects that inherited from any user class or built-in class
  other than Object.prototype.  (= not plain)
* Objects that inherited from another plain object. (= not plain)
* Objects created that inherit Object.prototype via 'new Object()'
  or literal '{}'. (= plain)
* Objects created without inheritance via Object.create(null)
  (= plain)

The following cases were broken, however:

* Objects that inherit an object that has no inheritance.
  > var defaults = Object.create(null);
  > // assign props to defaults
  > options = Object.create(defaults);
  This is not plain, but was wrongly detected as plain.
  Also fixed in jQuery 3.

* Objects that inherit an object that is plain.
  > var defaults = { /* .. */ };
  > options = Object.create(defaults);
  This is not plain, but was wrongly detected as plain.
  Also fixed in jQuery 3.

Also:
* Remove IE8 compat code that is now redundant.
* Upgrade from jQuery 1 to jQuery 3 must be before this
  commit as otherwise the new unit tests will fail for
  oojs.jquery.js.

Change-Id: Ibc67bbfaa35e88abcc68e09977bb7c390b1fe388
---
M src/util.js
M tests/unit/util.test.js
2 files changed, 25 insertions(+), 25 deletions(-)

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



diff --git a/src/util.js b/src/util.js
index 349436f..5fdafb2 100644
--- a/src/util.js
+++ b/src/util.js
@@ -8,25 +8,20 @@
  * @return {boolean}
  */
 oo.isPlainObject = function ( obj ) {
-   // Any object or value whose internal [[Class]] property is not 
"[object Object]"
-   // Support IE8: Explicitly filter out DOM nodes
-   // Support IE8: Explicitly filter out Window object (needs loose 
comparison)
-   // eslint-disable-next-line eqeqeq
-   if ( !obj || toString.call( obj ) !== '[object Object]' || obj.nodeType 
|| ( obj != null && obj == obj.window ) ) {
+   var proto;
+
+   // Optimise for common case where internal [[Class]] property is not 
"Object"
+   if ( !obj || toString.call( obj ) !== '[object Object]' ) {
return false;
}
 
-   // The try/catch suppresses exceptions thrown when attempting to access
-   // the "constructor" property of certain host objects such as Location
-   // in Firefox < 20 (https://bugzilla.mozilla.org/814622)
-   try {
-   if ( obj.constructor &&
-   !hasOwn.call( obj.constructor.prototype, 
'isPrototypeOf' ) ) {
-   return false;
-   }
-   } catch ( e ) {
-   return false;
+   proto = Object.getPrototypeOf( obj );
+
+   // Objects without prototype (e.g., `Object.create( null )`) are 
considered plain
+   if ( !proto ) {
+   return true;
}
 
-   return true;
+   // The 'isPrototypeOf' method is set on Object.prototype.
+   return hasOwn.call( proto, 'isPrototypeOf' );
 };
diff --git a/tests/unit/util.test.js b/tests/unit/util.test.js
index 3ae382d..0e505ae 100644
--- a/tests/unit/util.test.js
+++ b/tests/unit/util.test.js
@@ -3,19 +3,24 @@
QUnit.module( 'util' );
 
QUnit.test( 'isPlainObject', function ( assert ) {
+   var obj;
function Thing() {}
 
// Plain objects
assert.strictEqual( oo.isPlainObject( {} ), true, 'empty plain 
object' );
assert.strictEqual( oo.isPlainObject( { a: 1 } ), true, 
'non-empty plain object' );
-   if ( !Object.create ) {
-   // We test Object.create(null) when the environment 
supports it for modern browsers
-   // However Object.create(null) itself is not an OOjs 
feature and if the environment
-   // doesn't support it, we skip the test.
-   assert.strictEqual( true, true, '[skipped] Objects with 
no prototype from Object.create( null )' );
-   } else {
-   assert.strictEqual( oo.isPlainObject( Object.create( 
null ) ), true, 'Objects with no prototype from Object.create( null )' );
-   }
+   assert.strictEqual( oo.isPlainObject( Object.create( null ) ), 
true, 'empty object with no prototype, via Object.create( null )' );
+   obj = Object.create( null );
+   obj.foo = true;
+   assert.strictEqual( oo.isPlainObject( obj ), true, 'non-empty 
object with no prototype' );
+
+   // Non-plain objects (any inheritance other than 
Object.prototype is not plain)
+   obj = Object.create( Object.create( null ) );
+   assert.strictEqual( oo.isPlainObject( obj

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Restore Dashiki config in CommonSettings for...

2017-04-05 Thread Chad (Code Review)

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

Change subject: Revert "Revert "Restore Dashiki config in CommonSettings for 
now""
..


Revert "Revert "Restore Dashiki config in CommonSettings for now""

This reverts commit 76fec633e50c33acf32bbe91e8c6e0229b9d1399 because it did not 
work (the config in https://gerrit.wikimedia.org/r/#/c/344007/3/extension.json 
is not the same as the config removed here)

Change-Id: Iabfa21e55ddd1f2a5b5ae9df2a0e59361e2e246e
---
M wmf-config/CommonSettings.php
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 58e70a2..7010293 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3201,7 +3201,18 @@
 
 // Enable Config:Dashiki: sub-namespace on meta.wikimedia.org - T156971
 if ( $wmgEnableDashikiData ) {
-   // Dashiki sub-namespace Config:Dashiki: is configured in extension.json
+   // Configure Dashiki sub-namespace with JsonConfig
+   $wgJsonConfigs['JsonConfig.Dashiki'] = array(
+   'pattern' => '/^Dashiki\:./',
+   'isLocal' => true,
+   );
+
+   // register the custom view implemented by the Dashiki extension
+   $wgJsonConfigModels['JsonConfig.Dashiki'] = array(
+   'class' => null,
+   'view'  => 'Dashiki\DashikiView',
+   );
+
wfLoadExtension( 'Dashiki' );
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabfa21e55ddd1f2a5b5ae9df2a0e59361e2e246e
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
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]: Update Russian Wikipedia logo

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Update Russian Wikipedia logo
..


Update Russian Wikipedia logo

Bug: T162036
Change-Id: Iff761f60c0bc3ab32c71e305688c47db31eb72e3
---
M static/images/mobile/copyright/wikipedia-wordmark-ru.svg
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/static/images/mobile/copyright/wikipedia-wordmark-ru.svg 
b/static/images/mobile/copyright/wikipedia-wordmark-ru.svg
index 94af9cb..9685a07 100644
--- a/static/images/mobile/copyright/wikipedia-wordmark-ru.svg
+++ b/static/images/mobile/copyright/wikipedia-wordmark-ru.svg
@@ -1,9 +1,7 @@
 
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
-wikipedia-wordmark-ru
-
-
-
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
+Wiktionary
+
+
 
-
 
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff761f60c0bc3ab32c71e305688c47db31eb72e3
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Restore Dashiki config in CommonSettings for...

2017-04-05 Thread Milimetric (Code Review)

Hello Chad, Florianschmidtwelzow, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Revert "Restore Dashiki config in CommonSettings for 
now""
..

Revert "Revert "Restore Dashiki config in CommonSettings for now""

This reverts commit 76fec633e50c33acf32bbe91e8c6e0229b9d1399 because it did not 
work (the config in https://gerrit.wikimedia.org/r/#/c/344007/3/extension.json 
is not the same as the config removed here)

Change-Id: Iabfa21e55ddd1f2a5b5ae9df2a0e59361e2e246e
---
M wmf-config/CommonSettings.php
1 file changed, 12 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b163767..4638db5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3195,7 +3195,18 @@
 
 // Enable Config:Dashiki: sub-namespace on meta.wikimedia.org - T156971
 if ( $wmgEnableDashikiData ) {
-   // Dashiki sub-namespace Config:Dashiki: is configured in extension.json
+   // Configure Dashiki sub-namespace with JsonConfig
+   $wgJsonConfigs['JsonConfig.Dashiki'] = array(
+   'pattern' => '/^Dashiki\:./',
+   'isLocal' => true,
+   );
+
+   // register the custom view implemented by the Dashiki extension
+   $wgJsonConfigModels['JsonConfig.Dashiki'] = array(
+   'class' => null,
+   'view'  => 'Dashiki\DashikiView',
+   );
+
wfLoadExtension( 'Dashiki' );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabfa21e55ddd1f2a5b5ae9df2a0e59361e2e246e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
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...Dashiki[wmf/1.29.0-wmf.19]: Move as much config in extension.json as possible

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Move as much config in extension.json as possible
..


Move as much config in extension.json as possible

Bug: T161038
Change-Id: Ie19aac0e1467a1a86a957325230a124530abe46a
(cherry picked from commit 6ff5c655abe8ed203fdf28b929e251463fa06c98)
---
M README
M extension.json
2 files changed, 7 insertions(+), 11 deletions(-)

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



diff --git a/README b/README
index 370bfe6..0e60bd5 100644
--- a/README
+++ b/README
@@ -5,14 +5,4 @@
 
 To install, add the following to LocalSettings.php
 
-// Configure Dashiki sub-namespace with JsonConfig
-$wgJsonConfigs['JsonConfig.Dashiki'] = array(
-  'pattern' => '/^Dashiki\:./',
-  'isLocal' => true,
-);
-
-// register the custom view implemented by the Dashiki extension
-$wgJsonConfigModels['JsonConfig.Dashiki'] = array(
-'class' => null,
-'view'  => 'Dashiki\DashikiView',
-);
+   wfLoadExtension( 'Dashiki' );
diff --git a/extension.json b/extension.json
index 3379d6d..2dff856 100644
--- a/extension.json
+++ b/extension.json
@@ -21,5 +21,11 @@
"view": "Dashiki\\DashikiView"
}
},
+   "JsonConfigs": {
+   "Dashiki": {
+   "pattern": "/^Dashiki\\:./",
+   "isLocal": true
+   }
+   },
"manifest_version": 2
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie19aac0e1467a1a86a957325230a124530abe46a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Dashiki
Gerrit-Branch: wmf/1.29.0-wmf.19
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Milimetric 
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]: RecentChanges: Allow resetting date selection

2017-04-05 Thread Mooeypoo (Code Review)

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

Change subject: RecentChanges: Allow resetting date selection
..

RecentChanges: Allow resetting date selection

Add a link that resets the date selection if it is selected.

Bug: T160028
Change-Id: I4ecff943025635f42eb70fc70c6dfdf34c314707
---
M includes/specials/SpecialRecentchanges.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/346660/1

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index ae0887d..f88f09c 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -746,6 +746,9 @@
$user = $this->getUser();
$config = $this->getConfig();
if ( $options['from'] ) {
+   $resetLink = $this->makeOptionsLink( $this->msg( 
'rclistfromreset' ),
+   [ 'from' => '' ], $nondefaults );
+
$note .= $this->msg( 'rcnotefrom' )
->numParams( $options['limit'] )
->params(
@@ -754,7 +757,13 @@
$lang->userTime( $options['from'], 
$user )
)
->numParams( $numRows )
-   ->parse() . '';
+   ->parse() . ' ' .
+   Html::rawElement(
+   'span',
+   [ 'class' => 'rcoptions-listfromreset' 
],
+   $this->msg( 'parentheses' )->rawParams( 
$resetLink )->parse()
+   ) .
+   '';
}
 
# Sort data for display and make sure it's unique after we've 
added user data.
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 37f9f7f..ea2b05a 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1429,6 +1429,7 @@
"rcfilters-hideminor-conflicts-typeofchange": "Certain types of change 
cannot be designated as \"minor,\" so this filter conflicts with the following 
Type of Change filters: $1",
"rcfilters-typeofchange-conflicts-hideminor": "This Type of Change 
filter conflicts with the \"Minor Edits\" filter. Certain types of change 
cannot be designated as \"minor.\"",
"rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since 
$3, $4 (up to $1 shown).",
+   "rclistfromreset": "Reset date selection.",
"rclistfrom": "Show new changes starting from $2, $3",
"rcshowhideminor": "$1 minor edits",
"rcshowhideminor-show": "Show",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 8dd6d0f..01a8fe7 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1617,6 +1617,7 @@
"rcfilters-typeofchange-conflicts-hideminor": "Tooltip shown when 
hovering over a Type of change filter tag, when the Minor edits filter is also 
selected.\n\n\"Minor edits\" is 
{{msg-mw|rcfilters-filter-minor-label}}.\n\n\"Type of change\" is 
{{msg-mw|rcfilters-filtergroup-changetype}}.\n\nThis indicates that no results 
will be shown.",
"rcnotefrom": "This message is displayed at [[Special:RecentChanges]] 
when viewing recentchanges from some specific time.\n\nThe corresponding 
message is {{msg-mw|Rclistfrom}}.\n\nParameters:\n* $1 - the maximum number of 
changes that are displayed\n* $2 - (Optional) a date and time\n* $3 - a date\n* 
$4 - a time\n* $5 - Number of changes are displayed, for use with PLURAL",
"rclistfrom": "Used on [[Special:RecentChanges]]. Parameters:\n* $1 - 
(Currently not use) date and time. The date and the time adds to the rclistfrom 
description.\n* $2 - time. The time adds to the rclistfrom link description 
(with split of date and time).\n* $3 - date. The date adds to the rclistfrom 
link description (with split of date and time).\n\nThe corresponding message is 
{{msg-mw|Rcnotefrom}}.",
+   "rclistfromreset": "Used on [[Special:RecentChanges]] to reset a 
selection of a certain date range.",
"rcshowhideminor": "Option text in [[Special:RecentChanges]]. 
Parameters:\n* $1 - the \"show/hide\" command, with the text taken from either 
{{msg-mw|rcshowhideminor-show}} or 
{{msg-mw|rcshowhideminor-hide}}\n{{Identical|Minor edit}}",
"rcshowhideminor-show": "{{doc-actionlink}}\nOption text in 
[[Special:RecentChanges]] in conjunction with 
{{msg-mw|rcshowhideminor}}.\n\nSee also:\n* 
{{msg-mw|rcshowhideminor-hide}}\n{{Identical|Show}}",
"rcshowhideminor-hide": "{{doc-actionlink}}\nOption text in 
[[Special:RecentChanges]] in conjunction with

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy Page previews to stable on Hungrian and Hebrew Wikipe...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Deploy Page previews to stable on Hungrian and Hebrew Wikipedias
..


Deploy Page previews to stable on Hungrian and Hebrew Wikipedias

Bug: T162162
Change-Id: I4f58beed78dc9daf7ef39d1fb750111e508bfcf4
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8d07d50..67fc0da 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13324,6 +13324,10 @@
'ruwiki' => true,
'elwiki' => true,
'cawiki' => true,
+
+   // T162162
+   'hewiki' => true,
+   'huwiki' => true,
 ],
 
 'wgPopupsAnonsEnabledSamplingRate' => [
@@ -13337,6 +13341,8 @@
'ruwiki' => 0.9,
'elwiki' => 0.9,
'cawiki' => 0.9,
+   'hewiki' => 0.9,
+   'huwiki' => 0.9
 ],
 
 'wmgPopupsBetaFeature' => [
@@ -13367,6 +13373,7 @@
'elwiki' => true,
'cawiki' => true,
'hewiki' => true,
+   'huwiki' => true,
 ],
 
 'wmgULSCompactLanguageLinksBetaFeature' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[printstyles]: Infobox print styles

2017-04-05 Thread Jdlrobson (Code Review)

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

Change subject: Infobox print styles
..

Infobox print styles

Bug: T159857
Change-Id: Ie860fcf8e1325ef256432219f950da716b3de805
---
A resources/skins.minerva.print.styles/infobox.less
M resources/skins.minerva.print.styles/styles.less
2 files changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/resources/skins.minerva.print.styles/infobox.less 
b/resources/skins.minerva.print.styles/infobox.less
new file mode 100644
index 000..b9031d0
--- /dev/null
+++ b/resources/skins.minerva.print.styles/infobox.less
@@ -0,0 +1,12 @@
+@import 'minerva.variables';
+@import 'minerva.mixins';
+
+.infobox {
+   font-size: 30px;
+   border: solid 1px @printBodyBackground;
+   border-radius: 5px;
+
+   tr {
+   border-top: solid 2px @printBodyBackground;
+   }
+}
diff --git a/resources/skins.minerva.print.styles/styles.less 
b/resources/skins.minerva.print.styles/styles.less
index b888188..48114bd 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -1,3 +1,4 @@
 @media print {
@import 'article.less';
+   @import 'infobox.less';
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Remove debian metadata from the main repo

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Remove debian metadata from the main repo
..


Remove debian metadata from the main repo

My packaging files have moved to 
https://github.com/adamwight/process-control-debian

Change-Id: I21fa529ac5a9ee3ae145dfb21d2af39185567062
---
D debian/changelog
D debian/compat
D debian/control
D debian/copyright
D debian/docs
D debian/rules
D debian/source/format
D debian/upstream/metadata
8 files changed, 0 insertions(+), 44 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 3d5dac1..000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-process-control (0.0.1~rc1-1) UNRELEASED; urgency=low
-
-  * Initial release.
-
- -- Adam Roses Wight   Thu, 16 Mar 2017 00:12:17 -0700
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index bfd362a..000
--- a/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: process-control
-Maintainer: Adam Roses Wight 
-Section: admin
-Priority: optional
-Build-Depends: debhelper (>= 9), dh-python, python-all, python-setuptools
-Standards-Version: 3.9.8
-Homepage: https://github.com/adamwight/process-control
-Vcs-Browser: https://github.com/adamwight/process-control
-Vcs-Git: git://github.com/adamwight/process-control.git
-X-Python-Version: >= 2.7
-
-Package: process-control
-Architecture: all
-Depends: ${python:Depends}, python-argparse, python-yaml
-Description: Tools for Wikimedia Foundation Fundraising job management
- Control and schedule jobs using configuration files.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index cb75346..000
--- a/debian/copyright
+++ /dev/null
@@ -1,7 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://github.com/adamwight/process-control
-
-Files: *
-Copyright: 2017, Adam Roses Wight 
-License: GPL-2
- /usr/share/common-licenses/GPL-2
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 22c7238..000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.md
-process-control.example.yaml
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index e8722a2..000
--- a/debian/rules
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-export PYBUILD_NAME=process-control
-
-%:
-   dh $@ --with=python2 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
deleted file mode 100644
index 2922586..000
--- a/debian/upstream/metadata
+++ /dev/null
@@ -1,5 +0,0 @@
-Bug-Database: https://github.com/adamwight/process-control/issues
-Bug-Submit: https://github.com/adamwight/process-control/issues/new
-Contact: Adam Roses Wight 
-Repository: git://github.com/adamwight/process-control.git
-Repository-Browse: https://github.com/adamwight/process-control

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21fa529ac5a9ee3ae145dfb21d2af39185567062
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Infobox print styles

2017-04-05 Thread Jdlrobson (Code Review)

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

Change subject: Infobox print styles
..

Infobox print styles

Bug: T159857
Change-Id: If2d5de335e47db8e192174c9b8b856c8aa96cb01
---
A resources/skins.minerva.print.styles/infobox.less
M resources/skins.minerva.print.styles/styles.less
2 files changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/resources/skins.minerva.print.styles/infobox.less 
b/resources/skins.minerva.print.styles/infobox.less
new file mode 100644
index 000..b9031d0
--- /dev/null
+++ b/resources/skins.minerva.print.styles/infobox.less
@@ -0,0 +1,12 @@
+@import 'minerva.variables';
+@import 'minerva.mixins';
+
+.infobox {
+   font-size: 30px;
+   border: solid 1px @printBodyBackground;
+   border-radius: 5px;
+
+   tr {
+   border-top: solid 2px @printBodyBackground;
+   }
+}
diff --git a/resources/skins.minerva.print.styles/styles.less 
b/resources/skins.minerva.print.styles/styles.less
index b888188..48114bd 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -1,3 +1,4 @@
 @media print {
@import 'article.less';
+   @import 'infobox.less';
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Dashiki[wmf/1.29.0-wmf.19]: Move as much config in extension.json as possible

2017-04-05 Thread Chad (Code Review)

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

Change subject: Move as much config in extension.json as possible
..

Move as much config in extension.json as possible

Bug: T161038
Change-Id: Ie19aac0e1467a1a86a957325230a124530abe46a
(cherry picked from commit 6ff5c655abe8ed203fdf28b929e251463fa06c98)
---
M README
M extension.json
2 files changed, 7 insertions(+), 11 deletions(-)


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

diff --git a/README b/README
index 370bfe6..0e60bd5 100644
--- a/README
+++ b/README
@@ -5,14 +5,4 @@
 
 To install, add the following to LocalSettings.php
 
-// Configure Dashiki sub-namespace with JsonConfig
-$wgJsonConfigs['JsonConfig.Dashiki'] = array(
-  'pattern' => '/^Dashiki\:./',
-  'isLocal' => true,
-);
-
-// register the custom view implemented by the Dashiki extension
-$wgJsonConfigModels['JsonConfig.Dashiki'] = array(
-'class' => null,
-'view'  => 'Dashiki\DashikiView',
-);
+   wfLoadExtension( 'Dashiki' );
diff --git a/extension.json b/extension.json
index 3379d6d..2dff856 100644
--- a/extension.json
+++ b/extension.json
@@ -21,5 +21,11 @@
"view": "Dashiki\\DashikiView"
}
},
+   "JsonConfigs": {
+   "Dashiki": {
+   "pattern": "/^Dashiki\\:./",
+   "isLocal": true
+   }
+   },
"manifest_version": 2
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie19aac0e1467a1a86a957325230a124530abe46a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Dashiki
Gerrit-Branch: wmf/1.29.0-wmf.19
Gerrit-Owner: Chad 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add more jobs to test-prio

2017-04-05 Thread Zppix (Code Review)

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

Change subject: Add more jobs to test-prio
..

Add more jobs to test-prio

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/56/346656/2

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d759b91..eb85e46 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2061,7 +2061,7 @@
   - name: operations/debs/wikistats
 check:
   - php55lint
-test:
+test-prio:
  - php55lint
  - debian-glue-non-voting
 gate-and-submit:
@@ -2196,7 +2196,7 @@
   - name: operations/puppet/kafkatee
 template:
   - name: puppet-module
-test:
+test-prio:
   - tox-jessie
 
   - name: operations/puppet/mariadb
@@ -2210,7 +2210,7 @@
   - name: operations/puppet/varnishkafka
 template:
   - name: puppet-module
-test:
+test-prio:
   - tox-jessie
 
   - name: operations/puppet/wikimetrics
@@ -2268,7 +2268,7 @@
   - name: operations/software/tools-manifest
 template:
   - name: tox-jessie
-test:
+test-prio:
   - debian-glue
 gate-and-submit:
   - debian-glue
@@ -2276,7 +2276,7 @@
   - name: operations/software/tools-webservice
 template:
   - name: tox-jessie
-test:
+test-prio:
   - debian-glue
 gate-and-submit:
   - debian-glue

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d78df28dd0247e2d0ec9d36772be66f030cbb1c
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zppix 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Get browser info from new userAgent field

2017-04-05 Thread Chelsyx (Code Review)

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

Change subject: Get browser info from new userAgent field
..

Get browser info from new userAgent field

Bug: T162178
Change-Id: Ib292a1b87338c596125618b29ad16b7a82e48141
---
M modules/metrics/portal/user_agents.R
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/55/346655/1

diff --git a/modules/metrics/portal/user_agents.R 
b/modules/metrics/portal/user_agents.R
index 20097b1..6e45723 100644
--- a/modules/metrics/portal/user_agents.R
+++ b/modules/metrics/portal/user_agents.R
@@ -53,7 +53,16 @@
   # Get user agent data
   wmf::set_proxies() # To allow for the latest YAML to be retrieved.
   uaparser::update_regexes()
-  ua_data <- 
data.table::as.data.table(uaparser::parse_agents(results$user_agent, fields = 
c("browser", "browser_major")))
+  ua_data <- data.table::rbindlist(lapply(results$user_agent, function(x){
+if (grepl("^\\{", x)){
+  temp <- unlist(jsonlite::fromJSON(x)[c("browser_family", 
"browser_major")])
+  names(temp)[1] <- "browser"
+  temp <- as.data.frame(as.list(temp))
+  return(temp)
+} else {
+  uaparser::parse_agents(x, fields = c("browser", "browser_major"))
+}
+  }), fill = TRUE)
   ua_data <- ua_data[, j = list(amount = .N), by = c("browser", 
"browser_major")]
   ua_data$date <- results$date[1]
   ua_data$percent <- round((ua_data$amount/sum(ua_data$amount)) * 100, 2)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib292a1b87338c596125618b29ad16b7a82e48141
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Compress head loaded SVGS

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Compress head loaded SVGS
..


Compress head loaded SVGS

The new branding work introduced these icons but didn't compress
them. This results in a saving of 0.5kb.

Bug: T159979
Change-Id: I670bf5ede37450d376cdbf1635a83d2c82590da8
---
M resources/skins.minerva.icons.images/bell.svg
M resources/skins.minerva.icons.images/magnifying-glass.svg
2 files changed, 19 insertions(+), 20 deletions(-)

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



diff --git a/resources/skins.minerva.icons.images/bell.svg 
b/resources/skins.minerva.icons.images/bell.svg
index 7bff9e5..0b160fb 100644
--- a/resources/skins.minerva.icons.images/bell.svg
+++ b/resources/skins.minerva.icons.images/bell.svg
@@ -1,22 +1,22 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-icon-export
-Created with Sketch.
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+icon-export
+
 
-
-
-
+
+
+
 
 
-
+
 
 
-
-
-
+
+
+
 
 
 
 
-
\ No newline at end of file
+
diff --git a/resources/skins.minerva.icons.images/magnifying-glass.svg 
b/resources/skins.minerva.icons.images/magnifying-glass.svg
index 6062804..9984587 100644
--- a/resources/skins.minerva.icons.images/magnifying-glass.svg
+++ b/resources/skins.minerva.icons.images/magnifying-glass.svg
@@ -1,14 +1,13 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-icon-export
-Created with Sketch.
-
-
+http://www.w3.org/2000/svg;>
+
+icon-export
+
+
 
 
-
+
 
 
 
-
\ No newline at end of file
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I670bf5ede37450d376cdbf1635a83d2c82590da8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Stop stripping 'rel=mw:Extlink' attributes from tags

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Stop stripping 'rel=mw:Extlink' attributes from  tags
..


Stop stripping 'rel=mw:Extlink' attributes from  tags

There is a transform to add class="external" to links when this appears.
It has probably been broken for some time.  When we put it back, the app
will inject an external link icon as expected.

This attribute is also required for some CSS (available in the
ResourceLoader module mediawiki.skinning.content.parsoid) to add a bit of
text with an incremented counter (e.g., '[1]') for  tags with external
links and empty content.  Bundling this module with the app even after
this change doesn't seem to Just Work, though.  Still, the links will at
least be clickable due to the icon now appearing.

Bug: T162116
Change-Id: I44a28b0b3c339064df7559d336d347ffdb84731d
---
M lib/transforms.js
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
5 files changed, 19 insertions(+), 19 deletions(-)

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



diff --git a/lib/transforms.js b/lib/transforms.js
index 7e80d90..11fe9b0 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -188,7 +188,7 @@
 }
 
 function _applyOptionalParsoidSpecificTransformations(doc) {
-_rmAttributes(doc, 'a:not([rel=nofollow])', ['rel']);
+_rmAttributes(doc, 'a:not([rel=nofollow],[rel~=mw:ExtLink])', ['rel']);
 _rmAttributes(doc, 'a', ['about', 'data-mw', 'id', 'typeof']);
 _rmAttributes(doc, 'code', ['about', 'data-mw', 'id', 'typeof']);
 _rmAttributes(doc, 'div', ['about', 'data-mw', 'id', 'typeof']);
diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 651624d..24bdf8a 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -29,7 +29,7 @@
   },
   {
 "id": 2,
-"text": "\n Links partially italicized: Hindenburg disaster\n Link to edit 
action using edit template: edit\n Link to edit action using fullurl template edit2\n\n",
+"text": "\n Links partially italicized: Hindenburg disaster\n Link to edit 
action using edit template: edit\n Link to edit action 
using fullurl template edit2\n\n",
 "toclevel": 1,
 "line": "More links",
 "anchor": "More_links"
@@ -99,14 +99,14 @@
   },
   {
 "id": 12,
-"text": "\n\n\nShortcuts:\nMOS:ORDERMOS:SECTIONORDER\nSee also: Wikipedia:Manual of Style 
§Section headings\n\nA simple article should have at least a lead section 
and references. As editors add complexity where required, the elements (such as 
sections and templates) that are used typically appear in the following order, 
although they would not all appear in the same article at the same time: 
\n Before the lead section\n Hatnotes\n 
Deletion/Protection tags (CSD, PROD, AFD, PP notices)\n Appendices[1]\n Works or 
publications (for biographies only)\n 
Foo\n {{featured 
list}}, {{featured article}} and 
{{good article}} 
(where appropriate for article status) \n Defaultsort\n Categories[2]\n\n",
+"text": "\n\n\nShortcuts:\nMOS:ORDERMOS:SECTIONORDER\nSee also: Wikipedia:Manual of Style 
§Section headings\n\nA simple article should have at least a lead section 
and references. As editors add complexity where required, the elements (such as 
sections and templates) that are used typically appear in the following order, 
although they would not all appear in the same article at the same time: 
\n Before the lead section\n Hatnotes\n 
Deletion/Protection tags (CSD, PROD, AFD, PP notices)\n Appendices[1]\n Works or 
publications (for biographies only)\n 
Foo\n {{featured 
list}}, {{featured article}} and 
{{good article}} 
(where appropriate for article status) \n Defaultsort\n Categories[2]\n\n",
 "toclevel": 2,
 "line": "Order of article elements",
 "anchor": "Order_of_article_elements"
   },
   {
 "id": 13,
-"text": "\n\nShortcut:\nMOS:BODY\nFurther information: Help:Section and Wikipedia:Manual of Style 
§Article titles, headings, and sections\n\nBody sections appear after 
the lead and table of contents (click on image for larger 
view).\n\nArticles longer than a stub are generally 
divided into sections...\n\n",
+

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Unify `padding` on DecoratedOptionWidget an...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: MediaWiki theme: Unify `padding` on DecoratedOptionWidget and 
descendants
..


MediaWiki theme: Unify `padding` on DecoratedOptionWidget and descendants

Unifying `padding` & positioning of labels/icons/indicators across
DecoratedOptionWidget and derived DraggableElement, MenuOption-,
MenuSectionOption & OutlineOptionWidget.

Also
 - fixing styling of MenuSectionOptionWidget by showing correct cursor
 (selector specificity issue) and harmonizing with MenuOptionWidget
 styles,
 - removing OutlineOptionWidget's `font-size` hack by better, more
 specific solution,
 - removing unnecessary specific selector, as DraggableElement carries
 either `.oo-ui-draggableElement` or `.oo-ui-draggableElement-handle`
 on every occurrence,
 - adding `position: relative` to Dropdown handle to have icon/indicator
 position done correctly.

Bug: T92452
Bug: T161177
Change-Id: I2223c6dc3423c13219e3cf6c8ea712c48d82e117
---
M src/styles/elements/DraggableElement.less
M src/styles/widgets/DropdownWidget.less
M src/styles/widgets/MenuSectionOptionWidget.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
5 files changed, 36 insertions(+), 20 deletions(-)

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



diff --git a/src/styles/elements/DraggableElement.less 
b/src/styles/elements/DraggableElement.less
index cd6c67b..b420a2b 100644
--- a/src/styles/elements/DraggableElement.less
+++ b/src/styles/elements/DraggableElement.less
@@ -1,7 +1,6 @@
 @import '../common';
 
 .oo-ui-draggableElement {
-   &-handle:not( .oo-ui-draggableElement-undraggable ),
// HACK: Widgets will often specify a cursor with higher specificity, 
so override those here as
// they are a common use case of this mixin.
&-handle:not( .oo-ui-draggableElement-undraggable ).oo-ui-widget {
diff --git a/src/styles/widgets/DropdownWidget.less 
b/src/styles/widgets/DropdownWidget.less
index 36311cb..f75bec6 100644
--- a/src/styles/widgets/DropdownWidget.less
+++ b/src/styles/widgets/DropdownWidget.less
@@ -5,6 +5,7 @@
position: relative;
 
&-handle {
+   position: relative;
width: 100%;
display: block;
white-space: nowrap;
diff --git a/src/styles/widgets/MenuSectionOptionWidget.less 
b/src/styles/widgets/MenuSectionOptionWidget.less
index f670f7f..f9c89b2 100644
--- a/src/styles/widgets/MenuSectionOptionWidget.less
+++ b/src/styles/widgets/MenuSectionOptionWidget.less
@@ -1,8 +1,9 @@
 @import '../common';
 
 .oo-ui-menuSectionOptionWidget {
-   cursor: default;
+   &.oo-ui-widget-enabled {
+   cursor: default;
+   }
 
.theme-oo-ui-menuSectionOptionWidget();
 }
-
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 97c05d7..d3ba9b5 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -112,11 +112,15 @@
 
 @padding-default: @padding-top-default @padding-horizontal-default 
@padding-bottom-default;
 @padding-input-text: @padding-top-default @padding-horizontal-input-text 
@padding-bottom-default;
+@padding-menu: @padding-top-menu @padding-horizontal-default 
@padding-bottom-menu;
+@padding-menu-large: ( @padding-top-menu * 1.5 ) @padding-horizontal-default ( 
@padding-bottom-menu * 1.5 );
 @padding-horizontal-default: 12 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.9375em`≈`12px`
 @padding-horizontal-input-text: 8 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 @padding-vertical-label: 4 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.3125em`≈`4px`
 @padding-top-default: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default; 
// equals `0.625em`≈`8px`
+@padding-top-menu: 9 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
 @padding-bottom-default: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px`
+@padding-bottom-menu: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
 @padding-start-input-text-icon: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // As long as we have whitespace in icon canvas, we 
need reduced `padding-left`.
 @padding-start-input-text-icon-label: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 07314f4..a2dec1e 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -480,7 +480,8 @@
 }
 
 .theme-oo-ui-decoratedOptionWidget () {
-   padding: 0.5em 2em 0.5em 3em;
+   padding: @padding-menu;
+   line-height: @line-height-reset;
 
&.oo-ui-iconElement .oo-ui-iconElement-icon,
&.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
@@ -488,12 +489,20

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Unify `padding` across widgets and variablize

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: MediaWiki theme: Unify `padding` across widgets and variablize
..


MediaWiki theme: Unify `padding` across widgets and variablize

Unifying `padding` & positioning of labels/icons/indicators across
widgets and centralize through Less variables. Widgets affected:
 - ButtonElement
 - ComboboxInputWidget
 - DropdownWidget
 - SelectFileWidget
 - TextInputWidget

Also:
 - Moving `padding` up in Apex and MediaWiki theme from SelectFileWidget.less
 - Cleaning up unnecessary b/c obsolete or duplicated properties across widgets

CapsuleMultiselect, DecoratedOption, MenuOption, MenuSectionOption &
SearchWidget, and further work on ButtonElement will be accomplished in
follow-up patches.

Bug: T161177
Change-Id: I3981a628dba03faea90019a8d26e797ed3a2fab7
---
M src/styles/widgets/SelectFileWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
5 files changed, 99 insertions(+), 95 deletions(-)

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



diff --git a/src/styles/widgets/SelectFileWidget.less 
b/src/styles/widgets/SelectFileWidget.less
index a7dcb73..2a050a6 100644
--- a/src/styles/widgets/SelectFileWidget.less
+++ b/src/styles/widgets/SelectFileWidget.less
@@ -119,12 +119,6 @@
 
.oo-ui-selectFileWidget-fileName {
display: block;
-   padding-top: 0.5em;
-   padding-right: @size-icon + 0.5em;
-   }
-
-   .oo-ui-selectFileWidget-clearButton {
-   right: 0.5em;
}
}
 
@@ -180,10 +174,6 @@
&-notsupported {
&.oo-ui-selectFileWidget-dropTarget {
height: auto;
-
-   .oo-ui-selectFileWidget-label {
-   padding: 1em;
-   }
}
}
 
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 492b798..a958355 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -874,6 +874,12 @@
}
}
 
+   &-notsupported {
+   .oo-ui-selectFileWidget-label {
+   padding: 1em;
+   }
+   }
+
&-dropTarget {
background-color: @background-color-main;
border: 1px solid #aaa;
@@ -891,6 +897,15 @@
overflow: inherit;
white-space: normal;
}
+
+   .oo-ui-selectFileWidget-fileName {
+   padding-top: 0.5em;
+   padding-right: @size-icon + 0.5em;
+   }
+
+   .oo-ui-selectFileWidget-clearButton {
+   right: 0.5em;
+   }
}
 
&-empty.oo-ui-selectFileWidget-dropTarget {
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 1048ed4..97c05d7 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -62,7 +62,7 @@
 
 // Box Sizes
 @min-width-button-default: 40 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.125em`≈`40px` at base `font-size: 12.8px`
-@min-width-button-combo-widget: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.5em`≈`32px` at base `font-size: 12.8px`
+@min-width-button-combo-widget: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `2.5em`≈`32px`
 @min-height-button-default: 32 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 @min-height-toggleswitch: 26px; // equals `16px` @size-toggleswitch-grip-min + 
4px*2 distance top/bottom + 1px*2 border top/bottom
 @max-width-default: 50em;
@@ -73,16 +73,16 @@
 @size-button-default: @size-default;
 @size-icon-min: 24px; // values used for `min-height` are defined in `px`, see 
T130691
 @size-indicator-min: 12px;
-@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `1.875em`≈`24px` at base `font-size: 12.8px`
-@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `0.9375em`≈`12px` at base `font-size: 12.8px`
+@size-icon: 24 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `1.875em`≈`24px`
+@size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `0.9375em`≈`12px`
 @size-toggleswitch-grip-min: 16px;
-@size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px` at base `font-size: 
12.8px`
+@size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px`
 
 @width-button-combo-widget: @min-width-button-combo-widget;
 
 @height-icon-element: 100%;

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Chore: remove pageCombo endpoint

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Chore: remove pageCombo endpoint
..


Chore: remove pageCombo endpoint

Bug: T156917
Change-Id: Ibec49dab4873023faa8efac8abee62149ad26152
---
D 
app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
M app/src/main/java/org/wikipedia/dataclient/page/PageClient.java
D app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageClient.java
D app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
M app/src/main/java/org/wikipedia/page/Section.java
9 files changed, 0 insertions(+), 188 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
deleted file mode 100644
index 2abaf41..000
--- 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.wikipedia.dataclient.mwapi.page;
-
-import org.wikipedia.dataclient.page.PageCombo;
-
-/**
- * Combines MwMobileViewPageLead and MwMobileViewPageRemaining Gson POJOs for 
mobileview API.
- * In mobileview API the implementation is basically the same as 
MwMobileViewPageLead.
- * The class name "Page" was already used, and is very entrenched in this code 
base.
- */
-public class MwMobileViewPageCombo extends MwMobileViewPageLead implements 
PageCombo {
-}
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
index db13a09..c180257 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageClient.java
@@ -2,17 +2,12 @@
 
 import android.support.annotation.NonNull;
 
-import org.wikipedia.dataclient.ServiceError;
 import org.wikipedia.dataclient.page.PageClient;
-import org.wikipedia.dataclient.page.PageCombo;
 import org.wikipedia.dataclient.page.PageLead;
 import org.wikipedia.dataclient.page.PageRemaining;
 import org.wikipedia.dataclient.page.PageSummary;
 
-import java.io.IOException;
-
 import retrofit2.Call;
-import retrofit2.Response;
 
 /**
  * Retrofit web service client for MediaWiki PHP API.
@@ -40,17 +35,6 @@
 @NonNull @Override public Call sections(@NonNull 
String title,
  boolean 
noImages) {
 return service.sections(title, optional(noImages));
-}
-
-@Override public PageCombo pageCombo(String title, boolean noImages) 
throws IOException {
-Response rsp = service.pageCombo(title, 
optional(noImages)).execute();
-if (!rsp.body().hasError()) {
-return rsp.body();
-}
-ServiceError err = rsp.body() == null || rsp.body().getError() == null
-? null
-: rsp.body().getError();
-throw new IOException(err == null ? rsp.message() : err.getDetails());
 }
 
 /**
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java 
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
index 53711eb..51ca18e 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
@@ -67,19 +67,4 @@
 + "=toclevel%7Cline%7Canchor=true")
 @NonNull Call sections(@NonNull @Query("page") 
String title,
   @Nullable 
@Query("noimages") Boolean noImages);
-
-/**
- * Gets all page content of a given title -- for refreshing a saved page
- * Note: the only difference in the URL from #pageLead is the sections=all 
instead of 0.
- *
- * @param title the page title to be used including prefix
- * @param noImages add the noimages flag to the request if true
- */
-@GET("w/api.php?action=mobileview=json=2="
-+ 
"text%7Csections%7Clanguagecount%7Cthumb%7Cimage%7Cid%7Crevision%7Cdescription"
-+ 
"%7Clastmodified%7Cnormalizedtitle%7Cdisplaytitle%7Cprotection%7Ceditable"
-+ 
"%7Cpageprops=wikibase_item=1=all"
-+ "=toclevel%7Cline%7Canchor=true")
-Call pageCombo(@Query("page") String title,
-  @Query("noimages") Boolean noImages);
 }
diff --git

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: remove file-based saved pages

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Update: remove file-based saved pages
..


Update: remove file-based saved pages

Bug: T156917
Change-Id: I51c1bd5cc6c90be5aa58ab230fdd1633eb03ddda
---
M app/src/main/assets/bundle.js
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
M app/src/main/java/org/wikipedia/readinglist/page/ReadingListPage.java
M 
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDiskTable.java
M 
app/src/main/java/org/wikipedia/readinglist/page/database/disk/ReadingListPageDiskRow.java
D app/src/main/java/org/wikipedia/savedpages/ImageUrlHtmlParser.java
D app/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
D app/src/main/java/org/wikipedia/savedpages/LoadSavedPageUrlMapTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPage.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/util/FileUtil.java
M app/src/main/java/org/wikipedia/util/ImageUrlUtil.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
D app/src/test/java/org/wikipedia/savedpages/ImageUrlHtmlParserTest.java
M www/js/sections.js
18 files changed, 21 insertions(+), 809 deletions(-)

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



diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 676fc1c..0cccf25 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -587,8 +587,7 @@
 }
 document.getElementById( "loading_sections").className = "";
 bridge.sendMessage( "pageLoadComplete", {
-  "sequence": payload.sequence,
-  "savedPage": payload.savedPage });
+  "sequence": payload.sequence });
 } else {
 var contentWrapper = document.getElementById( "content" );
 elementsForSection(payload.section).forEach(function (element) {
@@ -603,7 +602,7 @@
 if ( typeof payload.fragment === "string" && payload.fragment.length > 
0 && payload.section.anchor === payload.fragment) {
 scrollToSection( payload.fragment );
 }
-bridge.sendMessage( "requestSection", { "sequence": payload.sequence, 
"savedPage": payload.savedPage, "index": payload.section.id + 1 });
+bridge.sendMessage( "requestSection", { "sequence": payload.sequence, 
"index": payload.section.id + 1 });
 }
 });
 
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index cc9ddca..2e98f93 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -68,8 +68,6 @@
 import org.wikipedia.readinglist.page.ReadingListPage;
 import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
 import org.wikipedia.readinglist.page.database.ReadingListPageDao;
-import org.wikipedia.savedpages.ImageUrlHtmlParser;
-import org.wikipedia.savedpages.LoadSavedPageUrlMapTask;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.tooltip.ToolTipUtil;
 import org.wikipedia.util.ActiveTimer;
@@ -898,37 +896,6 @@
 if (getPageLoadCallbacks() != null) {
 getPageLoadCallbacks().onLoadError(caught);
 }
-}
-
-/**
- * Read URL mappings from the saved page specific file
- */
-public void readUrlMappings() {
-new LoadSavedPageUrlMapTask(model.getTitle()) {
-@Override
-public void onFinish(JSONObject result) {
-// have we been unwittingly detached from our Activity?
-if (!isAdded()) {
-L.d("Detached from activity, so stopping update.");
-return;
-}
-
-ImageUrlHtmlParser.replaceImageSources(bridge, result);
-}
-
-@Override
-public void onCatch(Throwable e) {
-if (!isAdded()) {
-return;
-}
-/*
-If anything bad happens during loading of a saved page, then 
simply bounce it
-back to the online version of the page, and re-save the page 
contents locally when it's done.
- */
-L.d(e);
-refreshPage();
-}
-}.execute();
 }
 
 public void refreshPage() {
diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java 
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index 52d7019..ef9393c 100644
---

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuSelectWidget: Highlight the first result when searching

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: MenuSelectWidget: Highlight the first result when searching
..


MenuSelectWidget: Highlight the first result when searching

When we search for an item, highlight the first result found.
This is similar to what happens when we move with the arrow keys
and makes sense for highlighting the first search. It also gives
the option to the user of this widget to call on
this.getHighligtedItem() to pick the first result of the search.
Similar also to an autocomplete feature.

This will be done optionally through the highlightOnFilter
config option.

Change-Id: I66339c2efaf9b7b9a3ea88d59ad087ae102dbbad
---
M src/widgets/MenuSelectWidget.js
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index e71f34b..044e357 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -39,6 +39,7 @@
  * @cfg {boolean} [autoHide=true] Hide the menu when the mouse is pressed 
outside the menu.
  * @cfg {boolean} [hideOnChoose=true] Hide the menu when the user chooses an 
option.
  * @cfg {boolean} [filterFromInput=false] Filter the displayed options from 
the input
+ * @cfg {boolean} [highlightOnFilter] Highlight the first result when filtering
  */
 OO.ui.MenuSelectWidget = function OoUiMenuSelectWidget( config ) {
// Configuration initialization
@@ -58,6 +59,7 @@
this.$widget = config.widget ? config.widget.$element : null;
this.onDocumentMouseDownHandler = this.onDocumentMouseDown.bind( this );
this.onInputEditHandler = OO.ui.debounce( 
this.updateItemVisibility.bind( this ), 100 );
+   this.highlightOnFilter = !!config.highlightOnFilter;
 
// Initialization
this.$element
@@ -134,6 +136,7 @@
  */
 OO.ui.MenuSelectWidget.prototype.updateItemVisibility = function () {
var i, item, visible, section, sectionEmpty,
+   firstItemFound = false,
anyVisible = false,
len = this.items.length,
showAll = !this.isVisible(),
@@ -155,6 +158,11 @@
anyVisible = anyVisible || visible;
sectionEmpty = sectionEmpty && !visible;
item.toggle( visible );
+   if ( this.highlightOnFilter && visible && 
!firstItemFound ) {
+   // Highlight the first item in the list
+   this.highlightItem( item );
+   firstItemFound = true;
+   }
}
}
// Process the final section

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66339c2efaf9b7b9a3ea88d59ad087ae102dbbad
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] performance/WebPageTest[master]: test: Update mobile_result fixture

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: test: Update mobile_result fixture
..


test: Update mobile_result fixture

The current one was outdated and mentioned various outdated
urls that keep showing up in Wikimedia Git searches.

Change-Id: I8bcbcc3567efac9b2b8158f76c0c41f5daa64221
---
M test/files/mobile_result.json
1 file changed, 8,842 insertions(+), 7,039 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bcbcc3567efac9b2b8158f76c0c41f5daa64221
Gerrit-PatchSet: 1
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
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]: Fix incorrect index name in new 1.28.0 installations

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Fix incorrect index name in new 1.28.0 installations
..


Fix incorrect index name in new 1.28.0 installations

This index name should be the same in new installations as in all other
MySQL installations. This is necessary so that
Special:DeletedContributions does not give an SQL error. Release notes
will go in the 1.28 branch.

Bug: T154872
Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3
---
M includes/installer/MysqlUpdater.php
A maintenance/archives/patch-rename-ar_usertext_timestamp.sql
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index ff13196..70e790c 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -294,6 +294,7 @@
[ 'addField', 'change_tag', 'ct_id', 
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id', 
'patch-tag_summary-ts_id.sql' ],
[ 'modifyField', 'recentchanges', 'rc_ip', 
'patch-rc_ip_modify.sql' ],
+   [ 'addIndex', 'archive', 'usertext_timestamp', 
'patch-rename-ar_usertext_timestamp.sql' ],
 
// 1.29
[ 'addField', 'externallinks', 'el_index_60', 
'patch-externallinks-el_index_60.sql' ],
diff --git a/maintenance/archives/patch-rename-ar_usertext_timestamp.sql 
b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
new file mode 100644
index 000..658c179
--- /dev/null
+++ b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
@@ -0,0 +1,7 @@
+-- Rename the archive.ar_usertext_timestamp index to usertext_timestamp.
+-- This is for MySQL only and is only necessary on wikis freshly installed on
+-- 1.28.0 when bug T154872 was present. The patch will probably be removed in
+-- 1.29 since we plan on renaming the index properly to ar_usertext_timestamp.
+ALTER TABLE /*$wgDBprefix*/archive
+   DROP INDEX ar_usertext_timestamp,
+   ADD INDEX usertext_timestamp (ar_user_text,ar_timestamp);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Jjanes 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
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]: RCFilters UI: Use pixel instead of em for distancing the hig...

2017-04-05 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters UI: Use pixel instead of em for distancing the 
highlight dots
..

RCFilters UI: Use pixel instead of em for distancing the highlight dots

Bug: T161258
Change-Id: I483dc698ba15380990ded097caec24b408fba43a
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/346654/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
index 1ef49e2..2df6fad 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less
@@ -11,7 +11,7 @@
 
 // Result list circle indicators
 // Defined and used in mw.rcfilters.ui.ChangesListWrapperWidget.less
-@result-circle-margin: 0.1em;
+@result-circle-margin: 2px;
 @result-circle-general-margin: 0.5em;
 // In these small sizes, 'em' appears
 // squished and inconsistent.

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

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

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

[MediaWiki-commits] [Gerrit] performance/WebPageTest[master]: test: Update mobile_result fixture

2017-04-05 Thread Krinkle (Code Review)

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

Change subject: test: Update mobile_result fixture
..

test: Update mobile_result fixture

The current one was outdated and mentioned various outdated
urls that keep showing up in Wikimedia Git searches.

Change-Id: I8bcbcc3567efac9b2b8158f76c0c41f5daa64221
---
M test/files/mobile_result.json
1 file changed, 8,842 insertions(+), 7,039 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/53/346653/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bcbcc3567efac9b2b8158f76c0c41f5daa64221
Gerrit-PatchSet: 1
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add _items for WbMonolingualText

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Add _items for WbMonolingualText
..


Add _items for WbMonolingualText

This enables a __str__ and __repr__ for this class.
Also fixes whitespace issue (E305) at end of the class.

Change-Id: Ibba69fb19aaaf799f658323e0b3012cc1be121c2
---
M pywikibot/__init__.py
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 273e538..eff852a 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -772,6 +772,8 @@
 class WbMonolingualText(_WbRepresentation):
 """A Wikibase monolingual text representation."""
 
+_items = ('text', 'language')
+
 def __init__(self, text, language):
 """
 Create a new WbMonolingualText object.
@@ -809,6 +811,7 @@
 """
 return cls(wb['text'], wb['language'])
 
+
 _sites = {}
 _url_cache = {}  # The code/fam pair for each URL
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibba69fb19aaaf799f658323e0b3012cc1be121c2
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Compress head loaded SVGS

2017-04-05 Thread Jdlrobson (Code Review)

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

Change subject: Compress head loaded SVGS
..

Compress head loaded SVGS

The new branding work introduced these icons but didn't compress
them. This results in a saving of 0.5kb.

Bug: T159979
Change-Id: I670bf5ede37450d376cdbf1635a83d2c82590da8
---
M resources/skins.minerva.icons.images/bell.svg
M resources/skins.minerva.icons.images/magnifying-glass.svg
2 files changed, 19 insertions(+), 20 deletions(-)


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

diff --git a/resources/skins.minerva.icons.images/bell.svg 
b/resources/skins.minerva.icons.images/bell.svg
index 7bff9e5..0b160fb 100644
--- a/resources/skins.minerva.icons.images/bell.svg
+++ b/resources/skins.minerva.icons.images/bell.svg
@@ -1,22 +1,22 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-icon-export
-Created with Sketch.
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+icon-export
+
 
-
-
-
+
+
+
 
 
-
+
 
 
-
-
-
+
+
+
 
 
 
 
-
\ No newline at end of file
+
diff --git a/resources/skins.minerva.icons.images/magnifying-glass.svg 
b/resources/skins.minerva.icons.images/magnifying-glass.svg
index 6062804..9984587 100644
--- a/resources/skins.minerva.icons.images/magnifying-glass.svg
+++ b/resources/skins.minerva.icons.images/magnifying-glass.svg
@@ -1,14 +1,13 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-icon-export
-Created with Sketch.
-
-
+http://www.w3.org/2000/svg;>
+
+icon-export
+
+
 
 
-
+
 
 
 
-
\ No newline at end of file
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Use new BaseTemplate functions

2017-04-05 Thread Isarra (Code Review)

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

Change subject: Use new BaseTemplate functions
..

Use new BaseTemplate functions

getPortlet is now the version previously intended for
BaseTemplate.
Toolbox is betterer.
I don't know.

Change-Id: Ibb94caecaa703ed2895e93c3a15aa097a5b610d5
---
M TimelessTemplate.php
1 file changed, 48 insertions(+), 101 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/50/346650/1

diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index 6141da5..6eada16 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -27,7 +27,7 @@
$this->getLogo( 'p-logo-text', 'text' ) .
$this->getSearch()
) .
-   $this->clear()
+   $this->getClear()
);
$html .= $this->getHeaderHack();
 
@@ -43,7 +43,7 @@
'site-tools',
'timeless-sitetools',
$this->getPortlet(
-   'tbx',
+   'tb',

$this->pileOfTools['general'],
'timeless-sitetools'
)
@@ -79,16 +79,16 @@

'timeless-pagetools'
)
) .
-   $this->clear() .
+   $this->getClear() .
Html::rawElement( 'div', [ 
'class' => 'mw-body-content', 'id' => 'bodyContent' ],
$this->getContentSub() .
$this->get( 'bodytext' 
) .
-   $this->clear()
+   $this->getClear()
)
)
) .
$this->getAfterContent() .
-   $this->clear()
+   $this->getClear()
)
);
 
@@ -114,22 +114,26 @@
}
 
/**
-* A list of navigation links (portlet)
+* Generates a block of navigation links with a header
 *
 * @param string $name
-* @param array|string $content array of links or block of text
+* @param array|string $content array of links for use with 
makeListItem, or a block of text
 *Expected array format:
-   [
-   $name => [
-   'links' => [ '0' => [ 'href' => ..., 
'single-id' => ..., 'text' => ... ] ],
-   'id' => ...,
-   'active' => ...
-   ],
-   ...
-   ]
+*  [
+*  $name => [
+*  'links' => [ '0' =>
+*  [ 'href' => ..., 'single-id' => ..., 
'text' => ... ]
+*  ],
+*  'id' => ...,
+*  'active' => ...
+*  ],
+*  ...
+*  ]
 * @param null|string|array|bool $msg
+* @param string $class cssclass for the portal
 *
-* @return $html
+* @return string html
+* @since 1.29
 */
protected function getPortlet( $name, $content, $msg = null ) {
if ( $msg === null ) {
@@ -150,13 +154,38 @@
$msgString = htmlspecialchars( $msg );
}
 
+   // HACK: Compatibility with extensions still using 
SkinTemplateToolboxEnd
+   $hookContents = '';
+   if ( $name == 'tb' ) {
+   if ( isset( $boxes['TOOLBOX'] ) ) {
+   ob_start();
+   // We pass an extra 'true' at the end so 
extensions using BaseTemplateToolbox
+   // can abort and avoid outputting double 
toolbox links
+   // Avoid PHP 7.1 warning from passing $this by 
reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', [ 
&$template, true ] );
+

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix incorrect index name in new 1.28.0 installations

2017-04-05 Thread Reedy (Code Review)

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

Change subject: Fix incorrect index name in new 1.28.0 installations
..

Fix incorrect index name in new 1.28.0 installations

This index name should be the same in new installations as in all other
MySQL installations. This is necessary so that
Special:DeletedContributions does not give an SQL error. Release notes
will go in the 1.28 branch.

Bug: T154872
Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3
---
M RELEASE-NOTES-1.28
M includes/installer/MysqlUpdater.php
A maintenance/archives/patch-rename-ar_usertext_timestamp.sql
3 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/346649/1

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 265c5b2..7354b5d 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -15,6 +15,7 @@
 * (T145635) Fix too long index error when installing with MSSQL
 * (T156184) $wgRawHtml will no longer apply to internationalization messages.
 * (T160519) CACHE_ANYTHING will not be CACHE_ACCEL if no accelerator is 
installed.
+* (T154872) Fix incorrect ar_usertext_timestamp index names in new 1.28 
installs.
 
 == MediaWiki 1.28 ==
 
diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index a637ce0..b4dbe25 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -291,6 +291,7 @@
[ 'addField', 'change_tag', 'ct_id', 
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id', 
'patch-tag_summary-ts_id.sql' ],
[ 'modifyField', 'recentchanges', 'rc_ip', 
'patch-rc_ip_modify.sql' ],
+   [ 'addIndex', 'archive', 'usertext_timestamp', 
'patch-rename-ar_usertext_timestamp.sql' ],
];
}
 
diff --git a/maintenance/archives/patch-rename-ar_usertext_timestamp.sql 
b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
new file mode 100644
index 000..658c179
--- /dev/null
+++ b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql
@@ -0,0 +1,7 @@
+-- Rename the archive.ar_usertext_timestamp index to usertext_timestamp.
+-- This is for MySQL only and is only necessary on wikis freshly installed on
+-- 1.28.0 when bug T154872 was present. The patch will probably be removed in
+-- 1.29 since we plan on renaming the index properly to ar_usertext_timestamp.
+ALTER TABLE /*$wgDBprefix*/archive
+   DROP INDEX ar_usertext_timestamp,
+   ADD INDEX usertext_timestamp (ar_user_text,ar_timestamp);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 089d20c

2017-04-05 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 089d20c
..


Update restbase to 089d20c

List of changes:
ff4dfdf Release v0.16.5
ece2d06 Update to the new eslint config and fix errors
daf1bfc Test config: Switch to the deployment-prep Electron instance
89fad56 Blacklist: Fix and expand regex in commons blacklist
xxx Update node module dependencies

Change-Id: I63fd573ac54fb8e3d14e846a0877fc389667ea0b
---
M node_modules/bluebird/package.json
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
M node_modules/bunyan/package.json
M node_modules/content-type/package.json
M node_modules/heapdump/lib/main.js
M node_modules/heapdump/package.json
M node_modules/hyperswitch/package.json
M node_modules/js-yaml/dist/js-yaml.js
M node_modules/js-yaml/dist/js-yaml.min.js
M node_modules/js-yaml/lib/js-yaml/type/float.js
M node_modules/js-yaml/lib/js-yaml/type/int.js
M node_modules/js-yaml/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/service-runner/package.json
M node_modules/swagger-ui/package.json
M restbase
19 files changed, 114 insertions(+), 91 deletions(-)

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



diff --git a/node_modules/bluebird/package.json 
b/node_modules/bluebird/package.json
index 6cc8817..e5efbf2 100644
--- a/node_modules/bluebird/package.json
+++ b/node_modules/bluebird/package.json
@@ -2,18 +2,18 @@
   "_args": [
 [
   {
-"raw": "bluebird@^3.4.7",
+"raw": "bluebird@^3.5.0",
 "scope": null,
 "escapedName": "bluebird",
 "name": "bluebird",
-"rawSpec": "^3.4.7",
-"spec": ">=3.4.7 <4.0.0",
+"rawSpec": "^3.5.0",
+"spec": ">=3.5.0 <4.0.0",
 "type": "range"
   },
   "/opt/service"
 ]
   ],
-  "_from": "bluebird@>=3.4.7 <4.0.0",
+  "_from": "bluebird@>=3.5.0 <4.0.0",
   "_id": "bluebird@3.5.0",
   "_inCache": true,
   "_location": "/bluebird",
@@ -29,12 +29,12 @@
   "_npmVersion": "4.1.2",
   "_phantomChildren": {},
   "_requested": {
-"raw": "bluebird@^3.4.7",
+"raw": "bluebird@^3.5.0",
 "scope": null,
 "escapedName": "bluebird",
 "name": "bluebird",
-"rawSpec": "^3.4.7",
-"spec": ">=3.4.7 <4.0.0",
+"rawSpec": "^3.5.0",
+"spec": ">=3.5.0 <4.0.0",
 "type": "range"
   },
   "_requiredBy": [
@@ -49,7 +49,7 @@
   "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz;,
   "_shasum": "791420d7f551eea2897453a8a77653f96606d67c",
   "_shrinkwrap": null,
-  "_spec": "bluebird@^3.4.7",
+  "_spec": "bluebird@^3.5.0",
   "_where": "/opt/service",
   "author": {
 "name": "Petka Antonov",
diff --git a/node_modules/bunyan/bin/bunyan b/node_modules/bunyan/bin/bunyan
index 1ff7c12..330e25a 100755
--- a/node_modules/bunyan/bin/bunyan
+++ b/node_modules/bunyan/bin/bunyan
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
- * Copyright 2016 Trent Mick
- * Copyright 2016 Joyent Inc.
+ * Copyright 2017 Trent Mick
+ * Copyright 2017 Joyent Inc.
  *
  * bunyan -- filter and pretty-print Bunyan log files (line-delimited JSON)
  *
@@ -11,7 +11,7 @@
  * vim: expandtab:ts=4:sw=4
  */
 
-var VERSION = '1.8.9';
+var VERSION = '1.8.10';
 
 var p = console.log;
 var util = require('util');
@@ -795,7 +795,7 @@
 };
 time = moTime.format(tzFormat);
 }
-time = stylize(time, 'XXX');
+time = stylize(time, 'none');
 delete rec.time;
 
 var nameStr = rec.name;
@@ -1040,9 +1040,9 @@
 }
 
 extras = stylize(
-(extras.length ? ' (' + extras.join(', ') + ')' : ''), 'XXX');
+(extras.length ? ' (' + extras.join(', ') + ')' : ''), 'none');
 details = stylize(
-(details.length ? details.join('\n--\n') + '\n' : ''), 'XXX');
+(details.length ? details.join('\n--\n') + '\n' : ''), 'none');
 if (!short)
 emit(format('%s %s: %s on %s%s:%s%s\n%s',
 time,
@@ -1525,9 +1525,9 @@
 console.log('bunyan ' + getVersion());
 return;
 }
-if (opts.pid && opts.args.length > 0) {
+if (opts.pids && opts.args.length > 0) {
 warn('bunyan: error: can\'t use both "-p PID" (%s) and file (%s) args',
-opts.pid, opts.args.join(' '));
+opts.pids, opts.args.join(' '));
 return drainStdoutAndExit(1);
 }
 if (opts.color === null) {
diff --git a/node_modules/bunyan/lib/bunyan.js 
b/node_modules/bunyan/lib/bunyan.js
index 1713bb4..8c8a974 100644
--- a/node_modules/bunyan/lib/bunyan.js
+++ b/node_modules/bunyan/lib/bunyan.js
@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2015 Trent Mick.
- * Copyright (c) 2015 Joyent Inc.
+ * Copyright (c) 2017 Trent Mick.
+ * Copyright (c) 2017 Joyent Inc.

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 089d20c

2017-04-05 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 089d20c
..

Update restbase to 089d20c

List of changes:
ff4dfdf Release v0.16.5
ece2d06 Update to the new eslint config and fix errors
daf1bfc Test config: Switch to the deployment-prep Electron instance
89fad56 Blacklist: Fix and expand regex in commons blacklist
xxx Update node module dependencies

Change-Id: I63fd573ac54fb8e3d14e846a0877fc389667ea0b
---
M node_modules/bluebird/package.json
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
M node_modules/bunyan/package.json
M node_modules/content-type/package.json
M node_modules/heapdump/lib/main.js
M node_modules/heapdump/package.json
M node_modules/hyperswitch/package.json
M node_modules/js-yaml/dist/js-yaml.js
M node_modules/js-yaml/dist/js-yaml.min.js
M node_modules/js-yaml/lib/js-yaml/type/float.js
M node_modules/js-yaml/lib/js-yaml/type/int.js
M node_modules/js-yaml/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/service-runner/package.json
M node_modules/swagger-ui/package.json
M restbase
19 files changed, 114 insertions(+), 91 deletions(-)


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

diff --git a/node_modules/bluebird/package.json 
b/node_modules/bluebird/package.json
index 6cc8817..e5efbf2 100644
--- a/node_modules/bluebird/package.json
+++ b/node_modules/bluebird/package.json
@@ -2,18 +2,18 @@
   "_args": [
 [
   {
-"raw": "bluebird@^3.4.7",
+"raw": "bluebird@^3.5.0",
 "scope": null,
 "escapedName": "bluebird",
 "name": "bluebird",
-"rawSpec": "^3.4.7",
-"spec": ">=3.4.7 <4.0.0",
+"rawSpec": "^3.5.0",
+"spec": ">=3.5.0 <4.0.0",
 "type": "range"
   },
   "/opt/service"
 ]
   ],
-  "_from": "bluebird@>=3.4.7 <4.0.0",
+  "_from": "bluebird@>=3.5.0 <4.0.0",
   "_id": "bluebird@3.5.0",
   "_inCache": true,
   "_location": "/bluebird",
@@ -29,12 +29,12 @@
   "_npmVersion": "4.1.2",
   "_phantomChildren": {},
   "_requested": {
-"raw": "bluebird@^3.4.7",
+"raw": "bluebird@^3.5.0",
 "scope": null,
 "escapedName": "bluebird",
 "name": "bluebird",
-"rawSpec": "^3.4.7",
-"spec": ">=3.4.7 <4.0.0",
+"rawSpec": "^3.5.0",
+"spec": ">=3.5.0 <4.0.0",
 "type": "range"
   },
   "_requiredBy": [
@@ -49,7 +49,7 @@
   "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz;,
   "_shasum": "791420d7f551eea2897453a8a77653f96606d67c",
   "_shrinkwrap": null,
-  "_spec": "bluebird@^3.4.7",
+  "_spec": "bluebird@^3.5.0",
   "_where": "/opt/service",
   "author": {
 "name": "Petka Antonov",
diff --git a/node_modules/bunyan/bin/bunyan b/node_modules/bunyan/bin/bunyan
index 1ff7c12..330e25a 100755
--- a/node_modules/bunyan/bin/bunyan
+++ b/node_modules/bunyan/bin/bunyan
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
- * Copyright 2016 Trent Mick
- * Copyright 2016 Joyent Inc.
+ * Copyright 2017 Trent Mick
+ * Copyright 2017 Joyent Inc.
  *
  * bunyan -- filter and pretty-print Bunyan log files (line-delimited JSON)
  *
@@ -11,7 +11,7 @@
  * vim: expandtab:ts=4:sw=4
  */
 
-var VERSION = '1.8.9';
+var VERSION = '1.8.10';
 
 var p = console.log;
 var util = require('util');
@@ -795,7 +795,7 @@
 };
 time = moTime.format(tzFormat);
 }
-time = stylize(time, 'XXX');
+time = stylize(time, 'none');
 delete rec.time;
 
 var nameStr = rec.name;
@@ -1040,9 +1040,9 @@
 }
 
 extras = stylize(
-(extras.length ? ' (' + extras.join(', ') + ')' : ''), 'XXX');
+(extras.length ? ' (' + extras.join(', ') + ')' : ''), 'none');
 details = stylize(
-(details.length ? details.join('\n--\n') + '\n' : ''), 'XXX');
+(details.length ? details.join('\n--\n') + '\n' : ''), 'none');
 if (!short)
 emit(format('%s %s: %s on %s%s:%s%s\n%s',
 time,
@@ -1525,9 +1525,9 @@
 console.log('bunyan ' + getVersion());
 return;
 }
-if (opts.pid && opts.args.length > 0) {
+if (opts.pids && opts.args.length > 0) {
 warn('bunyan: error: can\'t use both "-p PID" (%s) and file (%s) args',
-opts.pid, opts.args.join(' '));
+opts.pids, opts.args.join(' '));
 return drainStdoutAndExit(1);
 }
 if (opts.color === null) {
diff --git a/node_modules/bunyan/lib/bunyan.js 
b/node_modules/bunyan/lib/bunyan.js
index 1713bb4..8c8a974 100644
--- a/node_modules/bunyan/lib/bunyan.js
+++ b/node_modules/bunyan/lib/bunyan.js
@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2015 Trent Mick.
- * Copyright (c) 2015 Joyent Inc.
+ * Copyright (c) 2017 Trent

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Stop stripping 'rel=mw:Extlink' attributes from tags

2017-04-05 Thread Mholloway (Code Review)

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

Change subject: Stop stripping 'rel=mw:Extlink' attributes from  tags
..

Stop stripping 'rel=mw:Extlink' attributes from  tags

There is a transform to add class="external" to links when this appears.
It has probably been broken for some time.  When we put it back, the app
will inject an external link icon as expected.

This attribute is also required for some CSS (availale in the
ResourceLoader module mediawiki.skinning.content.parsoid) to add a bit of
text with an incremented counter (e.g., '[1]') for  tags with external
links and empty content.  Bundling this module with the app even after
this change doesn't seem to Just Work, though.  Still, the links will at
least be clickable due to the icon now appearing.

Bug: T162116
Change-Id: I44a28b0b3c339064df7559d336d347ffdb84731d
---
M lib/transforms.js
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M 
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
5 files changed, 19 insertions(+), 19 deletions(-)


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

diff --git a/lib/transforms.js b/lib/transforms.js
index 7e80d90..11fe9b0 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -188,7 +188,7 @@
 }
 
 function _applyOptionalParsoidSpecificTransformations(doc) {
-_rmAttributes(doc, 'a:not([rel=nofollow])', ['rel']);
+_rmAttributes(doc, 'a:not([rel=nofollow],[rel~=mw:ExtLink])', ['rel']);
 _rmAttributes(doc, 'a', ['about', 'data-mw', 'id', 'typeof']);
 _rmAttributes(doc, 'code', ['about', 'data-mw', 'id', 'typeof']);
 _rmAttributes(doc, 'div', ['about', 'data-mw', 'id', 'typeof']);
diff --git 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 651624d..24bdf8a 100644
--- 
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++ 
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -29,7 +29,7 @@
   },
   {
 "id": 2,
-"text": "\n Links partially italicized: Hindenburg disaster\n Link to edit 
action using edit template: edit\n Link to edit action using fullurl template edit2\n\n",
+"text": "\n Links partially italicized: Hindenburg disaster\n Link to edit 
action using edit template: edit\n Link to edit action 
using fullurl template edit2\n\n",
 "toclevel": 1,
 "line": "More links",
 "anchor": "More_links"
@@ -99,14 +99,14 @@
   },
   {
 "id": 12,
-"text": "\n\n\nShortcuts:\nMOS:ORDERMOS:SECTIONORDER\nSee also: Wikipedia:Manual of Style 
§Section headings\n\nA simple article should have at least a lead section 
and references. As editors add complexity where required, the elements (such as 
sections and templates) that are used typically appear in the following order, 
although they would not all appear in the same article at the same time: 
\n Before the lead section\n Hatnotes\n 
Deletion/Protection tags (CSD, PROD, AFD, PP notices)\n Appendices[1]\n Works or 
publications (for biographies only)\n 
Foo\n {{featured 
list}}, {{featured article}} and 
{{good article}} 
(where appropriate for article status) \n Defaultsort\n Categories[2]\n\n",
+"text": "\n\n\nShortcuts:\nMOS:ORDERMOS:SECTIONORDER\nSee also: Wikipedia:Manual of Style 
§Section headings\n\nA simple article should have at least a lead section 
and references. As editors add complexity where required, the elements (such as 
sections and templates) that are used typically appear in the following order, 
although they would not all appear in the same article at the same time: 
\n Before the lead section\n Hatnotes\n 
Deletion/Protection tags (CSD, PROD, AFD, PP notices)\n Appendices[1]\n Works or 
publications (for biographies only)\n 
Foo\n {{featured 
list}}, {{featured article}} and 
{{good article}} 
(where appropriate for article status) \n Defaultsort\n Categories[2]\n\n",
 "toclevel": 2,
 "line": "Order of article elements",
 "anchor": "Order_of_article_elements"
   },
   {
 "id": 13,
-"text": "\n\nShortcut:\nMOS:BODY\nFurther information: Help:Section and Wikipedia:Manual of Style 
§Article titles, headings, and sections\n\nBody sections appear after 
the lead and table of contents (click on image for larger 
view).\n\nArticles longer than a stub are generally 
divided into

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to d8b2e15

2017-04-05 Thread Ppchelko (Code Review)

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

Change subject: Update trending-edits to d8b2e15
..


Update trending-edits to d8b2e15

List of changes:
38c36e8 Documentation fixup
5b840c2 Allow debugging of scores with different half lifes
02da400 Correctly calculate `since` value
xxx Update node module dependencies

Change-Id: Ie9ddeaff548bf141c766e14178d4a80fff0e4ae7
---
M node_modules/kad/package.json
M src
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 1c8f17d..7fd2a66 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "72c0bddfdf7a9e006f464049fa18a35a678c3e4d",
+  "_shasum": "a7295e36e15b42d8115fa0209b355417a1f0b4a5",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/src b/src
index f08be6f..d8b2e15 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit f08be6fffa347d32021f70da4dc72fda708ceef8
+Subproject commit d8b2e15d080c814efe0b765305b8e18672a25025

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9ddeaff548bf141c766e14178d4a80fff0e4ae7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to d8b2e15

2017-04-05 Thread Ppchelko (Code Review)

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

Change subject: Update trending-edits to d8b2e15
..

Update trending-edits to d8b2e15

List of changes:
38c36e8 Documentation fixup
5b840c2 Allow debugging of scores with different half lifes
02da400 Correctly calculate `since` value
xxx Update node module dependencies

Change-Id: Ie9ddeaff548bf141c766e14178d4a80fff0e4ae7
---
M node_modules/kad/package.json
M src
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits/deploy 
refs/changes/46/346646/1

diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 1c8f17d..7fd2a66 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
 "/limitation"
   ],
   "_resolved": 
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17;,
-  "_shasum": "72c0bddfdf7a9e006f464049fa18a35a678c3e4d",
+  "_shasum": "a7295e36e15b42d8115fa0209b355417a1f0b4a5",
   "_shrinkwrap": null,
   "_spec": "kad@git+https://github.com/gwicke/kad.git#master;,
   "_where": "/opt/service/node_modules/limitation",
diff --git a/src b/src
index f08be6f..d8b2e15 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit f08be6fffa347d32021f70da4dc72fda708ceef8
+Subproject commit d8b2e15d080c814efe0b765305b8e18672a25025

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9ddeaff548bf141c766e14178d4a80fff0e4ae7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MediaSearchWidget: Listed to "change" event to reposition

2017-04-05 Thread Mooeypoo (Code Review)

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

Change subject: MediaSearchWidget: Listed to "change" event to reposition
..

MediaSearchWidget: Listed to "change" event to reposition

The "add" event is emitted too early (by the OO.EmitterList, before
the items are attached to the DOM) so instead we have to go by the
GroupElement event api itself -- which uses "change" event to all
item changes.

Listening to item change means that we are certain the items are
already attached to the DOM before we manipulate and read their
positioning, etc.

Bug: T162202
Change-Id: I3ef9d9451562c725e12a66b80048fc3836280d9f
---
M resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/346645/1

diff --git 
a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js 
b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
index c6938e8..5cbd2ec 100644
--- 
a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
+++ 
b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
@@ -65,7 +65,7 @@
this.$results.on( 'scroll', this.onResultsScroll.bind( this ) );
this.$query.append( this.noItemsMessage.$element );
this.results.connect( this, {
-   add: 'onResultsAdd',
+   change: 'onResultsChange',
remove: 'onResultsRemove'
} );
 
@@ -357,9 +357,13 @@
 *
 * @param {mw.widgets.MediaResultWidget[]} items An array of item 
elements
 */
-   mw.widgets.MediaSearchWidget.prototype.onResultsAdd = function ( items 
) {
+   mw.widgets.MediaSearchWidget.prototype.onResultsChange = function ( 
items ) {
var search = this;
 
+   if ( !items.length ) {
+   return;
+   }
+
// Add method to a queue; this queue will only run when the 
widget
// is visible
this.layoutQueue.push( function () {

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Increase video transcode max time from 8 to 16 hours

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Increase video transcode max time from 8 to 16 hours
..


Increase video transcode max time from 8 to 16 hours

Full-length films at HD sometimes take long enough they were
still hitting the increased time limit (compensating for the
threading in ffmpeg and how ulimit handles time). This meant
we were transcoding most of the file, then throwing away the
result after the timeout struck.

Bump up from 8 hour to 16-hour base limit, which should
somewhat increase CPU usage on scalers in exchange for actually
producing results on those long files.

NB: in future it would be great to find a way to reduce
time spent on a single scaler for a high res lnog file.
This will be complicated though, we're stuck with serialized
behavior for now.

Bug: T156185
Change-Id: I49ad2328026af2065e8c9e884145fffaf8bff58d
---
M wmf-config/CommonSettings.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b163767..58e70a2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -852,8 +852,14 @@
$wgTranscodeBackgroundMemoryLimit = 4 * 1024 * 1024; // 4GB
$wgFFmpegThreads = 2;
 
+   // HD transcodes of full-length films/docs/conference vids can
+   // take several hours, and sometimes over 12. Bump up from default
+   // 8 hour limit to 16 to avoid wasting the time we've already spent
+   // when breaking these off.
+   $wgTranscodeBackgroundTimeLimit = 16 * 3600;
+
// ffmpeg tends to use about 175% CPU when threaded, so hits
-   // the default 8-hour ulimit in 4-6 hours. This tends to cut
+   // say an 8-hour ulimit in 4-6 hours. This tends to cut
// off very large files at very high resolution just before
// they finish, wasting a lot of time.
// Pad it back out so we don't waste that CPU time with a fail!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49ad2328026af2065e8c9e884145fffaf8bff58d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
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...deploy[master]: Bump src/ to 56ae82bb for service-runner

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Bump src/ to 56ae82bb for service-runner
..


Bump src/ to 56ae82bb for service-runner

 * And update node_modules/

Change-Id: Iafd2a34c735afa0c48476d2dadcfdfed544f8f73
---
D node_modules/.bin/window-size
A node_modules/ajv/.tonic_example.js
A node_modules/ajv/LICENSE
A node_modules/ajv/README.md
A node_modules/ajv/dist/ajv.bundle.js
A node_modules/ajv/dist/ajv.min.js
A node_modules/ajv/dist/ajv.min.js.map
A node_modules/ajv/dist/nodent.min.js
A node_modules/ajv/dist/regenerator.min.js
A node_modules/ajv/lib/ajv.d.ts
A node_modules/ajv/lib/ajv.js
A node_modules/ajv/lib/async.js
A node_modules/ajv/lib/cache.js
A node_modules/ajv/lib/compile/_rules.js
A node_modules/ajv/lib/compile/equal.js
A node_modules/ajv/lib/compile/formats.js
A node_modules/ajv/lib/compile/index.js
A node_modules/ajv/lib/compile/resolve.js
A node_modules/ajv/lib/compile/rules.js
A node_modules/ajv/lib/compile/schema_obj.js
A node_modules/ajv/lib/compile/ucs2length.js
A node_modules/ajv/lib/compile/util.js
A node_modules/ajv/lib/compile/validation_error.js
A node_modules/ajv/lib/dot/_limit.jst
A node_modules/ajv/lib/dot/_limitItems.jst
A node_modules/ajv/lib/dot/_limitLength.jst
A node_modules/ajv/lib/dot/_limitProperties.jst
A node_modules/ajv/lib/dot/allOf.jst
A node_modules/ajv/lib/dot/anyOf.jst
A node_modules/ajv/lib/dot/coerce.def
A node_modules/ajv/lib/dot/custom.jst
A node_modules/ajv/lib/dot/defaults.def
A node_modules/ajv/lib/dot/definitions.def
A node_modules/ajv/lib/dot/dependencies.jst
A node_modules/ajv/lib/dot/enum.jst
A node_modules/ajv/lib/dot/errors.def
A node_modules/ajv/lib/dot/format.jst
A node_modules/ajv/lib/dot/items.jst
A node_modules/ajv/lib/dot/missing.def
A node_modules/ajv/lib/dot/multipleOf.jst
A node_modules/ajv/lib/dot/not.jst
A node_modules/ajv/lib/dot/oneOf.jst
A node_modules/ajv/lib/dot/pattern.jst
A node_modules/ajv/lib/dot/properties.jst
A node_modules/ajv/lib/dot/ref.jst
A node_modules/ajv/lib/dot/required.jst
A node_modules/ajv/lib/dot/uniqueItems.jst
A node_modules/ajv/lib/dot/v5/_formatLimit.jst
A node_modules/ajv/lib/dot/v5/constant.jst
A node_modules/ajv/lib/dot/v5/patternRequired.jst
A node_modules/ajv/lib/dot/v5/switch.jst
A node_modules/ajv/lib/dot/validate.jst
A node_modules/ajv/lib/dotjs/README.md
A node_modules/ajv/lib/dotjs/_formatLimit.js
A node_modules/ajv/lib/dotjs/_limit.js
A node_modules/ajv/lib/dotjs/_limitItems.js
A node_modules/ajv/lib/dotjs/_limitLength.js
A node_modules/ajv/lib/dotjs/_limitProperties.js
A node_modules/ajv/lib/dotjs/allOf.js
A node_modules/ajv/lib/dotjs/anyOf.js
A node_modules/ajv/lib/dotjs/constant.js
A node_modules/ajv/lib/dotjs/custom.js
A node_modules/ajv/lib/dotjs/dependencies.js
A node_modules/ajv/lib/dotjs/enum.js
A node_modules/ajv/lib/dotjs/format.js
A node_modules/ajv/lib/dotjs/items.js
A node_modules/ajv/lib/dotjs/multipleOf.js
A node_modules/ajv/lib/dotjs/not.js
A node_modules/ajv/lib/dotjs/oneOf.js
A node_modules/ajv/lib/dotjs/pattern.js
A node_modules/ajv/lib/dotjs/patternRequired.js
A node_modules/ajv/lib/dotjs/properties.js
A node_modules/ajv/lib/dotjs/ref.js
A node_modules/ajv/lib/dotjs/required.js
A node_modules/ajv/lib/dotjs/switch.js
A node_modules/ajv/lib/dotjs/uniqueItems.js
A node_modules/ajv/lib/dotjs/validate.js
A node_modules/ajv/lib/keyword.js
A node_modules/ajv/lib/refs/json-schema-draft-04.json
A node_modules/ajv/lib/refs/json-schema-v5.json
A node_modules/ajv/lib/v5.js
A node_modules/ajv/package.json
A node_modules/ajv/scripts/.eslintrc.yml
A node_modules/ajv/scripts/bundle.js
A node_modules/ajv/scripts/compile-dots.js
A node_modules/ajv/scripts/info
A node_modules/ajv/scripts/prepare-tests
A node_modules/ajv/scripts/travis-gh-pages
M node_modules/ansi-styles/package.json
M node_modules/asap/package.json
M node_modules/asynckit/package.json
M node_modules/aws4/aws4.js
M node_modules/aws4/package.json
M node_modules/babel-runtime/helpers/asyncGenerator.js
M node_modules/babel-runtime/helpers/asyncIterator.js
M node_modules/babel-runtime/package.json
M node_modules/babylon/CHANGELOG.md
M node_modules/babylon/README.md
M node_modules/babylon/bin/generate-identifier-regex.js
M node_modules/babylon/lib/index.js
M node_modules/babylon/package.json
M node_modules/bl/node_modules/readable-stream/.travis.yml
A node_modules/bl/node_modules/readable-stream/CONTRIBUTING.md
A node_modules/bl/node_modules/readable-stream/GOVERNANCE.md
M node_modules/bl/node_modules/readable-stream/LICENSE
M node_modules/bl/node_modules/readable-stream/README.md
M node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
M node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
M node_modules/bl/node_modules/readable-stream/package.json
M node_modules/bluebird/LICENSE
M node_modules/bluebird/README.md
M node_modules/bluebird/js/browser/bluebird.core.js
M

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[printstyles]: Feature flagged print styles

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Feature flagged print styles
..


Feature flagged print styles

Currently no print styles are shipped.
The styles will be added in follow ups

Bug: T159857
Change-Id: Ic8b61b81c16a009721d635f133a72107d95b61d3
---
M README.md
M extension.json
M includes/skins/SkinMinerva.php
A resources/skins.minerva.print.styles/styles.less
4 files changed, 36 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index e05d7b7..920b730 100644
--- a/README.md
+++ b/README.md
@@ -339,6 +339,19 @@
 * Type: `Boolean`
 * Default: `false`
 
+ $wgMinervaPrintStyles
+
+A temporary configuration variable to control roll out of styles to improve 
the MobileFrontend print experience.
+
+* Type: `Array`
+* Default:
+```php
+  [
+'beta' => true,
+'base' => false,
+  ]
+```
+
  $wgMinervaUseHeaderV2
 
 A temporary configuration variable to control display of a new header which 
converts the search input
diff --git a/extension.json b/extension.json
index fb7e63c..ef3c3b8 100644
--- a/extension.json
+++ b/extension.json
@@ -153,6 +153,16 @@

"resources/mobile.pagesummary.styles/pagesummary.less"
]
},
+   "skins.minerva.print.styles": {
+   "targets": [
+   "mobile",
+   "desktop"
+   ],
+   "position": "top",
+   "styles": [
+   
"resources/skins.minerva.print.styles/styles.less"
+   ]
+   },
"skins.minerva.tablet.styles": {
"targets": [
"mobile",
@@ -1801,6 +1811,10 @@
"MFContentNamespace": 0,
"MFDefaultSkinClass": "SkinMinerva",
"MinervaApplyKnownTemplateHacks": false,
+   "MinervaPrintStyles": {
+   "base": false,
+   "beta": true
+   },
"MinervaPageActions": [
"edit",
"talk",
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 1de9788..72b19ab 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -286,7 +286,12 @@
 */
public function initPage( OutputPage $out ) {
parent::initPage( $out );
-   $out->addModuleStyles( 'mobile.usermodule.styles' );
+   $styles = [ 'mobile.usermodule.styles' ];
+   if ( $this->mobileContext->getConfigVariable( 
'MinervaPrintStyles' ) ) {
+   $styles[] = 'skins.minerva.print.styles';
+   }
+
+   $out->addModuleStyles( $styles );
$out->addModuleScripts( 'mobile.usermodule' );
$out->addJsConfigVars( $this->getSkinConfigVariables() );
}
diff --git a/resources/skins.minerva.print.styles/styles.less 
b/resources/skins.minerva.print.styles/styles.less
new file mode 100644
index 000..cdecd88
--- /dev/null
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -0,0 +1,3 @@
+/* stylelint-disable block-no-empty */
+@media print {
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8b61b81c16a009721d635f133a72107d95b61d3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
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...trending-edits[master]: Correctly calculate `since` value

2017-04-05 Thread Ppchelko (Code Review)

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

Change subject: Correctly calculate `since` value
..


Correctly calculate `since` value

When calculating the since value we want to get a date that represents
the date X hours ago where X was the period. Our calculation was
multiplying everything by 24 and forgetting minutes so was very
very wrong. This would lead things to be filtered out of the results.

Change-Id: I44bef4698de3c2ef0346b707388edc9b9929a74f
---
M routes/trending-v1.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/routes/trending-v1.js b/routes/trending-v1.js
index 80f5e2e..050b4a5 100644
--- a/routes/trending-v1.js
+++ b/routes/trending-v1.js
@@ -80,7 +80,7 @@
 const period = req.params.period ? parseInt(req.params.period, 10) : 24;
 const date = new Date();
 const conf = Object.assign({
-since: new Date(date.getTime() - (period * 24 * 60 * 1000))
+since: new Date(date.getTime() - (period * 60 * 60 * 1000))
 }, app.conf);
 
 if (isNaN(period) || period > 24 || period < 1) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44bef4698de3c2ef0346b707388edc9b9929a74f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Allow debugging of scores with different half lifes

2017-04-05 Thread Ppchelko (Code Review)

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

Change subject: Allow debugging of scores with different half lifes
..


Allow debugging of scores with different half lifes

Change-Id: I5bb073a160fa54843c49bdbe53f6db2d0713763b
---
M routes/trending-v1.js
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/routes/trending-v1.js b/routes/trending-v1.js
index 1acfe36..80f5e2e 100644
--- a/routes/trending-v1.js
+++ b/routes/trending-v1.js
@@ -45,13 +45,15 @@
  * GET /feed/debug-trending-edits
  * Debugging tools for private usage that expose the contents of the processor
  */
-router.get('/debug-trending-edits/:id?', function(req, res) {
+router.get('/debug-trending-edits/:id?/:halflife?', function(req, res) {
 const processor = app.processor;
 if (req.params.id) {
 const page = processor.getPage(parseInt(req.params.id, 10));
+const hl = req.params.halflife ? parseInt(req.params.halflife, 10) : 
1.5;
+
 if (page) {
 res.status(200).type('application/json').end(
-JSON.stringify(scorePages(new Date(), [page]))
+JSON.stringify(scorePages(new Date(), [page], hl))
 );
 } else {
 res.status(404).type('application/json').end('Unknown page title');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bb073a160fa54843c49bdbe53f6db2d0713763b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Correctly calculate `since` value

2017-04-05 Thread Jdlrobson (Code Review)

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

Change subject: Correctly calculate `since` value
..

Correctly calculate `since` value

When calculating the since value we want to get a date that represents
the date X hours ago where X was the period. Our calculation was
multiplying everything by 24 and forgetting minutes so was very
very wrong. This would lead things to be filtered out of the results.

Change-Id: I44bef4698de3c2ef0346b707388edc9b9929a74f
---
M routes/trending-v1.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits 
refs/changes/44/346644/1

diff --git a/routes/trending-v1.js b/routes/trending-v1.js
index 80f5e2e..050b4a5 100644
--- a/routes/trending-v1.js
+++ b/routes/trending-v1.js
@@ -80,7 +80,7 @@
 const period = req.params.period ? parseInt(req.params.period, 10) : 24;
 const date = new Date();
 const conf = Object.assign({
-since: new Date(date.getTime() - (period * 24 * 60 * 1000))
+since: new Date(date.getTime() - (period * 60 * 60 * 1000))
 }, app.conf);
 
 if (isNaN(period) || period > 24 || period < 1) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44bef4698de3c2ef0346b707388edc9b9929a74f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace ResultWrapper alias with full namespace

2017-04-05 Thread Hoo man (Code Review)

Hoo man has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/345113 )

Change subject: Replace ResultWrapper alias with full namespace
..


Replace ResultWrapper alias with full namespace

Sneaking in a tiny little bit of documentation clean ups. Tell me if I
should split this to a separate patch.

Change-Id: I16bdb435457fb9517d8259ddbba32bd72fbd83fe
---
M client/includes/Api/ApiListEntityUsage.php
M client/includes/Api/ApiPropsEntityUsage.php
M client/includes/Specials/SpecialUnconnectedPages.php
M client/includes/Store/Sql/BulkSubscriptionUpdater.php
M client/includes/Usage/Sql/EntityUsageTableBuilder.php
M lib/includes/Store/Sql/EntityChangeLookup.php
M lib/includes/Store/Sql/PropertyInfoTable.php
M lib/includes/Store/Sql/SqlEntityInfoBuilder.php
M lib/includes/Store/Sql/WikiPageEntityMetaDataLookup.php
M repo/includes/Api/ListSubscribers.php
M repo/includes/Hooks/LabelPrefetchHookHandlers.php
M repo/includes/Store/Sql/ChangesSubscriptionTableBuilder.php
M repo/includes/Store/Sql/EntityPerPageBuilder.php
M repo/includes/Store/Sql/SqlEntitiesWithoutTermFinder.php
M repo/includes/Store/Sql/SqlEntityIdPager.php
15 files changed, 25 insertions(+), 19 deletions(-)

Approvals:
  Hoo man: Verified; Looks good to me, approved



diff --git a/client/includes/Api/ApiListEntityUsage.php 
b/client/includes/Api/ApiListEntityUsage.php
index e671060..f69231e 100644
--- a/client/includes/Api/ApiListEntityUsage.php
+++ b/client/includes/Api/ApiListEntityUsage.php
@@ -7,10 +7,10 @@
 use ApiQuery;
 use ApiQueryGeneratorBase;
 use ApiResult;
-use ResultWrapper;
 use Title;
 use Wikibase\Client\RepoLinker;
 use Wikibase\Client\Usage\EntityUsage;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * API module to get the usage of entities.
diff --git a/client/includes/Api/ApiPropsEntityUsage.php 
b/client/includes/Api/ApiPropsEntityUsage.php
index 47b6ce1..7053e2b 100644
--- a/client/includes/Api/ApiPropsEntityUsage.php
+++ b/client/includes/Api/ApiPropsEntityUsage.php
@@ -6,9 +6,9 @@
 use ApiQuery;
 use ApiQueryBase;
 use ApiResult;
-use ResultWrapper;
 use Wikibase\Client\RepoLinker;
 use Wikibase\Client\Usage\EntityUsage;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * API module to get the usage of entities.
diff --git a/client/includes/Specials/SpecialUnconnectedPages.php 
b/client/includes/Specials/SpecialUnconnectedPages.php
index 9da0204..a44da72 100644
--- a/client/includes/Specials/SpecialUnconnectedPages.php
+++ b/client/includes/Specials/SpecialUnconnectedPages.php
@@ -3,15 +3,15 @@
 namespace Wikibase\Client\Specials;
 
 use Database;
-use FakeResultWrapper;
 use Html;
 use MWNamespace;
 use QueryPage;
-use ResultWrapper;
 use Skin;
 use Title;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\NamespaceChecker;
+use Wikimedia\Rdbms\FakeResultWrapper;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * List client pages that are not connected to repository items.
diff --git a/client/includes/Store/Sql/BulkSubscriptionUpdater.php 
b/client/includes/Store/Sql/BulkSubscriptionUpdater.php
index 8b5fe7a..bca8622 100644
--- a/client/includes/Store/Sql/BulkSubscriptionUpdater.php
+++ b/client/includes/Store/Sql/BulkSubscriptionUpdater.php
@@ -3,13 +3,13 @@
 namespace Wikibase\Client\Store\Sql;
 
 use InvalidArgumentException;
-use ResultWrapper;
 use Wikibase\Client\Usage\Sql\EntityUsageTable;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\Lib\Reporting\ExceptionHandler;
 use Wikibase\Lib\Reporting\LogWarningExceptionHandler;
 use Wikibase\Lib\Reporting\MessageReporter;
 use Wikibase\Lib\Reporting\NullMessageReporter;
+use Wikimedia\Rdbms\ResultWrapper;
 use Wikimedia\Rdbms\SessionConsistentConnectionManager;
 
 /**
diff --git a/client/includes/Usage/Sql/EntityUsageTableBuilder.php 
b/client/includes/Usage/Sql/EntityUsageTableBuilder.php
index 5b87df9..901860a 100644
--- a/client/includes/Usage/Sql/EntityUsageTableBuilder.php
+++ b/client/includes/Usage/Sql/EntityUsageTableBuilder.php
@@ -5,7 +5,6 @@
 use Database;
 use Exception;
 use InvalidArgumentException;
-use ResultWrapper;
 use Wikibase\Client\Usage\EntityUsage;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdParser;
@@ -14,6 +13,7 @@
 use Wikibase\Lib\Reporting\MessageReporter;
 use Wikibase\Lib\Reporting\NullMessageReporter;
 use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * Implements initial population (priming) for the wbc_entity_usage table,
diff --git a/lib/includes/Store/Sql/EntityChangeLookup.php 
b/lib/includes/Store/Sql/EntityChangeLookup.php
index 06423f5..325eef2 100644
--- a/lib/includes/Store/Sql/EntityChangeLookup.php
+++ b/lib/includes/Store/Sql/EntityChangeLookup.php
@@ -3,12 +3,12 @@
 namespace Wikibase\Lib\Store;
 
 use DBAccessBase;
-use ResultWrapper;
 use Wikibase\ChunkAccess;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\EntityChange;
 use

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename BaseTemplate::clear to getClear to avoid conflicts wi...

2017-04-05 Thread jenkins-bot (Code Review)

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

Change subject: Rename BaseTemplate::clear to getClear to avoid conflicts with 
Example skin and derivatives
..


Rename BaseTemplate::clear to getClear to avoid conflicts
with Example skin and derivatives

Also it's a bit more consistent with everything else anyway.

Change-Id: I2745d51267790e93fe2b92a75e88621abbb57fd1
---
M includes/skins/BaseTemplate.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index dc0a703..5868904 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -699,7 +699,7 @@
$html .= Html::closeElement( 'ul' );
}
 
-   $html .= $this->clear() . $footerEnd;
+   $html .= $this->getClear() . $footerEnd;
 
return $html;
}
@@ -710,7 +710,7 @@
 * @return string html
 * @since 1.29
 */
-   protected function clear() {
+   protected function getClear() {
return Html::element( 'div', [ 'class' => 'visualClear' ] );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2745d51267790e93fe2b92a75e88621abbb57fd1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Isarra 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Remove debian metadata from the main repo

2017-04-05 Thread Awight (Code Review)

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

Change subject: Remove debian metadata from the main repo
..

Remove debian metadata from the main repo

Change-Id: I21fa529ac5a9ee3ae145dfb21d2af39185567062
---
D debian/changelog
D debian/compat
D debian/control
D debian/copyright
D debian/docs
D debian/rules
D debian/source/format
D debian/upstream/metadata
8 files changed, 0 insertions(+), 44 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/43/346643/1

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 3d5dac1..000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-process-control (0.0.1~rc1-1) UNRELEASED; urgency=low
-
-  * Initial release.
-
- -- Adam Roses Wight   Thu, 16 Mar 2017 00:12:17 -0700
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index bfd362a..000
--- a/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: process-control
-Maintainer: Adam Roses Wight 
-Section: admin
-Priority: optional
-Build-Depends: debhelper (>= 9), dh-python, python-all, python-setuptools
-Standards-Version: 3.9.8
-Homepage: https://github.com/adamwight/process-control
-Vcs-Browser: https://github.com/adamwight/process-control
-Vcs-Git: git://github.com/adamwight/process-control.git
-X-Python-Version: >= 2.7
-
-Package: process-control
-Architecture: all
-Depends: ${python:Depends}, python-argparse, python-yaml
-Description: Tools for Wikimedia Foundation Fundraising job management
- Control and schedule jobs using configuration files.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index cb75346..000
--- a/debian/copyright
+++ /dev/null
@@ -1,7 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://github.com/adamwight/process-control
-
-Files: *
-Copyright: 2017, Adam Roses Wight 
-License: GPL-2
- /usr/share/common-licenses/GPL-2
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 22c7238..000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.md
-process-control.example.yaml
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index e8722a2..000
--- a/debian/rules
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-export PYBUILD_NAME=process-control
-
-%:
-   dh $@ --with=python2 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
deleted file mode 100644
index 2922586..000
--- a/debian/upstream/metadata
+++ /dev/null
@@ -1,5 +0,0 @@
-Bug-Database: https://github.com/adamwight/process-control/issues
-Bug-Submit: https://github.com/adamwight/process-control/issues/new
-Contact: Adam Roses Wight 
-Repository: git://github.com/adamwight/process-control.git
-Repository-Browse: https://github.com/adamwight/process-control

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21fa529ac5a9ee3ae145dfb21d2af39185567062
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove 'ar_usertext_timestamp' => 'usertext_timestamp' mapping

2017-04-05 Thread Reedy (Code Review)

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

Change subject: Remove 'ar_usertext_timestamp' => 'usertext_timestamp' mapping
..

Remove 'ar_usertext_timestamp' => 'usertext_timestamp' mapping

Change-Id: Icd2426c2cebba1fdc3dbe9fed27e548a7fd25e47
---
M includes/libs/rdbms/database/DatabaseMysqlBase.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php 
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 6725090..98e585a 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -1358,7 +1358,6 @@
 * T154872).
 */
$renamed = [
-   'ar_usertext_timestamp' => 'usertext_timestamp',
'un_user_id' => 'user_id',
'un_user_ip' => 'user_ip',
];

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: add license file

2017-04-05 Thread Awight (Code Review)

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

Change subject: add license file
..

add license file

Change-Id: I3a8b5cf08749b96b5a784193017efa85e5d59144
---
A LICENSE.md
1 file changed, 361 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/41/346641/1

diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 000..af5153d
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,361 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+### Preamble
+
+The licenses for most software are designed to take away your freedom
+to share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on,
+we want its recipients to know that what they have is not the
+original, so that any problems introduced by others will not reflect
+on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at
+all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License. The
+"Program", below, refers to any such program or work, and a "work
+based on the Program" means either the Program or any derivative work
+under copyright law: that is to say, a work containing the Program or
+a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is
+included without limitation in the term "modification".) Each licensee
+is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+**1.** You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may

[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: [WIP] Fix double-failmail after timeout.

2017-04-05 Thread Awight (Code Review)

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

Change subject: [WIP] Fix double-failmail after timeout.
..

[WIP] Fix double-failmail after timeout.

Change-Id: Ie0cd58e9a890ecf9100f022cffec0743b9327504
---
M processcontrol/runner.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control 
refs/changes/40/346640/1

diff --git a/processcontrol/runner.py b/processcontrol/runner.py
index 82fa6fc..c2cbd13 100644
--- a/processcontrol/runner.py
+++ b/processcontrol/runner.py
@@ -17,6 +17,7 @@
 self.job = job
 self.mailer = mailer.Mailer(self.job, self)
 self.logfile = None
+self.killer_was_me = False
 
 def run(self):
 # Check that we are the service user.
@@ -78,6 +79,9 @@
 self.process = None
 
 def fail_exitcode(self, return_code):
+if self.killer_was_me and return_code == -9:
+# We already mailed and stuff.
+return
 message = "{name} failed with code {code}".format(name=self.job.name, 
code=return_code)
 config.log.error(message)
 # TODO: Prevent future jobs according to config.
@@ -93,12 +97,12 @@
 raise JobFailure(message)
 
 def fail_timeout(self):
+self.timed_out = True
 self.process.kill()
 message = "{name} timed out after {timeout} 
minutes".format(name=self.job.name, timeout=self.job.timeout)
 config.log.error(message)
 self.mailer.fail_mail(message)
 # FIXME: Job will return SIGKILL now, fail_exitcode should ignore that 
signal now?
-raise JobFailure(message)
 
 def status(self):
 """Check for any running instances of this job, in this process or 
another.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0cd58e9a890ecf9100f022cffec0743b9327504
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [Beta] RESTBase: Set the Cassandra seeds correctly

2017-04-05 Thread Mobrovac (Code Review)

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

Change subject: [Beta] RESTBase: Set the Cassandra seeds correctly
..

[Beta] RESTBase: Set the Cassandra seeds correctly

Change-Id: Iff55bc7abe92f1c375d45bcf5d51bcda16202e88
---
M hieradata/labs/deployment-prep/host/deployment-restbase01.yaml
M hieradata/labs/deployment-prep/host/deployment-restbase02.yaml
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/346639/1

diff --git a/hieradata/labs/deployment-prep/host/deployment-restbase01.yaml 
b/hieradata/labs/deployment-prep/host/deployment-restbase01.yaml
index fc0d92b..bc4c989 100644
--- a/hieradata/labs/deployment-prep/host/deployment-restbase01.yaml
+++ b/hieradata/labs/deployment-prep/host/deployment-restbase01.yaml
@@ -1,3 +1,6 @@
+restbase::seeds:
+  - deployment-restbase01.deployment-prep.eqiad.wmflabs
+  - deployment-restbase02.deployment-prep.eqiad.wmflabs
 cassandra::seeds:
   - deployment-restbase01.deployment-prep.eqiad.wmflabs
-  - deployment-restbase02.deployment-prep.eqiad.wmflabs
\ No newline at end of file
+  - deployment-restbase02.deployment-prep.eqiad.wmflabs
diff --git a/hieradata/labs/deployment-prep/host/deployment-restbase02.yaml 
b/hieradata/labs/deployment-prep/host/deployment-restbase02.yaml
index fc0d92b..bc4c989 100644
--- a/hieradata/labs/deployment-prep/host/deployment-restbase02.yaml
+++ b/hieradata/labs/deployment-prep/host/deployment-restbase02.yaml
@@ -1,3 +1,6 @@
+restbase::seeds:
+  - deployment-restbase01.deployment-prep.eqiad.wmflabs
+  - deployment-restbase02.deployment-prep.eqiad.wmflabs
 cassandra::seeds:
   - deployment-restbase01.deployment-prep.eqiad.wmflabs
-  - deployment-restbase02.deployment-prep.eqiad.wmflabs
\ No newline at end of file
+  - deployment-restbase02.deployment-prep.eqiad.wmflabs

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

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

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

1 2 3 4 >

1 - 100 of 325 matches

Mail list logo