[MediaWiki-commits] [Gerrit] Preprocessor_Hash: use child arrays instead of linked lists - change (mediawiki/core)

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review.

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

Change subject: Preprocessor_Hash: use child arrays instead of linked lists
..

Preprocessor_Hash: use child arrays instead of linked lists

The singly-linked list data structure of Preprocessor_Hash was causing
stack exhaustion due to the need for a recursion depth proportional to
the number of children of a given PPNode, in serialize() and on
object destruction. So, switch to array-based storage. PPNode_* becomes
a temporary proxy around the underlying storage, which avoids circular
references and keeps the storage very compact. Preprocessor_DOM uses
similar temporary PPNode objects, so the fact that

  $node->getFirstChild() !== $node->getFirstChild()

should not cause any new problems.

* Increment cache version
* Use JSON serialization of the store array instead of serialize(),
  since JSON is more compact, even after gzipping.
* For efficiency, make $accum a plain array, and use it as an array
  where possible, instead of using helper functions.

Performance and memory usage for typical input are slightly improved:
something like 4% faster for the whole parse, and 20% less memory for
the tree.

Bug: T73486
Change-Id: I0d6c162b790d6dc1ddb0352aba6e4753854f4c56
---
M autoload.php
M includes/parser/Preprocessor_Hash.php
2 files changed, 455 insertions(+), 391 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/299710/1

diff --git a/autoload.php b/autoload.php
index d82d699..a2fe5f1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -986,7 +986,6 @@
'PNGMetadataExtractor' => __DIR__ . 
'/includes/media/PNGMetadataExtractor.php',
'PPCustomFrame_DOM' => __DIR__ . 
'/includes/parser/Preprocessor_DOM.php',
'PPCustomFrame_Hash' => __DIR__ . 
'/includes/parser/Preprocessor_Hash.php',
-   'PPDAccum_Hash' => __DIR__ . '/includes/parser/Preprocessor_Hash.php',
'PPDPart' => __DIR__ . '/includes/parser/Preprocessor_DOM.php',
'PPDPart_Hash' => __DIR__ . '/includes/parser/Preprocessor_Hash.php',
'PPDStack' => __DIR__ . '/includes/parser/Preprocessor_DOM.php',
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 0e11967..16e652d 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -25,6 +25,15 @@
  * Differences from DOM schema:
  *   * attribute nodes are children
  *   * "" nodes that aren't at the top are replaced with 
+ *
+ * Nodes are stored in a recursive array data structure. A node store is an
+ * array where each element may be either a scalar (representing a text node)
+ * or a "descriptor", which is a two-element array where the first element is
+ * the node name and the second element is the node store for the children.
+ *
+ * Attributes are represented as children that have a node name starting with
+ * "@", and a single text node child.
+ *
  * @ingroup Parser
  */
 // @codingStandardsIgnoreStart Squiz.Classes.ValidClassName.NotCamelCaps
@@ -37,6 +46,7 @@
public $parser;
 
const CACHE_PREFIX = 'preprocess-hash';
+   const CACHE_VERSION = 2;
 
public function __construct( $parser ) {
$this->parser = $parser;
@@ -65,23 +75,20 @@
$list = [];
 
foreach ( $values as $k => $val ) {
-   $partNode = new PPNode_Hash_Tree( 'part' );
-   $nameNode = new PPNode_Hash_Tree( 'name' );
-
if ( is_int( $k ) ) {
-   $nameNode->addChild( new PPNode_Hash_Attr( 
'index', $k ) );
-   $partNode->addChild( $nameNode );
+   $store = [ [ 'part', [
+   [ 'name', [ [ '@index', [ $k ] ] ] ],
+   [ 'value', [ strval( $val ) ] ],
+   ] ] ];
} else {
-   $nameNode->addChild( new PPNode_Hash_Text( $k ) 
);
-   $partNode->addChild( $nameNode );
-   $partNode->addChild( new PPNode_Hash_Text( '=' 
) );
+   $store = [ [ 'part', [
+   [ 'name', [ strval( $k ) ] ],
+   '=',
+   [ 'value', [ strval( $val ) ] ],
+   ] ] ];
}
 
-   $valueNode = new PPNode_Hash_Tree( 'value' );
-   $valueNode->addChild( new PPNode_Hash_Text( $val ) );
-   $partNode->addChild( $valueNode );
-
-   $list[] = $partNode;
+   $list[] = new PPNode_Hash_Tree( $store, 0 );
}
 
$node = new 

[MediaWiki-commits] [Gerrit] Fix date provided with most-read content in aggregated endpoint - change (mediawiki...mobileapps)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Fix date provided with most-read content in aggregated endpoint
..

Fix date provided with most-read content in aggregated endpoint

Expected behavior for requests directly to the most-read endpoint is
to get results for the requested date, but for the aggregated endpoint
to include the previous day's top-read pages.  This is working correctly,
but due to a bug, the most-read section of the aggregated feed results
were attributing the most-read results to the aggregated endpoint request
date rather than the previous day.  This ensures that the date provided
with the most-read results is accurate in all cases.

Change-Id: If9dca73fb745effdf6b422b29fdf4670a64b0c54
---
M lib/feed/most-read.js
1 file changed, 10 insertions(+), 8 deletions(-)


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

diff --git a/lib/feed/most-read.js b/lib/feed/most-read.js
index a6dacbc..fd23b36 100644
--- a/lib/feed/most-read.js
+++ b/lib/feed/most-read.js
@@ -46,14 +46,16 @@
 }
 
 function promise(app, req, aggregated) {
-var goodTitles;
-var date = dateUtil.hyphenDelimitedDateString(req);
-dateUtil.validate(date);
+var goodTitles, resultsDate;
+var requestDate = dateUtil.hyphenDelimitedDateString(req);
+dateUtil.validate(requestDate);
 return getTopPageviews(app, req, aggregated).then(function (response) {
-var queryTitlesList, rankedTitles = response.body
- && response.body.items
- && response.body.items[0]
- && response.body.items[0].articles;
+var queryTitlesList;
+var items = response.body
+ && response.body.items
+ && response.body.items[0];
+var rankedTitles = items && items.articles;
+resultsDate = items && items.year + '-' + items.month + '-' + 
items.day + 'Z';
 
 goodTitles = blacklist.filter(rankedTitles)
   .slice(0, mwapi.API_QUERY_MAX_TITLES);
@@ -92,7 +94,7 @@
 if (results.length) {
 return {
 payload: {
-date: dateUtil.iso8601DateFrom(req),
+date: resultsDate,
 articles: results
 },
 meta: {

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

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

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

[MediaWiki-commits] [Gerrit] Striker: require wiki setup before setting admin email address - change (mediawiki/vagrant)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Striker: require wiki setup before setting admin email address
..

Striker: require wiki setup before setting admin email address

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/08/299708/1

diff --git a/puppet/modules/role/manifests/striker.pp 
b/puppet/modules/role/manifests/striker.pp
index 554cb52..ed10def 100644
--- a/puppet/modules/role/manifests/striker.pp
+++ b/puppet/modules/role/manifests/striker.pp
@@ -177,7 +177,7 @@
 $admin_email = 'ad...@local.wmftest.net'
 mysql::sql { "USE ${::mediawiki::db_name}; UPDATE user SET user_email = 
'${admin_email}', user_email_authenticated = '2001011500' WHERE user_name 
='${::mediawiki::admin_user}'":
 unless  => "USE ${::mediawiki::db_name}; SELECT 1 FROM user WHERE 
user_name ='${::mediawiki::admin_user}' AND user_email_authenticated IS NOT 
NULL",
-#require => Mediawiki::Wiki[$::mediawiki::wiki_name],
+require => Exec["${::mediawiki::db_name}_setup"],
 }
 
 # Setup Phabricator

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

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

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

[MediaWiki-commits] [Gerrit] Avoid accessing private $filters field - change (mediawiki...ContentTranslation)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Avoid accessing private $filters field
..

Avoid accessing private $filters field

Use getFilter() instead.

Bug: T139657
Change-Id: Ibb8600fe68fd7d08bba498509aefbb57330769ab
(cherry picked from commit fcb500940c408df02e34e7b3dabb7c6f1cd01d39)
---
M includes/AbuseFilterCheck.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/AbuseFilterCheck.php b/includes/AbuseFilterCheck.php
index 21626d9..3b351b7 100644
--- a/includes/AbuseFilterCheck.php
+++ b/includes/AbuseFilterCheck.php
@@ -118,7 +118,7 @@
 
$results = [];
foreach ( $actions as $key => $val ) {
-   $rulename = 
\AbuseFilter::$filters[$key]->af_public_comments;
+   $rulename = \AbuseFilter::getFilter( $key 
)->af_public_comments;
 
// No point alerting the user about non-serious 
actions. T136596
$actionsForRule = array_keys( $val );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb8600fe68fd7d08bba498509aefbb57330769ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.28.0-wmf.10
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Update jquery.uls to d8e29b0efe - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Update jquery.uls to d8e29b0efe
..


Update jquery.uls to d8e29b0efe

Contains l10n updates for common -> suggested languages

Change-Id: Iafb6fb5b7eb11fbb908f333287c6a73c2346a6c6
---
M lib/jquery.uls/i18n/bn.json
M lib/jquery.uls/i18n/br.json
M lib/jquery.uls/i18n/cy.json
M lib/jquery.uls/i18n/da.json
M lib/jquery.uls/i18n/diq.json
M lib/jquery.uls/i18n/fa.json
M lib/jquery.uls/i18n/fi.json
M lib/jquery.uls/i18n/fr.json
M lib/jquery.uls/i18n/he.json
M lib/jquery.uls/i18n/hu.json
M lib/jquery.uls/i18n/it.json
M lib/jquery.uls/i18n/ko.json
M lib/jquery.uls/i18n/ku-latn.json
M lib/jquery.uls/i18n/lb.json
M lib/jquery.uls/i18n/lt.json
M lib/jquery.uls/i18n/lv.json
M lib/jquery.uls/i18n/mk.json
M lib/jquery.uls/i18n/pl.json
M lib/jquery.uls/i18n/ps.json
M lib/jquery.uls/i18n/qqq.json
M lib/jquery.uls/i18n/ru.json
M lib/jquery.uls/i18n/sr-ec.json
M lib/jquery.uls/i18n/sr-el.json
M lib/jquery.uls/i18n/sv.json
M lib/jquery.uls/i18n/tt-cyrl.json
M lib/jquery.uls/i18n/zh-hans.json
26 files changed, 41 insertions(+), 34 deletions(-)

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



diff --git a/lib/jquery.uls/i18n/bn.json b/lib/jquery.uls/i18n/bn.json
index 7909714..e660dfb 100644
--- a/lib/jquery.uls/i18n/bn.json
+++ b/lib/jquery.uls/i18n/bn.json
@@ -17,7 +17,7 @@
"uls-region-ME": "মধ্যপ্রাচ্য",
"uls-region-PA": "প্রশান্ত মহাসাগরীয়",
"uls-no-results-found": "কোনো ফলাফল পাওয়া যায়নি",
-   "uls-common-languages": "সাধারণ ভাষাসমূহ",
+   "uls-common-languages": "প্রস্তাবিত ভাষাসমূহ",
"uls-no-results-suggestion-title": "আপনি হয়তো আগ্রহী হতে পারেন:",
"uls-search-help": "আপনি ভাষার নাম, স্ক্রিপ্টের নাম, ভাষার আইএসও কোড 
অথবা এলাকার ভিত্তিক অনুসন্ধান করতে পারবেন।",
"uls-search-placeholder": "ভাষা অনুসন্ধান"
diff --git a/lib/jquery.uls/i18n/br.json b/lib/jquery.uls/i18n/br.json
index 03462b4..77858db 100644
--- a/lib/jquery.uls/i18n/br.json
+++ b/lib/jquery.uls/i18n/br.json
@@ -16,6 +16,6 @@
"uls-no-results-found": "N'eus bet kavet disoc'h ebet",
"uls-common-languages": "Yezhoù boutin",
"uls-no-results-suggestion-title": "Gallout a reot bezañ dedennet gant 
:",
-   "uls-search-help": "Gallout a reot klask dre anv yezh, anv skript, kod 
yezh ISO pe gallout a reot klask dre rannvro :",
+   "uls-search-help": "Gallout a reot klask dre anv yezh, anv skript, kod 
yezh ISO pe gallout a reot klask dre rannvro.",
"uls-search-placeholder": "Klask yezh"
 }
diff --git a/lib/jquery.uls/i18n/cy.json b/lib/jquery.uls/i18n/cy.json
index 465e14c..664c7f2 100644
--- a/lib/jquery.uls/i18n/cy.json
+++ b/lib/jquery.uls/i18n/cy.json
@@ -2,10 +2,11 @@
"@metadata": {
"authors": [
"Lloffiwr",
-   "Robin Owain"
+   "Robin Owain",
+   "Dafyddt"
]
},
-   "uls-region-WW": "Aml i fan",
+   "uls-region-WW": "Byd-eang",
"uls-region-SP": "Neilltuol",
"uls-region-AM": "America",
"uls-region-AF": "Affrica",
@@ -14,7 +15,7 @@
"uls-region-ME": "Y Dwyrain Canol",
"uls-region-PA": "Y Pasiffig",
"uls-no-results-found": "Ni chafwyd unrhyw ganlyniadau",
-   "uls-common-languages": "Awgrymiadau o ieithoedd",
+   "uls-common-languages": "Ieithoedd awgrymedig",
"uls-no-results-suggestion-title": "Hwyrach bod y rhai sy'n dilyn o 
ddiddordeb i chi:",
"uls-search-help": "Gallwch chwilio gan ddefnyddio enw iaith, enw 
sgript, côd ISO'r iaith neu gallwch bori fesul rhanbarth.",
"uls-search-placeholder": "Chwilio am iaith"
diff --git a/lib/jquery.uls/i18n/da.json b/lib/jquery.uls/i18n/da.json
index aafa717..88e8390 100644
--- a/lib/jquery.uls/i18n/da.json
+++ b/lib/jquery.uls/i18n/da.json
@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"Christian List",
-   "Peter Alberti"
+   "Peter Alberti",
+   "Jubber"
]
},
"uls-region-WW": "Verdensomspændende",
@@ -14,7 +15,7 @@
"uls-region-ME": "Mellemøsten",
"uls-region-PA": "Stillehavet",
"uls-no-results-found": "Ingen resultater fundet",
-   "uls-common-languages": "Almindelige sprog",
+   "uls-common-languages": "Foreslåede sprog",
"uls-no-results-suggestion-title": "Du er måske interesseret i:",
"uls-search-help": "Du kan søge på sprogets navn, skriftens navn eller 
sprogets ISO-kode, eller du kan bladre hen til sproget efter regionen:",
"uls-search-placeholder": "Sprogsøgning"
diff --git a/lib/jquery.uls/i18n/diq.json b/lib/jquery.uls/i18n/diq.json
index 7508379..0a2f199 100644
--- a/lib/jquery.uls/i18n/diq.json
+++ b/lib/jquery.uls/i18n/diq.json
@@ -4,7 +4,8 

[MediaWiki-commits] [Gerrit] Support Commons app and uploads - change (mediawiki...MobileApp)

[jenkins-bot (Code Review)]

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

Change subject: Support Commons app and uploads
..


Support Commons app and uploads

Change-Id: I06ead8fb975b1586551e8f38af8e0b8f10f65532
---
M MobileApp.hooks.php
1 file changed, 14 insertions(+), 10 deletions(-)

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



diff --git a/MobileApp.hooks.php b/MobileApp.hooks.php
index 586dd37..205650a 100644
--- a/MobileApp.hooks.php
+++ b/MobileApp.hooks.php
@@ -24,16 +24,20 @@
public static function onRecentChange_save( RecentChange $rc ) {
global $wgRequest;
$userAgent = $wgRequest->getHeader( "User-agent" );
-   if ( strpos( $userAgent, "WikipediaApp/" ) === 0 ) {
-   // This is from the app!
-   $logType = $rc->getAttribute( 'rc_log_type' );
-   // Only apply tag for edits, nothing else
-   if ( is_null( $logType ) ) {
-   $rcId = $rc->getAttribute( 'rc_id' );
-   $revId = $rc->getAttribute( 'rc_this_oldid' );
-   $logId = $rc->getAttribute( 'rc_logid' );
-   ChangeTags::addTags( 'mobile app edit', $rcId, 
$revId, $logId );
-   }
+   $isWikipediaApp = strpos( $userAgent, "WikipediaApp/" ) === 0;
+   $isCommonsApp = strpos( $userAgent, "Commons/" ) === 0;
+   $logType = $rc->getAttribute( 'rc_log_type' );
+
+   // Apply tag for edits done with the Wikipedia app, and
+   // edits and uploads done with the Commons app
+   if (
+   ( $isWikipediaApp && is_null( $logType ) )
+   || ( $isCommonsApp && ( is_null( $logType ) || $logType 
== 'upload' ) )
+   ) {
+   $rcId = $rc->getAttribute( 'rc_id' );
+   $revId = $rc->getAttribute( 'rc_this_oldid' );
+   $logId = $rc->getAttribute( 'rc_logid' );
+   ChangeTags::addTags( 'mobile app edit', $rcId, $revId, 
$logId );
}
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06ead8fb975b1586551e8f38af8e0b8f10f65532
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Whym 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Whym 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Follow-up 83ec590: Add new updateExtensionJsonSchema to auto... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 83ec590: Add new updateExtensionJsonSchema to autoload
..


Follow-up 83ec590: Add new updateExtensionJsonSchema to autoload

Change-Id: Ibf61cf36c094ac192b6a7f9aa010659a12e5c5bb
---
M autoload.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 61c97c6..b139399 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1438,6 +1438,7 @@
'UpdateArticleCount' => __DIR__ . '/maintenance/updateArticleCount.php',
'UpdateCollation' => __DIR__ . '/maintenance/updateCollation.php',
'UpdateDoubleWidthSearch' => __DIR__ . 
'/maintenance/updateDoubleWidthSearch.php',
+   'UpdateExtensionJsonSchema' => __DIR__ . 
'/maintenance/updateExtensionJsonSchema.php',
'UpdateLogging' => __DIR__ . '/maintenance/archives/upgradeLogging.php',
'UpdateMediaWiki' => __DIR__ . '/maintenance/update.php',
'UpdateRestrictions' => __DIR__ . '/maintenance/updateRestrictions.php',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf61cf36c094ac192b6a7f9aa010659a12e5c5bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Jforrester 
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] Gerrit: Fix redirect to commit-msg, vary on $host - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Fix redirect to commit-msg, vary on $host
..

Gerrit: Fix redirect to commit-msg, vary on $host

Change-Id: I19e65477da24f6f5954a44bac296a9c65d53fea3
---
M modules/gerrit/templates/gerrit.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/299706/1

diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb 
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 4e5d5e1..fad2d73 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -117,7 +117,7 @@
 # git-review for some reason sometimes uses 

 # instead of , 
except when somebody is
 # trying to reproduce this behavior. But people run into this all the time.
-RewriteRule ^/tools/hooks/commit-msg$ 
https://gerrit.wikimedia.org/r/tools/hooks/commit-msg
+RewriteRule ^/tools/hooks/commit-msg$ https://<%= @host 
%>/r/tools/hooks/commit-msg
 
 # Workaround for really broken browser detection in Gerrit code. Not sure 
if the hex string is
 # stable, this will probably need to be updated at least after Gerrit 
upgrades. Just load up

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

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

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

[MediaWiki-commits] [Gerrit] Add spamblacklist.check-stash.store metric - change (mediawiki...SpamBlacklist)

[jenkins-bot (Code Review)]

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

Change subject: Add spamblacklist.check-stash.store metric
..


Add spamblacklist.check-stash.store metric

Change-Id: I7990d7b0681b667015d4db68c0be8234dde4ce28
---
M SpamBlacklist_body.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/SpamBlacklist_body.php b/SpamBlacklist_body.php
index 3202f07..35ad323 100644
--- a/SpamBlacklist_body.php
+++ b/SpamBlacklist_body.php
@@ -144,6 +144,7 @@
if ( $retVal === false ) {
// Cache the typical negative results
$cache->set( $key, 1, $cache::TTL_MINUTE );
+   $statsd->increment( 'spamblacklist.check-stash.store' );
}
 
return $retVal;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7990d7b0681b667015d4db68c0be8234dde4ce28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Gerrit: Enable proper backups from new hosts - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Enable proper backups from new hosts
..

Gerrit: Enable proper backups from new hosts

Change-Id: Ifea8ef77c790c2c34a0bed6f13425af595096362
---
M hieradata/hosts/ytterbium.yaml
M hieradata/role/common/gerrit/server.yaml
M modules/role/manifests/backup/director.pp
M modules/role/manifests/gerrit/server.pp
4 files changed, 9 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/hosts/ytterbium.yaml b/hieradata/hosts/ytterbium.yaml
index b713118..ceedec0 100644
--- a/hieradata/hosts/ytterbium.yaml
+++ b/hieradata/hosts/ytterbium.yaml
@@ -1,5 +1,6 @@
 role::gerrit::server::ipv4: '208.80.154.81'
 role::gerrit::server::ipv6: '2620:0:861:3:208:80:154:81'
+role::gerrit::bacula: 'var-lib-gerrit2-review_site-git'
 gerrit::jetty::gid: 1146
 gerrit::jetty::uid: 1146
 gerrit::jetty::system: false
diff --git a/hieradata/role/common/gerrit/server.yaml 
b/hieradata/role/common/gerrit/server.yaml
index 05bd817..f6a90a0 100644
--- a/hieradata/role/common/gerrit/server.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -17,3 +17,4 @@
 push:
 - '+refs/heads/*:refs/heads/*'
 - '+refs/tags/*:refs/tags/*'
+role::gerrit::bacula: 'srv-gerrit-git'
diff --git a/modules/role/manifests/backup/director.pp 
b/modules/role/manifests/backup/director.pp
index cb3b0fa..7462b6b 100644
--- a/modules/role/manifests/backup/director.pp
+++ b/modules/role/manifests/backup/director.pp
@@ -114,6 +114,9 @@
 bacula::director::fileset { 'var-lib-gerrit2-review_site-git':
 includes => [ '/var/lib/gerrit2/review_site/git' ]
 }
+bacula::director::fileset { 'srv-gerrit-git':
+includes => [ '/srv/gerrit/git' ]
+}
 bacula::director::fileset { 'var-lib-jenkins-backups':
 includes => [ '/var/lib/jenkins/backups' ]
 }
diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index 564a6ec..98f3fc1 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -1,5 +1,5 @@
 # modules/role/manifests/gerrit/production.pp
-class role::gerrit::server($ipv4, $ipv6) {
+class role::gerrit::server($ipv4, $ipv6, $bacula = undef) {
 system::role { 'role::gerrit::server': description => 'Gerrit server' }
 include role::backup::host
 include base::firewall
@@ -28,7 +28,9 @@
 contact_group => 'admins,gerrit',
 }
 
-backup::set { 'var-lib-gerrit2-review_site-git': }
+if $backup != undef {
+backup::set { $bacula: }
+}
 
 interface::ip { 'role::gerrit::server_ipv4':
 interface => 'eth0',

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

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

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

[MediaWiki-commits] [Gerrit] Added GTID support to slave lag methods - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Added GTID support to slave lag methods
..


Added GTID support to slave lag methods

The IDs will be included in MySQLMasterPos objects and,
if specified by config, in slave lag wait methods.

Bug: T135027
Change-Id: I1dfc0210b715b449ec07760c712d0267763f2697
---
M includes/db/DatabaseMysqlBase.php
M tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
2 files changed, 187 insertions(+), 52 deletions(-)

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



diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 3ebc3ec..02a8d30 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -36,6 +36,8 @@
protected $lagDetectionMethod;
/** @var array Method to detect slave lag */
protected $lagDetectionOptions = [];
+   /** @var bool bool Whether to use GTID methods */
+   protected $useGTIDs = false;
 
/** @var string|null */
private $serverVersion = null;
@@ -43,13 +45,14 @@
/**
 * Additional $params include:
 *   - lagDetectionMethod : set to one of 
(Seconds_Behind_Master,pt-heartbeat).
-*  pt-heartbeat assumes the table is at 
heartbeat.heartbeat
-*  and uses UTC timestamps in the heartbeat.ts 
column.
-*  
(https://www.percona.com/doc/percona-toolkit/2.2/pt-heartbeat.html)
+*   pt-heartbeat assumes the table is at heartbeat.heartbeat
+*   and uses UTC timestamps in the heartbeat.ts column.
+*   
(https://www.percona.com/doc/percona-toolkit/2.2/pt-heartbeat.html)
 *   - lagDetectionOptions : if using pt-heartbeat, this can be set to 
an array map to change
-*   the default behavior. Normally, the 
heartbeat row with the server
-*   ID of this server's master will be used. 
Set the "conds" field to
-*   override the query conditions, e.g. 
['shard' => 's1'].
+*   the default behavior. Normally, the heartbeat row with the 
server
+*   ID of this server's master will be used. Set the "conds" field 
to
+*   override the query conditions, e.g. ['shard' => 's1'].
+*   - useGTIDs : use GTID methods like MASTER_GTID_WAIT() when 
possible.
 * @param array $params
 */
function __construct( array $params ) {
@@ -61,6 +64,7 @@
$this->lagDetectionOptions = isset( 
$params['lagDetectionOptions'] )
? $params['lagDetectionOptions']
: [];
+   $this->useGTIDs = !empty( $params['useGTIDs' ] );
}
 
/**
@@ -788,13 +792,20 @@
return 0; // already reached this point for sure
}
 
-   # Commit any open transactions
+   // Commit any open transactions
$this->commit( __METHOD__, 'flush' );
 
-   # Call doQuery() directly, to avoid opening a transaction if 
DBO_TRX is set
-   $encFile = $this->addQuotes( $pos->file );
-   $encPos = intval( $pos->pos );
-   $res = $this->doQuery( "SELECT MASTER_POS_WAIT($encFile, 
$encPos, $timeout)" );
+   // Call doQuery() directly, to avoid opening a transaction if 
DBO_TRX is set
+   if ( $this->useGTIDs && $pos->gtids ) {
+   // Wait on the GTID set (MariaDB only)
+   $gtidArg = implode( ',', $pos->gtids );
+   $res = $this->doQuery( "SELECT 
MASTER_GTID_WAIT($gtidArg, $timeout)" );
+   } else {
+   // Wait on the binlog coordinates
+   $encFile = $this->addQuotes( $pos->file );
+   $encPos = intval( $pos->pos );
+   $res = $this->doQuery( "SELECT 
MASTER_POS_WAIT($encFile, $encPos, $timeout)" );
+   }
 
$row = $res ? $this->fetchRow( $res ) : false;
if ( !$row ) {
@@ -827,15 +838,23 @@
 * @return MySQLMasterPos|bool
 */
function getSlavePos() {
-   $res = $this->query( 'SHOW SLAVE STATUS', 
'DatabaseBase::getSlavePos' );
+   $res = $this->query( 'SHOW SLAVE STATUS', __METHOD__ );
$row = $this->fetchObject( $res );
 
if ( $row ) {
$pos = isset( $row->Exec_master_log_pos )
? $row->Exec_master_log_pos
: $row->Exec_Master_Log_Pos;
+   // Also fetch the last-applied GTID set (MariaDB)
+   if ( $this->useGTIDs 

[MediaWiki-commits] [Gerrit] Remove Echo transition flags - change (operations/mediawiki-config)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Remove Echo transition flags
..

Remove Echo transition flags

Change-Id: I159a47d52218f65cfb0e1f6fee4330e06ac1ea73
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c0ca478..d87c6ef 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2748,9 +2748,6 @@
$wgDefaultUserOptions[$option] = $value;
}
}
-
-   $wgEchoBundleTransition = $wmgEchoTransition;
-   $wgEchoSectionTransition = $wmgEchoTransition;
 }
 
 if ( $wmgUseThanks ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 9f977f0..2c6661b 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -199,9 +199,6 @@
'-wmgEchoCluster' => [
'default' => false,
],
-   '-wmgEchoTransition' => [
-   'default' => true,
-   ],
 
# FIXME: make that settings to be applied
'-wgShowExceptionDetails' => [
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 52442f0..9590256 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15640,11 +15640,6 @@
'default' => [],
 ],
 
-// Whether to enable the transition flags for the bundling and 
recategorization changes in Echo
-'wmgEchoTransition' => [
-   'default' => true,
-],
-
 // Thanks should be enabled for wikis with Echo
 'wmgUseThanks' => [
'default' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I159a47d52218f65cfb0e1f6fee4330e06ac1ea73
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] [gerrit] Use HEAD instead of master for branch - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: [gerrit] Use HEAD instead of master for branch
..


[gerrit] Use HEAD instead of master for branch

Since some repos use a different branch to master this will break the link
for those repos. With this patch this fixes the link.

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

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index ffa8352..1f97459 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -62,7 +62,7 @@
 branch = "/r/branch/${project};${branch}"
 filehistory = "/r/p/${project}/;history/${branch}/${file}"
 file = "/r/browse/${project};${branch};${file}"
-roottree = "/r/p/${project}/;browse/master/;${commit}"
+roottree = "/r/p/${project}/;browse/HEAD/;${commit}"
 linkname = diffusion
 linkDrafts = true
 urlEncode = false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78c78d8a2968f59e6813f6d7b71617242c1ece32
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Gerrit: Introduce comment of $maint_mode for the web UI - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Introduce comment of $maint_mode for the web UI
..


Gerrit: Introduce comment of $maint_mode for the web UI

This allows Gerrit to disappear with 503s while providing a useful
error message back to the user. Don't just rely on ErrorDocument,
as Gerrit might be going away and coming back several times.

Should be a no-op (config-wise) on both ytterbium and lead until
we actually use $maint_mode.

Change-Id: Ideebea72ddbd8a9b919ffa319724ef1caecde7df
---
A modules/gerrit/files/maintenance.html
M modules/gerrit/manifests/proxy.pp
M modules/gerrit/templates/gerrit.wikimedia.org.erb
3 files changed, 80 insertions(+), 1 deletion(-)

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



diff --git a/modules/gerrit/files/maintenance.html 
b/modules/gerrit/files/maintenance.html
new file mode 100644
index 000..f4c998a
--- /dev/null
+++ b/modules/gerrit/files/maintenance.html
@@ -0,0 +1,38 @@
+
+
+  
+
+Gerrit - Down for Maintenance
+   
+   body {
+   color: #353535 !important;
+   background: #fff url(/page-bkg.cache.jpg) no-repeat 0 0 
!important;
+   position: static;
+   }
+   h1 {
+   margin: 0;
+   padding: 14px 0 0 17px;
+   font-family: 'PT Sans', sans-serif;
+   font-weight: normal;
+   letter-spacing: -1px;
+   /* This color isn't used since there is an image there,
+* but it kept for consistency when used for display of 
alt-text
+*/
+   color: #99;
+   min-height: 59px;
+   background: transparent 
url(/wikimedia-codereview-logo.cache.png) no-repeat 0 0;
+   text-indent: -px;
+   overflow: hidden;
+   }
+   p {
+   font-size: 150%;
+   }
+   
+  
+  
+Wikimedia Code Review
+   
+   Gerrit is currently down for maintenance. Please try again 
later.
+   
+  
+
diff --git a/modules/gerrit/manifests/proxy.pp 
b/modules/gerrit/manifests/proxy.pp
index e573f0f..a33bcc0 100644
--- a/modules/gerrit/manifests/proxy.pp
+++ b/modules/gerrit/manifests/proxy.pp
@@ -1,4 +1,8 @@
-class gerrit::proxy($host = $::gerrit::host, $lets_encrypt = true) {
+class gerrit::proxy(
+$host = $::gerrit::host,
+$lets_encrypt = true,
+$maint_mode   = false,
+) {
 
 $ssl_settings = ssl_ciphersuite('apache', 'compat', true)
 
@@ -16,6 +20,39 @@
 content => template('gerrit/gerrit.wikimedia.org.erb'),
 }
 
+# Error page just in case we're dying
+$ensure_maint = $maint_mode ? {
+true=> present,
+default => absent,
+}
+file { '/var/www/maintenance.html':
+ensure => $ensure_maint,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => 'puppet:///modules/gerrit/maintenance.html',
+}
+
+$ensure_link = $maint_mode ? {
+true=> 'link',
+default => absent
+}
+file { '/var/www/page-bkg.cache.jpg':
+ensure => $ensure_link,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+target => '/var/lib/gerrit2/review_site/static/page-bkg.cache.jpg',
+}
+
+file { '/var/www/wikimedia-codereview-logo.cache.png':
+ensure => $ensure_link,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => 
'/var/lib/gerrit2/review_site/static/wikimedia-codereview-logo.cache.png',
+}
+
 include ::apache::mod::rewrite
 
 include ::apache::mod::proxy
diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb 
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 24198d7..4e5d5e1 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -124,7 +124,11 @@
 # Gerrit in Firefox and look in the Network Monitor for a similarly named 
.cache.js file.
 RewriteRule ^/r/gerrit_ui/undefined.cache.js$ https://<%= @host 
%>/r/gerrit_ui/D39174379837CB12534D3B279AEAC59F.cache.js
 
+<%- if @maint_mode -%>
+RedirectMatch temp "/r" "/maintenance.html#"
+<%- else -%>
 ProxyPass /r/ http://127.0.0.1:8080/r/ retry=0 nocanon
+<%- end -%>
 
 ErrorLog /var/log/apache2/error.log
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ideebea72ddbd8a9b919ffa319724ef1caecde7df
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet

[MediaWiki-commits] [Gerrit] iDO NOT MERGE] role::tooladmin - change (mediawiki/vagrant)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: iDO NOT MERGE] role::tooladmin
..

iDO NOT MERGE] role::tooladmin

Testing setup for tool-admin-web.

Change-Id: Id073986605e36e98a144763fc214774c86943c6c
---
M puppet/hieradata/common.yaml
A puppet/modules/role/manifests/tooladmin.pp
A puppet/modules/role/templates/tooladmin/apache.conf.erb
3 files changed, 93 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/03/299703/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 38dd04f..0905285 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -376,6 +376,12 @@
 role::striker::phabricator_repo_admin_group: "!Set in local.yaml after 
creating group!"
 role::striker::use_xff: false
 
+role::tooladmin::vhost_name: "tools%{hiera('mwv::tld')}%{::port_fragment}"
+role::tooladmin::dir: "%{hiera('mwv::services_dir')}/tool-admin-web"
+role::tooladmin::env:
+  CACHE_DIR: /var/cache/tool-admin-web
+  SLIM_MODE: development
+
 role::oauth::dir: "%{hiera('mwv::services_dir')}/oauth-hello-world"
 role::oauth::secret_key: 
292ed299345a01c1c0520b60f628c01ea817a0b3372b89dbb7637a2f678d018a
 role::oauth::example_consumer_key: 81cf4c1f885de4ed6b475c05c408c9b4
diff --git a/puppet/modules/role/manifests/tooladmin.pp 
b/puppet/modules/role/manifests/tooladmin.pp
new file mode 100644
index 000..930da64
--- /dev/null
+++ b/puppet/modules/role/manifests/tooladmin.pp
@@ -0,0 +1,50 @@
+# == Class: role::tooladmin
+# Provisions the Tool Labs admin tool (https://tools.wmflabs.org/admin/)
+#
+# === Parameters
+# [*vhost_name*]
+#   Vhost name. Default 'tools.local.wmftest.net'.
+#
+# [*dir*]
+#   Deployment directory.
+#
+# [*env*]
+#   Hash of environment settings.
+#
+class role::tooladmin(
+$vhost_name,
+$dir,
+$env,
+) {
+$docroot = '/var/www/tools'
+git::clone { 'tool-admin-web':
+directory => $dir,
+remote=> 
'https://phabricator.wikimedia.org/diffusion/1922/tool-admin-web.git',
+}
+
+file { $docroot:
+ensure => 'directory',
+mode   => '0444',
+}
+file { "${docroot}/admin":
+ensure  => 'link',
+target  => "${dir}/public",
+require => Git::Clone['tool-admin-web'],
+}
+
+php::composer::install { $dir:
+require => Git::Clone['tool-admin-web'],
+}
+
+file { '/var/cache/tool-admin-web':
+ensure => directory,
+owner  => 'www-data',
+group  => 'www-data',
+mode   => '0770',
+}
+
+apache::site { $vhost_name:
+content => template('role/tooladmin/apache.conf.erb'),
+require => Git::Clone['tool-admin-web'],
+}
+}
diff --git a/puppet/modules/role/templates/tooladmin/apache.conf.erb 
b/puppet/modules/role/templates/tooladmin/apache.conf.erb
new file mode 100644
index 000..4a96a73
--- /dev/null
+++ b/puppet/modules/role/templates/tooladmin/apache.conf.erb
@@ -0,0 +1,37 @@
+# Funky fake for dynamicproxy and lighttpd in Tool Labs
+ServerName <%= @vhost_name %>
+
+DocumentRoot <%= @docroot %>
+
+
+  Options FollowSymLinks
+  AllowOverride None
+  Require all denied
+
+
+>
+  Options +FollowSymLinks
+  Require all granted
+
+
+RequestHeader set X-Original-URI "%{REQUEST_URI}e"
+
+# Send / to the admin tool
+RewriteEngine On
+RewriteRule "^/$" "/admin/" [L,PT]
+
+# Map non-file requests to the app's router script
+
+  RewriteEngine On
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule "^.*" "<%= @docroot %>/admin/index.php$1" [L,PT]
+
+
+# Handle errors with the admin tool
+ErrorDocument 404 /admin/?404
+ErrorDocument 500 /admin/?500
+
+<%- @env.each do |key, val| -%>
+SetEnv <%= key %> <%= val %>
+<%- end -%>
+# vim:sw=2:ts=2:sts=2:et:ft=apache:

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

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

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

[MediaWiki-commits] [Gerrit] Add some colors to the site table on changes - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Add some colors to the site table on changes
..


Add some colors to the site table on changes

In the update to gerrit 2.12 it will remove the colors from the review
table on changes making it harder to notice.

Add some colors to it including making it a table with faint lines.

I got the css from

https://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/openstack_project/files/gerrit/GerritSite.css

Change-Id: I93dd695cedc4c456f50982f64f6defcfe0a85cb9
---
M modules/gerrit/files/skin/GerritSite.css
1 file changed, 28 insertions(+), 1 deletion(-)

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



diff --git a/modules/gerrit/files/skin/GerritSite.css 
b/modules/gerrit/files/skin/GerritSite.css
index a524703..0d9bb21 100644
--- a/modules/gerrit/files/skin/GerritSite.css
+++ b/modules/gerrit/files/skin/GerritSite.css
@@ -1,4 +1,4 @@
-/* Local overrides for Wikimedia. Tested on Gerrit 2.4.2 */
+/* Local overrides for Wikimedia. Tested on Gerrit 2.12.2 */
 
 /**
  * Add word wrapping for commit messages, so horizontal scrolling isn't needed,
@@ -159,6 +159,33 @@
font-size: 12px;
 }
 
+/* Changes for gerrit 2.12 */
+.com-google-gerrit-client-change-ChangeScreen_BinderImpl_GenCss_style-infoColumn
 {
+width: 100% !important;
+min-width: 400px;
+}
+
+#change_infoTable {
+  border-collapse: collapse;
+}
+
+#change_infoTable th {
+  padding: 2px 4px 2px 6px;
+  background-color: #eee;
+  font-style: italic;
+  text-align: left;
+}
+
+#change_infoTable td {
+  padding: 2px 4px 2px 6px;
+  border-bottom: 1px solid #eee;
+  border-right: 1px solid #eee;
+}
+
+#change_infoTable tr:last-child td {
+  border: none;
+}
+
 /** Zuul test result. From OpenStack Foundation */
 .ci_comment_test_name {
display: inline-block;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93dd695cedc4c456f50982f64f6defcfe0a85cb9
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add css to turn repo links into blue again - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Add css to turn repo links into blue again
..


Add css to turn repo links into blue again

in gerrit 2.12 it seems the links are blank but in gerrit 2.8 it is blue.
Let's not let the links look plain but actual links.

Change-Id: Ibcb8054fcb44a00ac186bca6c606a17d19fef97c
---
M modules/gerrit/files/skin/GerritSite.css
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/gerrit/files/skin/GerritSite.css 
b/modules/gerrit/files/skin/GerritSite.css
index 4b1cec4..a524703 100644
--- a/modules/gerrit/files/skin/GerritSite.css
+++ b/modules/gerrit/files/skin/GerritSite.css
@@ -28,6 +28,11 @@
text-decoration: underline;
 }
 
+/* Make the repo links turn blue */
+table.changeTable a.gwt-Anchor {
+   color: #0654ac !important;
+}
+
 /* Search queries / Dashboards
  * have links in every cell, make those easier on the eyes
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcb8054fcb44a00ac186bca6c606a17d19fef97c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Sync parserTests with core
..


Sync parserTests with core

Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 790f276..f4a03d8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -18858,7 +18858,7 @@

Nonexistent.jpg

-Nonexistent.jpg
+Nonexistent.jpg
 caption
 

@@ -18866,14 +18866,14 @@

Nonexistent.jpg

-Nonexistent.jpg
+Nonexistent.jpg
 



http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>

-Foobar.jpg
+Foobar.jpg
 some caption Main Page
 

@@ -18881,7 +18881,7 @@

http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>

-Foobar.jpg
+Foobar.jpg
 


@@ -27121,8 +27121,8 @@
 !! html/php+tidy
 
 a
-
-
+
+
 b
 
 !! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 68000ab..416f015 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/fetch-parserTests.txt.js
@@ -12,9 +12,9 @@
 // and update these hashes automatically.
 //
 // You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "82b1c56d0a15db33b13e3bc1a1f7f9c817e0863c";
+var expectedSHA1 = "7baf1dfcb3e2315e586b14542acea8fbda38e15b";
 // git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "6cff81981569412ec779495370dfe9566cc175c9";
+var latestCommit = "9526a4bb6630fce432f3922d9fb2c16f4237d136";
 
 var fs = require('fs');
 var path = require('path');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Cscott 
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] admin: create shell account for mpany - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: create shell account for mpany
..

admin: create shell account for mpany

Creating a shell user for Maximilian Pany,
per T135392 and T140399.

He is a fundraising analytics consultant.

key copied from ticket.
UID matches newly created wikitech user.

Bug:T140399
Change-Id: I705309d1754705b6b55827ea498a220122aae8ec
---
M modules/admin/data/data.yaml
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/299702/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 4e39219..f98c4b2 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1953,4 +1953,11 @@
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EBIwAAAgEAva6Q3qQ5IRXx3HtQkfb46D57AZW+8iY+ZBXc9zXdQS1RSL+KK2rcrQz+Hjuc5DjrLkVpJ+hoQnzURi2JfODOGcCz1DqjZPauz03avBvKXAAyIR0W8Td4Av6ENj77YJ1MpX3La69D4HM5Ws6gRC/tOPln+2hvxHnhO7QPF1oj2eI4NRyTZ0tRgaCBNqFclFtwYnA6RYyDeOm4E9k8bxItsT5mfptumNM29W6diuyqDT64oJwK+sbP0bZaxR8JKQ43m7KOiBZN5MIwT2sWNNsEaIHK2iVUKUP4wjOUKrp1QKM3KmbG1PnIRQAPyt0ifyC6MkQNIikdQO6geNx8DX5jf24YpRjDeWADhsJzjNyzwyvTWXbbA7mB+5VQkT1i4EE0JPaq9MBtN3W5x/q03gClGJT7g5p/t2j8decmc8eqjOtnnb5xLh2WKJAWSWTz+psH+0D/v6ORA37wcWxRSTkmPKVWXSl+iESs67a1CARR5hVbihD0jJ9AYxsr8PL6PeBEiTmrQ89xepnJL+k/HnijTLGGECUrMKOeUkT4wJ8ZNPJy63Qwt0MKP0zkSsnnUWMd/nTccRx1N67KL8NgqDg2FegidNEYmSAv9pb4OtCQD7+Ao6FTZuZD+0RBrpbVbfeeyjhFTEtWymOry1b058AOS/B4Ogux2oQWAv7B+w2Gsr8=
 bawolff@Bawolff-L
 uid: 1235
-
+  mpany:
+ensure: present
+gid: 500
+name: mpany
+realname: Maximilian Pany
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDbRaAUzTfgxalgYGZ7ztelMGXC7vDJ4VwFtFlMt9IvApeYViRh+eIwcr2+94cwextv5fuFD/UWAhk38KKsEnr2SDu1BhTeqlXM1Tfibb8vfq5SrUXzANh61HgqAt9XIyWPXhOFGBJWGZKIHE9DJaDZn5xCmkwz+KPe0smxa0QLHgJTs/Z0sHYu5wcJYPQ/D+b1lBQAPHMUzCIDz8t6ctFysb/pPubX7kbnILao+Q60D7L85+6jgPx2mGFHfsv4LiZP80BhsbrLjwOpuILy3A8jS9aJ9WI0q6Yap9vuRXa8D0DNiymeoGo5X6ye0vdtfe4NZuV9eru3BWBjbSFmRwXP
 MJP@MJPwork.local
+uid: 15095

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I705309d1754705b6b55827ea498a220122aae8ec
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] Gerrit: Introduce comment of $maint_mode for the web UI - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Introduce comment of $maint_mode for the web UI
..

Gerrit: Introduce comment of $maint_mode for the web UI

This allows Gerrit to disappear with 503s while providing a useful
error message back to the user. Don't just rely on ErrorDocument,
as Gerrit might be going away and coming back several times.

This moves some image resources to the DocumentRoot which necessitates
some minor CSS tweaks.

Should be a no-op (config-wise) on both ytterbium and lead until
we actually use $maint_mode.

Change-Id: Ideebea72ddbd8a9b919ffa319724ef1caecde7df
---
A modules/gerrit/files/maintenance.html
M modules/gerrit/files/skin/GerritSite.css
R modules/gerrit/files/skin/page-bkg.jpg
R modules/gerrit/files/skin/wikimedia-codereview-logo.png
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/manifests/proxy.pp
M modules/gerrit/templates/gerrit.wikimedia.org.erb
7 files changed, 73 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/299701/1

diff --git a/modules/gerrit/files/maintenance.html 
b/modules/gerrit/files/maintenance.html
new file mode 100644
index 000..ccc6d40
--- /dev/null
+++ b/modules/gerrit/files/maintenance.html
@@ -0,0 +1,38 @@
+
+
+  
+
+Gerrit - Down for Maintenance
+   
+   body {
+   color: #353535 !important;
+   background: #fff url(/page-bkg.jpg) no-repeat 0 0 
!important;
+   position: static;
+   }
+   h1 {
+   margin: 0;
+   padding: 14px 0 0 17px;
+   font-family: 'PT Sans', sans-serif;
+   font-weight: normal;
+   letter-spacing: -1px;
+   /* This color isn't used since there is an image there,
+* but it kept for consistency when used for display of 
alt-text
+*/
+   color: #99;
+   min-height: 59px;
+   background: transparent 
url(/wikimedia-codereview-logo.png) no-repeat 0 0;
+   text-indent: -px;
+   overflow: hidden;
+   }
+   p {
+   font-size: 150%;
+   }
+   
+  
+  
+Wikimedia Code Review
+   
+   Gerrit is currently down for maintenance. Please try again 
later.
+   
+  
+
diff --git a/modules/gerrit/files/skin/GerritSite.css 
b/modules/gerrit/files/skin/GerritSite.css
index 4b1cec4..86a79b7 100644
--- a/modules/gerrit/files/skin/GerritSite.css
+++ b/modules/gerrit/files/skin/GerritSite.css
@@ -13,7 +13,7 @@
  */
 body, .gwt-DialogBox .dialogMiddleCenter {
color: #353535 !important;
-   background: #fff url(/r/static/page-bkg.cache.jpg) no-repeat 0 0 
!important;
+   background: #fff url(/page-bkg.jpg) no-repeat 0 0 !important;
position: static;
 }
 
@@ -60,7 +60,7 @@
color: #99;
 
min-height: 59px;
-   background: transparent 
url(/r/static/wikimedia-codereview-logo.cache.png) no-repeat 0 0;
+   background: transparent url(/wikimedia-codereview-logo.png) no-repeat 0 
0;
text-indent: -px;
overflow: hidden;
 }
