date:20150901

[MediaWiki-commits] [Gerrit] Fix old API version fetch - change (pywikibot/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Fix old API version fetch
..


Fix old API version fetch

d51b9977 replaced urllib2 with requests, introducing an exception
in the old version detection as it attempted to load json from
a file handle, but the file handle was changed to a decoded string.

Also filter is not subscriptable on Python 3.

Change-Id: I141d77183b63c6d6d417689eb61ea5e40df4fc55
---
M pywikibot/site_detect.py
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py
index fed1f56..13bfe27 100644
--- a/pywikibot/site_detect.py
+++ b/pywikibot/site_detect.py
@@ -85,11 +85,11 @@
 if self.version is None:
 # try to get version using api
 try:
-d = json.load(fetch(self.api + '?version=json').content)
-self.version = filter(
+d = json.loads(fetch(self.api + 
'?version=json').content)
+self.version = list(filter(
 lambda x: x.startswith("MediaWiki"),
 [l.strip()
- for l in d['error']['*'].split("\n")])[0].split()[1]
+ for l in d['error']['*'].split("\n")]))[0].split()[1]
 except Exception:
 pass
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I141d77183b63c6d6d417689eb61ea5e40df4fc55
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Turn off CirrusSearch user test for phrase slop - change (operations/mediawiki-config)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Turn off CirrusSearch user test for phrase slop
..


Turn off CirrusSearch user test for phrase slop

Bug: T109018
Change-Id: I23d5739e3fe9d9fc50a34f68e3b03bf87241a086
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 20 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ab5ccfc..ab36c64 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15265,26 +15265,7 @@
 ),
 
 'wmgCirrusSearchUserTesting' => array(
-   'default' => array(
-   'phrase-slop' => array(
-   'sampleRate' => 33,
-   'buckets' => array(
-   'a' => array(
-   // control bucket, retain defaults
-   ),
-   'b' => array(
-   'wgCirrusSearchPhraseSlop' => array(
-   'precise' => 1, 'default' => 1, 
'boost' => 1
-   ),
-   ),
-   'c' => array(
-   'wgCirrusSearchPhraseSlop' => array(
-   'precise' => 2, 'default' => 2, 
'boost' => 2
-   ),
-   ),
-   ),
-   ),
-   ),
+   'default' => array(),
 ),
 
 'wmgUseCite' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23d5739e3fe9d9fc50a34f68e3b03bf87241a086
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mailman: set new settings to improve security - change (operations/puppet)

2015-09-01 Thread John F. Lewis (Code Review)

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: set new settings to improve security
..

mailman: set new settings to improve security

Sets new settings introduced at different times between 2.1.14 to 2.1.18 which
improve security of password cookies and automated bounces.

Change-Id: I8a10a2d88b72f9f81566396842cfa27ba151a266
---
M modules/mailman/files/mm_cfg.py
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/235384/1

diff --git a/modules/mailman/files/mm_cfg.py b/modules/mailman/files/mm_cfg.py
index 93c8401..47987da 100644
--- a/modules/mailman/files/mm_cfg.py
+++ b/modules/mailman/files/mm_cfg.py
@@ -126,3 +126,9 @@
 
 # Don't store messages in qfiles/bad
 QRUNNER_SAVE_BAD_MESSAGES = No
+
+# Expire cookies 3600 seconds (1 hour) after last use
+AUTHENTICATION_COOKIE_LIFETIME = 3600
+
+# Don't include full email in automatic bounces
+RESPONSE_INCLUDE_LEVEL = 0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a10a2d88b72f9f81566396842cfa27ba151a266
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] Now that all virt nodes are running Juno, return everything ... - change (operations/puppet)

2015-09-01 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Now that all virt nodes are running Juno, return everything to 
the scheduler pool.
..


Now that all virt nodes are running Juno, return everything to the scheduler 
pool.

Bug: T110886
Change-Id: Ib835fac6bf967865da0b9219dfa943d7eec8db3d
---
M modules/openstack/templates/juno/nova/nova.conf.erb
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/modules/openstack/templates/juno/nova/nova.conf.erb 
b/modules/openstack/templates/juno/nova/nova.conf.erb
index b6e8eb3..58c7efd 100644
--- a/modules/openstack/templates/juno/nova/nova.conf.erb
+++ b/modules/openstack/templates/juno/nova/nova.conf.erb
@@ -9,9 +9,7 @@
 instance_name_template=i-%08x
 daemonize=1
 scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
-#wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009
-# Temporarily limit the pool to just labvirt1004 until everything is moved to 
Juno.
-wmf_scheduler_hosts_pool=labvirt1004
+wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009
 
scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter
 
 # Don't allow duplicate instance names

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib835fac6bf967865da0b9219dfa943d7eec8db3d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] remove ##wmt, cannot join - change (labs...grrrit)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: remove ##wmt, cannot join
..


remove ##wmt, cannot join

Change-Id: I5a60ab4870aacd48c850dd890de637edcb796db7
---
M config.yaml
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/config.yaml b/config.yaml
index 43121ba..1849044 100644
--- a/config.yaml
+++ b/config.yaml
@@ -159,8 +159,6 @@
 "#wikipedia-en-ambassadors":
 mediawiki/extensions/Campaigns:
 mediawiki/extensions/EducationProgram:
-"##wmt":
-labs/tools/WMT:
 "#brickimedia":
 mediawiki/extensions/MediaWikiChat:
 "#wikimedia-services":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a60ab4870aacd48c850dd890de637edcb796db7
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Follow-up 5542fe9: Fix build for added language 'glk' - change (VisualEditor/VisualEditor)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Follow-up 5542fe9: Fix build for added language 'glk'
..


Follow-up 5542fe9: Fix build for added language 'glk'

Change-Id: I28f8d91d4e8ef016dc45739e5cd88f3fbdea619e
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
5 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 6921086..5f63b23 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -58,7 +58,7 @@
 

ve.messagePaths = ["../i18n/","../lib/oojs-ui/i18n/"];
-   ve.availableLanguages = 
["ace","af","am","ang","ar","arc","arq","as","ast","av","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","cjy-hant","ckb","co","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en-ca","en-gb","en","eo","es","et","eu","fa","fi","fo","fr","frp","frr","fur","fy","ga","gd","gl","gn","gsw","gu","gv","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","kri","ksh","ku-latn","kw","ky","la","lb","lez","li","lmo","lrc","lt","luz","lv","lzh","lzz","mg","min","mk","ml","mn","mr","ms","mt","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","os","pa","pam","pfl","pl","pms","ps","pt-br","pt","qqq","qu","rm","ro","roa-tara","ru","rue","sa","sah","sc","scn","sco","sh","shn","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","tzm","ug-arab","uk","ur","uz","vec","vi","vo","wuu","xmf","yi","yue","zh-hans","zh-hant","ace","af","am","ar","arc","arq","as","ast","awa","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","ckb","co","crh-cyrl","crh-latn","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en","eo","es","et","eu","fa","fi","fo","fr","frr","fur","fy","gd","gl","gu","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","ksh","ku-latn","kw","ky","la","lb","li","lmo","lt","luz","lv","lzh","mg","min","mk","ml","mr","ms","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","pa","pfl","pl","pms","ps","pt-br","pt","qqq","qu","ro","roa-tara","ru","sa","sah","scn","sco","sh","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","ug-arab","uk","uz","vec","vi","vo","wuu","xmf","yi","yo","yue","zh-hans","zh-hant"];
+   ve.availableLanguages = 
["ace","af","am","ang","ar","arc","arq","as","ast","av","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","cjy-hant","ckb","co","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en-ca","en-gb","en","eo","es","et","eu","fa","fi","fo","fr","frp","frr","fur","fy","ga","gd","gl","glk","gn","gsw","gu","gv","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","kri","ksh","ku-latn","kw","ky","la","lb","lez","li","lmo","lrc","lt","luz","lv","lzh","lzz","mg","min","mk","ml","mn","mr","ms","mt","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","os","pa","pam","pfl","pl","pms","ps","pt-br","pt","qqq","qu","rm","ro","roa-tara","ru","rue","sa","sah","sc","scn","sco","sh","shn","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","tzm","ug-arab","uk","ur","uz","vec","vi","vo","wuu","xmf","yi","yue","zh-hans","zh-hant","ace","af","am","ar","arc","arq","as","ast","awa","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","ckb","co","crh-cyrl","crh-latn","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en","eo","es","et","eu","fa","fi","fo","fr","frr","fur","fy","gd","gl","gu","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","ksh","ku-latn","kw","ky","la","lb","li","lmo","lt","luz","lv","lzh","mg","min","mk","ml","mr","ms","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","pa","pfl","pl","pms","ps","pt-br","pt","qqq","qu","ro","roa-tara","ru","sa","sah","scn","sco","sh","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","ug-arab","uk","uz","vec","vi","vo","wuu","xmf","yi","yo","yue","zh-hans","zh-hant"];

 

diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html
index 0f46648..cbaa3f1 100644
--- a/demos/ve/desktop-dist.html
+++ b/demos/ve/desktop-dist.html
@@ -72,7 +72,7 @@
 

ve.messagePaths = 
["../../dist/i18n/","../../lib/oojs-ui/i18n/"];
-   ve.availableLanguages =

[MediaWiki-commits] [Gerrit] Enable VisualEditor for NS_PROJECT on enwiki - change (operations/mediawiki-config)

2015-09-01 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor for NS_PROJECT on enwiki
..

