date:20170624

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmAccount[master]: Pay attention to CAPTCHA failures

2017-06-24 Thread MarkAHershberger (Code Review)

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

Change subject: Pay attention to CAPTCHA failures
..

Pay attention to CAPTCHA failures

The CAPTCHA is shown, but without this hook it is ignored.

Bug: T168783
Change-Id: Id9518664f85b2c718591c15662a9978bae01efd0
---
M frontend/ConfirmAccountUI.setup.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/frontend/ConfirmAccountUI.setup.php 
b/frontend/ConfirmAccountUI.setup.php
index 5924fca..ce454c4 100644
--- a/frontend/ConfirmAccountUI.setup.php
+++ b/frontend/ConfirmAccountUI.setup.php
@@ -20,6 +20,8 @@
$hooks['AdminLinks'][] = 
'ConfirmAccountUIHooks::confirmAccountAdminLinks';
# Pre-fill/lock the form if its for an approval
$hooks['AuthChangeFormFields'][] = 
'ConfirmAccountUIHooks::onAuthChangeFormFields';
+# Let the CAPTCHA block an account request.
+   $hooks['AbortNewAccount'][] = 
'ConfirmEditHooks::confirmUserCreate';
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CategoryTree[master]: Display classic lists instead of arrows until JavaScript is ...

2017-06-24 Thread Petr.matas (Code Review)

Petr.matas has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361282 )

Change subject: Display classic lists instead of arrows until JavaScript is 
available
..

Display classic lists instead of arrows until JavaScript is available

Instead of adding and later removing display:none everywhere, add a class to 
#mw-subcategories.
That does not need to be done after each loading of children, it suffices once 
after initialization.
The rest is done with CSS.

Bug: T168770
Change-Id: I9ad0c2c824e1995aaf1bbbadeacffdf521e55f1f
---
M CategoryTreeFunctions.php
M modules/ext.categoryTree.css
M modules/ext.categoryTree.js
3 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree 
refs/changes/82/361282/1

diff --git a/CategoryTreeFunctions.php b/CategoryTreeFunctions.php
index a710839..14a1a47 100644
--- a/CategoryTreeFunctions.php
+++ b/CategoryTreeFunctions.php
@@ -624,7 +624,6 @@
$linkattr = [];
 
$linkattr[ 'class' ] = "CategoryTreeToggle";
-   $linkattr['style'] = 'display: none;'; // 
Unhidden by JS
$linkattr['data-ct-title'] = $key;
 
$tag = 'span';
diff --git a/modules/ext.categoryTree.css b/modules/ext.categoryTree.css
index 4534123..2be3e3f 100644
--- a/modules/ext.categoryTree.css
+++ b/modules/ext.categoryTree.css
@@ -8,11 +8,20 @@
  * @licence GNU General Public Licence 2.0 or later
  */
 
-#mw-subcategories ul {
+#mw-subcategories.CategoryTreeExpandable ul {
list-style: none none;
margin-left: 0.25em;
 }
 
+.CategoryTreeBullet, .CategoryTreeEmptyBullet {
+   display: none;
+}
+
+.CategoryTreeExpandable .CategoryTreeBullet,
+.CategoryTreeExpandable .CategoryTreeEmptyBullet {
+   display: inline;
+}
+
 #mw-panel div.portal div.body .CategoryTreeTag {