diff --git a/modules/gerrit/files/skin/page-bkg.cache.jpg 
b/modules/gerrit/files/skin/page-bkg.jpg
similarity index 100%
rename from modules/gerrit/files/skin/page-bkg.cache.jpg
rename to modules/gerrit/files/skin/page-bkg.jpg
Binary files differ
diff --git a/modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png 
b/modules/gerrit/files/skin/wikimedia-codereview-logo.png
similarity index 100%
rename from modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png
rename to modules/gerrit/files/skin/wikimedia-codereview-logo.png
Binary files differ
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index b761be8..dbc6d10 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -163,20 +163,6 @@
 recurse => true,
 }
 
-file { '/var/lib/gerrit2/review_site/static/page-bkg.cache.jpg':
-owner  => 'gerrit2',
-group  => 'gerrit2',
-mode   => '0444',
-source => 'puppet:///modules/gerrit/skin/page-bkg.cache.jpg',
-}
-
-file { 
'/var/lib/gerrit2/review_site/static/wikimedia-codereview-logo.cache.png':
-owner  => 'gerrit2',
-group  => 'gerrit2',
-mode   => '0444',
-source => 
'puppet:///modules/gerrit/skin/wikimedia-codereview-logo.cache.png',
-}
-
 file { '/var/lib/gerrit2/review_site/lib':
 ensure  => directory,
 owner   => 'gerrit2',
diff --git a/modules/gerrit/manifests/proxy.pp 
b/modules/gerrit/manifests/proxy.pp
index 

[MediaWiki-commits] [Gerrit] Introduce wmde-analytics-users group - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Introduce wmde-analytics-users group
..


Introduce wmde-analytics-users group

This group will allow members to manually run the
crons associated with the stats:wmde role as well as
individual scripts in the case of failed runs and or
back filling of data.

Bug: T140342
Change-Id: I090b49634aa594fb2006f44edee03bac5b86bed0
---
M hieradata/role/common/statistics/private.yaml
M modules/admin/data/data.yaml
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/statistics/private.yaml 
b/hieradata/role/common/statistics/private.yaml
index df707f7..27b0d2a 100644
--- a/hieradata/role/common/statistics/private.yaml
+++ b/hieradata/role/common/statistics/private.yaml
@@ -9,6 +9,7 @@
   # that analytics-search-users are allowed to sudo to.  This is used
   # for deploying files to HDFS.
   - analytics-search-users
+  - analytics-wmde-users
 debdeploy::grains:
   debdeploy-stat:
 value: standard
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index bdf6fe6..4e39219 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -539,6 +539,11 @@
 gid: 783
 members: []
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
+  analytics-wmde-users:
+description: Group of WMDE analytics users
+gid: 784
+members: []
+privileges: ['ALL = (analytics-wmde) NOPASSWD: ALL']
 users:
   rush:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I090b49634aa594fb2006f44edee03bac5b86bed0
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ottomata 
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 pluralizations - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add missing pluralizations
..


Add missing pluralizations

Pluralizations should always include at least an other item.

Bug: T140700
Change-Id: I142be15ae2943f325aaea6cf1759ad6440dc2958
---
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-uk/strings.xml
3 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/app/src/main/res/values-it/strings.xml 
b/app/src/main/res/values-it/strings.xml
index 6dd1bb5..20cb658 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -305,5 +305,7 @@
   Tendenze
   Icona 
scheda
   Nelle notizie
-  
+  
+  %d days ago
+  
 
diff --git a/app/src/main/res/values-ru/strings.xml 
b/app/src/main/res/values-ru/strings.xml
index af5c83c..d58d304 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -305,5 +305,7 @@
   В трендах
   Значок 
карточки
   В новостях
-  
+  
+  %d days ago
+  
 
diff --git a/app/src/main/res/values-uk/strings.xml 
b/app/src/main/res/values-uk/strings.xml
index bc7e620..bb93a43 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -307,5 +307,6 @@
   У новинах
   
 1 день тому
+%d days ago
   
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I142be15ae2943f325aaea6cf1759ad6440dc2958
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Sync parserTests with core
..

Sync parserTests with core

Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 790f276..f4a03d8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -18858,7 +18858,7 @@

Nonexistent.jpg

-Nonexistent.jpg
+Nonexistent.jpg
 caption
 

@@ -18866,14 +18866,14 @@

Nonexistent.jpg

-Nonexistent.jpg
+Nonexistent.jpg
 



http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>

-Foobar.jpg
+Foobar.jpg
 some caption Main Page
 

@@ -18881,7 +18881,7 @@

http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>

-Foobar.jpg
+Foobar.jpg
 


@@ -27121,8 +27121,8 @@
 !! html/php+tidy
 
 a
-
-
+
+
 b
 
 !! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 68000ab..416f015 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/fetch-parserTests.txt.js
@@ -12,9 +12,9 @@
 // and update these hashes automatically.
 //
 // You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "82b1c56d0a15db33b13e3bc1a1f7f9c817e0863c";
+var expectedSHA1 = "7baf1dfcb3e2315e586b14542acea8fbda38e15b";
 // git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "6cff81981569412ec779495370dfe9566cc175c9";
+var latestCommit = "9526a4bb6630fce432f3922d9fb2c16f4237d136";
 
 var fs = require('fs');
 var path = require('path');

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

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

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

[MediaWiki-commits] [Gerrit] logstash: update logstash_optimize_index.sh for ES 2.x - change (operations/puppet)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: logstash: update logstash_optimize_index.sh for ES 2.x
..

logstash: update logstash_optimize_index.sh for ES 2.x

The _optimize API was renamed to _forcemerge in Elasticsearch 2.1.0.

Change-Id: I43535bd8e26a40874ea51f993fd5279c4599df02
---
M modules/logstash/files/logstash_optimize_index.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/299699/1

diff --git a/modules/logstash/files/logstash_optimize_index.sh 
b/modules/logstash/files/logstash_optimize_index.sh
index 7ecc179..04e470dd 100755
--- a/modules/logstash/files/logstash_optimize_index.sh
+++ b/modules/logstash/files/logstash_optimize_index.sh
@@ -38,7 +38,7 @@
 SEGMENTS=$(grep num_search_segments "${CURL_BODY}"|cut -d: -f2|tr -d ' ,')
 
 if [[ $SEGMENTS > 1 ]]; then
-runCurl -XPOST "${ES_HOST}/${ES_INDEX}/_optimize?max_num_segments=1" ||
+runCurl -XPOST "${ES_HOST}/${ES_INDEX}/_forcemerge?max_num_segments=1" ||
 die "Failed to optimize ${ES_HOST}/${ES_INDEX}"
 fi
 

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

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

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

[MediaWiki-commits] [Gerrit] backfillUnreadWikis: Skip updateCount if race condition dete... - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: backfillUnreadWikis: Skip updateCount if race condition detected
..


backfillUnreadWikis: Skip updateCount if race condition detected

Related doc fixes

Change-Id: I1b7545d2f86ec87e9701811ac5f4db0fec690681
---
M includes/NotifUser.php
M includes/UnreadWikis.php
M maintenance/backfillUnreadWikis.php
3 files changed, 19 insertions(+), 9 deletions(-)

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



diff --git a/includes/NotifUser.php b/includes/NotifUser.php
index 3e87fb3..96336fe 100644
--- a/includes/NotifUser.php
+++ b/includes/NotifUser.php
@@ -243,18 +243,18 @@
}
 
