date:20171220

[MediaWiki-commits] [Gerrit] integration/config[master]: Add lucene-explain-parser library

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Add lucene-explain-parser library
..


Add lucene-explain-parser library

Change-Id: Iac5e52732a81eef1774e4a477bcdd1611065836f
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d96f7f4..0ac1c2d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2769,6 +2769,10 @@
 template:
  - name: composer-test-package
 
+  - name: wikimedia/lucene-explain-parser
+template:
+ - name: composer-test-package
+
  MediaWiki extensions ##
 
   - name: mediawiki/extensions/3D

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac5e52732a81eef1774e4a477bcdd1611065836f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix sidebar regression

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix sidebar regression
..


Fix sidebar regression

- After removing clearfix on dashboard wrapper in Idee6714287,
the wrapper collapsed because of floated children, which in turn
introduced regression of sidebar not becoming sticky on scroll.

Change-Id: Ie6de5eaf97084a3bc9510a930db88dbeb23e60b6
---
M modules/dashboard/styles/ext.cx.dashboard.less
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/dashboard/styles/ext.cx.dashboard.less 
b/modules/dashboard/styles/ext.cx.dashboard.less
index 541550b..9c88a70 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -14,6 +14,18 @@
@media only screen and ( max-width: ( @very-narrow - 1px ) ) {
padding: 20px 12px;
}
+
+   /* Clearfix */
+   &:after {
+   // Non empty content value avoids an Opera bug that creates 
space around
+   // clearfixed elements if the contenteditable attribute is also 
present
+   // somewhere in the HTML.
+   content: ' ';
+   visibility: hidden;
+   display: block;
+   height: 0;
+   clear: both;
+   }
 }
 
 .cx-dashboard-sidebar {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6de5eaf97084a3bc9510a930db88dbeb23e60b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Petar.petkovic 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make ImagePage#getThumbPrevText and ImagePage#makeSizeLink p...

2017-12-20 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399574 )

Change subject: Make ImagePage#getThumbPrevText and ImagePage#makeSizeLink 
protected instead of private
..

Make ImagePage#getThumbPrevText and ImagePage#makeSizeLink protected instead of 
private

So that extensions wishing to modify ImagePage#openShowImage() that want
to preserve most of the existing functionality (at least in certain
contexts) do not have to copypaste these two methods over.
ImagePage#openShowImage() itself is ridiculously large and it's absurd
that to change a few things there you need to copy over the whole giant
block of code, but that's a separate matter.

Inspired by wikiHow's WikihowImagePage extension and their associated core
hacks to ImagePage.php, which hopefully won't be needed in the future.

Change-Id: Ic5e16acfc2cf4683154a60a3eaa9df69d30d03cb
---
M includes/page/ImagePage.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 1dcdc65..8724c45 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -632,7 +632,7 @@
 * @param string $sizeLinkBigImagePreview HTML for the current size
 * @return string HTML output
 */