margin: 0;
font-size: 0.75em;
diff --git a/modules/ext.categoryTree.js b/modules/ext.categoryTree.js
index fa3c4b6..ff54947 100644
--- a/modules/ext.categoryTree.js
+++ b/modules/ext.categoryTree.js
@@ -15,10 +15,10 @@
mw.hook( 'wikipage.content' ).add( function ( $content ) {
 
/**
-* Sets display inline to tree toggle
+* Makes the toggles appear
 */
function showToggles() {
-   $content.find( 'span.CategoryTreeToggle' ).css( 
'display', 'inline' );
+   $content.find( '#mw-subcategories' ).addClass( 
'CategoryTreeExpandable' );
}
 
/**
@@ -161,8 +161,6 @@
.html( data )
.find( '.CategoryTreeToggle' )
.click( handleNode );
-
-   showToggles();
} )
.fail( error );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad0c2c824e1995aaf1bbbadeacffdf521e55f1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Petr.matas 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Show visual diffs on DiffPage

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Show visual diffs on DiffPage
..


Show visual diffs on DiffPage

Only shown if VisualEditorEnableDiffPage is set, or query
string param 'visualdiff' is present.

Currently:
* All VE javascript is loaded (could be cut down to just DM code)
* The entire Parsoid HTML of both revisions being compared is loaded
* Both Parsoid HTML docs are parsed into VE DM trees and diffed

Bug: T167508
Change-Id: I151fc9bab3d3032f50c8d11be6b54e45a06fcc34
---
M VisualEditor.hooks.php
M extension.json
A modules/ve-mw/init/styles/ve.init.mw.DiffPage.less
A modules/ve-mw/init/ve.init.mw.DiffPage.init.js
4 files changed, 193 insertions(+), 0 deletions(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 68b7622..ebea7ca 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -77,6 +77,51 @@
return true;
}
 
+   public static function onDiffViewHeader(
+   DifferenceEngine $diff,
+   Revision $oldRev,
+   Revision $newRev
+   ) {
+   $config = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
+   $output = RequestContext::getMain()->getOutput();
+
+   if (
+   !$config->get( 'VisualEditorEnableDiffPage' ) &&
+   $output->getRequest()->getVal( 'visualdiff' ) === null
+   ) {
+   return;
+   }
+
+   $output->addModuleStyles( [
+   'ext.visualEditor.diffPage.init.styles',
+   'oojs-ui.styles.icons-alerts',
+   'oojs-ui.styles.icons-editing-advanced'
+   ] );
+   $output->addModules( 'ext.visualEditor.diffPage.init' );
+   $output->enableOOUI();
+   $output->addHtml(
+   '' .
+   // Will be replaced by a ButtonSelectWidget in JS
+   new OOUI\ButtonGroupWidget( [
+   'items' => [
+   new \OOUI\ButtonWidget( [
+   'data' => 'visual',
+   'icon' => 'eye',
+   'disabled' => true,
+   'label' => $output->msg( 
'visualeditor-savedialog-review-visual' )->plain()
+   ] ),
+   new \OOUI\ButtonWidget( [
+   'data' => 'source',
+   'icon' => 'wikiText',
+   'active' => true,
+   'label' => $output->msg( 
'visualeditor-savedialog-review-wikitext' )->plain()
+   ] )
+   ]
+   ] ) .
+   ''
+   );
+   }
+
/**
 * Detect incompatibile browsers which we can't expect to load VE
 *
diff --git a/extension.json b/extension.json
index 54e303f..129c657 100644
--- a/extension.json
+++ b/extension.json
@@ -47,6 +47,7 @@
},
"VisualEditorUseChangeTagging": true,
"VisualEditorEnableWikitext": false,
+   "VisualEditorEnableDiffPage": false,
"VisualEditorUseSingleEditTab": false,
"VisualEditorSingleEditTabSwitchTime": 2016010100,
"VisualEditorTabPosition": "before",
@@ -124,6 +125,9 @@
],
"SkinEditSectionLinks": [
"VisualEditorHooks::onSkinEditSectionLinks"
+   ],
+   "DiffViewHeader": [
+   "VisualEditorHooks::onDiffViewHeader"
],
"GetBetaFeaturePreferences": [
"VisualEditorHooks::onGetBetaPreferences"
@@ -1852,6 +1856,25 @@
"mobile"
]
},
+   "ext.visualEditor.diffPage.init.styles": {
+   "styles": [
+   
"modules/ve-mw/init/styles/ve.init.mw.DiffPage.less"
+   ]
+   },
+   "ext.visualEditor.diffPage.init": {
+   "scripts": [
+   "modules/ve-mw/init/ve.init.mw.DiffPage.init.js"
+   ],
+   "dependencies": [
+   "oojs-ui",
+

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Fix doc child replacement

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: VisualDiff: Fix doc child replacement
..


VisualDiff: Fix doc child replacement

If types are not equal, mark the change as a replacement, instead
of just setting typeChange, which is never used.

Only use 'structural-(insert/remove)' if a non content node is also
a branch node (so leaf nodes like AlienBlockNode aren't structural).

Change highlightRemove/highlightInsert order to ensure the node
at the correct offset is annotated.

Bug: T166801
Change-Id: I237254096ef58fca6060ef45a29b34244410aca5
---
M src/dm/ve.dm.VisualDiff.js
M src/ui/elements/ve.ui.DiffElement.js
2 files changed, 23 insertions(+), 10 deletions(-)

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



diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index 750d112..269ea5c 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -235,6 +235,7 @@
var i, ilen, j, jlen,
treeDiff, linearDiff,
oldNode, newNode,
+   replacement,
oldDocChildTree,
newDocChildTree,
removeLength,
@@ -277,9 +278,11 @@
if ( !oldNode.canContainContent() && 
!newNode.canContainContent() ) {
 
// There is no content change
+   replacement = oldNode.type !== newNode.type;
diffInfo[ i ] = {
-   typeChange: oldNode.type !== 
newNode.type,
-   attributeChange: !ve.compare( 
oldNode.getAttributes(), newNode.getAttributes() ) ?
+   linearDiff: null,
+   replacement: replacement,
+   attributeChange: !replacement && 
!ve.compare( oldNode.getAttributes(), newNode.getAttributes() ) ?
{
oldAttributes: 
oldNode.getAttributes(),
newAttributes: 
newNode.getAttributes()
@@ -291,18 +294,28 @@
} else if ( !newNode.canContainContent() ) {
 
// Content was removed
-   diffInfo[ i ] = { replacement: true };
+   diffInfo[ i ] = {
+   linearDiff: null,
+   replacement: true,
+   attributeChange: false
+   };
removeLength = oldNode.length;
 
} else if ( !oldNode.canContainContent() ) {
 
// Content was inserted
-   diffInfo[ i ] = { replacement: true };
+   diffInfo[ i ] = {
+   linearDiff: null,
+   replacement: true,
+   attributeChange: false
+   };
insertLength = newNode.length;
 
// If we got this far, they are both CBNs
} else {
-   if ( new Date().getTime() < this.endTime ) {
+   replacement = oldNode.type !== newNode.type;
+
+   if ( !replacement && new Date().getTime() < 
this.endTime ) {
linearDiff = 
this.linearDiffer.getCleanDiff(
this.oldDoc.getData( 
oldNode.getRange() ),
this.newDoc.getData( 
newNode.getRange() )
@@ -315,8 +328,8 @@
 
diffInfo[ i ] = {
linearDiff: linearDiff,
-   typeChange: oldNode.type !== 
newNode.type,
-   attributeChange: !ve.compare( 
oldNode.getAttributes(), newNode.getAttributes() ) ?
+   replacement: replacement,
+   attributeChange: !replacement && 
!ve.compare( oldNode.getAttributes(), newNode.getAttributes() ) ?
{
oldAttributes: 
oldNode.getAttributes(),
newAttributes: 
newNode.getAttributes()
diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index e4f181f..f0c4e2e 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -400,7 +400,7 @@

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: FilterTagMultiselectWidget: Use frameless buttons and fix he...

2017-06-24 Thread Esanders (Code Review)

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

Change subject: FilterTagMultiselectWidget: Use frameless buttons and fix 
height issues
..

FilterTagMultiselectWidget: Use frameless buttons and fix height issues

Use a fixed height of 2.5em so the textinput and buttons line up.

Change-Id: Ifa50230084a88450eb5bcf8ca4faef28091cdf65
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
2 files changed, 13 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/361281/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index 5ce7988..420bb44 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -5,6 +5,7 @@
// Make sure this uses the interface direction, not the content 
direction
direction: ltr;
border-bottom-right-radius: 0;
+   height: 2.5em;
}
 
&.oo-ui-widget-enabled .oo-ui-tagMultiselectWidget-handle {
@@ -43,18 +44,19 @@
width: 1em;
 
&-widget.oo-ui-widget {
+   border: 1px solid #a2a9b1;
+   border-left-width: 0;
+   border-top-left-radius: 0;
+   border-top-right-radius: 0;
+   border-bottom-left-radius: 0;
+
display: block;
text-align: right;
+   height: 2.5em;
+   box-sizing: border-box;
 
-   // Override OOUI rules
-   &.oo-ui-buttonSelectWidget 
.oo-ui-buttonOptionWidget:first-child a.oo-ui-buttonElement-button,
-   .oo-ui-buttonOptionWidget 
a.oo-ui-buttonElement-button {
-   border-radius: 0;
-   border-left: 0;
-   }
-
-   &.oo-ui-buttonSelectWidget 
.oo-ui-buttonOptionWidget:last-child a.oo-ui-buttonElement-button {
-   border-bottom-right-radius: 2px;
+   
.oo-ui-buttonElement-frameless.oo-ui-iconElement:first-child {
+   margin-left: 0;
}
 
}
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 752bbe6..7b49147 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -145,11 +145,13 @@
classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
items: [
new OO.ui.ButtonOptionWidget( {
+   framed: false,
data: 'namespaces',
icon: 'article',
title: mw.msg( 'namespaces' )
} ),
new OO.ui.ButtonOptionWidget( {
+   framed: false,
data: 'tags',
icon: 'tag',
title: mw.msg( 
'rcfilters-view-tags' )

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Remove newline at end from english messages

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Remove newline at end from english messages
..

Remove newline at end from english messages

Newline get lost on translation, but it seems there are not needed.

Change-Id: I22305779f6dc35157bbe378ebcf3a63cd8ce6f7b
---
M i18n/notifications/en.json
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/i18n/notifications/en.json b/i18n/notifications/en.json
index 8e98c8b..5931470 100644
--- a/i18n/notifications/en.json
+++ b/i18n/notifications/en.json
@@ -9,14 +9,14 @@
"bs-notifications-email-addaccount-body": "{{GENDER:$2|The user}} $3 
was created.\n\nYou can visit {{GENDER:$2|his|her|the}} user page following 
this link:\n$1",
"bs-notifications-edit": "The page [[:$1]] has been changed",
"bs-notifications-email-edit-subject": "Page $1 {{GENDER:$2|edited}} by 
$3",
-   "bs-notifications-email-edit-body": "The page \"$1\" was 
{{GENDER:$2|edited}} by $6.\n\nComment:\n $3 \nYou can visit the page following 
this link:\n$4.\n\nIf you only want to see the changes, follow this 
link:\n$5\n",
+   "bs-notifications-email-edit-body": "The page \"$1\" was 
{{GENDER:$2|edited}} by $6.\n\nComment:\n $3 \nYou can visit the page following 
this link:\n$4.\n\nIf you only want to see the changes, follow this link:\n$5",
"bs-notifications-create": "The page [[:$1]] was created",
"bs-notifications-email-create-subject": "Page $1 {{GENDER:$2|created}} 
by $3",
-   "bs-notifications-email-create-body": "The page \"$1\" was 
{{GENDER:$2|created}} by $6.\n\nComment:\n $3 \nYou can visit the page 
following this link:\n$4\n",
+   "bs-notifications-email-create-body": "The page \"$1\" was 
{{GENDER:$2|created}} by $6.\n\nComment:\n $3 \nYou can visit the page 
following this link:\n$4",
"bs-notifications-delete": "The page [[:$1]] has been deleted",
"bs-notifications-email-delete-subject": "Page $1 {{GENDER:$2|deleted}} 
by $3",
"bs-notifications-email-delete-body": "The page \"$4\" was 
{{GENDER:$2|deleted}} by $5.\n\nThis was the reason:\n$3",
"bs-notifications-move": "The page [[:$1]] has been moved",
"bs-notifications-email-move-subject": "Page $1 {{GENDER:$2|moved}} by 
$4",
-   "bs-notifications-email-move-body": "The page \"$1\" was 
{{GENDER:$2|moved}} to $3 by $5. You can visit the page following this 
link:\n$4\n"
+   "bs-notifications-email-move-body": "The page \"$1\" was 
{{GENDER:$2|moved}} to $3 by $5. You can visit the page following this 
link:\n$4"
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22305779f6dc35157bbe378ebcf3a63cd8ce6f7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Remove newline at end from english messages

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Remove newline at end from english messages
..

Remove newline at end from english messages

Newline get lost on translation, but it seems there are not needed.

Change-Id: I321783eabb1487aaefca8ec3a610d94af8d3c6ec
---
M Review/i18n/en.json
M ShoutBox/i18n/en.json
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index f941eda..4da5cdf 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -38,9 +38,9 @@
"bs-review-mail-deny-and-restart-header": "$1 has 
{{GENDER:$2|rejected}} $3",
"bs-review-mail-deny-and-restart-body": "the user $1 has 
{{GENDER:$2|reacted}} to your review and {{GENDER:$2|rejected}} the changes. 
The review will be restarted automatically.",
"bs-review-mail-finish-header": "Review finished",
-   "bs-review-mail-finish-body": "the user $1 has {{GENDER:$2|reacted}} to 
your review on \"$3\" and {{GENDER:$2|accepted}} the changes. The review is now 
finished.\n\n",
+   "bs-review-mail-finish-body": "the user $1 has {{GENDER:$2|reacted}} to 
your review on \"$3\" and {{GENDER:$2|accepted}} the changes. The review is now 
finished.",
"bs-review-mail-finish-and-review-header": "$1 Review finished",
-   "bs-review-mail-finish-and-review-body": "the user $1 has 
{{GENDER:$2|reacted}} to your review on \"$3\" and {{GENDER:$2|accepted}} the 
changes. The review is now finished and got marked as stable.\n\n",
+   "bs-review-mail-finish-and-review-body": "the user $1 has 
{{GENDER:$2|reacted}} to your review on \"$3\" and {{GENDER:$2|accepted}} the 
changes. The review is now finished and got marked as stable.",
"bs-review-statebar-body-do-review": "Please review this page",
"bs-review-i-agree": "Agree",
"bs-review-i-dismiss": "Disagree",
diff --git a/ShoutBox/i18n/en.json b/ShoutBox/i18n/en.json
index 296e745..3dd1a70 100644
--- a/ShoutBox/i18n/en.json
+++ b/ShoutBox/i18n/en.json
@@ -30,7 +30,7 @@
"bs-shoutbox-n-shouts": "$1 {{PLURAL:$1|Shout|Shouts}}",
"echo-category-title-bs-shoutbox-mention-cat": "Notification for 
mention in a shout",
"bs-shoutbox-notifications-title-message-subject": "You've been 
mentioned",
-   "bs-shoutbox-notifications-title-message-text": "You've been 
{{GENDER:$1|mentioned}} by $1 ($4) in a shout on the page \"$5.\"\n\nYou can 
visit the page following this link:\n$3\n",
+   "bs-shoutbox-notifications-title-message-text": "You've been 
{{GENDER:$1|mentioned}} by $1 ($4) in a shout on the page \"$5.\"\n\nYou can 
visit the page following this link:\n$3",
"bs-shoutbox-notifications-summary": "[[User:$1|$1]] 
{{GENDER:$1|mentioned}} you in a shout on $3.",
"apihelp-bs-shoutbox-tasks-description": "Provides common tasks for the 
ShoutBox",
"apihelp-bs-shoutbox-tasks-summary": "Provides common tasks for the 
ShoutBox",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I321783eabb1487aaefca8ec3a610d94af8d3c6ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove newline at end from english messages

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Remove newline at end from english messages
..

Remove newline at end from english messages

Newline get lost on translation, but it seems there are not needed.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/361278/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 9d0445b..430a051 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4109,7 +4109,7 @@
"log-description-pagelang": "This is a log of changes in page 
languages.",
"logentry-pagelang-pagelang": "$1 {{GENDER:$2|changed}} the language of 
$3 from $4 to $5",
"default-skin-not-found": "Whoops! The default skin for your wiki, 
defined in $wgDefaultSkin as $1, is not 
available.\n\nYour installation seems to include the following 
{{PLURAL:$4|skin|skins}}. See 
[https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin 
configuration] for information how to enable {{PLURAL:$4|it|them and choose the 
default}}.\n\n$2\n\n; If you have just installed MediaWiki:\n: You probably 
installed from git, or directly from the source code using some other method. 
This is expected. Try installing some skins from 
[https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor 
mediawiki.org].\n:* 
[https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins
 Using Git to download skins].\n: Doing this should not interfere with your git 
repository if you're a MediaWiki developer.\n\n; If you have just upgraded 
MediaWiki:\n: MediaWiki 1.24 and newer no longer automatically enables 
installed skins (see [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery 
Manual: Skin autodiscovery]). You can paste the following 
{{PLURAL:$5|line|lines}} into LocalSettings.php to enable 
{{PLURAL:$5|the|all}} installed {{PLURAL:$5|skin|skins}}:\n\n$3\n\n; If you have just modified 
LocalSettings.php:\n: Double-check the skin names for typos.",
-   "default-skin-not-found-no-skins": "Whoops! The default skin for your 
wiki, defined in $wgDefaultSkin as $1, is not 
available.\n\nYou have no installed skins.\n\n; If you have just installed or 
upgraded MediaWiki:\n: You probably installed from git, or directly from the 
source code using some other method. This is expected. MediaWiki 1.24 and newer 
doesn't include any skins in the main repository. Try installing some skins 
from [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor 
mediawiki.org].\n:* 
[https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins
 Using Git to download skins].\n: Doing this should not interfere with your git 
repository if you're a MediaWiki developer. See 
[https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin 
configuration] for information how to enable skins and choose the default.\n",
+   "default-skin-not-found-no-skins": "Whoops! The default skin for your 
wiki, defined in $wgDefaultSkin as $1, is not 
available.\n\nYou have no installed skins.\n\n; If you have just installed or 
upgraded MediaWiki:\n: You probably installed from git, or directly from the 
source code using some other method. This is expected. MediaWiki 1.24 and newer 
doesn't include any skins in the main repository. Try installing some skins 
from [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin 
directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download 
tarball installer], which comes with several skins and extensions. You can copy 
and paste the skins/ directory from it.\n:* Downloading individual 
skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor 
mediawiki.org].\n:* 
[https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins
 Using Git to download skins].\n: Doing this should not interfere with your git 
repository if you're a MediaWiki developer. See 
[https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin 
configuration] for information how to enable skins and choose the default.",

[MediaWiki-commits] [Gerrit] mediawiki...MaintenanceShell[master]: Remove newline at end from english messages

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Remove newline at end from english messages
..

Remove newline at end from english messages

Newline get lost on translation, but it seems there are not needed.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MaintenanceShell 
refs/changes/77/361277/1

diff --git a/i18n/en.json b/i18n/en.json
index be34248..2ada579 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,7 +9,7 @@
"right-maintenanceshell": "Execute maintenance scripts",
"action-maintenanceshell": "execute the maintenance shell",
"maintenanceshell-legend": "Maintenance Shell",
-   "maintenanceshell-text": "Warning: Use these scripts 
with care. They are intended for developers only.\n* 
[https://www.mediawiki.org/wiki/Manual:Maintenance_scripts Manual:Maintenance 
scripts]\n* [https://www.mediawiki.org/wiki/Extension:MaintenanceShell 
Extension:MaintenanceShell]\n",
+   "maintenanceshell-text": "Warning: Use these scripts 
with care. They are intended for developers only.\n* 
[https://www.mediawiki.org/wiki/Manual:Maintenance_scripts Manual:Maintenance 
scripts]\n* [https://www.mediawiki.org/wiki/Extension:MaintenanceShell 
Extension:MaintenanceShell]",
"maintenanceshell-return": "Return to 
[[{{#special:maintenanceshell}}]].",
"maintenanceshell-error-scriptname": "Script not found",
"maintenanceshell-error-rawsubmit": "For security reasons, this page 
requires JavaScript to be enabled.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8edef4e0aa795591ead7093b60b1a4264525242e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MaintenanceShell
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Remove newline at end from english messages

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Remove newline at end from english messages
..

Remove newline at end from english messages

Newline get lost on translation, but it seems there are not needed.

Change-Id: I27fcb3e5f1f12e1de92956477794f2e44b4f349b
---
M i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 39279e4..a4717e6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -465,7 +465,7 @@
"globalrenamequeue-action-view": "View",
"globalrenamequeue-request-title": "Rename \"$1\"?",
"globalrenamequeue-request-header": "[$1 $2] is 
requesting a rename to $3.",
-   "globalrenamequeue-request-userinfo-local": "* user: 
[[Special:CentralAuth/$1|$1]]\n* home wiki: $2\n* new name: 
[[Special:CentralAuth/$3|$3]]\n",
+   "globalrenamequeue-request-userinfo-local": "* user: 
[[Special:CentralAuth/$1|$1]]\n* home wiki: $2\n* new name: 
[[Special:CentralAuth/$3|$3]]",
"globalrenamequeue-request-userinfo-global": "* current username: 
[[Special:CentralAuth/$1|$1]]\n* home wiki: $2\n* new username: 
[[Special:CentralAuth/$3|$3]]\n* global edit count: $4",
"globalrenamequeue-request-reason": "Reason for requesting 
rename\n:$1",
"globalrenamequeue-request-reason-sul": "User notified of global name 
conflict in preparation for SUL finalization.",
@@ -491,8 +491,8 @@
"globalrenamequeue-form-status-all": "all",
"globalrenamequeue-email-subject-approved": "Account rename request 
approved",
"globalrenamequeue-email-subject-rejected": "Account rename request 
rejected",
-   "globalrenamequeue-email-body-approved": "The request to rename 
\"{{GENDER:$1|$1}}\" to \"{{GENDER:$1|$2}}\" has been approved.\n\n",
-   "globalrenamequeue-email-body-rejected": "The request to rename 
\"{{GENDER:$1|$1}}\" to \"{{GENDER:$1|$2}}\" has been rejected.\n\nNote: 
$3\n\n",
+   "globalrenamequeue-email-body-approved": "The request to rename 
\"{{GENDER:$1|$1}}\" to \"{{GENDER:$1|$2}}\" has been approved.",
+   "globalrenamequeue-email-body-rejected": "The request to rename 
\"{{GENDER:$1|$1}}\" to \"{{GENDER:$1|$2}}\" has been rejected.\n\nNote: $3",
"centralauth-abortlogin-renamed": "Your account was renamed to \"$1\". 
Please use that username instead.",
"sulrenamewarning-title" : "{{GENDER:$1|Your}} account has been 
renamed",
"sulrenamewarning-renamed" : "{{GENDER:$2|Your}} account '''$1''' has 
been renamed to '''$2''' during automatic migration to the unified login system 
of {{int:Centralauth-groupname}}.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27fcb3e5f1f12e1de92956477794f2e44b4f349b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix : Index naming for the Cargo Tables of multi valued fie...

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix : Index naming for the Cargo Tables of  multi valued fields.
..


Fix : Index naming for the Cargo Tables of  multi valued fields.

The index name for the Cargo tables of multi valued fields was being generated 
as 'row_id_$fieldname'.
This patch fixes the issue.

Change-Id: I64cbcf10d515205892f5df398c0761a8870e61b3
---
M CargoUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/CargoUtils.php b/CargoUtils.php
index 50ecac6..1579405 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -707,7 +707,7 @@
$createSQL .= ' )';
$cdb->query( $createSQL );
$createIndexSQL = 'CREATE INDEX ' .
-   $cdb->addIdentifierQuotes( 
'row_id_$fieldTableName' ) . ' ON ' .
+   $cdb->addIdentifierQuotes( 
"row_id_$fieldTableName" ) . ' ON ' .
$cdb->tableName( $fieldTableName ) .
' (' . $cdb->addIdentifierQuotes( 
'_rowID' ) . ')';
$cdb->query( $createIndexSQL );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64cbcf10d515205892f5df398c0761a8870e61b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Fz-29 
Gerrit-Reviewer: Yaron Koren 
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...Cargo[master]: Fix : Index naming for the Cargo Tables of multi valued fie...

2017-06-24 Thread Fz-29 (Code Review)

Fz-29 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361275 )

Change subject: Fix : Index naming for the Cargo Tables of  multi valued fields.
..

Fix : Index naming for the Cargo Tables of  multi valued fields.

The index name for the Cargo tables of multi valued fields was being generated 
as 'row_id_$fieldname'.
This patch fixes the issue.

Change-Id: I64cbcf10d515205892f5df398c0761a8870e61b3
---
M CargoUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/75/361275/1

diff --git a/CargoUtils.php b/CargoUtils.php
index 50ecac6..1579405 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -707,7 +707,7 @@
$createSQL .= ' )';
$cdb->query( $createSQL );
$createIndexSQL = 'CREATE INDEX ' .
-   $cdb->addIdentifierQuotes( 
'row_id_$fieldTableName' ) . ' ON ' .
+   $cdb->addIdentifierQuotes( 
"row_id_$fieldTableName" ) . ' ON ' .
$cdb->tableName( $fieldTableName ) .
' (' . $cdb->addIdentifierQuotes( 
'_rowID' ) . ')';
$cdb->query( $createIndexSQL );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64cbcf10d515205892f5df398c0761a8870e61b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Fz-29 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fixed : Populate hierarchy fields in Cargo Tables

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Fixed : Populate hierarchy fields in Cargo Tables
..


Fixed : Populate hierarchy fields in Cargo Tables

Hierarchy fields were not being populated.
This patch fixes the above issue.

Change-Id: I958d9c246d621b484f5acee3d6271a8ef4d3b86a
---
M CargoFieldDescription.php
M CargoUtils.php
2 files changed, 22 insertions(+), 6 deletions(-)

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



diff --git a/CargoFieldDescription.php b/CargoFieldDescription.php
index 727136c..8c22c58 100644
--- a/CargoFieldDescription.php
+++ b/CargoFieldDescription.php
@@ -15,6 +15,7 @@
public $mAllowedValues = null;
public $mIsHidden = false;
public $mIsHierarchy = false;
+   public $mHierarchyStructure = null;
public $mOtherParams = array();
 
/**
@@ -68,12 +69,25 @@
// already used to separate
// "extra parameters", so just
// hardcode it to a semicolon.
+   if( 
$fieldDescription->mIsHierarchy == true ) {
+   // $paramValue contains 
"*" hierarchy structure
+   
$fieldDescription->mHierarchyStructure = trim( $paramValue );
+   // now make the allowed 
values param similar to the syntax
+   // used by other fields
+   $hierarchyNodesArray = 
explode( "\n", $paramValue );
+   $allowedValuesArray = 
array();
+   foreach ( 
$hierarchyNodesArray as $node ) {
+   // Remove 
prefix of multiple "*"
+   
$allowedValuesArray[] = preg_replace( '/^[*]*/', '', $node );
+   }
+   $paramValue = implode( 
',', $allowedValuesArray );
+   }
$delimiter = ',';
$allowedValuesStr = 
str_replace( "\\$delimiter", "\a", $paramValue );
$allowedValuesArray = explode( 
$delimiter, $allowedValuesStr );
foreach ( $allowedValuesArray 
as $i => $value ) {
if ( $value == '' ) 
continue;
-   // Replace beep back 
with comma, trim.
+   // Replace beep back 
with delimiter, trim.
$value = str_replace( 
"\a", $delimiter, trim( $value ) );

$fieldDescription->mAllowedValues[] = $value;
}
@@ -114,6 +128,8 @@
$fieldDescription->mIsHidden = true;
} elseif ( $param == 'hierarchy' ) {
$fieldDescription->mIsHierarchy = true;
+   } elseif ( $param == 'hierarchyStructure' ) {
+   $fieldDescription->mHierarchyStructure = $value;
}
}
return $fieldDescription;
@@ -152,6 +168,7 @@
}
if ( $this->mIsHierarchy ) {
$descriptionData['hierarchy'] = true;
+   $descriptionData['hierarchyStructure'] = 
$this->mHierarchyStructure;
}
foreach ( $this->mOtherParams as $otherParam => $value ) {
$descriptionData[$otherParam] = $value;
diff --git a/CargoUtils.php b/CargoUtils.php
index eeb860b..50ecac6 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -730,11 +730,10 @@
$createIndexSQL .= $cdb->addIdentifierQuotes( 
'_right' ) . ')';
$cdb->query( $createIndexSQL );
$fieldTableNames[] = $fieldTableName;
-   //Insert Hierarchy Structure
-   $allowedValuesWikitext = 
$fieldDescription->mAllowedValues[0];
-   $hierarchyTree = 
CargoHierarchy::newFromWikiText( $allowedValuesWikitext );
-   $hierarchyStructureData =

[MediaWiki-commits] [Gerrit] operations...cumin[master]: Tests: convert unittest to pytest

2017-06-24 Thread Volans (Code Review)

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

Change subject: Tests: convert unittest to pytest
..

Tests: convert unittest to pytest

Bug: T154588
Change-Id: Ia75f32b212e36d613c784765a52f1317ac690810
---
M cumin/tests/unit/backends/test_direct.py
M cumin/tests/unit/backends/test_puppetdb.py
M cumin/tests/unit/test_backends.py
M cumin/tests/unit/test_cli.py
M cumin/tests/unit/test_grammar.py
M cumin/tests/unit/test_query.py
M cumin/tests/unit/test_transport.py
M cumin/tests/unit/transports/test_clustershell.py
M cumin/tests/unit/transports/test_init.py
9 files changed, 563 insertions(+), 570 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/cumin 
refs/changes/74/361274/1

diff --git a/cumin/tests/unit/backends/test_direct.py 
b/cumin/tests/unit/backends/test_direct.py
index feaea9b..d63440b 100644
--- a/cumin/tests/unit/backends/test_direct.py
+++ b/cumin/tests/unit/backends/test_direct.py
@@ -1,80 +1,77 @@
 """Direct backend tests."""
 
-import unittest
+import pytest
 
 from ClusterShell.NodeSet import NodeSet
 
 from cumin.backends import BaseQuery, InvalidQueryError, direct
 
 
-class TestDirectQueryClass(unittest.TestCase):
-"""Direct backend query_class test class."""
-
-def test_query_class(self):
-"""An instance of query_class should be an instance of BaseQuery."""
-query = direct.query_class({})
-self.assertIsInstance(query, BaseQuery)
+def test_direct_query_class():
+"""An instance of query_class should be an instance of BaseQuery."""
+query = direct.query_class({})
+assert isinstance(query, BaseQuery)
 
 
-class TestDirectQuery(unittest.TestCase):
+class TestDirectQuery(object):
 """Direct backend query test class."""
 
-def setUp(self):
-"""Setup an instace of DirectQuery for each test."""
-self.query = direct.DirectQuery({})
+def setup_method(self, _):
+"""Setup an instance of DirectQuery for each test."""
+self.query = direct.DirectQuery({})  # pylint: 
disable=attribute-defined-outside-init
 
 def test_instantiation(self):
 """An instance of DirectQuery should be an instance of BaseQuery."""
-self.assertIsInstance(self.query, BaseQuery)
-self.assertDictEqual(self.query.config, {})
+assert isinstance(self.query, BaseQuery)
+assert self.query.config == {}
 
 def test_add_category_fact(self):
 """Calling add_category() should raise InvalidQueryError."""
-with self.assertRaisesRegexp(InvalidQueryError, r"Category tokens are 
not supported"):
+with pytest.raises(InvalidQueryError, match='Category tokens are not 
supported'):
 self.query.add_category('F', 'key', 'value')
 
 def test_add_hosts(self):
 """Calling add_hosts() should add the hosts to the NodeSet."""
-self.assertListEqual(list(self.query.hosts), [])
+assert list(self.query.hosts) == []
 # No hosts
 self.query.add_hosts(NodeSet.fromlist([]))
-self.assertListEqual(list(self.query.hosts), [])
+assert list(self.query.hosts) == []
 # Single host
 self.query.add_hosts(NodeSet.fromlist(['host']))
-self.assertListEqual(list(self.query.hosts), ['host'])
+assert list(self.query.hosts) == ['host']
 # Multiple hosts
 self.query.add_hosts(NodeSet.fromlist(['host1', 'host2']))
-self.assertListEqual(list(self.query.hosts), ['host', 'host1', 
'host2'])
+assert list(self.query.hosts) == ['host', 'host1', 'host2']
 # Negated query
 self.query.add_hosts(NodeSet.fromlist(['host1']), neg=True)
-self.assertListEqual(list(self.query.hosts), ['host', 'host2'])
+assert list(self.query.hosts) == ['host', 'host2']
 # Globbing is not supported
-with self.assertRaisesRegexp(InvalidQueryError, r"Hosts globbing is 
not supported"):
+with pytest.raises(InvalidQueryError, match='Hosts globbing is not 
supported'):
 self.query.add_hosts(NodeSet.fromlist(['host1*']))
 
 def test_open_subgroup(self):
 """Calling open_subgroup() should raise InvalidQueryError."""
-with self.assertRaisesRegexp(InvalidQueryError, r"Subgroups are not 
supported"):
+with pytest.raises(InvalidQueryError, matach='Subgroups are not 
supported'):
 self.query.open_subgroup()
 
 def test_close_subgroup(self):
 """Calling close_subgroup() should raise InvalidQueryError."""
-with self.assertRaisesRegexp(InvalidQueryError, r"Subgroups are not 
supported"):
+with pytest.raises(InvalidQueryError, match='Subgroups are not 
supported'):
 self.query.close_subgroup()
 
 def test_add_and(self):
 """Calling add_and() should raise InvalidQueryError."""
-with self.assertRaisesRegexp(InvalidQueryError, r"Boolean AND

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Automatically detect if luasandbox is installed

2017-06-24 Thread Legoktm (Code Review)

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

Change subject: Automatically detect if luasandbox is installed
..

Automatically detect if luasandbox is installed

This makes it easier for people to use luasandbox and brings it in line
with how we currently take advantage of other PHP extensions if they're
available (e.g. wikidiff2). People can still explicitly use
luastandalone if they want to.

Change-Id: I585019be4dfeb0e2614d91dc3fb7eac0a3bd4bab
---
M common/Common.php
M engines/LuaCommon/LuaCommon.php
M extension.json
3 files changed, 34 insertions(+), 3 deletions(-)


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

diff --git a/common/Common.php b/common/Common.php
index 5511cb6..c6f089e 100644
--- a/common/Common.php
+++ b/common/Common.php
@@ -13,8 +13,12 @@
 * @return ScribuntoEngineBase
 */
public static function newEngine( $options ) {
-   $class = $options['class'];
-   return new $class( $options );
+   if ( isset( $options['factory'] ) ) {
+   return call_user_func( $options['factory'], $options );
+   } else {
+   $class = $options['class'];
+   return new $class( $options );
+   }
}
 
/**
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index 345e9c4..b544def 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -51,6 +51,30 @@
const MAX_EXPAND_CACHE_SIZE = 100;
 
/**
+* If luasandbox is installed and usable then use it,
+* otherwise
+*
+* @param array $options
+* @return Scribunto_LuaEngine
+*/
+   public static function newAutodetectEngine( array $options ) {
+   global $wgScribuntoEngineConf;
+   $engine = 'luastandalone';
+   try {
+   
Scribunto_LuaSandboxInterpreter::checkLuaSandboxVersion();
+   $engine = 'luasandbox';
+   } catch ( Scribunto_LuaInterpreterNotFoundError $e ) {
+   // pass
+   } catch ( Scribunto_LuaInterpreterBadVersionError $e ) {
+   // pass
+   }
+
+   unset( $options['factory'] );
+
+   return Scribunto::newEngine( $options + 
$wgScribuntoEngineConf[$engine] );
+   }
+
+   /**
 * Create a new interpreter object
 * @return Scribunto_LuaInterpreter
 */
diff --git a/extension.json b/extension.json
index f807954..edac38d 100644
--- a/extension.json
+++ b/extension.json
@@ -136,7 +136,7 @@
],
"callback": "ScribuntoHooks::onRegistration",
"config": {
-   "ScribuntoDefaultEngine": "luastandalone",
+   "ScribuntoDefaultEngine": "luaautodetect",
"ScribuntoEngineConf": {
"luasandbox": {
"class": "Scribunto_LuaSandboxEngine",
@@ -155,6 +155,9 @@
"allowEnvFuncs": false,
"maxLangCacheSize": 30
},
+   "luaautodetect": {
+   "factory": 
"Scribunto_LuaEngine::newAutodetectEngine"
+   },
"_merge_strategy": "array_plus_2d"
},
"ScribuntoUseGeSHi": false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I585019be4dfeb0e2614d91dc3fb7eac0a3bd4bab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
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] mediawiki/vagrant[master]: striker: sudo schema support

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: striker: sudo schema support
..


striker: sudo schema support

Add LDAP configuration needed to support storing sudoer rules. Initial
LDAP tree contents are updated as well. Existing deployments can be
updated manually using:

ldapadd -x -D cn=admin,dc=wmftest,dc=net -w vagrant_admin < Service['slapd'],
 }
 
+file { '/etc/ldap/schema/sudo.schema':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+source  => 'puppet:///modules/openldap/sudo.schema',
+require => Package['slapd'],
+notify  => Service['slapd'],
+}
+
 file { '/etc/ldap/slapd.conf' :
 ensure  => present,
 owner   => 'openldap',
diff --git a/puppet/modules/openldap/templates/slapd.erb 
b/puppet/modules/openldap/templates/slapd.erb
index f93874d..0221c27 100644
--- a/puppet/modules/openldap/templates/slapd.erb
+++ b/puppet/modules/openldap/templates/slapd.erb
@@ -11,6 +11,7 @@
 include /etc/ldap/schema/ppolicy.schema
 include /etc/ldap/schema/rfc2307bis.schema
 include /etc/ldap/schema/openssh-ldap.schema
+include /etc/ldap/schema/sudo.schema
 
 pidfile  /var/run/slapd/slapd.pid
 argsfile /var/run/slapd/slapd.args
diff --git a/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb 
b/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb
index 1fc1730..4f1bad3 100644
--- a/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb
+++ b/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb
@@ -103,7 +103,7 @@
 ===Setup Striker===
 * [<%= scope['::mediawiki::server_url'] 
%>/wiki/Special:OAuthConsumerRegistration/propose Register an OAuth consumer 
for Striker]
 ** Application Name: Tool Labs console
-** OAuth callback URL: http://<%= @vhost_name %>
+** OAuth callback URL: http://<%= @vhost_name %><%= 
scope['::port_fragment'] %>
 ** Check the ''Allow consumer to specify a callback in requests and use 
"callback" URL above as a required prefix.'' checkbox.
 ** Contact email address: <%= @admin_email %>
 ** Types of grants being requested: Authentication only with access to 
real name and email address via Special:OAuth/identify, no API access.
@@ -113,7 +113,7 @@
 Q = function(s){return document.querySelector('[name="' + s + '"]')};
 Q("wpname").value = "Striker";
 Q("wpdescription").value = "Striker login";
-Q("wpcallbackUrl").value = "http://<%= @vhost_name %>";
+Q("wpcallbackUrl").value = "http://<%= @vhost_name %><%= 
scope['::port_fragment'] %>";
 Q("wpcallbackIsPrefix").checked = true;
 Q("wpemail").value = "<%= @admin_email %>";
 Q("wpgranttype").value = "authonlyprivate";
diff --git a/puppet/modules/role/templates/striker/ldap_data.erb 
b/puppet/modules/role/templates/striker/ldap_data.erb
index 6f39fa4..7b03a2d 100755
--- a/puppet/modules/role/templates/striker/ldap_data.erb
+++ b/puppet/modules/role/templates/striker/ldap_data.erb
@@ -5,6 +5,17 @@
 objectClass: top
 description: Tools
 
+dn: ou=people,ou=servicegroups,<%= scope['::role::ldapauth::base_dn'] %>
+objectClass: organizationalUnit
+objectClass: top
+ou: people
+
+dn: ou=projects,<%= scope['::role::ldapauth::base_dn'] %>
+objectClass: organizationalUnit
+objectClass: top
+description: OU for openstack projects and global groups
+ou: projects
+
 dn: uid=admin,<%= scope['::role::ldapauth::user_base_dn'] %>
 objectClass: person
 objectClass: inetOrgPerson
@@ -39,6 +50,18 @@
 gidNumber: 5001
 member: uid=admin,<%= scope['::role::ldapauth::user_base_dn'] %>
 
+dn: cn=tools,ou=projects,<%= scope['::role::ldapauth::base_dn'] %>
+objectClass: extensibleObject
+objectClass: groupOfNames
+objectClass: top
+cn: tools
+member: uid=admin,<%= scope['::role::ldapauth::user_base_dn'] %>
+
+dn: ou=sudoers,cn=tools,ou=projects,<%= 
scope['::role::ldapauth::user_base_dn'] %>
+objectClass: organizationalUnit
+objectClass: top
+ou: sudoers
+
 dn: cn=tools.admin,ou=servicegroups,<%= scope['::role::ldapauth::base_dn'] %>
 objectClass: groupOfNames
 objectClass: posixGroup

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97503da4621de5d60207746fd564fa3196274886
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
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[master]: striker: sudo schema support

2017-06-24 Thread BryanDavis (Code Review)

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

Change subject: striker: sudo schema support
..

striker: sudo schema support

Add LDAP configuration needed to support storing sudoer rules. Initial
LDAP tree contents are updated as well. Existing deployments can be
updated manually using:

ldapadd -x -D cn=admin,dc=wmftest,dc=net -w vagrant_admin < Service['slapd'],
 }
 
+file { '/etc/ldap/schema/sudo.schema':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+source  => 'puppet:///modules/openldap/sudo.schema',
+require => Package['slapd'],
+notify  => Service['slapd'],
+}
+
 file { '/etc/ldap/slapd.conf' :
 ensure  => present,
 owner   => 'openldap',
diff --git a/puppet/modules/openldap/templates/slapd.erb 
b/puppet/modules/openldap/templates/slapd.erb
index f93874d..0221c27 100644
--- a/puppet/modules/openldap/templates/slapd.erb
+++ b/puppet/modules/openldap/templates/slapd.erb
@@ -11,6 +11,7 @@
 include /etc/ldap/schema/ppolicy.schema
 include /etc/ldap/schema/rfc2307bis.schema
 include /etc/ldap/schema/openssh-ldap.schema
+include /etc/ldap/schema/sudo.schema
 
 pidfile  /var/run/slapd/slapd.pid
 argsfile /var/run/slapd/slapd.args
diff --git a/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb 
b/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb
index 1fc1730..4f1bad3 100644
--- a/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb
+++ b/puppet/modules/role/templates/striker/VagrantRoleStriker.wiki.erb
@@ -103,7 +103,7 @@
 ===Setup Striker===
 * [<%= scope['::mediawiki::server_url'] 
%>/wiki/Special:OAuthConsumerRegistration/propose Register an OAuth consumer 
for Striker]
 ** Application Name: Tool Labs console
-** OAuth callback URL: http://<%= @vhost_name %>
+** OAuth callback URL: http://<%= @vhost_name %><%= 
scope['::port_fragment'] %>
 ** Check the ''Allow consumer to specify a callback in requests and use 
"callback" URL above as a required prefix.'' checkbox.
 ** Contact email address: <%= @admin_email %>
 ** Types of grants being requested: Authentication only with access to 
real name and email address via Special:OAuth/identify, no API access.
@@ -113,7 +113,7 @@
 Q = function(s){return document.querySelector('[name="' + s + '"]')};
 Q("wpname").value = "Striker";
 Q("wpdescription").value = "Striker login";
-Q("wpcallbackUrl").value = "http://<%= @vhost_name %>";
+Q("wpcallbackUrl").value = "http://<%= @vhost_name %><%= 
scope['::port_fragment'] %>";
 Q("wpcallbackIsPrefix").checked = true;
 Q("wpemail").value = "<%= @admin_email %>";
 Q("wpgranttype").value = "authonlyprivate";
diff --git a/puppet/modules/role/templates/striker/ldap_data.erb 
b/puppet/modules/role/templates/striker/ldap_data.erb
index 6f39fa4..7b03a2d 100755
--- a/puppet/modules/role/templates/striker/ldap_data.erb
+++ b/puppet/modules/role/templates/striker/ldap_data.erb
@@ -5,6 +5,17 @@
 objectClass: top
 description: Tools
 
+dn: ou=people,ou=servicegroups,<%= scope['::role::ldapauth::base_dn'] %>
+objectClass: organizationalUnit
+objectClass: top
+ou: people
+
+dn: ou=projects,<%= scope['::role::ldapauth::base_dn'] %>
+objectClass: organizationalUnit
+objectClass: top
+description: OU for openstack projects and global groups
+ou: projects
+
 dn: uid=admin,<%= scope['::role::ldapauth::user_base_dn'] %>
 objectClass: person
 objectClass: inetOrgPerson
@@ -39,6 +50,18 @@
 gidNumber: 5001
 member: uid=admin,<%= scope['::role::ldapauth::user_base_dn'] %>
 
+dn: cn=tools,ou=projects,<%= scope['::role::ldapauth::base_dn'] %>
+objectClass: extensibleObject
+objectClass: groupOfNames
+objectClass: top
+cn: tools
+member: uid=admin,<%= scope['::role::ldapauth::user_base_dn'] %>
+
+dn: ou=sudoers,cn=tools,ou=projects,<%= 
scope['::role::ldapauth::user_base_dn'] %>
+objectClass: organizationalUnit
+objectClass: top
+ou: sudoers
+
 dn: cn=tools.admin,ou=servicegroups,<%= scope['::role::ldapauth::base_dn'] %>
 objectClass: groupOfNames
 objectClass: posixGroup

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Use short array syntax in alias file

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Use short array syntax in alias file
..


Use short array syntax in alias file

Fixed by phpcbf with composer fix

Change-Id: Id4fe774535e66d789289bd7cfa9579f4f215f9f4
---
M EducationProgram.i18n.alias.php
1 file changed, 634 insertions(+), 635 deletions(-)

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



diff --git a/EducationProgram.i18n.alias.php b/EducationProgram.i18n.alias.php
index 91c1a45..8b78bce 100644
--- a/EducationProgram.i18n.alias.php
+++ b/EducationProgram.i18n.alias.php
@@ -11,735 +11,734 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-// @codingStandardsIgnoreFile
 
-$specialPageAliases = array();
+$specialPageAliases = [];
 
 /** English (English) */
-$specialPageAliases['en'] = array(
-   'MyCourses' => array( 'MyCourses' ),
-   'ManageCourses' => array( 'ManageCourses' ),
-   'Institutions' => array( 'Institutions', 'Orgs' ),
-   'Student' => array( 'Student' ),
-   'Students' => array( 'Students' ),
-   'Courses' => array( 'Courses' ),
-   'EducationProgram' => array( 'EducationProgram', 'Education_Program' ),
-   'Enroll' => array( 'Enroll' ),
-   'Disenroll' => array( 'Disenroll' ),
-   'CampusAmbassadors' => array( 'CampusVolunteers', 'CampusAmbassadors' ),
-   'OnlineAmbassadors' => array( 'OnlineVolunteers', 'OnlineAmbassadors' ),
-   'OnlineAmbassadorProfile' => array( 'OnlineVolunteerProfile', 
'OnlineAmbassadorProfile' ),
-   'CampusAmbassadorProfile' => array( 'CampusVolunteerProfile', 
'CampusAmbassadorProfile' ),
-   'StudentActivity' => array( 'StudentActivity' ),
-   'Articles' => array( 'Articles' ),
-   'CourseActivity' => array( 'CourseActivity' ),
-);
+$specialPageAliases['en'] = [
+   'MyCourses' => [ 'MyCourses' ],
+   'ManageCourses' => [ 'ManageCourses' ],
+   'Institutions' => [ 'Institutions', 'Orgs' ],
+   'Student' => [ 'Student' ],
+   'Students' => [ 'Students' ],
+   'Courses' => [ 'Courses' ],
+   'EducationProgram' => [ 'EducationProgram', 'Education_Program' ],
+   'Enroll' => [ 'Enroll' ],
+   'Disenroll' => [ 'Disenroll' ],
+   'CampusAmbassadors' => [ 'CampusVolunteers', 'CampusAmbassadors' ],
+   'OnlineAmbassadors' => [ 'OnlineVolunteers', 'OnlineAmbassadors' ],
+   'OnlineAmbassadorProfile' => [ 'OnlineVolunteerProfile', 
'OnlineAmbassadorProfile' ],
+   'CampusAmbassadorProfile' => [ 'CampusVolunteerProfile', 
'CampusAmbassadorProfile' ],
+   'StudentActivity' => [ 'StudentActivity' ],
+   'Articles' => [ 'Articles' ],
+   'CourseActivity' => [ 'CourseActivity' ],
+];
 
 /** Afrikaans (Afrikaans) */
-$specialPageAliases['af'] = array(
-   'Student' => array( 'Student' ),
-   'Students' => array( 'Studente' ),
-   'Courses' => array( 'Kursusse' ),
-   'Articles' => array( 'Artikels' ),
-);
+$specialPageAliases['af'] = [
+   'Student' => [ 'Student' ],
+   'Students' => [ 'Studente' ],
+   'Courses' => [ 'Kursusse' ],
+   'Articles' => [ 'Artikels' ],
+];
 
 /** Arabic (العربية) */
-$specialPageAliases['ar'] = array(
-   'MyCourses' => array( 'دروسي' ),
-   'ManageCourses' => array( 'التحكم_بالدروس' ),
-   'Institutions' => array( 'معاهد' ),
-   'Student' => array( 'طالب' ),
-   'Students' => array( 'طلاب' ),
-   'Courses' => array( 'دروس' ),
-   'EducationProgram' => array( 'برنامج_التعليم' ),
-   'Enroll' => array( 'تسجيل' ),
-   'Disenroll' => array( 'إلغاء_تسجيل' ),
-   'CampusAmbassadors' => array( 'سفراء_الجامعة' ),
-   'OnlineAmbassadors' => array( 'سفراء_الويب' ),
-   'OnlineAmbassadorProfile' => array( 'ملف_سفير_الويب' ),
-   'CampusAmbassadorProfile' => array( 'ملف_سفير_الجامعة' ),
-   'StudentActivity' => array( 'نشاط_الطالب' ),
-   'Articles' => array( 'مقالات' ),
-   'CourseActivity' => array( 'نشاط_الدروس' ),
-);
+$specialPageAliases['ar'] = [
+   'MyCourses' => [ 'دروسي' ],
+   'ManageCourses' => [ 'التحكم_بالدروس' ],
+   'Institutions' => [ 'معاهد' ],
+   'Student' => [ 'طالب' ],
+   'Students' => [ 'طلاب' ],
+   'Courses' => [ 'دروس' ],
+   'EducationProgram' => [ 'برنامج_التعليم' ],
+   'Enroll' => [ 'تسجيل' ],
+   'Disenroll' => [ 'إلغاء_تسجيل' ],
+   'CampusAmbassadors' => [ 'سفراء_الجامعة' ],
+   'OnlineAmbassadors' => [ 'سفراء_الويب' ],
+   'OnlineAmbassadorProfile' => [ 'ملف_سفير_الويب' ],
+   'CampusAmbassadorProfile' => [ 'ملف_سفير_الجامعة' ],
+   'StudentActivity' => [ 'نشاط_الطالب' ],
+   'Articles' => [ 'مقالات' ],
+   'CourseActivity' => [ 'نشاط_الدروس' ],
+];
 
 /** Egyptian Arabic (مصرى) */
-$specialPageAliases['arz'] = array(
-   'MyCourses' => array( 'كورساتى' ),
-

[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I8974e665b6b96e90b4ab832fea356bcee5773ed9
---
M SkinModern.php
M composer.json
M phpcs.xml
3 files changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/SkinModern.php b/SkinModern.php
index 331a6b6..423df66 100644
--- a/SkinModern.php
+++ b/SkinModern.php
@@ -198,5 +198,5 @@

 

 
-   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8974e665b6b96e90b4ab832fea356bcee5773ed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I8a0430a2f8c1ab286ea0e6203d67b61fb70f3e2c
---
M MetrolookTemplate.php
M SkinMetrolook.php
M composer.json
M phpcs.xml
4 files changed, 29 insertions(+), 21 deletions(-)

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



diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 4dcfd90..3939df5 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -99,7 +99,8 @@
);
 
if ( $this->config->get( 'MetrolookDisableAvatar' ) ) {
-   if ( class_exists( 'wAvatar' ) ) { // SocialProfile is 
installed
+   if ( class_exists( 'wAvatar' ) ) {
+   // SocialProfile is installed
$avatar = new wAvatar( 
$skin->getUser()->getId(), 'l' );
$avatarImage = $avatar->getAvatarURL( [
'width' => (int)$width,
@@ -445,8 +446,7 @@
if (
isset( 
$this->data['nav_urls']['upload']['href'] ) &&

$this->data['nav_urls']['upload']['href']
-   )
-   {
+   ) {
$uploadURL = 
$this->data['nav_urls']['upload']['href'];
} else {
$upURL = 
SpecialPage::getTitleFor( 'Upload' )->getFullURL();
@@ -638,7 +638,8 @@

renderAfterPortlet( $name );
@@ -835,17 +836,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
---
M .gitignore
M Timeless.skin.php
M TimelessTemplate.php
M composer.json
M phpcs.xml
5 files changed, 20 insertions(+), 14 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 47e36d5..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/node_modules/
-/vendor/
+/node_modules
+/vendor
 /composer.lock
diff --git a/Timeless.skin.php b/Timeless.skin.php
index d5e4618..f76e670 100644
--- a/Timeless.skin.php
+++ b/Timeless.skin.php
@@ -9,7 +9,7 @@
$template = 'TimelessTemplate', $useHeadElement = true;
 
/**
-* @param $out OutputPage
+* @param OutputPage $out
 */
public function initPage( OutputPage $out ) {
parent::initPage( $out );
@@ -33,7 +33,7 @@
/**
 * Add CSS via ResourceLoader
 *
-* @param $out OutputPage
+* @param OutputPage $out
 */
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index 6a45282..f22e5d5 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -338,9 +338,12 @@
$sidebar = $this->getSidebar();
$html = '';
 
-   $sidebar['SEARCH'] = false; // Already hardcoded into header
-   $sidebar['TOOLBOX'] = false; // Parsed as part of pageTools
-   $sidebar['LANGUAGES'] = false; // Forcibly removed to separate 
chunk
+   // Already hardcoded into header
+   $sidebar['SEARCH'] = false;
+   // Parsed as part of pageTools
+   $sidebar['TOOLBOX'] = false;
+   // Forcibly removed to separate chunk
+   $sidebar['LANGUAGES'] = false;
 
foreach ( $sidebar as $name => $content ) {
if ( $content === false ) {
@@ -647,7 +650,8 @@
] ) ) {
$currentSet = 'page-secondary';
} else {
-   $currentSet = 'page-primary'; // Catch random 
extension ones?
+   // Catch random extension ones?
+   $currentSet = 'page-primary';
}
$sortedPileOfTools[$currentSet][$navKey] = $navBlock;
}
@@ -822,7 +826,6 @@
$variants = '';
}
if ( $this->data['language_urls'] !== false ) {
-
$html .= $this->getSidebarChunk(
'other-languages',
'timeless-languages',
diff --git a/composer.json b/composer.json
index f5a983a..b0d45ec 100644
--- a/composer.json
+++ b/composer.json
@@ -31,14 +31,14 @@
"installer-name": "Timeless"
},
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.*",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor",
+   "parallel-lint . --exclude node_modules --exclude 
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..eecaea2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,11 @@
 
 
-   
+   
+   
+   
.

-   
+   
vendor
+   node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...FundraisingEmailUnsubscribe[master]: Use short array syntax in alias file

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Use short array syntax in alias file
..


Use short array syntax in alias file

Change-Id: I28ccffd34e48f1856b55325c6840577aa18f9e1e
---
M FundraisingEmailUnsubscribe.alias.php
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/FundraisingEmailUnsubscribe.alias.php 
b/FundraisingEmailUnsubscribe.alias.php
index 29f329a..9bdbeb0 100644
--- a/FundraisingEmailUnsubscribe.alias.php
+++ b/FundraisingEmailUnsubscribe.alias.php
@@ -5,11 +5,10 @@
  * @file
  * @ingroup Extensions
  */
-// @codingStandardsIgnoreFile
 
-$specialPageAliases = array();
+$specialPageAliases = [];
 
 /** English (English) */
-$specialPageAliases['en'] = array(
-   'FundraiserUnsubscribe' => array( 'FundraiserUnsubscribe' ),
-);
+$specialPageAliases['en'] = [
+   'FundraiserUnsubscribe' => [ 'FundraiserUnsubscribe' ],
+];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28ccffd34e48f1856b55325c6840577aa18f9e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingEmailUnsubscribe
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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] mediawiki...apex[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I516a69a4f3c2b4c564e20042669a4eb27c969524
---
M .gitignore
M ApexTemplate.php
M SkinApex.php
M composer.json
M phpcs.xml
5 files changed, 22 insertions(+), 18 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 8ec4b92..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-node_modules/
-vendor/
-composer.lock
+/node_modules
+/vendor
+/composer.lock
diff --git a/ApexTemplate.php b/ApexTemplate.php
index 76f468f..08dd169 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -117,13 +117,13 @@


>
-   renderNavigation( array( 'SEARCH', 
'PERSONAL' ) ); ?>
+   renderNavigation( [ 'SEARCH', 'PERSONAL' ] 
); ?>


-   renderNavigation( array( 
'NAMESPACES', 'VARIANTS' ) ); ?>
+   renderNavigation( [ 
'NAMESPACES', 'VARIANTS' ] ); ?>


-   renderNavigation( array( 
'VIEWS', 'ACTIONS' ) ); ?>
+   renderNavigation( [ 
'VIEWS', 'ACTIONS' ] ); ?>



@@ -224,7 +224,7 @@
 

@@ -248,7 +248,7 @@
// If only one element was given, wrap it in an array, allowing 
more
// flexible arguments
if ( !is_array( $elements ) ) {
-   $elements = array( $elements );
+   $elements = [ $elements ];
// If there's a series of elements, reverse them when in RTL 
mode
} elseif ( $this->data['rtl'] ) {
$elements = array_reverse( $elements );
@@ -349,8 +349,8 @@
>msg( 'search' ) ?>


-   makeSearchInput( array( 'id' => 
'searchInput', 'type' => 'text' ) ); ?>
-   makeSearchButton( 'image', array( 
'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 
'images/icons/search.png' ), 'width' => '12', 'height' => '13' ) ); ?>
+   makeSearchInput( [ 'id' => 
'searchInput', 'type' => 'text' ] ); ?>
+   makeSearchButton( 'image', [ 'id' => 
'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 
'images/icons/search.png' ), 'width' => '12', 'height' => '13' ] ); ?>



diff --git a/SkinApex.php b/SkinApex.php
index 6d384b3..6f5f23e 100644
--- a/SkinApex.php
+++ b/SkinApex.php
@@ -6,7 +6,7 @@
  */
 class SkinApex extends SkinTemplate {
 
-   protected static $bodyClasses = array( 'apex-animateLayout' );
+   protected static $bodyClasses = [ 'apex-animateLayout' ];
 
var $skinname = 'apex', $stylename = 'apex',
$template = 'ApexTemplate', $useHeadElement = true;
@@ -44,10 +44,10 @@
 */
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
-   $out->addModuleStyles( array(
+   $out->addModuleStyles( [
'mediawiki.skinning.interface',
'skins.apex'
-   ) );
+   ] );
}
 
/**
diff --git a/composer.json b/composer.json
index 56f1655..10da5b6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.5.1",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor",
+   "parallel-lint . --exclude node_modules --exclude 
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index f136dc2..6e1cd0e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 
 
-   
+   



@@ -10,10 +10,14 @@



-
+   
+   
+   
+   

.

-   
+   
vendor
+   node_modules
 

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

[MediaWiki-commits] [Gerrit] mediawiki...Nostalgia[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I8cd65a3255123e33b993099717a6473b469a24fa
---
M .gitignore
M Nostalgia_body.php
M composer.json
M phpcs.xml
4 files changed, 15 insertions(+), 8 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index c2658d7..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-node_modules/
+/node_modules
+/vendor
+/composer.lock
diff --git a/Nostalgia_body.php b/Nostalgia_body.php
index 2d0857c..7911f0c 100644
--- a/Nostalgia_body.php
+++ b/Nostalgia_body.php
@@ -31,7 +31,7 @@
 
/**
 * Add skin specific stylesheets
-* @param $out OutputPage
+* @param OutputPage $out
 */
function setupSkinUserCss( OutputPage $out ) {
$out->addModuleStyles( 'mediawiki.legacy.shared' );
@@ -386,14 +386,16 @@
$title = $skin->getTitle();
 
$s[] = $this->printableLink();
-   $disclaimer = $skin->disclaimerLink(); # may be empty
+   $disclaimer = $skin->disclaimerLink();
 
+   # may be empty
if ( $disclaimer ) {
$s[] = $disclaimer;
}
 
-   $privacy = $skin->privacyLink(); # may be empty too
+   $privacy = $skin->privacyLink();
 
+   # may be empty too
if ( $privacy ) {
$s[] = $privacy;
}
diff --git a/composer.json b/composer.json
index b8f68fb..5243c66 100644
--- a/composer.json
+++ b/composer.json
@@ -2,12 +2,12 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor",
+   "parallel-lint . --exclude node_modules --exclude 
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index ede6c5d..0903898 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,12 @@
 
 
-   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cd65a3255123e33b993099717a6473b469a24fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
---
M VectorTemplate.php
M composer.json
M phpcs.xml
3 files changed, 26 insertions(+), 21 deletions(-)

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



diff --git a/VectorTemplate.php b/VectorTemplate.php
index 932f636..234e015 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -322,7 +322,8 @@

renderAfterPortlet( $name );
@@ -499,18 +500,16 @@
msg( 'personaltools' ) ?>
>
getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ){
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
$notLoggedIn =

Html::rawElement( 'li',

[ 'id' => 'pt-anonuserpage' ],

$this->getMsg( 'notloggedin' )->escaped()
);
-
}
 
$personalTools = 
$this->getPersonalTools();
@@ -551,17 +550,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(
'fulltext',

[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: Fix indent of if statement

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix indent of if statement
..


Fix indent of if statement

Change-Id: I3d29736b169136c88d97d643e479bddb6d3719a4
---
M lib/LifeWeb/Character.php
M lib/LifeWeb/Collection.php
M lib/LifeWeb/Component.php
M lib/LifeWeb/Degree.php
M lib/LifeWeb/Difficulty.php
M lib/LifeWeb/Equipment.php
M lib/LifeWeb/LWItem.php
M lib/LifeWeb/Question.php
M lib/LifeWeb/Topic.php
9 files changed, 29 insertions(+), 20 deletions(-)

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



diff --git a/lib/LifeWeb/Character.php b/lib/LifeWeb/Character.php
index 7179f31..d490f5f 100644
--- a/lib/LifeWeb/Character.php
+++ b/lib/LifeWeb/Character.php
@@ -30,8 +30,9 @@
$questions = $this->getItems( EntityIDs::pid( 
'pParentQuestion' ), EntityIDs::pid( 'qQuestion' ) );
 
$name = $this->getEntity()->getLabel( 
$wgLang->getCode() );
-   if ( !$name ) { $name = $this->getPrefixedId();
- }
+   if ( !$name ) {
+   $name = $this->getPrefixedId();
+   }
 
$this->data = [
'id' => $this->getPrefixedId(),
diff --git a/lib/LifeWeb/Collection.php b/lib/LifeWeb/Collection.php
index 110255c..a2cb8be 100644
--- a/lib/LifeWeb/Collection.php
+++ b/lib/LifeWeb/Collection.php
@@ -23,8 +23,9 @@
if ( $this->updateContent( $oldRev ) || $clearCache ) {
 
$name = $this->getEntity()->getLabel( 
$wgLang->getCode() );
-   if ( !$name ) { $name = $this->getPrefixedId();
- }
+   if ( !$name ) {
+   $name = $this->getPrefixedId();
+   }
 
$this->data = [
'id' => $this->getPrefixedId(),
diff --git a/lib/LifeWeb/Component.php b/lib/LifeWeb/Component.php
index 0329b6c..63202e5 100644
--- a/lib/LifeWeb/Component.php
+++ b/lib/LifeWeb/Component.php
@@ -25,8 +25,9 @@
$name = $this->getEntity()->getLabel( 
$wgLang->getCode() );
$topics = $this->getItems( EntityIDs::pid( 'pTopic' ), 
EntityIDs::pid( 'qTopic' ) );
 
-   if ( !$name ) { $name = $this->getPrefixedId();
- }
+   if ( !$name ) {
+   $name = $this->getPrefixedId();
+   }
 
$this->data = [
'id' => $this->getPrefixedId(),
diff --git a/lib/LifeWeb/Degree.php b/lib/LifeWeb/Degree.php
index 03e8cfa..486ebf1 100644
--- a/lib/LifeWeb/Degree.php
+++ b/lib/LifeWeb/Degree.php
@@ -23,8 +23,9 @@
if ( $this->updateContent( $oldRev ) || $clearCache ) {
 
$name = $this->getEntity()->getLabel( 
$wgLang->getCode() );
-   if ( !$name ) { $name = $this->getPrefixedId();
- }
+   if ( !$name ) {
+   $name = $this->getPrefixedId();
+   }
 
$this->data = [
'id' => $this->getPrefixedId(),
diff --git a/lib/LifeWeb/Difficulty.php b/lib/LifeWeb/Difficulty.php
index 170a1e8..142bcbf 100644
--- a/lib/LifeWeb/Difficulty.php
+++ b/lib/LifeWeb/Difficulty.php
@@ -23,8 +23,9 @@
if ( $this->updateContent( $oldRev ) || $clearCache ) {
 
$name = $this->getEntity()->getLabel( 
$wgLang->getCode() );
-   if ( !$name ) { $name = $this->getPrefixedId();
- }
+   if ( !$name ) {
+   $name = $this->getPrefixedId();
+   }
 
$this->data = [
'id' => $this->getPrefixedId(),
diff --git a/lib/LifeWeb/Equipment.php b/lib/LifeWeb/Equipment.php
index 7c45227..8fc3f79 100644
--- a/lib/LifeWeb/Equipment.php
+++ b/lib/LifeWeb/Equipment.php
@@ -23,8 +23,9 @@
if ( $this->updateContent( $oldRev ) || $clearCache ) {
 
$name = $this->getEntity()->getLabel( 
$wgLang->getCode() );
-   if ( !$name ) { $name = $this->getPrefixedId();
- }
+   if ( !$name ) {
+   $name = $this->getPrefixedId();
+   }
 
$this->data = [
'id' => $this->getPrefixedId(),
diff --git a/lib/LifeWeb/LWItem.php b/lib/LifeWeb/LWItem.php
index 3cbf33f..435fdbc 100644
--- a/lib/LifeWeb/LWItem.php
+++ b/lib/LifeWeb/LWItem.php
@@ -83,8 +83,9 @@
$updatedContent = 
\Wikibase\EntityContentFactory::singleton()->getFromId( $this->itemId );

[MediaWiki-commits] [Gerrit] mediawiki...VectorV2[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ie6489c84c576fe4f0162f5c39e0100dc9c83f90f
---
M .gitignore
M VectorV2Template.php
M composer.json
M phpcs.xml
4 files changed, 26 insertions(+), 19 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/VectorV2Template.php b/VectorV2Template.php
index 9b203aa..5aeec5f 100644
--- a/VectorV2Template.php
+++ b/VectorV2Template.php
@@ -114,7 +114,7 @@
if ( $this->data['title'] != '' ) {
?>
html( 'title' )
+   $this->html( 'title' )
?>

@@ -322,7 +322,8 @@

renderAfterPortlet( $name );
@@ -520,17 +521,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(
'fulltext',
[ 'id' => 
'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ]
diff --git a/composer.json b/composer.json
index fe15d13..7e889a4 100644
--- a/composer.json
+++ b/composer.json
@@ -34,14 +34,14 @@
"installer-name": "VectorV2"
},
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.*",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",

[MediaWiki-commits] [Gerrit] mediawiki...CologneBlue[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: If7f5a59d83910c444f5108c022eb4f08c1fd
---
M .gitignore
M composer.json
M phpcs.xml
3 files changed, 12 insertions(+), 5 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/composer.json b/composer.json
index 1ef4ea4..5243c66 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index ede6c5d..e7b9854 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,16 @@
 
 
-   
+   
+   
+   
+   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7f5a59d83910c444f5108c022eb4f08c1fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
---
M .gitignore
M MonoBookTemplate.php
M composer.json
M phpcs.xml
4 files changed, 17 insertions(+), 19 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 6625e52..ac6aae6 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -72,7 +72,7 @@
data['undelete'] ) { 
?>
html( 'undelete' ) ?>
data['newtalk'] ) {
?>
@@ -117,7 +117,6 @@

>
getPersonalTools();
 
if ( array_key_exists( 'uls', 
$personalTools ) ) {
@@ -126,8 +125,8 @@
}
 
if ( 
!$this->getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ) {
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
echo Html::rawElement( 
'li', [
'id' => 
'pt-anonuserpage'
], $this->getMsg( 
'notloggedin' )->escaped() );
@@ -159,7 +158,8 @@

getFooterIcons( 'icononly' );
-   $validFooterLinks = $this->getFooterLinks( 'flat' ); // 
Additional footer links
+   // Additional footer links
+   $validFooterLinks = $this->getFooterLinks( 'flat' );
 
if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
?>
@@ -177,7 +177,7 @@
getSkin()->makeFooterIcon( $icon ); ?>
 




@@ -331,7 +328,6 @@
Hooks::run( 'MonoBookAfterToolbox' );
}
 
-   
/*/
function languageBox() {
if ( $this->data['language_urls'] !== false ) {
?>
@@ -344,7 +340,7 @@
makeListItem( $key, $langLink ); ?>
 


 
@@ -355,7 +351,6 @@
}
}
 
-   
/*/
/**
 * @param string $bar
 * @param array|string $cont
@@ -402,4 +397,4 @@


 
-   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Use short array syntax in alias file

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Use short array syntax in alias file
..


Use short array syntax in alias file

Fixed by phpcbf with composer fix

Change-Id: Id3cf6919874e0ef40fb4e77223f2e947bf4fcb6c
---
M PageTriage.alias.php
1 file changed, 61 insertions(+), 62 deletions(-)

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



diff --git a/PageTriage.alias.php b/PageTriage.alias.php
index add11a1..cedac79 100644
--- a/PageTriage.alias.php
+++ b/PageTriage.alias.php
@@ -5,106 +5,105 @@
  * @file
  * @ingroup Extensions
  */
-// @codingStandardsIgnoreFile
 
-$specialPageAliases = array();
+$specialPageAliases = [];
 
 /** English (English) */
-$specialPageAliases['en'] = array(
-   'NewPagesFeed' => array( 'NewPagesFeed' ),
-);
+$specialPageAliases['en'] = [
+   'NewPagesFeed' => [ 'NewPagesFeed' ],
+];
 
 /** Arabic (العربية) */
-$specialPageAliases['ar'] = array(
-   'NewPagesFeed' => array( 'تغذية_الصفحات_الجديدة' ),
-);
+$specialPageAliases['ar'] = [
+   'NewPagesFeed' => [ 'تغذية_الصفحات_الجديدة' ],
+];
 
 /** Egyptian Arabic (مصرى) */
-$specialPageAliases['arz'] = array(
-   'NewPagesFeed' => array( 'تغذيه_الصفحات_الجديده' ),
-);
+$specialPageAliases['arz'] = [
+   'NewPagesFeed' => [ 'تغذيه_الصفحات_الجديده' ],
+];
 
 /** Western Balochi (بلوچی رخشانی) */
-$specialPageAliases['bgn'] = array(
-   'NewPagesFeed' => array( 'نوکین_وّرق_ئانی_وّرگ' ),
-);
+$specialPageAliases['bgn'] = [
+   'NewPagesFeed' => [ 'نوکین_وّرق_ئانی_وّرگ' ],
+];
 
 /** German (Deutsch) */
-$specialPageAliases['de'] = array(
-   'NewPagesFeed' => array( 'Seitenprüfung' ),
-);
+$specialPageAliases['de'] = [
+   'NewPagesFeed' => [ 'Seitenprüfung' ],
+];
 
 /** Zazaki (Zazaki) */
-$specialPageAliases['diq'] = array(
-   'NewPagesFeed' => array( 'WerdéPerandéNewan' ),
-);
+$specialPageAliases['diq'] = [
+   'NewPagesFeed' => [ 'WerdéPerandéNewan' ],
+];
 
 /** Persian (فارسی) */
-$specialPageAliases['fa'] = array(
-   'NewPagesFeed' => array( 'خوراک_صفحه‌های_جدید' ),
-);
+$specialPageAliases['fa'] = [
+   'NewPagesFeed' => [ 'خوراک_صفحه‌های_جدید' ],
+];
 
 /** Hebrew (עברית) */
-$specialPageAliases['he'] = array(
-   'NewPagesFeed' => array( 'הזנת_דפים_חדשים' ),
-);
+$specialPageAliases['he'] = [
+   'NewPagesFeed' => [ 'הזנת_דפים_חדשים' ],
+];
 
 /** Italian (italiano) */
-$specialPageAliases['it'] = array(
-   'NewPagesFeed' => array( 'FeedNuovePagine' ),
-);
+$specialPageAliases['it'] = [
+   'NewPagesFeed' => [ 'FeedNuovePagine' ],
+];
 
 /** Japanese (日本語) */
-$specialPageAliases['ja'] = array(
-   'NewPagesFeed' => array( '新規ページフィード' ),
-);
+$specialPageAliases['ja'] = [
+   'NewPagesFeed' => [ '新規ページフィード' ],
+];
 
 /** Korean (한국어) */
-$specialPageAliases['ko'] = array(
-   'NewPagesFeed' => array( '새문서피드' ),
-);
+$specialPageAliases['ko'] = [
+   'NewPagesFeed' => [ '새문서피드' ],
+];
 
 /** Macedonian (македонски) */
-$specialPageAliases['mk'] = array(
-   'NewPagesFeed' => array( 'КаналНовиСтраници' ),
-);
+$specialPageAliases['mk'] = [
+   'NewPagesFeed' => [ 'КаналНовиСтраници' ],
+];
 
 /** Malayalam (മലയാളം) */
-$specialPageAliases['ml'] = array(
-   'NewPagesFeed' => array( 'വാർത്താതാൾഫീഡ്' ),
-);
+$specialPageAliases['ml'] = [
+   'NewPagesFeed' => [ 'വാർത്താതാൾഫീഡ്' ],
+];
 
 /** Malay (Bahasa Melayu) */
-$specialPageAliases['ms'] = array(
-   'NewPagesFeed' => array( 'Suapan_laman_baru' ),
-);
+$specialPageAliases['ms'] = [
+   'NewPagesFeed' => [ 'Suapan_laman_baru' ],
+];
 
 /** Dutch (Nederlands) */
-$specialPageAliases['nl'] = array(
-   'NewPagesFeed' => array( 'OverzichtNieuwePagina\'s', 
'OverzichtNieuwePaginas' ),
-);
+$specialPageAliases['nl'] = [
+   'NewPagesFeed' => [ 'OverzichtNieuwePagina\'s', 
'OverzichtNieuwePaginas' ],
+];
 
 /** Sicilian (sicilianu) */
-$specialPageAliases['scn'] = array(
-   'NewPagesFeed' => array( 'FeedNuovePagine' ),
-);
+$specialPageAliases['scn'] = [
+   'NewPagesFeed' => [ 'FeedNuovePagine' ],
+];
 
 /** Turkish (Türkçe) */
-$specialPageAliases['tr'] = array(
-   'NewPagesFeed' => array( 'YeniSayfaBeslemesi' ),
-);
+$specialPageAliases['tr'] = [
+   'NewPagesFeed' => [ 'YeniSayfaBeslemesi' ],
+];
 
 /** Vietnamese (Tiếng Việt) */
-$specialPageAliases['vi'] = array(
-   'NewPagesFeed' => array( 'Nguồn_tin_trang_mới' ),
-);
+$specialPageAliases['vi'] = [
+   'NewPagesFeed' => [ 'Nguồn_tin_trang_mới' ],
+];
 
 /** Simplified Chinese (中文（简体）‎) */
-$specialPageAliases['zh-hans'] = array(
-   'NewPagesFeed' => array( '新页面供给' ),
-);
+$specialPageAliases['zh-hans'] = [
+   'NewPagesFeed' => [ '新页面供给' ],
+];
 
 /** Traditional Chinese (中文（繁體）‎) */
-$specialPageAliases['zh-hant'] = array(
-   'NewPagesFeed' => array( '新頁面供稿' ),
-);
\ No newline at end of file

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Use short array syntax in alias file

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Use short array syntax in alias file
..


Use short array syntax in alias file

Change-Id: Ifcf111db7cc7d108a8b6f9f6a1da64a4ed691799
---
M DonationInterface.alias.php
1 file changed, 5 insertions(+), 7 deletions(-)

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



diff --git a/DonationInterface.alias.php b/DonationInterface.alias.php
index 725754d..060dee0 100644
--- a/DonationInterface.alias.php
+++ b/DonationInterface.alias.php
@@ -1,11 +1,9 @@
  array( 'GatewayFormChooser' ),
-   'SystemStatus' => array( 'SystemStatus' ),
-);
+$specialPageAliases['en'] = [
+   'GatewayFormChooser' => [ 'GatewayFormChooser' ],
+   'SystemStatus' => [ 'SystemStatus' ],
+];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcf111db7cc7d108a8b6f9f6a1da64a4ed691799
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LiveTranslate[master]: Fix typo in word 'destination'

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix typo in word 'destination'
..


Fix typo in word 'destination'

Bug: T168059
Change-Id: Id47051756616f3d81d753bf4e68a27292a425b12
---
M api/ApiLiveTranslate.php
M i18n/en.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/api/ApiLiveTranslate.php b/api/ApiLiveTranslate.php
index 6e4072d..3da26d1 100644
--- a/api/ApiLiveTranslate.php
+++ b/api/ApiLiveTranslate.php
@@ -113,7 +113,7 @@

public function getDescription() {
return array(
-   'Returns the available translations of the provided 
words in the source language in the destiniation language.'
+   'Returns the available translations of the provided 
words in the source language in the destination language.'
);
}
 
diff --git a/i18n/en.json b/i18n/en.json
index f496b41..f8ce788 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,8 +43,8 @@
"apihelp-query+translationmemories-summary": "This module returns all 
matching translation memories",
"apihelp-importtms-description": "Imports one or more translation 
memories.",
"apihelp-importtms-summary": "Imports one or more translation 
memories.",
-   "apihelp-livetranslate-description": "Returns the available 
translations of the provided words in the source language in the destiniation 
language.",
-   "apihelp-livetranslate-summary": "Returns the available translations of 
the provided words in the source language in the destiniation language.",
+   "apihelp-livetranslate-description": "Returns the available 
translations of the provided words in the source language in the destination 
language.",
+   "apihelp-livetranslate-summary": "Returns the available translations of 
the provided words in the source language in the destination language.",
"apihelp-query+livetranslate-param-language": "The language for which 
to return special words",
"apihelp-query+livetranslate-param-continue": "Offset number from where 
to continue the query",
"apihelp-query+livetranslate-param-limit": "Maximum number of words to 
return",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id47051756616f3d81d753bf4e68a27292a425b12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiveTranslate
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Add option 'hide when empty' to wiki sections in forms

2017-06-24 Thread FreedomFighterSparrow (Code Review)

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

Change subject: Add option 'hide when empty' to wiki sections in forms
..

Add option 'hide when empty' to wiki sections in forms

If specified for a section and it is empty, its heading will not be created
in the wikitext when saving the page through the form.

Change-Id: I7ac6ca80848166b517f4afc44368773f091da6c9
---
M includes/PF_FormPrinter.php
M includes/PF_PageSection.php
M includes/wikipage/PF_WikiPage.php
M includes/wikipage/PF_WikiPageSection.php
4 files changed, 31 insertions(+), 14 deletions(-)


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

diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index cbdf276..b9a20c5 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -1279,7 +1279,10 @@
if ( ( ! $source_is_page ) && 
$wgRequest ) {
$text_per_section = 
$wgRequest->getArray( '_section' );
$section_text = 
$text_per_section[trim( $section_name )];
-   $wiki_page->addSection( 
$section_name, $page_section_in_form->getSectionLevel(), $section_text );
+
+   // $section_options will allow 
to pass additional options in the future without breaking backword compatibility
+   $section_options = array( 
'isDisplayedEmpty' => $page_section_in_form->isDisplayedEmpty() );
+   $wiki_page->addSection( 
$section_name, $page_section_in_form->getSectionLevel(), $section_text, 
$section_options );
}
 
$section_text = trim( $section_text );
@@ -1624,4 +1627,4 @@
 
return $text;
}
-}
\ No newline at end of file
+}
diff --git a/includes/PF_PageSection.php b/includes/PF_PageSection.php
index 3f41377..71b87d1 100644
--- a/includes/PF_PageSection.php
+++ b/includes/PF_PageSection.php
@@ -14,6 +14,7 @@
private $mIsMandatory = false;
private $mIsHidden = false;
private $mIsRestricted = false;
+   private $mIsDisplayedEmpty = true;
private $mSectionArgs = array();
 
static function create( $section_name ) {
@@ -42,6 +43,8 @@
$ps->mIsRestricted = !( $wgUser && 
$wgUser->isAllowed( 'editrestrictedfields' ) );
} elseif ( $component === 'autogrow' ) {
$ps->mSectionArgs['autogrow'] = true;
+   } elseif ( $component === 'hide when empty' ) {
+   $ps->mIsDisplayedEmpty = false;
}
 
$sub_components = array_map( 'trim', explode( '=', 
$component, 2 ) );
@@ -102,6 +105,10 @@
return $this->mIsRestricted;
}
 
+   public function isDisplayedEmpty() {
+   return $this->mIsDisplayedEmpty;
+   }
+
public function setSectionArgs( $key, $value ) {
$this->mSectionArgs[$key] = $value;
}
diff --git a/includes/wikipage/PF_WikiPage.php 
b/includes/wikipage/PF_WikiPage.php
index 374ccab..a70cc26 100644
--- a/includes/wikipage/PF_WikiPage.php
+++ b/includes/wikipage/PF_WikiPage.php
@@ -47,8 +47,8 @@
return null;
}
 
-   function addSection( $sectionName, $headerLevel, $sectionText ) {
-   $this->mComponents[] = new PFWikiPageSection( $sectionName, 
$headerLevel, $sectionText );
+   function addSection( $sectionName, $headerLevel, $sectionText, 
$sectionOptions ) {
+   $this->mComponents[] = new PFWikiPageSection( $sectionName, 
$headerLevel, $sectionText, $sectionOptions );
}
 
function addFreeTextSection() {
@@ -168,15 +168,17 @@
$pageText .= $this->createTemplateCall( 
$component ) . "\n";
}
} elseif ( get_class( $component ) == 
'PFWikiPageSection' ) {
-   $sectionName = $component->getHeader();
-   for ( $i = 0; $i < 
$component->getHeaderLevel(); $i++ ) {
-   $sectionName = "=$sectionName=";
+   if ( $component->getText() !== "" || 
$component->isDisplayedEmpty() ) {
+   $sectionName = $component->getHeader();
+   for ( $i = 0; $i < 
$component->getHeaderLevel(); $i++ ) {
+   $sectionName = "=$sectionName=";
+   }
+

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Enable exceptions from fixes file

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: [bugfix] Enable exceptions from fixes file
..


[bugfix] Enable exceptions from fixes file

exceptions from fixes file where never passed to the bot.

Bug: T142324
Change-Id: I1212fd73af3cd529e12334d4b05ca5e9257136e5
---
M scripts/replace.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/scripts/replace.py b/scripts/replace.py
index 7b5c952..a4dae6c 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -1078,6 +1078,7 @@
 
 if replacement_set:
 replacements.extend(replacement_set)
+exceptions = replacement_set._exceptions
 
 if len(fix['replacements']) == len(missing_fix_summaries):
 missing_fixes_summaries.append(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1212fd73af3cd529e12334d4b05ca5e9257136e5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: Eranroz 
Gerrit-Reviewer: Gallaecio 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] performance/docroot[master]: Remove unused CSS from Bootstrap

2017-06-24 Thread Phedenskog (Code Review)

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

Change subject: Remove unused CSS from Bootstrap
..

Remove unused CSS from Bootstrap

Use uncss to generate the used CSS from Bootstrap.
The change: 123 kb -> 7kb

Bug: T161588
Bug: T167382
Change-Id: Ic8347c041193ed58db1c680a8c7ce155597ce09e
---
M package.json
M public_html/index.html
A public_html/lib/bootstrap-3.3.5/css/bootstrap.uncss.css
A public_html/lib/overrides.css
M src/_layouts/default.html
A src/lib/overrides.css
6 files changed, 84 insertions(+), 78 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/docroot 
refs/changes/37/361237/1

diff --git a/package.json b/package.json
index b4a89e3..4f8f876 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,10 @@
   "private": true,
   "scripts": {
 "test": "eslint .",
-"generate": "jekyll build --source src --destination public_html",
-"jekyll": "jekyll serve --source src --destination public_html",
-"verify": "test -z '$(git status --porcelain public_html/)'"
+"generate": "jekyll build --source src --destination public_html && npm 
run uncss",
+"jekyll": "jekyll serve --source src --destination public_html --detach && 
npm run uncss",
+"verify": "npm run generate && test -z '$(git status --porcelain 
public_html/)'",
+"uncss": "uncss public_html/index.html --ignore /\\.popover/, 
--ignoreSheet public_html/lib/bootstrap-3.3.5/css/bootstrap.uncss.css 
--stylesheets lib/bootstrap-3.3.5/css/bootstrap.min.css > 
public_html/lib/bootstrap-3.3.5/css/bootstrap.uncss.css"
   },
   "pre-commit": [
 "generate"
@@ -12,6 +13,7 @@
   "devDependencies": {
 "eslint": "^3.18.0",
 "eslint-config-wikimedia": "0.4.0",
-"pre-commit": "^1.2.2"
+"pre-commit": "^1.2.2",
+"uncss": "0.14.1"
   }
 }
diff --git a/public_html/index.html b/public_html/index.html
index eb46cab..4ec02ff 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -4,44 +4,9 @@
 
 
 Metrics — Wikimedia Performance
-
+
 
-
-  html {
-background-color: #f5f5f5;
-font-size: 12px;
-  }
-  h2 {
-font-weight: 400;
-  }
-  .footer {
-margin-top: 40px;
-background-color: #f5f5f5;
-padding: 20px 0;
-  }
-  .perf-container {
-width: 100%;
-max-width: 700px;
-margin-top: 40px;
-/* Save reflow from pushing down footer; 4+ graphs x 200px */
-min-height: 800px;
-padding: 0;
-  }
-  .metric {
-margin-top: 28px;
-margin-right: 20px;
-  }
-  .mg-chart-title {
-cursor: default;
-font-size: 1.8rem;
-text-align: center;
-font-weight: 400;
-  }
-  .perf-info-box {
-width: 100%;
-max-width: 700px;
-  }
-
+
 https://www.wikimedia.org/static/favicon/wmf.ico;>
 
 
diff --git a/public_html/lib/bootstrap-3.3.5/css/bootstrap.uncss.css 
b/public_html/lib/bootstrap-3.3.5/css/bootstrap.uncss.css
new file mode 100644
index 000..3c28ce7
--- /dev/null
+++ b/public_html/lib/bootstrap-3.3.5/css/bootstrap.uncss.css
@@ -0,0 +1,6 @@
+/*** uncss> filename: public_html/lib/bootstrap-3.3.5/css/bootstrap.min.css 
***/
+/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css 
*/html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}header{display:block}a{background-color:transparent}a:active,a:hover{outline:0}small{font-size:80%}img{border:0}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}/*!
 Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css 
*/@media 
print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0
 
0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:"
 (" attr(href) 
")"}a[href^="#"]:after{content:""}img{page-break-inside:avoid}img{max-width:100%!important}p{orphans:3;widows:3}.navbar{display:none}}@font-face{font-family:'Glyphicons
 
Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix)
 format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) 
format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) 
format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) 
format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular)

[MediaWiki-commits] [Gerrit] integration/config[master]: php-hhvm-compile-test: Fix node OS

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: php-hhvm-compile-test: Fix node OS
..


php-hhvm-compile-test: Fix node OS

Bug: T168774
Change-Id: I9d850f80b1ed7076fcc8137fd95b5af6ee15e30f
---
M jjb/php-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/php-extensions.yaml b/jjb/php-extensions.yaml
index fbb567b..7d80c47 100644
--- a/jjb/php-extensions.yaml
+++ b/jjb/php-extensions.yaml
@@ -51,7 +51,7 @@
 # of hack.
 - job: 
 name: 'php-compile-hhvm-test'
-node: contintLabsSlave && UbuntuJessie
+node: contintLabsSlave && DebianJessie
 defaults: use-remoteonly-zuul
 triggers:
  - zuul

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d850f80b1ed7076fcc8137fd95b5af6ee15e30f
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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...luasandbox[master]: Remove EXPERIMENTAL

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Remove EXPERIMENTAL
..


Remove EXPERIMENTAL

This HHVM/PHP extension is widely used on Wikimedia sites and really not
that experimental anymore.

Change-Id: I76460e81215a65b9be3b639bf4112a8d49c0c891
---
D EXPERIMENTAL
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/EXPERIMENTAL b/EXPERIMENTAL
deleted file mode 100644
index e69de29..000
--- a/EXPERIMENTAL
+++ /dev/null

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76460e81215a65b9be3b639bf4112a8d49c0c891
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: php-hhvm-compile-test: Fix node OS

2017-06-24 Thread Legoktm (Code Review)

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

Change subject: php-hhvm-compile-test: Fix node OS
..

php-hhvm-compile-test: Fix node OS

Change-Id: I9d850f80b1ed7076fcc8137fd95b5af6ee15e30f
---
M jjb/php-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/jjb/php-extensions.yaml b/jjb/php-extensions.yaml
index fbb567b..7d80c47 100644
--- a/jjb/php-extensions.yaml
+++ b/jjb/php-extensions.yaml
@@ -51,7 +51,7 @@
 # of hack.
 - job: 
 name: 'php-compile-hhvm-test'
-node: contintLabsSlave && UbuntuJessie
+node: contintLabsSlave && DebianJessie
 defaults: use-remoteonly-zuul
 triggers:
  - zuul

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d850f80b1ed7076fcc8137fd95b5af6ee15e30f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] integration/config[master]: Fix php-hhvm-compile-test test

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix php-hhvm-compile-test test
..

Fix php-hhvm-compile-test test

Made a spelling mistake, called it UbuntuJessie instead of DebianJessie

Bug: T168774
Change-Id: Ibfafc16ec8ddb6ed037c1aaf192c5f7e3bf96cfd
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/33/361233/1


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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add icon to RAWGraphs.io link

2017-06-24 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361232 )

Change subject: Add icon to RAWGraphs.io link
..

Add icon to RAWGraphs.io link

An icon to indicate that the link goes to an external service was
requested in Iba52476a92, but not added before the change was merged.

Change-Id: I7cd8ad7f43b2625cd43f3b5b3a18d32f5995e6d4
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/index.html b/index.html
index c783175..8274a9f 100644
--- a/index.html
+++ b/index.html
@@ -157,7 +157,7 @@



-   
+
  



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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cd8ad7f43b2625cd43f3b5b3a18d32f5995e6d4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Insert the description of the change. Description of the cha...

2017-06-24 Thread Namitius (Code Review)

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

Change subject: Insert the description of the change. Description of the change.
..

Insert the description of the change. Description of the change.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples 
refs/changes/29/361229/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5859cc0919b329d59bc58ce478a35159882f928b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Namitius 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Use wellknown to parse geo:wktLiteral values

2017-06-24 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361230 )

Change subject: Use wellknown to parse geo:wktLiteral values
..

Use wellknown to parse geo:wktLiteral values

This gives us support for other kinds of values than points, for
instance linestrings; such values are not present on Wikidata, but may
be obtained via a federated SPARQL query against a GeoSPARQL endpoint.

Change-Id: I9c069eff00ac816fa345aa1b8ab874032730a725
---
M embed.html
M index.html
M package.json
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
4 files changed, 48 insertions(+), 73 deletions(-)


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

diff --git a/embed.html b/embed.html
index d35da5f..c890efe 100644
--- a/embed.html
+++ b/embed.html
@@ -118,6 +118,7 @@



+   



diff --git a/index.html b/index.html
index c783175..6db001c 100644
--- a/index.html
+++ b/index.html
@@ -261,6 +261,7 @@



+   



diff --git a/package.json b/package.json
index 605992a..d01be6e 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
 "moment": "^2.18.1",
 "select2": "^4.0.3",
 "underscore": "^1.8.3",
-"vis": "^4.19.1"
+"vis": "^4.19.1",
+"wellknown": "^0.5.0"
   },
   "devDependencies": {
 "grunt": "0.4.5",
diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index e753556..0fe9b91 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -3,7 +3,7 @@
 wikibase.queryService.ui = wikibase.queryService.ui || {};
 wikibase.queryService.ui.resultBrowser = 
wikibase.queryService.ui.resultBrowser || {};
 
-wikibase.queryService.ui.resultBrowser.CoordinateResultBrowser = ( function( 
$, L, d3, _, window ) {
+wikibase.queryService.ui.resultBrowser.CoordinateResultBrowser = ( function( 
$, L, d3, _, wellknown, window ) {
'use strict';
 
var MAP_DATATYPE = 'http://www.opengis.net/ont/geosparql#wktLiteral';
@@ -108,7 +108,6 @@
 
this._setTileLayer();
this._createControls();
-   this._createMarkerZoomResize();
 
$element.html( container );
};
@@ -153,37 +152,6 @@
/**
 * @private
 */
-   SELF.prototype._createMarkerZoomResize = function() {
-   var self = this;
-
-   if ( this._markerGroups[LAYER_DEFAULT_GROUP].getLayers().length 
> 1000 ) {
-   return; // disable when to many markers (bad 
performance)
-   }
-
-   var resize = function() {
-   self._markerGroups[LAYER_DEFAULT_GROUP].setStyle( {
-   radius: self._getMarkerRadius()
-   } );
-   };
-
-   this._map.on( 'zoomend', resize );
-   };
-
-   /**
-* @private
-*/
-   SELF.prototype._getMarkerRadius = function() {
-   if ( !this._map ) {
-   return 3;
-   }
-
-   var currentZoom = this._map.getZoom();
-   return ( currentZoom * ( 1 / 2 ) );
-   };
-
-   /**
-* @private
-*/
SELF.prototype._getLayerControl = function() {
var self = this,
layerControls = {},
@@ -213,27 +181,29 @@
 
this._iterateResult( function( field, key, row ) {
if ( field && field.datatype === MAP_DATATYPE ) {
-   var longLat = self._extractLongLat( field.value 
);
-   if ( longLat === null || !longLat[0] || 
!longLat[1] ) {
-   return true;
+   var geoJson = self._extractGeoJson( field.value 
);
+   if ( !geoJson ) {
+   return;
}
 
-   var popup = L.popup(),
-   lon = longLat[0],
-   lat = longLat[1];
-
var layer = self._getMarkerGroupsLayer( row );
-   var marker = L.circleMarker( [ lat, lon ], 
self._getMarkerStyle( layer ) )
-   .bindPopup( popup );
-
-   marker.on( 'click', function() {
-   var info = self._getItemDescription( 
row );
-   popup.setContent( info[0] );
-   } );
-
if ( !markers[ layer

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix host name in notifications

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix host name in notifications
..


Fix host name in notifications

Change-Id: I04cbf0931a99c42a80598ad19dbadc3daa44d2aa
---
M templates/mail-service-notification.sh.erb
M templates/ores-mail-service-notification.sh.erb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/mail-service-notification.sh.erb 
b/templates/mail-service-notification.sh.erb
index 35890b4..83bcd18 100644
--- a/templates/mail-service-notification.sh.erb
+++ b/templates/mail-service-notification.sh.erb
@@ -19,4 +19,4 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
+/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTALIAS is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
diff --git a/templates/ores-mail-service-notification.sh.erb 
b/templates/ores-mail-service-notification.sh.erb
index 9a9e88e..dda71a4 100644
--- a/templates/ores-mail-service-notification.sh.erb
+++ b/templates/ores-mail-service-notification.sh.erb
@@ -19,4 +19,4 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log
+/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTALIAS is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04cbf0931a99c42a80598ad19dbadc3daa44d2aa
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix host name in notifications

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix host name in notifications
..

Fix host name in notifications

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/28/361228/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04cbf0931a99c42a80598ad19dbadc3daa44d2aa
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix permission on ido-mysql file

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix permission on ido-mysql file
..


Fix permission on ido-mysql file

Change-Id: Ie6a0d6d05af3315ebc6c17e5f895c7f1e2b4ad1b
---
M manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/init.pp b/manifests/init.pp
index f057066..3e97670 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -55,7 +55,7 @@
 
 package { 'icinga2-ido-mysql':
 ensure => 'present',
-require => [ Apt::Repository['icinga2'], Package['icinga2'] ],
+require => Package['icinga2'],
 }
 
 file { '/etc/icinga2/features-available/ido-mysql.conf':
@@ -63,6 +63,7 @@
 content => template('icinga2/ido-mysql.erb'),
 owner   => 'root',
 group   => 'root',
+mode=> '0755',
 require => Package['icinga2-ido-mysql'],
 notify  => Base::Service_unit['icinga2'],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6a0d6d05af3315ebc6c17e5f895c7f1e2b4ad1b
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix permission on ido-mysql file

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix permission on ido-mysql file
..

Fix permission on ido-mysql file

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/27/361227/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6a0d6d05af3315ebc6c17e5f895c7f1e2b4ad1b
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix ido-mysql variable did not work properly

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix ido-mysql variable did not work properly
..

Fix ido-mysql variable did not work properly

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/26/361226/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia782816e9b87bb3dc9b5eaecec8ee1bce234db29
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix ido-mysql variable did not work properly

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix ido-mysql variable did not work properly
..


Fix ido-mysql variable did not work properly

Change-Id: Ia782816e9b87bb3dc9b5eaecec8ee1bce234db29
---
M manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/manifests/init.pp b/manifests/init.pp
index f1686a9..f057066 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,7 +11,11 @@
 class icinga2(
 $enable_notifications  = 1,
 $enable_event_handlers = 1,
-$os = hiera('icinga_apt_dist')
+$icinga_ido_db_host = hiera('icinga_ido_db_host'),
+$icinga_ido_db_name = hiera('icinga_ido_db_name'),
+$icinga_ido_user_name = hiera('icinga_ido_user_name'),
+$icinga_ido_password = hiera('icinga_ido_password'),
+$os = hiera('icinga_apt_dist'),
 ) {
 apt::repository { 'icinga2':
 uri=> 'http://packages.icinga.com/debian',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia782816e9b87bb3dc9b5eaecec8ee1bce234db29
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Install some modules for icingaweb2

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Install some modules for icingaweb2
..


Install some modules for icingaweb2

Change-Id: I81afed25c7c8f181dcadff41ec0d94e2a46bf598
---
M manifests/web.pp
1 file changed, 2 insertions(+), 8 deletions(-)

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



diff --git a/manifests/web.pp b/manifests/web.pp
index 5cc53c2..3d0690c 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -18,19 +18,13 @@
 ) {
 include ::icinga2
 
-package { 'icingaweb2':
+package { [ 'icingaweb2', 'icingaweb2-module-monitoring',
+'icingaweb2-module-doc', 'icingacli' ] :
 ensure => present,
 require => Apt::Repository['icinga2'],
 }
 
-package { 'icinga2-doc':
-ensure => present,
-}
-
 include ::apache
-if os_version('debian == jessie') {
-include ::apache::mod::php5
-}
 include ::apache::mod::ssl
 include ::apache::mod::headers
 include ::apache::mod::cgi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81afed25c7c8f181dcadff41ec0d94e2a46bf598
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Install some modules for icingaweb2

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Install some modules for icingaweb2
..

Install some modules for icingaweb2

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/24/361224/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81afed25c7c8f181dcadff41ec0d94e2a46bf598
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: commit wiadomosc

2017-06-24 Thread Namitius (Code Review)

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

Change subject: commit wiadomosc
..

commit wiadomosc

blebleblebleblelb

Bug: T5
Change-Id: I359941291e23929034a232cc0a61188432494afe
---
M examples.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples 
refs/changes/23/361223/1

diff --git a/examples.php b/examples.php
index c54628c..e989054 100644
--- a/examples.php
+++ b/examples.php
@@ -1,5 +1,7 @@
 https://gerrit.wikimedia.org/r/361223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I359941291e23929034a232cc0a61188432494afe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Namitius 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Move somethings to puppet and puppicise some things

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Move somethings to puppet and puppicise some things
..

Move somethings to puppet and puppicise some things

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/21/361221/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I127f438b01151a0dd8d38fc219b1b960f9d3f89c
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Move somethings to puppet and puppicise some things

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Move somethings to puppet and puppicise some things
..


Move somethings to puppet and puppicise some things

Change-Id: I127f438b01151a0dd8d38fc219b1b960f9d3f89c
---
A files/icinga2.gpg
D files/icingaweb2.gpg
M manifests/init.pp
M manifests/plugins.pp
M manifests/web.pp
A templates/backends.ini.erb
A templates/commandtransports.ini.erb
A templates/ido-mysql.erb
A templates/roles.ini.erb
9 files changed, 122 insertions(+), 28 deletions(-)

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



diff --git a/files/icinga2.gpg b/files/icinga2.gpg
new file mode 100644
index 000..901c78c
--- /dev/null
+++ b/files/icinga2.gpg
@@ -0,0 +1,30 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+mQGiBFKHzk4RBACSHMIFTtfw4ZsNKAA03Gf5t7ovsKWnS7kcMYleAidypqhOmkGg
+0petiYsMPYT+MOepCJFGNzwQwJhZrdLUxxMSWay4Xj0ArgpD9vbvU+gj8Tb02l+x
+SqNGP8jXMV5UnK4gZsrYGLUPvx47uNNYRIRJAGOPYTvohhnFJiG402dzlwCg4u5I
+1RdFplkp9JM6vNM9VBIAmcED/2jr7UQGsPs8YOiPkskGHLh/zXgO8SvcNAxCLgbp
+BjGcF4Iso/A2TAI/2KGJW6kBW/Paf722ltU6s/6mutdXJppgNAz5nfpEt4uZKZyu
+oSWf77179B2B/Wl1BsX/Oc3chscAgQb2pD/qPF/VYRJU+hvdQkq1zfi6cVsxyREV
+k+IwA/46nXh51CQxE29ayuy1BoIOxezvuXFUXZ8rP6aCh4KaiN9AJoy7pBieCzsq
+d7rPEeGIzBjI+yhEu8p92W6KWzL0xduWfYg9I7a2GTk8CaLX2OCLuwnKd7RVDyyZ
+yzRjWs0T5U7SRAWspLStYxMdKert9lLyQiRHtLwmlgBPqa0gh7Q+SWNpbmdhIE9w
+ZW4gU291cmNlIE1vbml0b3JpbmcgKEJ1aWxkIHNlcnZlcikgPGluZm9AaWNpbmdh
+Lm9yZz6IYAQTEQIAIAUCUofOTgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJ
+EMbjGcM0QQaCgSQAnRjXdbsyqziqhmxfAKffNJYuMPwdAKCS/IRCVyQzApFBtIBQ
+1xuoym/4C7kCDQRSh85OEAgAvPwjlURCi8z6+7i60no4n16dNcSzd6AT8Kizpv2r
+9BmNBff/GNYGnHyob/DMtmO2esEuVG8w62rO9m1wzzXzjbtmtU7NZ1Tg+C+reU2I
+GNVu3SYtEVK/UTJHAhLcgry9yD99610tYPN2Fx33Efse94mXOreBfCvDsmFGSc7j
+GVNCWXpMR3jTYyGj1igYd5ztOzG63D8gPyOucTTl+RWN/G9EoGBv6sWqk5eCd1Fs
+JlWyQX4BJn3YsCZx3uj1DWL0dAl2zqcn6m1M4oj1ozW47MqM/efKOcV6VvCs9SL8
+F/NFvZcH4LKzeupCQ5jEONqcTlVlnLlIqId95Z4DI4AV9wADBQf/S6sKA4oH49tD
+Yb5xAfUyEp5ben05TzUJbXs0Z7hfRQzy9+vQbWGamWLgg3QRUVPx1e4IT+W5vEm5
+dggNTMEwlLMI7izCPDcD32B5oxNVxlfj428KGllYWCFj+edY+xKTvw/PHnn+drKs
+LE65Gwx4BPHm9EqWHIBX6aPzbgbJZZ06f6jWVBi/N7e/5n8lkxXqS23DBKemapyu
+S1i56sH7mQSMaRZP/iiOroAJemPNxv1IQkykxw2woWMmTLKLMCD/i+4DxejE50tK
+dxaOLTc4HDCsattw/RVJO6fwE414IXHMv330z4HKWJevMQ+CmQGfswvCwgeBP9n8
+PItLjBQAXIhJBBgRAgAJBQJSh85OAhsMAAoJEMbjGcM0QQaCzpAAmwUNoRyySf9p
+5G3/2UD1PMueIwOtAKDVVDXEq5LJPVg4iafNu0SRMwgP0Q==
+=icbY
+-END PGP PUBLIC KEY BLOCK-
diff --git a/files/icingaweb2.gpg b/files/icingaweb2.gpg
deleted file mode 100644
index ac52912..000
--- a/files/icingaweb2.gpg
+++ /dev/null
@@ -1,7 +0,0 @@
--BEGIN PGP SIGNATURE-
-Version: GnuPG v1
-
-iEYEABEIAAYFAlkHqt0ACgkQxuMZwzRBBoLAuQCgndU7a0I7ryWQQ4KxtQFsRV/C
-DFIAoM8xdATxQsAJ5qEU0py/hD3Jbm2H
-=ZEPy
--END PGP SIGNATURE-
diff --git a/manifests/init.pp b/manifests/init.pp
index 837711b..f1686a9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,7 +11,16 @@
 class icinga2(
 $enable_notifications  = 1,
 $enable_event_handlers = 1,
+$os = hiera('icinga_apt_dist')
 ) {
+apt::repository { 'icinga2':
+uri=> 'http://packages.icinga.com/debian',
+dist   => $os,
+components => 'main',
+source => false,
+keyfile=> 'puppet:///modules/icinga2/icinga2.gpg',
+}
+
 group { 'nagios':
 ensure=> present,
 name  => 'nagios',
@@ -37,6 +46,21 @@
 
 package { 'icinga2':
 ensure => 'present',
+require => Apt::Repository['icinga2'],
+}
+
+package { 'icinga2-ido-mysql':
+ensure => 'present',
+require => [ Apt::Repository['icinga2'], Package['icinga2'] ],
+}
+
+file { '/etc/icinga2/features-available/ido-mysql.conf':
+ensure  => present,
+content => template('icinga2/ido-mysql.erb'),
+owner   => 'root',
+group   => 'root',
+require => Package['icinga2-ido-mysql'],
+notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/commands.conf':
diff --git a/manifests/plugins.pp b/manifests/plugins.pp
index 17fe054..9a312d2 100644
--- a/manifests/plugins.pp
+++ b/manifests/plugins.pp
@@ -5,6 +5,7 @@
 package { 'nagios-nrpe-plugin':
 ensure => present,
 }
+
 file { '/usr/lib/nagios':
 ensure => directory,
 owner  => 'root',
diff --git a/manifests/web.pp b/manifests/web.pp
index 57f5a75..5cc53c2 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -14,30 +14,13 @@
 $director_db_host = hiera('director_db_host'),
 $director_db_name = hiera('director_db_name'),
 $director_user_name = hiera('director_user_name'),
-$director_password = hiera('director_password')
+$director_password = hiera('director_password'),
 ) {
 include ::icinga2
 
-if os_version('debian >= stretch') {

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Tests for Retorfit GalleryItemClient

2017-06-24 Thread Yashasvi (Code Review)

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

Change subject: Tests for Retorfit GalleryItemClient
..

Tests for Retorfit GalleryItemClient

Change-Id: I8a177aa34aeaa0b83f42a6818c8029923ad8cd34
---
A app/src/test/java/org/wikipedia/gallery/GalleryItemClientTest.java
A app/src/test/res/raw/gallery_item_image.json
2 files changed, 225 insertions(+), 0 deletions(-)


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

diff --git a/app/src/test/java/org/wikipedia/gallery/GalleryItemClientTest.java 
b/app/src/test/java/org/wikipedia/gallery/GalleryItemClientTest.java
new file mode 100644
index 000..ca0ac71
--- /dev/null
+++ b/app/src/test/java/org/wikipedia/gallery/GalleryItemClientTest.java
@@ -0,0 +1,119 @@
+package org.wikipedia.gallery;
+
+import android.support.annotation.NonNull;
+
+import com.google.gson.stream.MalformedJsonException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.mwapi.MwException;
+import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import org.wikipedia.dataclient.okhttp.HttpStatusException;
+import org.wikipedia.gallery.GalleryItemClient.Callback;
+import org.wikipedia.page.PageTitle;
+import org.wikipedia.test.MockWebServerTest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import retrofit2.Call;
+
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+public class GalleryItemClientTest extends MockWebServerTest {
+
+private static final WikiSite WIKISITE_EN = WikiSite.forLanguageCode("en");
+private static final PageTitle PAGE_TITLE = new PageTitle("File", 
"Kozanji_Kyoto_Kyoto11s5s4592", WIKISITE_EN);
+
+@NonNull private final GalleryItemClient subject = new GalleryItemClient();
+
+@Test
+public void testRequestSuccessForImage() throws Throwable {
+
+enqueueFromFile("gallery_item_image.json");
+
+Callback cb = mock(Callback.class);
+
+Call call = request(cb, false);
+
+server().takeRequest();
+
+ArgumentCaptor captor = 
ArgumentCaptor.forClass(HashMap.class);
+
+//noinspection unchecked
+verify(cb).success(eq(call), captor.capture());
+
+//noinspection unchecked
+Map result = captor.getValue();
+
+Assert.assertTrue(result.size() > 0);
+
+GalleryItem galleryItem = (GalleryItem) result.values().toArray()[0];
+
+Assert.assertTrue(galleryItem != null);
+
+Assert.assertThat(galleryItem.getHeight(), is(1489));
+
+Assert.assertThat(galleryItem.getWidth(), is(2125));
+
+Assert.assertThat(galleryItem.getThumbUrl(), 
is("https://upload.wikimedia.org/wikipedia/commons/thumb/c/c9/Kinkaku3402CBcropped.jpg/1280px-Kinkaku3402CBcropped.jpg;));
+
+Assert.assertThat(galleryItem.getMimeType(), is("image/jpeg"));
+
+Assert.assertThat(galleryItem.getUrl(), 
is("https://upload.wikimedia.org/wikipedia/commons/c/c9/Kinkaku3402CBcropped.jpg;));
+
+}
+
+@Test
+public void testRequestResponseMalformed() throws Throwable {
+server().enqueue("'");
+
+GalleryItemClient.Callback cb = mock(GalleryItemClient.Callback.class);
+Call call = request(cb, false);
+
+server().takeRequest();
+assertCallbackFailure(call, cb, MalformedJsonException.class);
+}
+
+@Test
+public void testRequestResponseFailure() throws Throwable {
+enqueue404();
+
+GalleryItemClient.Callback cb = mock(GalleryItemClient.Callback.class);
+Call call = request(cb, false);
+
+server().takeRequest();
+assertCallbackFailure(call, cb, HttpStatusException.class);
+}
+
+@Test
+public void testRequestResponseApiError() throws Throwable {
+enqueueFromFile("api_error.json");
+
+GalleryItemClient.Callback cb = mock(GalleryItemClient.Callback.class);
+Call call = request(cb, false);
+
+server().takeRequest();
+assertCallbackFailure(call, cb, MwException.class);
+}
+
+private void assertCallbackFailure(@NonNull Call call,
+   @NonNull GalleryItemClient.Callback cb,
+   @NonNull Class 
throwable) {
+//noinspection unchecked
+verify(cb, never()).success(any(Call.class), any(HashMap.class));
+verify(cb).failure(eq(call), isA(throwable));
+}
+
+private Call request(@NonNull Callback cb, boolean 
isVideo) {
+return subject.request(WIKISITE_EN, 
service(GalleryItemClient.Service.class), PAGE_TITLE,

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Remove []

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Remove []
..


Remove []

Change-Id: I589015811c3abebee5a5dfd7beecbf8236087698
---
M templates/mail-host-notification.sh.erb
M templates/mail-service-notification.sh.erb
M templates/ores-mail-host-notification.sh.erb
M templates/ores-mail-service-notification.sh.erb
4 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/templates/mail-host-notification.sh.erb 
b/templates/mail-host-notification.sh.erb
index 5012565..6781f2a 100644
--- a/templates/mail-host-notification.sh.erb
+++ b/templates/mail-host-notification.sh.erb
@@ -18,5 +18,5 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME is $HOSTSTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT [$NOTIFICATIONAUTHORNAME] $NOTIFICATIONCOMMENT" 
>> /var/log/icinga2/irc.log
+/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT $NOTIFICATIONAUTHORNAME $NOTIFICATIONCOMMENT" >> 
/var/log/icinga2/irc.log
 
diff --git a/templates/mail-service-notification.sh.erb 
b/templates/mail-service-notification.sh.erb
index 8bb2c49..35890b4 100644
--- a/templates/mail-service-notification.sh.erb
+++ b/templates/mail-service-notification.sh.erb
@@ -19,4 +19,4 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT [$NOTIFICATIONAUTHORNAME] 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
+/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
diff --git a/templates/ores-mail-host-notification.sh.erb 
b/templates/ores-mail-host-notification.sh.erb
index d2c7f17..8e19b6e 100644
--- a/templates/ores-mail-host-notification.sh.erb
+++ b/templates/ores-mail-host-notification.sh.erb
@@ -18,5 +18,5 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME is $HOSTSTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT [$NOTIFICATIONAUTHORNAME] $NOTIFICATIONCOMMENT" 
>> /var/log/icinga2/irc-ores.log
+/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT $NOTIFICATIONAUTHORNAME $NOTIFICATIONCOMMENT" >> 
/var/log/icinga2/irc-ores.log
 
diff --git a/templates/ores-mail-service-notification.sh.erb 
b/templates/ores-mail-service-notification.sh.erb
index 499afdc..9a9e88e 100644
--- a/templates/ores-mail-service-notification.sh.erb
+++ b/templates/ores-mail-service-notification.sh.erb
@@ -19,4 +19,4 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT [$NOTIFICATIONAUTHORNAME] 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log
+/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I589015811c3abebee5a5dfd7beecbf8236087698
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Remove []

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Remove []
..

Remove []

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/20/361220/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I589015811c3abebee5a5dfd7beecbf8236087698
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix path for irc-ores.log

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix path for irc-ores.log
..


Fix path for irc-ores.log

Change-Id: I1758cda874ff61475dffa6a7b7709c4d221ee5d2
---
M templates/ores-mail-service-notification.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/ores-mail-service-notification.sh.erb 
b/templates/ores-mail-service-notification.sh.erb
index 8bb2c49..499afdc 100644
--- a/templates/ores-mail-service-notification.sh.erb
+++ b/templates/ores-mail-service-notification.sh.erb
@@ -19,4 +19,4 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT [$NOTIFICATIONAUTHORNAME] 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
+/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT [$NOTIFICATIONAUTHORNAME] 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1758cda874ff61475dffa6a7b7709c4d221ee5d2
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix path for irc-ores.log

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix path for irc-ores.log
..

Fix path for irc-ores.log

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/19/361219/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1758cda874ff61475dffa6a7b7709c4d221ee5d2
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Add ores notification script

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Add ores notification script
..

Add ores notification script

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/18/361218/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f67752b934392cf16707f0a8d209d15cb98e8b1
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Add ores notification script

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Add ores notification script
..


Add ores notification script

Change-Id: I2f67752b934392cf16707f0a8d209d15cb98e8b1
---
M manifests/init.pp
M templates/mail-host-notification.sh.erb
M templates/mail-service-notification.sh.erb
A templates/ores-mail-host-notification.sh.erb
A templates/ores-mail-service-notification.sh.erb
5 files changed, 65 insertions(+), 3 deletions(-)

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



diff --git a/manifests/init.pp b/manifests/init.pp
index b625c86..837711b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -121,6 +121,24 @@
 notify  => Base::Service_unit['icinga2'],
 }
 
+file { '/etc/icinga2/scripts/ores-mail-host-notification.sh':
+ensure  => present,
+content => template('icinga2/ores-mail-host-notification.sh.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+notify  => Base::Service_unit['icinga2'],
+}
+
+file { '/etc/icinga2/scripts/ores-mail-service-notification.sh':
+ensure  => present,
+content => template('icinga2/ores-mail-service-notification.sh.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+notify  => Base::Service_unit['icinga2'],
+}
+
 # Setup all plugins!
 class { '::icinga2::plugins':
 require => Package['icinga2'],
diff --git a/templates/mail-host-notification.sh.erb 
b/templates/mail-host-notification.sh.erb
index 3244cce..5012565 100644
--- a/templates/mail-host-notification.sh.erb
+++ b/templates/mail-host-notification.sh.erb
@@ -16,7 +16,7 @@
 TEMPLATE
 `
 
-# /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME is $HOSTSTATE"  # $USEREMAIL
+# /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME is $HOSTSTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT $NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
+/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT [$NOTIFICATIONAUTHORNAME] $NOTIFICATIONCOMMENT" 
>> /var/log/icinga2/irc.log
 
diff --git a/templates/mail-service-notification.sh.erb 
b/templates/mail-service-notification.sh.erb
index a337320..8bb2c49 100644
--- a/templates/mail-service-notification.sh.erb
+++ b/templates/mail-service-notification.sh.erb
@@ -19,4 +19,4 @@
 
 # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - 
$HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL
 
-/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT" >> /var/log/icinga2/irc.log
+/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: 
$SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT [$NOTIFICATIONAUTHORNAME] 
$NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
diff --git a/templates/ores-mail-host-notification.sh.erb 
b/templates/ores-mail-host-notification.sh.erb
new file mode 100644
index 000..d2c7f17
--- /dev/null
+++ b/templates/ores-mail-host-notification.sh.erb
@@ -0,0 +1,22 @@
+#!/bin/sh
+template=`cat <> /var/log/icinga2/irc-ores.log
+
diff --git a/templates/ores-mail-service-notification.sh.erb 
b/templates/ores-mail-service-notification.sh.erb
new file mode 100644
index 000..8bb2c49
--- /dev/null
+++ b/templates/ores-mail-service-notification.sh.erb
@@ -0,0 +1,22 @@
+#!/bin/sh
+template=`cat <> /var/log/icinga2/irc.log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f67752b934392cf16707f0a8d209d15cb98e8b1
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix location for shell scripts

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix location for shell scripts
..

Fix location for shell scripts

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/17/361217/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I396972f837f249500359e8c128d6dc28bdcf3d99
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix location for shell scripts

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix location for shell scripts
..


Fix location for shell scripts

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

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



diff --git a/manifests/init.pp b/manifests/init.pp
index 83faef0..b625c86 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -105,7 +105,7 @@
 
 file { '/etc/icinga2/scripts/mail-host-notification.sh':
 ensure  => present,
-content => template('mail-host-notification.sh.erb'),
+content => template('icinga2/mail-host-notification.sh.erb'),
 owner   => 'root',
 group   => 'root',
 mode=> '0755',
@@ -114,7 +114,7 @@
 
 file { '/etc/icinga2/scripts/mail-service-notification.sh':
 ensure  => present,
-content => template('mail-service-notification.sh.erb'),
+content => template('icinga2/mail-service-notification.sh.erb'),
 owner   => 'root',
 group   => 'root',
 mode=> '0755',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I396972f837f249500359e8c128d6dc28bdcf3d99
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix syntax error

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix syntax error
..


Fix syntax error

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

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



diff --git a/manifests/init.pp b/manifests/init.pp
index 7bb4d40..83faef0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -108,7 +108,7 @@
 content => template('mail-host-notification.sh.erb'),
 owner   => 'root',
 group   => 'root',
-mode=> '0755'
+mode=> '0755',
 notify  => Base::Service_unit['icinga2'],
 }
 
@@ -117,7 +117,7 @@
 content => template('mail-service-notification.sh.erb'),
 owner   => 'root',
 group   => 'root',
-mode=> '0755'
+mode=> '0755',
 notify  => Base::Service_unit['icinga2'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4817eb9e5e7b2bab74010a8a118a7299cb7a9e3
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix syntax error

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix syntax error
..

Fix syntax error

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/16/361216/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4817eb9e5e7b2bab74010a8a118a7299cb7a9e3
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Add mail-host and mail-service scripts

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Add mail-host and mail-service scripts
..

Add mail-host and mail-service scripts

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/14/361214/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2ee659366a40766fa11a9579effdd8a7f753093
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Add mail-host and mail-service scripts

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Add mail-host and mail-service scripts
..


Add mail-host and mail-service scripts

Change-Id: Ie2ee659366a40766fa11a9579effdd8a7f753093
---
M manifests/init.pp
A templates/mail-host-notification.sh.erb
A templates/mail-service-notification.sh.erb
3 files changed, 62 insertions(+), 0 deletions(-)

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



diff --git a/manifests/init.pp b/manifests/init.pp
index a06f40a..7bb4d40 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -103,6 +103,24 @@
 notify  => Base::Service_unit['icinga2'],
 }
 
+file { '/etc/icinga2/scripts/mail-host-notification.sh':
+ensure  => present,
+content => template('mail-host-notification.sh.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0755'
+notify  => Base::Service_unit['icinga2'],
+}
+
+file { '/etc/icinga2/scripts/mail-service-notification.sh':
+ensure  => present,
+content => template('mail-service-notification.sh.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0755'
+notify  => Base::Service_unit['icinga2'],
+}
+
 # Setup all plugins!
 class { '::icinga2::plugins':
 require => Package['icinga2'],
diff --git a/templates/mail-host-notification.sh.erb 
b/templates/mail-host-notification.sh.erb
new file mode 100644
index 000..3244cce
--- /dev/null
+++ b/templates/mail-host-notification.sh.erb
@@ -0,0 +1,22 @@
+#!/bin/sh
+template=`cat < # $USEREMAIL
+
+/bin/echo "$NOTIFICATIONTYPE - Host $HOSTALIAS is $HOSTSTATE: $HOSTOUTPUT 
$HOSTACKAUTHOR $HOSTACKCOMMENT $NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log
+
diff --git a/templates/mail-service-notification.sh.erb 
b/templates/mail-service-notification.sh.erb
new file mode 100644
index 000..a337320
--- /dev/null
+++ b/templates/mail-service-notification.sh.erb
@@ -0,0 +1,22 @@
+#!/bin/sh
+template=`cat <> /var/log/icinga2/irc.log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2ee659366a40766fa11a9579effdd8a7f753093
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...LiveTranslate[master]: Fix typo in word 'destination'

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Fix typo in word 'destination'
..

Fix typo in word 'destination'

Bug: T168059
Change-Id: Id47051756616f3d81d753bf4e68a27292a425b12
---
M api/ApiLiveTranslate.php
M i18n/en.json
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiveTranslate 
refs/changes/15/361215/1

diff --git a/api/ApiLiveTranslate.php b/api/ApiLiveTranslate.php
index 6e4072d..3da26d1 100644
--- a/api/ApiLiveTranslate.php
+++ b/api/ApiLiveTranslate.php
@@ -113,7 +113,7 @@

public function getDescription() {
return array(
-   'Returns the available translations of the provided 
words in the source language in the destiniation language.'
+   'Returns the available translations of the provided 
words in the source language in the destination language.'
);
}
 
diff --git a/i18n/en.json b/i18n/en.json
index f496b41..f8ce788 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,8 +43,8 @@
"apihelp-query+translationmemories-summary": "This module returns all 
matching translation memories",
"apihelp-importtms-description": "Imports one or more translation 
memories.",
"apihelp-importtms-summary": "Imports one or more translation 
memories.",
-   "apihelp-livetranslate-description": "Returns the available 
translations of the provided words in the source language in the destiniation 
language.",
-   "apihelp-livetranslate-summary": "Returns the available translations of 
the provided words in the source language in the destiniation language.",
+   "apihelp-livetranslate-description": "Returns the available 
translations of the provided words in the source language in the destination 
language.",
+   "apihelp-livetranslate-summary": "Returns the available translations of 
the provided words in the source language in the destination language.",
"apihelp-query+livetranslate-param-language": "The language for which 
to return special words",
"apihelp-query+livetranslate-param-continue": "Offset number from where 
to continue the query",
"apihelp-query+livetranslate-param-limit": "Maximum number of words to 
return",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id47051756616f3d81d753bf4e68a27292a425b12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiveTranslate
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Preprocesses Wikitext before looking for the Index table of ...

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Preprocesses Wikitext before looking for the Index table of 
content
..


Preprocesses Wikitext before looking for the Index table of content

Bug: T168768
Change-Id: Ia8074832cc9cffd0f2158d53888230b0c7574fce
---
M includes/index/ProofreadIndexPage.php
M tests/parser/proofreadpage_pages_pagelist.txt
2 files changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index b82374e..a8c287e 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -285,7 +285,7 @@
 * @return array of array( Title title of the pointed page, the label 
of the link )
 */
public function getLinksToMainNamespace() {
-   return $this->getLinksToNamespaceFromContent( NS_MAIN );
+   return $this->getLinksToNamespaceFromContent( NS_MAIN, true );
}
 
/**
diff --git a/tests/parser/proofreadpage_pages_pagelist.txt 
b/tests/parser/proofreadpage_pages_pagelist.txt
index 6c2cbf3..98f7048 100644
--- a/tests/parser/proofreadpage_pages_pagelist.txt
+++ b/tests/parser/proofreadpage_pages_pagelist.txt
@@ -27,15 +27,22 @@
 !!endarticle
 
 !!article
+Index TOC
+!!text
+* [[Test/Chapter 2|Chapter 2]]
+* [[Test/Chapter 3|Chapter 3]]
+!!endarticle
+
+!!article
 Index:Test
 !!text
 {{:MediaWiki:Proofreadpage_index_template
 |Title=Title
 |Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
 |Author=[[Author:Me]]
-|TOC=* [[Test/Chapter 1]]
-* [[Test/Chapter 2|Chapter 2]]
-* [[Test/Chapter 3|Chapter 3]]
+|TOC=
+* [[Test/Chapter 1]]
+{{:Index TOC}}
 }}
 !!endarticle
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8074832cc9cffd0f2158d53888230b0c7574fce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: GOIII 
Gerrit-Reviewer: Phe 
Gerrit-Reviewer: Tpt 
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...Translate[master]: Skip blank translation on export

2017-06-24 Thread Umherirrender (Code Review)

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

Change subject: Skip blank translation on export
..

Skip blank translation on export

Bug: T155182
Change-Id: I08e5f009749828050de4962274136004d46aa6a2
---
M ffs/JsonFFS.php
M ffs/MediaWikiExtensionFFS.php
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/13/361213/1

diff --git a/ffs/JsonFFS.php b/ffs/JsonFFS.php
index 24d3f71..79e85db 100644
--- a/ffs/JsonFFS.php
+++ b/ffs/JsonFFS.php
@@ -108,6 +108,11 @@
$value = str_replace( TRANSLATE_FUZZY, '', 
$value );
}
 
+   // Skip blank translation - T155182
+   if ( $value === '' ) {
+   continue;
+   }
+
$key = $mangler->unmangle( $key );
$messages[$key] = $value;
}
diff --git a/ffs/MediaWikiExtensionFFS.php b/ffs/MediaWikiExtensionFFS.php
index a1aef9d..ff2e2ae 100644
--- a/ffs/MediaWikiExtensionFFS.php
+++ b/ffs/MediaWikiExtensionFFS.php
@@ -219,6 +219,12 @@
 
$key = $mangler->unmangle( $key );
$value = str_replace( TRANSLATE_FUZZY, '', $value );
+
+   // Skip blank translation - T155182
+   if ( $value === '' ) {
+   continue;
+   }
+
$fuzzy = $m->hasTag( 'fuzzy' ) ? ' # Fuzzy' : '';
 
$key = self::quote( $key );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08e5f009749828050de4962274136004d46aa6a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Update groups.ini

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Update groups.ini
..

Update groups.ini

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/12/361212/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97cc1329830f6261fb3dddfe03ffdb4902c8800f
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Update groups.ini

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Update groups.ini
..


Update groups.ini

Change-Id: I97cc1329830f6261fb3dddfe03ffdb4902c8800f
---
M templates/groups.ini.erb
1 file changed, 14 insertions(+), 10 deletions(-)

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



diff --git a/templates/groups.ini.erb b/templates/groups.ini.erb
index e50c261..5dc98b6 100644
--- a/templates/groups.ini.erb
+++ b/templates/groups.ini.erb
@@ -1,10 +1,14 @@
-[ad_groups]
-backend = "ldap"
-resource= "ad_group"
-user_backend= "ad_users"
-user_class  = "inetOrgPerson"
-user_name_attribute = "uid"
-group_class = "groupOfNames"
-group_name_attribute = "cn"
-user_base_dn= "ou=people,dc=wikimedia,dc=org"
-base_dn = "ou=groups,dc=wikimedia,dc=org"
+[db]
+resource = "icingaweb_db"
+backend = "db"
+
+# [ad_groups]
+# backend = "ldap"
+# resource= "ad_group"
+# user_backend= "ad_users"
+# user_class  = "inetOrgPerson"
+# user_name_attribute = "uid"
+# group_class = "groupOfNames"
+# group_name_attribute = "cn"
+# user_base_dn= "ou=people,dc=wikimedia,dc=org"
+# base_dn = "ou=groups,dc=wikimedia,dc=org"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97cc1329830f6261fb3dddfe03ffdb4902c8800f
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix authentication.ini

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix authentication.ini
..


Fix authentication.ini

Change-Id: I948281f57762afd08c307f249e6bb9f9c0e23341
---
M templates/authentication.ini.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/authentication.ini.erb b/templates/authentication.ini.erb
index ecc1ec8..615818c 100644
--- a/templates/authentication.ini.erb
+++ b/templates/authentication.ini.erb
@@ -7,3 +7,4 @@
 user_class = "inetOrgPerson"
 user_name_attribute = "uid"
 backend = "ldap"
+base_dn = "ou=people,dc=wikimedia,dc=org"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I948281f57762afd08c307f249e6bb9f9c0e23341
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix authentication.ini

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Fix authentication.ini
..

Fix authentication.ini

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/11/361211/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I948281f57762afd08c307f249e6bb9f9c0e23341
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Add groups.ini

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Add groups.ini
..


Add groups.ini

Change-Id: I481d00ebad095b24261782791786a774822977bc
---
M manifests/web.pp
A templates/groups.ini.erb
2 files changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/manifests/web.pp b/manifests/web.pp
index 50e1da3..57f5a75 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -85,6 +85,13 @@
 group  => 'icingaweb2',
 }
 
+file { '/etc/icingaweb2/groups.ini':
+ensure => present,
+content => template('icinga2/groups.ini.erb'),
+owner  => 'www-data',
+group  => 'icingaweb2',
+}
+
 file { '/etc/icingaweb2/resources.ini':
 ensure => present,
 content => template('icinga2/resources.ini.erb'),
diff --git a/templates/groups.ini.erb b/templates/groups.ini.erb
new file mode 100644
index 000..e50c261
--- /dev/null
+++ b/templates/groups.ini.erb
@@ -0,0 +1,10 @@
+[ad_groups]
+backend = "ldap"
+resource= "ad_group"
+user_backend= "ad_users"
+user_class  = "inetOrgPerson"
+user_name_attribute = "uid"
+group_class = "groupOfNames"
+group_name_attribute = "cn"
+user_base_dn= "ou=people,dc=wikimedia,dc=org"
+base_dn = "ou=groups,dc=wikimedia,dc=org"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I481d00ebad095b24261782791786a774822977bc
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Add groups.ini

2017-06-24 Thread Paladox (Code Review)

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

Change subject: Add groups.ini
..

Add groups.ini

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/09/361209/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I481d00ebad095b24261782791786a774822977bc
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add support for linestring geo literals

2017-06-24 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361208 )

Change subject: Add support for linestring geo literals
..

Add support for linestring geo literals

_extractLongLat is changed to _extractLongLats and returns an array of
coordinate pairs instead of a single pair, and learns to parse
linestring literals into such a list of coordinate pairs.
_createMarkerGroups turns a single coordinate pair into a circle marker
(as before) and more pairs into a polyline. Since polylines need
slightly different styles than cirle markers, two new methods for their
styles are added, and _createMarkerGroups stores all circle markers in
one feature group and all polyline markers in another; the zoomend event
handler then updates the styles of those two feature groups instead of
the default layer group.

There are no linestring literals on Wikidata, but they can be obtained
via federation (e. g. LinkedGeoData.org). The distinction between
multiple marker styles introduced here may also be useful for geoshape
support later.

Change-Id: I414ecb3c49328829ae13ae34e8b3f4a76efc6d92
---
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
1 file changed, 70 insertions(+), 16 deletions(-)


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

diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index e753556..b761611 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -87,6 +87,18 @@
SELF.prototype._getMarkerGroupColor = null;
 
/**
+* Contains all map markers that are circles.
+* @private
+*/
+   SELF.prototype._circleMarkers = null;
+
+   /**
+* Contains all map markers that are polylines.
+* @private
+*/
+   SELF.prototype._polylineMarkers = null;
+
+   /**
 * Draw a map to the given element
 *
 * @param {jQuery} $element target element
@@ -161,8 +173,11 @@
}
 
var resize = function() {
-   self._markerGroups[LAYER_DEFAULT_GROUP].setStyle( {
+   self._circleMarkers.setStyle( {
radius: self._getMarkerRadius()
+   } );
+   self._polylineMarkers.setStyle( {
+   weight: 2 * self._getMarkerRadius()
} );
};
 
@@ -208,23 +223,36 @@
 */
SELF.prototype._createMarkerGroups = function() {
var self = this,
-   markers = {};
+   markers = {},
+   circleMarkers = [],
+   polylineMarkers = [];
markers[ LAYER_DEFAULT_GROUP ] = [];
 
this._iterateResult( function( field, key, row ) {
if ( field && field.datatype === MAP_DATATYPE ) {
-   var longLat = self._extractLongLat( field.value 
);
-   if ( longLat === null || !longLat[0] || 
!longLat[1] ) {
+   var longLats = self._extractLongLats( 
field.value );
+   if ( longLats === null || longLats.length === 0 
) {
return true;
}
 
var popup = L.popup(),
-   lon = longLat[0],
-   lat = longLat[1];
+   layer = self._getMarkerGroupsLayer( row 
),
+   marker;
 
-   var layer = self._getMarkerGroupsLayer( row );
-   var marker = L.circleMarker( [ lat, lon ], 
self._getMarkerStyle( layer ) )
-   .bindPopup( popup );
+   if ( longLats.length === 1 ) {
+   var lon = longLats[0][0],
+   lat = longLats[0][1];
+   marker = L.circleMarker( [ lat, lon ], 
self._getCircleMarkerStyle( layer ) );
+   circleMarkers.push( marker );
+   } else {
+   var latLongs = [];
+   $.each( longLats, function( index, 
longLat ) {
+   latLongs.push( [ longLat[1], 
longLat[0] ] );
+   } );
+   marker = L.polyline( latLongs, 
self._getPolylineMarkerStyle( layer )

[MediaWiki-commits] [Gerrit] mediawiki...grabbers[master]: grabFiles: Robustness, code style and features

2017-06-24 Thread Martineznovo (Code Review)

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

Change subject: grabFiles: Robustness, code style and features
..

grabFiles: Robustness, code style and features

- Use class member variables instead of globals everywhere
- Using max api limits instead of hardcoded values
- Check only local repo for existing files
- End date cutoff changed to not exclude the entire file
  revision history, but just new versions of files
- Added revdeletion handling from text grabbers
- Added new parameter "wikia" to handle this special host
  mangling original files
- Download file and store has been rewritten to use MWHttpRequest
  for download the file and check the sha1 of the file, with
  multiple retries and possible cache bypass, and use MediaWiki
  classes to store files, which use local repo configuration
  from LocalSettings.php to store the file where it should be
  instead of using dumb assumptions about location based on
  the remote location. It should even support custom file
  backends now.

Change-Id: Ie9ce0fafaae6a9f4ffe92123806b891c7bb0e760
---
M grabFiles.php
1 file changed, 349 insertions(+), 119 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/grabbers 
refs/changes/07/361207/1

diff --git a/grabFiles.php b/grabFiles.php
index d19ffba..b7e9ec7 100755
--- a/grabFiles.php
+++ b/grabFiles.php
@@ -6,7 +6,9 @@
  * @file
  * @ingroup Maintenance
  * @author Calimonious the Estrange
+ * @author Jesús Martínez 
  * @date 31 December 2012
+ * @version 1.0
  * @note Based on code by Misza, Jack Phoenix and Edward Chernenko.
  */
 
@@ -20,6 +22,49 @@
 require_once 'mediawikibot.class.php';
 
 class GrabFiles extends Maintenance {
+
+   /**
+* End date
+*
+* @var string
+*/
+   protected $endDate;
+
+   /**
+* Handle to the database connection
+*
+* @var DatabaseBase
+*/
+   protected $dbw;
+
+   /**
+* MediaWikiBot instance
+*
+* @var MediaWikiBot
+*/
+   protected $bot;
+
+   /**
+* Local file repository
+*
+* @var LocalRepo
+*/
+   protected $localRepo;
+
+   /**
+* Temporal file handle
+*
+* @var FileHandle
+*/
+   protected $mTmpHandle;
+
+   /**
+* The target wiki is on Wikia
+*
+* @var boolean
+*/
+   protected $isWikia;
+
public function __construct() {
parent::__construct();
$this->mDescription = 'Grabs files from a pre-existing wiki 
into a new wiki. Assumes a normal file hashing structure on each end.';
@@ -29,46 +74,54 @@
$this->addOption( 'db', 'Database name, if we don\'t want to 
write to $wgDBname', false, true );
$this->addOption( 'from', 'Name of file to start from', false, 
true );
$this->addOption( 'enddate', 'Date after which to ignore new 
files (20121222142317, 2012-12-22T14:23:17T, etc)', false, true );
+   $this->addOption( 'wikia', 'Set this param if the target wiki 
is on Wikia, which needs to handle URLs in a special way', false, false );
}
 
public function execute() {
-   global $wgUploadDirectory, $endDate;
-
-   $endDate = $this->getOption( 'enddate' );
-   if ( $endDate ) {
-   $endDate = wfTimestamp( TS_MW, $endDate );
-   if ( !$endDate ) {
-   $this->error( "Invalid enddate format.\n", true 
);
-   }
-   } else {
-   $endDate = wfTimestampNow();
-   }
+   global $wgDBname;
 
$url = $this->getOption( 'url' );
if ( !$url ) {
-   $this->error( 'The URL to the target wiki\'s api.php is 
required.', true );
+   $this->error( 'The URL to the target wiki\'s api.php is 
required.', 1 );
}
+
+   $this->endDate = $this->getOption( 'enddate' );
+   if ( $this->endDate ) {
+   $this->endDate = wfTimestamp( TS_MW, $this->endDate );
+   if ( !$this->endDate ) {
+   $this->error( "Invalid enddate format.\n", 1 );
+   }
+   } else {
+   $this->endDate = wfTimestampNow();
+   }
+
+   # Get a single DB_MASTER connection
+   $this->dbw = wfGetDB( DB_MASTER, array(), $this->getOption( 
'db', $wgDBname ) );
+
+   # Get a local repo instance
+   $this->localRepo = RepoGroup::singleton()->getLocalRepo();
+
+   $this->isWikia = $this->getOption( 'wikia' );
+
$user = $this->getOption( 'username' );

[MediaWiki-commits] [Gerrit] mediawiki...PagedTiffHandler[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

Change-Id: I990846c669dddb5e3ae8c8739ee902be6459baa7
---
M .gitignore
M PagedTiffHandler_body.php
M composer.json
M phpcs.xml
M selenium/PagedTiffHandlerTestCases.php
M selenium/PagedTiffHandlerTestSuite.php
M selenium/PagedTiffHandler_tests.php
M tests/PagedTiffHandlerTest.php
8 files changed, 24 insertions(+), 28 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index e65c3c5..d6192df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .*.swp
 node_modules/
 /vendor
+composer.lock
diff --git a/PagedTiffHandler_body.php b/PagedTiffHandler_body.php
index a8a57e8..eb34a4e 100644
--- a/PagedTiffHandler_body.php
+++ b/PagedTiffHandler_body.php
@@ -156,7 +156,7 @@
 */
function validateParam( $name, $value ) {
if ( in_array( $name, [ 'width', 'height', 'page', 'lossy' ] ) 
) {
-   if ( $name === 'page' && trim( $value ) !== (string) 
intval( $value ) ) {
+   if ( $name === 'page' && trim( $value ) !== 
(string)intval( $value ) ) {
// Extra junk on the end of page, probably 
actually a caption
// e.g. [[File:Foo.tiff|thumb|Page 3 of the 
document shows foo]]
return false;
diff --git a/composer.json b/composer.json
index b8f68fb..4a8c744 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 95106c5..350c587 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,11 +1,17 @@
-
+
 

-   
+   
+   
+   
+   
+   
+   
+   

.
-   
-   
+   
+   
vendor
node_modules
 
diff --git a/selenium/PagedTiffHandlerTestCases.php 
b/selenium/PagedTiffHandlerTestCases.php
index aea70b8..4e033d9 100644
--- a/selenium/PagedTiffHandlerTestCases.php
+++ b/selenium/PagedTiffHandlerTestCases.php
@@ -4,7 +4,6 @@
public $name = 'Check prerequisites';
private $prerequisiteError = null;
public function runTest() {
-
// check whether Multipage.tiff is already uploaded
$this->open( $this->getUrl() .
'/index.php?title=Image:Multipage.tiff' );
@@ -36,7 +35,6 @@
 
 class SeleniumUploadTiffTest extends SeleniumTestCase {
public function uploadFile( $filename ) {
-
$this->open( $this->getUrl() .
'/index.php?title=Special:Upload' );
$this->type( 'wpUploadFile', __DIR__ .
@@ -154,7 +152,6 @@
$this->type( 'wpTextbox1', $text );
$this->click( 'wpSave' );
$this->waitForPageToLoad( 1 );
-
}
 }
 
@@ -185,7 +182,7 @@
 
// Ergebnis chekcen
// $source = $this->getAttribute(
-   //  
"//div[@class='gallerybox']//a[@title='Multipage.tiff']//img@src" );
+   // 
"//div[@class='gallerybox']//a[@title='Multipage.tiff']//img@src" );
$source = $this->getAttribute(
"//li[@class='gallerybox']//a[@class='image']//img@src" 
);
$correct = strstr( $source, "-page1-" );
@@ -212,7 +209,7 @@
public function runTest() {
$this->preparePage( "[[Image:Multipage.tiff|200px]]\n" );
// $this->selenium->type( 'wpTextbox1',
-   //  "[[Image:Pc260001.tif|thumb]]\n" );
+   // "[[Image:Pc260001.tif|thumb]]\n" );
 
$this->assertSeleniumAttributeEquals(
"//div[@id='bodyContent']//img@height", '150' );
@@ -239,7 +236,7 @@
 
public function runTest() {
$this->preparePage( "[[Image:Multipage.tiff|page=2]]\n" );
-   //  $this->selenium->type( 'wpTextbox1', 
"[[Image:Pc260001.tif|thumb]]\n" );
+

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Preprocesses Wikitext before looking for the Index table of ...

2017-06-24 Thread Tpt (Code Review)

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

Change subject: Preprocesses Wikitext before looking for the Index table of 
content
..

Preprocesses Wikitext before looking for the Index table of content

Bug: T168768
Change-Id: Ia8074832cc9cffd0f2158d53888230b0c7574fce
---
M includes/index/ProofreadIndexPage.php
M tests/parser/proofreadpage_pages_pagelist.txt
2 files changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/06/361206/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index b82374e..a8c287e 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -285,7 +285,7 @@
 * @return array of array( Title title of the pointed page, the label 
of the link )
 */
public function getLinksToMainNamespace() {
-   return $this->getLinksToNamespaceFromContent( NS_MAIN );
+   return $this->getLinksToNamespaceFromContent( NS_MAIN, true );
}
 
/**
diff --git a/tests/parser/proofreadpage_pages_pagelist.txt 
b/tests/parser/proofreadpage_pages_pagelist.txt
index 6c2cbf3..98f7048 100644
--- a/tests/parser/proofreadpage_pages_pagelist.txt
+++ b/tests/parser/proofreadpage_pages_pagelist.txt
@@ -27,15 +27,22 @@
 !!endarticle
 
 !!article
+Index TOC
+!!text
+* [[Test/Chapter 2|Chapter 2]]
+* [[Test/Chapter 3|Chapter 3]]
+!!endarticle
+
+!!article
 Index:Test
 !!text
 {{:MediaWiki:Proofreadpage_index_template
 |Title=Title
 |Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
 |Author=[[Author:Me]]
-|TOC=* [[Test/Chapter 1]]
-* [[Test/Chapter 2|Chapter 2]]
-* [[Test/Chapter 3|Chapter 3]]
+|TOC=
+* [[Test/Chapter 1]]
+{{:Index TOC}}
 }}
 !!endarticle
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8074832cc9cffd0f2158d53888230b0c7574fce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Clear all diff state when switching editors

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Clear all diff state when switching editors
..


Clear all diff state when switching editors

Bug: T168618
Change-Id: I19ff5054b87568546bfe1202d67c5d863e1549be
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 4585298..7a56a9c 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1181,7 +1181,7 @@
this.clearPreparedCacheKey();
this.loading = false;
this.saving = false;
-   this.wikitextDiffPromise = null;
+   this.clearDiff();
this.serializing = false;
this.submitting = false;
this.baseTimeStamp = null;
@@ -1634,14 +1634,23 @@
var target = this;
// Invalidate the viewer diff on next change
this.getSurface().getModel().getDocument().once( 'transact', function 
() {
-   target.saveDialog.clearDiff();
-   target.wikitextDiffPromise = null;
+   target.clearDiff();
} );
this.saveDialog.setDiffAndReview(
this.getWikitextDiffPromise( doc ),
this.getVisualDiffGeneratorPromise(),
this.getSurface().getModel().getDocument().getHtmlDocument()
);
+};
+
+/**
+ * Clear all state associated with the diff
+ */
+ve.init.mw.ArticleTarget.prototype.clearDiff = function () {
+   if ( this.saveDialog ) {
+   this.saveDialog.clearDiff();
+   }
+   this.wikitextDiffPromise = null;
 };
 
 /**
@@ -2295,6 +2304,7 @@
  */
 ve.init.mw.ArticleTarget.prototype.reloadSurface = function ( newMode, 
dataPromise ) {
this.setDefaultMode( newMode );
+   this.clearDiff();
// Create progress - will be discarded when surface is destroyed.
this.getSurface().createProgress(
$.Deferred().promise(),

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-06-24T10:00:01+0000

2017-06-24 Thread WikidataBuilder (Code Review)

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

Change subject: New Wikidata Build - 2017-06-24T10:00:01+
..

New Wikidata Build - 2017-06-24T10:00:01+

Change-Id: Id498342af08f0b5879cd68e641ce505c183d9cc2
---
M composer.lock
M extensions/ArticlePlaceholder/composer.json
M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php
M extensions/ArticlePlaceholder/phpcs.xml
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php
M extensions/ArticlePlaceholder/tests/phpunit/includes/SearchHookHandlerTest.php
M extensions/Constraints/.eslintignore
M extensions/Constraints/README.md
M extensions/Constraints/extension.json
M extensions/Constraints/i18n/ast.json
M extensions/Constraints/i18n/cs.json
M extensions/Constraints/i18n/de.json
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/gl.json
M extensions/Constraints/i18n/he.json
M extensions/Constraints/i18n/it.json
M extensions/Constraints/i18n/ko.json
M extensions/Constraints/i18n/lb.json
M extensions/Constraints/i18n/qqq.json
M extensions/Constraints/i18n/zh-hans.json
M extensions/Constraints/includes/Constraint.php
M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
D extensions/Constraints/includes/ConstraintCheck/Checker/TypeSparqlChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
D 
extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeSparqlChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintStatementParameterParser.php
M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
M extensions/Constraints/includes/ConstraintReportFactory.php
M extensions/Constraints/modules/SpecialConstraintReportPage.css
M extensions/Constraints/modules/SpecialConstraintReportPage.js
A extensions/Constraints/modules/gadget-skip.js
A extensions/Constraints/modules/gadget.css
R extensions/Constraints/modules/gadget.js
M extensions/Constraints/specials/SpecialConstraintReport.php
M 
extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
M extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
D 
extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeSparqlCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
D 
extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeSparqlCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ValueCountChecker/ValueCountCheckerHelperTest.php
M

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Make wkt literal matching more lenient

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Make wkt literal matching more lenient
..


Make wkt literal matching more lenient

I haven’t been able to find a standard document on this (GeoSPARQL [1]
only specifies that a geo:wktLiteral contains a WKT String according to
ISO 191215-1, which is not freely available), but the
http://linkedgeodata.org/sparql service (which is part of the federation
whitelist) spells these literals all uppercase, i.e. POINT(1 2), so it
seems that the Point should be matched case-insensitively.

The same endpoint also contains other kinds of literals, e. g.
LINESTRING, so we should also not assume that the regular expression
will always match, and instead handle the non-matching case more
gracefully.

[1]: http://www.opengeospatial.org/standards/geosparql

Change-Id: I7ceb1b94a68228ba94733ec86017218966b4f152
---
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index 87218e8..e753556 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -292,9 +292,13 @@
return null;
}
 
-   point = point.match( /Point\((.*)\)/ ).pop();
+   var match = point.match( /Point\((.*)\)/i );
 
-   return point.split( ' ' );
+   if ( !match ) {
+   return null;
+   }
+
+   return match.pop().split( ' ' );
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ceb1b94a68228ba94733ec86017218966b4f152
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Make wkt literal matching more lenient

2017-06-24 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361204 )

Change subject: Make wkt literal matching more lenient
..

Make wkt literal matching more lenient

I haven’t been able to find a standard document on this (GeoSPARQL [1]
only specifies that a geo:wktLiteral contains a WKT String according to
ISO 191215-1, which is not freely available), but the
http://linkedgeodata.org/sparql service (which is part of the federation
whitelist) spells these literals all uppercase, i.e. POINT(1 2), so it
seems that the Point should be matched case-insensitively.

The same endpoint also contains other kinds of literals, e. g.
LINESTRING, so we should also not assume that the regular expression
will always match, and instead handle the non-matching case more
gracefully.

[1]: http://www.opengeospatial.org/standards/geosparql

Change-Id: I7ceb1b94a68228ba94733ec86017218966b4f152
---
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index 87218e8..e753556 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -292,9 +292,13 @@
return null;
}
 
-   point = point.match( /Point\((.*)\)/ ).pop();
+   var match = point.match( /Point\((.*)\)/i );
 
-   return point.split( ' ' );
+   if ( !match ) {
+   return null;
+   }
+
+   return match.pop().split( ' ' );
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ceb1b94a68228ba94733ec86017218966b4f152
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: [WIP] Improve color contrast for Echo icons in bundled dark ...

2017-06-24 Thread SamanthaNguyen (Code Review)

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

Change subject: [WIP] Improve color contrast for Echo icons in bundled dark 
themes
..

[WIP] Improve color contrast for Echo icons in bundled dark themes

- Both icons bundled here, tray.svg and bell.svg have
  been modified from their original source to improve
  the color contrast against the dark themes.
 - tray.svg -
   
https://github.com/wikimedia/oojs-ui/blob/master/src/themes/wikimediaui/images/icons/tray.svg
 - bell.svg -
   
https://github.com/wikimedia/oojs-ui/blob/master/src/themes/wikimediaui/images/icons/bell.svg

TODO: Convert to use ResourceLoaderImageModule or
ResourceLoaderOOUIIMageModule(?)

Change-Id: I0f0d54eb2ee531f303d69699429640c831d030be
---
M extension.json
A icons/bell.svg
A icons/tray.svg
A modules/ext.echo.dark.css
4 files changed, 31 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index 9691581..c9dc16c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "Theme",
"namemsg": "theme-extensionname",
-   "version": "1.8.0",
+   "version": "1.9.0",
"author": [
"Ryan Schmidt",
"Jack Phoenix",
@@ -19,12 +19,22 @@
"ThemeHooks": "Theme.hooks.php"
},
"ResourceModules": {
+   "ext.echo.dark" : {
+   "styles": {
+   "modules/ext.echo.dark.css": {
+   "media": "screen"
+   }
+   }
+   },
"themeloader.skins.monobook.dark": {
"styles": {
"monobook/dark.css": {
"media": "screen"
}
-   }
+   },
+   "dependencies": [
+   "ext.echo.dark"
+   ]
},
"themeloader.skins.monobook.pink": {
"styles": {
@@ -48,7 +58,10 @@

"vector/dark/dark.special.preferences.styles.less": {
"media": "screen"
}
-   }
+   },
+   "dependencies": [
+   "ext.echo.dark"
+   ]
},
"themeloader.skins.vector.deepsea": {
"styles": {
diff --git a/icons/bell.svg b/icons/bell.svg
new file mode 100644
index 000..d2662fc
--- /dev/null
+++ b/icons/bell.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24" fill="#f8f9fa">
+   
+
diff --git a/icons/tray.svg b/icons/tray.svg
new file mode 100644
index 000..8a8a672
--- /dev/null
+++ b/icons/tray.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24" fill="#f8f9fa">
+   
+
diff --git a/modules/ext.echo.dark.css b/modules/ext.echo.dark.css
new file mode 100644
index 000..cf78833
--- /dev/null
+++ b/modules/ext.echo.dark.css
@@ -0,0 +1,7 @@
+#pt-notifications-alert .mw-echo-notifications-badge:before {
+   background-image: url(../icons/bell.svg);
+}
+
+#pt-notifications-notice .mw-echo-notifications-badge:before {
+   background-image: url(../icons/tray.svg);
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f0d54eb2ee531f303d69699429640c831d030be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...WebPlatformAuth[master]: Remove empty vendor folder

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Remove empty vendor folder
..


Remove empty vendor folder

Change-Id: I878ded0fe9a8a107b25c4ec3141aaf04f516a112
---
M .gitignore
D vendor/.gitkeep
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 95894af..55602f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 node_modules/
+vendor/
+/composer.lock
 
 .svn
 *~
 *.kate-swp
 .*.swp
-vendor/*
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
deleted file mode 100644
index e69de29..000
--- a/vendor/.gitkeep
+++ /dev/null

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I878ded0fe9a8a107b25c4ec3141aaf04f516a112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WebPlatformAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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] mediawiki...Html2Wiki[master]: Remove composer.lock

2017-06-24 Thread jenkins-bot (Code Review)

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

Change subject: Remove composer.lock
..


Remove composer.lock

Change-Id: I18728fd0e5ca30cbe8d5047e6fc20127707d00d1
---
M .gitignore
D composer.lock
2 files changed, 1 insertion(+), 194 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index c369f1e..b4e6dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/
 vendor/
+/composer.lock
 
 # Editors
 *.kate-swp
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 7b4ee4c..000
--- a/composer.lock
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-"_readme": [
-"This file locks the dependencies of your project to a known state",
-"Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
-"This file is @generated automatically"
-],
-"content-hash": "0d3468f516943c19bd229bc991c1fb54",
-"packages": [
-{
-"name": "querypath/querypath",
-"version": "3.0.3",
-"source": {
-"type": "git",
-"url": "https://github.com/technosophos/querypath.git;,
-"reference": "13224745f7348e099d2dde9e555bc8972c21a810"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/technosophos/querypath/zipball/13224745f7348e099d2dde9e555bc8972c21a810;,
-"reference": "13224745f7348e099d2dde9e555bc8972c21a810",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.0"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"QueryPath": "src/"
-},
-"files": [
-"src/qp_functions.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"description": "HTML/XML querying (CSS 4 or XPath) and processing 
(like jQuery)",
-"homepage": "https://github.com/technosophos/querypath;,
-"keywords": [
-"css",
-"html",
-"jquery",
-"xml",
-"xslt"
-],
-"time": "2014-09-23T19:04:19+00:00"
-}
-],
-"packages-dev": [
-{
-"name": "jakub-onderka/php-console-color",
-"version": "0.1",
-"source": {
-"type": "git",
-"url": "https://github.com/JakubOnderka/PHP-Console-Color.git;,
-"reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1;,
-"reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.2"
-},
-"require-dev": {
-"jakub-onderka/php-code-style": "1.0",
-"jakub-onderka/php-parallel-lint": "0.*",
-"jakub-onderka/php-var-dump-check": "0.*",
-"phpunit/phpunit": "3.7.*",
-"squizlabs/php_codesniffer": "1.*"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"JakubOnderka\\PhpConsoleColor": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"BSD-2-Clause"
-],
-"authors": [
-{
-"name": "Jakub Onderka",
-"email": "jakub.onde...@gmail.com",
-"homepage": "http://www.acci.cz;
-}
-],
-"time": "2014-04-08T15:00:19+00:00"
-},
-{
-"name": "jakub-onderka/php-console-highlighter",
-"version": "v0.3.2",
-"source": {
-"type": "git",
-"url": 
"https://github.com/JakubOnderka/PHP-Console-Highlighter.git;,
-"reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5;,
-"reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
-"shasum": ""
-},
-"require": {
-

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Clarify bad-tags message: "must" is more precise than "should"

2017-06-24 Thread Amire80 (Code Review)

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

Change subject: Clarify bad-tags message: "must" is more precise than "should"
..

Clarify bad-tags message: "must" is more precise than "should"

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/02/361202/1

diff --git a/i18n/en.json b/i18n/en.json
index be06bcf..cf2aa91 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -183,7 +183,7 @@
"abusefilter-edit-export": "Export this filter to another wiki",
"abusefilter-edit-syntaxok": "No syntax errors detected.",
"abusefilter-edit-syntaxerr": "Syntax error detected: $1",
-   "abusefilter-edit-bad-tags": "One or more of the tags you specified is 
not valid.\nTags should be short, they should not contain special characters, 
and they should not be reserved by other software.  Try choosing a new tag 
name",
+   "abusefilter-edit-bad-tags": "One or more of the tags you specified is 
not valid.\nTags should be short, they must not contain special characters, and 
they must not be reserved by other software. Try choosing a new tag name.",
"abusefilter-edit-notallowed": "You are not permitted to create or edit 
abuse filters",
"abusefilter-edit-notallowed-global": "You are not permitted to create 
or edit global abuse filters",
"abusefilter-edit-notallowed-global-custom-msg": "Custom warning 
messages are not supported for global filters",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae4505cbe263bdb413b47ac24e84d9b1f9c5d43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Amire80 

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

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[master]: Remove EXPERIMENTAL

2017-06-24 Thread Legoktm (Code Review)

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

Change subject: Remove EXPERIMENTAL
..

Remove EXPERIMENTAL

This HHVM/PHP extension is widely used on Wikimedia sites and really not
that experimental anymore.

Change-Id: I76460e81215a65b9be3b639bf4112a8d49c0c891
---
D EXPERIMENTAL
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/01/361201/1

diff --git a/EXPERIMENTAL b/EXPERIMENTAL
deleted file mode 100644
index e69de29..000
--- a/EXPERIMENTAL
+++ /dev/null

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76460e81215a65b9be3b639bf4112a8d49c0c891
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

88 matches

Mail list logo