/**
-* Get the unread timestamp of the latest alert
+* Get the timestamp of the latest unread alert
 *
 * @param boolean $cached Set to false to bypass the cache. (Optional. 
Defaults to true)
 * @param int $dbSource Use master or slave database to pull count 
(Optional. Defaults to DB_SLAVE)
-* @return bool|MWTimestamp
+* @return bool|MWTimestamp Timestamp of latest unread alert, or false 
if there are no unread alerts.
 */
public function getLastUnreadAlertTime( $cached = true, $dbSource = 
DB_SLAVE ) {
return $this->getLastUnreadNotificationTime( $cached, 
$dbSource, EchoAttributeManager::ALERT );
}
 
/**
-* Get the unread timestamp of the latest message
+* Get the timestamp of the latest unread message
 *
 * @param boolean $cached Set to false to bypass the cache. (Optional. 
Defaults to true)
 * @param int $dbSource Use master or slave database to pull count 
(Optional. Defaults to DB_SLAVE)
@@ -273,7 +273,7 @@
 * @param int $dbSource Use master or slave database to pull count 
(Optional. Defaults to DB_SLAVE)
 * @param string $section Notification section
 * @param bool|string $global Whether to include foreign notifications. 
If set to 'preference', uses the user's preference.
-* @return bool|MWTimestamp Timestamp of last notification, or false if 
there is none
+* @return bool|MWTimestamp Timestamp of latest unread message, or 
false if there are no unread messages.
 */
public function getLastUnreadNotificationTime( $cached = true, 
$dbSource = DB_SLAVE, $section = EchoAttributeManager::ALL, $global = 
'preference' ) {
if ( $this->mUser->isAnon() ) {
diff --git a/includes/UnreadWikis.php b/includes/UnreadWikis.php
index ea6f501..55d326a 100644
--- a/includes/UnreadWikis.php
+++ b/includes/UnreadWikis.php
@@ -93,11 +93,13 @@
}
 
/**
-* @param string $wiki
-* @param int $alertCount
-* @param MWTimestamp|bool $alertTime
-* @param int $msgCount
-* @param MWTimestamp|bool $msgTime
+* @param string $wiki Wiki code
+* @param int $alertCount Number of alerts
+* @param MWTimestamp|bool $alertTime Timestamp of most recent unread 
alert, or
+*   false meaning no timestamp because there are no unread alerts.
+* @param int $msgCount Number of messages
+* @param MWTimestamp|bool $msgTime Timestamp of most recent message, or
+*   false meaning no timestamp because there are no unread messages.
 */
public function updateCount( $wiki, $alertCount, $alertTime, $msgCount, 
$msgTime ) {
$dbw = $this->getDB( DB_MASTER );
diff --git a/maintenance/backfillUnreadWikis.php 
b/maintenance/backfillUnreadWikis.php
index b84280e..9914309 100644
--- a/maintenance/backfillUnreadWikis.php
+++ b/maintenance/backfillUnreadWikis.php
@@ -49,6 +49,14 @@
$msgCount = 
$notifUser->getNotificationCount( true, DB_SLAVE, 
EchoAttributeManager::MESSAGE, false );
$msgUnread = 
$notifUser->getLastUnreadNotificationTime( true, DB_SLAVE, 
EchoAttributeManager::MESSAGE, false );
 
+   if ( ( $alertCount !== 0 && 
$alertUnread === false ) || ( $msgCount !== 0 && $msgUnread === false ) ) {
+   // If there are alerts, there 
should be an alert timestamp (same for messages).
+
+   // Otherwise, there is a race 
condition between the two values, indicating there's already
+   // just been an updateCount 
call, so we can skip this user.
+   continue;
+   }
+
$uw->updateCount( wfWikiID(), 
$alertCount, $alertUnread, $msgCount, $msgUnread );
}
}

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

[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Sync up with Parsoid parserTests.
..


Sync up with Parsoid parserTests.

This now aligns with Parsoid commit 36075c7fc242ad2fd7bba05661606722ebda49aa

Change-Id: I5bbf1c0a1e9602983024ce30eb28a33648246b3c
---
M tests/parser/parserTests.txt
1 file changed, 47 insertions(+), 1 deletion(-)

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



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index dd50607..bd67258 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -35,7 +35,7 @@
 #
 # You can also set the following parser properties via test options:
 #  wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
-#  wgLinkHolderBatchSize, wgRawHtml
+#  wgLinkHolderBatchSize, wgRawHtml, wgInterwikiMagic
 #
 # For testing purposes, temporary articles can created:
 # !!article / NAMESPACE:TITLE / !!text / ARTICLE TEXT / !!endarticle
@@ -8361,6 +8361,7 @@
 http://zh.wikipedia.org/wiki/Chinese"/>
 !! end
 
+## parsoid html2wt will lose the space variations
 !! test
 Interlanguage link with spacing
 !! options
@@ -8391,6 +8392,7 @@
 http://zh.wikipedia.org/wiki/Chinese"/>
 !! end
 
+## parsoid html2wt will lose the space variations
 !! test
 Interlanguage link variations
 !! options
@@ -8410,6 +8412,7 @@
 http://es.wikipedia.org/wiki/Foo_bar; />
 !! end
 
+## parsoid html2wt will normalize the space to _
 !! test
 Space and question mark encoding in interlanguage links (T95473)
 !! options
@@ -8468,6 +8471,34 @@
 !! html/parsoid
 Blah blah blah
 http://wikisource.org/wiki/Article"/>
+!! end
+
+## PHP parser tests script needs an update
+## Parsoid html2wt will normalize output to [[:zh:Chinese]]
+!! test
+Language links render as inline links if $wgInterwikiMagic=false
+!! options
+wgInterwikiMagic=false
+parsoid=wt2html,wt2wt,html2html
+!! wikitext
+Blah blah blah
+[[zh:Chinese]]
+!! html/parsoid
+Blah blah blah http://zh.wikipedia.org/wiki/Chinese; 
title="zh:Chinese">zh:Chinese
+!! end
+
+## PHP parser tests script needs an update
+## Parsoid html2wt will normalize output to [[:zh:Chinese]]
+!! test
+Language links render as inline links in the Talk namespace
+!! options
+title=Talk:Foo
+parsoid=wt2html,wt2wt,html2html
+!! wikitext
+Blah blah blah
+[[zh:Chinese]]
+!! html/parsoid
+Blah blah blah http://zh.wikipedia.org/wiki/Chinese; 
title="zh:Chinese">zh:Chinese
 !! end
 
 !! test
@@ -27066,6 +27097,21 @@
 !! end
 
 !! test
+DOMDiff: Edits to content nested in elements with templated attributes should 
not be lost (T139388)
+!! options
+parsoid={
+  "modes": ["selser"],
+  "changes": [
+[ "div:first-child", "text", "bar" ]
+  ]
+}
+!! wikitext
+foo
+!! wikitext/edited
+bar
+!! end
+
+!! test
 Empty LI (T49673)
 !! wikitext
 * a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bbf1c0a1e9602983024ce30eb28a33648246b3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
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] Sync up with Parsoid parserTests. - change (mediawiki/core)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Sync up with Parsoid parserTests.
..

Sync up with Parsoid parserTests.

This now aligns with Parsoid commit 36075c7fc242ad2fd7bba05661606722ebda49aa

Change-Id: I5bbf1c0a1e9602983024ce30eb28a33648246b3c
---
M tests/parser/parserTests.txt
1 file changed, 47 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/299698/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index dd50607..bd67258 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -35,7 +35,7 @@
 #
 # You can also set the following parser properties via test options:
 #  wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
-#  wgLinkHolderBatchSize, wgRawHtml
+#  wgLinkHolderBatchSize, wgRawHtml, wgInterwikiMagic
 #
 # For testing purposes, temporary articles can created:
 # !!article / NAMESPACE:TITLE / !!text / ARTICLE TEXT / !!endarticle
@@ -8361,6 +8361,7 @@
 http://zh.wikipedia.org/wiki/Chinese"/>
 !! end
 
+## parsoid html2wt will lose the space variations
 !! test
 Interlanguage link with spacing
 !! options
@@ -8391,6 +8392,7 @@
 http://zh.wikipedia.org/wiki/Chinese"/>
 !! end
 
+## parsoid html2wt will lose the space variations
 !! test
 Interlanguage link variations
 !! options
@@ -8410,6 +8412,7 @@
 http://es.wikipedia.org/wiki/Foo_bar; />
 !! end
 
+## parsoid html2wt will normalize the space to _
 !! test
 Space and question mark encoding in interlanguage links (T95473)
 !! options
@@ -8468,6 +8471,34 @@
 !! html/parsoid
 Blah blah blah
 http://wikisource.org/wiki/Article"/>
+!! end
+
+## PHP parser tests script needs an update
+## Parsoid html2wt will normalize output to [[:zh:Chinese]]
+!! test
+Language links render as inline links if $wgInterwikiMagic=false
+!! options
+wgInterwikiMagic=false
+parsoid=wt2html,wt2wt,html2html
+!! wikitext
+Blah blah blah
+[[zh:Chinese]]
+!! html/parsoid
+Blah blah blah http://zh.wikipedia.org/wiki/Chinese; 
title="zh:Chinese">zh:Chinese
+!! end
+
+## PHP parser tests script needs an update
+## Parsoid html2wt will normalize output to [[:zh:Chinese]]
+!! test
+Language links render as inline links in the Talk namespace
+!! options
+title=Talk:Foo
+parsoid=wt2html,wt2wt,html2html
+!! wikitext
+Blah blah blah
+[[zh:Chinese]]
+!! html/parsoid
+Blah blah blah http://zh.wikipedia.org/wiki/Chinese; 
title="zh:Chinese">zh:Chinese
 !! end
 
 !! test
@@ -27066,6 +27097,21 @@
 !! end
 
 !! test
+DOMDiff: Edits to content nested in elements with templated attributes should 
not be lost (T139388)
+!! options
+parsoid={
+  "modes": ["selser"],
+  "changes": [
+[ "div:first-child", "text", "bar" ]
+  ]
+}
+!! wikitext
+foo
+!! wikitext/edited
+bar
+!! end
+
+!! test
 Empty LI (T49673)
 !! wikitext
 * a

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

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

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

[MediaWiki-commits] [Gerrit] Fix truncation of notification headers - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Fix truncation of notification headers
..


Fix truncation of notification headers

We need a fixed-width CSS table with a number of fixed-width
cells and one cell that takes up the remaining width, with
text truncation. This is a pain to do with CSS tables,
but this trick I found on StackOverflow[1] works well:
wrap the contents of the cell in a div that's position: relative;,
containing another div that's position: absolute; width: 100%;

[1] 
http://stackoverflow.com/questions/7569436/css-constrain-a-table-with-long-cell-contents-to-page-width

Bug: T140349
Change-Id: I507f915f06185c767d7a5c8edbff6c341e07b6e2
---
M modules/echo.variables.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
M modules/ui/mw.echo.ui.NotificationItemWidget.js
3 files changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index f9eb60c..b962f77 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -11,7 +11,6 @@
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
-@bundled-notification-header-width: 350px;
 
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 23a67f2..25e0ba1 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -137,7 +137,12 @@
 
&-header {

.mw-echo-ui-mixin-one-line-truncated;
-   width: 
@bundled-notification-header-width;
+   width: 100%;
+   position: absolute;
+
+   &-wrapper {
+   position: relative;
+   }
}
}
 
