date:20160222

[MediaWiki-commits] [Gerrit] Remove mediawiki.sectionAnchor - change (mediawiki...Vector)

2016-02-22 Thread Majr (Code Review)

Majr has uploaded a new change for review.

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

Change subject: Remove mediawiki.sectionAnchor
..

Remove mediawiki.sectionAnchor

The feature was reverted in 5205405385397782b5288b429f49c9d8c97ac6c6 almost a
year ago, so it's pretty safe to say this styling is unnecessary.

This essentially reverts 2466e550e53309dab057ae07841175bd992bce7e.

Change-Id: I88b6465d5554d334cc34893bb0acf548a5fc440b
---
M skin.json
D skinStyles/mediawiki.sectionAnchor.less
2 files changed, 0 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/77/272677/1

diff --git a/skin.json b/skin.json
index 22a219d..ebcb721 100644
--- a/skin.json
+++ b/skin.json
@@ -88,7 +88,6 @@
"jquery.ui.tabs": 
"skinStyles/jquery.ui/jquery.ui.tabs.css",
"jquery.ui.tooltips": 
"skinStyles/jquery.ui/jquery.ui.tooltips.css",
"+mediawiki.notification": 
"skinStyles/mediawiki.notification.less",
-   "+mediawiki.sectionAnchor": 
"skinStyles/mediawiki.sectionAnchor.less",
"+oojs-ui.styles": "skinStyles/ooui.less",
"mediawiki.special": 
"skinStyles/mediawiki.special.less",
"+mediawiki.special.preferences.styles": 
"skinStyles/mediawiki.special.preferences.styles.less"
diff --git a/skinStyles/mediawiki.sectionAnchor.less 
b/skinStyles/mediawiki.sectionAnchor.less
deleted file mode 100644
index 6a74810..000
--- a/skinStyles/mediawiki.sectionAnchor.less
+++ /dev/null
@@ -1,45 +0,0 @@
-@media screen {
-   .mw-headline-anchor {
-   margin-left: -16px;
-   width: 16px;
-   }
-
-   .mw-content-ltr .mw-headline-anchor,
-   .mw-content-rtl .mw-content-ltr .mw-headline-anchor {
-   /* @noflip */
-   margin-left: -16px;
-   /* @noflip */
-   margin-right: 0;
-   }
-
-   .mw-content-rtl .mw-headline-anchor,
-   .mw-content-ltr .mw-content-rtl .mw-headline-anchor {
-   /* @noflip */
-   margin-left: 0;
-   /* @noflip */
-   margin-right: -16px;
-   }
-}
-
-@media screen and (min-width: 982px) {
-   .mw-headline-anchor {
-   margin-left: -20px;
-   width: 20px;
-   }
-
-   .mw-content-ltr .mw-headline-anchor,
-   .mw-content-rtl .mw-content-ltr .mw-headline-anchor {
-   /* @noflip */
-   margin-left: -20px;
-   /* @noflip */
-   margin-right: 0;
-   }
-
-   .mw-content-rtl .mw-headline-anchor,
-   .mw-content-ltr .mw-content-rtl .mw-headline-anchor {
-   /* @noflip */
-   margin-left: 0;
-   /* @noflip */
-   margin-right: -20px;
-   }
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88b6465d5554d334cc34893bb0acf548a5fc440b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Majr 

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

[MediaWiki-commits] [Gerrit] [Echo] Add new optional key - change (translatewiki)

2016-02-22 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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

Change subject: [Echo] Add new optional key
..

[Echo] Add new optional key

https://gerrit.wikimedia.org/r/#/c/266474/8/i18n/en.json,unified

Change-Id: I9ff12df90c2ac1f7e5e506202d2846ad4faa0e0d
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/76/272676/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 321c348..c97c991 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -890,6 +890,7 @@
 optional = echo-notification-count
 optional = echo-email-batch-separator, echo-email-batch-bullet, 
echo-quotation-marks
 optional = notification-body-edit-user-talk-with-section, 
notification-body-reverted
+optional = echo-foreign-wiki-lang
 ignored = echo-email-batch-separator, notification-welcome-link, 
notification-body-mention
 ignored = notification-body-emailuser, notification-body-user-rights
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ff12df90c2ac1f7e5e506202d2846ad4faa0e0d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [Echo] Add new optional key - change (translatewiki)

2016-02-22 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: [Echo] Add new optional key
..


[Echo] Add new optional key

https://gerrit.wikimedia.org/r/#/c/266474/8/i18n/en.json,unified

Change-Id: I9ff12df90c2ac1f7e5e506202d2846ad4faa0e0d
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 321c348..c97c991 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -890,6 +890,7 @@
 optional = echo-notification-count
 optional = echo-email-batch-separator, echo-email-batch-bullet, 
echo-quotation-marks
 optional = notification-body-edit-user-talk-with-section, 
notification-body-reverted
+optional = echo-foreign-wiki-lang
 ignored = echo-email-batch-separator, notification-welcome-link, 
notification-body-mention
 ignored = notification-body-emailuser, notification-body-user-rights
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ff12df90c2ac1f7e5e506202d2846ad4faa0e0d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Include Brasil (pt wiki) in webpagetest runs - change (performance/WebPageTest)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Include Brasil (pt wiki) in webpagetest runs
..


Include Brasil (pt wiki) in webpagetest runs

pt is a smaller wiki. As part of the lazy loading references work
we would like to run a test on this wiki. Having this represented in
tests would thus be useful. The Brazil pt page is a good representative article
where references seems to carry a lot of weight in the page HTML.

Bug: T126802
Change-Id: I11c64b2e766680aa3c8f054d683e9cb01d6e3282
---
M scripts/batch/mobile.txt
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/scripts/batch/mobile.txt b/scripts/batch/mobile.txt
index 020e323..4f812f0 100644
--- a/scripts/batch/mobile.txt
+++ b/scripts/batch/mobile.txt
@@ -21,6 +21,10 @@
 
 --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m-2g 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-beta-2gslow.anonymous.Barack_Obama --emulateMobile 
true --bandwidthDown 35000 --bandwidthUp 32000 --latency 1300 --connectivity 
custom --reporter statsv 
https://en.m.wikipedia.org/wiki/Barack_Obama?mobileaction=beta
 
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m-2g 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-2gslow.anonymous.pt-Brasil --emulateMobile true 
--bandwidthDown 35000 --bandwidthUp 32000 --latency 1300 --connectivity custom 
--reporter statsv https://pt.m.wikipedia.org/wiki/Brasil
+
+--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m-2g 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile-beta-2gslow.anonymous.pt-Brasil --emulateMobile true 
--bandwidthDown 35000 --bandwidthUp 32000 --latency 1300 --connectivity custom 
--reporter statsv https://pt.m.wikipedia.org/wiki/Brasil?mobileaction=beta
+
 --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.test2wiki-mobile.anonymous.signup --emulateMobile true 
--connectivity 3GFast --reporter statsv 
https://test2.m.wikipedia.org/w/index.php?title=Special:UserLogin&type=signup
 
 --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median 
SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m 
--runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace 
webpagetest.enwiki-mobile.anonymous.BlankPage --emulateMobile true 
--connectivity 3GFast --reporter statsv 
https://en.m.wikipedia.org/wiki/Special:BlankPage

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11c64b2e766680aa3c8f054d683e9cb01d6e3282
Gerrit-PatchSet: 1
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Phedenskog 
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: Warning: Division by zero in includes/BuildDocument/Sug... - change (mediawiki...CirrusSearch)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix: Warning: Division by zero in 
includes/BuildDocument/SuggestScoring.php on line 188
..


Fix: Warning: Division by zero in includes/BuildDocument/SuggestScoring.php on 
line 188

Change-Id: Ie011f55213fc3bde910e124526d93751be9afe9d
---
M includes/BuildDocument/SuggestScoring.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/BuildDocument/SuggestScoring.php 
b/includes/BuildDocument/SuggestScoring.php
index 5049554..edfd649 100644
--- a/includes/BuildDocument/SuggestScoring.php
+++ b/includes/BuildDocument/SuggestScoring.php
@@ -144,10 +144,6 @@
 */
public function __construct( $boostTemplates = null ) {
$this->boostTemplates = $boostTemplates ?: 
Util::getDefaultBoostTemplates();
-   if ( $this->incomingLinksNorm < 1 ) {
-   // it's a very small wiki let's force the norm to 1
-   $this->incomingLinksNorm = 1;
-   }
}
 
/**
@@ -267,6 +263,10 @@
$this->maxDocs = $maxDocs;
// We normalize incoming links according to the size of the 
index
$this->incomingLinksNorm = (int) ($maxDocs * 
self::INCOMING_LINKS_MAX_DOCS_FACTOR);
+   if ( $this->incomingLinksNorm < 1 ) {
+   // it's a very small wiki let's force the norm to 1
+   $this->incomingLinksNorm = 1;
+   }
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie011f55213fc3bde910e124526d93751be9afe9d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove cirrus-suggest api and supporting js - change (mediawiki...CirrusSearch)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Remove cirrus-suggest api and supporting js
..


Remove cirrus-suggest api and supporting js

This is deprecated in favor of recent work to trigger completion
suggester directly from the main opensearch api. Anything that
could have been done with this is now doable from the standard
mediawiki core actions.

This was an internal API call and only used from the js file here,
it should be safe to completely remove.

Change-Id: I051437a5ee238716dd773ee66951ce25bef984b1
---
M CirrusSearch.php
M autoload.php
M i18n/en.json
M i18n/qqq.json
D includes/Api/Suggest.php
D resources/ext.cirrus.suggest.js
6 files changed, 0 insertions(+), 123 deletions(-)

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



diff --git a/CirrusSearch.php b/CirrusSearch.php
index beefc54..699a613 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -954,30 +954,11 @@
 $wgAPIModules['cirrus-config-dump'] = 'CirrusSearch\Api\ConfigDump';
 $wgAPIModules['cirrus-mapping-dump'] = 'CirrusSearch\Api\MappingDump';
 $wgAPIModules['cirrus-settings-dump'] = 'CirrusSearch\Api\SettingsDump';
-$wgAPIModules['cirrus-suggest'] = 'CirrusSearch\Api\Suggest';
 
 /**
  * Configs
  */
 $wgConfigRegistry['CirrusSearch'] = 
'CirrusSearch\SearchConfig::newFromGlobals';
-
-/**
- * Completion Suggester Beta Feature
- */
-$wgResourceModules += array(
-   "ext.cirrus" => array(
-   'scripts' => array(
-   'resources/ext.cirrus.suggest.js'
-   ),
-   'dependencies' => array(
-   'mediawiki.searchSuggest'
-   ),
-   'styles' => array(),
-   'messages' => array(),
-   'remoteExtPath' => 'CirrusSearch',
-   'localBasePath' => __DIR__,
-   )
-);
 
 /**
  * Jenkins configuration required to get all the browser tests passing cleanly.
diff --git a/autoload.php b/autoload.php
index e4820a2..a052f35 100644
--- a/autoload.php
+++ b/autoload.php
@@ -10,7 +10,6 @@
'CirrusSearch\\Api\\FreezeWritesToCluster' => __DIR__ . 
'/includes/Api/FreezeWritesToCluster.php',
'CirrusSearch\\Api\\MappingDump' => __DIR__ . 
'/includes/Api/MappingDump.php',
'CirrusSearch\\Api\\SettingsDump' => __DIR__ . 
'/includes/Api/SettingsDump.php',
-   'CirrusSearch\\Api\\Suggest' => __DIR__ . '/includes/Api/Suggest.php',
'CirrusSearch\\Api\\SuggestIndex' => __DIR__ . 
'/includes/Api/SuggestIndex.php',
'CirrusSearch\\BuildDocument\\Builder' => __DIR__ . 
'/includes/BuildDocument/Builder.php',
'CirrusSearch\\BuildDocument\\FileDataBuilder' => __DIR__ . 
'/includes/BuildDocument/FileDataBuilder.php',
diff --git a/i18n/en.json b/i18n/en.json
index 976aea7..baa8eb2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -22,10 +22,6 @@
"apihelp-cirrus-mapping-dump-example": "Get a dump of the CirrusSearch 
mapping for this wiki.",
"apihelp-cirrus-settings-dump-description": "Dump of CirrusSearch 
settings for this wiki.",
"apihelp-cirrus-settings-dump-example": "Get a dump of CirrusSearch 
settings for this wiki.",
-   "apihelp-cirrus-suggest-description": "Suggest completions for search 
term.",
-   "apihelp-cirrus-suggest-param-text": "Search term to provide 
completions for.",
-   "apihelp-cirrus-suggest-param-limit": "How many results to return.",
-   "apihelp-cirrus-suggest-param-context": "Search context limiting the 
search, e.g. geo or category.",
"cirrussearch-give-feedback": "Give us your feedback",
"cirrussearch-morelikethis-settings": " # \n# This message lets you configure the settings of the 
\"more like this\" feature.\n# Changes to this take effect immediately.\n# The 
syntax is as follows:\n#   * Everything from a \"#\" character to the end of 
the line is a comment.\n#   * Every non-blank line is the setting name followed 
by a \":\" character followed by the setting value\n# The settings are:\n#   * 
min_doc_freq (integer): Minimum number of documents (per shard) that need a 
term for it to be considered.\n#   * max_doc_freq (integer): Maximum number of 
documents (per shard) that have a term for it to be considered.\n#  
 High frequency terms are generally \"stop words\".\n#   * max_query_terms 
(integer): Maximum number of terms to be considered. This value is limited to 
$wgCirrusSearchMoreLikeThisMaxQueryTermsLimit (100).\n#   * min_term_freq 
(integer): Minimum number of times the term appears in the input to doc to be 
considered. For small fields (title) this value should be 1.\n#   * 
percent_terms_to_match (float 0 to 1): The percentage of terms to match on. 
Defaults to 0.3 (30 percent).\n#   * min_word_len (integer): Minimal length of 
a term to be considered. Defaults to 0.\n#

[MediaWiki-commits] [Gerrit] logstash: fix top-scope var w/o namespace - change (operations/puppet)

2016-02-22 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: logstash: fix top-scope var w/o namespace
..

logstash: fix top-scope var w/o namespace

WARNING: top-scope variable being used without an explicit namespace on line 7
WARNING: top-scope variable being used without an explicit namespace on line 15
WARNING: top-scope variable being used without an explicit namespace on line 23

Is the correct namespace 'logstash'? I see it as a parameter in logstash::conf

Change-Id: Id4c77ab598a914d219bfe501c1b76a423c5e60d8
---
M modules/logstash/manifests/output/elasticsearch/scripts.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/272675/1

diff --git a/modules/logstash/manifests/output/elasticsearch/scripts.pp 
b/modules/logstash/manifests/output/elasticsearch/scripts.pp
index 5d47066..113f963 100644
--- a/modules/logstash/manifests/output/elasticsearch/scripts.pp
+++ b/modules/logstash/manifests/output/elasticsearch/scripts.pp
@@ -4,7 +4,7 @@
 #
 class logstash::output::elasticsearch::scripts {
 file { '/usr/local/bin/logstash_delete_index.sh':
-ensure => $ensure,
+ensure => $logstash::ensure,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
@@ -12,7 +12,7 @@
 }
 
 file { '/usr/local/bin/logstash_optimize_index.sh':
-ensure => $ensure,
+ensure => $logstash::ensure,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
@@ -20,7 +20,7 @@
 }
 
 file { '/usr/local/bin/logstash_clear_cache.sh':
-ensure => $ensure,
+ensure => $logstash::ensure,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',

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

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

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

[MediaWiki-commits] [Gerrit] ferm: fix "not documented" warnings - change (operations/puppet)

2016-02-22 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ferm: fix "not documented" warnings
..

ferm: fix "not documented" warnings

 WARNING: defined type not documented
 WARNING: class not documented

Change-Id: I9f4dc205e42dd4e10ecfb89bda05e1b4259faa3f
---
M modules/ferm/manifests/conf.pp
M modules/ferm/manifests/init.pp
M modules/ferm/manifests/rule.pp
3 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/272674/1

diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index 0940f89..7c13974 100644
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -1,3 +1,4 @@
+# defines a ferm config snippet
 define ferm::conf(
 $source  = undef,
 $content = undef,
diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 33fa0b3..845633e 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,3 +1,5 @@
+# ferm is a frontend for iptables
+# https://wiki.debian.org/ferm
 class ferm {
 # @resolve requires libnet-dns-perl
 
diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index eb5d88c..9d2f4e5 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -1,3 +1,4 @@
+# defines a custom ferm rule
 define ferm::rule(
 $rule,
 $ensure = present,

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

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

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

[MediaWiki-commits] [Gerrit] Add a comment about manually-created MongoDB indexes - change (operations/puppet)

2016-02-22 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Add a comment about manually-created MongoDB indexes
..


Add a comment about manually-created MongoDB indexes

In lieu of proper Puppetization, add a comment which explains how to create the
indexes XHGui needs on the MongoDB instance it is using.

Change-Id: I88fe13fbd7066b00b0eacacf845facdf3362e2d9
---
M manifests/role/xhgui.pp
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/manifests/role/xhgui.pp b/manifests/role/xhgui.pp
index 50b0f2d..6e25958 100644
--- a/manifests/role/xhgui.pp
+++ b/manifests/role/xhgui.pp
@@ -3,6 +3,20 @@
 # XHGUI is a MongoDB-backed PHP webapp for viewing and analyzing
 # PHP profiling data.
 #
+# Note that indexes on the MongoDB database on the target system
+# need to be declared manually. The indexes (and commands to create
+# them) are:
+#
+#  use xhprof;
+#  # Retain profiles for 30 days:
+#  db.results.ensureIndex( { 'meta.SERVER.REQUEST_TIME' : -1 },
+#  { expireAfterSeconds: 2592000 } );
+#  db.results.ensureIndex( { 'meta.SERVER.REQUEST_TIME' : -1 } );
+#  db.results.ensureIndex( { 'profile.main().wt' : -1 } );
+#  db.results.ensureIndex( { 'profile.main().mu' : -1 } );
+#  db.results.ensureIndex( { 'profile.main().cpu' : -1 } );
+#  db.results.ensureIndex( { 'meta.url' : 1 } );
+#
 class role::xhgui {
 include ::apache::mod::authnz_ldap
 include ::apache::mod::php5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88fe13fbd7066b00b0eacacf845facdf3362e2d9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
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 comment about manually-created MongoDB indexes - change (operations/puppet)

2016-02-22 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Add a comment about manually-created MongoDB indexes
..

Add a comment about manually-created MongoDB indexes

In lieu of proper Puppetization, add a comment which explains how to create the
indexes XHGui needs on the MongoDB instance it is using.

Change-Id: I88fe13fbd7066b00b0eacacf845facdf3362e2d9
---
M manifests/role/xhgui.pp
1 file changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/xhgui.pp b/manifests/role/xhgui.pp
index 50b0f2d..69d42df 100644
--- a/manifests/role/xhgui.pp
+++ b/manifests/role/xhgui.pp
@@ -3,6 +3,20 @@
 # XHGUI is a MongoDB-backed PHP webapp for viewing and analyzing
 # PHP profiling data.
 #
+# Note that indexes on the MongoDB database on the target system
+# need to be declare manually. The indexes (and commands to create
+# them) are:
+#
+#  use xhprof;
+#  # Retain profiles for 30 days:
+#  db.results.ensureIndex( { 'meta.SERVER.REQUEST_TIME' : -1 },
+#  { expireAfterSeconds: 2592000 } );
+#  db.results.ensureIndex( { 'meta.SERVER.REQUEST_TIME' : -1 } );
+#  db.results.ensureIndex( { 'profile.main().wt' : -1 } );
+#  db.results.ensureIndex( { 'profile.main().mu' : -1 } );
+#  db.results.ensureIndex( { 'profile.main().cpu' : -1 } );
+#  db.results.ensureIndex( { 'meta.url' : 1 } );
+#
 class role::xhgui {
 include ::apache::mod::authnz_ldap
 include ::apache::mod::php5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88fe13fbd7066b00b0eacacf845facdf3362e2d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Use BatchRowIterator instead of EchoBatchRowIterator - change (mediawiki...CirrusSearch)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Use BatchRowIterator instead of EchoBatchRowIterator
..


Use BatchRowIterator instead of EchoBatchRowIterator

Looks like this class has been imported to core.

Change-Id: I43a0a5f8d6863b9d4ff2559e0a2cd1b8c78667af
---
M tests/jenkins/deleteBrowserTestPages.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/jenkins/deleteBrowserTestPages.php 
b/tests/jenkins/deleteBrowserTestPages.php
index 3b9fe0e..1b62e46 100644
--- a/tests/jenkins/deleteBrowserTestPages.php
+++ b/tests/jenkins/deleteBrowserTestPages.php
@@ -59,7 +59,7 @@
 
$dbw = wfGetDB( DB_MASTER );
$user = \User::newFromName( 'Admin' );
-   $it = new \EchoBatchRowIterator( $dbw, 'page', 'page_id', 500 );
+   $it = new \BatchRowIterator( $dbw, 'page', 'page_id', 500 );
$it->setFetchColumns( array( '*' ) );
$it = new \RecursiveIteratorIterator( $it );
foreach ( $it as $row ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43a0a5f8d6863b9d4ff2559e0a2cd1b8c78667af
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix broken icons - change (mediawiki...ContentTranslation)

2016-02-22 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Fix broken icons
..

Fix broken icons

Change-Id: I34a2629cd4d868b23d18c18e56e6cd7eb1d9eda4
---
M modules/campaigns/images/question.png
M modules/campaigns/images/wikimediaCommons.png
2 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/modules/campaigns/images/question.png 
b/modules/campaigns/images/question.png
index 7841d41..2093ad8 100644
--- a/modules/campaigns/images/question.png
+++ b/modules/campaigns/images/question.png
Binary files differ
diff --git a/modules/campaigns/images/wikimediaCommons.png 
b/modules/campaigns/images/wikimediaCommons.png
index f90e997..9535930 100644
--- a/modules/campaigns/images/wikimediaCommons.png
+++ b/modules/campaigns/images/wikimediaCommons.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34a2629cd4d868b23d18c18e56e6cd7eb1d9eda4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Fix broken images after I5ca4ec27c5a2f8664a324e6e3dfb1a1f769... - change (mediawiki...ContentTranslation)

2016-02-22 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Fix broken images after 
I5ca4ec27c5a2f8664a324e6e3dfb1a1f769bf894
..

Fix broken images after I5ca4ec27c5a2f8664a324e6e3dfb1a1f769bf894

Change-Id: I7665c75f72e6edcc037d8ab5beedf6fc60d9e35c
---
M modules/campaigns/images/question.png
M modules/campaigns/images/wikimediaCommons.png
2 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/modules/campaigns/images/question.png 
b/modules/campaigns/images/question.png
index cb80ed9..b41c879 100644
--- a/modules/campaigns/images/question.png
+++ b/modules/campaigns/images/question.png
Binary files differ
diff --git a/modules/campaigns/images/wikimediaCommons.png 
b/modules/campaigns/images/wikimediaCommons.png
index 40f500c..5863fb9 100644
--- a/modules/campaigns/images/wikimediaCommons.png
+++ b/modules/campaigns/images/wikimediaCommons.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7665c75f72e6edcc037d8ab5beedf6fc60d9e35c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] xhgui: profile 1:10, 000 requests - change (operations/mediawiki-config)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: xhgui: profile 1:10,000 requests
..


xhgui: profile 1:10,000 requests

In addition to profiling all requests which bear the X-Wikimedia-Header, also
profile 1:10,000 requests. Add HTTP_X_WIKIMEDIA_DEBUG to the key whitelist,
so that such requests can be distinguished from the rest.

Change-Id: Ic952fab90f4725a3afb9c435ab7a2fa0cae61920
---
M wmf-config/StartProfiler.php
1 file changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index bd6237c..7e71938 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -131,7 +131,10 @@
} );
 }
 
-if ( isset( $_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) && ini_get( 
'hhvm.stats.enable_hot_profiler' ) ) {
+if (
+   ini_get( 'hhvm.stats.enable_hot_profiler' ) &&
+   ( isset( $_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) || mt_rand( 1, 1 ) 
=== 1 )
+) {
xhprof_enable( XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY | 
XHPROF_FLAGS_NO_BUILTINS );
 
register_shutdown_function( function () {
@@ -141,11 +144,11 @@
$usec = $_SERVER['REQUEST_TIME_FLOAT'] - $sec;
 
$keyWhitelist = array_flip( [
-   'HTTP_HOST', 'REQUEST_METHOD', 'REQUEST_START_TIME', 
'REQUEST_TIME',
-   'REQUEST_TIME_FLOAT', 'SCRIPT_FILENAME', 'SCRIPT_NAME',
-   'SERVER_ADDR', 'SERVER_NAME', 'THREAD_TYPE', 'action'
+   'HTTP_HOST', 'HTTP_X_WIKIMEDIA_DEBUG', 'REQUEST_METHOD',
+   'REQUEST_START_TIME', 'REQUEST_TIME', 
'REQUEST_TIME_FLOAT',
+   'SCRIPT_FILENAME', 'SCRIPT_NAME', 'SERVER_ADDR', 
'SERVER_NAME',
+   'THREAD_TYPE', 'action'
] );
-
 
// Create sanitized copies of $_SERVER, $_ENV, and $_GET:
$server = array_intersect_key( $_SERVER, $keyWhitelist );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic952fab90f4725a3afb9c435ab7a2fa0cae61920
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Ori.livneh 
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 gdash.wikimedia.org - change (operations/dns)

2016-02-22 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: remove gdash.wikimedia.org
..

remove gdash.wikimedia.org

Removed from operations/puppet in I48150a5c9.

Bug: T104365
Change-Id: I90b49f4c578dc07fdfbbacbb4867423f37fa14ed
---
M templates/wikimedia.org
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/70/272670/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index ef092c6..8eb29c3 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -456,7 +456,6 @@
 gerrit  1H  IN A208.80.154.81
 1H  IN  2620:0:861:3:208:80:154:81
 git 600 IN DYNA geoip!misc-addrs
-gdash   600 IN DYNA geoip!misc-addrs
 graphite600 IN DYNA geoip!misc-addrs
 grafana 600 IN DYNA geoip!misc-addrs
 grafana-admin   600 IN DYNA geoip!misc-addrs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90b49f4c578dc07fdfbbacbb4867423f37fa14ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] [WIP] Calculate page rank for search scoring - change (wikimedia...analytics)

2016-02-22 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: [WIP] Calculate page rank for search scoring
..

[WIP] Calculate page rank for search scoring

This is a WIP for calculating page rank.

TODO:
* Figure out right way to partition results. Resource requirements
  suggest we should run multiple jobs, one for wikis with < ~200k docs,
  one for wikis with 200k <= docs <= 1M, and perhaps grouped or perhaps
  individual jobs for wikis with > 1M docs? not sure yet.
* Figure out correct directory structure. I'm not sure if src/ should be
  a top level directory. But it only contains a single .scala file so I
  don't want to get too crazy
* Setup git-fat and include elasticsearch-hadoop JAR
* Update spark dependency to 1.5.0 to match cdh5.5 upgrade in hadoop
  cluster
* Test oozie workflows/coordinator. They are completely untested
  currently.
* Write some scala unit tests to verify resolving redirects works the
  way it is supposed to. The code has been refactored to allow this,
  but no tests have been written.
* PRobably lots more

Change-Id: I6df33034933499423f3fd97f3ee7442248486b5f
---
A cirrus_page_rank.sbt
M oozie/datasets.xml
A oozie/page_rank/coordinator.properties
A oozie/page_rank/coordinator.xml
A oozie/page_rank/workflow.xml
A src/main/scala/org/wikimedia/search/pagerank/CirrusPageRank.scala
6 files changed, 779 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/analytics 
refs/changes/69/272669/1

diff --git a/cirrus_page_rank.sbt b/cirrus_page_rank.sbt
new file mode 100644
index 000..eda864f
--- /dev/null
+++ b/cirrus_page_rank.sbt
@@ -0,0 +1,9 @@
+name := "CirrusSearch pagerank"
+version := "0.1"
+scalaVersion := "2.10.5"
+libraryDependencies += "org.apache.spark" % "spark-core_2.10" % "1.3.0"
+libraryDependencies += "org.apache.spark" % "spark-sql_2.10" % "1.3.0"
+libraryDependencies += "org.apache.spark" % "spark-graphx_2.10" % "1.3.0"
+libraryDependencies += "org.apache.spark" % "spark-hive_2.10" % "1.3.0"
+libraryDependencies += "org.elasticsearch" % "elasticsearch-spark_2.10" % 
"2.2.0"
+
diff --git a/oozie/datasets.xml b/oozie/datasets.xml
index 68c7ec2..542574a 100644
--- a/oozie/datasets.xml
+++ b/oozie/datasets.xml
@@ -31,4 +31,12 @@
 
${popularity_score_data_directory}/agg_days=${days_aggregated}/year=${YEAR}/month=${"$"}{MONTH
 + 0}/day=${"$"}{DAY + 0}
 _SUCCESS
 
+
+
+
${page_rank_data_directory}/year=${YEAR}/month=${"$"}{MONTH + 
0}/day=${"$"}{DAY + 0}
+_SUCCESS
+
 
diff --git a/oozie/page_rank/coordinator.properties 
b/oozie/page_rank/coordinator.properties
new file mode 100644
index 000..32d6c0c
--- /dev/null
+++ b/oozie/page_rank/coordinator.properties
@@ -0,0 +1,76 @@
+# Configures a coordinator to manage automatically aggregating
+# popularity_score from the pageview_hourly table.
+#
+# Any of the following properties are overidable with -D.
+# Usage:
+#   oozie job -Duser=$USER -Dstart_time=2015-12-01T00:00Z -submit \
+#   -config oozie/popularity_score/coordinator.properties
+#
+# NOTE:  Both *_oozie_directory must be synced to HDFS so that all relevant
+#.xml files exist there when this job is submitted.
+
+# Base path in HDFS to this repository oozie files.
+# Other files will be used relative to this path.
+discovery_oozie_directory = ${name_node}/wmf/discovery/current/oozie
+
+# Base path in HDFS to the analytics team oozie files.
+# Other files will be used relative to this path
+analytics_oozie_directory = ${name_node}/wmf/refinery/current/oozie
+
+name_node = hdfs://analytics-hadoop
+job_tracker   = resourcemanager.analytics.eqiad.wmnet:8032
+queue_name= default
+
+user  = analytics-search
+
+# HDFS path to coordinator to run to generate popularity_score
+coordinator_file  = 
${discovery_oozie_directory}/page_rank/coordinator.xml
+
+# HDFS path to workflow to run to generate popularity_score.
+workflow_file = 
${discovery_oozie_directory}/page_rank/workflow.xml
+
+# HDFS path to popularity score dataset definitions
+discovery_datasets_file   = ${discovery_oozie_directory}/datasets.xml
+discovery_data_directory  = ${name_node}/wmf/data/discovery
+page_rank_data_directory  = ${discovery_data_directory}/page_rank
+page_rank_table   = discovery.page_rank
+
+# Initial import time of the popularity score dataset. This is one week after 
the page_id
+# field was added to pageview_hourly.
+start_time= 2015-12-08T00:00Z
+
+# Time to stop running this coordinator.  Year 3000 == never!
+stop_time = 3000-01-01T00:00Z
+
+# HDFS path to workflow to add partition to hive
+add_partition_workflow_file   = 
${analytics_oozi

[MediaWiki-commits] [Gerrit] gdash: decom - change (operations/puppet)

2016-02-22 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: gdash: decom
..


gdash: decom

https://gdash.wikimedia.org/ is a static mirror of the dashboarding webapp
previously hosted at that address. In October 2015, we deprecated gdash in
favor of grafana. gdash has carried a deprecation notice on the top of each
page since then. We can now remove it.

/var/www/gdash.wikimedia.org will need to be wiped manually on graphite2001
& krypton

Bug: T104365
Change-Id: I48150a5c906299a6d0c51d661dbde62d201ef25a
---
D files/gdash/docroot/dashboards/apimethods/index.html
D files/gdash/docroot/dashboards/article/index.html
D files/gdash/docroot/dashboards/datastores/index.html
D files/gdash/docroot/dashboards/editpage/index.html
D files/gdash/docroot/dashboards/editswiki/index.html
D files/gdash/docroot/dashboards/filebackend/index.html
D files/gdash/docroot/dashboards/graphite.codfw/index.html
D files/gdash/docroot/dashboards/graphite.eqiad/index.html
D files/gdash/docroot/dashboards/indexpager/index.html
D files/gdash/docroot/dashboards/jobq/index.html
D files/gdash/docroot/dashboards/mobext/index.html
D files/gdash/docroot/dashboards/parser/index.html
D files/gdash/docroot/dashboards/pcache/index.html
D files/gdash/docroot/dashboards/poolcounter/index.html
D files/gdash/docroot/dashboards/searchlatency/index.html
D files/gdash/docroot/dashboards/swift.codfw-prod/index.html
D files/gdash/docroot/dashboards/swift.eqiad-prod/index.html
D files/gdash/docroot/dashboards/totalphp/index.html
D files/gdash/docroot/favicon.ico
D files/gdash/docroot/index.html
D files/gdash/docroot/lib/gdash.min.css
D files/gdash/docroot/lib/gdash.min.js
D files/gdash/gdash.wikimedia.org.conf
M hieradata/common/role/deployment.yaml
D manifests/role/gdash.pp
M manifests/site.pp
M templates/varnish/misc-backend.inc.vcl.erb
27 files changed, 2 insertions(+), 417 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48150a5c906299a6d0c51d661dbde62d201ef25a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] backup: move roles to modules/role/ - change (operations/puppet)

2016-02-22 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: backup: move roles to modules/role/
..

backup: move roles to modules/role/

Change-Id: I39e8d35f8a19b6aa23ec681cc5efcb63e91292eb
---
A modules/role/manifests/backup/config.pp
R modules/role/manifests/backup/director.pp
A modules/role/manifests/backup/host.pp
A modules/role/manifests/backup/storage.pp
4 files changed, 110 insertions(+), 113 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/272668/1

diff --git a/modules/role/manifests/backup/config.pp 
b/modules/role/manifests/backup/config.pp
new file mode 100644
index 000..b08bd78
--- /dev/null
+++ b/modules/role/manifests/backup/config.pp
@@ -0,0 +1,15 @@
+class role::backup::config {
+# if you change the director host name
+# you (likely) also need to change the IP,
+# we don't want to rely on DNS in firewall rules
+$director= 'helium.eqiad.wmnet'
+$director_ip = '10.64.0.179'
+$director_ip6 = '2620:0:861:101:10:64:0:179'
+$database = 'm1-master.eqiad.wmnet'
+$days = ['Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri']
+$pool = 'production'
+$offsite_pool = 'offsite'
+$onsite_sd = 'helium'
+$offsite_sd = 'heze'
+}
+
diff --git a/manifests/role/backup.pp 
b/modules/role/manifests/backup/director.pp
similarity index 68%
rename from manifests/role/backup.pp
rename to modules/role/manifests/backup/director.pp
index 1be587b..e5f2774 100644
--- a/manifests/role/backup.pp
+++ b/modules/role/manifests/backup/director.pp
@@ -1,54 +1,3 @@
-# A set of roles for the backup director, storage and client as they are
-# configured in WMF
-
-class role::backup::config {
-# if you change the director host name
-# you (likely) also need to change the IP,
-# we don't want to rely on DNS in firewall rules
-$director= 'helium.eqiad.wmnet'
-$director_ip = '10.64.0.179'
-$director_ip6 = '2620:0:861:101:10:64:0:179'
-$database = 'm1-master.eqiad.wmnet'
-$days = ['Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri']
-$pool = 'production'
-$offsite_pool = 'offsite'
-$onsite_sd = 'helium'
-$offsite_sd = 'heze'
-}
-
-class role::backup::host {
-include role::backup::config
-
-$pool = $role::backup::config::pool
-
-class { 'bacula::client':
-director   => $role::backup::config::director,
-catalog=> 'production',
-file_retention => '60 days',
-job_retention  => '60 days',
-}
-
-
-# This will use uniqueid fact to distribute (hopefully evenly) machines on
-# days of the week
-$days = $role::backup::config::days
-$day = inline_template('<%= @days[[@uniqueid].pack("H*").unpack("L")[0] % 
7] -%>')
-
-$jobdefaults = "Monthly-1st-${day}-${pool}"
-
-Bacula::Client::Job <| |> {
-require => Class['bacula::client'],
-}
-File <| tag == 'backup-motd' |>
-
-# If the machine includes base::firewall then let director connect to us
-ferm::service { 'bacula-file-demon':
-proto  => 'tcp',
-port   => '9102',
-srange => "(${role::backup::config::director_ip} 
${role::backup::config::director_ip6})",
-}
-}
-
 class role::backup::director {
 include role::backup::host
 include role::backup::config
@@ -270,65 +219,3 @@
 
 }
 
-class role::backup::storage() {
-include role::backup::config
-include base::firewall
-
-system::role { 'role::backup::storage': description => 'Backup Storage' }
-
-mount { '/srv/baculasd1' :
-ensure  => mounted,
-device  => '/dev/mapper/bacula-baculasd1',
-fstype  => 'ext4',
-require => File['/srv/baculasd1'],
-}
-
-mount { '/srv/baculasd2' :
-ensure  => mounted,
-device  => '/dev/mapper/bacula-baculasd2',
-fstype  => 'ext4',
-require => File['/srv/baculasd2'],
-}
-
-class { 'bacula::storage':
-director   => $role::backup::config::director,
-sd_max_concur_jobs => 5,
-sqlvariant => 'mysql',
-}
-
-# We have two storage devices to overcome any limitations from backend
-# infrastructure (e.g. Netapp used to have only < 16T volumes)
-file { ['/srv/baculasd1',
-'/srv/baculasd2' ]:
-ensure  => directory,
-owner   => 'bacula',
-group   => 'bacula',
-mode=> '0660',
-require => Class['bacula::storage'],
-}
-
-bacula::storage::device { 'FileStorage1':
-device_type => 'File',
-media_type  => 'File',
-archive_device  => '/srv/baculasd1',
-max_concur_jobs => 2,
-}
-
-bacula::storage::device { 'FileStorage2':
-device_type => 'File',
-media_type  => 'File',
-archive_device  => '/srv/baculasd2',
-max_concur_jobs => 2,
-}
-
-nrpe::monitor_servi

[MediaWiki-commits] [Gerrit] phabricator: move roles to module/role/ - change (operations/puppet)

2016-02-22 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: phabricator: move roles to module/role/
..

phabricator: move roles to module/role/

Change-Id: I2dd111d9c806a7a7c8abd434814fc22c4ea0e055
---
A modules/role/manifests/phabricator/config.pp
A modules/role/manifests/phabricator/labs.pp
R modules/role/manifests/phabricator/main.pp
3 files changed, 68 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/272667/1

diff --git a/modules/role/manifests/phabricator/config.pp 
b/modules/role/manifests/phabricator/config.pp
new file mode 100644
index 000..590945c
--- /dev/null
+++ b/modules/role/manifests/phabricator/config.pp
@@ -0,0 +1,21 @@
+class role::phabricator::config {
+#Both app and admin user are limited to the appropriate
+#database based on the connecting host.
+include passwords::mysql::phabricator
+$mysql_adminuser   = $passwords::mysql::phabricator::admin_user
+$mysql_adminpass   = $passwords::mysql::phabricator::admin_pass
+$mysql_appuser = $passwords::mysql::phabricator::app_user
+$mysql_apppass = $passwords::mysql::phabricator::app_pass
+$mysql_maniphestuser   = $passwords::mysql::phabricator::manifest_user
+$mysql_maniphestpass   = $passwords::mysql::phabricator::manifest_pass
+$bz_user   = $passwords::mysql::phabricator::bz_user
+$bz_pass   = $passwords::mysql::phabricator::bz_pass
+$rt_user   = $passwords::mysql::phabricator::rt_user
+$rt_pass   = $passwords::mysql::phabricator::rt_pass
+
+include passwords::phabricator
+$phabtools_cert= $passwords::phabricator::phabtools_cert
+$phabtools_user= $passwords::phabricator::phabtools_user
+$gerritbot_token   = $passwords::phabricator::gerritbot_token
+}
+
diff --git a/modules/role/manifests/phabricator/labs.pp 
b/modules/role/manifests/phabricator/labs.pp
new file mode 100644
index 000..b1ee757
--- /dev/null
+++ b/modules/role/manifests/phabricator/labs.pp
@@ -0,0 +1,47 @@
+# phabricator instance on wmflabs at phab-0[1-9].wmflabs.org
+class role::phabricator::labs {
+
+# pass not sensitive but has to match phab and db
+$mysqlpass = 'labspass'
+$current_tag = 'release/2016-02-18/1'
+class { '::phabricator':
+git_tag   => $current_tag,
+lock_file => '/var/run/phab_repo_lock',
+sprint_tag=> 'release/2016-02-18/1',
+security_tag  => 'release/2016-02-18/2',
+libraries => ['/srv/phab/libext/Sprint/src',
+  '/srv/phab/libext/security/src'],
+extension_tag => 'release/2016-02-18/1',
+extensions=> [ 'MediaWikiUserpageCustomField.php',
+  'LDAPUserpageCustomField.php',
+  'PhabricatorMediaWikiAuthProvider.php',
+  'PhutilMediaWikiAuthAdapter.php'],
+settings  => {
+'darkconsole.enabled' => true,
+'phabricator.base-uri'=> 
"https://${::hostname}.wmflabs.org";,
+'mysql.pass'  => $mysqlpass,
+'auth.require-email-verification' => false,
+'metamta.mail-adapter'=> 
'PhabricatorMailImplementationTestAdapter',
+'repository.default-local-path'   => '/srv/phab/repos',
+'config.ignore-issues'=> '{
+  
"security.security.alternate-file-domain": true
+  }',
+},
+}
+
+package { 'mysql-server': ensure => present }
+
+class { 'mysql::config':
+root_password => $mysqlpass,
+sql_mode  => 'STRICT_ALL_TABLES',
+restart   => true,
+require   => Package['mysql-server'],
+}
+
+service { 'mysql':
+ensure => running,
+hasrestart => true,
+hasstatus  => true,
+require=> Package['mysql-server'],
+}
+}
diff --git a/manifests/role/phabricator.pp 
b/modules/role/manifests/phabricator/main.pp
similarity index 70%
rename from manifests/role/phabricator.pp
rename to modules/role/manifests/phabricator/main.pp
index db7b72d..1c2b288 100644
--- a/manifests/role/phabricator.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -1,24 +1,3 @@
-class role::phabricator::config {
-#Both app and admin user are limited to the appropriate
-#database based on the connecting host.
-include passwords::mysql::phabricator
-$mysql_adminuser   = $passwords::mysql::phabricator::admin_user
-$mysql_adminpass   = $passwords::mysql::phabricator::admin_pass
-$mysql_appuser = $passwords::mysql::phabricator::app_user
-$mysql_apppass = $passwords::mysql::phabr

[MediaWiki-commits] [Gerrit] Fix test due to issue T127786 - change (mediawiki...CirrusSearch)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix test due to issue T127786
..


Fix test due to issue T127786

Change-Id: Ib36e3402d53c30758c596225489ba7323a5017cb
---
M tests/browser/features/prefix_search_api.feature
M tests/browser/features/step_definitions/search_steps.rb
2 files changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/tests/browser/features/prefix_search_api.feature 
b/tests/browser/features/prefix_search_api.feature
index 22fcf82..f56a41a 100644
--- a/tests/browser/features/prefix_search_api.feature
+++ b/tests/browser/features/prefix_search_api.feature
@@ -2,7 +2,8 @@
 Feature: Prefix search via api
   Scenario: Suggestions don't appear when you search for a string that is too 
long
 When I get api suggestions for 
贵州省瞬时速度团头鲂身体c实施ysstsstsg说tyttxy以推销员会同香港推广系统在同他讨厌她团体淘汰>赛系统大选于它拥有一天天用于与体育学院国ttxzyttxtxytdttyyyztdsytstsstxtttd天天体育系统的摄像头听到他他偷笑>偷笑太阳团体杏眼桃腮他要tttxx
 
y贵州省瞬时速度团头鲂身体c实施ysstsstsg说tyttxy以推销员会同香港推广系统在同他讨厌她团体淘汰>赛系统大选于它拥有一天天用于与体育学院国ttxzyttxtxytdttyyyztdsytstsstxtttd天天体育系统的摄像头听到他他偷笑>偷笑太阳团体杏眼桃腮他要tttxx
 y
-Then the api warns Prefix search request was longer than the maximum 
allowed length. (288 > 255)
+#Then the api warns Prefix search request was longer than the maximum 
allowed length. (288 > 255)
+   Then the api returns error code 400
 
   @redirect
   Scenario: Prefix search lists page name if both redirect and page name match
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index e9834f1..a953c2e 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -48,12 +48,16 @@
 )
   rescue MediawikiApi::ApiError => e
 @api_error = e
+  rescue MediawikiApi::HttpError => e
+@api_error = e
   end
 end
 When(/^I get api suggestions for (.*)$/) do |search|
   begin
 @api_result = suggestions_for(search)
   rescue MediawikiApi::ApiError => e
+@api_error = e
+  rescue MediawikiApi::HttpError => e
 @api_error = e
   end
 end
@@ -227,6 +231,10 @@
   @api_error.should_not be nil
   @api_error.info.should == warning
 end
+Then(/^the api returns error code (.*)$/) do |code|
+  @api_error.should_not be nil
+  @api_error.status.should == code.to_i
+end
 Then(/^(.+) is the (.+) api suggestion$/) do |title, position|
   pos = %w(first second third fourth fifth sixth seventh eighth ninth 
tenth).index position
   if title == "none"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib36e3402d53c30758c596225489ba7323a5017cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
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] fix whitespace-related lint issues - change (operations/puppet)

2016-02-22 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: fix whitespace-related lint issues
..

fix whitespace-related lint issues

Fix a lot of lint warnigns due to incorrectly aligned arrows.

Change-Id: Ib062d7142a79a8cb6bb3abd86fd7499aa3edad03
---
M manifests/role/xhgui.pp
M manifests/site.pp
M modules/burrow/manifests/init.pp
M modules/elasticsearch/manifests/nagios/plugin.pp
M modules/etcd/manifests/ssl.pp
M modules/eventlogging/manifests/service/service.pp
M modules/geoip/manifests/data/maxmind.pp
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/monitor/ores.pp
M modules/labs_vagrant/manifests/init.pp
M modules/ldap/manifests/client/nss.pp
M modules/limn/manifests/instance.pp
M modules/mailman/manifests/webui.pp
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
M modules/memcached/manifests/init.pp
M modules/mysql_multi_instance/manifests/init.pp
M modules/mysql_wmf/manifests/init.pp
M modules/nagios_common/manifests/contactgroups.pp
M modules/openldap/manifests/ldap_schema.pp
M modules/ores/manifests/redis.pp
M modules/phabricator/manifests/tools.pp
M modules/phabricator/manifests/vcs.pp
M modules/puppet/manifests/self/config.pp
M modules/quarry/manifests/init.pp
M modules/service/manifests/node.pp
M modules/statistics/manifests/sites/stats.pp
M modules/strongswan/manifests/init.pp
M modules/tcpircbot/manifests/init.pp
M modules/testreduce/manifests/server.pp
M modules/tmpreaper/manifests/reap.pp
M modules/visualdiff/manifests/server.pp
31 files changed, 120 insertions(+), 120 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/272666/1

diff --git a/manifests/role/xhgui.pp b/manifests/role/xhgui.pp
index 50b0f2d..33ed6ce 100644
--- a/manifests/role/xhgui.pp
+++ b/manifests/role/xhgui.pp
@@ -62,10 +62,10 @@
 } ->
 
 file { '/srv/xhgui/cache':
-ensure  => directory,
-owner   => 'www-data',
-group   => 'www-data',
-mode=> '0755',
+ensure => directory,
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0755',
 } ->
 
 apache::site { 'xhgui_apache_site':
diff --git a/manifests/site.pp b/manifests/site.pp
index 57283f8..b68f248 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -916,9 +916,9 @@
 ## codfw servers (decommissioning)
 node /es200[1234]\.codfw\.wmnet/ {
 class { 'role::mariadb::core':
-shard  => 'es1',
-p_s=> 'on',
-binlog_format  => 'ROW',
+shard => 'es1',
+p_s   => 'on',
+binlog_format => 'ROW',
 }
 include base::firewall
 }
@@ -926,9 +926,9 @@
 ## codfw servers
 node /es201[123]\.codfw\.wmnet/ {
 class { 'role::mariadb::core':
-shard  => 'es1',
-p_s=> 'on',
-binlog_format  => 'ROW',
+shard => 'es1',
+p_s   => 'on',
+binlog_format => 'ROW',
 }
 include base::firewall
 }
diff --git a/modules/burrow/manifests/init.pp b/modules/burrow/manifests/init.pp
index d20ca14..79b2435 100644
--- a/modules/burrow/manifests/init.pp
+++ b/modules/burrow/manifests/init.pp
@@ -49,8 +49,8 @@
 }
 
 service { 'burrow':
-ensure => ensure_service($ensure),
-enable => true,
+ensure=> ensure_service($ensure),
+enable=> true,
 subscribe => File['/etc/burrow/burrow.cfg'],
 }
 }
diff --git a/modules/elasticsearch/manifests/nagios/plugin.pp 
b/modules/elasticsearch/manifests/nagios/plugin.pp
index 06b64e9..8a86c77 100644
--- a/modules/elasticsearch/manifests/nagios/plugin.pp
+++ b/modules/elasticsearch/manifests/nagios/plugin.pp
@@ -4,20 +4,20 @@
 #
 class elasticsearch::nagios::plugin {
 @file { '/usr/lib/nagios/plugins/check_elasticsearch':
-  source  => 'puppet:///modules/elasticsearch/nagios/check_elasticsearch',
-  owner   => 'root',
-  group   => 'root',
-  mode=> '0755',
-  tag => 'nagiosplugin'
+  source => 'puppet:///modules/elasticsearch/nagios/check_elasticsearch',
+  owner  => 'root',
+  group  => 'root',
+  mode   => '0755',
+  tag=> 'nagiosplugin'
 }
 
 # new version, can do more fine-grained checks
 @file { '/usr/lib/nagios/plugins/check_elasticsearch.py':
-  source  => 
'puppet:///modules/elasticsearch/nagios/check_elasticsearch.py',
-  owner   => 'root',
-  group   => 'root',
-  mode=> '0755',
-  tag => 'nagiosplugin'
+  source => 
'puppet:///modules/elasticsearch/nagios/check_elasticsearch.py',
+  owner  => 'root',
+  group  => 'root',
+  mode   => '0755',
+  tag=> 'nagiosplugin'
 }
 
 package { 'python-requests':
diff --git a/modules/etcd/manifests/ssl.pp b/modules/etcd/manifests/ssl.pp
index f144b3b..179332f 100644
--- a/modules/etcd/manifests/ssl.pp
+++ b/

[MediaWiki-commits] [Gerrit] cache_parsoid: remove from DNS - change (operations/dns)

2016-02-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: cache_parsoid: remove from DNS
..


cache_parsoid: remove from DNS

Bug: T110474
Change-Id: I0dfb2b99584a74f684b7e96c890dfffbbca85890
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 3162a13..da11cf2 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -245,7 +245,6 @@
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 d.0.0.0 1H IN PTR   misc-web-lb.eqiad.wikimedia.org.
-4.1.0.0 1H IN PTR   parsoid-lb.eqiad.wikimedia.org.
 5.1.0.0 1H IN PTR   stream-lb.eqiad.wikimedia.org.
 6.1.0.0 1H IN PTR   git-ssh.eqiad.wikimedia.org.
 e.f.0.0 1H IN PTR   dns-rec-lb.eqiad.wikimedia.org.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 2ecdf10..42c7252 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -50,7 +50,7 @@
 
 27  1H  IN PTR  ms-fe.svc.eqiad.wmnet.
 28  1H  IN PTR  parsoid.svc.eqiad.wmnet.
-29  1H  IN PTR  parsoidcache.svc.eqiad.wmnet.
+
 30  1H  IN PTR  search.svc.eqiad.wmnet.
 31  1H  IN PTR  ocg.svc.eqiad.wmnet.
 
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 639d0b6..ab389f1 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -187,7 +187,6 @@
 
 ; - - 208.80.154.248/29 (248-255) LVS Misc
 
-248 1H  IN PTR  parsoid-lb.eqiad.wikimedia.org.
 249 1H  IN PTR  stream-lb.eqiad.wikimedia.org.
 250 1H  IN PTR  git-ssh.eqiad.wikimedia.org.
 251 1H  IN PTR  misc-web-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index d3e7cad..ef092c6 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -219,8 +219,6 @@
 
 geoiplookup-lb.eqiad600 IN DYNA geoip!geoiplookup-addrs/eqiad
 
-parsoid-lb.eqiad1H  IN A208.80.154.248
-1H  IN  2620:0:861:ed1a::3:14
 stream-lb.eqiad 1H  IN A208.80.154.249
 1H  IN  2620:0:861:ed1a::3:15
 
diff --git a/templates/wmnet b/templates/wmnet
index a1551b8..945cae3 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4042,7 +4042,6 @@
 
 ms-fe   1H  IN A10.2.2.27
 parsoid 1H  IN A10.2.2.28
-parsoidcache1H  IN A10.2.2.29
 search  1H  IN A10.2.2.30
 ocg 1H  IN A10.2.2.31
 labstore1H  IN A10.64.37.10

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0dfb2b99584a74f684b7e96c890dfffbbca85890
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mobrovac 
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] DO NOT MERGE: Show not-yet-working board move change - change (mediawiki...Flow)

2016-02-22 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: DO NOT MERGE: Show not-yet-working board move change
..

DO NOT MERGE: Show not-yet-working board move change

Bug: T127785
Change-Id: I696aaa239b295d4e7837150975bab41e4813fde4
---
M Flow.php
M Hooks.php
M includes/BoardMover.php
3 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/Flow.php b/Flow.php
index 63d77ab..c21b06d 100644
--- a/Flow.php
+++ b/Flow.php
@@ -142,7 +142,7 @@
 $wgHooks['MovePageIsValidMove'][] = 'FlowHooks::onMovePageIsValidMove';
 $wgHooks['AbortMove'][] = 'FlowHooks::onAbortMove';
 $wgHooks['TitleMove'][] = 'FlowHooks::onTitleMove';
-$wgHooks['TitleMoveComplete'][] = 'FlowHooks::onTitleMoveComplete';
+$wgHooks['TitleMoveCompleting'][] = 'FlowHooks::onTitleMoveCompleting';
 $wgHooks['TitleSquidURLs'][] = 'FlowHooks::onTitleSquidURLs';
 $wgHooks['WatchlistEditorBuildRemoveLine'][] = 
'FlowHooks::onWatchlistEditorBuildRemoveLine';
 $wgHooks['WatchlistEditorBeforeFormRender'][] = 
'FlowHooks::onWatchlistEditorBeforeFormRender';
diff --git a/Hooks.php b/Hooks.php
index 7412b6e..41cf6f8 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1649,14 +1649,14 @@
// location and rendered it doesn't throw an error 
about the wrong title
Container::get( 'factory.loader.workflow' 
)->pageMoveInProgress();
// open a database transaction and prepare everything 
for the move, but
-   // don't commit yet. That is done below in 
self::onTitleMoveComplete
+   // don't commit yet. That is done below in 
self::onTitleMoveCompleting
Container::get( 'board_mover' )->prepareMove( 
$oldTitle->getArticleID(), $bogusTitle );
}
 
return true;
}
 
-   public static function onTitleMoveComplete( Title $oldTitle, Title 
$newTitle, User $user, $pageid, $redirid, $reason ) {
+   public static function onTitleMoveCompleting( Title $oldTitle, Title 
$newTitle, User $user, $pageid, $redirid, $reason, Revision $revision ) {
if ( $newTitle->getContentModel() === CONTENT_MODEL_FLOW_BOARD 
) {
Container::get( 'board_mover' )->commit();
}
diff --git a/includes/BoardMover.php b/includes/BoardMover.php
index f475c07..5370542 100644
--- a/includes/BoardMover.php
+++ b/includes/BoardMover.php
@@ -61,7 +61,7 @@
 
// Open a transaction, this will be closed from self::commit.
$this->dbw = $this->dbFactory->getDB( DB_MASTER );
-   $this->dbw->begin( __METHOD__ );
+   $this->dbw->startAtomic( __CLASS__ );
$this->cache->begin();
 
// @todo this loads every topic workflow this board has ever 
seen,
@@ -118,7 +118,7 @@
}
 
try {
-   $this->dbw->commit( __METHOD__ );
+   $this->dbw->endAtomic( __CLASS__ );
$this->cache->commit();
} catch ( \Exception $e ) {
$this->dbw->rollback( __METHOD__ );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I696aaa239b295d4e7837150975bab41e4813fde4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Add missing namespace to @covers comments - change (mediawiki/core)

2016-02-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Add missing namespace to @covers comments
..

Add missing namespace to @covers comments

PHP_CodeCoverage_Exception:
> Trying to @cover not existing method "SwiftFileBackend::sanitzeHdrs".
> Trying to @cover not existing method "LineFormatter::normalizeException".
> Trying to @cover not existing method "MonologSpi::mergeConfig".
> Trying to @cover not existing method "ProcessCacheLRU::het".
> Trying to @cover not existing method "BitmapHandler::swapICCProfile".
> Trying to @cover not existing class or interface "checkParseSafety".
> Trying to @cover not existing method "Article::__call". (was removed).
> Trying to @cover not existing method 
> "ExtensionProcessor::extracttExtensionMessagesFiles".
> Trying to @cover not existing method "FileContentsHasher::getFileContentHash".

Makes code coverage run fail at the moment. These used to be warnings
in PHPUnit 3.x, but are now hard exceptions in PHPUnit 4.x when requesting
a coverage report.

Change-Id: If7f45ca57fd7d480d35b1414a889398837c0c472
---
M tests/phpunit/includes/debug/logger/MonologSpiTest.php
M tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
M tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
M tests/phpunit/includes/libs/ProcessCacheLRUTest.php
M tests/phpunit/includes/media/ExifBitmapTest.php
M tests/phpunit/includes/media/XMPTest.php
M tests/phpunit/includes/page/ArticleTest.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
M tests/phpunit/includes/utils/FileContentsHasherTest.php
9 files changed, 17 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/272664/1

diff --git a/tests/phpunit/includes/debug/logger/MonologSpiTest.php 
b/tests/phpunit/includes/debug/logger/MonologSpiTest.php
index 206362f..0ee7d26 100644
--- a/tests/phpunit/includes/debug/logger/MonologSpiTest.php
+++ b/tests/phpunit/includes/debug/logger/MonologSpiTest.php
@@ -26,7 +26,7 @@
 class MonologSpiTest extends MediaWikiTestCase {
 
/**
-* @covers MonologSpi::mergeConfig
+* @covers MediaWiki\Logger\MonologSpi::mergeConfig
 */
public function testMergeConfig() {
$base = [
diff --git a/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php 
b/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
index be23c4a..f33cf7e 100644
--- a/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
@@ -36,7 +36,7 @@
}
 
/**
-* @covers LineFormatter::normalizeException
+* @covers MediaWiki\Logger\Monolog\LineFormatter::normalizeException
 */
public function testNormalizeExceptionNoTrace() {
$fixture = new LineFormatter();
@@ -55,7 +55,7 @@
}
 
/**
-* @covers LineFormatter::normalizeException
+* @covers MediaWiki\Logger\Monolog\LineFormatter::normalizeException
 */
public function testNormalizeExceptionTrace() {
$fixture = new LineFormatter();
diff --git a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php 
b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
index 4f47f32..95ffb70 100644
--- a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
@@ -27,17 +27,17 @@
}
 
/**
-* @dataProvider provider_testSanitzeHdrs
-* @covers SwiftFileBackend::sanitzeHdrs
+* @dataProvider provider_testSanitizeHdrs
+* @covers SwiftFileBackend::sanitizeHdrs
 * @covers SwiftFileBackend::getCustomHeaders
 */
-   public function testSanitzeHdrs( $raw, $sanitized ) {
+   public function testSanitizeHdrs( $raw, $sanitized ) {
$hdrs = $this->backend->sanitizeHdrs( [ 'headers' => $raw ] );
 
$this->assertEquals( $hdrs, $sanitized, 'sanitizeHdrs() has 
expected result' );
}
 
-   public static function provider_testSanitzeHdrs() {
+   public static function provider_testSanitizeHdrs() {
return [
[
[
diff --git a/tests/phpunit/includes/libs/ProcessCacheLRUTest.php 
b/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
index a579f3a..9c189d1 100644
--- a/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
+++ b/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
@@ -94,7 +94,7 @@
/**
 * @covers ProcessCacheLRU::get
 * @covers ProcessCacheLRU::set
-* @covers ProcessCacheLRU::het
+* @covers ProcessCacheLRU::has
 */
public function testAddAndGetAKey() {
$oneCache = new ProcessCacheLRUTestable( 1 );
@@ -184,7 +184,7 @@

[MediaWiki-commits] [Gerrit] parsoidcache: remove from LVS - change (operations/puppet)

2016-02-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: parsoidcache: remove from LVS
..


parsoidcache: remove from LVS

Bug: T110472
Change-Id: Id82a0e286801339703f0743436d2c3617adc4a1f
---
M hieradata/common/lvs/configuration.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/role/manifests/cache/parsoid.pp
M modules/role/manifests/lvs/balancer.pp
4 files changed, 0 insertions(+), 53 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, but someone else must approve
  BBlack: Looks good to me, approved
  GWicke: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/common/lvs/configuration.yaml 
b/hieradata/common/lvs/configuration.yaml
index 41c177e..394a9ca 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -85,11 +85,6 @@
 ulsfo:
   misc_weblb: 198.35.26.120
   misc_weblb6: 2620:0:863:ed1a::3:d
-  parsoidcache: &ip_block012
-eqiad:
-  parsoidcachelb: 208.80.154.248
-  parsoidcachelb6: 2620:0:861:ed1a::3:14
-  parsoidcachesvc: 10.2.2.29
   search: &ip_block013
 eqiad: 10.2.2.30
 codfw: 10.2.1.30
@@ -499,48 +494,6 @@
   sites:
 eqiad:
   hostname: parsoid.svc.eqiad.wmnet
-  parsoidcache:
-description: Varnish caches in front of Parsoid
-class: high-traffic2
-sites:
-- eqiad
-ip: *ip_block012
-port: 80
-bgp: 'yes'
-depool-threshold: '.5'
-monitors:
-  ProxyFetch:
-url:
-- http://localhost
-  IdleConnection:
-timeout-clean-reconnect: 3
-max-delay: 300
-conftool:
-  cluster: cache_parsoid
-  service: varnish-fe
-icinga:
-  check_command: check_http_on_port!80
-  contact_group: admins,parsoid
-  sites:
-eqiad:
-  hostname: parsoid-lb.eqiad.wikimedia.org
-  parsoidcache-https:
-description: nginx HTTPS terminators for Parsoid
-class: high-traffic2
-sites:
-- eqiad
-ip: *ip_block012
-port: 443
-scheduler: sh
-bgp: 'no'
-depool-threshold: '.5'
-monitors:
-  IdleConnection:
-timeout-clean-reconnect: 3
-max-delay: 300
-conftool:
-  cluster: cache_parsoid
-  service: nginx
   search:
 description: Elasticsearch search for MediaWiki
 class: low-traffic
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index d420db0..c868d19 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -87,7 +87,6 @@
   ocg: {}
   osm: {}
   parsoid: {}
-  parsoidcache: {}
   rendering: {}
   restbase: {}
   search: {}
diff --git a/modules/role/manifests/cache/parsoid.pp 
b/modules/role/manifests/cache/parsoid.pp
index 04836db..df639a0 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -10,10 +10,6 @@
 
 include role::cache::2layer
 
-class { 'lvs::realserver':
-realserver_ips => 
$lvs::configuration::service_ips['parsoidcache'][$::site],
-}
-
 $cluster_nodes = hiera('cache::parsoid::nodes')
 $site_cluster_nodes = $cluster_nodes[$::site]
 
diff --git a/modules/role/manifests/lvs/balancer.pp 
b/modules/role/manifests/lvs/balancer.pp
index 9114426..56ed92f 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -20,7 +20,6 @@
 $sip['maps'][$::site],
 $sip['dns_rec'][$::site],
 $sip['misc_web'][$::site],
-$sip['parsoidcache'][$::site],
 $sip['stream'][$::site],
 $sip['ocg'][$::site],
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id82a0e286801339703f0743436d2c3617adc4a1f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mobrovac 
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] ButtonOptionWidget active state should carry default cursor - change (oojs/ui)

2016-02-22 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: ButtonOptionWidget active state should carry default cursor
..

ButtonOptionWidget active state should carry default cursor

Applying default cursor to ButtonOptionWidget's `-active` button as
there is no action possible.

Bug: T77916
Change-Id: Ia8c782c99621b39e48d39d9a389bd024ae231062
---
M src/styles/widgets/ButtonOptionWidget.less
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/63/272663/1

diff --git a/src/styles/widgets/ButtonOptionWidget.less 
b/src/styles/widgets/ButtonOptionWidget.less
index fe21409..3af1450 100644
--- a/src/styles/widgets/ButtonOptionWidget.less
+++ b/src/styles/widgets/ButtonOptionWidget.less
@@ -7,6 +7,10 @@
position: relative;
}
 
+   &.oo-ui-buttonElement-active .oo-ui-buttonElement-button {
+   cursor: default;
+   }
+
&.oo-ui-iconElement .oo-ui-iconElement-icon,
&.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
position: static;

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

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

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

[MediaWiki-commits] [Gerrit] Don't ignore exit code in mediawik-core-code-coverage - change (integration/config)

2016-02-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Don't ignore exit code in mediawik-core-code-coverage
..

Don't ignore exit code in mediawik-core-code-coverage

This means that when the tests fail early, it ends up doing a
cover-publish anyway, resulting in an empty directory being published
and the existing coverage report being wiped out.

The segfault that justified this doesn't seem relevant anymore.

Change-Id: Ib3badf6782706b40f016f4818ff966b631554b70
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/62/272662/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index c930459..83ae0f1 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -463,12 +463,8 @@
 nice -n 19 php $MW_INSTALL_PATH/tests/phpunit/phpunit.php \
 --exclude-group Dump,Broken,ParserFuzz,Stub \
 --coverage-clover log/clover.xml \
---coverage-html "$WORKSPACE/cover" \
-|| :
+--coverage-html "$WORKSPACE/cover"
 
-# PHP segfault (bug 43972) so ignore any error with '|| :' or the
-# Jenkins plugin will never generate the coverage report for us
-# https://issues.jenkins-ci.org/browse/JENKINS-21046
  - cover-publish:
  src: 'cover'
  dest: 'mediawiki-core/$ZUUL_BRANCH/php'

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

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

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

[MediaWiki-commits] [Gerrit] Add missing namespace to @covers comment in LegacyLoggerTest - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Add missing namespace to @covers comment in LegacyLoggerTest
..


Add missing namespace to @covers comment in LegacyLoggerTest

> Trying to @cover or @use not existing method "LegacyLogger::interpolate"

Makes code coverage run fail at the moment.

Change-Id: I8417b5c2f1fc116583758c7507770c796127bb67
---
M tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php 
b/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
index faad97b..37a28c3 100644
--- a/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
+++ b/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
@@ -26,7 +26,7 @@
 class LegacyLoggerTest extends MediaWikiTestCase {
 
/**
-* @covers LegacyLogger::interpolate
+* @covers MediaWiki\Logger\LegacyLogger::interpolate
 * @dataProvider provideInterpolate
 */
public function testInterpolate( $message, $context, $expect ) {
@@ -125,7 +125,7 @@
}
 
/**
-* @covers LegacyLogger::shouldEmit
+* @covers MediaWiki\Logger\LegacyLogger::shouldEmit
 * @dataProvider provideShouldEmit
 */
public function testShouldEmit( $level, $config, $expected ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8417b5c2f1fc116583758c7507770c796127bb67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
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 missing namespace to @covers comment in LegacyLoggerTest - change (mediawiki/core)

2016-02-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Add missing namespace to @covers comment in LegacyLoggerTest
..

Add missing namespace to @covers comment in LegacyLoggerTest

> Trying to @cover or @use not existing method "LegacyLogger::interpolate"

Makes code coverage run fail at the moment.

Change-Id: I8417b5c2f1fc116583758c7507770c796127bb67
---
M tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/272661/1

diff --git a/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php 
b/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
index faad97b..37a28c3 100644
--- a/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
+++ b/tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
@@ -26,7 +26,7 @@
 class LegacyLoggerTest extends MediaWikiTestCase {
 
/**
-* @covers LegacyLogger::interpolate
+* @covers MediaWiki\Logger\LegacyLogger::interpolate
 * @dataProvider provideInterpolate
 */
public function testInterpolate( $message, $context, $expect ) {
@@ -125,7 +125,7 @@
}
 
/**
-* @covers LegacyLogger::shouldEmit
+* @covers MediaWiki\Logger\LegacyLogger::shouldEmit
 * @dataProvider provideShouldEmit
 */
public function testShouldEmit( $level, $config, $expected ) {

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

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

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

[MediaWiki-commits] [Gerrit] parserTest: Make $wgResourceBasePath match $wgScriptPath - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: parserTest: Make $wgResourceBasePath match $wgScriptPath
..


parserTest: Make $wgResourceBasePath match $wgScriptPath

Right now it forgets to reset $wgResourceBasePath, which means it
is inherited from the wikis's (or Jenkins') default settings which
is typically '/w'. That caused parser tests to behave as if pointers
to /extensions were outside /w.

Also update wgScriptPath to be '' instead of '/'. Otherwise this
can cause double-slash prefixed urls.

Change-Id: Ic455d62fca8fcac2c4ecc055cc0d7e311b70a94a
---
M tests/parser/parserTest.inc
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/NewParserTest.php
3 files changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index fa774c7..549a51f 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -168,15 +168,16 @@
$wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
$wgExtraNamespaces, $wgNamespaceAliases, 
$wgNamespaceProtection, $wgLocalFileRepo,
$wgExtraInterlanguageLinkPrefixes, $wgLocalInterwikis,
-   $parserMemc, $wgThumbnailScriptPath, $wgScriptPath,
+   $parserMemc, $wgThumbnailScriptPath, $wgScriptPath, 
$wgResourceBasePath,
$wgArticlePath, $wgScript, $wgStylePath, 
$wgExtensionAssetsPath,
$wgMainCacheType, $wgMessageCacheType, 
$wgParserCacheType, $wgLockManagers;
 
+   $wgScriptPath = '';
$wgScript = '/index.php';
-   $wgScriptPath = '/';
-   $wgArticlePath = '/wiki/$1';
$wgStylePath = '/skins';
+   $wgResourceBasePath = '';
$wgExtensionAssetsPath = '/extensions';
+   $wgArticlePath = '/wiki/$1';
$wgThumbnailScriptPath = false;
$wgLockManagers = [ [
'name' => 'fsLockManager',
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 9ad7bd5..3bbc00d 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -9804,8 +9804,7 @@
 !! wikitext
 {{SCRIPTPATH}}
 !! html
-/
-
+
 !! end
 
 !! test
diff --git a/tests/phpunit/includes/parser/NewParserTest.php 
b/tests/phpunit/includes/parser/NewParserTest.php
index fa86eed..04d6067 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -71,13 +71,14 @@
$tmpGlobals['wgSitename'] = 'MediaWiki';
$tmpGlobals['wgServer'] = 'http://example.org';
$tmpGlobals['wgServerName'] = 'example.org';
+   $tmpGlobals['wgScriptPath'] = '';
$tmpGlobals['wgScript'] = '/index.php';
-   $tmpGlobals['wgScriptPath'] = '/';
+   $tmpGlobals['wgResourceBasePath'] = '';
+   $tmpGlobals['wgStylePath'] = '/skins';
+   $tmpGlobals['wgExtensionAssetsPath'] = '/extensions';
$tmpGlobals['wgArticlePath'] = '/wiki/$1';
$tmpGlobals['wgActionPaths'] = [];
$tmpGlobals['wgVariantArticlePath'] = false;
-   $tmpGlobals['wgExtensionAssetsPath'] = '/extensions';
-   $tmpGlobals['wgStylePath'] = '/skins';
$tmpGlobals['wgEnableUploads'] = true;
$tmpGlobals['wgUploadNavigationUrl'] = false;
$tmpGlobals['wgThumbnailScriptPath'] = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic455d62fca8fcac2c4ecc055cc0d7e311b70a94a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Password policies for advanced permission groups - change (operations/mediawiki-config)

2016-02-22 Thread CSteipp (Code Review)

CSteipp has uploaded a new change for review.

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

Change subject: Password policies for advanced permission groups
..

Password policies for advanced permission groups

Begin implementing the results of 
https://meta.wikimedia.org/wiki/Requests_for_comment/Password_policy_for_users_with_certain_advanced_permissions

Bug: T119100
Change-Id: I9bf79e16d61b6e7aca89cd7bd05a8ce65685a8c2
---
M wmf-config/CommonSettings.php
1 file changed, 36 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b8e05bf..1fe0299 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -353,16 +353,18 @@
 if ( $wgDBname === 'labswiki' || $wgDBname === 'labtestwiki' ) {
$wgPasswordPolicy['policies']['default']['MinimalPasswordLength'] = 10;
 } else {
-   // Temporarily set the policy for these roles to the previous WMF 
setting until
-   // we communicate the change to affected communities.
-   $wgPasswordPolicy['policies']['bureaucrat']['MinimalPasswordLength'] = 
1;
-   $wgPasswordPolicy['policies']['sysop']['MinimalPasswordLength'] = 1;
+   // See password policy RFC on meta
+   $wgPasswordPolicy['policies']['bureaucrat']['MinimalPasswordLength'] = 
8;
+   $wgPasswordPolicy['policies']['bureaucrat']['PasswordCannotBePopular'] 
= 1;
+   $wgPasswordPolicy['policies']['sysop']['MinimalPasswordLength'] = 8;
+   $wgPasswordPolicy['policies']['sysop']['PasswordCannotBePopular'] = 
1;
+   $wgPasswordPolicy['policies']['checkuser']['MinimalPasswordLength'] = 8;
+   $wgPasswordPolicy['policies']['checkuser']['PasswordCannotBePopular'] = 
1;
+   $wgPasswordPolicy['policies']['suppress']['MinimalPasswordLength'] = 8;
+   $wgPasswordPolicy['policies']['suppress']['PasswordCannotBePopular'] = 
1;
+
$wgPasswordPolicy['policies']['bot']['MinimalPasswordLength'] = 1;
 }
-
-// Temporarily disable PasswordCannotBePopular policies until communicated.
-unset( $wgPasswordPolicy['policies']['bureaucrat']['PasswordCannotBePopular'] 
);
-unset( $wgPasswordPolicy['policies']['sysop']['PasswordCannotBePopular'] );
 
 // For global policies, see $wgCentralAuthGlobalPasswordPolicies below
 
@@ -1278,6 +1280,32 @@
'PasswordCannotMatchUsername' => true,
);
 
+   // See password policy RFC on meta
+   $wgCentralAuthGlobalPasswordPolicies['global-sysop'] = array(
+   'MinimalPasswordLength' => 8,
+   'PasswordCannotBePopular' => 1,
+   );
+   $wgCentralAuthGlobalPasswordPolicies['global-interface-editor'] = array(
+   'MinimalPasswordLength' => 8,
+   'PasswordCannotBePopular' => 1,
+   );
+   $wgCentralAuthGlobalPasswordPolicies['wmf-researcher'] = array(
+   'MinimalPasswordLength' => 8,
+   'PasswordCannotBePopular' => 1,
+   );
+   $wgCentralAuthGlobalPasswordPolicies['new-wikis-importer'] = array(
+   'MinimalPasswordLength' => 8,
+   'PasswordCannotBePopular' => 1,
+   );
+   $wgCentralAuthGlobalPasswordPolicies['ombudsman'] = array(
+   'MinimalPasswordLength' => 8,
+   'PasswordCannotBePopular' => 1,
+   );
+   $wgCentralAuthGlobalPasswordPolicies['founder'] = array(
+   'MinimalPasswordLength' => 8,
+   'PasswordCannotBePopular' => 1,
+   );
+
$wgCentralAuthUseSlaves = true;
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] parserTest: Make $wgResourceBasePath match $wgScriptPath - change (mediawiki/core)

2016-02-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: parserTest: Make $wgResourceBasePath match $wgScriptPath
..

parserTest: Make $wgResourceBasePath match $wgScriptPath

Right now it forgets to reset $wgResourceBasePath, which means it
is inherited from the wikis's (or Jenkins') default settings which
is typically '/w'. That caused parser tests to behave as if pointers
to /extensions were outside /w.

Also update wgScriptPath to be '' instead of '/'. Otherwise this
can cause double-slash prefixed urls.

Change-Id: Ic455d62fca8fcac2c4ecc055cc0d7e311b70a94a
---
M tests/parser/parserTest.inc
M tests/phpunit/includes/parser/NewParserTest.php
2 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/272659/1

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index fa774c7..549a51f 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -168,15 +168,16 @@
$wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory,
$wgExtraNamespaces, $wgNamespaceAliases, 
$wgNamespaceProtection, $wgLocalFileRepo,
$wgExtraInterlanguageLinkPrefixes, $wgLocalInterwikis,
-   $parserMemc, $wgThumbnailScriptPath, $wgScriptPath,
+   $parserMemc, $wgThumbnailScriptPath, $wgScriptPath, 
$wgResourceBasePath,
$wgArticlePath, $wgScript, $wgStylePath, 
$wgExtensionAssetsPath,
$wgMainCacheType, $wgMessageCacheType, 
$wgParserCacheType, $wgLockManagers;
 
+   $wgScriptPath = '';
$wgScript = '/index.php';
-   $wgScriptPath = '/';
-   $wgArticlePath = '/wiki/$1';
$wgStylePath = '/skins';
+   $wgResourceBasePath = '';
$wgExtensionAssetsPath = '/extensions';
+   $wgArticlePath = '/wiki/$1';
$wgThumbnailScriptPath = false;
$wgLockManagers = [ [
'name' => 'fsLockManager',
diff --git a/tests/phpunit/includes/parser/NewParserTest.php 
b/tests/phpunit/includes/parser/NewParserTest.php
index fa86eed..04d6067 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -71,13 +71,14 @@
$tmpGlobals['wgSitename'] = 'MediaWiki';
$tmpGlobals['wgServer'] = 'http://example.org';
$tmpGlobals['wgServerName'] = 'example.org';
+   $tmpGlobals['wgScriptPath'] = '';
$tmpGlobals['wgScript'] = '/index.php';
-   $tmpGlobals['wgScriptPath'] = '/';
+   $tmpGlobals['wgResourceBasePath'] = '';
+   $tmpGlobals['wgStylePath'] = '/skins';
+   $tmpGlobals['wgExtensionAssetsPath'] = '/extensions';
$tmpGlobals['wgArticlePath'] = '/wiki/$1';
$tmpGlobals['wgActionPaths'] = [];
$tmpGlobals['wgVariantArticlePath'] = false;
-   $tmpGlobals['wgExtensionAssetsPath'] = '/extensions';
-   $tmpGlobals['wgStylePath'] = '/skins';
$tmpGlobals['wgEnableUploads'] = true;
$tmpGlobals['wgUploadNavigationUrl'] = false;
$tmpGlobals['wgThumbnailScriptPath'] = false;

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

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

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

[MediaWiki-commits] [Gerrit] Upgrade from PHPunit 3.7.x to PHPUnit 4.8.x - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade from PHPunit 3.7.x to PHPUnit 4.8.x
..


Upgrade from PHPunit 3.7.x to PHPUnit 4.8.x

Major changes:

* (4.0.0) Limited support for stubbing and mocking static methods was removed.
  (introduced in PHPUnit 3.5)
* (4.0.0) The addRiskyTest() was added to the PHPUnit_Framework_TestListener 
interface.
  Classes that implement this interface MUST implement this method.
* (4.5.0) The "--strict" catch-all option was deprecated. Use specific options 
instead.

Notable changes:

* (4.6.0) Tests not annotated with @small, @medium, or @large are no longer 
default
  to matching in group @small.
* (4.6.0) Result printer now checks hasColorSupport().
* (4.8.0) The name of the default group was changed from "__nogroup__" to 
"default".
* (4.8.0) This is the last release to support PHP 5.3, PHP 5.4, and PHP 5.5.
  PHPUnit 5 will require PHP 5.6 or higher.

PHPUnit 3.7.17 was released March 2013.
PHPUnit 4.8.0 was released August 2015.
PHPUnit 4.8.23 was released January 2016.

Details:

* https://github.com/sebastianbergmann/phpunit/wiki/ChangeLog-for-PHPUnit-3.7
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.0.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.1.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.2.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.3.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.4.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.5.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.6.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.7.0
* 
https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-4.8.0

Bug: T99982
Change-Id: I70ad81513812aa76a84fa55be14135aac94d55e8
---
M composer.json
M tests/phpunit/phpunit.php
M tests/phpunit/suite.xml
3 files changed, 8 insertions(+), 21 deletions(-)

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



diff --git a/composer.json b/composer.json
index c5b4395..1270311 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "~1.17.2",
"nikic/php-parser": "1.4.1",
"nmred/kafka-php": "0.1.5",
-   "phpunit/phpunit": "3.7.37",
+   "phpunit/phpunit": "4.8.23",
"wikimedia/avro": "1.7.7"
},
"suggest": {
diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 66e8182..86fc295 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -176,19 +176,6 @@
$_SERVER['argv'] = array_values( $_SERVER['argv'] );
}
 
-   if ( !wfIsWindows() ) {
-   # If we are not running on windows then we can enable 
phpunit colors
-   # Windows does not come anymore with ANSI.SYS loaded by 
default
-   # PHPUnit uses the suite.xml parameters to 
enable/disable colors
-   # which can be then forced to be enabled with --colors.
-   # The below code injects a parameter just like if the 
user called
-   # Probably fix bug 29226
-   $key = array_search( '--colors', $_SERVER['argv'] );
-   if ( $key === false ) {
-   array_splice( $_SERVER['argv'], 1, 0, 
'--colors' );
-   }
-   }
-
# Makes MediaWiki PHPUnit directory includable so the PHPUnit 
will
# be able to resolve relative files inclusion such as suites/*
# PHPUnit uses stream_resolve_include_path() internally
diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index bdabdc1..63f5de0 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -1,11 +1,9 @@
 
-
-
 http://www.w3.org/2001/XMLSchema-instance";
+   xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd";
+
+   colors="true"
backupGlobals="false"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
@@ -15,7 +13,9 @@
timeoutForSmallTests="10"
timeoutForMediumTests="30"
timeoutForLargeTests="60"
-   strict="true"
+   beStrictAboutTestsThatDoNotTestAnything="true"
+   beStrictAboutOutputDuringTests="true"
+   beStrictAboutTestSize="true"
verbose="true">



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

[MediaWiki-commits] [Gerrit] Remove extsrc bloat from references data-mw - change (mediawiki...parsoid)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Remove extsrc bloat from references data-mw
..


Remove extsrc bloat from references data-mw

 * This hasn't been used since 2013! See 5bfa0e9e

Change-Id: Iea382829f38788541b3bc4f8595a0d6bf600c167
---
M lib/ext/Cite.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 18 insertions(+), 44 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  Subramanya Sastry: Looks good to me, approved
  Esanders: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/lib/ext/Cite.js b/lib/ext/Cite.js
index b28f049..7b77735 100644
--- a/lib/ext/Cite.js
+++ b/lib/ext/Cite.js
@@ -484,32 +484,24 @@
 References.prototype.insertReferencesIntoDOM = function(refsNode, refsData, 
refsInReferencesHTML) {
var dp = DU.getDataParsoid(refsNode);
var group = dp.group || '';
-   var src = dp.src || '';  // fall back so we don't crash
-   // Extract ext-source for .. usage
-   var body = Util.extractExtBody("references", src).trim();
-   var refGroup = refsData.getRefGroup(group);
 
var dataMw =  DU.getDataMw(refsNode);
if (!Object.keys(dataMw).length) {
-   var datamwBody;
-   // We'll have to output data-mw.body.extsrc in
-   // scenarios where original wikitext was of the form:
-   // " lot of refs here "
-   // Ex: See [[en:Barack Obama]]
-   if (body.length > 0) {
-   datamwBody = {
-   'extsrc': body,
-   'html': refsInReferencesHTML.join(''),
-   };
-   }
dataMw = {
'name': 'references',
-   'body': datamwBody,
'attrs': {
// Dont emit empty keys
'group': group || undefined,
},
};
+
+   var src = dp.src || '';  // fall back so we don't 
crash
+   // Extract ext-source for .. usage
+   var body = Util.extractExtBody('references', src).trim();
+   if (body.length > 0) {
+   dataMw.body = { 'html': refsInReferencesHTML.join('') };
+   }
+
DU.setDataMw(refsNode, dataMw);
}
 
@@ -522,6 +514,7 @@
refsNode.removeChild(refsNode.firstChild);
}
 
+   var refGroup = refsData.getRefGroup(group);
if (refGroup) {
refGroup.refs.forEach(refGroup.renderLine.bind(refGroup, 
refsNode));
}
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 1aae6a0..b5b34ec 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -386,7 +386,6 @@
 add("wt2wt", "Ref: 9. unclosed comments should not leak out of ref-body", "A 
foo  B C\n");
 add("wt2wt", "Ref: 10. Unclosed HTML tags should not leak out of ref-body", "A 
 foo  B C\n\n");
 add("wt2wt", "Ref: 19. ref-tags with identical name encodings should get 
identical indexes", "1 foo 2 \n\n");
-add("wt2wt", "References: 5. ref tags in references should be processed while 
ignoring all other content", "A \nB bar\n\n\nfoo\n");
 add("wt2wt", "References: 9. Generate missing references list at the end", "A 
foo\nB bar\n\n");
 add("wt2wt", "Entities in ref name", "hi\n");
 add("wt2wt", "HTML tag with broken attribute value quoting", "Foo\n");
@@ -620,7 +619,6 @@
 add("html2html", "Gallery override link with malicious javascript (bug 
34852)", "\t\t*  \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\"; 
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[106,170,null,null]}'/> \t\t\t 
caption  \t\t\t \t\t\n");
 add("html2html", "Gallery with invalid title as link (bug 43964)", "\t\t*  \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\"; 
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[106,170,null,null]}'/> \t\t\t\t\t\t 
\t\t\n");
 add("html2html", "Ref: 19. ref-tags with identical name encodings should get 
identical indexes", "1 [1] 2 [2]\n\n↑  foo↑  ");
-add("html2html", "References: 5. ref tags in references should be processed 
while ignoring all other content", "A 
[1]\nB [2]\n\n↑  foo↑  bar");
 add("html2html", "Entities in ref name", "[1]\n↑  hi");
 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", "2. Parsoid-only: Don't wrap broken template tags in  
on wt2wt (Bug 42353)", "{{}}");
@@ -1310,7 +1308,6 @@
 add("html2wt", "Ref: 9. unclosed comments should not leak out of ref-body", "A 
foo  B C\n");
 add("html2wt", "Ref: 10. Unclosed HTML tags should not leak out of ref-body", 
"A  foo  B C\n\n");
 add("ht

[MediaWiki-commits] [Gerrit] Remove strip markers from references before saving them to t... - change (mediawiki...Cite)

2016-02-22 Thread Cenarium (Code Review)

Cenarium has uploaded a new change for review.

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

Change subject: Remove strip markers from references before saving them to the 
database
..

Remove strip markers from references before saving them to the database

This removes the strip markers that sometimes occur due to  or
other extension tags embedded within a  tag. This doesn't solve
the issue completely since ideally, the text that was replaced by the
strip marker should be restored.

Change-Id: Ice12d7d45a1cda6a3d753372169f1f055c46f31e
---
M CiteHooks.php
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/CiteHooks.php b/CiteHooks.php
index e69b477..5622c7e 100644
--- a/CiteHooks.php
+++ b/CiteHooks.php
@@ -114,6 +114,17 @@
// remove spaces or newlines added at 
the beginning or end of references
$ref['text'] = trim( $ref['text'] );
 
+   // core and extension tags (including 
, , etc) inside {{#tag:ref}} calls
+   // get replaced by the parser with a 
strip marker before Cite::ref is called and the
+   // original wikitext cannot be 
recovered, so remove these useless strip markers
+   $stripState = new StripState();
+   $text = $stripState->killMarkers( 
$ref['text'] );
+   if ( $ref['text'] !== $text ) {
+   $ref['text'] = $text;
+   // let callers know about the 
removed strip markers
+   $ref['markers'] = true;
+   }
+
// return more meaningful count
if ( $ref['count'] < 0 ) {
$ref['count'] = 1;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice12d7d45a1cda6a3d753372169f1f055c46f31e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

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

[MediaWiki-commits] [Gerrit] Cleanup references parameters before saving them to the data... - change (mediawiki...Cite)

2016-02-22 Thread Cenarium (Code Review)

Cenarium has uploaded a new change for review.

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

Change subject: Cleanup references parameters before saving them to the database
..

Cleanup references parameters before saving them to the database

Before saving references data, this processes the 'text' parameter by
trimming it. This also provides a more meaningful 'count', that actually
corresponds to the number of ref tags referencing a single named ref.
And it removes the 'number'param that is only needed internally by Cite.

Change-Id: Ib3fbf0075002e815d049c47acb571f51873c378f
---
M CiteHooks.php
1 file changed, 30 insertions(+), 0 deletions(-)


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

diff --git a/CiteHooks.php b/CiteHooks.php
index a2df9ef..e69b477 100644
--- a/CiteHooks.php
+++ b/CiteHooks.php
@@ -82,6 +82,7 @@
if ( $refData === null ) {
return;
}
+   $refData = self::processReferencesData( $refData );
if ( $wgCiteCacheRawReferencesOnParse ) {
// caching
$cache = ObjectCache::getMainWANInstance();
@@ -103,6 +104,35 @@
}
 
/**
+* @param array $refData
+*/
+   private static function processReferencesData( $refData ) {
+   $refs = $refData['refs'];
+   foreach ( $refs as $index => $listing ) {
+   foreach ( $listing as $group => $refsInGroup ) {
+   foreach ( $refsInGroup as $key => $ref ) {
+   // remove spaces or newlines added at 
the beginning or end of references
+   $ref['text'] = trim( $ref['text'] );
+
+   // return more meaningful count
+   if ( $ref['count'] < 0 ) {
+   $ref['count'] = 1;
+   } else {
+   $ref['count']++;
+   }
+
+   // remove 'number' param, of no use 
after parse
+   unset( $ref['number'] );
+
+   $refs[$index][$group][$key] = $ref;
+   }
+   }
+   }
+   $refData['refs'] = $refs;
+   return $refData;
+   }
+
+   /**
 * Callback for LinksUpdateComplete hook
 * If $wgCiteCacheRawReferencesOnParse is set to false, purges the cache
 * when references are modified

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3fbf0075002e815d049c47acb571f51873c378f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

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

[MediaWiki-commits] [Gerrit] Fix parameter parsing in parserTests.php - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix parameter parsing in parserTests.php
..


Fix parameter parsing in parserTests.php

Change-Id: Iafb8a60f040cd94eb1b8c30ea5ace9cff4272c0e
---
M tests/parserTests.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/parserTests.php b/tests/parserTests.php
index 02c0123..7e6f68c 100644
--- a/tests/parserTests.php
+++ b/tests/parserTests.php
@@ -24,9 +24,9 @@
  * @ingroup Testing
  */
 
-$otions = [ 'quick', 'color', 'quiet', 'help', 'show-output',
+$options = [ 'quick', 'color', 'quiet', 'help', 'show-output',
'record', 'run-disabled', 'run-parsoid' ];
-$optionsWithArgs = [ 'regex', 'filter', 'seed', 'setversion' ];
+$optionsWithArgs = [ 'regex', 'filter', 'seed', 'setversion', 'file' ];
 
 require_once __DIR__ . '/../maintenance/commandLine.inc';
 require_once __DIR__ . '/TestsAutoLoader.php';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafb8a60f040cd94eb1b8c30ea5ace9cff4272c0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Krinkle 
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] Fix test due to issue T127786 - change (mediawiki...CirrusSearch)

2016-02-22 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Fix test due to issue T127786
..

Fix test due to issue T127786

Change-Id: Ib36e3402d53c30758c596225489ba7323a5017cb
---
M tests/browser/features/prefix_search_api.feature
M tests/browser/features/step_definitions/search_steps.rb
2 files changed, 10 insertions(+), 1 deletion(-)


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

diff --git a/tests/browser/features/prefix_search_api.feature 
b/tests/browser/features/prefix_search_api.feature
index 22fcf82..f56a41a 100644
--- a/tests/browser/features/prefix_search_api.feature
+++ b/tests/browser/features/prefix_search_api.feature
@@ -2,7 +2,8 @@
 Feature: Prefix search via api
   Scenario: Suggestions don't appear when you search for a string that is too 
long
 When I get api suggestions for 
贵州省瞬时速度团头鲂身体c实施ysstsstsg说tyttxy以推销员会同香港推广系统在同他讨厌她团体淘汰>赛系统大选于它拥有一天天用于与体育学院国ttxzyttxtxytdttyyyztdsytstsstxtttd天天体育系统的摄像头听到他他偷笑>偷笑太阳团体杏眼桃腮他要tttxx
 
y贵州省瞬时速度团头鲂身体c实施ysstsstsg说tyttxy以推销员会同香港推广系统在同他讨厌她团体淘汰>赛系统大选于它拥有一天天用于与体育学院国ttxzyttxtxytdttyyyztdsytstsstxtttd天天体育系统的摄像头听到他他偷笑>偷笑太阳团体杏眼桃腮他要tttxx
 y
-Then the api warns Prefix search request was longer than the maximum 
allowed length. (288 > 255)
+#Then the api warns Prefix search request was longer than the maximum 
allowed length. (288 > 255)
+   Then the api returns error code 400
 
   @redirect
   Scenario: Prefix search lists page name if both redirect and page name match
diff --git a/tests/browser/features/step_definitions/search_steps.rb 
b/tests/browser/features/step_definitions/search_steps.rb
index e9834f1..a953c2e 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -48,12 +48,16 @@
 )
   rescue MediawikiApi::ApiError => e
 @api_error = e
+  rescue MediawikiApi::HttpError => e
+@api_error = e
   end
 end
 When(/^I get api suggestions for (.*)$/) do |search|
   begin
 @api_result = suggestions_for(search)
   rescue MediawikiApi::ApiError => e
+@api_error = e
+  rescue MediawikiApi::HttpError => e
 @api_error = e
   end
 end
@@ -227,6 +231,10 @@
   @api_error.should_not be nil
   @api_error.info.should == warning
 end
+Then(/^the api returns error code (.*)$/) do |code|
+  @api_error.should_not be nil
+  @api_error.status.should == code.to_i
+end
 Then(/^(.+) is the (.+) api suggestion$/) do |title, position|
   pos = %w(first second third fourth fifth sixth seventh eighth ninth 
tenth).index position
   if title == "none"

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

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

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

[MediaWiki-commits] [Gerrit] Fix resource path check when ResourceBasePath is an empty st... - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix resource path check when ResourceBasePath is an empty string
..


Fix resource path check when ResourceBasePath is an empty string

If you have MediaWiki installed in the root of the domain, then
$wgScriptPath and $wgResourceBasePath is an empty string. In HHVM and
PHP, passing an empty string as the second parameter of strpos() causes
a warning and returns false, which will cause the condition to fail, as
if the path were not within the base path.

So, normalize such paths. Using substr() instead of strpos() for a
"starts with" check would have worked except that RelPath also fails
when given an empty string.

Bug: T127652
Change-Id: If7e94ae638d6834f7cc0f31f67a5fe6a2f74771c
---
M includes/OutputPage.php
1 file changed, 12 insertions(+), 5 deletions(-)

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



diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 2570cfb..5d1d5d0 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3870,13 +3870,20 @@
 */
public static function transformResourcePath( Config $config, $path ) {
global $IP;
-   $remotePath = $config->get( 'ResourceBasePath' );
+   $remotePathPrefix = $config->get( 'ResourceBasePath' );
+   if ( $remotePathPrefix === '' ) {
+   // The configured base path is required to be empty 
string for
+   // wikis in the domain root
+   $remotePath = '/';
+   } else {
+   $remotePath = $remotePathPrefix;
+   }
if ( strpos( $path, $remotePath ) !== 0 ) {
// Path is outside wgResourceBasePath, ignore.
return $path;
}
$path = RelPath\getRelativePath( $path, $remotePath );
-   return self::transformFilePath( $remotePath, $IP, $path );
+   return self::transformFilePath( $remotePathPrefix, $IP, $path );
}
 
/**
@@ -3885,18 +3892,18 @@
 * Caller is responsible for ensuring the file exists. Emits a PHP 
warning otherwise.
 *
 * @since 1.27
-* @param string $remotePath URL path that points to $localPath
+* @param string $remotePath URL path prefix that points to $localPath
 * @param string $localPath File directory exposed at $remotePath
 * @param string $file Path to target file relative to $localPath
 * @return string URL
 */
-   public static function transformFilePath( $remotePath, $localPath, 
$file ) {
+   public static function transformFilePath( $remotePathPrefix, 
$localPath, $file ) {
$hash = md5_file( "$localPath/$file" );
if ( $hash === false ) {
wfLogWarning( __METHOD__ . ": Failed to hash 
$localPath/$file" );
$hash = '';
}
-   return "$remotePath/$file?" . substr( $hash, 0, 5 );
+   return "$remotePathPrefix/$file?" . substr( $hash, 0, 5 );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7e94ae638d6834f7cc0f31f67a5fe6a2f74771c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [FEATURE] add feature to check snippet in search - change (pywikibot/core)

2016-02-22 Thread hroest (Code Review)

hroest has uploaded a new change for review.

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

Change subject: [FEATURE] add feature to check snippet in search
..

[FEATURE] add feature to check snippet in search

- using the new checkSnippet option, only pages are returned that
  actually contain the search-word. This can substantially reduce the
  number of returned pages and thus speed up the bot.

[FEATURE] add option checkSnippet to generator

[TEST] add test

[FIX] add maximum items

[FEATURE] skip after a certain number of misses

Change-Id: I62c91758fa33620215fd85ed583da56623f73b65
---
M pywikibot/pagegenerators.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 78 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/55/272655/1

diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 7ccf929..e70f369 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -2241,7 +2241,7 @@
 
 @deprecated_args(number='total')
 def SearchPageGenerator(query, step=None, total=None, namespaces=None,
-site=None):
+site=None, checkSnippet=True, skipAfterNrMisses=-1):
 """
 Yield pages from the MediaWiki internal search engine.
 
@@ -2255,7 +2255,7 @@
 if site is None:
 site = pywikibot.Site()
 for page in site.search(query, step=step, total=total,
-namespaces=namespaces):
+namespaces=namespaces, checkSnippet=checkSnippet, 
skipAfterNrMisses=skipAfterNrMisses):
 yield page
 
 
diff --git a/pywikibot/site.py b/pywikibot/site.py
index fb92abe..b3a988c 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4400,11 +4400,15 @@
 @deprecated_args(number='total', key='searchstring',
  getredirects='get_redirects')
 def search(self, searchstring, namespaces=None, where="text",
-   get_redirects=False, step=None, total=None, content=False):
+   get_redirects=False, step=None, total=None, content=False, 
+   checkSnippet=False, skipAfterNrMisses=-1):
 """Iterate Pages that contain the searchstring.
 
 Note that this may include non-existing Pages if the wiki's database
-table contains outdated entries.
+table contains outdated entries. Note that sometimes articles can be
+returned that do not actually contain the searchterm but a closely
+related term. This can be prevented by checking that the term is
+actually present (see checkSnippet parameter).
 
 @param searchstring: the text to search for
 @type searchstring: unicode
@@ -4416,8 +4420,13 @@
 list of namespace identifiers.
 @param get_redirects: if True, include redirects in results. Since
 version MediaWiki 1.23 it will always return redirects.
+@param total: Maximum number of items to retrieve
 @param content: if True, load the current content of each iterated page
 (default False)
+@param checkSnippet: if True, only yield pages that contain an exact 
match 
+(default False)
+@param skipAfterNrMisses: Stop retrieving items after this many
+non-matches were retrieved (default -1)
 @raises KeyError: a namespace identifier was not resolved
 @raises TypeError: a namespace identifier has an inappropriate
 type such as NoneType or bool
@@ -4431,13 +4440,65 @@
 if not namespaces:
 pywikibot.warning(u"search: namespaces cannot be empty; using 
[0].")
 namespaces = [0]
-srgen = self._generator(api.PageGenerator, type_arg="search",
-gsrsearch=searchstring, gsrwhat=where,
-namespaces=namespaces, step=step,
-total=total, g_content=content)
-if MediaWikiVersion(self.version()) < MediaWikiVersion('1.23'):
-srgen.request['gsrredirects'] = get_redirects
-return srgen
+
+if MediaWikiVersion(self.version()) > MediaWikiVersion('1.11') and 
checkSnippet:
+
+if len(namespaces) > 1:
+raise Error("Cannot do more than one namespace and check 
snippets")
+
+# If we want to get the snippets, we have to use a ListGenerator
+# and manually yield those pages that contain the correct words.
+srgen = api.ListGenerator("search", site=self,
+  srsearch=searchstring, srwhat=where,
+  srnamespace=namespaces[0], step=step,
+  g_content=content)
+
+if total is not None:
+srgen.set_maximum_items(total)
+
+if MediaWikiVersion(self.version()) < MediaWikiVersion('1.23'):
+

[MediaWiki-commits] [Gerrit] CachedBagOStuff: cache backend misses - change (mediawiki/core)

2016-02-22 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: CachedBagOStuff: cache backend misses
..

CachedBagOStuff: cache backend misses

Cache misses from the backend cache the same as hits.

Bug: T127772
Change-Id: If2fe1920411b24862acea888c627db13717da8bd
---
M includes/libs/objectcache/CachedBagOStuff.php
M includes/libs/objectcache/HashBagOStuff.php
M tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
3 files changed, 32 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/272653/1

diff --git a/includes/libs/objectcache/CachedBagOStuff.php 
b/includes/libs/objectcache/CachedBagOStuff.php
index 798357d..3d5d383 100644
--- a/includes/libs/objectcache/CachedBagOStuff.php
+++ b/includes/libs/objectcache/CachedBagOStuff.php
@@ -50,11 +50,9 @@
 
protected function doGet( $key, $flags = 0 ) {
$ret = parent::doGet( $key, $flags );
-   if ( $ret === false ) {
+   if ( $ret === false && !$this->hasKey( $key ) ) {
$ret = $this->backend->doGet( $key, $flags );
-   if ( $ret !== false ) {
-   $this->set( $key, $ret, 0, 
self::WRITE_CACHE_ONLY );
-   }
+   $this->set( $key, $ret, 0, self::WRITE_CACHE_ONLY );
}
return $ret;
}
diff --git a/includes/libs/objectcache/HashBagOStuff.php 
b/includes/libs/objectcache/HashBagOStuff.php
index 6e7fb0c..e03cec6 100644
--- a/includes/libs/objectcache/HashBagOStuff.php
+++ b/includes/libs/objectcache/HashBagOStuff.php
@@ -60,8 +60,19 @@
return true;
}
 
+   /**
+* Does this bag have a non-null value for the given key?
+*
+* @param string $key
+* @return bool
+* @since 1.27
+*/
+   protected function hasKey( $key ) {
+   return isset( $this->bag[$key] );
+   }
+
protected function doGet( $key, $flags = 0 ) {
-   if ( !isset( $this->bag[$key] ) ) {
+   if ( !$this->hasKey( $key ) ) {
return false;
}
 
diff --git a/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
index 3b19c9a..7fe8055 100644
--- a/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
@@ -49,4 +49,22 @@
$cache->delete( 'foo', CachedBagOStuff::WRITE_CACHE_ONLY );
$this->assertEquals( 'old', $cache->get( 'foo' ) ); // Reloaded 
from backend
}
+
+   public function testCacheBackendMisses() {
+   $backend = new HashBagOStuff;
+   $cache = new CachedBagOStuff( $backend );
+
+   // First hit primes the cache with miss from the backend
+   $this->assertEquals( false, $cache->get( 'foo' ) );
+
+   // Change the value in the backend
+   $backend->set( 'foo', true );
+
+   // Second hit returns the cached miss
+   $this->assertEquals( false, $cache->get( 'foo' ) );
+
+   // But a fresh value is read from the backend
+   $backend->set( 'bar', true );
+   $this->assertEquals( true, $cache->get( 'bar' ) );
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Transform the notification action bar to css table layout - change (mediawiki...Echo)

2016-02-22 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Transform the notification action bar to css table layout
..

Transform the notification action bar to css table layout

* Transform the action bar to table layout even in non-bundle
  notifications.
* Increase the padding on the side for consistency

Bug: T125909
Change-Id: I26ba5b7a21a1f36774749154d3f95d61254c5ce2
---
M modules/ooui/mw.echo.ui.NotificationItemWidget.js
M modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
2 files changed, 24 insertions(+), 4 deletions(-)


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

diff --git a/modules/ooui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ooui/mw.echo.ui.NotificationItemWidget.js
index 0b4be95..93fda8d 100644
--- a/modules/ooui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ooui/mw.echo.ui.NotificationItemWidget.js
@@ -151,7 +151,9 @@
this.$content.append(
this.markAsReadButton.$element,
$message,
-   this.$actions
+   $( '' )
+   .addClass( 
'mw-echo-ui-notificationItemWidget-content-table' )
+   .append( this.$actions )
);
this.$element.append( $icon, this.$content );
}
diff --git a/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
index ba92565..df28fa2 100644
--- a/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
@@ -2,7 +2,7 @@
 @import '../../echo.mixins';
 
 .mw-echo-ui-notificationItemWidget {
-   padding: 0.8em;
+   padding: 0.8em 1em;
background-color: #F1F1F1;
border-bottom: 1px solid #DD;
white-space: normal;
@@ -43,9 +43,21 @@
}
}
 
-   &-actions {
+   &-table {
+   display: table;
+   width: 100%;
margin-top: 0.8em;
+   }
+
+   &-actions {
+   display: table-row;
font-size: 0.9em;
+
+   & > &-buttons.oo-ui-buttonSelectWidget {
+   display: table-cell;
+   vertical-align: top;
+   width: 100%;
+   }
 
.mw-echo-ui-menuItemWidget {
&:not(:last-child) {
@@ -54,6 +66,10 @@
}
 
&-menu {
+   display: table-cell;
+   vertical-align: top;
+   padding: 0 0.5em;
+
.oo-ui-popupWidget-popup {
font-size: 1 / 0.8em;
padding: 0.5em;
@@ -61,9 +77,11 @@
}
 
&-timestamp {
-   float: right;
+   display: table-cell;
+   vertical-align: top;
color: black;
opacity: @opacity-low;
+   white-space: nowrap;
}
 
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26ba5b7a21a1f36774749154d3f95d61254c5ce2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Fix parameter parsing in parserTests.php - change (mediawiki/core)

2016-02-22 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Fix parameter parsing in parserTests.php
..

Fix parameter parsing in parserTests.php

Change-Id: Iafb8a60f040cd94eb1b8c30ea5ace9cff4272c0e
---
M tests/parserTests.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/parserTests.php b/tests/parserTests.php
index 02c0123..7e6f68c 100644
--- a/tests/parserTests.php
+++ b/tests/parserTests.php
@@ -24,9 +24,9 @@
  * @ingroup Testing
  */
 
-$otions = [ 'quick', 'color', 'quiet', 'help', 'show-output',
+$options = [ 'quick', 'color', 'quiet', 'help', 'show-output',
'record', 'run-disabled', 'run-parsoid' ];
-$optionsWithArgs = [ 'regex', 'filter', 'seed', 'setversion' ];
+$optionsWithArgs = [ 'regex', 'filter', 'seed', 'setversion', 'file' ];
 
 require_once __DIR__ . '/../maintenance/commandLine.inc';
 require_once __DIR__ . '/TestsAutoLoader.php';

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

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

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

[MediaWiki-commits] [Gerrit] Move extension content serialization to cite - change (mediawiki...parsoid)

2016-02-22 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has submitted this change and it was merged.

Change subject: Move extension content serialization to cite
..


Move extension content serialization to cite

 * See the follow up for why references extsrc is irrelevant.

Change-Id: I1db0f3c3f3e85706125418bb431aa40c17a97407
---
M lib/ext/Cite.js
M lib/html2wt/DOMHandlers.js
M lib/html2wt/WikitextSerializer.js
3 files changed, 124 insertions(+), 112 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  Subramanya Sastry: Verified; Looks good to me, approved



diff --git a/lib/ext/Cite.js b/lib/ext/Cite.js
index 2ae98a4..b28f049 100644
--- a/lib/ext/Cite.js
+++ b/lib/ext/Cite.js
@@ -96,6 +96,68 @@
});
 };
 
+Ref.prototype.serialHandler = {
+   handle: Promise.method(function(node, state, wrapperUnmodified) {
+   return state.serializer.serializeExtensionStartTag(node, state)
+   .then(function(startTagSrc) {
+   var dataMw = DU.getDataMw(node);
+   var env = state.env;
+   var html;
+   if (!dataMw.body) {
+   return startTagSrc;  // We self-closed this 
already.
+   } else if (typeof dataMw.body.html === 'string') {
+   // First look for the extension's content in 
data-mw.body.html
+   html = dataMw.body.html;
+   } else if (typeof dataMw.body.id === 'string') {
+   // If the body isn't contained in 
data-mw.body.html, look if
+   // there's an element pointed to by body.id.
+   var bodyElt = 
node.ownerDocument.getElementById(dataMw.body.id);
+   if (!bodyElt && env.page.editedDoc) {
+   // Try to get to it from the main page.
+   // This can happen when the  is 
inside another
+   // extension, most commonly inside a 
.
+   bodyElt = 
env.page.editedDoc.getElementById(dataMw.body.id);
+   }
+   if (bodyElt) {
+   html = bodyElt.innerHTML;
+   } else {
+   // Some extra debugging for VisualEditor
+   var extraDebug = '';
+   var firstA = 
node.querySelector('a[href]');
+   if (firstA && 
/^#/.test(firstA.getAttribute('href'))) {
+   var href = 
firstA.getAttribute('href');
+   var ref = 
node.ownerDocument.querySelector(href);
+   if (ref) {
+   extraDebug += ' [own 
doc: ' + ref.outerHTML + ']';
+   }
+   ref = 
env.page.editedDoc.querySelector(href);
+   if (ref) {
+   extraDebug += ' [main 
doc: ' + ref.outerHTML + ']';
+   }
+   if (!extraDebug) {
+   extraDebug = ' 
[reference ' + href + ' not found]';
+   }
+   }
+   env.log('error/' + dataMw.name +
+   'extension src id ' + 
dataMw.body.id +
+   ' points to non-existent 
element for:', node.outerHTML,
+   '. More debug info: ', 
extraDebug);
+   return '';  // Drop it!
+   }
+   } else {
+   env.log('error', 'Ref body unavailable for: ' + 
node.outerHTML);
+   return '';  // Drop it!
+   }
+   return state.serializer.serializeHTML({
+   env: state.env,
+   extName: dataMw.name,
+   }, html).then(function(src) {
+   return startTagSrc + src + '';
+   });
+   });
+   }),
+};
+
 /**
  * Helper class used by  implementation
  */
@@ -325,7 +387,7 @@
var doc = node.ownerDocument;
var span = doc.createElement('span');
var content = dp.content;
-   var dataMW = Util.clone(DU.getDataM

[MediaWiki-commits] [Gerrit] Completely remove Special:UserProfile - change (mediawiki...MobileFrontend)

2016-02-22 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

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

Change subject: Completely remove Special:UserProfile
..

Completely remove Special:UserProfile

It's been replaced by Special:User.

Bug: T125902
Change-Id: If5f2d3f6720727186cc666483751e98357ce842e
---
M extension.json
M i18n/en.json
D includes/specials/SpecialUserProfile.php
D tests/phpunit/specials/SpecialUserProfileTest.php
4 files changed, 2 insertions(+), 82 deletions(-)


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

diff --git a/extension.json b/extension.json
index fd7e954..cc07167 100644
--- a/extension.json
+++ b/extension.json
@@ -45,8 +45,7 @@
"MobileOptions": "SpecialMobileOptions",
"MobileMenu": "SpecialMobileMenu",
"MobileLanguages": "SpecialMobileLanguages",
-   "Uploads": "SpecialUploads",
-   "UserProfile": "SpecialUserProfile"
+   "Uploads": "SpecialUploads"
},
"APIModules": {
"mobileview": "ApiMobileView"
@@ -84,7 +83,6 @@
"MobileSiteModule": "includes/modules/MobileSiteModule.php",
"MobileUserModule": "includes/modules/MobileUserModule.php",
"SpecialUploads": "includes/specials/SpecialUploads.php",
-   "SpecialUserProfile": 
"includes/specials/SpecialUserProfile.php",
"SpecialMobileHistory": 
"includes/specials/SpecialMobileHistory.php",
"SpecialMobileDiff": "includes/specials/SpecialMobileDiff.php",
"SpecialMobileEditor": 
"includes/specials/SpecialMobileEditor.php",
diff --git a/i18n/en.json b/i18n/en.json
index 6e0bb03..80e57a9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -62,7 +62,7 @@
"mobile-frontend-changeslist-nocomment": "no edit summary",
"mobile-frontend-clear-search": "Clear",
"mobile-frontend-commons-category-view": "Images for $1",
-   "mobile-frontend-contribution-summary": "All edits made by 
{{GENDER:$1|[[Special:UserProfile/$1|$1]]}}",
+   "mobile-frontend-contribution-summary": "All edits made by 
{{GENDER:$1|[[Special:User/$1|$1]]}}",
"mobile-frontend-cookies-required": "Cookies are required to switch 
view modes. Please enable them and try again.",
"mobile-frontend-copyright": "Content is available under $1 unless 
otherwise noted.",
"mobile-frontend-current-language": "{{#language:{{CONTENTLANG",
diff --git a/includes/specials/SpecialUserProfile.php 
b/includes/specials/SpecialUserProfile.php
deleted file mode 100644
index 927a384..000
--- a/includes/specials/SpecialUserProfile.php
+++ /dev/null
@@ -1,28 +0,0 @@
-getId() ) {
-   return $user->getUserPage();
-   } else {
-   return SpecialPage::getTitleFor( 
'Contributions', $par );
-   }
-   }
-   }
-}
diff --git a/tests/phpunit/specials/SpecialUserProfileTest.php 
b/tests/phpunit/specials/SpecialUserProfileTest.php
deleted file mode 100644
index 2058b3a..000
--- a/tests/phpunit/specials/SpecialUserProfileTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-getId() ) {
-   $user->addToDatabase();
-   }
-   }
-   /**
-* @covers SpecialUserProfile::getRedirect
-* @dataProvider provideGetRedirect
-*/
-   public function testGetRedirect( $par, $expected, $exception = false ) {
-   if ( $exception ) {
-   $this->setExpectedException( $exception );
-   }
-   $sp = new SpecialUserProfile;
-   $title = $sp->getRedirect( $par );
-   $this->assertEquals( $expected, $title->getPrefixedText() );
-   }
-
-   public static function provideGetRedirect() {
-   return array(
-   // IP address
-   array(
-   '127.0.0.1',
-   'Special:Contributions/127.0.0.1'
-   ),
-   // User that exists
-   array(
-   'UserThatExists',
-   'User:UserThatExists',
-   ),
-   // User that doesn't exist
-   array(
-   'UserThatDoesNotExist',
-   'Special:Contributions/UserThatDoesNotExist',
-   ),
-   // Invalid username
-   array(
-   'NotAValidUsername[]',
-   '',
-   'BadTitleError'
-   ),
-   );
-   }
-}

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

[MediaWiki-commits] [Gerrit] Remove skel-1.5 symlinks - change (operations/mediawiki-config)

2016-02-22 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Remove skel-1.5 symlinks
..

Remove skel-1.5 symlinks

These are ancient, copied into git straight from /home/wikipedia/common.
Nothing references them in this repo (as other symlinks or in code) or
in DNS, puppet, release tools or scap.

They may have served a purpose for basic setup of other top level domains
at some point but are just baggage really. Plenty of other working domains
you can copy.

Change-Id: If694a6b6d35c71590eb7b3d36f35033af9091c90
---
D docroot/skel-1.5/503.html
D docroot/skel-1.5/images
D docroot/skel-1.5/static
D docroot/skel-1.5/w
4 files changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/docroot/skel-1.5/503.html b/docroot/skel-1.5/503.html
deleted file mode 12
index 8a0c3a2..000
--- a/docroot/skel-1.5/503.html
+++ /dev/null
@@ -1 +0,0 @@
-../../errorpages/503.html
\ No newline at end of file
diff --git a/docroot/skel-1.5/images b/docroot/skel-1.5/images
deleted file mode 12
index 2a1f364..000
--- a/docroot/skel-1.5/images
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/images
\ No newline at end of file
diff --git a/docroot/skel-1.5/static b/docroot/skel-1.5/static
deleted file mode 12
index 5134fa2..000
--- a/docroot/skel-1.5/static
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/w/static
\ No newline at end of file
diff --git a/docroot/skel-1.5/w b/docroot/skel-1.5/w
deleted file mode 12
index 65de7be..000
--- a/docroot/skel-1.5/w
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/w
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Introduces a gallery for images in the query result - change (wikidata...gui)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Introduces a gallery for images in the query result
..


Introduces a gallery for images in the query result

Change-Id: Id9a000f697a179395ae1b6beba895360cc477883
---
M index.html
A vendor/lightbox/ekko-lightbox.css
A vendor/lightbox/ekko-lightbox.js
A vendor/lightbox/ekko-lightbox.min.css
A vendor/lightbox/ekko-lightbox.min.js
M wikibase/queryService/ui/App.js
6 files changed, 553 insertions(+), 1 deletion(-)

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



diff --git a/index.html b/index.html
index 2fab761..972e87d 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,7 @@
 
 
 
+
 
 
 
@@ -175,6 +176,7 @@



+   
 


diff --git a/vendor/lightbox/ekko-lightbox.css 
b/vendor/lightbox/ekko-lightbox.css
new file mode 100644
index 000..ec3432f
--- /dev/null
+++ b/vendor/lightbox/ekko-lightbox.css
@@ -0,0 +1,62 @@
+/*!
+ * Lightbox for Bootstrap 3 by @ashleydw
+ * https://github.com/ashleydw/lightbox
+ *
+ * License: https://github.com/ashleydw/lightbox/blob/master/LICENSE
+ */
+
+.ekko-lightbox-container {
+  position: relative;
+}
+
+.ekko-lightbox-nav-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  width: 100%;
+  height: 100%;
+}
+
+.ekko-lightbox-nav-overlay a {
+  z-index: 100;
+  display: block;
+  width: 49%;
+  height: 100%;
+  font-size: 30px;
+  color: #fff;
+  text-shadow: 2px 2px 4px #000;
+  opacity: 0;
+  filter: dropshadow(color=#00, offx=2, offy=2);
+  -webkit-transition: opacity 0.5s;
+ -moz-transition: opacity 0.5s;
+   -o-transition: opacity 0.5s;
+  transition: opacity 0.5s;
+}
+
+.ekko-lightbox-nav-overlay a:empty {
+  width: 49%;
+}
+
+.ekko-lightbox a:hover {
+  text-decoration: none;
+  opacity: 1;
+}
+
+.ekko-lightbox .glyphicon-chevron-left {
+  left: 0;
+  float: left;
+  padding-left: 15px;
+  text-align: left;
+}
+
+.ekko-lightbox .glyphicon-chevron-right {
+  right: 0;
+  float: right;
+  padding-right: 15px;
+  text-align: right;
+}
+
+.ekko-lightbox .modal-footer {
+  text-align: left;
+}
\ No newline at end of file
diff --git a/vendor/lightbox/ekko-lightbox.js b/vendor/lightbox/ekko-lightbox.js
new file mode 100644
index 000..a662601
--- /dev/null
+++ b/vendor/lightbox/ekko-lightbox.js
@@ -0,0 +1,440 @@
+
+/*
+Lightbox for Bootstrap 3 by @ashleydw
+https://github.com/ashleydw/lightbox
+
+License: https://github.com/ashleydw/lightbox/blob/master/LICENSE
+ */
+
+(function() {
+  "use strict";
+  var $, EkkoLightbox;
+
+  $ = jQuery;
+
+  EkkoLightbox = function(element, options) {
+var content, footer, header;
+this.options = $.extend({
+  title: null,
+  footer: null,
+  remote: null
+}, $.fn.ekkoLightbox.defaults, options || {});
+this.$element = $(element);
+content = '';
+this.modal_id = this.options.modal_id ? this.options.modal_id : 
'ekkoLightbox-' + Math.floor((Math.random() * 1000) + 1);
+header = '×' + 
(this.options.title || " ") + '';
+footer = '' + this.options.footer + '';
+$(document.body).append('' + header + '' + footer + 
'');
+this.modal = $('#' + this.modal_id);
+this.modal_dialog = this.modal.find('.modal-dialog').first();
+this.modal_content = this.modal.find('.modal-content').first();
+this.modal_body = this.modal.find('.modal-body').first();
+this.modal_header = this.modal.find('.modal-header').first();
+this.modal_footer = this.modal.find('.modal-footer').first();
+this.lightbox_container = 
this.modal_body.find('.ekko-lightbox-container').first();
+this.lightbox_body = this.lightbox_container.find('> 
div:first-child').first();
+this.showLoading();
+this.modal_arrows = null;
+this.border = {
+  top: parseFloat(this.modal_dialog.css('border-top-width')) + 
parseFloat(this.modal_content.css('border-top-width')) + 
parseFloat(this.modal_body.css('border-top-width')),
+  right: parseFloat(this.modal_dialog.css('border-right-width')) + 
parseFloat(this.modal_content.css('border-right-width')) + 
parseFloat(this.modal_body.css('border-right-width')),
+  bottom: parseFloat(this.modal_dialog.css('border-bottom-width')) + 
parseFloat(this.modal_content.css('border-bottom-width')) + 
parseFloat(this.modal_body.css('border-bottom-width')),
+  left: parseFloat(this.modal_dialog.css('border-left-width')) + 
parseFloat(this.modal_content.css('border-left-width')) + 
parseFloat(this.modal_body.css('border-left-width'))
+};
+this.padding = {
+  top: parseFloat(this.modal_dialog.css('padding-top')) + 
parseFloat(this.modal_content.css('padding-top')) + 
parseFloat(this.modal_body.css('padding-top')),
+  right: parseFloat(this.modal_dialog.css('padding-right')) + 
parseFloat(this.modal_content.css('padding-right')) + 
parseFloat(this.modal_body.css('padding-right')),
+  bottom: p

[MediaWiki-commits] [Gerrit] Update VE-MW submodule to wmf/1.27.0-wmf.14 HEAD (a0f62da) - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Update VE-MW submodule to wmf/1.27.0-wmf.14 HEAD (a0f62da)
..


Update VE-MW submodule to wmf/1.27.0-wmf.14 HEAD (a0f62da)

New changes:
a0f62da Update VE core submodule to wmf/1.27.0-wmf.14 HEAD (59c0f02)

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 2e85364..a0f62da 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 2e853643f2362016c99623a2213511da891204d0
+Subproject commit a0f62da7293054dbcd5cd94445c48f21c56a5215

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0d69f9be48cf5af6abba359b70024610f327f86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.14
Gerrit-Owner: Jforrester 
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] Add version hash to wikihiero images - change (mediawiki...wikihiero)

2016-02-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Add version hash to wikihiero images
..

Add version hash to wikihiero images

Makes them more cachable by wmfstatic. Currently they point to
short-lived branch urls or hash-less wmfstatic urls.

Bug: T102578
Change-Id: Ia0990f5f0070113f73207d3280fd1c710d28449b
---
M wikihiero.body.php
M wikihiero.hooks.php
2 files changed, 14 insertions(+), 7 deletions(-)


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

diff --git a/wikihiero.body.php b/wikihiero.body.php
index bcf251f..cc83062 100644
--- a/wikihiero.body.php
+++ b/wikihiero.body.php
@@ -35,10 +35,12 @@
const TABLE_START = '';
 
private $scale = 100;
+   private $config;
 
private static $phonemes, $prefabs, $files;
 
-   public function __construct() {
+   public function __construct( Config $config = null) {
+   $this->config = $config ?: 
RequestContext::getMain()->getConfig();
self::loadData();
}
 
@@ -62,7 +64,7 @@
}
 
/**
-*
+* Parser callback for  tag
 */
public static function parserHook( $input, $args = array(), $parser ) {
$hiero = new WikiHiero();
@@ -119,13 +121,13 @@
private function renderGlyphImage( $glyph, $height = null, $margin = 
null, $class = null ) {
if ( array_key_exists( $glyph, self::$phonemes ) ) {
$code = self::$phonemes[$glyph];
-   $file = $code;
+   $fileName = $code;
// Don't show image name for cartouches and such
$title = preg_match( '/^[A-Za-z0-9]+$/', $glyph ) ? 
"{$code} [{$glyph}]" : $glyph;
} else {
-   $file = $title = $glyph;
+   $fileName = $title = $glyph;
}
-   if ( !array_key_exists( $file, self::$files ) ) {
+   if ( !array_key_exists( $fileName, self::$files ) ) {
return htmlspecialchars( $glyph );
}
 
@@ -133,7 +135,7 @@
$attribs = array(
'class' => $class,
'style' => $style,
-   'src' => self::getImagePath() . self::IMAGE_PREFIX . 
"{$file}." . self::IMAGE_EXT,
+   'src' => $this->getImageUrl( $fileName ),
'height' => $height,
'title' => $title,
'alt' => $glyph,
@@ -158,6 +160,11 @@
);
}
 
+   private function getImageUrl( $fileName ) {
+   $url = self::getImagePath() . self::IMAGE_PREFIX . $fileName . 
'.' . self::IMAGE_EXT;
+   return OutputPage::transformResourcePath( $this->config, $url );
+   }
+
private function isMirrored( $glyph ) {
return substr( $glyph, -1 ) == '\\';
}
diff --git a/wikihiero.hooks.php b/wikihiero.hooks.php
index 5501fbb..80ce135 100644
--- a/wikihiero.hooks.php
+++ b/wikihiero.hooks.php
@@ -11,4 +11,4 @@
$parser->setHook( 'hiero', 'WikiHiero::parserHook' );
return true;
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0990f5f0070113f73207d3280fd1c710d28449b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Give drag handle an increased opacity on hover - change (mediawiki...TemplateData)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Give drag handle an increased opacity on hover
..


Give drag handle an increased opacity on hover

Change-Id: Ic7f283b4d20cc8ba35924d4f79be6ba7d3414a78
---
M modules/ext.templateDataGenerator.ui.css
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.ui.css 
b/modules/ext.templateDataGenerator.ui.css
index b0c0d46..26788a9 100644
--- a/modules/ext.templateDataGenerator.ui.css
+++ b/modules/ext.templateDataGenerator.ui.css
@@ -32,6 +32,11 @@
opacity: 0.2;
 }
 
+/* Hover events sometimes fire while dragging, so limit to highlighted widgets 
*/
+.tdg-templateDataParamWidget.oo-ui-optionWidget-highlighted 
.oo-ui-iconElement-icon:hover {
+   opacity: 0.5;
+}
+
 .tdg-templateDataParamWidget-param-name,
 .tdg-templateDataParamWidget-param-aliases,
 .tdg-templateDataParamWidget-param-description {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7f283b4d20cc8ba35924d4f79be6ba7d3414a78
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Keep JSON data as an object (not a string) until the last po... - change (mediawiki...TemplateData)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Keep JSON data as an object (not a string) until the last 
possible point
..


Keep JSON data as an object (not a string) until the last possible point

Conversion to wikitext string can all happen in one place, and tests
are cleaner.

Change-Id: I42adc454dad0dcbb33d9395f8ced0b07a6535fed
---
M modules/ext.templateDataGenerator.data.js
M modules/ext.templateDataGenerator.ui.js
M modules/ext.templateDataGenerator.ui.tdDialog.js
M tests/ext.templateData.tests.js
4 files changed, 107 insertions(+), 99 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.data.js 
b/modules/ext.templateDataGenerator.data.js
index 45c2299..b7be368 100644
--- a/modules/ext.templateDataGenerator.data.js
+++ b/modules/ext.templateDataGenerator.data.js
@@ -858,11 +858,11 @@
 };
 
 /**
- * Process the current model and output it as a complete templatedata string
+ * Process the current model and output it
  *
- * @return {string} Templatedata String
+ * @return {Object} Templatedata object
  */
-mw.TemplateData.Model.prototype.outputTemplateDataString = function () {
+mw.TemplateData.Model.prototype.outputTemplateData = function () {
var param, paramKey, key, prop, oldKey, name, compareOrig, 
normalizedValue,
allProps = this.constructor.static.getAllProperties( true ),
original = this.getOriginalTemplateDataObject(),
@@ -1018,7 +1018,7 @@
}
}
}
-   return JSON.stringify( result, null, '\t' );
+   return result;
 };
 
 /**
diff --git a/modules/ext.templateDataGenerator.ui.js 
b/modules/ext.templateDataGenerator.ui.js
index f9ff904..77abfdc 100644
--- a/modules/ext.templateDataGenerator.ui.js
+++ b/modules/ext.templateDataGenerator.ui.js
@@ -131,10 +131,10 @@
 * Respond to edit dialog apply event
 *
 * @method onDialogApply
-* @param {string} templateDataString New templatedata string
+* @param {Object} templateData New templatedata
 */
-   onDialogApply = function ( templateDataString ) {
-   $textbox.val( replaceTemplateData( templateDataString ) 
);
+   onDialogApply = function ( templateData ) {
+   $textbox.val( replaceTemplateData( templateData ) );
},
 
/**
@@ -142,7 +142,7 @@
 * insert the new one into the page if an old one doesn't exist
 *
 * @method replaceTemplateData
-* @param {string} newTemplateData New templatedata string
+* @param {Object} newTemplateData New templatedata
 * @return {string} Full wikitext content with the new 
templatedata
 *  string.
 */
@@ -158,7 +158,7 @@
//  exists. Replace it
finalOutput = fullWikitext.replace(

/()([\s\S]*?)(<\/templatedata>)/i,
-   '\n' + newTemplateData + 
'\n'
+   '\n' + JSON.stringify( 
newTemplateData, null, '\t' ) + '\n'
);
} else {
finalOutput = fullWikitext;
@@ -174,7 +174,7 @@
}
}
finalOutput += '\n' +
-   newTemplateData +
+   JSON.stringify( 
newTemplateData, null, '\t' ) +
'\n\n';
if ( !isPageSubLevel ) {
finalOutput += '\n';
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index e3246d6..a3a4532 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -925,7 +925,7 @@
}
if ( action === 'apply' ) {
return new OO.ui.Process( function () {
-   this.emit( 'apply', 
this.model.outputTemplateDataString() );
+   this.emit( 'apply', this.model.outputTemplateData() );
this.close( { action: action } );
}, this );
}
diff --git a/tests/ext.templateData.tests.js b/tests/ext.templateData.tests.js
index 13b4691..0873e4f 100644
--- a/tests/ext.templateData.tests.js
+++ b/tests/ext.templateData.tests.js
@@ -5,7 +5,7 @@
 ( function () {
'use strict';
 
-   var i, testVars, finalJsonStringParams, finalJsonStringOnly,
+   var i, te

[MediaWiki-commits] [Gerrit] Param list style tweaks - change (mediawiki...TemplateData)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Param list style tweaks
..


Param list style tweaks

Change-Id: I244b010a4b1a06e33b31d029afaabe9290440e0f
---
M modules/ext.templateDataGenerator.ui.css
M modules/widgets/ext.templateDataGenerator.paramWidget.js
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.ui.css 
b/modules/ext.templateDataGenerator.ui.css
index 53b81cd..b0c0d46 100644
--- a/modules/ext.templateDataGenerator.ui.css
+++ b/modules/ext.templateDataGenerator.ui.css
@@ -38,8 +38,6 @@
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
-   /* HACK: Based on the expected width of this widget, using % produces 
unreliable results*/
-   max-width: 33em;
 }
 
 .tdg-templateDataParamWidget-param-name {
@@ -51,6 +49,10 @@
font-size: 0.9em;
 }
 
+.tdg-templateDataParamWidget-param-description {
+   color: #666;
+}
+
 .tdg-templateDataParamWidget-param-alias {
border-radius: 0.3em;
padding: 0.125em 0.25em;
diff --git a/modules/widgets/ext.templateDataGenerator.paramWidget.js 
b/modules/widgets/ext.templateDataGenerator.paramWidget.js
index d409c05..fdfbd96 100644
--- a/modules/widgets/ext.templateDataGenerator.paramWidget.js
+++ b/modules/widgets/ext.templateDataGenerator.paramWidget.js
@@ -59,5 +59,5 @@
);
}
 
-   this.setLabel( $paramName.add( $aliases ).add( $description ) );
+   this.setLabel( $aliases.add( $paramName ).add( $description ) );
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I244b010a4b1a06e33b31d029afaabe9290440e0f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make main template param select widget drag/drop re-orderable - change (mediawiki...TemplateData)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Make main template param select widget drag/drop re-orderable
..


Make main template param select widget drag/drop re-orderable

Not having two lists of all the parameters seems like a good idea.

Depends-On: I30d1f7f56230d73eb47ccbf9881c0b952b15bd89
Change-Id: I5b2ba39fb7b98fc50816f63bc4fbfc9fe25e02a5
---
M extension.json
M modules/ext.templateDataGenerator.ui.css
M modules/ext.templateDataGenerator.ui.tdDialog.js
D modules/widgets/ext.templateDataGenerator.dragDropItemWidget.js
D modules/widgets/ext.templateDataGenerator.dragDropWidget.js
D modules/widgets/ext.templateDataGenerator.optionImportWidget.js
D modules/widgets/ext.templateDataGenerator.optionWidget.js
A modules/widgets/ext.templateDataGenerator.paramImportWidget.js
A modules/widgets/ext.templateDataGenerator.paramSelectWidget.js
A modules/widgets/ext.templateDataGenerator.paramWidget.js
10 files changed, 192 insertions(+), 298 deletions(-)

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



diff --git a/extension.json b/extension.json
index 99af116..6c220db 100644
--- a/extension.json
+++ b/extension.json
@@ -77,12 +77,11 @@
"styles": "modules/ext.templateDataGenerator.ui.css",
"scripts": [
"modules/ext.templateDataGenerator.ui.js",
-   
"modules/widgets/ext.templateDataGenerator.optionWidget.js",
-   
"modules/widgets/ext.templateDataGenerator.optionImportWidget.js",
+   
"modules/widgets/ext.templateDataGenerator.paramSelectWidget.js",
+   
"modules/widgets/ext.templateDataGenerator.paramWidget.js",
+   
"modules/widgets/ext.templateDataGenerator.paramImportWidget.js",

"modules/widgets/ext.templateDataGenerator.languageResultWidget.js",

"modules/widgets/ext.templateDataGenerator.languageSearchWidget.js",
-   
"modules/widgets/ext.templateDataGenerator.dragDropItemWidget.js",
-   
"modules/widgets/ext.templateDataGenerator.dragDropWidget.js",

"modules/ext.templateDataGenerator.ui.tdDialog.js"
],
"dependencies": [
diff --git a/modules/ext.templateDataGenerator.ui.css 
b/modules/ext.templateDataGenerator.ui.css
index 38a1f8b..53b81cd 100644
--- a/modules/ext.templateDataGenerator.ui.css
+++ b/modules/ext.templateDataGenerator.ui.css
@@ -24,13 +24,17 @@
background-color: #FFA3A3;
 }
 
-.tdg-templateDataOptionWidget {
+.tdg-templateDataParamWidget {
padding-right: 0.5em;
 }
 
-.tdg-templateDataOptionWidget-param-name,
-.tdg-templateDataOptionWidget-param-aliases,
-.tdg-templateDataOptionWidget-param-description {
+.tdg-templateDataParamWidget .oo-ui-iconElement-icon {
+   opacity: 0.2;
+}
+
+.tdg-templateDataParamWidget-param-name,
+.tdg-templateDataParamWidget-param-aliases,
+.tdg-templateDataParamWidget-param-description {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
@@ -38,16 +42,16 @@
max-width: 33em;
 }
 
-.tdg-templateDataOptionWidget-param-name {
+.tdg-templateDataParamWidget-param-name {
font-weight: bold;
 }
 
-.tdg-templateDataOptionWidget-param-aliases {
+.tdg-templateDataParamWidget-param-aliases {
float: right;
font-size: 0.9em;
 }
 
-.tdg-templateDataOptionWidget-param-alias {
+.tdg-templateDataParamWidget-param-alias {
border-radius: 0.3em;
padding: 0.125em 0.25em;
margin-left: 0.5em;
@@ -56,15 +60,24 @@
border: solid 1px #ddd;
 }
 
-.tdg-templateDataOptionWidget-param-alias:first-child {
+.tdg-templateDataParamWidget-param-alias:first-child {
background-color: #fff;
 }
 
-.tdg-templateDataOptionWidget-paramList-param-description {
+.tdg-templateDataParamWidget-paramList-param-description {
clear: both;
color: #555;
 }
 
+.tdg-templateDataParamImportWidget {
+   margin-top: 1em;
+}
+
+.tdg-templateDataParamImportWidget > .oo-ui-buttonElement-button {
+   text-align: left;
+   font-weight: normal;
+}
+
 /* mw.TemplateData.LanguageSearchWidget */
 
 .tdg-languageResultWidget-otherMatch {
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 26f08c2..eac7269 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -80,8 +80,7 @@
  * @chainable
  */
 mw.TemplateData.Dialog.prototype.initialize = function () {
-   var templateParamsFieldset, addParamFieldlayout, 
languageActionFieldLayout,
-   paramOrderFieldset, templateFormatFieldSet;
+   var tem

[MediaWiki-commits] [Gerrit] Show param label in list if available - change (mediawiki...TemplateData)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Show param label in list if available
..


Show param label in list if available

It looks like this is how the code was originally intended,
but 'name' and 'key' are the same thing.

Move the key to the 'alias' list where CSS already exists to
colour it differently.

Change-Id: Ieade122633cec14203f7959121e9cd7250bb9f7a
---
M modules/ext.templateDataGenerator.data.js
M modules/ext.templateDataGenerator.ui.tdDialog.js
M modules/widgets/ext.templateDataGenerator.paramWidget.js
M tests/ext.templateData.tests.js
4 files changed, 25 insertions(+), 31 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.data.js 
b/modules/ext.templateDataGenerator.data.js
index aa7e54d..45c2299 100644
--- a/modules/ext.templateDataGenerator.data.js
+++ b/modules/ext.templateDataGenerator.data.js
@@ -529,19 +529,16 @@
 };
 
 /**
- * Get a specific parameter's description
+ * Get a specific parameter's localized property
  *
  * @param {string} paramKey Parameter key
+ * @param {string} property Property name
  * @param {string} [language] Optional language key
- * @return {string} Parameter description in given language.
+ * @return {string} Parameter property in specified language
  */
-mw.TemplateData.Model.prototype.getParamDescription = function ( paramKey, 
language ) {
+mw.TemplateData.Model.prototype.getParamValue = function ( paramKey, property, 
language ) {
language = language || this.getDefaultLanguage();
-   if ( this.params[ paramKey ] && this.params[ paramKey ].description ) {
-   // Return description in this language or fall back
-   return this.params[ paramKey ].description[ language ] || '';
-   }
-   return '';
+   return OO.getProp( this.params, paramKey, property, language ) || '';
 };
 
 /**
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index eac7269..e3246d6 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -582,12 +582,10 @@
data = this.model.getParamData( paramKey );
 
paramItem = new mw.TemplateData.ParamWidget( {
-   data: {
-   key: paramKey,
-   name: data.name,
-   aliases: data.aliases,
-   description: this.model.getParamDescription( paramKey, 
this.language )
-   }
+   key: paramKey,
+   label: this.model.getParamValue( paramKey, 'label', 
this.language ),
+   aliases: data.aliases,
+   description: this.model.getParamValue( paramKey, 'description', 
this.language )
} );
 
this.paramSelect.addItems( [ paramItem ] );
diff --git a/modules/widgets/ext.templateDataGenerator.paramWidget.js 
b/modules/widgets/ext.templateDataGenerator.paramWidget.js
index 9f9f8ac..d409c05 100644
--- a/modules/widgets/ext.templateDataGenerator.paramWidget.js
+++ b/modules/widgets/ext.templateDataGenerator.paramWidget.js
@@ -5,13 +5,11 @@
  * @extends {OO.ui.DecoratedOptionWidget}
  * @mixins OO.ui.mixin.DraggableElement
  *
- * @param {Object} config Dialog configuration object
+ * @param {Object} data Parameter data
+ * @param {Object} [config] Configuration object
  */
-mw.TemplateData.ParamWidget = function mwTemplateDataParamWidget( config ) {
-   var data;
-
+mw.TemplateData.ParamWidget = function mwTemplateDataParamWidget( data, config 
) {
config = config || {};
-   data = config.data || {};
 
// Parent constructor
mw.TemplateData.ParamWidget.parent.call( this, $.extend( {}, config, { 
data: data.key, icon: 'menu' } ) );
@@ -20,8 +18,8 @@
OO.ui.mixin.DraggableElement.call( this, $.extend( { $handle: 
this.$icon } ) );
 
this.key = data.key;
-   this.name = data.name;
-   this.aliases = data.aliases;
+   this.label = data.label;
+   this.aliases = data.aliases || [];
this.description = data.description;
 
// Initialize
@@ -40,6 +38,7 @@
  */
 mw.TemplateData.ParamWidget.prototype.buildParamLabel = function () {
var i, len,
+   keys = this.aliases.slice(),
$paramName = $( '' )
.addClass( 'tdg-templateDataParamWidget-param-name' ),
$aliases = $( '' )
@@ -47,17 +46,17 @@
$description = $( '' )
.addClass( 
'tdg-templateDataParamWidget-param-description' );
 
-   $paramName.text( this.name );
+   keys.unshift( this.key );
+
+   $paramName.text( this.label || this.key );
$description.text( this.description );
 
-   if ( this.aliases !== undefined ) {
-   for ( i = 0, len = this.aliases.length; i <

[MediaWiki-commits] [Gerrit] Use upstream highlightQuery method in OOUI - change (VisualEditor/VisualEditor)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Use upstream highlightQuery method in OOUI
..


Use upstream highlightQuery method in OOUI

Depends-On: I3019dd44597e60722efa5b14687b069e9ae0a90a
Change-Id: I9ebd1c1a4e01508ce00af8515cd186c9fae2a079
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
D src/ui/styles/ve.ui.css
M src/ui/widgets/ve.ui.LanguageResultWidget.js
M src/ve.utils.js
6 files changed, 15 insertions(+), 54 deletions(-)

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



diff --git a/build/modules.json b/build/modules.json
index e72d77b..45c4701 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -518,7 +518,6 @@
"src/ce/styles/nodes/ve.ce.TableNode.css",
"src/ce/styles/ve.ce.css",
"src/ce/styles/ve.ce.Surface.css",
-   "src/ui/styles/ve.ui.css",
"src/ui/styles/dialogs/ve.ui.ToolbarDialog.css",
"src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css",
"src/ui/styles/dialogs/ve.ui.FindAndReplaceDialog.css",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 0f5e124..7c9fbb2 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -42,7 +42,6 @@



-   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 4201905..dcab319 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -42,7 +42,6 @@



-   



diff --git a/src/ui/styles/ve.ui.css b/src/ui/styles/ve.ui.css
deleted file mode 100644
index a505009..000
--- a/src/ui/styles/ve.ui.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * VisualEditor UserInterface styles.
- *
- * @copyright 2011-2016 VisualEditor Team and others; see 
http://ve.mit-license.org
- */
-
-.ve-ui-query-highlight {
-   font-weight: bold;
-}
diff --git a/src/ui/widgets/ve.ui.LanguageResultWidget.js 
b/src/ui/widgets/ve.ui.LanguageResultWidget.js
index 65b9177..5d7aa26 100644
--- a/src/ui/widgets/ve.ui.LanguageResultWidget.js
+++ b/src/ui/widgets/ve.ui.LanguageResultWidget.js
@@ -19,9 +19,9 @@
 
// Initialization
this.$element.addClass( 've-ui-languageResultWidget' );
-   this.$name = $( '' ).addClass( 've-ui-languageResultWidget-name' );
-   this.$otherMatch = $( '' ).addClass( 
've-ui-languageResultWidget-otherMatch' );
-   this.setLabel( this.$otherMatch.add( this.$name ) );
+   this.name = new OO.ui.LabelWidget( { classes: [ 
've-ui-languageResultWidget-name' ] } );
+   this.otherMatch = new OO.ui.LabelWidget( { classes: [ 
've-ui-languageResultWidget-otherMatch' ] } );
+   this.setLabel( this.otherMatch.$element.add( this.name.$element ) );
 };
 
 /* Inheritance */
@@ -33,25 +33,22 @@
 /**
  * Update labels based on query
  *
- * @param {string} [query] Query text which matched this result
- * @param {string} [matchedProperty] Data property which matched the query text
+ * @param {string} query Query text which matched this result
+ * @param {string} matchedProperty Data property which matched the query text
  * @chainable
  */
 ve.ui.LanguageResultWidget.prototype.updateLabel = function ( query, 
matchedProperty ) {
-   var $highlighted, data = this.getData();
+   var data = this.getData();
 
-   // Reset text
-   this.$name.text( data.name );
-   this.$otherMatch.text( data.code );
-
-   // Highlight where applicable
-   if ( matchedProperty ) {
-   $highlighted = ve.highlightQuery( data[ matchedProperty ], 
query );
-   if ( matchedProperty === 'name' ) {
-   this.$name.empty().append( $highlighted );
-   } else {
-   this.$otherMatch.empty().append( $highlighted );
-   }
+   if ( matchedProperty === 'name' ) {
+   this.name.setHighlightedQuery( data.name, query );
+   } else {
+   this.name.setLabel( data.name );
+   }
+   if ( matchedProperty === 'code' || matchedProperty === 'autonym' ) {
+   this.otherMatch.setHighlightedQuery( data[ matchedProperty ], 
query );
+   } else {
+   this.otherMatch.setLabel( data.code );
}
 
return this;
diff --git a/src/ve.utils.js b/src/ve.utils.js
index 9ce9577..486cfea 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -1442,30 +1442,6 @@
 };
 
 /**
- * Highlight text where a substring query matches
- *
- * @param {string} text Text
- * @param {string} query Query to find
- * @return {jQuery} Text with query substring wrapped in highlighted span
- */
-ve.highlightQuery = function ( text, query ) {
-   var $result = $( '' ),
-

[MediaWiki-commits] [Gerrit] CapsuleItemWidget: Revert regression on "remove" button in F... - change (oojs/ui)

2016-02-22 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: CapsuleItemWidget: Revert regression on "remove" button in 
Firefox
..

CapsuleItemWidget: Revert regression on "remove" button in Firefox

Reverting regression introduced by I54e2dedf43dc7a9e66a09ec12b56ac06f30c58b6
in Firefox, see https://phabricator.wikimedia.org/F3402279

Change-Id: Ieac469d5901dd3d1b032fd0fb897edcb53ea22e2
---
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
2 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/47/272647/1

diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 3c687eb..9808c7a 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -622,9 +622,8 @@
}
 
> .oo-ui-buttonElement {
-   float: right;
-   margin-top: -0.1em;
-   margin-right: -0.4em;
+   margin-top: -1.25em;
+   padding-left: 0.3em;
}
 }
 
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index f024e59..ca08efe 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -806,9 +806,8 @@
}
 
> .oo-ui-buttonElement {
-   float: right;
-   margin-top: -0.2em;
-   margin-left: 0.4em;
+   margin-top: -1.4em;
+   padding-left: 0.3em;
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Strip references for experimentation" - change (operations/mediawiki-config)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Strip references for experimentation"
..


Revert "Strip references for experimentation"

To be merged Monday 22nd February to allow further
analysis and to account for the removal of srcsets.

This reverts commit 48e847b9ab6359e9cca0bb2a28e6afdb4325bc0b.

Bug: T126390
Change-Id: Ia7fca8c9326b9483f1c9e77a702bb445415c8409
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 307f2bf..76e7c4a 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -281,8 +281,8 @@
 
'wgMFRemovableClasses' => array(
'default' => array(
-   'base' => array( '.navbox', '.references' ),
-   'beta' => array( '.navbox', '.references' ),
+   'base' => array( '.navbox' ),
+   'beta' => array( '.navbox' ),
'HTML' => array(),
),
),

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

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

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

[MediaWiki-commits] [Gerrit] Bugfix: wrong value format for wgReferrerPolicy - change (operations/mediawiki-config)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Bugfix: wrong value format for wgReferrerPolicy
..


Bugfix: wrong value format for wgReferrerPolicy

Change I7678f3348 used the wrong formatting of the
wgReferrerPolicy (meta referrer tag) value.

Ref:
https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-delivery-meta

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e008fdf..a7b43be 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11338,7 +11338,7 @@
 ),
 
 'wgReferrerPolicy' => array(
-   'default' => 'Origin When Cross-Origin',
+   'default' => 'origin-when-cross-origin',
 ),
 
 'wgUserEmailUseReplyTo' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5f1759bdb8845b5cda4161d74dd29215f54f1cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: DarTar 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mdann52 
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 a PHP 5.5 TODO - change (mediawiki/core)

2016-02-22 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Fix a PHP 5.5 TODO
..

Fix a PHP 5.5 TODO

Change-Id: Ieb3bc27e4f33e170b2217ab8eab58f5309083e80
---
M includes/parser/Preprocessor.php
1 file changed, 2 insertions(+), 6 deletions(-)


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

diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php
index 255fef8..368d79e 100644
--- a/includes/parser/Preprocessor.php
+++ b/includes/parser/Preprocessor.php
@@ -67,9 +67,7 @@
}
 
$key = wfMemcKey(
-   // TODO: Once we require PHP 5.5, use static::class 
instead of
-   // get_called_class() or get_class( $this ).
-   defined( 'static::CACHE_PREFIX' ) ? 
static::CACHE_PREFIX : get_called_class(),
+   defined( 'static::CACHE_PREFIX' ) ? 
static::CACHE_PREFIX : static::class,
md5( $text ), $flags );
$value = sprintf( "%08d", static::CACHE_VERSION ) . $tree;
 
@@ -100,9 +98,7 @@
$cache = ObjectCache::getInstance( $config->get( 
'MainCacheType' ) );
 
$key = wfMemcKey(
-   // TODO: Once we require PHP 5.5, use static::class 
instead of
-   // get_called_class() or get_class( $this ).
-   defined( 'static::CACHE_PREFIX' ) ? 
static::CACHE_PREFIX : get_called_class(),
+   defined( 'static::CACHE_PREFIX' ) ? 
static::CACHE_PREFIX : static::class,
md5( $text ), $flags );
 
$value = $cache->get( $key );

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

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

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

[MediaWiki-commits] [Gerrit] Avoid pointless doBatchLookups() query for user contributions - change (mediawiki/core)

2016-02-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid pointless doBatchLookups() query for user contributions
..

Avoid pointless doBatchLookups() query for user contributions

This shows up in slow query reports a lot.

Change-Id: Ic1cf45fae87655e0b9d09fdc96aa2b2c22de2c11
---
M includes/specials/SpecialContributions.php
1 file changed, 9 insertions(+), 3 deletions(-)


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

diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 254d9e2..5a351a7 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -934,14 +934,16 @@
function doBatchLookups() {
# Do a link batch query
$this->mResult->seek( 0 );
-   $revIds = [];
+   $parentRevIds = [];
+   $this->mParentLens = [];
$batch = new LinkBatch();
# Give some pointers to make (last) links
foreach ( $this->mResult as $row ) {
if ( isset( $row->rev_parent_id ) && 
$row->rev_parent_id ) {
-   $revIds[] = $row->rev_parent_id;
+   $parentRevIds[] = $row->rev_parent_id;
}
if ( isset( $row->rev_id ) ) {
+   $this->mParentLens[$row->rev_id] = 
$row->rev_len;
if ( $this->contribs === 'newbie' ) { // 
multiple users
$batch->add( NS_USER, $row->user_name );
$batch->add( NS_USER_TALK, 
$row->user_name );
@@ -949,7 +951,11 @@
$batch->add( $row->page_namespace, 
$row->page_title );
}
}
-   $this->mParentLens = Revision::getParentLengths( 
$this->mDbSecondary, $revIds );
+   # Fetch rev_len for revisions not already scanned above
+   $this->mParentLens += Revision::getParentLengths(
+   $this->mDbSecondary,
+   array_diff( $parentRevIds, array_keys( 
$this->mParentLens ) )
+   );
$batch->execute();
$this->mResult->seek( 0 );
}

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

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

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

[MediaWiki-commits] [Gerrit] Add Tool namespace to wikitech - change (operations/mediawiki-config)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Add Tool namespace to wikitech
..


Add Tool namespace to wikitech

Add a "Tool" namespace to wikitech that will be used by Tool Labs
maintainers to document their tools and provide support to their users.
This new namespace is also added to the default full site search to make
surfacing tools easier and marked as a content namespace.

Bug: T122865
Change-Id: Iaf5f30a461120378d16373cb9ac9202bb89cbcbb
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2912c8d..881ee36 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4651,6 +4651,9 @@
111 => 'Obsolete_talk',
112 => 'OfficeIT', // T123383
113 => 'OfficeIT_talk',
+   // NS 114/115 reserved for 'Translation'
+   116 => 'Tool', // T122865
+   117 => 'Tool_talk', // T122865
),
'mediawikiwiki' => array(
100 => 'Manual',
@@ -7047,7 +7050,7 @@
'+itwikivoyage' => array( 100 => 1, 104 => 1, 106 => 1 ),
'+kowikisource' => array( 100 => 1 ),
'+lawikisource' => array( 102 => 1, 106 => 1 ),
-   '+wikitech' => array( 12 => 1, 498 => 1 ),
+   '+wikitech' => array( 12 => 1, 116 => 1, 498 => 1 ),
'+ltwiki' => array( 100 => 1 ),
'+mediawikiwiki' => array( 12 => 1, 100 => 1, 102 => 1, 104 => 1, 106 
=> 1 ), // T85807
'+metawiki' => array( 12 => 1, 200 => 1, 202 => 1 ),
@@ -10818,6 +10821,7 @@
'+vecwikisource' => array( 100 ),
'+viwikibooks' => array( 104, 106 ),
'+viwikisource' => array( 102 ),
+   '+wikitech' => array( NS_HELP, 116 ), // Tools - T122865
'+zhwikisource' => array( 102, 114 ), // T66127
'+dewikivoyage' => array( 104 ),
 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf5f30a461120378d16373cb9ac9202bb89cbcbb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: Tim Landscheidt 
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] Only load a page/booklet once - change (mediawiki...WikiEditor)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Only load a page/booklet once
..


Only load a page/booklet once

Bug: T126138
Change-Id: Ib4b2b76b115026df12a7d9cc3c30b7559c2580e4
---
M modules/jquery.wikiEditor.toolbar.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/jquery.wikiEditor.toolbar.js 
b/modules/jquery.wikiEditor.toolbar.js
index 24e3316..b731eaf 100644
--- a/modules/jquery.wikiEditor.toolbar.js
+++ b/modules/jquery.wikiEditor.toolbar.js
@@ -447,7 +447,7 @@
rel: id
} );
if ( deferLoad ) {
-   $page.bind( 'loadPage', function () {
+   $page.one( 'loadPage', function () {

$.wikiEditor.modules.toolbar.fn.reallyBuildPage( context, id, page, $page );
} );
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4b2b76b115026df12a7d9cc3c30b7559c2580e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: GOIII 
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] Update OOjs UI to v0.16.0 - change (VisualEditor/VisualEditor)

2016-02-22 Thread jenkins-bot (Code Review)

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

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


Update OOjs UI to v0.16.0

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

Change-Id: I9c170fce1c65ae65b0b33342572fe4d3bb613774
---
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
A lib/oojs-ui/i18n/nan.json
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
D lib/oojs-ui/oojs-ui-apex-noimages.css
D lib/oojs-ui/oojs-ui-apex-noimages.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.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-mediawiki.css
M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
D lib/oojs-ui/oojs-ui-mediawiki-noimages.css
D lib/oojs-ui/oojs-ui-mediawiki-noimages.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.css
M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
M lib/oojs-ui/themes/apex/images/toolbar-shadow.png
M lib/oojs-ui/themes/mediawiki/images/icons/eye-invert.svg
M lib/oojs-ui/themes/mediawiki/images/icons/eye.svg
91 files changed, 643 insertions(+), 13,121 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c170fce1c65ae65b0b33342572fe4d3bb613774
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch:

[MediaWiki-commits] [Gerrit] Adding Integration test to verify event-logging on wikipedia... - change (wikimedia/portals)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Adding Integration test to verify event-logging on 
wikipedia.org portal. Tests are run with casper.js and require phantomjs.
..


Adding Integration test to verify event-logging on wikipedia.org portal.
Tests are run with casper.js and require phantomjs.

Bug: T124091
Change-Id: I4154e65330ae092fc0f05742df5f381de90a495f
---
M package.json
A tests/casper.js
2 files changed, 177 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 20ef7de..5ef591f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "scripts": {
-"test": "node ./tests/lint.js"
+"test": "node ./tests/lint.js",
+"casperjs": "casperjs test ./tests/casper.js"
   },
   "devDependencies": {
 "bluebird": "^3.0.5",
@@ -33,6 +34,10 @@
 "preq": "^0.4.6",
 "sprity": "^1.0.8",
 "underscore": "^1.8.3",
-"yargs": "^3.29.0"
+"yargs": "^3.29.0",
+"casperjs": "git+https://github.com/n1k0/casperjs.git";
+  },
+  "dependencies": {
+"phantomjs-prebuilt": "^2.1.3"
   }
 }
diff --git a/tests/casper.js b/tests/casper.js
new file mode 100644
index 000..bd57d12
--- /dev/null
+++ b/tests/casper.js
@@ -0,0 +1,170 @@
+// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+/* global casper, console */
+
+/**
+ * Integration Test for wikipedia.org portal event logging.
+ * Run from the main project directory with
+ * $ npm run casperjs -- --url=http://your testing url
+ *
+ * This baseline test:
+ * - opens the wikipedia portal
+ * - sets the event logging group to 'baseline'
+ * - reloads the page
+ * - checks for a landing EL request
+ * - checks for clickthrough events on all sections.
+ * - checks for clickthrough event on forms.
+ * - makes sure only 1 event per section was sent.
+ **/
+
+var _ = require( 'underscore' );
+
+casper.test.begin( 'Wikipedia Portal - baseline', function suite( test ) {
+
+   var portalUrl = casper.cli.get( 'url' );
+
+   /**
+* Tests which should be executed on event logging sections.
+* These tests should trigger an EL request.
+*/
+   var elTests = {
+   clickEvent: function( section ) {
+   test.assertExists( section.sectionSelector );
+   casper.click( section.clickSelector );
+   },
+   submitEvent: function( section ){
+   test.assertExists( section.sectionSelector );
+   casper.fillSelectors( section.sectionSelector, 
section.formFields, false );
+   casper.click( section.clickSelector );
+   }
+   };
+
+   /**
+* Sections to execute the event logging tests on.
+* The names of these sections should equal the EL `section_used` || 
`event_type` property.
+*/
+   var elSections = {
+   landing: {
+   eventTest: null,
+   eventData: [],
+   eventCount: 0
+   },
+   search: {
+   eventTest: elTests.submitEvent,
+   sectionSelector: 'form.search-form',
+   clickSelector: 'form.search-form 
button.formBtn',
+   eventCount: 0,
+   eventData: [],
+   formFields: {
+   'select#searchLanguage': 'fr',
+   'input#searchInput': '~paris'
+   }
+   },
+   'primary links': {
+   eventTest: elTests.clickEvent,
+   sectionSelector: '[data-el-section="primary 
links"]',
+   clickSelector: '[data-el-section="primary 
links"] * a',
+   eventData: [],
+   eventCount: 0
+   },
+   'secondary links': {
+   eventTest: elTests.clickEvent,
+   sectionSelector: '[data-el-section="secondary 
links"]',
+   clickSelector: '[data-el-section="secondary 
links"] * a',
+   eventData: [],
+   eventCount: 0
+   },
+   'other languages': {
+   eventTest: elTests.clickEvent,
+   sectionSelector: '[data-el-section="other 
languages"]',
+   clickSelector: '[data-el-section="other 
languages"] * a',
+   eventData: [],
+

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

2016-02-22 Thread jenkins-bot (Code Review)

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

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


Update OOjs UI to v0.16.0

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

Change-Id: I9c170fce1c65ae65b0b33342572fe4d3bb613774
---
M composer.json
A resources/lib/oojs-ui/i18n/nan.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/images/icons/add.png
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.png
M resources/lib/oojs-ui/themes/apex/images/icons/alert.png
M resources/lib/oojs-ui/themes/apex/images/icons/align-center.png
M resources/lib/oojs-ui/themes/apex/images/icons/align-float-left.png
M resources/lib/oojs-ui/themes/apex/images/icons/align-float-right.png
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/arrow-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/arrow-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/attachment-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/attachment-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/beta.png
M resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch.png
M resources/lib/oojs-ui/themes/apex/images/icons/bigger-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/bigger-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/block.png
M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-a.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-b.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-te.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-f.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-geor-man.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-l.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-n.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-v.png
M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-ltr-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-rtl-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/browser-ltr-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/browser-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/cancel.png
M resources/lib/oojs-ui/themes/apex/images/icons/caret-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/caret-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/caretDown.png
M resources/lib/oojs-ui/themes/apex/images/icons/caretUp.png
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png
M resources/lib/oojs-ui/themes/apex/images/icons/check.png
M resources/lib/oojs-ui/themes/apex/images/icons/circle.png
M resources/lib/oojs-ui/themes/apex/images/icons/clear-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/clear.png
M resources/lib/oojs-ui/themes/apex/images/icons/clock-invert.png
M resources/lib/oojs-ui/themes/apex/images/icons/clock.png
M resources/lib/oojs-ui/themes/apex/images/icons/close.png
M resources/lib/oojs-ui/themes/apex/images/icons/code.pn

[MediaWiki-commits] [Gerrit] Freeze LQT on fiwikimedia - change (operations/mediawiki-config)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Freeze LQT on fiwikimedia
..


Freeze LQT on fiwikimedia

Also remove sewikimedia from the LQT list; this is a no-op
because it's in the freeze list, but we generally
have each wiki in only one of the two lists.

Bug: T127576
Change-Id: I9e7991e2347137a8e4da4188f285f5e1532512ab
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9945c73..a7e77d7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11974,11 +11974,9 @@
'testwiki' => true, // Expanding out to testwiki -- Andrew 2009-10-13
'enwikinews' => true, // Per T23956 -- Andrew 2009-02-09
'enwiktionary' => true, // T25417 -- ariel 2010-16-05
-   'fiwikimedia' => true, // T39778
'huwiki' => true, // T24909 -- Andrew 2010-09-06
'ptwikibooks' => true, // T26143 -- Andrew 2010-08-16
'strategywiki' => true, // Philippe says it's cool -- Andrew 2009-10-13
-   'sewikimedia' => true, // T26377 -- Andrew 2010-08-28
'svwikisource' => true, // T25220 -- Andrew 2010-08-28
'test2wiki' => true,
'wikimania2010wiki' => true, // Erik requested, by mail
@@ -11997,6 +11995,7 @@
'mediawikiwiki' => true,
'officewiki' => true, // replaced with Flow 2014-11-25
'sewikimedia' => true, // T106302, T114277
+   'fiwikimedia' => true,
 ),
 
 'wmgLQTUserControlNamespaces' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e7991e2347137a8e4da4188f285f5e1532512ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER - change (mediawiki/core)

2016-02-22 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER
..

Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER

When an entry point specifies MW_NO_SESSION, actually enforce that by
having both SessionManager and PHP's session handling (session_start()
and friends) throw exceptions.

If an entry point needs the old behavior of using PHP's default session
handling (as defined in php.ini), it should define
MW_NO_SESSION_HANDLER instead of or in addition to MW_NO_SESSION.

This also makes PHPSessionHandler be installed in CLI mode, where it
wasn't installed before.

Bug: T127233
Change-Id: I2a3db06ee8e44a044096c57a819b5fd5e51c5c5c
(cherry-picked from: f61cb18b71dac4b8117c36c4b54653742f6e118c)
---
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
M includes/Setup.php
M includes/installer/Installer.php
M includes/session/PHPSessionHandler.php
M includes/session/SessionManager.php
M includes/user/User.php
7 files changed, 68 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/272644/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a2f1c7f..6c85fee 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2294,6 +2294,14 @@
 
 /**
  * Whether to use PHP session handling ($_SESSION and session_*() functions)
+ *
+ * If the constant MW_NO_SESSION is defined, this is forced to 'disable'.
+ *
+ * If the constant MW_NO_SESSION_HANDLER is defined, this is ignored and PHP
+ * session handling will function independently of SessionHandler.
+ * SessionHandler and PHP's session handling may attempt to override each
+ * others' cookies.
+ *
  * @since 1.27
  * @var string
  *  - 'enable': Integrate with PHP's session handling as much as possible.
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a1ea936..5fcafb6 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3046,12 +3046,6 @@
 function wfSetupSession( $sessionId = false ) {
wfDeprecated( __FUNCTION__, '1.27' );
 
-   // If they're calling this, they probably want our session management 
even
-   // if NO_SESSION was set for Setup.php.
-   if ( !MediaWiki\Session\PHPSessionHandler::isInstalled() ) {
-   MediaWiki\Session\PHPSessionHandler::install( 
SessionManager::singleton() );
-   }
-
if ( $sessionId ) {
session_id( $sessionId );
}
diff --git a/includes/Setup.php b/includes/Setup.php
index 3ceb558..fa2a6bb 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -517,6 +517,11 @@
 ) {
$wgPHPSessionHandling = 'warn';
 }
+if ( defined( 'MW_NO_SESSION' ) ) {
+   // If the entry point wants no session, force 'disable' here unless they
+   // specifically set it to the (undocumented) 'warn'.
+   $wgPHPSessionHandling = MW_NO_SESSION === 'warn' ? 'warn' : 'disable';
+}
 
 Profiler::instance()->scopedProfileOut( $ps_default );
 
@@ -702,10 +707,13 @@
session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix 
. '_session' );
}
 
-   // Create the SessionManager singleton and set up our session handler
-   MediaWiki\Session\PHPSessionHandler::install(
-   MediaWiki\Session\SessionManager::singleton()
-   );
+   // Create the SessionManager singleton and set up our session handler,
+   // unless we're specifically asked not to.
+   if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+   MediaWiki\Session\PHPSessionHandler::install(
+   MediaWiki\Session\SessionManager::singleton()
+   );
+   }
 
// Initialize the session
try {
@@ -740,6 +748,16 @@
session_id( $session->getId() );
MediaWiki\quietCall( 'session_start' );
}
+
+   unset( $session );
+} else {
+   // Even if we didn't set up a global Session, still install our session
+   // handler unless specifically requested not to.
+   if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+   MediaWiki\Session\PHPSessionHandler::install(
+   MediaWiki\Session\SessionManager::singleton()
+   );
+   }
 }
 Profiler::instance()->scopedProfileOut( $ps_session );
 
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index ded45c2..968220c 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1715,7 +1715,9 @@
 * Override the necessary bits of the config to run an installation.
 */
public static function overrideConfig() {
-   define( 'MW_NO_SESSION', 1 );
+   // Use PHP's built-in session handling, since MediaWiki's
+   // SessionHandler can't work before we have

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b616785..1b7921c - change (mediawiki/extensions)

2016-02-22 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: b616785..1b7921c
..


Syncronize VisualEditor: b616785..1b7921c

Change-Id: Ib82abbaffb131e0cd9d6d40b662fe24438b4c4c1
---
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 b616785..1b7921c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b616785927d8f7c4f1adb913ef984d5648c90bd2
+Subproject commit 1b7921c0601f9268900501cc30b8bded0510a2ca

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib82abbaffb131e0cd9d6d40b662fe24438b4c4c1
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: b616785..1b7921c - change (mediawiki/extensions)

2016-02-22 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: b616785..1b7921c
..

Syncronize VisualEditor: b616785..1b7921c

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


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

diff --git a/VisualEditor b/VisualEditor
index b616785..1b7921c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b616785927d8f7c4f1adb913ef984d5648c90bd2
+Subproject commit 1b7921c0601f9268900501cc30b8bded0510a2ca

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82abbaffb131e0cd9d6d40b662fe24438b4c4c1
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] Update VE core submodule to master (2279bbb) - change (mediawiki...VisualEditor)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Update VE core submodule to master (2279bbb)
..


Update VE core submodule to master (2279bbb)

New changes:
bf122f6 Check node is an element before doing classList.contains
9e72ee8 Localisation updates from https://translatewiki.net.
5ebe94c Language widget: Use 'super' for parent methods
5a5adef Localisation updates from https://translatewiki.net.
6ac4f1a LanguageSearchWidget: Simplify prefix search
285a31a Localisation updates from https://translatewiki.net.
458cb58 Localisation updates from https://translatewiki.net.
8607a1a Documentation consistency
2279bbb Localisation updates from https://translatewiki.net.

Change-Id: I68c9ebccd3d482079261ab9357be46e05fa18f08
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index cdfd84e..2279bbb 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit cdfd84ea545250dfcc28bdfec011d808cc748951
+Subproject commit 2279bbb832565170e8070fd2944232bf0ae4de12

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68c9ebccd3d482079261ab9357be46e05fa18f08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] Cache CentralAuthUsers more aggressively - change (mediawiki...CentralAuth)

2016-02-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Cache CentralAuthUsers more aggressively
..

Cache CentralAuthUsers more aggressively

Instead of a cache per User object, maintain a global cache of the last
20 CentralAuthUsers accessed.

Bug: T127396
Bug: T127236
Change-Id: I4199f56edff09de974dd066328ee5f2e4b0f5a14
(cherry picked from commit c52bb45d5306e00a2fe0bbd14bd0d517a95cec8d)
---
M includes/CentralAuthUser.php
M includes/CentralAuthUserArray.php
M includes/session/CentralAuthSessionCompat.php
M tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
M tests/phpunit/CentralAuthUserTest.php
5 files changed, 59 insertions(+), 25 deletions(-)


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

diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index cb234b2..cec761d 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -11,6 +11,9 @@
 */
 
 class CentralAuthUser extends AuthPluginUser implements IDBAccessObject {
+   /** Cache of loaded CentralAuthUsers */
+   private static $loadedUsers = null;
+
/**
 * The username of the current user.
 * @var string
@@ -68,34 +71,57 @@
$this->mFromMaster = true;
}
}
-
/**
-* Create a CentralAuthUser object corresponding to the supplied User, 
and
-* cache it in the User object.
-* @param User $user
-*
-* @return CentralAuthUser
+* Fetch the cache
+* @return MapCacheLRU
 */
-   static function getInstance( User $user ) {
-   if ( !isset( $user->centralAuthObj ) ) {
-   $user->centralAuthObj = new self( $user->getName() );
+   private static function getUserCache() {
+   if ( self::$loadedUsers === null ) {
+   // Limit of 20 is arbitrary
+   self::$loadedUsers = new MapCacheLRU( 20 );
}
-   return $user->centralAuthObj;
+   return self::$loadedUsers;
}
 
/**
-* Create a CentralAuthUser object corresponding to the supplied User, 
and
-* cache it in the User object. This object will use DB_MASTER.
+* Explicitly set the (cached) CentralAuthUser object corresponding to 
the supplied User.
 * @param User $user
-*
+* @param CentralAuthUser $caUser
+*/
+   public static function setInstance( User $user, CentralAuthUser $caUser 
) {
+   self::getUserCache()->set( $user->getName(), $caUser );
+   }
+
+   /**
+* Create a (cached) CentralAuthUser object corresponding to the 
supplied User.
+* @param User $user
+* @return CentralAuthUser
+*/
+   public static function getInstance( User $user ) {
+   $cache = self::getUserCache();
+   $ret = $cache->get( $user->getName() );
+   if ( !$ret ) {
+   $ret = new self( $user->getName() );
+   $cache->set( $user->getName(), $ret );
+   }
+   return $ret;
+   }
+
+   /**
+* Create a (cached) CentralAuthUser object corresponding to the 
supplied User.
+* This object will use DB_MASTER.
+* @param User $user
 * @return CentralAuthUser
 * @since 1.27
 */
-   static function getMasterInstance( User $user ) {
-   if ( !isset( $user->centralAuthMasterObj ) ) {
-   $user->centralAuthMasterObj = new self( 
$user->getName(), self::READ_LATEST );
+   public static function getMasterInstance( User $user ) {
+   $cache = self::getUserCache();
+   $ret = $cache->get( $user->getName() );
+   if ( !$ret || !$ret->mFromMaster ) {
+   $ret = new self( $user->getName(), self::READ_LATEST );
+   $cache->set( $user->getName(), $ret );
}
-   return $user->centralAuthMasterObj;
+   return $ret;
}
 
 
diff --git a/includes/CentralAuthUserArray.php 
b/includes/CentralAuthUserArray.php
index 30b91b1..1cc627e 100644
--- a/includes/CentralAuthUserArray.php
+++ b/includes/CentralAuthUserArray.php
@@ -75,9 +75,13 @@
$renameUser = array( 
$caRow->ru_oldname, $caRow->ru_newname );
}
 
-   $this->current->centralAuthObj = 
CentralAuthUser::newFromRow( $caRow, $renameUser );
+   CentralAuthUser::setInstance(
+   $this->current, 
CentralAuthUser::newFromRow( $caRow, $renameUser )
+   );
} else {
-

[MediaWiki-commits] [Gerrit] Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER - change (mediawiki/core)

2016-02-22 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER
..

Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER

When an entry point specifies MW_NO_SESSION, actually enforce that by
having both SessionManager and PHP's session handling (session_start()
and friends) throw exceptions.

If an entry point needs the old behavior of using PHP's default session
handling (as defined in php.ini), it should define
MW_NO_SESSION_HANDLER instead of or in addition to MW_NO_SESSION.

This also makes PHPSessionHandler be installed in CLI mode, where it
wasn't installed before.

Bug: T127233
Change-Id: I2a3db06ee8e44a044096c57a819b5fd5e51c5c5c
(cherry-picked from: f61cb18b71dac4b8117c36c4b54653742f6e118c)
---
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
M includes/Setup.php
M includes/installer/Installer.php
M includes/session/PHPSessionHandler.php
M includes/session/SessionManager.php
M includes/user/User.php
7 files changed, 82 insertions(+), 21 deletions(-)


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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 18d2b62..3f2c96c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2301,7 +2301,19 @@
 
 /**
  * Whether to use PHP session handling ($_SESSION and session_*() functions)
- * @var string 'enable', 'warn', or 'disable'
+ *
+ * If the constant MW_NO_SESSION is defined, this is forced to 'disable'.
+ *
+ * If the constant MW_NO_SESSION_HANDLER is defined, this is ignored and PHP
+ * session handling will function independently of SessionHandler.
+ * SessionHandler and PHP's session handling may attempt to override each
+ * others' cookies.
+ *
+ * @since 1.27
+ * @var string
+ *  - 'enable': Integrate with PHP's session handling as much as possible.
+ *  - 'warn': Integrate but log warnings if anything changes $_SESSION.
+ *  - 'disable': Throw exceptions if PHP session handling is used.
  */
 $wgPHPSessionHandling = 'enable';
 
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 66201b5..dd356ec 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3066,12 +3066,6 @@
 function wfSetupSession( $sessionId = false ) {
wfDeprecated( __FUNCTION__, '1.27' );
 
-   // If they're calling this, they probably want our session management 
even
-   // if NO_SESSION was set for Setup.php.
-   if ( !MediaWiki\Session\PHPSessionHandler::isInstalled() ) {
-   MediaWiki\Session\PHPSessionHandler::install( 
SessionManager::singleton() );
-   }
-
if ( $sessionId ) {
session_id( $sessionId );
}
diff --git a/includes/Setup.php b/includes/Setup.php
index 8009c2d..1c0e43c 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -517,6 +517,11 @@
 ) {
$wgPHPSessionHandling = 'warn';
 }
+if ( defined( 'MW_NO_SESSION' ) ) {
+   // If the entry point wants no session, force 'disable' here unless they
+   // specifically set it to the (undocumented) 'warn'.
+   $wgPHPSessionHandling = MW_NO_SESSION === 'warn' ? 'warn' : 'disable';
+}
 
 Profiler::instance()->scopedProfileOut( $ps_default );
 
@@ -702,10 +707,13 @@
session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix 
. '_session' );
}
 
-   // Create the SessionManager singleton and set up our session handler
-   MediaWiki\Session\PHPSessionHandler::install(
-   MediaWiki\Session\SessionManager::singleton()
-   );
+   // Create the SessionManager singleton and set up our session handler,
+   // unless we're specifically asked not to.
+   if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+   MediaWiki\Session\PHPSessionHandler::install(
+   MediaWiki\Session\SessionManager::singleton()
+   );
+   }
 
// Initialize the session
try {
@@ -740,6 +748,16 @@
session_id( $session->getId() );
MediaWiki\quietCall( 'session_start' );
}
+
+   unset( $session );
+} else {
+   // Even if we didn't set up a global Session, still install our session
+   // handler unless specifically requested not to.
+   if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+   MediaWiki\Session\PHPSessionHandler::install(
+   MediaWiki\Session\SessionManager::singleton()
+   );
+   }
 }
 Profiler::instance()->scopedProfileOut( $ps_session );
 
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index e61e2d2..52ee79f 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1757,7 +1757,9 @@
 * Override the necessary bits of the config to run an installation.
 */

[MediaWiki-commits] [Gerrit] Clean-up duplicate properties across widgets - change (oojs/ui)

2016-02-22 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: Clean-up duplicate properties across widgets
..

Clean-up duplicate properties across widgets

Removing superflous property duplicates across widgets, predominantely
ButtonElement widget.

Change-Id: I074a1dfb090f314da7586c91468cb6389e0ea456
---
M src/styles/elements/ButtonElement.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 3 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/272640/1

diff --git a/src/styles/elements/ButtonElement.less 
b/src/styles/elements/ButtonElement.less
index 61fae00..bafc289 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -20,31 +20,21 @@
}
 
&.oo-ui-indicatorElement > .oo-ui-buttonElement-button > 
.oo-ui-indicatorElement-indicator,
-   &.oo-ui-iconElement > .oo-ui-buttonElement-button > 
.oo-ui-iconElement-icon {
-   display: inline-block;
+   &.oo-ui-iconElement > .oo-ui-buttonElement-button > 
.oo-ui-iconElement-icon,
+   &.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
+   display: inline-block; // For vertical alignment
vertical-align: middle;
}
 
&-frameless {
display: inline-block;
position: relative;
-
-   &.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
-   display: inline-block;
-   vertical-align: middle;
-   }
}
 
&-framed {
> .oo-ui-buttonElement-button {
-   display: inline-block;
vertical-align: top;
text-align: center;
-   }
-
-   &.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
-   display: inline-block;
-   vertical-align: middle;
}
 
&.oo-ui-widget-disabled {
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 41e7565..d697e77 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -129,7 +129,6 @@
> input.oo-ui-buttonElement-button,
&.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
line-height: 1.2em;
-   display: inline-block; // For vertical alignment
}
 
&.oo-ui-iconElement {
@@ -146,10 +145,6 @@
}
 
&.oo-ui-indicatorElement {
-   > .oo-ui-buttonElement-button > 
.oo-ui-indicatorElement-indicator {
-   display: inline-block; // For vertical alignment
-   }
-
&.oo-ui-labelElement > .oo-ui-buttonElement-button > 
.oo-ui-indicatorElement-indicator,
&.oo-ui-iconElement:not( .oo-ui-labelElement ) > 
.oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator {
margin-left: @size-indicator / 2;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index f024e59..68fe72f 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -120,7 +120,6 @@
}
 
.oo-ui-labelElement-label {
-   line-height: 1.275em;
margin: 0 1em;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mariadb: Moved error logs to syslog - change (operations/puppet)

2016-02-22 Thread Volans (Code Review)

Volans has uploaded a new change for review.

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

Change subject: mariadb: Moved error logs to syslog
..

mariadb: Moved error logs to syslog

This change will be effective only upon MariaDB restart

Bug: T127636
Change-Id: Ifeb4f60903d8aee9074841e6a57c4b1f20b820de
---
M templates/mariadb/production.my.cnf.erb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/272639/1

diff --git a/templates/mariadb/production.my.cnf.erb 
b/templates/mariadb/production.my.cnf.erb
index 0d5bed2..4507884 100644
--- a/templates/mariadb/production.my.cnf.erb
+++ b/templates/mariadb/production.my.cnf.erb
@@ -14,6 +14,10 @@
 # ssl-verify-server-cert
 <% end %>
 
+[mysqld_safe]
+skip_log_error
+syslog
+
 [mysqld]
 
 user   = mysql

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-22 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

7a85e97 CiviCRM submodule update
0124d7c Output extra data when failing to create contact

CiviCRM updates:
dfade8f CRM-17837 Improve Lybunt report.
43202a1 Stop adding duplicate sql to developer tab

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba481cd783b13044665f671c3d0c08f22b122416
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
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 hostnames for cindy - change (mediawiki...CirrusSearch)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix hostnames for cindy
..


Fix hostnames for cindy

Change-Id: Ib25a471e4cb185a68373315ccba1ba1260fd8591
---
M tests/browser/environments.yml
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index bdaa2d3..8d7263e 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -45,10 +45,10 @@
 
 cindy:
   browser: phantomjs
-  mediawiki_api_url: http://cirrustest.wiki.local.wmftest.net/w/api.php
-  mediawiki_commons_api_url: http://commons.wiki.local.wmftest.net/w/api.php
-  mediawiki_url: http://cirrustest.wiki.local.wmftest.net/wiki/
-  mediawiki_url_commons: http://commons.wiki.local.wmftest.net/wiki/
+  mediawiki_api_url: http://cirrustest-cirrus-browser-bot.wmflabs.org/w/api.php
+  mediawiki_commons_api_url: 
http://commons-cirrus-browser-bot.wmflabs.org/w/api.php
+  mediawiki_url: http://cirrustest-cirrus-browser-bot.wmflabs.org/wiki/
+  mediawiki_url_commons: http://commons-cirrus-browser-bot.wmflabs.org/wiki/
   mediawiki_user: admin
   mediawiki_password: vagrant
   reuse_browser: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib25a471e4cb185a68373315ccba1ba1260fd8591
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
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] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-22 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

7a85e97 CiviCRM submodule update
0124d7c Output extra data when failing to create contact

CiviCRM updates:
dfade8f CRM-17837 Improve Lybunt report.
43202a1 Stop adding duplicate sql to developer tab

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/272638/1


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

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

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

[MediaWiki-commits] [Gerrit] CiviCRM submodule update - change (wikimedia...crm)

2016-02-22 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: CiviCRM submodule update
..


CiviCRM submodule update

dfade8f CRM-17837 Improve Lybunt report.
43202a1 Stop adding duplicate sql to developer tab

Change-Id: I775eadc6b1563a46a4e8dda855e48913a7679533
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/civicrm b/civicrm
index 1b52451..dfade8f 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 1b52451c226fd4f06d61459882cad3efd7303c85
+Subproject commit dfade8fad885f6fe62017e22941f7c39d412a39e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I775eadc6b1563a46a4e8dda855e48913a7679533
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] CiviCRM submodule update - change (wikimedia...crm)

2016-02-22 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: CiviCRM submodule update
..

CiviCRM submodule update

dfade8f CRM-17837 Improve Lybunt report.
43202a1 Stop adding duplicate sql to developer tab

Change-Id: I775eadc6b1563a46a4e8dda855e48913a7679533
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/37/272637/1

diff --git a/civicrm b/civicrm
index 1b52451..dfade8f 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 1b52451c226fd4f06d61459882cad3efd7303c85
+Subproject commit dfade8fad885f6fe62017e22941f7c39d412a39e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I775eadc6b1563a46a4e8dda855e48913a7679533
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Fix hostnames for cindy - change (mediawiki...CirrusSearch)

2016-02-22 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Fix hostnames for cindy
..

Fix hostnames for cindy

Change-Id: Ib25a471e4cb185a68373315ccba1ba1260fd8591
---
M tests/browser/environments.yml
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index bdaa2d3..8d7263e 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -45,10 +45,10 @@
 
 cindy:
   browser: phantomjs
-  mediawiki_api_url: http://cirrustest.wiki.local.wmftest.net/w/api.php
-  mediawiki_commons_api_url: http://commons.wiki.local.wmftest.net/w/api.php
-  mediawiki_url: http://cirrustest.wiki.local.wmftest.net/wiki/
-  mediawiki_url_commons: http://commons.wiki.local.wmftest.net/wiki/
+  mediawiki_api_url: http://cirrustest-cirrus-browser-bot.wmflabs.org/w/api.php
+  mediawiki_commons_api_url: 
http://commons-cirrus-browser-bot.wmflabs.org/w/api.php
+  mediawiki_url: http://cirrustest-cirrus-browser-bot.wmflabs.org/wiki/
+  mediawiki_url_commons: http://commons-cirrus-browser-bot.wmflabs.org/wiki/
   mediawiki_user: admin
   mediawiki_password: vagrant
   reuse_browser: true

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

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

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

[MediaWiki-commits] [Gerrit] Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER - change (mediawiki/core)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER
..


Enforce MW_NO_SESSION, add MW_NO_SESSION_HANDLER

When an entry point specifies MW_NO_SESSION, actually enforce that by
having both SessionManager and PHP's session handling (session_start()
and friends) throw exceptions.

If an entry point needs the old behavior of using PHP's default session
handling (as defined in php.ini), it should define
MW_NO_SESSION_HANDLER instead of or in addition to MW_NO_SESSION.

This also makes PHPSessionHandler be installed in CLI mode, where it
wasn't installed before.

Bug: T127233
Change-Id: I2a3db06ee8e44a044096c57a819b5fd5e51c5c5c
---
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
M includes/Setup.php
M includes/installer/Installer.php
M includes/session/PHPSessionHandler.php
M includes/session/SessionManager.php
M includes/user/User.php
7 files changed, 68 insertions(+), 20 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 08538ee..da8eed5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2294,6 +2294,14 @@
 
 /**
  * Whether to use PHP session handling ($_SESSION and session_*() functions)
+ *
+ * If the constant MW_NO_SESSION is defined, this is forced to 'disable'.
+ *
+ * If the constant MW_NO_SESSION_HANDLER is defined, this is ignored and PHP
+ * session handling will function independently of SessionHandler.
+ * SessionHandler and PHP's session handling may attempt to override each
+ * others' cookies.
+ *
  * @since 1.27
  * @var string
  *  - 'enable': Integrate with PHP's session handling as much as possible.
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index ac1dd6d..7a41f11 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3046,12 +3046,6 @@
 function wfSetupSession( $sessionId = false ) {
wfDeprecated( __FUNCTION__, '1.27' );
 
-   // If they're calling this, they probably want our session management 
even
-   // if NO_SESSION was set for Setup.php.
-   if ( !MediaWiki\Session\PHPSessionHandler::isInstalled() ) {
-   MediaWiki\Session\PHPSessionHandler::install( 
SessionManager::singleton() );
-   }
-
if ( $sessionId ) {
session_id( $sessionId );
}
diff --git a/includes/Setup.php b/includes/Setup.php
index 4854727..47fb73e 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -517,6 +517,11 @@
 ) {
$wgPHPSessionHandling = 'warn';
 }
+if ( defined( 'MW_NO_SESSION' ) ) {
+   // If the entry point wants no session, force 'disable' here unless they
+   // specifically set it to the (undocumented) 'warn'.
+   $wgPHPSessionHandling = MW_NO_SESSION === 'warn' ? 'warn' : 'disable';
+}
 
 Profiler::instance()->scopedProfileOut( $ps_default );
 
@@ -702,10 +707,13 @@
session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix 
. '_session' );
}
 
-   // Create the SessionManager singleton and set up our session handler
-   MediaWiki\Session\PHPSessionHandler::install(
-   MediaWiki\Session\SessionManager::singleton()
-   );
+   // Create the SessionManager singleton and set up our session handler,
+   // unless we're specifically asked not to.
+   if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+   MediaWiki\Session\PHPSessionHandler::install(
+   MediaWiki\Session\SessionManager::singleton()
+   );
+   }
 
// Initialize the session
try {
@@ -740,6 +748,16 @@
session_id( $session->getId() );
MediaWiki\quietCall( 'session_start' );
}
+
+   unset( $session );
+} else {
+   // Even if we didn't set up a global Session, still install our session
+   // handler unless specifically requested not to.
+   if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+   MediaWiki\Session\PHPSessionHandler::install(
+   MediaWiki\Session\SessionManager::singleton()
+   );
+   }
 }
 Profiler::instance()->scopedProfileOut( $ps_session );
 
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7ebab67..70fa857 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1715,7 +1715,9 @@
 * Override the necessary bits of the config to run an installation.
 */
public static function overrideConfig() {
-   define( 'MW_NO_SESSION', 1 );
+   // Use PHP's built-in session handling, since MediaWiki's
+   // SessionHandler can't work before we have an object cache set 
up.
+   define( 'MW_NO_SESSION_HANDLER', 1 );
 
// Don

[MediaWiki-commits] [Gerrit] Add wikis that now have the cross-wiki beta feature - change (analytics/limn-language-data)

2016-02-22 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Add wikis that now have the cross-wiki beta feature
..


Add wikis that now have the cross-wiki beta feature

A few days too late :( it was deployed on Thursday
and I forgot to add them beforehand.

Change-Id: I10a7b9a76ffce83f745b027b4f83ed54faaed9af
---
M language/config.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/language/config.yaml b/language/config.yaml
index eb310a6..c9cae5a 100644
--- a/language/config.yaml
+++ b/language/config.yaml
@@ -41,4 +41,4 @@
 timeboxed: true
 starts: 2016-01-19
 explode_by:
-wiki_db: testwiki, test2wiki, mediawikiwiki
+wiki_db: testwiki, test2wiki, mediawikiwiki, testwikidatawiki, 
wikidatawiki, commonswiki, hewiki, hewikibooks, hewikinews, hewikiquote, 
hewikisource, hewikivoyage, hewiktionary, frwiki, frwikibooks, frwikinews, 
frwikiquote, frwikiversity, frwikivoyage, frwiktionary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10a7b9a76ffce83f745b027b4f83ed54faaed9af
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-language-data
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add hive queries for the traffic breakdown reports - change (analytics/reportupdater-queries)

2016-02-22 Thread Mforns (Code Review)

Mforns has uploaded a new change for review.

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

Change subject: Add hive queries for the traffic breakdown reports
..

Add hive queries for the traffic breakdown reports

Adds 5 reports and its correspondent configuration:
- Desktop and mobile web pageviews by OS
- Desktop and mobile web pageviews by browser
- Mobile web pageviews by OS
- Mobile web pageviews by browser
- Desktop and mobile web pageviews by OS and browser

Note that they are python script reports that call hive using
subprocess.call() that calls the hive client in the local machine.
Thus, reportupdater should run within stat1002.

In the future, we can add a report type = 'hive' and avoid the
hack, although it's a quite short hack.

Bug: T127326
Change-Id: I62990fdb29909c162cc67012ace6f7a904d969db
---
A browser/config.yaml
A browser/desktop_and_mobile_web_by_browser
A browser/desktop_and_mobile_web_by_os
A browser/desktop_and_mobile_web_by_os_and_browser
A browser/mobile_web_by_browser
A browser/mobile_web_by_os
6 files changed, 212 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater-queries 
refs/changes/35/272635/1

diff --git a/browser/config.yaml b/browser/config.yaml
new file mode 100644
index 000..dfcc2bc
--- /dev/null
+++ b/browser/config.yaml
@@ -0,0 +1,48 @@
+reportupdater-reports:
+
+desktop_and_mobile_web_by_browser:
+type: script
+frequency: weeks
+granularity: weeks
+timeboxed: true
+funnel: true
+starts: 2016-01-03
+lag: 86400 # wait 1 day to compute last week
+
+desktop_and_mobile_web_by_os:
+type: script
+frequency: weeks
+granularity: weeks
+timeboxed: true
+funnel: true
+starts: 2016-01-03
+lag: 86400 # wait 1 day to compute last week
+
+desktop_and_mobile_web_by_os_and_browser:
+type: script
+frequency: weeks
+granularity: weeks
+timeboxed: true
+funnel: true
+starts: 2016-01-03
+lag: 86400 # wait 1 day to compute last week
+
+mobile_web_by_browser:
+type: script
+frequency: weeks
+granularity: weeks
+timeboxed: true
+funnel: true
+starts: 2016-01-03
+lag: 86400 # wait 1 day to compute last week
+
+mobile_web_by_os:
+type: script
+frequency: weeks
+granularity: weeks
+timeboxed: true
+funnel: true
+starts: 2016-01-03
+lag: 86400 # wait 1 day to compute last week
+
+reportupdater-output: "/some/path/we/decide"
diff --git a/browser/desktop_and_mobile_web_by_browser 
b/browser/desktop_and_mobile_web_by_browser
new file mode 100644
index 000..499899b
--- /dev/null
+++ b/browser/desktop_and_mobile_web_by_browser
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import subprocess
+import sys
+import os
+
+query = """
+SELECT
+'{start_date}' AS date,
+browser_family,
+browser_major,
+SUM(view_count) as view_count
+FROM wmf.browser_general
+WHERE
+access_method IN ('desktop', 'mobile web') AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+GROUP BY
+'{start_date}',
+browser_family,
+browser_major
+ORDER BY view_count DESC
+LIMIT 1000
+;
+""".format(
+start_date=sys.argv[1],
+end_date=sys.argv[2]
+)
+
+with open(os.devnull, 'w') as devnull:
+subprocess.call(['hive', '-e', query], stderr=devnull)
diff --git a/browser/desktop_and_mobile_web_by_os 
b/browser/desktop_and_mobile_web_by_os
new file mode 100644
index 000..c713fae
--- /dev/null
+++ b/browser/desktop_and_mobile_web_by_os
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import subprocess
+import sys
+import os
+
+query = """
+SELECT
+'{start_date}' AS date,
+os_family,
+os_major,
+SUM(view_count) as view_count
+FROM wmf.browser_general
+WHERE
+access_method IN ('desktop', 'mobile web') AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+GROUP BY
+'{start_date}',
+os_family,
+os_major
+ORDER BY view_count DESC
+LIMIT 1000
+;
+""".format(
+start_date=sys.argv[1],
+end_date=sys.argv[2]
+)
+
+with open(os.devnull, 'w') as devnull:
+subprocess.call(['hive', '-e', query], stderr=devnull)
diff --git a/browser/desktop_and_mobile_web_by_os_and_browser 
b/browser/desktop_and_mobile_web_by_os_and_browser
new file mode 100644
index 000..7cdd7b3
--- /dev/null
+++ b/browser/desktop_and_mobile_web_by_os_and_browser
@@

[MediaWiki-commits] [Gerrit] Add mw-fetch-composer-dev to 'mwext-testextension-{phpflavor... - change (integration/config)

2016-02-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add mw-fetch-composer-dev to 
'mwext-testextension-{phpflavor}-non-voting'
..

Add mw-fetch-composer-dev to 'mwext-testextension-{phpflavor}-non-voting'

Without this update the test is failing.

Please see
https://integration.wikimedia.org/ci/job/mwext-testextension-php55-non-voting/54/console
and
https://integration.wikimedia.org/ci/job/mwext-testextension-hhvm-non-voting/54/console

Change-Id: Ib005b93b8fac27766e08b30ee70cf5d8f857e12a
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/34/272634/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 28c7a9d..e3a1c49 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -259,6 +259,7 @@
  phpflavor: '{phpflavor}'
  - hhvm-clear-hhbc
  - prepare-mediawiki-zuul-project
+ - mw-fetch-composer-dev
  - mw-run-phpunit-allexts
 publishers:
  - junit:

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 74b2489..b616785 - change (mediawiki/extensions)

2016-02-22 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 74b2489..b616785
..

Syncronize VisualEditor: 74b2489..b616785

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


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

diff --git a/VisualEditor b/VisualEditor
index 74b2489..b616785 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 74b24892767648fd309a9832e33d3d9a43f8150a
+Subproject commit b616785927d8f7c4f1adb913ef984d5648c90bd2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20ff5d9a437b2b683279664837126fcb743cac29
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] Syncronize VisualEditor: 74b2489..b616785 - change (mediawiki/extensions)

2016-02-22 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 74b2489..b616785
..


Syncronize VisualEditor: 74b2489..b616785

Change-Id: I20ff5d9a437b2b683279664837126fcb743cac29
---
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 74b2489..b616785 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 74b24892767648fd309a9832e33d3d9a43f8150a
+Subproject commit b616785927d8f7c4f1adb913ef984d5648c90bd2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20ff5d9a437b2b683279664837126fcb743cac29
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] Put jquery.uls.data dependency in the correct place - change (mediawiki...VisualEditor)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Put jquery.uls.data dependency in the correct place
..


Put jquery.uls.data dependency in the correct place

This module is (and always has been) referenced by
ve.init.mw.Platform, so ensure it is loaded before that.

Previously this was not a problem because it was inside a
function that was never run unless the language search widget
was invoked.

This probably makes a good case to not put these functions
in platform, but that is for another day.

Bug: T127736
Change-Id: I119b27a397b15628a8de5f0b32ae636bc73a8ba4
---
M extension.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7af5935..255d73a 100644
--- a/extension.json
+++ b/extension.json
@@ -456,7 +456,8 @@
"user.tokens",
"ext.visualEditor.base",
"ext.visualEditor.track",
-   "ext.visualEditor.targetLoader"
+   "ext.visualEditor.targetLoader",
+   "jquery.uls.data"
],
"messages": [
"visualeditor-quick-access-characters.json",
@@ -1442,8 +1443,7 @@
],
"dependencies": [
"ext.visualEditor.mwcore",
-   "ext.visualEditor.mwlink",
-   "jquery.uls.data"
+   "ext.visualEditor.mwlink"
],
"messages": [
"visualeditor-advancedsettings-tool",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I119b27a397b15628a8de5f0b32ae636bc73a8ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix jenkins entry point by Changing main php file name from ... - change (mediawiki...CryoKey)

2016-02-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Fix jenkins entry point by Changing main php file name from 
cryokey to CryoKey
..

Fix jenkins entry point by Changing main php file name from cryokey to CryoKey

Change-Id: I6287b4804d7f2c3e3d95a9c2adf3ce7d4cb789a6
---
R CryoKey.php
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/cryokey.php b/CryoKey.php
similarity index 99%
rename from cryokey.php
rename to CryoKey.php
index 12ed3fd..98216bc 100644
--- a/cryokey.php
+++ b/CryoKey.php
@@ -4,8 +4,7 @@
 // MIT License - See LICENSE file for details.
 //
 
-$wgExtensionCredits['other'][] = array
-(
+$wgExtensionCredits['other'][] = array(
   'path' => __FILE__,
   'name' => 'CryoKey',
   'descriptionmsg' => 'cryokey-desc',
@@ -218,4 +217,3 @@
 $wgHooks['UserLoginForm'][] = 'wgck_form';
 $wgHooks['UserLoadFromSession'][] = 'wgck_check';
 $wgHooks['GetLocalURL::Internal'][] = 'wgck_logout_link';
-?>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6287b4804d7f2c3e3d95a9c2adf3ce7d4cb789a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CryoKey
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Update parsoid content type meta tags in the - change (mediawiki...parsoid)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Update parsoid content type meta tags in the 
..


Update parsoid content type meta tags in the 

* Moved the content type strings from apiUtils to ParsoidConfig.

* Added html content type strings to  replacing the
  stale mw:parsoidVersion meta tag.

* If the HTML body uses inline data-parsoid attributes, this
  patch also adds a data-parsoid content type string to .

Change-Id: Ideaedb45fa189a6f982e983b9dedf18043b3c338
---
M lib/api/apiUtils.js
M lib/api/routes.js
M lib/config/ParsoidConfig.js
M lib/wt2html/DOMPostProcessor.js
4 files changed, 29 insertions(+), 22 deletions(-)

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



diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js
index ffdbf52..34ed694 100644
--- a/lib/api/apiUtils.js
+++ b/lib/api/apiUtils.js
@@ -20,14 +20,7 @@
  * @class apiUtils
  * @singleton
  */
-var apiUtils = module.exports = {
-   /** @property {string} */
-   WIKITEXT_CONTENT_TYPE: 'text/plain; charset=utf-8; 
profile="mediawiki.org/specs/wikitext/1.0.0"',
-   /** @property {string} */
-   HTML_CONTENT_TYPE: 'text/html; charset=utf-8; 
profile="mediawiki.org/specs/html/1.1.0"',
-   /** @property {string} */
-   DATA_PARSOID_CONTENT_TYPE: 'application/json; charset=utf-8; 
profile="mediawiki.org/specs/data-parsoid/0.0.1"',
-};
+var apiUtils = module.exports = { };
 
 /**
  * Send a redirect response with optional code and a relative URL
@@ -492,7 +485,7 @@
// in v3 api, just the children of the body
innerXML: res.locals.bodyOnly && res.locals.apiVersion 
> 2,
}).str;
-   apiUtils.setHeader(res, env, 'content-type', 
apiUtils.HTML_CONTENT_TYPE);
+   apiUtils.setHeader(res, env, 'content-type', 
env.conf.parsoid.HTML_CONTENT_TYPE);
apiUtils.sendResponse(res, env, output);
}
 
@@ -525,7 +518,7 @@
});
apiUtils.jsonResponse(res, env, {
html: {
-   headers: { 'content-type': 
apiUtils.HTML_CONTENT_TYPE },
+   headers: { 'content-type': 
env.conf.parsoid.HTML_CONTENT_TYPE },
body: out.str,
},
'data-parsoid': {
diff --git a/lib/api/routes.js b/lib/api/routes.js
index 52c56da..e2ba73b 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -444,7 +444,7 @@
var p = apiUtils.startHtml2wt(req, res, body.html || 
body.content || '')
.then(apiUtils.endHtml2wt)
.then(function(output) {
-   apiUtils.setHeader(res, env, 'content-type', 
apiUtils.WIKITEXT_CONTENT_TYPE);
+   apiUtils.setHeader(res, env, 'content-type', 
env.conf.parsoid.WIKITEXT_CONTENT_TYPE);
apiUtils.sendResponse(res, env, output);
});
return apiUtils.cpuTimeout(p, res)
@@ -584,13 +584,13 @@
return ret;
}).then(apiUtils.endHtml2wt).then(function(output) {
if (res.locals.apiVersion > 2) {
-   apiUtils.setHeader(res, env, 
'content-type', apiUtils.WIKITEXT_CONTENT_TYPE);
+   apiUtils.setHeader(res, env, 
'content-type', env.conf.parsoid.WIKITEXT_CONTENT_TYPE);
apiUtils.sendResponse(res, env, output);
} else {
// In API v2 we used to send a JSON 
object here
apiUtils.jsonResponse(res, env, {
wikitext: {
-   headers: { 
'content-type': apiUtils.WIKITEXT_CONTENT_TYPE },
+   headers: { 
'content-type': env.conf.parsoid.WIKITEXT_CONTENT_TYPE },
body: output,
},
});
diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 9611248..ba61e78 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -248,11 +248,19 @@
 ParsoidConfig.prototype.rtTestMode = false;
 
 /**
- * @property {number} version
- *   Parsoid DOM format version.
- *   See https://phabricator.wikimedia.org/T54937
+ * @property {string} WIKITEXT_CONTENT_TYPE
  */
-ParsoidConfig.prototype.version = 0;
+ParsoidConfig.prototype.WIKITEXT_CONTENT_TYPE = 'text/plain; charset=utf-8; 
profile="mediawiki.org/specs/w

[MediaWiki-commits] [Gerrit] quarry: Move role classes to module role - change (operations/puppet)

2016-02-22 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: quarry: Move role classes to module role
..


quarry: Move role classes to module role

Change-Id: Idd7f078180d8d743de5f8602647b199421476ec0
---
D manifests/role/labsquarry.pp
A modules/role/manifests/labs/quarry/celeryrunner.pp
A modules/role/manifests/labs/quarry/database.pp
A modules/role/manifests/labs/quarry/killer.pp
A modules/role/manifests/labs/quarry/redis.pp
A modules/role/manifests/labs/quarry/web.pp
6 files changed, 35 insertions(+), 39 deletions(-)

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



diff --git a/manifests/role/labsquarry.pp b/manifests/role/labsquarry.pp
deleted file mode 100644
index 7fb90c0..000
--- a/manifests/role/labsquarry.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-class role::labs::quarry::web {
-include role::labs::lvm::srv
-include ::labs_debrepo
-
-class { '::quarry::web':
-require => [Mount['/srv'], Class['::labs_debrepo']],
-}
-}
-
-class role::labs::quarry::celeryrunner {
-include role::labs::lvm::srv
-include ::labs_debrepo
-
-class { '::quarry::celeryrunner':
-require => [Mount['/srv'], Class['::labs_debrepo']],
-}
-}
-
-class role::labs::quarry::database {
-include role::labs::lvm::srv
-
-class { '::quarry::database':
-require => Mount['/srv']
-}
-}
-
-class role::labs::quarry::redis {
-include role::labs::lvm::srv
-
-class { '::quarry::redis':
-require => Mount['/srv']
-}
-}
-
-# Should be included on an instance that already has
-# a Quarry install (celery or web) setup
-class role::labs::quarry::killer {
-include quarry::querykiller
-}
diff --git a/modules/role/manifests/labs/quarry/celeryrunner.pp 
b/modules/role/manifests/labs/quarry/celeryrunner.pp
new file mode 100644
index 000..6e8bff1
--- /dev/null
+++ b/modules/role/manifests/labs/quarry/celeryrunner.pp
@@ -0,0 +1,8 @@
+class role::labs::quarry::celeryrunner {
+include role::labs::lvm::srv
+include ::labs_debrepo
+
+class { '::quarry::celeryrunner':
+require => [Mount['/srv'], Class['::labs_debrepo']],
+}
+}
diff --git a/modules/role/manifests/labs/quarry/database.pp 
b/modules/role/manifests/labs/quarry/database.pp
new file mode 100644
index 000..e06ac1a
--- /dev/null
+++ b/modules/role/manifests/labs/quarry/database.pp
@@ -0,0 +1,7 @@
+class role::labs::quarry::database {
+include role::labs::lvm::srv
+
+class { '::quarry::database':
+require => Mount['/srv']
+}
+}
diff --git a/modules/role/manifests/labs/quarry/killer.pp 
b/modules/role/manifests/labs/quarry/killer.pp
new file mode 100644
index 000..5052810
--- /dev/null
+++ b/modules/role/manifests/labs/quarry/killer.pp
@@ -0,0 +1,5 @@
+# Should be included on an instance that already has
+# a Quarry install (celery or web) setup
+class role::labs::quarry::killer {
+include quarry::querykiller
+}
diff --git a/modules/role/manifests/labs/quarry/redis.pp 
b/modules/role/manifests/labs/quarry/redis.pp
new file mode 100644
index 000..de3d2ae
--- /dev/null
+++ b/modules/role/manifests/labs/quarry/redis.pp
@@ -0,0 +1,7 @@
+class role::labs::quarry::redis {
+include role::labs::lvm::srv
+
+class { '::quarry::redis':
+require => Mount['/srv']
+}
+}
diff --git a/modules/role/manifests/labs/quarry/web.pp 
b/modules/role/manifests/labs/quarry/web.pp
new file mode 100644
index 000..330f107
--- /dev/null
+++ b/modules/role/manifests/labs/quarry/web.pp
@@ -0,0 +1,8 @@
+class role::labs::quarry::web {
+include role::labs::lvm::srv
+include ::labs_debrepo
+
+class { '::quarry::web':
+require => [Mount['/srv'], Class['::labs_debrepo']],
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd7f078180d8d743de5f8602647b199421476ec0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wmfstatic: Set MW_NO_SESSION to 'warn' - change (operations/mediawiki-config)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: wmfstatic: Set MW_NO_SESSION to 'warn'
..


wmfstatic: Set MW_NO_SESSION to 'warn'

Currently it's a boolean constant for disabling the session.
Anything accessing the user object falls back gracefully.

MediaWiki will change this in I2a3db06ee by enforcing MW_NO_SESSION
with an exception on accessing the session. It also adds a "warn" mode.

Use this mode for now to help identify outliers first.

Change-Id: I31184dd36ea007671ac86fa68f826512dcf96a8c
---
M w/static.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/w/static.php b/w/static.php
index 4a834ec..d08445f 100644
--- a/w/static.php
+++ b/w/static.php
@@ -25,7 +25,7 @@
  * - wmfstatic.notfound
  * - wmfstatic.fallback
  */
-define( 'MW_NO_SESSION', 1 );
+define( 'MW_NO_SESSION', 'warn' );
 require_once './MWVersion.php';
 require getMediaWiki( 'includes/WebStart.php' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31184dd36ea007671ac86fa68f826512dcf96a8c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [Limn] Archive repo - change (integration/config)

2016-02-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: [Limn] Archive repo
..

[Limn] Archive repo

Per https://gerrit.wikimedia.org/r/#/c/153753/

Bug: T127362
Change-Id: I17deac29bfa4d2b87e7a4094aab0f7827c5bd20e
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 29 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/31/272631/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 28c7a9d..195fa09 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -471,7 +471,6 @@
   - mwext-ExtraLanguageLink
   - mwext-ExtTab
   - mwext-FanBoxes
-  - mwext-FeedsFromPrivateWikis
   - mwext-FilterListUsers
   - mwext-FirstSteps
   - mwext-FlvHandler
@@ -479,7 +478,6 @@
   - mwext-FormatDates
   - mwext-FormatNum
   - mwext-FormelApplet
-  - mwext-Foxway
   - mwext-FundraisingChart
   - mwext-Genderize
   - mwext-GlobalNotice
@@ -504,9 +502,7 @@
   - mwext-ImageLink
   - mwext-IndexFunction
   - mwext-InlineCategorizer
-  - mwext-InteractiveBlockMessage
   - mwext-Interlanguage
-  - mwext-InterwikiMagic
   - mwext-JSBreadCrumbs
   - mwext-JsonData
   - mwext-LanguageSelector
@@ -515,21 +511,18 @@
   - mwext-LifeWeb
   - mwext-LifeWebCore
   - mwext-LightweightRDFa
-  - mwext-Limn
   - mwext-LinkFilter
   - mwext-ListSignup
   - mwext-LiveTranslate
   - mwext-Lockdown
   - mwext-LockDownEnglishPages
   - mwext-LogEntry
-  - mwext-LogoFunctions
   - mwext-LookupUser
   - mwext-LoopFunctions
   - mwext-Loops
   - mwext-MagicNoCache
   - mwext-Maps
   - mwext-MassEditRegex
-  - mwext-MediaFunctions
   - mwext-MediaWikiChat
   - mwext-Minifier
   - mwext-Model
@@ -548,12 +541,8 @@
   - mwext-NewsBox
   - mwext-NewSignupPage
   - mwext-NewUsersList
-  - mwext-NoTitle
-  - mwext-NSFileRepo
-  - mwext-NukeDPL
   - mwext-NumberFormat
   - mwext-NumberOfWikis
-  - mwext-Numbertext
   - mwext-NumerAlpha
   - mwext-OdbcDatabase
   - mwext-OfflineImportLexicon
@@ -569,7 +558,6 @@
   - mwext-PageLanguage
   - mwext-PageNotice
   - mwext-PageSchemas
-  - mwext-PageTools
   - mwext-PanScroll
   - mwext-PdfBook
   - mwext-PdfExport
@@ -599,7 +587,6 @@
   - mwext-QuizTabulate
   - mwext-RandomFeaturedUser
   - mwext-RandomGameUnit
-  - mwext-RandomImage
   - mwext-RandomImageByCategory
   - mwext-RandomInCategory
   - mwext-RandomUsersWithAvatars
@@ -641,7 +628,6 @@
   - mwext-SimpleSecurity
   - mwext-SimpleSurvey
   - mwext-SiteMetrics
-  - mwext-SkinPerNamespace
   - mwext-SlimboxThumbs
   - mwext-SmoothGallery
   - mwext-SocialProfile
@@ -679,7 +665,6 @@
   - mwext-UserStatus
   - mwext-Vine
   - mwext-VirtualKeyboard
-  - mwext-VoteNY
   - mwext-WebPlatformSearchAutocomplete
   - mwext-Widgets
   - mwext-WikiArticleFeeds
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1ab87e7..1fbe6cf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4410,7 +4410,8 @@
 
   - name: mediawiki/extensions/FeedsFromPrivateWikis
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FilterListUsers
@@ -4450,7 +4451,8 @@
 
   - name: mediawiki/extensions/Foxway
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FundraisingEmailUnsubscribe
@@ -4591,7 +4593,8 @@
 
   - name: mediawiki/extensions/InteractiveBlockMessage
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Interlanguage
@@ -4602,7 +4605,8 @@
 
   - name: mediawiki/extensions/InterwikiMagic
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
 
@@ -4666,8 +4670,7 @@
 
   - name: mediawiki/extensions/Limn
 template:
-  - name: extension-jslint
-  - name: extension-unittests-non-voting
+  - name: archived
 
   - name: mediawiki/extensions/LinkFilter
 template:
@@ -4707,7 +4710,8 @@
 
   - name: mediawiki/extensions/LogoFunctions

[MediaWiki-commits] [Gerrit] wmfstatic: Set MW_NO_SESSION to 'warn' - change (operations/mediawiki-config)

2016-02-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: wmfstatic: Set MW_NO_SESSION to 'warn'
..

wmfstatic: Set MW_NO_SESSION to 'warn'

Currently it's a boolean constant for disabling the session.
Anything accessing the user object falls back gracefully.

MediaWiki will change this in I2a3db06ee by enforcing MW_NO_SESSION
with an exception on accessing the session. It also adds a "warn" mode.

Use this mode for now to help identify outliers first.

Change-Id: I31184dd36ea007671ac86fa68f826512dcf96a8c
---
M w/static.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/w/static.php b/w/static.php
index 4a834ec..d08445f 100644
--- a/w/static.php
+++ b/w/static.php
@@ -25,7 +25,7 @@
  * - wmfstatic.notfound
  * - wmfstatic.fallback
  */
-define( 'MW_NO_SESSION', 1 );
+define( 'MW_NO_SESSION', 'warn' );
 require_once './MWVersion.php';
 require getMediaWiki( 'includes/WebStart.php' );
 

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

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

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

[MediaWiki-commits] [Gerrit] Replace jslint test with jshint and jsonlint tests - change (integration/config)

2016-02-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace jslint test with jshint and jsonlint tests
..

Replace jslint test with jshint and jsonlint tests

[LogoFunctions]
* https://gerrit.wikimedia.org/r/#/c/253230/

[InteractiveBlockMessage]
* https://gerrit.wikimedia.org/r/#/c/245383/

[MediaFunctions]
* https://gerrit.wikimedia.org/r/#/c/245413/

[SkinPerNamespace]
* https://gerrit.wikimedia.org/r/#/c/256827/

[NoTitle]
* https://gerrit.wikimedia.org/r/#/c/248172/

[NSFileRepo]
* https://gerrit.wikimedia.org/r/#/c/271872/

[RandomImage]
* https://gerrit.wikimedia.org/r/#/c/247414/

[Numbertext]
* https://gerrit.wikimedia.org/r/#/c/245444/

[Foxway]
* https://gerrit.wikimedia.org/r/#/c/245338/

[PageTools]
* https://gerrit.wikimedia.org/r/#/c/247685/

[InterwikiMagic]
* https://gerrit.wikimedia.org/r/#/c/152440/

[NukeDPL]
* https://gerrit.wikimedia.org/r/#/c/266865/

[VoteNY]
* https://gerrit.wikimedia.org/r/#/c/199096/

[FeedsFromPrivateWikis]
* https://gerrit.wikimedia.org/r/#/c/245328/

Bug: T127362
Change-Id: Iee1c9c7b078d0f44aec771dd293b629bd88867fb
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 28 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/29/272629/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 28c7a9d..c0c8e83 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -471,7 +471,6 @@
   - mwext-ExtraLanguageLink
   - mwext-ExtTab
   - mwext-FanBoxes
-  - mwext-FeedsFromPrivateWikis
   - mwext-FilterListUsers
   - mwext-FirstSteps
   - mwext-FlvHandler
@@ -479,7 +478,6 @@
   - mwext-FormatDates
   - mwext-FormatNum
   - mwext-FormelApplet
-  - mwext-Foxway
   - mwext-FundraisingChart
   - mwext-Genderize
   - mwext-GlobalNotice
@@ -504,9 +502,7 @@
   - mwext-ImageLink
   - mwext-IndexFunction
   - mwext-InlineCategorizer
-  - mwext-InteractiveBlockMessage
   - mwext-Interlanguage
-  - mwext-InterwikiMagic
   - mwext-JSBreadCrumbs
   - mwext-JsonData
   - mwext-LanguageSelector
@@ -522,14 +518,12 @@
   - mwext-Lockdown
   - mwext-LockDownEnglishPages
   - mwext-LogEntry
-  - mwext-LogoFunctions
   - mwext-LookupUser
   - mwext-LoopFunctions
   - mwext-Loops
   - mwext-MagicNoCache
   - mwext-Maps
   - mwext-MassEditRegex
-  - mwext-MediaFunctions
   - mwext-MediaWikiChat
   - mwext-Minifier
   - mwext-Model
@@ -548,12 +542,8 @@
   - mwext-NewsBox
   - mwext-NewSignupPage
   - mwext-NewUsersList
-  - mwext-NoTitle
-  - mwext-NSFileRepo
-  - mwext-NukeDPL
   - mwext-NumberFormat
   - mwext-NumberOfWikis
-  - mwext-Numbertext
   - mwext-NumerAlpha
   - mwext-OdbcDatabase
   - mwext-OfflineImportLexicon
@@ -569,7 +559,6 @@
   - mwext-PageLanguage
   - mwext-PageNotice
   - mwext-PageSchemas
-  - mwext-PageTools
   - mwext-PanScroll
   - mwext-PdfBook
   - mwext-PdfExport
@@ -599,7 +588,6 @@
   - mwext-QuizTabulate
   - mwext-RandomFeaturedUser
   - mwext-RandomGameUnit
-  - mwext-RandomImage
   - mwext-RandomImageByCategory
   - mwext-RandomInCategory
   - mwext-RandomUsersWithAvatars
@@ -641,7 +629,6 @@
   - mwext-SimpleSecurity
   - mwext-SimpleSurvey
   - mwext-SiteMetrics
-  - mwext-SkinPerNamespace
   - mwext-SlimboxThumbs
   - mwext-SmoothGallery
   - mwext-SocialProfile
@@ -679,7 +666,6 @@
   - mwext-UserStatus
   - mwext-Vine
   - mwext-VirtualKeyboard
-  - mwext-VoteNY
   - mwext-WebPlatformSearchAutocomplete
   - mwext-Widgets
   - mwext-WikiArticleFeeds
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1ab87e7..da28382 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4410,7 +4410,8 @@
 
   - name: mediawiki/extensions/FeedsFromPrivateWikis
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FilterListUsers
@@ -4450,7 +4451,8 @@
 
   - name: mediawiki/extensions/Foxway
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/FundraisingEmailUnsubscribe
@@ -4591,7 +4593,8 @@
 
   - name: mediawiki/extensions/InteractiveBlockMessage
 template:
-  - name: extension-jslint

[MediaWiki-commits] [Gerrit] Depooled es2010, controller issue - change (operations/mediawiki-config)

2016-02-22 Thread Volans (Code Review)

Volans has uploaded a new change for review.

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

Change subject: Depooled es2010, controller issue
..

Depooled es2010, controller issue

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 0733994..7b1d4b0 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -355,7 +355,7 @@
'10.64.16.187' => 0, # es1019, master
'10.192.16.29' => 1, # es2008
'10.192.16.30' => 3, # es2009
-   '10.192.16.31' => 3, # es2010
+#  '10.192.16.31' => 3, # es2010 - depooled because of T127769 - 
volans
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Add wikis that now have the cross-wiki beta feature - change (analytics/limn-language-data)

2016-02-22 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Add wikis that now have the cross-wiki beta feature
..

Add wikis that now have the cross-wiki beta feature

A few days too late :( it was deployed on Thursday
and I forgot to add them beforehand.

Change-Id: I10a7b9a76ffce83f745b027b4f83ed54faaed9af
---
M language/config.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-language-data 
refs/changes/27/272627/1

diff --git a/language/config.yaml b/language/config.yaml
index eb310a6..c9cae5a 100644
--- a/language/config.yaml
+++ b/language/config.yaml
@@ -41,4 +41,4 @@
 timeboxed: true
 starts: 2016-01-19
 explode_by:
-wiki_db: testwiki, test2wiki, mediawikiwiki
+wiki_db: testwiki, test2wiki, mediawikiwiki, testwikidatawiki, 
wikidatawiki, commonswiki, hewiki, hewikibooks, hewikinews, hewikiquote, 
hewikisource, hewikivoyage, hewiktionary, frwiki, frwikibooks, frwikinews, 
frwikiquote, frwikiversity, frwikivoyage, frwiktionary

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10a7b9a76ffce83f745b027b4f83ed54faaed9af
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-language-data
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Refactored modules/kartographer.js - change (mediawiki...Kartographer)

2016-02-22 Thread jenkins-bot (Code Review)

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

Change subject: Refactored modules/kartographer.js
..


Refactored modules/kartographer.js

* Making it possible for the geojson to be stored
in a separate layer from all other groups, to allow VE
editing in the future.

Change-Id: Ifd4b6526b42c8853275dbfa95cfb7b906ba4ff06
---
M modules/kartographer.js
1 file changed, 49 insertions(+), 66 deletions(-)

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



diff --git a/modules/kartographer.js b/modules/kartographer.js
index c238b05..7e99c41 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -29,6 +29,10 @@
return brackets[ brackets.length - 1 ];
}
 
+   function isPrivateGroup( groupName ) {
+   return groupName[ 0 ] === '_';
+   }
+
scale = bracketDevicePixelRatio();
scale = ( scale === 1 ) ? '' : ( '@' + scale + 'x' );
urlFormat = '/{z}/{x}/{y}' + scale + '.png';
@@ -44,18 +48,17 @@
 * @param {number} data.longitude Longitude
 * @param {number} data.zoom Zoom
 * @param {string} [data.style] Map style
-* @param {Object} [data.geoJson] Raw GeoJSON
-* @param {Object} [data.overlays] Overlays
+* @param {string[]} [data.overlays] Names of overlay groups to show
 * @return {L.mapbox.Map} Map object
 */
mw.kartographer.createMap = function ( container, data ) {
-   var geoJson, map,
+   var map,
style = data.style || mw.config.get( 
'wgKartographerDfltStyle' ),
mapData = mw.config.get( 'wgKartographerLiveData' ) || 
{};
 
map = L.map( container );
if ( !container.clientWidth ) {
-   // HACK: If the container is not naturally measureable, 
try jQuery
+   // HACK: If the container is not naturally measurable, 
try jQuery
// which will pick up CSS dimensions. T125263
/*jscs:disable disallowDanglingUnderscores */
map._size = new L.Point(
@@ -71,104 +74,84 @@
attribution: mw.message( 'kartographer-attribution' 
).parse()
} ).addTo( map );
 
-   geoJson = data.geoJson || [];
-
if ( data.overlays ) {
-   geoJson = [];
-   $.each( data.overlays, function ( _, group ) {
+   $.each( data.overlays, function ( index, group ) {
if ( group === '*' ) {
$.each( mapData, function ( k, d ) {
-   if ( k[ 0 ] !== '_' ) {
-   geoJson = 
geoJson.concat( d );
+   if ( !isPrivateGroup( k ) ) {
+   
mw.kartographer.addDataLayer( map, d );
}
} );
} else if ( mapData.hasOwnProperty( group ) ) {
-   geoJson = geoJson.concat( mapData[ 
group ] );
+   if ( index + 1 === data.overlays.length 
) {
+   map.kartographerLayer =
+   
mw.kartographer.addDataLayer( map, mapData[ group ] );
+   } else {
+   mw.kartographer.addDataLayer( 
map, mapData[ group ] );
+   }
}
} );
-   }
-   if ( geoJson.length ) {
-   mw.kartographer.setGeoJson( map, geoJson );
}
 
return map;
};
 
/**
-* Get GeoJSON layer for the specified map.
+* Create a new GeoJSON layer and add it to map.
+*
+* @param {L.mapbox.Map} map Map to get layers from
+* @param {Object} geoJson
+*/
+   mw.kartographer.addDataLayer = function ( map, geoJson ) {
+   try {
+   return L.mapbox.featureLayer( geoJson ).addTo( map );
+   } catch ( e ) {
+   mw.log( e );
+   }
+   };
+
+   /**
+* Get "editable" geojson layer for the map.
 *
 * If a layer doesn't exist, create and attach one.
 *
 * @param {L.mapbox.Map} map Map to get layers from
+* @param {L.mapbox.FeatureLayer} map.kartographerLayer show 
tag-specific info in this layer
 * @return {L.mapbox.FeatureLayer|null} GeoJSON layer, if present
 */
-   mw.

[MediaWiki-commits] [Gerrit] designate: Open firewall to axfr traffic from pdns hosts. - change (operations/puppet)

2016-02-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: designate:   Open firewall to axfr traffic from pdns hosts.
..


designate:   Open firewall to axfr traffic from pdns hosts.

Previously the secondary pdns server was unable to get xfr updates
from designate-mdns.  It stayed in sync by accident, due to sharing
a commmon db with the primary pdns server.

This may also have caused lockups, if the secondary was holding
a lock on the database while waiting for an xfr update.

Bug: T124680
Change-Id: Ie26af2f6e51e91ec3695718ee5d8e7c3bb4af861
---
M hieradata/codfw.yaml
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M hieradata/hosts/holmium.yaml
M modules/role/manifests/labs/openstack/designate.pp
5 files changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index afba02b..e6760bf 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -32,6 +32,7 @@
 
 # These are the up-and-coming, better dns servers:
 labs_dns_host: &labsdnshost "labs-ns2.wikimedia.org"
+labs_dns_host_secondary: &labsdnshostsecondary "labs-ns3.wikimedia.org"
 labs_recursor: &labsrecursor "labs-recursor0.wikimedia.org"
 
 ldap_labs_hostname: ldap-labs.codfw.wikimedia.org
diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 5f86b5f..c0f11e1 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -28,6 +28,7 @@
 labs_ldap_dns_host_secondary: &labsldapdnshostsecondary 
"labtestservices2001.wikimedia.org"
 
 labs_dns_host: &labsdnshost "labtest-ns0.wikimedia.org"
+labs_dns_host_secondary: &labsdnshostsecondary "labtest-ns0.wikimedia.org"
 labs_dns_db_server: 'labtestcontrol2001.wikimedia.org'
 labs_recursor: &labsrecursor "labtest-recursor0.wikimedia.org"
 
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 48d62b7..013619b 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -92,6 +92,7 @@
 
 # These are the up-and-coming, better dns servers:
 labs_dns_host: &labsdnshost "labs-ns2.wikimedia.org"
+labs_dns_host_secondary: &labsdnshostsecondary "labs-ns3.wikimedia.org"
 labs_dns_db_server: 'm5-master.eqiad.wmnet'
 labs_recursor: &labsrecursor "labs-recursor1.wikimedia.org"
 
diff --git a/hieradata/hosts/holmium.yaml b/hieradata/hosts/holmium.yaml
index 33d2bc1..792c5c8 100644
--- a/hieradata/hosts/holmium.yaml
+++ b/hieradata/hosts/holmium.yaml
@@ -1,3 +1,4 @@
 cluster: virt
 labs_dns_host: "labs-ns3.wikimedia.org"
+labs_dns_host_secondary: &labsdnshostsecondary "labs-ns2.wikimedia.org"
 labs_recursor: "labs-recursor0.wikimedia.org"
diff --git a/modules/role/manifests/labs/openstack/designate.pp 
b/modules/role/manifests/labs/openstack/designate.pp
index 81d7b94..2bb22f6 100644
--- a/modules/role/manifests/labs/openstack/designate.pp
+++ b/modules/role/manifests/labs/openstack/designate.pp
@@ -27,4 +27,14 @@
 ferm::rule { 'designate-api':
 rule => "saddr (${wikitech_ip} ${horizon_ip} ${controller_ip}) proto 
tcp dport (9001) ACCEPT;",
 }
+
+$dns_host  = hiera('labs_dns_host')
+$dns_host_secondary= hiera('labs_dns_host_secondary')
+$dns_host_ip   = ipresolve ($dns_host)
+$dns_host_secondary_ip = ipresolve ($dns_host_secondary)
+
+# allow axfr traffic between mdns and pdns on the pdns hosts
+ferm::rule { 'mdns-axfr':
+rule => "saddr (${dns_host_ip} ${dns_host_secondary_ip} ) proto tcp 
dport (5354) ACCEPT;",
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie26af2f6e51e91ec3695718ee5d8e7c3bb4af861
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] MediaWiki theme: Disabled buttonElement icon should be gray - change (oojs/ui)

2016-02-22 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: MediaWiki theme: Disabled buttonElement icon should be gray
..

MediaWiki theme: Disabled buttonElement icon should be gray

Adding grayscale `filter` to make disabled icon on `buttonElement` gray.

Bug: T114044
Change-Id: I9509acac6843785f1681150d4ecca654e78d9d6c
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/26/272626/1

diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index eeb7426..e8bb77b 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -35,6 +35,7 @@
 @color-disabled-framed: #fff;
 @border-color-disabled: #ddd;
 @opacity-disabled: 0.2;
+@filter-disabled: grayscale( 100% );
 
 // Invalid Widget (validation error feedback)
 @color-invalid: #f00;
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 41e7565..68bf769 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -93,6 +93,7 @@
> .oo-ui-iconElement-icon,
> .oo-ui-indicatorElement-indicator {
opacity: @opacity-disabled;
+   filter: @filter-disabled;
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] Make long site links wrap nicely - change (mediawiki...Wikibase)

2016-02-22 Thread Adrian Heine (Code Review)

Adrian Heine has uploaded a new change for review.

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

Change subject: Make long site links wrap nicely
..

Make long site links wrap nicely

This reduces loading time of big items by about a quarter.

Bug: T127305
Change-Id: I4a2604221df3b515ee2301871ec32145e352cdda
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
M 
view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css
M view/resources/templates.php
3 files changed, 13 insertions(+), 48 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index 2531150..642cbf5 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -104,8 +104,6 @@
// sitelinkview is created dynamically, in contrast to 
being initialized on pre-existing
// DOM.
this._draw();
-   } else {
-   this._shortenPageName();
}
 
this._createBadgeSelector();
@@ -193,40 +191,7 @@
this._drawEditMode();
} else {
this.element.removeClass( 'wb-edit' );
-   this._shortenPageName();
}
-   },
-
-   /**
-* Shortens the page name using the ellipsis character in order to 
prevent the page name from
-* wrapping.
-*
-* @private
-*/
-   _shortenPageName: function() {
-   if ( this._isInEditMode ) {
-   return;
-   }
-   var $a = this.$link.find( 'a' ),
-   fullText = $a.text(),
-   text = fullText;
-
-   $a.text( '.' );
-
-   var lineHeight = this.element.height();
-
-   $a.text( text );
-
-   if ( this.element.height() <= lineHeight ) {
-   return;
-   }
-
-   while ( this.element.height() > lineHeight && text.length > 0 ) 
{
-   text = text.substring( 0, text.length - 1 );
-   $a.text( text + '…' );
-   }
-
-   $a.attr( 'title', fullText );
},
 
/**
diff --git 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css
 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css
index e0964a6..6229e03 100644
--- 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css
+++ 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css
@@ -21,35 +21,35 @@
float: left;
line-height: 1.2;
width: 100%;
-}
-.wikibase-sitelinklistview.wb-edit .wikibase-sitelinkview {
-   white-space: nowrap;
-}
-.wikibase-sitelinklistview .wikibase-sitelinkview-new {
-   white-space: normal;
+
+   display: table;
 }
 
 .wikibase-sitelinklistview .wikibase-sitelinkview 
.wikibase-sitelinkview-siteid-container {
background: #E8E8E8;
border: 1px solid #C9C9C9;
-   display: inline-block;
+   display: table-cell;
line-height: 1.5;
padding-left: 0.2em;
padding-right: 0;
-   white-space: nowrap;
 }
 
 .wikibase-sitelinklistview .wikibase-sitelinkview 
.wikibase-sitelinkview-siteid-container .wikibase-sitelinkview-siteid {
background: none;
padding: 0 0.2em 0 0;
-   white-space: nowrap;
 }
 
 .wikibase-sitelinklistview .wikibase-sitelinkview .wikibase-sitelinkview-link {
-   display: inline;
-   margin-left: 0.4em;
-   word-wrap: break-word;
+   display: table-cell;
+   padding-left: 0.4em;
 }
+
+/* Edit mode */
+
+.wikibase-sitelinklistview .wb-edit .wikibase-sitelinkview-siteid-container {
+   display: inline;
+}
+
 .wikibase-sitelinklistview .wikibase-sitelinkview 
.wikibase-sitelinkview-link-new {
display: inline-block;
 }
diff --git a/view/resources/templates.php b/view/resources/templates.php
index d83786f..2a7ca91 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -254,7 +254,7 @@
 
$templates['wikibase-sitelinkview-pagename'] =
 <<$2$3
+$2$3
 HTML;
 
$templates['wikibase-sitelinkview-unknown'] =

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a2604221df3b515ee2301871ec32145e352cdda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Heine 

_

1 2 3 4 >

1 - 100 of 378 matches

Mail list logo