Enable VisualEditor for NS_PROJECT on enwiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ab5ccfc..2903d3c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12678,6 +12678,7 @@
102 /* Viquiprojecte */ => true // T58000
),
'+enwiki' => array(
+   NS_PROJECT => true, // T100067
100 /* Portal */ => true, // T58001
108 /* Book */ => true, // T58001
118 /* Draft */ => true

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

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

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

[MediaWiki-commits] [Gerrit] Avoid PHP notices on undefined timed_out response - change (mediawiki...CirrusSearch)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Avoid PHP notices on undefined timed_out response
..


Avoid PHP notices on undefined timed_out response

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

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

Objections:
  Cindy-the-browser-test-bot: There's a problem with this change, please improve



diff --git a/includes/Searcher.php b/includes/Searcher.php
index a95590e..befed88 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -1499,7 +1499,7 @@
 
$result->setResult( true, 
$this->resultsType->transformElasticsearchResult( $this->suggestPrefixes,
$this->suggestSuffixes, $result->getValue(), 
$this->searchContainedSyntax ) );
-   if ( $responseData[ 'timed_out' ] ) {
+   if ( isset( $responseData['timed_out'] ) && 
$responseData[ 'timed_out' ] ) {
LoggerFactory::getInstance( 'CirrusSearch' 
)->warning(
"$description timed out and only 
returned partial results!",
$logContext

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie21d03671aa1659447e53a0cd1315e7cf3e5f26c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use wgResourceBasePath instead of wgScriptPath for wgStylePa... - change (mediawiki/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Use wgResourceBasePath instead of wgScriptPath for wgStylePath 
etc.
..


Use wgResourceBasePath instead of wgScriptPath for wgStylePath etc.

This make re-configuring these much easier by only needing to update
one variable instead of four.

Also remove redundant hardcoding of wgStylePath and wgResourceBasePath
in the generated LocalSettings.php file during installation. This way
changing wgScriptPath will naturally result in the other variables
updating too. We already do this for many other variables (such as
wgLoadScript, wgScript, wgExtensionAssetsPath, etc.).

Change-Id: Ide74355b4054c78214c17f3b2d6fa2f5270e0ab9
---
M includes/DefaultSettings.php
M includes/Setup.php
M includes/installer/LocalSettingsGenerator.php
3 files changed, 10 insertions(+), 12 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c0aad5d..f0450a9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -211,7 +211,7 @@
 
 /**
  * The URL path of the skins directory.
- * Defaults to "{$wgScriptPath}/skins".
+ * Defaults to "{$wgResourceBasePath}/skins".
  * @since 1.3
  */
 $wgStylePath = false;
@@ -226,7 +226,7 @@
 
 /**
  * The URL path of the extensions directory.
- * Defaults to "{$wgScriptPath}/extensions".
+ * Defaults to "{$wgResourceBasePath}/extensions".
  * @since 1.16
  */
 $wgExtensionAssetsPath = false;
@@ -3473,8 +3473,8 @@
 $wgResourceLoaderSources = array();
 
 /**
- * Default 'remoteBasePath' value for instances of ResourceLoaderFileModule.
- * If not set, then $wgScriptPath will be used as a fallback.
+ * The default 'remoteBasePath' value for instances of 
ResourceLoaderFileModule.
+ * Defaults to $wgScriptPath.
  */
 $wgResourceBasePath = null;
 
diff --git a/includes/Setup.php b/includes/Setup.php
index 86df4b8..6abef44 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -68,17 +68,18 @@
$wgActionPaths['view'] = $wgArticlePath;
 }
 
+if ( $wgResourceBasePath === null ) {
+   $wgResourceBasePath = $wgScriptPath;
+}
 if ( $wgStylePath === false ) {
-   $wgStylePath = "$wgScriptPath/skins";
+   $wgStylePath = "$wgResourceBasePath/skins";
 }
 if ( $wgLocalStylePath === false ) {
+   // Avoid wgResourceBasePath here since that may point to a different 
domain (e.g. CDN)
$wgLocalStylePath = "$wgScriptPath/skins";
 }
 if ( $wgExtensionAssetsPath === false ) {
-   $wgExtensionAssetsPath = "$wgScriptPath/extensions";
-}
-if ( $wgResourceBasePath === null ) {
-   $wgResourceBasePath = $wgScriptPath;
+   $wgExtensionAssetsPath = "$wgResourceBasePath/extensions";
 }
 
 if ( $wgLogo === false ) {
diff --git a/includes/installer/LocalSettingsGenerator.php 
b/includes/installer/LocalSettingsGenerator.php
index 7b1cfdc..09b5929 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -332,9 +332,6 @@
 ## https://www.mediawiki.org/wiki/Manual:Short_URL
 \$wgScriptPath = \"{$this->values['wgScriptPath']}\";
 ${serverSetting}
-## The relative URL path to the skins directory
-\$wgStylePath = \"\$wgScriptPath/skins\";
-\$wgResourceBasePath = \$wgScriptPath;
 
 ## The relative URL path to the logo.  Make sure you change this from the 
default,
 ## or else you'll overwrite your logo when you upgrade!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide74355b4054c78214c17f3b2d6fa2f5270e0ab9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Nutcracker: set a higher ulimit - change (operations/puppet)

2015-09-01 Thread Rush (Code Review)

Rush has uploaded a new change for review.

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

Change subject: Nutcracker: set a higher ulimit
..

Nutcracker: set a higher ulimit

We are bumping our head on the current effective
limit of 935.  I am setting at 2048.

depends on https://gerrit.wikimedia.org/r/#/c/235368/

Change-Id: I3c689e837303bffea3a10ccef9a7fce42d46608f
---
M modules/nutcracker/templates/default.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/235370/1

diff --git a/modules/nutcracker/templates/default.erb 
b/modules/nutcracker/templates/default.erb
index 731ce3a..6ec6409 100644
--- a/modules/nutcracker/templates/default.erb
+++ b/modules/nutcracker/templates/default.erb
@@ -2,3 +2,4 @@
 # This file is managed by Puppet.
 DAEMON_OPTS="--verbose=<%= @verbosity %>"
 <%- if @mbuf_size -%>DAEMON_OPTS="$DAEMON_OPTS --mbuf-size=<%= 
scope.function_to_bytes [@mbuf_size] %>"<%- end %>
+ULIMIT="2048"

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

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

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

[MediaWiki-commits] [Gerrit] Explain some disablement - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Explain some disablement
..

Explain some disablement

Bug: https://phabricator.wikimedia.org/T99836
Change-Id: I8dfedc9aeda607e5d8bd9c8c50a742aea4c160a1
---
M sites/all/modules/wmf_reports/wmf_reports.module
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/71/235371/1

diff --git a/sites/all/modules/wmf_reports/wmf_reports.module 
b/sites/all/modules/wmf_reports/wmf_reports.module
index bc78245..316c3e7 100644
--- a/sites/all/modules/wmf_reports/wmf_reports.module
+++ b/sites/all/modules/wmf_reports/wmf_reports.module
@@ -12,6 +12,13 @@
 }
 
 /*
+ * FIXME: These reports cause performance issues, so they're currently disabled
+ * pending further work.  Original features are outlined here,
+ * 
https://wikimedia.mingle.thoughtworks.com/projects/online_fundraiser/cards/525
+ * 
https://wikimedia.mingle.thoughtworks.com/projects/online_fundraiser/cards/529
+ * 
+ * ==
+ *
  * function wmf_reports_civicrm_advancedSearchModes(&$search_modes)
  * {
  * $search_modes[] = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dfedc9aeda607e5d8bd9c8c50a742aea4c160a1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Update OOjs UI to v0.12.7 - change (VisualEditor/VisualEditor)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Update OOjs UI to v0.12.7
..


Update OOjs UI to v0.12.7

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.7/History.md

Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M lib/oojs-ui/i18n/de.json
A lib/oojs-ui/i18n/en-ca.json
M lib/oojs-ui/i18n/en.json
M lib/oojs-ui/i18n/fa.json
M lib/oojs-ui/i18n/fi.json
A lib/oojs-ui/i18n/glk.json
M lib/oojs-ui/i18n/he.json
M lib/oojs-ui/i18n/mk.json
M lib/oojs-ui/i18n/nap.json
M lib/oojs-ui/i18n/pt.json
M lib/oojs-ui/i18n/qqq.json
M lib/oojs-ui/i18n/sv.json
M lib/oojs-ui/i18n/vi.json
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.raster.css
M lib/oojs-ui/oojs-ui-apex.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.vector.css
M lib/oojs-ui/oojs-ui-apex.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.css
M

[MediaWiki-commits] [Gerrit] Support legacy banner_count field for S:RI - change (mediawiki...CentralNotice)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Support legacy banner_count field for S:RI
..


Support legacy banner_count field for S:RI

Change-Id: I84e1a0f11ca448cb49b08c122c783528ce9c2aa2
---
M resources/subscribing/ext.centralNotice.display.js
M resources/subscribing/ext.centralNotice.display.state.js
2 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/resources/subscribing/ext.centralNotice.display.js 
b/resources/subscribing/ext.centralNotice.display.js
index 8b4a929..ec45642 100644
--- a/resources/subscribing/ext.centralNotice.display.js
+++ b/resources/subscribing/ext.centralNotice.display.js
@@ -346,6 +346,11 @@
state.setBannerLoadedButHidden(

bannerLoadedButHiddenReason );
}
+
+   if ( tmpData.banner_count ) {
+   state.setBannerCount( 
tmpData.banner_count );
+   }
+
} else {
state.setAlterFunctionMissing();
}
diff --git a/resources/subscribing/ext.centralNotice.display.state.js 
b/resources/subscribing/ext.centralNotice.display.state.js
index 4176da0..5341107 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -294,6 +294,13 @@
state.data.result = 'show';
},
 
+   /**
+* Sets banner_count, a legacy field for 
Special:RecordImpression
+*/
+   setBannerCount: function ( bannerCount ) {
+   state.data.banner_count = bannerCount;
+   },
+
setRecordImpressionSampleRate: function( rate ) {
state.data.recordImpressionSampleRate = rate;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84e1a0f11ca448cb49b08c122c783528ce9c2aa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add config deployment - change (mediawiki...scap)

2015-09-01 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: Add config deployment
..

Add config deployment

Adds a section inside the local scap/scap.cfg for configuration files to
be deployed, formatted like:

[config_files]
/path/to/dest_config.file:
   template: file_in_the_template_dir.yaml.j2
   vars_file: /path/to/vars_file.yaml

The deploy command renders a json file in a known location on tin that
is later fetched by each deploy target.

The deploy target loops through the config files and grabs the
`template` and renders it using the `vars_file` (which is put into place
by puppet on the target and contains puppet private repo information)

Current limitations:

  - Files created are created by the ssh_user specified in the config
and therefore must be created in locations to which that user has
read access

Change-Id: I64aa464039c0471f156795a3042ea44d48c8622a
---
A bin/deploy-local-config
M scap/__init__.py
M scap/config.py
M scap/main.py
M scap/tasks.py
A scap/template.py
M scap/utils.py
7 files changed, 227 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/85/235385/1

diff --git a/bin/deploy-local-config b/bin/deploy-local-config
new file mode 100755
index 000..f555f4b
--- /dev/null
+++ b/bin/deploy-local-config
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Deploy service to localhost.
+#
+# Copyright © 2015 Wikimedia Foundation and contributors
+
+import os
+import sys
+
+# Add scap package to search path
+script = os.path.realpath(sys.argv[0])
+scap_src = os.path.dirname(os.path.dirname(script))
+sys.path.append(scap_src)
+
+import scap
+scap.DeployLocalConfig.run()
diff --git a/scap/__init__.py b/scap/__init__.py
index 70baa76..4d68bc9 100644
--- a/scap/__init__.py
+++ b/scap/__init__.py
@@ -9,6 +9,7 @@
 from .main import (
 CompileWikiversions,
 DeployLocal,
+DeployLocalConfig,
 Deploy,
 HHVMGracefulAll,
 MWVersionsInUse,
@@ -28,6 +29,7 @@
 __all__ = (
 'CompileWikiversions',
 'DeployLocal',
+'DeployLocalConfig',
 'Deploy',
 'HHVMGracefulAll',
 'MWVersionsInUse',
@@ -47,6 +49,7 @@
 any((
 CompileWikiversions,
 DeployLocal,
+DeployLocalConfig,
 Deploy,
 HHVMGracefulAll,
 MWVersionsInUse,
diff --git a/scap/config.py b/scap/config.py
index 3ef9463..340e7bb 100644
--- a/scap/config.py
+++ b/scap/config.py
@@ -9,6 +9,9 @@
 import getpass
 import os
 import socket
+import yaml
+
+from . import utils
 
 
 DEFAULT_CONFIG = {
@@ -35,6 +38,7 @@
 'git_server': 'tin.eqiad.wmnet',
 'git_scheme': 'http',
 'git_submodules': False,
+'config_deploy': False,
 }
 
 
@@ -63,6 +67,8 @@
 :param overrides: Dict of configuration values
 :returns: dict of configuration values
 """
+local_cfg = os.path.join(os.getcwd(), 'scap')
+
 parser = ConfigParser.SafeConfigParser()
 if cfg_file:
 try:
@@ -77,7 +83,7 @@
 os.path.join(os.path.dirname(__file__), '..', 'scap.cfg'),
 '/srv/scap/scap.cfg',
 '/etc/scap.cfg',
-os.path.join(os.getcwd(), 'scap.cfg'),
+os.path.join(local_cfg, 'scap.cfg'),
 ])
 
 fqdn = socket.getfqdn().split('.')
@@ -95,4 +101,23 @@
 if overrides:
 config.update(overrides)
 
+# Grab the config file
+# config file section example:
+# [config_files]
+# /path/to/dest_config.file:
+#template: file_in_the_template_dir.yaml.j2
+#vars_file: /path/to/vars_file.yaml
+if parser.has_section('config_files'):
+config['config_files'] = []
+for config_file in parser.items('config_files', True):
+name = config_file[0]
+info = yaml.load(config_file[1])
+template = utils.get_realm_specific_filename(
+os.path.join(local_cfg, 'templates', info['template']),
+config['wmf_realm'],
+config['datacenter']
+)
+info['template'] = template
+config['config_files'].append({'name': name, 'info': info})
+
 return config
diff --git a/scap/main.py b/scap/main.py
index fb6e37d..e6f4f86 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -11,12 +11,14 @@
 import netifaces
 import os
 import psutil
+import requests
 import subprocess
 
 from . import cli
 from . import log
 from . import ssh
 from . import tasks
+from . import template
 from . import utils
 
 
@@ -575,8 +577,51 @@
 return exit_code
 
 
+class DeployLocalConfig(cli.Application):
+"""Creates config files
+#. Pull config_files.json (generated during deploy on tin)
+#. Loop through config files and render template from variables in
+   final location
+"""
+
+def main(self, *extra_args):
+"""Looks only in the scap directory for the repo being

[MediaWiki-commits] [Gerrit] Search Συγγραφέας namespace by default on elwikisource - change (operations/mediawiki-config)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Search Συγγραφέας namespace by default on elwikisource
..


Search Συγγραφέας namespace by default on elwikisource

Bug: T110871
Change-Id: Ie1c41fae4b9792ba43c5fb6251623625e438baee
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b3c4d75..9048aee 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6799,7 +6799,7 @@
'+dewikisource' => array( 102 => 1, 104 => 1 ),
'+dewikiversity' => array( 106 => 1, 108 => 1 ),
'+dewikivoyage' => array( 6 => 1, 14 => 1, 100 => 1, 104 => 1, 106 => 1 
),
-   '+elwikisource' => array( 102 => 1 ),
+   '+elwikisource' => array( 102 => 1, 108 => 1 ),
'+enwikibooks' => array( 4 => 1, 112 => 1 ),
'+enwikinews' => array( 14 => 1, ), // T87522
'+enwikisource' => array( 102 => 1, 106 => 1, 114 => 1 ), // T52007

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

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

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

[MediaWiki-commits] [Gerrit] Defer the resetAuthToken() call on logout - change (mediawiki...CentralAuth)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Defer the resetAuthToken() call on logout
..


Defer the resetAuthToken() call on logout

Bug: T92357
Change-Id: I8ba6606b9b32fd45bd4b16c208aad12383049f87
---
M includes/CentralAuthHooks.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index d1fc927..c790a2e 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -946,7 +946,9 @@
 
if ( $centralUser->exists() ) {
CentralAuthUser::deleteGlobalCookies();
-   $centralUser->resetAuthToken();
+   DeferredUpdates::addCallableUpdate( function() use ( 
$centralUser ) {
+   $centralUser->resetAuthToken();
+   } );
}
 
// Clean up any possible forced rename markers

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ba6606b9b32fd45bd4b16c208aad12383049f87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Disable webp for now, so we can enable outside of WMF - change (operations/mediawiki-config)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Disable webp for now, so we can enable outside of WMF
..


Disable webp for now, so we can enable outside of WMF

Bug: T27397
Change-Id: I33b7de30c746e36539e9af29e9598e6723d030dd
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1e5e8cc..e44db2d 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -363,6 +363,9 @@
 
 $wgFileExtensions = array_merge( $wgFileExtensions, $wmgFileExtensions );
 
+// Disable webp for now. T27397
+$wgFileExtensions = array_values( array_diff( $wgFileExtensions, array( 'webp' 
) ) );
+
 if ( isset( $wmgUploadStashMaxAge ) ) {
$wgUploadStashMaxAge = $wmgUploadStashMaxAge;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33b7de30c746e36539e9af29e9598e6723d030dd
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.12.7 - change (mediawiki/vendor)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Update OOjs UI to v0.12.7
..


Update OOjs UI to v0.12.7

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.7/History.md

Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/i18n/de.json
A oojs/oojs-ui/i18n/en-ca.json
M oojs/oojs-ui/i18n/en.json
M oojs/oojs-ui/i18n/fa.json
M oojs/oojs-ui/i18n/fi.json
A oojs/oojs-ui/i18n/glk.json
M oojs/oojs-ui/i18n/he.json
M oojs/oojs-ui/i18n/mk.json
M oojs/oojs-ui/i18n/nap.json
M oojs/oojs-ui/i18n/pt.json
M oojs/oojs-ui/i18n/qqq.json
M oojs/oojs-ui/i18n/sv.json
M oojs/oojs-ui/i18n/vi.json
M oojs/oojs-ui/package.json
19 files changed, 179 insertions(+), 64 deletions(-)

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



diff --git a/composer.json b/composer.json
index bc07826..0073abe 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"liuggio/statsd-php-client": "1.0.16",
"mediawiki/at-ease": "1.0.0",
"monolog/monolog": "1.14.0",
-   "oojs/oojs-ui": "0.12.6",
+   "oojs/oojs-ui": "0.12.7",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"ruflin/elastica": "2.2.0",
diff --git a/composer.lock b/composer.lock
index e7261de..6657198 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "0653c465457889256cda913288c80112",
+"hash": "f430edec4f55e7f3c1b6d7593500d3ab",
 "packages": [
 {
 "name": "composer/semver",
@@ -392,16 +392,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.12.6",
+"version": "v0.12.7",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa"
+"reference": "e284431329b734d3bb9c945b256ad157e305348c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f405939b8c7ef5b5759d8cff7a732deb45b1deaa;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/e284431329b734d3bb9c945b256ad157e305348c;,
+"reference": "e284431329b734d3bb9c945b256ad157e305348c",
 "shasum": ""
 },
 "require": {
@@ -425,7 +425,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2015-08-25 23:46:32"
+"time": "2015-09-01 20:24:01"
 },
 {
 "name": "psr/log",
diff --git a/composer/installed.json b/composer/installed.json
index 1f6ebe7..cfd6feb 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -830,45 +830,6 @@
 "homepage": "https://github.com/firebase/php-jwt;
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.12.6",
-"version_normalized": "0.12.6.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f405939b8c7ef5b5759d8cff7a732deb45b1deaa;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.0.0",
-"php": ">=5.3.3"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.3.0",
-"phpunit/phpunit": "~4.5"
-},
-"time": "2015-08-25 23:46:32",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"description": "Provides library of common widgets, layouts, and 
windows.",
-"homepage": "https://www.mediawiki.org/wiki/OOjs_UI;
-},
-{
 "name": "wikimedia/ip-set",
 "version": "1.0.1",
 "version_normalized": "1.0.1.0",
@@ -911,5 +872,44 @@
 ],
 "description":

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.12.7 - change (mediawiki/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Update OOjs UI to v0.12.7
..


Update OOjs UI to v0.12.7

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.7/History.md

Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a
---
M composer.json
M resources/lib/oojs-ui/i18n/de.json
A resources/lib/oojs-ui/i18n/en-ca.json
M resources/lib/oojs-ui/i18n/en.json
M resources/lib/oojs-ui/i18n/fa.json
M resources/lib/oojs-ui/i18n/fi.json
A resources/lib/oojs-ui/i18n/glk.json
M resources/lib/oojs-ui/i18n/he.json
M resources/lib/oojs-ui/i18n/mk.json
M resources/lib/oojs-ui/i18n/nap.json
M resources/lib/oojs-ui/i18n/pt.json
M resources/lib/oojs-ui/i18n/qqq.json
M resources/lib/oojs-ui/i18n/sv.json
M resources/lib/oojs-ui/i18n/vi.json
M resources/lib/oojs-ui/oojs-ui-apex-noimages.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.png
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
M resources/lib/oojs-ui/themes/apex/images/icons/close.png
M resources/lib/oojs-ui/themes/apex/images/icons/close.svg
M resources/lib/oojs-ui/themes/apex/images/icons/code.png
M resources/lib/oojs-ui/themes/apex/images/icons/code.svg
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/help-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/help-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/history.svg
M resources/lib/oojs-ui/themes/apex/images/icons/info.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-c.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-c.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-d.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-s.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-s.svg
M resources/lib/oojs-ui/themes/apex/images/icons/language.png
M resources/lib/oojs-ui/themes/apex/images/icons/language.svg
M resources/lib/oojs-ui/themes/apex/images/icons/link.svg
M resources/lib/oojs-ui/themes/apex/images/icons/lock.svg
M resources/lib/oojs-ui/themes/apex/images/icons/move-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/notice.svg
M resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.png
M resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.svg
M resources/lib/oojs-ui/themes/apex/images/icons/search.svg
M resources/lib/oojs-ui/themes/apex/images/icons/secure-link.svg
M resources/lib/oojs-ui/themes/apex/images/icons/settings.svg
M resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.png
M resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.svg
M resources/lib/oojs-ui/themes/apex/images/icons/strikethrough-s.svg
M resources/lib/oojs-ui/themes/apex/images/icons/tag.svg
M resources/lib/oojs-ui/themes/apex/images/icons/text-style.svg
M

[MediaWiki-commits] [Gerrit] Allow maps access from localhost - change (operations/puppet)

2015-09-01 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Allow maps access from localhost
..

Allow maps access from localhost

Otherwise, no development work is possible

Change-Id: I4bce8c4a1258b43f77d853df141993044c4fee1a
---
M templates/varnish/maps-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/235386/1

diff --git a/templates/varnish/maps-frontend.inc.vcl.erb 
b/templates/varnish/maps-frontend.inc.vcl.erb
index da36020..8a7b63d 100644
--- a/templates/varnish/maps-frontend.inc.vcl.erb
+++ b/templates/varnish/maps-frontend.inc.vcl.erb
@@ -8,6 +8,7 @@
&& req.url != "/"
&& req.http.referer !~ 
"(?i)^https?://[-a-zA-Z0-9.]+\.(mediawiki|wikivoyage|wmflabs)\.org/"
&& req.http.referer !~ 
"(?i)^https?://(maps|phabricator|wikitech)\.wikimedia\.org/"
+   && req.http.referer !~ 
"(?i)^https?://(localhost|127\.0\.0\.1)(:\d+)?/"
) {
error 403 "Access Denied";
}

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

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

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

[MediaWiki-commits] [Gerrit] Allow maps access from localhost - change (operations/puppet)

2015-09-01 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Allow maps access from localhost
..


Allow maps access from localhost

Otherwise, no development work is possible

Change-Id: I4bce8c4a1258b43f77d853df141993044c4fee1a
---
M templates/varnish/maps-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/varnish/maps-frontend.inc.vcl.erb 
b/templates/varnish/maps-frontend.inc.vcl.erb
index da36020..8a7b63d 100644
--- a/templates/varnish/maps-frontend.inc.vcl.erb
+++ b/templates/varnish/maps-frontend.inc.vcl.erb
@@ -8,6 +8,7 @@
&& req.url != "/"
&& req.http.referer !~ 
"(?i)^https?://[-a-zA-Z0-9.]+\.(mediawiki|wikivoyage|wmflabs)\.org/"
&& req.http.referer !~ 
"(?i)^https?://(maps|phabricator|wikitech)\.wikimedia\.org/"
+   && req.http.referer !~ 
"(?i)^https?://(localhost|127\.0\.0\.1)(:\d+)?/"
) {
error 403 "Access Denied";
}

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

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

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

[MediaWiki-commits] [Gerrit] Modifying MediaWiki:Wikigrok-dialog-more-info-license to use... - change (mediawiki...WikiGrok)

2015-09-01 Thread TTO (Code Review)

TTO has submitted this change and it was merged.

Change subject: Modifying MediaWiki:Wikigrok-dialog-more-info-license to use 
{{int:}}
..


Modifying MediaWiki:Wikigrok-dialog-more-info-license to use {{int:}}

When showing this message, allow to show the localized Wikidata name for
the language selected via WikimediaMessages int:wikibase-repo-name.
Requested at translatewiki.net, cfr.
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikigrok-dialog-more-info-license/ksh

Change-Id: I2c296fa2c06dd0bee7a74105dc7298c00d54b5d1
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 8ccae2c..a059a09 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -38,7 +38,7 @@
"wikigrok-dialog-error-ok-button-label": "OK",
"wikigrok-dialog-more-info-heading": "About",
"wikigrok-dialog-more-info-intro": "Wikipedia is experimenting with new 
ways for people to contribute. By collecting responses from you and other 
readers, we can improve search on Wikipedia.",
-   "wikigrok-dialog-more-info-license": "Entries are submitted to Wikidata and are freely licensed under the Creative Commons Public 
Domain Dedication (CC0) license.",
+   "wikigrok-dialog-more-info-license": "Entries are submitted to {{int:wikibase-repo-name}} and are freely 
licensed under the Creative Commons Public 
Domain Dedication (CC0) license.",
"wikigrok-dialog-more-info-ok-button-label": "Got it!",
"wikigrok-dialog-select-tags": "Select tags that correctly describe $1",
"wikigrok-dialog-instance-of": "type",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c296fa2c06dd0bee7a74105dc7298c00d54b5d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Document Event methods that can return null - change (mediawiki...Echo)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Document Event methods that can return null
..


Document Event methods that can return null

Change-Id: Iecb3ba68ae48924c68781e195557954afd770af3
---
M includes/model/Event.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/model/Event.php b/includes/model/Event.php
index 8a30abf..77f65c8 100644
--- a/includes/model/Event.php
+++ b/includes/model/Event.php
@@ -383,7 +383,7 @@
}
 
/**
-* @return string
+* @return string|null
 */
public function getVariant() {
return $this->variant;
@@ -401,7 +401,7 @@
}
 
/**
-* @return User
+* @return User|null
 */
public function getAgent() {
return $this->agent;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecb3ba68ae48924c68781e195557954afd770af3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable experiment with experimental completion suggester - change (operations/mediawiki-config)

2015-09-01 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Enable experiment with experimental completion suggester
..

Enable experiment with experimental completion suggester

Enabled for 1 in 5000 page views. Runs from 2015-09-08 until
2015-09-15.

Bug: T111078
Change-Id: I22a7f3d96924cc8b0ab7e2dd19bd3c5b4701cf46
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3e1fede..8546201 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2648,6 +2648,7 @@
include_once( "$IP/extensions/WikimediaEvents/WikimediaEvents.php" );
$wgWMEStatsdBaseUri = '/beacon/statsv';
$wgWMETrackGeoFeatures = $wmgWMETrackGeoFeatures;
+   $wgWMEEnableCompletionExperiment = $wmgWMEEnableCompletionExperiment;
 }
 
 if ( $wmgUseEventLogging && $wmgUseNavigationTiming ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d799919..1e337b3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15269,6 +15269,12 @@
'default' => array(),
 ),
 
+'wmgWMEEnableCompletionExperiment' => array(
+   'default' => false,
+   'enwiki' => true,
+   'dewiki' => true,
+),
+
 'wmgUseCite' => array(
'default' => true,
'loginwiki' => false,

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

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

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

[MediaWiki-commits] [Gerrit] Add composer.lock to .gitignore - change (mediawiki...Blueprint)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Add composer.lock to .gitignore
..


Add composer.lock to .gitignore

Change-Id: Ic051ac8fac1d88b3153589e2e851a09dd8254997
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 8404965..c311080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 node_modules
 vendor
+composer.lock

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic051ac8fac1d88b3153589e2e851a09dd8254997
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.12.7 - change (mediawiki/vendor)

2015-09-01 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Update OOjs UI to v0.12.7
..

Update OOjs UI to v0.12.7

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.7/History.md

Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/i18n/de.json
A oojs/oojs-ui/i18n/en-ca.json
M oojs/oojs-ui/i18n/en.json
M oojs/oojs-ui/i18n/fa.json
M oojs/oojs-ui/i18n/fi.json
A oojs/oojs-ui/i18n/glk.json
M oojs/oojs-ui/i18n/he.json
M oojs/oojs-ui/i18n/mk.json
M oojs/oojs-ui/i18n/nap.json
M oojs/oojs-ui/i18n/pt.json
M oojs/oojs-ui/i18n/qqq.json
M oojs/oojs-ui/i18n/sv.json
M oojs/oojs-ui/i18n/vi.json
M oojs/oojs-ui/package.json
19 files changed, 179 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/80/235380/1

diff --git a/composer.json b/composer.json
index bc07826..0073abe 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"liuggio/statsd-php-client": "1.0.16",
"mediawiki/at-ease": "1.0.0",
"monolog/monolog": "1.14.0",
-   "oojs/oojs-ui": "0.12.6",
+   "oojs/oojs-ui": "0.12.7",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"ruflin/elastica": "2.2.0",
diff --git a/composer.lock b/composer.lock
index e7261de..6657198 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "0653c465457889256cda913288c80112",
+"hash": "f430edec4f55e7f3c1b6d7593500d3ab",
 "packages": [
 {
 "name": "composer/semver",
@@ -392,16 +392,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.12.6",
+"version": "v0.12.7",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa"
+"reference": "e284431329b734d3bb9c945b256ad157e305348c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f405939b8c7ef5b5759d8cff7a732deb45b1deaa;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/e284431329b734d3bb9c945b256ad157e305348c;,
+"reference": "e284431329b734d3bb9c945b256ad157e305348c",
 "shasum": ""
 },
 "require": {
@@ -425,7 +425,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2015-08-25 23:46:32"
+"time": "2015-09-01 20:24:01"
 },
 {
 "name": "psr/log",
diff --git a/composer/installed.json b/composer/installed.json
index 1f6ebe7..cfd6feb 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -830,45 +830,6 @@
 "homepage": "https://github.com/firebase/php-jwt;
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.12.6",
-"version_normalized": "0.12.6.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/f405939b8c7ef5b5759d8cff7a732deb45b1deaa;,
-"reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.0.0",
-"php": ">=5.3.3"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.3.0",
-"phpunit/phpunit": "~4.5"
-},
-"time": "2015-08-25 23:46:32",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"description": "Provides library of common widgets, layouts, and 
windows.",
-"homepage": "https://www.mediawiki.org/wiki/OOjs_UI;
-},
-{
 "name": "wikimedia/ip-set",
 "version": "1.0.1",
 "version_normalized": "1.0.1.0",
@@ -911,5

[MediaWiki-commits] [Gerrit] Support legacy banner_count field for S:RI - change (mediawiki...CentralNotice)

2015-09-01 Thread AndyRussG (Code Review)

AndyRussG has uploaded a new change for review.

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

Change subject: Support legacy banner_count field for S:RI
..

Support legacy banner_count field for S:RI

Change-Id: I84e1a0f11ca448cb49b08c122c783528ce9c2aa2
---
M resources/subscribing/ext.centralNotice.display.js
M resources/subscribing/ext.centralNotice.display.state.js
2 files changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/resources/subscribing/ext.centralNotice.display.js 
b/resources/subscribing/ext.centralNotice.display.js
index 8b4a929..ec45642 100644
--- a/resources/subscribing/ext.centralNotice.display.js
+++ b/resources/subscribing/ext.centralNotice.display.js
@@ -346,6 +346,11 @@
state.setBannerLoadedButHidden(

bannerLoadedButHiddenReason );
}
+
+   if ( tmpData.banner_count ) {
+   state.setBannerCount( 
tmpData.banner_count );
+   }
+
} else {
state.setAlterFunctionMissing();
}
diff --git a/resources/subscribing/ext.centralNotice.display.state.js 
b/resources/subscribing/ext.centralNotice.display.state.js
index 4176da0..5341107 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -294,6 +294,13 @@
state.data.result = 'show';
},
 
+   /**
+* Sets banner_count, a legacy field for 
Special:RecordImpression
+*/
+   setBannerCount: function ( bannerCount ) {
+   state.data.banner_count = bannerCount;
+   },
+
setRecordImpressionSampleRate: function( rate ) {
state.data.recordImpressionSampleRate = rate;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84e1a0f11ca448cb49b08c122c783528ce9c2aa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.12.7 - change (mediawiki/core)

2015-09-01 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Update OOjs UI to v0.12.7
..

Update OOjs UI to v0.12.7

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.7/History.md

Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a
---
M composer.json
M resources/lib/oojs-ui/i18n/de.json
A resources/lib/oojs-ui/i18n/en-ca.json
M resources/lib/oojs-ui/i18n/en.json
M resources/lib/oojs-ui/i18n/fa.json
M resources/lib/oojs-ui/i18n/fi.json
A resources/lib/oojs-ui/i18n/glk.json
M resources/lib/oojs-ui/i18n/he.json
M resources/lib/oojs-ui/i18n/mk.json
M resources/lib/oojs-ui/i18n/nap.json
M resources/lib/oojs-ui/i18n/pt.json
M resources/lib/oojs-ui/i18n/qqq.json
M resources/lib/oojs-ui/i18n/sv.json
M resources/lib/oojs-ui/i18n/vi.json
M resources/lib/oojs-ui/oojs-ui-apex-noimages.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.png
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
M resources/lib/oojs-ui/themes/apex/images/icons/close.png
M resources/lib/oojs-ui/themes/apex/images/icons/close.svg
M resources/lib/oojs-ui/themes/apex/images/icons/code.png
M resources/lib/oojs-ui/themes/apex/images/icons/code.svg
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/help-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/help-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/history.svg
M resources/lib/oojs-ui/themes/apex/images/icons/info.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-c.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-c.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-d.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.svg
M resources/lib/oojs-ui/themes/apex/images/icons/italic-s.png
M resources/lib/oojs-ui/themes/apex/images/icons/italic-s.svg
M resources/lib/oojs-ui/themes/apex/images/icons/language.png
M resources/lib/oojs-ui/themes/apex/images/icons/language.svg
M resources/lib/oojs-ui/themes/apex/images/icons/link.svg
M resources/lib/oojs-ui/themes/apex/images/icons/lock.svg
M resources/lib/oojs-ui/themes/apex/images/icons/move-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/notice.svg
M resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.png
M resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.svg
M resources/lib/oojs-ui/themes/apex/images/icons/search.svg
M resources/lib/oojs-ui/themes/apex/images/icons/secure-link.svg
M resources/lib/oojs-ui/themes/apex/images/icons/settings.svg
M resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.png
M resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.svg
M resources/lib/oojs-ui/themes/apex/images/icons/strikethrough-s.svg
M resources/lib/oojs-ui/themes/apex/images/icons/tag.svg
M resources/lib/oojs-ui/themes/apex/images/icons/text-style.svg
M

[MediaWiki-commits] [Gerrit] Deprecate unconditional loading of mediawiki.ui.button on al... - change (mediawiki/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Deprecate unconditional loading of mediawiki.ui.button on all 
pages
..


Deprecate unconditional loading of mediawiki.ui.button on all pages

Formally deprecate the unconditional loading of mediawiki.ui.button on all
pages. During the deprecation period, the styles will be loaded on pages which
contain 'mw-ui-button' in the page HTML. Starting with 1.28, the styles will
only be loaded if explicitly depended upon.

The rationale for the patch was expressed by Spage in a comment on PS4 of
I835f3eb937: "Wikis have too many templates like
[[commons:Template:Clickable_button]] dependent on jquery.ui.button that don't
work if JavaScript isn't enabled.  mediawiki.ui.button is a lighter-weight
piece of CSS that we own and can improve, and transitioning wiki content to it
requires that we provide it." Mattflaschen commented that the added payload was
"justifiable if we announce this widely and make an effort to get wikis to use 
this."

A year and a half later, [[commons:Template:Clickable_button]] is still not
using mediawiki.ui.button, and usage elsewhere is not sufficiently widespread
to merit loading this stylesheet in the critical path.

Bug: T98395
Change-Id: I290e1db422b7c7b9c1a026aae22e174580cefae9
---
M RELEASE-NOTES-1.26
M includes/skins/SkinTemplate.php
2 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 5b85bbc..6dcf919 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -66,6 +66,10 @@
   for potentially slow POST requests that need to be as atomic as possible.
 * ResourceLoader now loads all scripts asynchronously. The top-queue and
   startup modules are no longer synchronously loaded.
+* 'mediawiki.ui.button' styles are no longer unconditionally loaded on every
+  page. During the deprecation period, the styles will only be loaded on pages
+  which contain 'mw-ui-button' in their HTML. Starting in 1.28, the styles will
+  only be loaded if explicitly required.
 
  External libraries 
 * Update es5-shim from v4.0.0 to v4.1.5.
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index a1844a8..baf9d95 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -54,12 +54,18 @@
$moduleStyles = array(
'mediawiki.legacy.shared',
'mediawiki.legacy.commonPrint',
-   'mediawiki.ui.button',
'mediawiki.sectionAnchor'
);
if ( $out->isSyndicated() ) {
$moduleStyles[] = 'mediawiki.feedlink';
}
+
+   // Deprecated since 1.26: Unconditional loading of 
mediawiki.ui.button
+   // on every page is deprecated. Express a dependency instead.
+   if ( strpos( $out->getHTML(), 'mw-ui-button' ) !== false ) {
+   $moduleStyles[] = 'mediawiki.ui.button';
+   }
+
$out->addModuleStyles( $moduleStyles );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I290e1db422b7c7b9c1a026aae22e174580cefae9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Spage 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Translate namespace name in MediaWiki:Securepoll-ns-readonly - change (mediawiki...SecurePoll)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Translate namespace name in MediaWiki:Securepoll-ns-readonly
..


Translate namespace name in MediaWiki:Securepoll-ns-readonly

Reported at
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Securepoll-ns-readonly/en

Change-Id: Id99f9625435515c5de715a0075bae250de3acd9e
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  TTO: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index e51c0f7..bdceebd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -250,7 +250,7 @@
"securepoll-votereligibility-cleared-comment": "$1 cleared.",
"right-securepoll-create-poll": "Create polls",
"action-securepoll-create-poll": "create polls",
-   "securepoll-ns-readonly": "The SecurePoll namespace is read-only",
+   "securepoll-ns-readonly": "The {{ns:SecurePoll}} namespace is 
read-only",
"apihelp-strikevote-description": "Allows admins to strike or unstrike 
a vote.",
"apihelp-strikevote-param-option": "Which action to take: strike or 
unstrike a vote.",
"apihelp-strikevote-paramvalue-option-strike": "Strike a vote (remove 
it from the count).",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id99f9625435515c5de715a0075bae250de3acd9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] build: Enforce jshint and jscs test - change (mediawiki...NavigationTiming)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: build: Enforce jshint and jscs test
..


build: Enforce jshint and jscs test

* Reduce jshint settings to those relevant in curent versions of JSHint
  (coding style is now checked by JSCS).
* Add JSCS build step (with Wikimedia preset).

Also:
* Change file header to use "/*!" instead of "/**" since this
  comment does not validate as a valid JSDuck comment block
  (errors on unknown @see and @license)

* Remove type check for window.Geo. If it's truthy, then the next
  will work fine. (Property access works on all truthy values).
  And we don't actually need it to be a plain object, upstream
  could turn it into an instance of something that provides
  compatible properties.

* After the check, use Geo without "window." prefix. Similar to what
  the code does for 'performance' and 'chrome' and justifies the entry
  for "Geo" in jshint-predef (which was previously unused).

* Enforce ES3 syntax compatibility.

* Minor fixes to satisfy Wikimedia coding style as enforced by JSCS.

Change-Id: I721864fb6b50cc0fe0752da561950d03c2c77ae1
---
A .jscsrc
M .jshintrc
M Gruntfile.js
M modules/ext.navigationTiming.js
M package.json
5 files changed, 50 insertions(+), 43 deletions(-)

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



diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..fcf4a3e
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,7 @@
+{
+   "preset": "wikimedia",
+
+   "excludeFiles": [
+   "{node_modules}/**"
+   ]
+}
diff --git a/.jshintrc b/.jshintrc
index ee816f7..94545ab 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,7 +1,6 @@
 {
"predef": [
"Geo",
-   "QUnit",
"jQuery",
"mediaWiki",
"mediaWikiLoadStart",
@@ -9,30 +8,17 @@
"chrome"
],
 
+   // Enforcing
"bitwise": true,
-   "camelcase": true,
-   "curly": true,
"eqeqeq": true,
-   "forin": false,
-   "immed": true,
+   "es3": true,
+   "freeze": true,
"latedef": true,
-   "newcap": true,
"noarg": true,
-   "noempty": true,
"nonew": true,
-   "quotmark": "single",
-   "regexp": false,
"undef": true,
"unused": true,
-   "strict": false,
-   "trailing": true,
 
-   "laxbreak": true,
-   "smarttabs": true,
-   "multistr": true,
-
-   "browser": true,
-
-   "nomen": true,
-   "onevar": true
+   // Environment
+   "browser": true
 }
diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..5784898 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,20 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [ '*.js', 'modules/**/*.js' ]
+   },
+   jscs: {
+   all: [ '*.js', 'modules/**/*.js' ]
+   },
banana: {
all: 'i18n/'
},
@@ -15,6 +26,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index 0c4c1eb..ba30dab 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -1,4 +1,4 @@
-/**
+/*!
  * JavaScript module for logging client-side latency measurements.
  * @see https://mediawiki.org/wiki/Extension:NavigationTiming
  *
@@ -27,18 +27,20 @@
function isCompliant() {
// Tests derived from 
-   var attr, current, last = 0, order = [
-   'loadEventEnd',
-   'loadEventStart',
-   'domContentLoadedEventEnd',
-   'domContentLoadedEventStart',
-   'domInteractive',
-   'responseEnd',
-   'responseStart',
-   'requestStart',
-   'connectEnd',
-   'connectStart'
-   ];
+   var attr, current,
+   last = 0,
+   order = [
+   'loadEventEnd',
+   'loadEventStart',
+

[MediaWiki-commits] [Gerrit] Naming is hard - change (labs...wikibugs2)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Naming is hard
..


Naming is hard

Change-Id: I4425820dcb9b203b6f635b591cb386c2a8a4d4ea
---
M channels.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/channels.yaml b/channels.yaml
index e62ef4a..c62ac0d 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -81,7 +81,7 @@
 # projects
 - Continuous-Integration-Infrastructure
 - Continuous-Integration-Config
-- Continuous-Integration-Isolation
+- Continuous-Integration-Scaling
 - Beta-Cluster
 - Staging
 - Deployment-Systems

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4425820dcb9b203b6f635b591cb386c2a8a4d4ea
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Greg Grossmeier 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix cancelling of extension inspectors - change (mediawiki...VisualEditor)

2015-09-01 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Fix cancelling of extension inspectors
..

Fix cancelling of extension inspectors

* Don't insert/update/remove nodes on cancel in MWExtensionInspector
* Don't forget to popStaging on cancel in MWLiveExtensionInspector

Bug: T110992
Change-Id: I1e30206595e304eb502c7e745bf5e00d145d12d7
---
M modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
M modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
2 files changed, 11 insertions(+), 6 deletions(-)


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

diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
index 9d3264f..98b7d69 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
@@ -124,12 +124,14 @@
 ve.ui.MWExtensionInspector.prototype.getTeardownProcess = function ( data ) {
return 
ve.ui.MWExtensionInspector.super.prototype.getTeardownProcess.call( this, data )
.first( function () {
-   if ( this.constructor.static.allowedEmpty || 
this.input.getInnerValue() !== '' ) {
-   this.insertOrUpdateNode();
-   } else if ( this.selectedNode && 
!this.constructor.static.allowedEmpty ) {
-   // Content has been emptied on a node which 
isn't allowed to
-   // be empty, so delete it.
-   this.removeNode();
+   if ( data && data.action === 'done' ) {
+   if ( this.constructor.static.allowedEmpty || 
this.input.getInnerValue() !== '' ) {
+   this.insertOrUpdateNode();
+   } else if ( this.selectedNode && 
!this.constructor.static.allowedEmpty ) {
+   // Content has been emptied on a node 
which isn't allowed to
+   // be empty, so delete it.
+   this.removeNode();
+   }
}
}, this );
 };
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
index 3867efa..c9a8807 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
@@ -64,6 +64,9 @@
return 
ve.ui.MWLiveExtensionInspector.super.prototype.getTeardownProcess.call( this, 
data )
.first( function () {
this.input.off( 'change', this.onChangeHandler );
+   if ( data === undefined ) { // cancel
+   this.getFragment().getSurface().popStaging();
+   }
}, this );
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e30206595e304eb502c7e745bf5e00d145d12d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Reword 'stub-threshold' message in Special:Preferences advan... - change (mediawiki/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Reword 'stub-threshold' message in Special:Preferences advanced 
section
..


Reword 'stub-threshold' message in Special:Preferences advanced section

Message changed from "Threshold for stub link formatting bytes" to
"Threshold in bytes for stub link rendering (sample)".

Also convert it to a wikitext message (not raw HTML) and improve the "qqq"
documentation.

Bug: T107732
Change-Id: I493679073b9881c98a068dede2db00b391ab8353
---
M includes/Preferences.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/includes/Preferences.php b/includes/Preferences.php
index fbb7b51..6f95952 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -751,7 +751,11 @@
'type' => 'select',
'section' => 'rendering/advancedrendering',
'options' => $stubThresholdOptions,
-   'label-raw' => $context->msg( 'stub-threshold' 
)->text(), // Raw HTML message. Yay?
+   // This is not a raw HTML message; label-raw is needed 
for the manual 
+   'label-raw' => $context->msg( 'stub-threshold' 
)->rawParams(
+   '' .
+   $context->msg( 'stub-threshold-sample-link' 
)->parse() .
+   '' )->parse(),
);
 
$defaultPreferences['showhiddencats'] = array(
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 681d63e..7703f7b 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -975,7 +975,8 @@
"rows": "Rows:",
"columns": "Columns:",
"searchresultshead": "Search",
-   "stub-threshold": "Threshold for stub 
link formatting (bytes):",
+   "stub-threshold": "Threshold for stub link formatting ($1):",
+   "stub-threshold-sample-link": "sample",
"stub-threshold-disabled": "Disabled",
"recentchangesdays": "Days to show in recent changes:",
"recentchangesdays-max": "Maximum $1 {{PLURAL:$1|day|days}}",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e011dd7..a983bba 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1146,7 +1146,8 @@
"rows": "Used on [[Special:Preferences]], \"Editing\" section in the 
\"Size of editing window\" fieldset.\n{{Identical|Row}}",
"columns": "Used on [[Special:Preferences]], \"Editing\" section in the 
\"Size of editing window\" fieldset.\n{{Identical|Column}}",
"searchresultshead": "Replaced by {{msg-mw|prefs-searchoptions}}, 
though may still be used in some extensions. 
DEPRECATED.\n\n{{Identical|Search}}",
-   "stub-threshold": "Used in [[Special:Preferences]], tab \"Misc\".",
+   "stub-threshold": "Used in [[Special:Preferences]], \"Advanced 
options\" section. The setting allows the user to select a threshold value, in 
bytes, from a predefined list of options. Any links that lead to pages smaller 
than the threshold (\"stub links\") will be styled 
differently.\n\nParameters:\n* $1: the text of 
{{msg-mw|stub-threshold-sample-link}}, styled as a stub link",
+   "stub-threshold-sample-link": "Passed as a parameter to the 
{{msg-mw|stub-threshold}} message.",
"stub-threshold-disabled": "Used in 
[[Special:Preferences]].\n{{Identical|Disabled}}",
"recentchangesdays": "Used in [[Special:Preferences]], tab \"Recent 
changes\".",
"recentchangesdays-max": "Shown as hint in [[Special:Preferences]], tab 
\"Recent changes\". Parameters:\n* $1 - number of days\nSee also:\n* 
{{msg-mw|Prefs-watchlist-days-max}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I493679073b9881c98a068dede2db00b391ab8353
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Devirk 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add a confirmation dialog for canceling edits - change (mediawiki...Flow)

2015-09-01 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Add a confirmation dialog for canceling edits
..

Add a confirmation dialog for canceling edits

Pop up a confirmation dialog when the user tries to cancel an
edit with changes.

Bug: T15
Change-Id: Ib2977892e413468262c2be76e89678aad4737ecd
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/flow-initialize.js
A modules/flow/ui/mw.flow.ui.CancelConfirmDialog.js
A modules/flow/ui/mw.flow.ui.Overlay.js
M modules/flow/ui/mw.flow.ui.js
M modules/flow/ui/widgets/editor/editors/mw.flow.ui.AbstractEditorWidget.js
M modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js
M modules/flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
A modules/styles/flow/mw.flow.ui.Overlay.less
13 files changed, 168 insertions(+), 4 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index cb3930b..76f63ad 100644
--- a/Resources.php
+++ b/Resources.php
@@ -375,6 +375,8 @@
'ext.flow.ui' => $flowResourceTemplate + array(
'scripts' => array(
'flow/ui/mw.flow.ui.js',
+   'flow/ui/mw.flow.ui.Overlay.js',
+   'flow/ui/mw.flow.ui.CancelConfirmDialog.js',
'flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js',
'flow/ui/widgets/mw.flow.ui.ToCWidget.js',
'flow/ui/widgets/mw.flow.ui.ReorderTopicsWidget.js',
@@ -395,6 +397,7 @@
),
'styles' => array(
'styles/flow/mw.flow.ui.less',
+   'styles/flow/mw.flow.ui.Overlay.less',
'styles/flow/widgets/mw.flow.ui.NavigationWidget.less',

'styles/flow/widgets/mw.flow.ui.TopicMenuSelectWidget.less',

'styles/flow/widgets/mw.flow.ui.ReorderTopicsWidget.less',
@@ -411,6 +414,10 @@
'messages' => array(
'flow-error-parsoid-failure',
'flow-error-default',
+   'flow-dialog-cancelconfirm-title',
+   'flow-dialog-cancelconfirm-message',
+   'flow-dialog-cancelconfirm-keep',
+   'flow-dialog-cancelconfirm-discard',
),
'dependencies' => array (
'oojs-ui',
diff --git a/i18n/en.json b/i18n/en.json
index 5af2b4b..31678cd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -557,5 +557,9 @@
"flow-mark-revision-patrolled-link-title": "Mark this page as 
patrolled",
"flow-mark-diff-patrolled-link-text": "Mark as patrolled",
"flow-mark-diff-patrolled-link-title": "Mark as patrolled",
+   "flow-dialog-cancelconfirm-title": "Are you sure?",
+   "flow-dialog-cancelconfirm-message": "Are you sure you want to cancel 
without saving first?",
+   "flow-dialog-cancelconfirm-keep": "Continue editing",
+   "flow-dialog-cancelconfirm-discard": "Discard changes",
"flow-description-last-modified-at": "This description was last 
modified on $1, at $2."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6bcd486..106df87 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -564,5 +564,9 @@
"flow-mark-revision-patrolled-link-title": "Title of the link to mark a 
revision as patrolled on a revision page.",
"flow-mark-diff-patrolled-link-text": "Text of the link to mark a 
revision as patrolled on a diff page.\n{{Identical|Mark as patrolled}}",
"flow-mark-diff-patrolled-link-title": "Title of the link to mark a 
revision as patrolled on a diff page.\n{{Identical|Mark as patrolled}}",
+   "flow-dialog-cancelconfirm-title": "Title of the dialog that appears 
when the user cancels an edit and verifies whether the user wants to discard 
their edits or continue editing.",
+   "flow-dialog-cancelconfirm-message": "Title of the dialog that appears 
when the user cancels an edit, asking the user if they are sure they wants to 
discard their edits or continue editing.",
+   "flow-dialog-cancelconfirm-keep": "Title for the keep option in the 
dialog that appears when the user cancels an edit.",
+   "flow-dialog-cancelconfirm-discard": "Title for the discard option in 
the dialog that appears when the user cancels an edit.",
"flow-description-last-modified-at": "Timestamp line stating when 
description was modified. See also {{msg-mw|lastmodifiedat}}.  Parameters:\n* 
$1 - Date\n* $2 - Time"
 }
diff --git a/modules/flow-initialize.js b/modules/flow-initialize.js
index 677403e..8d599b9 100644
--- a/modules/flow-initialize.js
+++

[MediaWiki-commits] [Gerrit] Implement Sanitizer's escapeId - change (mediawiki...parsoid)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Implement Sanitizer's escapeId
..


Implement Sanitizer's escapeId

 * Will be useful if/when we generate meta tags with munged ids.

 * Moves some utilities from the Sanitizer's prototype to the constructor
   for use without instantiation.  Necessary for a follow up patch I'm
   working on.

Change-Id: I8758a7af37788a93d2326c7930bb82b9ad138f27
---
M lib/ext.core.Sanitizer.js
M lib/mediawiki.Util.js
2 files changed, 37 insertions(+), 19 deletions(-)

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



diff --git a/lib/ext.core.Sanitizer.js b/lib/ext.core.Sanitizer.js
index 08e952b..06cc10c 100644
--- a/lib/ext.core.Sanitizer.js
+++ b/lib/ext.core.Sanitizer.js
@@ -810,12 +810,11 @@
  *
  * gwicke: Use Util.decodeEntities instead?
  */
-Sanitizer.prototype.decodeEntity = function(name) {
-   if (this.constants.htmlEntityAliases[name]) {
-   name = this.constants.htmlEntityAliases[name];
+Sanitizer.decodeEntity = function(name) {
+   if (SanitizerConstants.htmlEntityAliases[name]) {
+   name = SanitizerConstants.htmlEntityAliases[name];
}
-
-   var e = this.constants.htmlEntities[name];
+   var e = SanitizerConstants.htmlEntities[name];
return e ? Util.codepointToUtf8(e) : "&" + name + ";";
 };
 
@@ -823,11 +822,11 @@
  * Return UTF-8 string for a codepoint if that is a valid
  * character reference, otherwise U+FFFD REPLACEMENT CHARACTER.
  */
-Sanitizer.prototype.decodeChar = function(codepoint) {
+Sanitizer.decodeChar = function(codepoint) {
if (Util.validateCodepoint(codepoint)) {
return Util.codepointToUtf8(codepoint);
} else {
-   return this.constants.UTF8_REPLACEMENT;
+   return SanitizerConstants.UTF8_REPLACEMENT;
}
 };
 
@@ -835,15 +834,14 @@
  * Decode any character references, numeric or named entities,
  * in the text and return a UTF-8 string.
  */
-Sanitizer.prototype.decodeCharReferences = function(text) {
-   var sanitizer = this;
-   return text.replace(sanitizer.constants.CHAR_REFS_RE, function() {
+Sanitizer.decodeCharReferences = function(text) {
+   return text.replace(SanitizerConstants.CHAR_REFS_RE, function() {
if (arguments[1]) {
-   return sanitizer.decodeEntity(arguments[1]);
+   return Sanitizer.decodeEntity(arguments[1]);
} else if (arguments[2]) {
-   return sanitizer.decodeChar(parseInt(arguments[2], 10));
+   return Sanitizer.decodeChar(parseInt(arguments[2], 10));
} else if (arguments[3]) {
-   return sanitizer.decodeChar(parseInt(arguments[3], 16));
+   return Sanitizer.decodeChar(parseInt(arguments[3], 16));
} else {
return arguments[4];
}
@@ -873,7 +871,7 @@
}
 
// Decode character references like 
-   text = this.decodeCharReferences(text);
+   text = Sanitizer.decodeCharReferences(text);
text = text.replace(this.constants.cssDecodeRE, function() {
var c;
if (arguments[1] !== undefined) {
@@ -940,8 +938,23 @@
return text;
 };
 
-Sanitizer.prototype.escapeId = function(id, options) {
-   // SSS: Not ported -- is this relevant for security?
+Sanitizer.escapeId = function(id, options) {
+   options = options || {};
+
+   id = Sanitizer.decodeCharReferences(id);
+
+   // Assume $wgExperimentalHtmlIds is `false` for now.
+
+   id = id.replace(/ /g, '_');
+   id = Util.urlencode(id);
+   id = id.replace(/%3A/g, ':');
+   id = id.replace(/%/g, '.');
+
+   if (!/^[a-zA-Z]/.test(id) && !options.hasOwnProperty('noninitial')) {
+   // Initial character must be a letter!
+   id = 'x' + id;
+   }
+
return id;
 };
 
@@ -1019,9 +1032,9 @@
v = this.checkCss(v);
}
 
-   if (k === 'id') {
-   v = this.escapeId(v, ['noninitial']);
-   }
+   // if (k === 'id') {
+   //  v = Sanitizer.escapeId(v, { 'noninitial': true });
+   // }
 
// RDFa and microdata properties allow URLs, URIs and/or CURIs.
// Check them for sanity
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index 8946ab9..f93c331 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -1031,6 +1031,11 @@
return num + '';
},
 
+   // php's urlencode
+   urlencode: function(txt) {
+   return encodeURIComponent(txt).replace(/%20/g, '+');
+   },
+
decodeURI: function(s) {
return

[MediaWiki-commits] [Gerrit] Make ve.ui.Sequence#execute return false if the command is m... - change (VisualEditor/VisualEditor)

2015-09-01 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Make ve.ui.Sequence#execute return false if the command is 
missing
..

Make ve.ui.Sequence#execute return false if the command is missing

Bug: T106060
Change-Id: If4b466865f12a6b256c85b9a23d29a51c5125910
---
M src/ui/ve.ui.Sequence.js
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/87/235387/1

diff --git a/src/ui/ve.ui.Sequence.js b/src/ui/ve.ui.Sequence.js
index 9721fc4..fe3f428 100644
--- a/src/ui/ve.ui.Sequence.js
+++ b/src/ui/ve.ui.Sequence.js
@@ -64,7 +64,6 @@
  *
  * @param {ve.ui.Surface} surface surface
  * @return {boolean} The command executed
- * @throws {Error} Command not found
  */
 ve.ui.Sequence.prototype.execute = function ( surface, range ) {
var stripRange, executed, stripFragment, selection,
@@ -72,7 +71,7 @@
command = ve.init.target.commandRegistry.lookup( 
this.getCommandName() );
 
if ( !command ) {
-   throw new Error( 'Command not found: ' + this.getCommandName() 
) ;
+   return false;
}
 
if ( this.strip ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4b466865f12a6b256c85b9a23d29a51c5125910
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Consolidate test to determine if separator introduced SOL - change (mediawiki...parsoid)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Consolidate test to determine if separator introduced SOL
..


Consolidate test to determine if separator introduced SOL

 * It needs to make sure that the new line is just comments and
   whitespace.  makeSepIndentPreSafe was tripping it up by adding
   nowikis, yet returning to SOL state.

 * Small cleanup to serializeChildren initiation.

 * Dedup the match used to pop the separators from not entirely
   whitespace nodes in handleSeparatorText.

Change-Id: I5592ce2709cd3f30defd2377debb1f5e3de1f897
---
M lib/wts.SerializerState.js
M lib/wts.separators.js
2 files changed, 24 insertions(+), 31 deletions(-)

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



diff --git a/lib/wts.SerializerState.js b/lib/wts.SerializerState.js
index baf7af7..b88853d 100644
--- a/lib/wts.SerializerState.js
+++ b/lib/wts.SerializerState.js
@@ -163,15 +163,14 @@
 SSP.serializeChildren = function(node, chunkCB, wtEscaper) {
try {
// TODO gwicke: use nested WikitextSerializer instead?
-   var oldSep = this.sep;
-   var children = node.childNodes;
-   var child = children[0];
-   var nextChild;
 
// SSS FIXME: Unsure if this is the right thing always
if (wtEscaper) {
this.wteHandlerStack.push(wtEscaper);
}
+
+   var child = node.firstChild;
+   var nextChild = null;
 
while (child) {
nextChild = this.serializer._serializeNode(child, this, 
chunkCB);
@@ -214,6 +213,17 @@
 };
 
 /**
+ * Separators put us in SOL state.
+ */
+SSP.sepIntroducedSOL = function(sep) {
+   // Don't get tripped by newlines in comments!  Be wary of nowikis added
+   // by makeSepIndentPreSafe on the last line.
+   if (sep.replace(Util.COMMENT_REGEXP_G, '').search(/\n\s*$/) !== -1) {
+   this.onSOL = true;
+   }
+};
+
+/**
  */
 SSP.emitSep = function(sep, node, cb, debugPrefix) {
// Replace newlines if we're in a single-line context
@@ -225,10 +235,7 @@
 
// Reset separator state
this.sep = {};
-   // Don't get tripped by newlines in comments!
-   if (sep && sep.replace(Util.COMMENT_REGEXP_G, '').search(/\n/) !== -1) {
-   this.onSOL = true;
-   }
+   this.sepIntroducedSOL(sep || '');
 
this.env.log(this.serializer.logType,
"--->", debugPrefix,
diff --git a/lib/wts.separators.js b/lib/wts.separators.js
index f1fdbcb..31353cf 100644
--- a/lib/wts.separators.js
+++ b/lib/wts.separators.js
@@ -151,33 +151,19 @@
if (node.nodeValue.match(/^\s*$/)) {
state.sep.src = (state.sep.src || '') + node.nodeValue;
 
-   // Same caveat about onSOL and  nodes (see 
WSP._serializeTextNode)
-   // applies here as well.
-   //
-   // Since all whitespace is buffered as separator text,
-   // WTS is still in SOL state here.
-   if (state.sep.src.match(/\n/)) {
-   state.onSOL = true;
-   }
+   // Same caveat about onSOL and  nodes
+   // (see WSP._serializeTextNode) applies here as well.
+   state.sepIntroducedSOL(state.sep.src);
 
-   // if (!state.sep.lastSourceNode) {
-   //  // FIXME: Actually set lastSourceNode when the 
source is
-   //  // emitted / buildAndEmitSep is called!
-   //  state.sep.lastSourceNode = node.previousSibling 
|| node.parentNode;
-   // }
return true;
} else {
-   if (node.nodeValue.match(/^[ \t]*\n+\s*/)) {
-   state.sep.src = (state.sep.src || '') + 
node.nodeValue.match(/^[ \t]*\n+\s*/)[0];
+   var match = node.nodeValue.match(/^[ \t]*\n+\s*/);
+   if (match) {
+   state.sep.src = (state.sep.src || '') + 
match[0];
 
-   // Same caveat about onSOL and  nodes (see 
WSP._serializeTextNode)
-   // applies here as well.
-   state.onSOL = true;
-   // if (!state.sep.lastSourceNode) {
-   //  // FIXME: Actually set lastSourceNode 
when the source is
-   //  // emitted / buildAndEmitSep is called!
-   //  state.sep.lastSourceNode = 
node.previousSibling || node.parentNode;
-   // }
+   //

[MediaWiki-commits] [Gerrit] Convert SpecialItemDisambiguation to HTMLForm - change (mediawiki...Wikibase)

2015-09-01 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Convert SpecialItemDisambiguation to HTMLForm
..

Convert SpecialItemDisambiguation to HTMLForm

Bug: T48248
Change-Id: I8d7cfc9d1d13cfd07b05812399571fafc13398c5
---
M repo/includes/specials/SpecialItemDisambiguation.php
1 file changed, 38 insertions(+), 61 deletions(-)


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

diff --git a/repo/includes/specials/SpecialItemDisambiguation.php 
b/repo/includes/specials/SpecialItemDisambiguation.php
index dca4a8a..2d6aaab 100644
--- a/repo/includes/specials/SpecialItemDisambiguation.php
+++ b/repo/includes/specials/SpecialItemDisambiguation.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Repo\Specials;
 
+use HTMLForm;
 use Html;
 use Language;
 use Wikibase\ItemDisambiguation;
@@ -192,71 +193,47 @@
private function switchForm( $languageCode, $label ) {
$this->getOutput()->addModules( 
'wikibase.special.languageSuggester' );
 
-   $this->getOutput()->addHTML(
-   Html::openElement(
-   'form',
-   array(
-   'method' => 'get',
-   'action' => 
$this->getPageTitle()->getFullUrl(),
-   'name' => 'itemdisambiguation',
-   'id' => 'wb-itemdisambiguation-form1'
-   )
+   $formDescriptor = array(
+   'language' => array(
+   'name' => 'language',
+   'default' => $languageCode ?: '',
+   'type' => 'text',
+   'id' => 'wb-itemdisambiguation-languagename',
+   'size' => 12,
+   'cssclass' => 'wb-input-text 
wb-language-suggester',
+   'label-message' => 
'wikibase-itemdisambiguation-lookup-language'
+   ),
+   'label' => array(
+   'name' => 'label',
+   'default' => $label ?: '',
+   'type' => 'text',
+   'id' => 'labelname',
+   'size' => 36,
+   'cssclass' => 'wb-input-text',
+   'autofocus',
+   'label-message' => 
'wikibase-itemdisambiguation-lookup-label'
+   ),
+   'submit' => array(
+   'name' => 'submit',
+   'default' => $this->msg( 
'wikibase-itemdisambiguation-submit' )->text(),
+   'type' => 'submit',
+   'id' => 'wb-itembytitle-submit',
+   'cssclass' => 'wb-input-button'
)
-   . Html::openElement( 'fieldset' )
-   . Html::element(
-   'legend',
-   array(),
-   $this->msg( 
'wikibase-itemdisambiguation-lookup-fieldset' )->text()
-   )
-   . Html::element(
-   'label',
-   array( 'for' => 
'wb-itemdisambiguation-languagename' ),
-   $this->msg( 
'wikibase-itemdisambiguation-lookup-language' )->text()
-   )
-   . Html::input(
-   'language',
-   $languageCode ?: '',
-   'text',
-   array(
-   'id' => 
'wb-itemdisambiguation-languagename',
-   'size' => 12,
-   'class' => 'wb-input-text 
wb-language-suggester'
-   )
-   )
-   . ' '
-   . Html::element(
-   'label',
-   array( 'for' => 'labelname' ),
-   $this->msg( 
'wikibase-itemdisambiguation-lookup-label' )->text()
-   )
-   . Html::input(
-   'label',
-   $label ?: '',
-   'text',
-   array(
-   'id' => 'labelname',
-   'size' => 36,
-   'class' => 'wb-input-text',
-

[MediaWiki-commits] [Gerrit] elasticsearch: exclude 1001 from ferm for now - change (operations/puppet)

2015-09-01 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: elasticsearch: exclude 1001 from ferm for now
..


elasticsearch: exclude 1001 from ferm for now

Applying ferm to the master node in the cluster
created instability and I am excluding for now
to leave overnight for more investigation.

Change-Id: I4c1e19e66eef568afc83234b39db7d606d1946d3
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a3c1606..2ffd3dd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,7 +847,9 @@
 node /^elastic10[0-3][0-9]\.eqiad\.wmnet/ {
 
 role elasticsearch::server
-include base::firewall
+if $::hostname =~ /^elastic10(0[2-9]|1[0-9]|2[0-9]|3[0-1])$/ {
+include base::firewall
+}
 }
 
 # erbium is a webrequest udp2log host

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2462889..471df53 - change (mediawiki/extensions)

2015-09-01 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 2462889..471df53
..


Syncronize VisualEditor: 2462889..471df53

Change-Id: Ia2d36f655be494ef539a51591b7e1bf5782a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 2462889..471df53 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2462889843c5843236345b6bc2f658b2ccba6c02
+Subproject commit 471df53aaf8f3da9d8e9d062acd6053815b65852

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2d36f655be494ef539a51591b7e1bf5782a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2462889..471df53 - change (mediawiki/extensions)

2015-09-01 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 2462889..471df53
..

Syncronize VisualEditor: 2462889..471df53

Change-Id: Ia2d36f655be494ef539a51591b7e1bf5782a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 2462889..471df53 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2462889843c5843236345b6bc2f658b2ccba6c02
+Subproject commit 471df53aaf8f3da9d8e9d062acd6053815b65852

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2d36f655be494ef539a51591b7e1bf5782a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Follow composer.lock - change (wikimedia...vendor)

2015-09-01 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Follow composer.lock
..


Follow composer.lock

Change-Id: I4cecb6d850fd7c6a4f00985fb4be7e3e5cc35467
---
A coderkungfu/php-queue/.gitreview
M composer/autoload_classmap.php
M composer/installed.json
M wikimedia/donation-interface/gateway_common/FinalStatus.php
M wikimedia/donation-interface/gateway_common/PaymentResult.php
M wikimedia/donation-interface/gateway_common/PaymentTransactionResponse.php
M wikimedia/donation-interface/gateway_common/gateway.adapter.php
M wikimedia/donation-interface/gateway_common/i18n/interface/et.json
M wikimedia/donation-interface/gateway_common/i18n/interface/ko.json
M wikimedia/donation-interface/gateway_common/i18n/interface/qqq.json
M wikimedia/donation-interface/gateway_common/i18n/interface/sah.json
M wikimedia/donation-interface/gateway_common/i18n/interface/tt-cyrl.json
M wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
A wikimedia/donation-interface/globalcollect_gateway/scripts/refund.php
M wikimedia/donation-interface/tests/Adapter/Worldpay/WorldpayTest.php
15 files changed, 560 insertions(+), 245 deletions(-)

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



diff --git a/coderkungfu/php-queue/.gitreview b/coderkungfu/php-queue/.gitreview
new file mode 100644
index 000..ffb389a
--- /dev/null
+++ b/coderkungfu/php-queue/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=wikimedia/fundraising/php-queue.git
+defaultbranch=master
+defaultrebase=0
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index aeb8b25..1ca0e38 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -29,6 +29,7 @@
 'GlobalCollectGatewayResult' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/globalcollect_resultswitcher.body.php',
 'GlobalCollectOrphanAdapter' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/orphan.adapter.php',
 'GlobalCollectOrphanRectifier' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/GlobalCollectOrphanRectifier.php',
+'GlobalCollectRefundMaintenance' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/scripts/refund.php',
 'LCRun3' => $vendorDir . '/zordius/lightncandy/src/lightncandy.php',
 'LightnCandy' => $vendorDir . '/zordius/lightncandy/src/lightncandy.php',
 'LogPrefixProvider' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/gateway.adapter.php',
diff --git a/composer/installed.json b/composer/installed.json
index 362878c..3a77b7b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -418,6 +418,104 @@
 ]
 },
 {
+"name": "zordius/lightncandy",
+"version": "v0.18",
+"version_normalized": "0.18.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/zordius/lightncandy.git;,
+"reference": "24be6909c37391f4648ce1fdf19036b11bd56d05"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/zordius/lightncandy/zipball/24be6909c37391f4648ce1fdf19036b11bd56d05;,
+"reference": "24be6909c37391f4648ce1fdf19036b11bd56d05",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"require-dev": {
+"phpunit/phpunit": "4.0.17"
+},
+"time": "2015-01-01 04:37:19",
+"type": "library",
+"installation-source": "dist",
+"autoload": {
+"classmap": [
+"src/lightncandy.php"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Zordius Chen",
+"email": "zord...@yahoo-inc.com"
+}
+],
+"description": "An extremely fast PHP implementation of handlebars ( 
http://handlebarsjs.com/ ) and mustache ( http://mustache.github.io/ ).",
+"homepage": "https://github.com/zordius/lightncandy;,
+"keywords": [
+"handlebars",
+"logicless",
+"mustache",
+"php",
+"template"
+]
+},
+{
+"name": "wikimedia/smash-pig",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
+"reference": "955d5147b36a2f6bbfdd9aaf35fa5539d016c89b"
+},
+"require": {
+"fusesource/stomp-php": "2.*",
+"php": ">=5.3.3",
+"phpmailer/phpmailer": "5.2.6",
+"symfony/event-dispatcher": ">=2.1,<2.4-dev",
+

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46786f9bb6ae5f69a60f8f76a92d4b0df75a5704
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update vendor libs - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Update vendor libs
..


Update vendor libs

Change-Id: I8e585d7ec5625f3d352d344a0d01b95434df
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/vendor b/vendor
index bcf6e4f..7d97e12 16
--- a/vendor
+++ b/vendor
-Subproject commit bcf6e4f3a1ec517e07963d6a9195f772df745934
+Subproject commit 7d97e129935a6f71ede905010cba4d72832e9301

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e585d7ec5625f3d352d344a0d01b95434df
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
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] Exit early from parse.js if selsering w/o source - change (mediawiki...parsoid)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Exit early from parse.js if selsering w/o source
..


Exit early from parse.js if selsering w/o source

Change-Id: I356649bff7e62997298c8cb454c13a2fa698d8cc
---
M tests/parse.js
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/tests/parse.js b/tests/parse.js
index f014900..de63f16 100755
--- a/tests/parse.js
+++ b/tests/parse.js
@@ -73,7 +73,7 @@
'oldtext': {
description: 'The old page text for a selective-serialization 
(see --selser)',
'boolean': false,
-   'default': false,
+   'default': null,
},
'oldtextfile': {
description: 'File containing the old page text for a 
selective-serialization (see --selser)',
@@ -231,6 +231,11 @@
env.setPageSrcInfo(argv.oldtext || null);
}
 
+   if (argv.selser && argv.oldtext === null) {
+   throw new Error('Please provide original wikitext ' +
+   '(--oldtext or --oldtextfile). Selser requires 
that.');
+   }
+
if (typeof (input) === 'string') {
return { env: env, input: input };
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I356649bff7e62997298c8cb454c13a2fa698d8cc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Exit early from parse.js if selsering w/o source - change (mediawiki...parsoid)

2015-09-01 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Exit early from parse.js if selsering w/o source
..

Exit early from parse.js if selsering w/o source

Change-Id: I356649bff7e62997298c8cb454c13a2fa698d8cc
---
M tests/parse.js
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/tests/parse.js b/tests/parse.js
index f014900..bc174db 100755
--- a/tests/parse.js
+++ b/tests/parse.js
@@ -73,7 +73,7 @@
'oldtext': {
description: 'The old page text for a selective-serialization 
(see --selser)',
'boolean': false,
-   'default': false,
+   'default': null,
},
'oldtextfile': {
description: 'File containing the old page text for a 
selective-serialization (see --selser)',
@@ -231,6 +231,10 @@
env.setPageSrcInfo(argv.oldtext || null);
}
 
+   if (argv.selser && argv.oldtext === null) {
+   throw new Error('You probably meant to supply the 
source to selser.');
+   }
+
if (typeof (input) === 'string') {
return { env: env, input: input };
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I356649bff7e62997298c8cb454c13a2fa698d8cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] elasticsearch: exclude 1001 from ferm for now - change (operations/puppet)

2015-09-01 Thread Rush (Code Review)

Rush has uploaded a new change for review.

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

Change subject: elasticsearch: exclude 1001 from ferm for now
..

elasticsearch: exclude 1001 from ferm for now

Applying ferm to the master node in the cluster
created instability and I am excluding for now
to leave overnight for more investigation.

Change-Id: I4c1e19e66eef568afc83234b39db7d606d1946d3
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/235348/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a3c1606..2ffd3dd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,7 +847,9 @@
 node /^elastic10[0-3][0-9]\.eqiad\.wmnet/ {
 
 role elasticsearch::server
-include base::firewall
+if $::hostname =~ /^elastic10(0[2-9]|1[0-9]|2[0-9]|3[0-1])$/ {
+include base::firewall
+}
 }
 
 # erbium is a webrequest udp2log host

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

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

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

[MediaWiki-commits] [Gerrit] Remove 'last modified' message from the description - change (mediawiki...Flow)

2015-09-01 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Remove 'last modified' message from the description
..

Remove 'last modified' message from the description

Bug: T110082
Change-Id: I75d2960799512ccb03f916d57c6665d2d6b582ae
---
M Resources.php
M handlebars/compiled/flow_block_header.handlebars.php
M handlebars/flow_header_footer.partial.handlebars
M i18n/en.json
M i18n/qqq.json
5 files changed, 5 insertions(+), 17 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index cb3930b..5fbb99a 100644
--- a/Resources.php
+++ b/Resources.php
@@ -240,7 +240,6 @@
// Timestamps
'flow-edited',
'flow-edited-by',
-   'flow-description-last-modified-at',
// Board header
"flow-board-header-browse-topics-link",
// editor switching
diff --git a/handlebars/compiled/flow_block_header.handlebars.php 
b/handlebars/compiled/flow_block_header.handlebars.php
index 686f174..7995af2 100644
--- a/handlebars/compiled/flow_block_header.handlebars.php
+++ b/handlebars/compiled/flow_block_header.handlebars.php
@@ -64,14 +64,11 @@
 '.$sp.'
 ';},'flow_header_footer' => function ($cx, $in, $sp) {return ''.$sp.'
 '.$sp.'  
-'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['revision']['dateFormats']) && 
is_array($in['revision'])) ? $in['revision']['dateFormats'] : null))) ? '
-'.$sp.'  '.LCRun3::ch($cx, 'l10n', 
array(array('flow-description-last-modified-at',((isset($in['revision']['dateFormats']['date'])
 && is_array($in['revision']['dateFormats'])) ? 
$in['revision']['dateFormats']['date'] : 
null),((isset($in['revision']['dateFormats']['time']) && 
is_array($in['revision']['dateFormats'])) ? 
$in['revision']['dateFormats']['time'] : null)),array()), 'encq').'
-'.$sp.'
-'.$sp.'' : '').'
 '.$sp.'  
 '.$sp.''.LCRun3::ch($cx, 'html', 
array(array(((isset($in['copyrightMessage']) && is_array($in)) ? 
$in['copyrightMessage'] : null)),array()), 'encq').'
 '.$sp.'  
-'.$sp.'';},),
+'.$sp.'
+';},),
 'scopes' => array(),
 'sp_vars' => array('root' => $in),
 'lcrun' => 'LCRun3',
diff --git a/handlebars/flow_header_footer.partial.handlebars 
b/handlebars/flow_header_footer.partial.handlebars
index c60cd8e..609340d 100644
--- a/handlebars/flow_header_footer.partial.handlebars
+++ b/handlebars/flow_header_footer.partial.handlebars
@@ -1,12 +1,6 @@
 
   
-  {{#if revision.dateFormats}}
-
-  {{l10n "flow-description-last-modified-at" revision.dateFormats.date 
revision.dateFormats.time}}
-
-  {{/if}}
-
   
 {{html copyrightMessage}}
   
-
\ No newline at end of file
+
diff --git a/i18n/en.json b/i18n/en.json
index 5af2b4b..cb7a8f7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -556,6 +556,5 @@
"flow-mark-revision-patrolled-link-text": "Mark this page as patrolled",
"flow-mark-revision-patrolled-link-title": "Mark this page as 
patrolled",
"flow-mark-diff-patrolled-link-text": "Mark as patrolled",
-   "flow-mark-diff-patrolled-link-title": "Mark as patrolled",
-   "flow-description-last-modified-at": "This description was last 
modified on $1, at $2."
+   "flow-mark-diff-patrolled-link-title": "Mark as patrolled"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6bcd486..80706ee 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -563,6 +563,5 @@
"flow-mark-revision-patrolled-link-text": "Text of the link to mark a 
revision as patrolled on a revision page.",
"flow-mark-revision-patrolled-link-title": "Title of the link to mark a 
revision as patrolled on a revision page.",
"flow-mark-diff-patrolled-link-text": "Text of the link to mark a 
revision as patrolled on a diff page.\n{{Identical|Mark as patrolled}}",
-   "flow-mark-diff-patrolled-link-title": "Title of the link to mark a 
revision as patrolled on a diff page.\n{{Identical|Mark as patrolled}}",
-   "flow-description-last-modified-at": "Timestamp line stating when 
description was modified. See also {{msg-mw|lastmodifiedat}}.  Parameters:\n* 
$1 - Date\n* $2 - Time"
+   "flow-mark-diff-patrolled-link-title": "Title of the link to mark a 
revision as patrolled on a diff page.\n{{Identical|Mark as patrolled}}"
 }

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

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

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

[MediaWiki-commits] [Gerrit] remove ##wmt, cannot join - change (labs...grrrit)

2015-09-01 Thread Merlijn van Deen (Code Review)

Merlijn van Deen has uploaded a new change for review.

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

Change subject: remove ##wmt, cannot join
..

remove ##wmt, cannot join

Change-Id: I5a60ab4870aacd48c850dd890de637edcb796db7
---
M config.yaml
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/56/235356/1

diff --git a/config.yaml b/config.yaml
index 43121ba..1849044 100644
--- a/config.yaml
+++ b/config.yaml
@@ -159,8 +159,6 @@
 "#wikipedia-en-ambassadors":
 mediawiki/extensions/Campaigns:
 mediawiki/extensions/EducationProgram:
-"##wmt":
-labs/tools/WMT:
 "#brickimedia":
 mediawiki/extensions/MediaWikiChat:
 "#wikimedia-services":

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a60ab4870aacd48c850dd890de637edcb796db7
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen 

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

[MediaWiki-commits] [Gerrit] Naming is hard - change (labs...wikibugs2)

2015-09-01 Thread Greg Grossmeier (Code Review)

Greg Grossmeier has uploaded a new change for review.

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

Change subject: Naming is hard
..

Naming is hard

Change-Id: I4425820dcb9b203b6f635b591cb386c2a8a4d4ea
---
M channels.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/57/235357/1

diff --git a/channels.yaml b/channels.yaml
index e62ef4a..c62ac0d 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -81,7 +81,7 @@
 # projects
 - Continuous-Integration-Infrastructure
 - Continuous-Integration-Config
-- Continuous-Integration-Isolation
+- Continuous-Integration-Scaling
 - Beta-Cluster
 - Staging
 - Deployment-Systems

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4425820dcb9b203b6f635b591cb386c2a8a4d4ea
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Greg Grossmeier 

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

[MediaWiki-commits] [Gerrit] Don't set wgEchoBundleEmailInterval if it won't work - change (operations/mediawiki-config)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Don't set wgEchoBundleEmailInterval if it won't work
..


Don't set wgEchoBundleEmailInterval if it won't work

This needs to remain set to 0 when the job queue has no delay support
(it's only supported by the cluster's redis job queue)

Bug: T110985
Change-Id: I459c1c124bd3f0a7dadc3dbbb40d5be3279f58e3
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1e5e8cc..a79d7ca 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2440,7 +2440,9 @@
 
$wgEchoEnableEmailBatch = $wmgEchoEnableEmailBatch;
$wgEchoEmailFooterAddress = $wmgEchoEmailFooterAddress;
-   $wgEchoBundleEmailInterval = $wmgEchoBundleEmailInterval;
+   if ( $wmgUseClusterJobqueue ) {
+   $wgEchoBundleEmailInterval = $wmgEchoBundleEmailInterval;
+   }
$wgEchoHelpPage = $wmgEchoHelpPage;
$wgEchoNotificationIcons['site']['url'] = 
$wmgEchoSiteNotificationIconUrl;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I459c1c124bd3f0a7dadc3dbbb40d5be3279f58e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Rewrite sitemap.wikimedia.org to dumps.wikimedia.org - change (operations/puppet)

2015-09-01 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Rewrite sitemap.wikimedia.org to dumps.wikimedia.org
..


Rewrite sitemap.wikimedia.org to dumps.wikimedia.org

The DNS change is in I086cf78.

Bug: T110511
Change-Id: I6e2436428be403e8f73ea22ef0ce13759c3ab74e
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 5a6a2fb..de8cd15 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -369,6 +369,7 @@
ServerAlias svn.mediawiki.org
ServerAlias download.wikimedia.org
ServerAlias download.wikipedia.org
+   ServerAlias sitemap.wikimedia.org
 
# allow caching for redirects

@@ -935,6 +936,9 @@
# rewrite   download.wikipedia.org  https://dumps.wikimedia.org
RewriteCond %{HTTP_HOST} =download.wikipedia.org
RewriteRule ^[^\x00-\x1F]* https://dumps.wikimedia.org$0 [R=301,L,NE]
+   # rewrite   sitemap.wikimedia.org   https://dumps.wikimedia.org
+   RewriteCond %{HTTP_HOST} =sitemap.wikimedia.org
+   RewriteRule ^[^\x00-\x1F]* https://dumps.wikimedia.org$0 [R=301,L,NE]
 
# Type: wildcard
# funnel*wikijunior.com //en.wikibooks.org/wiki/Wikijunior
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index ec68022..9f7d064 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -515,3 +515,6 @@
 # rewrite download.wiki(m|p)edia to dumps.wikimedia - T107575
 rewritedownload.wikimedia.org  https://dumps.wikimedia.org
 rewritedownload.wikipedia.org  https://dumps.wikimedia.org
+
+# rewrite sitemap.wikimedia.org to dumps.wikimedia - T110511
+rewritesitemap.wikimedia.org   https://dumps.wikimedia.org
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e2436428be403e8f73ea22ef0ce13759c3ab74e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Always refetch data editing description - change (mediawiki...Flow)

2015-09-01 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Always refetch data editing description
..

Always refetch data editing description

Bug: T109365
Change-Id: I6807ead8a07cfd422b8b94f4bf20a8ab3ff6b1c1
---
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
index 0445a69..480a63f 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
@@ -99,10 +99,6 @@
this.$content.addClass( 'oo-ui-element-hidden' );
 
this.editor.toggle( true );
-   if ( this.editor.isActive() ) {
-   this.editor.focus();
-   return;
-   }
 
// Load the editor
this.editor.pushPending();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6807ead8a07cfd422b8b94f4bf20a8ab3ff6b1c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Added WDQS dash as submodule, instructions for adding dashbo... - change (wikimedia...dashboard)

2015-09-01 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Added WDQS dash as submodule, instructions for adding 
dashboards, ...
..

Added WDQS dash as submodule, instructions for adding dashboards, ...

and updated list of R packages that should be installed.

Change-Id: I5960deb7bbe5c00ae8899c6905a2e03f172261c1
---
M .gitmodules
M README
M setup.sh
A shiny-server/wdqs
4 files changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/65/235365/1

diff --git a/.gitmodules b/.gitmodules
index e8d83fd..d45f850 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "shiny-server/metrics"]
path = shiny-server/metrics
url = http://github.com/Ironholds/rainbow.git
+[submodule "shiny-server/wdqs"]
+   path = shiny-server/wdqs
+   url = 
https://gerrit.wikimedia.org/r/wikimedia/discovery/twilightsparql.git
diff --git a/README b/README
index 388184f..9188a56 100644
--- a/README
+++ b/README
@@ -46,3 +46,12 @@
 $ sudo git submodule update --init --recursive
 $ sudo service shiny-server restart
 
+==Adding dashboards
+
+On your local clone:
+
+$ cd 
+$ git submodule add .git shiny-server/
+$ 
+$ git review
+
diff --git a/setup.sh b/setup.sh
index 7bc795c..4216d86 100755
--- a/setup.sh
+++ b/setup.sh
@@ -96,11 +96,18 @@
   echo "Installing R packages..."
   install_r_package curl
   install_r_package markdown
+  install_r_package rmarkdown
   install_r_package shinydashboard
   install_r_package dygraphs
   install_r_package readr
   install_r_package ggplot2
   install_r_package toOrdinal
+  install_r_package dplyr
+  install_r_package tidyr
+  install_r_package knitr
+  install_r_package magrittr
+  install_r_package ggvis
+  install_r_package ggthemes
 
   echo "Installing shiny-server..."
   if [ ! -d /opt/shiny-server ]; then
diff --git a/shiny-server/wdqs b/shiny-server/wdqs
new file mode 16
index 000..cdef68b
--- /dev/null
+++ b/shiny-server/wdqs
+Subproject commit cdef68bbbab3009f2969d755490e1210558e6e17

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

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

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

[MediaWiki-commits] [Gerrit] Always refetch data editing description - change (mediawiki...Flow)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Always refetch data editing description
..


Always refetch data editing description

Bug: T109365
Change-Id: I6807ead8a07cfd422b8b94f4bf20a8ab3ff6b1c1
---
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
index 0445a69..480a63f 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
@@ -99,10 +99,6 @@
this.$content.addClass( 'oo-ui-element-hidden' );
 
this.editor.toggle( true );
-   if ( this.editor.isActive() ) {
-   this.editor.focus();
-   return;
-   }
 
// Load the editor
this.editor.pushPending();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6807ead8a07cfd422b8b94f4bf20a8ab3ff6b1c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Search Συγγραφέας namespace by default on elwikisource - change (operations/mediawiki-config)

2015-09-01 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Search Συγγραφέας namespace by default on elwikisource
..

Search Συγγραφέας namespace by default on elwikisource

Bug: T110871
Change-Id: Ie1c41fae4b9792ba43c5fb6251623625e438baee
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b3c4d75..9048aee 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6799,7 +6799,7 @@
'+dewikisource' => array( 102 => 1, 104 => 1 ),
'+dewikiversity' => array( 106 => 1, 108 => 1 ),
'+dewikivoyage' => array( 6 => 1, 14 => 1, 100 => 1, 104 => 1, 106 => 1 
),
-   '+elwikisource' => array( 102 => 1 ),
+   '+elwikisource' => array( 102 => 1, 108 => 1 ),
'+enwikibooks' => array( 4 => 1, 112 => 1 ),
'+enwikinews' => array( 14 => 1, ), // T87522
'+enwikisource' => array( 102 => 1, 106 => 1, 114 => 1 ), // T52007

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1c41fae4b9792ba43c5fb6251623625e438baee
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Link DB docs from tables.sql - change (mediawiki/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Link DB docs from tables.sql
..


Link DB docs from tables.sql

Change-Id: I720ae3345963414103112fd4b4d2128c56c2
---
M maintenance/tables.sql
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index de36d26..aa0c7ea 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -3,7 +3,9 @@
 -- not have to run it by itself unless doing a manual install.
 
 -- This is a shared schema file used for both MySQL and SQLite installs.
-
+--
+-- For more documentation on the database schema, see
+-- https://www.mediawiki.org/wiki/Manual:Database_layout
 --
 -- General notes:
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I720ae3345963414103112fd4b4d2128c56c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Jjanes 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move Amazon test responses into their own files - change (mediawiki...DonationInterface)

2015-09-01 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Move Amazon test responses into their own files
..

Move Amazon test responses into their own files

Now more like the other adapter test responses.

Bug: T108123
Change-Id: I39e8ca959cb223b2bad81ab624d261d6ba1d6df6
---
M tests/Adapter/Amazon/AmazonTest.php
M tests/includes/MockAmazonClient.php
M tests/includes/MockAmazonResponse.php
A tests/includes/Responses/amazon/authorize.json
A tests/includes/Responses/amazon/authorize_InvalidPaymentMethod.json
A tests/includes/Responses/amazon/closeOrderReference.json
A tests/includes/Responses/amazon/confirmOrderReference.json
A tests/includes/Responses/amazon/getCaptureDetails.json
A tests/includes/Responses/amazon/getOrderReferenceDetails.json
A tests/includes/Responses/amazon/setOrderReferenceDetails.json
10 files changed, 186 insertions(+), 177 deletions(-)


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

diff --git a/tests/Adapter/Amazon/AmazonTest.php 
b/tests/Adapter/Amazon/AmazonTest.php
index e34c6b5..e7ff302 100644
--- a/tests/Adapter/Amazon/AmazonTest.php
+++ b/tests/Adapter/Amazon/AmazonTest.php
@@ -33,140 +33,10 @@
$this->testAdapterClass = 'TestingAmazonAdapter';
}
 
-   private $normalResponses = array(
-   'setOrderReferenceDetails' => array (
-   'SetOrderReferenceDetailsResult' => array (
-   'OrderReferenceDetails' => array (
-   'OrderReferenceStatus' => array (
-   'State' => 'Draft',
-   ),
-   'ExpirationTimestamp' => 
'2016-02-20T21:03:47.077Z',
-   'SellerOrderAttributes' => array (),
-   'OrderTotal' => array (
-   'CurrencyCode' => 'USD',
-   'Amount' => '10.00',
-   ),
-   'ReleaseEnvironment' => 'Sandbox',
-   'SellerNote' => 'Donation to the 
Wikimedia Foundation',
-   'AmazonOrderReferenceId' => 
'S01-0391295-0674065',
-   'CreationTimestamp' => 
'2015-08-24T21:03:47.077Z',
-   ),
-   ),
-   'ResponseMetadata' => array (
-   'RequestId' => 
'fce0cb84-1aa9-4f82-83a1-acf64ece1b56',
-   ),
-   'ResponseStatus' => '200',
-   ),
-   'confirmOrderReference' => array (
-   'ResponseMetadata' => array (
-   'RequestId' => 
'bbda771d-1739-448e-bdff-d79881dea668',
-   ),
-   'ResponseStatus' => '200',
-   ),
-   'getOrderReferenceDetails' => array (
-   'GetOrderReferenceDetailsResult' => array (
-   'OrderReferenceDetails' => array (
-   'OrderReferenceStatus' => array (
-   'LastUpdateTimestamp' => 
'2015-08-24T21:50:01.773Z',
-   'State' => 'Open',
-   ),
-   'ExpirationTimestamp' => 
'2016-02-20T21:03:47.077Z',
-   'IdList' => array (),
-   'SellerOrderAttributes' => array (),
-   'OrderTotal' => array (
-   'CurrencyCode' => 'USD',
-   'Amount' => '10.00',
-   ),
-   'Buyer' => array (
-   'Name' => 'Testy Test',
-   'Email' => 
'nob...@wikimedia.org',
-   ),
-   'ReleaseEnvironment' => 'Sandbox',
-   'SellerNote' => 'Donation to the 
Wikimedia Foundation',
-   'AmazonOrderReferenceId' => 
'S01-0391295-0674065',
-   'CreationTimestamp' => 
'2015-08-24T21:03:47.077Z',
-   ),
-   ),
-   'ResponseMetadata' => array (
-   'RequestId' => 
'd2759fcb-fdb0-4e93-8b9f-c3156d6bc5fd',
-   ),
-

[MediaWiki-commits] [Gerrit] Language: Fix 'pretty' fallback in getDateFormatString() - change (mediawiki/core)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Language: Fix 'pretty' fallback in getDateFormatString()
..


Language: Fix 'pretty' fallback in getDateFormatString()

* If using 'default', still fallback to 'date' if 'pretty' is
unavailable.
* Fix instance caching of 'default', which never worked since $pref
would be changed inside the !isset() block.

Bug: T110945
Change-Id: Ic53b279f8741371fa1cb642c53e6d487cb1c6b81
---
M languages/Language.php
1 file changed, 17 insertions(+), 14 deletions(-)

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



diff --git a/languages/Language.php b/languages/Language.php
index 370e2ed..b47442d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2270,30 +2270,33 @@
 
/**
 * Get a format string for a given type and preference
-* @param string $type May be date, time or both
-* @param string $pref The format name as it appears in Messages*.php
+* @param string $type May be 'date', 'time', 'both', or 'pretty'.
+* @param string $pref The format name as it appears in Messages*.php 
under
+*  $datePreferences.
 *
 * @since 1.22 New type 'pretty' that provides a more readable 
timestamp format
 *
 * @return string
 */
function getDateFormatString( $type, $pref ) {
+   $wasDefault = false;
+   if ( $pref == 'default' ) {
+   $wasDefault = true;
+   $pref = $this->getDefaultDateFormat();
+   }
+
if ( !isset( $this->dateFormatStrings[$type][$pref] ) ) {
-   if ( $pref == 'default' ) {
+   $df = self::$dataCache->getSubitem( $this->mCode, 
'dateFormats', "$pref $type" );
+
+   if ( $type === 'pretty' && $df === null ) {
+   $df = $this->getDateFormatString( 'date', $pref 
);
+   }
+
+   if ( !$wasDefault && $df === null ) {
$pref = $this->getDefaultDateFormat();
$df = self::$dataCache->getSubitem( 
$this->mCode, 'dateFormats', "$pref $type" );
-   } else {
-   $df = self::$dataCache->getSubitem( 
$this->mCode, 'dateFormats', "$pref $type" );
-
-   if ( $type === 'pretty' && $df === null ) {
-   $df = $this->getDateFormatString( 
'date', $pref );
-   }
-
-   if ( $df === null ) {
-   $pref = $this->getDefaultDateFormat();
-   $df = self::$dataCache->getSubitem( 
$this->mCode, 'dateFormats', "$pref $type" );
-   }
}
+
$this->dateFormatStrings[$type][$pref] = $df;
}
return $this->dateFormatStrings[$type][$pref];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic53b279f8741371fa1cb642c53e6d487cb1c6b81
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow upstart to set ulimit - change (operations...nutcracker)

2015-09-01 Thread Rush (Code Review)

Rush has uploaded a new change for review.

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

Change subject: Allow upstart to set ulimit
..

Allow upstart to set ulimit

Max client connections is dependent on available file
descriptors minus some reserve and those allocated for server
connections.  In order to use client_connections in excess of
935 we need to specify a ulimit.
---
M debian/default
M debian/upstart
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/nutcracker 
refs/changes/68/235368/1

diff --git a/debian/default b/debian/default
index bf9d599..9ba2001 100644
--- a/debian/default
+++ b/debian/default
@@ -1,2 +1,3 @@
 # extra daemon options; see nutcracker --help
 DAEMON_OPTS=""
+ULIMIT="1024"
diff --git a/debian/upstart b/debian/upstart
index 77b3f67..cb5a174 100644
--- a/debian/upstart
+++ b/debian/upstart
@@ -17,6 +17,7 @@
 
 script
   . /etc/default/nutcracker
+  ulimit -n $ULIMIT
   exec start-stop-daemon --quiet --start --chuid nutcracker \
--exec /usr/sbin/nutcracker -- $DAEMON_OPTS
 end script

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61a9eecb97427aaf83863b184000a19ddea8df23
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/nutcracker
Gerrit-Branch: master
Gerrit-Owner: Rush 

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

[MediaWiki-commits] [Gerrit] Update vendor libs - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Update vendor libs
..

Update vendor libs

Change-Id: I8e585d7ec5625f3d352d344a0d01b95434df
---
M vendor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/75/235375/1

diff --git a/vendor b/vendor
index bcf6e4f..7d97e12 16
--- a/vendor
+++ b/vendor
-Subproject commit bcf6e4f3a1ec517e07963d6a9195f772df745934
+Subproject commit 7d97e129935a6f71ede905010cba4d72832e9301

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e585d7ec5625f3d352d344a0d01b95434df
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Merge master into deployment
..

Merge master into deployment

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/235374/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46786f9bb6ae5f69a60f8f76a92d4b0df75a5704
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Rewrite - change (mediawiki/core)

2015-09-01 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review.

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

Change subject: Rewrite 
..

Rewrite 

See:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-options-param-optionname/ksh

Change-Id: I0498780c24f49fbdf75a191d544752c6be66be67
---
M includes/api/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/235352/1

diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 396f5da..cff739c 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -258,7 +258,7 @@
"apihelp-options-param-reset": "Resets preferences to the site 
defaults.",
"apihelp-options-param-resetkinds": "List of types of options to reset 
when the $1reset option is set.",
"apihelp-options-param-change": "List of changes, formatted name=value 
(e.g. skin=vector). Value cannot contain pipe characters. If no value is given 
(not even an equals sign), e.g., optionname|otheroption|..., the option will be 
reset to its default value.",
-   "apihelp-options-param-optionname": "The name of the option that should 
be set to the value given by $1optionvalue.",
+   "apihelp-options-param-optionname": "The name of an option that should 
be set to the value given by $1optionvalue.",
"apihelp-options-param-optionvalue": "The value for the option 
specified by $1optionname, can contain pipe characters.",
"apihelp-options-example-reset": "Reset all preferences.",
"apihelp-options-example-change": "Change skin and 
hideminor preferences.",

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

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

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

[MediaWiki-commits] [Gerrit] Tag v0.12.7 - change (oojs/ui)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Tag v0.12.7
..


Tag v0.12.7

Change-Id: Id802ba2d20a460ee0a8fbfb70bc88ac2a509
---
M History.md
M package.json
2 files changed, 21 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index d27bed7..f622662 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,25 @@
 # OOjs UI Release History
 
+## v0.12.7 / 2015-09-01
+### Deprecations
+* [DEPRECATING CHANGE] SelectFileWidget: Re-design to use a clearly clickable 
button (Ed Sanders)
+
+### Styles
+* FieldLayout: Don't add `margin-bottom` when in a HorizontalLayout (Florian)
+* SelectFileWidget: Use gray for hover and `@progressive-fade` for drop active 
(Prateek Saxena)
+* Apex, MediaWiki themes: Fix scale of external link icon (Ed Sanders)
+* Apex, MediaWiki themes: Re-crush all SVG files with SVGO (James D. Forrester)
+* Apex, MediaWiki themes: Reduce size of 'close' icon by 1px (Ed Sanders)
+* Apex, MediaWiki themes: Remove Inkscape-ism from SVG files (James D. 
Forrester)
+* Apex, MediaWiki themes: Standardise XML prolog for SVG files (Bartosz 
Dziewoński)
+* MediaWiki theme: Fix viewBox of arrow indicators (Ed Sanders)
+* MediaWiki theme: Fix viewBox of several icons (James D. Forrester)
+
+### Code
+* LookupElement: Really disallow editing of `readOnly` TextInputWidgets 
(Bartosz Dziewoński)
+* SelectFileWidget: Fix drop and drop hover exception in Firefox (Ed Sanders)
+* SelectFileWidget: Improve type checking (Ed Sanders)
+
 ## v0.12.6 / 2015-08-25
 ### Features
 * AccessKeyedElement: Introduce (Florian)
diff --git a/package.json b/package.json
index 92669db..5faa2a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] Add parent method call to link inspector updateState - change (mediawiki...VisualEditor)

2015-09-01 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Add parent method call to link inspector updateState
..

Add parent method call to link inspector updateState

Bug: T111099
Change-Id: Ieaa3ee979477175d0f129e30838853bc04937fad
---
M modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
index c988d92..b443111 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
@@ -33,6 +33,9 @@
 ve.ui.MWLinkInspectorTool.static.associatedWindows = [ 'link', 'linkNode', 
'linkMagicNode' ];
 
 ve.ui.MWLinkInspectorTool.prototype.onUpdateState = function ( fragment ) {
+   // Parent method
+   ve.ui.MWLinkInspectorTool.super.prototype.onUpdateState.apply( this, 
arguments );
+
// Vary title based on link type.
var node = fragment instanceof ve.dm.SurfaceFragment ?
fragment.getSelectedNode() : null,

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

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

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

[MediaWiki-commits] [Gerrit] Catch duplicate parserTests - change (mediawiki...parsoid)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Catch duplicate parserTests
..


Catch duplicate parserTests

 * Probably from bad rebases or parserTests syncs.

Change-Id: I74422024fb4c3eb69d691ed1f26bdd8a06ea7b70
---
M tests/parserTests-blacklist.js
M tests/parserTests.js
M tests/parserTests.txt
3 files changed, 23 insertions(+), 43 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 67ffe5c..d2555ce 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -306,8 +306,8 @@
 add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
 add("wt2html", "Links 3. WikiLinks: No escapes needed", "[[Foo|[Foobar]]\nfoo|bar");
 add("wt2html", "1. a tags", "a 
href=\"http://google.com\;>google/a>");
-add("wt2html", "Parsoid-only: Don't wrap broken template tags in  on 
wt2wt (Bug 42353)", "{{}}");
-add("wt2html", "Parsoid-only: Don't wrap broken template tags in  on 
wt2wt (Bug 42353)", "}}{{");
+add("wt2html", "1. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "{{}}");
+add("wt2html", "2. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "}}{{");
 add("wt2html", "Empty table rows go away", "\n Hello\n 
there\n\n\n");
 add("wt2html", "RT-ed inter-element separators should be valid separators", 
"\n\n");
 
@@ -673,8 +673,8 @@
 add("html2html", "Empty LI and TR nodes should not be stripped from top-level 
content", " a\n\n b\n\n\n\n\nfoo\n\n\n");
 add("html2html", "Links 3. WikiLinks: No escapes needed", "[[Foo|[Foobar]]\nfoo|bar\n");
 add("html2html", "1. a tags", "a 
href=\"http://google.com\;>google/a>");
-add("html2html", "Parsoid-only: Don't wrap broken template tags in  on 
wt2wt (Bug 42353)", "{{}}");
-add("html2html", "Parsoid-only: Don't wrap broken template tags in  on 
wt2wt (Bug 42353)", "}}{{");
+add("html2html", "1. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "{{}}");
+add("html2html", "2. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "}}{{");
 add("html2html", "Empty TR followed by a template-generated TR", "\n\nfoo\n\n");
 add("html2html", "Empty TR followed by mixed-ws-comment line should RT 
correctly", "\n\n\n \n
 \n\n");
 add("html2html", "Image: upright option (parsoid)", "caption\ncaption\ncaption\n");
@@ -1400,8 +1400,8 @@
 add("html2wt", "Parsoid-only: HTML tag with broken attribute value quoting", 
"Foo\n");
 add("html2wt", "Table with broken attribute value quoting", "{|\n\n| 
title=\"Hello world\" |Foo\n|}\n");
 add("html2wt", "Table with broken attribute value quoting on consecutive 
lines", "{|\n\n| title=\"Hello world\" |Foo\n| style=\"color: red\" 
|Bar\n|}\n");
-add("html2wt", "Parsoid-only: Don't wrap broken template tags in  on 
wt2wt (Bug 42353)", "{{}}");
-add("html2wt", "Parsoid-only: Don't wrap broken template tags in  on 
wt2wt (Bug 42353)", "}}{{");
+add("html2wt", "1. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "{{}}");
+add("html2wt", "2. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "}}{{");
 add("html2wt", "Accept empty td cell attribute", "{|\n\n| align=\"center\" | 
foo \n|\n|}\n");
 add("html2wt", "Non-empty attributes in th-cells", "{|\n\n! Foo \n! 
style=\"color: red\" | Bar\n|}\n");
 add("html2wt", "Accept empty attributes in th-cells", "{|\n\n! foo \n! 
bar\n|}\n");
diff --git a/tests/parserTests.js b/tests/parserTests.js
index c987e02..92f3102 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -92,6 +92,7 @@
this.testsChangesFile = 'changes.txt';
 
this.articles = {};
+   this.tests = new Set();
 
// Test statistics
this.stats = {};
@@ -393,9 +394,13 @@
  */
 ParserTests.prototype.processArticle = function(item, cb) {
var norm = this.env.normalizeTitle(item.title);
-   // console.log( 'processArticle ' + norm );
-   this.articles[norm] = item.text;
-   setImmediate(cb);
+   var err = null;
+   if (this.articles.hasOwnProperty(norm)) {
+   err = new Error('Duplicate article: ' + item.title);
+   } else {
+   this.articles[norm] = item.text;
+   }
+   setImmediate(cb, err);
 };
 
 /**
@@ -1911,6 +1916,13 @@
this.processArticle(item, nextCallback);
break;
case 'test':
+   if (this.tests.has(item.title)) {
+   return 
setImmediate(nextCallback,
+   new Error('Duplicate 
titles: ' + item.title));
+   } else {
+

[MediaWiki-commits] [Gerrit] Beta feature Flow on user talk page - change (mediawiki...Flow)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Beta feature Flow on user talk page
..


Beta feature Flow on user talk page

When $wgFlowEnableOptInBetaFeature is true,
a new beta feature allows using to
enable Flow on their talk page.

There is also a maintenance script to
auto opt-in users who are already using
Flow on their user talk page.

Bug: T98270
Change-Id: Ia9950c4eb1c0e5f912761a65c76c5a2b3b99c8ee
---
M Flow.php
M Hooks.php
M autoload.php
M defines.php
M i18n/en.json
M i18n/qqq.json
A images/betafeature-flow-ltr.svg
A images/betafeature-flow-rtl.svg
A includes/Import/ArchiveNameHelper.php
M includes/Import/Converter.php
M includes/Import/Exception.php
M includes/Import/LiquidThreadsApi/ConversionStrategy.php
A includes/Import/OptInController.php
A includes/Import/OptInUpdate.php
A includes/Import/TemplateHelper.php
M includes/Import/Wikitext/ConversionStrategy.php
M includes/Notifications/Controller.php
M includes/Notifications/Notifications.php
A maintenance/FlowUpdateBetaFeaturePreference.php
A tests/browser/features/opt_in.feature
A tests/browser/features/step_definitions/opt_in_steps.rb
M tests/browser/features/support/data_manager.rb
M tests/browser/features/support/pages/abstract_flow_page.rb
A tests/browser/features/support/pages/flow_component.rb
D tests/browser/features/support/pages/new_wiki_page.rb
A tests/browser/features/support/pages/special_notifications_page.rb
A tests/browser/features/support/pages/special_preferences_page.rb
A tests/browser/features/support/pages/user_talk_page.rb
M tests/browser/features/support/pages/wiki_page.rb
A tests/phpunit/Import/ArchiveNameHelperTest.php
M tests/phpunit/Import/ConverterTest.php
A tests/phpunit/Import/TemplateHelperTest.php
32 files changed, 1,337 insertions(+), 122 deletions(-)

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



diff --git a/Flow.php b/Flow.php
index ccc9e4b..2906511 100644
--- a/Flow.php
+++ b/Flow.php
@@ -166,6 +166,10 @@
 $wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'Flow\NotificationController::getDefaultNotifiedUsers';
 $wgHooks['EchoGetBundleRules'][] = 
'Flow\NotificationController::onEchoGetBundleRules';
 
+// Beta feature Flow on user talk page
+$wgHooks['GetBetaFeaturePreferences'][] = 
'FlowHooks::onGetBetaFeaturePreferences';
+$wgHooks['UserSaveOptions'][] = 'FlowHooks::onUserSaveOptions';
+
 // Extension initialization
 $wgExtensionFunctions[] = 'FlowHooks::initFlowExtension';
 
@@ -403,3 +407,6 @@
 
 // Temporary field to allow source wiki to be null for references until it's 
backfilled.
 $wgFlowMigrateReferenceWiki = false;
+
+// Enable/Disable Opt-in beta feature
+$wgFlowEnableOptInBetaFeature = false;
diff --git a/Hooks.php b/Hooks.php
index 6bf3a96..95f53f5 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -6,6 +6,7 @@
 use Flow\Exception\FlowException;
 use Flow\Exception\PermissionException;
 use Flow\Formatter\CheckUserQuery;
+use Flow\Import\OptInUpdate;
 use Flow\Model\UUID;
 use Flow\OccupationController;
 use Flow\SpamFilter\AbuseFilter;
@@ -230,6 +231,9 @@
 
require_once __DIR__.'/maintenance/FlowFixLinks.php';
$updater->addPostDatabaseUpdateMaintenance( 'FlowFixLinks' );
+
+   require_once 
__DIR__.'/maintenance/FlowUpdateBetaFeaturePreference.php';
+   $updater->addPostDatabaseUpdateMaintenance( 
'FlowUpdateBetaFeaturePreference' );
 
return true;
}
@@ -1577,9 +1581,92 @@
 *
 * @param array $namespaces Associative array mapping namespace index
 *  to name
+* @return bool
 */
public static function onSearchableNamespaces( &$namespaces ) {
unset( $namespaces[NS_TOPIC] );
return true;
}
+
+   /**
+* @return bool
+*/
+   private static function isBetaFeatureAvailable() {
+   global $wgBetaFeaturesWhitelist, $wgFlowEnableOptInBetaFeature;
+   return $wgFlowEnableOptInBetaFeature &&
+   ( !is_array( $wgBetaFeaturesWhitelist ) || in_array( 
BETA_FEATURE_FLOW_USER_TALK_PAGE, $wgBetaFeaturesWhitelist ) );
+   }
+
+   /**
+* @param User $user
+* @param array $prefs
+* @return bool
+*/
+   public static function onGetBetaFeaturePreferences( $user, &$prefs ) {
+   global $wgExtensionAssetsPath;
+
+   if ( !self::isBetaFeatureAvailable() ) {
+   return true;
+   }
+
+   $defaultProjectUrl = 
'https://www.mediawiki.org/wiki/Extension:Flow';
+   $defaultProjectTalkUrl = 
'https://www.mediawiki.org/wiki/Extension_talk:Flow';
+
+   $prefs[BETA_FEATURE_FLOW_USER_TALK_PAGE] = array(
+   // The first two are message keys
+   'label-message' => 
'flow-talk-page-beta-feature-message',
+

[MediaWiki-commits] [Gerrit] Link DB docs from tables.sql - change (mediawiki/core)

2015-09-01 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Link DB docs from tables.sql
..

Link DB docs from tables.sql

Change-Id: I720ae3345963414103112fd4b4d2128c56c2
---
M maintenance/tables.sql
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/235367/1

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index de36d26..aa0c7ea 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -3,7 +3,9 @@
 -- not have to run it by itself unless doing a manual install.
 
 -- This is a shared schema file used for both MySQL and SQLite installs.
-
+--
+-- For more documentation on the database schema, see
+-- https://www.mediawiki.org/wiki/Manual:Database_layout
 --
 -- General notes:
 --

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

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

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

[MediaWiki-commits] [Gerrit] Fix badly worded link anchors. - change (mediawiki...SpamDiffTool)

2015-09-01 Thread Purodha (Code Review)

Purodha has uploaded a new change for review.

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

Change subject: Fix badly worded link anchors.
..

Fix badly worded link anchors.

See also:
* https://www.mediawiki.org/wiki/i18n#Use_meaningful_link_anchors
* 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Spamdifftool-no-urls-detected/ksh

Change-Id: I2b46825319189660a624f6e8e7f8678f07df690e
---
M i18n/en.json
1 file changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index db00315..a96c942 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,15 +1,17 @@
 {
"@metadata": {
-   "authors": []
+   "authors": [
+   "Purodha"
+   ]
},
"spamdifftool": "Manage Spam Blacklist",
"spamdifftool-desc": "Provides a basic way of adding new entries to the 
Spam Blacklist from diff pages",
"spamdifftool-block": "Block:",
"spamdifftool-cant-edit": "Sorry - you don't have permission to edit 
the Spam Blacklist.",
-   "spamdifftool-confirm": "Confirm that you want to add these entries to 
the Spam Blacklist. (Click here to report a 
problem.)",
-   "spamdifftool-no-text": "There is no text to add to the Spam Blacklist. 
Click here to continue.",
+   "spamdifftool-confirm": "Confirm that you want to add these entries to 
the Spam Blacklist. (Report a problem.)",
+   "spamdifftool-no-text": "There is no text to add to the Spam Blacklist. 
Continue.",
"spamdifftool-no-title": "'''Error:''' no page title was specified.",
-   "spamdifftool-no-urls-detected": "No URLs were detected. Click here to return.",
+   "spamdifftool-no-urls-detected": "No URLs were detected. Return.",
"spamdifftool-option-domain": "all from this domain",
"spamdifftool-option-subdomain": "all from this subdomain",
"spamdifftool-option-directory": "this subdomain and directory",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b46825319189660a624f6e8e7f8678f07df690e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamDiffTool
Gerrit-Branch: master
Gerrit-Owner: Purodha 

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

[MediaWiki-commits] [Gerrit] avoid php notices - change (mediawiki...CirrusSearch)

2015-09-01 Thread MarkAHershberger (Code Review)

MarkAHershberger has uploaded a new change for review.

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

Change subject: avoid php notices
..

avoid php notices

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


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

diff --git a/includes/Searcher.php b/includes/Searcher.php
index 91748cc..f42ecb8 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -1196,7 +1196,7 @@
$responseData = 
$result->getValue()->getResponse()->getData();
$result->setResult( true, 
$this->resultsType->transformElasticsearchResult( $this->suggestPrefixes,
$this->suggestSuffixes, $result->getValue(), 
$this->searchContainedSyntax ) );
-   if ( $responseData[ 'timed_out' ] ) {
+   if ( isset( $responseData[ 'timed_out' ] ) && 
$responseData[ 'timed_out' ] ) {
wfLogWarning( "$description timed out and only 
returned partial results!" );
if ( $result->getValue()->numRows() === 0 ) {
return Status::newFatal( 
'cirrussearch-backend-error' );

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

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

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

[MediaWiki-commits] [Gerrit] Annotate CiviCRM patches - change (wikimedia...civicrm)

2015-09-01 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Annotate CiviCRM patches
..

Annotate CiviCRM patches

Add comments about CiviCRM patches to the patches to indicate upgrade thoughts

Bug: T99836
Change-Id: If26d079a2adb63d182669914d76f139a71e2
---
M patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch
M patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch
M patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch
M patches/civicrm-4.2.19-drupal-wmf-api.patch
M patches/civicrm-4.2.19-drupal-wmf-big-fields.patch
M patches/civicrm-4.2.19-drupal-wmf-custom-names.patch
M patches/civicrm-4.2.19-drupal-wmf-dateadded.patch
M patches/civicrm-4.2.19-drupal-wmf-debug-queries.patch
M patches/civicrm-4.2.19-drupal-wmf-debug-upgrade.patch
M patches/civicrm-4.2.19-drupal-wmf-dedupe.patch
M patches/civicrm-4.2.19-drupal-wmf-delete.patch
M patches/civicrm-4.2.19-drupal-wmf-empty-search.patch
M patches/civicrm-4.2.19-drupal-wmf-entitytag.patch
M patches/civicrm-4.2.19-drupal-wmf-exception.patch
M patches/civicrm-4.2.19-drupal-wmf-export.patch
M patches/civicrm-4.2.19-drupal-wmf-expose-sql.patch
M patches/civicrm-4.2.19-drupal-wmf-failure-info.patch
M patches/civicrm-4.2.19-drupal-wmf-greetings.patch
M patches/civicrm-4.2.19-drupal-wmf-jcalendar.patch
M patches/civicrm-4.2.19-drupal-wmf-language-freeform.patch
M patches/civicrm-4.2.19-drupal-wmf-option-cache.patch
M patches/civicrm-4.2.19-drupal-wmf-prevnext.patch
M patches/civicrm-4.2.19-drupal-wmf-queryopt.patch
M patches/civicrm-4.2.19-drupal-wmf-refund.patch
M patches/civicrm-4.2.19-drupal-wmf-sort-name.patch
M patches/civicrm-4.2.19-drupal-wmf-strict.patch
M patches/civicrm-4.2.19-drupal-wmf-style.patch
M patches/civicrm-4.2.19-drupal-wmf-triggers.patch
M patches/civicrm-4.2.19-drupal-wmf-typo.patch
M patches/civicrm-4.2.19-drupal-wmf-typo2.patch
30 files changed, 190 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/59/235359/1

diff --git a/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch 
b/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch
index b366af2..1a9543b 100644
--- a/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch
+++ b/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch
@@ -1,4 +1,12 @@
 diff -urN civicrm-4.2.19/CRM/ACL/BAO/ACL.php 
civicrm-4.2.19-wmf/CRM/ACL/BAO/ACL.php
+
+Status: needs confirmation
+Recommendation: no further action.
+Background: This appears to be primarily about adding caching to the 
CRM_ACL_BAO_ACL::group function.
+In 4.4 there appears to be caching submitted by Adam.
+
+JIRA: CRM-11275 (tangental I think)
+
 --- civicrm-4.2.19/CRM/ACL/BAO/ACL.php 2014-09-09 15:40:20.0 -0700
 +++ civicrm-4.2.19-wmf/CRM/ACL/BAO/ACL.php 2015-03-11 13:31:10.174248480 
-0700
 @@ -44,6 +44,7 @@
diff --git a/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch 
b/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch
index bfb5cb9..407094c 100644
--- a/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch
+++ b/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch
@@ -1,4 +1,8 @@
 diff -urN civicrm-4.2.19/CRM/Admin/Page/Admin.php 
civicrm-4.2.19-wmf/CRM/Admin/Page/Admin.php
+
+Status: 4.4 and 4.6 ok
+Recommendation: ignore this is already upstream.
+
 --- civicrm-4.2.19/CRM/Admin/Page/Admin.php2014-09-09 15:40:20.0 
-0700
 +++ civicrm-4.2.19-wmf/CRM/Admin/Page/Admin.php2015-03-11 
13:31:10.194248479 -0700
 @@ -113,6 +113,9 @@
diff --git a/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch 
b/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch
index 8d7bcf3..2c19e00 100644
--- a/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch
+++ b/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch
@@ -1,4 +1,12 @@
 diff -urN civicrm-4.2.19/CRM/Contact/Form/Search.php 
civicrm-4.2.19-wmf/CRM/Contact/Form/Search.php
+
+Status: I think this hook (in 4.4) 
http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_queryObjects 
possibly
+supercedes this proposed hook.
+
+Recommendation : grep & make sure the only use is still the commented out one 
& if so don't port to upgraded version
+
+JIRA: CRM-10674
+
 --- civicrm-4.2.19/CRM/Contact/Form/Search.php 2014-09-09 15:40:20.0 
-0700
 +++ civicrm-4.2.19-wmf/CRM/Contact/Form/Search.php 2015-03-11 
13:31:10.234248478 -0700
 @@ -329,6 +329,7 @@
diff --git a/patches/civicrm-4.2.19-drupal-wmf-api.patch 
b/patches/civicrm-4.2.19-drupal-wmf-api.patch
index cad923f..79aa7fa 100644
--- a/patches/civicrm-4.2.19-drupal-wmf-api.patch
+++ b/patches/civicrm-4.2.19-drupal-wmf-api.patch
@@ -1,4 +1,9 @@
 diff -urN civicrm-4.2.19/api/api.php civicrm-4.2.19-wmf/api/api.php
+
+Status: needs review
+Background: patch is to prevent 'bubble up DB_Error details'
+Commit comment: (FR #1066) Overly specific hack to bubble up DB_Error details
+
 --- civicrm-4.2.19/api/api.php

[MediaWiki-commits] [Gerrit] Use the VirtualRESTService to configure Flow - change (mediawiki...Flow)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Use the VirtualRESTService to configure Flow
..


Use the VirtualRESTService to configure Flow

This allows Flow to use either Parsoid or RESTBase via the VRS, and
to share its configuration with Visual Editor.

Bug: T110721
Change-Id: I83ddb11a846d7caa426dd223179dbd81f3924719
---
M Flow.php
M Hooks.php
M includes/Parsoid/Utils.php
3 files changed, 119 insertions(+), 46 deletions(-)

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



diff --git a/Flow.php b/Flow.php
index 2b12073..c54180c 100644
--- a/Flow.php
+++ b/Flow.php
@@ -236,11 +236,15 @@
 $wgFlowContentFormat = 'html'; // possible values: html|wikitext XXX bug 70148 
with wikitext
 
 // Flow Parsoid config
+// THESE VARIABLES ARE DEPRECATED.
+// Use the VirtualRESTService ($wgVirtualRestConfig) to configure
+// Parsoid and/or RESTBase.
 // Please note that this configuration is separate from VE's Parsoid config:
 // you'll have to fill out these variables too if you want to use Parsoid.
 $wgFlowParsoidURL = null; // also see $wgVisualEditorParsoidURL
 $wgFlowParsoidPrefix = null; // also see $wgVisualEditorParsoidPrefix
 $wgFlowParsoidTimeout = null; // In seconds; also see 
$wgVisualEditorParsoidTimeout
+$wgFlowParsoidHTTPProxy = null; // see also $wgVisualEditorParsoidHTTPProxy
 // Forward users' Cookie: headers to Parsoid. Required for private wikis 
(login required to read).
 // If the wiki is not private (i.e. $wgGroupPermissions['*']['read'] is true) 
this configuration
 // variable will be ignored.
diff --git a/Hooks.php b/Hooks.php
index 5b87b89..364374a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -85,7 +85,7 @@
 * from $wgExtensionFunctions
 */
public static function initFlowExtension() {
-   global $wgFlowContentFormat, $wgFlowParsoidURL;
+   global $wgFlowContentFormat;
 
// needed to determine if a page is occupied by flow
self::getOccupationController();
@@ -96,7 +96,7 @@
self::getAbuseFilter();
}
 
-   if ( $wgFlowContentFormat === 'html' && $wgFlowParsoidURL === 
null ) {
+   if ( $wgFlowContentFormat === 'html' && 
!Flow\Parsoid\Utils::isParsoidConfigured() ) {
wfDebugLog( 'Flow', __METHOD__ . ': Warning: 
$wgFlowContentFormat was set to \'html\', but you do not have Parsoid enabled.  
Changing $wgFlowContentFormat to \'wikitext\'' );
$wgFlowContentFormat = 'wikitext';
}
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index b4299c6..fc854f9 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -11,10 +11,12 @@
 use Flow\Exception\NoParsoidException;
 use Flow\Exception\WikitextException;
 use Language;
+use MultiHttpClient;
 use OutputPage;
 use RequestContext;
 use Title;
 use User;
+use VirtualRESTServiceClient;
 
 abstract class Utils {
/**
@@ -33,13 +35,12 @@
}
 
try {
-   self::parsoidConfig();
+   return self::parsoid( $from, $to, $content, $title );
} catch ( NoParsoidException $e ) {
// If we have no parsoid config, fallback to the parser.
return self::parser( $from, $to, $content, $title );
}
 
-   return self::parsoid( $from, $to, $content, $title );
}
 
/**
@@ -79,52 +80,44 @@
 * @throws WikitextException When conversion is unsupported
 */
protected static function parsoid( $from, $to, $content, Title $title ) 
{
-   list( $parsoidURL, $parsoidPrefix, $parsoidTimeout, 
$parsoidForwardCookies ) = self::parsoidConfig();
+   $serviceClient = self::getServiceClient();
 
if ( $from == 'html' ) {
$from = 'html';
} elseif ( in_array( $from, array( 'wt', 'wikitext' ) ) ) {
-   $from = 'wt';
+   $from = 'wikitext';
} else {
throw new WikitextException( 'Unknown source format: ' 
. $from, 'process-wikitext' );
}
 
+   $prefixedDbTitle = $title->getPrefixedDBkey();
$params = array(
$from => $content,
-   'body' => true,
+   'bodyOnly' => 'true',
);
if ( $from === 'html' ) {
$params['scrubWikitext'] = 'true';
}
-
-   $prefixedDbTitle = $title->getPrefixedDBkey();
-   $request = \MWHttpRequest::factory(
-   $parsoidURL . '/' . $parsoidPrefix . '/' . urlencode( 
$prefixedDbTitle ),
-   array(
-

[MediaWiki-commits] [Gerrit] Correctly report an error for file names without extension - change (mediawiki...UploadWizard)

2015-09-01 Thread Code Review

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

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

Change subject: Correctly report an error for file names without extension
..

Correctly report an error for file names without extension

mw.Title.newFromFileName() doesn't throw on unparseable titles,
it just returns null.

Also refactor a bit to avoid showing two error messages at once.

Bug: T100226
Change-Id: I200fa6b571a32c63c1ff3a8f77ddcb9ae2d9e550
---
M resources/mw.UploadWizardUpload.js
1 file changed, 10 insertions(+), 5 deletions(-)


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

diff --git a/resources/mw.UploadWizardUpload.js 
b/resources/mw.UploadWizardUpload.js
index c4c99a3..68ef5cb 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -437,6 +437,15 @@
 
this.setTitle( basename );
 
+   if ( !this.title ) {
+   if ( basename.indexOf( '.' ) === -1 ) {
+   this.fileNameErr( 'noext', null );
+   } else {
+   this.fileNameErr( 'unparseable', null );
+   }
+   return;
+   }
+
// Check if extension is acceptable
extension = this.title.getExtension();
if ( mw.isEmpty( extension ) ) {
@@ -549,11 +558,7 @@
 * @param {string} title Unsanitized title.
 */
UWUP.setTitle = function ( title ) {
-   try {
-   this.title = mw.Title.newFromFileName( 
mw.UploadWizard.sanitizeFilename( title ) );
-   } catch ( e ) {
-   this.fileNameErr( 'unparseable', null );
-   }
+   this.title = mw.Title.newFromFileName( 
mw.UploadWizard.sanitizeFilename( title ) );
};
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Follow composer.lock - change (wikimedia...vendor)

2015-09-01 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Follow composer.lock
..

Follow composer.lock

Change-Id: I4cecb6d850fd7c6a4f00985fb4be7e3e5cc35467
---
A coderkungfu/php-queue/.gitreview
M composer/autoload_classmap.php
M composer/installed.json
M wikimedia/donation-interface/gateway_common/FinalStatus.php
M wikimedia/donation-interface/gateway_common/PaymentResult.php
M wikimedia/donation-interface/gateway_common/PaymentTransactionResponse.php
M wikimedia/donation-interface/gateway_common/gateway.adapter.php
M wikimedia/donation-interface/gateway_common/i18n/interface/et.json
M wikimedia/donation-interface/gateway_common/i18n/interface/ko.json
M wikimedia/donation-interface/gateway_common/i18n/interface/qqq.json
M wikimedia/donation-interface/gateway_common/i18n/interface/sah.json
M wikimedia/donation-interface/gateway_common/i18n/interface/tt-cyrl.json
M wikimedia/donation-interface/globalcollect_gateway/globalcollect.adapter.php
A wikimedia/donation-interface/globalcollect_gateway/scripts/refund.php
M wikimedia/donation-interface/tests/Adapter/Worldpay/WorldpayTest.php
15 files changed, 560 insertions(+), 245 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/73/235373/1

diff --git a/coderkungfu/php-queue/.gitreview b/coderkungfu/php-queue/.gitreview
new file mode 100644
index 000..ffb389a
--- /dev/null
+++ b/coderkungfu/php-queue/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=wikimedia/fundraising/php-queue.git
+defaultbranch=master
+defaultrebase=0
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index aeb8b25..1ca0e38 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -29,6 +29,7 @@
 'GlobalCollectGatewayResult' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/globalcollect_resultswitcher.body.php',
 'GlobalCollectOrphanAdapter' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/orphan.adapter.php',
 'GlobalCollectOrphanRectifier' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/GlobalCollectOrphanRectifier.php',
+'GlobalCollectRefundMaintenance' => $vendorDir . 
'/wikimedia/donation-interface/globalcollect_gateway/scripts/refund.php',
 'LCRun3' => $vendorDir . '/zordius/lightncandy/src/lightncandy.php',
 'LightnCandy' => $vendorDir . '/zordius/lightncandy/src/lightncandy.php',
 'LogPrefixProvider' => $vendorDir . 
'/wikimedia/donation-interface/gateway_common/gateway.adapter.php',
diff --git a/composer/installed.json b/composer/installed.json
index 362878c..3a77b7b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -418,6 +418,104 @@
 ]
 },
 {
+"name": "zordius/lightncandy",
+"version": "v0.18",
+"version_normalized": "0.18.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/zordius/lightncandy.git;,
+"reference": "24be6909c37391f4648ce1fdf19036b11bd56d05"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/zordius/lightncandy/zipball/24be6909c37391f4648ce1fdf19036b11bd56d05;,
+"reference": "24be6909c37391f4648ce1fdf19036b11bd56d05",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"require-dev": {
+"phpunit/phpunit": "4.0.17"
+},
+"time": "2015-01-01 04:37:19",
+"type": "library",
+"installation-source": "dist",
+"autoload": {
+"classmap": [
+"src/lightncandy.php"
+]
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Zordius Chen",
+"email": "zord...@yahoo-inc.com"
+}
+],
+"description": "An extremely fast PHP implementation of handlebars ( 
http://handlebarsjs.com/ ) and mustache ( http://mustache.github.io/ ).",
+"homepage": "https://github.com/zordius/lightncandy;,
+"keywords": [
+"handlebars",
+"logicless",
+"mustache",
+"php",
+"template"
+]
+},
+{
+"name": "wikimedia/smash-pig",
+"version": "dev-master",
+"version_normalized": "999-dev",
+"source": {
+"type": "git",
+"url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
+"reference": "955d5147b36a2f6bbfdd9aaf35fa5539d016c89b"
+},
+"require": {
+"fusesource/stomp-php": "2.*",
+"php": ">=5.3.3",
+"phpmailer/phpmailer": "5.2.6",
+

[MediaWiki-commits] [Gerrit] Enable VisualEditor for NS_PROJECT on enwiki - change (operations/mediawiki-config)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Enable VisualEditor for NS_PROJECT on enwiki
..


Enable VisualEditor for NS_PROJECT on enwiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ab5ccfc..2903d3c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12678,6 +12678,7 @@
102 /* Viquiprojecte */ => true // T58000
),
'+enwiki' => array(
+   NS_PROJECT => true, // T100067
100 /* Portal */ => true, // T58001
108 /* Book */ => true, // T58001
118 /* Draft */ => true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9553a77be308d43bb8d93e999c86d4ae9a5682d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add namespace for Arabic - change (mediawiki...Flow)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Add namespace for Arabic
..


Add namespace for Arabic

Bug: T110999
Change-Id: I29c3513ceb55fc58d90ff5b9702e023b7bb1f829
---
M Flow.namespaces.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Flow.namespaces.php b/Flow.namespaces.php
index 024288e..c74f8eb 100644
--- a/Flow.namespaces.php
+++ b/Flow.namespaces.php
@@ -9,6 +9,11 @@
 
 $namespaceNames = array();
 
+/** Arabic */
+$namespaceNames['ar'] = array(
+   NS_TOPIC => 'موضوع',
+);
+
 /** Asturian */
 $namespaceNames['ast'] = array(
NS_TOPIC =>  'Asuntu',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29c3513ceb55fc58d90ff5b9702e023b7bb1f829
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Tag v0.12.7 - change (oojs/ui)

2015-09-01 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Tag v0.12.7
..

Tag v0.12.7

Change-Id: Id802ba2d20a460ee0a8fbfb70bc88ac2a509
---
M History.md
M package.json
2 files changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/54/235354/1

diff --git a/History.md b/History.md
index d27bed7..f622662 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,25 @@
 # OOjs UI Release History
 
+## v0.12.7 / 2015-09-01
+### Deprecations
+* [DEPRECATING CHANGE] SelectFileWidget: Re-design to use a clearly clickable 
button (Ed Sanders)
+
+### Styles
+* FieldLayout: Don't add `margin-bottom` when in a HorizontalLayout (Florian)
+* SelectFileWidget: Use gray for hover and `@progressive-fade` for drop active 
(Prateek Saxena)
+* Apex, MediaWiki themes: Fix scale of external link icon (Ed Sanders)
+* Apex, MediaWiki themes: Re-crush all SVG files with SVGO (James D. Forrester)
+* Apex, MediaWiki themes: Reduce size of 'close' icon by 1px (Ed Sanders)
+* Apex, MediaWiki themes: Remove Inkscape-ism from SVG files (James D. 
Forrester)
+* Apex, MediaWiki themes: Standardise XML prolog for SVG files (Bartosz 
Dziewoński)
+* MediaWiki theme: Fix viewBox of arrow indicators (Ed Sanders)
+* MediaWiki theme: Fix viewBox of several icons (James D. Forrester)
+
+### Code
+* LookupElement: Really disallow editing of `readOnly` TextInputWidgets 
(Bartosz Dziewoński)
+* SelectFileWidget: Fix drop and drop hover exception in Firefox (Ed Sanders)
+* SelectFileWidget: Improve type checking (Ed Sanders)
+
 ## v0.12.6 / 2015-08-25
 ### Features
 * AccessKeyedElement: Introduce (Florian)
diff --git a/package.json b/package.json
index 92669db..5faa2a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] MWLinkInspectorTool: Add parent method call to #updateState - change (mediawiki...VisualEditor)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: MWLinkInspectorTool: Add parent method call to #updateState
..


MWLinkInspectorTool: Add parent method call to #updateState

Bonus: No need to check if fragment is a SurfaceFragment.

Bug: T111099
Change-Id: Ieaa3ee979477175d0f129e30838853bc04937fad
---
M modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
1 file changed, 25 insertions(+), 9 deletions(-)

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



diff --git a/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
index c988d92..570617a 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
@@ -22,7 +22,11 @@
ve.ui.MWLinkInspectorTool.super.apply( this, arguments );
 };
 
+/* Inheritance */
+
 OO.inheritClass( ve.ui.MWLinkInspectorTool, ve.ui.LinkInspectorTool );
+
+/* Static Properties */
 
 ve.ui.MWLinkInspectorTool.static.modelClasses =
ve.ui.MWLinkInspectorTool.super.static.modelClasses.concat( [
@@ -32,20 +36,32 @@
 
 ve.ui.MWLinkInspectorTool.static.associatedWindows = [ 'link', 'linkNode', 
'linkMagicNode' ];
 
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
 ve.ui.MWLinkInspectorTool.prototype.onUpdateState = function ( fragment ) {
+   var node, type, title;
+
+   // Parent method
+   ve.ui.MWLinkInspectorTool.super.prototype.onUpdateState.apply( this, 
arguments );
+
// Vary title based on link type.
-   var node = fragment instanceof ve.dm.SurfaceFragment ?
-   fragment.getSelectedNode() : null,
-   type = node instanceof ve.dm.MWMagicLinkNode ?
-   'magiclinknode-tooltip-' + 
node.getMagicType().toLowerCase() :
-   node instanceof ve.dm.MWNumberedExternalLinkNode ?
-   'linknode-tooltip' : null,
-   title = type ?
-   OO.ui.deferMsg( 'visualeditor-annotationbutton-' + type 
) :
-   ve.ui.MWLinkInspectorTool.static.title;
+   node = fragment && fragment.getSelectedNode();
+   type = node instanceof ve.dm.MWMagicLinkNode ?
+   'magiclinknode-tooltip-' + node.getMagicType().toLowerCase() :
+   node instanceof ve.dm.MWNumberedExternalLinkNode ?
+   'linknode-tooltip' : null;
+   title = type ?
+   OO.ui.deferMsg( 'visualeditor-annotationbutton-' + type ) :
+   ve.ui.MWLinkInspectorTool.static.title;
+
this.setTitle( title  );
 };
 
+/* Registration */
+
 ve.ui.toolFactory.register( ve.ui.MWLinkInspectorTool );
 
 ve.ui.commandRegistry.register(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaa3ee979477175d0f129e30838853bc04937fad
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Cscott 
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] mailman: ferm, allow rsync from sodium for migration - change (operations/puppet)

2015-09-01 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: mailman: ferm, allow rsync from sodium for migration
..


mailman: ferm, allow rsync from sodium for migration

Need to let firewalling allow rsync from sodium until migration
is done.

Bug:T110129
Change-Id: I8e1fecd9007a41fb8f250a242d797661b1bf733a
---
M manifests/role/lists.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index e2b69e4..04e4e66 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -156,6 +156,12 @@
 ferm::rule { 'mailman-spamd-local':
 rule => 'proto tcp dport 783 { saddr (127.0.0.1 ::1) ACCEPT; }'
 }
+
+ferm::service { 'sodium-rysnc':
+proto  => 'tcp',
+port   => '873',
+srange => '208.80.154.61/32',
+}
 }
 
 class role::lists::migration {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e1fecd9007a41fb8f250a242d797661b1bf733a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: John F. Lewis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Disable MediaViewer thumbnail guessing on Beta - change (operations/mediawiki-config)

2015-09-01 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Disable MediaViewer thumbnail guessing on Beta
..

Disable MediaViewer thumbnail guessing on Beta

It's broken, and makes it impossible to test MediaViewer on Beta.

Bug: T69651
Change-Id: I66658dbc6f9c4e0afad5f1293a338b9aa395737d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 574d0af..6cd03e6 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -1067,5 +1067,9 @@
'wmgLogAuthmanagerMetrics' => array(
'default' => true,
),
+
+   'wmgMediaViewerUseThumbnailGuessing' => array(
+   'default' => false, # T69651
+   ),
);
 } # wmflLabsSettings()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66658dbc6f9c4e0afad5f1293a338b9aa395737d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Update DonationInterface - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Update DonationInterface
..

Update DonationInterface

Change-Id: I1d5368cc0e4b9d8efdb979e2dbcb9722076cc525
---
M composer.lock
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/72/235372/1

diff --git a/composer.lock b/composer.lock
index fc2393a..0a04918 100644
--- a/composer.lock
+++ b/composer.lock
@@ -693,7 +693,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git;,
-"reference": "74f4e078c48a44a90c9e8563ff365e679deb8c75"
+"reference": "1971cbbc12b967ff776399e57f5098de04785637"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d5368cc0e4b9d8efdb979e2dbcb9722076cc525
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Update DonationInterface - change (wikimedia...crm)

2015-09-01 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Update DonationInterface
..


Update DonationInterface

Change-Id: I1d5368cc0e4b9d8efdb979e2dbcb9722076cc525
---
M composer.lock
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Awight: Looks good to me, approved



diff --git a/composer.lock b/composer.lock
index fc2393a..0a04918 100644
--- a/composer.lock
+++ b/composer.lock
@@ -693,7 +693,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git;,
-"reference": "74f4e078c48a44a90c9e8563ff365e679deb8c75"
+"reference": "1971cbbc12b967ff776399e57f5098de04785637"
 },
 "require": {
 "coderkungfu/php-queue": "dev-master",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d5368cc0e4b9d8efdb979e2dbcb9722076cc525
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
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] Disable MediaViewer thumbnail guessing on Beta - change (operations/mediawiki-config)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Disable MediaViewer thumbnail guessing on Beta
..


Disable MediaViewer thumbnail guessing on Beta

It's broken, and makes it impossible to test MediaViewer on Beta.

Bug: T69651
Change-Id: I66658dbc6f9c4e0afad5f1293a338b9aa395737d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 574d0af..6cd03e6 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -1067,5 +1067,9 @@
'wmgLogAuthmanagerMetrics' => array(
'default' => true,
),
+
+   'wmgMediaViewerUseThumbnailGuessing' => array(
+   'default' => false, # T69651
+   ),
);
 } # wmflLabsSettings()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66658dbc6f9c4e0afad5f1293a338b9aa395737d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Refactor SiteLinkTable::saveLinksOfItem - change (mediawiki...Wikibase)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Refactor SiteLinkTable::saveLinksOfItem
..


Refactor SiteLinkTable::saveLinksOfItem

Converted loop of db calls to one db call with multiple inserts/deletes.

Change-Id: I3339b072558038ff91e6849e7ea71c9a6bfe3e35
---
M lib/includes/store/sql/SiteLinkTable.php
M lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
2 files changed, 50 insertions(+), 50 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/store/sql/SiteLinkTable.php 
b/lib/includes/store/sql/SiteLinkTable.php
index 13b2b51..8c1785e 100644
--- a/lib/includes/store/sql/SiteLinkTable.php
+++ b/lib/includes/store/sql/SiteLinkTable.php
@@ -139,30 +139,26 @@
 *
 * @return boolean Success indicator
 */
-   public function insertLinksInternal( Item $item, $links, DatabaseBase 
$dbw ) {
+   public function insertLinksInternal( Item $item, array $links, 
DatabaseBase $dbw ) {
wfDebugLog( __CLASS__, __FUNCTION__ . ': inserting links for ' 
. $item->getId()->getSerialization() );
 
-   $success = true;
-   foreach ( $links as $link ) {
-   $success = $dbw->insert(
-   $this->table,
-   array(
-   'ips_item_id' => 
$item->getId()->getNumericId(),
-   'ips_site_id' => $link->getSiteId(),
-   'ips_site_page' => $link->getPageName()
-   ),
-   __METHOD__,
-   array( 'IGNORE' )
+   $insert = array();
+   foreach ( $links as $siteLink ) {
+   $insert[] = array(
+   'ips_item_id' => $item->getId()->getNumericId(),
+   'ips_site_id' => $siteLink->getSiteId(),
+   'ips_site_page' => $siteLink->getPageName()
);
-
-   $success = $success && $dbw->affectedRows();
-
-   if ( !$success ) {
-   break;
-   }
}
 
-   return $success;
+   $success = $dbw->insert(
+   $this->table,
+   $insert,
+   __METHOD__,
+   array( 'IGNORE' )
+   );
+
+   return $success && $dbw->affectedRows();
}
 
/**
@@ -179,26 +175,22 @@
 *
 * @return boolean Success indicator
 */
-   public function deleteLinksInternal( Item $item, $links, DatabaseBase 
$dbw ) {
+   public function deleteLinksInternal( Item $item, array $links, 
DatabaseBase $dbw ) {
wfDebugLog( __CLASS__, __FUNCTION__ . ': deleting links for ' . 
$item->getId()->getSerialization() );
 
-   //TODO: We can do this in a single query by collecting all the 
site IDs into a set.
-
-   $success = true;
-   foreach ( $links as $link ) {
-   $success = $dbw->delete(
-   $this->table,
-   array(
-   'ips_item_id' => 
$item->getId()->getNumericId(),
-   'ips_site_id' => $link->getSiteId()
-   ),
-   __METHOD__
-   );
-
-   if ( !$success ) {
-   break;
-   }
+   $siteIds = array();
+   foreach ( $links as $siteLink ) {
+   $siteIds[] = $siteLink->getSiteId();
}
+
+   $success = $dbw->delete(
+   $this->table,
+   array(
+   'ips_item_id' => $item->getId()->getNumericId(),
+   'ips_site_id' => $siteIds
+   ),
+   __METHOD__
+   );
 
return $success;
}
@@ -227,6 +219,7 @@
);
 
$this->releaseConnection( $dbw );
+
return $ok;
}
 
diff --git a/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php 
b/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
index 9361e99..5dbef22 100644
--- a/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
@@ -24,7 +24,7 @@
/**
 * @var SiteLinkTable
 */
-   protected $siteLinkTable;
+   private $siteLinkTable;
 
protected function setUp() {
parent::setUp();
@@ -76,9 +76,6 @@
$this->assertFalse( $res

[MediaWiki-commits] [Gerrit] Fix old version fetch - change (pywikibot/core)

2015-09-01 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Fix old version fetch
..

Fix old version fetch

d51b9977 replaced urllib2 with requests, introducing an exception
in the old version detection as it attempted to load json from
a file handle, but the file handle was changed to a decoded string.

Change-Id: I141d77183b63c6d6d417689eb61ea5e40df4fc55
---
M pywikibot/site_detect.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/76/235376/1

diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py
index fed1f56..e5e9b1a 100644
--- a/pywikibot/site_detect.py
+++ b/pywikibot/site_detect.py
@@ -85,7 +85,7 @@
 if self.version is None:
 # try to get version using api
 try:
-d = json.load(fetch(self.api + '?version=json').content)
+d = json.loads(fetch(self.api + '?version=json').raw)
 self.version = filter(
 lambda x: x.startswith("MediaWiki"),
 [l.strip()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I141d77183b63c6d6d417689eb61ea5e40df4fc55
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Enable ferm for role::osm::master (currently only used by la... - change (operations/puppet)

2015-09-01 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Enable ferm for role::osm::master (currently only used by 
labsdb1006)
..

Enable ferm for role::osm::master (currently only used by labsdb1006)

Change-Id: Iac82d0d8864a0b1b761e9721308822fc7d6f96bd
---
M manifests/role/osm.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/235205/1

diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index 64944f1..0ae6c46 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -35,6 +35,7 @@
 include postgresql::postgis
 include osm
 include passwords::osm
+include base::firewall
 
 class { 'postgresql::master':
 includes => 'tuning.conf',

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

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

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

[MediaWiki-commits] [Gerrit] Enable ferm on labsdb1003 - change (operations/puppet)

2015-09-01 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Enable ferm on labsdb1003
..


Enable ferm on labsdb1003

Change-Id: I728909e2c5e19836e2d23cdeaa25eb660d6f8d41
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 42e9e1a..b492147 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1355,6 +1355,7 @@
 node 'labsdb1003.eqiad.wmnet' {
 # this role is depecated and should be converted to labs::db::slave
 include role::mariadb::labs
+include base::firewall
 }
 
 node 'labsdb1004.eqiad.wmnet' {

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

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

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

[MediaWiki-commits] [Gerrit] Test multiple URL:s in the same run - change (performance/WebPageTest)

2015-09-01 Thread Phedenskog (Code Review)

Phedenskog has uploaded a new change for review.

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

Change subject: Test multiple URL:s in the same run
..

Test multiple URL:s in the same run

Made it possible to test multipe URL:s (or scripted
runs) in the same session. Makes's it easier to
schedule runs.

Bug: T110863

Change-Id: I663c107a46c4823d9a39a6cdbde192ed2d4f2feb
---
M lib/cli.js
M lib/index.js
M package.json
3 files changed, 56 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/95/235195/1

diff --git a/lib/cli.js b/lib/cli.js
index 7eabd16..10094b7 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -29,8 +29,9 @@
   // TODO add extra namespace  (key?)
   help: function() {
 console.log(' Thin wrapper for the WebPageTest API that sends metrics to 
statsv.\n');
-console.log(' Usage: ' + process.argv[1] + ' [options] [URL/file]');
-console.log(' Supply a file when you want to script WebPageTest 
https://sites.google.com/a/webpagetest.org/docs/using-webpagetest/scripting.\n')
+console.log(' Usage: ' + process.argv[1] + ' [options] [URLs/files]');
+console.log(' Supply a file when you want to script WebPageTest 
https://sites.google.com/a/webpagetest.org/docs/using-webpagetest/scripting.');
+console.log(' You can test multiple URL:s (or files) supplying them like: 
[options] URL1 URL2 URL3\n');
 console.log(' Options:');
 console.log('   --webPageTestKey The secret key for the WebPageTest 
instance [required]');
 console.log('   --location   The location and browser to use, 
check http://wpt.wmftest.org/getLocations.php [us-west-2:Chrome]');
diff --git a/lib/index.js b/lib/index.js
index dcf938a..df5d9dc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 /*
 wptstatsv
 ~~~
@@ -24,6 +25,7 @@
 var WebPageTest = require('webpagetest'),
   argv = require('minimist')(process.argv.slice(2)),
   util = require('./util'),
+  async = require('async'),
   cli = require('./cli');
 
 var DEFAULT_USER_STATUS = 'anonymous';
@@ -38,36 +40,63 @@
 }
 
 var input = cli.getInputURLorFile(argv._[0]);
-var endpoint = argv.endpoint ||  'https://www.wikimedia.org/beacon/statsv';
+var endpoint = argv.endpoint || 'https://www.wikimedia.org/beacon/statsv';
 var webPageTestHost = argv.webPageTestHost ||  'http://wpt.wmftest.org';
 var wpt = new WebPageTest(webPageTestHost, argv.webPageTestKey);
-var wptOptions = util.setupWPTOptions(argv);
 
-// read custom javascript metrics
-if (argv.customMetrics) {
-  wptOptions.custom = util.readFile(argv.customMetrics);
-}
 
 var userStatus = argv.userStatus || DEFAULT_USER_STATUS;
 
-console.log('Running WebPageTest [' + wptOptions.location + ' ' + 
wptOptions.runs + ' time(s)] for ' + argv._[0]);
+var series = [];
+argv._.forEach(function(url)  {
 
-wpt.runTest(input, wptOptions, function(err, data) {
+  series.push(function(callback) {
 
-  if (err) {
-console.error('Couldn\'t fetch data from WebPageTest:' + 
JSON.stringify(err));
-console.error('Configuration:' + JSON.stringify(wptOptions));
-  } else {
-console.log('Got id:' + data.data.id + ' summary at ' + data.data.summary);
-if (argv.verbose) {
-  console.log(JSON.stringify(data));
+var input = cli.getInputURLorFile(url);
+
+// Note: wptOptions are changed internally when you call runTest, so
+// pollResults and timeout are changed to milliseconds so if we set the 
poll
+// to 10 it will be 1, that's why we recreate the object per run :)
+var wptOptions = util.setupWPTOptions(argv);
+// read custom javascript metrics
+if (argv.customMetrics) {
+  wptOptions.custom = util.readFile(argv.customMetrics);
 }
 
-var collectedMetrics = util.collectMetrics(data);
-if (!argv.dryRun) {
-  util.sendMetrics(collectedMetrics, endpoint);
-} else {
-  console.log('Dry run:' + collectedMetrics);
-}
-  }
+console.log('Running WebPageTest [' + wptOptions.location + ' ' + 
wptOptions.runs + ' time(s)] for ' + input);
+
+wpt.runTest(input, wptOptions, function(err, data) {
+
+  if (err) {
+console.error('Couldn\'t fetch data from WebPageTest:' + 
JSON.stringify(err));
+console.error('Configuration:' + JSON.stringify(wptOptions));
+  } else {
+
+if (argv.verbose) {
+  console.log(JSON.stringify(data));
+}
+
+var collectedMetrics = util.collectMetrics(data);
+if (!argv.dryRun) {
+  util.sendMetrics(collectedMetrics, endpoint);
+} else {
+  console.log('Dry run:' + collectedMetrics);
+}
+callback();
+  }
+});
+  });
 });
+
+// lets run the tests in series so the wait time per test will be per test
+// else we need long wait times if we long many tests.
+async.series(series,
+  // optional callback
+  function(err, results) {
+if (err) {
+

[MediaWiki-commits] [Gerrit] Refactor SearchEntities - change (mediawiki...Wikibase)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Refactor SearchEntities
..


Refactor SearchEntities

Extract EntitySearchHelper and add unit tests for it.
Preparation for T85368

Change-Id: Ie48bbd75cf7cd8da9631c0816223f51f589caa75
---
A repo/includes/api/EntitySearchHelper.php
M repo/includes/api/SearchEntities.php
A repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
M repo/tests/phpunit/includes/api/SearchEntitiesTest.php
4 files changed, 518 insertions(+), 304 deletions(-)

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



diff --git a/repo/includes/api/EntitySearchHelper.php 
b/repo/includes/api/EntitySearchHelper.php
new file mode 100644
index 000..02781e3
--- /dev/null
+++ b/repo/includes/api/EntitySearchHelper.php
@@ -0,0 +1,224 @@
+
+ */
+class EntitySearchHelper {
+
+   /**
+* @var EntityTitleLookup
+*/
+   private $titleLookup;
+
+   /**
+* @var EntityIdParser
+*/
+   private $idParser;
+
+   /**
+* @var TermIndexSearchInteractor
+*/
+   private $termIndexSearchInteractor;
+
+   /**
+* @var TermIndex
+*/
+   private $termIndex;
+
+   /**
+* @var LabelDescriptionLookup
+*/
+   private $labelDescriptionLookup;
+
+   public function __construct(
+   EntityTitleLookup $titleLookup,
+   EntityIdParser $idParser,
+   TermIndexSearchInteractor $termIndexSearchInteractor,
+   TermIndex $termIndex,
+   LabelDescriptionLookup $labelDescriptionLookup
+   ) {
+   $this->titleLookup = $titleLookup;
+   $this->idParser = $idParser;
+   $this->termIndexSearchInteractor = $termIndexSearchInteractor;
+   $this->termIndex = $termIndex;
+   $this->labelDescriptionLookup = $labelDescriptionLookup;
+   }
+
+   /**
+* Gets exact matches. If there are not enough exact matches, it gets 
prefixed matches.
+*
+* @param string $text
+* @param string $languageCode
+* @param string $entityType
+* @param int $limit
+* @param bool $strictLanguage
+*
+* @return TermSearchResult[] Key: string Serialized EntityId
+*/
+   public function getRankedSearchResults( $text, $languageCode, 
$entityType, $limit, $strictLanguage ) {
+   $allSearchResults = array();
+
+   // If $text is the ID of an existing item, include it in the 
result.
+   $entityId = $this->getExactMatchForEntityId( $text, $entityType 
);
+   if ( $entityId !== null ) {
+   // This is nothing to do with terms, but make it look a 
normal result so everything is easier
+   $displayTerms = $this->getDisplayTerms( $entityId );
+   $allSearchResults[$entityId->getSerialization()] = new 
TermSearchResult(
+   new Term( 'qid', $entityId->getSerialization() 
),
+   'entityId',
+   $entityId,
+   $displayTerms['label'],
+   $displayTerms['description']
+   );
+   }
+
+   // If not matched enough then search for full term matches
+   $missing = $limit - count( $allSearchResults );
+   if ( $missing > 0 ) {
+   $exactSearchResults = $this->searchEntities(
+   $text,
+   $languageCode,
+   $entityType,
+   $missing,
+   false,
+   $strictLanguage
+   );
+   $allSearchResults = $this->mergeSearchResults( 
$allSearchResults, $exactSearchResults, $limit );
+
+   // If still not enough matched then search for prefix 
matches
+   $missing = $limit - count( $allSearchResults );
+   if ( $missing > 0 ) {
+   $prefixSearchResults = $this->searchEntities(
+   $text,
+   $languageCode,
+   $entityType,
+   $missing,
+   true,
+   $strictLanguage
+   );
+   $allSearchResults = $this->mergeSearchResults( 
$allSearchResults, $prefixSearchResults, $limit );
+   }
+   }
+
+   return $allSearchResults;
+   }
+
+   /**
+* Gets exact match for the search term as an EntityId if

[MediaWiki-commits] [Gerrit] Fetch missing Navigation Timing metrics and mwLoadEnd. - change (mediawiki...NavigationTiming)

2015-09-01 Thread Phedenskog (Code Review)

Phedenskog has uploaded a new change for review.

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

Change subject: Fetch missing Navigation Timing metrics and mwLoadEnd.
..

Fetch missing Navigation Timing metrics and mwLoadEnd.

Added support for fetching unloadEvent*, redirect*,
domainLookup*, domLoading and domContentLoadedEvent* from
the Navigation Timing API. Also send mediaWikiLoadEventStart
and end as relative to navigation start. Set user timing
for mediaWikiLoadEventEnd.

Bug: T109756
Change-Id: I1aaa31f87e31ec46990fe7420bc664b51927237e
---
M NavigationTiming.php
M modules/ext.navigationTiming.js
2 files changed, 17 insertions(+), 3 deletions(-)


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

diff --git a/NavigationTiming.php b/NavigationTiming.php
index bc9ad81..cc27f5c 100644
--- a/NavigationTiming.php
+++ b/NavigationTiming.php
@@ -53,7 +53,7 @@
$wgEventLoggingSchemas = array();
 }
 $wgEventLoggingSchemas += array(
-   'NavigationTiming' => 12405818,
+   'NavigationTiming' => 13332008,
'SaveTiming'   => 12236257,
 );
 
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index f2bf258..7b820a9 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -95,15 +95,25 @@
$.each( [
'connectEnd',
'connectStart',
+   'domainLookupStart',
+   'domainLookupEnd',
'domComplete',
+   'domContentLoadedEventStart',
+   'domContentLoadedEventEnd',
'domInteractive',
+   'domLoading',
'fetchStart',
'loadEventEnd',
'loadEventStart',
+   'redirectStart',
+   'redirectEnd',
'requestStart',
'responseEnd',
'responseStart',
-   'secureConnectionStart'
+   'secureConnectionStart',
+   'unloadEventStart',
+   'unloadEventEnd',
+
], function ( i, marker ) {
var measure = timing[marker] - navStart;
if ( $.isNumeric( measure ) && measure > 0 ) {
@@ -127,6 +137,9 @@
 
 
function emitNavigationTiming() {
+   // check startup.js for startup time
+   performance.mark( 'mediaWikiStartUpEnd' );
+
var mediaWikiLoadEnd = mw.now ? mw.now() : new Date().getTime(),
event = {
isHttps: location.protocol === 'https:',
@@ -142,7 +155,8 @@
mobileMode = mw.config.get( 'wgMFMode' );
 
if ( window.mediaWikiLoadStart ) {
-   event.mediaWikiLoadComplete = Math.round( 
mediaWikiLoadEnd - mediaWikiLoadStart );
+   event.mediaWikiLoadStart = 
Math.round(mediaWikiLoadStart - timing.navigationStart || timing.fetchStart);
+   event.mediaWikiLoadEnd =  Math.round(mediaWikiLoadEnd - 
timing.navigationStart || timing.fetchStart);
}
 
if ( window.Geo ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aaa31f87e31ec46990fe7420bc664b51927237e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NavigationTiming
Gerrit-Branch: master
Gerrit-Owner: Phedenskog 

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

[MediaWiki-commits] [Gerrit] Enable ferm for osm::slave role (currently only used for lab... - change (operations/puppet)

2015-09-01 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Enable ferm for osm::slave role (currently only used for 
labsdb1007)
..

Enable ferm for osm::slave role (currently only used for labsdb1007)

Change-Id: Ic37a2d029ff0f9354f922db68cf34c6bd52aff68
---
M manifests/role/osm.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/235206/1

diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index 64944f1..cfebbbe 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -174,6 +174,7 @@
 include role::osm::common
 include postgresql::postgis
 include passwords::osm
+include base::firewall
 # Note: This is here to illustrate the fact that the slave is expected to
 # have the same dbs as the master.
 #postgresql::spatialdb { 'gis': }

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

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

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

[MediaWiki-commits] [Gerrit] Remove requirement that an "alphabetic" sort order must be d... - change (mediawiki...Wikibase)

2015-09-01 Thread WMDE

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

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

Change subject: Remove requirement that an "alphabetic" sort order must be 
defined
..

Remove requirement that an "alphabetic" sort order must be defined

This came up while working on T103044.

Bug: T111023
Change-Id: I827e8e0d0291354902e4c3cf694a9dab3db80c89
---
M client/includes/InterwikiSorter.php
M client/tests/phpunit/includes/InterwikiSorterTest.php
2 files changed, 21 insertions(+), 24 deletions(-)


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

diff --git a/client/includes/InterwikiSorter.php 
b/client/includes/InterwikiSorter.php
index b70c9b7..c49badb 100644
--- a/client/includes/InterwikiSorter.php
+++ b/client/includes/InterwikiSorter.php
@@ -2,8 +2,6 @@
 
 namespace Wikibase;
 
-use InvalidArgumentException;
-
 /**
  * Language sorting utility functions.
  *
@@ -42,16 +40,8 @@
 * @param string $sort
 * @param array[] $sortOrders
 * @param string[] $sortPrepend
-*
-* @throws InvalidArgumentException
 */
-   public function __construct( $sort, array $sortOrders, array 
$sortPrepend ) {
-   if ( !array_key_exists( 'alphabetic', $sortOrders ) ) {
-   throw new InvalidArgumentException(
-   'alphabetic interwiki sorting order is missing 
from Wikibase Client settings.'
-   );
-   }
-
+   public function __construct( $sort, array $sortOrders = array(), array 
$sortPrepend = array() ) {
$this->sort = $sort;
$this->sortOrders = $sortOrders;
$this->sortPrepend = $sortPrepend;
@@ -129,22 +119,16 @@
 * @return int[]
 */
private function buildSortOrder( $sort, array $sortOrders ) {
-   $sortOrder = $sortOrders['alphabetic'];
-
-   if ( $sort === 'alphabetic' ) {
-   // do nothing
-   } elseif ( $sort === 'code' ) {
+   if ( $sort === 'code' ) {
// The concept of known/unknown languages is irrelevant 
in strict code order.
$sortOrder = array();
+   } elseif ( !array_key_exists( $sort, $sortOrders ) ) {
+   // something went wrong, but we can use default order
+   trigger_error( __CLASS__
+   . ' : invalid or unknown sort order specified 
for interwiki links.', E_USER_WARNING );
+   $sortOrder = array();
} else {
-   if ( array_key_exists( $sort, $sortOrders ) ) {
-   $sortOrder = $sortOrders[$sort];
-   } else {
-   // something went wrong but we can use default 
order
-   trigger_error( __CLASS__
-   . ' : invalid or unknown sort order 
specified for interwiki links.', E_USER_WARNING );
-   sort( $sortOrder );
-   }
+   $sortOrder = $sortOrders[$sort];
}
 
if ( $this->sortPrepend !== array() ) {
diff --git a/client/tests/phpunit/includes/InterwikiSorterTest.php 
b/client/tests/phpunit/includes/InterwikiSorterTest.php
index e0d8243..9eeaccf 100644
--- a/client/tests/phpunit/includes/InterwikiSorterTest.php
+++ b/client/tests/phpunit/includes/InterwikiSorterTest.php
@@ -101,6 +101,13 @@
array( 'e' ), // prepend
array( 'e', 'a', 'b', 'c', 'd', 'f' )
),
+   'Code w/o alphabetic' => array(
+   array( 'c', 'b', 'a' ),
+   'code',
+   array(),
+   array(),
+   array( 'a', 'b', 'c' )
+   ),
array(
array( 'a', 'b', 'k', 'x' ),
'alphabetic',
@@ -120,4 +127,10 @@
$this->assertEquals( $expected, $sortedLinks );
}
 
+   public function testGivenInvalidSort_sortLinksTriggersError() {
+   $interwikiSorter = new InterwikiSorter( 'invalid' );
+   $this->setExpectedException( 'PHPUnit_Framework_Error_Warning' 
);
+   $interwikiSorter->sortLinks( array() );
+   }
+
 }

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

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

[MediaWiki-commits] [Gerrit] Add support for setting custom namespace - change (performance/WebPageTest)

2015-09-01 Thread Phedenskog (Code Review)

Phedenskog has uploaded a new change for review.

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

Change subject: Add support for setting custom namespace
..

Add support for setting custom namespace

You can now configure custom namespace of the data
sent to statsv, meaning you can yourself choose namespace
and have a specific one for baselinepages and when
testing with a mobile phone.

Bug: T110220
Change-Id: I75fcf0cb11f78c097880428abef19c2ea323eaa8
---
M lib/cli.js
M lib/index.js
M lib/util.js
M test/utilTest.js
4 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/96/235196/1

diff --git a/lib/cli.js b/lib/cli.js
index 7eabd16..b22fd35 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -33,6 +33,7 @@
 console.log(' Supply a file when you want to script WebPageTest 
https://sites.google.com/a/webpagetest.org/docs/using-webpagetest/scripting.\n')
 console.log(' Options:');
 console.log('   --webPageTestKey The secret key for the WebPageTest 
instance [required]');
+console.log('   --namespace  The namespace of the key sent to 
statsv. [webpagetest]');
 console.log('   --location   The location and browser to use, 
check http://wpt.wmftest.org/getLocations.php [us-west-2:Chrome]');
 console.log('   --connectivity   Connectivity profile 
(Cable|DSL|FIOS|Dial|3G|3GFast|Native|custom) [Cable]');
 console.log('   --runs   Number of test runs [11]');
diff --git a/lib/index.js b/lib/index.js
index dcf938a..6bf2a95 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -27,6 +27,7 @@
   cli = require('./cli');
 
 var DEFAULT_USER_STATUS = 'anonymous';
+var DEFAULT_NAMESPACE = 'webpagetest';
 
 if (argv.help) {
   cli.help();
@@ -49,6 +50,7 @@
 }
 
 var userStatus = argv.userStatus || DEFAULT_USER_STATUS;
+var namespace = argv.namespace || DEFAULT_NAMESPACE;
 
 console.log('Running WebPageTest [' + wptOptions.location + ' ' + 
wptOptions.runs + ' time(s)] for ' + argv._[0]);
 
@@ -63,7 +65,7 @@
   console.log(JSON.stringify(data));
 }
 
-var collectedMetrics = util.collectMetrics(data);
+var collectedMetrics = util.collectMetrics(data, userStatus, namespace);
 if (!argv.dryRun) {
   util.sendMetrics(collectedMetrics, endpoint);
 } else {
diff --git a/lib/util.js b/lib/util.js
index bd8b950..a7592f8 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -25,7 +25,6 @@
 path = require('path');
 
 var VIEWS = ['firstView', 'repeatView'];
-var NAMESPACE = 'webpagetest';
 var DEFAULT_USER_STATUS = 'anonymous';
 var BROWSERS = {
   'Google Chrome': 'chrome',
@@ -81,7 +80,7 @@
   path.sep, filename);
 return fs.readFileSync(fullPathToFile, 'utf-8');
   },
-  collectMetrics: function(wptJson, userStatus) {
+  collectMetrics: function(wptJson, userStatus, namespace) {
 
 var self = this;
 var metricsToSend = [];
@@ -93,12 +92,12 @@
   var browser = BROWSERS[wptJson.data.median[view].browser_name] || 
wptJson.data.location.replace(/[^A-Za-z_]/g, '_');
 
   self.METRICS.forEach(function(metric) {
-metricsToSend.push(NAMESPACE + '.' + userStatus + '.' + browser + '.' 
+ view + '.' + metric + '=' + wptJson.data.median[view][metric] + 'ms');
+metricsToSend.push(namespace + '.' + userStatus + '.' + browser + '.' 
+ view + '.' + metric + '=' + wptJson.data.median[view][metric] + 'ms');
   });
 
   if (wptJson.data.median.firstView.userTimes) {
 
Object.keys(wptJson.data.median.firstView.userTimes).forEach(function(userTiming)
 {
-  metricsToSend.push(NAMESPACE + '.' + userStatus + '.' + browser + 
'.' + view + '.' + userTiming + '=' + 
wptJson.data.median[view].userTimes[userTiming] + 'ms');
+  metricsToSend.push(namespace + '.' + userStatus + '.' + browser + 
'.' + view + '.' + userTiming + '=' + 
wptJson.data.median[view].userTimes[userTiming] + 'ms');
 });
   }
 });
diff --git a/test/utilTest.js b/test/utilTest.js
index bfd54c4..59bb501 100644
--- a/test/utilTest.js
+++ b/test/utilTest.js
@@ -39,7 +39,7 @@
 
   it('Parameters specific for wptstatsv should be cleaned out from WebPageTest 
options', function() {
 
-var keysToBeRemoved = ['webPageTestKey', 'webPageTestHost', '_', 
'verbose', 'userStatus', 'dryRun', 'customMetrics'];
+var keysToBeRemoved = ['webPageTestKey', 'webPageTestHost', '_', 
'verbose', 'userStatus', 'dryRun', 'customMetrics', 'namespace'];
 var args = {
   webPageTestKey: 'aSupERSecrEtKey',
   webPageTestHost: 'http://our.wpt.org',
@@ -47,7 +47,8 @@
   verbose: true,
   userStatus: 'anonymous',
   dryRun: true,
-  customMetrics: 'javascript that collects custom metrics'
+  customMetrics: 'javascript that collects custom metrics',
+  namespace: 'super.special.namespace'
 };
 
 var wptOptions = util.setupWPTOptions(args);
@@ -59,7 +60,8 @@
 
   it('We should be

[MediaWiki-commits] [Gerrit] labstore: Run the cleanup script every day - change (operations/puppet)

2015-09-01 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: labstore: Run the cleanup script every day
..

labstore: Run the cleanup script every day

Bug: T109954
Change-Id: Ie0ded32d134541ff77468f0621cf2fbdfd1f678c
---
M modules/labstore/manifests/fileserver/cleanup_snapshots.pp
A modules/labstore/templates/initscripts/cleanup.timer.erb
2 files changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/235203/1

diff --git a/modules/labstore/manifests/fileserver/cleanup_snapshots.pp 
b/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
index 7aba5e5..8bcbb44 100644
--- a/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
+++ b/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
@@ -16,4 +16,17 @@
 systemd => true,
 declare_service => false,
 }
+
+file { "/etc/systemd/system/cleanup-${volume_group}.timer":
+ensure  => present,
+owner   => "root",
+group   => "root",
+mode=> "0444",
+content => template("labstore/initscripts/cleanup.timer.erb"),
+}
+
+nrpe::monitor_systemd_unit_state { "cleanup-${volume_group}":
+description=> "Last cleanup of snapshots in the ${volume_group} 
vg",
+expected_state => "periodic 9", # 25h (i.e. daily but with a bit 
of give)
+}
 }
diff --git a/modules/labstore/templates/initscripts/cleanup.timer.erb 
b/modules/labstore/templates/initscripts/cleanup.timer.erb
new file mode 100644
index 000..2aa8e0f
--- /dev/null
+++ b/modules/labstore/templates/initscripts/cleanup.timer.erb
@@ -0,0 +1,9 @@
+[Unit]
+Description=Cleanup snapshots (<%= @title %>)
+
+[Timer]
+OnCalendar=<%= @calendar %>
+Persistent=true
+
+[Install]
+WantedBy=timers.target

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

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

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

[MediaWiki-commits] [Gerrit] add apps development guidelines to legal text for dumps - change (operations/puppet)

2015-09-01 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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

Change subject: add apps development guidelines to legal text for dumps
..

add apps development guidelines to legal text for dumps

Change-Id: I100f2f5a32d8c45fa25009dd96d74c5553a4e4bb
---
M modules/snapshot/files/dumps/templates/legal.html
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/235208/1

diff --git a/modules/snapshot/files/dumps/templates/legal.html 
b/modules/snapshot/files/dumps/templates/legal.html
index dd209fc..ee1e2a4 100644
--- a/modules/snapshot/files/dumps/templates/legal.html
+++ b/modules/snapshot/files/dumps/templates/legal.html
@@ -135,6 +135,8 @@

More information: for researchers
If you’re a researcher, you can find https://meta.wikimedia.org/wiki/Research:Data;>more information about our 
data sources as part of our https://meta.wikimedia.org/wiki/Research:Index;>Research hub.
+   Apps Guidelines
+   https://wikimediafoundation.org/wiki/Developer_app_guidelines;>Guidelines 
for developers on how to properly reuse Wikimedia data, trademarks, and 
content.
Questions?
For questions, please contact 
le...@wikimedia.org.


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

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

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

[MediaWiki-commits] [Gerrit] schedule stages of dumps to run in order on a given host - change (operations/dumps)

2015-09-01 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: schedule stages of dumps to run in order on a given host
..


schedule stages of dumps to run in order on a given host

this replaces the manual method of running dump scripts in
a multitude of screens on each host, now that we have moved
to staged dumps

Change-Id: Iac7b0af53de1463148b488098a927bb123d723c5
---
A xmldumps-backup/dumpscheduler.py
1 file changed, 530 insertions(+), 0 deletions(-)

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



diff --git a/xmldumps-backup/dumpscheduler.py b/xmldumps-backup/dumpscheduler.py
new file mode 100644
index 000..6e660d0
--- /dev/null
+++ b/xmldumps-backup/dumpscheduler.py
@@ -0,0 +1,530 @@
+'''
+run a set of commands in a given order,
+given information about how many free slots
+the host has for such processes and how many
+slots each process takes.
+'''
+import os
+import sys
+import getopt
+from subprocess import Popen
+import logging
+import time
+import smtplib
+import email.mime.text
+import json
+import traceback
+
+LOG = logging.getLogger(__name__)
+
+
+def line_to_entry(line):
+'''
+convert a line of text representing a command to be run,
+into an entry describing the command info
+
+line has content: slots count onfailure errornotify command
+onfailure may be one of continue exit retry
+'''
+slots, count, onfailure, errornotify, command = line.split(' ', 4)
+return {'slots': int(slots),
+'count': int(count),
+'command': command,
+'onfailure': onfailure,
+'errornotify': errornotify,
+'processes': [],
+'processids': [],
+'procidsfromcache': [],
+'done': 0}
+
+
+def json_obj_dump(obj):
+return
+
+
+class Scheduler(object):
+'''
+handle running a sequence of commands, each command possibly to
+be run multiple times, each command possibly using more than
+one 'slot' of resources (think cpu)
+'''
+
+def __init__(self, file_p, slots, cache, mailhost,
+ email_from, restore, rerun):
+'''
+constructor
+also define a unique id that is set in the environment of every command
+run and can be used later if this script dies, to check to see if a 
command
+with the same pid and environment variable is still running
+'''
+
+self.input = file_p
+self.total_slots = slots
+self.commands = []
+self.free_slots = slots
+self.cache = cache
+self.mailhost = mailhost
+self.restore = restore
+self.rerun = rerun
+self.pid = os.getpid()
+self.my_id = "%s%d%s" % (time.strftime("%Y%m%d%H%M%S", time.gmtime()),
+ self.pid, os.geteuid())
+self.my_prefix = 'PYMGR_ID'
+self.email_from = email_from
+
+def run(self):
+'''
+run all commands in order.
+if this script died and was restarted with the option to
+restore from cache, it will restore its state and check the
+commands that were running at the time of interruption,
+rerunning them after they complete, if specified.
+this script has no way to tell if such processes ran to
+successful completion which is why a rerun might be a good choice.
+
+waits 30 seconds in between starting up new commands, assuming
+free slots (e.g. cpu resources) are available.
+'''
+
+if self.cache and self.restore:
+self.restore_from_cache()
+if self.rerun:
+for entry in self.commands:
+entry['rerun'] = True
+else:
+self.read_commands()
+os.environ[self.my_prefix] = self.my_id
+
+while True:
+if self.start_command() is None:
+self.save_to_cache()
+LOG.info("all command sets completed.")
+break
+# do we want this configurable? meh
+# 30 seconds is fine, we're dealing with long running commands here
+time.sleep(30)
+
+def read_commands(self):
+'''
+read text entries describing each set of commands to be run
+'''
+
+for line in self.input:
+line = line.rstrip('\n')
+if line.startswith('#') or line.startswith(" ") or not line:
+continue
+self.commands.append(line_to_entry(line))
+if self.input != sys.stdin:
+self.input.close()
+
+def check_pid(self, pid):
+'''
+see if process with given pid is running
+and if we started it. if the process was running
+when this script was interrupted and we restored
+from cache, we check that the special environment
+variable is set for the process, to ensure the pid
+didn't get

[MediaWiki-commits] [Gerrit] Reduce flash of unstyled content appearance - change (mediawiki...Translate)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Reduce flash of unstyled content appearance
..


Reduce flash of unstyled content appearance

FOUT is made more obvious by the recent async loading change.

Shuffled some CSS around so that it can be loaded with addModuleStyles.
Load jquery.uls.grid with addModuleStyles and remove from explicit
dependencies.

Tweaked group selector CSS to retain display with different style
loading order.

Moved some non-TUX CSS to separate file to not load it on most requests.

In message table hide part of the output until JS is loaded.

Load tabgroup with addModuleStyles as it only contains CSS which needs
to be applied immediately to avoid FOUT.

Tested by loading Special:Translate and Special:SearchTranslations without
JS support and verifying the output looks (almost) similar to that of fully
loaded page with JS enabled.

Change-Id: Ib5d4d97a3c9e56019b9b36b31d5b1fb4611f4ca2
---
M Resources.php
M resources/css/ext.translate.groupselector.css
A resources/css/ext.translate.legacy.css
M resources/css/ext.translate.messagetable.css
M resources/css/ext.translate.special.translate.css
M resources/js/ext.translate.messagetable.js
M specials/SpecialManageGroups.php
M specials/SpecialSearchTranslations.php
M specials/SpecialTranslate.php
M utils/TuxMessageTable.php
10 files changed, 168 insertions(+), 170 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index ba7089e..c074372 100644
--- a/Resources.php
+++ b/Resources.php
@@ -55,7 +55,6 @@
'ext.translate.hooks',
'ext.translate.dropdownmenu',
'ext.uls.buttons',
-   'jquery.uls.grid',
'mediawiki.util',
'mediawiki.Uri',
'mediawiki.api',
@@ -121,7 +120,6 @@
'position' => 'top',
'dependencies' => array(
'ext.translate.base',
-   'jquery.uls.grid',
'ext.translate.statsbar',
'mediawiki.jqueryMsg',
'ext.translate.loader',
@@ -146,6 +144,10 @@
'position' => 'top',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.legacy'] = array(
+   'styles' => 'resources/css/ext.translate.legacy.css',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.loader'] = array(
'styles' => 'resources/css/ext.translate.loader.css',
'position' => 'top',
@@ -154,7 +156,6 @@
 $wgResourceModules['ext.translate.messagetable'] = array(
'scripts' => 'resources/js/ext.translate.messagetable.js',
'styles' => 'resources/css/ext.translate.messagetable.css',
-   'position' => 'top',
'dependencies' => array(
'ext.translate.base',
'ext.translate.hooks',
@@ -397,7 +398,6 @@
 
 $wgResourceModules['ext.translate.special.searchtranslations'] = array(
'scripts' => 'resources/js/ext.translate.special.searchtranslations.js',
-   'styles' => 
'resources/css/ext.translate.special.searchtranslations.css',
'dependencies' => array(
'ext.translate.editor',
'ext.uls.mediawiki',
@@ -414,15 +414,17 @@
'position' => 'top',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.special.searchtranslations.styles'] = array(
+   'styles' => 
'resources/css/ext.translate.special.searchtranslations.css',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.special.supportedlanguages'] = array(
'styles' => 
'resources/css/ext.translate.special.supportedlanguages.css',
'position' => 'top',
 ) + $resourcePaths;
 
 $wgResourceModules['ext.translate.special.translate'] = array(
-   'styles' => 'resources/css/ext.translate.special.translate.css',
'scripts' => 'resources/js/ext.translate.special.translate.js',
-   'position' => 'top',
'dependencies' => array(
'mediawiki.jqueryMsg',
'mediawiki.Uri',
@@ -446,6 +448,10 @@
),
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.special.translate.styles'] = array(
+   'styles' => 'resources/css/ext.translate.special.translate.css',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.special.translationstash'] = array(
'scripts' => 'resources/js/ext.translate.special.translationstash.js',
'styles' => 'resources/css/ext.translate.special.translationstash.css',
diff --git a/resources/css/ext.translate.groupselector.css 
b/resources/css/ext.translate.groupselector.css
index d3fdca5..3b764a1 100644
--- a/resources/css/ext.translate.groupselector.css
+++ b/resources/css/ext.translate.groupselector.css
@@ -1,46 +1,3 @@
-/*
- * Breadcrumb
- */
-.tux-breadcrumb {
-   margin-bottom: 10px;
-}
-
-.tux-breadcrumb .grouplink + .grouplink:before {
-   border-left: 4px solid #777;
-   border-top: 4px solid

[MediaWiki-commits] [Gerrit] Add composer.lock to .gitignore - change (mediawiki...Blueprint)

2015-09-01 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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

Change subject: Add composer.lock to .gitignore
..

Add composer.lock to .gitignore

Change-Id: Ic051ac8fac1d88b3153589e2e851a09dd8254997
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint 
refs/changes/07/235207/1

diff --git a/.gitignore b/.gitignore
index 8404965..c311080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 node_modules
 vendor
+composer.lock

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic051ac8fac1d88b3153589e2e851a09dd8254997
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Amire80 

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

[MediaWiki-commits] [Gerrit] Strict code order in InterwikiSorter - change (mediawiki...Wikibase)

2015-09-01 Thread jenkins-bot (Code Review)

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

Change subject: Strict code order in InterwikiSorter
..


Strict code order in InterwikiSorter

As discussed in Ib9add17 unknown languages must go to the bottom.
But there is one exception: "code" order is strictly alphabetical.
It should not make any difference if a language is known or not in
the "sortOrders" setting. Simply do: prepend first, everything else
alphabetical. Done.

Bug: T103044
Change-Id: Ib738e2d95024fa35600e60418f65ff9427c8493d
---
M client/includes/InterwikiSorter.php
M client/tests/phpunit/includes/InterwikiSorterTest.php
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/client/includes/InterwikiSorter.php 
b/client/includes/InterwikiSorter.php
index 0497ab9..b70c9b7 100644
--- a/client/includes/InterwikiSorter.php
+++ b/client/includes/InterwikiSorter.php
@@ -134,7 +134,8 @@
if ( $sort === 'alphabetic' ) {
// do nothing
} elseif ( $sort === 'code' ) {
-   sort( $sortOrder );
+   // The concept of known/unknown languages is irrelevant 
in strict code order.
+   $sortOrder = array();
} else {
if ( array_key_exists( $sort, $sortOrders ) ) {
$sortOrder = $sortOrders[$sort];
diff --git a/client/tests/phpunit/includes/InterwikiSorterTest.php 
b/client/tests/phpunit/includes/InterwikiSorterTest.php
index 78b5db7..e0d8243 100644
--- a/client/tests/phpunit/includes/InterwikiSorterTest.php
+++ b/client/tests/phpunit/includes/InterwikiSorterTest.php
@@ -94,6 +94,13 @@
array( 'e' ),
array( 'e', 'c', 'a', 'b', 'd', 'f' )
),
+   'Strict code order' => array(
+   array( 'f', 'd', 'b', 'a', 'c', 'e' ),
+   'code',
+   array( 'alphabetic' => array( 'c', 'a' ) ), // 
this should be ignored
+   array( 'e' ), // prepend
+   array( 'e', 'a', 'b', 'c', 'd', 'f' )
+   ),
array(
array( 'a', 'b', 'k', 'x' ),
'alphabetic',

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

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

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

< 1 2 3 4 >

101 - 200 of 340 matches

Mail list logo