diff --git a/modules/ui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ui/mw.echo.ui.NotificationItemWidget.js
index bb56ac8..50eab37 100644
--- a/modules/ui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationItemWidget.js
@@ -53,8 +53,12 @@
// Content
$message.append(
$( '' )
-   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header' )
-   .append( this.model.getContentHeader() )
+   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header-wrapper' )
+   .append(
+   $( '' )
+   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header' )
+   .append( 
this.model.getContentHeader() )
+   )
);
if ( !this.bundle && this.model.getContentBody() ) {
$message.append(

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

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

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

[MediaWiki-commits] [Gerrit] ForeignWikiRequest: Also check User::isSafeToLoad() - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: ForeignWikiRequest: Also check User::isSafeToLoad()
..


ForeignWikiRequest: Also check User::isSafeToLoad()

Check it for both $wgUser and $this->user because they
could theoretically be different.

Bug: T139665
Change-Id: I59cb4f0122a9fccb32ca165fda065dee2467b1da
---
M includes/ForeignWikiRequest.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/ForeignWikiRequest.php b/includes/ForeignWikiRequest.php
index 87ddb75..5a42616 100644
--- a/includes/ForeignWikiRequest.php
+++ b/includes/ForeignWikiRequest.php
@@ -38,9 +38,11 @@
}
 
protected function canUseCentralAuthl() {
-   global $wgFullyInitialised;
+   global $wgFullyInitialised, $wgUser;
 
return $wgFullyInitialised &&
+   $wgUser->isSafeToLoad() &&
+   $this->user->isSafeToLoad() &&
SessionManager::getGlobalSession()->getProvider() 
instanceof CentralAuthSessionProvider &&
$this->getCentralId( $this->user ) !== 0;
}

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

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

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

[MediaWiki-commits] [Gerrit] ContribsPager: Disallow looking too far in the past for 'new... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: ContribsPager: Disallow looking too far in the past for 
'newbies' queries
..


ContribsPager: Disallow looking too far in the past for 'newbies' queries

If the user requested a timestamp offset far in the past such that
there are no edits by users with user_ids in the range, we would end
up scanning all revisions from that offset until start of time.

This might end up generating funny queries with redundant conditions
on rev_timestamp, but that should not be a problem, and trying to
tweak paging logic would probably be more difficult than this.

Bug: T140537
Change-Id: I2ac9abee09529620588923bbafbcac07ebe466b2
---
M includes/specials/pagers/ContribsPager.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/includes/specials/pagers/ContribsPager.php 
b/includes/specials/pagers/ContribsPager.php
index fe0b4fe..f8eba9a 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -224,6 +224,11 @@
]
];
}
+   // (T140537) Disallow looking too far in the past for 
'newbies' queries. If the user requested
+   // a timestamp offset far in the past such that there 
are no edits by users with user_ids in
+   // the range, we would end up scanning all revisions 
from that offset until start of time.
+   $condition[] = 'rev_timestamp > ' .
+   $this->mDb->addQuotes( $this->mDb->timestamp( 
wfTimestamp() - 30 * 24 * 60 * 60 ) );
} else {
$uid = User::idFromName( $this->target );
if ( $uid ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ac9abee09529620588923bbafbcac07ebe466b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Publish Doxygen and jsduck documentation for Kartographer - change (integration/config)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Publish Doxygen and jsduck documentation for Kartographer
..

Publish Doxygen and jsduck documentation for Kartographer

Bug: T140657
Change-Id: I6d84f72994e70460b55861c411a90ab3dab5431b
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/97/299697/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f9e5f07..63c34f4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3456,6 +3456,9 @@
 check:
   - jsonlint
   - jshint
+postmerge:
+  - doxygen-publish
+  - mwext-jsduck-publish
 
   - name: mediawiki/extensions/LabeledSectionTransclusion
 template:

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

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

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

[MediaWiki-commits] [Gerrit] gerrit: fix ssh port monitoring - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: gerrit: fix ssh port monitoring
..


gerrit: fix ssh port monitoring

follow-up to If23443bca48f45e3

The command definition is:

/usr/lib/nagios/plugins/check_ssh -p '$ARG1$' '$HOSTADDRESS$'

so the host address is already automatic and there is just one arg,
the port.

Without this we are getting "check_ssh: Port number must be a positive integer"

Change-Id: Ibe2048713bfe5bc2c83489aa00eec229220e1369
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index 67644dd..564a6ec 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -24,7 +24,7 @@
 
 monitoring::service { 'gerrit_ssh':
 description   => 'SSH access',
-check_command => "check_ssh_port!${host}!29418",
+check_command => 'check_ssh_port!29418',
 contact_group => 'admins,gerrit',
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe2048713bfe5bc2c83489aa00eec229220e1369
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
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 typo (canUseCentralAuthl -> canUseCentralAuth) - change (mediawiki...Echo)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix typo (canUseCentralAuthl -> canUseCentralAuth)
..

Fix typo (canUseCentralAuthl -> canUseCentralAuth)

Change-Id: Ic27240df0744c6025e7b1922d31250377f0a2bc4
---
M includes/ForeignWikiRequest.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/ForeignWikiRequest.php b/includes/ForeignWikiRequest.php
index 87ddb75..6eff1d3 100644
--- a/includes/ForeignWikiRequest.php
+++ b/includes/ForeignWikiRequest.php
@@ -23,7 +23,7 @@
 * @return array [ wiki => result ]
 */
public function execute() {
-   if ( !$this->canUseCentralAuthl() ) {
+   if ( !$this->canUseCentralAuth() ) {
return array();
}
 
@@ -37,7 +37,7 @@
return $id;
}
 
-   protected function canUseCentralAuthl() {
+   protected function canUseCentralAuth() {
global $wgFullyInitialised;
 
return $wgFullyInitialised &&

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic27240df0744c6025e7b1922d31250377f0a2bc4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] gerrit: fix ssh port monitoring - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: gerrit: fix ssh port monitoring
..

gerrit: fix ssh port monitoring

follow-up to If23443bca48f45e3

The command definition is:

/usr/lib/nagios/plugins/check_ssh -p '$ARG1$' '$HOSTADDRESS$'

so the host address is already automatic and there is just one arg,
the port.

Without this we are getting "check_ssh: Port number must be a positive integer"

Change-Id: Ibe2048713bfe5bc2c83489aa00eec229220e1369
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/299695/1

diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index 5e2c274..2d873c0 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -24,7 +24,7 @@
 
 nrpe::monitor_service { 'ssh':
 description   => 'SSH access',
-check_command => "check_ssh_port!${host}!29418",
+check_command => "check_ssh_port!29418",
 contact_group => 'admins,gerrit',
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe2048713bfe5bc2c83489aa00eec229220e1369
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] Fix truncation of notification headers - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Fix truncation of notification headers
..

Fix truncation of notification headers

We need a fixed-width CSS table with a number of fixed-width
cells and one cell that takes up the remaining width, with
text truncation. This is a pain to do with CSS tables,
but this trick I found on StackOverflow[1] works well:
wrap the contents of the cell in a div that's position: relative;,
containing another div that's position: absolute; width: 100%;

[1] 
http://stackoverflow.com/questions/7569436/css-constrain-a-table-with-long-cell-contents-to-page-width

Bug: T140349
Change-Id: I507f915f06185c767d7a5c8edbff6c341e07b6e2
---
M modules/echo.variables.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
M modules/ui/mw.echo.ui.NotificationItemWidget.js
3 files changed, 12 insertions(+), 4 deletions(-)


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

diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index f9eb60c..b962f77 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -11,7 +11,6 @@
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
-@bundled-notification-header-width: 350px;
 
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 23a67f2..25e0ba1 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -137,7 +137,12 @@
 
&-header {

.mw-echo-ui-mixin-one-line-truncated;
-   width: 
@bundled-notification-header-width;
+   width: 100%;
+   position: absolute;
+
+   &-wrapper {
+   position: relative;
+   }
}
}
 
diff --git a/modules/ui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ui/mw.echo.ui.NotificationItemWidget.js
index bb56ac8..50eab37 100644
--- a/modules/ui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationItemWidget.js
@@ -53,8 +53,12 @@
// Content
$message.append(
$( '' )
-   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header' )
-   .append( this.model.getContentHeader() )
+   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header-wrapper' )
+   .append(
+   $( '' )
+   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header' )
+   .append( 
this.model.getContentHeader() )
+   )
);
if ( !this.bundle && this.model.getContentBody() ) {
$message.append(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I507f915f06185c767d7a5c8edbff6c341e07b6e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Add tooltips to page filters - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Add tooltips to page filters
..


Add tooltips to page filters

Bug: T139644
Change-Id: I6ae0d0e8c6c7dd79b9ab00db1d601f670764d3a4
---
M modules/ui/mw.echo.ui.PageFilterWidget.js
M modules/ui/mw.echo.ui.PageNotificationsOptionWidget.js
2 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/ui/mw.echo.ui.PageFilterWidget.js 
b/modules/ui/mw.echo.ui.PageFilterWidget.js
index b7b8d8f..aa76f0f 100644
--- a/modules/ui/mw.echo.ui.PageFilterWidget.js
+++ b/modules/ui/mw.echo.ui.PageFilterWidget.js
@@ -33,6 +33,7 @@
// Title option
this.title = new mw.echo.ui.PageNotificationsOptionWidget( {
label: config.title,
+   title: config.title,
unreadCount: this.totalCount,
data: null,
classes: [ 'mw-echo-ui-pageFilterWidget-title' ]
@@ -78,6 +79,7 @@
for ( i = 0; i < sourcePages.length; i++ ) {
widget = new mw.echo.ui.PageNotificationsOptionWidget( {
label: sourcePages[ i ].title,
+   title: sourcePages[ i ].title,
// TODO: Pages that are a user page should
// have a user icon
icon: 'article',
diff --git a/modules/ui/mw.echo.ui.PageNotificationsOptionWidget.js 
b/modules/ui/mw.echo.ui.PageNotificationsOptionWidget.js
index e3283f4..932d54e 100644
--- a/modules/ui/mw.echo.ui.PageNotificationsOptionWidget.js
+++ b/modules/ui/mw.echo.ui.PageNotificationsOptionWidget.js
@@ -5,6 +5,7 @@
 * @class
 * @extends OO.ui.OptionWidget
 * @mixins OO.ui.mixin.IconElement
+* @mixins OO.ui.mixin.TitledElement
 *
 * @constructor
 * @param {Object} [config] Configuration object
@@ -17,6 +18,7 @@
mw.echo.ui.PageNotificationsOptionWidget.parent.call( this, 
config );
// Mixin constructors
OO.ui.mixin.IconElement.call( this, config );
+   OO.ui.mixin.TitledElement.call( this, config );
 
this.count = config.unreadCount || 0;
 
@@ -53,6 +55,7 @@
 
OO.inheritClass( mw.echo.ui.PageNotificationsOptionWidget, 
OO.ui.OptionWidget );
OO.mixinClass( mw.echo.ui.PageNotificationsOptionWidget, 
OO.ui.mixin.IconElement );
+   OO.mixinClass( mw.echo.ui.PageNotificationsOptionWidget, 
OO.ui.mixin.TitledElement );
 
/**
 * Set the page count

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ae0d0e8c6c7dd79b9ab00db1d601f670764d3a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move NewPP limit report HTML comments to JS variables - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Move NewPP limit report HTML comments to JS variables
..

Move NewPP limit report HTML comments to JS variables

* Make makeConfigSetScript() use pretty output so these
  are also easy to read in "view source".
* Removed ParserLimitReportFormat hook.

Bug: T110763
Change-Id: I2783c46c6d80f828f9ecf5e71fc8f35910454582
---
M RELEASE-NOTES-1.28
M docs/hooks.txt
M includes/parser/Parser.php
M includes/parser/ParserOutput.php
M includes/resourceloader/ResourceLoader.php
5 files changed, 58 insertions(+), 76 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/299693/1

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 42b65ba..bbddb15 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -61,6 +61,7 @@
   use or update a custom session provider if needed.
 * Deprecated APIEditBeforeSave hook in favor of EditFilterMergedContent.
 * The 'UploadVerification' hook is deprecated. Use 'UploadVerifyFile' instead.
+* The 'ParserLimitReportFormat' hook was removed.
 
 == Compatibility ==
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 2b3116d..9b05221 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2360,23 +2360,11 @@
 &$parser: Parser object
 &$varCache: variable cache (array)
 
-'ParserLimitReport': DEPRECATED! Use ParserLimitReportPrepare and
-ParserLimitReportFormat instead.
+'ParserLimitReport': DEPRECATED! Use ParserLimitReportPrepare instead.
 Called at the end of Parser:parse() when the parser will
 include comments about size of the text parsed.
 $parser: Parser object
 &$limitReport: text that will be included (without comment tags)
-
-'ParserLimitReportFormat': Called for each row in the parser limit report that
-needs formatting. If nothing handles this hook, the default is to use "$key" to
-get the label, and "$key-value" or "$key-value-text"/"$key-value-html" to
-format the value.
-$key: Key for the limit report item (string)
-&$value: Value of the limit report item
-&$report: String onto which to append the data
-$isHTML: If true, $report is an HTML table with two columns; if false, it's
-  text intended for display in a monospaced font.
-$localize: If false, $report should be output in English.
 
 'ParserLimitReportPrepare': Called at the end of Parser:parse() when the parser
 will include comments about size of the text parsed. Hooks should use
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index a765450..e57ec8e 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -501,60 +501,46 @@
[ $this->mHighestExpansionDepth, 
$this->mOptions->getMaxPPExpandDepth() ]
);
$this->mOutput->setLimitReportData( 
'limitreport-expensivefunctioncount',
-   [ $this->mExpensiveFunctionCount, 
$this->mOptions->getExpensiveParserFunctionLimit() ]
+   [ $this->mExpensiveFunctionCount,
+   
$this->mOptions->getExpensiveParserFunctionLimit() ]
);
Hooks::run( 'ParserLimitReportPrepare', [ $this, 
$this->mOutput ] );
 
-   $limitReport = "NewPP limit report\n";
-   if ( $wgShowHostnames ) {
-   $limitReport .= 'Parsed by ' . wfHostname() . 
"\n";
-   }
-   $limitReport .= 'Cached time: ' . 
$this->mOutput->getCacheTime() . "\n";
-   $limitReport .= 'Cache expiry: ' . 
$this->mOutput->getCacheExpiry() . "\n";
-   $limitReport .= 'Dynamic content: ' .
-   ( $this->mOutput->hasDynamicContent() ? 'true' 
: 'false' ) .
-   "\n";
-
-   foreach ( $this->mOutput->getLimitReportData() as $key 
=> $value ) {
-   if ( Hooks::run( 'ParserLimitReportFormat',
-   [ $key, &$value, &$limitReport, false, 
false ]
-   ) ) {
-   $keyMsg = wfMessage( $key 
)->inLanguage( 'en' )->useDatabase( false );
-   $valueMsg = wfMessage( [ 
"$key-value-text", "$key-value" ] )
-   ->inLanguage( 'en' 
)->useDatabase( false );
-   if ( !$valueMsg->exists() ) {
-   $valueMsg = new RawMessage( 
'$1' );
-   }
-   if ( !$keyMsg->isDisabled() && 
!$valueMsg->isDisabled() ) {
-   $valueMsg->params( $value );
-   

[MediaWiki-commits] [Gerrit] Nitpick: Point to Phab tasks directly instead of BZ redirs - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Nitpick: Point to Phab tasks directly instead of BZ redirs
..


Nitpick: Point to Phab tasks directly instead of BZ redirs

Change-Id: I4fffee2c01665145e4cae9442f5283dfd1946962
---
M modules/gerrit/files/skin/GerritSite.css
M modules/mediawiki/templates/apache/apache2.conf.erb
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/gerrit/files/skin/GerritSite.css 
b/modules/gerrit/files/skin/GerritSite.css
index 4766789..4b1cec4 100644
--- a/modules/gerrit/files/skin/GerritSite.css
+++ b/modules/gerrit/files/skin/GerritSite.css
@@ -117,7 +117,7 @@
 }
 
 /**
- * https://bugzilla.wikimedia.org/show_bug.cgi?id=44895
+ * https://phabricator.wikimedia.org/T46895
  * Gerrit commit message font is too small
  */
 .changeScreenDescription,
@@ -126,7 +126,7 @@
 }
 
 /**
- * https://bugzilla.wikimedia.org/show_bug.cgi?id=40941
+ * https://phabricator.wikimedia.org/T42941
  * Gerrit diff font isn't big enough, either
  */
 .patchContentTable td {
diff --git a/modules/mediawiki/templates/apache/apache2.conf.erb 
b/modules/mediawiki/templates/apache/apache2.conf.erb
index 14c8df2..f419077 100644
--- a/modules/mediawiki/templates/apache/apache2.conf.erb
+++ b/modules/mediawiki/templates/apache/apache2.conf.erb
@@ -88,5 +88,5 @@
 
 # Set ETags for files to not be based on inode,
 # since that will be different on each backend server
-# http://bugzilla.wikimedia.org/show_bug.cgi?id=8926
+# https://phabricator.wikimedia.org/T10926
 FileETag MTime Size

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fffee2c01665145e4cae9442f5283dfd1946962
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove unnecessary width:100% from header - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Remove unnecessary width:100% from header
..


Remove unnecessary width:100% from header

The default value of 'auto' gives the desired behaviour.
100% causes a little horizontal scrolling on narrow screens.

Bug: T140091
Change-Id: I25e96c72485546e6fe12f8177939720739bb4cd9
---
M modules/styles/board/header.less
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/styles/board/header.less b/modules/styles/board/header.less
index 56f9f30..edffb85 100644
--- a/modules/styles/board/header.less
+++ b/modules/styles/board/header.less
@@ -5,7 +5,6 @@
 
 .flow-board-header {
word-break: break-word;
-   width: 100%;
max-width: 700px;
padding-top: 10px;
padding-right: 15px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25e96c72485546e6fe12f8177939720739bb4cd9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Etonkovidova 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't show 'start a new topic' twice - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Don't show 'start a new topic' twice
..


Don't show 'start a new topic' twice

Include the style that controls the overlay
on the board for the 'view' action.

Bug: T135619
Change-Id: I6d62544500bbc285e726ec1e9512712b742aaadf
---
M Resources.php
M includes/View.php
M modules/styles/js.less
3 files changed, 48 insertions(+), 41 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index c3276a1..832103d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -287,6 +287,7 @@
'styles/board/timestamps.less',
'styles/board/replycount.less',
'styles/nojs.less',
+   'styles/js.less',
'styles/board/form-actions.less',
'styles/board/terms-of-use.less',
'styles/board/editor-switcher.less',
diff --git a/includes/View.php b/includes/View.php
index 81900d9..8f2e024 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -300,6 +300,9 @@
$title = Title::newFromText( $apiResponse['title'] );
$classes[] = 'mw-content-' . 
$title->getPageViewLanguage()->getDir();
 
+   $action = $this->getRequest()->getVal( 'action', 'view' 
);
+   $classes[] = "flow-action-$action";
+
// Output the component, with the rendered blocks 
inside it
$out->addHTML( Html::rawElement(
'div',
diff --git a/modules/styles/js.less b/modules/styles/js.less
index d3d7017..e8352f2 100644
--- a/modules/styles/js.less
+++ b/modules/styles/js.less
@@ -4,53 +4,56 @@
 
 // @todo: Find better home for this css
 .client-js {
-   // Hide the component while it is loading if Javascript
-   // is enabled.
-   .flow-ui-load-overlay {
-   z-index: 101;
-   position: absolute;
-   top: 0;
-   left: 0;
-   width: 100%;
-   height: 100%;
-   cursor: wait;
-   }
-
-   .flow-component {
-   position: relative;
-   opacity: 0.5;
-
-   &-ready {
-   opacity: 1;
-
-   -moz-transition: opacity 0.5s;
-   -webkit-transition: opacity 0.5s;
-   -o-transition: opacity 0.5s;
-   transition: opacity 0.5s;
+   .flow-action-view {
+   // Hide the component while it is loading if Javascript
+   // is enabled.
+   .flow-ui-load-overlay {
+   z-index: 101;
+   position: absolute;
+   top: 0;
+   left: 0;
+   width: 100%;
+   height: 100%;
+   cursor: wait;
}
-   }
 
-   /*
-   Fallback elements
+   .flow-component {
+   position: relative;
+   opacity: 0.5;
 
-   Fallback elements are invisible when JavaScript is enabled. They only 
exist when JavaScript does not run.
+   &-ready {
+   opacity: 1;
 
-   Markup:
-   
+   -moz-transition: opacity 0.5s;
+   -webkit-transition: opacity 0.5s;
+   -o-transition: opacity 0.5s;
+   transition: opacity 0.5s;
+   }
+   }
 
-   Styleguide X.
-   */
-   .flow-ui-fallback-element {
-   visibility: hidden;
-   height: 0;
-   }
+   /*
+   Fallback elements
 
-   // With JS, hide .flow-nojs & display .flow-js elements
-   .flow-nojs {
-   display: none;
-   }
-   .flow-js {
-   display: block;
+   Fallback elements are invisible when JavaScript is enabled. 
They only exist when JavaScript does not run.
+
+   Markup:
+   
+
+   Styleguide X.
+   */
+   .flow-ui-fallback-element {
+   visibility: hidden;
+   height: 0;
+   }
+
+   // With JS, hide .flow-nojs & display .flow-js elements
+   .flow-nojs {
+   display: none;
+   }
+   .flow-js {
+   display: block;
+   }
+
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d62544500bbc285e726ec1e9512712b742aaadf

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered CommonsMetadata* into CommonSett... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup: Move never-altered CommonsMetadata* into CommonSettings
..


Cleanup: Move never-altered CommonsMetadata* into CommonSettings

Change-Id: I3f93183a312d058bdac10d4904586b2f4293c7c0
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 10 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index af91155..25f4928 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2078,8 +2078,8 @@
 
 if ( $wmgUseCommonsMetadata ) {
require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
-   $wgCommonsMetadataSetTrackingCategories = 
$wmgCommonsMetadataSetTrackingCategories;
-   $wgCommonsMetadataForceRecalculate = 
$wmgCommonsMetadataForceRecalculate;
+   $wgCommonsMetadataSetTrackingCategories = true;
+   $wgCommonsMetadataForceRecalculate = false;
 }
 
 if ( $wmgUseGWToolset ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a738d3e..688e7cf 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12605,14 +12605,6 @@
'wikitech' => false,
 ],
 
-'wmgCommonsMetadataSetTrackingCategories' => [
-   'default' => true,
-],
-
-'wmgCommonsMetadataForceRecalculate' => [
-   'default' => false,
-],
-
 // T134778
 'wmgUsePopups' => [
'default' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f93183a312d058bdac10d4904586b2f4293c7c0
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] backfillUnreadWikis: Skip updateCount if race condition dete... - change (mediawiki...Echo)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: backfillUnreadWikis: Skip updateCount if race condition detected
..

backfillUnreadWikis: Skip updateCount if race condition detected

Related doc fixes

Change-Id: I1b7545d2f86ec87e9701811ac5f4db0fec690681
---
M includes/NotifUser.php
M includes/UnreadWikis.php
M maintenance/backfillUnreadWikis.php
3 files changed, 19 insertions(+), 9 deletions(-)


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

diff --git a/includes/NotifUser.php b/includes/NotifUser.php
index 3e87fb3..96336fe 100644
--- a/includes/NotifUser.php
+++ b/includes/NotifUser.php
@@ -243,18 +243,18 @@
}
 
/**
-* Get the unread timestamp of the latest alert
+* Get the timestamp of the latest unread alert
 *
 * @param boolean $cached Set to false to bypass the cache. (Optional. 
Defaults to true)
 * @param int $dbSource Use master or slave database to pull count 
(Optional. Defaults to DB_SLAVE)
-* @return bool|MWTimestamp
+* @return bool|MWTimestamp Timestamp of latest unread alert, or false 
if there are no unread alerts.
 */
public function getLastUnreadAlertTime( $cached = true, $dbSource = 
DB_SLAVE ) {
return $this->getLastUnreadNotificationTime( $cached, 
$dbSource, EchoAttributeManager::ALERT );
}
 
/**
-* Get the unread timestamp of the latest message
+* Get the timestamp of the latest unread message
 *
 * @param boolean $cached Set to false to bypass the cache. (Optional. 
Defaults to true)
 * @param int $dbSource Use master or slave database to pull count 
(Optional. Defaults to DB_SLAVE)
@@ -273,7 +273,7 @@
 * @param int $dbSource Use master or slave database to pull count 
(Optional. Defaults to DB_SLAVE)
 * @param string $section Notification section
 * @param bool|string $global Whether to include foreign notifications. 
If set to 'preference', uses the user's preference.
-* @return bool|MWTimestamp Timestamp of last notification, or false if 
there is none
+* @return bool|MWTimestamp Timestamp of latest unread message, or 
false if there are no unread messages.
 */
public function getLastUnreadNotificationTime( $cached = true, 
$dbSource = DB_SLAVE, $section = EchoAttributeManager::ALL, $global = 
'preference' ) {
if ( $this->mUser->isAnon() ) {
diff --git a/includes/UnreadWikis.php b/includes/UnreadWikis.php
index ea6f501..55d326a 100644
--- a/includes/UnreadWikis.php
+++ b/includes/UnreadWikis.php
@@ -93,11 +93,13 @@
}
 
/**
-* @param string $wiki
-* @param int $alertCount
-* @param MWTimestamp|bool $alertTime
-* @param int $msgCount
-* @param MWTimestamp|bool $msgTime
+* @param string $wiki Wiki code
+* @param int $alertCount Number of alerts
+* @param MWTimestamp|bool $alertTime Timestamp of most recent unread 
alert, or
+*   false meaning no timestamp because there are no unread alerts.
+* @param int $msgCount Number of messages
+* @param MWTimestamp|bool $msgTime Timestamp of most recent message, or
+*   false meaning no timestamp because there are no unread messages.
 */
public function updateCount( $wiki, $alertCount, $alertTime, $msgCount, 
$msgTime ) {
$dbw = $this->getDB( DB_MASTER );
diff --git a/maintenance/backfillUnreadWikis.php 
b/maintenance/backfillUnreadWikis.php
index b84280e..9c34d79 100644
--- a/maintenance/backfillUnreadWikis.php
+++ b/maintenance/backfillUnreadWikis.php
@@ -49,6 +49,14 @@
$msgCount = 
$notifUser->getNotificationCount( true, DB_SLAVE, 
EchoAttributeManager::MESSAGE, false );
$msgUnread = 
$notifUser->getLastUnreadNotificationTime( true, DB_SLAVE, 
EchoAttributeManager::MESSAGE, false );
 
+   if ( ( $alertCount !== 0 && 
$alertUnread === false ) || ( $msgCount !== 0 && $msgUnread === false ) ) {
+   // If there are alerts, there 
should be an alert timestamp (same for messages).
+   //
+   // Otherwise, there is a race 
condition between the two values, indicating there's already
+   // just been an updateCount 
call, so we can skip this user.
+   continue;
+   }
+
$uw->updateCount( wfWikiID(), 
$alertCount, $alertUnread, $msgCount, $msgUnread );
}
   

[MediaWiki-commits] [Gerrit] [WIP] Pending queue supports delete and fetch - change (wikimedia...SmashPig)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: [WIP] Pending queue supports delete and fetch
..

[WIP] Pending queue supports delete and fetch

Bug: T131275
Change-Id: I3b41e486ad4b66b4c8c48b83555e8131b977f97c
---
M Core/DataStores/PendingDatabase.php
1 file changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/91/299691/1

diff --git a/Core/DataStores/PendingDatabase.php 
b/Core/DataStores/PendingDatabase.php
index 8efefe4..09d23a6 100644
--- a/Core/DataStores/PendingDatabase.php
+++ b/Core/DataStores/PendingDatabase.php
@@ -91,4 +91,31 @@
}
$prepared->execute();
}
+
+   /**
+* Return all records matching a (gateway, gateway_txn_id)
+*
+* @param $gatewayName string
+* @param $gatewayTxnId string
+* @return array List of records related to a transaction
+*/
+   public function fetchGatewayTransactionMessages( $gatewayName, 
$gatewayTxnId ) {
+   $prepared = $this->db->prepare( 'select from pending where 
gateway = :gateway and gateway_txn_id = :gateway_txn_id' );
+   $prepared->bindValue( ':gateway', $gateway, PDO::PARAM_STR );
+   $prepared->bindValue( ':gateway_txn_id', $gateway_txn_id, 
PDO::PARAM_STR );
+   $prepared->execute();
+   return $prepared->fetchAll( PDO::FETCH_ASSOC );
+   }
+
+   /**
+* Delete a message, given its pending db primary key
+*
+* FIXME: schema uses bigint
+* @param $primaryDbId int
+*/
+   public function deleteMessage( $primaryDbId ) {
+   $prepared = $this->db->prepare( 'delete from pending where id = 
:id' );
+   $prepared->bindValue( ':id', $primaryDbId, PDO::PARAM_INT );
+   $prepared->execute();
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b41e486ad4b66b4c8c48b83555e8131b977f97c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseLocalisationUpdate into Commo... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup: Move never-altered UseLocalisationUpdate into 
CommonSettings
..


Cleanup: Move never-altered UseLocalisationUpdate into CommonSettings

Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 9 insertions(+), 14 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index be55be8..af91155 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1840,16 +1840,15 @@
 $wgDefaultUserOptions['usebetatoolbar'] = 1;
 $wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
 
-if ( $wmgUseLocalisationUpdate ) {
-   wfLoadExtension( 'LocalisationUpdate' );
-   $wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
-   $wgLocalisationUpdateRepository = 'local';
-   $wgLocalisationUpdateRepositories['local'] = [
-   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
-   'extension' => 
'/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
-   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
-   ];
-}
+# LocalisationUpdate
+wfLoadExtension( 'LocalisationUpdate' );
+$wgLocalisationUpdateDirectory = 
"/var/lib/l10nupdate/caches/cache-$wmgVersionNumber";
+$wgLocalisationUpdateRepository = 'local';
+$wgLocalisationUpdateRepositories['local'] = [
+   'mediawiki' => '/var/lib/l10nupdate/mediawiki/core/%PATH%',
+   'extension' => '/var/lib/l10nupdate/mediawiki/extensions/%NAME%/%PATH%',
+   'skins' => '/var/lib/l10nupdate/mediawiki/skins/%NAME%/%PATH%',
+];
 
 if ( $wmgEnableLandingCheck ) {
require_once(  "$IP/extensions/LandingCheck/LandingCheck.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bad7666..a738d3e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12220,10 +12220,6 @@
'default' => 1024,
 ],
 
-'wmgUseLocalisationUpdate' => [
-   'default' => true,
-],
-
 'wmgUseLiquidThreads' => [
 //
 // 
!

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e94467a0248c7238ac00653c33677844b8e1b13
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Truncate gallery caption filenames with CSS - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Truncate gallery caption filenames with CSS
..


Truncate gallery caption filenames with CSS

Bug: T139766
Change-Id: Iba7efb8f89e132b8eb39f3c9ba76d2b1a9181b2f
---
M includes/DefaultSettings.php
M includes/gallery/TraditionalImageGallery.php
M resources/src/mediawiki/page/gallery.css
M tests/parser/parserTests.txt
4 files changed, 28 insertions(+), 7 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f6611ac..5088445 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1444,7 +1444,10 @@
'imagesPerRow' => 0, // Default number of images per-row in the 
gallery. 0 -> Adapt to screensize
'imageWidth' => 120, // Width of the cells containing images in 
galleries (in "px")
'imageHeight' => 120, // Height of the cells containing images in 
galleries (in "px")
-   'captionLength' => 25, // Length to truncate filename to in caption 
when using "showfilename"
+   'captionLength' => true, // Deprecated @since 1.28
+// Length to truncate filename to in caption 
when using "showfilename".
+// A value of 'true' will truncate the 
filename to one line using CSS
+// and will be the behaviour after deprecation.
'showBytes' => true, // Show the filesize in bytes in categories
'mode' => 'traditional',
 ];
diff --git a/includes/gallery/TraditionalImageGallery.php 
b/includes/gallery/TraditionalImageGallery.php
index 2fb2281..f6527b8 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -189,8 +189,16 @@
// Preloaded into LinkCache above
Linker::linkKnown(
$nt,
-   htmlspecialchars( $lang->truncate( 
$nt->getText(), $this->mCaptionLength ) )
-   ) . "\n" :
+   htmlspecialchars(
+   $this->mCaptionLength !== true ?
+   $lang->truncate( 
$nt->getText(), $this->mCaptionLength ) :
+   $nt->getText()
+   ),
+   [
+   'class' => 'galleryfilename' .
+   ( $this->mCaptionLength 
=== true ? ' galleryfilename-truncate' : '' )
+   ]
+   ) . "\n" :
'';
 
$galleryText = $textlink . $text . $fileSize;
diff --git a/resources/src/mediawiki/page/gallery.css 
b/resources/src/mediawiki/page/gallery.css
index 4d43e6a..d765144 100644
--- a/resources/src/mediawiki/page/gallery.css
+++ b/resources/src/mediawiki/page/gallery.css
@@ -45,6 +45,16 @@
word-wrap: break-word;
 }
 
+.galleryfilename {
+   display: block;
+}
+
+.galleryfilename-truncate {
+   white-space: nowrap;
+   overflow: hidden;
+   text-overflow: ellipsis;
+}
+
 /* new gallery stuff */
 ul.mw-gallery-nolines li.gallerybox div.thumb {
background-color: transparent;
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 2e059d7..aa5ed05 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18816,7 +18816,7 @@

Nonexistent.jpg

-Nonexistent.jpg
+Nonexistent.jpg
 caption
 

@@ -18824,14 +18824,14 @@

Nonexistent.jpg

-Nonexistent.jpg
+Nonexistent.jpg
 



http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>

-Foobar.jpg
+Foobar.jpg
 some caption Main Page
 

@@ -18839,7 +18839,7 @@

http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg; 
width="120" height="14" 
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x" 
/>

-Foobar.jpg
+Foobar.jpg
 



-- 
To view, visit https://gerrit.wikimedia.org/r/298020
To 

[MediaWiki-commits] [Gerrit] Check for array indices before using them - change (mediawiki...SecureHTML)

[Fo0bar (Code Review)]

Fo0bar has submitted this change and it was merged.

Change subject: Check for array indices before using them
..


Check for array indices before using them

Change-Id: I718ab3b0b804e37da003cc56db6beb89fe3f74a8
---
M SecureHTML.php
M i18n/en.json
2 files changed, 23 insertions(+), 2 deletions(-)

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



diff --git a/SecureHTML.php b/SecureHTML.php
index 40cfb15..c1525bf 100644
--- a/SecureHTML.php
+++ b/SecureHTML.php
@@ -76,6 +76,12 @@
global $wgSecureHTMLSecrets;
global $shtml_keys;
 
+   # The hash attribute is required.
+   if ( !isset( $argv['hash'] ) ) {
+   return( '' . wfMessage( 'securehtml-hashrequired' ) 
. '' . "\n" );
+   }
+
+   # Default (but deprecated) version 1.
if ( !isset( $argv['version'] ) ) {
$argv['version'] = '1';
}
@@ -93,7 +99,14 @@
$keyname = ( isset( $argv['keyname'] ) ? $argv['keyname'] : 
$keynames[0] );
 
# The key secret.
-   $keysecret = $wgSecureHTMLSecrets[$keyname];
+   if ( array_key_exists( $keyname, $wgSecureHTMLSecrets ) ) {
+   $keysecret = $wgSecureHTMLSecrets[$keyname];
+   } else {
+   # Respond with "invalid hash" instead of something like 
"invalid
+   # key name", to avoid leaking the existence of a key 
name due to
+   # dictionary attack.
+   return( '' . wfMessage( 
'securehtml-invalidhash' ) . '' . "\n" );
+   }
 
# Compute a test hash.
$testhash = hash_hmac( 'sha256', $input, $keysecret );
@@ -113,7 +126,14 @@
$keyname = ( isset( $argv['keyname'] ) ? $argv['keyname'] : 
$keynames[0] );
 
# The key secret.
-   $keysecret = $shtml_keys[$keyname];
+   if ( array_key_exists( $keyname, $wgSecureHTMLSecrets ) ) {
+   $keysecret = $shtml_keys[$keyname];
+   } else {
+   # Respond with "invalid hash" instead of something like 
"invalid
+   # key name", to avoid leaking the existence of a key 
name due to
+   # dictionary attack.
+   return( '' . wfMessage( 
'securehtml-invalidhash' ) . '' . "\n" );
+   }
 
# Compute a test hash.
$testhash = md5( $keysecret . $input );
diff --git a/i18n/en.json b/i18n/en.json
index 928a3db..3475ffb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,6 +6,7 @@
"securehtml-desc": "Lets you include arbitrary HTML in an authorized 
and secure way",
"securehtml-nokeys": "Error: $wgSecureHTMLSecrets is not 
populated.",
"securehtml-legacykeys": "Warning: $wgSecureHTMLSecrets 
(version 2) is not populated, but $shtml_keys (version 1) 
is.\nPlease convert to version 2 hashes as soon as possible, as version 1 is 
deprecated.",
+   "securehtml-hashrequired": "Error: Hash required.",
"securehtml-invalidhash": "Error: Invalid hash.",
"securehtml-invalidversion": "Error: Invalid version.",
"securehtml-input-title": "HTML input",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I718ab3b0b804e37da003cc56db6beb89fe3f74a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecureHTML
Gerrit-Branch: master
Gerrit-Owner: Fo0bar 
Gerrit-Reviewer: Fo0bar 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseAbuseFilter into CommonSettings - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup: Move never-altered UseAbuseFilter into CommonSettings
..


Cleanup: Move never-altered UseAbuseFilter into CommonSettings

Change-Id: Idaf2bb5e2a9d591b9ecab46e98366e42e0f98a5b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/abusefilter.php
3 files changed, 6 insertions(+), 13 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 795fa8d..be55be8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1816,14 +1816,12 @@
$wgCodeReviewMaxDiffPaths = 100;
 }
 
-if ( $wmgUseAbuseFilter ) {
-   include "$IP/extensions/AbuseFilter/AbuseFilter.php";
-   include( "$wmfConfigDir/abusefilter.php" );
-
-   $wgAbuseFilterEmergencyDisableThreshold = 
$wmgAbuseFilterEmergencyDisableThreshold;
-   $wgAbuseFilterEmergencyDisableCount = 
$wmgAbuseFilterEmergencyDisableCount;
-   $wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge;
-}
+# AbuseFilter
+include "$IP/extensions/AbuseFilter/AbuseFilter.php";
+include( "$wmfConfigDir/abusefilter.php" );
+$wgAbuseFilterEmergencyDisableThreshold = 
$wmgAbuseFilterEmergencyDisableThreshold;
+$wgAbuseFilterEmergencyDisableCount = $wmgAbuseFilterEmergencyDisableCount;
+$wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge;
 
 if ( $wmgUsePdfHandler ) {
include ( "$IP/extensions/PdfHandler/PdfHandler.php" );
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d460f92..bad7666 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11988,10 +11988,6 @@
 ],
 
 # abuse filter @{
-'wmgUseAbuseFilter' => [
-   'default' => true,
-],
-
 'wmgAbuseFilterCentralDB' => [
'default' => 'metawiki',
 ],
diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 84fff71..e684cf4 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -2,7 +2,6 @@
 # WARNING: This file is publically viewable on the web. Do not put private 
data here.
 
 # This file is for the default permissions and custom permissions of the 
AbuseFilter extension.
-# You must also set wmgUseAbuseFilter in InitialiseSettings.php
 # This file is referenced from an include in CommonSettings.php
 
 $wgGroupPermissions['*']['abusefilter-view'] = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idaf2bb5e2a9d591b9ecab46e98366e42e0f98a5b
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Check for array indices before using them - change (mediawiki...SecureHTML)

[Fo0bar (Code Review)]

Fo0bar has uploaded a new change for review.

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

Change subject: Check for array indices before using them
..

Check for array indices before using them

Change-Id: I718ab3b0b804e37da003cc56db6beb89fe3f74a8
---
M SecureHTML.php
M i18n/en.json
2 files changed, 23 insertions(+), 2 deletions(-)


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

diff --git a/SecureHTML.php b/SecureHTML.php
index 40cfb15..c1525bf 100644
--- a/SecureHTML.php
+++ b/SecureHTML.php
@@ -76,6 +76,12 @@
global $wgSecureHTMLSecrets;
global $shtml_keys;
 
+   # The hash attribute is required.
+   if ( !isset( $argv['hash'] ) ) {
+   return( '' . wfMessage( 'securehtml-hashrequired' ) 
. '' . "\n" );
+   }
+
+   # Default (but deprecated) version 1.
if ( !isset( $argv['version'] ) ) {
$argv['version'] = '1';
}
@@ -93,7 +99,14 @@
$keyname = ( isset( $argv['keyname'] ) ? $argv['keyname'] : 
$keynames[0] );
 
# The key secret.
-   $keysecret = $wgSecureHTMLSecrets[$keyname];
+   if ( array_key_exists( $keyname, $wgSecureHTMLSecrets ) ) {
+   $keysecret = $wgSecureHTMLSecrets[$keyname];
+   } else {
+   # Respond with "invalid hash" instead of something like 
"invalid
+   # key name", to avoid leaking the existence of a key 
name due to
+   # dictionary attack.
+   return( '' . wfMessage( 
'securehtml-invalidhash' ) . '' . "\n" );
+   }
 
# Compute a test hash.
$testhash = hash_hmac( 'sha256', $input, $keysecret );
@@ -113,7 +126,14 @@
$keyname = ( isset( $argv['keyname'] ) ? $argv['keyname'] : 
$keynames[0] );
 
# The key secret.
-   $keysecret = $shtml_keys[$keyname];
+   if ( array_key_exists( $keyname, $wgSecureHTMLSecrets ) ) {
+   $keysecret = $shtml_keys[$keyname];
+   } else {
+   # Respond with "invalid hash" instead of something like 
"invalid
+   # key name", to avoid leaking the existence of a key 
name due to
+   # dictionary attack.
+   return( '' . wfMessage( 
'securehtml-invalidhash' ) . '' . "\n" );
+   }
 
# Compute a test hash.
$testhash = md5( $keysecret . $input );
diff --git a/i18n/en.json b/i18n/en.json
index 928a3db..3475ffb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,6 +6,7 @@
"securehtml-desc": "Lets you include arbitrary HTML in an authorized 
and secure way",
"securehtml-nokeys": "Error: $wgSecureHTMLSecrets is not 
populated.",
"securehtml-legacykeys": "Warning: $wgSecureHTMLSecrets 
(version 2) is not populated, but $shtml_keys (version 1) 
is.\nPlease convert to version 2 hashes as soon as possible, as version 1 is 
deprecated.",
+   "securehtml-hashrequired": "Error: Hash required.",
"securehtml-invalidhash": "Error: Invalid hash.",
"securehtml-invalidversion": "Error: Invalid version.",
"securehtml-input-title": "HTML input",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I718ab3b0b804e37da003cc56db6beb89fe3f74a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecureHTML
Gerrit-Branch: master
Gerrit-Owner: Fo0bar 

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

[MediaWiki-commits] [Gerrit] Gerrit: monitoring conflicts with system ssh - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: monitoring conflicts with system ssh
..


Gerrit: monitoring conflicts with system ssh

Change-Id: I0d90baae8421ae1211a77ae1a7b34ade520e8a06
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index e3a7a10..67644dd 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -22,7 +22,7 @@
 contact_group => 'admins,gerrit',
 }
 
-monitoring::service { 'ssh':
+monitoring::service { 'gerrit_ssh':
 description   => 'SSH access',
 check_command => "check_ssh_port!${host}!29418",
 contact_group => 'admins,gerrit',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d90baae8421ae1211a77ae1a7b34ade520e8a06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] Cleanup: Move never-altered UseDismissableSiteNotice into Co... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup: Move never-altered UseDismissableSiteNotice into 
CommonSettings
..


Cleanup: Move never-altered UseDismissableSiteNotice into CommonSettings

Change-Id: Idd92ba969311c161598741050c89ed45f80dade2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a74c44f..795fa8d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1453,10 +1453,8 @@
 }
 
 // taking it live 2006-12-15 brion
-if ( $wmgUseDismissableSiteNotice ) {
-   require( 
"$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
-   $wgDismissableSiteNoticeForAnons = true; // T59732
-}
+require( "$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
+$wgDismissableSiteNoticeForAnons = true; // T59732
 $wgMajorSiteNoticeID = '2';
 
 // pre-Authmanager code for logging failed login attempts
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f957c4a..d460f92 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4354,10 +4354,6 @@
'private' => true // make files private and such
 ],
 
-'wmgUseDismissableSiteNotice' => [
-   'default' => true,
-],
-
 'wmgUseCentralNotice' => [
'default' => true,
'advisorywiki' => false, // Per T27519

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd92ba969311c161598741050c89ed45f80dade2
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [gerrit] Use HEAD instead of master for branch - change (operations/puppet)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [gerrit] Use HEAD instead of master for branch
..

[gerrit] Use HEAD instead of master for branch

Since some repos use a different branch to master this will break the link
for those repos. With this patch this fixes the link.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/299689/1

diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index ffa8352..1f97459 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -62,7 +62,7 @@
 branch = "/r/branch/${project};${branch}"
 filehistory = "/r/p/${project}/;history/${branch}/${file}"
 file = "/r/browse/${project};${branch};${file}"
-roottree = "/r/p/${project}/;browse/master/;${commit}"
+roottree = "/r/p/${project}/;browse/HEAD/;${commit}"
 linkname = diffusion
 linkDrafts = true
 urlEncode = false

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit: monitoring conflicts with system ssh - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: monitoring conflicts with system ssh
..

Gerrit: monitoring conflicts with system ssh

Change-Id: I0d90baae8421ae1211a77ae1a7b34ade520e8a06
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/299688/1

diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index e3a7a10..67644dd 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -22,7 +22,7 @@
 contact_group => 'admins,gerrit',
 }
 
-monitoring::service { 'ssh':
+monitoring::service { 'gerrit_ssh':
 description   => 'SSH access',
 check_command => "check_ssh_port!${host}!29418",
 contact_group => 'admins,gerrit',

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit: Follow-up I8455189c, use monitoring::service not nrp... - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Follow-up I8455189c, use monitoring::service not 
nrpe::monitor_service
..


Gerrit: Follow-up I8455189c, use monitoring::service not nrpe::monitor_service

Change-Id: I2417fb54acd84a9fb39b0ca6649b7218eea3804f
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index 5e2c274..e3a7a10 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -22,7 +22,7 @@
 contact_group => 'admins,gerrit',
 }
 
-nrpe::monitor_service { 'ssh':
+monitoring::service { 'ssh':
 description   => 'SSH access',
 check_command => "check_ssh_port!${host}!29418",
 contact_group => 'admins,gerrit',

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

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

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

[MediaWiki-commits] [Gerrit] [WIP] Move PendingDatabase into its own class - change (wikimedia...SmashPig)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: [WIP] Move PendingDatabase into its own class
..

[WIP] Move PendingDatabase into its own class

Bug: T131275
Bug: T130897
Change-Id: Iccfdbe207f1197e2297de1f9d075d3aceb8b42ac
---
A Core/DataStores/PendingDatabase.php
M Maintenance/ConsumePendingQueue.php
2 files changed, 99 insertions(+), 67 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/86/299686/1

diff --git a/Core/DataStores/PendingDatabase.php 
b/Core/DataStores/PendingDatabase.php
new file mode 100644
index 000..8efefe4
--- /dev/null
+++ b/Core/DataStores/PendingDatabase.php
@@ -0,0 +1,94 @@
+getConfiguration();
+   $this->db = $config->object( 'data-store/pending-db' );
+   }
+
+   /**
+* @return PDO
+*/
+   public function getDatabase() {
+   return $this->db;
+   }
+
+   public static get() {
+   // This is static so we have the option to go singleton if 
needed.
+   return new PendingDatabase();
+   }
+
+   protected function validateMessage( $message ) {
+   if (
+   empty( $message['date'] ) ||
+   empty( $message['gateway'] ) ||
+   (   // need at least one transaction ID
+   empty( $message['gateway_txn_id'] ) &&
+   empty( $message['order_id'] )
+   )
+   ) {
+   throw new SmashPigException( 'Message missing required 
fields' );
+   }
+   }
+
+   /**
+* Build and insert a database record from a pending queue message
+*
+* @param array $message
+* @throws SmashPigException
+*/
+   public function storeMessage( $message ) {
+   $this->validateMessage( $message );
+
+   $dbRecord = array();
+
+   // These fields (and date) have their own columns in the 
database
+   // Copy the values from the message to the record
+   $indexedFields = array(
+   'gateway', 'gateway_account', 'gateway_txn_id', 
'order_id'
+   );
+
+   foreach ( $indexedFields as $fieldName ) {
+   if ( isset( $message[$fieldName] ) ) {
+   $dbRecord[$fieldName] = $message[$fieldName];
+   }
+   }
+
+   $dbRecord['date'] = UtcDate::getUtcDatabaseString( 
$message['date'] );
+   // Dump the whole message into a text column
+   $dbRecord['message'] = json_encode( $message );
+
+   $fieldList = implode( ',', array_keys( $dbRecord ) );
+
+   // Build a list of parameter names for safe db insert
+   // Same as the field list, but each parameter is prefixed with 
a colon
+   $paramList = ':' . implode( ', :', array_keys( $dbRecord ) );
+
+   $insert = "INSERT INTO pending ( $fieldList ) values ( 
$paramList );";
+   $prepared = $this->db->prepare( $insert );
+
+   foreach ( $dbRecord as $field => $value ) {
+   $prepared->bindValue(
+   ':' . $field,
+   $value,
+   PDO::PARAM_STR
+   );
+   }
+   $prepared->execute();
+   }
+}
diff --git a/Maintenance/ConsumePendingQueue.php 
b/Maintenance/ConsumePendingQueue.php
index 2e54dcb..bc08fdf 100644
--- a/Maintenance/ConsumePendingQueue.php
+++ b/Maintenance/ConsumePendingQueue.php
@@ -5,11 +5,9 @@
 
 use \PDO;
 
-use SmashPig\Core\Context;
 use SmashPig\Core\Logging\Logger;
+use SmashPig\Core\DataStores\PendingDatabase;
 use SmashPig\Core\DataStores\QueueConsumer;
-use SmashPig\Core\SmashPigException;
-use SmashPig\Core\UtcDate;
 
 $maintClass = '\SmashPig\Maintenance\ConsumePendingQueue';
 
@@ -19,9 +17,9 @@
 class ConsumePendingQueue extends MaintenanceBase {
 
/**
-* @var PDO
+* @var PendingDatabase
 */
-   protected $pendingDatabase = null;
+   protected $pendingDatabase;
 
public function __construct() {
parent::__construct();
@@ -34,13 +32,12 @@
 * Do the actual work of the script.
 */
public function execute() {
-   $config = Context::get()->getConfiguration();
-   $this->pendingDatabase = $config->object( 
'data-store/pending-db' );
+   $this->pendingDatabase = PendingDatabase::get();
 
$basePath = 'maintenance/consume-pending/';
$consumer = new QueueConsumer(
$this->getOption( 'queue' ),
-   array( $this, 'storeMessage' ),
+ 

[MediaWiki-commits] [Gerrit] Gerrit: Follow-up I8455189c, use monitoring::service not nrp... - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Follow-up I8455189c, use monitoring::service not 
nrpe::monitor_service
..

Gerrit: Follow-up I8455189c, use monitoring::service not nrpe::monitor_service

Change-Id: I2417fb54acd84a9fb39b0ca6649b7218eea3804f
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/299687/1

diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index 5e2c274..e3a7a10 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -22,7 +22,7 @@
 contact_group => 'admins,gerrit',
 }
 
-nrpe::monitor_service { 'ssh':
+monitoring::service { 'ssh':
 description   => 'SSH access',
 check_command => "check_ssh_port!${host}!29418",
 contact_group => 'admins,gerrit',

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

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

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

[MediaWiki-commits] [Gerrit] Adjust the width of content in bundled item based on language - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Adjust the width of content in bundled item based on language
..

Adjust the width of content in bundled item based on language

Timestamps vary in length, but CSS table-layout ignores length
constraints when truncating, so we need a way to force the item
to resize itself properly when timestamp takes more space than
we initially thought.

This really isn't what we'd want to do, but there doesn't seem
to be a good way to get the browser to play ball, so we're going
to bust it instead.

Bug: T140349
Change-Id: I97fcea4af62afe9c10bfdd7bb5e1a54c5b4dab85
---
M modules/ui/mw.echo.ui.CrossWikiNotificationItemWidget.js
M modules/ui/mw.echo.ui.NotificationItemWidget.js
2 files changed, 58 insertions(+), 12 deletions(-)


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

diff --git a/modules/ui/mw.echo.ui.CrossWikiNotificationItemWidget.js 
b/modules/ui/mw.echo.ui.CrossWikiNotificationItemWidget.js
index 918e94d..8d141ae 100644
--- a/modules/ui/mw.echo.ui.CrossWikiNotificationItemWidget.js
+++ b/modules/ui/mw.echo.ui.CrossWikiNotificationItemWidget.js
@@ -282,6 +282,7 @@
}
}
)
+   .then( this.adjustBundledItemsWidth.bind( this 
) )
.always( this.popPending.bind( this ) );
 
// Only run the fetch notifications action once
@@ -290,6 +291,18 @@
};
 
/**
+* Adjust the content width of all bundled items.
+* See mw.echo.ui.NotificationItemWidget#adjustBundledWidth
+*/
+   
mw.echo.ui.CrossWikiNotificationItemWidget.prototype.adjustBundledItemsWidth = 
function () {
+   this.getList().getItems().forEach( function ( subgroup ) {
+   subgroup.getListWidget().getItems().forEach( function ( 
item ) {
+   item.adjustBundledWidth();
+   } );
+   } );
+   };
+
+   /**
 * Toggle the expand/collapsed state of this group widget
 *
 * @param {boolean} show Show the widget expanded
diff --git a/modules/ui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ui/mw.echo.ui.NotificationItemWidget.js
index bb56ac8..b554a0c 100644
--- a/modules/ui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationItemWidget.js
@@ -51,20 +51,20 @@
}
 
// Content
-   $message.append(
-   $( '' )
+   this.$header = $( '' )
.addClass( 
'mw-echo-ui-notificationItemWidget-content-message-header' )
-   .append( this.model.getContentHeader() )
-   );
+   .append( this.model.getContentHeader() );
+   $message.append( this.$header );
+
if ( !this.bundle && this.model.getContentBody() ) {
-   $message.append(
-   $( '' )
-   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-body' )
-   .append( this.model.getContentBody() )
-   // dir=auto has a similar effect to 
wrapping the content in , but
-   // makes text-overflow: ellipsis; 
behave less strangely
-   .attr( 'dir', 'auto' )
-   );
+   this.$body = $( '' )
+   .addClass( 
'mw-echo-ui-notificationItemWidget-content-message-body' )
+   .append( this.model.getContentBody() )
+   // dir=auto has a similar effect to wrapping 
the content in , but
+   // makes text-overflow: ellipsis; behave less 
strangely
+   .attr( 'dir', 'auto' );
+
+   $message.append( this.$body );
}
 
// Actions menu
@@ -240,6 +240,39 @@
};
 
/**
+* Adjust the sizing of the header width according to the current width
+* of the other elements.
+*
+* NOTE: We shouldn't need this, but the browser is being stupid about 
css
+* table-layout.
+* The content header must have a fixed width, otherwise the truncation
+* does not work well (because css table-layout ignores the parent width
+* in that case, stretching the entire content to its full width). 
However,
+* we must make sure that the width is adjusted in case the length of 
the
+* timestamp changes.
+* The timestamp length 

[MediaWiki-commits] [Gerrit] Gerrit: Follow-up I8455189c, isn't needed now - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Follow-up I8455189c,  isn't needed now
..


Gerrit: Follow-up I8455189c,  isn't needed now

Change-Id: I194f7c1e5300876caf53eafcc8a9bfce0915c18a
---
M modules/gerrit/manifests/crons.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/gerrit/manifests/crons.pp 
b/modules/gerrit/manifests/crons.pp
index 697c5b6..8dae376 100644
--- a/modules/gerrit/manifests/crons.pp
+++ b/modules/gerrit/manifests/crons.pp
@@ -1,4 +1,4 @@
-class gerrit::crons($ssh_key) {
+class gerrit::crons() {
 cron { 'list_mediawiki_extensions':
 # Gerrit is missing a public list of projects.
 # This hack list MediaWiki extensions repositories

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I194f7c1e5300876caf53eafcc8a9bfce0915c18a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] Gerrit: Follow-up I8455189c, isn't needed now - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Follow-up I8455189c,  isn't needed now
..

Gerrit: Follow-up I8455189c,  isn't needed now

Change-Id: I194f7c1e5300876caf53eafcc8a9bfce0915c18a
---
M modules/gerrit/manifests/crons.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/gerrit/manifests/crons.pp 
b/modules/gerrit/manifests/crons.pp
index 697c5b6..8dae376 100644
--- a/modules/gerrit/manifests/crons.pp
+++ b/modules/gerrit/manifests/crons.pp
@@ -1,4 +1,4 @@
-class gerrit::crons($ssh_key) {
+class gerrit::crons() {
 cron { 'list_mediawiki_extensions':
 # Gerrit is missing a public list of projects.
 # This hack list MediaWiki extensions repositories

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit: Remove SSH public key and last user of it - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Remove SSH public key and last user of it
..


Gerrit: Remove SSH public key and last user of it

Gerrit now supports doing its own garbage cleaning. Stop
using this hack to trigger it.

I'm pretty sure the SSH key isn't being used anyway since it's
in Gerrit itself.

Change-Id: I8455189c964cfd2f49521db88980073f1f0b9b5b
---
M hieradata/role/common/gerrit/server.yaml
M modules/gerrit/manifests/crons.pp
2 files changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/hieradata/role/common/gerrit/server.yaml 
b/hieradata/role/common/gerrit/server.yaml
index d96eab0..05bd817 100644
--- a/hieradata/role/common/gerrit/server.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -7,7 +7,6 @@
 gerrit::host: 'gerrit.wikimedia.org'
 gerrit::jetty::git_dir: '/srv/gerrit/git'
 gerrit::proxy::lets_encrypt: false
-gerrit::crons::ssh_key: 'ssh-rsa 
B3NzaC1yc2EBIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production'
 gerrit::jetty::replication:
 github:
 url: 'g...@github.com:wikimedia/${name}'
diff --git a/modules/gerrit/manifests/crons.pp 
b/modules/gerrit/manifests/crons.pp
index fcddce5..697c5b6 100644
--- a/modules/gerrit/manifests/crons.pp
+++ b/modules/gerrit/manifests/crons.pp
@@ -1,12 +1,4 @@
 class gerrit::crons($ssh_key) {
-
-# TODO: Make this go away -- need to stop using gerrit2 for hook actions
-ssh::userkey { 'gerrit2':
-ensure  => present,
-content => $ssh_key,
-require => Package['gerrit'],
-}
-
 cron { 'list_mediawiki_extensions':
 # Gerrit is missing a public list of projects.
 # This hack list MediaWiki extensions repositories
@@ -29,13 +21,5 @@
 command => 'find /var/lib/gerrit2/review_site/logs/*.gz -mtime +7 
-exec rm {} \\;',
 user=> 'root',
 hour=> 1
-}
-
-cron { 'jgit_gc':
-# Keep repo sizes sane, so people can be productive
-command => 'ssh -p 29418 localhost gerrit gc --all > /dev/null 2>&1',
-user=> 'gerrit2',
-hour=> 2,
-weekday => 6
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Change wmgVisualEditorAvailableNamespaces keys to canonical ... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Change wmgVisualEditorAvailableNamespaces keys to canonical 
names instead of indexes
..


Change wmgVisualEditorAvailableNamespaces keys to canonical names instead of 
indexes

A lot of these are based on comments which are assumed to be correct.

Bug: T138999
Change-Id: Ia3344e7249655eac8003d3e4e1f13ee707c0cb3a
---
M wmf-config/InitialiseSettings.php
1 file changed, 42 insertions(+), 42 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e0ad488..f957c4a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13543,72 +13543,72 @@
 // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces
 'wmgVisualEditorAvailableNamespaces' => [
'default' => [
-   NS_USER => true,
-   NS_FILE => true,
-   NS_HELP => true,
-   NS_CATEGORY => true
+   'User' => true,
+   'File' => true,
+   'Help' => true,
+   'Category' => true
],
 
// Group 0 wikis
'+mediawikiwiki' => [
-   NS_PROJECT => true, // T50430
-   100 /* Manual */ => true, // T50430
-   102 /* Extension */ => true, // T50430
-   104 /* API */ => true, // T50430
-   106 /* Skin */ => true // T50430
+   'Project' => true, // T50430
+   'Manual' => true, // T50430
+   'Extension' => true, // T50430
+   'API' => true, // T50430
+   'Skin' => true // T50430
],
 
// Wikipedias
'+cawiki' => [
-   NS_PROJECT => true, // T88896
-   100 /* Portal */ => true, // T58000
-   102 /* Viquiprojecte */ => true // T58000
+   'Project' => true, // T88896
+   'Portal' => true, // T58000
+   'Viquiprojecte' => true // T58000
],
'+cswiki' => [
-   NS_PROJECT => true, // T136628
+   'Project' => true, // T136628
],
'+enwiki' => [
-   100 /* Portal */ => true, // T58001
-   108 /* Book */ => true, // T58001
-   118 /* Draft */ => true
+   'Portal' => true, // T58001
+   'Book' => true, // T58001
+   'Draft' => true
],
'+fawiki' => [
-   118 /* Draft */ => true // T118060
+   'Draft' => true // T118060
],
'+frwiki' => [
-   102 /* Wikiprojet */ => true // T116603
+   'Projet' => true // T116603
],
'+hewiki' => [
-   118 /* Draft */ => true // T87027
+   'Draft' => true // T87027
],
'+htwiki' => [
-   NS_PROJECT => true // T130177
+   'Project' => true // T130177
],
'+jawiki' => [
-   100 /* Portal */ => true // T97313
+   'Portal' => true // T97313
],
'+kowiki' => [
-   118 /* Draft */ => true // T92798
+   'Draft' => true // T92798
],
'+plwiki' => [
-   NS_PROJECT => true, // T133980
-   100 /* Portal */ => true, // T133980
-   102 /* Wikiprojekt */ => true, // T92698
+   'Project' => true, // T133980
+   'Portal' => true, // T133980
+   'Wikiprojekt' => true, // T92698
],
'+ruwiki' => [
-   102 /* Draft / Incubator */ => true // T86688
+   'Инкубатор' /* Draft / Incubator */ => true // T86688
],
'+zhwiki' => [
-   118 /* Draft */ => true // T91223
+   'Draft' => true // T91223
],
 
// Wiktionaries
'+frwiktionary' => [
-   100 /* Annexe */ => true, // T127819
-   106 /* Thésaurus */ => true // T127819
+   'Annexe' => true, // T127819
+   'Thésaurus' => true // T127819
],
'svwiktionary' => [
-   NS_USER => true // T59356
+   'User' => true // T59356
],
 
// Wikiquotes
@@ -13621,7 +13621,7 @@
 
// Wikiversities
'+frwikiversity' => [
-   104 /* Recherche */ => true // T63874
+   'Recherche' => true // T63874
],
 
// Wikivoyages
@@ -13630,29 +13630,29 @@
 
// Wikimedias
'+sewikimedia' => [
-   100 /* Projekt */ => true // T62882
+   'Projekt' => true // T62882
],
 
// Other wikis (e.g. Commons, Meta)
'+commonswiki' => [
-   100 /* Creator */ => true, // T67067
-   106 /* Institution */ => true // T67067
+   'Creator' => true, 

[MediaWiki-commits] [Gerrit] Nitpick: Point to Phab tasks directly instead of BZ redirs - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Nitpick: Point to Phab tasks directly instead of BZ redirs
..

Nitpick: Point to Phab tasks directly instead of BZ redirs

Change-Id: I4fffee2c01665145e4cae9442f5283dfd1946962
---
M modules/gerrit/files/skin/GerritSite.css
M modules/mediawiki/templates/apache/apache2.conf.erb
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/299683/1

diff --git a/modules/gerrit/files/skin/GerritSite.css 
b/modules/gerrit/files/skin/GerritSite.css
index 4766789..4b1cec4 100644
--- a/modules/gerrit/files/skin/GerritSite.css
+++ b/modules/gerrit/files/skin/GerritSite.css
@@ -117,7 +117,7 @@
 }
 
 /**
- * https://bugzilla.wikimedia.org/show_bug.cgi?id=44895
+ * https://phabricator.wikimedia.org/T46895
  * Gerrit commit message font is too small
  */
 .changeScreenDescription,
@@ -126,7 +126,7 @@
 }
 
 /**
- * https://bugzilla.wikimedia.org/show_bug.cgi?id=40941
+ * https://phabricator.wikimedia.org/T42941
  * Gerrit diff font isn't big enough, either
  */
 .patchContentTable td {
diff --git a/modules/mediawiki/templates/apache/apache2.conf.erb 
b/modules/mediawiki/templates/apache/apache2.conf.erb
index 14c8df2..f419077 100644
--- a/modules/mediawiki/templates/apache/apache2.conf.erb
+++ b/modules/mediawiki/templates/apache/apache2.conf.erb
@@ -88,5 +88,5 @@
 
 # Set ETags for files to not be based on inode,
 # since that will be different on each backend server
-# http://bugzilla.wikimedia.org/show_bug.cgi?id=8926
+# https://phabricator.wikimedia.org/T10926
 FileETag MTime Size

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

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

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

[MediaWiki-commits] [Gerrit] Check Title.newFromImg produced a valid title with an extension - change (mediawiki...MultimediaViewer)

[jenkins-bot (Code Review)]

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

Change subject: Check Title.newFromImg produced a valid title with an extension
..


Check Title.newFromImg produced a valid title with an extension

Bug: T140574
Change-Id: Ia818cebd47b3bce03befc547e5e435cb8b1f2996
(cherry picked from commit 14d9297eb14afa69a2fe7c8e700710f9ef893e6f)
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 8700330..5d972fd 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -180,7 +180,7 @@
link = $link.prop( 'href' ),
alt = $thumb.attr( 'alt' );
 
-   if ( !( title.getExtension().toLowerCase() in 
bs.validExtensions ) ) {
+   if ( !title || !title.getExtension() || !( 
title.getExtension().toLowerCase() in bs.validExtensions ) ) {
return;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia818cebd47b3bce03befc547e5e435cb8b1f2996
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: wmf/1.28.0-wmf.10
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Gerrit: Add icinga check for Gerrit SSH access - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Add icinga check for Gerrit SSH access
..


Gerrit: Add icinga check for Gerrit SSH access

Change-Id: If23443bca48f45e5ac580f6efcbd5d8585b1
---
M modules/role/manifests/gerrit/server.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index db7d38b..5e2c274 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -22,6 +22,12 @@
 contact_group => 'admins,gerrit',
 }
 
+nrpe::monitor_service { 'ssh':
+description   => 'SSH access',
+check_command => "check_ssh_port!${host}!29418",
+contact_group => 'admins,gerrit',
+}
+
 backup::set { 'var-lib-gerrit2-review_site-git': }
 
 interface::ip { 'role::gerrit::server_ipv4':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If23443bca48f45e5ac580f6efcbd5d8585b1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] AuthManager: Break AuthPlugin::addUser more explicitly - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: AuthManager: Break AuthPlugin::addUser more explicitly
..


AuthManager: Break AuthPlugin::addUser more explicitly

AuthPlugin::addUser() is intended to only touch the external database
without creating a local user, which isn't possible under AuthManager
without reproducing too much of AuthManager's account creation methods
(and risking breaking things in even more obscure ways) to be
worthwhile.

As it is, either this will fail because the caller already called
User::addToDatabase() or the caller's subsequent User::addToDatabase()
call will fail because we're creating the local user.

So instead, let's just throw an exception unconditionally instead of
pretending it could work.

Bug: T137843
Change-Id: I8a439ea190c752a7fc49de5617e2c64c314c38f0
(cherry picked from commit 677c66b31ecfadc48733396ed7c729847875fe21)
---
M includes/auth/AuthManagerAuthPlugin.php
1 file changed, 7 insertions(+), 29 deletions(-)

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



diff --git a/includes/auth/AuthManagerAuthPlugin.php 
b/includes/auth/AuthManagerAuthPlugin.php
index 8d85b44..8845858 100644
--- a/includes/auth/AuthManagerAuthPlugin.php
+++ b/includes/auth/AuthManagerAuthPlugin.php
@@ -161,35 +161,13 @@
}
 
public function addUser( $user, $password, $email = '', $realname = '' 
) {
-   global $wgUser;
-
-   $data = [
-   'username' => $user->getName(),
-   'password' => $password,
-   'retype' => $password,
-   'email' => $email,
-   'realname' => $realname,
-   ];
-   if ( $this->domain !== null && $this->domain !== '' ) {
-   $data['domain'] = $this->domain;
-   }
-   $reqs = AuthManager::singleton()->getAuthenticationRequests( 
AuthManager::ACTION_CREATE );
-   $reqs = AuthenticationRequest::loadRequestsFromSubmission( 
$reqs, $data );
-
-   $res = AuthManager::singleton()->beginAccountCreation( $wgUser, 
$reqs, 'null:' );
-   switch ( $res->status ) {
-   case AuthenticationResponse::PASS:
-   return true;
-   case AuthenticationResponse::FAIL:
-   // Hope it's not a PreAuthenticationProvider 
that failed...
-   $msg = $res->message instanceof \Message ? 
$res->message : new \Message( $res->message );
-   $this->logger->info( __METHOD__ . ': 
Authentication failed: ' . $msg->plain() );
-   return false;
-   default:
-   throw new \BadMethodCallException(
-   'AuthManager does not support such 
simplified account creation'
-   );
-   }
+   throw new \BadMethodCallException(
+   'Creation of users via AuthPlugin is not supported with 
'
+   . 'AuthManager. Generally, user creation should be left 
to either '
+   . 'Special:CreateAccount, auto-creation when triggered 
by a '
+   . 'SessionProvider or PrimaryAuthenticationProvider, or 
'
+   . 'User::newSystemUser().'
+   );
}
 
public function strict() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a439ea190c752a7fc49de5617e2c64c314c38f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Gergő Tisza 
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 pluralizations - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Add missing pluralizations
..

Add missing pluralizations

Pluralizations should always include at least an other item.

Bug: T140700
Change-Id: I142be15ae2943f325aaea6cf1759ad6440dc2958
---
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-uk/strings.xml
3 files changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/app/src/main/res/values-it/strings.xml 
b/app/src/main/res/values-it/strings.xml
index 6dd1bb5..20cb658 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -305,5 +305,7 @@
   Tendenze
   Icona 
scheda
   Nelle notizie
-  
+  
+  %d days ago
+  
 
diff --git a/app/src/main/res/values-ru/strings.xml 
b/app/src/main/res/values-ru/strings.xml
index af5c83c..d58d304 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -305,5 +305,7 @@
   В трендах
   Значок 
карточки
   В новостях
-  
+  
+  %d days ago
+  
 
diff --git a/app/src/main/res/values-uk/strings.xml 
b/app/src/main/res/values-uk/strings.xml
index bc7e620..bb93a43 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -307,5 +307,6 @@
   У новинах
   
 1 день тому
+%d days ago
   
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I142be15ae2943f325aaea6cf1759ad6440dc2958
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

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

[MediaWiki-commits] [Gerrit] Remove deprecated Fundraising thermometer config - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Remove deprecated Fundraising thermometer config
..


Remove deprecated Fundraising thermometer config

We haven't used this since 2010 or so.

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b934690..a74c44f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1653,18 +1653,6 @@
 
$wgCentralNoticeLoader = $wmgCentralNoticeLoader;
 
-   # Wed evening -- all on!
-   $wgNoticeTimeout = 3600;
-   switch( $wmfRealm ) {
-   case 'production':
-   $wgNoticeServerTimeout = 3600; // to let the counter update
-   $wgNoticeCounterSource = 
'//wikimediafoundation.org/wiki/Special:ContributionTotal' .
-   '?action=raw' .
-   '=2010111200' . // FY 10-11
-   '=66';   // fudge for pledged donations 
not in CRM
-   break;
-   }
-
$wgNoticeInfrastructure = false;
if ( $wgDBname == 'metawiki' ) {
$wgNoticeInfrastructure = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I706a592402376581ff9ba996fd8f8df660a1eb8a
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Pcoombe 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow both language buttons to be shown at same time - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Allow both language buttons to be shown at same time
..

Allow both language buttons to be shown at same time

* Do not use an id on Language switcher on a component - only use
ids on containers. This allows us to have 2 at the same time
* More reliably detect version of language switcher clicked

Change-Id: If3b8314ba5de9eab94055078d6f919f20b58f4b9
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.beta.styles/pageactions.less
M resources/skins.minerva.scripts/init.js
5 files changed, 13 insertions(+), 15 deletions(-)


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

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index ac04da2..6a2e8a3 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -797,9 +797,7 @@
 
return [
'attributes' => [
-   'id' => 'language-switcher',
-   // FIXME: remove class when cache clears
-   'class' => 'languageSelector',
+   'class' => 'language-selector',
'href' => $languageUrl,
],
'label' => $this->msg( 
'mobile-frontend-language-article-heading' )->text()
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index d004d98..b5ef653 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -12,7 +12,7 @@
/** @var string $mode Describes 'stability' of the skin - beta, stable 
*/
protected $mode = 'beta';
/** @inheritdoc */
-   protected $shouldSecondaryActionsIncludeLanguageBtn = false;
+   protected $shouldSecondaryActionsIncludeLanguageBtn = true;
 
/**
 * Do not set page actions on the user page that hasn't been created 
yet.
@@ -41,9 +41,10 @@
];
$languageSwitcherClasses = '';
}
+   $languageSwitcherClasses .= ' language-selector';
if ( $this->getMFConfig()->get( 
'MinervaAlwaysShowLanguageButton' ) ||
$this->doesPageHaveLanguages ) {
-   $menu['language-switcher'] = [ 'id' => 
'language-switcher', 'text' => '',
+   $menu['language-switcher'] = [ 'text' => '',
'itemtitle' => $this->msg( 
'mobile-frontend-language-article-heading' ),
'class' => MobileUI::iconClass( 
'language-switcher', 'element', $languageSwitcherClasses ),
'links' => $languageSwitcherLinks,
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index a1847d8..19a6d1f 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -267,10 +267,9 @@
 }
 
 .stable {
-   // Remove when/if page-secondary-actions are promoted to stable
-   #language-switcher,
-   // FIXME: remove .languageSelector when cache clears
-   .languageSelector {
+   // FIXME: Exists only for caching reasons (T139794)
+   #page-secondary-actions #language-switcher,
+   #page-secondary-actions .language-selector {
margin-top: 1em;
}
 }
diff --git a/resources/skins.minerva.beta.styles/pageactions.less 
b/resources/skins.minerva.beta.styles/pageactions.less
index 04ed2aa..6eccb2b 100644
--- a/resources/skins.minerva.beta.styles/pageactions.less
+++ b/resources/skins.minerva.beta.styles/pageactions.less
@@ -29,7 +29,7 @@
}
}
 
-   #language-switcher {
+   .language-selector {
float: left;
margin-left: -@iconGutterWidth;
 
diff --git a/resources/skins.minerva.scripts/init.js 
b/resources/skins.minerva.scripts/init.js
index 09846c9..eb597a3 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -44,11 +44,11 @@
 * @ignore
 */
function initButton() {
-   // FIXME: remove .languageSelector when cache clears
-   var $languageSwitcherBtn = $( '#language-switcher, 
.languageSelector' ),
-   languageButtonVersion = ( !page.isMainPage() && 
context.isBetaGroupMember() ) ?
-   'top-of-article' : 'bottom-of-article';
+   // FIXME: remove #language-switcher when cache clears (T139794)
+   var $languageSwitcherBtn = $( 

[MediaWiki-commits] [Gerrit] WIP: Help old users discover newly positioned language switcher - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: WIP: Help old users discover newly positioned language switcher
..

WIP: Help old users discover newly positioned language switcher

Bug: T139794
Change-Id: I85db419b2974e0c2c00163975dfc1c8b75b3e6f4
---
M resources/mobile.contentOverlays/PointerOverlay.hogan
M resources/mobile.contentOverlays/PointerOverlay.js
M resources/skins.minerva.scripts/init.js
3 files changed, 18 insertions(+), 4 deletions(-)


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

diff --git a/resources/mobile.contentOverlays/PointerOverlay.hogan 
b/resources/mobile.contentOverlays/PointerOverlay.hogan
index 7c7a342..3c98b30 100644
--- a/resources/mobile.contentOverlays/PointerOverlay.hogan
+++ b/resources/mobile.contentOverlays/PointerOverlay.hogan
@@ -1,5 +1,5 @@
 {{{summary}}}
 
-   {{cancelMsg}}
+   {{#cancelMsg}}{{cancelMsg}}{{/cancelMsg}}
{{#confirmMsg}}{{confirmMsg}}{{/confirmMsg}}
 
diff --git a/resources/mobile.contentOverlays/PointerOverlay.js 
b/resources/mobile.contentOverlays/PointerOverlay.js
index 68477cb..8352bd0 100644
--- a/resources/mobile.contentOverlays/PointerOverlay.js
+++ b/resources/mobile.contentOverlays/PointerOverlay.js
@@ -7,9 +7,6 @@
 * @extends Overlay
 */
function PointerOverlay( options ) {
-   // FIXME: This should not have a default fallback. This is a 
non-optional parameter.
-   // Remove when all existing uses in Gather have been updated.
-   this.appendToElement = options.appendToElement || 
'#mw-mf-page-center';
Overlay.apply( this, arguments );
}
 
@@ -58,6 +55,9 @@
self = this;
 
Overlay.prototype.postRender.apply( this );
+   if ( self.options.autoHide ) {
+   this.$el.addClass( 'pointer-overlay-auto-hides' 
);
+   }
if ( self.options.target ) {
$target = $( self.options.target );
// Ensure we position the overlay correctly but 
do not show the arrow
diff --git a/resources/skins.minerva.scripts/init.js 
b/resources/skins.minerva.scripts/init.js
index eb597a3..49e585a 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -285,5 +285,19 @@
// Update anything else that needs enhancing (e.g. watchlist)
initModifiedInfo();
initHistoryLink( $( '#mw-mf-last-modified a' ) );
+
+   // FIXME: This will only be done on click of old language 
overlay
+   mw.loader.using( 'mobile.contentOverlays' ).done( function () {
+   var PointerOverlay = M.require( 
'mobile.contentOverlays/PointerOverlay' );
+   // point to new language overlay
+   var po = new PointerOverlay( {
+   // @todo: i18n
+   summary: 'Change language',
+   target: '#language-switcher',
+   autohide: true,
+   cancelMsg: null
+   } );
+   po.show();
+   } );
} );
 }( mw.mobileFrontend, jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] Gerrit: Add myself to contact groups for when https goes boom - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Add myself to contact groups for when https goes boom
..


Gerrit: Add myself to contact groups for when https goes boom

Change-Id: I4962954744736ca2de2492e0a509061a9946d579
---
M modules/nagios_common/files/contactgroups.cfg
M modules/role/manifests/gerrit/server.pp
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/nagios_common/files/contactgroups.cfg 
b/modules/nagios_common/files/contactgroups.cfg
index fdad12e..aa23821 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -40,6 +40,11 @@
 }
 
 define contactgroup {
+contactgroup_name   gerrit
+members chad
+}
+
+define contactgroup {
 contactgroup_name   sms
 members 
akosiaris,andrew,ariel,bblack,cmjohnson,dzahn,ema,faidon,fgiunchedi,jgreen,mark,otto,volans,robh,springle,tstarling,rush,glavagetto,yuvipanda,jmm,jcrespo,team-operations,gehel,madhuvishy
 }
diff --git a/modules/role/manifests/gerrit/server.pp 
b/modules/role/manifests/gerrit/server.pp
index 73be146..db7d38b 100644
--- a/modules/role/manifests/gerrit/server.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -19,6 +19,7 @@
 monitoring::service { 'https':
 description   => 'HTTPS',
 check_command => "check_ssl_http!${host}",
+contact_group => 'admins,gerrit',
 }
 
 backup::set { 'var-lib-gerrit2-review_site-git': }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4962954744736ca2de2492e0a509061a9946d579
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Version number indicates fundraising patches - change (mediawiki/core)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Version number indicates fundraising patches
..

Version number indicates fundraising patches

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/299679/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6664fe0..1d6e347 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.27.0';
+$wgVersion = '1.27.0-fundraising';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I756cb80c38f18af3709810756f814cb8149565be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Add missing roottree, file configs to gerrit.config.erb - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Add missing roottree, file configs to gerrit.config.erb
..


Add missing roottree, file configs to gerrit.config.erb

Also update filehistory link to link to the correct place.

This is required for gitweb to work in gerrit 2.12.

Per
https://gerrit-review.googlesource.com/Documentation/config-gitweb.html
(Near to the bottom)

Also enable linkDrafts since you can now upload patches via the browser
but it dosent automatically make it visable making it a draft until you
press the submit button even then it wont show the link since it still
thinks it is a draft but is now in refs/changes so enabling this fixed it.

Change-Id: Iebd2bbdc28a5c87986fe2c37f5c3f01a049b9d47
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index ec75a15..ffa8352 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -60,9 +60,11 @@
 revision = "/r/revision/${project};${commit}"
 project = /r/project/${project}
 branch = "/r/branch/${project};${branch}"
-filehistory = "/r/browse/${project};${branch};${file}"
+filehistory = "/r/p/${project}/;history/${branch}/${file}"
+file = "/r/browse/${project};${branch};${file}"
+roottree = "/r/p/${project}/;browse/master/;${commit}"
 linkname = diffusion
-linkDrafts = false
+linkDrafts = true
 urlEncode = false
 [user]
 email = ger...@wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebd2bbdc28a5c87986fe2c37f5c3f01a049b9d47
Gerrit-PatchSet: 21
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Gerrit: Go ahead and ensure lets_encrypt everywhere other th... - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Gerrit: Go ahead and ensure lets_encrypt everywhere other than 
ytterbium
..

Gerrit: Go ahead and ensure lets_encrypt everywhere other than ytterbium

Change-Id: I356a39715c858c0aec538ef37d57f729472b468b
---
M hieradata/hosts/lead.yaml
M hieradata/hosts/ytterbium.yaml
M hieradata/role/common/gerrit/server.yaml
3 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/299678/1

diff --git a/hieradata/hosts/lead.yaml b/hieradata/hosts/lead.yaml
index 2510914..0b94583 100644
--- a/hieradata/hosts/lead.yaml
+++ b/hieradata/hosts/lead.yaml
@@ -1,6 +1,5 @@
 gerrit::host: 'gerrit-new.wikimedia.org'
 gerrit::jetty::db_host: 'db1042.eqiad.wmnet'
 gerrit::jetty::replication: ''
-gerrit::proxy::lets_encrypt: true
 role::gerrit::server::ipv4: '208.80.154.85'
 role::gerrit::server::ipv6: '2620:0:861:3:208:80:154:85'
diff --git a/hieradata/hosts/ytterbium.yaml b/hieradata/hosts/ytterbium.yaml
index b713118..71a768d 100644
--- a/hieradata/hosts/ytterbium.yaml
+++ b/hieradata/hosts/ytterbium.yaml
@@ -7,3 +7,4 @@
 gerrit::jetty::commitlink: '#q,$2,n,z'
 gerrit::jetty::git_dir: '/var/lib/gerrit2/review_site/git'
 gerrit::jetty::index_type: 'SQL'
+gerrit::proxy::lets_encrypt: false
diff --git a/hieradata/role/common/gerrit/server.yaml 
b/hieradata/role/common/gerrit/server.yaml
index d96eab0..ae83000 100644
--- a/hieradata/role/common/gerrit/server.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -6,7 +6,7 @@
 value: standard
 gerrit::host: 'gerrit.wikimedia.org'
 gerrit::jetty::git_dir: '/srv/gerrit/git'
-gerrit::proxy::lets_encrypt: false
+gerrit::proxy::lets_encrypt: true
 gerrit::crons::ssh_key: 'ssh-rsa 
B3NzaC1yc2EBIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production'
 gerrit::jetty::replication:
 github:

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up 83ec590: Add new updateExtensionJsonSchema to auto... - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up 83ec590: Add new updateExtensionJsonSchema to autoload
..

Follow-up 83ec590: Add new updateExtensionJsonSchema to autoload

Change-Id: Ibf61cf36c094ac192b6a7f9aa010659a12e5c5bb
---
M autoload.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/299677/1

diff --git a/autoload.php b/autoload.php
index 61c97c6..b139399 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1438,6 +1438,7 @@
'UpdateArticleCount' => __DIR__ . '/maintenance/updateArticleCount.php',
'UpdateCollation' => __DIR__ . '/maintenance/updateCollation.php',
'UpdateDoubleWidthSearch' => __DIR__ . 
'/maintenance/updateDoubleWidthSearch.php',
+   'UpdateExtensionJsonSchema' => __DIR__ . 
'/maintenance/updateExtensionJsonSchema.php',
'UpdateLogging' => __DIR__ . '/maintenance/archives/upgradeLogging.php',
'UpdateMediaWiki' => __DIR__ . '/maintenance/update.php',
'UpdateRestrictions' => __DIR__ . '/maintenance/updateRestrictions.php',

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

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

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

[MediaWiki-commits] [Gerrit] Update submodules to REL1_27 - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update submodules to REL1_27
..


Update submodules to REL1_27

Change-Id: Ic04aefa59d9aef57a03d672a61303303f520b940
---
M extensions/ContributionTracking
M extensions/DonationEmailUnsubscribe
M extensions/ParserFunctions
M extensions/cldr
4 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/ContributionTracking b/extensions/ContributionTracking
index 8317daf..2819783 16
--- a/extensions/ContributionTracking
+++ b/extensions/ContributionTracking
-Subproject commit 8317dafcc2938a5ca6c596d422bf92caa6226e3c
+Subproject commit 2819783d67bef23c03dfb6a054a90473750be1a0
diff --git a/extensions/DonationEmailUnsubscribe 
b/extensions/DonationEmailUnsubscribe
index ba0fb5f..d0f9a78 16
--- a/extensions/DonationEmailUnsubscribe
+++ b/extensions/DonationEmailUnsubscribe
-Subproject commit ba0fb5f4364940ef37ea44990a55dab83a2859ff
+Subproject commit d0f9a78ac108ec86e24d800ed6bd4a82568b6f8e
diff --git a/extensions/ParserFunctions b/extensions/ParserFunctions
index f093aac..d0a5d10 16
--- a/extensions/ParserFunctions
+++ b/extensions/ParserFunctions
-Subproject commit f093aacdf279e45a3b95a35827a2d8a7e21044ec
+Subproject commit d0a5d10aaf44553956b5cb3da70a13d121904aad
diff --git a/extensions/cldr b/extensions/cldr
index 5cfed11..7994317 16
--- a/extensions/cldr
+++ b/extensions/cldr
-Subproject commit 5cfed118e1f1dc73a3c6598859d03d3aa0eb7ce1
+Subproject commit 79943175832bee79fac11b66132a9cdffc76b3a3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic04aefa59d9aef57a03d672a61303303f520b940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
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 submodules to REL1_27 - change (mediawiki/core)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Update submodules to REL1_27
..

Update submodules to REL1_27

Change-Id: Ic04aefa59d9aef57a03d672a61303303f520b940
---
M extensions/ContributionTracking
M extensions/DonationEmailUnsubscribe
M extensions/ParserFunctions
M extensions/cldr
4 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/299676/1

diff --git a/extensions/ContributionTracking b/extensions/ContributionTracking
index 8317daf..2819783 16
--- a/extensions/ContributionTracking
+++ b/extensions/ContributionTracking
-Subproject commit 8317dafcc2938a5ca6c596d422bf92caa6226e3c
+Subproject commit 2819783d67bef23c03dfb6a054a90473750be1a0
diff --git a/extensions/DonationEmailUnsubscribe 
b/extensions/DonationEmailUnsubscribe
index ba0fb5f..d0f9a78 16
--- a/extensions/DonationEmailUnsubscribe
+++ b/extensions/DonationEmailUnsubscribe
-Subproject commit ba0fb5f4364940ef37ea44990a55dab83a2859ff
+Subproject commit d0f9a78ac108ec86e24d800ed6bd4a82568b6f8e
diff --git a/extensions/ParserFunctions b/extensions/ParserFunctions
index f093aac..d0a5d10 16
--- a/extensions/ParserFunctions
+++ b/extensions/ParserFunctions
-Subproject commit f093aacdf279e45a3b95a35827a2d8a7e21044ec
+Subproject commit d0a5d10aaf44553956b5cb3da70a13d121904aad
diff --git a/extensions/cldr b/extensions/cldr
index 5cfed11..7994317 16
--- a/extensions/cldr
+++ b/extensions/cldr
-Subproject commit 5cfed118e1f1dc73a3c6598859d03d3aa0eb7ce1
+Subproject commit 79943175832bee79fac11b66132a9cdffc76b3a3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic04aefa59d9aef57a03d672a61303303f520b940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] MediaWiki JSON content should render in mobile - change (mediawiki/core)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: MediaWiki JSON content should render in mobile
..

MediaWiki JSON content should render in mobile

Changes:
* Switch to less file so can make use of variable
* Up until 720px table is collapsed into single column
* Enable module on mobile now it is mobile first

Bug: T140689
Change-Id: Id3e9b09b3ae8cad81c6e95c0a15335b998ea9884
---
M resources/Resources.php
D resources/src/mediawiki/mediawiki.content.json.css
A resources/src/mediawiki/mediawiki.content.json.less
3 files changed, 113 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/299675/1

diff --git a/resources/Resources.php b/resources/Resources.php
index e35c3d7..7cada8a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -948,7 +948,8 @@
],
'mediawiki.content.json' => [
'position' => 'top',
-   'styles' => 
'resources/src/mediawiki/mediawiki.content.json.css',
+   'styles' => 
'resources/src/mediawiki/mediawiki.content.json.less',
+   'targets' => [ 'desktop', 'mobile' ],
],
'mediawiki.confirmCloseWindow' => [
'scripts' => [
diff --git a/resources/src/mediawiki/mediawiki.content.json.css 
b/resources/src/mediawiki/mediawiki.content.json.css
deleted file mode 100644
index 91fa02a..000
--- a/resources/src/mediawiki/mediawiki.content.json.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * CSS for styling HTML-formatted JSON Schema objects
- *
- * @file
- * @author Munaf Assaf 
- */
-
-.mw-json {
-   border-collapse: collapse;
-   border-spacing: 0;
-   font-style: normal;
-}
-
-.mw-json th,
-.mw-json td {
-   border: 1px solid #808080;
-   font-size: 16px;
-   padding: 0.5em 1em;
-}
-
-.mw-json .value,
-.mw-json-single-value {
-   background-color: #dcfae3;
-   font-family: monospace, monospace;
-   white-space: pre-wrap;
-}
-
-.mw-json-single-value {
-   background-color: #eee;
-}
-
-.mw-json-empty {
-   background-color: #fff;
-   font-style: italic;
-}
-
-.mw-json tr {
-   margin-bottom: 0.5em;
-   background-color: #eee;
-}
-
-.mw-json th {
-   background-color: #fff;
-   font-weight: normal;
-}
-
-.mw-json caption {
-   /* For stylistic reasons, suppress the caption of the outermost table */
-   display: none;
-}
-
-.mw-json table caption {
-   color: #808080;
-   display: inline-block;
-   font-size: 10px;
-   font-style: italic;
-   margin-bottom: 0.5em;
-   text-align: left;
-}
diff --git a/resources/src/mediawiki/mediawiki.content.json.less 
b/resources/src/mediawiki/mediawiki.content.json.less
new file mode 100644
index 000..6ad146d
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.content.json.less
@@ -0,0 +1,111 @@
+/*!
+ * CSS for styling HTML-formatted JSON Schema objects
+ *
+ * @file
+ * @author Munaf Assaf 
+ */
+
+@borderColor: #808080;
+.mw-json {
+   border-collapse: collapse;
+   border-spacing: 0;
+   font-style: normal;
+
+   tbody,
+   th,
+   tr,
+   td {
+   display: block;
+   box-sizing: border-box;
+   width: 100%;
+   }
+
+   th {
+   border: 1px solid @borderColor;
+   }
+
+   td {
+   border-bottom: 1px solid @borderColor;
+   font-size: 1em;
+   padding: 0.5em 1em;
+   background-color: #eee;
+   }
+
+   .value {
+   font-size: .9em;
+   }
+}
+
+.mw-json .value,
+.mw-json-single-value {
+   background-color: #dcfae3;
+   font-family: monospace, monospace;
+   white-space: pre-wrap;
+}
+
+.mw-json-single-value {
+   background-color: #eee;
+}
+
+.mw-json-empty {
+   background-color: #fff;
+   font-style: italic;
+}
+
+.mw-json tr {
+   margin-bottom: 0.5em;
+}
+
+.mw-json th {
+   background-color: #fff;
+   font-weight: normal;
+}
+
+.mw-json caption {
+   /* For stylistic reasons, suppress the caption of the outermost table */
+   display: none;
+}
+
+.mw-json table caption {
+   color: @borderColor;
+   display: inline-block;
+   font-size: 10px;
+   font-style: italic;
+   margin-bottom: 0.5em;
+   text-align: left;
+}
+
+@media all and (min-width: @deviceWidthTablet) {
+   .mw-json {
+   th,
+   td {
+   border: 1px solid @borderColor;
+   }
+   }
+
+   .mw-json {
+   border-collapse: collapse;
+   border-spacing: 0;
+   font-style: normal;
+
+   tbody,
+   tr,
+   th,
+   td {
+   box-sizing: inherit;
+   width: 

[MediaWiki-commits] [Gerrit] Update BatchRowIterator constructor to allow multiple tables - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update BatchRowIterator constructor to allow multiple tables
..


Update BatchRowIterator constructor to allow multiple tables

This already supported multiple tables, but the annotations claimed it
didn't. This $table value gets passed on directly to IDatabase::select
which takes a string or array, so mark it as such here as well.

Change-Id: I28fa61429544e592f90c0855ea59279af897283f
---
M includes/utils/BatchRowIterator.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/utils/BatchRowIterator.php 
b/includes/utils/BatchRowIterator.php
index 419ee47..c7bd395 100644
--- a/includes/utils/BatchRowIterator.php
+++ b/includes/utils/BatchRowIterator.php
@@ -31,7 +31,7 @@
protected $db;
 
/**
-* @var string $table The name of the table to read from
+* @var string|array $table The name or names of the table to read from
 */
protected $table;
 
@@ -79,7 +79,7 @@
 
/**
 * @param IDatabase $db The database to read from
-* @param string   $table  The name of the table to read from
+* @param string|array $table  The name or names of the table to 
read from
 * @param string|array $primaryKey The name or names of the primary key 
columns
 * @param integer  $batchSize  The number of rows to fetch per 
iteration
 * @throws MWException

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28fa61429544e592f90c0855ea59279af897283f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Aaron Schulz 
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] Refactor some state from Searcher::searchText to SearchContext - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

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

Change subject: Refactor some state from Searcher::searchText to SearchContext
..


Refactor some state from Searcher::searchText to SearchContext

In preparation for refactoring parts of query parsing out of searchText
push some of the state into SearchContext. This should make it easier
to break parts out of the function.

This does start to explode the size of SearchContext, although it's
mostly boilerplate. Future work can further refactor things to resolve
that. One idea would be to move some of the methods that build pieces
of a query into one part into a QueryBuilder or something, and have
the context provide a getQueryBuilder() method instead.

Change-Id: Ie7a647163c4a9e0c6b61d461084cee31fe5d567e
---
M includes/Hooks.php
M includes/InterwikiSearcher.php
M includes/Search/Filters.php
M includes/Search/ResultsType.php
M includes/Search/SearchContext.php
M includes/Searcher.php
6 files changed, 638 insertions(+), 387 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/Hooks.php b/includes/Hooks.php
index 9ab316b..03726fc 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -547,7 +547,7 @@
public static function prefixSearchExtractNamespace( &$namespaces, 
&$search ) {
$searcher = new Searcher( self::getConnection(), 0, 1, null, 
$namespaces );
$searcher->updateNamespacesFromQuery( $search );
-   $namespaces = $searcher->getNamespaces();
+   $namespaces = $searcher->getSearchContext()->getNamespaces();
return false;
}
 
diff --git a/includes/InterwikiSearcher.php b/includes/InterwikiSearcher.php
index bbd4239..5f52cff 100644
--- a/includes/InterwikiSearcher.php
+++ b/includes/InterwikiSearcher.php
@@ -67,8 +67,8 @@
return null;
}
 
-   $namespaceKey = $this->getNamespaces() !== null ?
-   implode( ',', $this->getNamespaces() ) : '';
+   $namespaceKey = $this->searchContext->getNamespaces() !== null ?
+   implode( ',', $this->searchContext->getNamespaces() ) : 
'';
 
$cache = ObjectCache::getLocalClusterInstance();
$key = $cache->makeKey(
diff --git a/includes/Search/Filters.php b/includes/Search/Filters.php
index 13094be..7a035c2 100644
--- a/includes/Search/Filters.php
+++ b/includes/Search/Filters.php
@@ -118,10 +118,10 @@
 * @param Escaper $escaper
 * @param SearchContext $context
 * @param string $value
-* @return callable a side-effecting function to update several 
references
+* @return AbstractQuery
 */
public static function insource( Escaper $escaper, SearchContext 
$context, $value ) {
-   return self::insourceOrIntitle( $escaper, $context, $value, 
true, function () {
+   return self::insourceOrIntitle( $escaper, $context, $value, 
function () {
return 'source_text.plain';
});
}
@@ -134,10 +134,10 @@
 * @param Escaper $escaper
 * @param SearchContext $context
 * @param string $value
-* @return callable a side-effecting function to update several 
references
+* @return AbstractQuery
 */
public static function intitle( Escaper $escaper, SearchContext 
$context, $value ) {
-   return self::insourceOrIntitle( $escaper, $context, $value, 
false, function ( $queryString ) {
+   return self::insourceOrIntitle( $escaper, $context, $value, 
function ( $queryString ) {
if ( preg_match( '/[?*]/u', $queryString ) ) {
return 'title.plain';
} else {
@@ -183,9 +183,9 @@
 * @param string $value
 * @param bool $updateHighlightSourceRef
 * @param callable $fieldF
-* @return callable
+* @return AbstractQuery
 */
-   private static function insourceOrIntitle( Escaper $escaper, 
SearchContext $context, $value, $updateHighlightSourceRef, $fieldF ) {
+   private static function insourceOrIntitle( Escaper $escaper, 
SearchContext $context, $value, $fieldF ) {
list( $queryString, $fuzzyQuery ) = 
$escaper->fixupWholeQueryString(
$escaper->fixupQueryStringPart( $value ) );
$field = $fieldF( $queryString );
@@ -196,18 +196,10 @@
$query->setFuzzyPrefixLength( 2 );
$query->setRewrite( 'top_terms_boost_1024' );
 
-   $updateReferences =
-   function ( &$fuzzyQueryRef, &$filterDestinationRef, 
&$highlightSourceRef, &$searchContainedSyntaxRef )
-

[MediaWiki-commits] [Gerrit] Use OpenJdk 8 for Android periodic tests - change (integration/config)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Use OpenJdk 8 for Android periodic tests
..

Use OpenJdk 8 for Android periodic tests

This adds a 'jdk' directive to the config for the Android periodic
test job that will (hopefully) tell it where to find JDK 8 so that
the tests can build and pass once again.

Bug: T139137
Change-Id: Ia2ac35a6d4b6a48302f49fca335ab3b1d3b22a4c
---
M jjb/mobile.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/74/299674/1

diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index 60a1542..12fdb1c 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -67,6 +67,7 @@
 - job-template:
 name: 'apps-android-wikipedia-periodic-test'
 node: contintLabsSlave && AndroidEmulator
+jdk: 'Debian - OpenJdk 8'
 defaults: use-remoteonly-zuul
 concurrent: true
 properties:

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

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

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

[MediaWiki-commits] [Gerrit] Reduce kibana logging levels - change (operations/puppet)

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: Reduce kibana logging levels
..


Reduce kibana logging levels

Kibana tells syslog about every web request, which is a bit excessive.
Lets limit to only error messages.

Change-Id: I2e07474b87ac6c5ebf69f0909f19c60e136a15a2
---
M modules/kibana/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/kibana/manifests/init.pp b/modules/kibana/manifests/init.pp
index da659b8..9eebac6 100644
--- a/modules/kibana/manifests/init.pp
+++ b/modules/kibana/manifests/init.pp
@@ -25,6 +25,7 @@
 group   => 'root',
 content => ordered_yaml({
 'kibana.defaultAppId' => $default_app_id,
+'logging.quiet'   => true,
 }),
 mode=> '0444',
 require => Package['kibana'],

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

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

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

[MediaWiki-commits] [Gerrit] ForeignWikiRequest: Also check User::isSafeToLoad() - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: ForeignWikiRequest: Also check User::isSafeToLoad()
..

ForeignWikiRequest: Also check User::isSafeToLoad()

Check it for both $wgUser and $this->user because they
could theoretically be different.

Bug: T139665
Change-Id: I59cb4f0122a9fccb32ca165fda065dee2467b1da
---
M includes/ForeignWikiRequest.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/ForeignWikiRequest.php b/includes/ForeignWikiRequest.php
index 87ddb75..5a42616 100644
--- a/includes/ForeignWikiRequest.php
+++ b/includes/ForeignWikiRequest.php
@@ -38,9 +38,11 @@
}
 
protected function canUseCentralAuthl() {
-   global $wgFullyInitialised;
+   global $wgFullyInitialised, $wgUser;
 
return $wgFullyInitialised &&
+   $wgUser->isSafeToLoad() &&
+   $this->user->isSafeToLoad() &&
SessionManager::getGlobalSession()->getProvider() 
instanceof CentralAuthSessionProvider &&
$this->getCentralId( $this->user ) !== 0;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59cb4f0122a9fccb32ca165fda065dee2467b1da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Use hiera for udp2log-mw logrotate count - change (operations/puppet)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Use hiera for udp2log-mw logrotate count
..

Use hiera for udp2log-mw logrotate count

For the deployment-prep project, there isn't enough diskspace to keep
1000 compressed logfiles.

This creates a hiera variable so that a rotate count can be set on a
per-project basis.

Bug: T140313
Change-Id: I292936c91d539d6791fa63a1d87e282b0350594f
---
M hieradata/labs/deployment-prep/host/deployment-fluorine.yaml
M manifests/role/logging.pp
M modules/udp2log/manifests/instance.pp
M templates/udp2log/logrotate_udp2log.erb
4 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/299672/1

diff --git a/hieradata/labs/deployment-prep/host/deployment-fluorine.yaml 
b/hieradata/labs/deployment-prep/host/deployment-fluorine.yaml
index 56ed024..8f7c7c6 100644
--- a/hieradata/labs/deployment-prep/host/deployment-fluorine.yaml
+++ b/hieradata/labs/deployment-prep/host/deployment-fluorine.yaml
@@ -1,2 +1,3 @@
 role::logging::mediawiki::monitor: false
 role::logging::mediawiki::log_directory: /srv/mw-log
+role::logging::mediawiki::count: 100
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index bad611e..e5a4491 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -1,5 +1,9 @@
 # mediawiki udp2log instance.  Does not use monitoring.
-class role::logging::mediawiki($monitor = true, $log_directory = '/srv/mw-log' 
) {
+class role::logging::mediawiki(
+$monitor = true,
+$log_directory = '/srv/mw-log',
+$rotate = 1000,
+) {
 system::role { 'role::logging:mediawiki':
 description => 'MediaWiki log collector',
 }
@@ -64,6 +68,7 @@
 monitor_log_age =>false,
 monitor_processes   =>false,
 monitor_packet_loss =>false,
+rotate  =>$rotate,
 template_variables  => {
 error_processor_host => $error_processor_host,
 error_processor_port => 8423,
diff --git a/modules/udp2log/manifests/instance.pp 
b/modules/udp2log/manifests/instance.pp
index 79e8fc9..423933a 100644
--- a/modules/udp2log/manifests/instance.pp
+++ b/modules/udp2log/manifests/instance.pp
@@ -36,6 +36,7 @@
 $template_variables  = undef,
 $recv_queue  = undef,
 $logrotate_template  = 'udp2log/logrotate_udp2log.erb',
+$rotate  = 1000,
 ){
 # This define requires that the udp2log class has
 # been included.  The udp2log class is parameterized,
diff --git a/templates/udp2log/logrotate_udp2log.erb 
b/templates/udp2log/logrotate_udp2log.erb
index 544084a..6094233 100644
--- a/templates/udp2log/logrotate_udp2log.erb
+++ b/templates/udp2log/logrotate_udp2log.erb
@@ -9,7 +9,7 @@
notifempty
nocreate
maxage 90
-   rotate 1000
+rotate <%= @rotate %>
dateext
compress
postrotate

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

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

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

[MediaWiki-commits] [Gerrit] Reduce kibana logging levels - change (operations/puppet)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Reduce kibana logging levels
..

Reduce kibana logging levels

Kibana tells syslog about every web request, which is a bit excessive.
Lets limit to only error messages.

Change-Id: I2e07474b87ac6c5ebf69f0909f19c60e136a15a2
---
M modules/kibana/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/299671/1

diff --git a/modules/kibana/manifests/init.pp b/modules/kibana/manifests/init.pp
index da659b8..9eebac6 100644
--- a/modules/kibana/manifests/init.pp
+++ b/modules/kibana/manifests/init.pp
@@ -25,6 +25,7 @@
 group   => 'root',
 content => ordered_yaml({
 'kibana.defaultAppId' => $default_app_id,
+'logging.quiet'   => true,
 }),
 mode=> '0444',
 require => Package['kibana'],

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

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

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

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

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 348555a..2525218 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 348555aa7962ed45cd80764a1fc998347606cd48
+Subproject commit 25252184a27ead9eab4f389780a63cb77e168792

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I305c1f5648c78a07c4dbf93b5249015fffa44778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/299670/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 348555a..2525218 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 348555aa7962ed45cd80764a1fc998347606cd48
+Subproject commit 25252184a27ead9eab4f389780a63cb77e168792

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I305c1f5648c78a07c4dbf93b5249015fffa44778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] Add additional balancer tests (those starting with `

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Add additional balancer tests (those starting with ``)
..

Add additional balancer tests (those starting with ``)

Change-Id: Ie854cf99f7e72bcca1bb8565ace558a43dcb6379
---
M tests/phpunit/includes/tidy/BalancerTest.php
1 file changed, 25 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/299669/1

diff --git a/tests/phpunit/includes/tidy/BalancerTest.php 
b/tests/phpunit/includes/tidy/BalancerTest.php
index f2e41bd..740ddb9 100644
--- a/tests/phpunit/includes/tidy/BalancerTest.php
+++ b/tests/phpunit/includes/tidy/BalancerTest.php
@@ -48,15 +48,16 @@
// for providers, and filter out HTML constructs which
// the balancer doesn't support.
$tests = [];
-   $start = '';
-   $end = '';
+   $okre = "~ \A
+   (?i:)?
+   
+   .*
+   
+   \z ~xs";
foreach ( $json as $filename => $cases ) {
foreach ( $cases as $case ) {
$html = $case['document']['html'];
-   if (
-   substr( $html, 0, strlen( $start ) ) 
!== $start ||
-   substr( $html, -strlen( $end ) ) !== 
$end
-   ) {
+   if ( !preg_match( $okre, $html ) ) {
// Skip tests which involve stuff in 
the  or
// weird doctypes.
continue;
@@ -70,6 +71,8 @@
$html = $case['document']['noQuirksBodyHtml'];
// Normalize case of SVG attributes.
$html = str_replace( 'foreignObject', 
'foreignobject', $html );
+   // Normalize case of MathML attributes.
+   $html = str_replace( 'definitionURL', 
'definitionurl', $html );
 
if (
isset( 
$case['document']['props']['comment'] ) &&
@@ -83,11 +86,17 @@
// Skip tests involving  
quoting.
continue;
}
-   if ( stripos( $case['data'], '' ) === false
+   ) {
+   // Skip tests involving unusual 
doctypes.
continue;
}
-   if ( preg_match( 
',|

[MediaWiki-commits] [Gerrit] Update libs to match REL1_27 - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Update libs to match REL1_27
..


Update libs to match REL1_27

DO NOT DEPLOY ON REL1_25!

and update vendor pointer

Change-Id: If07c50f7e772cf5ea20c135aa7aeba99cb41b37a
---
M composer.json
M composer.lock
M vendor
3 files changed, 28 insertions(+), 22 deletions(-)

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



diff --git a/composer.json b/composer.json
index a9de913..08af3f6 100644
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,11 @@
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "2.1.*",
"minfraud/http": "^1.70",
-   "monolog/monolog": "1.12.0",
+   "monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
"predis/predis": "1.*",
"psr/log": "1.0.0",
-   "zordius/lightncandy": "0.18",
+   "zordius/lightncandy": "0.23",
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"symfony/yaml": "2.8.3"
},
diff --git a/composer.lock b/composer.lock
index 8488190..8a6cf38 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "d643f019cef25316f964bc272a94ff0d",
-"content-hash": "ffc63a23b6187d5fb8ea80a87d128c85",
+"hash": "d1578f11dcbed7949aed6b72799a0a7c",
+"content-hash": "6c8ce9c9936ec28d37d50cda85c34086",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -243,16 +243,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.12.0",
+"version": "1.18.2",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+"reference": "064b38c16790249488e7a8b987acf1c9d7383c09"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f;,
-"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09;,
+"reference": "064b38c16790249488e7a8b987acf1c9d7383c09",
 "shasum": ""
 },
 "require": {
@@ -263,13 +263,17 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "~2.4, >2.4.8",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
-"phpunit/phpunit": "~4.0",
-"raven/raven": "~0.5",
-"ruflin/elastica": "0.90.*",
-"videlalvaro/php-amqplib": "~2.4"
+"jakub-onderka/php-parallel-lint": "0.9",
+"php-amqplib/php-amqplib": "~2.4",
+"php-console/php-console": "^3.1.3",
+"phpunit/phpunit": "~4.5",
+"phpunit/phpunit-mock-objects": "2.3.0",
+"raven/raven": "^0.13",
+"ruflin/elastica": ">=0.90 <3.0",
+"swiftmailer/swiftmailer": "~5.3"
 },
 "suggest": {
 "aws/aws-sdk-php": "Allow sending log messages to AWS services 
like DynamoDB",
@@ -277,15 +281,17 @@
 "ext-amqp": "Allow sending log messages to an AMQP server 
(1.0+ required)",
 "ext-mongo": "Allow sending log messages to a MongoDB server",
 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 
server",
+"mongodb/mongodb": "Allow sending log messages to a MongoDB 
server via PHP Driver",
+"php-amqplib/php-amqplib": "Allow sending log messages to an 
AMQP server using php-amqplib",
+"php-console/php-console": "Allow sending log messages to 
Google Chrome",
 "raven/raven": "Allow sending log messages to a Sentry server",
 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-"ruflin/elastica": "Allow sending log messages to an Elastic 
Search server",
-"videlalvaro/php-amqplib": "Allow sending log messages to an 
AMQP server using php-amqplib"
+"ruflin/elastica": "Allow sending log messages to an Elastic 
Search server"
 },
 "type": "library",
 "extra": {
 "branch-alias": {
-"dev-master": "1.12.x-dev"
+   

[MediaWiki-commits] [Gerrit] Support tags in Balancer. - change (mediawiki/core)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Support  tags in Balancer.
..

Support  tags in Balancer.

Change-Id: I63c2fd1c343362e49cf3b5a258fc98489744ad68
---
M includes/tidy/Balancer.php
M tests/phpunit/includes/tidy/BalancerTest.php
2 files changed, 72 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/299668/1

diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 37807ba..4c348b1 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -75,7 +75,7 @@
self::HTML_NAMESPACE => [
'html' => true, 'head' => true, 'body' => true, 
'frameset' => true,
'frame' => true,
-   'plaintext' => true, 'isindex' => true, 'textarea' => 
true,
+   'plaintext' => true, 'isindex' => true,
'xmp' => true, 'iframe' => true, 'noembed' => true,
'noscript' => true, 'script' => true,
'title' => true
@@ -89,6 +89,12 @@
'embed' => true, 'frame' => true, 'hr' => true, 'img' 
=> true,
'input' => true, 'keygen' => true, 'link' => true, 
'meta' => true,
'param' => true, 'source' => true, 'track' => true, 
'wbr' => true
+   ]
+   ];
+
+   public static $extraLinefeedSet = [
+   self::HTML_NAMESPACE => [
+   'pre' => true, 'textarea' => true, 'listing' => true,
]
];
 
@@ -513,11 +519,21 @@
}
if ( !$this->isA( BalanceSets::$emptyElementSet ) ) {
$out = "<{$this->localName}{$encAttribs}>";
+   $len = strlen( $out );
// flatten children
foreach ( $this->children as $elt ) {
$out .= "{$elt}";
}
$out .= "localName}>";
+   if (
+   $this->isA( BalanceSets::$extraLinefeedSet ) &&
+   $out[$len] === "\n"
+   ) {
+   // Double the linefeed after 
pre/listing/textarea
+   // according to the HTML5 fragment 
serialization algorithm.
+   $out = substr( $out, 0, $len + 1 ) .
+   substr( $out, $len );
+   }
} else {
$out = "<{$this->localName}{$encAttribs} />";
Assert::invariant(
@@ -1740,18 +1756,19 @@
  * - The document is never in "quirks mode".
  * - All occurrences of < and > have been entity escaped, so we
  *   can parse tags by simply splitting on those two characters.
+ *   (This also simplifies the handling of < inside .)
  *   The character < must not appear inside comments.
  *   Similarly, all attributes have been "cleaned" and are double-quoted
  *   and escaped.
  * - All null characters are assumed to have been removed.
- * - We don't alter linefeeds after /.
  * - The following elements are disallowed: , , , ,
- *   , , , , , ,
+ *   , , , , ,
  *   , , 

[MediaWiki-commits] [Gerrit] Minor bug fixes to Balancer. - change (mediawiki/core)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Minor bug fixes to Balancer.
..

Minor bug fixes to Balancer.

This is a follow-up to the refactor done in
5726c9ceb0644af360d37b86351b97ddfcbee20c which prevents a crash when
the first entry in the stack happens to be a BalanceMarker (and thus
doesn't have a `$localName` property).  It also fixes an unrelated
issue where unpaired close-heading tags (like ``) get entity-escaped
instead of ignored.

Test cases exposing these bugs are added in
Ie854cf99f7e72bcca1bb8565ace558a43dcb6379.

Change-Id: Ia9a1d435be1be10512071f5ff626b68742863483
---
M includes/tidy/Balancer.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 9e96b14..4bcaf1a 100644
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -1613,9 +1613,11 @@
 
// Loop backward through the list until we find a marker or an
// open element
+   $foundit = false;
while ( $entry->prevAFE ) {
$entry = $entry->prevAFE;
if ( $entry instanceof BalanceMarker || 
$stack->indexOf( $entry ) >= 0 ) {
+   $foundit = true;
break;
}
}
@@ -1624,7 +1626,7 @@
// the first element if we didn't find a marker or open 
element),
// recreating formatting elements and pushing them back onto 
the list
// of open elements.
-   if ( $entry->prevAFE ) {
+   if ( $foundit ) {
$entry = $entry->nextAFE;
}
do {
@@ -2656,7 +2658,7 @@
case 'h5':
case 'h6':
if ( !$this->stack->inScope( 
BalanceSets::$headingSet ) ) {
-   return;
+   return true; # ignore
}
$this->stack->generateImpliedEndTags();
$this->stack->popTag( BalanceSets::$headingSet 
);

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

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

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

[MediaWiki-commits] [Gerrit] Update kibana module for kibana 4 - change (operations/puppet)

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: Update kibana module for kibana 4
..


Update kibana module for kibana 4

* Transition kibana from trebuchet deployment to deb
* Proxy requests from apache to the node.js application.
* Drop previous apache config focused around serving static files and
  proxying requests to elasticsearch.
* default_route argument to kibana module changed to default_app_id to
  match new config file.
* Status check now hits an html page, but it's proxied to the node.js
  app so probably reasonable.
* Makes no attempt to uninstall the kibana package, will nuke by hand
  once everything looks sane in prod.
* Apache proxying tested in beta cluster. Static assets are returning
  304 as expected, searches always return a 200.
* Testing in beta cluster is a pain, because we want one server on
  kibana 3 and another on kibana 4. In prod though we will want only the
  upgrade so doing the patch like this.

TODO:
* Dependant patch, which imports kibana .deb to our apt repository, must
  be merged.

Depends-On: I478c7fd4d
Bug: T129138
Change-Id: I2a11a05be801c461caeb11228ea5f5b496d743a9
---
M hieradata/common/role/deployment.yaml
M manifests/role/kibana.pp
M modules/kibana/manifests/init.pp
D modules/kibana/templates/config.js
M templates/kibana/apache.conf.erb
5 files changed, 31 insertions(+), 173 deletions(-)

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



diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index b96105e..4f73a97 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -68,8 +68,6 @@
 upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
   librenms/librenms:
 upstream: https://gerrit.wikimedia.org/r/operations/software/librenms
-  kibana/kibana:
-upstream: https://gerrit.wikimedia.org/r/operations/software/kibana
   servermon/servermon:
 service_name: gunicorn
   iegreview/iegreview:
diff --git a/manifests/role/kibana.pp b/manifests/role/kibana.pp
index dd37a23..698abc0 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -8,8 +8,6 @@
 # - $vhost: Apache vhost name
 # - $serveradmin: Email address for contacting server administrator
 # - $auth_type: Vhost auth type. One of ldap, local, none
-# - $es_host: Elasticsearch host to proxy to
-# - $es_port: Elasticsearch port to proxy to
 # - $require_ssl: Require SSL connection to vhost?
 # - $auth_realm: HTTP basic auth realm description
 # - $auth_file: Path to htpasswd file for $auth_type == 'local'
@@ -21,8 +19,6 @@
 $vhost,
 $serveradmin,
 $auth_type,
-$es_host   = '127.0.0.1',
-$es_port   = 9200,
 $require_ssl   = true,
 $auth_realm= undef,
 $auth_file = undef,
@@ -36,9 +32,7 @@
 include ::apache::mod::proxy
 include ::apache::mod::proxy_http
 include ::apache::mod::rewrite
-
-# Directory trebuchet puts Kibana files in
-$deploy_dir = '/srv/deployment/kibana/kibana'
+include ::kibana
 
 if $auth_type == 'ldap' {
 include ::apache::mod::authnz_ldap
@@ -56,10 +50,6 @@
 }
 
 $apache_auth = template("kibana/apache-auth-${auth_type}.erb")
-
-class { '::kibana':
-default_route => '/dashboard/elasticsearch/default',
-}
 
 ferm::service { 'kibana_frontend':
 proto   => 'tcp',
diff --git a/modules/kibana/manifests/init.pp b/modules/kibana/manifests/init.pp
index 5c8f5d9..da659b8 100644
--- a/modules/kibana/manifests/init.pp
+++ b/modules/kibana/manifests/init.pp
@@ -4,34 +4,38 @@
 # types of time-stamped data. It integrates with ElasticSearch and LogStash.
 #
 # == Parameters:
-# - $default_route: Default landing page. You can specify files, scripts or
+# - $default_app_id: Default landing page. You can specify files, scripts or
 # saved dashboards here. Default: '/dashboard/file/default.json'.
 #
 # == Sample usage:
 #
 #   class { 'kibana':
-#   default_route => '/dashboard/elasticsearch/default',
+#   default_app_id => 'dashboard/default',
 #   }
 #
 class kibana (
-$default_route = '/dashboard/file/default.json'
+$default_app_id = 'dashboard/default'
 ) {
-package { 'kibana':
-provider => 'trebuchet',
-}
+require_package('kibana')
 
-file { '/etc/kibana':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
-
-file { '/etc/kibana/config.js':
-ensure  => present,
-content => template('kibana/config.js'),
+# kibana 4
+file { '/opt/kibana/config/kibana.yml':
+ensure  => file,
 owner   => 'root',
 group   => 'root',
-mode=> '0644',
+content => ordered_yaml({
+'kibana.defaultAppId' => $default_app_id,
+}),
+mode=> '0444',
+require => 

[MediaWiki-commits] [Gerrit] Update libs to match REL1_27 - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Update libs to match REL1_27
..

Update libs to match REL1_27

DO NOT DEPLOY ON REL1_25!

and update vendor pointer

Change-Id: If07c50f7e772cf5ea20c135aa7aeba99cb41b37a
---
M composer.json
M composer.lock
M vendor
3 files changed, 28 insertions(+), 22 deletions(-)


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

diff --git a/composer.json b/composer.json
index a9de913..08af3f6 100644
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,11 @@
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "2.1.*",
"minfraud/http": "^1.70",
-   "monolog/monolog": "1.12.0",
+   "monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
"predis/predis": "1.*",
"psr/log": "1.0.0",
-   "zordius/lightncandy": "0.18",
+   "zordius/lightncandy": "0.23",
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"symfony/yaml": "2.8.3"
},
diff --git a/composer.lock b/composer.lock
index 8488190..8a6cf38 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "d643f019cef25316f964bc272a94ff0d",
-"content-hash": "ffc63a23b6187d5fb8ea80a87d128c85",
+"hash": "d1578f11dcbed7949aed6b72799a0a7c",
+"content-hash": "6c8ce9c9936ec28d37d50cda85c34086",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -243,16 +243,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.12.0",
+"version": "1.18.2",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+"reference": "064b38c16790249488e7a8b987acf1c9d7383c09"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f;,
-"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09;,
+"reference": "064b38c16790249488e7a8b987acf1c9d7383c09",
 "shasum": ""
 },
 "require": {
@@ -263,13 +263,17 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "~2.4, >2.4.8",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
-"phpunit/phpunit": "~4.0",
-"raven/raven": "~0.5",
-"ruflin/elastica": "0.90.*",
-"videlalvaro/php-amqplib": "~2.4"
+"jakub-onderka/php-parallel-lint": "0.9",
+"php-amqplib/php-amqplib": "~2.4",
+"php-console/php-console": "^3.1.3",
+"phpunit/phpunit": "~4.5",
+"phpunit/phpunit-mock-objects": "2.3.0",
+"raven/raven": "^0.13",
+"ruflin/elastica": ">=0.90 <3.0",
+"swiftmailer/swiftmailer": "~5.3"
 },
 "suggest": {
 "aws/aws-sdk-php": "Allow sending log messages to AWS services 
like DynamoDB",
@@ -277,15 +281,17 @@
 "ext-amqp": "Allow sending log messages to an AMQP server 
(1.0+ required)",
 "ext-mongo": "Allow sending log messages to a MongoDB server",
 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 
server",
+"mongodb/mongodb": "Allow sending log messages to a MongoDB 
server via PHP Driver",
+"php-amqplib/php-amqplib": "Allow sending log messages to an 
AMQP server using php-amqplib",
+"php-console/php-console": "Allow sending log messages to 
Google Chrome",
 "raven/raven": "Allow sending log messages to a Sentry server",
 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-"ruflin/elastica": "Allow sending log messages to an Elastic 
Search server",
-"videlalvaro/php-amqplib": "Allow sending log messages to an 
AMQP server using php-amqplib"
+"ruflin/elastica": "Allow sending log messages to an Elastic 
Search server"
 },
 "type": "library",
 "extra": {
 

[MediaWiki-commits] [Gerrit] Update libs to match 1_27 - change (mediawiki...vendor)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Update libs to match 1_27
..


Update libs to match 1_27

Change-Id: I47a911e15abb0b2f42fddc60c976c6bd57200a1a
---
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
A monolog/monolog/.php_cs
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/LICENSE
M monolog/monolog/README.mdown
M monolog/monolog/composer.json
A monolog/monolog/doc/01-usage.md
A monolog/monolog/doc/02-handlers-formatters-processors.md
A monolog/monolog/doc/03-utilities.md
R monolog/monolog/doc/04-extending.md
M monolog/monolog/doc/sockets.md
D monolog/monolog/doc/usage.md
M monolog/monolog/phpunit.xml.dist
M monolog/monolog/src/Monolog/ErrorHandler.php
M monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
M monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
M monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
A monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
M monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
M monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
M monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AbstractHandler.php
M monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
M monolog/monolog/src/Monolog/Handler/BufferHandler.php
M monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
M monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
M monolog/monolog/src/Monolog/Handler/CubeHandler.php
A monolog/monolog/src/Monolog/Handler/Curl/Util.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
M monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
M monolog/monolog/src/Monolog/Handler/FilterHandler.php
M 
monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
M monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
M monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
M monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
M monolog/monolog/src/Monolog/Handler/GelfHandler.php
M monolog/monolog/src/Monolog/Handler/GroupHandler.php
A monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
M monolog/monolog/src/Monolog/Handler/HipChatHandler.php
A monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
M monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
M monolog/monolog/src/Monolog/Handler/LogglyHandler.php
M monolog/monolog/src/Monolog/Handler/MailHandler.php
M monolog/monolog/src/Monolog/Handler/MandrillHandler.php
M monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
M monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
M monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
M monolog/monolog/src/Monolog/Handler/NullHandler.php
A monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
M monolog/monolog/src/Monolog/Handler/PushoverHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RedisHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
M monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
M monolog/monolog/src/Monolog/Handler/SamplingHandler.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
M monolog/monolog/src/Monolog/Handler/SocketHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
M monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
M monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
M monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
M monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
M monolog/monolog/src/Monolog/Processor/TagProcessor.php
M monolog/monolog/src/Monolog/Processor/UidProcessor.php
M monolog/monolog/src/Monolog/Processor/WebProcessor.php
M monolog/monolog/src/Monolog/Registry.php
M monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
A monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M 

[MediaWiki-commits] [Gerrit] Update libs to match REL1_27 - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Update libs to match REL1_27
..


Update libs to match REL1_27

DO NOT DEPLOY ON REL1_25!

Change-Id: If07c50f7e772cf5ea20c135aa7aeba99cb41b37a
---
M composer.json
M composer.lock
2 files changed, 28 insertions(+), 22 deletions(-)

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



diff --git a/composer.json b/composer.json
index a9de913..08af3f6 100644
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,11 @@
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "2.1.*",
"minfraud/http": "^1.70",
-   "monolog/monolog": "1.12.0",
+   "monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
"predis/predis": "1.*",
"psr/log": "1.0.0",
-   "zordius/lightncandy": "0.18",
+   "zordius/lightncandy": "0.23",
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"symfony/yaml": "2.8.3"
},
diff --git a/composer.lock b/composer.lock
index 8488190..8a6cf38 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "d643f019cef25316f964bc272a94ff0d",
-"content-hash": "ffc63a23b6187d5fb8ea80a87d128c85",
+"hash": "d1578f11dcbed7949aed6b72799a0a7c",
+"content-hash": "6c8ce9c9936ec28d37d50cda85c34086",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -243,16 +243,16 @@
 },
 {
 "name": "monolog/monolog",
-"version": "1.12.0",
+"version": "1.18.2",
 "source": {
 "type": "git",
 "url": "https://github.com/Seldaek/monolog.git;,
-"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+"reference": "064b38c16790249488e7a8b987acf1c9d7383c09"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f;,
-"reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+"url": 
"https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09;,
+"reference": "064b38c16790249488e7a8b987acf1c9d7383c09",
 "shasum": ""
 },
 "require": {
@@ -263,13 +263,17 @@
 "psr/log-implementation": "1.0.0"
 },
 "require-dev": {
-"aws/aws-sdk-php": "~2.4, >2.4.8",
+"aws/aws-sdk-php": "^2.4.9",
 "doctrine/couchdb": "~1.0@dev",
 "graylog2/gelf-php": "~1.0",
-"phpunit/phpunit": "~4.0",
-"raven/raven": "~0.5",
-"ruflin/elastica": "0.90.*",
-"videlalvaro/php-amqplib": "~2.4"
+"jakub-onderka/php-parallel-lint": "0.9",
+"php-amqplib/php-amqplib": "~2.4",
+"php-console/php-console": "^3.1.3",
+"phpunit/phpunit": "~4.5",
+"phpunit/phpunit-mock-objects": "2.3.0",
+"raven/raven": "^0.13",
+"ruflin/elastica": ">=0.90 <3.0",
+"swiftmailer/swiftmailer": "~5.3"
 },
 "suggest": {
 "aws/aws-sdk-php": "Allow sending log messages to AWS services 
like DynamoDB",
@@ -277,15 +281,17 @@
 "ext-amqp": "Allow sending log messages to an AMQP server 
(1.0+ required)",
 "ext-mongo": "Allow sending log messages to a MongoDB server",
 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 
server",
+"mongodb/mongodb": "Allow sending log messages to a MongoDB 
server via PHP Driver",
+"php-amqplib/php-amqplib": "Allow sending log messages to an 
AMQP server using php-amqplib",
+"php-console/php-console": "Allow sending log messages to 
Google Chrome",
 "raven/raven": "Allow sending log messages to a Sentry server",
 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-"ruflin/elastica": "Allow sending log messages to an Elastic 
Search server",
-"videlalvaro/php-amqplib": "Allow sending log messages to an 
AMQP server using php-amqplib"
+"ruflin/elastica": "Allow sending log messages to an Elastic 
Search server"
 },
 "type": "library",
 "extra": {
 "branch-alias": {
-"dev-master": "1.12.x-dev"
+"dev-master": 

[MediaWiki-commits] [Gerrit] Update libs to match 1_27 - change (mediawiki...vendor)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Update libs to match 1_27
..

Update libs to match 1_27

Change-Id: I47a911e15abb0b2f42fddc60c976c6bd57200a1a
---
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
A monolog/monolog/.php_cs
M monolog/monolog/CHANGELOG.mdown
M monolog/monolog/LICENSE
M monolog/monolog/README.mdown
M monolog/monolog/composer.json
A monolog/monolog/doc/01-usage.md
A monolog/monolog/doc/02-handlers-formatters-processors.md
A monolog/monolog/doc/03-utilities.md
R monolog/monolog/doc/04-extending.md
M monolog/monolog/doc/sockets.md
D monolog/monolog/doc/usage.md
M monolog/monolog/phpunit.xml.dist
M monolog/monolog/src/Monolog/ErrorHandler.php
M monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
M monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
M monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
A monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
M monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
M monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
M monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
M monolog/monolog/src/Monolog/Formatter/LineFormatter.php
M monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
M monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
M monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
M monolog/monolog/src/Monolog/Handler/AbstractHandler.php
M monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
M monolog/monolog/src/Monolog/Handler/AmqpHandler.php
M monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
M monolog/monolog/src/Monolog/Handler/BufferHandler.php
M monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
M monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
M monolog/monolog/src/Monolog/Handler/CubeHandler.php
A monolog/monolog/src/Monolog/Handler/Curl/Util.php
M monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
M monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
M monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
M monolog/monolog/src/Monolog/Handler/FilterHandler.php
M 
monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
M monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
M monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
M monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
M monolog/monolog/src/Monolog/Handler/GelfHandler.php
M monolog/monolog/src/Monolog/Handler/GroupHandler.php
A monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
M monolog/monolog/src/Monolog/Handler/HipChatHandler.php
A monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
M monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
M monolog/monolog/src/Monolog/Handler/LogglyHandler.php
M monolog/monolog/src/Monolog/Handler/MailHandler.php
M monolog/monolog/src/Monolog/Handler/MandrillHandler.php
M monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
M monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
M monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
M monolog/monolog/src/Monolog/Handler/NullHandler.php
A monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
M monolog/monolog/src/Monolog/Handler/PushoverHandler.php
M monolog/monolog/src/Monolog/Handler/RavenHandler.php
M monolog/monolog/src/Monolog/Handler/RedisHandler.php
M monolog/monolog/src/Monolog/Handler/RollbarHandler.php
M monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
M monolog/monolog/src/Monolog/Handler/SamplingHandler.php
M monolog/monolog/src/Monolog/Handler/SlackHandler.php
M monolog/monolog/src/Monolog/Handler/SocketHandler.php
M monolog/monolog/src/Monolog/Handler/StreamHandler.php
M monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogHandler.php
M monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
M monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
M monolog/monolog/src/Monolog/Handler/TestHandler.php
M monolog/monolog/src/Monolog/Logger.php
M monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
M monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
M monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
M monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
M monolog/monolog/src/Monolog/Processor/TagProcessor.php
M monolog/monolog/src/Monolog/Processor/UidProcessor.php
M monolog/monolog/src/Monolog/Processor/WebProcessor.php
M monolog/monolog/src/Monolog/Registry.php
M monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
A monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
M monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
M 

[MediaWiki-commits] [Gerrit] Revert "labs: Don't have shinken do basic instance checks" - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Revert "labs: Don't have shinken do basic instance checks"
..


Revert "labs: Don't have shinken do basic instance checks"

We have new enough hardware now!

This reverts commit 84569f1dcad0cbd17e0db8b08d9249fcfa3aecb8.

Change-Id: If6db7e3e9db8c0c70278fe48fc788345ea97a015
---
M modules/role/manifests/labs/shinken.pp
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/labs/shinken.pp 
b/modules/role/manifests/labs/shinken.pp
index 15a7df3..8b31942 100644
--- a/modules/role/manifests/labs/shinken.pp
+++ b/modules/role/manifests/labs/shinken.pp
@@ -17,6 +17,9 @@
 shinken::config { 'basic-infra-checks':
 source => 'puppet:///modules/shinken/labs/basic-infra-checks.cfg',
 }
+shinken::config { 'basic-instance-checks':
+source => 'puppet:///modules/shinken/labs/basic-instance-checks.cfg',
+}
 
 if $ircbot {
 include shinken::ircbot

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6db7e3e9db8c0c70278fe48fc788345ea97a015
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
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] Move a bunch of stuff out of the top level :) - change (mediawiki...HitCounters)

[jenkins-bot (Code Review)]

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

Change subject: Move a bunch of stuff out of the top level :)
..


Move a bunch of stuff out of the top level :)

Yay less clutter!

Change-Id: Ibe250a6ce0b32abccd2a674b289a795dffaf2c6d
---
M extension.json
R includes/HCUpdater.php
R includes/HitCounters.body.php
R includes/HitCounters.hooks.php
R includes/SpecialPopularPages.php
R includes/ViewCountUpdate.php
R sql/drop_field.sql
R sql/hit_counter_extension.sql
R sql/initial_count.sql
R sql/page_counter.sql
R sql/rename_table.sql
11 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/extension.json b/extension.json
index 1826005..83b6457 100644
--- a/extension.json
+++ b/extension.json
@@ -48,11 +48,11 @@
]
},
"AutoloadClasses": {
-   "HitCounters\\Hooks": "HitCounters.hooks.php",
-   "HitCounters\\HitCounters": "HitCounters.body.php",
-   "ViewCountUpdate": "ViewCountUpdate.php",
-   "HitCounters\\SpecialPopularPages": "SpecialPopularPages.php",
-   "HitCounters\\HCUpdater": "HCUpdater.php"
+   "HitCounters\\Hooks": "includes/HitCounters.hooks.php",
+   "HitCounters\\HitCounters": "includes/HitCounters.body.php",
+   "ViewCountUpdate": "includes/ViewCountUpdate.php",
+   "HitCounters\\SpecialPopularPages": 
"includes/SpecialPopularPages.php",
+   "HitCounters\\HCUpdater": "includes/HCUpdater.php"
},
"config": {
"HitcounterUpdateFreq": 1,
diff --git a/HCUpdater.php b/includes/HCUpdater.php
similarity index 85%
rename from HCUpdater.php
rename to includes/HCUpdater.php
index 331f2fa..974d073 100644
--- a/HCUpdater.php
+++ b/includes/HCUpdater.php
@@ -12,13 +12,13 @@
/* This is an ugly abuse to rename a table. */
$updater->modifyExtensionField( 'hitcounter',
'hc_id',
-   __DIR__ . '/rename_table.sql' );
+   __DIR__ . '/../sql/rename_table.sql' );
$updater->addExtensionTable( 'hit_counter_extension',
-   __DIR__ . '/hit_counter_extension.sql', true );
+   __DIR__ . '/../sql/hit_counter_extension.sql', true );
$updater->addExtensionTable( 'hit_counter',
-   __DIR__ . '/page_counter.sql', true );
+   __DIR__ . '/../sql/page_counter.sql', true );
$updater->dropExtensionField( 'page', 'page_counter',
-   __DIR__ . '/drop_field.sql' );
+   __DIR__ . '/../sql/drop_field.sql' );
}
 
public function clearExtensionUpdates() {
diff --git a/HitCounters.body.php b/includes/HitCounters.body.php
similarity index 100%
rename from HitCounters.body.php
rename to includes/HitCounters.body.php
diff --git a/HitCounters.hooks.php b/includes/HitCounters.hooks.php
similarity index 100%
rename from HitCounters.hooks.php
rename to includes/HitCounters.hooks.php
diff --git a/SpecialPopularPages.php b/includes/SpecialPopularPages.php
similarity index 100%
rename from SpecialPopularPages.php
rename to includes/SpecialPopularPages.php
diff --git a/ViewCountUpdate.php b/includes/ViewCountUpdate.php
similarity index 100%
rename from ViewCountUpdate.php
rename to includes/ViewCountUpdate.php
diff --git a/drop_field.sql b/sql/drop_field.sql
similarity index 100%
rename from drop_field.sql
rename to sql/drop_field.sql
diff --git a/hit_counter_extension.sql b/sql/hit_counter_extension.sql
similarity index 100%
rename from hit_counter_extension.sql
rename to sql/hit_counter_extension.sql
diff --git a/initial_count.sql b/sql/initial_count.sql
similarity index 100%
rename from initial_count.sql
rename to sql/initial_count.sql
diff --git a/page_counter.sql b/sql/page_counter.sql
similarity index 100%
rename from page_counter.sql
rename to sql/page_counter.sql
diff --git a/rename_table.sql b/sql/rename_table.sql
similarity index 100%
rename from rename_table.sql
rename to sql/rename_table.sql

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe250a6ce0b32abccd2a674b289a795dffaf2c6d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Wiktionary: Stop restricting language names to those on a st... - change (mediawiki...mobileapps)

[jenkins-bot (Code Review)]

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

Change subject: Wiktionary: Stop restricting language names to those on a 
static list
..


Wiktionary: Stop restricting language names to those on a static list

Wiktionary allows users to define languages arbitrarily rather than
restricting them to a fixed set.  Previously we were discarding these
where they weren't on a fixed list derived from the outstanding Wiki
languages.

This patch stops discarding "unknown" language content and instead
includes it in the response.  It does this in a strictly additive way
without changing the response structure so as to avoid breaking existing
clients.  The language code "other" is used for languages not on the
static list and the language name is included with each definition so that
the client can use it if desired.

I've also added just "Chinese" (as opposed to "Traditional Chinese" or
"Simplified Chinese") to the static list since it was absent before.

These changes should eliminate most of the remaining 404s in the
mobileapps production logs.

Bug: T129229
Bug: T129235
Change-Id: Ic07f729337599ed4038a3930d27b832c70a16a0f
---
M lib/parseDefinition.js
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/lib/parseDefinition.js b/lib/parseDefinition.js
index 98efafe..33f1f05 100644
--- a/lib/parseDefinition.js
+++ b/lib/parseDefinition.js
@@ -135,6 +135,7 @@
 function parse(doc, domain, title) {
 // TODO: update once Parsoid emits section tags, see 
https://phabricator.wikimedia.org/T114072#1711063
 var i, j,
+currentLang,
 definitions = {},
 definitionSection,
 defnList,
@@ -157,13 +158,15 @@
Per the English Wiktionary style guide (linked in header above), H2 
headings
are language names. */
 if (currentSectionDiv.className.substring('toclevel_'.length) === "1") 
{
-defnLangCode = getLanguageCode(header, wikiLangCode);
+currentLang = header;
+defnLangCode = getLanguageCode(header, wikiLangCode) || 'other';
 }
 
 /* Parse definitions from part-of-speech sections */
-if (defnLangCode && partsOfSpeech[wikiLangCode].indexOf(header) > -1) {
+if (partsOfSpeech[wikiLangCode].indexOf(header) > -1) {
 definitionSection = {};
 definitionSection.partOfSpeech = header;
+definitionSection.language = currentLang;
 definitionSection.definitions = [];
 defnList = getDefnList(doc, currentSectionDiv.id, wikiLangCode);
 for (i = 0; i < defnList.length; i++) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic07f729337599ed4038a3930d27b832c70a16a0f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Apply es2.x config for logstash1001-3 as well - change (operations/puppet)

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: Apply es2.x config for logstash1001-3 as well
..


Apply es2.x config for logstash1001-3 as well

These settings only got applied to logstash1004-6 (as well as the two
search clusters). Now that everything is on 2.x make them the default.

Change-Id: I2674c2d2fdd04f62bf25f842a37a56a7cc2e170a
---
M hieradata/role/common/elasticsearch/server.yaml
M hieradata/role/common/logstash/elasticsearch.yaml
M modules/elasticsearch/manifests/init.pp
3 files changed, 2 insertions(+), 12 deletions(-)

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



diff --git a/hieradata/role/common/elasticsearch/server.yaml 
b/hieradata/role/common/elasticsearch/server.yaml
index 00e37b7..046eefa 100644
--- a/hieradata/role/common/elasticsearch/server.yaml
+++ b/hieradata/role/common/elasticsearch/server.yaml
@@ -12,12 +12,6 @@
 # More than 30G isn't very useful
 elasticsearch::heap_memory: '30G'
 
-elasticsearch::bind_networks:
-  - _local_
-  - _site_
-
-elasticsearch::publish_host: _eth0_
-
 # Production elasticsearch needs these plugins to be loaded in order
 # to work properly.  This will keep elasticsearch from starting
 # if these plugins are  not available.
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml 
b/hieradata/role/common/logstash/elasticsearch.yaml
index 640cf16..abcddf4 100644
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ b/hieradata/role/common/logstash/elasticsearch.yaml
@@ -27,10 +27,6 @@
   - logstash1004.eqiad.wmnet
   - logstash1005.eqiad.wmnet
   - logstash1006.eqiad.wmnet
-elasticsearch::bind_networks:
-  - _local_
-  - _site_
-elasticsearch::publish_host: _eth0_
 debdeploy::grains:
   debdeploy-logstash:
 value: standard
diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 44d3306..d91758e 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -100,8 +100,8 @@
 $rack = undef,
 $multicast_enabled = true,
 $unicast_hosts = undef,
-$bind_networks = undef,
-$publish_host = undef,
+$bind_networks = ['_local_', '_site_'],
+$publish_host = '_eth0_',
 $filter_cache_size = '10%',
 $bulk_thread_pool_executors = undef,
 $bulk_thread_pool_capacity = undef,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2674c2d2fdd04f62bf25f842a37a56a7cc2e170a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Whitelist a bunch of RSS feeds for Fundraising Tech to play ... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Whitelist a bunch of RSS feeds for Fundraising Tech to play with
..


Whitelist a bunch of RSS feeds for Fundraising Tech to play with

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7ff0062..e0ad488 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13772,6 +13772,15 @@
'https://planet.wikimedia.de/atom.php',
'https://planet.wikimedia.de/wikidata/atom.php',
'https://sourcecode.berlin/feed/',
+
+   // Feeds included for Fundraising Tech pages
+   
'https://codeclimate.com/github/wikimedia/mediawiki-extensions-CentralNotice/feed.atom',
+   
'https://codeclimate.com/github/wikimedia/mediawiki-extensions-DonationInterface/feed.atom',
+   
'https://codeclimate.com/github/wikimedia/wikimedia-fundraising-crm/feed.atom',
+   
'https://codeclimate.com/github/wikimedia/wikimedia-fundraising-dash/feed.atom',
+   
'https://codeclimate.com/github/wikimedia/wikimedia-fundraising-php-queue/feed.atom',
+   
'https://codeclimate.com/github/wikimedia/wikimedia-fundraising-SmashPig/feed.atom',
+   
'https://codeclimate.com/github/wikimedia/wikimedia-fundraising-tools/feed.atom',
],
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icda60d5bd50e43ec98a0c4b5eef9cb6548613c75
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Pcoombe 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] phabricator: re-enable project-changes email - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: phabricator: re-enable project-changes email
..

phabricator: re-enable project-changes email

Bug:T139950
Change-Id: I592830e0fe921fcab5bc070331af10eeeb9590bb
---
M modules/role/manifests/phabricator/main.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/299663/1

diff --git a/modules/role/manifests/phabricator/main.pp 
b/modules/role/manifests/phabricator/main.pp
index 3bafe44..a699511 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -188,9 +188,9 @@
 }
 
 # project changes mail (T85183)
-# disabled due to maintenance: T138460
+# disabled due to maintenance: T138460, re-enabled T139950
 phabricator::logmail {'projectchanges':
-ensure   => absent,
+ensure   => present,
 script_name  => 'project_changes.sh',
 rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
 sndr_address => 'aklap...@wikimedia.org',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I592830e0fe921fcab5bc070331af10eeeb9590bb
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