[MediaWiki-commits] [Gerrit] operations...pybal[1.13]: Bump version number in setup.py
Ema has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354180 ) Change subject: Bump version number in setup.py .. Bump version number in setup.py Change-Id: Ia414863aa9db40b778dd123ef78c1f01134b4e4f --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal refs/changes/80/354180/1 diff --git a/setup.py b/setup.py index acbcfc1..96ce359 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( name='PyBal', -version='1.12', +version='1.13', license='GPLv2+', author='Mark Bergsma', author_email='m...@wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/354180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia414863aa9db40b778dd123ef78c1f01134b4e4f Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/pybal Gerrit-Branch: 1.13 Gerrit-Owner: Ema ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikispeech[master]: Adding a buffer animation to the play button while the sound...
Eugene233 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354181 )
Change subject: Adding a buffer animation to the play button while the sound is
loading
..
Adding a buffer animation to the play button while the sound is loading
* Added a function to create an element to be added to the span (
addI() ).
* Added a function to create a which represents the stack which
holds the loader and appends to the playStop button.
* Modified the play function to
* Add the stack and loader items.
* Add the spinner class to loader item.
* modify the size of the playStop button with the stack.
* Added a class to the playStop button when it contains loader.
* modified the stop function to remove the stack on the playStop Button before
restoring the original play button.
* Modified Qunit test assert for play() function to check for the class added
to playStop button when the loader is addded.
Bug: T165147
Change-Id: Id4b254cc94d218fafb761b7c628f73c45dbfa9e8
---
M modules/ext.wikispeech.js
M tests/qunit/ext.wikispeech.test.js
2 files changed, 41 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikispeech
refs/changes/81/354181/1
diff --git a/modules/ext.wikispeech.js b/modules/ext.wikispeech.js
index f36c9b6..1d0059d 100644
--- a/modules/ext.wikispeech.js
+++ b/modules/ext.wikispeech.js
@@ -130,6 +130,32 @@
};
/**
+* Add a item to the stack
+* @param id The id of the item
+* @param cssClass The name of the CSS class to add the Item
+*/
+
+ this.addI = function ( id, cssClass ) {
+ var $i = $( '' )
+ .attr( 'id', id )
+ .addClass( cssClass );
+ $( '#stack' ).append( $i );
+ };
+
+ /**
+* Add a span to the to the play button
+* @param id The id of the item
+* @param cssClass The name of the CSS class to add the Item
+*/
+
+ this.addSpan = function ( id, cssClass ) {
+ var $span = $( '' )
+ .attr( 'id', id )
+ .addClass( cssClass );
+ $( '#ext-wikispeech-play-stop-button' ).append( $span );
+ };
+
+ /**
* Add a button that takes the user to another page.
*
* The button gets the link destination from a supplied
@@ -183,14 +209,25 @@
};
/**
-* Start playing the first utterance.
+* Start playing the first utterance and display loader button
*/
this.play = function () {
var $playStopButton = $(
'#ext-wikispeech-play-stop-button' );
self.playUtterance( $( '#utterance-0' ) );
$playStopButton.removeClass( 'ext-wikispeech-play' );
- $playStopButton.addClass( 'ext-wikispeech-stop' );
+
+ // We discard all the children of the play stop button
to add the span freely
+ $playStopButton.empty();
+
+ // We add the span and list containing the loader to
the button
+ this.addSpan( 'stack', 'fa fa-stack' );
+ this.addI( 'ext-wikispeech-load-item-one', 'fa
fa-stack-1x fa-stop' );
+ this.addI( 'ext-wikispeech-load-item-two', 'waiting fa
fa-stack-2x' );
+ $( '#ext-wikispeech-load-item-two' ).addClass(
'fa-spinner fa-spin' );
+ $( '#ext-wikispeech-load-item-two' ).css( 'color',
'red' );
+ $( '#stack' ).css( 'font-size', '47%' );
+ $playStopButton.addClass(
'ext-wikispeech-button-with-rotator' );
};
/**
@@ -404,6 +441,7 @@
var $playStopButton = $(
'#ext-wikispeech-play-stop-button' );
self.stopUtterance( $currentUtterance );
$currentUtterance = $();
+ $playStopButton.empty();
$playStopButton.removeClass( 'ext-wikispeech-stop' );
$playStopButton.addClass( 'ext-wikispeech-play' );
};
diff --git a/tests/qunit/ext.wikispeech.test.js
b/tests/qunit/ext.wikispeech.test.js
index 924b05f..3e100fd 100644
--- a/tests/qunit/ext.wikispeech.test.js
+++ b/tests/qunit/ext.wikispeech.test.js
@@ -488,7 +488,7 @@
);
assert.strictEqual(
$( '#ext-wikispeech-play-stop-button' )
- .hasClass( 'ext-wiki
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Check for parent page being a hub earlier in the process.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351095 )
Change subject: Check for parent page being a hub earlier in the process.
..
Check for parent page being a hub earlier in the process.
What was happening was that pages were being created, *then* it was
checking if the parent was a hub.
Also preventing Special:CreateHubFeature from being accessed if the
user does not have page creation privileges.
Change-Id: I250c2f880471b7299def3b923be1a2556673d568
---
M includes/SpecialCreateHubFeature.php
1 file changed, 17 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/includes/SpecialCreateHubFeature.php
b/includes/SpecialCreateHubFeature.php
index 8e20a6a..6a486f4 100644
--- a/includes/SpecialCreateHubFeature.php
+++ b/includes/SpecialCreateHubFeature.php
@@ -21,6 +21,10 @@
* @param string $par
*/
public function execute( $par ) {
+ if ( !$this->getUser()->isAllowed( 'createpage' ) ) {
+ throw new PermissionsError( 'createpage' );
+ }
+
$output = $this->getContext()->getOutput();
$output->addModules( 'ext.CollaborationKit.iconbrowser' );
$output->addModuleStyles( [
@@ -116,10 +120,21 @@
*/
public function onSubmit( array $data ) {
$collaborationHub = $data['collaborationhub'];
+ $hubTitleObject = Title::newFromText( $collaborationHub );
+
+ // This special page can only be used to create subpages of
Collaboration
+ // Hubs. This checks if the parent page is one.
+
+ if ( !$hubTitleObject->exists() ) {
+ return Status::newFatal(
'collaborationkit-createhubfeature-hubdoesnotexist' );
+ }
+
+ if ( $hubTitleObject->getContentModel() !=
'CollaborationHubContent' ) {
+ return Status::newFatal(
'collaborationkit-createhubfeature-hubisnotahub' );
+ }
+
$featureName = $data['featurename'];
-
$titleText = $collaborationHub . '/' . $featureName;
-
$title = Title::newFromText( $titleText );
if ( !$title ) {
return Status::newFatal(
'collaborationkit-createhubfeature-invalidtitle' );
@@ -197,16 +212,6 @@
if ( $data[ 'icon' ] ) {
$newFeature['image'] = $data[ 'icon' ];
- }
-
- $hubTitleObject = Title::newFromText( $collaborationHub );
-
- if ( !$hubTitleObject->exists() ) {
- return Status::newFatal(
'collaborationkit-createhubfeature-hubdoesnotexist' );
- }
-
- if ( $hubTitleObject->getContentModel() !=
'CollaborationHubContent' ) {
- return Status::newFatal(
'collaborationkit-createhubfeature-hubisnotahub' );
}
$hubWikiPageObject = WikiPage::factory( $hubTitleObject );
--
To view, visit https://gerrit.wikimedia.org/r/351095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I250c2f880471b7299def3b923be1a2556673d568
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix the Qunit failures
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354178 )
Change subject: Fix the Qunit failures
..
Fix the Qunit failures
1. Skip the template tests that need mock server
2. Simplify the test for ext.cx.sitemapper: getApi
3. use mock response for ext.cx.tools.categories:Get categories
test.
Also upgraded to use latest Qunit test patterns.
Bug: T165646
Change-Id: If8d86694f1b3ecd76f8b0766384369302ef3b211
---
M tests/qunit/base/ext.cx.sitemapper.test.js
M tests/qunit/tools/ext.cx.tools.categories.test.js
M tests/qunit/tools/ext.cx.tools.template.test.js
3 files changed, 78 insertions(+), 62 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/qunit/base/ext.cx.sitemapper.test.js
b/tests/qunit/base/ext.cx.sitemapper.test.js
index be448fb..bff8741 100644
--- a/tests/qunit/base/ext.cx.sitemapper.test.js
+++ b/tests/qunit/base/ext.cx.sitemapper.test.js
@@ -21,7 +21,7 @@
} ) );
QUnit.test( 'getLanguageCodeForWikiDomain', function ( assert ) {
- QUnit.expect( 2 );
+ assert.expect( 2 );
assert.strictEqual(
this.siteMapper.getLanguageCodeForWikiDomain( 'no' ),
@@ -37,7 +37,7 @@
} );
QUnit.test( 'getPageUrl', function ( assert ) {
- QUnit.expect( 2 );
+ assert.expect( 2 );
assert.strictEqual(
this.siteMapper.getPageUrl( 'es', 'Title' ),
@@ -53,17 +53,9 @@
} );
QUnit.test( 'getApi', function ( assert ) {
- var server = this.sandbox.useFakeServer();
-
- QUnit.expect( 2 );
-
- this.siteMapper.getApi( 'he' ).get( { action: 'testaction' } );
- assert.strictEqual( server.requests.length, 1 );
- assert.strictEqual(
- server.requests[ 0 ].url,
-
'https://he.wikipedia.org/w/api.php?action=testaction&format=json&origin=*'
- );
-
- server.requests[ 0 ].respond( 500 );
+ var api;
+ assert.expect( 1 );
+ api = this.siteMapper.getApi( 'he' );
+ assert.strictEqual( api.apiUrl,
'https://he.wikipedia.org/w/api.php' );
} );
}( jQuery, mediaWiki ) );
diff --git a/tests/qunit/tools/ext.cx.tools.categories.test.js
b/tests/qunit/tools/ext.cx.tools.categories.test.js
index e3896e5..5cda11e 100644
--- a/tests/qunit/tools/ext.cx.tools.categories.test.js
+++ b/tests/qunit/tools/ext.cx.tools.categories.test.js
@@ -8,6 +8,8 @@
QUnit.module( 'ext.cx.tools.categories', QUnit.newMwEnvironment( {
setup: function () {
+ this.server = this.sandbox.useFakeServer();
+ this.server.respondImmediately = true;
this.sitemapper = new mw.cx.SiteMapper(
mw.config.get(
'wgContentTranslationSiteTemplates' )
);
@@ -16,19 +18,44 @@
}
} ) );
+ // These two functions are copied from
suites/resources/mediawiki.api/mediawiki.api.test.js
+ function sequence( responses ) {
+ var i = 0;
+ return function ( request ) {
+ var response = responses[ i ];
+ if ( response ) {
+ i++;
+ request.respond.apply( request, response );
+ }
+ };
+ }
+
+ function sequenceBodies( status, headers, bodies ) {
+ $.each( bodies, function ( i, body ) {
+ bodies[ i ] = [ status, headers, body ];
+ } );
+ return sequence( bodies );
+ }
+
QUnit.test( 'Get categories', function ( assert ) {
var done, categoryTool = new mw.cx.CategoryTool(
this.sitemapper );
done = assert.async();
- QUnit.expect( 3 );
+ assert.expect( 3 );
mw.cx.sourceTitle = 'Han Feizi';
+
+ this.server.respond( sequenceBodies( 200, { 'Content-Type':
'application/json' },
+ [
+
'{"batchcomplete":true,"query":{"pages":[{"pageid":1297210,"ns":0,"title":"Han
Feizi","categories":[{"ns":14,"title":"Categoría:Chinos del siglo III a.
C."},{"ns":14,"title":"Categoría:Filósofos de China
Antigua"},{"ns":14,"title":"Categoría:Filósofos del siglo III a.
C."},{"ns":14,"title":"Categoría:Filósofos
sociales"},{"ns":14,"title":"Categoría:Suicidas de China"}]}]}}',
+
'{"batchcomplete":"","query":{"pages":{"4794870":{"pageid":4794870,"ns":14,"title":"Categor\u00eda:Chinos
del siglo III a.
C."},"389825":{"pageid":389825,"ns":14,"title":"Categor\u00eda:
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Treating the "empty column" message as a list item for CSS s...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351747 )
Change subject: Treating the "empty column" message as a list item for CSS
selector purposes.
..
Treating the "empty column" message as a list item for CSS selector
purposes.
Basically, the JavaScript uses the last element of the mw-ck-list-item
class to figure out where to append the "add item" button. This
treats the notice that says "this column is empty" as a list item
so that each column will always have at least one element of that
class.
Change-Id: I55fb901e4d87ef266e22b2c9ef2f33f78f1c6e66
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index c60c1c7..58ea7b2 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -333,7 +333,9 @@
$text .= "\n";
if ( count( $column->items ) === 0 ) {
- $text .=
"\n{{mediawiki:collaborationkit-list-emptycolumn}}\n";
+ $text .= "\n";
+ $text .=
"{{mediawiki:collaborationkit-list-emptycolumn}}\n";
+ $text .= "\n";
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/351747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55fb901e4d87ef266e22b2c9ef2f33f78f1c6e66
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
Gerrit-Reviewer: Isarra
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...CollaborationKit[master]: Change JS list editor to use numeric indices instead of titles.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351094 )
Change subject: Change JS list editor to use numeric indices instead of titles.
..
Change JS list editor to use numeric indices instead of titles.
A page title could be included on a list multiple times, and this
causes issues with the JS list editor. This change assigns "item
IDs" to each list item, based on the column and item index, and
changes all list editor behavior to use those instead of the page
title.
Change-Id: I01af89264c59f943274c422b630b1f9fb09622ca
---
M extension.json
M includes/content/CollaborationListContent.php
M modules/ext.CollaborationKit.list.edit.js
M modules/ext.CollaborationKit.list.ui.js
4 files changed, 105 insertions(+), 101 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 9a9f0ac..005c968 100644
--- a/extension.json
+++ b/extension.json
@@ -197,6 +197,7 @@
"collaborationkit-list-delete-summary",
"collaborationkit-list-delete-popup",
"collaborationkit-list-delete-popup-title",
+ "collaborationkit-list-error-editconflict",
"collaborationkit-list-error-saving",
"collaborationkit-list-move",
"collaborationkit-list-move-summary",
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index c60c1c7..871665f 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -342,6 +342,7 @@
$sortedItems = $column->items;
$this->sortList( $sortedItems, $options['defaultSort']
);
+ $itemCounter = 0;
foreach ( $sortedItems as $item ) {
if ( $offset !== 0 ) {
$offset--;
@@ -366,8 +367,10 @@
$text .= Html::openElement( 'div', [
'style' => "min-height:{$iconWidth}px",
'class' => 'mw-ck-list-item',
- 'data-collabkit-item-title' =>
$item->title
+ 'data-collabkit-item-title' =>
$item->title,
+ 'data-collabkit-item-id' => $colId .
'-' . $itemCounter
] );
+ $itemCounter++;
if ( $options['mode'] !== 'no-img' ) {
if ( isset( $item->image ) ) {
$text .= static::generateImage(
diff --git a/modules/ext.CollaborationKit.list.edit.js
b/modules/ext.CollaborationKit.list.edit.js
index 8865022..75400fe 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -4,7 +4,7 @@
( function ( $, mw ) {
'use strict';
- var deleteItem, getCurrentJson, saveJson, reorderList, getListOfTitles,
getColId;
+ var deleteItem, getCurrentJson, saveJson, reorderList, getListOfItems,
getColId, renumberElements;
/**
* Retrieves ID number of column
@@ -24,13 +24,28 @@
};
/**
+* Renumbers the item IDs within a column following a re-ordering or a
deletion
+*
+* @param {number} colId the column in which to re-number the items
+*/
+ renumberElements = function ( colId ) {
+ $( '.mw-ck-list-column[ data-collabkit-column-id=' + colId + '
] .mw-ck-list-item' )
+ .each( function ( index ) {
+ $( this ).data( 'collabkit-item-id', colId +
'-' + index );
+ } );
+ };
+
+ /**
* Deletes an item from the list
*
* @param {jQuery} $item
*/
deleteItem = function ( $item ) {
- var spinner,
+ var i,
+ oldItems,
+ spinner,
title = $item.data( 'collabkit-item-title' ),
+ itemId = $item.data( 'collabkit-item-id' ),
colId = getColId( $item );
if ( mw.config.get( 'wgCollaborationKitIsMemberList' ) ) {
@@ -48,12 +63,13 @@
getCurrentJson( mw.config.get( 'wgArticleId' ), function ( res
) {
var newItems = [];
- $.each( res.content.columns[ colId ].items, function (
index ) {
- if ( this.title === title ) {
- return;
+
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Adding .pushPending() to certain process dialogs
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351746 )
Change subject: Adding .pushPending() to certain process dialogs
..
Adding .pushPending() to certain process dialogs
This way, when buttons are pushed, they have a nice save animation
instead of just sitting there blankly.
Change-Id: Iafd1663f94d03cf059fec185e072aceac0cc1d59
---
M modules/ext.CollaborationKit.hubtheme.js
M modules/ext.CollaborationKit.list.ui.js
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/modules/ext.CollaborationKit.hubtheme.js
b/modules/ext.CollaborationKit.hubtheme.js
index e99bd8b..e727919 100644
--- a/modules/ext.CollaborationKit.hubtheme.js
+++ b/modules/ext.CollaborationKit.hubtheme.js
@@ -223,8 +223,8 @@
*/
ImageProcessDialog.prototype.getActionProcess = function ( action ) {
var dialog, fileTitle;
-
dialog = this;
+ dialog.pushPending();
if ( action ) {
return new OO.ui.Process( function () {
var fileObj, fileUrl, fileHeight, fileTitleObj;
diff --git a/modules/ext.CollaborationKit.list.ui.js
b/modules/ext.CollaborationKit.list.ui.js
index 26a0574..3ad6636 100644
--- a/modules/ext.CollaborationKit.list.ui.js
+++ b/modules/ext.CollaborationKit.list.ui.js
@@ -187,6 +187,8 @@
dialog = this,
titleObj;
+ dialog.pushPending();
+
if ( this.titleWidget instanceof mw.widgets.UserInputWidget ) {
titleObj = mw.Title.newFromText( 'User:' + title );
if ( titleObj ) {
--
To view, visit https://gerrit.wikimedia.org/r/351746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafd1663f94d03cf059fec185e072aceac0cc1d59
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
Gerrit-Reviewer: Isarra
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...CollaborationKit[master]: Ask the user for confirmation before overwriting an existing...
Harej has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351097 )
Change subject: Ask the user for confirmation before overwriting an existing
page
..
Ask the user for confirmation before overwriting an existing page
Also preventing CreateCollaborationHub from being shown to those
who cannot create pages.
Change-Id: I507acec92d29a871d4e0df7a9db43cc01dfbe746
---
M i18n/en.json
M i18n/qqq.json
M includes/SpecialCreateCollaborationHub.php
3 files changed, 69 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 74caeb9..4fb8c8d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,6 +15,8 @@
"collaborationkit-createhub-exists": "A page already exists with the
specified title.",
"collaborationkit-createhub-nopermission": "You do not have permission
to create a Collaboration Hub with this title",
"collaborationkit-createhub-editsummary": "Created new Collaboration
Hub",
+ "collaborationkit-createhub-confirm": "Yes, overwrite the current page
contents",
+ "collaborationkit-createhub-confirmheader": "There is already a page
with this title. If you confirm below, the contents of that page will be
overwritten. Would you like to proceed?",
"collaborationkit-createhubfeature-collaborationhub": "Parent
Collaboration Hub",
"collaborationkit-createhubfeature-featurename": "Feature name",
"collaborationkit-createhubfeature-icon": "Icon",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8e171bc..4df4c93 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,6 +18,8 @@
"collaborationkit-createhub-exists": "Error message for attempting to
create a page that already exists",
"collaborationkit-createhub-nopermission": "Error message for no
permission to edit/create/whatever",
"collaborationkit-createhub-editsummary": "Edit summary for creating a
new Collaboration Hub via Special:CreateCollaborationHub",
+ "collaborationkit-createhub-confirm": "Checkbox message to confirm
overwriting an existing page when creating a Collaboration Hub",
+ "collaborationkit-createhub-confirmheader": "Warning box that shows at
the top of Special:CreateCollaborationHub when a page already exists at the
given title",
"collaborationkit-createhubfeature-collaborationhub": "Label for form
field for specifying the Collaboration Hub on Special:CreateHubFeature",
"collaborationkit-createhubfeature-featurename": "Label for form field
for specifying the name of the feature to be created on
Special:CreateHubFeature",
"collaborationkit-createhubfeature-icon": "Label for form field for
specifying the feature's icon on Special:CreateHubFeature\n{{Identical|Icon}}",
diff --git a/includes/SpecialCreateCollaborationHub.php
b/includes/SpecialCreateCollaborationHub.php
index 321fab6..5a96b3b 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -25,6 +25,10 @@
* @param $par string
*/
public function execute( $par ) {
+ if ( !$this->getUser()->isAllowed( 'createpage' ) ) {
+ throw new PermissionsError( 'createpage' );
+ }
+
$out = $this->getContext()->getOutput();
$out->addModules( [
'ext.CollaborationKit.hubtheme'
@@ -35,6 +39,12 @@
CollaborationHubContent::getThemeColours()
);
+ if ( $this->getRequest()->getVal( 'confirm' ) ) {
+ $out->wrapWikiMsg(
+ "\n$1\n",
+ 'collaborationkit-createhub-confirmheader'
+ );
+ }
parent::execute( $par );
}
@@ -52,8 +62,6 @@
}
$fields = [
- // autofilled from how they got here, hopefully
-
'namespace' => [
'type' => 'select',
'options' => $namespaceChoices,
@@ -110,6 +118,36 @@
'placeholder-message' =>
'collaborationkit-hubedit-introduction-placeholder'
];
+ // If these fields are included in GET parameter, have them as
default
+ // values on the form.
+ foreach ( [
+ 'namespace',
+ 'icon',
+ 'display_name',
+ 'icon',
+ 'colour',
+ 'introduction' ]
+ as $fieldName )
+ {
+ if ( $this->getRequest()->getVal( $fieldName ) ) {
+ $fields[ $fieldName ][ 'default' ] =
$this->getRequest()->
[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: convert deployment-prep to role/profile
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354182 )
Change subject: restbase: convert deployment-prep to role/profile
..
restbase: convert deployment-prep to role/profile
Also:
* Add a deprecation warning to role::restbase::server
* Better handle the default instances case for cassandra
Change-Id: I48827fd2388d15d24935df909e70d36097aec8aa
---
M hieradata/labs/deployment-prep/common.yaml
M modules/cassandra/manifests/init.pp
M modules/profile/manifests/cassandra.pp
M modules/role/manifests/restbase/dev_cluster.pp
M modules/role/manifests/restbase/server.pp
5 files changed, 45 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/354182/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 948c05d..42d1059 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -88,38 +88,55 @@
text: {}
upload: {}
zotero: {}
+# AQS
aqs_hosts:
- deployment-aqs01.deployment-prep.eqiad.wmflabs
- deployment-aqs02.deployment-prep.eqiad.wmflabs
- deployment-aqs03.deployment-prep.eqiad.wmflabs
aqs::cassandra_default_consistency: localOne
-cassandra::listen_address: '%{::ipaddress}'
-cassandra::rpc_address: '%{::ipaddress}'
-cassandra::seeds:
- - deployment-restbase01.deployment-prep.eqiad.wmflabs
- - deployment-restbase02.deployment-prep.eqiad.wmflabs
-cassandra::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
-cassandra::target_version: '2.2'
-cassandra::metrics::graphite_host: labmon1001.eqiad.wmnet
-cassandra::metrics::blacklist:
-- .*\.metrics\.Table\..*$
+# END AQS
+# Restbase (profile::restbase)
+profile::restbase::cassandra_local_dc: "%{::site}"
+profile::restbase::logging_label: restbase
+profile::restbase::cassandra_datacenters:
+- "eqiad"
+profile::restbase::parsoid_uri:
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
+profile::restbase::graphoid_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
+profile::restbase::mobileapps_uri:
http://deployment-mcs01.deployment-prep.eqiad.wmflabs:
+profile::restbase::mathoid_uri:
http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042
+profile::restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics
+profile::restbase::eventlogging_service_uri:
http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events
+profile::restbase::pdfrender_uri:
http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252
+profile::restbase::citoid_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970
+profile::restbase::trendingedits_uri:
http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699
+profile::restbase::cxserver_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:8080
-cassandra::additional_jvm_opts:
- -
'-javaagent:/srv/deployment/prometheus/jmx_exporter/lib/jmx_prometheus_javaagent-0.8-SNAPSHOT.jar=7800:/etc/cassandra/jmx_exporter.yaml'
-# used for rate limiting
-restbase::hosts:
+profile::restbase::cassandra_user: cassandra
+profile::restbase::cassandra_password: cassandra
+profile::restbase::monitor_domain: en.wikipedia.org
+profile::restbase::cassandra_tls: {}
+profile::restbase::hosts:
- deployment-restbase01.deployment-prep.eqiad.wmflabs
- deployment-restbase02.deployment-prep.eqiad.wmflabs
-restbase::parsoid_uri:
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
-restbase::graphoid_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
-restbase::mobileapps_uri:
http://deployment-mcs01.deployment-prep.eqiad.wmflabs:
-restbase::mathoid_uri:
http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042
-restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics
-restbase::eventlogging_service_uri:
http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events
-restbase::pdfrender_uri:
http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252
-restbase::citoid_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970
-restbase::trendingedits_uri:
http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699
-restbase::cxserver_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:8080
+profile::restbase::seeds:
+ - deployment-restbase01.deployment-prep.eqiad.wmflabs
+ - deployment-restbase02.deployment-prep.eqiad.wmflabs
+# Cassandra (profile::cassandra)
+graphite_host: labmon1001.eqiad.wmnet
+profile::cassandra::metrics_whitelist: false
+profile::cassandra::metrics_blacklist:
+- .*\.metrics\.Table\..*$
+profile::cassandra::instances:
+ "deployment-restbase01.deployment-prep.eqiad.wmflabs": {}
+ "deployment-restbase02.deployment-prep.eqiad.wmflabs": {}
+profile::cassandra::settings:
+ listen_address: '%{::ipaddress}'
+ rpc_address: '%{::ipaddress}'
+ logstash_host: deploym
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nrpe: Ship a systemd unit file
Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354183 )
Change subject: nrpe: Ship a systemd unit file
..
nrpe: Ship a systemd unit file
Use base::service_unit and ship a just slighlty modified version of
stretch's systemd unit. Our version differs in just not passing -f and
$NRPE_OPTS to the nrpe server.
Change-Id: Id1a2695c5bc10928cee62a6cc9fbf04268f0e817
---
M modules/nrpe/manifests/init.pp
A modules/nrpe/templates/initscripts/nagios-nrpe-server.systemd.erb
2 files changed, 25 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/354183/1
diff --git a/modules/nrpe/manifests/init.pp b/modules/nrpe/manifests/init.pp
index 5a49175..5e7f142 100644
--- a/modules/nrpe/manifests/init.pp
+++ b/modules/nrpe/manifests/init.pp
@@ -55,8 +55,8 @@
require => File['/usr/local/lib/nagios/'],
}
-service { 'nagios-nrpe-server':
-ensure => running,
+base::service_unit { 'nagios-nrpe-server':
+systemd => true,
require => Package['nagios-nrpe-server'],
}
diff --git a/modules/nrpe/templates/initscripts/nagios-nrpe-server.systemd.erb
b/modules/nrpe/templates/initscripts/nagios-nrpe-server.systemd.erb
new file mode 100644
index 000..9aebac8
--- /dev/null
+++ b/modules/nrpe/templates/initscripts/nagios-nrpe-server.systemd.erb
@@ -0,0 +1,23 @@
+[Unit]
+Description=Nagios Remote Plugin Executor
+Documentation=http://www.nagios.org/documentation
+After=var-run.mount nss-lookup.target network.target local-fs.target
remote-fs.target time-sync.target
+Before=getty@tty1.service plymouth-quit.service xdm.service
+Conflicts=nrpe.socket
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+Restart=on-abort
+PIDFile=/var/run/nagios/nrpe.pid
+EnvironmentFile=-/etc/default/nagios-nrpe-server
+ExecStart=/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStopPost=/bin/rm -f /var/run/nagios/nrpe.pid
+TimeoutStopSec=60
+User=nagios
+Group=nagios
+PrivateTmp=true
+OOMScoreAdjust=-500
--
To view, visit https://gerrit.wikimedia.org/r/354183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1a2695c5bc10928cee62a6cc9fbf04268f0e817
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: convert deployment-prep to role/profile
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354182 )
Change subject: restbase: convert deployment-prep to role/profile
..
restbase: convert deployment-prep to role/profile
Also:
* Add a deprecation warning to role::restbase::server
* Better handle the default instances case for cassandra
Change-Id: I48827fd2388d15d24935df909e70d36097aec8aa
---
M hieradata/labs/deployment-prep/common.yaml
M modules/cassandra/manifests/init.pp
M modules/profile/manifests/cassandra.pp
M modules/role/manifests/restbase/dev_cluster.pp
M modules/role/manifests/restbase/server.pp
5 files changed, 45 insertions(+), 27 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 948c05d..42d1059 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -88,38 +88,55 @@
text: {}
upload: {}
zotero: {}
+# AQS
aqs_hosts:
- deployment-aqs01.deployment-prep.eqiad.wmflabs
- deployment-aqs02.deployment-prep.eqiad.wmflabs
- deployment-aqs03.deployment-prep.eqiad.wmflabs
aqs::cassandra_default_consistency: localOne
-cassandra::listen_address: '%{::ipaddress}'
-cassandra::rpc_address: '%{::ipaddress}'
-cassandra::seeds:
- - deployment-restbase01.deployment-prep.eqiad.wmflabs
- - deployment-restbase02.deployment-prep.eqiad.wmflabs
-cassandra::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
-cassandra::target_version: '2.2'
-cassandra::metrics::graphite_host: labmon1001.eqiad.wmnet
-cassandra::metrics::blacklist:
-- .*\.metrics\.Table\..*$
+# END AQS
+# Restbase (profile::restbase)
+profile::restbase::cassandra_local_dc: "%{::site}"
+profile::restbase::logging_label: restbase
+profile::restbase::cassandra_datacenters:
+- "eqiad"
+profile::restbase::parsoid_uri:
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
+profile::restbase::graphoid_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
+profile::restbase::mobileapps_uri:
http://deployment-mcs01.deployment-prep.eqiad.wmflabs:
+profile::restbase::mathoid_uri:
http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042
+profile::restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics
+profile::restbase::eventlogging_service_uri:
http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events
+profile::restbase::pdfrender_uri:
http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252
+profile::restbase::citoid_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970
+profile::restbase::trendingedits_uri:
http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699
+profile::restbase::cxserver_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:8080
-cassandra::additional_jvm_opts:
- -
'-javaagent:/srv/deployment/prometheus/jmx_exporter/lib/jmx_prometheus_javaagent-0.8-SNAPSHOT.jar=7800:/etc/cassandra/jmx_exporter.yaml'
-# used for rate limiting
-restbase::hosts:
+profile::restbase::cassandra_user: cassandra
+profile::restbase::cassandra_password: cassandra
+profile::restbase::monitor_domain: en.wikipedia.org
+profile::restbase::cassandra_tls: {}
+profile::restbase::hosts:
- deployment-restbase01.deployment-prep.eqiad.wmflabs
- deployment-restbase02.deployment-prep.eqiad.wmflabs
-restbase::parsoid_uri:
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
-restbase::graphoid_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
-restbase::mobileapps_uri:
http://deployment-mcs01.deployment-prep.eqiad.wmflabs:
-restbase::mathoid_uri:
http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042
-restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics
-restbase::eventlogging_service_uri:
http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events
-restbase::pdfrender_uri:
http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252
-restbase::citoid_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970
-restbase::trendingedits_uri:
http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699
-restbase::cxserver_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:8080
+profile::restbase::seeds:
+ - deployment-restbase01.deployment-prep.eqiad.wmflabs
+ - deployment-restbase02.deployment-prep.eqiad.wmflabs
+# Cassandra (profile::cassandra)
+graphite_host: labmon1001.eqiad.wmnet
+profile::cassandra::metrics_whitelist: false
+profile::cassandra::metrics_blacklist:
+- .*\.metrics\.Table\..*$
+profile::cassandra::instances:
+ "deployment-restbase01.deployment-prep.eqiad.wmflabs": {}
+ "deployment-restbase02.deployment-prep.eqiad.wmflabs": {}
+profile::cassandra::settings:
+ listen_address: '%{::ipaddress}'
+ rpc_address: '%{::ipaddress}'
+ logstash_host: de
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix MediaWiki centralauth errors graphite alarm
Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354184 )
Change subject: Fix MediaWiki centralauth errors graphite alarm
..
Fix MediaWiki centralauth errors graphite alarm
Small fix for the metric to monitor (sum should be sumSeries)
Change-Id: I75ff7c9daf230d79af21562ef3bcf15fe1a55a24
---
M modules/role/manifests/graphite/alerts.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/354184/1
diff --git a/modules/role/manifests/graphite/alerts.pp
b/modules/role/manifests/graphite/alerts.pp
index 44a0171..3983b04 100644
--- a/modules/role/manifests/graphite/alerts.pp
+++ b/modules/role/manifests/graphite/alerts.pp
@@ -79,7 +79,7 @@
# Monitor MediaWiki CentralAuth bad tokens
monitoring::graphite_threshold { 'mediawiki_centralauth_errors':
description => 'MediaWiki centralauth errors',
-metric => 'sum(MediaWiki.centralauth.centrallogin_errors.*.rate)',
+metric =>
'sumSeries(MediaWiki.centralauth.centrallogin_errors.*.rate)',
warning => 0.5,
critical=> 1,
from=> '15min',
--
To view, visit https://gerrit.wikimedia.org/r/354184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75ff7c9daf230d79af21562ef3bcf15fe1a55a24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix MediaWiki centralauth errors graphite alarm
Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354184 )
Change subject: Fix MediaWiki centralauth errors graphite alarm
..
Fix MediaWiki centralauth errors graphite alarm
Small fix for the metric to monitor (sum should be sumSeries)
Change-Id: I75ff7c9daf230d79af21562ef3bcf15fe1a55a24
---
M modules/role/manifests/graphite/alerts.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/graphite/alerts.pp
b/modules/role/manifests/graphite/alerts.pp
index 44a0171..3983b04 100644
--- a/modules/role/manifests/graphite/alerts.pp
+++ b/modules/role/manifests/graphite/alerts.pp
@@ -79,7 +79,7 @@
# Monitor MediaWiki CentralAuth bad tokens
monitoring::graphite_threshold { 'mediawiki_centralauth_errors':
description => 'MediaWiki centralauth errors',
-metric => 'sum(MediaWiki.centralauth.centrallogin_errors.*.rate)',
+metric =>
'sumSeries(MediaWiki.centralauth.centrallogin_errors.*.rate)',
warning => 0.5,
critical=> 1,
from=> '15min',
--
To view, visit https://gerrit.wikimedia.org/r/354184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75ff7c9daf230d79af21562ef3bcf15fe1a55a24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey
Gerrit-Reviewer: Elukey
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...BlueSpiceExtensions[master]: BSExtensions: Removed deprecated ContextActive for SecureFil...
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354185 )
Change subject: BSExtensions: Removed deprecated ContextActive for
SecureFilestore
..
BSExtensions: Removed deprecated ContextActive for SecureFilestore
* As SecureFileStore will not be supported in new version anymore,
simply removed the hole statement
* Also removed the default activation of SecureFileStore extension
Change-Id: I2873078d9224449dc0737aae67076287d932f216
---
M Authors/views/view.AuthorsUserPageProfileImageSetting.php
M BlueSpiceExtensions.default.php
M RSSStandards/RSSStandards.class.php
M Readers/includes/api/BSApiReadersUsersStore.php
4 files changed, 5 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/85/354185/1
diff --git a/Authors/views/view.AuthorsUserPageProfileImageSetting.php
b/Authors/views/view.AuthorsUserPageProfileImageSetting.php
index 60b2b7d..803effa 100644
--- a/Authors/views/view.AuthorsUserPageProfileImageSetting.php
+++ b/Authors/views/view.AuthorsUserPageProfileImageSetting.php
@@ -46,9 +46,7 @@
public function execute( $params = false ) {
$this->initFields();
wfRunHooks( 'BsAuthorPageProfileImageAfterInitFields', array(
$this, $this->oUser ) );
- // CR RBV (03.06.11 08:39): Hook/Event!
- if ( BsExtensionManager::isContextActive(
'MW::SecureFileStore::Active' ) )
- $this->sImagePath = SecureFileStore::secureStuff(
$this->sImagePath, true );
+
$aOut = array();
$aOut[] = '';
$aOut[] = $this->renderLink(
diff --git a/BlueSpiceExtensions.default.php b/BlueSpiceExtensions.default.php
index 1c70494..4629038 100644
--- a/BlueSpiceExtensions.default.php
+++ b/BlueSpiceExtensions.default.php
@@ -32,7 +32,9 @@
require_once( __DIR__."/NamespaceCss/NamespaceCss.setup.php" );
require_once( __DIR__."/PageAccess/PageAccess.setup.php" );
require_once( __DIR__."/PagesVisited/PagesVisited.setup.php" );
-require_once( __DIR__."/SecureFileStore/SecureFileStore.setup.php" );
+// This extension is deprecated as of BlueSpice 2.27.1 and will be removed soon
+// Usage of this extension was completely removed in BlueSpice
+#require_once( __DIR__."/SecureFileStore/SecureFileStore.setup.php" );
require_once( __DIR__."/SmartList/SmartList.setup.php" );
require_once( __DIR__."/TopMenuBarCustomizer/TopMenuBarCustomizer.setup.php" );
require_once( __DIR__."/UsageTracker/UsageTracker.setup.php" );
diff --git a/RSSStandards/RSSStandards.class.php
b/RSSStandards/RSSStandards.class.php
index 0d90d0f..fc28d72 100644
--- a/RSSStandards/RSSStandards.class.php
+++ b/RSSStandards/RSSStandards.class.php
@@ -294,10 +294,6 @@
$this->mCore->parseWikiText(
$page->getContent(), $this->getTitle() )
);
- if( BsExtensionManager::isContextActive(
'MW::SecureFileStore::Active' ) ) {
- $_description =
SecureFileStore::secureFilesInText( $_description );
- }
-
$item = RSSItemCreator::createItem( $_title,
$_link, $_description );
if ( $item ) {
$item->setPubDate( wfTimestamp(
TS_UNIX,$row->rev_timestamp) );
@@ -381,17 +377,11 @@
$_title = str_replace( "_", " ",
$title->getText() );
$_link = $title->getFullURL();
- $_tmpText = preg_replace(
+ $_description = preg_replace(
"#\[(.*)<\/a>\]#",
"",
$this->mCore->parseWikiText(
$page->getContent()->getNativeData(), $this->getTitle() )
);
- if ( class_exists( 'SecureFileStore' ) ) {
- $_description =
SecureFileStore::secureFilesInText($_tmpText);
- } else {
- $_description = $_tmpText;
- }
- unset( $_tmpText );
$item = RSSItemCreator::createItem( $_title,
$_link, $_description );
if ( $item ) {
diff --git a/Readers/includes/api/BSApiReadersUsersStore.php
b/Readers/includes/api/BSApiReadersUsersStore.php
index 28b9dc9..d40cc46 100644
--- a/Readers/includes/api/BSApiReadersUsersStore.php
+++ b/Readers/includes/api/BSApiReadersUsersStore.php
@@ -60,9 +60,6 @@
$oUserMiniProfile =
BsCore::getInstance()->getUserMiniProfile( $oUser, array() );
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap3: deploy jobrunner with scap3
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354186 )
Change subject: Scap3: deploy jobrunner with scap3
..
Scap3: deploy jobrunner with scap3
Change-Id: I9b60db40222172da63f4e29cc64bbbf49567a960
---
M hieradata/common/role/deployment.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment_server.yaml
M modules/mediawiki/manifests/jobrunner.pp
4 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/354186/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 7612021..98fd56d 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -1,7 +1,4 @@
role::deployment::repo_config:
- jobrunner/jobrunner:
-upstream: https://gerrit.wikimedia.org/r/mediawiki/services/jobrunner
-service_name: jobrunner
eventlogging/eventlogging:
upstream: https://gerrit.wikimedia.org/r/eventlogging
checkout_submodules: true
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 948c05d..bb0cb84 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -280,6 +280,9 @@
eventstreams/deploy:
repository: mediawiki/services/eventstreams/deploy
+ jobrunner/jobrunner:
+repository: mediawiki/services/jobrunner
+
# RESTBase
restbase/deploy: {}
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index 729a5e3..c54df9e 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -102,6 +102,8 @@
repository: mediawiki/services/eventstreams/deploy
graphoid/deploy: {}
#lvs_service: graphoid
+ jobrunner/jobrunner:
+repository: mediawiki/services/jobrunner
kartotherian/deploy:
repository: maps/kartotherian/deploy
#lvs_service: kartotherian
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index 46be7a5..fec8374 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -20,10 +20,9 @@
include ::passwords::redis
-package { 'jobrunner':
-ensure => latest,
-provider => 'trebuchet',
-notify => Service['jobrunner'],
+scap::target { 'jobrunner/jobrunner':
+deploy_user => 'mwdeploy',
+manage_user => false,
}
$dispatcher = template('mediawiki/jobrunner/dispatcher.erb')
--
To view, visit https://gerrit.wikimedia.org/r/354186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b60db40222172da63f4e29cc64bbbf49567a960
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::cassandra: remove useless pick()
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354187 )
Change subject: profile::cassandra: remove useless pick()
..
profile::cassandra: remove useless pick()
Change-Id: I7e7bdfe55b68ab43a64305d001a036ba84a3c0a4
---
M modules/profile/manifests/cassandra.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/354187/1
diff --git a/modules/profile/manifests/cassandra.pp
b/modules/profile/manifests/cassandra.pp
index 19e7a2d..3ad9aa4 100644
--- a/modules/profile/manifests/cassandra.pp
+++ b/modules/profile/manifests/cassandra.pp
@@ -38,7 +38,7 @@
vm_dirty_background_bytes => 25165824,
}
-$tls_cluster_name = pick($cassandra_settings['tls_cluster_name'], '')
+$tls_cluster_name = $cassandra_settings['tls_cluster_name']
if $instances != {} {
$instance_names = keys($instances)
::cassandra::instance::monitoring{ $instance_names:
--
To view, visit https://gerrit.wikimedia.org/r/354187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e7bdfe55b68ab43a64305d001a036ba84a3c0a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::cassandra: remove useless pick()
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354187 )
Change subject: profile::cassandra: remove useless pick()
..
profile::cassandra: remove useless pick()
Change-Id: I7e7bdfe55b68ab43a64305d001a036ba84a3c0a4
---
M modules/profile/manifests/cassandra.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/cassandra.pp
b/modules/profile/manifests/cassandra.pp
index 19e7a2d..3ad9aa4 100644
--- a/modules/profile/manifests/cassandra.pp
+++ b/modules/profile/manifests/cassandra.pp
@@ -38,7 +38,7 @@
vm_dirty_background_bytes => 25165824,
}
-$tls_cluster_name = pick($cassandra_settings['tls_cluster_name'], '')
+$tls_cluster_name = $cassandra_settings['tls_cluster_name']
if $instances != {} {
$instance_names = keys($instances)
::cassandra::instance::monitoring{ $instance_names:
--
To view, visit https://gerrit.wikimedia.org/r/354187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e7bdfe55b68ab43a64305d001a036ba84a3c0a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1090 for maintenance
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354188 ) Change subject: db-eqiad.php: Depool db1090 for maintenance .. db-eqiad.php: Depool db1090 for maintenance Bug: T159753 Bug: T164530 Change-Id: I79940a01fb863007557ea2b81b6ef5e2057d5e68 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/88/354188/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 682bf9c..73ea27d 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB - 'db1089' => 500, # C3 3.6TB 512GB +# 'db1089' => 500, # C3 3.6TB 512GB #T164530 #T159753 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/354188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79940a01fb863007557ea2b81b6ef5e2057d5e68 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1090 for maintenance
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354188 ) Change subject: db-eqiad.php: Depool db1090 for maintenance .. db-eqiad.php: Depool db1090 for maintenance Bug: T159753 Bug: T164530 Change-Id: I79940a01fb863007557ea2b81b6ef5e2057d5e68 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 682bf9c..73ea27d 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB - 'db1089' => 500, # C3 3.6TB 512GB +# 'db1089' => 500, # C3 3.6TB 512GB #T164530 #T159753 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/354188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79940a01fb863007557ea2b81b6ef5e2057d5e68 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1090 for maintenance"
Hello jenkins-bot, Jcrespo, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/354189 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1090 for maintenance" .. Revert "db-eqiad.php: Depool db1090 for maintenance" This reverts commit 188df554b91d5689ab79b4b17584fabd6c261e5a. Change-Id: Idc164e2d2313d8c42c55ff0560af5803039e83e5 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/89/354189/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 73ea27d..682bf9c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB -# 'db1089' => 500, # C3 3.6TB 512GB #T164530 #T159753 + 'db1089' => 500, # C3 3.6TB 512GB ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/354189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc164e2d2313d8c42c55ff0560af5803039e83e5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1090 for maintenance"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354189 ) Change subject: Revert "db-eqiad.php: Depool db1090 for maintenance" .. Revert "db-eqiad.php: Depool db1090 for maintenance" This reverts commit 188df554b91d5689ab79b4b17584fabd6c261e5a. Change-Id: Idc164e2d2313d8c42c55ff0560af5803039e83e5 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 73ea27d..682bf9c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB -# 'db1089' => 500, # C3 3.6TB 512GB #T164530 #T159753 + 'db1089' => 500, # C3 3.6TB 512GB ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/354189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc164e2d2313d8c42c55ff0560af5803039e83e5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Also strip rpcbind/nfs-common deps on jessie installs
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354190 ) Change subject: Also strip rpcbind/nfs-common deps on jessie installs .. Also strip rpcbind/nfs-common deps on jessie installs On a freshly installed jessie system we have two packages which got pulled in during base install by nfs-common/rpcbind, so strip these as well: root@kubetcd2001:~# apt-get autoremove Reading package lists... Done Building dependency tree Reading state information... Done The following packages will be REMOVED: libnfsidmap2 libtirpc1 Bug: T106477 Change-Id: I871a4530fa5164daba5a131425c619b8a2415104 --- M modules/install_server/files/autoinstall/scripts/late_command.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/354190/1 diff --git a/modules/install_server/files/autoinstall/scripts/late_command.sh b/modules/install_server/files/autoinstall/scripts/late_command.sh index 5da5b14..3cddfe5 100644 --- a/modules/install_server/files/autoinstall/scripts/late_command.sh +++ b/modules/install_server/files/autoinstall/scripts/late_command.sh @@ -42,7 +42,7 @@ if [ "$(chroot /target /usr/bin/lsb_release --codename --short)" = "jessie" ]; then in-target apt-get -y upgrade apt-install linux-meta-4.9 - in-target dpkg --purge rpcbind nfs-common + in-target dpkg --purge rpcbind nfs-common libnfsidmap2 libtirpc1 fi # Temporarily pre-provision swift user at a fixed UID on new installs. -- To view, visit https://gerrit.wikimedia.org/r/354190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I871a4530fa5164daba5a131425c619b8a2415104 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1090, depool db1076
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354191 ) Change subject: db-eqiad.php: Repool db1090, depool db1076 .. db-eqiad.php: Repool db1090, depool db1076 db1090 finished alter db1076 needs alter Bug: T162611 Change-Id: I987a26a70cefefc7f285675f61909b3b204954c4 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/354191/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 682bf9c..f4cc7ae 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,8 +112,8 @@ 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api 'db1074' => 300, # A2 3.6TB 512GB, api - 'db1076' => 500, # B1 3.6TB 512GB -# 'db1090' => 500, # C3 3.6TB 512GB #T162611 +# 'db1076' => 500, # B1 3.6TB 512GB #T162611 + 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # A2 3.6TB 512GB, master -- To view, visit https://gerrit.wikimedia.org/r/354191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I987a26a70cefefc7f285675f61909b3b204954c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1090, depool db1076
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354191 ) Change subject: db-eqiad.php: Repool db1090, depool db1076 .. db-eqiad.php: Repool db1090, depool db1076 db1090 finished alter db1076 needs alter Bug: T162611 Change-Id: I987a26a70cefefc7f285675f61909b3b204954c4 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 682bf9c..f4cc7ae 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,8 +112,8 @@ 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api 'db1074' => 300, # A2 3.6TB 512GB, api - 'db1076' => 500, # B1 3.6TB 512GB -# 'db1090' => 500, # C3 3.6TB 512GB #T162611 +# 'db1076' => 500, # B1 3.6TB 512GB #T162611 + 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # A2 3.6TB 512GB, master -- To view, visit https://gerrit.wikimedia.org/r/354191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I987a26a70cefefc7f285675f61909b3b204954c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: set db2051 as enabled for full reimage
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354192 ) Change subject: mariadb: set db2051 as enabled for full reimage .. mariadb: set db2051 as enabled for full reimage Remove db2052, which has already been moved to jessie. Change-Id: I9915ac63f0c505373949a2eb40a99d6d31866284 --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/354192/1 diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 32a6e2a..6abe99c 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -66,7 +66,7 @@ cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \ cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \ db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \ -db207[1-9]|db208[0-9]|db209[0-2]|db2052) echo partman/db.cfg ;; \ +db207[1-9]|db208[0-9]|db209[0-2]|db2051) echo partman/db.cfg ;; \ db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9]) echo partman/db-no-srv-format.cfg ;; \ d-i-test) echo partman/flat.cfg virtual.cfg ;; \ druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/354192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9915ac63f0c505373949a2eb40a99d6d31866284 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[wmf/1.30.0-wmf.1]: Revert "Dump should return decrypted votes"
Jalexander has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354194 )
Change subject: Revert "Dump should return decrypted votes"
..
Revert "Dump should return decrypted votes"
For large elections the decryption takes too long (same reason tally page
doesn't work) and prohibits use of the dump page because of timeout.
This reverts commit d2eac8c31231136e8df57a30f88ff75d7231f102.
Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
---
M includes/pages/DumpPage.php
1 file changed, 1 insertion(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/94/354194/1
diff --git a/includes/pages/DumpPage.php b/includes/pages/DumpPage.php
index 5b0261c..71cb1ef 100644
--- a/includes/pages/DumpPage.php
+++ b/includes/pages/DumpPage.php
@@ -58,22 +58,7 @@
if ( !$this->headersSent ) {
$this->sendHeaders();
}
- $record = $row->vote_record;
- if ( $this->election->getCrypt() ) {
- $status = $this->election->getCrypt()->decrypt( $record
);
- if ( !$status->isOK() ) {
- // Decrypt failed, e.g. invalid or absent
private key
- // Still, return the encrypted vote
- echo "\n" . $record .
"\n\n";
- } else {
- $decrypted_record = $status->value;
- echo "\n" . $record .
- "\n" .
$decrypted_record .
- "\n\n";
- }
- } else {
- echo "\n" . $record .
"\n\n";
- }
+ echo "" . $row->vote_record . "\n";
}
public function sendHeaders() {
--
To view, visit https://gerrit.wikimedia.org/r/354194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Jalexander
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Revert "Dump should return decrypted votes"
Hello Aaron Schulz, Tim Starling, Huji, Chad, Reedy, jenkins-bot, Anomie,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/354193
to review the following change.
Change subject: Revert "Dump should return decrypted votes"
..
Revert "Dump should return decrypted votes"
For large elections the decryption takes too long (same reason tally page
doesn't work) and prohibits use of the dump page because of timeout.
This reverts commit d2eac8c31231136e8df57a30f88ff75d7231f102.
Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
---
M includes/pages/DumpPage.php
1 file changed, 1 insertion(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/93/354193/1
diff --git a/includes/pages/DumpPage.php b/includes/pages/DumpPage.php
index 782fd64..a0465de 100644
--- a/includes/pages/DumpPage.php
+++ b/includes/pages/DumpPage.php
@@ -63,22 +63,7 @@
if ( !$this->headersSent ) {
$this->sendHeaders();
}
- $record = $row->vote_record;
- if ( $this->election->getCrypt() ) {
- $status = $this->election->getCrypt()->decrypt( $record
);
- if ( !$status->isOK() ) {
- // Decrypt failed, e.g. invalid or absent
private key
- // Still, return the encrypted vote
- echo "\n" . $record .
"\n\n";
- } else {
- $decrypted_record = $status->value;
- echo "\n" . $record .
- "\n" .
$decrypted_record .
- "\n\n";
- }
- } else {
- echo "\n" . $record .
"\n\n";
- }
+ echo "" . $row->vote_record . "\n";
}
public function sendHeaders() {
--
To view, visit https://gerrit.wikimedia.org/r/354193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0c145ac87074fe7c38331d6a5add690546e20b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Jalexander
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Huji
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1083
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354195 ) Change subject: db-eqiad.php: Depool db1083 .. db-eqiad.php: Depool db1083 Needs alter table Bug: T159753 Bug: T164530 Change-Id: I98aa9a0102cd05840cb875c119d400da41777587 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/95/354195/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f4cc7ae..de388ad 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -102,7 +102,7 @@ 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB - 'db1083' => 500, # B1 3.6TB 512GB +# 'db1083' => 500, # B1 3.6TB 512GB #T159753 #T164530 'db1089' => 500, # C3 3.6TB 512GB ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98aa9a0102cd05840cb875c119d400da41777587 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1083
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354195 ) Change subject: db-eqiad.php: Depool db1083 .. db-eqiad.php: Depool db1083 Needs alter table Bug: T159753 Bug: T164530 Change-Id: I98aa9a0102cd05840cb875c119d400da41777587 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f4cc7ae..de388ad 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -102,7 +102,7 @@ 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB - 'db1083' => 500, # B1 3.6TB 512GB +# 'db1083' => 500, # B1 3.6TB 512GB #T159753 #T164530 'db1089' => 500, # C3 3.6TB 512GB ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98aa9a0102cd05840cb875c119d400da41777587 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment-prep: additional fixes to restbase hiera
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354196 )
Change subject: deployment-prep: additional fixes to restbase hiera
..
deployment-prep: additional fixes to restbase hiera
Change-Id: I94146313de3ee84a20b2e66b4083f6a7aa796fe7
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/354196/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 42d1059..78ee4b6 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -96,10 +96,11 @@
aqs::cassandra_default_consistency: localOne
# END AQS
# Restbase (profile::restbase)
-profile::restbase::cassandra_local_dc: "%{::site}"
+profile::restbase::salt_key: secretkey
profile::restbase::logging_label: restbase
profile::restbase::cassandra_datacenters:
-- "eqiad"
+- "datacenter1"
+profile::restbase::cassandra_local_dc: "datacenter1"
profile::restbase::parsoid_uri:
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
profile::restbase::graphoid_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
profile::restbase::mobileapps_uri:
http://deployment-mcs01.deployment-prep.eqiad.wmflabs:
@@ -126,6 +127,7 @@
profile::cassandra::metrics_whitelist: false
profile::cassandra::metrics_blacklist:
- .*\.metrics\.Table\..*$
+profile::cassandra::rack: rack1
profile::cassandra::instances:
"deployment-restbase01.deployment-prep.eqiad.wmflabs": {}
"deployment-restbase02.deployment-prep.eqiad.wmflabs": {}
--
To view, visit https://gerrit.wikimedia.org/r/354196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94146313de3ee84a20b2e66b4083f6a7aa796fe7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment-prep: additional fixes to restbase hiera
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354196 )
Change subject: deployment-prep: additional fixes to restbase hiera
..
deployment-prep: additional fixes to restbase hiera
Change-Id: I94146313de3ee84a20b2e66b4083f6a7aa796fe7
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 42d1059..78ee4b6 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -96,10 +96,11 @@
aqs::cassandra_default_consistency: localOne
# END AQS
# Restbase (profile::restbase)
-profile::restbase::cassandra_local_dc: "%{::site}"
+profile::restbase::salt_key: secretkey
profile::restbase::logging_label: restbase
profile::restbase::cassandra_datacenters:
-- "eqiad"
+- "datacenter1"
+profile::restbase::cassandra_local_dc: "datacenter1"
profile::restbase::parsoid_uri:
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
profile::restbase::graphoid_uri:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
profile::restbase::mobileapps_uri:
http://deployment-mcs01.deployment-prep.eqiad.wmflabs:
@@ -126,6 +127,7 @@
profile::cassandra::metrics_whitelist: false
profile::cassandra::metrics_blacklist:
- .*\.metrics\.Table\..*$
+profile::cassandra::rack: rack1
profile::cassandra::instances:
"deployment-restbase01.deployment-prep.eqiad.wmflabs": {}
"deployment-restbase02.deployment-prep.eqiad.wmflabs": {}
--
To view, visit https://gerrit.wikimedia.org/r/354196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94146313de3ee84a20b2e66b4083f6a7aa796fe7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Removed $wgRestrictDisplayTitle from global li...
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354197 )
Change subject: BSFoundation: Removed $wgRestrictDisplayTitle from global list
onRegidtry, as it is not in use anymore
..
BSFoundation: Removed $wgRestrictDisplayTitle from global list onRegidtry, as
it is not in use anymore
Change-Id: If4b5d92bb4ab1583111b9d40be2e7c1143552684
---
M includes/CoreHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/97/354197/1
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 26a4f6b..3e0334a 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -10,7 +10,7 @@
public static function onRegistry(){
global $wgScriptPath, $wgFooterIcons, $wgExtensionFunctions,
$wgAjaxExportList, $wgVersion, $IP;
global $wgNamespacesWithSubpages, $wgApiFrameOptions,
$wgRSSUrlWhitelist;
- global $wgExternalLinkTarget, $wgCapitalLinkOverrides,
$wgRestrictDisplayTitle;
+ global $wgExternalLinkTarget, $wgRestrictDisplayTitle;
global $wgUrlProtocols, $wgVerifyMimeType, $wgAllowJavaUploads;
global $bsgTestSystem, $bsgPermissionConfig,
$bsgSystemNamespaces;
global $bsgConfigFiles, $wgResourceLoaderLESSVars,
$bsgExtensions;
--
To view, visit https://gerrit.wikimedia.org/r/354197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4b5d92bb4ab1583111b9d40be2e7c1143552684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Minor improvements to constraint violation messages
Lucas Werkmeister (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354198 )
Change subject: Minor improvements to constraint violation messages
..
Minor improvements to constraint violation messages
- Constraints are generally not mandatory, so favor “should” over
“must”.
- The term “claim” is deprecated in favor of “claim”.
- The change from “have” to “contain” in the Single and Multi value
violation messages brings them slightly closer to the template
versions [1].
[1]: https://www.wikidata.org/wiki/Module:I18n/constraints
Bug: T164354
Change-Id: If0c0afb6936f2dcf5929aa45bd423f4ef4be1abd
---
M i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/98/354198/1
diff --git a/i18n/en.json b/i18n/en.json
index 60a0288..26e783a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -55,12 +55,12 @@
"wbqc-violation-message-target-entity-must-exist": "The target entity
must exist.",
"wbqc-violation-message-value-entity-must-exist": "The value entity
must exist.",
- "wbqc-violation-message-commons-link-no-existent": "Commons link must
exist.",
- "wbqc-violation-message-commons-link-not-well-formed": "Commons link
must be well-formed.",
+ "wbqc-violation-message-commons-link-no-existent": "Commons link should
exist.",
+ "wbqc-violation-message-commons-link-not-well-formed": "Commons link
should be well-formed.",
"wbqc-violation-message-commons-link-check-for-namespace-not-yet-implemented":
"Check for namespace \"$1\" is not yet implemented.",
"wbqc-violation-message-conflicts-with-property": "An entity should not
have statements for both $1 and $2.",
"wbqc-violation-message-conflicts-with-claim": "An entity should not
have a statement for $1 if it also has a statement for $2 with value $3.",
- "wbqc-violation-message-diff-within-range": "The difference between $3
($4) and $1 ($2) must be between $5 and $6 ([$5; $6]).",
+ "wbqc-violation-message-diff-within-range": "The difference between $3
($4) and $1 ($2) should be between $5 and $6 ([$5; $6]).",
"wbqc-violation-message-diff-within-range-property-must-exist": "The
property defined in the parameters must exist.",
"wbqc-violation-message-diff-within-range-property-needs value": "The
property defined in the parameters needs to have a value.",
"wbqc-violation-message-diff-within-range-must-have-equal-types": "The
property defined in the parameters must have a value of the same type as this
property.",
@@ -68,13 +68,13 @@
"wbqc-violation-message-inverse": "$1 should also have the inverse
statement $2 $3.",
"wbqc-violation-message-item": "An entity with $1 should also have
{{PLURAL:$3|0=a statement $2.|1=a statement $2 $5.|a statement for $2 with one
of the following values:$4}}",
"wbqc-violation-message-mandatory-qualifiers": "All of the properties
defined in the parameters have to be used as qualifiers on this statement.",
- "wbqc-violation-message-multi-value": "This property must have multiple
values. That is, there must be more than one claim using this property.",
+ "wbqc-violation-message-multi-value": "This property should contain
multiple values. That is, there should be more than one statement using this
property.",
"wbqc-violation-message-one-of": "The value for $1 should be
{{PLURAL:$2|1=$4.|2=either $4 or $5.|one of the following:$3}}",
- "wbqc-violation-message-qualifier": "The property must only be used as
a qualifier.",
+ "wbqc-violation-message-qualifier": "The property should only be used
as a qualifier.",
"wbqc-violation-message-qualifiers": "The property must only be used
with (no other than) the qualifiers defined in the parameters.",
"wbqc-violation-message-range-parameters-needed": "Properties with
values of type \"$1\" with constraint \"Range\" need the parameters \"$2\" and
\"$3\".",
- "wbqc-violation-message-range": "The value for $1 ($2) must be between
$3 and $4 ([$3, $4]).",
- "wbqc-violation-message-single-value": "This property must only have a
single value. That is, there must only be one claim using this property.",
+ "wbqc-violation-message-range": "The value for $1 ($2) should be
between $3 and $4 ([$3, $4]).",
+ "wbqc-violation-message-single-value": "This property should only
contain a single value. That is, there should only be one statement using this
property.",
"wbqc-violation-message-symmetric": "$1 should also have the symmetric
statement $2 $3.",
"wbqc-violation-message-type-relation-instance-or-subclass": "Parameter
\"relation\" must be either \"instance\" or \"subclass\".",
"wbqc-violation-message-type-instance": "Entities using the $1 property
should be
[MediaWiki-commits] [Gerrit] mediawiki...jobrunner[master]: Scap3: deploy jobrunner with scap3
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354199 ) Change subject: Scap3: deploy jobrunner with scap3 .. Scap3: deploy jobrunner with scap3 Bug: T129148 Change-Id: I1ed4a604e5abd0651449c1b99e3bed0af0973682 --- A scap/betacluster A scap/scap.cfg 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner refs/changes/99/354199/1 diff --git a/scap/betacluster b/scap/betacluster new file mode 100644 index 000..d44b86c --- /dev/null +++ b/scap/betacluster @@ -0,0 +1,2 @@ +deployment-tmh01.deployment-prep.eqiad.wmflabs +deployment-jobrunner02.deployment-prep.eqiad.wmflabs diff --git a/scap/scap.cfg b/scap/scap.cfg new file mode 100644 index 000..f121dd6 --- /dev/null +++ b/scap/scap.cfg @@ -0,0 +1,14 @@ +[global] +git_repo: jobrunner/jobrunner +git_repo_user: mwdeploy +ssh_user: mwdeploy +server_groups: canary, default +canary_dsh_targets: canary-targets +dsh_targets: targets +git_submodules: True +service_name: jobrunner +service_port: 9005 + +[deployment-prep.eqiad.wmflabs] +server_groups: default +dsh_targets: betacluster -- To view, visit https://gerrit.wikimedia.org/r/354199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ed4a604e5abd0651449c1b99e3bed0af0973682 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/jobrunner Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1083, depool db1080
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354200 ) Change subject: db-eqiad.php: Repool db1083, depool db1080 .. db-eqiad.php: Repool db1083, depool db1080 db1083 finished alter db1080 needs alter Bug: T159753 Bug: T164530 Change-Id: Ic6fafb0d2895a68c95a6ccad043f92bf5b05735c --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/00/354200/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index de388ad..9030235 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -101,8 +101,8 @@ 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api - 'db1080' => 500, # A2 3.6TB 512GB -# 'db1083' => 500, # B1 3.6TB 512GB #T159753 #T164530 +# 'db1080' => 500, # A2 3.6TB 512GB #T159753 #T164530 + 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6fafb0d2895a68c95a6ccad043f92bf5b05735c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: remove legacy classes, roles
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354201 )
Change subject: restbase: remove legacy classes, roles
..
restbase: remove legacy classes, roles
Change-Id: Iaf26092f719f91b4772f6f3eb180941f1e43af89
---
D hieradata/role/codfw/restbase/server.yaml
D hieradata/role/common/restbase/server.yaml
D hieradata/role/eqiad/restbase/server.yaml
D modules/restbase/manifests/init.pp
D modules/role/manifests/restbase/server.pp
5 files changed, 0 insertions(+), 264 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/354201/1
diff --git a/hieradata/role/codfw/restbase/server.yaml
b/hieradata/role/codfw/restbase/server.yaml
deleted file mode 100644
index 0b3e45a..000
--- a/hieradata/role/codfw/restbase/server.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-restbase::seeds:
-- restbase2001-a.codfw.wmnet
-- restbase2001-b.codfw.wmnet
-- restbase2001-c.codfw.wmnet
-- restbase2002-a.codfw.wmnet
-- restbase2002-b.codfw.wmnet
-- restbase2002-c.codfw.wmnet
-# used for rate limiting
-restbase::hosts:
- - restbase2001.codfw.wmnet
- - restbase2002.codfw.wmnet
- - restbase2003.codfw.wmnet
- - restbase2004.codfw.wmnet
- - restbase2005.codfw.wmnet
- - restbase2006.codfw.wmnet
- - restbase2007.codfw.wmnet
- - restbase2008.codfw.wmnet
- - restbase2009.codfw.wmnet
-
-lvs::realserver::realserver_ips:
- - '10.2.1.17' # restbase.svc.codfw.wmnet
-
-debdeploy::grains:
- debdeploy-restbase-codfw:
-value: standard
diff --git a/hieradata/role/common/restbase/server.yaml
b/hieradata/role/common/restbase/server.yaml
deleted file mode 100644
index b2316eb..000
--- a/hieradata/role/common/restbase/server.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# RESTBase
-#
-cluster: restbase
-restbase::port: 7231
-restbase::cassandra_local_dc: "%{::site}"
-restbase::cassandra_datacenters:
-- "eqiad"
-- "codfw"
-restbase::parsoid_uri: "http://parsoid.discovery.wmnet:8000";
-restbase::graphoid_uri: "http://graphoid.discovery.wmnet:19000";
-restbase::mobileapps_uri: "http://mobileapps.discovery.wmnet:";
-restbase::mathoid_uri: "http://mathoid.discovery.wmnet:10042";
-restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
-restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
-restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
-restbase::trendingedits_uri: "http://trendingedits.svc.%{::site}.wmnet:6699";
-restbase::cassandra_user: restb
-restbase::cassandra_password: "%{passwords::cassandra::restbase}"
-restbase::monitoring::monitor_domain: en.wikipedia.org
-restbase::cassandra_tls:
- ca: /dev/null
-role::lvs::realserver::pools:
- restbase: {}
-service::configuration::log_dir: "/var/log"
-
-admin::groups:
- - restbase-roots
- - restbase-admins
diff --git a/hieradata/role/eqiad/restbase/server.yaml
b/hieradata/role/eqiad/restbase/server.yaml
deleted file mode 100644
index c2d4280..000
--- a/hieradata/role/eqiad/restbase/server.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-restbase::seeds:
-- restbase1007-a.eqiad.wmnet
-- restbase1007-b.eqiad.wmnet
-- restbase1008-a.eqiad.wmnet
-- restbase1008-b.eqiad.wmnet
-- restbase1009-a.eqiad.wmnet
-- restbase1009-b.eqiad.wmnet
-- restbase1010-a.eqiad.wmnet
-- restbase1010-b.eqiad.wmnet
-- restbase1011-a.eqiad.wmnet
-- restbase1011-b.eqiad.wmnet
-- restbase1012-a.eqiad.wmnet
-- restbase1012-b.eqiad.wmnet
-- restbase1013-a.eqiad.wmnet
-- restbase1013-b.eqiad.wmnet
-# used for rate limiting
-restbase::hosts:
- - restbase1007.eqiad.wmnet
- - restbase1008.eqiad.wmnet
- - restbase1009.eqiad.wmnet
- - restbase1010.eqiad.wmnet
- - restbase1011.eqiad.wmnet
- - restbase1012.eqiad.wmnet
- - restbase1013.eqiad.wmnet
- - restbase1014.eqiad.wmnet
- - restbase1015.eqiad.wmnet
-
-lvs::realserver::realserver_ips:
- - '10.2.2.17' # restbase.svc.eqiad.wmnet
-
-debdeploy::grains:
- debdeploy-restbase-eqiad:
-value: standard
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
deleted file mode 100644
index 310222c..000
--- a/modules/restbase/manifests/init.pp
+++ /dev/null
@@ -1,145 +0,0 @@
-# == Class: restbase
-#
-# restbase is a REST API & storage service
-# http://restbase.org
-#
-# === Parameters
-#
-# [*cassandra_user*]
-# Cassandra user name.
-#
-# [*cassandra_password*]
-# Cassandra password.
-#
-# [*seeds*]
-# Array of cassandra hosts (IP or host names) to contact.
-# Default: ['localhost']
-#
-# [*cassandra_local_dc*]
-# Which DC should be considered local. Default: 'datacenter1'.
-#
-# [*cassandra_datacenters*]
-# The full list of member datacenters.
-#
-# [*cassandra_tls*]
-# An associative array of TLS options for the Cassandra driver.
-# See: https://nodejs.org/api/tls.html#tls_tls_createsecurecontext_options
-#
-# [*port*]
-# Port where to run the
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: remove unused role
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354202 ) Change subject: cassandra: remove unused role .. cassandra: remove unused role Change-Id: Ideb535c305081990815642d8a4be861aee8f0835 --- D hieradata/role/common/cassandra.yaml D modules/role/manifests/cassandra.pp 2 files changed, 0 insertions(+), 242 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/354202/1 diff --git a/hieradata/role/common/cassandra.yaml b/hieradata/role/common/cassandra.yaml deleted file mode 100644 index 6ee1f88..000 --- a/hieradata/role/common/cassandra.yaml +++ /dev/null @@ -1,161 +0,0 @@ -cassandra::metrics::graphite_host: 'graphite1003.eqiad.wmnet' -cassandra::start_rpc: 'false' - -# TODO: set up a cluster variable similar to MySQL clusters to share -# cassandra cluster configs between cassandra & clients - -cassandra::seeds: -- restbase1007.eqiad.wmnet -- restbase1007-a.eqiad.wmnet -- restbase1007-b.eqiad.wmnet -- restbase1007-c.eqiad.wmnet -- restbase1008.eqiad.wmnet -- restbase1008-a.eqiad.wmnet -- restbase1008-b.eqiad.wmnet -- restbase1008-c.eqiad.wmnet -- restbase1009.eqiad.wmnet -- restbase1009-a.eqiad.wmnet -- restbase1009-b.eqiad.wmnet -- restbase1009-c.eqiad.wmnet -- restbase1010.eqiad.wmnet -- restbase1010-a.eqiad.wmnet -- restbase1010-b.eqiad.wmnet -- restbase1010-c.eqiad.wmnet -- restbase1011.eqiad.wmnet -- restbase1011-a.eqiad.wmnet -- restbase1011-b.eqiad.wmnet -- restbase1011-c.eqiad.wmnet -- restbase1012.eqiad.wmnet -- restbase1012-a.eqiad.wmnet -- restbase1012-b.eqiad.wmnet -- restbase1012-c.eqiad.wmnet -- restbase1013.eqiad.wmnet -- restbase1013-a.eqiad.wmnet -- restbase1013-b.eqiad.wmnet -- restbase1013-c.eqiad.wmnet -- restbase1014.eqiad.wmnet -- restbase1014-a.eqiad.wmnet -- restbase1014-b.eqiad.wmnet -- restbase1014-c.eqiad.wmnet -- restbase1015.eqiad.wmnet -- restbase1015-a.eqiad.wmnet -- restbase1015-b.eqiad.wmnet -- restbase1015-c.eqiad.wmnet -- restbase1016.eqiad.wmnet -- restbase1016-a.eqiad.wmnet -- restbase1016-b.eqiad.wmnet -- restbase1016-c.eqiad.wmnet -- restbase1017.eqiad.wmnet -- restbase1017-a.eqiad.wmnet -- restbase1017-b.eqiad.wmnet -- restbase1017-c.eqiad.wmnet -- restbase1018.eqiad.wmnet -- restbase1018-a.eqiad.wmnet -- restbase1018-b.eqiad.wmnet -- restbase1018-c.eqiad.wmnet -- restbase2001.codfw.wmnet -- restbase2001-a.codfw.wmnet -- restbase2001-b.codfw.wmnet -- restbase2001-c.codfw.wmnet -- restbase2002.codfw.wmnet -- restbase2002-a.codfw.wmnet -- restbase2002-b.codfw.wmnet -- restbase2002-c.codfw.wmnet -- restbase2003.codfw.wmnet -- restbase2003-a.codfw.wmnet -- restbase2003-b.codfw.wmnet -- restbase2003-c.codfw.wmnet -- restbase2004.codfw.wmnet -- restbase2004-a.codfw.wmnet -- restbase2004-b.codfw.wmnet -- restbase2004-c.codfw.wmnet -- restbase2005.codfw.wmnet -- restbase2005-a.codfw.wmnet -- restbase2005-b.codfw.wmnet -- restbase2005-c.codfw.wmnet -- restbase2006.codfw.wmnet -- restbase2006-a.codfw.wmnet -- restbase2006-b.codfw.wmnet -- restbase2006-c.codfw.wmnet -- restbase2007.codfw.wmnet -- restbase2007-a.codfw.wmnet -- restbase2007-b.codfw.wmnet -- restbase2007-c.codfw.wmnet -- restbase2008.codfw.wmnet -- restbase2008-a.codfw.wmnet -- restbase2008-b.codfw.wmnet -- restbase2008-c.codfw.wmnet -- restbase2009.codfw.wmnet -- restbase2009-a.codfw.wmnet -- restbase2009-b.codfw.wmnet -- restbase2009-c.codfw.wmnet -- restbase2010.codfw.wmnet -- restbase2010-a.codfw.wmnet -- restbase2010-b.codfw.wmnet -- restbase2010-c.codfw.wmnet -- restbase2011.codfw.wmnet -- restbase2011-a.codfw.wmnet -- restbase2011-b.codfw.wmnet -- restbase2011-c.codfw.wmnet -- restbase2012.codfw.wmnet -- restbase2012-a.codfw.wmnet -- restbase2012-b.codfw.wmnet -- restbase2012-c.codfw.wmnet - -cassandra::max_heap_size: 12g -# 1/4 heap size, no more than 100m/thread -cassandra::heap_newsize: 2048m -cassandra::compaction_throughput_mb_per_sec: 20 -cassandra::concurrent_compactors: 10 -cassandra::concurrent_writes: 18 -cassandra::concurrent_reads: 18 -cassandra::tls_cluster_name: services -cassandra::internode_encryption: dc -cassandra::metrics::whitelist: -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorReadLatency\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorScanLatency\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedColumnCountHistogram\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedRowCount\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedRowSizeHistogram\..*$ -
[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: remove legacy classes, roles
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354201 )
Change subject: restbase: remove legacy classes, roles
..
restbase: remove legacy classes, roles
Change-Id: Iaf26092f719f91b4772f6f3eb180941f1e43af89
---
D hieradata/role/codfw/restbase/server.yaml
D hieradata/role/common/restbase/server.yaml
D hieradata/role/eqiad/restbase/server.yaml
D modules/restbase/manifests/init.pp
D modules/role/manifests/restbase/server.pp
5 files changed, 0 insertions(+), 264 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/restbase/server.yaml
b/hieradata/role/codfw/restbase/server.yaml
deleted file mode 100644
index 0b3e45a..000
--- a/hieradata/role/codfw/restbase/server.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-restbase::seeds:
-- restbase2001-a.codfw.wmnet
-- restbase2001-b.codfw.wmnet
-- restbase2001-c.codfw.wmnet
-- restbase2002-a.codfw.wmnet
-- restbase2002-b.codfw.wmnet
-- restbase2002-c.codfw.wmnet
-# used for rate limiting
-restbase::hosts:
- - restbase2001.codfw.wmnet
- - restbase2002.codfw.wmnet
- - restbase2003.codfw.wmnet
- - restbase2004.codfw.wmnet
- - restbase2005.codfw.wmnet
- - restbase2006.codfw.wmnet
- - restbase2007.codfw.wmnet
- - restbase2008.codfw.wmnet
- - restbase2009.codfw.wmnet
-
-lvs::realserver::realserver_ips:
- - '10.2.1.17' # restbase.svc.codfw.wmnet
-
-debdeploy::grains:
- debdeploy-restbase-codfw:
-value: standard
diff --git a/hieradata/role/common/restbase/server.yaml
b/hieradata/role/common/restbase/server.yaml
deleted file mode 100644
index b2316eb..000
--- a/hieradata/role/common/restbase/server.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# RESTBase
-#
-cluster: restbase
-restbase::port: 7231
-restbase::cassandra_local_dc: "%{::site}"
-restbase::cassandra_datacenters:
-- "eqiad"
-- "codfw"
-restbase::parsoid_uri: "http://parsoid.discovery.wmnet:8000";
-restbase::graphoid_uri: "http://graphoid.discovery.wmnet:19000";
-restbase::mobileapps_uri: "http://mobileapps.discovery.wmnet:";
-restbase::mathoid_uri: "http://mathoid.discovery.wmnet:10042";
-restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
-restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
-restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
-restbase::trendingedits_uri: "http://trendingedits.svc.%{::site}.wmnet:6699";
-restbase::cassandra_user: restb
-restbase::cassandra_password: "%{passwords::cassandra::restbase}"
-restbase::monitoring::monitor_domain: en.wikipedia.org
-restbase::cassandra_tls:
- ca: /dev/null
-role::lvs::realserver::pools:
- restbase: {}
-service::configuration::log_dir: "/var/log"
-
-admin::groups:
- - restbase-roots
- - restbase-admins
diff --git a/hieradata/role/eqiad/restbase/server.yaml
b/hieradata/role/eqiad/restbase/server.yaml
deleted file mode 100644
index c2d4280..000
--- a/hieradata/role/eqiad/restbase/server.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-restbase::seeds:
-- restbase1007-a.eqiad.wmnet
-- restbase1007-b.eqiad.wmnet
-- restbase1008-a.eqiad.wmnet
-- restbase1008-b.eqiad.wmnet
-- restbase1009-a.eqiad.wmnet
-- restbase1009-b.eqiad.wmnet
-- restbase1010-a.eqiad.wmnet
-- restbase1010-b.eqiad.wmnet
-- restbase1011-a.eqiad.wmnet
-- restbase1011-b.eqiad.wmnet
-- restbase1012-a.eqiad.wmnet
-- restbase1012-b.eqiad.wmnet
-- restbase1013-a.eqiad.wmnet
-- restbase1013-b.eqiad.wmnet
-# used for rate limiting
-restbase::hosts:
- - restbase1007.eqiad.wmnet
- - restbase1008.eqiad.wmnet
- - restbase1009.eqiad.wmnet
- - restbase1010.eqiad.wmnet
- - restbase1011.eqiad.wmnet
- - restbase1012.eqiad.wmnet
- - restbase1013.eqiad.wmnet
- - restbase1014.eqiad.wmnet
- - restbase1015.eqiad.wmnet
-
-lvs::realserver::realserver_ips:
- - '10.2.2.17' # restbase.svc.eqiad.wmnet
-
-debdeploy::grains:
- debdeploy-restbase-eqiad:
-value: standard
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
deleted file mode 100644
index 310222c..000
--- a/modules/restbase/manifests/init.pp
+++ /dev/null
@@ -1,145 +0,0 @@
-# == Class: restbase
-#
-# restbase is a REST API & storage service
-# http://restbase.org
-#
-# === Parameters
-#
-# [*cassandra_user*]
-# Cassandra user name.
-#
-# [*cassandra_password*]
-# Cassandra password.
-#
-# [*seeds*]
-# Array of cassandra hosts (IP or host names) to contact.
-# Default: ['localhost']
-#
-# [*cassandra_local_dc*]
-# Which DC should be considered local. Default: 'datacenter1'.
-#
-# [*cassandra_datacenters*]
-# The full list of member datacenters.
-#
-# [*cassandra_tls*]
-# An associative array of TLS options for the Cassandra driver.
-# See: https://nodejs.org/api/tls.html#tls_tls_createsecurecontext_options
-#
-# [*port*]
-# Port where to run
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: remove unused role
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354202 ) Change subject: cassandra: remove unused role .. cassandra: remove unused role Change-Id: Ideb535c305081990815642d8a4be861aee8f0835 --- D hieradata/role/common/cassandra.yaml D modules/role/manifests/cassandra.pp 2 files changed, 0 insertions(+), 242 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/cassandra.yaml b/hieradata/role/common/cassandra.yaml deleted file mode 100644 index 6ee1f88..000 --- a/hieradata/role/common/cassandra.yaml +++ /dev/null @@ -1,161 +0,0 @@ -cassandra::metrics::graphite_host: 'graphite1003.eqiad.wmnet' -cassandra::start_rpc: 'false' - -# TODO: set up a cluster variable similar to MySQL clusters to share -# cassandra cluster configs between cassandra & clients - -cassandra::seeds: -- restbase1007.eqiad.wmnet -- restbase1007-a.eqiad.wmnet -- restbase1007-b.eqiad.wmnet -- restbase1007-c.eqiad.wmnet -- restbase1008.eqiad.wmnet -- restbase1008-a.eqiad.wmnet -- restbase1008-b.eqiad.wmnet -- restbase1008-c.eqiad.wmnet -- restbase1009.eqiad.wmnet -- restbase1009-a.eqiad.wmnet -- restbase1009-b.eqiad.wmnet -- restbase1009-c.eqiad.wmnet -- restbase1010.eqiad.wmnet -- restbase1010-a.eqiad.wmnet -- restbase1010-b.eqiad.wmnet -- restbase1010-c.eqiad.wmnet -- restbase1011.eqiad.wmnet -- restbase1011-a.eqiad.wmnet -- restbase1011-b.eqiad.wmnet -- restbase1011-c.eqiad.wmnet -- restbase1012.eqiad.wmnet -- restbase1012-a.eqiad.wmnet -- restbase1012-b.eqiad.wmnet -- restbase1012-c.eqiad.wmnet -- restbase1013.eqiad.wmnet -- restbase1013-a.eqiad.wmnet -- restbase1013-b.eqiad.wmnet -- restbase1013-c.eqiad.wmnet -- restbase1014.eqiad.wmnet -- restbase1014-a.eqiad.wmnet -- restbase1014-b.eqiad.wmnet -- restbase1014-c.eqiad.wmnet -- restbase1015.eqiad.wmnet -- restbase1015-a.eqiad.wmnet -- restbase1015-b.eqiad.wmnet -- restbase1015-c.eqiad.wmnet -- restbase1016.eqiad.wmnet -- restbase1016-a.eqiad.wmnet -- restbase1016-b.eqiad.wmnet -- restbase1016-c.eqiad.wmnet -- restbase1017.eqiad.wmnet -- restbase1017-a.eqiad.wmnet -- restbase1017-b.eqiad.wmnet -- restbase1017-c.eqiad.wmnet -- restbase1018.eqiad.wmnet -- restbase1018-a.eqiad.wmnet -- restbase1018-b.eqiad.wmnet -- restbase1018-c.eqiad.wmnet -- restbase2001.codfw.wmnet -- restbase2001-a.codfw.wmnet -- restbase2001-b.codfw.wmnet -- restbase2001-c.codfw.wmnet -- restbase2002.codfw.wmnet -- restbase2002-a.codfw.wmnet -- restbase2002-b.codfw.wmnet -- restbase2002-c.codfw.wmnet -- restbase2003.codfw.wmnet -- restbase2003-a.codfw.wmnet -- restbase2003-b.codfw.wmnet -- restbase2003-c.codfw.wmnet -- restbase2004.codfw.wmnet -- restbase2004-a.codfw.wmnet -- restbase2004-b.codfw.wmnet -- restbase2004-c.codfw.wmnet -- restbase2005.codfw.wmnet -- restbase2005-a.codfw.wmnet -- restbase2005-b.codfw.wmnet -- restbase2005-c.codfw.wmnet -- restbase2006.codfw.wmnet -- restbase2006-a.codfw.wmnet -- restbase2006-b.codfw.wmnet -- restbase2006-c.codfw.wmnet -- restbase2007.codfw.wmnet -- restbase2007-a.codfw.wmnet -- restbase2007-b.codfw.wmnet -- restbase2007-c.codfw.wmnet -- restbase2008.codfw.wmnet -- restbase2008-a.codfw.wmnet -- restbase2008-b.codfw.wmnet -- restbase2008-c.codfw.wmnet -- restbase2009.codfw.wmnet -- restbase2009-a.codfw.wmnet -- restbase2009-b.codfw.wmnet -- restbase2009-c.codfw.wmnet -- restbase2010.codfw.wmnet -- restbase2010-a.codfw.wmnet -- restbase2010-b.codfw.wmnet -- restbase2010-c.codfw.wmnet -- restbase2011.codfw.wmnet -- restbase2011-a.codfw.wmnet -- restbase2011-b.codfw.wmnet -- restbase2011-c.codfw.wmnet -- restbase2012.codfw.wmnet -- restbase2012-a.codfw.wmnet -- restbase2012-b.codfw.wmnet -- restbase2012-c.codfw.wmnet - -cassandra::max_heap_size: 12g -# 1/4 heap size, no more than 100m/thread -cassandra::heap_newsize: 2048m -cassandra::compaction_throughput_mb_per_sec: 20 -cassandra::concurrent_compactors: 10 -cassandra::concurrent_writes: 18 -cassandra::concurrent_reads: 18 -cassandra::tls_cluster_name: services -cassandra::internode_encryption: dc -cassandra::metrics::whitelist: -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorReadLatency\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorScanLatency\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedColumnCountHistogram\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedRowCount\..*$ -- .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedRowSizeHistogram\.
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Vertical-align heading indicator with page content
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354150 )
Change subject: Vertical-align heading indicator with page content
..
Vertical-align heading indicator with page content
Bug: T164866
Change-Id: I489fe79b84afcbcd187e209aa21d61bd33198a20
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Phuedx: Looks good to me, approved
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index adb6071..b3258e2 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -242,6 +242,7 @@
.indicator {
font-size: @indicatorFontSize;
+ margin-left: -@iconGutterWidth;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/354150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I489fe79b84afcbcd187e209aa21d61bd33198a20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1083, depool db1080
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354200 ) Change subject: db-eqiad.php: Repool db1083, depool db1080 .. db-eqiad.php: Repool db1083, depool db1080 db1083 finished alter db1080 needs alter Bug: T159753 Bug: T164530 Change-Id: Ic6fafb0d2895a68c95a6ccad043f92bf5b05735c --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index de388ad..9030235 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -101,8 +101,8 @@ 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api - 'db1080' => 500, # A2 3.6TB 512GB -# 'db1083' => 500, # B1 3.6TB 512GB #T159753 #T164530 +# 'db1080' => 500, # A2 3.6TB 512GB #T159753 #T164530 + 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6fafb0d2895a68c95a6ccad043f92bf5b05735c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1080, depool db1073
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354203 ) Change subject: db-eqiad.php: Repool db1080, depool db1073 .. db-eqiad.php: Repool db1080, depool db1073 db1080 finished alter table db1073 needs alter table Bug: T159753 Bug: T164530 Change-Id: Ib47ddae3ad268988672c60d76f2909df37ae475e --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/354203/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 9030235..32574e5 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -100,8 +100,8 @@ 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api - 'db1073' => 50, # B3 2.8TB 160GB, api -# 'db1080' => 500, # A2 3.6TB 512GB #T159753 #T164530 +# 'db1073' => 50, # B3 2.8TB 160GB, api #T159753 #T164530 + 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB ], @@ -263,7 +263,7 @@ 'api' => [ 'db1066' => 1, 'db1072' => 1, - 'db1073' => 1, +# 'db1073' => 1, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354203 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib47ddae3ad268988672c60d76f2909df37ae475e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1080, depool db1073
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354203 ) Change subject: db-eqiad.php: Repool db1080, depool db1073 .. db-eqiad.php: Repool db1080, depool db1073 db1080 finished alter table db1073 needs alter table Bug: T159753 Bug: T164530 Change-Id: Ib47ddae3ad268988672c60d76f2909df37ae475e --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 9030235..32574e5 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -100,8 +100,8 @@ 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api - 'db1073' => 50, # B3 2.8TB 160GB, api -# 'db1080' => 500, # A2 3.6TB 512GB #T159753 #T164530 +# 'db1073' => 50, # B3 2.8TB 160GB, api #T159753 #T164530 + 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB ], @@ -263,7 +263,7 @@ 'api' => [ 'db1066' => 1, 'db1072' => 1, - 'db1073' => 1, +# 'db1073' => 1, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354203 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib47ddae3ad268988672c60d76f2909df37ae475e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: set db2051 as enabled for full reimage
Jcrespo has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354192 ) Change subject: mariadb: set db2051 as enabled for full reimage .. mariadb: set db2051 as enabled for full reimage Remove db2052, which has already been moved to jessie. Change-Id: I9915ac63f0c505373949a2eb40a99d6d31866284 --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, but someone else must approve jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 32a6e2a..6abe99c 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -66,7 +66,7 @@ cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \ cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \ db109[6-9]|db110[0-6]) echo partman/db.cfg ;; \ -db207[1-9]|db208[0-9]|db209[0-2]|db2052) echo partman/db.cfg ;; \ +db207[1-9]|db208[0-9]|db209[0-2]|db2051) echo partman/db.cfg ;; \ db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9]) echo partman/db-no-srv-format.cfg ;; \ d-i-test) echo partman/flat.cfg virtual.cfg ;; \ druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/354192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9915ac63f0c505373949a2eb40a99d6d31866284 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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-05-18T10:00:02+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354204 ) Change subject: New Wikidata Build - 2017-05-18T10:00:02+ .. New Wikidata Build - 2017-05-18T10:00:02+ Change-Id: Ia284749caf095d7ce807569e6b54c6793a988382 --- M composer.lock M extensions/Constraints/.jscsrc A extensions/Constraints/.mailmap M extensions/Constraints/Gruntfile.js M extensions/Constraints/README.md M extensions/Constraints/api/CheckConstraints.php M extensions/Constraints/composer.json M extensions/Constraints/docs/user.js M extensions/Constraints/extension.json M extensions/Constraints/i18n/bn.json M extensions/Constraints/i18n/de.json M extensions/Constraints/i18n/en.json M extensions/Constraints/i18n/es.json M extensions/Constraints/i18n/fr.json M extensions/Constraints/i18n/gl.json M extensions/Constraints/i18n/he.json A extensions/Constraints/i18n/hi.json A extensions/Constraints/i18n/hy.json M extensions/Constraints/i18n/it.json A extensions/Constraints/i18n/kn.json M extensions/Constraints/i18n/ko.json M extensions/Constraints/i18n/mk.json M extensions/Constraints/i18n/pl.json M extensions/Constraints/i18n/qqq.json A extensions/Constraints/i18n/ro.json M extensions/Constraints/i18n/yi.json M extensions/Constraints/i18n/zh-hans.json M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.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 M extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php M extensions/Constraints/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php M extensions/Constraints/includes/ConstraintParameterRenderer.php M extensions/Constraints/includes/ConstraintReportFactory.php M extensions/Constraints/includes/ConstraintRepository.php M extensions/Constraints/maintenance/UpdateConstraintsTable.php M extensions/Constraints/phpcs.xml M extensions/Constraints/tests/phpunit/CachingConstraintLookupTest.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/OneOfChecker/OneOfCheckerTest.php M extensions/Constraints/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php M extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php A extensions/Constraints/tests/phpunit/Checker/TypeChecker/Q10.json A extensions/Constraints/tests/phpunit/Checker/TypeChecker/Q9.json M extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php M extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php M extensions/Constraints/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php M extensions/Constraints/tests/phpunit/ConstraintRepositoryTest.php M extensions/Constraints/tests/phpunit/DefaultConfig.php M extensions/Constraints/tests/phpunit/DelegatingConstraintCheckerTest.php M extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php M extensions/ExternalValidation/.jscsrc M extensions/ExternalValidation/Gruntfile.js M extensions/ExternalValidation/composer.json M extensions/ExternalValidation/includes/CrossCheck/Comparer/QuantityValueComparer.php D extensions/MediaInfo/WikibaseMediaInfo.i18n.alias.php M extensions/MediaInfo/extension.json M extensions/MediaInfo/resources/datamodel/MediaInfo.js M extensions/Quality/.jscsrc M extensions/Quality/Gruntfile.js
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [do not merge] Use WikimediaUI variables in the Mediawiki theme
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354205 ) Change subject: [do not merge] Use WikimediaUI variables in the Mediawiki theme .. [do not merge] Use WikimediaUI variables in the Mediawiki theme For T165652. This is not real. At least not until T165652. To test: cd node_modules git clone https://phabricator.wikimedia.org/source/wikimedia-ui-base.git cd wikimedia-ui-base # npm complains if there is a git repo in node_modules rm -rf .git See T165652 for the meaning of MISSING, REF etc. Change-Id: I323260f70872f3e2c36d92281c953f42f462add5 --- M src/themes/mediawiki/common.less 1 file changed, 61 insertions(+), 58 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/354205/1 diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less index 695f63f..2f24a8b 100644 --- a/src/themes/mediawiki/common.less +++ b/src/themes/mediawiki/common.less @@ -1,57 +1,60 @@ +@import '../../../node_modules/wikimedia-ui-base/wikimedia-ui-base.less'; + // Theme variables @oo-ui-default-image-path: 'themes/mediawiki/images'; -@oo-ui-font-size-browser: 16; // assumed browser default of `16px` -@oo-ui-font-size-default: 0.8em; // equals `12.8px` at browser default of `16px` +@oo-ui-font-size-browser: 16; // assumed browser default of `16px` MISSING +@oo-ui-font-size-default: 0.8em; // equals `12.8px` at browser default of `16px` MISSING -@background-color-default: #fff; -@background-color-default-hover: #eaecf0; -@background-color-readonly: #f8f9fa; +@background-color-default: @wmui-color-base100; +@background-color-default-hover: @wmui-color-base80; +@background-color-readonly: @wmui-color-base90; -@color-default: #222; -@color-default-hover: #444; -@color-default-active: #000; -@color-default-light: #fff; +@color-default: @wmui-color-base10; +@color-default-hover: @color-base--hover; +@color-default-active: @color-base--active; +@color-default-light: @color-base--inverted; // SEEME, are light and inverted the same? @color-emphasized: @color-default-active; -@color-placeholder: #72777d; // equals HSB 210°/9%/49%, aligns to WCAG 2.0 level AA at 4.52:1 contrast ratio -@color-subtle: #72777d; +// Removed @color-placeholder SAME +@color-subtle: @color-base--subtle; // Primary 'Progressive' and 'Destructive' Colors -@background-color-progressive: #eaf3ff; // equals rgba output in `fade( @color-progressive, 10% )` -@background-color-progressive-hover: rgba( 41, 98, 204, 0.1 ); -@color-progressive: #36c; // equals HSB 220°/75%/80% -@color-progressive-hover: #447ff5; // equals HSB 220°/72%/96% -@color-progressive-active: #2a4b8d; // equals HSB 220°/70%/55% +// Should this have been the value of @background-color-primary in WMUI? MISTAKE +@background-color-progressive: @wmui-color-accent90; +@background-color-progressive-hover: @background-color-primary--hover; +@color-progressive: @color-primary; +@color-progressive-hover: @color-primary--hover; +@color-progressive-active: @color-primary--active; @color-progressive-active-hover: @color-progressive; @color-progressive-focus: @color-progressive; -@background-color-destructive: #fbe8e7; // equals `fade( @color-destructive, 10% )` -@color-destructive: #d33; // equals HSB 360°/77%/87% -@color-destructive-non-primary: #d7; // Exemption for non-primary buttons, foremost used in VE, lightened up R50 to align to AA contrast ratio -@color-destructive-hover: #ff4242; // equals HSB 360°/74%/100% -@color-destructive-active: #b32424; // equals HSB 360°/80%/70% -@color-destructive-focus: @color-destructive; +// Removed @background-color-destructive, even though the value is slightly different SAME VALUE +// @color-destructive: #d33; // equals HSB 360°/77%/87% SAME +@color-destructive-non-primary: #d7; // Exemption for non-primary buttons, foremost used in VE, lightened up R50 to align to AA contrast ratio MISSING +@color-destructive-hover: @color-destructive--hover; +@color-destructive-active: @color-destructive--active; +@color-destructive-focus: @color-destructive; // @color-primary--focus in wmui should not be accent50 again MISTAKE REF // Disabled Widgets -@background-color-disabled: #eaecf0; -@background-color-disabled-filled: #c8ccd1; -@color-disabled: #72777d; +@background-color-disabled: @wmui-color-base80; +@background-color-disabled-filled: @wmui-color-base70; +@color-disabled: @color-base--disabled; @color-disabled-filled: @color-default-light; -@opacity-disabled: 0.51; // `0.51` equals `#7d7d7d` on background-color `#fff`, HSB 0°/0%/49% -@opacity-disabled-filled: 1; -@opacity-disabled-indicator: 0.15; // equals `#c7c8cc` on background-color `#fff` -@opacity-disabled-tool: 0.3; +@opacity-disabled: @opacity-base--disabled; +@opacity-disabled-filled: @opacity-base; +@opacity-disabled-indicator: 0.15; // equals `#c7c8cc` on background-color `#fff` MISSING +@opacity-disa
[MediaWiki-commits] [Gerrit] operations...wmfmariadbpy[master]: [WIP]Initial commit of existent python scripts
Jcrespo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354206 )
Change subject: [WIP]Initial commit of existent python scripts
..
[WIP]Initial commit of existent python scripts
Change-Id: I8d5f73759903428ccb5822939e61196a8e541827
---
A wmfmariadbpy/WMFMariaDB.py
A wmfmariadbpy/check_health.py
A wmfmariadbpy/check_private_data.py
A wmfmariadbpy/compare.py
A wmfmariadbpy/sql.py
5 files changed, 978 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/wmfmariadbpy
refs/changes/06/354206/1
diff --git a/wmfmariadbpy/WMFMariaDB.py b/wmfmariadbpy/WMFMariaDB.py
new file mode 100755
index 000..e701e91
--- /dev/null
+++ b/wmfmariadbpy/WMFMariaDB.py
@@ -0,0 +1,344 @@
+import configparser
+import csv
+import os
+import glob
+import ipaddress
+# requires python3-pymysql
+import pymysql
+import re
+import socket
+import pprint
+
+
+class WMFMariaDB:
+"""
+Wrapper class to connect to MariaDB instances within the Wikimedia
+Foundation cluster. It simplifys all authentication methods by providing a
+unique, clean way to do stuff on the databases.
+"""
+
+connection = None
+host = None
+port = None
+database = None
+__last_error = None
+__debug = False
+
+@staticmethod
+def get_credentials(host, port, database):
+"""
+Given a database instance, return the authentication method, including
+the user, password, socket and ssl configuration.
+"""
+if host == 'localhost' and port == 3306:
+# connnect to localhost using plugin_auth:
+mysql_sock = '/tmp/mysql.sock'
+ssl = None
+user = os.geteuid()
+password = None
+charset = None
+elif host == 'localhost' and port != 3306:
+mysql_sock = '/tmp/mysql.s' + str(port)[-1:] + '.sock'
+ssl = None
+user = os.geteuid()
+password = None
+charset = None
+elif not host.startswith('labsdb'):
+# connect to a production remote host, use ssl
+config = configparser.ConfigParser(interpolation=None)
+config.read('/root/.my.cnf')
+user = config['client']['user']
+password = config['client']['password']
+ssl = {'ca': '/etc/ssl/certs/Puppet_Internal_CA.pem'}
+mysql_sock = None
+charset = None
+else:
+# connect to a labs remote host, use ssl
+config = configparser.ConfigParser(interpolation=None)
+config.read('/root/.my.cnf')
+user = config['labsdb']['user']
+password = config['labsdb']['password']
+if host.startswith('labsdb1001') or host.startswith('labsdb1003'):
+ssl = None
+else:
+ssl = {'ca': '/etc/ssl/certs/Puppet_Internal_CA.pem'}
+mysql_sock = None
+charset = None
+
+return (user, password, mysql_sock, ssl, charset)
+
+@property
+def debug(self):
+"""debug getter"""
+return self.__debug
+
+@debug.setter
+def debug(self, debug):
+"""debug setter"""
+if not debug:
+self.__debug = False
+else:
+self.__debug = True
+
+@property
+def last_error(self):
+"""last_error getter"""
+return self.__last_error
+
+@staticmethod
+def resolve(host):
+"""
+Return the full qualified domain name for a database hostname. Normally
+this return the hostname itself, except in the case where the
+datacenter and network parts have been omitted, in which case, it is
+completed as a best effort.
+If the original address is an IPv4 or IPv6 address, leave it as is
+"""
+try:
+ipaddress.ip_address(host)
+return host
+except ValueError:
+pass
+if '.' not in host and host != 'localhost':
+domain=''
+if re.match('^[a-z]+1[0-9][0-9][0-9]$', host) is not None:
+domain = '.eqiad.wmnet'
+elif re.match('^[a-z]+2[0-9][0-9][0-9]$', host) is not None:
+domain = '.codfw.wmnet'
+elif re.match('^[a-z]+3[0-9][0-9][0-9]$', host) is not None:
+domain = '.esams.wmnet'
+elif re.match('^[a-z]+4[0-9][0-9][0-9]$', host) is not None:
+domain = '.ulsfo.wmnet'
+else:
+localhost_fqdn = socket.getfqdn()
+if '.' in localhost_fqdn and len(localhost_fqdn) > 1:
+domain = localhost_fqdn[localhost_fqdn.index('.'):]
+host = host + domain
+return host
+
+def __init__(self, host, port=3306, database=None, debug=False,
+ connect_timeout=10.0):
+"""
+Try to connect to a mysql
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: registration: Move attributes out of the top level
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354029 )
Change subject: registration: Move attributes out of the top level
..
registration: Move attributes out of the top level
This moves attributes out of the top level, and namespaces them under
each extension. If the extension that it belongs to is not installed,
the attribute is not exported and dropped.
The full name of the attribute is the name of the extension plus the
name of the attribute key. This enforces the recommendation that the
attribute name start with the extension's name.
Add test coverage for attributes under manifest_version 1 and 2.
Bug: T133627
Depends-On: I5a148763f68989c8da313a4fb1d0213658ee4495
Depends-On: I5a148763f68989c8da313a4fb1d0213658ee4459
Change-Id: I8613a027c56e2c9d2c6a83ca14749eb1c8fc23be
---
M docs/extension.schema.v2.json
M includes/registration/ExtensionProcessor.php
M includes/registration/ExtensionRegistry.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
4 files changed, 153 insertions(+), 5 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index a2fdf65..0c476b0 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -2,6 +2,7 @@
"$schema": "http://json-schema.org/schema#";,
"description": "MediaWiki extension.json schema",
"type": "object",
+ "additionalProperties": false,
"properties": {
"manifest_version": {
"type": "integer",
@@ -729,6 +730,20 @@
"type": "array",
"description": "List of service wiring files to be
loaded by the default instance of MediaWikiServices"
},
+ "attributes": {
+ "description":"Registration information for other
extensions",
+ "type": "object",
+ "patternProperties": {
+ ".*": {
+ "type": "object",
+ "patternProperties": {
+ ".*": {
+ "type": ["array",
"object"]
+ }
+ }
+ }
+ }
+ },
"load_composer_autoloader": {
"type": "boolean",
"description": "Load the composer autoloader for this
extension, if one is present"
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index 1212f99..d14be3f 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -57,6 +57,16 @@
];
/**
+* Top-level attributes that come from MW core
+*
+* @var string[]
+*/
+ protected static $coreAttributes = [
+ 'SkinOOUIThemes',
+ 'TrackingCategories',
+ ];
+
+ /**
* Mapping of global settings to their specific merge strategies.
*
* @see ExtensionRegistry::exportExtractedData
@@ -161,6 +171,14 @@
protected $attributes = [];
/**
+* Extension attributes, keyed by name =>
+* settings.
+*
+* @var array
+*/
+ protected $extAttributes = [];
+
+ /**
* @param string $path
* @param array $info
* @param int $version manifest_version for info
@@ -186,14 +204,47 @@
$this->callbacks[$name] = $info['callback'];
}
+ if ( $version === 2 ) {
+ $this->extractAttributes( $path, $info );
+ }
+
foreach ( $info as $key => $val ) {
+ // If it's a global setting,
if ( in_array( $key, self::$globalSettings ) ) {
$this->storeToArray( $path, "wg$key", $val,
$this->globals );
+ continue;
+ }
// Ignore anything that starts with a @
- } elseif ( $key[0] !== '@' && !in_array( $key,
self::$notAttributes )
- && !in_array( $key, self::$creditsAttributes )
- ) {
- $this->storeToArray( $path, $key, $val,
$this->attributes );
+ if ( $key[0] === '@' ) {
+ continue;
+ }
+
+ if ( $version === 2 ) {
+ // Only whitelisted attributes are set
+
[MediaWiki-commits] [Gerrit] integration/config[master]: Do not run Ruby jobs for mediawiki/core
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343848 )
Change subject: Do not run Ruby jobs for mediawiki/core
..
Do not run Ruby jobs for mediawiki/core
The only Ruby code is Selenium tests, and it is replaced with tests in
Node.js.
Bug: T164004
Depends-On: I9a782aca67809f70fd9e62c075f49811a4dabc1d
Change-Id: I062d68458d8f472d636f1ae15f4fc37110460854
---
M jjb/selenium.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
3 files changed, 5 insertions(+), 54 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/selenium.yaml b/jjb/selenium.yaml
index ed8b96e..4545570 100644
--- a/jjb/selenium.yaml
+++ b/jjb/selenium.yaml
@@ -26,14 +26,6 @@
- 'selenium-{name}'
- project:
-name: Core
-recipients: qa-ale...@lists.wikimedia.org zfili...@wikimedia.org #
@zeljkofilipin #releng
-repository: mediawiki/core
-
-jobs:
- - 'selenium-{name}'
-
-- project:
name: Echo
recipients: qa-ale...@lists.wikimedia.org sbis...@wikimedia.org # @SBisson
repository: mediawiki/extensions/Echo
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 51379ba..9253093 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -690,54 +690,16 @@
assertChangeTriggersJob(change, test_55)
assertChangeTriggersJob(change, gate_55)
-# FIXME: should be more generic
-def get_mediawiki_core_rake_jessie_job(self):
+def test_rake_jessie_files_filters(self):
+# FIXME: should be more generic
jobs_tree = [t for (p, t) in
self.getPipeline('test').job_trees.iteritems()
- if p.name == 'mediawiki/core'][0]
+ if p.name == 'mediawiki/ruby/api'][0]
rake_jessie_job = [j for j in jobs_tree.getJobs()
- if j.name == 'mwgate-rake-jessie'][0]
-return rake_jessie_job
-
-# Make sure rake-jessie is properly filtered
-# https://phabricator.wikimedia.org/T105178
-def test_mediawiki_core_rake_jessie_branch_filters(self):
-test_manager = self.getPipeline('test').manager
-rake_jessie_job = self.get_mediawiki_core_rake_jessie_job()
-
-def change_for_branch(branch_name):
-"""Return a change against branch_name branch"""
-change = zuul.model.Change('mediawiki/core')
-change.branch = branch_name
-change.files.append('Gemfile.lock')
-return change
-
-event = zuul.model.TriggerEvent()
-event.type = 'patchset-created'
-event.account = {'email': 'john...@wikimedia.org'}
-
-for allowed_branch in ['master', 'REL1_25', 'REL1_26']:
-change = change_for_branch(allowed_branch)
-event.branch = change.branch
-self.assertTrue(test_manager.eventMatches(event, change))
-self.assertTrue(rake_jessie_job.changeMatches(change),
-'mediawiki/core rake-jessie job must run on %s'
-% allowed_branch)
-
-for blacklisted_branch in ['REL1_23', 'fundraising/REL1_42']:
-change = change_for_branch(blacklisted_branch)
-event.branch = change.branch
-self.assertTrue(test_manager.eventMatches(event, change))
-self.assertFalse(
-rake_jessie_job.changeMatches(change),
-'mediawiki/core rake-jessie job must NOT run on %s'
-% blacklisted_branch)
-
-def test_rake_jessie_files_filters(self):
-rake_jessie_job = self.get_mediawiki_core_rake_jessie_job()
+ if j.name == 'rake-jessie'][0]
def change_with_files(files):
-change = zuul.model.Change('mediawiki/core')
+change = zuul.model.Change('mediawiki/ruby/api')
change.branch = 'master'
change.files.extend(files)
return change
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9dadf62..0a71b4e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -677,8 +677,6 @@
- '(\.rubocop|\.gemspec|Gemfile)'
- '.*([Rr]akefile|/spec/)'
skip-if:
- - project: '^mediawiki/core$'
-branch: (?:^REL1_23$|^fundraising/REL.*)
- project: '^VisualEditor/VisualEditor$'
branch: (?:^REL1_26$)
@@ -1286,7 +1284,6 @@
- name: mediawiki/core
template:
- name: extension-gate
- - name: mwgate-rake
check:
- mediawiki-core-php55lint
- composer-package-validate
--
To view, visit https://gerrit.wikimedia.org/r/343848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I062d68458d8f472d636f1ae15f4fc37110460854
Gerrit-PatchSet: 10
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin
Gerrit
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Document servermon optimization
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354207 ) Change subject: Document servermon optimization .. Document servermon optimization Add a comment about how we had to change the puppet tables indexes slightly to fix an inefficient query issued by servermon. Normally we would not be touching the tables created by another application, but ActiveRecord support in puppet is deprecated for a long time now and we are the only user now Bug: T164604 Change-Id: I359e92c5a6852645b86bcf1e183e705f5952507b --- M modules/puppetmaster/lib/puppet/reports/servermon.rb 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/07/354207/1 diff --git a/modules/puppetmaster/lib/puppet/reports/servermon.rb b/modules/puppetmaster/lib/puppet/reports/servermon.rb index 4138938..1b37d38 100644 --- a/modules/puppetmaster/lib/puppet/reports/servermon.rb +++ b/modules/puppetmaster/lib/puppet/reports/servermon.rb @@ -12,6 +12,12 @@ # storeconfig_backend = puppetdb # NOTE: This is probably quite inefficient, but let's evaluate first # +# NOTE: On 2017-05-05 an inefficiency was indeed found. The fix was to alter the +# puppet schema by changing the index on fact_values table. The command issued: +# +# ALTER TABLE fact_values drop index index_fact_values_on_host_id, add index +# index_fact_values_on_host_id(host_id,fact_name_id); +# # Copyright © 2016 Alexandros Kosiaris and Wikimedia Foundation. # License http://www.apache.org/licenses/LICENSE-2.0 -- To view, visit https://gerrit.wikimedia.org/r/354207 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I359e92c5a6852645b86bcf1e183e705f5952507b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove Selenium tests written in Ruby
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343847 ) Change subject: Remove Selenium tests written in Ruby .. Remove Selenium tests written in Ruby New Selenium tests in Node.js are in tests/selenium. Bug: T164004 Change-Id: I3ddeecb4f012ba4a614b3ada81c5926da28556f4 Depends-On: I062d68458d8f472d636f1ae15f4fc37110460854 --- D .rubocop.yml D Gemfile D Gemfile.lock D Rakefile D tests/.gitignore D tests/browser/README.mediawiki D tests/browser/ci.yml D tests/browser/environments.yml D tests/browser/features/create_account.feature D tests/browser/features/create_and_follow_wiki_link.feature D tests/browser/features/edit_page.feature D tests/browser/features/file.feature D tests/browser/features/login.feature D tests/browser/features/main_page_links.feature D tests/browser/features/preferences.feature D tests/browser/features/step_definitions/create_account_steps.rb D tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb D tests/browser/features/step_definitions/edit_page_steps.rb D tests/browser/features/step_definitions/file_steps.rb D tests/browser/features/step_definitions/login_steps.rb D tests/browser/features/step_definitions/main_page_links_steps.rb D tests/browser/features/step_definitions/preferences_appearance_steps.rb D tests/browser/features/step_definitions/preferences_editing_steps.rb D tests/browser/features/step_definitions/preferences_user_profile_steps.rb D tests/browser/features/step_definitions/view_history_steps.rb D tests/browser/features/support/env.rb D tests/browser/features/support/hooks.rb D tests/browser/features/support/pages/create_account_page.rb D tests/browser/features/support/pages/edit_page.rb D tests/browser/features/support/pages/file_does_not_exist_page.rb D tests/browser/features/support/pages/login_page.rb D tests/browser/features/support/pages/main_page.rb D tests/browser/features/support/pages/preferences_appearance_page.rb D tests/browser/features/support/pages/preferences_editing_page.rb D tests/browser/features/support/pages/preferences_page.rb D tests/browser/features/support/pages/preferences_user_profile_page.rb D tests/browser/features/support/pages/view_history_page.rb D tests/browser/features/support/pages/ztargetpage.rb D tests/browser/features/view_history.feature 39 files changed, 0 insertions(+), 899 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 5b6c3f2..000 --- a/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Exclude: -- 'extensions/**/*' -- 'node_modules/**/*' -- 'skins/**/*' -- 'tests/frontend/node_modules/**/*' -- 'vendor/**/*' - StyleGuideCopsOnly: true - -Metrics/LineLength: - Max: 100 - -Metrics/MethodLength: - Enabled: false - -Style/Alias: - Enabled: false - -Style/SignalException: - Enabled: false - -Style/StringLiterals: - EnforcedStyle: single_quotes - -Style/TrivialAccessors: - ExactNameMatch: true diff --git a/Gemfile b/Gemfile deleted file mode 100644 index ee0cec0..000 --- a/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' - -gem 'mediawiki_selenium', '~> 1.8' -gem 'rake', '~> 11.1', '>= 11.1.1' -gem 'rubocop', '~> 0.32.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 4992303..000 --- a/Gemfile.lock +++ /dev/null @@ -1,111 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: -ast (2.0.0) -astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) -builder (3.2.3) -childprocess (0.6.2) - ffi (~> 1.0, >= 1.0.11) -cucumber (1.3.20) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) -data_magic (1.0) - faker (>= 1.1.2) - yml_reader (>= 0.6) -diff-lcs (1.3) -domain_name (0.5.20170223) - unf (>= 0.0.5, < 1.0.0) -faker (1.7.3) - i18n (~> 0.5) -faraday (0.11.0) - multipart-post (>= 1.2, < 3) -faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) - http-cookie (~> 1.0.0) -faraday_middleware (0.11.0.1) - faraday (>= 0.7.4, < 1.0) -ffi (1.9.17) -gherkin (2.12.2) - multi_json (~> 1.3) -headless (2.3.1) -http-cookie (1.0.3) - domain_name (~> 0.5) -i18n (0.8.1) -json (2.0.3) -mediawiki_api (0.7.1) - faraday (~> 0.9, >= 0.9.0) - faraday-cookie_jar (~> 0.0, >= 0.0.6) - faraday_middleware (~> 0.10, >= 0.10.0) -mediawiki_selenium (1.8.0) - cucumber (~> 1.3, >= 1.3.20) - headless (~> 2.0, >= 2.1.0) - json (~> 2.0, >= 2.0.2) - mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 2.0) - rest-client (~> 1.6, >= 1.6.7) - rspec-core (~> 2.14, >= 2.14.4) - rspec-expectations (~> 2.14, >= 2.14.4) - selenium-webdriver (~> 3.1.0) -
[MediaWiki-commits] [Gerrit] operations/calico-cni[master]: Updating debian version
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353868 ) Change subject: Updating debian version .. Updating debian version Change-Id: Ia7ef5d0f94517811e69543e722281732ad626dd2 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 532cbfa..eb98584 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calico-cni (1.8.3-1~wmf1) jesse-wikimedia; urgency=medium + + * Upgrade to 1.8.3 upstream version + + -- Giuseppe Lavagetto Mon, 15 May 2017 13:46:41 +0200 + calico-cni (1.5.1-1~wmf1) jessie-wikimedia; urgency=medium * Initial release. -- To view, visit https://gerrit.wikimedia.org/r/353868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7ef5d0f94517811e69543e722281732ad626dd2 Gerrit-PatchSet: 1 Gerrit-Project: operations/calico-cni Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/calico-cni[master]: package name change
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353869 ) Change subject: package name change .. package name change Change-Id: I45cbd61211b3beac53ad3586768f62da06ba8487 --- M debian/rules 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/rules b/debian/rules index d183e2c..724f406 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,9 @@ include /usr/share/dpkg/pkg-info.mk -DH_GOPKG := github.com/projectcalico/calico-cni +DH_GOPKG := github.com/projectcalico/cni-plugin export GOPATH=$(CURDIR)/build -export BUILD_DIR=$(GOPATH)/src/github.com/projectcalico/calico-cni +export BUILD_DIR=$(GOPATH)/src/github.com/projectcalico/cni-plugin build_calico: -- To view, visit https://gerrit.wikimedia.org/r/353869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45cbd61211b3beac53ad3586768f62da06ba8487 Gerrit-PatchSet: 1 Gerrit-Project: operations/calico-cni Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Add php-parallel-lint
Hashar has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352292 )
Change subject: Add php-parallel-lint
..
Add php-parallel-lint
php-lint will test for valid php files
Change-Id: I6170eb1363dd16457b6d783b42e8822518c1bd44
---
M .gitignore
A composer.json
2 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index c40aa38..0921166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
docs/
node_modules/
+vendor/
+/composer.lock
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..686b65b
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,11 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "jakub-onderka/php-console-highlighter": "0.3.2"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor"
+ ]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/352292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6170eb1363dd16457b6d783b42e8822518c1bd44
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update docker-host.cfg partman recipe
Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354209 )
Change subject: Update docker-host.cfg partman recipe
..
Update docker-host.cfg partman recipe
Specify the VG name to docker, set priorities and sizes better, add a
placeholder LV and amend a few typos. Finally add confirmations for LVM
removals
Remove some whitespace as well
Change-Id: Ib7c7fbdbf508b685aeebe72cf072b8dd4f102454
---
M modules/install_server/files/autoinstall/partman/docker-host.cfg
1 file changed, 18 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/354209/1
diff --git a/modules/install_server/files/autoinstall/partman/docker-host.cfg
b/modules/install_server/files/autoinstall/partman/docker-host.cfg
index f1fddb8..70ee17a 100644
--- a/modules/install_server/files/autoinstall/partman/docker-host.cfg
+++ b/modules/install_server/files/autoinstall/partman/docker-host.cfg
@@ -4,13 +4,17 @@
# * layout:
# - /: ext4, RAID1, 30GB
# - swap: RAID1, 1GB
-# - free space for the rest under LVM
+# - free space for the rest under LVM
d-ipartman-auto/method string raid
d-ipartman-md/device_remove_md boolean true
d-ipartman-lvm/device_remove_lvm boolean true
# Use the first two disks
d-ipartman-auto/disk string /dev/sda /dev/sdb
+
+# Don't stop if method isn't provided, e.g. in non used LVs
+d-i partman-basicmethods/method_onlyboolean false
+d-ipartman-auto-lvm/new_vg_namestring docker
# Parameters are:
# \
@@ -25,27 +29,28 @@
1 2 0 lvm - \
/dev/sda3#/dev/sdb3 \
.
-
+
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 1 13000 3 raid\
+ 1 2 3 raid\
$primary{ } method{ raid } \
$lvmignore{}\
$bootable{} \
. \
- 100020001000raid\
+ 100010001000raid\
$primary{ } method{ raid } \
- $lvignore{} \
+ $lvmignore{}\
. \
- 1 2000-1 raid\
+ 1 1 -1 raid\
$primary{ } method{ raid } \
- $lvignore{} \
+ $lvmignore{}\
. \
- 1 2000-1 ext4\
- $lvmok{}\
- method{ format }\
- .
+ 10002000-1 ext4\
+ $defaultignore { } \
+ $lvmok{} lv_name { _placeholder } \
+ method{ keep } \
+ .
d-ipartman-md/confirm boolean true
d-ipartman-md/confirm_nooverwrite boolean true
@@ -53,3 +58,5 @@
d-ipartman/choose_partitionselect finish
d-ipartman/confirm boolean true
d-ipartman/confirm_nooverwrite boolean true
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
--
To view, visit https://gerrit.wikimedia.org/r/354209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c7fbdbf508b685aeebe72cf072b8dd4f102454
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1073, depool db1072
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354208 ) Change subject: db-eqiad.php: Repool db1073, depool db1072 .. db-eqiad.php: Repool db1073, depool db1072 db1073 finished alter db1072 needs alter Bug: T159753 Bug: T164530 Change-Id: Ida16812fab8219b972280db6c35f872803cae060 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/08/354208/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 32574e5..d91437a 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -99,8 +99,8 @@ 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api - 'db1072' => 50, # B2 2.8TB 160GB, api -# 'db1073' => 50, # B3 2.8TB 160GB, api #T159753 #T164530 +# 'db1072' => 50, # B2 2.8TB 160GB, api #T159753 #T164530 + 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB @@ -262,8 +262,8 @@ ], 'api' => [ 'db1066' => 1, - 'db1072' => 1, -# 'db1073' => 1, +# 'db1072' => 1, + 'db1073' => 1, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida16812fab8219b972280db6c35f872803cae060 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1073, depool db1072
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354208 ) Change subject: db-eqiad.php: Repool db1073, depool db1072 .. db-eqiad.php: Repool db1073, depool db1072 db1073 finished alter db1072 needs alter Bug: T159753 Bug: T164530 Change-Id: Ida16812fab8219b972280db6c35f872803cae060 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 32574e5..d91437a 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -99,8 +99,8 @@ 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api - 'db1072' => 50, # B2 2.8TB 160GB, api -# 'db1073' => 50, # B3 2.8TB 160GB, api #T159753 #T164530 +# 'db1072' => 50, # B2 2.8TB 160GB, api #T159753 #T164530 + 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB 'db1089' => 500, # C3 3.6TB 512GB @@ -262,8 +262,8 @@ ], 'api' => [ 'db1066' => 1, - 'db1072' => 1, -# 'db1073' => 1, +# 'db1072' => 1, + 'db1073' => 1, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/354208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida16812fab8219b972280db6c35f872803cae060 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update docker-host.cfg partman recipe
Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354209 )
Change subject: Update docker-host.cfg partman recipe
..
Update docker-host.cfg partman recipe
Specify the VG name to docker, set priorities and sizes better, add a
placeholder LV and amend a few typos. Finally add confirmations for LVM
removals
Remove some whitespace as well
Change-Id: Ib7c7fbdbf508b685aeebe72cf072b8dd4f102454
---
M modules/install_server/files/autoinstall/partman/docker-host.cfg
1 file changed, 18 insertions(+), 11 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/install_server/files/autoinstall/partman/docker-host.cfg
b/modules/install_server/files/autoinstall/partman/docker-host.cfg
index f1fddb8..70ee17a 100644
--- a/modules/install_server/files/autoinstall/partman/docker-host.cfg
+++ b/modules/install_server/files/autoinstall/partman/docker-host.cfg
@@ -4,13 +4,17 @@
# * layout:
# - /: ext4, RAID1, 30GB
# - swap: RAID1, 1GB
-# - free space for the rest under LVM
+# - free space for the rest under LVM
d-ipartman-auto/method string raid
d-ipartman-md/device_remove_md boolean true
d-ipartman-lvm/device_remove_lvm boolean true
# Use the first two disks
d-ipartman-auto/disk string /dev/sda /dev/sdb
+
+# Don't stop if method isn't provided, e.g. in non used LVs
+d-i partman-basicmethods/method_onlyboolean false
+d-ipartman-auto-lvm/new_vg_namestring docker
# Parameters are:
# \
@@ -25,27 +29,28 @@
1 2 0 lvm - \
/dev/sda3#/dev/sdb3 \
.
-
+
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 1 13000 3 raid\
+ 1 2 3 raid\
$primary{ } method{ raid } \
$lvmignore{}\
$bootable{} \
. \
- 100020001000raid\
+ 100010001000raid\
$primary{ } method{ raid } \
- $lvignore{} \
+ $lvmignore{}\
. \
- 1 2000-1 raid\
+ 1 1 -1 raid\
$primary{ } method{ raid } \
- $lvignore{} \
+ $lvmignore{}\
. \
- 1 2000-1 ext4\
- $lvmok{}\
- method{ format }\
- .
+ 10002000-1 ext4\
+ $defaultignore { } \
+ $lvmok{} lv_name { _placeholder } \
+ method{ keep } \
+ .
d-ipartman-md/confirm boolean true
d-ipartman-md/confirm_nooverwrite boolean true
@@ -53,3 +58,5 @@
d-ipartman/choose_partitionselect finish
d-ipartman/confirm boolean true
d-ipartman/confirm_nooverwrite boolean true
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
--
To view, visit https://gerrit.wikimedia.org/r/354209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c7fbdbf508b685aeebe72cf072b8dd4f102454
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Document servermon optimization
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354207 ) Change subject: Document servermon optimization .. Document servermon optimization Add a comment about how we had to change the puppet tables indexes slightly to fix an inefficient query issued by servermon. Normally we would not be touching the tables created by another application, but ActiveRecord support in puppet is deprecated for a long time now and we are the only user now Bug: T164604 Change-Id: I359e92c5a6852645b86bcf1e183e705f5952507b --- M modules/puppetmaster/lib/puppet/reports/servermon.rb 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/modules/puppetmaster/lib/puppet/reports/servermon.rb b/modules/puppetmaster/lib/puppet/reports/servermon.rb index 4138938..1b37d38 100644 --- a/modules/puppetmaster/lib/puppet/reports/servermon.rb +++ b/modules/puppetmaster/lib/puppet/reports/servermon.rb @@ -12,6 +12,12 @@ # storeconfig_backend = puppetdb # NOTE: This is probably quite inefficient, but let's evaluate first # +# NOTE: On 2017-05-05 an inefficiency was indeed found. The fix was to alter the +# puppet schema by changing the index on fact_values table. The command issued: +# +# ALTER TABLE fact_values drop index index_fact_values_on_host_id, add index +# index_fact_values_on_host_id(host_id,fact_name_id); +# # Copyright © 2016 Alexandros Kosiaris and Wikimedia Foundation. # License http://www.apache.org/licenses/LICENSE-2.0 -- To view, visit https://gerrit.wikimedia.org/r/354207 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I359e92c5a6852645b86bcf1e183e705f5952507b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris 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...BlueSpiceExtensions[master]: Replaced deprecated BsExtensionManager::registerNamespace
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354210 )
Change subject: Replaced deprecated BsExtensionManager::registerNamespace
..
Replaced deprecated BsExtensionManager::registerNamespace
Change-Id: Iafdfe14c0833d3625d600e9df7f8730cbc93f142
---
M Blog/Blog.class.php
1 file changed, 12 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/10/354210/1
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 197ec38..a3efd69 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -93,7 +93,18 @@
* extension.json callback
*/
public static function onRegistration() {
- BsExtensionManager::registerNamespace( 'Blog', 2 );
+ global $wgExtraNamespaces, $bsgSystemNamespaces;
+ if( !defined( 'NS_BLOG' ) ) {
+ define( 'NS_BLOG', 1502 );
+ $wgExtraNamespaces[NS_BLOG] = 'Blog';
+ $bsgSystemNamespaces[1502] = 'NS_BLOG';
+ }
+
+ if( !defined( 'NS_BLOG_TALK' ) ) {
+ define( 'NS_BLOG_TALK', 1503 );
+ $wgExtraNamespaces[NS_BLOG_TALK] = 'Blog_talk';
+ $bsgSystemNamespaces[1503] = 'NS_BLOG_TALK';
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/354210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafdfe14c0833d3625d600e9df7f8730cbc93f142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: lineardoc: Add test to cover span wrapping for around linkba...
Santhosh has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354211 )
Change subject: lineardoc: Add test to cover span wrapping for around linkback
a tags
..
lineardoc: Add test to cover span wrapping for around linkback a tags
Change-Id: I281ebe889bb5d58e35fa3586ffc76a873fbb4583
---
M test/lineardoc/LinearDoc.test.js
A test/lineardoc/data/test6-result.xhtml
A test/lineardoc/data/test6-result.xml
A test/lineardoc/data/test6.xhtml
4 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/11/354211/1
diff --git a/test/lineardoc/LinearDoc.test.js b/test/lineardoc/LinearDoc.test.js
index ca397e9..2c27a97 100644
--- a/test/lineardoc/LinearDoc.test.js
+++ b/test/lineardoc/LinearDoc.test.js
@@ -9,7 +9,7 @@
it( 'should be possible to linearise all kind of HTML inputs', function
() {
var parser, testXhtmlFile, resultXmlFile, resultXhtmlFile,
testXhtml, resultXml,
resultXhtml, i,
- numTests = 5;
+ numTests = 6;
for ( i = 1; i <= numTests; i++ ) {
testXhtmlFile = __dirname + '/data/test' + i + '.xhtml';
resultXmlFile = __dirname + '/data/test' + i +
'-result.xml';
diff --git a/test/lineardoc/data/test6-result.xhtml
b/test/lineardoc/data/test6-result.xhtml
new file mode 100644
index 000..e6376a9
--- /dev/null
+++ b/test/lineardoc/data/test6-result.xhtml
@@ -0,0 +1,3 @@
+
+1 2
foo
+
diff --git a/test/lineardoc/data/test6-result.xml
b/test/lineardoc/data/test6-result.xml
new file mode 100644
index 000..06d0e70
--- /dev/null
+++ b/test/lineardoc/data/test6-result.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ 1
+ 2
+
+ foo
+
+
+
+
diff --git a/test/lineardoc/data/test6.xhtml b/test/lineardoc/data/test6.xhtml
new file mode 100644
index 000..453b5a8
--- /dev/null
+++ b/test/lineardoc/data/test6.xhtml
@@ -0,0 +1,3 @@
+
+1 2
foo
+
--
To view, visit https://gerrit.wikimedia.org/r/354211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I281ebe889bb5d58e35fa3586ffc76a873fbb4583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove non-ascii character from servermon.rb
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354212 ) Change subject: Remove non-ascii character from servermon.rb .. Remove non-ascii character from servermon.rb Remove the copyright sign. Change-Id: Ibaa7d4b783fa71e87262823842abd7b2e53d639f --- M modules/puppetmaster/lib/puppet/reports/servermon.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/modules/puppetmaster/lib/puppet/reports/servermon.rb b/modules/puppetmaster/lib/puppet/reports/servermon.rb index 1b37d38..71e8d92 100644 --- a/modules/puppetmaster/lib/puppet/reports/servermon.rb +++ b/modules/puppetmaster/lib/puppet/reports/servermon.rb @@ -18,7 +18,7 @@ # ALTER TABLE fact_values drop index index_fact_values_on_host_id, add index # index_fact_values_on_host_id(host_id,fact_name_id); # -# Copyright © 2016 Alexandros Kosiaris and Wikimedia Foundation. +# Copyright 2016 Alexandros Kosiaris and Wikimedia Foundation. # License http://www.apache.org/licenses/LICENSE-2.0 require 'puppet' -- To view, visit https://gerrit.wikimedia.org/r/354212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibaa7d4b783fa71e87262823842abd7b2e53d639f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove non-ascii character from servermon.rb
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354212 ) Change subject: Remove non-ascii character from servermon.rb .. Remove non-ascii character from servermon.rb Remove the copyright sign. Change-Id: Ibaa7d4b783fa71e87262823842abd7b2e53d639f --- M modules/puppetmaster/lib/puppet/reports/servermon.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/354212/1 diff --git a/modules/puppetmaster/lib/puppet/reports/servermon.rb b/modules/puppetmaster/lib/puppet/reports/servermon.rb index 1b37d38..71e8d92 100644 --- a/modules/puppetmaster/lib/puppet/reports/servermon.rb +++ b/modules/puppetmaster/lib/puppet/reports/servermon.rb @@ -18,7 +18,7 @@ # ALTER TABLE fact_values drop index index_fact_values_on_host_id, add index # index_fact_values_on_host_id(host_id,fact_name_id); # -# Copyright © 2016 Alexandros Kosiaris and Wikimedia Foundation. +# Copyright 2016 Alexandros Kosiaris and Wikimedia Foundation. # License http://www.apache.org/licenses/LICENSE-2.0 require 'puppet' -- To view, visit https://gerrit.wikimedia.org/r/354212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaa7d4b783fa71e87262823842abd7b2e53d639f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/calico-cni[master]: Workaround: use locally installed glide binary
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354213 ) Change subject: Workaround: use locally installed glide binary .. Workaround: use locally installed glide binary Debian jessie has no packager-provided version of glide, we're just installing the binary. Change-Id: I428d95d92b8f8ded923bea03294427195bc27cef --- M debian/rules 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/calico-cni refs/changes/13/354213/1 diff --git a/debian/rules b/debian/rules index 724f406..8f46d38 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ mkdir -p $(BUILD_DIR) tar -cf - --exclude=debian/build --exclude=.pc . \ | tar -xf - -C $(BUILD_DIR) - cd $(BUILD_DIR) && glide install -strip-vendor + cd $(BUILD_DIR) && /usr/local/bin/glide install -strip-vendor override_dh_auto_build: build_calico build_ipam -- To view, visit https://gerrit.wikimedia.org/r/354213 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I428d95d92b8f8ded923bea03294427195bc27cef Gerrit-PatchSet: 1 Gerrit-Project: operations/calico-cni Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/calico-cni[master]: Workaround: use locally installed glide binary
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354213 ) Change subject: Workaround: use locally installed glide binary .. Workaround: use locally installed glide binary Debian jessie has no packager-provided version of glide, we're just installing the binary. Change-Id: I428d95d92b8f8ded923bea03294427195bc27cef --- M debian/rules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/rules b/debian/rules index 724f406..8f46d38 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ mkdir -p $(BUILD_DIR) tar -cf - --exclude=debian/build --exclude=.pc . \ | tar -xf - -C $(BUILD_DIR) - cd $(BUILD_DIR) && glide install -strip-vendor + cd $(BUILD_DIR) && /usr/local/bin/glide install -strip-vendor override_dh_auto_build: build_calico build_ipam -- To view, visit https://gerrit.wikimedia.org/r/354213 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I428d95d92b8f8ded923bea03294427195bc27cef Gerrit-PatchSet: 1 Gerrit-Project: operations/calico-cni Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Correct last uniques oozie jobs (wrong join)
Joal has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354214 )
Change subject: Correct last uniques oozie jobs (wrong join)
..
Correct last uniques oozie jobs (wrong join)
An inner join was made instead of an outer one, making a (very small)
amount of data being lost. While not changing the data, this patch ensures
better correctness of the computation.
Bug: T165661
Change-Id: Id3849cc5404d3cdf4227eff53ce4340c39d6b004
---
M oozie/last_access_uniques/daily/last_access_uniques_daily.hql
M oozie/last_access_uniques/monthly/last_access_uniques_monthly.hql
2 files changed, 34 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/14/354214/1
diff --git a/oozie/last_access_uniques/daily/last_access_uniques_daily.hql
b/oozie/last_access_uniques/daily/last_access_uniques_daily.hql
index c003974..e1d41f3 100644
--- a/oozie/last_access_uniques/daily/last_access_uniques_daily.hql
+++ b/oozie/last_access_uniques/daily/last_access_uniques_daily.hql
@@ -48,12 +48,14 @@
fresh_sessions_aggregated AS (
SELECT
uri_host,
+country,
country_code,
COUNT(1) AS uniques_offset
FROM (
SELECT
hash(ip, user_agent, accept_language, uri_host) AS id,
uri_host,
+country,
country_code,
SUM(CASE WHEN (nocookies IS NOT NULL) THEN 1 ELSE 0 END),
SUM(CASE WHEN (nocookies IS NULL) THEN 1 ELSE 0 END)
@@ -62,6 +64,7 @@
GROUP BY
hash(ip, user_agent, accept_language, uri_host),
uri_host,
+country,
country_code
-- Only keeping clients having done
--1 event without cookies
@@ -71,28 +74,31 @@
) fresh_sessions
GROUP BY
uri_host,
+country,
country_code
)
INSERT OVERWRITE TABLE ${destination_table}
PARTITION(year = ${year}, month = ${month}, day = ${day})
SELECT
-la.uri_host,
-la.country,
-la.country_code,
+COALESCE(la.uri_host, fresh.uri_host) AS uri_host,
+COALESCE(la.country, fresh.country) AS country,
+COALESCE(la.country_code, fresh.country_code) AS country_code,
SUM(CASE
+-- uri_host defined (not null from outer join)
-- Last access not set and client accept cookies --> first visit, count
-WHEN (la.last_access IS NULL AND la.nocookies is NULL) THEN 1
+WHEN (la.uri_host IS NOT NULL AND la.last_access IS NULL AND
la.nocookies is NULL) THEN 1
-- Last access set and date before today --> First visit today, count
WHEN ((la.last_access IS NOT NULL)
AND (la.last_access < unix_timestamp(CONCAT('${year}-',
LPAD('${month}', 2, '0'), '-', LPAD('${day}', 2, '0')), '-MM-dd'))) THEN 1
-- Other cases, don't
ELSE 0
END) AS uniques_underestimate,
-fresh.uniques_offset AS uniques_offset,
+COALESCE(fresh.uniques_offset, 0) AS uniques_offset,
SUM(CASE
+-- uri_host defined (not null from outer join)
-- Last access not set and client accept cookies --> first visit, count
-WHEN (la.last_access IS NULL AND la.nocookies is NULL) THEN 1
+WHEN (la.uri_host IS NOT NULL AND la.last_access IS NULL AND
la.nocookies is NULL) THEN 1
-- Last access set and date before today --> First visit today, count
WHEN ((la.last_access IS NOT NULL)
AND (la.last_access < unix_timestamp(CONCAT('${year}-',
LPAD('${month}', 2, '0'), '-', LPAD('${day}', 2, '0')), '-MM-dd'))) THEN 1
@@ -101,14 +107,14 @@
END) + fresh.uniques_offset AS uniques_estimate
FROM
last_access_dates AS la
-INNER JOIN fresh_sessions_aggregated AS fresh
+FULL OUTER JOIN fresh_sessions_aggregated AS fresh
ON (fresh.uri_host = la.uri_host
AND fresh.country_code = la.country_code)
GROUP BY
-la.uri_host,
-la.country,
-la.country_code,
-fresh.uniques_offset
+COALESCE(la.uri_host, fresh.uri_host),
+COALESCE(la.country, fresh.country),
+COALESCE(la.country_code, fresh.country_code),
+COALESCE(fresh.uniques_offset, 0)
-- TODO
-- Add HAVING clause to restrict on long tail (maybe ?)
--
diff --git a/oozie/last_access_uniques/monthly/last_access_uniques_monthly.hql
b/oozie/last_access_uniques/monthly/last_access_uniques_monthly.hql
index b27b969..bcaf328 100644
--- a/oozie/last_access_uniques/monthly/last_access_uniques_monthly.hql
+++ b/oozie/last_access_uniques/monthly/last_access_uniques_monthly.hql
@@ -47,12 +47,14 @@
fresh_sessions_aggregated AS (
SELECT
uri_host,
+country,
country_code,
COUNT(1) AS uniques_offset
FROM (
SELECT
hash(ip, user_agent, accept_language, uri_host) AS id,
uri_host,
+country,
country_code,
SUM(CASE WHEN
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Streamline HTML generation code in SpecialConstraintReport
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352124 )
Change subject: Streamline HTML generation code in SpecialConstraintReport
..
Streamline HTML generation code in SpecialConstraintReport
"Html::openElement + raw HTML + Html::closeElement" really is the same as
Html::rawElement.
Warning: I'm not sure if it's correct to use Html::rawElement in all these
cases! It might be that some need HTML escaping and must use Html::element
because of this. But if such cases exist they are not introduced by this bug,
and should be fixed in a later one.
Change-Id: I53dbef8ae2e8aa1cdb0d90650499d3cf15b3f536
---
M specials/SpecialConstraintReport.php
1 file changed, 22 insertions(+), 24 deletions(-)
Approvals:
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index c3b9358..b6bd285 100644
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -298,8 +298,7 @@
$cssClasses .= ' wbqc-constraintreport-notice-error';
}
- return
- Html::element(
+ return Html::rawElement(
'p',
[
'class' => $cssClasses
@@ -312,14 +311,17 @@
* @return string HTML
*/
private function getExplanationText() {
- return
- Html::openElement( 'div', [ 'class' =>
'wbqc-explanation' ] )
- . $this->msg(
'wbqc-constraintreport-explanation-part-one' )->escaped()
- . Html::closeElement( 'div' )
+ return Html::rawElement(
+ 'div',
+ [ 'class' => 'wbqc-explanation' ],
+ $this->msg(
'wbqc-constraintreport-explanation-part-one' )->escaped()
+ )
. Html::element( 'br' )
- . Html::openElement( 'div', [ 'class' =>
'wbqc-explanation' ] )
- . $this->msg(
'wbqc-constraintreport-explanation-part-two' )->escaped()
- . Html::closeElement( 'div' );
+ . Html::rawElement(
+ 'div',
+ [ 'class' => 'wbqc-explanation' ],
+ $this->msg(
'wbqc-constraintreport-explanation-part-two' )->escaped()
+ );
}
/**
@@ -436,10 +438,11 @@
$this->entityIdLinkFormatter->formatEntityId( $entityId ),
htmlspecialchars(
$entityId->getSerialization() ) );
- return
- Html::openElement( 'h3' )
- . sprintf( '%s %s', $this->msg(
'wbqc-constraintreport-result-headline' )->escaped(), $entityLink )
- . Html::closeElement( 'h3' );
+ return Html::rawElement(
+ 'h3',
+ [],
+ sprintf( '%s %s', $this->msg(
'wbqc-constraintreport-result-headline' )->escaped(), $entityLink )
+ );
}
/**
@@ -465,12 +468,8 @@
. $count;
}
}
- $summary =
- Html::openElement( 'p' )
- . implode( ', ', $statusElements )
- . Html::closeElement( 'p' );
- return $summary;
+ return Html::rawElement( 'p', [], implode( ', ',
$statusElements ) );
}
/**
@@ -513,12 +512,11 @@
$tooltipContent
);
- return
- Html::openElement(
- 'span'
- )
- . sprintf( '%s %s %s', $content, $tooltipIndicator,
$tooltip )
- . Html::closeElement( 'span' );
+ return Html::rawElement(
+ 'span',
+ [],
+ sprintf( '%s %s %s', $content, $tooltipIndicator,
$tooltip )
+ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/352124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53dbef8ae2e8aa1cdb0d90650499d3cf15b3f536
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Lucas Werkmeister (WMDE)
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jen
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Move example data from LexemeView to LexemeContent to make i...
Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354215 )
Change subject: Move example data from LexemeView to LexemeContent to make it
"visible" to serializers
..
Move example data from LexemeView to LexemeContent to make it "visible" to
serializers
Change-Id: I8444bf33b8ec7c06d09590a2495b2e01c1029ae0
---
M src/Content/LexemeContent.php
M src/DataModel/Lexeme.php
M src/View/LexemeView.php
3 files changed, 55 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/15/354215/1
diff --git a/src/Content/LexemeContent.php b/src/Content/LexemeContent.php
index b86a59a..0e881f9 100644
--- a/src/Content/LexemeContent.php
+++ b/src/Content/LexemeContent.php
@@ -3,11 +3,20 @@
namespace Wikibase\Lexeme\Content;
use InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
use Wikibase\Content\EntityHolder;
use Wikibase\EntityContent;
use Wikibase\Lexeme\DataModel\Lexeme;
use Wikimedia\Assert\Assert;
+
+use DataValues\StringValue;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementList;
+use Wikibase\Lexeme\DataModel\LexemeForm;
+use Wikibase\Lexeme\DataModel\LexemeFormId;
/**
* @license GPL-2.0+
@@ -44,7 +53,41 @@
* @return Lexeme
*/
public function getEntity() {
- return $this->lexemeHolder->getEntity( Lexeme::class );
+ /** @var Lexeme $lexeme */
+ $lexeme = $this->lexemeHolder->getEntity( Lexeme::class );
+
+ // TODO: This obviously is a dummy that must be removed
+ $grammaticalFeatures1 = [ new ItemId( 'Q2' ) ];
+ $grammaticalFeatures2 = [ new ItemId( 'Q2' ), new ItemId( 'Q3'
) ];
+ $statements1 = new StatementList(
+ [
+ new Statement( new PropertyNoValueSnak( new
PropertyId( 'P2' ) ), null, null, 'guid1' )
+ ]
+ );
+ $statements2 = new StatementList(
+ [
+ new Statement( new PropertyNoValueSnak( new
PropertyId( 'P2' ) ), null, null, 'guid2' ),
+ new Statement(
+ new PropertyValueSnak(
+ new PropertyId( 'P3' ),
+ new StringValue( 'asd' )
+ ),
+ null,
+ null,
+ 'guid3'
+ ),
+ ]
+ );
+
+ $forms = [
+ new LexemeForm( new LexemeFormId( 'F1' ), 'A', [] ),
+ new LexemeForm( new LexemeFormId( 'F2' ), 'B',
$grammaticalFeatures1, $statements1 ),
+ new LexemeForm( new LexemeFormId( 'F3' ), 'C',
$grammaticalFeatures2, $statements2 ),
+ ];
+
+ $lexeme->setForms( $forms );
+
+ return $lexeme;
}
/**
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 014bab2..7575999 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -233,6 +233,14 @@
}
/**
+* @param LexemeForm[] $forms
+* @deprecated Temporary method, for demo. Just don't use.
+*/
+ public function setForms( $forms ) {
+ $this->forms = $forms;
+ }
+
+ /**
* @return bool False if a non-optional field was never initialized,
true otherwise.
*/
public function isSufficientlyInitialized() {
diff --git a/src/View/LexemeView.php b/src/View/LexemeView.php
index 22ac15c..4bdb94e 100644
--- a/src/View/LexemeView.php
+++ b/src/View/LexemeView.php
@@ -2,24 +2,16 @@
namespace Wikibase\Lexeme\View;
-use DataValues\StringValue;
use InvalidArgumentException;
use Language;
use Message;
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookupException;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Statement\Statement;
-use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lexeme\DataModel\LexemeForm;
-use Wikibase\Lexeme\DataModel\
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Update docs/usagetracking.wiki: Statement usages, minor things
Hoo man has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354216 ) Change subject: Update docs/usagetracking.wiki: Statement usages, minor things .. Update docs/usagetracking.wiki: Statement usages, minor things For the update aspects, please see AffectedPagesFinder::getChangedAspects. Change-Id: I51f8f319c0e673dbb95d7b725b35b2ff69f7e609 Note: Statement usages aren't currently used for any page updates. --- M docs/usagetracking.wiki 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/16/354216/1 diff --git a/docs/usagetracking.wiki b/docs/usagetracking.wiki index d32b0d6..3272732 100644 --- a/docs/usagetracking.wiki +++ b/docs/usagetracking.wiki @@ -11,24 +11,25 @@ == Client side usage tracking == -Each client wiki tracks which pages use (which aspect of) which entity (from which repo). The "aspect" is used to decide which kind of change is relevant for the given kind of usage, and what kind of update is needed for the page in question. The following aspects are defined: +Each client wiki tracks which pages use (which aspect of) which entity (from which repo). The "aspect" is used to decide which kind of change is relevant for the given kind of usage, and what kind of update is needed for the page in question. Among others the following aspects are defined: * sitelinks: only an item's sitelinks are used. This would be the case for a client page that is connected to an item on the repo via an incoming sitelink, but does not access any data of the item directly. A change to the sitelinks may be applied without re-parsing the page, by overwriting the sitelinks in the cached ParserOutput opbject. * label: only the entity's label is used. This would be the case when a localized reference to the entity is shown on a page. It's also used in cases when a property is referenced by label. A page that uses a label should be updated when that label chances, but this kind of update my be considered low priority. The language in which the label is used is tracked along as a "modification" of the label aspect. In case language fallback is applied, all relevant languages are considered to be used on the page. * all: any and all aspects of the entity may be used on the given page. This includes statements, claims, and labels. This kind of usage triggers a full re-parse on any change to the entity. This aspect of use is recorded when entity data is accessed via Lua or the #property parser function. -Entity usage on client pages is tracked using the following codes: +Entity usage on client pages is tracked using the following codes (each representing one aspect): * sitelinks (S): the entity's sitelinks are used. * label (L.xx): the entity's label in in language xx changed. * title (T): the title of the local page corresponding to the entity is used. -* all (X): other aspects (such as statement data), or all aspects, are or may be used. +* statements (C): certain statements (identified by their property id) from the entity are used. +* other (O): something else about the entity (such as statement data) is used. +* all (X): all aspects of an entity are or may be used. Changes result in updates to pages that use the respective entity based on the aspect that is used. Changes are classified accordingly: * sitelinks (S): any change to the entity's sitelinks. Pages that use the S or X aspect are updated. * label (L.xx): the label in the language "xx" changed. Pages that use the L.xx or X aspect are updated. * title (T): the sitelink corresponding to the local wiki was changed. Pages that use the S, T, or X aspect are updated. -* all (X): Everything about the entity changed, all pages using the entity are updated. -* other (O): something else about the entity (such as statement data) changed. Only pages that use the X aspect are updated. +* other (O): something else about the entity (such as statement data) changed. Only pages that use the O or X aspects are updated. This way, editing e.g. statements will not cause pages that just show the entities label to be purged. -- To view, visit https://gerrit.wikimedia.org/r/354216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51f8f319c0e673dbb95d7b725b35b2ff69f7e609 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSCSyntaxHighlight: Fixed notice "non static method called s...
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354217 )
Change subject: BSCSyntaxHighlight: Fixed notice "non static method called
statically"
..
BSCSyntaxHighlight: Fixed notice "non static method called statically"
Change-Id: I80d9b08aacfe98839a0525d0886f079699e7ccee
---
M CSyntaxHighlight/CSyntaxHighlight.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/17/354217/1
diff --git a/CSyntaxHighlight/CSyntaxHighlight.class.php
b/CSyntaxHighlight/CSyntaxHighlight.class.php
index 97b2d57..700ab85 100644
--- a/CSyntaxHighlight/CSyntaxHighlight.class.php
+++ b/CSyntaxHighlight/CSyntaxHighlight.class.php
@@ -161,7 +161,7 @@
* @param string $sType
* @return boolean Always true to keep hook running
*/
- public function onBSInsertMagicAjaxGetData( $oResponse, $sType ) {
+ public static function onBSInsertMagicAjaxGetData( $oResponse, $sType )
{
if( $sType !== "tags" ) return true;
$oDescriptor = new stdClass();
--
To view, visit https://gerrit.wikimedia.org/r/354217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80d9b08aacfe98839a0525d0886f079699e7ccee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1076, depool db1074
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354218 ) Change subject: db-eqiad.php: Repool db1076, depool db1074 .. db-eqiad.php: Repool db1076, depool db1074 db1076 finished alter db1074 needs alter Bug: T159753 Bug: T164530 Change-Id: I5a406e65ddba1311d9f11ed5a9443455f50920ae --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/18/354218/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d91437a..44ba0e8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,8 +111,8 @@ 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api - 'db1074' => 300, # A2 3.6TB 512GB, api -# 'db1076' => 500, # B1 3.6TB 512GB #T162611 +# 'db1074' => 300, # A2 3.6TB 512GB, api #T162611 + 'db1076' => 300, # B1 3.6TB 512GB #temporary api #T162611 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ @@ -275,7 +275,7 @@ ], 'api' => [ 'db1060' => 2, - 'db1074' => 1, + 'db1076' => 1, ], 'watchlist' => [ 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a406e65ddba1311d9f11ed5a9443455f50920ae Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Improve violation messages for Qualifiers and Mandatory qual...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353568 )
Change subject: Improve violation messages for Qualifiers and Mandatory
qualifiers
..
Improve violation messages for Qualifiers and Mandatory qualifiers
The message now includes all the information necessary to understand the
violation, including a bit that was not previously available in the
parameters: the property that causes the violation because the qualifier
is not permitted (Qualifiers) or missing (Mandatory qualifiers).
The special case of no permitted qualifiers at all is turned into a
separate message, since it differs enough from the message for one or
more qualifiers that accommodating them both in a single message would
require too much PLURAL magic.
Bug: T164354
Change-Id: Ic876f160b8e04912f3597a64282179686c78fb32
---
M i18n/en.json
M i18n/qqq.json
M includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M includes/ConstraintCheck/Checker/QualifiersChecker.php
M includes/ConstraintReportFactory.php
M tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
M tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php
7 files changed, 99 insertions(+), 19 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 60a0288..b71d3d5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -67,11 +67,12 @@
"wbqc-violation-message-format": "The property's value must match the
pattern defined in the parameters.",
"wbqc-violation-message-inverse": "$1 should also have the inverse
statement $2 $3.",
"wbqc-violation-message-item": "An entity with $1 should also have
{{PLURAL:$3|0=a statement $2.|1=a statement $2 $5.|a statement for $2 with one
of the following values:$4}}",
- "wbqc-violation-message-mandatory-qualifiers": "All of the properties
defined in the parameters have to be used as qualifiers on this statement.",
+ "wbqc-violation-message-mandatory-qualifiers": "This $1 statement is
missing {{PLURAL:$2|1=a qualifier $4.|2=$4 and $5 qualifiers.|the following
qualifiers:$3}}",
"wbqc-violation-message-multi-value": "This property must have multiple
values. That is, there must be more than one claim using this property.",
"wbqc-violation-message-one-of": "The value for $1 should be
{{PLURAL:$2|1=$4.|2=either $4 or $5.|one of the following:$3}}",
"wbqc-violation-message-qualifier": "The property must only be used as
a qualifier.",
- "wbqc-violation-message-qualifiers": "The property must only be used
with (no other than) the qualifiers defined in the parameters.",
+ "wbqc-violation-message-no-qualifiers": "$1 statements should not have
any qualifiers.",
+ "wbqc-violation-message-qualifiers": "$2 is not a valid qualifier for
$1 – the only valid {{PLURAL:$3|1=qualifier is $5.|2=qualifiers are $5 and
$6.|qualifiers are:$4}}",
"wbqc-violation-message-range-parameters-needed": "Properties with
values of type \"$1\" with constraint \"Range\" need the parameters \"$2\" and
\"$3\".",
"wbqc-violation-message-range": "The value for $1 ($2) must be between
$3 and $4 ([$3, $4]).",
"wbqc-violation-message-single-value": "This property must only have a
single value. That is, there must only be one claim using this property.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0a7b8c3..6db1eb2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -62,11 +62,12 @@
"wbqc-violation-message-format": "Message for violation of format
constraint. When string does not match given pattern.",
"wbqc-violation-message-inverse": "Message for a violation of the
“Inverse” constraint, when the inverse statement of a statement does not exist.
$1, $2 and $3 contain the expected subject entity, property, and target entity
of the missing inverse statement.",
"wbqc-violation-message-item": "Message for a violation of the “Item”
constraint, when the subject entity of a statement is missing another
statement. Parameters:\n* $1 is the property of the statement that has the
constraint.\n* $2 is the property of the missing statement.\n* $3 is the number
of values permitted for the missing statement (or 0, in which case the
constraint only specifies that there should be a statement but not the values
it should have).\n* $4 is an HTML list of all values permitted for the missing
statement.\n* $5, $6 etc. are the individual values permitted for the missing
statement.\n{{Related|wbqc-violation-message-target-required-claim}}",
- "wbqc-violation-message-mandatory-qualifiers": "Message for violation
of Mandatory qualifiers constraint. When a qualifier is missing.",
+ "wbqc-violation-message-mandatory-qualifiers": "Message for a violation
of the “Mandatory qualifiers” constraint, when one or more mandatory
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1076, depool db1074
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354218 ) Change subject: db-eqiad.php: Repool db1076, depool db1074 .. db-eqiad.php: Repool db1076, depool db1074 db1076 finished alter db1074 needs alter Bug: T159753 Bug: T164530 Change-Id: I5a406e65ddba1311d9f11ed5a9443455f50920ae --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d91437a..44ba0e8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,8 +111,8 @@ 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api - 'db1074' => 300, # A2 3.6TB 512GB, api -# 'db1076' => 500, # B1 3.6TB 512GB #T162611 +# 'db1074' => 300, # A2 3.6TB 512GB, api #T162611 + 'db1076' => 300, # B1 3.6TB 512GB #temporary api #T162611 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ @@ -275,7 +275,7 @@ ], 'api' => [ 'db1060' => 2, - 'db1074' => 1, + 'db1076' => 1, ], 'watchlist' => [ 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a406e65ddba1311d9f11ed5a9443455f50920ae Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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...WikibaseLexeme[master]: LexemeSerializer also serializes statements on forms
Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354219 )
Change subject: LexemeSerializer also serializes statements on forms
..
LexemeSerializer also serializes statements on forms
Change-Id: I9ae81c903e529738ea9cb7ca80a3e2cd97f23740
---
M src/DataModel/Serialization/LexemeSerializer.php
M tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
2 files changed, 21 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/19/354219/1
diff --git a/src/DataModel/Serialization/LexemeSerializer.php
b/src/DataModel/Serialization/LexemeSerializer.php
index ecaa8df..b226ecf 100644
--- a/src/DataModel/Serialization/LexemeSerializer.php
+++ b/src/DataModel/Serialization/LexemeSerializer.php
@@ -135,6 +135,11 @@
}
$serialization['representation'] = $form->getRepresentation();
+
+ $serialization['claims'] =
$this->statementListSerializer->serialize(
+ $form->getStatements()
+ );
+
return $serialization;
}
diff --git
a/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
b/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
index d88eb73..ababdb2 100644
--- a/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
+++ b/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
@@ -6,9 +6,11 @@
use Serializers\Exceptions\SerializationException;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Serializers\StatementListSerializer;
use Wikibase\DataModel\Serializers\TermListSerializer;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
@@ -32,8 +34,7 @@
$statementListSerializer = $this->getMockBuilder(
StatementListSerializer::class )
->disableOriginalConstructor()
->getMock();
- $statementListSerializer->expects( $this->any() )
- ->method( 'serialize' )
+ $statementListSerializer->method( 'serialize' )
->will( $this->returnCallback( function( StatementList
$statementList ) {
return implode( '|',
$statementList->getPropertyIds() );
} ) );
@@ -41,8 +42,7 @@
$termListSerializer = $this->getMockBuilder(
TermListSerializer::class )
->disableOriginalConstructor()
->getMock();
- $termListSerializer->expects( $this->any() )
- ->method( 'serialize' )
+ $termListSerializer->method( 'serialize' )
->will( $this->returnCallback( function( TermList
$termList ) {
return $termList->toTextArray();
} ) );
@@ -218,4 +218,16 @@
$this->assertFalse( $serializer->isSerializerFor( $object ) );
}
+ public function testSerializesStatementsOnLexemeForms() {
+ $statement = new Statement( new PropertyNoValueSnak( new
PropertyId( 'P2' ) ) );
+ $forms = [ new LexemeForm( null, 'some representation', [], new
StatementList( [ $statement ] ) ) ];
+ $lexeme = new Lexeme( null, null, new ItemId( 'Q1' ), new
ItemId( 'Q1' ), null, $forms );
+
+ $serialization = $this->newSerializer()->serialize( $lexeme );
+
+ assertThat( $serialization, hasKeyValuePair( "forms",
+ hasItemInArray(
+ hasKeyValuePair( "claims", equalTo( "P2" ) ) )
) );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/354219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ae81c903e529738ea9cb7ca80a3e2cd97f23740
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1072, depool db1066
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354220 ) Change subject: db-eqiad.php: Repool db1072, depool db1066 .. db-eqiad.php: Repool db1072, depool db1066 db1072 finished alter table db1066 needs alter table Bug: T159753 Bug: T164530 Change-Id: I7fdac0a29bb3838ba4eb447bc25913922ac6a3ab --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/20/354220/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 44ba0e8..4d80da6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -98,8 +98,8 @@ 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium - 'db1066' => 10, # D1 2.8TB 160GB, api -# 'db1072' => 50, # B2 2.8TB 160GB, api #T159753 #T164530 +# 'db1066' => 10, # D1 2.8TB 160GB, api #T159753 #T164530 + 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB @@ -261,8 +261,8 @@ 'db1065' => 1, ], 'api' => [ - 'db1066' => 1, -# 'db1072' => 1, +# 'db1066' => 1, + 'db1072' => 1, 'db1073' => 1, ], ], -- To view, visit https://gerrit.wikimedia.org/r/354220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fdac0a29bb3838ba4eb447bc25913922ac6a3ab Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1072, depool db1066
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354220 ) Change subject: db-eqiad.php: Repool db1072, depool db1066 .. db-eqiad.php: Repool db1072, depool db1066 db1072 finished alter table db1066 needs alter table Bug: T159753 Bug: T164530 Change-Id: I7fdac0a29bb3838ba4eb447bc25913922ac6a3ab --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 44ba0e8..4d80da6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -98,8 +98,8 @@ 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium - 'db1066' => 10, # D1 2.8TB 160GB, api -# 'db1072' => 50, # B2 2.8TB 160GB, api #T159753 #T164530 +# 'db1066' => 10, # D1 2.8TB 160GB, api #T159753 #T164530 + 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB 'db1083' => 500, # B1 3.6TB 512GB @@ -261,8 +261,8 @@ 'db1065' => 1, ], 'api' => [ - 'db1066' => 1, -# 'db1072' => 1, +# 'db1066' => 1, + 'db1072' => 1, 'db1073' => 1, ], ], -- To view, visit https://gerrit.wikimedia.org/r/354220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fdac0a29bb3838ba4eb447bc25913922ac6a3ab Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1066
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354221 ) Change subject: db-eqiad.php: Repool db1066 .. db-eqiad.php: Repool db1066 db1066 finished alter Bug: T159753 Bug: T164530 Change-Id: Ia01be256023c3772ad0bb3c12ee7567d6726a4a0 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/21/354221/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4d80da6..cd02ee6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -98,7 +98,7 @@ 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium -# 'db1066' => 10, # D1 2.8TB 160GB, api #T159753 #T164530 + 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB @@ -261,7 +261,7 @@ 'db1065' => 1, ], 'api' => [ -# 'db1066' => 1, + 'db1066' => 1, 'db1072' => 1, 'db1073' => 1, ], -- To view, visit https://gerrit.wikimedia.org/r/354221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia01be256023c3772ad0bb3c12ee7567d6726a4a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1066
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354221 ) Change subject: db-eqiad.php: Repool db1066 .. db-eqiad.php: Repool db1066 db1066 finished alter Bug: T159753 Bug: T164530 Change-Id: Ia01be256023c3772ad0bb3c12ee7567d6726a4a0 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4d80da6..cd02ee6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -98,7 +98,7 @@ 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium -# 'db1066' => 10, # D1 2.8TB 160GB, api #T159753 #T164530 + 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 500, # A2 3.6TB 512GB @@ -261,7 +261,7 @@ 'db1065' => 1, ], 'api' => [ -# 'db1066' => 1, + 'db1066' => 1, 'db1072' => 1, 'db1073' => 1, ], -- To view, visit https://gerrit.wikimedia.org/r/354221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia01be256023c3772ad0bb3c12ee7567d6726a4a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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...MobileFrontend[master]: Hygiene: Break out mobile.messageBox styles module
Phuedx has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354222 )
Change subject: Hygiene: Break out mobile.messageBox styles module
..
Hygiene: Break out mobile.messageBox styles module
Because the mobile.messageBox styles are loaded using
OutputPage#addModuleStyles, which requires that the specified modules
are styles-only, on certain special pages. They are also loaded by the
RL on other pages as they are depended on by the mobile.nearby and
mobile.editor.common RL modules.
Support both ways of loading the mobile.messageBox styles (and other
content) and the RL by:
* Creating the mobile.messageBox.styles styles-only RL module.
* Making the mobile.messageBox RL module depend on
mobile.messageBox.styles.
* Loading the mobile.messageBox.styles RL module using
OutputPage#addModuleStyles.
Bug: T164892
Change-Id: I46dd7fbfdfebd1daf732f9c3a7dbbf488ff6c533
---
M extension.json
M includes/skins/SkinMinerva.php
2 files changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/22/354222/1
diff --git a/extension.json b/extension.json
index 4191e85..e4c7ec8 100644
--- a/extension.json
+++ b/extension.json
@@ -321,17 +321,24 @@
"resources/mobile.mainMenu/MainMenu.js"
]
},
+ "mobile.messageBox.styles": {
+ "targets": [
+ "mobile",
+ "desktop"
+ ],
+ "position": "top",
+ "styles": [
+ "resources/mobile.messageBox/messageBox.less"
+ ]
+ },
"mobile.messageBox": {
"targets": [
"mobile",
"desktop"
],
"dependencies": [
- "mobile.startup"
- ],
- "position": "top",
- "styles": [
- "resources/mobile.messageBox/messageBox.less"
+ "mobile.startup",
+ "mobile.messageBox.styles"
],
"templates": {
"MessageBox.hogan":
"resources/mobile.messageBox/MessageBox.mustache"
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 1b18eeb..8cadaf4 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1402,14 +1402,14 @@
$styles[] = 'skins.minerva.userpage.styles';
$styles[] = 'skins.minerva.userpage.icons';
} elseif ( $title->isSpecialPage() ) {
- $styles[] = 'mobile.messageBox';
+ $styles[] = 'mobile.messageBox.styles';
$styles['special'] = 'skins.minerva.special.styles';
}
if ( $title->isSpecial( 'Notifications' ) ) {
$styles[] = 'skins.minerva.notifications.filter.styles';
}
if ( $this->getOutput()->getRequest()->getText( 'oldid' ) ) {
- $styles[] = 'mobile.messageBox';
+ $styles[] = 'mobile.messageBox.styles';
}
return $styles;
--
To view, visit https://gerrit.wikimedia.org/r/354222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46dd7fbfdfebd1daf732f9c3a7dbbf488ff6c533
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/kafkatee[master]: Remove logrotate and syslog configuration
Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354223 )
Change subject: Remove logrotate and syslog configuration
..
Remove logrotate and syslog configuration
This will allow us to easily deploy logrotate/syslog
configurations via puppet without the risk of overlapping
with the package defaults.
Bug: T151748
Change-Id: I41b0a0be339701a682d3af49e6fc64e4dc74958e
---
D debian/75-kafkatee.conf
M debian/kafkatee.install
D debian/kafkatee.logrotate
M debian/kafkatee.postinst
4 files changed, 0 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/kafkatee
refs/changes/23/354223/1
diff --git a/debian/75-kafkatee.conf b/debian/75-kafkatee.conf
deleted file mode 100644
index d9c29ce..000
--- a/debian/75-kafkatee.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# rsyslogd kafkatee config.
-if $programname == 'kafkatee' then /var/log/kafkatee.log
diff --git a/debian/kafkatee.install b/debian/kafkatee.install
index ef17cfb..eb3166b 100644
--- a/debian/kafkatee.install
+++ b/debian/kafkatee.install
@@ -1,4 +1,3 @@
kafkateeusr/bin
debian/etc/kafkatee.confetc
debian/etc/kafkatee.d/READMEetc/kafkatee.d
-debian/75-kafkatee.conf etc/rsyslog.d
diff --git a/debian/kafkatee.logrotate b/debian/kafkatee.logrotate
deleted file mode 100644
index 3e284d7..000
--- a/debian/kafkatee.logrotate
+++ /dev/null
@@ -1,23 +0,0 @@
-/var/log/kafkatee.log {
- daily
- rotate 7
- create 0664 syslog adm
- missingok
- compress
- delaycompress
- postrotate
-service rsyslog reload
- endscript
-}
-
-/var/cache/kafkatee/kafkatee.stats.json {
- weekly
- rotate 4
- create 0644 kafkatee root
- missingok
- compress
- delaycompress
- postrotate
-service kafkatee reload
- endscript
-}
diff --git a/debian/kafkatee.postinst b/debian/kafkatee.postinst
index 4900121..1b3033d 100755
--- a/debian/kafkatee.postinst
+++ b/debian/kafkatee.postinst
@@ -24,9 +24,6 @@
chown -R kafkatee:kafkatee /var/cache/kafkatee
chown -R kafkatee:kafkatee /var/run/kafkatee
-# force rsyslog to create /var/log/kafkatee.log on install.
-service rsyslog restart
-
echo \
"NOTE: Default kafkatee config files have been installed at:
/etc/kafkatee.conf
--
To view, visit https://gerrit.wikimedia.org/r/354223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41b0a0be339701a682d3af49e6fc64e4dc74958e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/kafkatee
Gerrit-Branch: master
Gerrit-Owner: Elukey
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Change thank you and thank you test to thank you send
Mepps has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354224 )
Change subject: Change thank you and thank you test to thank you send
..
Change thank you and thank you test to thank you send
Bug: T165671
Change-Id: If30368ebaf9b7d5fd4b1a701638196868710a0e5
---
M sites/all/modules/thank_you/thank_you.drush.inc
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/24/354224/1
diff --git a/sites/all/modules/thank_you/thank_you.drush.inc
b/sites/all/modules/thank_you/thank_you.drush.inc
index 6dbdc0d..a31611f 100644
--- a/sites/all/modules/thank_you/thank_you.drush.inc
+++ b/sites/all/modules/thank_you/thank_you.drush.inc
@@ -6,14 +6,14 @@
function thank_you_drush_command() {
$items = array();
- $items['thank-you'] = array(
+ $items['thank-you-send'] = array(
'description' =>
'Sends thank you emails for donations',
'examples' => array( 'drush thank-you' => '# Send thank you emails' ),
'aliases' => array( 'ty' ),
);
- $items['thank-you-test'] = array(
+ $items['thank-you-send-test'] = array(
'description' =>
'Simulates sending 1000 thank you emails for donations, to test DB
performance',
'aliases' => array( 'tyt' ),
@@ -26,7 +26,7 @@
*/
function thank_you_drush_help( $section ) {
switch ( $section ) {
-case 'drush:thank-you':
+case 'drush:thank-you-send':
return dt( "Send thank you emails for donations " );
}
}
@@ -37,7 +37,7 @@
* This simply executes the code necessary to run the thank you modules.
* All configuration happens in the module.
*/
-function drush_thank_you() {
+function drush_thank_you_send() {
module_invoke( 'thank_you', 'batch_process' );
$errors = drush_get_error_log();
if (!empty($errors)){
@@ -60,6 +60,6 @@
* This simply executes the code necessary to run the thank you modules.
* All configuration happens in the module.
*/
-function drush_thank_you_test() {
+function drush_thank_you_send_test() {
module_invoke( 'thank_you', 'batch_test' );
}
--
To view, visit https://gerrit.wikimedia.org/r/354224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If30368ebaf9b7d5fd4b1a701638196868710a0e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: rl: Break out mobile.mainMenu style module
Phuedx has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354225 )
Change subject: rl: Break out mobile.mainMenu style module
..
rl: Break out mobile.mainMenu style module
The mobile.mainMenu styles are loaded by OutputPage#addModuleStyles,
which requires that the specified modules are styles-only, on the
Special:MobileMenu page. A side effect of this is that the
mobile.mainMenu JS and templates aren't loaded on Special:MobileMenu,
which is fortunate as they aren't required. They are also loaded by the
RL on other pages.
Support both ways of loading the mobile.mainMenu styles (and other
content) and the RL by:
* Creating the mobile.mainMenu.styles styles-only RL module.
* Making the mobile.mainMenu RL module depend on mobile.mainMenu.styles.
* Only the mobile.mainMenu.styles RL module on Special:MobileMenu.
Bug: T164892
Change-Id: Ia108d63753593ca8e6ce266e595d32af148b436a
---
M extension.json
M includes/specials/SpecialMobileMenu.php
2 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/25/354225/1
diff --git a/extension.json b/extension.json
index 3c27293..49221a2 100644
--- a/extension.json
+++ b/extension.json
@@ -299,6 +299,15 @@
"contributions":
"resources/mobile.mainMenu.icons/contributions.svg"
}
},
+ "mobile.mainMenu.styles": {
+ "targets": [
+ "mobile",
+ "desktop"
+ ],
+ "styles": [
+ "resources/mobile.mainMenu/mainmenu.less"
+ ]
+ },
"mobile.mainMenu": {
"targets": [
"mobile",
@@ -306,13 +315,11 @@
],
"dependencies": [
"mobile.mainMenu.icons",
+ "mobile.mainMenu.styles",
"mobile.startup",
"mobile.loggingSchemas.mobileWebMainMenuClickTracking"
],
"position": "bottom",
- "styles": [
- "resources/mobile.mainMenu/mainmenu.less"
- ],
"templates": {
"menu.hogan":
"resources/mobile.mainMenu/menu.mustache",
"menuGroup.hogan":
"resources/mobile.mainMenu/menuGroup.mustache"
diff --git a/includes/specials/SpecialMobileMenu.php
b/includes/specials/SpecialMobileMenu.php
index 7489064..8b8fff7 100644
--- a/includes/specials/SpecialMobileMenu.php
+++ b/includes/specials/SpecialMobileMenu.php
@@ -34,7 +34,7 @@
$out->addModuleStyles(
[
'mobile.mainMenu.icons',
- 'mobile.mainMenu',
+ 'mobile.mainMenu.styles',
]
);
}
--
To view, visit https://gerrit.wikimedia.org/r/354225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia108d63753593ca8e6ce266e595d32af148b436a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ferm service for rpc.statd on labstore
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354226 )
Change subject: Add ferm service for rpc.statd on labstore
..
Add ferm service for rpc.statd on labstore
rpc.statd is configured to use 55659/tcp via the STATDOPTS variable
configured in modules/labstore/files/nfs-common
Bug: T165136
Change-Id: Iaffbf5238dd867aa3dd00e7fdb1a3e8ea425201a
---
M modules/role/manifests/labs/nfs/ferm.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/354226/1
diff --git a/modules/role/manifests/labs/nfs/ferm.pp
b/modules/role/manifests/labs/nfs/ferm.pp
index 2282dfc..7e9a250 100644
--- a/modules/role/manifests/labs/nfs/ferm.pp
+++ b/modules/role/manifests/labs/nfs/ferm.pp
@@ -12,4 +12,10 @@
port => '111',
srange => '$LABS_NETWORKS',
}
+
+ferm::service { 'labstore_nfs_rpc_statd':
+proto => 'tcp',
+port => '55659',
+srange => '$LABS_NETWORKS',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/354226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaffbf5238dd867aa3dd00e7fdb1a3e8ea425201a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensions: Removed deprecated usage of context handling m...
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354227 )
Change subject: BSExtensions: Removed deprecated usage of context handling
methods
..
BSExtensions: Removed deprecated usage of context handling methods
Change-Id: Ie49ded38eede15454112ae81e1ad43df7126052e
---
M ArticleInfo/ArticleInfo.class.php
M ArticleInfo/extension.json
A ArticleInfo/languages/ArticleInfo.i18n.magic.php
M Blog/Blog.class.php
M Blog/includes/specials/SpecialBlog.class.php
M CSyntaxHighlight/CSyntaxHighlight.class.php
M SaferEdit/SaferEdit.class.php
M ShoutBox/ShoutBox.class.php
M StateBar/StateBar.class.php
M WhoIsOnline/WhoIsOnline.class.php
10 files changed, 47 insertions(+), 65 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/27/354227/1
diff --git a/ArticleInfo/ArticleInfo.class.php
b/ArticleInfo/ArticleInfo.class.php
index f8cf1d6..12c16d5 100644
--- a/ArticleInfo/ArticleInfo.class.php
+++ b/ArticleInfo/ArticleInfo.class.php
@@ -51,7 +51,7 @@
BsConfig::registerVar( 'MW::ArticleInfo::ImageCheckRevision',
'bs-infobar-revision.png', BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_STRING );
BsConfig::registerVar(
'MW::ArticleInfo::CheckRevisionInterval', 10,
BsConfig::LEVEL_PUBLIC|BsConfig::RENDER_AS_JAVASCRIPT|BsConfig::TYPE_INT,
'bs-articleinfo-pref-CheckRevisionInterval', 'int' );
- $this->mCore->registerBehaviorSwitch( 'NOARTICLEINFO', array(
$this, 'noArticleInfoCallback' ) );
+ $this->mCore->registerBehaviorSwitch( 'bs_noarticleinfo' );
$this->setHook( 'BSStateBarAddSortTopVars',
'onStatebarAddSortTopVars' );
$this->setHook( 'BSStateBarAddSortBodyVars',
'onStatebarAddSortBodyVars' );
@@ -65,10 +65,6 @@
$this->setHook( 'SkinTemplateOutputPageBeforeExec' );
wfProfileOut( 'BS::'.__METHOD__ );
- }
-
- public function noArticleInfoCallback() {
- BsExtensionManager::setContext( 'MW::ArticleInfo::Hide' );
}
/**
@@ -117,8 +113,16 @@
* @return boolean Always true to keep hook running
*/
public function onStateBarBeforeTopViewAdd( $oStateBar, &$aTopViews,
$oUser, $oTitle ) {
- if ( BsExtensionManager::isContextActive(
'MW::ArticleInfo::Hide' ) ) return true;
wfProfileIn( 'BS::'.__METHOD__ );
+ $mContext = BsArticleHelper::getInstance( $oTitle
)->getPageProp(
+ 'bs_noarticleinfo'
+ );
+
+ if( $mContext === '' ) {
+ wfProfileOut( 'BS::'.__METHOD__ );
+ return true;
+ }
+
$aTopElements = array(
'statebartoplastedited' =>
$this->makeStateBarTopLastEdited( $oTitle ),
'statebartoplasteditor' =>
$this->makeStateBarTopLastEditor( $oTitle ),
@@ -145,8 +149,14 @@
* @return boolean Always true to keep hook running
*/
public function onStateBarBeforeBodyViewAdd( $oStateBar, &$aBodyViews,
$oUser, $oTitle ) {
- if ( BsExtensionManager::isContextActive(
'MW::ArticleInfo::Hide' ) ) return true;
wfProfileIn( 'BS::'.__METHOD__ );
+ $mContext = BsArticleHelper::getInstance( $oTitle
)->getPageProp(
+ 'bs_noarticleinfo'
+ );
+ if( $mContext === '' ) {
+ wfProfileOut( 'BS::'.__METHOD__ );
+ return true;
+ }
$aBodyElements = array(
'statebarbodysubpages' =>
$this->makeStateBarBodySubPages( $oTitle ),
'statebarbodycategories' =>
$this->makeStateBarBodyCategories( $oTitle ),
diff --git a/ArticleInfo/extension.json b/ArticleInfo/extension.json
index fc84427..ebde4b4 100644
--- a/ArticleInfo/extension.json
+++ b/ArticleInfo/extension.json
@@ -19,6 +19,9 @@
"i18n"
]
},
+ "ExtensionMessagesFiles": {
+ "ArticleInfoMagic": "languages/ArticleInfo.i18n.magic.php"
+ },
"AutoloadClasses": {
"ArticleInfo": "ArticleInfo.class.php",
"ViewStateBarTopElementCategoryShortList":
"views/view.StateBarTopElementCategoryShortList.php"
diff --git a/ArticleInfo/languages/ArticleInfo.i18n.magic.php
b/ArticleInfo/languages/ArticleInfo.i18n.magic.php
new file mode 100644
index 000..5841019
--- /dev/null
+++ b/ArticleInfo/languages/ArticleInfo.i18n.magic.php
@@ -0,0 +1,6 @@
+ array( 0, '__NOARTICLEINFO__',
'__NO_ARTICLEINFO__' ),
+);
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index a3efd69..687f877 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -114,20 +114,11 @@
* @return boolean - always true
*/
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1055
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354228 ) Change subject: db-eqiad.php: Depool db1055 .. db-eqiad.php: Depool db1055 Needs alter table Bug: T159753 Bug: T164530 Change-Id: I73440d41058fd2cacabd42be474bd15a2af73f16 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/28/354228/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index cd02ee6..3d8389d 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager +# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager #T159753 T164530 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73440d41058fd2cacabd42be474bd15a2af73f16 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1055
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354228 ) Change subject: db-eqiad.php: Depool db1055 .. db-eqiad.php: Depool db1055 Needs alter table Bug: T159753 Bug: T164530 Change-Id: I73440d41058fd2cacabd42be474bd15a2af73f16 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index cd02ee6..3d8389d 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager +# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager #T159753 T164530 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, - 'db1055' => 1, +# 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73440d41058fd2cacabd42be474bd15a2af73f16 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1055"
Hello jenkins-bot, Jcrespo, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/354229 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1055" .. Revert "db-eqiad.php: Depool db1055" This reverts commit d63394e012b2451839c3c3df5fd94b16c34ddbee. Change-Id: I796694842fe8354b0bf3709058e52b74f053178d --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/29/354229/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3d8389d..cd02ee6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager #T159753 T164530 + 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I796694842fe8354b0bf3709058e52b74f053178d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1055"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354229 ) Change subject: Revert "db-eqiad.php: Depool db1055" .. Revert "db-eqiad.php: Depool db1055" This reverts commit d63394e012b2451839c3c3df5fd94b16c34ddbee. Change-Id: I796694842fe8354b0bf3709058e52b74f053178d --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3d8389d..cd02ee6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1052' => 0, # B3 2.8TB 96GB, master 'db1067' => 0, # D1 2.8TB 160GB, old master 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager #T159753 T164530 + 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium 'db1066' => 10, # D1 2.8TB 160GB, api 'db1072' => 50, # B2 2.8TB 160GB, api @@ -236,23 +236,23 @@ 's1' => [ 'watchlist' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchanges' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'recentchangeslinked' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'contributions' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'logpager' => [ 'db1051' => 1, -# 'db1055' => 1, + 'db1055' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/354229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I796694842fe8354b0bf3709058e52b74f053178d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Assign roles to kubernetes200X hosts
Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354230 )
Change subject: Assign roles to kubernetes200X hosts
..
Assign roles to kubernetes200X hosts
Give the kubernetes::worker role to these boxes
Bug: T164851
Change-Id: Iafc9937ce6b39a79874196b573ad87819e14f45d
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/354230/1
diff --git a/manifests/site.pp b/manifests/site.pp
index dc2f2c8..807d5b9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1289,7 +1289,7 @@
include ::standard
}
-node /kubernetes100[1-4].eqiad.wmnet/ {
+node /kubernetes[12]00[1-4]\.(codfw|eqiad)\.wmnet/ {
role(kubernetes::worker)
include ::standard
}
--
To view, visit https://gerrit.wikimedia.org/r/354230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafc9937ce6b39a79874196b573ad87819e14f45d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Assign roles to kubernetes200X hosts
Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354230 )
Change subject: Assign roles to kubernetes200X hosts
..
Assign roles to kubernetes200X hosts
Give the kubernetes::worker role to these boxes
Bug: T164851
Change-Id: Iafc9937ce6b39a79874196b573ad87819e14f45d
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index dc2f2c8..807d5b9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1289,7 +1289,7 @@
include ::standard
}
-node /kubernetes100[1-4].eqiad.wmnet/ {
+node /kubernetes[12]00[1-4]\.(codfw|eqiad)\.wmnet/ {
role(kubernetes::worker)
include ::standard
}
--
To view, visit https://gerrit.wikimedia.org/r/354230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafc9937ce6b39a79874196b573ad87819e14f45d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: JS LexemeDeserializer also serializes statements on forms
Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354231 )
Change subject: JS LexemeDeserializer also serializes statements on forms
..
JS LexemeDeserializer also serializes statements on forms
Change-Id: Ic0707ef8df72187366d8a273e63b18936e70c514
---
M resources/datamodel/LexemeForm.js
M resources/serialization/LexemeDeserializer.js
M tests/qunit/serialization/LexemeDeserializer.tests.js
3 files changed, 89 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/31/354231/1
diff --git a/resources/datamodel/LexemeForm.js
b/resources/datamodel/LexemeForm.js
index cbd19a9..47111e3 100644
--- a/resources/datamodel/LexemeForm.js
+++ b/resources/datamodel/LexemeForm.js
@@ -2,15 +2,19 @@
'use strict';
/**
+* @class wikibase.lexeme.datamodel.LexemeForm
+* @mixes wikibase.datamodel.StatementProvider
+*
* @param {string} id
* @param {string} representation
*/
var LexemeForm = util.inherit(
'LexemeForm',
- function ( id, representation, grammaticalFeatures ) {
+ function ( id, representation, grammaticalFeatures,
statementGroupSet ) {
this._id = id;
this._representation = representation;
this._grammaticalFeatures = grammaticalFeatures;
+ wb.datamodel.StatementProvider.call( this,
statementGroupSet );
},
{
@@ -63,4 +67,6 @@
wb.lexeme.datamodel.LexemeForm = LexemeForm;
+ wb.datamodel.StatementProvider.mixInto( LexemeForm );
+
}( wikibase, util ) );
diff --git a/resources/serialization/LexemeDeserializer.js
b/resources/serialization/LexemeDeserializer.js
index 4b17d39..53ff3d9 100644
--- a/resources/serialization/LexemeDeserializer.js
+++ b/resources/serialization/LexemeDeserializer.js
@@ -29,11 +29,30 @@
var statementGroupSetDeserializer = new
SERIALIZER.StatementGroupSetDeserializer(),
termMapDeserializer = new
SERIALIZER.TermMapDeserializer();
- return new wikibase.datamodel.Lexeme(
+ var forms = serialization.forms || [];
+ var deserializedForms = forms.map( function ( form ) {
+ return this.deserializeForm( form );
+ }.bind( this ) );
+
+ var lexeme = new wikibase.datamodel.Lexeme(
serialization.id,
termMapDeserializer.deserialize(
serialization.labels ),
statementGroupSetDeserializer.deserialize(
serialization.claims )
);
+
+ // TODO switch to setter/constructor
+ lexeme.forms = deserializedForms;
+ return lexeme;
+ },
+
+ deserializeForm: function ( formSerialization ) {
+ var statementGroupSetDeserializer = new
SERIALIZER.StatementGroupSetDeserializer();
+ return new wb.lexeme.datamodel.LexemeForm(
+ formSerialization.id,
+ formSerialization.representation,
+ formSerialization.gramaaticalFeatures,
+ statementGroupSetDeserializer.deserialize(
formSerialization.claims )
+ );
}
} );
diff --git a/tests/qunit/serialization/LexemeDeserializer.tests.js
b/tests/qunit/serialization/LexemeDeserializer.tests.js
index 8418b02..dbda4fc 100644
--- a/tests/qunit/serialization/LexemeDeserializer.tests.js
+++ b/tests/qunit/serialization/LexemeDeserializer.tests.js
@@ -7,37 +7,40 @@
QUnit.module( 'wikibase.lexeme.serialization.LexemeDeserializer' );
+ var claimsSerialization = {
+ P1: [
+ {
+ id: 'L1$1',
+ mainsnak: {
+ snaktype: 'novalue',
+ property: 'P1'
+ },
+ type: 'statement',
+ rank: 'normal'
+ }
+ ]
+ };
var serialization = {
type: 'lexeme',
id: 'L1',
lemmas: {},
lexicalCategory: 'Q2',
language: 'Q2',
- claims: {
- P1: [
- {
- id: 'L1$1',
- mainsnak: {
-
[MediaWiki-commits] [Gerrit] mediawiki...Listings[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354232 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I3ac116bd7cc426253a7192cf71c2a1cc1420f19e
---
M Listings.body.php
M composer.json
A phpcs.xml
3 files changed, 48 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Listings
refs/changes/32/354232/1
diff --git a/Listings.body.php b/Listings.body.php
index cba597e..e3f89ea 100644
--- a/Listings.body.php
+++ b/Listings.body.php
@@ -2,13 +2,13 @@
class Listings {
public static function setupHooks( Parser $parser ) {
- $parser->setHook( 'buy', array( 'Listings', 'buyListings'
) );
- $parser->setHook( 'do', array( 'Listings', 'doListings'
) );
- $parser->setHook( 'drink', array( 'Listings', 'drinkListings'
) );
- $parser->setHook( 'eat', array( 'Listings', 'eatListings'
) );
- $parser->setHook( 'listing', array( 'Listings', 'otherlistings'
) );
- $parser->setHook( 'see', array( 'Listings', 'seeListings'
) );
- $parser->setHook( 'sleep', array( 'Listings', 'sleepListings'
) );
+ $parser->setHook( 'buy', [ 'Listings', 'buyListings' ] );
+ $parser->setHook( 'do', [ 'Listings', 'doListings' ] );
+ $parser->setHook( 'drink', [ 'Listings', 'drinkListings' ] );
+ $parser->setHook( 'eat', [ 'Listings', 'eatListings' ] );
+ $parser->setHook( 'listing', [ 'Listings', 'otherlistings' ] );
+ $parser->setHook( 'see', [ 'Listings', 'seeListings' ] );
+ $parser->setHook( 'sleep', [ 'Listings', 'sleepListings' ] );
return true;
}
@@ -93,7 +93,8 @@
private static function listingsTag( $aType, $input, $args, $parser ) {
/*
-* if a {{listings}} template exists, feed tag name and
parameter list to template verbatim and exit
+* if a {{listings}} template exists,
+* feed tag name and parameter list to template verbatim and
exit
*/
$ltemplate = '';
if ( !wfMessage( 'listings-template'
)->inContentLanguage()->isDisabled() ) {
@@ -203,15 +204,15 @@
}
// @fixme: a lot of localisation-unfriendly patchwork below
- $out = Html::element( 'strong', array(), $name );
+ $out = Html::element( 'strong', [], $name );
if ( $url != '' ) {
$sanitizedHref = Sanitizer::validateAttributes(
- array( 'href' => $url ),
- array( 'href' )
+ [ 'href' => $url ],
+ [ 'href' ]
);
if ( isset( $sanitizedHref['href'] ) ) {
$out = Html::rawElement( 'a',
- $sanitizedHref + array( 'class' =>
'external text', 'rel' => 'nofollow', 'title' => $name ),
+ $sanitizedHref + [ 'class' => 'external
text', 'rel' => 'nofollow', 'title' => $name ],
$out
);
}
@@ -236,27 +237,39 @@
}
}
- $phoneSymbol = $parser->internalParse( wfMessage(
'listings-phone-symbol' )->inContentLanguage()->text() );
+ $phoneSymbol = $parser->internalParse(
+ wfMessage( 'listings-phone-symbol'
)->inContentLanguage()->text() );
if ( $phoneSymbol != '' ) {
- $phoneSymbol = '' . $phoneSymbol .
'';
+ $phoneSymbol = '' . $phoneSymbol . '';
} else {
$phoneSymbol = wfMessage( 'listings-phone'
)->inContentLanguage()->escaped();
}
- $faxSymbol = $parser->internalParse( wfMessage(
'listings-fax-symbol' )->inContentLanguage()->text() );
+ $faxSymbol = $parser->internalParse(
+ wfMessage( 'listings-fax-symbol'
)->inContentLanguage()->text() );
if ( $faxSymbol != '' ) {
- $faxSymbol = '' . $faxSymbol .
'';
+ $faxSymbol = '' . $faxSymbol . '';
} else {
$faxSymbol = wfMessage( 'listings-fax'
)->inContentLanguage()->escaped();
}
- $emailSymbol = $parser->internalParse( wfMessage(
'listings-email-symbol' )->inContentLanguage()->text() );
+ $emailSymbol = $parser->internalParse(
+ wfMessage( 'listings-email-symbol'
)->inContentLanguage()->text() );
[MediaWiki-commits] [Gerrit] mediawiki...MobileApp[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354233 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I668566534cbf54da053cc30353a57326974724e8
---
M MobileAppResourceLoaderModule.php
M composer.json
A phpcs.xml
3 files changed, 17 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp
refs/changes/33/354233/1
diff --git a/MobileAppResourceLoaderModule.php
b/MobileAppResourceLoaderModule.php
index 5c0346f..bc68a8d 100644
--- a/MobileAppResourceLoaderModule.php
+++ b/MobileAppResourceLoaderModule.php
@@ -8,9 +8,8 @@
* @return array
*/
protected function getPages( ResourceLoaderContext $context ) {
- return array(
- 'MediaWiki:Mobile.css' => array( 'type' => 'style'
),
- );
+ return [
+ 'MediaWiki:Mobile.css' => [ 'type' => 'style' ],
+ ];
}
}
-
diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
+ "fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..ede6c5d
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,9 @@
+
+
+
+ .
+
+
+ vendor
+ node_modules
+
--
To view, visit https://gerrit.wikimedia.org/r/354233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I668566534cbf54da053cc30353a57326974724e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
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...NavigationTiming[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354234 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: Id04068cb1eb56eef5ca5ba06b79295151c5b2dd6
---
M NavigationTiming.php
M composer.json
A phpcs.xml
3 files changed, 15 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming
refs/changes/34/354234/1
diff --git a/NavigationTiming.php b/NavigationTiming.php
index a0704e9..194fd72 100644
--- a/NavigationTiming.php
+++ b/NavigationTiming.php
@@ -25,4 +25,4 @@
return;
} else {
die( 'This version of the NavigationTiming extension requires MediaWiki
1.25+' );
-}
\ No newline at end of file
+}
diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
+ "fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..ede6c5d
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,9 @@
+
+
+
+ .
+
+
+ vendor
+ node_modules
+
--
To view, visit https://gerrit.wikimedia.org/r/354234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id04068cb1eb56eef5ca5ba06b79295151c5b2dd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NavigationTiming
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...parsoid[master]: Allow \r\n in wikilink titles.
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354235 )
Change subject: Allow \r\n in wikilink titles.
..
Allow \r\n in wikilink titles.
This fixes an RT testing regression on
[[it:Teenage Mutant Ninja Turtles - Tartarughe Ninja]]
caused by this fragment of (bogus) wikitext:
|autori = [[ Ciro Nieli
Joshua Sternin
J. R. Ventimilia]]
In general our practice now is *not* to try to validate the title inside
the tokenizer, but instead to accept the same set of characters here that
the PHP preprocessor does and wait until later title validation to
unlink bogus titles.
Change-Id: I0ed15d6e897d2734ad8436c73de2fdcc4d0f563a
---
M lib/wt2html/pegTokenizer.pegjs
M tests/parserTests.txt
2 files changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/35/354235/1
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 2664c17..72b2d42 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1950,7 +1950,7 @@
wikilink_preprocessor_text
= r:( t:$[^<[{\n\r\t|!\]}{ &\-]+
// XXX gwicke: any more chars we need to allow here?
-/ !inline_breaks wr:( directive / $( !"]]" ( text_char / [!<\-\}\]] )
) )
+/ !inline_breaks wr:( directive / $( !"]]" ( text_char /
[!<\-\}\]\n\r] ) ) )
{ return wr; }
)+ {
return tu.flattenStringlist(r);
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 2d107e7..0d93294 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5332,6 +5332,21 @@
!! end
!! test
+Wikilinks with embedded newlines are not broken
+!! wikitext
+{{echo|[[ Foo
+B
+C]]}}
+!! html/php
+[[ Foo
+B
+C]]
+
+!! html/parsoid
+[[ Foo B C]]
+!! end
+
+!! test
Broken templates
!! options
parsoid=wt2html
--
To view, visit https://gerrit.wikimedia.org/r/354235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ed15d6e897d2734ad8436c73de2fdcc4d0f563a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NewUserMessage[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354236 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: Iafd01ef4008a7f763b2a0a6132fbe9148f5be823
---
M NewUserMessage.class.php
M composer.json
A phpcs.xml
3 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewUserMessage
refs/changes/36/354236/1
diff --git a/NewUserMessage.class.php b/NewUserMessage.class.php
index 48b4f62..512023e 100644
--- a/NewUserMessage.class.php
+++ b/NewUserMessage.class.php
@@ -24,7 +24,7 @@
$editor = User::newFromName( self::getMsg(
'newusermessage-editor' )->text() );
if ( !$editor ) {
- return false; # Invalid user name
+ return false; // Invalid user name
}
if ( !$editor->isLoggedIn() ) {
@@ -44,7 +44,7 @@
if ( !self::getMsg( 'newusermessage-signatures' )->isDisabled()
) {
$pattern = '/^\* ?(.*?)$/m';
- $signatureList = array();
+ $signatureList = [];
preg_match_all( $pattern, $signatures, $signatureList,
PREG_SET_ORDER );
if ( count( $signatureList ) > 0 ) {
$rand = rand( 0, count( $signatureList ) - 1 );
@@ -110,8 +110,12 @@
global $wgNewUserMinorEdit, $wgNewUserSuppressRC;
$flags = EDIT_NEW;
- if ( $wgNewUserMinorEdit ) $flags = $flags | EDIT_MINOR;
- if ( $wgNewUserSuppressRC ) $flags = $flags | EDIT_SUPPRESS_RC;
+ if ( $wgNewUserMinorEdit ) {
+ $flags = $flags | EDIT_MINOR;
+ }
+ if ( $wgNewUserSuppressRC ) {
+ $flags = $flags | EDIT_SUPPRESS_RC;
+ }
return $flags;
}
@@ -125,7 +129,7 @@
* @param $preparse bool If provided, then preparse the string using a
Parser
* @return string
*/
- static private function substString( $str, $user, $editor, $talk,
$preparse = null ) {
+ private static function substString( $str, $user, $editor, $talk,
$preparse = null ) {
$realName = $user->getRealName();
$name = $user->getName();
@@ -258,7 +262,7 @@
* @param $signature string the signature, if provided.
* @return string in wiki text with complete user message
*/
- static protected function formatUserMessage( $subject, $text,
$signature ) {
+ protected static function formatUserMessage( $subject, $text,
$signature ) {
$contents = "";
$signature = empty( $signature ) ? "" : "{$signature}
~";
@@ -274,7 +278,7 @@
* @param $name
* @return Message
*/
- static protected function getMsg( $name ) {
+ protected static function getMsg( $name ) {
return wfMessage( $name )->inContentLanguage();
}
}
diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
+ "fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..ede6c5d
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,9 @@
+
+
+
+ .
+
+
+ vendor
+ node_modules
+
--
To view, visit https://gerrit.wikimedia.org/r/354236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafd01ef4008a7f763b2a0a6132fbe9148f5be823
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewUserMessage
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] operations/mediawiki-config[master]: db-eqiad.php: Repool db1074, depool db1060
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354237 ) Change subject: db-eqiad.php: Repool db1074, depool db1060 .. db-eqiad.php: Repool db1074, depool db1060 db1074 finished alter table db1060 needs alter table Bug: T162611 Change-Id: I0d18868ed21e8412569aa70ebeb68073484b9bfe --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/37/354237/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3d8389d..d1f3d6e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -110,8 +110,8 @@ # 'db1018' => 0, # B1 1.4TB 64GB, old master 2 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1060' => 1, # C2 2.8TB 96GB, api -# 'db1074' => 300, # A2 3.6TB 512GB, api #T162611 +# 'db1060' => 1, # C2 2.8TB 96GB, api #T162611 + 'db1074' => 300, # A2 3.6TB 512GB, api 'db1076' => 300, # B1 3.6TB 512GB #temporary api #T162611 'db1090' => 500, # C3 3.6TB 512GB ], @@ -274,7 +274,8 @@ 'db1021' => 1, ], 'api' => [ - 'db1060' => 2, +# 'db1060' => 2, + 'db1074' => 1, 'db1076' => 1, ], 'watchlist' => [ -- To view, visit https://gerrit.wikimedia.org/r/354237 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d18868ed21e8412569aa70ebeb68073484b9bfe Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ParsoidBatchAPI[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354238 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I75faa8bd39e062b12d544c2f48d1998bbce68893
---
M composer.json
M includes/ApiParsoidBatch.php
A phpcs.xml
3 files changed, 53 insertions(+), 41 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParsoidBatchAPI
refs/changes/38/354238/1
diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
+ "fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
]
}
}
diff --git a/includes/ApiParsoidBatch.php b/includes/ApiParsoidBatch.php
index 5d8e656..2af855d 100644
--- a/includes/ApiParsoidBatch.php
+++ b/includes/ApiParsoidBatch.php
@@ -10,7 +10,7 @@
$config = $context->getConfig();
$ipset = new IPSet( $config->get( 'ParsoidBatchAPI_AllowedIPs'
) );
if ( !$ipset->match( $context->getRequest()->getIP() ) ) {
- if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+ if ( is_callable( [ $this, 'dieWithError' ] ) ) {
$this->dieWithError(
'apierror-parsoid-batch-notallowed', 'not_allowed' );
} else {
$this->dieUsage( "Client IP address not in
ParsoidBatchAPI_AllowedIPs",
@@ -21,14 +21,14 @@
// Parameter validation
$batch = json_decode( $params['batch'], true );
if ( !is_array( $batch ) ) {
- if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+ if ( is_callable( [ $this, 'dieWithError' ] ) ) {
$this->dieWithError(
'apierror-parsoid-batch-invalidbatch', 'invalid_batch' );
} else {
$this->dieUsage( "Invalid batch, must be
array", 'invalid_batch' );
}
}
if ( count( $batch ) > 500 ) {
- if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+ if ( is_callable( [ $this, 'dieWithError' ] ) ) {
$this->dieWithError(
'apierror-parsoid-batch-batchtoolarge', 'batch_too_large' );
} else {
$this->dieUsage( "Batch too large, limit is
500", 'batch_too_large' );
@@ -38,7 +38,7 @@
wfIncrStats( 'ParsoidBatchAPI.items', count( $batch ) );
$size = 0;
- $filenames = array();
+ $filenames = [];
foreach ( $batch as $itemIndex => $itemParams ) {
$action = $itemParams['action'];
$this->assertScalar( $itemParams, 'action' );
@@ -64,7 +64,7 @@
$filenames[] =
$batch[$itemIndex]['filename'] = $title->getDBkey();
}
} else {
- if ( is_callable( array( $this, 'dieWithError'
) ) ) {
+ if ( is_callable( [ $this, 'dieWithError' ] ) )
{
$this->dieWithError(
[
'apierror-parsoid-batch-invalidaction', wfEscapeWikiText( $itemIndex ) ],
'invalid_action'
);
@@ -74,7 +74,7 @@
}
}
if ( $size > 1024 * $config->get( 'MaxArticleSize' ) ) {
- if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+ if ( is_callable( [ $this, 'dieWithError' ] ) ) {
$this->dieWithError(
'apierror-parsoid-batch-texttoobig', 'text_too_big' );
} else {
$this->dieUsage( "Input text exceeds maximum
article size", 'text_too_big' );
@@ -85,17 +85,17 @@
if ( count( $filenames ) ) {
$files = RepoGroup::singleton()->findFiles( $filenames
);
} else {
- $files = array();
+ $files = [];
}
- $batchResult = array();
+ $batchResult = [];
$result = $this->getResult();
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Fix mmv.bootstrap qunit tests
Jforrester has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352183 )
Change subject: Fix mmv.bootstrap qunit tests
..
Fix mmv.bootstrap qunit tests
This heavily relied on deferreds getting resolved synchroneously,
which (for .then) is no longer the case with jQuery 3.
There's also a difference in how chained .then's get resolved.
These tests did not wait for the deferreds to get resolved async,
so that had to change. Worse even: some functionality was tested
by assuming a handler would not be called (= the test in that
handler would not be called), which didn't make the test run,
because we never even waited for it to be called.
The changes in here are basically:
* make mmv.bootstrap.js correctly use .then instead of .done & fail
* let mmw.bootstrap.test.js tests wait for unresolved async promises
* check call counts instead of running tests inside of callbacks
* limit use of fake timer to the 1 test that needs it (it interferes
with async, which otherwise don't get resolved)
Bug: T164473
Change-Id: I3ca4f786890ad1646f71fe336afdb61e5c3b01c7
---
M resources/mmv/mmv.bootstrap.js
M tests/qunit/mmv/mmv.bootstrap.test.js
M tests/qunit/mmv/mmv.testhelpers.js
3 files changed, 229 insertions(+), 122 deletions(-)
Approvals:
Jforrester: Verified; Looks good to me, approved
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 4da5a9c..10d9e81 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -112,20 +112,26 @@
deferred.reject( error.message );
} );
- return deferred.done( function ( viewer ) {
- if ( !bs.viewerInitialized ) {
- if ( bs.thumbs.length ) {
- viewer.initWithThumbs( bs.thumbs );
- }
+ return deferred.promise()
+ .then(
+ function ( viewer ) {
+ if ( !bs.viewerInitialized ) {
+ if ( bs.thumbs.length ) {
+ viewer.initWithThumbs(
bs.thumbs );
+ }
- bs.viewerInitialized = true;
- }
- } ).fail( function ( message ) {
- mw.log.warn( message );
- bs.cleanupOverlay();
- bs.viewerIsBroken = true;
- mw.notify( 'Error loading MediaViewer: ' + message );
- } );
+ bs.viewerInitialized = true;
+ }
+ return viewer;
+ },
+ function ( message ) {
+ mw.log.warn( message );
+ bs.cleanupOverlay();
+ bs.viewerIsBroken = true;
+ mw.notify( 'Error loading MediaViewer:
' + message );
+ return $.Deferred().reject( message );
+ }
+ );
};
/**
diff --git a/tests/qunit/mmv/mmv.bootstrap.test.js
b/tests/qunit/mmv/mmv.bootstrap.test.js
index d8f64da..2821d78 100644
--- a/tests/qunit/mmv/mmv.bootstrap.test.js
+++ b/tests/qunit/mmv/mmv.bootstrap.test.js
@@ -4,7 +4,6 @@
mw.config.set( 'wgMediaViewer', true );
mw.config.set( 'wgMediaViewerOnClick', true );
this.sandbox.stub( mw.user, 'isAnon' ).returns( false );
- this.clock = this.sandbox.useFakeTimers();
}
} ) );
@@ -67,80 +66,93 @@
}
function hashTest( prefix, bootstrap, assert ) {
- var hash = prefix + '/foo';
+ var hash = prefix + '/foo',
+ callCount = 0;
+
+ bootstrap.loadViewer = function () {
+ callCount++;
+ return $.Deferred().reject();
+ };
+
+ // Hijack loadViewer, which will return a promise that we'll
have to
+ // wait for if we want to see these tests through
+ mw.mmv.testHelpers.asyncMethod( bootstrap, 'loadViewer' );
bootstrap.setupEventHandlers();
- bootstrap.loadViewer = function () {
- assert.ok( false, 'Viewer should not be loaded' );
- return $.Deferred().reject();
- };
-
+ // invalid hash, should not trigger MMV load
window.location.hash = 'Foo';
-
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Fix mmv qunit tests
Jforrester has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353307 )
Change subject: Fix mmv qunit tests
..
Fix mmv qunit tests
This heavily relied on deferreds getting resolved synchroneously,
which (for .then) is no longer the case with jQuery 3.
There's also a difference in how chained .then's get resolved,
and $.when no longer propagates notify().
The changes in here are basically:
* fix use of $.when, manually passing along notify()
* use .then in some places, instead of .done, .fail, .progress
* fix progress bar hiding in setupProgressBar, which assumed sync
* fixed tests, mostly by using fake timers to give async stuff a
chance to execute
Bug: T164473
Change-Id: Ib51ddd8bc6254a477861588fb16f57565353afe1
---
M resources/mmv/mmv.js
M tests/qunit/mmv/mmv.test.js
2 files changed, 168 insertions(+), 109 deletions(-)
Approvals:
Jforrester: Verified; Looks good to me, approved
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index f7b2eee..d6aa6f4 100644
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -288,63 +288,78 @@
metadataPromise = this.fetchSizeIndependentLightboxInfo(
image.filePageTitle );
- imagePromise.done( function ( thumbnail, imageElement ) {
- if ( viewer.currentIndex !== image.index ) {
- return;
- }
+ imagePromise.then(
+ // done
+ function ( thumbnail, imageElement ) {
+ if ( viewer.currentIndex !== image.index ) {
+ return;
+ }
- if ( viewer.imageDisplayedCount++ === 0 ) {
- mw.mmv.durationLogger.stop(
'click-to-first-image' );
+ if ( viewer.imageDisplayedCount++ === 0 ) {
+ mw.mmv.durationLogger.stop(
'click-to-first-image' );
- metadataPromise.done( function ( imageInfo ) {
- if ( !imageInfo ||
!imageInfo.anonymizedUploadDateTime ) {
- return;
- }
+ metadataPromise.then( function (
imageInfo, repoInfo ) {
+ if ( imageInfo &&
imageInfo.anonymizedUploadDateTime ) {
+
mw.mmv.durationLogger.record( 'click-to-first-image', {
+
uploadTimestamp: imageInfo.anonymizedUploadDateTime
+ } );
+ }
- mw.mmv.durationLogger.record(
'click-to-first-image', {
- uploadTimestamp:
imageInfo.anonymizedUploadDateTime
+ return $.Deferred().resolve(
imageInfo, repoInfo );
} );
+ }
+
+ imageElement.className = 'mw-mmv-final-image '
+ image.filePageTitle.ext.toLowerCase();
+ imageElement.alt = image.alt;
+
+ $.when( metadataPromise, pluginsPromise ).then(
function ( metadata ) {
+ $( document ).trigger( $.Event(
'mmv-metadata', { viewer: viewer, image: image, imageInfo: metadata[ 0 ] } ) );
} );
+
+ viewer.displayRealThumbnail( thumbnail,
imageElement, imageWidths, $.now() - start );
+
+ return $.Deferred().resolve( thumbnail,
imageElement );
+ },
+ // fail
+ function ( error ) {
+ viewer.ui.canvas.showError( error );
+ return $.Deferred().reject( error );
}
+ );
- imageElement.className = 'mw-mmv-final-image ' +
image.filePageTitle.ext.toLowerCase();
- imageElement.alt = image.alt;
+ metadataPromise.then(
+ // done
+ function ( imageInfo, repoInfo ) {
+ extraStatsDeferred.resolve( { uploadTimestamp:
imageInfo.anonymizedUploadDateTime } );
- $.when( metadataPromise, pluginsPromise ).done(
function ( metadata ) {
- $( document ).trigger( $.Event( 'mmv-metadata',
{ viewer: viewer, image: image, imageInfo: metadata[ 0 ] } ) );
- } );
+