-   private function getThumbPrevText( $params, $sizeLinkBigImagePreview ) {
+   protected function getThumbPrevText( $params, $sizeLinkBigImagePreview 
) {
if ( $sizeLinkBigImagePreview ) {
// Show a different message of preview is different 
format from original.
$previewTypeDiffers = false;
@@ -670,7 +670,7 @@
 * @param int $height
 * @return string
 */
-   private function makeSizeLink( $params, $width, $height ) {
+   protected function makeSizeLink( $params, $width, $height ) {
$params['width'] = $width;
$params['height'] = $height;
$thumbnail = $this->displayImg->transform( $params );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5e16acfc2cf4683154a60a3eaa9df69d30d03cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1100 with low weight

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Repool db1100 with low weight
..


db-eqiad.php: Repool db1100 with low weight

Start pooling it slowly

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 243d277..89767dd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -148,7 +148,7 @@
'db1082' => 50, # A2 3.6TB 512GB, api # db1095 master
'db1096:3315' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
-   # 'db1100' => 50,  # C2 3.6TB 512GB, old master #api # T161294
+   'db1100' => 50,  # C2 3.6TB 512GB, old master #api
'db1106' => 500, # D3 3.6TB 512GB
'db1110' => 500, # C3 3.6TB 512GB
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f68c62e8e6d110ed26b6997a0c7507bb0cea9bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MsCatSelect[master]: Add minus-x check and fix to composer.json

2017-12-20 Thread Albert221 (Code Review)

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

Change subject: Add minus-x check and fix to composer.json
..

Add minus-x check and fix to composer.json

Bug: T175794
Change-Id: I737262573aac87b5e0ee15af62200fc9021032df
---
M MsCatSelect.body.php
M MsCatSelect.css
M MsCatSelect.js
M MsCatSelect.php
M README.md
M composer.json
6 files changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/MsCatSelect.body.php b/MsCatSelect.body.php
old mode 100755
new mode 100644
diff --git a/MsCatSelect.css b/MsCatSelect.css
old mode 100755
new mode 100644
diff --git a/MsCatSelect.js b/MsCatSelect.js
old mode 100755
new mode 100644
diff --git a/MsCatSelect.php b/MsCatSelect.php
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..7d306d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I737262573aac87b5e0ee15af62200fc9021032df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCatSelect
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix docroot for dev for letsencrypt

2017-12-20 Thread Nikerabbit (Code Review)

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

Change subject: Fix docroot for dev for letsencrypt
..

Fix docroot for dev for letsencrypt

Change-Id: I743cae95d280858d066d33e0a59e933e85f11d0c
---
M puppet/modules/nginx/manifests/ssl.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/71/399571/1

diff --git a/puppet/modules/nginx/manifests/ssl.pp 
b/puppet/modules/nginx/manifests/ssl.pp
index 2a9a86c..0060ed9 100644
--- a/puppet/modules/nginx/manifests/ssl.pp
+++ b/puppet/modules/nginx/manifests/ssl.pp
@@ -38,7 +38,7 @@
   '/www/translatewiki.net/docroot',
   '/usr/lib/cgi-bin/mailman',
   '/www/stats.translatewiki.net',
-  '/www/translatewiki.net/docroot',
+  '/www/dev.translatewiki.net/docroot',
 ],
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I743cae95d280858d066d33e0a59e933e85f11d0c
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1100 with low weight

2017-12-20 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Repool db1100 with low weight
..

db-eqiad.php: Repool db1100 with low weight

Start pooling it slowly

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 243d277..89767dd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -148,7 +148,7 @@
'db1082' => 50, # A2 3.6TB 512GB, api # db1095 master
'db1096:3315' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
-   # 'db1100' => 50,  # C2 3.6TB 512GB, old master #api # T161294
+   'db1100' => 50,  # C2 3.6TB 512GB, old master #api
'db1106' => 500, # D3 3.6TB 512GB
'db1110' => 500, # C3 3.6TB 512GB
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MetaMaster[master]: Add minus-x check and fix to composer.json

2017-12-20 Thread Albert221 (Code Review)

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

Change subject: Add minus-x check and fix to composer.json
..

Add minus-x check and fix to composer.json

Bug: T175794
Change-Id: I580d73c89bce6b81dac48631b7d40b8f1fd5cab0
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/composer.json b/composer.json
index 79a9d9e..6c34d20 100644
--- a/composer.json
+++ b/composer.json
@@ -4,13 +4,18 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"fix": "phpcbf",
"test": [
"parallel-lint . --exclude vendor --exclude 
node_modules",
-   "phpcs -p -s"
+   "phpcs -p -s",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
},
"require": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I580d73c89bce6b81dac48631b7d40b8f1fd5cab0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MetaMaster
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tags for undo edits

2017-12-20 Thread Nikerabbit (Code Review)

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

Change subject: Add tags for undo edits
..


Add tags for undo edits

Follow up on Ie7f637fcec.

Bug: T167656
Change-Id: I763844e4bf7c3b5ca7a436cc4aa22a92f70f79d0
---
M includes/DefaultSettings.php
M includes/changetags/ChangeTags.php
M includes/page/WikiPage.php
M languages/i18n/en.json
M languages/i18n/qqq.json
5 files changed, 14 insertions(+), 2 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c17bf7e..2ee27ab 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6951,6 +6951,7 @@
  * - 'mw-blank': Edit completely blanks the page
  * - 'mw-replace': Edit removes more than 90% of the content
  * - 'mw-rollback': Edit is a rollback, made through the rollback link or 
rollback API
+ * - 'mw-undo': Edit made through an undo link
  *
  * @var array
  * @since 1.31
@@ -6962,7 +6963,8 @@
'mw-changed-redirect-target' => true,
'mw-blank' => true,
'mw-replace' => true,
-   'mw-rollback' => true
+   'mw-rollback' => true,
+   'mw-undo' => true,
 ];
 
 /**
diff --git a/includes/changetags/ChangeTags.php 
b/includes/changetags/ChangeTags.php
index b4a8ca8..db1f599 100644
--- a/includes/changetags/ChangeTags.php
+++ b/includes/changetags/ChangeTags.php
@@ -39,7 +39,8 @@
'mw-changed-redirect-target',
'mw-blank',
'mw-replace',
-   'mw-rollback'
+   'mw-rollback',
+   'mw-undo',
];
 
/**
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index ff997ab..67e4d0d 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1624,6 +1624,11 @@
$tags[] = $tag;
}
 
+   // Check for undo tag
+   if ( $undidRevId !== 0 && in_array( 'mw-undo', 
ChangeTags::getSoftwareTags() ) ) {
+   $tags[] = 'mw-undo';
+   }
+
// Provide autosummaries if summary is not provided and 
autosummaries are enabled
if ( $wgUseAutomaticEditSummaries && ( $flags & 
EDIT_AUTOSUMMARY ) && $summary == '' ) {
$summary = $handler->getAutosummary( $old_content, 
$content, $flags );
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 7254b92..70230fe 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3888,6 +3888,8 @@
"tag-mw-replace-description": "Edits that remove more than 90% of the 
content of a page",
"tag-mw-rollback": "Rollback",
"tag-mw-rollback-description": "Edits that roll back previous edits 
using the rollback link",
+   "tag-mw-undo": "Undo",
+   "tag-mw-undo-description": "Edits that undo previous edits using the 
undo link",
"tags-title": "Tags",
"tags-intro": "This page lists the tags that the software may mark an 
edit with, and their meaning.",
"tags-tag": "Tag name",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 0497396..54b2ee0 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -4083,6 +4083,8 @@
"tag-mw-replace-description": "Description for \"replace\" change tag",
"tag-mw-rollback": "Change tag for rolling back an 
edit\n{{Identical|Rollback}}",
"tag-mw-rollback-description": "Description for \"rollback\" change 
tag",
+   "tag-mw-undo": "Change tag for undoing an edit",
+   "tag-mw-undo-description": "Description for \"undo\" change tag",
"tags-title": "The title of [[Special:Tags]].\n{{Identical|Tag}}",
"tags-intro": "Explanation on top of [[Special:Tags]]. For more 
information on tags see [[mw:Manual:Tags|MediaWiki]].",
"tags-tag": "Caption of a column in [[Special:Tags]]. For more 
information on tags see [[mw:Manual:Tags|MediaWiki]].",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I763844e4bf7c3b5ca7a436cc4aa22a92f70f79d0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Petar.petkovic 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1109 and db1096:3315

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Repool db1109 and db1096:3315
..


db-eqiad.php: Repool db1109 and db1096:3315

Bug: T161294
Change-Id: Id92b3429aa9f1425d737c470a67d74deedd1769c
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8eb6088..243d277 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -146,7 +146,7 @@
'db1070' => 0,   # D1 2.8TB 160GB, master
'db1051' => 0,   # B3 2.8TB  96GB, vslow, dump in s5
'db1082' => 50, # A2 3.6TB 512GB, api # db1095 master
-   # 'db1096:3315' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6 
# T161294
+   'db1096:3315' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
# 'db1100' => 50,  # C2 3.6TB 512GB, old master #api # T161294
'db1106' => 500, # D3 3.6TB 512GB
@@ -179,7 +179,7 @@
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
-   # 'db1109' => 500,  # D8 3.6TB 512GB # T161294
+   'db1109' => 500,  # D8 3.6TB 512GB
],
 
'silver' => [
@@ -404,23 +404,23 @@
# 'db1100' => 3,
],
'watchlist' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'recentchanges' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'recentchangeslinked' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'contributions' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'logpager' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id92b3429aa9f1425d737c470a67d74deedd1769c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1109 and db1096:3315

2017-12-20 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Depool db1109 and db1096:3315
..

db-eqiad.php: Depool db1109 and db1096:3315

Bug: T161294
Change-Id: Id92b3429aa9f1425d737c470a67d74deedd1769c
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8eb6088..243d277 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -146,7 +146,7 @@
'db1070' => 0,   # D1 2.8TB 160GB, master
'db1051' => 0,   # B3 2.8TB  96GB, vslow, dump in s5
'db1082' => 50, # A2 3.6TB 512GB, api # db1095 master
-   # 'db1096:3315' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6 
# T161294
+   'db1096:3315' => 1,   # A6 3.6TB 512GB, # rc, log: s5 and s6
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
# 'db1100' => 50,  # C2 3.6TB 512GB, old master #api # T161294
'db1106' => 500, # D3 3.6TB 512GB
@@ -179,7 +179,7 @@
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
-   # 'db1109' => 500,  # D8 3.6TB 512GB # T161294
+   'db1109' => 500,  # D8 3.6TB 512GB
],
 
'silver' => [
@@ -404,23 +404,23 @@
# 'db1100' => 3,
],
'watchlist' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'recentchanges' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'recentchangeslinked' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'contributions' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
'logpager' => [
-   # 'db1096:3315' => 1,
+   'db1096:3315' => 1,
'db1097:3315' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mariadb: setup unix_socket auth for vagrant user

2017-12-20 Thread BryanDavis (Code Review)

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

Change subject: mariadb: setup unix_socket auth for vagrant user
..

mariadb: setup unix_socket auth for vagrant user

Modern MariaDB packages setup unix_socket based auth for the root user
rather than password auth. Rather than undoing this protection by
switching the root account back to password auth, we will setup an `ALL
PRIVILEGES` grant for the vagrant shell user as well.

Bug: T181918
Change-Id: I299e05071efe919ad5c27e45519f4fe50f597f6d
---
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/mysql/manifests/sql.pp
M puppet/modules/mysql/manifests/user.pp
M puppet/modules/mysql/templates/my.cnf.erb
M puppet/modules/role/manifests/oozie.pp
6 files changed, 20 insertions(+), 22 deletions(-)


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

diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 3bb641c..14eed0f 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -129,7 +129,6 @@
 server_url   => $server_url,
 primary_wiki => true,
 require  => [
-Exec['set_mysql_password'],
 Git::Clone['mediawiki/core'],
 Php::Composer::Install[$dir],
 ],
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f503c34..113ce1f 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -5,9 +5,6 @@
 #
 # === Parameters
 #
-# [*root_password*]
-#   Password for the root MySQL account (default: 'vagrant').
-#
 # [*default_db_name*]
 #   If defined, the 'mysql' command-line client will be configured to
 #   use this database by default (default: undefined).
@@ -18,12 +15,10 @@
 # === Examples
 #
 #  class { 'mysql':
-#  root_password   => 'r00tp455w0rd',
 #  default_db_name => 'wiki',
 #  }
 #
 class mysql(
-$root_password = 'vagrant',
 $default_db_name = undef,
 $grant_host_name = undef,
 ) {
@@ -36,12 +31,14 @@
 require=> Package['mysql-server'],
 }
 
-exec { 'set_mysql_password':
-command => "/usr/bin/mysqladmin -u root password \"${root_password}\"",
-unless  => "/usr/bin/mysqladmin -u root -p\"${root_password}\" status",
-require => Service['mysql'],
+# Setup password free auth for VM's vagrant user
+mysql::user { 'vagrant':
+ensure   => present,
+password => 'ignored',
+grant=> 'ALL PRIVILEGES ON *.*',
+hostname => 'localhost',
+socket   => true,
 }
-
 file { '/home/vagrant/.my.cnf':
 ensure  => file,
 owner   => 'vagrant',
diff --git a/puppet/modules/mysql/manifests/sql.pp 
b/puppet/modules/mysql/manifests/sql.pp
index 19040ab..fae6094 100644
--- a/puppet/modules/mysql/manifests/sql.pp
+++ b/puppet/modules/mysql/manifests/sql.pp
@@ -34,8 +34,7 @@
 $quoted_unless = regsubst($unless, '"', '\\"', 'G')
 
 exec { $title:
-command => "/usr/bin/mysql -uroot -p${mysql::root_password} -qfsAe 
\"${quoted_sql}\"",
-unless  => "/usr/bin/mysql -uroot -p${mysql::root_password} -qfsANe 
\"${quoted_unless}\" | /usr/bin/tail -1 | /bin/grep -q 1",
-require => Exec['set_mysql_password'],
+command => "/usr/bin/mysql -qfsAe \"${quoted_sql}\"",
+unless  => "/usr/bin/mysql -qfsANe \"${quoted_unless}\" | 
/usr/bin/tail -1 | /bin/grep -q 1",
 }
 }
diff --git a/puppet/modules/mysql/manifests/user.pp 
b/puppet/modules/mysql/manifests/user.pp
index f0f98b3..9c69e2a 100644
--- a/puppet/modules/mysql/manifests/user.pp
+++ b/puppet/modules/mysql/manifests/user.pp
@@ -26,6 +26,11 @@
 #   Defaults to 'usage on *.*'. This allows combining user account
 #   creation with a database permission grant.
 #
+# [*socket*]
+#   Use unix_socket auth rather than a password to identify the user. When
+#   enabled the $password supplied will be ignored.
+#   Defaults to false.
+#
 # === Examples
 #
 # Creates an 'wikiadmin' user with full privileges on 'wiki':
@@ -41,6 +46,7 @@
 $username = $title,
 $grant= 'usage on *.*',
 $hostname = $::mysql::grant_host_name,
+$socket   = false,
 ) {
 if $ensure == 'absent' {
 $command = 'drop'
@@ -55,8 +61,12 @@
 unless => "select not exists(select 1 from mysql.user where user = 
'${username}')",
 }
 } else {
+$ident = $socket ? {
+true=> 'IDENTIFIED VIA unix_socket',
+default => "IDENTIFIED BY '${password}'",
+}
 mysql::sql { "create user ${username}":
-sql=> "grant ${grant} to '${username}'@'${hostname}' 
identified by '${password}'",
+sql=> "grant ${grant} to

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

2017-12-20 Thread jenkins-bot (Code Review)

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

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


db-eqiad.php: Depool db1109

Bug: T161294
Change-Id: I492b731a6303ee401242c70ec06c9f2c6d998f34
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index e4034a1..8eb6088 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -179,7 +179,7 @@
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
-   'db1109' => 500,  # D8 3.6TB 512GB
+   # 'db1109' => 500,  # D8 3.6TB 512GB # T161294
],
 
'silver' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I492b731a6303ee401242c70ec06c9f2c6d998f34
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

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

2017-12-20 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1109

Bug: T161294
Change-Id: I492b731a6303ee401242c70ec06c9f2c6d998f34
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index e4034a1..8eb6088 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -179,7 +179,7 @@
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
-   'db1109' => 500,  # D8 3.6TB 512GB
+   # 'db1109' => 500,  # D8 3.6TB 512GB # T161294
],
 
'silver' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: 2008 called, it wants its IDs back

2017-12-20 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399563 )

Change subject: 2008 called, it wants its IDs back
..

2008 called, it wants its IDs back

These IDs haven't been used since r41798.

Change-Id: I036da7bedf089764cfe4d6cfabe6ced85646
---
M monobook/dark.css
1 file changed, 1 insertion(+), 4 deletions(-)


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

diff --git a/monobook/dark.css b/monobook/dark.css
index d011d5d..7ba4edc 100644
--- a/monobook/dark.css
+++ b/monobook/dark.css
@@ -1,8 +1,6 @@
 /*
 ** Dark theme for MonoBook
 ** Originally from ZeldaWiki.org and modified by Skizzerz 
 for ShoutWiki
-**
-** @date 1 November 2014
 */
 div#content {
background: #1c3855;
@@ -318,8 +316,7 @@
 }
 
 /* Recreating-deleted-page/reupload file warning and log entries */
-div#mw-upload-deleted-warn,
-div#mw-recreate-deleted-warn {
+div.mw-warning-with-logexcerpt {
padding: 3px;
margin-bottom: 3px;
border: 2px solid #2F6FAB;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I036da7bedf089764cfe4d6cfabe6ced85646
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Treat mw-stack elements as if they are infoboxes

2017-12-20 Thread Jdlrobson (Code Review)

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

Change subject: Treat mw-stack elements as if they are infoboxes
..

Treat mw-stack elements as if they are infoboxes

If the first element of the page is an element with class mw-stack
that contains an infobox we should treat the entire element as if it's
an infobox and hoist the paragraph.

Bug: T170006
Change-Id: I212504e9b1f9b055ab25c15645364a8a27ba6f91
---
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
2 files changed, 82 insertions(+), 8 deletions(-)


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

diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 938f90b..f784f61 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -224,6 +224,21 @@
}
 
/**
+* Determine whether a selected element can be classed as a "infobox"
+*
+* @param DOMElement $element
+* @return bool
+*/
+   private function isInfoboxElement( $element ) {
+   return $element->nodeName == 'table' ||
+   (
+   strpos( $element->getAttribute( 'class' ), 
"mw-stack" ) !== false &&
+   $element->getElementsByTagName( 'table' 
)->length === 1 &&
+   $this->isInfoboxElement( 
$element->getElementsByTagName( 'table' )->item( 0 ) )
+   );
+   }
+
+   /**
 * Move the first paragraph in the lead section above the infobox
 *
 * In order for a paragraph to be moved the following conditions must 
be met:
@@ -249,16 +264,16 @@
return;
}
$xPath = new DOMXPath( $doc );
-   // Find infoboxes and paragraphs that have text content, i.e. 
paragraphs
+   // Find infoboxes, certain wrapped infoboxes, and paragraphs 
that have text content, i.e. paragraphs
// that are not empty nor are wrapper paragraphs that contain 
span#coordinates.
$infoboxAndParagraphs = $xPath->query(
-   './table[contains(@class,"infobox")] | 
./p[string-length(text()) > 0]',
+   './div[contains(@class,"mw-stack")] | 
./table[contains(@class,"infobox")] | ./p[string-length(text()) > 0]',
$leadSectionBody
);
// We need both an infobox and a paragraph and the first 
element of our query result
// ought to be an infobox.
if ( $infoboxAndParagraphs->length >= 2 &&
-   $infoboxAndParagraphs->item( 0 )->nodeName == 'table'
+   $this->isInfoboxElement( $infoboxAndParagraphs->item( 0 
) )
) {
$firstP = null;
for ( $i = 1; $i < $infoboxAndParagraphs->length; $i++ 
) {
@@ -296,15 +311,19 @@
 
/**
 * Finds all infoboxes which are one or more levels deep in $xPath 
content. When at least one
-* element is found - log the page title and revision
+* element is found and that is not wrapped in an allowed element e.g. 
mw-stack or another infobox,
+* log the page title and revision
 *
 * @see https://phabricator.wikimedia.org/T149884
 * @param $leadSectionBody
 * @param DOMXPath $xPath
 */
private function logInfoboxesWrappedInContainers( $leadSectionBody, 
DOMXPath $xPath ) {
-   $infoboxes = $xPath->query( 
'./*//table[contains(@class,"infobox")]' .
-   '[not(ancestor::table[contains(@class,"infobox")])]', 
$leadSectionBody );
+   $query = './*//table[contains(@class,"infobox")]' .
+   '[not(ancestor::div[contains(@class,"mw-stack")]) and' .
+   'not(ancestor::table[contains(@class,"infobox")])]';
+
+   $infoboxes = $xPath->query( $query, $leadSectionBody );
if ( $infoboxes->length > 0 ) {
\MediaWiki\Logger\LoggerFactory::getInstance( 'mobile' 
)->info(
"Found infobox wrapped with container on 
{$this->title} (rev:{$this->revId})"
diff --git a/tests/phpunit/MobileFormatterTest.php 
b/tests/phpunit/MobileFormatterTest.php
index 702d0c6..3c11200 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -675,6 +675,7 @@
// 
MobileFormatter#moveFirstParagraphBeforeInfobox will trigger a "Not
// Found Error" warning.
// Do not touch infoboxes that are not 
immediate children of the lead section
+   // unless... (see next test T170006)

[MediaWiki-commits] [Gerrit] integration/config[master]: Add lucene-explain-parser library

2017-12-20 Thread Smalyshev (Code Review)

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

Change subject: Add lucene-explain-parser library
..

Add lucene-explain-parser library

Change-Id: Iac5e52732a81eef1774e4a477bcdd1611065836f
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/61/399561/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d96f7f4..0ac1c2d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2769,6 +2769,10 @@
 template:
  - name: composer-test-package
 
+  - name: wikimedia/lucene-explain-parser
+template:
+ - name: composer-test-package
+
  MediaWiki extensions ##
 
   - name: mediawiki/extensions/3D

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/lucene-explain-parser[master]: Fix package name

2017-12-20 Thread Smalyshev (Code Review)

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

Change subject: Fix package name
..


Fix package name

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

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



diff --git a/composer.json b/composer.json
index 51455b3..ca0ac4a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-"name": "smalyshev/splainer",
+"name": "wikimedia/lucene-explain-parser",
 "description": "Parsing and pretty-printing Lucene explain data",
 "type": "library",
 "license": "Apache 2.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id922406d3b8d2d8a7961962e1631a0c043e7ccb2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/lucene-explain-parser
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikimedia/lucene-explain-parser[master]: Fix package name

2017-12-20 Thread Smalyshev (Code Review)

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

Change subject: Fix package name
..

Fix package name

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/lucene-explain-parser 
refs/changes/60/399560/1

diff --git a/composer.json b/composer.json
index 51455b3..ca0ac4a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-"name": "smalyshev/splainer",
+"name": "wikimedia/lucene-explain-parser",
 "description": "Parsing and pretty-printing Lucene explain data",
 "type": "library",
 "license": "Apache 2.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id922406d3b8d2d8a7961962e1631a0c043e7ccb2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/lucene-explain-parser
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix Eventlogging role for Stretch

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix Eventlogging role for Stretch
..


Fix Eventlogging role for Stretch

Bug: T183380
Change-Id: I483a174632ba6928b408b13188683c5167ad47b8
---
M puppet/modules/eventlogging/manifests/devserver.pp
M puppet/modules/eventlogging/manifests/init.pp
M puppet/modules/eventlogging/manifests/service.pp
A puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
D puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
R puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
6 files changed, 27 insertions(+), 17 deletions(-)

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



diff --git a/puppet/modules/eventlogging/manifests/devserver.pp 
b/puppet/modules/eventlogging/manifests/devserver.pp
index 0fdaf8b..b472f00 100644
--- a/puppet/modules/eventlogging/manifests/devserver.pp
+++ b/puppet/modules/eventlogging/manifests/devserver.pp
@@ -9,6 +9,11 @@
 $eventlogging_path = $::eventlogging::path
 
 systemd::service { 'eventlogging-devserver':
-ensure=> 'present',
+ensure => 'present',
+epp_template   => true,
+template_variables => {
+'eventlogging_path' => $eventlogging_path,
+'output_file'   => $output_file,
+},
 }
 }
diff --git a/puppet/modules/eventlogging/manifests/init.pp 
b/puppet/modules/eventlogging/manifests/init.pp
index d205fbc..cd7027b 100644
--- a/puppet/modules/eventlogging/manifests/init.pp
+++ b/puppet/modules/eventlogging/manifests/init.pp
@@ -20,7 +20,7 @@
 
 # Do the initial pip install into the virtualenv
 exec { 'eventlogging_virtualenv_pip_install':
-command => "${path}/virtualenv/bin/pip install -e .",
+command => "${path}/virtualenv/bin/pip install --no-binary mysqlclient 
-e .",
 cwd => $path,
 creates => 
"${path}/virtualenv/local/lib/python2.7/site-packages/eventlogging.egg-link",
 require => [
diff --git a/puppet/modules/eventlogging/manifests/service.pp 
b/puppet/modules/eventlogging/manifests/service.pp
index fb78b1f..9e186bd 100644
--- a/puppet/modules/eventlogging/manifests/service.pp
+++ b/puppet/modules/eventlogging/manifests/service.pp
@@ -48,10 +48,15 @@
 }
 
 systemd::service { $service_name:
-ensure => 'present',
-template_name  => 'eventlogging-service',
-service_params => {
+ensure => 'present',
+template_name  => 'eventlogging-service',
+service_params => {
 subscribe => File[$config_file],
 },
+epp_template   => true,
+template_variables => {
+'eventlogging_path' => $eventlogging_path,
+'config_file'   => $config_file,
+},
 }
 }
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
new file mode 100644
index 000..b16c8ae
--- /dev/null
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.epp
@@ -0,0 +1,11 @@
+[Unit]
+Description=EventLogging Dev Server
+Requires=network.target
+
+[Service]
+User=www-data
+Group=www-data
+ExecStart=<%= $eventlogging_path %>/virtualenv/bin/eventlogging-devserver 
--append-to <%= $output_file %>
+
+[Install]
+WantedBy=multi-user.target
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
deleted file mode 100644
index 7befeaf..000
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=EventLogging Dev Server
-Requires=network.target
-
-[Service]
-User=www-data
-Group=www-data
-ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-devserver 
--append-to <%= @output_file %>
-
-[Install]
-WantedBy=multi-user.target
diff --git 
a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb 
b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
similarity index 62%
rename from 
puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
rename to puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
index 76d1689..fed374a 100644
--- a/puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb
+++ b/puppet/modules/eventlogging/templates/systemd/eventlogging-service.epp
@@ -5,7 +5,7 @@
 [Service]
 User=www-data
 Group=www-data
-ExecStart=<%= @eventlogging_path %>/virtualenv/bin/eventlogging-service @<%= 
@config_file %>
+ExecStart=<%= $eventlogging_path %>/virtualenv/bin/eventlogging-service @<%= 
$config_file %>
 
 [Install]
 WantedBy=multi-user.target

-- 
To view, visit

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix Statsd role for Stretch

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix Statsd role for Stretch
..


Fix Statsd role for Stretch

Bug: T183374
Change-Id: Ie0bf259b46283b8d8926f05f2e47684b9fed1bce
---
M puppet/modules/statsd/manifests/init.pp
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/statsd/manifests/init.pp 
b/puppet/modules/statsd/manifests/init.pp
index aa35057..376e76a 100644
--- a/puppet/modules/statsd/manifests/init.pp
+++ b/puppet/modules/statsd/manifests/init.pp
@@ -58,7 +58,12 @@
 }
 
 systemd::service { 'statsd':
-ensure  => 'present',
-require => Npm::Install[$dir],
+ensure => 'present',
+require=> Npm::Install[$dir],
+epp_template   => true,
+template_variables => {
+'dir'=> $dir,
+'logdir' => $logdir,
+},
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Add ability to pass variables to systemd service template

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Add ability to pass variables to systemd service template
..


Add ability to pass variables to systemd service template

Fixes issue with variable context seggregation and
the systemd service class.

Without this, the template cannot access variables
defined by classes calling systemd::service, which
seems to be a Puppet 4 breaking change.

Bug: T183374
Change-Id: I8a95385a314c78b74a5dd41b8548398b2f39a17a
---
A puppet/modules/statsd/templates/systemd/statsd.epp
D puppet/modules/statsd/templates/systemd/statsd.erb
M puppet/modules/systemd/manifests/service.pp
3 files changed, 39 insertions(+), 24 deletions(-)

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



diff --git a/puppet/modules/statsd/templates/systemd/statsd.epp 
b/puppet/modules/statsd/templates/systemd/statsd.epp
new file mode 100644
index 000..59e7325
--- /dev/null
+++ b/puppet/modules/statsd/templates/systemd/statsd.epp
@@ -0,0 +1,16 @@
+[Unit]
+Description=statsd service
+Requires=mediawiki-ready.service
+After=mediawiki-ready.service
+
+[Service]
+Environment=NODE_PATH=<%= $dir %>/node_modules
+User=www-data
+Group=www-data
+SyslogIdentifier=statsd
+WorkingDirectory=<%= $dir %>
+ExecStart=/bin/sh -c '/usr/bin/nodejs stats.js <%= $dir %>/config.js > <%= 
$logdir %>/statsd.log'
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/puppet/modules/statsd/templates/systemd/statsd.erb 
b/puppet/modules/statsd/templates/systemd/statsd.erb
deleted file mode 100644
index 5c58107..000
--- a/puppet/modules/statsd/templates/systemd/statsd.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=statsd service
-Requires=mediawiki-ready.service
-After=mediawiki-ready.service
-
-[Service]
-Environment=NODE_PATH=<%= @dir %>/node_modules
-User=www-data
-Group=www-data
-SyslogIdentifier=statsd
-WorkingDirectory=<%= @dir %>
-ExecStart=/bin/sh -c '/usr/bin/nodejs stats.js <%= @dir %>/config.js > <%= 
@logdir %>/statsd.log'
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/puppet/modules/systemd/manifests/service.pp 
b/puppet/modules/systemd/manifests/service.pp
index 3270f12..cda8297 100644
--- a/puppet/modules/systemd/manifests/service.pp
+++ b/puppet/modules/systemd/manifests/service.pp
@@ -29,16 +29,28 @@
 # [*service_params*]
 # A hash of parameters to applied to the Service resource. Default: {}
 #
+# [*template_variables*]
+# Variables to be exposed to the template. Default: {}
+#
+# [*epp_template*]
+# Whether or not the service template is EPP rather than ERB. Default: false
+#
 define systemd::service (
-$ensure  = 'present',
-$is_override = false,
-$refresh = true,
-$template_name   = $name,
-$declare_service = true,
-$service_params  = {},
+$ensure = 'present',
+$is_override= false,
+$refresh= true,
+$template_name  = $name,
+$declare_service= true,
+$service_params = {},
+$template_variables = {},
+$epp_template   = false,
 ) {
 validate_ensure($ensure)
-$unit_template = "${caller_module_name}/systemd/${template_name}.erb"
+$unit_template = $epp_template ? {
+true=> "${caller_module_name}/systemd/${template_name}.epp",
+default => "${caller_module_name}/systemd/${template_name}.erb",
+}
+
 $unit_path = $is_override ? {
 true=> 
"/etc/systemd/system/${name}.service.d/puppet-override.conf",
 default => "/lib/systemd/system/${name}.service",
@@ -59,7 +71,10 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template($unit_template),
+content => $epp_template ? {
+true=> epp($unit_template, $template_variables),
+default => template($unit_template),
+},
 }
 
 exec { "systemd reload for ${name}":

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Fix remaining php sniffs

2017-12-20 Thread Jdlrobson (Code Review)

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

Change subject: Fix remaining php sniffs
..

Fix remaining php sniffs

Bug: T170583
Change-Id: I3db5de11618f952eb7974c456445eaa1d5e4e6a4
---
M .phpcs.xml
M extension.json
A maintenance/InitImageData.php
A tests/phpunit/ApiQueryPageImagesProxy.php
M tests/phpunit/ApiQueryPageImagesTest.php
5 files changed, 144 insertions(+), 27 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index b5fc9ef..1a6c997 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,10 +1,6 @@
 
 
-   
-   
-   
-   
-   
+   
.


diff --git a/extension.json b/extension.json
index 9e53807..02effd5 100644
--- a/extension.json
+++ b/extension.json
@@ -22,7 +22,8 @@
},
"AutoloadClasses": {
"PageImages": "includes/PageImages.php",
-   "PageImages\\PageImages": "includes/PageImages.php"
+   "PageImages\\PageImages": "includes/PageImages.php",
+   "PageImages\\Tests\\ApiQueryPageImagesProxy": 
"tests/phpunit/ApiQueryPageImagesProxy.php"
},
"Hooks": {
"AfterParserFetchFileAndTitle": 
"PageImages\\Hooks\\ParserFileProcessingHookHandlers::onAfterParserFetchFileAndTitle",
diff --git a/maintenance/InitImageData.php b/maintenance/InitImageData.php
new file mode 100644
index 000..329b525
--- /dev/null
+++ b/maintenance/InitImageData.php
@@ -0,0 +1,114 @@
+mDescription = 'Initializes PageImages data';
+   $this->addOption( 'namespaces',
+   'Comma-separated list of namespace(s) to refresh', 
false, true );
+   $this->addOption( 'earlier-than',
+   'Run only on pages earlier than this timestamp', false, 
true );
+   $this->addOption( 'start', 'Starting page ID', false, true );
+   $this->addOption( 'queue-pressure', 'Maximum number of jobs to 
enqueue at a time. ' .
+   'If not provided or 0 will be run in-process.', false, 
true );
+   $this->addOption( 'quiet', "Don't report on job queue pressure" 
);
+   $this->setBatchSize( 100 );
+   }
+
+   /**
+* Do the actual work of filling out page images
+* @return null
+*/
+   public function execute() {
+   global $wgPageImagesNamespaces;
+
+   $lastId = $this->getOption( 'start', 0 );
+   $isQuiet = $this->getOption( 'quiet', false );
+   $queue = null;
+   $maxPressure = $this->getOption( 'queue-pressure', 0 );
+   if ( $maxPressure > 0 ) {
+   $queue = JobQueueGroup::singleton();
+   }
+
+   do {
+   $tables = [ 'page', 'imagelinks' ];
+   $conds = [
+   'page_id > ' . (int)$lastId,
+   'il_from IS NOT NULL',
+   'page_is_redirect' => 0,
+   ];
+   $fields = [ 'page_id' ];
+   $joinConds = [ 'imagelinks' => [
+   'LEFT JOIN', 'page_id = il_from',
+   ] ];
+
+   $dbr = wfGetDB( DB_REPLICA );
+   if ( $this->hasOption( 'namespaces' ) ) {
+   $ns = explode( ',', $this->getOption( 
'namespaces' ) );
+   $conds['page_namespace'] = $ns;
+   } else {
+   $conds['page_namespace'] = 
$wgPageImagesNamespaces;
+   }
+   if ( $this->hasOption( 'earlier-than' ) ) {
+   $conds[] = 'page_touched < '
+   . $dbr->addQuotes( $this->getOption( 
'earlier-than' ) );
+   }
+   $res = $dbr->select( $tables, $fields, $conds, 
__METHOD__,
+   [ 'LIMIT' => $this->mBatchSize, 'ORDER_BY' => 
'page_id', 'GROUP BY' => 'page_id' ],
+   $joinConds
+   );
+   $pageIds = [];
+   foreach ( $res as $row ) {
+   $pageIds[] = $row->page_id;
+   }
+   $job = new InitImageDataJob( Title::newMainPage(), [ 
'page_ids' => $pageIds ] );
+   if ( $queue === null ) {
+   $job->run();
+   } else {
+   $queue->push( $job );
+   $this->waitForMaxPressure( $queue, 
$maxPressure, $isQuiet );
+   }
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/docker: check_disk regex for ci::master, kubernetes

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: icinga/docker: check_disk regex for ci::master,kubernetes
..

icinga/docker: check_disk regex for ci::master,kubernetes

Like I1e8104525d6b21098 for role(builder) which popped up
in Icinga and fixed it but for the other 3 roles using check_disk
options to avoid docker-related alerts. Use the same regex here
as well, for consistency reasons.

Change-Id: Iabf1cf38a0b7d95818170af83e81ce84060066a7
---
M hieradata/role/common/ci/master.yaml
M hieradata/role/common/kubernetes/staging/worker.yaml
M hieradata/role/common/kubernetes/worker.yaml
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/399558/1

diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index b4d91a6..fb227af 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -32,4 +32,4 @@
 # TODO: create specific credentials for CI
 docker::registry: docker-registry.discovery.wmnet
 docker::registry::username: uploader
-profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
/var/lib/docker/* -i /run/docker/netns/* --exclude-type=tracefs
+profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
'/(var/lib|run)/docker/*' --exclude-type=tracefs
diff --git a/hieradata/role/common/kubernetes/staging/worker.yaml 
b/hieradata/role/common/kubernetes/staging/worker.yaml
index c2af37a..8e0e6a9 100644
--- a/hieradata/role/common/kubernetes/staging/worker.yaml
+++ b/hieradata/role/common/kubernetes/staging/worker.yaml
@@ -20,7 +20,7 @@
iptables: false
ip-masq: false
live-restore: true
-profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
/var/lib/docker/containers/* -i /run/docker/netns/* --exclude-type=tracefs
+profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
'/(var/lib|run)/docker/*' --exclude-type=tracefs
 profile::calico::kubernetes::calico_version: 2.2.0
 profile::calico::kubernetes::docker::registry: docker-registry.discovery.wmnet
 profile::kubernetes::node::masquerade_all: false
diff --git a/hieradata/role/common/kubernetes/worker.yaml 
b/hieradata/role/common/kubernetes/worker.yaml
index 40c447f..86426a0 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -15,7 +15,7 @@
iptables: false
ip-masq: false
live-restore: true
-profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
/var/lib/docker/containers/* -i /run/docker/netns/* --exclude-type=tracefs
+profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
'/(var/lib|run)/docker/*' --exclude-type=tracefs
 profile::calico::kubernetes::calico_version: 2.2.0
 profile::calico::kubernetes::docker::registry: docker-registry.discovery.wmnet
 profile::kubernetes::node::masquerade_all: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable commons import in tawikisource

2017-12-20 Thread Jayprakash12345 (Code Review)

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

Change subject: Enable commons import in tawikisource
..

Enable commons import in tawikisource

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/56/399556/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7c00204..8c5226e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11625,7 +11625,7 @@
'svwiktionary' => [ 'w', 'meta' ],
'szlwiki' => [ 'incubator' ],
'tawiki' => [ 'en' ], // T122808
-   'tawikisource' => [ 'oldwikisource', 'w', 'b', 'en', 'fr', 'bn', 'it' ],
+   'tawikisource' => [ 'oldwikisource', 'w', 'b', 'en', 'fr', 'bn', 'it', 
'commons' ], // T181774
'tcywiki' => [ 'en', 'kn', 'te', 'c', 'meta' ], // T143397
'tewiki' => [ 'en', 'commons' ], // T43880
'tewikisource' => [ 'w', 'b', 'en' ], // T94531

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If782e8638db1cbbf2de0eee3ebad95feed0be13b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: builder/icinga: regex to avoid check_disk alerts for docker

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: builder/icinga: regex to avoid check_disk alerts for docker
..


builder/icinga: regex to avoid check_disk alerts for docker

We still had an Icinga DISK (check_disk) alert for a docker
path. This one on boron which is used for building docker images.

DISK CRITICAL - /run/docker/netns/8c8a18222867 is not accessible:
Permission denied

We already had the check_disk options to ignore docker pathes
by regex and yes, check_disk --help claims that the -i option
can be repeated multiple times, but nevertheless this happens:

[boron:/etc/nagios/nrpe.d] $
/usr/lib/nagios/plugins/check_disk .. -i /var/lib/docker/* -i 
/run/docker/netns/*
--exclude-type=tracefs

DISK CRITICAL - /run/docker/netns/8c8a18222867 is not accessible:
Permission denied

but

/usr/lib/nagios/plugins/check_disk .. -i
'/(var/lib|run)/docker/*' --exclude-type=tracefs

DISK OK|..

Change-Id: I1e8104525d6b210981070924f107391a15ef5a60
---
M hieradata/role/common/builder.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/builder.yaml 
b/hieradata/role/common/builder.yaml
index 567750a..c27befc 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -9,4 +9,4 @@
 monitor_screens: false
 # The default setup has no lvm, so no source
 #profile::docker::storage::loopback::dm_source: null
-profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
/var/lib/docker/* -i /run/docker/netns/* --exclude-type=tracefs
+profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
'/(var/lib|run)/docker/*' --exclude-type=tracefs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e8104525d6b210981070924f107391a15ef5a60
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
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] operations/puppet[production]: builder/icinga: regex to avoid check_disk alerts for docker

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: builder/icinga: regex to avoid check_disk alerts for docker
..

builder/icinga: regex to avoid check_disk alerts for docker

We still had an Icinga DISK (check_disk) alert for a docker
path. This one on boron which is used for building docker images.

DISK CRITICAL - /run/docker/netns/8c8a18222867 is not accessible:
Permission denied

We already had the check_disk options to ignore docker pathes
by regex and yes, check_disk --help claims that the -i option
can be repeated multiple times, but nevertheless this happens:

[boron:/etc/nagios/nrpe.d] $
/usr/lib/nagios/plugins/check_disk .. -i /var/lib/docker/* -i 
/run/docker/netns/*
--exclude-type=tracefs

DISK CRITICAL - /run/docker/netns/8c8a18222867 is not accessible:
Permission denied

but

/usr/lib/nagios/plugins/check_disk .. -i
'/(var/lib|run)/docker/*' --exclude-type=tracefs

DISK OK|..

Change-Id: I1e8104525d6b210981070924f107391a15ef5a60
---
M hieradata/role/common/builder.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/399557/1

diff --git a/hieradata/role/common/builder.yaml 
b/hieradata/role/common/builder.yaml
index 567750a..c27befc 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -9,4 +9,4 @@
 monitor_screens: false
 # The default setup has no lvm, so no source
 #profile::docker::storage::loopback::dm_source: null
-profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
/var/lib/docker/* -i /run/docker/netns/* --exclude-type=tracefs
+profile::base::check_disk_options: -w 10% -c 5% -W 6% -K 3% -l -e -A -i 
'/(var/lib|run)/docker/*' --exclude-type=tracefs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e8104525d6b210981070924f107391a15ef5a60
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] pywikibot/core[master]: replaceCategoryLinks should not fail on de-wiki when page co...

2017-12-20 Thread Eflyjason (Code Review)

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

Change subject: replaceCategoryLinks should not fail on de-wiki when page 
contains {{Personendaten}}
..

replaceCategoryLinks should not fail on de-wiki when page contains 
{{Personendaten}}

Bug: T151541
Change-Id: I7033d6ab781fcadc7bf1a77a1b51f313b1c62092
---
M pywikibot/textlib.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index ebb72a9..450547a 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -1227,7 +1227,7 @@
 if site is None:
 site = pywikibot.Site()
 if site.sitename == 'wikipedia:de' and '{{Personendaten' in oldtext:
-raise pywikibot.Error(
+pywikibot.error(
 'The Pywikibot is no longer allowed to touch categories on the '
 'German\nWikipedia on pages that contain the Personendaten '
 'template because of the\nnon-standard placement of that 
template.\n'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Experiment with npm assets

2017-12-20 Thread Jdlrobson (Code Review)

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

Change subject: Experiment with npm assets
..

Experiment with npm assets

Change-Id: I7c875a3b0a3c3bc358dec7002c02f26cacc04d91
---
M composer.json
M resources/Resources.php
D resources/lib/jquery/jquery.js
3 files changed, 2 insertions(+), 10,254 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c875a3b0a3c3bc358dec7002c02f26cacc04d91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] labs/codesearch[master]: If `docker rm` fails, that's fine

2017-12-20 Thread Legoktm (Code Review)

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

Change subject: If `docker rm` fails, that's fine
..

If `docker rm` fails, that's fine

The container might not exist.

Change-Id: Idd60158ded932f349cb833f67a7db488ced246f0
---
M hound-core.service
M hound-extensions.service
M hound-search.service
M hound-skins.service
M hound-things.service
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/codesearch 
refs/changes/53/399553/1

diff --git a/hound-core.service b/hound-core.service
index ca80fe5..3754bf3 100644
--- a/hound-core.service
+++ b/hound-core.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-core
-ExecStartPre=/usr/bin/docker rm hound-core
+ExecStartPre=-/usr/bin/docker rm hound-core
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/hound/hound-core:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-core
diff --git a/hound-extensions.service b/hound-extensions.service
index c629887..8e9d65b 100644
--- a/hound-extensions.service
+++ b/hound-extensions.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-extensions
-ExecStartPre=/usr/bin/docker rm hound-extensions
+ExecStartPre=-/usr/bin/docker rm hound-extensions
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/hound/hound-extensions:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-extensions
diff --git a/hound-search.service b/hound-search.service
index 099184f..f68b969 100644
--- a/hound-search.service
+++ b/hound-search.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-search
-ExecStartPre=/usr/bin/docker rm hound-search
+ExecStartPre=-/usr/bin/docker rm hound-search
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/hound/hound-search:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-search
diff --git a/hound-skins.service b/hound-skins.service
index 02fb95c..8c1f04e 100644
--- a/hound-skins.service
+++ b/hound-skins.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-skins
-ExecStartPre=/usr/bin/docker rm hound-skins
+ExecStartPre=-/usr/bin/docker rm hound-skins
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/hound/hound-skins:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-skins
diff --git a/hound-things.service b/hound-things.service
index 22a0da0..2dc9918 100644
--- a/hound-things.service
+++ b/hound-things.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-things
-ExecStartPre=/usr/bin/docker rm hound-things
+ExecStartPre=-/usr/bin/docker rm hound-things
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/hound/hound-things:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-things

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd60158ded932f349cb833f67a7db488ced246f0
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: If `docker rm` fails, that's fine

2017-12-20 Thread Legoktm (Code Review)

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

Change subject: If `docker rm` fails, that's fine
..


If `docker rm` fails, that's fine

The container might not exist.

Change-Id: Idd60158ded932f349cb833f67a7db488ced246f0
---
M hound-core.service
M hound-extensions.service
M hound-search.service
M hound-skins.service
M hound-things.service
5 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/hound-core.service b/hound-core.service
index ca80fe5..3754bf3 100644
--- a/hound-core.service
+++ b/hound-core.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-core
-ExecStartPre=/usr/bin/docker rm hound-core
+ExecStartPre=-/usr/bin/docker rm hound-core
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/hound/hound-core:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-core
diff --git a/hound-extensions.service b/hound-extensions.service
index c629887..8e9d65b 100644
--- a/hound-extensions.service
+++ b/hound-extensions.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-extensions
-ExecStartPre=/usr/bin/docker rm hound-extensions
+ExecStartPre=-/usr/bin/docker rm hound-extensions
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/hound/hound-extensions:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-extensions
diff --git a/hound-search.service b/hound-search.service
index 099184f..f68b969 100644
--- a/hound-search.service
+++ b/hound-search.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-search
-ExecStartPre=/usr/bin/docker rm hound-search
+ExecStartPre=-/usr/bin/docker rm hound-search
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/hound/hound-search:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-search
diff --git a/hound-skins.service b/hound-skins.service
index 02fb95c..8c1f04e 100644
--- a/hound-skins.service
+++ b/hound-skins.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-skins
-ExecStartPre=/usr/bin/docker rm hound-skins
+ExecStartPre=-/usr/bin/docker rm hound-skins
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/hound/hound-skins:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-skins
diff --git a/hound-things.service b/hound-things.service
index 22a0da0..2dc9918 100644
--- a/hound-things.service
+++ b/hound-things.service
@@ -6,7 +6,7 @@
 [Service]
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill hound-things
-ExecStartPre=/usr/bin/docker rm hound-things
+ExecStartPre=-/usr/bin/docker rm hound-things
 ExecStartPre=/usr/bin/docker pull etsy/hound
 ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/hound/hound-things:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-things

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd60158ded932f349cb833f67a7db488ced246f0
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: Move data to /srv/hound

2017-12-20 Thread Legoktm (Code Review)

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

Change subject: Move data to /srv/hound
..


Move data to /srv/hound

Change-Id: Ia3d509d81bc26a610748c97423fc8ec87467c3a3
---
D .gitignore
M hound-core.service
M hound-extensions.service
M hound-search.service
M hound-skins.service
M hound-things.service
M write_config.py
7 files changed, 7 insertions(+), 10 deletions(-)

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



diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 52c000d..000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-search
-core
-extensions
-skins
-things
diff --git a/hound-core.service b/hound-core.service
index dd5a82c..ca80fe5 100644
--- a/hound-core.service
+++ b/hound-core.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-core
 ExecStartPre=/usr/bin/docker rm hound-core
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/codesearch/hound-core:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/hound/hound-core:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-core
 
 [Install]
diff --git a/hound-extensions.service b/hound-extensions.service
index 7406085..c629887 100644
--- a/hound-extensions.service
+++ b/hound-extensions.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-extensions
 ExecStartPre=/usr/bin/docker rm hound-extensions
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/codesearch/hound-extensions:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/hound/hound-extensions:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-extensions
 
 [Install]
diff --git a/hound-search.service b/hound-search.service
index 5d37967..099184f 100644
--- a/hound-search.service
+++ b/hound-search.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-search
 ExecStartPre=/usr/bin/docker rm hound-search
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/codesearch/hound-search:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/hound/hound-search:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-search
 
 [Install]
diff --git a/hound-skins.service b/hound-skins.service
index 3943f83..02fb95c 100644
--- a/hound-skins.service
+++ b/hound-skins.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-skins
 ExecStartPre=/usr/bin/docker rm hound-skins
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/codesearch/hound-skins:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/hound/hound-skins:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-skins
 
 [Install]
diff --git a/hound-things.service b/hound-things.service
index cccae97..22a0da0 100644
--- a/hound-things.service
+++ b/hound-things.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-things
 ExecStartPre=/usr/bin/docker rm hound-things
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/codesearch/hound-things:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/hound/hound-things:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-things
 
 [Install]
diff --git a/write_config.py b/write_config.py
index b1d836b..8d602de 100755
--- a/write_config.py
+++ b/write_config.py
@@ -24,6 +24,7 @@
 
 # One hour
 POLL = 60 * 60 * 1000
+DATA = '/srv/hound'
 
 
 @functools.lru_cache()
@@ -76,6 +77,7 @@
 'mediawiki/skins/%s' % skin
 )
 
+directory = os.path.join(DATA, directory)
 if not os.path.isdir(directory):
 os.mkdir(directory)
 with open(os.path.join(directory, 'config.json'), 'w') as f:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3d509d81bc26a610748c97423fc8ec87467c3a3
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: Move data to /srv/hound

2017-12-20 Thread Legoktm (Code Review)

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

Change subject: Move data to /srv/hound
..

Move data to /srv/hound

Change-Id: Ia3d509d81bc26a610748c97423fc8ec87467c3a3
---
D .gitignore
M hound-core.service
M hound-extensions.service
M hound-search.service
M hound-skins.service
M hound-things.service
M write_config.py
7 files changed, 7 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/codesearch 
refs/changes/52/399552/1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 52c000d..000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-search
-core
-extensions
-skins
-things
diff --git a/hound-core.service b/hound-core.service
index dd5a82c..ca80fe5 100644
--- a/hound-core.service
+++ b/hound-core.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-core
 ExecStartPre=/usr/bin/docker rm hound-core
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/codesearch/hound-core:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/hound/hound-core:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-core
 
 [Install]
diff --git a/hound-extensions.service b/hound-extensions.service
index 7406085..c629887 100644
--- a/hound-extensions.service
+++ b/hound-extensions.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-extensions
 ExecStartPre=/usr/bin/docker rm hound-extensions
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/codesearch/hound-extensions:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/hound/hound-extensions:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-extensions
 
 [Install]
diff --git a/hound-search.service b/hound-search.service
index 5d37967..099184f 100644
--- a/hound-search.service
+++ b/hound-search.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-search
 ExecStartPre=/usr/bin/docker rm hound-search
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/codesearch/hound-search:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/hound/hound-search:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-search
 
 [Install]
diff --git a/hound-skins.service b/hound-skins.service
index 3943f83..02fb95c 100644
--- a/hound-skins.service
+++ b/hound-skins.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-skins
 ExecStartPre=/usr/bin/docker rm hound-skins
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/codesearch/hound-skins:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/hound/hound-skins:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-skins
 
 [Install]
diff --git a/hound-things.service b/hound-things.service
index cccae97..22a0da0 100644
--- a/hound-things.service
+++ b/hound-things.service
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker kill hound-things
 ExecStartPre=/usr/bin/docker rm hound-things
 ExecStartPre=/usr/bin/docker pull etsy/hound
-ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/codesearch/hound-things:/data etsy/hound
+ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/hound/hound-things:/data etsy/hound
 ExecStop=/usr/bin/docker stop hound-things
 
 [Install]
diff --git a/write_config.py b/write_config.py
index b1d836b..8d602de 100755
--- a/write_config.py
+++ b/write_config.py
@@ -24,6 +24,7 @@
 
 # One hour
 POLL = 60 * 60 * 1000
+DATA = '/srv/hound'
 
 
 @functools.lru_cache()
@@ -76,6 +77,7 @@
 'mediawiki/skins/%s' % skin
 )
 
+directory = os.path.join(DATA, directory)
 if not os.path.isdir(directory):
 os.mkdir(directory)
 with open(os.path.join(directory, 'config.json'), 'w') as f:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3d509d81bc26a610748c97423fc8ec87467c3a3
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: Manage docker containers with systemd

2017-12-20 Thread Legoktm (Code Review)

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

Change subject: Manage docker containers with systemd
..

Manage docker containers with systemd

Change-Id: Id5ef2fc755e8eaf69c3d55ca39d4b0bf021be5ad
---
M README
A hound-core.service
A hound-extensions.service
A hound-search.service
A hound-skins.service
A hound-things.service
M start.sh
M write_config.py
8 files changed, 86 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/codesearch 
refs/changes/51/399551/1

diff --git a/README b/README
index fd54e95..381976d 100644
--- a/README
+++ b/README
@@ -11,8 +11,8 @@
  git clone https://gerrit.wikimedia.org/r/labs/codesearch /srv/codesearch
  cd /srv/codesearch
  ./write_config.py
+ sudo cp *.service /etc/systemd/system/
  sudo ./start.sh
- sudo cp hound_proxy.service /etc/systemd/system/
  sudo systemctl start hound_proxy
 
 If that works, then curl http://localhost:3002/ should work, and you can point
diff --git a/hound-core.service b/hound-core.service
new file mode 100644
index 000..dd5a82c
--- /dev/null
+++ b/hound-core.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-core
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-core
+ExecStartPre=/usr/bin/docker rm hound-core
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/codesearch/hound-core:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-core
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-extensions.service b/hound-extensions.service
new file mode 100644
index 000..7406085
--- /dev/null
+++ b/hound-extensions.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-extensions
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-extensions
+ExecStartPre=/usr/bin/docker rm hound-extensions
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/codesearch/hound-extensions:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-extensions
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-search.service b/hound-search.service
new file mode 100644
index 000..5d37967
--- /dev/null
+++ b/hound-search.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-search
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-search
+ExecStartPre=/usr/bin/docker rm hound-search
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/codesearch/hound-search:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-search
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-skins.service b/hound-skins.service
new file mode 100644
index 000..3943f83
--- /dev/null
+++ b/hound-skins.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-skins
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-skins
+ExecStartPre=/usr/bin/docker rm hound-skins
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/codesearch/hound-skins:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-skins
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-things.service b/hound-things.service
new file mode 100644
index 000..cccae97
--- /dev/null
+++ b/hound-things.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-things
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-things
+ExecStartPre=/usr/bin/docker rm hound-things
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/codesearch/hound-things:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-things
+
+[Install]
+WantedBy=multi-user.target
diff --git a/start.sh b/start.sh
index a03d9b1..7e0e29e 100755
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-docker run -d -p 6080:6080 --name hound-search -v /srv/codesearch/search:/data 
etsy/hound
-docker run -d -p 6081:6080 --name hound-extensions -v 
/srv/codesearch/extensions:/data etsy/hound
-docker run -d -p 6082:6080 --name hound-skins -v /srv/codesearch/skins:/data 
etsy/hound
-docker run -d -p 6083:6080 --name hound-things -v /srv/codesearch/things:/data 
etsy/hound
-docker run -d -p 6084:6080 --name hound-core -v /srv/codesearch/core:/data 
etsy/hound
+systemctl start hound-search
+systemctl start hound-core
+systemctl start hound-extensions
+systemctl start hound-skins
+systemctl start hound-things
diff --git a/write_config.py b/write_config.py
index 772dca6..b1d836b 100755
--- a/write_config.py
+++ b/write_config.py
@@ -83,11 +83,11 @@

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: Manage docker containers with systemd

2017-12-20 Thread Legoktm (Code Review)

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

Change subject: Manage docker containers with systemd
..


Manage docker containers with systemd

Change-Id: Id5ef2fc755e8eaf69c3d55ca39d4b0bf021be5ad
---
M README
A hound-core.service
A hound-extensions.service
A hound-search.service
A hound-skins.service
A hound-things.service
M start.sh
M write_config.py
8 files changed, 86 insertions(+), 11 deletions(-)

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



diff --git a/README b/README
index fd54e95..381976d 100644
--- a/README
+++ b/README
@@ -11,8 +11,8 @@
  git clone https://gerrit.wikimedia.org/r/labs/codesearch /srv/codesearch
  cd /srv/codesearch
  ./write_config.py
+ sudo cp *.service /etc/systemd/system/
  sudo ./start.sh
- sudo cp hound_proxy.service /etc/systemd/system/
  sudo systemctl start hound_proxy
 
 If that works, then curl http://localhost:3002/ should work, and you can point
diff --git a/hound-core.service b/hound-core.service
new file mode 100644
index 000..dd5a82c
--- /dev/null
+++ b/hound-core.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-core
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-core
+ExecStartPre=/usr/bin/docker rm hound-core
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6084:6080 --name hound-core -v 
/srv/codesearch/hound-core:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-core
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-extensions.service b/hound-extensions.service
new file mode 100644
index 000..7406085
--- /dev/null
+++ b/hound-extensions.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-extensions
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-extensions
+ExecStartPre=/usr/bin/docker rm hound-extensions
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6081:6080 --name hound-extensions -v 
/srv/codesearch/hound-extensions:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-extensions
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-search.service b/hound-search.service
new file mode 100644
index 000..5d37967
--- /dev/null
+++ b/hound-search.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-search
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-search
+ExecStartPre=/usr/bin/docker rm hound-search
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6080:6080 --name hound-search -v 
/srv/codesearch/hound-search:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-search
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-skins.service b/hound-skins.service
new file mode 100644
index 000..3943f83
--- /dev/null
+++ b/hound-skins.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-skins
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-skins
+ExecStartPre=/usr/bin/docker rm hound-skins
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6082:6080 --name hound-skins -v 
/srv/codesearch/hound-skins:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-skins
+
+[Install]
+WantedBy=multi-user.target
diff --git a/hound-things.service b/hound-things.service
new file mode 100644
index 000..cccae97
--- /dev/null
+++ b/hound-things.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-things
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-things
+ExecStartPre=/usr/bin/docker rm hound-things
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6083:6080 --name hound-things -v 
/srv/codesearch/hound-things:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-things
+
+[Install]
+WantedBy=multi-user.target
diff --git a/start.sh b/start.sh
index a03d9b1..7e0e29e 100755
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-docker run -d -p 6080:6080 --name hound-search -v /srv/codesearch/search:/data 
etsy/hound
-docker run -d -p 6081:6080 --name hound-extensions -v 
/srv/codesearch/extensions:/data etsy/hound
-docker run -d -p 6082:6080 --name hound-skins -v /srv/codesearch/skins:/data 
etsy/hound
-docker run -d -p 6083:6080 --name hound-things -v /srv/codesearch/things:/data 
etsy/hound
-docker run -d -p 6084:6080 --name hound-core -v /srv/codesearch/core:/data 
etsy/hound
+systemctl start hound-search
+systemctl start hound-core
+systemctl start hound-extensions
+systemctl start hound-skins
+systemctl start hound-things
diff --git a/write_config.py b/write_config.py
index 772dca6..b1d836b 100755
--- a/write_config.py
+++ b/write_config.py
@@ -83,11 +83,11 @@
 
 
 def main():
-

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Inline lists in new print styles should not have a smaller f...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Inline lists in new print styles should not have a smaller font 
size than surrounding content
..


Inline lists in new print styles should not have a smaller font size than 
surrounding content

Bug: T178667
Change-Id: I2a9bc621db5a09cb5a5653488e0f9dd6c236a773
---
M print.less
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/print.less b/print.less
index f54e677..9e7069e 100644
--- a/print.less
+++ b/print.less
@@ -148,6 +148,12 @@
li {
padding: 2px 0;
font-size: 10pt;
+
+   // T178667: Inline lists in new print styles should not
+   // have a smaller font size than surrounding content
+   table & {
+   font-size: inherit;
+   }
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a9bc621db5a09cb5a5653488e0f9dd6c236a773
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Eflyjason 
Gerrit-Reviewer: Eflyjason 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: make-release: Pylint basically everything

2017-12-20 Thread Chad (Code Review)

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

Change subject: make-release: Pylint basically everything
..

make-release: Pylint basically everything

Change-Id: I0b3c7302b63f9b66e6bfab46fbce9fc50b3bb26c
---
R make-release/makerelease
1 file changed, 188 insertions(+), 201 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/50/399550/1

diff --git a/make-release/make-release.py b/make-release/makerelease
similarity index 61%
rename from make-release/make-release.py
rename to make-release/makerelease
index 89ce180..9ded8bf 100755
--- a/make-release/make-release.py
+++ b/make-release/makerelease
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # vim:sw=4:ts=4:et:
-from __future__ import print_function
 """
 Helper to generate a MediaWiki tarball.
 
@@ -9,7 +8,7 @@
 
 If no arguments are given, a snapshot is created.
 """
-
+from __future__ import print_function
 import argparse
 import glob
 import logging
@@ -44,7 +43,6 @@
 help='version that came before')
 
 # Optional arguments:
-
 log_options = parser.add_mutually_exclusive_group()
 log_options.add_argument(
 '--debug', dest='log_level',
@@ -96,13 +94,13 @@
 """Abstract out a MediaWiki version"""
 
 def __init__(self, version):
-decomposed = self.decomposeVersion(version)
+decomposed = self.decompose(version)
 
 self.raw = version
 self.major = decomposed.get('major', None)
 self.branch = decomposed.get('branch', None)
 self.tag = decomposed.get('tag', None)
-self.prev_version = decomposed.get('prevVersion', None)
+self.prev_version = decomposed.get('prev_version', None)
 self.prev_tag = decomposed.get('prevTag', None)
 
 # alpha / beta / rc ..
@@ -126,7 +124,7 @@
 self.branch
 )
 
-def decomposeVersion(self, version):
+def decompose(self, version):
 """Split a version number to branch / major
 
 Whenever a version is recognized, a dict is returned with keys:
@@ -134,7 +132,7 @@
 - minor
 - branch
 - tag
-- prevVersion
+- prev_version
 - prevTag
 
 When one or more letters are found after the minor version we consider
@@ -156,7 +154,7 @@
 'tag': 'master',
 }
 
-m = re.compile(r"""
+matches = re.compile(r"""
 (?P(?P\d+)\.(?P\d+))
 \.
 (?P\d+)
@@ -166,11 +164,11 @@
 )?
 """, re.X).match(version)
 
-if m is None:
+if matches is None:
 raise ValueError('%s is in the wrong format' % version)
 
 # Clear out unneed phase/cycle
-ret = dict((k, v) for k, v in m.groupdict().iteritems()
+ret = dict((k, v) for k, v in matches.groupdict().iteritems()
if v is not None)
 
 ret['branch'] = 'REL%s_%s' % (
@@ -193,7 +191,7 @@
 ret.get('phase', ''),
 ret.get('cycle', '')
 )
-elif('phase' in ret):
+elif 'phase' in ret:
 ret['tag'] = 'tags/%s.%s-%s.%s' % (
 ret['major'],
 ret['minor'],
@@ -211,14 +209,14 @@
 ret['minor']
 )
 
-last = m.group(m.lastindex)
+last = matches.group(matches.lastindex)
 if last != '' and int(last) == 0:
-ret['prevVersion'] = None
+ret['prev_version'] = None
 ret['prevTag'] = None
 return ret
 
-bits = [d for d in m.groups('')]
-last = m.lastindex - 3
+bits = [d for d in matches.groups('')]
+last = matches.lastindex - 3
 del bits[1]
 del bits[1]
 
@@ -229,38 +227,34 @@
 bits[1] == '0' and
 (bits[2] == 'rc' and
  bits[3] == '0'))):
-ret['prevVersion'] = '%s.%s%s%s' % tuple(bits)
+ret['prev_version'] = '%s.%s%s%s' % tuple(bits)
 elif 'phase' in ret:
-ret['prevVersion'] = '%s.%s-%s.%s' % tuple(bits)
+ret['prev_version'] = '%s.%s-%s.%s' % tuple(bits)
 else:
-ret['prevVersion'] = '%s.%s' % (bits[0], bits[1])
+ret['prev_version'] = '%s.%s' % (bits[0], bits[1])
 
-ret['prevTag'] = 'tags/' + ret['prevVersion']
+ret['prevTag'] = 'tags/' + ret['prev_version']
 
 return ret
 
 
 class MakeRelease(object):
 """Surprisingly: do a MediaWiki release"""
-
-options = None
-version = None  # MwVersion object
-config = None
-
-def __init__(self, options):
-if options.version is None:
+def __init__(self, ops):
+if ops.version is None:
 self.version = MwVersion.new_snapshot()
 else:
-self.version =

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Avoid use of $wgOut global in UserProfilePage

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Avoid use of $wgOut global in UserProfilePage
..


Avoid use of $wgOut global in UserProfilePage

Change-Id: I688e9537a9aac0e473ff56bd8593141e04f6d07f
---
M UserProfile/UserProfilePage.php
1 file changed, 40 insertions(+), 30 deletions(-)

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



diff --git a/UserProfile/UserProfilePage.php b/UserProfile/UserProfilePage.php
index 3e7fdcb..1dff618 100644
--- a/UserProfile/UserProfilePage.php
+++ b/UserProfile/UserProfilePage.php
@@ -79,9 +79,10 @@
}
 
function view() {
-   global $wgOut;
+   $context = $this->getContext();
+   $out = $context->getOutput();
 
-   $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+   $out->setPageTitle( $this->mTitle->getPrefixedText() );
 
// No need to display noarticletext, we use our own message
if ( !$this->user_id ) {
@@ -89,9 +90,9 @@
return '';
}
 
-   $wgOut->addHTML( '' );
-   $wgOut->addHTML( $this->getProfileTop( $this->user_id, 
$this->user_name ) );
-   $wgOut->addHTML( '' );
+   $out->addHTML( '' );
+   $out->addHTML( $this->getProfileTop( $this->user_id, 
$this->user_name ) );
+   $out->addHTML( '' );
 
// User does not want social profile for User:user_name, so we 
just
// show header + page content
@@ -106,7 +107,7 @@
}
 
// Left side
-   $wgOut->addHTML( '' );
+   $out->addHTML( '' );
 
// Avoid PHP 7.1 warning of passing $this by reference
$userProfilePage = $this;
@@ -115,44 +116,44 @@
wfDebug( __METHOD__ . ": UserProfileBeginLeft messed up 
profile!\n" );
}
 
-   $wgOut->addHTML( $this->getRelationships( $this->user_name, 1 ) 
);
-   $wgOut->addHTML( $this->getRelationships( $this->user_name, 2 ) 
);
-   $wgOut->addHTML( $this->getGifts( $this->user_name ) );
-   $wgOut->addHTML( $this->getAwards( $this->user_name ) );
-   $wgOut->addHTML( $this->getCustomInfo( $this->user_name ) );
-   $wgOut->addHTML( $this->getInterests( $this->user_name ) );
-   $wgOut->addHTML( $this->getFanBoxes( $this->user_name ) );
-   $wgOut->addHTML( $this->getUserStats( $this->user_id, 
$this->user_name ) );
+   $out->addHTML( $this->getRelationships( $this->user_name, 1 ) );
+   $out->addHTML( $this->getRelationships( $this->user_name, 2 ) );
+   $out->addHTML( $this->getGifts( $this->user_name ) );
+   $out->addHTML( $this->getAwards( $this->user_name ) );
+   $out->addHTML( $this->getCustomInfo( $this->user_name ) );
+   $out->addHTML( $this->getInterests( $this->user_name ) );
+   $out->addHTML( $this->getFanBoxes( $this->user_name ) );
+   $out->addHTML( $this->getUserStats( $this->user_id, 
$this->user_name ) );
 
if ( !Hooks::run( 'UserProfileEndLeft', array( 
&$userProfilePage ) ) ) {
wfDebug( __METHOD__ . ": UserProfileEndLeft messed up 
profile!\n" );
}
 
-   $wgOut->addHTML( '' );
+   $out->addHTML( '' );
 
wfDebug( "profile start right\n" );
 
// Right side
-   $wgOut->addHTML( '' 
);
+   $out->addHTML( '' );
 
if ( !Hooks::run( 'UserProfileBeginRight', array( 
&$userProfilePage ) ) ) {
wfDebug( __METHOD__ . ": UserProfileBeginRight messed 
up profile!\n" );
}
 
-   $wgOut->addHTML( $this->getPersonalInfo( $this->user_id, 
$this->user_name ) );
-   $wgOut->addHTML( $this->getActivity( $this->user_name ) );
+   $out->addHTML( $this->getPersonalInfo( $this->user_id, 
$this->user_name ) );
+   $out->addHTML( $this->getActivity( $this->user_name ) );
// Hook for BlogPage
if ( !Hooks::run( 'UserProfileRightSideAfterActivity', array( 
$this ) ) ) {
wfDebug( __METHOD__ . ": 
UserProfileRightSideAfterActivity hook messed up profile!\n" );
}
-   $wgOut->addHTML( $this->getCasualGames( $this->user_id, 
$this->user_name ) );
-   $wgOut->addHTML( $this->getUserBoard( $this->user_id, 
$this->user_name ) );
+   $out->addHTML( $this->getCasualGames( $this->user_id, 
$this->user_name ) );
+   $out->addHTML( $this->getUserBoard( $this->user_id, 
$this->user_name ) );
 
if ( !Hooks::run(

[MediaWiki-commits] [Gerrit] mediawiki...RegexBlock[master]: Replace deprecated use of IP::isValidBlock with isValidRange

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated use of IP::isValidBlock with isValidRange
..


Replace deprecated use of IP::isValidBlock with isValidRange

`IP::isValidBlock` has been deprecated since 1.30.0.

Change-Id: Ic1e80a76cba77fca0ecafcab25f9ef09ef210781
---
M extension.json
M includes/specials/SpecialRegexBlock.php
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index bc52e69..8c703ce 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "RegexBlock",
-   "version": "1.4.4",
+   "version": "1.4.5",
"author": [
"Bartek Łapiński",
"Tomasz Klim",
@@ -13,6 +13,9 @@
"url": "https://www.mediawiki.org/wiki/Extension:RegexBlock;,
"descriptionmsg": "regexblock-desc",
"type": "antispam",
+   "requires": {
+   "MediaWiki": ">= 1.30.0"
+   },
"config": {
"ContactLink": "Special:Contact",
"RegexBlockDatabase": false
diff --git a/includes/specials/SpecialRegexBlock.php 
b/includes/specials/SpecialRegexBlock.php
index 4e42432..75bc7c2 100644
--- a/includes/specials/SpecialRegexBlock.php
+++ b/includes/specials/SpecialRegexBlock.php
@@ -676,7 +676,7 @@
Block::TYPE_IP
];
 
-   } elseif ( IP::isValidBlock( $target ) ) {
+   } elseif ( IP::isValidRange( $target ) ) {
# Can't create a User from an IP range
return [ IP::sanitizeRange( $target ), 
Block::TYPE_RANGE ];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1e80a76cba77fca0ecafcab25f9ef09ef210781
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RegexBlock
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Added MinusX Support

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Added MinusX Support
..


Added MinusX Support

Bug: T175794
Change-Id: I377e3e0c20c944a79ec4eb7dec34680270b7671d
---
M MediaWikiChat.js
M composer.json
2 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/MediaWikiChat.js b/MediaWikiChat.js
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..7d306d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I377e3e0c20c944a79ec4eb7dec34680270b7671d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: UltrasonicNXT 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: deploy1001: switch to use stretch installer

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: deploy1001: switch to use stretch installer
..


deploy1001: switch to use stretch installer

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 3897d35..9751eda 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1792,6 +1792,8 @@
 host deploy1001 {
 hardware ethernet 18:66:DA:5F:CF:1F;
 fixed-address deploy1001.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host druid1001 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab830c970ee0639173bb60f3fdef4285c2a9234e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
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] operations/puppet[production]: deploy1001: switch to use stretch installer

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: deploy1001: switch to use stretch installer
..

deploy1001: switch to use stretch installer

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/399549/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 3897d35..9751eda 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1792,6 +1792,8 @@
 host deploy1001 {
 hardware ethernet 18:66:DA:5F:CF:1F;
 fixed-address deploy1001.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host druid1001 {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PasswordBlacklist[master]: Initial implementation of the PasswordBlacklist

2017-12-20 Thread Reedy (Code Review)

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

Change subject: Initial implementation of the PasswordBlacklist
..

Initial implementation of the PasswordBlacklist

Implemented using a Bloom Filter from pleonasm/bloom-filter [1]

Password list source came from GitHub [2]

[1] https://github.com/pleonasm/bloom-filter
[2] 
https://github.com/danielmiessler/SecLists/blob/aad07ff/Passwords/10_million_password_list_top_10.txt

Change-Id: I2a8f8bd4fd73982e7ef6921ac93ae6e3e87bcfa1
---
M README.md
M composer.json
A scripts/data/10_million_password_list_top_10.txt
A scripts/generate.php
M src/PasswordBlacklist.php
A src/blacklist.json
M tests/PasswordBlacklistTest.php
7 files changed, 100,118 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/PasswordBlacklist 
refs/changes/48/399548/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a8f8bd4fd73982e7ef6921ac93ae6e3e87bcfa1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/PasswordBlacklist
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

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

2017-12-20 Thread jenkins-bot (Code Review)

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

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


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

+ 994a789bcee7766c404d2f609c40c917bdb9e3de Pass in skip_greeting_proceessing 
param
+ 90b7dd4d67a4110fe86a79251aa3de963885b383 Update CiviCRM submodule
bd3fadb CRM-21551 Add parameter to support skipping processing greetings 
when calling api contact.create
fc9dc65 Fix for CRM-21180: Inline changes to custom fields aren't reflected 
in custom greetings.
ad68507 Greetings fixes (already upstreamed)
4ded9af Greetings fixes to support contact type change.

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

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




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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix target detection for jquery.textSelection overrides

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix target detection for jquery.textSelection overrides
..


Fix target detection for jquery.textSelection overrides

CM intercepted textSelection() globally but assumed
nobody will ever need to call it for anything but wpTexbox1.
Thus, attempts to get edit summary returned article text.
Lots of things can probably be fixed in this area, but here's
the beginning.

Bug: T177175
Bug: T179287

Depends-On: I113394a473e8fe534f17815676ec7014203db7d6
Change-Id: I72d7d72b2a891a0ad242a565dddc076fa6dd1bd1
---
M resources/ext.CodeMirror.js
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 03a84f0..4ab2a72 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -1,6 +1,6 @@
 ( function ( mw, $ ) {
var origTextSelection, useCodeMirror, codeMirror, api, 
originHooksTextarea,
-   wikiEditorToolbarEnabled, enableContentEditable = true;
+   wikiEditorToolbarEnabled, enableContentEditable = true, textBox;
 
if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the 
CodeEditor is used then just exit;
return;
@@ -54,7 +54,9 @@
function cmTextSelection( command, options ) {
var fn, retval;
 
-   if ( !codeMirror ) {
+   if ( !codeMirror ||
+   ( this[ 0 ] !== textBox && this[ 0 ] !== 
codeMirror.getWrapperElement() )
+   ) {
return origTextSelection.call( this, command, options );
}
 
@@ -325,6 +327,7 @@
} );
 
$codeMirror = $( codeMirror.getWrapperElement() );
+   textBox = $textbox1[ 0 ];
 
$codeMirror.resizable( {
handles: 'se',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72d7d72b2a891a0ad242a565dddc076fa6dd1bd1
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CharInsert[master]: Add CodeMirror support

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Add CodeMirror support
..


Add CodeMirror support

CM uses ContentEditable divs on every browser other
than Firefox so CharInsert needs to work with these.
Not using a generic [contenteditable] selector because
not every surface supports jquery.textSelection.

Works with I72d7d72b2a891a0ad242a565dddc076fa6dd1bd1

Bug: T179287
Change-Id: I113394a473e8fe534f17815676ec7014203db7d6
---
M modules/ext.charinsert.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.charinsert.js b/modules/ext.charinsert.js
index 78de492..dcfa6c3 100644
--- a/modules/ext.charinsert.js
+++ b/modules/ext.charinsert.js
@@ -2,7 +2,7 @@
var addClickHandlers = function ( $content ) {
var $currentFocused = $( 'wpTextbox1' );
// Apply to dynamically created textboxes as well as normal ones
-   $( document ).on( 'focus', 'textarea, input:text', function () {
+   $( document ).on( 'focus', 'textarea, input:text, .CodeMirror', 
function () {
$currentFocused = $( this );
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I113394a473e8fe534f17815676ec7014203db7d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

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

2017-12-20 Thread Eileen (Code Review)

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

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

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

+ 994a789bcee7766c404d2f609c40c917bdb9e3de Pass in skip_greeting_proceessing 
param
+ 90b7dd4d67a4110fe86a79251aa3de963885b383 Update CiviCRM submodule
bd3fadb CRM-21551 Add parameter to support skipping processing greetings 
when calling api contact.create
fc9dc65 Fix for CRM-21180: Inline changes to custom fields aren't reflected 
in custom greetings.
ad68507 Greetings fixes (already upstreamed)
4ded9af Greetings fixes to support contact type change.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/47/399547/1


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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add support for namespaces

2017-12-20 Thread Smalyshev (Code Review)

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

Change subject: Add support for namespaces
..

Add support for namespaces

TODO: not supported in embed, as of yet, and not in query string.

Bug: T176190
Change-Id: I8044f69c04782c4b11988cdf800a5c2948a59689
---
M embed.html
M i18n/en.json
M i18n/qqq.json
M index.html
M wikibase/config.js
M wikibase/init.js
M wikibase/queryService/RdfNamespaces.js
M wikibase/queryService/api/Sparql.js
M wikibase/queryService/ui/App.js
9 files changed, 65 insertions(+), 12 deletions(-)


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

diff --git a/embed.html b/embed.html
index 72cbf8a..874a33a 100644
--- a/embed.html
+++ b/embed.html
@@ -266,7 +266,7 @@
$( document ).ready( function() {
var config = CONFIG,
lang = Cookies.get( 'lang' ) ? Cookies.get( 
'lang' ) : config.language,
-   sparqlApi = new 
wikibase.queryService.api.Sparql( config.api.sparql.uri, lang ),
+   sparqlApi = new 
wikibase.queryService.api.Sparql( config.api.sparql.uri, lang, 
config.api.sparql.base ),
resultView = new 
wikibase.queryService.ui.ResultView( sparqlApi ),
query = decodeURIComponent( 
window.location.hash.substr( 1 ) );
 
diff --git a/i18n/en.json b/i18n/en.json
index bc27b7a..0c31331 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -83,5 +83,6 @@
 "wdqs-result-map-layers-all": "All layers",
 "wdqs-result-map-progress": "Loading map data: $1%",
 "wdqs-embed-button-edit-query": "Edit this query",
-"wdqs-embed-button-edit-query-title": "Edit this query with the SPARQL 
editor"
+"wdqs-embed-button-edit-query-title": "Edit this query with the SPARQL 
editor",
+"wdqs-namespace-label": "Namespace:"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2921354..217733c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -85,5 +85,6 @@
"wdqs-result-map-layers-all": "Label for all layers in layer control on 
map view",
"wdqs-result-map-progress": "Message while loading data for the map 
view. $1 is a percentage from 0 to 100.",
"wdqs-embed-button-edit-query": "Label for button in embed",
-   "wdqs-embed-button-edit-query-title": "Title for button in embed"
+   "wdqs-embed-button-edit-query-title": "Title for button in embed",
+   "wdqs-namespace-label": "Label for namespace selector"
 }
diff --git a/index.html b/index.html
index e2170ab..abee5c4 100644
--- a/index.html
+++ b/index.html
@@ -101,6 +101,12 @@



+   
+   
+   
+   
+   
+   



diff --git a/wikibase/config.js b/wikibase/config.js
index 68a4a4c..4067c8c 100644
--- a/wikibase/config.js
+++ b/wikibase/config.js
@@ -20,7 +20,9 @@
language: getUserLanguage() || 'en',
api: {
sparql: {
-   uri: '/sparql'
+   uri: '/sparql',
+   base: '/bigdata/',
+   namespaces: [ 'wdq', 'categories' ]
},
wikibase: {
uri: 'https://www.wikidata.org/w/api.php'
@@ -56,8 +58,8 @@
return $.extend( true, {}, configDeploy, {
api: {
sparql: {
-   uri: 'https://query.wikidata.org/sparql'
-
+   uri: 
'https://query.wikidata.org/sparql',
+   base: 
'https://query.wikidata.org/bigdata/'
}
},
i18nLoad: function( lang ) {
diff --git a/wikibase/init.js b/wikibase/init.js
index bc4bddc..aa87faf 100644
--- a/wikibase/init.js
+++ b/wikibase/init.js
@@ -34,7 +34,7 @@
setLanguage( lang, false );
 
var api = new wb.api.Wikibase( config.api.wikibase.uri, 
lang ),
-   sparqlApi = new wb.api.Sparql( 
config.api.sparql.uri, lang ),
+   sparqlApi = new wb.api.Sparql( 
config.api.sparql.uri, lang,

[MediaWiki-commits] [Gerrit] mediawiki...Lockdown[master]: Use Namespace

2017-12-20 Thread MarkAHershberger (Code Review)

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

Change subject: Use Namespace
..

Use Namespace

* Elminate final phpcs warnings
* Use namespace instead of global functions
* Break up NS checking into reusable code
* Credit self

Change-Id: Ief7034bc7b308e3250b4a3241d9bacbc9f49c595
---
M .phpcs.xml
M Lockdown.php
2 files changed, 212 insertions(+), 196 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index 634226c..9292826 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,9 +1,6 @@
 
 
-  
-
-
-  
+  
   .
   
   
diff --git a/Lockdown.php b/Lockdown.php
index 871a667..1e2bcde 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -7,7 +7,9 @@
  * @file
  * @ingroup Extensions
  * @author Daniel Kinzler, brightbyte.de
- * @copyright © 2007 Daniel Kinzler
+ * @author Mark A. Hershberger, NicheWork, LLC
+ * @copyright © 2007, 2016 Daniel Kinzler
+ * @copyright © 2017 NicheWork, LLC
  * @license GNU General Public Licence 2.0 or later
  */
 
@@ -22,6 +24,7 @@
'name' => 'Lockdown',
'author' => [
'Daniel Kinzler',
+   'Mark A. Hershberger',
'Platonides',
'...'
],
@@ -36,217 +39,233 @@
 $wgSpecialPageLockdown = [];
 $wgActionLockdown = [];
 
-$wgHooks['getUserPermissionsErrors'][] = 'lockdownUserPermissionsErrors';
-$wgHooks['MediaWikiPerformAction'][] = 'lockdownMediawikiPerformAction';
-$wgHooks['SearchableNamespaces'][] = 'lockdownSearchableNamespaces';
-$wgHooks['SearchGetNearMatchComplete'][] = 
'lockdownSearchGetNearMatchComplete';
+$wgHooks['getUserPermissionsErrors'][] = 
'Lockdown::onGetUserPermissionsErrors';
+$wgHooks['MediaWikiPerformAction'][] = 'Lockdown::onMediawikiPerformAction';
+$wgHooks['SearchableNamespaces'][] = 'Lockdown::onSearchableNamespaces';
+$wgHooks['SearchGetNearMatchComplete'][]
+   = 'Lockdown::onSearchGetNearMatchComplete';
 
-/**
- * Return an error if the user is locked out of this namespace.
- *
- * @param Title $title that is being requested
- * @param User $user who is requesting
- * @param string $action they are performing
- * @param MessageSpecifier|array|string|bool|null &$result response
- * @return bool
- * @see https://www.mediawiki.org/wiki/Manual:Hooks/getUserPermissionsErrors
- */
-function lockdownUserPermissionsErrors(
-   Title $title,
-   User $user,
-   $action,
-   &$result = null
-) {
-   global $wgNamespacePermissionLockdown, $wgSpecialPageLockdown,
-   $wgWhitelistRead, $wgLang;
+class Lockdown {
 
-   $result = null;
+   /**
+* Fetch an appropriate permission error (or none!)
+*
+* @param Title $title being checked
+* @param User $user whose access is being checked
+* @param string $action being checked
+* @param MessageSpecifier|array|string|bool|null &$result User
+*   permissions error to add. If none, return true. $result can be
+*   returned as a single error message key (string), or an array of
+*   error message keys when multiple messages are needed
+* @return bool
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/getUserPermissionsErrors
+*/
+   public static function onGetUserPermissionsErrors(
+   Title $title,
+   User $user,
+   $action,
+   &$result = null
+   ) {
+   global $wgSpecialPageLockdown, $wgWhitelistRead, $wgLang;
 
-   // don't impose extra restrictions on UI pages
-   if ( $title->isCssJsSubpage() ) {
-   return true;
-   }
+   $result = null;
 
-   if ( $action == 'read' && is_array( $wgWhitelistRead ) ) {
-   // don't impose read restrictions on whitelisted pages
-   if ( in_array( $title->getPrefixedText(), $wgWhitelistRead ) ) {
+   // don't impose extra restrictions on UI pages
+   if ( $title->isCssJsSubpage() ) {
return true;
}
-   }
 
-   $groups = null;
-   $ns = $title->getNamespace();
-   if ( NS_SPECIAL == $ns ) {
-   foreach ( $wgSpecialPageLockdown as $page => $g ) {
-   if ( !$title->isSpecial( $page ) ) {
-   continue;
+   if ( $action == 'read' && is_array( $wgWhitelistRead ) ) {
+   // don't impose read restrictions on whitelisted pages
+   if ( in_array( $title->getPrefixedText(), 
$wgWhitelistRead ) ) {
+   return true;
}
-   $groups = $g;
-   break;
}
-   } else {
-   $groups = @$wgNamespacePermissionLockdown[$ns][$action];
+
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update CiviCRM submodule

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Update CiviCRM submodule
..


Update CiviCRM submodule

bd3fadb CRM-21551 Add parameter to support skipping processing greetings when 
calling api contact.create
fc9dc65 Fix for CRM-21180: Inline changes to custom fields aren't reflected in 
custom greetings.
ad68507 Greetings fixes (already upstreamed)
4ded9af Greetings fixes to support contact type change.

Bug:  T156193
Change-Id: Iadcf4697c10ce8413de0dadb52e3f4803d0546f4
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index b2fab9d..bd3fadb 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b2fab9d9d24b1187e845ec601f4165683278243c
+Subproject commit bd3fadbf3335985e0b7ac425217b05ee5e963f11

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadcf4697c10ce8413de0dadb52e3f4803d0546f4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
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] wikimedia...crm[master]: Update CiviCRM submodule

2017-12-20 Thread Eileen (Code Review)

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

Change subject: Update CiviCRM submodule
..

Update CiviCRM submodule

bd3fadb CRM-21551 Add parameter to support skipping processing greetings when 
calling api contact.create
fc9dc65 Fix for CRM-21180: Inline changes to custom fields aren't reflected in 
custom greetings.
ad68507 Greetings fixes (already upstreamed)
4ded9af Greetings fixes to support contact type change.

Bug:  T156193
Change-Id: Iadcf4697c10ce8413de0dadb52e3f4803d0546f4
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/45/399545/1

diff --git a/civicrm b/civicrm
index b2fab9d..bd3fadb 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b2fab9d9d24b1187e845ec601f4165683278243c
+Subproject commit bd3fadbf3335985e0b7ac425217b05ee5e963f11

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::jobrunner: move firewall includes to role

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: mediawiki::jobrunner: move firewall includes to role
..

mediawiki::jobrunner: move firewall includes to role

Change-Id: I39392adbe87f5de5492bd445c9e14035b4c02110
---
M manifests/site.pp
M modules/role/manifests/mediawiki/jobrunner.pp
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/399543/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 96a2af1..8bb4c47 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1570,13 +1570,11 @@
 # ROW A eqiad jobrunners
 node /^mw1(299|30[0-6])\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 # ROW C eqiad jobrunners
 node /^mw133[4-7]\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 
@@ -1594,7 +1592,6 @@
 # ROW A eqiad jobrunners
 node /^mw13(0[89]|1[01])\.eqiad\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 # ROW A videoscaler
@@ -1647,7 +1644,6 @@
 #mw2153-62 are jobrunners
 node /^mw21(5[3-9]|6[0-2])\.codfw\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 #mw2163-mw2199 are appservers
@@ -1685,7 +1681,6 @@
 # mw2247-2250 are jobrunners
 node /^mw22(4[3789]|50)\.codfw\.wmnet$/ {
 role(mediawiki::jobrunner)
-include ::base::firewall
 }
 
 #mw2251-2253 are api-appservers
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp 
b/modules/role/manifests/mediawiki/jobrunner.pp
index 81abbcc..5e0a434 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -2,6 +2,8 @@
 class role::mediawiki::jobrunner {
 system::role { 'mediawiki::jobrunner': }
 
+include ::profile::base::firewall
+
 # Parent role (we don't use inheritance by choice)
 include ::role::mediawiki::common
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs/labs: move more firewall/standard includes into roles

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: wmcs/labs: move more firewall/standard includes into roles
..

wmcs/labs: move more firewall/standard includes into roles

Change-Id: I42cd6cfd50628b7b96ef479a78162a0c37f4c48b
---
M manifests/site.pp
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.pp
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtest/net.pp
M modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
M modules/role/manifests/wmcs/openstack/labtest/services.pp
M modules/role/manifests/wmcs/openstack/labtest/web.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/horizon.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
M modules/role/manifests/wmcs/openstack/main/services_secondary.pp
M modules/role/manifests/wmcs/openstack/main/wikitech.pp
16 files changed, 28 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/399542/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 96a2af1..7bd0b38 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -135,10 +135,7 @@
 node 'californium.wikimedia.org' {
 role(wmcs::openstack::main::horizon,
   striker::web)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
-
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -906,15 +903,11 @@
 
 node 'labpuppetmaster1001.wikimedia.org' {
 role(wmcs::openstack::main::puppetmaster::frontend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
 node 'labpuppetmaster1002.wikimedia.org' {
 role(wmcs::openstack::main::puppetmaster::backend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -922,15 +915,11 @@
 # and the powerdns auth and recursive services for instances.
 node 'labservices1001.wikimedia.org' {
 role(wmcs::openstack::main::services_primary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
 node 'labservices1002.wikimedia.org' {
 role(wmcs::openstack::main::services_secondary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -947,9 +936,7 @@
 }
 
 node 'labtestmetal2001.codfw.wmnet' {
-# WIP
-include ::standard
-include ::base::firewall
+role(test)
 }
 
 node 'labtestnet2002.codfw.wmnet' {
@@ -957,32 +944,23 @@
 }
 
 node 'labtestneutron2002.codfw.wmnet' {
-# WIP
-include ::standard
-include ::base::firewall
+role(test)
 }
 
 node 'labtestnet2001.codfw.wmnet' {
 role(wmcs::openstack::labtest::net)
-include ::standard
 }
 
 node 'labtestcontrol2001.wikimedia.org' {
 role(wmcs::openstack::labtest::control)
-include ::standard
-include ::base::firewall
 }
 
 node 'labtestcontrol2003.wikimedia.org' {
 role(wmcs::openstack::labtestn::control)
-include ::standard
-include ::base::firewall
 }
 
 node 'labtestpuppetmaster2001.wikimedia.org' {
 role(wmcs::openstack::labtest::puppetmaster::frontend)
-include ::standard
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -994,7 +972,6 @@
 
 node /labtestservices200[23]\.wikimedia\.org/ {
 role(wmcs::openstack::labtestn::services)
-include ::base::firewall
 interface::add_ip6_mapped { 'main': }
 }
 
@@ -1134,14 +,11 @@
 }
 
 node /labcontrol100[34]\.wikimedia\.org/ {
-include ::base::firewall
-include ::standard
+role(test)
 }
 
 node 'labcontrol1001.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1153,8 +1127,6 @@
 #  'keystone endpoint-create' and 'keystone endpoint-delete.'
 node 'labcontrol1002.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1164,7 +1136,6 @@
 node 'labtestweb2001.wikimedia.org' {
 role(wmcs::openstack::labtest::web,
   mariadb::wikitech)
-include ::base::firewall
 include ::ldap::role::client::labs
 
 interface::add_ip6_mapped { 'main': }
@@ -1262,14 +1233,12 @@
 
 node 'labstore2003.codfw.wmnet' {
 role(labs::nfs::secondary_backup::tools)
-include ::standard
 # Do not enable yet
 # include ::base::firewall
 }
 
 node 'labstore2004.codfw.wmnet' {
 role(labs::nfs::secondary_backup::misc)
-include ::standard
 # Do not enable yet

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: [WIP] Unit tests for reading lists

2017-12-20 Thread Sharvaniharan (Code Review)

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

Change subject: [WIP] Unit tests for reading lists
..

[WIP] Unit tests for reading lists

- Created instrumented tests for dbHelper
- Tests created for code test coverage

todo: higher level tests for testing functionality w.r.t the app logic

Bug: T183169
Change-Id: I75307babfe4914ac6bbe840963d0fca94dcf13f6
---
A 
app/src/androidTest/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
1 file changed, 54 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
 
b/app/src/androidTest/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
new file mode 100644
index 000..100dc11
--- /dev/null
+++ 
b/app/src/androidTest/java/org/wikipedia/readinglist/database/ReadingListDbHelperTest.java
@@ -0,0 +1,54 @@
+package org.wikipedia.readinglist.database;
+
+import junit.framework.Assert;
+
+import org.junit.experimental.theories.Theory;
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.page.PageTitle;
+import org.wikipedia.test.view.ViewTest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReadingListDbHelperTest extends ViewTest {
+private ReadingListDbHelper readingListDbHelper = 
ReadingListDbHelper.instance();
+
+@Theory
+public void testForCodeCoverage() {
+List list = readingListDbHelper.getAllLists();
+for (ReadingList readingList : list) {
+readingListDbHelper.deleteList(readingList);
+}
+list = readingListDbHelper.getAllLists();
+Assert.assertTrue(list.size() == 0);
+readingListDbHelper.createList("dummy", "This is a dummy");
+Assert.assertTrue(readingListDbHelper.getAllLists().size() == 1);
+list = readingListDbHelper.getAllLists();
+ReadingList readingList = list.get(0);
+Assert.assertEquals(readingList.title(), "dummy");
+readingList.title("dummy update");
+readingListDbHelper.updateList(readingList);
+list = readingListDbHelper.getAllLists();
+readingList = list.get(0);
+Assert.assertEquals(readingList.title(), "dummy update");
+PageTitle pageTitle = new PageTitle("Barack Obama", 
WikipediaApp.getInstance().getWikiSite());
+List readingListPages = new ArrayList<>();
+readingListPages.add(new ReadingListPage(pageTitle));
+readingListDbHelper.addPagesToList(readingList, readingListPages);
+Assert.assertTrue(readingListDbHelper.findPageInAnyList(pageTitle) != 
null);
+Assert.assertTrue(readingListDbHelper.pageExistsInList(readingList, 
pageTitle));
+readingListDbHelper.createList("dummy2", "This is a dummy2");
+
readingListDbHelper.addPagesToList(readingListDbHelper.getAllLists().get(1), 
readingListPages);
+readingListDbHelper.createList("dummy3", "This is a dummy3");
+
Assert.assertTrue(readingListDbHelper.getAllListsWithoutContents().size() == 3);
+List pageTitlesList = new ArrayList<>();
+pageTitlesList.add(pageTitle);
+
Assert.assertTrue(readingListDbHelper.addPagesToListIfNotExist(readingList, 
pageTitlesList) == 0);
+Assert.assertTrue(readingListDbHelper.getRandomPage() != null && 
readingListDbHelper.getRandomPage() instanceof ReadingListPage);
+   
/*Assert.assertTrue(readingListDbHelper.getAllPageOccurrences(pageTitle).size() 
== 2); //returning 1
+   
Assert.assertTrue(readingListDbHelper.getListsFromPageOccurrences(readingListPages).size()
 == 2); // returning 22*/
+for (ReadingList readingListToDel : readingListDbHelper.getAllLists())
+readingListDbHelper.deleteList(readingListToDel);
+Assert.assertTrue(readingListDbHelper.getAllLists().size() == 0);
+}
+}
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuTagMultiselectWidget: Erase the input when tag is select...

2017-12-20 Thread Mooeypoo (Code Review)

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

Change subject: MenuTagMultiselectWidget: Erase the input when tag is selected 
if filtering
..

MenuTagMultiselectWidget: Erase the input when tag is selected if filtering

In the case where the menu filters from the input, we want to make sure
that the input is nulled out when tag is selected, so the menu item
can be visible even if it was previously filtering based on some string.

Bug: T183378
Change-Id: I3e143af1527d3c54e4aa46398dc5e36f95763699
---
M src/widgets/MenuTagMultiselectWidget.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/39/399539/1

diff --git a/src/widgets/MenuTagMultiselectWidget.js 
b/src/widgets/MenuTagMultiselectWidget.js
index f1eaeb6..d018c82 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -136,6 +136,11 @@
// but in our case, we want to utilize the menu selection behavior, and
// definitely not remove the item.
 
+   // If there is an input that is used for filtering, erase the value so 
we don't filter
+   if ( this.hasInput && this.menu.filterFromInput ) {
+   this.input.setValue( '' );
+   }
+
// Select the menu item
this.menu.selectItem( menuItem );
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Show offline message card when device is offline

2017-12-20 Thread Cooltey (Code Review)

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

Change subject: Show offline message card when device is offline
..

Show offline message card when device is offline

 - Add a offline message card with Retry button

Bug: T183308
Change-Id: I9cccf23bf52d016b1d2690bdd93f04aea2c67221
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
A app/src/main/java/org/wikipedia/feed/offline/OfflineCardClient.java
2 files changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 1d4a040..35f7454 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -5,6 +5,7 @@
 
 import org.wikipedia.feed.aggregated.AggregatedFeedContentClient;
 import org.wikipedia.feed.announcement.AnnouncementClient;
+import org.wikipedia.feed.offline.OfflineCardClient;
 import org.wikipedia.feed.offline.OfflineCompilationClient;
 import org.wikipedia.feed.onboarding.OnboardingClient;
 import org.wikipedia.feed.searchbar.SearchClient;
@@ -41,5 +42,8 @@
 for (FeedContentType contentType : orderedContentTypes) {
 addPendingClient(contentType.newClient(aggregatedClient, age, 
online));
 }
+
+conditionallyAddPendingClient(new OfflineCardClient(), age == 0 && 
!online);
+
 }
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/offline/OfflineCardClient.java 
b/app/src/main/java/org/wikipedia/feed/offline/OfflineCardClient.java
new file mode 100644
index 000..8b3e240
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/offline/OfflineCardClient.java
@@ -0,0 +1,11 @@
+package org.wikipedia.feed.offline;
+
+import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.feed.dataclient.DummyClient;
+import org.wikipedia.feed.model.Card;
+
+public class OfflineCardClient extends DummyClient {
+@Override public Card getNewCard(WikiSite wiki) {
+return new OfflineCard();
+}
+}

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

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

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

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

2017-12-20 Thread Noella94 (Code Review)

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

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

Putting MassMessage Extension in PHP namespace MediaWiki\MassMessage

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

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


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

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

[MediaWiki-commits] [Gerrit] mediawiki...GoogleDocTag[master]: Add minus-x to "composer test"

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Add minus-x to "composer test"
..


Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Ic70cf01ba0034bb108b7f7b6def89a66c0392a02
---
M GoogleDocTag.body.php
M GoogleDocTag.php
M composer.json
3 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/GoogleDocTag.body.php b/GoogleDocTag.body.php
old mode 100755
new mode 100644
diff --git a/GoogleDocTag.php b/GoogleDocTag.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..dfca38b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic70cf01ba0034bb108b7f7b6def89a66c0392a02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleDocTag
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add collation for Abkhaz (ab)

2017-12-20 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399537 )

Change subject: Add collation for Abkhaz (ab)
..

Add collation for Abkhaz (ab)

* Adding new class AbkhazUppercaseCollation, mapped to 'uppercase-ab'.
* Extended CustomUppercaseCollation with support for sorting digraphs
  and for alphabets larger than 64 letters (up to 4096).

Bug: T183430
Change-Id: I16d44568e44d7ef5b39c38b1a6257b9fe10a34d4
---
M autoload.php
A includes/collation/AbkhazUppercaseCollation.php
M includes/collation/Collation.php
M includes/collation/CustomUppercaseCollation.php
M tests/phpunit/includes/collation/CustomUppercaseCollationTest.php
5 files changed, 129 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/399537/1

diff --git a/autoload.php b/autoload.php
index 6b8387b..4967668 100644
--- a/autoload.php
+++ b/autoload.php
@@ -4,6 +4,7 @@
 global $wgAutoloadLocalClasses;
 
 $wgAutoloadLocalClasses = [
+   'AbkhazUppercaseCollation' => __DIR__ . 
'/includes/collation/AbkhazUppercaseCollation.php',
'APCBagOStuff' => __DIR__ . 
'/includes/libs/objectcache/APCBagOStuff.php',
'APCUBagOStuff' => __DIR__ . 
'/includes/libs/objectcache/APCUBagOStuff.php',
'AbstractContent' => __DIR__ . '/includes/content/AbstractContent.php',
diff --git a/includes/collation/AbkhazUppercaseCollation.php 
b/includes/collation/AbkhazUppercaseCollation.php
new file mode 100644
index 000..e0ea237
--- /dev/null
+++ b/includes/collation/AbkhazUppercaseCollation.php
@@ -0,0 +1,93 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 1.31
+ *
+ * @file
+ */
+
+class AbkhazUppercaseCollation extends CustomUppercaseCollation {
+
+   public function __construct() {
+   parent::__construct( [
+   'А',
+   'Б',
+   'В',
+   'Г',
+   'Гь',
+   'Гә',
+   'Ҕ',
+   'Ҕь',
+   'Ҕә',
+   'Д',
+   'Дә',
+   'Е',
+   'Ж',
+   'Жь',
+   'Жә',
+   'З',
+   'Ӡ',
+   'Ӡә',
+   'И',
+   'К',
+   'Кь',
+   'Кә',
+   'Қ',
+   'Қь',
+   'Қә',
+   'Ҟ',
+   'Ҟь',
+   'Ҟә',
+   'Л',
+   'М',
+   'Н',
+   'О',
+   'П',
+   'Ҧ',
+   'Р',
+   'С',
+   'Т',
+   'Тә',
+   'Ҭ',
+   'Ҭә',
+   'У',
+   'Ф',
+   'Х',
+   'Хь',
+   'Хә',
+   'Ҳ',
+   'Ҳә',
+   'Ц',
+   'Цә',
+   'Ҵ',
+   'Ҵә',
+   'Ч',
+   'Ҷ',
+   'Ҽ',
+   'Ҿ',
+   'Ш',
+   'Шь',
+   'Шә',
+   'Ы',
+   'Ҩ',
+   'Џ',
+   'Џь',
+   'ь',
+   'ә',
+   ], Language::factory( 'ab' ) );
+   }
+}
diff --git a/includes/collation/Collation.php b/includes/collation/Collation.php
index 7171a21..30cae5a 100644
--- a/includes/collation/Collation.php
+++ b/includes/collation/Collation.php
@@ -65,6 +65,8 @@
return new CollationEt;
case 'xx-uca-fa':
return new CollationFa;
+   case 'uppercase-ab':
+   return new AbkhazUppercaseCollation;
case 'uppercase-ba':
return new BashkirUppercaseCollation;
case 'uppercase-se':
diff --git a/includes/collation/CustomUppercaseCollation.php 
b/includes/collation/CustomUppercaseCollation.php
index 301972d..191d06e 100644
--- a/includes/collation/CustomUppercaseCollation.php
+++ b/includes/collation/CustomUppercaseCollation.php
@@ -32,6 +32,7 @@
  * conflicts with other people using private use area)
  *
  * This does not support fancy things like secondary differences, etc.
+ * (It supports digraphs, trigraphs etc. though.)
  *
  * It is expected most people will subclass this and just override the
  *

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Move the popups to the overlay

2017-12-20 Thread Mooeypoo (Code Review)

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

Change subject: Move the popups to the overlay
..

Move the popups to the overlay

This will solve multiple issues with the design having to overcome
the theme-based design for the #p-tools.

Bug: T156080
Change-Id: Ibfcdfeea649e566059fd88485e146fbad2201016
---
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
M modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
M modules/styles/mw.echo.ui.overlay.monobook.less
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
4 files changed, 16 insertions(+), 15 deletions(-)


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

diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index 73092a7..6e638e7 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -4,12 +4,7 @@
 .mw-echo-ui-notificationBadgeButtonPopupWidget {
position: relative;
 
-   > .oo-ui-popupWidget {
-   // #p-personal li has a font-size of 0.75em, but we want the
-   // font size here to be exactly 0.875em, so we must override
-   // the parent em sizing by dividing.
-   font-size: 0.875em / 0.75em;
-
+   &-popup {
> .oo-ui-popupWidget-popup {
> .oo-ui-popupWidget-head {
height: 3.5em;
diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
index 9f40892..3320c95 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
@@ -4,9 +4,15 @@
text-transform: none;
font-weight: normal;
 
-   &,
-   .oo-ui-popupWidget a.oo-ui-buttonElement-button {
-   color: #333;
+   &-popup {
+   // #p-personal li has a font-size of 0.75em, but we want the
+   // font size here to be exactly 0.875em, so we must override
+   // the parent em sizing by dividing.
+   font-size: 0.875em / 0.75em;
+
+   a.oo-ui-buttonElement-button {
+   color: #333;
+   }
}
 
a {
diff --git a/modules/styles/mw.echo.ui.overlay.monobook.less 
b/modules/styles/mw.echo.ui.overlay.monobook.less
index da3e7d3..280a225 100644
--- a/modules/styles/mw.echo.ui.overlay.monobook.less
+++ b/modules/styles/mw.echo.ui.overlay.monobook.less
@@ -2,7 +2,6 @@
// We need the overlay to be adjusted for:
// #globalWrapper 127%
// .pBody 95%
-   // .portlet ul 95%
// .mw-echo-ui-notificationBadgeButtonPopupWidget > .oo-ui-popupWidget 
0.875/0.75em
-   font-size: 1.27 * 0.95 * 0.95 * 0.875 / 0.75 em;
+   font-size: 1.27 * 0.95 * 0.875 / 0.75em;
 }
diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 1bf9981..77ae15e 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -132,6 +132,7 @@
width: config.popupWidth || 500,
autoClose: true,
containerPadding: 20,
+   $floatableContainer: this.$element,
// Also ignore clicks from the nested action menu 
items, that
// actually exist in the overlay
$autoCloseIgnore: this.$element.add( this.$menuOverlay 
),
@@ -145,6 +146,9 @@
),
classes: [ 
'mw-echo-ui-notificationBadgeButtonPopupWidget-popup' ]
} );
+   // Append the popup to the overlay
+   this.$overlay.append( this.popup.$element );
+
// HACK: Add an icon to the popup head label
this.popupHeadIcon = new OO.ui.IconWidget( { icon: 
config.badgeIcon } );
this.popup.$head.prepend( this.popupHeadIcon.$element );
@@ -186,10 +190,7 @@
'mw-echo-ui-notificationBadgeButtonPopupWidget 
' +

'mw-echo-ui-notificationBadgeButtonPopupWidget-' + adjustedTypeString
)
-   .append(
-   this.badgeButton.$element,
-   this.popup.$element
-   );
+   .append( this.badgeButton.$element );
};
 
/* Initialization */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: Set log level for com.google.gerrit.server.plugins.P...

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: gerrit: Set log level for 
com.google.gerrit.server.plugins.PluginLoader to ERROR
..


gerrit: Set log level for com.google.gerrit.server.plugins.PluginLoader to ERROR

It is spamming the logs with

No Plugin provider was found that handles this file format:
wikimedia-polygerrit-style.html

On gerrit 2.14

Which is because polymer plugins are not supported on 2.14 but it's ok
to have the plugin file in the plugins folder as it is not used just yet.

Also remove plugin_log. It's unneeded as it logs to error_log.

Change-Id: Ic7d8a0e504bff490d1b0db40e09321eca5e0502f
---
M modules/gerrit/templates/log4j.xml.erb
1 file changed, 2 insertions(+), 12 deletions(-)

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



diff --git a/modules/gerrit/templates/log4j.xml.erb 
b/modules/gerrit/templates/log4j.xml.erb
index 22bfe7c..7e3b32f 100644
--- a/modules/gerrit/templates/log4j.xml.erb
+++ b/modules/gerrit/templates/log4j.xml.erb
@@ -47,16 +47,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -161,8 +151,8 @@
 
 
 
-  
-  
+  
+  
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7d8a0e504bff490d1b0db40e09321eca5e0502f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
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] mediawiki...MessageCommons[master]: Added MinusX Support

2017-12-20 Thread Ryan10145 (Code Review)

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

Change subject: Added MinusX Support
..

Added MinusX Support

Bug: T175794
Change-Id: Iaad664ac807038a8256e921694848d766fdd0fbe
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/composer.json b/composer.json
index aebd773..9cc3cdd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minux-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minux-x.php check ."
+   ],
+   "test": [
+   "minus-x.php fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaad664ac807038a8256e921694848d766fdd0fbe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MessageCommons
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Added MinusX Support

2017-12-20 Thread Ryan10145 (Code Review)

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

Change subject: Added MinusX Support
..

Added MinusX Support

Bug: T175794
Change-Id: I377e3e0c20c944a79ec4eb7dec34680270b7671d
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/composer.json b/composer.json
index aebd773..9cc3cdd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minux-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minux-x.php check ."
+   ],
+   "test": [
+   "minus-x.php fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I377e3e0c20c944a79ec4eb7dec34680270b7671d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit replication: don't bother trying to create repos on g...

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: gerrit replication: don't bother trying to create repos on 
github
..


gerrit replication: don't bother trying to create repos on github

A) You can't, and B) the logs are confusing and make it look like
you can.

While we're here, remove silly thread allocations that don't make
sense

Change-Id: I7fc17468dd5dfd8d49143c3c8a679b9c6ea72db1
---
M hieradata/role/common/gerrit.yaml
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/hieradata/role/common/gerrit.yaml 
b/hieradata/role/common/gerrit.yaml
index 0242cc1..7f9abdf 100644
--- a/hieradata/role/common/gerrit.yaml
+++ b/hieradata/role/common/gerrit.yaml
@@ -20,16 +20,15 @@
 gerrit::jetty::replication:
 github:
 url: 'g...@github.com:wikimedia/${name}'
-threads: '4'
 authGroup: 'mediawiki-replication'
 remoteNameStyle: 'dash'
 mirror: true
 push:
 - '+refs/heads/*:refs/heads/*'
 - '+refs/tags/*:refs/tags/*'
+createMissingRepositories: false
 slaves:
 url: 'gerr...@gerrit2001.wikimedia.org:/srv/gerrit/git/${name}.git'
-threads: '4'
 mirror: true
 replicateProjectDeletions: true
 replicateHiddenProjects: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fc17468dd5dfd8d49143c3c8a679b9c6ea72db1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] operations/puppet[production]: ores::stresstest: fix style violations

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: ores::stresstest: fix style violations
..


ores::stresstest: fix style violations

Change-Id: I886ce1075d6a4e121fc5db0db8f2d13c72f81136
---
M modules/role/manifests/ores/stresstest.pp
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/ores/stresstest.pp 
b/modules/role/manifests/ores/stresstest.pp
index 600ec09..b83827f 100644
--- a/modules/role/manifests/ores/stresstest.pp
+++ b/modules/role/manifests/ores/stresstest.pp
@@ -1,7 +1,10 @@
 # Temporary role class for T169246
 class role::ores::stresstest {
+
+system::role { $name: }
+
 include ::standard
-include ::base::firewall
+include ::profile::base::firewall
 
 include ::profile::ores::worker
 include ::profile::ores::web

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit replication: don't bother trying to create repos on g...

2017-12-20 Thread Chad (Code Review)

Hello Hashar,

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

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

to review the following change.


Change subject: gerrit replication: don't bother trying to create repos on 
github
..

gerrit replication: don't bother trying to create repos on github

A) You can't, and B) the logs are confusing and make it look like
you can.

While we're here, remove silly thread allocations that don't make
sense

Change-Id: I7fc17468dd5dfd8d49143c3c8a679b9c6ea72db1
---
M hieradata/role/common/gerrit.yaml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/399533/1

diff --git a/hieradata/role/common/gerrit.yaml 
b/hieradata/role/common/gerrit.yaml
index 0242cc1..7f9abdf 100644
--- a/hieradata/role/common/gerrit.yaml
+++ b/hieradata/role/common/gerrit.yaml
@@ -20,16 +20,15 @@
 gerrit::jetty::replication:
 github:
 url: 'g...@github.com:wikimedia/${name}'
-threads: '4'
 authGroup: 'mediawiki-replication'
 remoteNameStyle: 'dash'
 mirror: true
 push:
 - '+refs/heads/*:refs/heads/*'
 - '+refs/tags/*:refs/tags/*'
+createMissingRepositories: false
 slaves:
 url: 'gerr...@gerrit2001.wikimedia.org:/srv/gerrit/git/${name}.git'
-threads: '4'
 mirror: true
 replicateProjectDeletions: true
 replicateHiddenProjects: true

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Do not pass HHVM_REPO_CENTRAL_PATH to Docker

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Do not pass HHVM_REPO_CENTRAL_PATH to Docker
..


Do not pass HHVM_REPO_CENTRAL_PATH to Docker

HHVM_REPO_CENTRAL_PATH is set centrally in Jenkins to point to the build
workspace.  That does not make sense inside a container, so strip it
off.

The HHVM container have a .ini and HHVM_REPO_CENTRAL_PATH env variable
set properly.

Update all -docker jobs.

Bug: T183324
Change-Id: I9d9b5c28ec3de4e41908833272349d16b41a067f
---
M jjb/castor.yaml
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
3 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index f0f0925..3988923 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -64,7 +64,7 @@
  - shell: |
  echo "Clearing $WORKSPACE/cache"
  exec docker run --rm \
- --env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
  --volume "$(pwd)"/cache:/cache \
  'docker-registry.wikimedia.org/releng/castor:0.1.3' 
clear || :
  # nothing else can be executed due to exec
@@ -90,7 +90,7 @@
 - docker-cache-dir
 - shell: |
 exec docker run --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "${WORKSPACE}/cache":/cache \
 docker-registry.wikimedia.org/releng/castor:0.1.3 \
 load
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 61b186b..352b74d 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -46,7 +46,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/log:{logdir} \
 {image}
 # nothing else can be executed due to exec
@@ -66,7 +66,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/log:{logdir} \
 --volume "$(pwd)"/cache:/cache \
 {image}{obj:run_args|}
@@ -82,7 +82,7 @@
 chmod 2777 src
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/log:{logdir} \
 --volume "$(pwd)"/cache:/cache \
 --volume "$(pwd)"/src:/src \
@@ -98,7 +98,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
@@ -116,7 +116,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 6235a03..f408d26 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -431,7 +431,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d9b5c28ec3de4e41908833272349d16b41a067f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] integration/config[master]: Do not pass HHVM_REPO_CENTRAL_PATH to Docker

2017-12-20 Thread Hashar (Code Review)

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

Change subject: Do not pass HHVM_REPO_CENTRAL_PATH to Docker
..

Do not pass HHVM_REPO_CENTRAL_PATH to Docker

HHVM_REPO_CENTRAL_PATH is set centrally in Jenkins to point to the build
workspace.  That does not make sense inside a container, so strip it
off.

The HHVM container have a .ini and HHVM_REPO_CENTRAL_PATH env variable
set properly.

Update all -docker jobs.

Bug: T183324
Change-Id: I9d9b5c28ec3de4e41908833272349d16b41a067f
---
M jjb/castor.yaml
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
3 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/399532/1

diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index f0f0925..3988923 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -64,7 +64,7 @@
  - shell: |
  echo "Clearing $WORKSPACE/cache"
  exec docker run --rm \
- --env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
  --volume "$(pwd)"/cache:/cache \
  'docker-registry.wikimedia.org/releng/castor:0.1.3' 
clear || :
  # nothing else can be executed due to exec
@@ -90,7 +90,7 @@
 - docker-cache-dir
 - shell: |
 exec docker run --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "${WORKSPACE}/cache":/cache \
 docker-registry.wikimedia.org/releng/castor:0.1.3 \
 load
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 61b186b..352b74d 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -46,7 +46,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/log:{logdir} \
 {image}
 # nothing else can be executed due to exec
@@ -66,7 +66,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/log:{logdir} \
 --volume "$(pwd)"/cache:/cache \
 {image}{obj:run_args|}
@@ -82,7 +82,7 @@
 chmod 2777 src
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/log:{logdir} \
 --volume "$(pwd)"/cache:/cache \
 --volume "$(pwd)"/src:/src \
@@ -98,7 +98,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
@@ -116,7 +116,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 6235a03..f408d26 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -431,7 +431,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Simplify logic to prevent writes on replica DB connections

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Simplify logic to prevent writes on replica DB connections
..


Simplify logic to prevent writes on replica DB connections

This reverts most of 36f4daf32c591d6b7e2435629fc6e431398b641a.

Change-Id: Ie8205749b14be186e80296b168c32310c10ce875
---
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/loadbalancer/ILoadBalancer.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
3 files changed, 2 insertions(+), 41 deletions(-)

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



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 3d40417..15e02ad 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -237,12 +237,6 @@
protected $trxProfiler;
 
/**
-* @var bool Whether writing is allowed on this connection.
-*  Should be false for connections to replicas.
-*/
-   protected $allowWrite = true;
-
-   /**
 * Constructor and database handle and attempt to connect to the DB 
server
 *
 * IDatabase classes should not be constructed directly in external
@@ -283,7 +277,6 @@
$this->connLogger = $params['connLogger'];
$this->queryLogger = $params['queryLogger'];
$this->errorLogger = $params['errorLogger'];
-   $this->allowWrite = empty( $params['noWrite'] );
 
// Set initial dummy domain until open() sets the final 
DB/prefix
$this->currentDomain = DatabaseDomain::newUnspecified();
@@ -915,13 +908,12 @@
}
 
if ( $isWrite ) {
-   if ( !$this->allowWrite ) {
+   if ( $this->getLBInfo( 'replica' ) === true ) {
throw new DBError(
$this,
-   'Write operations are not allowed on 
this database connection!'
+   'Write operations are not allowed on 
replica database connections.'
);
}
-
# In theory, non-persistent writes are allowed in 
read-only mode, but due to things
# like https://bugs.mysql.com/bug.php?id=33669 that 
might not work anyway...
$reason = $this->getReadOnlyReason();
diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
index b565b3b..86c4335 100644
--- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
@@ -87,9 +87,6 @@
/** @var int DB handle should have DBO_TRX disabled and the caller will 
leave it as such */
const CONN_TRX_AUTO = 1;
 
-   /** Disable writing for the given connection. Used internally. Do not 
use with DB_MASTER! */
-   const CONN_NO_WRITE = 2;
-
/**
 * Construct a manager of IDatabase connection objects
 *
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index eb288dd..a9eaa99 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -645,12 +645,6 @@
$oldConnsOpened = $this->connsOpened; // connections open now
 
if ( $i == self::DB_MASTER ) {
-   if ( $flags & self::CONN_NO_WRITE ) {
-   throw new InvalidArgumentException(
-   'Cannot set CONN_NO_WRITE flag on 
master connection!'
-   );
-   }
-
$i = $this->getWriterIndex();
} else {
# Try to find an available server in any the query 
groups (in order)
@@ -661,9 +655,6 @@
break;
}
}
-
-   // Request no-write connection, even if $i == 
$this->getWriterIndex().
-   $flags |= self::CONN_NO_WRITE;
}
 
# Operation-based index
@@ -680,9 +671,6 @@
$this->reportConnectionError();
return null; // not reached
}
-
-   // Request no-write connection, even if $i == 
$this->getWriterIndex().
-   $flags |= self::CONN_NO_WRITE;
}
 
# Now we have an explicit index into the servers array
@@ -803,13 +791,6 @@
// a) those are usually set to implicitly use transaction 
rounds

[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Use the new versions of mocha and eslint and their configs

2017-12-20 Thread Bmansurov (Code Review)

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

Change subject: Use the new versions of mocha and eslint and their configs
..


Use the new versions of mocha and eslint and their configs

Change-Id: Ifa503f878f04c2f1868c3b44c4dcab3c5ed7bf9d
---
M lib/queue.js
M lib/swagger-ui.js
M package.json
M test/mocha.opts
4 files changed, 10 insertions(+), 8 deletions(-)

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



diff --git a/lib/queue.js b/lib/queue.js
index c7fa3f5..5fb4624 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -41,7 +41,7 @@
  */
 constructor(queueOptions, puppeteerOptions, pdfOptions, logger) {
 this._queueObject = asyncQueue(this._worker.bind(this),
-   queueOptions.concurrency);
+queueOptions.concurrency);
 this._puppeteerOptions = puppeteerOptions;
 this._pdfOptions = pdfOptions;
 this._options = queueOptions;
@@ -128,7 +128,7 @@
 {
 msg: 'Queue is full, rejecting the request.',
 id: data.id,
-queueSize: queueSize
+queueSize
 }
 );
 callback(callbackErrors.queueFull, null);
@@ -142,7 +142,7 @@
 {
 msg: 'Job is being added to the queue.',
 id: data.id,
-queueSize: queueSize
+queueSize
 }
 );
 // this time is used for measuring the time task waits in queue
diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
index 9e39ff5..a85985c 100644
--- a/lib/swagger-ui.js
+++ b/lib/swagger-ui.js
@@ -33,7 +33,7 @@
 .replace(/((?:src|href)=['"])/g, '$1?doc=')
 // Some self-promotion
 .replace(//,
-`${app.info.name}`)
+`${app.info.name}`)
 .replace(/[^<]*<\/title>/, 
`${app.info.name}`)
 // Replace the default url with ours, switch off validation &
 // limit the size of documents to apply syntax highlighting to
diff --git a/package.json b/package.json
index 7e5e6df..4e4040c 100644
--- a/package.json
+++ b/package.json
@@ -46,16 +46,17 @@
 "swagger-ui": "git+https://github.com/wikimedia/swagger-ui.git#master;
   },
   "devDependencies": {
+"ajv": "^5.5.0",
 "extend": "^3.0.1",
 "istanbul": "^0.4.5",
 "mocha": "^4.0.1",
 "mocha-jshint": "^2.3.1",
 "mocha-lcov-reporter": "^1.3.0",
 "nsp": "^2.8.1",
-"mocha-eslint": "^3.0.1",
-"eslint": "^3.12.0",
-"eslint-config-node-services": "^2.0.2",
-"eslint-config-wikimedia": "^0.4.0",
+"mocha-eslint": "^4.0.1",
+"eslint": "^4.12.0",
+"eslint-config-node-services": "^2.2.5",
+"eslint-config-wikimedia": "^0.5.0",
 "eslint-plugin-json": "^1.2.0",
 "eslint-plugin-jsdoc": "^3.0.0"
   },
diff --git a/test/mocha.opts b/test/mocha.opts
index 5a2be76..d8a47e6 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,3 @@
 --recursive
 --no-timeouts
+--exit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa503f878f04c2f1868c3b44c4dcab3c5ed7bf9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: fix getMultiWithUnionSetCallback() doc

2017-12-20 Thread Aaron Schulz (Code Review)

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

Change subject: objectcache: fix getMultiWithUnionSetCallback() doc
..

objectcache: fix getMultiWithUnionSetCallback() doc

Change-Id: I5700ff8ccbe2ef3aa6730e20bdc17314bceade42
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/399531/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 36b45a1..562819e 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1374,8 +1374,8 @@
 * This works the same as getWithSetCallback() except:
 *   - a) The $keys argument expects the result of 
WANObjectCache::makeMultiKeys()
 *   - b) The $callback argument expects a callback returning a map of 
(ID => new value)
-*for all entity IDs in $regenById and it takes the following 
arguments:
-*  - $ids: a list of entity IDs to regenerate
+*for all entity IDs in $ids and it takes the following 
arguments:
+*  - $ids: a list of entity IDs that require cache regeneration
 *  - &$ttls: a reference to the (entity ID => new TTL) map
 *  - &$setOpts: a reference to options for set() which can be 
altered
 *   - c) The return value is a map of (cache key => value) in the 
order of $keyedIds

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Catch another double-quote, this may change the behavior of ...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Catch another double-quote, this may change the behavior of the 
three changes feeds.
..


Catch another double-quote, this may change the behavior of the three changes 
feeds.

Change-Id: I9876698af12409ee3cbb8cd95876b9c3bb2342fd
---
M includes/Hooks.php
M tests/phpunit/includes/Hooks/ContributionsHookHandlerTest.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 43c3ec5..cb6b549 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -384,7 +384,7 @@
return;
}
// FIXME: This is not a "filter" but an undocumented side 
effect of this function.
-   $fields['ores_damaging_threshold'] = $dbr->addQuotes( 
$threshold );
+   $fields['ores_damaging_threshold'] = $threshold;
 
if ( $hidenondamaging ) {
// Filter out non-damaging edits.
diff --git a/tests/phpunit/includes/Hooks/ContributionsHookHandlerTest.php 
b/tests/phpunit/includes/Hooks/ContributionsHookHandlerTest.php
index 554ffdf..9f0c9a5 100644
--- a/tests/phpunit/includes/Hooks/ContributionsHookHandlerTest.php
+++ b/tests/phpunit/includes/Hooks/ContributionsHookHandlerTest.php
@@ -74,7 +74,7 @@
],
'fields' => [
'ores_damaging_score' => 
'ores_damaging_cls.oresc_probability',
-   'ores_damaging_threshold' => "'0.16'"
+   'ores_damaging_threshold' => 0.16,
],
'conds' => [],
'join_conds' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9876698af12409ee3cbb8cd95876b9c3bb2342fd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Pass in skip_greeting_proceessing param

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Pass in skip_greeting_proceessing param
..


Pass in skip_greeting_proceessing param

Having moved this skip from a hack to a param we need to pass this in on our
main contact import shim. It doesn't matter if we by-pass it sometimes, this
is for performance rather than for functionality so as
long as we get the main volume q.

Bug: T156193
Change-Id: I14b55e54d18239febf01c93894c62dd68021e8b1
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 9485811..67664cd 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1089,6 +1089,10 @@
 'contact_type' => $msg['contact_type'],
 'contact_source' => $msg['contact_source'],
 'debug' => TRUE,
+// We speed up our imports by passing in this param.
+// going forwards there is scope to a) improve the processing
+// upstream rather than skip & b) not skip for Major Gifts contacts.
+'skip_greeting_processing' => TRUE,
 );
 if (strtolower($msg['contact_type']) !== "organization") {
   foreach (array('first_name', 'last_name', 'middle_name') as $name) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Don't double-quote model version

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Don't double-quote model version
..


Don't double-quote model version

We were inserting extra quotes around model versions, so instead of "0.4.0", we
would have "'0.4.0'".

Note that this change will affect API output, which will no longer have the
version double and single quotes.  Nothing else should be affected because we
refer to the model-version by its primary key internally.

Bug: T183266
Bug: T181848
Change-Id: Ia6b04482761559730db33afb35d6e5f0dc192f1a
---
M maintenance/CheckModelVersions.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/maintenance/CheckModelVersions.php 
b/maintenance/CheckModelVersions.php
index c5f365d..38b60a5 100644
--- a/maintenance/CheckModelVersions.php
+++ b/maintenance/CheckModelVersions.php
@@ -39,13 +39,13 @@
$dbw->upsert( 'ores_model',
[
'oresm_name' => $name,
-   'oresm_version' => $dbw->addQuotes( 
$info['version'] ),
+   'oresm_version' => $info['version'],
'oresm_is_current' => 1,
],
[ 'oresm_name', 'oresm_version' ],
[
'oresm_name' => $name,
-   'oresm_version' => $dbw->addQuotes( 
$info['version'] ),
+   'oresm_version' => $info['version'],
'oresm_is_current' => 1,
],
__METHOD__

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6b04482761559730db33afb35d6e5f0dc192f1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: hhvm set HHVM_REPO_CENTRAL_PATH

2017-12-20 Thread Hashar (Code Review)

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

Change subject: docker: hhvm set HHVM_REPO_CENTRAL_PATH
..


docker: hhvm set HHVM_REPO_CENTRAL_PATH

Set environment variable HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc `php -n`
skips loading /etc/hhvm/php.ini and ends up with a wrong repo.

Disable hhvm.repo.allow_fallback_path

Rebuild affected images and Jenkins jobs.

Bug: T183324
Change-Id: I0a3eebcf50fe1baf4918c0ac653e90ae2f13e049
---
M dockerfiles/composer-hhvm/changelog
M dockerfiles/composer-package-hhvm/changelog
M dockerfiles/composer-test-hhvm/changelog
M dockerfiles/hhvm/Dockerfile.template
M dockerfiles/hhvm/changelog
M dockerfiles/hhvm/hhvm.ini
M jjb/mediawiki.yaml
M jjb/php.yaml
8 files changed, 36 insertions(+), 5 deletions(-)



diff --git a/dockerfiles/composer-hhvm/changelog 
b/dockerfiles/composer-hhvm/changelog
index 81f887d..365e05f 100644
--- a/dockerfiles/composer-hhvm/changelog
+++ b/dockerfiles/composer-hhvm/changelog
@@ -1,4 +1,10 @@
-composer-hhvm (0.1.1) UNRELEASED; urgency=medium
+composer-hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
+
+ -- Antoine Musso   Wed, 20 Dec 2017 23:03:08 +0100
+
+composer-hhvm (0.1.1) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.1
 
diff --git a/dockerfiles/composer-package-hhvm/changelog 
b/dockerfiles/composer-package-hhvm/changelog
index ab5a2e3..4851d27 100644
--- a/dockerfiles/composer-package-hhvm/changelog
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -1,3 +1,9 @@
+composer-package-hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
+
+ -- Antoine Musso   Wed, 20 Dec 2017 23:03:08 +0100
+
 composer-package-hhvm (0.1.1) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.1
diff --git a/dockerfiles/composer-test-hhvm/changelog 
b/dockerfiles/composer-test-hhvm/changelog
index fbf2478..c48a558 100644
--- a/dockerfiles/composer-test-hhvm/changelog
+++ b/dockerfiles/composer-test-hhvm/changelog
@@ -1,3 +1,9 @@
+composer-test-hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
+
+ -- Antoine Musso   Wed, 20 Dec 2017 23:03:08 +0100
+
 composer-test-hhvm (0.1.1) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.1
diff --git a/dockerfiles/hhvm/Dockerfile.template 
b/dockerfiles/hhvm/Dockerfile.template
index 2d14d97..e19ffde 100644
--- a/dockerfiles/hhvm/Dockerfile.template
+++ b/dockerfiles/hhvm/Dockerfile.template
@@ -14,6 +14,10 @@
 && echo -n > /hhvm.hhbc \
 && rm /smoketest.php /hhvm.ini
 
+# So that we always use the proper path even without a ini file (php -n)
+ENV HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc
+RUN php -n -r 'echo "HHVM works without an ini file\n";'
+
 USER nobody
 
 ENTRYPOINT ["hhvm"]
diff --git a/dockerfiles/hhvm/changelog b/dockerfiles/hhvm/changelog
index 700ad6c..8879107 100644
--- a/dockerfiles/hhvm/changelog
+++ b/dockerfiles/hhvm/changelog
@@ -1,3 +1,11 @@
+hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Set environment variable HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc
+`php -n` skips loading /etc/hhvm/php.ini and ends up with a wrong repo
+  * Disable hhvm.repo.allow_fallback_path
+
+ -- Antoine Musso   Wed, 20 Dec 2017 22:56:45 +0100
+
 hhvm (0.1.1) wikimedia; urgency=medium
 
   * With a proper /etc/hhvm/php.ini
diff --git a/dockerfiles/hhvm/hhvm.ini b/dockerfiles/hhvm/hhvm.ini
index c97ff46..b094a02 100644
--- a/dockerfiles/hhvm/hhvm.ini
+++ b/dockerfiles/hhvm/hhvm.ini
@@ -40,3 +40,4 @@
 hhvm.repo.eval.mode = central
 hhvm.repo.journal = memory
 hhvm.repo.local.mode = --
+hhvm.repo.allow_fallback_path = false
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index d6d60bc..6235a03 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -263,7 +263,7 @@
 - '{name}-composer-package-{phpflavor}-docker': _docker
 phpflavor:
 - hhvm:
-image: 
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.1
+image: 
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.2
 - php55:
 image: 
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.0
 - php70:
@@ -271,7 +271,7 @@
 - '{name}-composer-{phpflavor}-docker':
 phpflavor:
 - hhvm:
-image: 
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.1
+image: 
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.2
 - php55:
 image: 
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.0
 - php70:
diff --git

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-21551 Add parameter to support skipping processing greet...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: CRM-21551 Add parameter to support skipping processing 
greetings when calling api contact.create
..


CRM-21551 Add parameter to support skipping processing greetings when calling 
api contact.create

https://github.com/civicrm/civicrm-core/pull/11405

This allows unit tests in the extension to run for us & on stock & brings us 
closer
to stock

Bug: T156193

Change-Id: Ib99a659495b7c584a986d056d53667b23f62494c
---
M CRM/Contact/BAO/Contact.php
M api/v3/Contact.php
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 53730bd..7511c4f 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -437,8 +437,12 @@
   }
 }
 
-// process greetings CRM-4575, cache greetings
-// NOT: self::processGreetings($contact);
+// In order to prevent a series of expensive queries in intensive batch 
processing
+// api calls may pass in skip_greeting_processing, probably doing it later 
via the
+// scheduled job. CRM-21551
+if (empty($params['skip_greeting_processing'])) {
+  self::processGreetings($contact);
+}
 
 return $contact;
   }
diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index 7329458..c8332d2 100644
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -153,6 +153,12 @@
 'description' => 'Throw error if contact create matches dedupe rule',
 'type' => CRM_Utils_Type::T_BOOLEAN,
   );
+  $params['skip_greeting_processing'] = array(
+'title' => 'Skip Greeting processing',
+'description' => 'Do not process greetings, (these can be done by 
scheduled job and there may be a preference to do so for performance reasons)',
+'type' => CRM_Utils_Type::T_BOOLEAN,
+'api.default' => 0,
+  );
   $params['prefix_id']['api.aliases'] = array('individual_prefix', 
'individual_prefix_id');
   $params['suffix_id']['api.aliases'] = array('individual_suffix', 
'individual_suffix_id');
   $params['gender_id']['api.aliases'] = array('gender');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib99a659495b7c584a986d056d53667b23f62494c
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: hhvm set HHVM_REPO_CENTRAL_PATH

2017-12-20 Thread Hashar (Code Review)

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

Change subject: docker: hhvm set HHVM_REPO_CENTRAL_PATH
..

docker: hhvm set HHVM_REPO_CENTRAL_PATH

Set environment variable HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc `php -n`
skips loading /etc/hhvm/php.ini and ends up with a wrong repo.

Disable hhvm.repo.allow_fallback_path

Rebuild affected images and Jenkins jobs.

Bug: T183324
Change-Id: I0a3eebcf50fe1baf4918c0ac653e90ae2f13e049
---
M dockerfiles/composer-hhvm/changelog
M dockerfiles/composer-package-hhvm/changelog
M dockerfiles/composer-test-hhvm/changelog
M dockerfiles/hhvm/Dockerfile.template
M dockerfiles/hhvm/changelog
M dockerfiles/hhvm/hhvm.ini
6 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/81/399481/1

diff --git a/dockerfiles/composer-hhvm/changelog 
b/dockerfiles/composer-hhvm/changelog
index 81f887d..365e05f 100644
--- a/dockerfiles/composer-hhvm/changelog
+++ b/dockerfiles/composer-hhvm/changelog
@@ -1,4 +1,10 @@
-composer-hhvm (0.1.1) UNRELEASED; urgency=medium
+composer-hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
+
+ -- Antoine Musso   Wed, 20 Dec 2017 23:03:08 +0100
+
+composer-hhvm (0.1.1) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.1
 
diff --git a/dockerfiles/composer-package-hhvm/changelog 
b/dockerfiles/composer-package-hhvm/changelog
index ab5a2e3..4851d27 100644
--- a/dockerfiles/composer-package-hhvm/changelog
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -1,3 +1,9 @@
+composer-package-hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
+
+ -- Antoine Musso   Wed, 20 Dec 2017 23:03:08 +0100
+
 composer-package-hhvm (0.1.1) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.1
diff --git a/dockerfiles/composer-test-hhvm/changelog 
b/dockerfiles/composer-test-hhvm/changelog
index fbf2478..c48a558 100644
--- a/dockerfiles/composer-test-hhvm/changelog
+++ b/dockerfiles/composer-test-hhvm/changelog
@@ -1,3 +1,9 @@
+composer-test-hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
+
+ -- Antoine Musso   Wed, 20 Dec 2017 23:03:08 +0100
+
 composer-test-hhvm (0.1.1) wikimedia; urgency=medium
 
   * Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.1
diff --git a/dockerfiles/hhvm/Dockerfile.template 
b/dockerfiles/hhvm/Dockerfile.template
index 2d14d97..e19ffde 100644
--- a/dockerfiles/hhvm/Dockerfile.template
+++ b/dockerfiles/hhvm/Dockerfile.template
@@ -14,6 +14,10 @@
 && echo -n > /hhvm.hhbc \
 && rm /smoketest.php /hhvm.ini
 
+# So that we always use the proper path even without a ini file (php -n)
+ENV HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc
+RUN php -n -r 'echo "HHVM works without an ini file\n";'
+
 USER nobody
 
 ENTRYPOINT ["hhvm"]
diff --git a/dockerfiles/hhvm/changelog b/dockerfiles/hhvm/changelog
index 700ad6c..8879107 100644
--- a/dockerfiles/hhvm/changelog
+++ b/dockerfiles/hhvm/changelog
@@ -1,3 +1,11 @@
+hhvm (0.1.2) wikimedia; urgency=medium
+
+  * Set environment variable HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc
+`php -n` skips loading /etc/hhvm/php.ini and ends up with a wrong repo
+  * Disable hhvm.repo.allow_fallback_path
+
+ -- Antoine Musso   Wed, 20 Dec 2017 22:56:45 +0100
+
 hhvm (0.1.1) wikimedia; urgency=medium
 
   * With a proper /etc/hhvm/php.ini
diff --git a/dockerfiles/hhvm/hhvm.ini b/dockerfiles/hhvm/hhvm.ini
index c97ff46..b094a02 100644
--- a/dockerfiles/hhvm/hhvm.ini
+++ b/dockerfiles/hhvm/hhvm.ini
@@ -40,3 +40,4 @@
 hhvm.repo.eval.mode = central
 hhvm.repo.journal = memory
 hhvm.repo.local.mode = --
+hhvm.repo.allow_fallback_path = false

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[v0.24.4]: Tag v0.24.4

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Tag v0.24.4
..


Tag v0.24.4

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

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



diff --git a/History.md b/History.md
index c9f9787..fa31454 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,22 @@
 # OOjs UI Release History
+## v0.24.4 / 2017-12-20 special release
+### Deprecations
+* [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed 
(Volker E.)
+* [DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' & 'redirect' as to be 
removed (Volker E.)
+
+### Features
+* Introduce `OO.ui.getDefaultOverlay` (Bartosz Dziewoński)
+* Put menus/popups of infused PHP widgets into the default overlay (Bartosz 
Dziewoński)
+
+### Styles
+* icons: Add 'lightbulb' icon (Prateek Saxena)
+* icons: Add 'stop' icon to Apex theme (Volker E.)
+
+### Code
+* ClippableElement: Fix JS error when Floatable is mixed in but disabled (Roan 
Kattouw)
+* DropdownWidget: Remove stray use of `this.$()` (Bartosz Dziewoński)
+
+
 ## v0.24.3 / 2017-11-28
 ### Features
 * Allow adding virtual viewport spacing (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 0e10483..7ab1775 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f7364af86f7b4d9b64de0cb74d6fd22c6ec04e2
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: v0.24.4
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Fix for CRM-21180: Inline changes to custom fields aren't re...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix for CRM-21180: Inline changes to custom fields aren't 
reflected in custom greetings.
..


Fix for CRM-21180: Inline changes to custom fields aren't reflected in custom 
greetings.

https://github.com/civicrm/civicrm-core/pull/11364/commits

Toward CRM-21180: Better static var handling.

Toward CRM-21180: removed static vars; removed unused method parameters.

CRM-21180 add unit test for custom field being set in address

CRM-21180 Inline changes to custom fields aren't reflected in custom greetings

This incorporates Allan's work to cause custom fields to be updated
when a custom value is updated. These have been reconciled with the changes to 
allow
greeting fields to be set to null per CRM-21474

CRM-21474 add support for setting non-required fields to 'null'

When a field is not required in the database the 'null' should be pass through 
the pseudoconstant validation.

Note the unit test on this is failing because the BAO is not respecting setting 
null. Follow up patch

CRM-21474, CRM-21880 fix error in Contact schema causing test fail.

The pseudoConstant was against the wrong field

Change-Id: If0365cd1fa34e46004a67d19377882368d063574
---
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/Contact/Utils.php
M CRM/Contact/DAO/Contact.php
M CRM/Core/BAO/CustomQuery.php
M CRM/Core/BAO/CustomValueTable.php
M api/v3/Contact.php
M api/v3/utils.php
M templates/CRM/Contact/Page/View/CustomDataFieldView.tpl
8 files changed, 167 insertions(+), 40 deletions(-)

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



diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 5689082..53730bd 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -151,16 +151,11 @@
   $params['source'] = $params['contact_source'];
 }
 
-// Fix for preferred communication method.
-$prefComm = CRM_Utils_Array::value('preferred_communication_method', 
$params, '');
-if ($prefComm && is_array($prefComm)) {
+if (isset($params['preferred_communication_method']) && 
is_array($params['preferred_communication_method'])) {
+  
CRM_Utils_Array::formatArrayKeys($params['preferred_communication_method']);
+  $contact->preferred_communication_method = 
CRM_Utils_Array::implodePadded($params['preferred_communication_method']);
   unset($params['preferred_communication_method']);
-
-  CRM_Utils_Array::formatArrayKeys($prefComm);
-  $prefComm = CRM_Utils_Array::implodePadded($prefComm);
 }
-
-$contact->preferred_communication_method = $prefComm;
 
 $allNull = $contact->copyValues($params);
 
@@ -183,6 +178,12 @@
 $allNull = FALSE;
 $contact->display_name = $contact->sort_name = 
CRM_Utils_Array::value('organization_name', $params, '');
   }
+}
+if (strlen($contact->display_name) > 128) {
+  $contact->display_name = substr($contact->display_name, 0, 128);
+}
+if (strlen($contact->sort_name) > 128) {
+  $contact->sort_name = substr($contact->sort_name, 0, 128);
 }
 
 $privacy = CRM_Utils_Array::value('privacy', $params);
@@ -286,7 +287,7 @@
   }
 }
 
-$config = CRM_Core_Config::singleton();
+self::ensureGreetingParamsAreSet($params);
 
 // CRM-6942: set preferred language to the current language if it’s unset 
(and we’re creating a contact).
 if (empty($params['contact_id'])) {
@@ -295,15 +296,10 @@
 $params['preferred_language'] = $language;
   }
 
-  // CRM-9739: set greeting & addressee if unset and we’re creating a 
contact.
-  foreach (self::$_greetingTypes as $greeting) {
-if (empty($params[$greeting . '_id'])) {
-  if ($defaultGreetingTypeId
-= 
CRM_Contact_BAO_Contact_Utils::defaultGreeting($params['contact_type'], 
$greeting)
-  ) {
-$params[$greeting . '_id'] = $defaultGreetingTypeId;
-  }
-}
+  // CRM-21041: set default 'Communication Style' if unset when creating a 
contact.
+  if (empty($params['communication_style_id'])) {
+$defaultCommunicationStyleId = 
CRM_Core_OptionGroup::values('communication_style', TRUE, NULL, NULL, 'AND 
is_default = 1');
+$params['communication_style_id'] = 
array_pop($defaultCommunicationStyleId);
   }
 }
 
@@ -448,6 +444,53 @@
   }
 
   /**
+   * Ensure greeting parameters are set.
+   *
+   * By always populating greetings here we can be sure they are set if 
required & avoid a call later.
+   * (ie. knowing we have definitely tried disambiguates between NULL & not 
loaded.)
+   *
+   * @param array $params
+   */
+  public static function ensureGreetingParamsAreSet(&$params) {
+$allGreetingParams = array('addressee' => 'addressee_id', 
'postal_greeting' => 'postal_greeting_id', 'email_greeting' =>

[MediaWiki-commits] [Gerrit] mediawiki...FundraisingEmailUnsubscribe[master]: Add minus-x to "composer test"

2017-12-20 Thread Rafidaslam (Code Review)

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

Change subject: Add minus-x to "composer test"
..

Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: I469735e1cb5c5c2527d5db4456376c979e5b60ad
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/composer.json b/composer.json
index 5eab5a6..4bd7d11 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I469735e1cb5c5c2527d5db4456376c979e5b60ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingEmailUnsubscribe
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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

[MediaWiki-commits] [Gerrit] mediawiki...GoogleDocTag[master]: Add minus-x to "composer test"

2017-12-20 Thread Rafidaslam (Code Review)

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

Change subject: Add minus-x to "composer test"
..

Add minus-x to "composer test"

Add minus-x to "composer test" and "composer fix"

Bug: T175794
Change-Id: Ic70cf01ba0034bb108b7f7b6def89a66c0392a02
---
M GoogleDocTag.body.php
M GoogleDocTag.php
M composer.json
3 files changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/GoogleDocTag.body.php b/GoogleDocTag.body.php
old mode 100755
new mode 100644
diff --git a/GoogleDocTag.php b/GoogleDocTag.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..dfca38b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
+   "fix": [
+   "minus-x fix ."
+   ],
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic70cf01ba0034bb108b7f7b6def89a66c0392a02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleDocTag
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

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

[MediaWiki-commits] [Gerrit] oojs/ui[v0.24.4]: Tag v0.24.4

2017-12-20 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399476 )

Change subject: Tag v0.24.4
..

Tag v0.24.4

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


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/76/399476/1

diff --git a/History.md b/History.md
index c9f9787..fa31454 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,22 @@
 # OOjs UI Release History
+## v0.24.4 / 2017-12-20 special release
+### Deprecations
+* [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed 
(Volker E.)
+* [DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' & 'redirect' as to be 
removed (Volker E.)
+
+### Features
+* Introduce `OO.ui.getDefaultOverlay` (Bartosz Dziewoński)
+* Put menus/popups of infused PHP widgets into the default overlay (Bartosz 
Dziewoński)
+
+### Styles
+* icons: Add 'lightbulb' icon (Prateek Saxena)
+* icons: Add 'stop' icon to Apex theme (Volker E.)
+
+### Code
+* ClippableElement: Fix JS error when Floatable is mixed in but disabled (Roan 
Kattouw)
+* DropdownWidget: Remove stray use of `this.$()` (Bartosz Dziewoński)
+
+
 ## v0.24.3 / 2017-11-28
 ### Features
 * Allow adding virtual viewport spacing (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 0e10483..7ab1775 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f7364af86f7b4d9b64de0cb74d6fd22c6ec04e2
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: v0.24.4
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.24.4

2017-12-20 Thread VolkerE (Code Review)

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

Change subject: Tag v0.24.4
..

Tag v0.24.4

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


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/74/399474/1

diff --git a/History.md b/History.md
index c9f9787..fa31454 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,22 @@
 # OOjs UI Release History
+## v0.24.4 / 2017-12-20 special release
+### Deprecations
+* [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed 
(Volker E.)
+* [DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' & 'redirect' as to be 
removed (Volker E.)
+
+### Features
+* Introduce `OO.ui.getDefaultOverlay` (Bartosz Dziewoński)
+* Put menus/popups of infused PHP widgets into the default overlay (Bartosz 
Dziewoński)
+
+### Styles
+* icons: Add 'lightbulb' icon (Prateek Saxena)
+* icons: Add 'stop' icon to Apex theme (Volker E.)
+
+### Code
+* ClippableElement: Fix JS error when Floatable is mixed in but disabled (Roan 
Kattouw)
+* DropdownWidget: Remove stray use of `this.$()` (Bartosz Dziewoński)
+
+
 ## v0.24.3 / 2017-11-28
 ### Features
 * Allow adding virtual viewport spacing (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 0e10483..7ab1775 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Merge branch 'master' into deployment

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

baf4475 Fix data.js

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68fe1ebf4033ab3b001a15d408e2f376d428f5e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Merge branch 'master' into deployment

2017-12-20 Thread Mepps (Code Review)

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

baf4475 Fix data.js

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/73/399473/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68fe1ebf4033ab3b001a15d408e2f376d428f5e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: deployment
Gerrit-Owner: Mepps 

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

[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Fix reportcard deploy

2017-12-20 Thread Milimetric (Code Review)

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

Change subject: Fix reportcard deploy
..


Fix reportcard deploy

Change-Id: I8f5e267a19de6cdb41ed9c7a9d29a8a92659dcd6
---
D dashboards/reportcard/breakdown-toggle-43a8e35.js
D dashboards/reportcard/dygraphs-timeseries-43a8e35.js
A dashboards/reportcard/dygraphs-timeseries-8d20e18.js
A dashboards/reportcard/filter-timeseries-8d20e18.js
A dashboards/reportcard/hierarchy-8d20e18.js
M dashboards/reportcard/index.html
D dashboards/reportcard/out-of-service-43a8e35.js
A dashboards/reportcard/out-of-service-8d20e18.js
D dashboards/reportcard/project-selector-43a8e35.js
M dashboards/reportcard/scripts.js
A dashboards/reportcard/stacked-bars-8d20e18.js
M dashboards/reportcard/styles.css
A dashboards/reportcard/sunburst-8d20e18.js
A dashboards/reportcard/table-timeseries-8d20e18.js
14 files changed, 74,288 insertions(+), 97 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f5e267a19de6cdb41ed9c7a9d29a8a92659dcd6
Gerrit-PatchSet: 1
Gerrit-Project: analytics/analytics.wikimedia.org
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Fix reportcard deploy

2017-12-20 Thread Milimetric (Code Review)

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

Change subject: Fix reportcard deploy
..

Fix reportcard deploy

Change-Id: I8f5e267a19de6cdb41ed9c7a9d29a8a92659dcd6
---
D dashboards/reportcard/breakdown-toggle-43a8e35.js
D dashboards/reportcard/dygraphs-timeseries-43a8e35.js
A dashboards/reportcard/dygraphs-timeseries-8d20e18.js
A dashboards/reportcard/filter-timeseries-8d20e18.js
A dashboards/reportcard/hierarchy-8d20e18.js
M dashboards/reportcard/index.html
D dashboards/reportcard/out-of-service-43a8e35.js
A dashboards/reportcard/out-of-service-8d20e18.js
D dashboards/reportcard/project-selector-43a8e35.js
M dashboards/reportcard/scripts.js
A dashboards/reportcard/stacked-bars-8d20e18.js
M dashboards/reportcard/styles.css
A dashboards/reportcard/sunburst-8d20e18.js
A dashboards/reportcard/table-timeseries-8d20e18.js
14 files changed, 74,288 insertions(+), 97 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/analytics.wikimedia.org 
refs/changes/72/399472/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f5e267a19de6cdb41ed9c7a9d29a8a92659dcd6
Gerrit-PatchSet: 1
Gerrit-Project: analytics/analytics.wikimedia.org
Gerrit-Branch: master
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] oojs/ui[v0.24.4]: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to ...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be 
removed
..


[DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed

Bug: T145163
Bug: T183195
Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
(cherry picked from commit b67216f7330cad43f4a3b921e67320672ed82b34)
---
M demos/pages/icons.js
M src/themes/apex/icons-alerts.json
M src/themes/wikimediaui/icons-alerts.json
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 6e8c9fe..1f02500 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -37,7 +37,6 @@
alerts: [
'alert',
'bell',
-   'bellOn',
'comment',
'message',
'notice',
diff --git a/src/themes/apex/icons-alerts.json 
b/src/themes/apex/icons-alerts.json
index 880f765..9bef0a1 100644
--- a/src/themes/apex/icons-alerts.json
+++ b/src/themes/apex/icons-alerts.json
@@ -7,7 +7,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
diff --git a/src/themes/wikimediaui/icons-alerts.json 
b/src/themes/wikimediaui/icons-alerts.json
index 0d45a51..ee79a2e 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -27,7 +27,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: v0.24.4
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Fix data.js

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix data.js
..


Fix data.js

Change-Id: I1cf7eb31820f04bddc30991e11ee991520697607
---
M routes/data.js
1 file changed, 23 insertions(+), 6 deletions(-)

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



diff --git a/routes/data.js b/routes/data.js
index 47434a0..d50e090 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -1,6 +1,6 @@
 var widgets = require( '../widgets' ),
odataParser = require( 'odata-parser' ),
-   persistence = require( '../persistence.js' ),
+   mysql = require( 'mysql' ),
config = require( '../config.js' ),
util = require( 'util' ),
cache = require( 'memory-cache' ),
@@ -239,6 +239,7 @@
var widget = widgets[ req.params.widget ],
qs = urlParser.parse( req.url ).query,
parsedQs = querystringParser.parse( qs ),
+   connection,
sqlQuery = '',
parsedFilters,
filter,
@@ -346,18 +347,34 @@
sqlQuery = sqlQuery.replace( /\[\[GROUP\]\]/g, groupClause );
sqlQuery = sqlQuery.replace( /\[\[SELECTGROUP\]\]/g, selectGroup );
 
+   connection = mysql.createConnection( {
+   host: config.dbserver,
+   user: config.dblogin,
+   password: config.dbpwd,
+   database: config.db
+   } );
+   connection.connect( function ( error ) {
+   if ( error ) {
+   res.json( { error: 'Connection Error: ' + error } );
+   return;
+   }
+   } );
logger.debug( 'Query: ' + sqlQuery + '\nParams: ' + sqlParams.join( ', 
' ) );
-   persistence.query( sqlQuery, sqlParams, function ( dbResults ) {
-   var results = dbResults[ 0 ];
+   connection.query( sqlQuery, sqlParams, function ( error, dbResults ) {
+   if ( error ) {
+   res.json( { error: 'Query error: ' + error } );
+   return;
+   }
result = {
-   results: results,
+   results: dbResults,
sqlQuery: substituteParams( sqlQuery, sqlParams ),
timestamp: new Date().getTime()
};
logger.debug( 'Storing results at cache key ' + cacheKey );
cache.put( cacheKey, result, config.cacheDuration );
res.json( result );
-   }, function ( error ) {
-   res.json( { error: 'Query error: ' + error } );
} );
+   // from documentation at https://github.com/mysqljs/mysql
+   // end() makes sure all remaining queries have executed before sending 
a quit package to mysql
+   connection.end();
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cf7eb31820f04bddc30991e11ee991520697607
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] Don't insert new paragraph start before end tags

2017-12-20 Thread Arlolra (Code Review)

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

Change subject: [WIP] Don't insert new paragraph start before end tags
..

[WIP] Don't insert new paragraph start before end tags

Fixes the gratuitous template wrapping on,
/en.wikipedia.org/v3/page/html/Wikimedia_Foundation/803552163

Bug: T182349
Change-Id: I6b8df14d989750d66219b5234085dd636ca29a83
---
M lib/wt2html/tt/ParagraphWrapper.js
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/lib/wt2html/tt/ParagraphWrapper.js 
b/lib/wt2html/tt/ParagraphWrapper.js
index af24c3b..eb4c020 100644
--- a/lib/wt2html/tt/ParagraphWrapper.js
+++ b/lib/wt2html/tt/ParagraphWrapper.js
@@ -292,7 +292,8 @@
blockTagCount--;
}
this.closeOpenPTag(newToks);
-   } else if (blockTagCount === 0 && 
!Util.isSolTransparent(this.env, t) && !this.hasOpenPTag) {
+   } else if (blockTagCount === 0 && 
!Util.isSolTransparent(this.env, t)
+   && !this.hasOpenPTag && t.constructor 
!== EndTagTk) {
// SSS FIXME: This check below is strictly not 
necessary since
// removeUselessPWrappers will take care of it. 
But, doing this
// here will eliminate useless array copying. 
Not sure if this

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b8df14d989750d66219b5234085dd636ca29a83
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] mediawiki...PageImages[master]: Namespace and PSR-4 this extension

2017-12-20 Thread MaxSem (Code Review)

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

Change subject: Namespace and PSR-4 this extension
..

Namespace and PSR-4 this extension

Change-Id: I3acd80cc493f6d4df1fc744d6652c3de4f091cf0
---
M extension.json
M includes/ApiQueryPageImages.php
R includes/Hooks/LinksUpdateHookHandler.php
R includes/Hooks/ParserFileProcessingHookHandlers.php
M includes/PageImages.php
M tests/phpunit/ApiQueryPageImagesTest.php
M tests/phpunit/LinksUpdateHookHandlerTest.php
M tests/phpunit/PageImagesTest.php
8 files changed, 42 insertions(+), 18 deletions(-)


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

diff --git a/extension.json b/extension.json
index a84b1ee..98eb159 100644
--- a/extension.json
+++ b/extension.json
@@ -5,31 +5,30 @@
"descriptionmsg": "pageimages-desc",
"license-name": "WTFPL",
"type": "api",
-   "callback": "PageImages::onRegistration",
+   "callback": "PageImages\\PageImages::onRegistration",
"APIPropModules": {
-   "pageimages": "ApiQueryPageImages"
+   "pageimages": "PageImages\\ApiQueryPageImages"
},
"MessagesDirs": {
"PageImages": [
"i18n"
]
},
+   "AutoloadNamespaces": {
+   "PageImages\\": "includes/"
+   },
"AutoloadClasses": {
-   "ApiQueryPageImages": "includes/ApiQueryPageImages.php",
-   "PageImages": "includes/PageImages.php",
-   "PageImages\\Hooks\\LinksUpdateHookHandler": 
"includes/LinksUpdateHookHandler.php",
-   "PageImages\\Hooks\\ParserFileProcessingHookHandlers": 
"includes/ParserFileProcessingHookHandlers.php",
-   "PageImages\\Job\\InitImageDataJob": 
"includes/Job/InitImageDataJob.php"
+   "PageImages": "includes/PageImages.php"
},
"Hooks": {
"AfterParserFetchFileAndTitle": 
"PageImages\\Hooks\\ParserFileProcessingHookHandlers::onAfterParserFetchFileAndTitle",
-   "ApiOpenSearchSuggest": "PageImages::onApiOpenSearchSuggest",
-   "BeforePageDisplay": "PageImages::onBeforePageDisplay",
-   "InfoAction": "PageImages::onInfoAction",
+   "ApiOpenSearchSuggest": 
"PageImages\\PageImages::onApiOpenSearchSuggest",
+   "BeforePageDisplay": 
"PageImages\\PageImages::onBeforePageDisplay",
+   "InfoAction": "PageImages\\PageImages::onInfoAction",
"LinksUpdate": 
"PageImages\\Hooks\\LinksUpdateHookHandler::onLinksUpdate",
-   "OpenSearchXml": "PageImages::onApiOpenSearchSuggest",
+   "OpenSearchXml": 
"PageImages\\PageImages::onApiOpenSearchSuggest",
"ParserMakeImageParams": 
"PageImages\\Hooks\\ParserFileProcessingHookHandlers::onParserMakeImageParams",
-   "SpecialMobileEditWatchlist::images": 
"PageImages::onSpecialMobileEditWatchlistImages"
+   "SpecialMobileEditWatchlist::images": 
"PageImages\\PageImages::onSpecialMobileEditWatchlistImages"
},
"JobClasses": {
"InitImageDataJob": "PageImages\\Job\\InitImageDataJob"
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 64ed50b..840775d 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -1,5 +1,12 @@
 https://gerrit.wikimedia.org/r/399470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3acd80cc493f6d4df1fc744d6652c3de4f091cf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
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] oojs/ui[v0.24.4]: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to ...

2017-12-20 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399469 )

Change subject: [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be 
removed
..

[DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed

Bug: T145163
Bug: T183195
Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
(cherry picked from commit b67216f7330cad43f4a3b921e67320672ed82b34)
---
M demos/pages/icons.js
M src/themes/apex/icons-alerts.json
M src/themes/wikimediaui/icons-alerts.json
3 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/69/399469/1

diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 6e8c9fe..1f02500 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -37,7 +37,6 @@
alerts: [
'alert',
'bell',
-   'bellOn',
'comment',
'message',
'notice',
diff --git a/src/themes/apex/icons-alerts.json 
b/src/themes/apex/icons-alerts.json
index 880f765..9bef0a1 100644
--- a/src/themes/apex/icons-alerts.json
+++ b/src/themes/apex/icons-alerts.json
@@ -7,7 +7,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",
diff --git a/src/themes/wikimediaui/icons-alerts.json 
b/src/themes/wikimediaui/icons-alerts.json
index 0d45a51..ee79a2e 100644
--- a/src/themes/wikimediaui/icons-alerts.json
+++ b/src/themes/wikimediaui/icons-alerts.json
@@ -27,7 +27,9 @@
"bellOn": { "file": {
"ltr": "images/icons/bellOn-ltr.svg",
"rtl": "images/icons/bellOn-rtl.svg"
-   } },
+   },
+   "deprecated": "This will be removed in v0.26.0."
+   },
"comment": { "file": "images/icons/comment.svg" },
"message": { "file": {
"ltr": "images/icons/message-ltr.svg",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id73c673704ba9528a8b2a98f4a896905468beec3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: v0.24.4
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Use ScoreParser instead of Cache::processRevision in ApiHook...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Use ScoreParser instead of Cache::processRevision in 
ApiHooksHandler
..


Use ScoreParser instead of Cache::processRevision in ApiHooksHandler

Bug: T181334
Change-Id: I37f24c196b55427a19ee2560999a4a1694c0bfd2
---
M includes/Hooks/ApiHooksHandler.php
1 file changed, 35 insertions(+), 19 deletions(-)

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



diff --git a/includes/Hooks/ApiHooksHandler.php 
b/includes/Hooks/ApiHooksHandler.php
index 8ea1ca3..84a13ce 100644
--- a/includes/Hooks/ApiHooksHandler.php
+++ b/includes/Hooks/ApiHooksHandler.php
@@ -29,11 +29,13 @@
 use ApiResult;
 use DeferredUpdates;
 use JobQueueGroup;
+use InvalidArgumentException;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use ORES\Cache;
 use ORES\FetchScoreJob;
 use ORES\Hooks;
+use ORES\Parser\ScoreParser;
 use ORES\Scoring;
 use ORES\WatchedItemQueryServiceExtension;
 use RequestContext;
@@ -324,31 +326,13 @@
$loadedScores = Scoring::instance()->getScores( $revids 
);
 
$cache = Cache::instance();
-   $cache->setErrorCallback( function ( $mssg, $revision ) 
use ( &$scores ) {
-   $scores[$revision] = [];
-   $logger = LoggerFactory::getInstance( 'ORES' );
-   $logger->info( "Scoring errored for $revision: 
$mssg\n" );
-   } );
$cacheableScores = $cache->filterScores( $loadedScores, 
$cacheableRevids );
DeferredUpdates::addCallableUpdate( function () use ( 
$cache, $cacheableScores ) {
$cache->storeScores( $cacheableScores );
} );
 
-   $models = [];
-   foreach ( $modelData as $modelName => $modelDatum ) {
-   $models[$modelDatum['id']] = $modelName;
-   }
-
foreach ( $loadedScores as $revid => $data ) {
-   $dbData = [];
-   $cache->processRevision( $dbData, $revid, $data 
);
-   foreach ( $dbData as $row ) {
-   $scores[$revid][] = (object)[
-   'oresc_class' => 
$row['oresc_class'],
-   'oresc_probability' => 
$row['oresc_probability'],
-   'oresm_name' => 
$models[$row['oresc_model']],
-   ];
-   }
+   $scores[$revid] = self::processRevision( 
$revid, $data, $models );
}
 
if ( !$needsContinuation && array_diff( $revids, 
array_keys( $loadedScores ) ) ) {
@@ -361,6 +345,38 @@
}
 
/**
+* @param int $revid
+* @param array[] $data
+* @param string[] $models
+* @return array
+*/
+   private static function processRevision( $revid, $data, $models ) {
+   global $wgOresModelClasses;
+   $parser = new ScoreParser(
+   MediaWikiServices::getInstance()->getService( 
'ORESModelLookup' ),
+   $wgOresModelClasses
+   );
+   try {
+   $dbData = $parser->processRevision( $revid, $data );
+   } catch ( InvalidArgumentException $exception ) {
+   $logger = LoggerFactory::getInstance( 'ORES' );
+   $mssg = $exception->getMessage();
+   $logger->info( "Scoring errored for $revid: $mssg\n" );
+   return [];
+   }
+   $scores = [];
+   foreach ( $dbData as $row ) {
+   $scores[] = (object)[
+   'oresc_class' => $row['oresc_class'],
+   'oresc_probability' => 
$row['oresc_probability'],
+   'oresm_name' => $models[$row['oresc_model']],
+   ];
+   }
+
+   return $scores;
+   }
+
+   /**
 * Modify each data row before it's returned.
 *
 * This uses the data added to $hookData by

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37f24c196b55427a19ee2560999a4a1694c0bfd2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Added monolingual languages per request fro (Old French) and...

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: Added monolingual languages per request fro (Old French) and 
frm (Middle French)
..


Added monolingual languages per request
fro (Old French) and frm (Middle French)

Bug: T181823
Change-Id: I0fe406e895aad7ac86e244f43644212fe324e8cb
---
M repo/includes/WikibaseRepo.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, approved



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 478e5e3..8697d04 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1894,6 +1894,8 @@
// T174238
'ami',
 
+   // T181823
+   'fro', 'frm',
] )
),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fe406e895aad7ac86e244f43644212fe324e8cb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Mbch331 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: [WIP] Update messaging to clarify sync behavior is per accou...

2017-12-20 Thread Cooltey (Code Review)

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

Change subject: [WIP] Update messaging to clarify sync behavior is per account 
level
..

[WIP] Update messaging to clarify sync behavior is per account level

Bug: T177516
Change-Id: Ida5732a20e0054c4193ec1e6c23eafa178a7e34a
---
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/preferences.xml
4 files changed, 14 insertions(+), 3 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java 
b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
index a2dd83e..01e5857 100644
--- a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
+++ b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
@@ -130,7 +130,8 @@
 // TODO: kick off initial sync
 } else {
 new AlertDialog.Builder(getActivity())
-
.setMessage(R.string.reading_lists_confirm_remote_delete)
+
.setTitle(R.string.preference_dialog_of_turning_off_reading_list_sync_title)
+
.setMessage(R.string.preference_dialog_of_turning_off_reading_list_sync_text)
 
.setPositiveButton(R.string.reading_lists_confirm_remote_delete_yes, new 
DeleteRemoteListsYesListener(preference))
 
.setNegativeButton(R.string.reading_lists_confirm_remote_delete_no, new 
DeleteRemoteListsNoListener(preference))
 .show();
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index 27a0f5d..bf5a76a 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -84,6 +84,7 @@
   Used as window title.\n{{Identical|Log 
in}}
   A bubble that describes the 
in-progress action.
   A bubble that appears after logging 
in.
+  Add a toast message across 
all other logged in sessions advising when sync has been disabled on one 
device.
   {{Identical|Log out}}
   Toast popup message notifying the user 
that they have been logged out.\n{{Identical|Logged out}}
   Used in \"Browsing history\" page if 
there is nothing to show.
@@ -126,7 +127,11 @@
   Message shown in a small 
toast when account creation is successful.\n* 
{{msg-mw|Accountcreatedtext|message}}
   Section title for 
preferences related to syncing and storing user data
   Title of preference that, 
when checked, enables syncing the user\'s reading lists across devices
+  Title of 
preference that, when checked, enables syncing the user\'s reading lists across 
devices from this account
   Description of 
preference that, when checked, enables syncing the user\'s reading lists across 
devices
+  Description of 
preference that, when checked, enables syncing the user\'s reading lists across 
devices from this account
+  Title of a 
warning dialog when turning off the reading list sync
+  Description of a 
warning dialog when turning off the reading list sync
   Section title for 
privacy related settings\n{{Identical|Privacy}}
   Title of preference that 
when checked enables data collection of user behavior.\n\nShown in the 
preferences screen along with the following:\n* 
{{msg-wikimedia|Wikipedia-android-strings-preference title show images}}\n* 
{{msg-wikimedia|Wikipedia-android-strings-preference title language}}\n* 
{{msg-wikimedia|Wikipedia-android-strings-preference title show link 
previews}}\n* {{msg-wikimedia|Wikipedia-android-strings-preference title 
eventlogging opt in}}\n* {{msg-wikimedia|Wikipedia-android-strings-zero warn 
when leaving}}
   Description of 
preference that when checked enables data collection of user behavior.
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index c4ae9bf..f56c8e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,6 +97,7 @@
 Log in to Wikipedia
 Logging you in…
 Logged in successfully!
+Reading list sync has 
been turned off for your account.
 Log out
 Logged out
 No recently viewed articles
@@ -139,7 +140,11 @@
 Account 
created!
 Storage and 
syncing
 Sync reading 
lists
+Sync 
reading lists for this account
 Allow Wikimedia to 
sync your reading lists when you log in
+Allow 
Wikimedia to sync reading lists when you are logged in
+Remove synced 
reading lists from your account?
+This will 
completely delete all previously synced reading lists from remote storage. 
Remove all synced lists from your account?
 Privacy
 Send usage 
reports
 Allow Wikimedia to 
collect information about how you use the app to

[MediaWiki-commits] [Gerrit] operations/puppet[production]: redis: delete ganglia monitoring script

2017-12-20 Thread Dzahn (Code Review)

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

Change subject: redis: delete ganglia monitoring script
..


redis: delete ganglia monitoring script

Ganglia is not being used anymore at Wikimedia.

Bug: T177225
Change-Id: Ia8fa1feb459f8b905470cf4c6b4f5a4012c114c5
---
D modules/redis/files/ganglia/redis_monitoring.py
1 file changed, 0 insertions(+), 123 deletions(-)

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



diff --git a/modules/redis/files/ganglia/redis_monitoring.py 
b/modules/redis/files/ganglia/redis_monitoring.py
deleted file mode 100644
index beca8c7..000
--- a/modules/redis/files/ganglia/redis_monitoring.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""
-Redis in Ganglia
-Richard Crowley 
-"""
-
-import socket
-import time
-
-
-def metric_handler(name):
-
-# Update from Redis.  Don't thrash.
-if 15 < time.time() - metric_handler.timestamp:
-s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-s.connect((metric_handler.host, metric_handler.port))
-s.settimeout(5)  # set socket timeout as to not block gmond
-# if the password is set from parameters
-if metric_handler.password is not None:
-s.send("AUTH {0}\r\n".format(metric_handler.password))
-s.recv(4096)  # TODO check if auth is valid
-s.send("INFO\r\n")
-info = s.recv(4096)
-if "$" != info[0]:
-return 0
-len = int(info[1:info.find("\n")])
-if 4096 < len:
-info += s.recv(len - 4096)
-metric_handler.info = {}
-for line in info.splitlines()[1:]:
-if "" == line:
-continue
-if "#" == line[0]:
-continue
-n, v = line.split(":")
-if n in metric_handler.descriptors:
-metric_handler.info[n] = int(v)  # TODO Use value_type.
-s.close()
-metric_handler.timestamp = time.time()
-
-return metric_handler.info.get(name, 0)
-
-
-def metric_init(params={}):
-metric_handler.host = params.get("host", "127.0.0.1")
-metric_handler.port = int(params.get("port", 6379))
-metric_handler.password = params.get("password", None)
-metric_handler.timestamp = 0
-metrics = {
-"connected_clients": {"units": "clients"},
-"connected_slaves": {"units": "slaves"},
-"blocked_clients": {"units": "clients"},
-"used_memory": {
-"units": "bytes",
-"value_type": "double",
-"format": "%f",
-},
-"rdb_changes_since_last_save": {"units": "changes"},
-"rdb_bgsave_in_progress": {"units": "yes/no"},
-"aof_rewrite_in_progress": {"units": "yes/no"},
-"aof_last_rewrite_time_sec": {"units": "seconds"},
-"aof_current_size": {
-"units": "bytes",
-"value_type": "double",
-"format": "%f",
-},
-"aof_base_size": {
-"units": "bytes",
-"value_type": "double",
-"format": "%f",
-},
-"instantaneous_ops_per_sec": {"units": "ops/s"},
-"rejected_connections": {"units": "connections"},
-"latest_fork_usec": {"units": "microseconds"},
-"total_connections_received": {
-"units": "connections",
-"slope": "positive",
-},
-"total_commands_processed": {
-"units": "commands",
-"slope": "positive",
-},
-"expired_keys": {"units": "keys"},
-"evicted_keys": {"units": "keys"},
-"keyspace_hits": {
-"units": "keys",
-"slope": "positive",
-},
-"keyspace_misses": {
-"units": "keys",
-"slope": "positive",
-},
-"pubsub_channels": {"units": "channels"},
-"pubsub_patterns": {"units": "patterns"},
-"master_last_io_seconds_ago": {"units": "seconds ago"},
-}
-metric_handler.descriptors = {}
-for name, updates in metrics.iteritems():
-descriptor = {
-"name": name,
-"call_back": metric_handler,
-"time_max": 90,
-"value_type": "uint",
-"units": "",
-"slope": "both",
-"format": "%d",
-"description": "http://code.google.com/p/redis/wiki/InfoCommand;,
-"groups": "redis",
-}
-descriptor.update(updates)
-metric_handler.descriptors[name] = descriptor
-return metric_handler.descriptors.values()
-
-
-def metric_cleanup():
-pass
-
-
-# For testing
-if __name__ == "__main__":
-desc = metric_init({"host": "127.0.0.1"})
-for d in desc:
-v = d['call_back'](d['name'])
-print 'value for %s is %f' % (d['name'], v)

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

[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Fix data.js

2017-12-20 Thread Mepps (Code Review)

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

Change subject: Fix data.js
..

Fix data.js

Change-Id: I1cf7eb31820f04bddc30991e11ee991520697607
---
M routes/data.js
1 file changed, 21 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/67/399467/1

diff --git a/routes/data.js b/routes/data.js
index 47434a0..4ed8bb8 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -1,6 +1,6 @@
 var widgets = require( '../widgets' ),
odataParser = require( 'odata-parser' ),
-   persistence = require( '../persistence.js' ),
+   mysql = require( 'mysql' ),
config = require( '../config.js' ),
util = require( 'util' ),
cache = require( 'memory-cache' ),
@@ -346,18 +346,33 @@
sqlQuery = sqlQuery.replace( /\[\[GROUP\]\]/g, groupClause );
sqlQuery = sqlQuery.replace( /\[\[SELECTGROUP\]\]/g, selectGroup );
 
+   connection = mysql.createConnection( {
+   host: config.dbserver,
+   user: config.dblogin,
+   password: config.dbpwd,
+   database: config.db
+   } );
+   connection.connect( function ( error ) {
+   if ( error ) {
+   res.json( { error: 'Connection Error: ' + error } );
+   return;
+   }
+   } );
logger.debug( 'Query: ' + sqlQuery + '\nParams: ' + sqlParams.join( ', 
' ) );
-   persistence.query( sqlQuery, sqlParams, function ( dbResults ) {
-   var results = dbResults[ 0 ];
+   connection.query( sqlQuery, sqlParams, function ( error, dbResults ) {
+   if ( error ) {
+   res.json( { error: 'Query error: ' + error } );
+   connection.end();
+   return;
+   }
result = {
-   results: results,
+   results: dbResults,
sqlQuery: substituteParams( sqlQuery, sqlParams ),
timestamp: new Date().getTime()
};
logger.debug( 'Storing results at cache key ' + cacheKey );
cache.put( cacheKey, result, config.cacheDuration );
res.json( result );
-   }, function ( error ) {
-   res.json( { error: 'Query error: ' + error } );
+   connection.end();
} );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cf7eb31820f04bddc30991e11ee991520697607
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Mepps 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Lower refresh interval for Wikidata to 5s

2017-12-20 Thread Smalyshev (Code Review)

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

Change subject: Lower refresh interval for Wikidata to 5s
..

Lower refresh interval for Wikidata to 5s

Bug: T183053
Change-Id: I96249b3b24aecbfa99f8a9e8bd95d00e131e9215
---
M wmf-config/Wikibase.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 25ae2f2..ed43361 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -160,6 +160,8 @@
// Cirrus usage for wbsearchentities is on
$wgWBRepoSettings['entitySearch']['useCirrus'] = true;
 
+   // T183053
+   $wgCirrusSearchRefreshInterval = 5;
// T178180
$wgWBRepoSettings['canonicalUriProperty'] = 'P1921';
// T176903, T180169

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Catch another double-quote, this may change the behavior of ...

2017-12-20 Thread Awight (Code Review)

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

Change subject: Catch another double-quote, this may change the behavior of the 
three changes feeds.
..

Catch another double-quote, this may change the behavior of the three changes 
feeds.

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


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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 43c3ec5..cb6b549 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -384,7 +384,7 @@
return;
}
// FIXME: This is not a "filter" but an undocumented side 
effect of this function.
-   $fields['ores_damaging_threshold'] = $dbr->addQuotes( 
$threshold );
+   $fields['ores_damaging_threshold'] = $threshold;
 
if ( $hidenondamaging ) {
// Filter out non-damaging edits.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9876698af12409ee3cbb8cd95876b9c3bb2342fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
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] pywikibot/core[master]: [L10N] Remove battlestarwiki_family.py out of the framework

2017-12-20 Thread jenkins-bot (Code Review)

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

Change subject: [L10N] Remove battlestarwiki_family.py out of the framework
..


[L10N] Remove battlestarwiki_family.py out of the framework

- de.battlestarwiki.org and en.battlestarwiki.org are no longer available
  but closed since this year.
- Some of the en pages was ported to en.battlestarwikiclone.org but
  the de site is lost and available via web.archive.org.
  This clone can be reached via generate_family_file when needed

Change-Id: Iffa70aa32c7902294f5633d25806ce256cca1649
---
M HISTORY.rst
M docs/api_ref/pywikibot.families.rst
D pywikibot/families/battlestarwiki_family.py
M pywikibot/family.py
4 files changed, 1 insertion(+), 34 deletions(-)

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



diff --git a/HISTORY.rst b/HISTORY.rst
index 1b3b1c4..af33cac 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,7 @@
 Current release
 ---
 
+* Drop battlestarwiki family file
 * Bugfixes and improvements
 * Localisation updates
 
diff --git a/docs/api_ref/pywikibot.families.rst 
b/docs/api_ref/pywikibot.families.rst
index 51cc605..68c2dca 100644
--- a/docs/api_ref/pywikibot.families.rst
+++ b/docs/api_ref/pywikibot.families.rst
@@ -9,14 +9,6 @@
 Submodules
 --
 
-pywikibot.families.battlestarwiki_family module

-
-.. automodule:: pywikibot.families.battlestarwiki_family
-:members:
-:undoc-members:
-:show-inheritance:
-
 pywikibot.families.commons_family module
 
 
diff --git a/pywikibot/families/battlestarwiki_family.py 
b/pywikibot/families/battlestarwiki_family.py
deleted file mode 100644
index 1a12f79..000
--- a/pywikibot/families/battlestarwiki_family.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Family module for Battlestar Wiki."""
-#
-# (C) Pywikibot team, 2007-2015
-#
-# Distributed under the terms of the MIT license.
-#
-from __future__ import absolute_import, unicode_literals
-
-__version__ = '$Id$'
-
-from pywikibot import family
-
-
-# The Battlestar Wiki family, a set of Battlestar wikis.
-class Family(family.SubdomainFamily):
-
-"""Family class for Battlestar Wiki."""
-
-name = 'battlestarwiki'
-domain = 'battlestarwiki.org'
-
-codes = ['en', 'de']
-
-interwiki_removals = ['fr', 'zh', 'es', 'ms', 'tr', 'simple']
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 59be0f8..363c6b8 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -326,7 +326,6 @@
 'aspienetwiki': 'aspienetwiki',
 'atmwiki':  'atmwiki',
 'b':'wikibooks',
-'battlestarwiki':   'battlestarwiki',
 'bemi': 'bemi',
 'benefitswiki': 'benefitswiki',
 'betawiki': 'betawiki',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffa70aa32c7902294f5633d25806ce256cca1649
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Alex S.H. Lin 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 324 matches

Mail list logo