[MediaWiki-commits] [Gerrit] Remove U+FEFF before opening ?php tag - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged. Change subject: Remove U+FEFF before opening ?php tag .. Remove U+FEFF before opening ?php tag Change-Id: Ib2f1a75f4a3b5879809243cf43124bf3ebf83127 --- M tests/MathMathMLTest.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/MathMathMLTest.php b/tests/MathMathMLTest.php index e410070..5fb2749 100644 --- a/tests/MathMathMLTest.php +++ b/tests/MathMathMLTest.php @@ -1,4 +1,4 @@ -?php +?php /** * Test the MathML output format. * -- To view, visit https://gerrit.wikimedia.org/r/196297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2f1a75f4a3b5879809243cf43124bf3ebf83127 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix x axis labels - change (wikimedia...dash)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix x axis labels
..
Fix x axis labels
Also simplifies data processing. No longer invents data points
for time periods where no data exists in the database. Also add
hour groupings and fix hour display label.
Change-Id: I12f0ba790e2668287471f74b5f84a3b969e4f517
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
M widgets/x-by-y.js
3 files changed, 93 insertions(+), 316 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 3efc24f..ba71d70 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -4,6 +4,12 @@
'momentjs'
], function( $, ko, moment ){
+ function zeroPad( number ) {
+ if ( number 10 ) {
+ return '0' + number;
+ }
+ return number;
+ }
function WidgetBase( params ){
var self = this;
@@ -66,76 +72,47 @@
self.processData = function(rawdata, timescale){
- var dailyDataArray =
['Daily Total'],
- dailyCountArray =
['Daily Count'],
- secondsByHourDonationData = ['Donations
Per Second'],
- dayObj
= {}, returnObj;
+ var timeWord = ( timescale === 'Day' ? 'Dai' :
timescale ) + 'ly',
+ totals = [ timeWord + ' Total'],
+ counts = [ timeWord + ' Count'],
+ xs = [ 'x' ],
+ defaultYear = new Date().getFullYear(),
+ defaultMonth = new Date().getMonth() + 1,
+ tempDate, timeFormat;
+
+ $.each( rawdata, function( index, dataPoint ) {
+ totals.push( dataPoint.usd_total );
+ counts.push( dataPoint.donations );
+
+ tempDate = ( dataPoint.Year || defaultYear ) +
'-';
+ tempDate += zeroPad( dataPoint.Month ||
defaultMonth ) + '-';
+ tempDate += zeroPad( dataPoint.Day || 1 );
+ tempDate += ' ' + zeroPad( dataPoint.Hour || 0
);
+
+ xs.push( tempDate );
+ } );
switch(timescale){
case 'Year':
+ timeFormat = '%Y';
+ break;
case 'Month':
- var monthlyDataArray = ['Monthly
Total'],
- monthlyCountArray = ['Monthly Count'],
- months = rawdata;
-
- $.each(months, function(i, el){
-
monthlyDataArray.push(el.usd_total);
-
monthlyCountArray.push(el.donations);
- });
-
- returnObj = {
- timescale: timescale,
- monthlyDataArray:
monthlyDataArray,
- monthlyCountArray:
monthlyCountArray
- };
- return returnObj;
+ timeFormat = '%b \'%y';
+ break;
case 'Day':
+ timeFormat = '%b %e';
+ break;
case 'Hour':
- for (var d = 1; d 32; d++) {
- dailyDataArray[d] = 0;
- dailyCountArray[d] = 0;
- if (!dayObj[d]) {
- dayObj[d] = new
Array(25);
- dayObj[d][0] = 'Hourly
Totals';
- for (var h = 0; h 24;
h++) {
- dayObj[d][h +
1] = { total: 0, count: 0 };
-
secondsByHourDonationData[(d - 1) * 24 + h + 1] = 0;
- }
- }
-
[MediaWiki-commits] [Gerrit] Tag v0.9.1 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Tag v0.9.1
..
Tag v0.9.1
Change-Id: Id98897f45e29882672c561d28c6ca0bc6c3bf99f
---
M History.md
M package.json
2 files changed, 44 insertions(+), 1 deletion(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/History.md b/History.md
index 0f1486e..8475ba8 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,48 @@
# OOjs UI Release History
+## v0.9.1 / 2014-03-11
+* Syncing some button styles with MediaWiki UI (kaldari)
+* MediaWiki Theme: Add the progressive variant to the check icon (Prateek
Saxena)
+* demo: Fix typo in toolbars demo (Bartosz Dziewoński)
+* TextInputWidget: Use MutationObserver for #onElementAttach support (Bartosz
Dziewoński)
+* TextInputWidget: Adjust size and label on first focus, too (Bartosz
Dziewoński)
+* jsduck: Add MouseEvent and KeyboardEvent to externals (Timo Tijhof)
+* jsduck: Set --processes=0 to fix warnings-exit-nonzero (Timo Tijhof)
+* Dialog: Mark private methods and add description of methods and configs
(Kirsten Menger-Anderson)
+* ProcessDialog: Add description and example and mark private methods (Kirsten
Menger-Anderson)
+* MessageDialog: Add description, example, and mark private methods (Kirsten
Menger-Anderson)
+* build: Remove obsolete 'build' task from grunt-doc (Timo Tijhof)
+* build: Move pre/post 'doc' task into package.json (Timo Tijhof)
+* Remove remnants of window isolation (Bartosz Dziewoński)
+* demo: Simplify @media styles (Bartosz Dziewoński)
+* PanelLayout: Add 'framed' config option (Bartosz Dziewoński)
+* TextInputMenuSelectWidget: Add description and mark private methods (Kirsten
Menger-Anderson)
+* Toolbar: Tighten whitespace on narrow displays (Bartosz Dziewoński)
+* demo: Use popup with head in the toolbars demo (Bartosz Dziewoński)
+* Remove half-baked touch event handling (Bartosz Dziewoński)
+* ButtonElement: Use #setButtonElement correctly (Bartosz Dziewoński)
+* WindowManager: Documentation typo (Ed Sanders)
+* ButtonInputWidget: Clarify description of configs and methods (Kirsten
Menger-Anderson)
+* Icon width should only be applied if there is an icon (Moriel Schottlender)
+* package.json: Bump grunt-svg2png to 0.2.7 (Bartosz Dziewoński)
+* Add warning variant to MediaWiki set (Mark Holmquist)
+* Button styles between OOJS and MW (nirzar)
+* AUTHORS: Add Derk-Jan Hartman (Derk-Jan Hartman)
+* ActionSet: Add description for events and clarify method descriptions
(Kirsten Menger-Anderson)
+* demo: Load styles before building demo widgets (not asynchronously) (Bartosz
Dziewoński)
+* ActionWidget: Fix bad copy-paste in documentation (Bartosz Dziewoński)
+* Window: Clarify descriptions of methods and configs (Kirsten Menger-Anderson)
+* OutlineSelectWidget: Add description (Kirsten Menger-Anderson)
+* OutlineControlsWidget: Add description (Kirsten Menger-Anderson)
+* MediaWiki Theme: Add Wikicon icons (James D. Forrester)
+* build: Set 'generateExactDuplicates: true' for CSSJanus (Bartosz Dziewoński)
+* build: Implement basic image flipping support in colorize-svg (Bartosz
Dziewoński)
+* ActionWidget: Clarify description and mark private method (Kirsten
Menger-Anderson)
+* ActionSet: Clarify description (Kirsten Menger-Anderson)
+* InputWidget: Clarify description (Kirsten Menger-Anderson)
+* MediaWiki Theme: textInputWidget: Update focus state (Prateek Saxena)
+* Only prevent default for handled keypresses (Brad Jorsch)
+
## v0.9.0 / 2014-03-04
* [BREAKING CHANGE] Remove innerOverlay (Ed Sanders)
* [BREAKING CHANGE] TextInputWidget: Remove 'icon' and 'indicator' events
(Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 4372056..3448239 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
name: oojs-ui,
- version: 0.9.0,
+ version: 0.9.1,
description: User interface classes built on the OOjs framework.,
keywords: [
oojs-plugin,
--
To view, visit https://gerrit.wikimedia.org/r/196120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id98897f45e29882672c561d28c6ca0bc6c3bf99f
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert sessions: temporarily disable mc1014 - change (operations/mediawiki-config)
Rush has submitted this change and it was merged. Change subject: Revert sessions: temporarily disable mc1014 .. Revert sessions: temporarily disable mc1014 This reverts commit 74b9e29f32fe9786cfb9240056340c4002ac60c7. Change-Id: Icf419e2fa6be8b0d2134a0b1d67e6ddedae9e61b --- M wmf-config/session.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Rush: Looks good to me, approved Catrope: Looks good to me, but someone else must approve diff --git a/wmf-config/session.php b/wmf-config/session.php index 27502a5..6386001 100644 --- a/wmf-config/session.php +++ b/wmf-config/session.php @@ -15,7 +15,7 @@ '10.64.32.165', # mc1011 '10.64.32.166', # mc1012 '10.64.48.101', # mc1013 -# '10.64.48.102', # mc1014 + '10.64.48.102', # mc1014 '10.64.48.103', # mc1015 '10.64.48.104', # mc1016 '10.64.48.95', # mc1017 -- To view, visit https://gerrit.wikimedia.org/r/196302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf419e2fa6be8b0d2134a0b1d67e6ddedae9e61b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Rush r...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Rush r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert inputs.less: Change focus state - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196308
Change subject: Revert inputs.less: Change focus state
..
Revert inputs.less: Change focus state
Prematurely merged ahead of the synchronised OOjs UI change; let's do this in
wmf22 instead.
This reverts commit 8b73bc2df9b94a692528cf692c5e111fc5d34b53.
Change-Id: I24f33a40cd0126ae95698c2a46858a15f502ca5a
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/08/196308/1
diff --git a/resources/src/mediawiki.ui/components/inputs.less
b/resources/src/mediawiki.ui/components/inputs.less
index 1992cce..b16570a 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -39,7 +39,7 @@
font-family: inherit;
font-size: inherit;
line-height: inherit;
- .transition(~border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1),
box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1));
+ .transition(~border linear .2s, box-shadow linear .2s);
// Placeholder text styling must be set individually for each browser
@winter
::-webkit-input-placeholder { // webkit
@@ -64,9 +64,8 @@
}
:focus {
- box-shadow: inset 0 0 0 2px @colorProgressive;
- // Color being used to match inset shadow, not semantic reasons
- border-color: @colorProgressive;
+ box-shadow: inset .45em 0 0 @colorProgressive;
+ border-color: @colorGrayDark;
// Remove focus glow on input[type=search]
outline: 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/196308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24f33a40cd0126ae95698c2a46858a15f502ca5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf21
Gerrit-Owner: Jforrester jforres...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix addData calls - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix addData calls
..
Fix addData calls
Change-Id: I97d503dbb979dcfe083989512326170e73a167d0
---
M amazon_gateway/amazon_gateway.body.php
M paypal_gateway/paypal_gateway.body.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/amazon_gateway/amazon_gateway.body.php
b/amazon_gateway/amazon_gateway.body.php
index a20a901..7792149 100644
--- a/amazon_gateway/amazon_gateway.body.php
+++ b/amazon_gateway/amazon_gateway.body.php
@@ -44,7 +44,7 @@
|| $this-getRequest()-getText(
'recurring', 0 )
) {
// FIXME: do this in the form param
harvesting step
- $this-adapter-addData( array(
+ $this-adapter-addRequestData( array(
'recurring' = 1,
) );
}
diff --git a/paypal_gateway/paypal_gateway.body.php
b/paypal_gateway/paypal_gateway.body.php
index 8ae2b63..5354c57 100644
--- a/paypal_gateway/paypal_gateway.body.php
+++ b/paypal_gateway/paypal_gateway.body.php
@@ -34,7 +34,7 @@
if ( $this-getRequest()-getText( 'ffname', 'default' ) ===
'paypal-recurring' ) {
// FIXME: do this in the form param harvesting step
- $this-adapter-addData( array(
+ $this-adapter-addRequestData( array(
'recurring' = 1,
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/196307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97d503dbb979dcfe083989512326170e73a167d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/196309 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 7391d7a72088a757519e8435e7dc97189e33ecbf Fix addData calls Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/09/196309/1 -- To view, visit https://gerrit.wikimedia.org/r/196309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove unused api module - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196283
Change subject: Hygiene: Remove unused api module
..
Hygiene: Remove unused api module
This is confusing me lots! Let's get rid of it since it's not being
used.
Change-Id: Ic97683ae36344eb8b70f6ff423c7d6637722886e
---
M Gather.php
M extension.json
D includes/api/CollectionsListApi.php
3 files changed, 1 insertion(+), 110 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/83/196283/1
diff --git a/Gather.php b/Gather.php
index 31b8898..43061d4 100644
--- a/Gather.php
+++ b/Gather.php
@@ -67,7 +67,6 @@
'Gather\api\ApiEditList' = 'api/ApiEditList',
'Gather\api\ApiQueryLists' = 'api/ApiQueryLists',
- 'Gather\api\CollectionsListApi' = 'api/CollectionsListApi',
'Gather\api\ApiQueryListPages' = 'api/ApiQueryListPages',
);
@@ -93,7 +92,6 @@
$wgHooks['LoadExtensionSchemaUpdates'][] =
'Gather\UpdaterHooks::onLoadExtensionSchemaUpdates';
// Api
-$wgAPIModules['gather'] = 'Gather\api\CollectionsListApi';
$wgAPIModules['editlist'] = 'Gather\api\ApiEditList';
$wgAPIListModules['lists'] = 'Gather\api\ApiQueryLists';
$wgAPIListModules['listpages'] = 'Gather\api\ApiQueryListPages';
diff --git a/extension.json b/extension.json
index 209a1e9..ebc3750 100644
--- a/extension.json
+++ b/extension.json
@@ -15,9 +15,6 @@
SpecialPages: {
Gather: Gather\\SpecialGather
},
- APIModules: {
- gather: Gather\\api\\CollectionsListApi
- },
MessagesDirs: {
Gather: [
i18n
@@ -55,14 +52,12 @@
Gather\\views\\CollectionsListItemCard:
includes/views/CollectionsListItemCard.php,
Gather\\views\\helpers\\CSS: includes/views/helpers/CSS.php,
Gather\\SpecialGather: includes/specials/SpecialGather.php,
- Gather\\api\\CollectionsListApi:
includes/api/CollectionsListApi.php,
Gather\\api\\ApiEditList: includes/api/ApiEditList.php,
Gather\\api\\ApiQueryLists: includes/api/ApiQueryLists.php,
Gather\\api\\ApiQueryListPages:
includes/api/ApiQueryListPages.php
},
APIModules: {
- editlist: Gather\\api\\ApiEditList,
- gather: Gather\\api\\CollectionsListApi
+ editlist: Gather\\api\\ApiEditList
},
APIListModules: {
lists: Gather\\api\\ApiQueryLists,
diff --git a/includes/api/CollectionsListApi.php
b/includes/api/CollectionsListApi.php
deleted file mode 100644
index b4d86a9..000
--- a/includes/api/CollectionsListApi.php
+++ /dev/null
@@ -1,102 +0,0 @@
-?php
-
-/**
- * CollectionsListApi.php
- */
-
-namespace Gather\api;
-
-use Gather\stores;
-use Gather\models;
-use ApiBase;
-use User;
-
-// FIXME: ApiQueryGeneratorBase should be used here in future.
-class CollectionsListApi extends ApiBase {
- /**
-* Execute the requested api actions
-*/
- public function execute() {
- $this-getMain()-setCacheMode( 'anon-public-user-private' );
- $params = $this-extractRequestParams();
- $action = $params['gather'];
-
- // Get the list of collections for a user
- if ( $action === 'list' ) {
- // If an owner wasn't specified, then get the
collections of the current user
- $owner = isset( $params['owner'] ) ?
- User::newFromName( $params['owner'] ) :
$this-getUser();
- // If the name is invalid – it contains illegal
characters then this'll return false
- if ( $owner !== false ) {
- $collections = $this-getCollectionsList(
$owner );
- $res = array();
- foreach ( $collections as $collection ) {
- $res[] = $collection-toArray();
- }
- $this-addResult( $res, 'collection' );
- }
- }
- }
-
- /**
-* Add a result to the response
-* @param string $result result in json to add to the response
-* @param string $tagName xml tagName in case it needs to be set
-*/
- private function addResult( $result, $tagName = null ) {
- $apiResult = $this-getResult();
- if ( $tagName !== null ) {
- $apiResult-setIndexedTagName( $result, $tagName );
- $apiResult-setIndexedTagName_recursive( $result,
$tagName );
- }
- $apiResult-addValue( null, $this-getModuleName(), $result );
- }
-
- /**
-* Get the list of collections for a user
-*
[MediaWiki-commits] [Gerrit] Add merged cells table to converter examples - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Add merged cells table to converter examples
..
Add merged cells table to converter examples
Change-Id: I08f6d29057b24166dd27547a511511ecf1bd421e
---
M tests/dm/ve.dm.example.js
1 file changed, 224 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index 2138b37..730cfa7 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -810,6 +810,226 @@
{ type: '/alienMeta' }
];
+ve.dm.example.mergedCellsHtml =
+'table' +
+ 'tr' +
+ 'td1/tdtd2/tdtd3/tdtd
rowspan=34/tdtd5/tdtd6/td' +
+ '/tr' +
+ 'tr' +
+ 'td7/tdtd colspan=28/tdtd
rowspan=49/tdtd10/td' +
+ '/tr' +
+ 'tr' +
+ 'td11/tdtd12/tdtd13/tdtd14/td' +
+ '/tr' +
+ 'tr' +
+ 'td15/tdtd rowspan=3
colspan=316/tdtd17/td' +
+ '/tr' +
+ 'tr' +
+ 'td18/tdtd19/td' +
+ '/tr' +
+ 'tr' +
+ 'td20/tdtd colspan=221/td' +
+ '/tr' +
+ 'tr' +
+
'td22/tdtd23/tdtd24/tdtd25/tdtd26/tdtd27/td' +
+ '/tr' +
+ '/table';
+
+ve.dm.example.mergedCells = [
+ { type: 'table' },
+ { type: 'tableSection', attributes: { style: 'body' } },
+ { type: 'tableRow' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '1',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '2',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '3',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ {
+ type: 'tableCell',
+ attributes: {
+ style: 'data',
+ originalRowspan: '3',
+ rowspan: 3
+ }
+ },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '4',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '5',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '6',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: '/tableRow' },
+ { type: 'tableRow' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '7',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ {
+ type: 'tableCell',
+ attributes: {
+ style: 'data',
+ colspan: 2,
+ originalColspan: '2'
+ }
+ },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '8',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ {
+ type: 'tableCell',
+ attributes: {
+ style: 'data',
+ originalRowspan: '4',
+ rowspan: 4
+ }
+ },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '9',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '1', '0',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: '/tableRow' },
+ { type: 'tableRow' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '1', '1',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '1', '2',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell', attributes: { style: 'data' } },
+ { type: 'paragraph', internal: { generated: 'wrapper' } },
+ '1', '3',
+ { type: '/paragraph' },
+ { type: '/tableCell' },
+ { type: 'tableCell',
[MediaWiki-commits] [Gerrit] Fix Error /styles/widgets/images/broken-image.png 404 (Not ... - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/196289 Change subject: Fix Error /styles/widgets/images/broken-image.png 404 (Not Found) .. Fix Error /styles/widgets/images/broken-image.png 404 (Not Found) Follows-up f8720326b0. The stylesheet was moved to widgets, but the image was left behind. Change-Id: I147f9318062e785a034c4cc009874011d9e0ecaf --- R modules/ve-mw/ui/styles/widgets/images/broken-image.png 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/89/196289/1 diff --git a/modules/ve-mw/ui/styles/images/broken-image.png b/modules/ve-mw/ui/styles/widgets/images/broken-image.png similarity index 100% rename from modules/ve-mw/ui/styles/images/broken-image.png rename to modules/ve-mw/ui/styles/widgets/images/broken-image.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/196289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I147f9318062e785a034c4cc009874011d9e0ecaf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create Special:Gather/user/id via api - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Create Special:Gather/user/id via api
..
Create Special:Gather/user/id via api
Note:
This patch:
* Disables access of user other than yourself.
* Page image currently not working on collection
Bug: T92418
Change-Id: I8a2a3e4400f1431f472abcf8e56ec7b51571e91b
---
M includes/Gather.hooks.php
M includes/models/Collection.php
M includes/specials/SpecialGather.php
3 files changed, 67 insertions(+), 3 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Gather.hooks.php b/includes/Gather.hooks.php
index 0cba4b5..1789a2d 100644
--- a/includes/Gather.hooks.php
+++ b/includes/Gather.hooks.php
@@ -135,7 +135,7 @@
$gatherCollections = array();
foreach ( $collectionsList as $collectionInfo ) {
$id = $collectionInfo-getId();
- $collection =
stores\UserPageCollection::newFromUserAndId( $user, $id );
+ $collection = models\Collection::newFromApi(
$id, $user );
if ( $collection !== null ) {
$gatherCollections[] = array(
'id' = $id,
diff --git a/includes/models/Collection.php b/includes/models/Collection.php
index c752f9f..8ef87c2 100644
--- a/includes/models/Collection.php
+++ b/includes/models/Collection.php
@@ -9,12 +9,15 @@
use \IteratorAggregate;
use \ArrayIterator;
use \User;
+use \ApiMain;
+use \FauxRequest;
+use \Gather\stores\ItemExtracts;
+use \Title;
/**
* A collection with a list of items, which are represented by the
CollectionItem class.
*/
class Collection extends CollectionBase implements IteratorAggregate {
-
/**
* The internal collection of items.
*
@@ -92,4 +95,60 @@
}
return $data;
}
+
+ /**
+* Generate UserPageCollectionsList from api result
+* @param Integer $id the id of the collection
+* @param User $user collection list owner (currently unused)
+* @return models\Collections a collection
+*/
+ public static function newFromApi( $id, User $user ) {
+ // Work out meta data for this collection
+ $cl = CollectionsList::newFromApi( $user );
+ $collection = null;
+ foreach ( $cl as $c ) {
+ if ( $c-getId() === $id ) {
+ $collection = self::newFromCollectionInfo( $c );
+ }
+ }
+ if ( $collection ) {
+ $api = new ApiMain( new FauxRequest( array(
+ 'action' = 'query',
+ 'prop' = 'pageimages|extracts',
+ 'generator' = 'listpages',
+ 'glspid' = $id,
+ 'explaintext' = true,
+ 'exintro' = true,
+ 'exchars' = ItemExtracts::CHAR_LIMIT,
+ 'exlimit' = 50,
+ ) ) );
+ try {
+ $api-execute();
+ $data = $api-getResultData();
+ if ( isset( $data['query']['pages'] ) ) {
+ $pages = $data['query']['pages'];
+ foreach ( $pages as $page ) {
+ $title = Title::newFromText(
$page['title'], $page['ns'] );
+ // FIXME: Make use of the page
image
+ $pi = false;
+ $extract = isset(
$page['extract'][0] ) ? $page['extract'][0] : '';
+ $collection-add( new
CollectionItem( $title, $pi, $extract ) );
+ }
+ }
+ } catch ( Exception $e ) {
+ // just return collection
+ }
+ }
+
+ return $collection;
+ }
+
+ /**
+* @param CollectionInfo $info
+* @return models\Collection
+*/
+ public static function newFromCollectionInfo( $info ) {
+ return new Collection( $info-getId(), $info-getOwner(),
+ $info-getTitle(), $info-getDescription(),
$info-isPublic(), $info-getFile());
+ }
}
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index dfdd0c4..b141559 100644
--- a/includes/specials/SpecialGather.php
+++
[MediaWiki-commits] [Gerrit] Handle LQT suppressed user - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196296
Change subject: Handle LQT suppressed user
..
Handle LQT suppressed user
Adjust imported posts by suppressed users to be owned by Flow talkpage manager
user and add template to indicate why.
Bug: T92422
Change-Id: I996d836ed19af5f94815abc8e4914472a0932978
---
M i18n/en.json
M i18n/qqq.json
M includes/Import/LiquidThreadsApi/ConversionStrategy.php
M includes/Import/LiquidThreadsApi/Iterators.php
M includes/Import/LiquidThreadsApi/Objects.php
M includes/Import/LiquidThreadsApi/Source.php
M maintenance/convertLqtPage.php
7 files changed, 63 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/96/196296/1
diff --git a/i18n/en.json b/i18n/en.json
index c4da6eb..392f6f7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -395,6 +395,7 @@
flow-importer-lqt-converted-archive-template: Archive for converted
LQT page,
flow-importer-wt-converted-template: Wikitext talk page converted to
Flow,
flow-importer-wt-converted-archive-template: Archive for converted
wikitext talk page,
+ flow-importer-lqt-suppressed-user-template: This revision was
imported from LiquidThreads with a supressed user. It has been reassigned to
the current user.,
apihelp-flow-description: Allows actions to be taken on Flow pages.,
apihelp-flow-param-submodule: The Flow submodule to invoke.,
apihelp-flow-param-page: The page to take the action on.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a8c8ba1..73af384 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -400,6 +400,7 @@
flow-importer-lqt-converted-archive-template: Name of a wikitext
template that is added to the archived copy of a LiquidThreads page converted
to Flow.,
flow-importer-wt-converted-template: Name of a wikitext template
that is added to the header of a Flow boards that were converted from Wikitext,
flow-importer-wt-converted-archive-template: Name of a wikitext
template that is added to the archived copy of a wikitext talk page converted
to Flow.,
+ flow-importer-lqt-suppressed-user-template: Name of a wikitext
template that is added to a revision imported from liquidthreads that is owned
by a suppressed user.,
apihelp-flow-description: {{doc-apihelp-description|flow}},
apihelp-flow-param-submodule: {{doc-apihelp-param|flow|submodule}},
apihelp-flow-param-page: {{doc-apihelp-param|flow|page}},
diff --git a/includes/Import/LiquidThreadsApi/ConversionStrategy.php
b/includes/Import/LiquidThreadsApi/ConversionStrategy.php
index 51782aa..11462e6 100644
--- a/includes/Import/LiquidThreadsApi/ConversionStrategy.php
+++ b/includes/Import/LiquidThreadsApi/ConversionStrategy.php
@@ -86,7 +86,7 @@
}
public function createImportSource( Title $title ) {
- return new ImportSource( $this-api, $title-getPrefixedText()
);
+ return new ImportSource( $this-api, $title-getPrefixedText(),
$this-talkpageUser );
}
/**
diff --git a/includes/Import/LiquidThreadsApi/Iterators.php
b/includes/Import/LiquidThreadsApi/Iterators.php
index e86a8b5..3ed4296 100644
--- a/includes/Import/LiquidThreadsApi/Iterators.php
+++ b/includes/Import/LiquidThreadsApi/Iterators.php
@@ -210,13 +210,11 @@
/** @var IImportObject **/
protected $parent;
- public function __construct( array $pageData, IImportObject $parent,
$factory = null ) {
+ public function __construct( array $pageData, IImportObject $parent,
$factory ) {
$this-pageData = $pageData;
$this-pointer = 0;
$this-parent = $parent;
- $this-factory = $factory ?: function( $data, $parent ) {
- return new ImportRevision( $data, $parent );
- };
+ $this-factory = $factory;
}
protected function getRevisionCount() {
diff --git a/includes/Import/LiquidThreadsApi/Objects.php
b/includes/Import/LiquidThreadsApi/Objects.php
index e465235..d9c117a 100644
--- a/includes/Import/LiquidThreadsApi/Objects.php
+++ b/includes/Import/LiquidThreadsApi/Objects.php
@@ -45,7 +45,10 @@
// the iterators expect this to be a 0 indexed list
$pageData['revisions'] = array_values( $pageData['revisions'] );
- return new RevisionIterator( $pageData, $this );
+ $scriptUser = $this-importSource-getScriptUser();
+ return new RevisionIterator( $pageData, $this, function( $data,
$parent ) use ( $scriptUser ) {
+ return new ImportRevision( $data, $parent, $scriptUser
);
+ } );
}
}
@@ -235,14 +238,21 @@
protected $apiResponse;
/**
+* @var User Account used when the imported revision is
[MediaWiki-commits] [Gerrit] Fix Fatal error in recent changes - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196303
Change subject: Fix Fatal error in recent changes
..
Fix Fatal error in recent changes
When displaying grouped header edits the formatter code was attempting
to clone a non-existant topic link. Patch updates to fall back to a
'workflow' link if the topic is not available. Further falls back
to throwing an exception instead of fataling.
Bug: T92536
Change-Id: Ie3230d48bea5d7f18754f3fa725726409fd3e92b
---
M includes/Formatter/RecentChanges.php
1 file changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/03/196303/1
diff --git a/includes/Formatter/RecentChanges.php
b/includes/Formatter/RecentChanges.php
index 4cb94d2..b5817cf 100644
--- a/includes/Formatter/RecentChanges.php
+++ b/includes/Formatter/RecentChanges.php
@@ -176,13 +176,20 @@
throw new FlowException( 'Could not format data for row
' . $row-revision-getRevisionId()-getAlphadecimal() );
}
- // add highlight details to anchor
- /** @var Anchor $anchor */
- $anchor = clone $data['links']['topic'];
- $anchor-query['fromnotif'] = '1';
- $anchor-fragment = '#flow-post-' . $oldId-getAlphadecimal();
+ if ( isset( $data['links']['topic'] ) ) {
+ // add highlight details to anchor
+ /** @var Anchor $anchor */
+ $anchor = clone $data['links']['topic'];
+ $anchor-query['fromnotif'] = '1';
+ $anchor-fragment = '#flow-post-' .
$oldId-getAlphadecimal();
+ } elseif ( isset( $data['links']['workflow'] ) ) {
+ $anchor = $data['links']['workflow'];
+ } else {
+ // this will be caught and logged by the RC hook, it
will not fatal the page.
+ throw new FlowException( No anchor available for
revision $oldId );
+ }
- $changes = count($block);
+ $changes = count( $block );
// link text: n changes
$text = $ctx-msg( 'nchanges' )-numParams( $changes
)-escaped();
--
To view, visit https://gerrit.wikimedia.org/r/196303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3230d48bea5d7f18754f3fa725726409fd3e92b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert sessions: temporarily disable mc1014 - change (operations/mediawiki-config)
Rush has uploaded a new change for review. https://gerrit.wikimedia.org/r/196302 Change subject: Revert sessions: temporarily disable mc1014 .. Revert sessions: temporarily disable mc1014 This reverts commit 74b9e29f32fe9786cfb9240056340c4002ac60c7. Change-Id: Icf419e2fa6be8b0d2134a0b1d67e6ddedae9e61b --- M wmf-config/session.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/02/196302/1 diff --git a/wmf-config/session.php b/wmf-config/session.php index 27502a5..6386001 100644 --- a/wmf-config/session.php +++ b/wmf-config/session.php @@ -15,7 +15,7 @@ '10.64.32.165', # mc1011 '10.64.32.166', # mc1012 '10.64.48.101', # mc1013 -# '10.64.48.102', # mc1014 + '10.64.48.102', # mc1014 '10.64.48.103', # mc1015 '10.64.48.104', # mc1016 '10.64.48.95', # mc1017 -- To view, visit https://gerrit.wikimedia.org/r/196302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf419e2fa6be8b0d2134a0b1d67e6ddedae9e61b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Rush r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] authdns: transition to ssh::userkey - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: authdns: transition to ssh::userkey
..
authdns: transition to ssh::userkey
Bug: T92475
Change-Id: I8185344eb66c7f547fede44691dfb8225b41d9bf
---
M modules/authdns/manifests/account.pp
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/authdns/manifests/account.pp
b/modules/authdns/manifests/account.pp
index 6f02c7d..fd1b4dc 100644
--- a/modules/authdns/manifests/account.pp
+++ b/modules/authdns/manifests/account.pp
@@ -43,9 +43,8 @@
mode = '0400',
source = 'puppet:///private/authdns/id_rsa.pub',
}
-file { ${home}/.ssh/authorized_keys:
-ensure = 'link',
-target = 'id_rsa.pub',
+ssh::userkey { $user:
+source = 'puppet:///private/authdns/id_rsa.pub',
}
file { ${home}/git-shell-commands:
--
To view, visit https://gerrit.wikimedia.org/r/183821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8185344eb66c7f547fede44691dfb8225b41d9bf
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.9.1 - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/196305 Change subject: Update OOjs UI to v0.9.1 .. Update OOjs UI to v0.9.1 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.9.1/History.md Change-Id: I936ea56e1c99f576f44115a9b2fa075ef1ab14bd --- M lib/oojs-ui/i18n/fa.json A lib/oojs-ui/i18n/ksh.json M lib/oojs-ui/i18n/tr.json A lib/oojs-ui/oojs-ui-apex-icons-editing-core.css A lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css A lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css A lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css A lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css A lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css A lib/oojs-ui/oojs-ui-apex-icons-moderation.css A lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css A lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css A lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css A lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css A lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.raster.css M lib/oojs-ui/oojs-ui-apex.raster.rtl.css M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-apex.vector.css M lib/oojs-ui/oojs-ui-apex.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css A lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-content.css A lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css A lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css A lib/oojs-ui/oojs-ui-mediawiki-icons-layout.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-layout.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-layout.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-layout.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-location.css A lib/oojs-ui/oojs-ui-mediawiki-icons-location.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-location.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-location.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-location.vector.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-media.css A lib/oojs-ui/oojs-ui-mediawiki-icons-media.raster.css A lib/oojs-ui/oojs-ui-mediawiki-icons-media.raster.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css A lib/oojs-ui/oojs-ui-mediawiki-icons-media.vector.css A lib/oojs-ui/oojs-ui-mediawiki-icons-media.vector.rtl.css A
[MediaWiki-commits] [Gerrit] check_php_syntax: Check for any content before opening ?php... - change (mediawiki...scap)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196306
Change subject: check_php_syntax: Check for any content before opening ?php tag
..
check_php_syntax: Check for any content before opening ?php tag
Some commandline scripts do start with a shebang, so allow those.
Bug: T92534
Change-Id: I63018163fc740db9b475129113bbee809a8db0c9
---
M scap/tasks.py
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap
refs/changes/06/196306/1
diff --git a/scap/tasks.py b/scap/tasks.py
index f47eed0..bef2ef3 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -85,7 +85,25 @@
| xargs -n1 -P%d -exec php -l /dev/null
) % (' '.join(quoted_paths), multiprocessing.cpu_count())
logger.debug('Running command: `%s`', cmd)
-return subprocess.check_call(cmd, shell=True)
+subprocess.check_call(cmd, shell=True)
+# Check for anything that isn't a shebang before ?php (T92534)
+for path in paths:
+for root, dirs, files in os.walk(path):
+for filename in files:
+if filename.endswith(('.php', '.inc', '.phtml')):
+full_path = os.path.join(root, filename)
+with open(full_path) as f:
+text = f.read()
+if not text.startswith('?php'):
+# If the first line is a shebang and the
+# second has ?php, that's ok
+lines = text.splitlines()
+if not (lines[0].startswith('#!')
+and lines[1].startswith('?php')):
+raise ValueError(
+'%s has content before opening ?php tag'
+% full_path
+)
def compile_wikiversions_cdb(source_tree, cfg):
--
To view, visit https://gerrit.wikimedia.org/r/196306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63018163fc740db9b475129113bbee809a8db0c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet: transition to ssh::userkey - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: puppet: transition to ssh::userkey
..
puppet: transition to ssh::userkey
Bug: T92475
Change-Id: I342f2061467866844df4b6b9eee8039a1f29e808
---
M modules/puppetmaster/manifests/gitpuppet.pp
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/gitpuppet.pp
b/modules/puppetmaster/manifests/gitpuppet.pp
index 5355bfd..3c425db 100644
--- a/modules/puppetmaster/manifests/gitpuppet.pp
+++ b/modules/puppetmaster/manifests/gitpuppet.pp
@@ -25,11 +25,9 @@
group = 'gitpuppet',
mode= '0400',
source = 'puppet:///private/ssh/gitpuppet/gitpuppet-private.key';
-'/home/gitpuppet/.ssh/authorized_keys':
-owner = 'gitpuppet',
-group = 'gitpuppet',
-mode= '0400',
-source =
'puppet:///modules/puppetmaster/git/gitpuppet_authorized_keys';
+}
+ssh::userkey { 'gitpuppet':
+source =
'puppet:///modules/puppetmaster/git/gitpuppet_authorized_keys',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/183822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I342f2061467866844df4b6b9eee8039a1f29e808
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable mc1014 - change (operations/puppet)
Rush has submitted this change and it was merged. Change subject: enable mc1014 .. enable mc1014 refs T91773 Change-Id: If755b51134dc65b4de4a1ed469ecec2e15f9a5c2 --- M hieradata/eqiad.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 0fd46d9..191c6d1 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -12,6 +12,7 @@ - '10.64.32.165:11211:1 shard11' - '10.64.32.166:11211:1 shard12' - '10.64.48.101:11211:1 shard13' + - '10.64.48.102:11211:1 shard14' - '10.64.48.103:11211:1 shard15' - '10.64.48.104:11211:1 shard16' - '10.64.48.95:11211:1 shard17' -- To view, visit https://gerrit.wikimedia.org/r/196281 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If755b51134dc65b4de4a1ed469ecec2e15f9a5c2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush r...@wikimedia.org Gerrit-Reviewer: Rush r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MediaWiki Theme: textInputWidget: Update focus state - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki Theme: textInputWidget: Update focus state
..
MediaWiki Theme: textInputWidget: Update focus state
Bug: T73150
Change-Id: I2087030a8a8736ddba395f5a0948d265a76345fb
---
M src/themes/mediawiki/widgets.less
1 file changed, 10 insertions(+), 3 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index f32c2d3..5a9947c 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -394,10 +394,16 @@
.oo-ui-widget-enabled {
input:focus,
+
+ .oo-ui-transition(
+ border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1)
+ box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1)
+ )
+
textarea:focus {
outline: none;
- border-color: #aaa;
- box-shadow: inset 0.4em 0 0 0 @progressive;
+ border-color: @progressive;
+ box-shadow: inset 0 0 0 0.1em @progressive;
}
input[readonly],
@@ -406,7 +412,8 @@
text-shadow: 0 1px 1px #fff;
:focus {
- box-shadow: inset 0.4em 0 0 0 #ccc;
+ border-color: #ccc;
+ box-shadow: inset 0 0 0 0.1em #ccc;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/196213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2087030a8a8736ddba395f5a0948d265a76345fb
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move selection sub-classes to sub-folder - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Move selection sub-classes to sub-folder .. Move selection sub-classes to sub-folder Change-Id: I0b677a5858049d00d14c0988ea59397604a9e815 --- M .jsduck/eg-iframe.html M build/modules.json M demos/ve/desktop.html M demos/ve/mobile.html R src/dm/selections/ve.dm.LinearSelection.js R src/dm/selections/ve.dm.NullSelection.js R src/dm/selections/ve.dm.TableSelection.js M tests/index.html 8 files changed, 15 insertions(+), 15 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 00bf7b6..65677a2 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -160,9 +160,6 @@ script src=../src/dm/ve.dm.TransactionProcessor.js/script script src=../src/dm/ve.dm.Transaction.js/script script src=../src/dm/ve.dm.Selection.js/script - script src=../src/dm/ve.dm.LinearSelection.js/script - script src=../src/dm/ve.dm.NullSelection.js/script - script src=../src/dm/ve.dm.TableSelection.js/script script src=../src/dm/ve.dm.Surface.js/script script src=../src/dm/ve.dm.SurfaceFragment.js/script script src=../src/dm/ve.dm.DataString.js/script @@ -172,6 +169,9 @@ script src=../src/dm/ve.dm.DocumentSynchronizer.js/script script src=../src/dm/ve.dm.IndexValueStore.js/script script src=../src/dm/ve.dm.Converter.js/script + script src=../src/dm/selections/ve.dm.LinearSelection.js/script + script src=../src/dm/selections/ve.dm.NullSelection.js/script + script src=../src/dm/selections/ve.dm.TableSelection.js/script script src=../src/dm/lineardata/ve.dm.FlatLinearData.js/script script src=../src/dm/lineardata/ve.dm.ElementLinearData.js/script script src=../src/dm/lineardata/ve.dm.MetaLinearData.js/script diff --git a/build/modules.json b/build/modules.json index 7a3b019..c4e7b2a 100644 --- a/build/modules.json +++ b/build/modules.json @@ -183,9 +183,6 @@ src/dm/ve.dm.TransactionProcessor.js, src/dm/ve.dm.Transaction.js, src/dm/ve.dm.Selection.js, - src/dm/ve.dm.LinearSelection.js, - src/dm/ve.dm.NullSelection.js, - src/dm/ve.dm.TableSelection.js, src/dm/ve.dm.Surface.js, src/dm/ve.dm.SurfaceFragment.js, src/dm/ve.dm.DataString.js, @@ -195,6 +192,9 @@ src/dm/ve.dm.DocumentSynchronizer.js, src/dm/ve.dm.IndexValueStore.js, src/dm/ve.dm.Converter.js, + src/dm/selections/ve.dm.LinearSelection.js, + src/dm/selections/ve.dm.NullSelection.js, + src/dm/selections/ve.dm.TableSelection.js, src/dm/lineardata/ve.dm.FlatLinearData.js, src/dm/lineardata/ve.dm.ElementLinearData.js, src/dm/lineardata/ve.dm.MetaLinearData.js, diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 2da040f..f0ae254 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -177,9 +177,6 @@ script src=../../src/dm/ve.dm.TransactionProcessor.js/script script src=../../src/dm/ve.dm.Transaction.js/script script src=../../src/dm/ve.dm.Selection.js/script - script src=../../src/dm/ve.dm.LinearSelection.js/script - script src=../../src/dm/ve.dm.NullSelection.js/script - script src=../../src/dm/ve.dm.TableSelection.js/script script src=../../src/dm/ve.dm.Surface.js/script script src=../../src/dm/ve.dm.SurfaceFragment.js/script script src=../../src/dm/ve.dm.DataString.js/script @@ -189,6 +186,9 @@ script src=../../src/dm/ve.dm.DocumentSynchronizer.js/script script src=../../src/dm/ve.dm.IndexValueStore.js/script script src=../../src/dm/ve.dm.Converter.js/script + script src=../../src/dm/selections/ve.dm.LinearSelection.js/script + script src=../../src/dm/selections/ve.dm.NullSelection.js/script + script src=../../src/dm/selections/ve.dm.TableSelection.js/script script src=../../src/dm/lineardata/ve.dm.FlatLinearData.js/script script src=../../src/dm/lineardata/ve.dm.ElementLinearData.js/script script src=../../src/dm/lineardata/ve.dm.MetaLinearData.js/script diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html index 96558fd..fdb3dab 100644 ---
[MediaWiki-commits] [Gerrit] Fix list item background in 2.3. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/196285 Change subject: Fix list item background in 2.3. .. Fix list item background in 2.3. Under 2.3, the list items (search results, history, etc) were showing up with a solid blue (selected) background. It looks like the state_activated property is having an effect on the background, even though it's not supposed to apply to 2.3. I've split off the list background selector for API 11+, and modified the one for API 10 to no longer have state_activated. Change-Id: Ie3e29c151f9989e8c23ace09a188a84d00f660ca --- A wikipedia/res/drawable-v11/selectable_item_background.xml M wikipedia/res/drawable/selectable_item_background.xml 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/85/196285/1 diff --git a/wikipedia/res/drawable-v11/selectable_item_background.xml b/wikipedia/res/drawable-v11/selectable_item_background.xml new file mode 100644 index 000..76cdf58 --- /dev/null +++ b/wikipedia/res/drawable-v11/selectable_item_background.xml @@ -0,0 +1,9 @@ +?xml version=1.0 encoding=utf-8? + +selector xmlns:android=http://schemas.android.com/apk/res/android; + android:exitFadeDuration=@android:integer/config_mediumAnimTime +item android:state_activated=true android:drawable=@color/list_item_selected / +item android:state_checked=true android:drawable=@color/list_item_selected / +item android:state_pressed=true android:drawable=@color/list_item_highlight / +item android:drawable=@android:color/transparent / +/selector \ No newline at end of file diff --git a/wikipedia/res/drawable/selectable_item_background.xml b/wikipedia/res/drawable/selectable_item_background.xml index 76cdf58..f2d0117 100644 --- a/wikipedia/res/drawable/selectable_item_background.xml +++ b/wikipedia/res/drawable/selectable_item_background.xml @@ -1,8 +1,6 @@ ?xml version=1.0 encoding=utf-8? -selector xmlns:android=http://schemas.android.com/apk/res/android; - android:exitFadeDuration=@android:integer/config_mediumAnimTime -item android:state_activated=true android:drawable=@color/list_item_selected / +selector xmlns:android=http://schemas.android.com/apk/res/android; item android:state_checked=true android:drawable=@color/list_item_selected / item android:state_pressed=true android:drawable=@color/list_item_highlight / item android:drawable=@android:color/transparent / -- To view, visit https://gerrit.wikimedia.org/r/196285 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3e29c151f9989e8c23ace09a188a84d00f660ca Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant dbr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable mc1014 - change (operations/mediawiki-config)
Rush has submitted this change and it was merged. Change subject: enable mc1014 .. enable mc1014 refs T91773 Change-Id: Ifc7229218185ea2e0c91a5a73cca9d8b53c3458a --- M wmf-config/session.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Rush: Looks good to me, approved diff --git a/wmf-config/session.php b/wmf-config/session.php index 27502a5..16458d2 100644 --- a/wmf-config/session.php +++ b/wmf-config/session.php @@ -1,3 +1,4 @@ + ?php $sessionRedis = array( @@ -15,7 +16,7 @@ '10.64.32.165', # mc1011 '10.64.32.166', # mc1012 '10.64.48.101', # mc1013 -# '10.64.48.102', # mc1014 + '10.64.48.102', # mc1014 '10.64.48.103', # mc1015 '10.64.48.104', # mc1016 '10.64.48.95', # mc1017 -- To view, visit https://gerrit.wikimedia.org/r/196279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc7229218185ea2e0c91a5a73cca9d8b53c3458a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Rush r...@wikimedia.org Gerrit-Reviewer: Rush r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Update reviews system - change (wikimedia/iegreview)
Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196288
Change subject: [WIP] Update reviews system
..
[WIP] Update reviews system
Bug: T92442
Change-Id: I22d88b957a7040031ca79827077861a994594aef
---
M data/templates/proposals/view_review_edit.html
M src/App.php
M src/Controllers/Proposals/Review.php
M src/Controllers/Proposals/View.php
M src/Dao/Reviews.php
5 files changed, 70 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/iegreview
refs/changes/88/196288/1
diff --git a/data/templates/proposals/view_review_edit.html
b/data/templates/proposals/view_review_edit.html
index 6355390..5748d16 100644
--- a/data/templates/proposals/view_review_edit.html
+++ b/data/templates/proposals/view_review_edit.html
@@ -3,17 +3,21 @@
{% import _self as local %}
{% set ctx = _context %}
-{% macro criteria( review, name, ctx ) %}
+{% macro criteria( review, ques, name, ctx ) %}
{% set msgprefix = review-#{name} %}
{% set opts = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] %}
{% set r = review[name] %}
section class=panel panel-default
div class=panel-heading
-h4 class=panel-titlea
href=//meta.wikimedia.org/wiki/Grants:IEG/Committee/Workroom#review-rubric
target=_blank{{ msgprefix|message }}/a/h4
+h4 class=panel-title
+!--a
href=//meta.wikimedia.org/wiki/Grants:IEG/Committee/Workroom#review-rubric
target=_blank--
+{{ msgprefix|message }}
+!--/a--
+ /h4
/div
div class=panel-body
-{{ #{msgprefix}-instructions|message|raw|wikitext }}
-{{ ctx.forms.radioList( ctx, #{msgprefix}-rank, name, {
+ {{ ques.question }}
+ {{ ctx.forms.radioList( ctx, #{msgprefix}-rank, points[#{ques.id}], {
1:'review-rank-1',
2:'review-rank-2',
3:'review-rank-3',
@@ -27,7 +31,8 @@
}, { 'required':true, 'value':r } ) }}
div class=form-group
label for={{ #{name}_note }} class=control-label{{
#{msgprefix}-note|message }}/label
- textarea name={{ #{name}_note }} class=form-control{{
review[#{name}_note] }}/textarea
+!-- textarea name={{ #{name}_note }} class=form-control{{
review[#{name}_note] }}/textarea--
+ textarea name=notes[{{ ques.id }}] class=form-control{{
review[#{name}_note] }}/textarea
/div
/div
/section
@@ -47,10 +52,11 @@
form method=post action={{ urlFor( 'proposals_review_post', { 'id':
proposal.id } ) }}
input type=hidden name={{ csrf_param }} value={{ csrf_token }}
/
input type=hidden name=proposal value={{ proposal.id }} /
-{{ local.criteria( myreview, 'impact', ctx ) }}
-{{ local.criteria( myreview, 'innovation', ctx ) }}
-{{ local.criteria( myreview, 'ability', ctx ) }}
-{{ local.criteria( myreview, 'engagement', ctx ) }}
+
+ {% for q in questions %}
+{{ local.criteria( myreview, q, 'impact', ctx ) }}
+ {% endfor %}
+
section class=panel panel-default
div class=panel-heading
h4 class=panel-title{{ 'review-recommendation'|message }}/h4
diff --git a/src/App.php b/src/App.php
index 472e19a..78ed08f 100644
--- a/src/App.php
+++ b/src/App.php
@@ -494,6 +494,7 @@
$page = new Controllers\Proposals\View(
$slim );
$page-setDao( $slim-proposalsDao );
$page-setReviewsDao( $slim-reviewsDao
);
+ $page-setCampaignsDao(
$slim-campaignsDao );
$page( $id );
} )-name( 'proposals_view' );
}
diff --git a/src/Controllers/Proposals/Review.php
b/src/Controllers/Proposals/Review.php
index a5e8d87..aad39ac 100644
--- a/src/Controllers/Proposals/Review.php
+++ b/src/Controllers/Proposals/Review.php
@@ -35,33 +35,21 @@
protected function handlePost( $id ) {
$this-form-requireInt( 'proposal' );
- $this-form-requireInt( 'impact' );
- $this-form-expectString( 'impact_note' );
- $this-form-requireInt( 'innovation' );
- $this-form-expectString( 'innovation_note' );
- $this-form-requireInt( 'ability' );
- $this-form-expectString( 'ability_note' );
- $this-form-requireInt( 'engagement' );
- $this-form-expectString( 'engagement_note' );
+ $this-form-expectIntArray( 'points' );
+ $this-form-expectStringArray( 'notes' );
$this-form-requireInt( 'recommendation' );
$this-form-expectString( 'comments' );
if ( $this-form-validate() ) {
$review = array(
'proposal' = $this-form-get( 'proposal' ),
- 'impact' = $this-form-get( 'impact' ),
-
[MediaWiki-commits] [Gerrit] Add ellipsis to collection titles that are too long - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Add ellipsis to collection titles that are too long .. Add ellipsis to collection titles that are too long Bug: T92429 Change-Id: I6dc4b1a55ab08e4bee862ac16f5166534139cbd2 --- M resources/ext.gather.styles/collections.less 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/ext.gather.styles/collections.less b/resources/ext.gather.styles/collections.less index bab7c12..7f9c4ad 100644 --- a/resources/ext.gather.styles/collections.less +++ b/resources/ext.gather.styles/collections.less @@ -192,6 +192,9 @@ color: #FAF9F9; .reset-special-page-heading-styles(); .reset-link-styles(); + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } // User or collections not found -- To view, visit https://gerrit.wikimedia.org/r/196262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dc4b1a55ab08e4bee862ac16f5166534139cbd2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hit Parsoid directly - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Hit Parsoid directly
..
Hit Parsoid directly
Until now we have been calling Parsoid by passing through Varnish.
However, given that we use exclusively Parsoid's v2, which isn't cached
at all, it's better to hit the LVS directly.
Change-Id: Idce3d86ee6a9de1d029058e020467f9edf178f98
---
M hieradata/role/common/restbase.yaml
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.yaml.erb
3 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
GWicke: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index 0cb2926..336151f 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -23,6 +23,7 @@
restbase::cassandra_defaultConsistency: localQuorum
restbase::cassandra_localDc: %{::site}
restbase::statsd_host: statsd.eqiad.wmnet
+restbase::parsoid_uri: http://parsoid.svc.eqiad.wmnet:8000
lvs::realserver::realserver_ips:
- '10.2.2.17' # restbase.svc.eqiad.wmnet
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
index 456b430..86be047 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -19,6 +19,8 @@
# Which DC should be considered local. Default: 'datacenter1'.
# [*port*]
# Port where to run the restbase service. Default: 7231
+# [*parsoid_uri*]
+# URI to reach Parsoid. Default: http://parsoid-lb.eqiad.wikimedia.org
# [*logstash_host*]
# GELF logging host. Default: localhost
# [*logstash_port*]
@@ -38,6 +40,7 @@
$cassandra_defaultConsistency = 'localQuorum',
$cassandra_localDc = 'datacenter1',
$port = 7231,
+$parsoid_uri= 'http://parsoid-lb.eqiad.wikimedia.org',
$logstash_host = 'localhost',
$logstash_port = 12201,
$logging_level = 'warn',
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index 9892e5f..8298e72 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -115,7 +115,7 @@
version: 1.0.0
type: file
options:
- parsoidHost: http://parsoid-lb.eqiad.wikimedia.org
+ parsoidHost: %= @parsoid_uri %
/{module:action}:
x-modules:
--
To view, visit https://gerrit.wikimedia.org/r/196229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idce3d86ee6a9de1d029058e020467f9edf178f98
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass if log entry is legacy to ApiQueryLogEvents::addLogPara... - change (mediawiki/core)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/196299 Change subject: Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() .. Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() Querying via ApiQueryRecentChanges and ApiQueryWatchlist did not pass if a particular log entry was a legacy log entry. Ultimately CheckUser should stop writing legacy style log entries too but we can at least behave properly when we hit them. Bug: T91466 Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 --- M includes/api/ApiQueryRecentChanges.php M includes/api/ApiQueryWatchlist.php 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/99/196299/1 diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 1482034..aa22264 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -542,7 +542,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 11008cf..3857a08 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -419,7 +419,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } -- To view, visit https://gerrit.wikimedia.org/r/196299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Chad ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dump the query when 'cirrusDumpQuery' is requested - change (mediawiki...CirrusSearch)
Jdouglas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196301
Change subject: Dump the query when 'cirrusDumpQuery' is requested
..
Dump the query when 'cirrusDumpQuery' is requested
Currently we dump the Cirrus query when 'cirrusDumpQuery=yes' is
requested, but requiring the parameter to be 'yes' is rather silly.
This change triggers the query dump when the parameter is requested,
regardless of its value. That means it can have any value, or no
value at all:
* ...cirrusDumpQuery=yes
* ...cirrusDumpQuery=true
* ...cirrusDumpQuery=yep
* ...cirrusDumpQuery=1
* ...cirrusDumpQuery
Change-Id: I026c1ac28891a95de80764d5629ebcc3c9790a85
---
M includes/CirrusSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/01/196301/1
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 418a43a..58ac7f6 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -92,7 +92,7 @@
}
$request = $context-getRequest();
- $dumpQuery = $request $request-getVal( 'cirrusDumpQuery' )
=== 'yes';
+ $dumpQuery = $request $request-getVal( 'cirrusDumpQuery' )
!== null;
$searcher-setReturnQuery( $dumpQuery );
// Delegate to either searchText or moreLikeThisArticle and
dump the result into $status
if ( substr( $term, 0, strlen( self::MORE_LIKE_THIS_PREFIX ) )
=== self::MORE_LIKE_THIS_PREFIX ) {
--
To view, visit https://gerrit.wikimedia.org/r/196301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I026c1ac28891a95de80764d5629ebcc3c9790a85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Jdouglas jdoug...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass if log entry is legacy to ApiQueryLogEvents::addLogPara... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() .. Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() Querying via ApiQueryRecentChanges and ApiQueryWatchlist did not pass if a particular log entry was a legacy log entry. Ultimately CheckUser should stop writing legacy style log entries too but we can at least behave properly when we hit them. Bug: T91466 Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 --- M includes/api/ApiQueryRecentChanges.php M includes/api/ApiQueryWatchlist.php 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 1482034..aa22264 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -542,7 +542,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 11008cf..3857a08 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -419,7 +419,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } -- To view, visit https://gerrit.wikimedia.org/r/196299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Chad ch...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool cp1066 for reinstall - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: depool cp1066 for reinstall .. depool cp1066 for reinstall Change-Id: I03321930b67e5ad1ef2437e41c724e611d22eb24 --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index ef5b214..10f5741 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -65,7 +65,7 @@ 'cp1054.eqiad.wmnet', # Jessie 'cp1055.eqiad.wmnet', # Jessie 'cp1065.eqiad.wmnet', # Jessie -'cp1066.eqiad.wmnet', +#'cp1066.eqiad.wmnet', 'cp1067.eqiad.wmnet', # Jessie 'cp1068.eqiad.wmnet', # Jessie ], -- To view, visit https://gerrit.wikimedia.org/r/196254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03321930b67e5ad1ef2437e41c724e611d22eb24 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 7391d7a72088a757519e8435e7dc97189e33ecbf Fix addData calls Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/196309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] configure (but do not pool) cp107[1-4] for upload - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196310
Change subject: configure (but do not pool) cp107[1-4] for upload
..
configure (but do not pool) cp107[1-4] for upload
Change-Id: Ie5528ff3f5cf70941cf96793e4d9fe5f549c3d3a
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/196310/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 10f5741..03cf96d 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -146,6 +146,10 @@
'cp1062.eqiad.wmnet', # Jessie
'cp1063.eqiad.wmnet', # Jessie
'cp1064.eqiad.wmnet', # Jessie
+# 'cp1071.eqiad.wmnet', # Jessie
+# 'cp1072.eqiad.wmnet', # Jessie
+# 'cp1073.eqiad.wmnet', # Jessie
+# 'cp1074.eqiad.wmnet', # Jessie
],
'esams' = [
'cp3003.esams.wmnet', # Jessie
diff --git a/manifests/site.pp b/manifests/site.pp
index fb94488..62f0d10 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -460,7 +460,7 @@
role cache::mobile
}
-node /^cp10(4[89]|5[01]|6[1-4])\.eqiad\.wmnet$/ {
+node /^cp10(4[89]|5[01]|6[1-4]|7[1-4])\.eqiad\.wmnet$/ {
if $::hostname =~ /^(cp1048|cp1061)$/ {
$ganglia_aggregator = true
}
--
To view, visit https://gerrit.wikimedia.org/r/196310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5528ff3f5cf70941cf96793e4d9fe5f549c3d3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] configure (but do not pool) cp107[1-4] for upload - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: configure (but do not pool) cp107[1-4] for upload
..
configure (but do not pool) cp107[1-4] for upload
Change-Id: Ie5528ff3f5cf70941cf96793e4d9fe5f549c3d3a
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 10f5741..03cf96d 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -146,6 +146,10 @@
'cp1062.eqiad.wmnet', # Jessie
'cp1063.eqiad.wmnet', # Jessie
'cp1064.eqiad.wmnet', # Jessie
+# 'cp1071.eqiad.wmnet', # Jessie
+# 'cp1072.eqiad.wmnet', # Jessie
+# 'cp1073.eqiad.wmnet', # Jessie
+# 'cp1074.eqiad.wmnet', # Jessie
],
'esams' = [
'cp3003.esams.wmnet', # Jessie
diff --git a/manifests/site.pp b/manifests/site.pp
index fb94488..62f0d10 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -460,7 +460,7 @@
role cache::mobile
}
-node /^cp10(4[89]|5[01]|6[1-4])\.eqiad\.wmnet$/ {
+node /^cp10(4[89]|5[01]|6[1-4]|7[1-4])\.eqiad\.wmnet$/ {
if $::hostname =~ /^(cp1048|cp1061)$/ {
$ganglia_aggregator = true
}
--
To view, visit https://gerrit.wikimedia.org/r/196310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5528ff3f5cf70941cf96793e4d9fe5f549c3d3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw.ViewPageTarget: Hide ve-ui-surface instead of ve-ce-surface - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Hide ve-ui-surface instead of ve-ce-surface
..
mw.ViewPageTarget: Hide ve-ui-surface instead of ve-ce-surface
ve-ce-surface is a child of ve-ui-surface. The ve-ui-surface has
margins that would remain in the document flow causing a temporary
growth outwards to the bottom during deactivation (causing the
white area and blue border on Vector's grey background to move down)
after which it would restore again.
Follows-up 77f016a.
Bug: T91442
Change-Id: I5b999b580c968fcd24f07d9a895cfa17afc80c0d
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 063891a..0678cfc 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -26,7 +26,7 @@
.ve-activated #t-permalink,
.ve-activated #p-coll-print_export,
.ve-activated #t-cite,
-.ve-deactivating .ve-ce-surface {
+.ve-deactivating .ve-ui-surface {
display: none;
}
--
To view, visit https://gerrit.wikimedia.org/r/196269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b999b580c968fcd24f07d9a895cfa17afc80c0d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf21
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable mc1014 - change (operations/mediawiki-config)
Rush has uploaded a new change for review. https://gerrit.wikimedia.org/r/196279 Change subject: enable mc1014 .. enable mc1014 refs T91773 Change-Id: Ifc7229218185ea2e0c91a5a73cca9d8b53c3458a --- M wmf-config/session.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/79/196279/1 diff --git a/wmf-config/session.php b/wmf-config/session.php index 27502a5..16458d2 100644 --- a/wmf-config/session.php +++ b/wmf-config/session.php @@ -1,3 +1,4 @@ + ?php $sessionRedis = array( @@ -15,7 +16,7 @@ '10.64.32.165', # mc1011 '10.64.32.166', # mc1012 '10.64.48.101', # mc1013 -# '10.64.48.102', # mc1014 + '10.64.48.102', # mc1014 '10.64.48.103', # mc1015 '10.64.48.104', # mc1016 '10.64.48.95', # mc1017 -- To view, visit https://gerrit.wikimedia.org/r/196279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc7229218185ea2e0c91a5a73cca9d8b53c3458a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Rush r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Width adjustments in entityview css - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Width adjustments in entityview css
..
Width adjustments in entityview css
to avoid excessive wrapping of text in snak values
Change-Id: I58ca8b537a6cea54aa174d08f9448fb238ee9560
---
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
index 065e47a..afb412b 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
@@ -5,15 +5,20 @@
.wikibase-entityview {
clear: both; /* wrap around success message */
float: left; /* float left to let widget container float right next to
it */
- width: 100%;
+}
+
+@media screen and ( min-width: 1570px ) {
+ .wikibase-entityview {
+ width: 100%;
+ }
}
.wikibase-entityview * {
float: left;
- max-width: 65em;
}
.wikibase-entityview .wikibase-entityview-main {
margin: 0 2em 2em 0;
+ max-width: 65em;
width: 100%; /* required because it's a floating block element now */
}
--
To view, visit https://gerrit.wikimedia.org/r/195939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58ca8b537a6cea54aa174d08f9448fb238ee9560
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix long titles breaking layout on watchstar overlay - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196282
Change subject: Fix long titles breaking layout on watchstar overlay
..
Fix long titles breaking layout on watchstar overlay
See bug for images of problem and solution.
Bug: T92349
Change-Id: Ie08394adbef8d8e63f250e0ba9c83c7887ed8158
---
M resources/ext.gather.watchstar/contentOverlay.less
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/82/196282/1
diff --git a/resources/ext.gather.watchstar/contentOverlay.less
b/resources/ext.gather.watchstar/contentOverlay.less
index 2644271..56560ce 100644
--- a/resources/ext.gather.watchstar/contentOverlay.less
+++ b/resources/ext.gather.watchstar/contentOverlay.less
@@ -89,10 +89,13 @@
cursor: pointer;
border-top: solid 1px @grayLight;
font-size: 1.4em;
- padding: 12px 0;
+ padding: 12px 50px 12px 0;
+ position: relative;
div {
- float: right;
+ position: absolute;
+ right: -10px;
+ top: 30%;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/196282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie08394adbef8d8e63f250e0ba9c83c7887ed8158
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only prevent default for handled keypresses - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Only prevent default for handled keypresses
..
Only prevent default for handled keypresses
Firefox sends tab and shift-tab through the 'keypress' event, meaning
that preventing default for all keypress events was breaking tabbing.
It's probably safe for us to allow the default action through for
keypress events besides the ones we're specifically handling, despite
T91132 having trouble with respect to form submission.
Bug: T92449
Change-Id: If37f7383a8d1446f552df4eb4d1df1bacf6cb0e9
---
M src/elements/ButtonElement.js
M src/widgets/ComboBoxWidget.js
M src/widgets/DropdownWidget.js
M src/widgets/ToggleSwitchWidget.js
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/elements/ButtonElement.js b/src/elements/ButtonElement.js
index 1c4faad..fab6a1a 100644
--- a/src/elements/ButtonElement.js
+++ b/src/elements/ButtonElement.js
@@ -180,8 +180,8 @@
OO.ui.ButtonElement.prototype.onKeyPress = function ( e ) {
if ( !this.isDisabled() ( e.which === OO.ui.Keys.SPACE || e.which
=== OO.ui.Keys.ENTER ) ) {
this.emit( 'click' );
+ return false;
}
- return false;
};
/**
diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index f9920b3..9e4fe1e 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -168,8 +168,8 @@
if ( !this.isDisabled() ( e.which === OO.ui.Keys.SPACE || e.which
=== OO.ui.Keys.ENTER ) ) {
this.menu.toggle();
this.input.$input[ 0 ].focus();
+ return false;
}
- return false;
};
/**
diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index e287e13..ceaf0f4 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -144,6 +144,6 @@
OO.ui.DropdownWidget.prototype.onKeyPress = function ( e ) {
if ( !this.isDisabled() ( e.which === OO.ui.Keys.SPACE || e.which
=== OO.ui.Keys.ENTER ) ) {
this.menu.toggle();
+ return false;
}
- return false;
};
diff --git a/src/widgets/ToggleSwitchWidget.js
b/src/widgets/ToggleSwitchWidget.js
index 3995897..8517dd4 100644
--- a/src/widgets/ToggleSwitchWidget.js
+++ b/src/widgets/ToggleSwitchWidget.js
@@ -92,6 +92,6 @@
OO.ui.ToggleSwitchWidget.prototype.onKeyPress = function ( e ) {
if ( !this.isDisabled() ( e.which === OO.ui.Keys.SPACE || e.which
=== OO.ui.Keys.ENTER ) ) {
this.setValue( !this.value );
+ return false;
}
- return false;
};
--
To view, visit https://gerrit.wikimedia.org/r/196248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If37f7383a8d1446f552df4eb4d1df1bacf6cb0e9
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert spaces to tab indentation - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Convert spaces to tab indentation .. Convert spaces to tab indentation Change-Id: I470a22bf56f44edebd0fe2eb3874b390212b129b --- M demos/ve/pages/tables.html 1 file changed, 156 insertions(+), 156 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/demos/ve/pages/tables.html b/demos/ve/pages/tables.html index 3d1d068..a047909 100644 --- a/demos/ve/pages/tables.html +++ b/demos/ve/pages/tables.html @@ -3,197 +3,197 @@ h2Simple table/h2 table - tr -tdA/tdtdB/tdtdC/tdtdD/td - /tr - tr -tdE/tdtdF/tdtdG/tdtdH/td - /tr - tr -tdI/tdtdJ/tdtdK/tdtdL/td - /tr - tr -tdM/tdtdN/tdtdO/tdtdP/td - /tr + tr + tdA/tdtdB/tdtdC/tdtdD/td + /tr + tr + tdE/tdtdF/tdtdG/tdtdH/td + /tr + tr + tdI/tdtdJ/tdtdK/tdtdL/td + /tr + tr + tdM/tdtdN/tdtdO/tdtdP/td + /tr /table h2Merged cells/h2 table - tr -td1/tdtd2/tdtd3/tdtd rowspan='3'4/tdtd5/tdtd6/td - /tr - tr -td7/tdtd colspan='2'8/tdtd rowspan='4'9/tdtd10/td - /tr - tr -td11/tdtd12/tdtd13/tdtd14/td - /tr - tr -td15/tdtd rowspan='3' colspan='3'16/tdtd17/td - /tr - tr -td18/tdtd19/td - /tr - tr -td20/tdtd colspan='2'21/td - /tr - tr -td22/tdtd23/tdtd24/tdtd25/tdtd26/tdtd27/td - /tr + tr + td1/tdtd2/tdtd3/tdtd rowspan=34/tdtd5/tdtd6/td + /tr + tr + td7/tdtd colspan=28/tdtd rowspan=49/tdtd10/td + /tr + tr + td11/tdtd12/tdtd13/tdtd14/td + /tr + tr + td15/tdtd rowspan=3 colspan=316/tdtd17/td + /tr + tr + td18/tdtd19/td + /tr + tr + td20/tdtd colspan=221/td + /tr + tr + td22/tdtd23/tdtd24/tdtd25/tdtd26/tdtd27/td + /tr /table h2Nested tables/h2 table - tr -tdcell 1 row 1/td -tdcell 2 row 1/td - /tr - tr -tdcell 1 row 2/td -tdtable -tr - tdtable 2 cell 1 row 1/td - tdtable 2 cell 2 row 1/td -/tr -tr - tdtable 2 cell 1 row 2/td - tdtable - tr -tdtable 3 cell 1 row 1/td -tdtable 3 cell 2 row 1/td - /tr - tr -tdtable 3 cell 1 row 2/td -tdtable 3 cell 2 row 2/td - /tr -/table - /td -/tr - /table -/td - /tr + tr + tdcell 1 row 1/td + tdcell 2 row 1/td + /tr + tr + tdcell 1 row 2/td + tdtable + tr + tdtable 2 cell 1 row 1/td + tdtable 2 cell 2 row 1/td + /tr + tr + tdtable 2 cell 1 row 2/td + tdtable + tr + tdtable 3 cell 1 row 1/td + tdtable 3 cell 2 row 1/td + /tr + tr + tdtable 3 cell 1 row 2/td + tdtable 3 cell 2 row 2/td + /tr + /table + /td + /tr + /table + /td + /tr /table h2Captioned table/h2 table - captionCaption/caption - tr -tdA/tdtdB/tdtdC/tdtdD/td - /tr - tr -tdE/tdtdF/tdtdG/tdtdH/td - /tr + captionCaption/caption + tr + tdA/tdtdB/tdtdC/tdtdD/td + /tr + tr + tdE/tdtdF/tdtdG/tdtdH/td + /tr /table h2Sparse table/h2 table - tr -tdA/tdtdB/tdtdC/tdtdD/td - /tr - tr -tdE/tdtdF/td - /tr - tr -tdG/tdtdH/td - /tr - tr -tdI/tdtdJ/tdtdK/tdtdL/td - /tr + tr + tdA/tdtdB/tdtdC/tdtdD/td + /tr + tr + tdE/tdtdF/td + /tr + tr + tdG/tdtdH/td + /tr + tr + tdI/tdtdJ/tdtdK/tdtdL/td + /tr /table h2Alien table/h2 table - tr -tdA/tdtdB/tdtdC/tdtdD/td - /tr - tr -tdE/tdtd rel=ve:AlienF/tdtd rel=ve:AlienG/tdtdH/td - /tr - tr rel=ve:Alien -tdI/tdtdJ/tdtdK/tdtdL/td - /tr - tr rel=ve:Alien -td rel=ve:Alien colspan=4One alien/td - /tr - tr -
[MediaWiki-commits] [Gerrit] memcached: add host entry for mc2001 - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196284
Change subject: memcached: add host entry for mc2001
..
memcached: add host entry for mc2001
Change-Id: Iac8086e71f592d7b11441f447686bb78d9a8a935
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/196284/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 10cf34d..e016552 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2258,6 +2258,13 @@
filename precise-installer/ubuntu-installer/amd64/pxelinux.0;
}
+host mc2001 {
+ hardware ethernet 90:e2:ba:19:55:f0;
+ fixed-address mc2002.codfw.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
host mc2002 {
hardware ethernet 90:e2:ba:19:4e:c8;
fixed-address mc2002.codfw.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/196284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac8086e71f592d7b11441f447686bb78d9a8a935
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:Gather and collections overlay should use API - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:Gather and collections overlay should use API
..
Special:Gather and collections overlay should use API
Breaking changes:
* Temporarily this prevents viewing of lists other than your own.
For example: Currently http://127.0.0.1:8080/wiki/Special:Gather/Max is showing
the collections that belong to
http://127.0.0.1:8080/wiki/Special:Gather/Jdlrobson
* Sets number of articles on list to -1 rather than true value
Change-Id: Icca5cf432f8de6aef461c7d59947340a1056c553
---
M includes/Gather.hooks.php
M includes/models/CollectionsList.php
M includes/specials/SpecialGather.php
3 files changed, 37 insertions(+), 3 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Gather.hooks.php b/includes/Gather.hooks.php
index 584cf14..0cba4b5 100644
--- a/includes/Gather.hooks.php
+++ b/includes/Gather.hooks.php
@@ -7,6 +7,7 @@
use \SpecialPage;
use Gather\stores;
+use Gather\models;
use Gather\views\helpers\CSS;
use \MobileContext;
@@ -130,7 +131,7 @@
public static function onMakeGlobalVariablesScript( $vars, $out ) {
$user = $out-getUser();
if ( !$user-isAnon() ) {
- $collectionsList =
stores\UserPageCollectionsList::newFromUser( $user, true );
+ $collectionsList = models\CollectionsList::newFromApi(
$user, true );
$gatherCollections = array();
foreach ( $collectionsList as $collectionInfo ) {
$id = $collectionInfo-getId();
diff --git a/includes/models/CollectionsList.php
b/includes/models/CollectionsList.php
index 38dbe20..c87c4e4 100644
--- a/includes/models/CollectionsList.php
+++ b/includes/models/CollectionsList.php
@@ -6,8 +6,11 @@
namespace Gather\models;
+use \User;
use Gather\models;
use \ArrayIterator;
+use \ApiMain;
+use \FauxRequest;
class CollectionsList implements \IteratorAggregate, ArraySerializable {
@@ -75,5 +78,34 @@
return $arr;
}
+ /**
+* Generate UserPageCollectionsList from api result
+* FIXME: $user parameter currently ignored
+* @param User $user collection list owner (currently ignored)
+* @param boolean $includePrivate if the list should show private
collections or not
+* @return models\CollectionsList List of collections.
+*/
+ public static function newFromApi( User $user, $includePrivate = false
) {
+ $collectionsList = new CollectionsList( $includePrivate );
+ $api = new ApiMain( new FauxRequest( array(
+ 'action' = 'query',
+ 'list' = 'lists',
+ ) ) );
+ $api-execute();
+ $data = $api-getResultData();
+ if ( isset( $data['query']['lists'] ) ) {
+ $lists = $data['query']['lists'];
+ foreach ( $lists as $list ) {
+ if ( $list['isPublic'] || $includePrivate ) {
+ $info = new models\CollectionInfo(
$list['id'], $user,
+ $list['label'],
$list['description'], $list['isPublic'] );
+ // FIXME: API should return the number
of items in each list
+ $info-setCount( -1 );
+ $collectionsList-add( $info );
+ }
+ }
+ }
+ return $collectionsList;
+ }
}
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index 1d48ebc..dfdd0c4 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -100,8 +100,9 @@
* @param User $user owner of collections
*/
public function renderUserCollectionsList( User $user ) {
- $collectionsList = stores\UserPageCollectionsList::newFromUser(
$user, $this-isOwner( $user ) );
- if ( $collectionsList-getCount() 0 ) {
+ $collectionsList = models\CollectionsList::newFromApi( $user,
$this-isOwner( $user ) );
+ // FIXME: Remove when CollectionsList::newFromApi supports
access of other peoples lists
+ if ( $this-isOwner( $user ) $collectionsList-getCount()
0 ) {
$this-render( new views\CollectionsList(
$collectionsList ) );
} else {
$this-renderError( new views\NoPublic() );
--
To view, visit https://gerrit.wikimedia.org/r/195621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icca5cf432f8de6aef461c7d59947340a1056c553
Gerrit-PatchSet: 7
[MediaWiki-commits] [Gerrit] Fix list selection on watchstar overlay - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix list selection on watchstar overlay
..
Fix list selection on watchstar overlay
Event handler was accessing target which could be the icon when what it wanted
was always the 'li' element (currentTarget instead of target or delegateTarget)
http://api.jquery.com/event.currentTarget/
Bug: T92350
Change-Id: I6a3e52062df20527c0eab3306a0568514c37a326
---
M resources/ext.gather.watchstar/CollectionsContentOverlay.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.watchstar/CollectionsContentOverlay.js
b/resources/ext.gather.watchstar/CollectionsContentOverlay.js
index 926b3e4..6b1e155 100644
--- a/resources/ext.gather.watchstar/CollectionsContentOverlay.js
+++ b/resources/ext.gather.watchstar/CollectionsContentOverlay.js
@@ -101,7 +101,7 @@
*/
onSelectCollection: function ( ev ) {
var collection,
- $target = $( ev.target ),
+ $target = $( ev.currentTarget ),
page = M.getCurrentPage();
collection = {
--
To view, visit https://gerrit.wikimedia.org/r/196267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a3e52062df20527c0eab3306a0568514c37a326
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ve.ui.MWLinkNodeInspector: Restore action buttons - change (mediawiki...VisualEditor)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196291
Change subject: ve.ui.MWLinkNodeInspector: Restore action buttons
..
ve.ui.MWLinkNodeInspector: Restore action buttons
Bug: T92525
Change-Id: Id305268b76cce4e56f0e98a9d7ac4e6c571470d2
---
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/91/196291/1
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js
index 474de0f..2e99419 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js
@@ -38,11 +38,13 @@
ve.ui.MWLinkNodeInspector.static.actions =
ve.ui.MWLinkNodeInspector.super.static.actions.concat( [
{
action: 'open',
- label: OO.ui.deferMsg( 'visualeditor-linkinspector-open' )
+ label: OO.ui.deferMsg( 'visualeditor-linkinspector-open' ),
+ modes: [ 'edit', 'insert' ]
},
{
action: 'convert',
- label: OO.ui.deferMsg(
'visualeditor-linknodeinspector-add-label' )
+ label: OO.ui.deferMsg(
'visualeditor-linknodeinspector-add-label' ),
+ modes: [ 'edit' ]
}
] );
--
To view, visit https://gerrit.wikimedia.org/r/196291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id305268b76cce4e56f0e98a9d7ac4e6c571470d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Address nested parentheses in Share a Fact - change (apps...wikipedia)
Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196298
Change subject: Address nested parentheses in Share a Fact
..
Address nested parentheses in Share a Fact
Additionally, trim whitespace before semicolons.
Finally, use autoreleasepools, as a reviewer had requested.
Change-Id: I3c26877c7e4e220e84af9f192423384ea3b5c64e
---
M WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
M wikipedia/Categories/NSString+WMFHTMLParsing.m
2 files changed, 112 insertions(+), 93 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/98/196298/1
diff --git a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
index 698180d..f4dd719 100644
--- a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
+++ b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
@@ -33,8 +33,10 @@
}
- (void)testAdequateSnippet {
-NSString *string = @pDog (woof) [horse] adequately long string/p;
-XCTAssertEqualObjects([string wmf_getStringSnippetWithoutHTML], @Dog
adequately long string);
+NSString *string = @pDog (woof (w00t)) [horse] adequately long string
historically 40 characters./p;
+NSString *result = [string wmf_getStringSnippetWithoutHTML];
+XCTAssertEqualObjects([string wmf_getStringSnippetWithoutHTML],
+ @Dog adequately long string historically 40
characters.);
}
@end
diff --git a/wikipedia/Categories/NSString+WMFHTMLParsing.m
b/wikipedia/Categories/NSString+WMFHTMLParsing.m
index 9c06619..0e5663b 100644
--- a/wikipedia/Categories/NSString+WMFHTMLParsing.m
+++ b/wikipedia/Categories/NSString+WMFHTMLParsing.m
@@ -42,100 +42,117 @@
}
+ (NSString*)wmf_stringSnippetSimplifiedInString:(NSString*)string {
-NSString* result = [string
stringByReplacingOccurrencesOfString:@amp; withString:@];
-NSError* err = nil;
-NSRegularExpression* newlinesRegex = [NSRegularExpression
-
regularExpressionWithPattern:@\n{2,}
- options:0
- error:err];
-NSRange range = NSMakeRange(0, result.length);
-result = [newlinesRegex stringByReplacingMatchesInString:result
+@autoreleasepool {
+NSString* result = [string
stringByReplacingOccurrencesOfString:@amp; withString:@];
+NSError* err = nil;
+NSRegularExpression* newlinesRegex = [NSRegularExpression
+
regularExpressionWithPattern:@\n{2,}
+ options:0
+ error:err];
+NSRange range = NSMakeRange(0, result.length);
+result = [newlinesRegex stringByReplacingMatchesInString:result
+ options:0
+ range:range
+withTemplate:@\n];
+
+
+// We probably don't want to try to handle ideographic parens
+err = nil;
+NSRegularExpression* parensRegex = [NSRegularExpression
+
regularExpressionWithPattern:@[(][^()]+[)]
+options:0
+error:err];
+
+result = [NSString wmf_recursivelyUpdateString:result
withRegex:parensRegex];
+
+// Nor do we want to try to handle ideographic brackets
+err = nil;
+NSRegularExpression* bracketsRegex = [NSRegularExpression
+
regularExpressionWithPattern:@\\[[^]]+]
+ options:0
+ error:err];
+
+range = NSMakeRange(0, result.length);
+result = [bracketsRegex stringByReplacingMatchesInString:result
+ options:0
+ range:range
+withTemplate:@];
+
+// Unlike parens and brackets and unlike doubled up space in general,
+// we do not want whitespace preceding the comma, ideographic comma,
+// or semicolon
+err = nil;
+NSRegularExpression* whitespaceCommaSemicolonRegex =
[NSRegularExpression
+
regularExpressionWithPattern:@\\s+([,、;])
options:0
- range:range
-withTemplate:@\n];
-
-
-
[MediaWiki-commits] [Gerrit] Remove U+FEFF before opening ?php tag - change (mediawiki...Math)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/196297 Change subject: Remove U+FEFF before opening ?php tag .. Remove U+FEFF before opening ?php tag Change-Id: Ib2f1a75f4a3b5879809243cf43124bf3ebf83127 --- M tests/MathMathMLTest.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/97/196297/1 diff --git a/tests/MathMathMLTest.php b/tests/MathMathMLTest.php index e410070..5fb2749 100644 --- a/tests/MathMathMLTest.php +++ b/tests/MathMathMLTest.php @@ -1,4 +1,4 @@ -?php +?php /** * Test the MathML output format. * -- To view, visit https://gerrit.wikimedia.org/r/196297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2f1a75f4a3b5879809243cf43124bf3ebf83127 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding dhcp entries for cp1071-74 with jesse installer - change (operations/puppet)
Cmjohnson has submitted this change and it was merged.
Change subject: Adding dhcp entries for cp1071-74 with jesse installer
..
Adding dhcp entries for cp1071-74 with jesse installer
Change-Id: I15ec468d7071a6bec857a9a9c44fa4d40cd096bb
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 28 insertions(+), 0 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 5dd363e..eb1dc21 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -700,6 +700,34 @@
filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
+host cp1071 {
+hardware ethernet 44:A8:42:10:0E:D1;
+fixed-address cp1071.eqiad.wmnet;
+option pxelinux.pathprefix jessie-installer/;
+filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
+host cp1072 {
+hardware ethernet 44:A8:42:0A:6F:66;
+fixed-address cp1072.eqiad.wmnet;
+option pxelinux.pathprefix jessie-installer/;
+filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
+host cp1073 {
+hardware ethernet 44:A8:42:10:2A:0E;
+fixed-address cp1073.eqiad.wmnet;
+option pxelinux.pathprefix jessie-installer/;
+filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
+host cp1074 {
+hardware ethernet 44:A8:42:10:0D:5A;
+fixed-address cp1074.eqiad.wmnet;
+option pxelinux.pathprefix jessie-installer/;
+filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
host cp3001 {
hardware ethernet 78:2b:cb:45:4a:31;
fixed-address cp3001.esams.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/196258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15ec468d7071a6bec857a9a9c44fa4d40cd096bb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix broken UTF-8 encoding. - change (mediawiki...Wikibase)
Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/196304 Change subject: Fix broken UTF-8 encoding. .. Fix broken UTF-8 encoding. Requires https://github.com/Wikidata/easyrdf_lite/pull/4 Change-Id: Id9ed87250481ab4f37abf696be702d3fd1e0bec6 --- M repo/tests/phpunit/data/rdf/Q2_labels.nt M repo/tests/phpunit/data/rdf/Q4_all_statements.nt M repo/tests/phpunit/data/rdf/Q4_claims.nt M repo/tests/phpunit/data/rdf/Q4_props.nt M repo/tests/phpunit/data/rdf/Q4_truthy_statements.nt M repo/tests/phpunit/data/rdf/Q4_values.nt M repo/tests/phpunit/data/rdf/Q6_qualifiers.nt M repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt M repo/tests/phpunit/data/rdf/Q7_references.nt M repo/tests/phpunit/data/rdf/Q7_refs.nt 10 files changed, 32 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/04/196304/1 diff --git a/repo/tests/phpunit/data/rdf/Q2_labels.nt b/repo/tests/phpunit/data/rdf/Q2_labels.nt index b2e1941..59dd630 100644 --- a/repo/tests/phpunit/data/rdf/Q2_labels.nt +++ b/repo/tests/phpunit/data/rdf/Q2_labels.nt @@ -1,19 +1,18 @@ - http://acme.test/Q2 http://schema.org/description German city@en . -http://acme.test/Q2 http://schema.org/description \u00D1\u0081\u00D1\u0082\u00D0\u00BE\u00D0\u00BB\u00D0\u00B8\u00D1\u0086\u00D0\u00B0 \u00D0\u00B8 \u00D0\u00BE\u00D0\u00B4\u00D0\u00BD\u00D0\u00BE\u00D0\u00B2\u00D1\u0080\u00D0\u00B5\u00D0\u00BC\u00D0\u00B5\u00D0\u00BD\u00D0\u00BD\u00D0\u00BE \u00D0\u00B7\u00D0\u00B5\u00D0\u00BC\u00D0\u00BB\u00D1\u008F \u00D0\u0093\u00D0\u00B5\u00D1\u0080\u00D0\u00BC\u00D0\u00B0\u00D0\u00BD\u00D0\u00B8\u00D0\u00B8@ru . +http://acme.test/Q2 http://schema.org/description \u0441\u0442\u043E\u043B\u0438\u0446\u0430 \u0438 \u043E\u0434\u043D\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E \u0437\u0435\u043C\u043B\u044F \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438@ru . http://acme.test/Q2 http://schema.org/name Berlin@en . -http://acme.test/Q2 http://schema.org/name \u00D0\u0091\u00D0\u00B5\u00D1\u0080\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD@ru . +http://acme.test/Q2 http://schema.org/name \u0411\u0435\u0440\u043B\u0438\u043D@ru . http://acme.test/Q2 http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://www.wikidata.org/ontology-0.0.1#Item . http://acme.test/Q2 http://www.w3.org/2000/01/rdf-schema#label Berlin@en . -http://acme.test/Q2 http://www.w3.org/2000/01/rdf-schema#label \u00D0\u0091\u00D0\u00B5\u00D1\u0080\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD@ru . +http://acme.test/Q2 http://www.w3.org/2000/01/rdf-schema#label \u0411\u0435\u0440\u043B\u0438\u043D@ru . http://acme.test/Q2 http://www.w3.org/2004/02/skos/core#altLabel Berlin@ru . http://acme.test/Q2 http://www.w3.org/2004/02/skos/core#altLabel Berlin, Germany@en . http://acme.test/Q2 http://www.w3.org/2004/02/skos/core#altLabel Land Berlin@en . http://acme.test/Q2 http://www.w3.org/2004/02/skos/core#prefLabel Berlin@en . -http://acme.test/Q2 http://www.w3.org/2004/02/skos/core#prefLabel \u00D0\u0091\u00D0\u00B5\u00D1\u0080\u00D0\u00BB\u00D0\u00B8\u00D0\u00BD@ru . +http://acme.test/Q2 http://www.w3.org/2004/02/skos/core#prefLabel \u0411\u0435\u0440\u043B\u0438\u043D@ru . http://data.acme.test/Q2 http://creativecommons.org/ns#license http://creativecommons.org/publicdomain/zero/1.0/ . http://data.acme.test/Q2 http://schema.org/about http://acme.test/Q2 . http://data.acme.test/Q2 http://schema.org/dateModified 2014-11-04T03:11:05Z^^http://www.w3.org/2001/XMLSchema#dateTime . http://data.acme.test/Q2 http://schema.org/softwareVersion 0.0.1 . http://data.acme.test/Q2 http://schema.org/version 42^^http://www.w3.org/2001/XMLSchema#integer . -http://data.acme.test/Q2 http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://schema.org/Dataset . \ No newline at end of file +http://data.acme.test/Q2 http://www.w3.org/1999/02/22-rdf-syntax-ns#type http://schema.org/Dataset . diff --git a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt b/repo/tests/phpunit/data/rdf/Q4_all_statements.nt index c432fae..60c38a6 100644 --- a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt +++ b/repo/tests/phpunit/data/rdf/Q4_all_statements.nt @@ -1,4 +1,3 @@ - http://acme.test/Q4 http://acme.test/P2 http://acme.test/statement/TEST-Statement-2-423614cd831ed4e8da1138c9229cb65cf96f9366 . http://acme.test/Q4 http://acme.test/P2 http://acme.test/statement/TEST-Statement-2-475ae31b07cff4f0e33531030b1ba58f004fcd4b . http://acme.test/Q4 http://acme.test/P3 http://acme.test/statement/TEST-Statement-3-12914044e0dbab210aa9d81168bd50471bbde12d . @@ -30,10 +29,10 @@ http://acme.test/statement/TEST-Statement-5-8c5d9fe1bfe1fe52e5ab706ae3e5d62f4aaa8d5b http://acme.test/value/P5 http://www.wikidata.org/ontology-0.0.1#Somevalue . http://acme.test/statement/TEST-Statement-5-8c5d9fe1bfe1fe52e5ab706ae3e5d62f4aaa8d5b http://www.w3.org/1999/02/22-rdf-syntax-ns#type
[MediaWiki-commits] [Gerrit] Fix Fatal error in recent changes - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Fatal error in recent changes
..
Fix Fatal error in recent changes
When displaying grouped header edits the formatter code was attempting
to clone a non-existant topic link. Patch updates to fall back to a
'workflow' link if the topic is not available. Further falls back
to throwing an exception instead of fataling.
Bug: T92536
Change-Id: Ie3230d48bea5d7f18754f3fa725726409fd3e92b
---
M includes/Formatter/RecentChanges.php
1 file changed, 13 insertions(+), 6 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Formatter/RecentChanges.php
b/includes/Formatter/RecentChanges.php
index 4cb94d2..b5817cf 100644
--- a/includes/Formatter/RecentChanges.php
+++ b/includes/Formatter/RecentChanges.php
@@ -176,13 +176,20 @@
throw new FlowException( 'Could not format data for row
' . $row-revision-getRevisionId()-getAlphadecimal() );
}
- // add highlight details to anchor
- /** @var Anchor $anchor */
- $anchor = clone $data['links']['topic'];
- $anchor-query['fromnotif'] = '1';
- $anchor-fragment = '#flow-post-' . $oldId-getAlphadecimal();
+ if ( isset( $data['links']['topic'] ) ) {
+ // add highlight details to anchor
+ /** @var Anchor $anchor */
+ $anchor = clone $data['links']['topic'];
+ $anchor-query['fromnotif'] = '1';
+ $anchor-fragment = '#flow-post-' .
$oldId-getAlphadecimal();
+ } elseif ( isset( $data['links']['workflow'] ) ) {
+ $anchor = $data['links']['workflow'];
+ } else {
+ // this will be caught and logged by the RC hook, it
will not fatal the page.
+ throw new FlowException( No anchor available for
revision $oldId );
+ }
- $changes = count($block);
+ $changes = count( $block );
// link text: n changes
$text = $ctx-msg( 'nchanges' )-numParams( $changes
)-escaped();
--
To view, visit https://gerrit.wikimedia.org/r/196303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3230d48bea5d7f18754f3fa725726409fd3e92b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix addData calls - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196307
Change subject: Fix addData calls
..
Fix addData calls
Change-Id: I97d503dbb979dcfe083989512326170e73a167d0
---
M amazon_gateway/amazon_gateway.body.php
M paypal_gateway/paypal_gateway.body.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/07/196307/1
diff --git a/amazon_gateway/amazon_gateway.body.php
b/amazon_gateway/amazon_gateway.body.php
index a20a901..7792149 100644
--- a/amazon_gateway/amazon_gateway.body.php
+++ b/amazon_gateway/amazon_gateway.body.php
@@ -44,7 +44,7 @@
|| $this-getRequest()-getText(
'recurring', 0 )
) {
// FIXME: do this in the form param
harvesting step
- $this-adapter-addData( array(
+ $this-adapter-addRequestData( array(
'recurring' = 1,
) );
}
diff --git a/paypal_gateway/paypal_gateway.body.php
b/paypal_gateway/paypal_gateway.body.php
index 8ae2b63..5354c57 100644
--- a/paypal_gateway/paypal_gateway.body.php
+++ b/paypal_gateway/paypal_gateway.body.php
@@ -34,7 +34,7 @@
if ( $this-getRequest()-getText( 'ffname', 'default' ) ===
'paypal-recurring' ) {
// FIXME: do this in the form param harvesting step
- $this-adapter-addData( array(
+ $this-adapter-addRequestData( array(
'recurring' = 1,
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/196307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97d503dbb979dcfe083989512326170e73a167d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge REL1_23 into fundraising/REL1_23 - change (mediawiki/core)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196311
Change subject: Merge REL1_23 into fundraising/REL1_23
..
Merge REL1_23 into fundraising/REL1_23
0d304c1bcacc6b0f8165569963393b0102a63314 PostgreSQL: Fix Special:ActiveUsers
GROUP BY query
263c03eb4c5d48936b6041326cc7e5811887ae04 tests: Move npm-test to repo root
0112e62b53aed8205e0306fd0433753b399ab580 jquery.badge: Swap non-breaking space
character for regular space
1d7cbbe571342e8fe9f19269d04809807519748c resourceloader: Call setName() in test
suite before calling getStyles()
8e7b7728983252da81f7629a72afed9f6827753d Rename JSDuck config to standard
'jsduck'
Change-Id: I6ffc03fa2e644a8f6dd0616c87748aceff7af82d
---
M Gruntfile.js
M package.json
2 files changed, 0 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/196311/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 689d4ca..9badf03 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,43 +1,5 @@
/*jshint node:true */
module.exports = function ( grunt ) {
- HEAD (a6c451 update DonationInterface submodule)
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-contrib-watch' );
- grunt.loadNpmTasks( 'grunt-jscs-checker' );
-
- grunt.initConfig( {
- pkg: grunt.file.readJSON( 'package.json' ),
- jshint: {
- options: {
- jshintrc: '.jshintrc'
- },
- all: [ '*.js',
'{includes,languages,resources,skins,tests}/**/*.js' ]
- },
- jscs: {
- // Known issues:
- // - https://github.com/mdevils/node-jscs/issues/277
- // - https://github.com/mdevils/node-jscs/issues/278
- all: [
- '%= jshint.all %',
- // Auto-generated file with JSON (double quotes)
- '!tests/qunit/data/mediawiki.jqueryMsg.data.js'
-
- // Exclude all files ignored by jshint
- ].concat( grunt.file.read( '.jshintignore' ).split(
'\n' ).reduce( function ( patterns, pattern ) {
- // Filter out empty lines
- if ( pattern.length pattern[0] !== '#' ) {
- patterns.push( '!' + pattern );
- }
- return patterns;
- }, [] ) )
- },
- watch: {
- files: [
- '.{jshintrc,jscs.json,jshintignore,csslintrc}',
- '%= jshint.all %'
- ],
- tasks: ['test']
-===
grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
@@ -85,7 +47,6 @@
return require( 'path' ).join( dest,
src.replace( 'resources/', '' ) );
}
}
- BRANCH (8e7b77 Rename JSDuck config to standard 'jsduck')
}
} );
diff --git a/package.json b/package.json
index 30ffc40..a9b9148 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,6 @@
name: mediawiki,
version: 0.0.0,
scripts: {
- HEAD (a6c451 update DonationInterface submodule)
-test: grunt test
- },
- devDependencies: {
-grunt: 0.4.2,
-grunt-contrib-jshint: 0.9.2,
-===
test: grunt test,
doc: jsduck,
postdoc: grunt copy:jsduck
@@ -17,7 +10,6 @@
grunt: 0.4.2,
grunt-contrib-jshint: 0.9.2,
grunt-contrib-copy: 0.8.0,
- BRANCH (8e7b77 Rename JSDuck config to standard 'jsduck')
grunt-contrib-watch: 0.6.1,
grunt-jscs-checker: 0.4.1
}
--
To view, visit https://gerrit.wikimedia.org/r/196311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ffc03fa2e644a8f6dd0616c87748aceff7af82d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_23
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Database: Make the target_url nullable for cx_translations t... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Database: Make the target_url nullable for cx_translations table
..
Database: Make the target_url nullable for cx_translations table
Following alter query need to be executed
ALTER TABLE cx_translations
MODIFY translation_target_url text binary default null
Bug: T91365, T92364
Followup: I4cd9aa09bcac
Change-Id: I4b92ca30f92b0bd10241018bc1ce7221c13be3ee
---
M sql/contenttranslation.sql
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Nikerabbit: Looks good to me, approved
Springle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/sql/contenttranslation.sql b/sql/contenttranslation.sql
index 9e9bbb4..73fce44 100644
--- a/sql/contenttranslation.sql
+++ b/sql/contenttranslation.sql
@@ -21,7 +21,7 @@
-- source of the page as full canonical url --
https://www.mediawiki.org/wiki/Help:CxIsPage
translation_source_url text binary not null,
-- link to the draft/published target
-translation_target_url text binary not null,
+translation_target_url text binary default null,
-- Status of translation - Draft or published status.
-- There is no final status. A published translation can be draft again to
update again
translation_status enum('draft', 'published') default null,
--
To view, visit https://gerrit.wikimedia.org/r/195853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b92ca30f92b0bd10241018bc1ce7221c13be3ee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add restbase job runners - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Add restbase job runners
..
Add restbase job runners
This adds dedicated job runners in order to manage priorities basically the
same way we already do for Parsoid. The RESTBase update extension was just
enabled on testwiki via https://gerrit.wikimedia.org/r/#/c/195348/, but so far
the jobs just end up in the default queue.
Marko is prepping the job exclusion setting in wmf-config, and this patch will
provide the runners for the separate queues.
The number of restbase jobrunners has been reduced to 1 until T92490 has
been resolved.
Change-Id: I70a841b8e6b19482af727515891f887ee391d955
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
4 files changed, 15 insertions(+), 0 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 f21a2a5..05f9242 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -122,6 +122,7 @@
mediawiki::jobrunner::statsd_server: labmon1001.eqiad.wmnet
mediawiki::jobrunner::runners_basic: 5
mediawiki::jobrunner::runners_parsoid: 5
+mediawiki::jobrunner::runners_restbase: 5
mediawiki::jobrunner::runners_upload: 2
mediawiki::jobrunner::runners_gwt: 1
role::logging::mediawiki::log_directory: /data/project/logs
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml
b/hieradata/role/common/mediawiki/jobrunner.yaml
index da4cdec..4cdb6fa 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -3,6 +3,8 @@
- deployment
mediawiki::jobrunner::runners_basic: 14
mediawiki::jobrunner::runners_parsoid: 4
+# Do not raise this value until T92490 is resolved
+mediawiki::jobrunner::runners_restbase: 1
mediawiki::jobrunner::runners_upload: 7
mediawiki::jobrunner::runners_gwt: 1
mediawiki::users::web: www-data
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index 2891c73..a13a612 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -10,6 +10,7 @@
$runners_upload= 0,
$runners_gwt = 0,
$runners_parsoid = 0,
+$runners_restbase = 0,
$runners_transcode = 0,
$statsd_server = undef,
$port = 9005,
diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
index 9ad30ae..25409fb 100644
--- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
@@ -11,6 +11,8 @@
AssembleUploadChunks,
ParsoidCacheUpdateJobOnDependencyChange,
ParsoidCacheUpdateJobOnEdit,
+RestbaseUpdateJobOnEdit,
+RestbaseUpdateJobOnDependencyChange,
PublishStashedFile,
gwtoolsetGWTFileBackendCleanupJob,
gwtoolsetUploadMediafileJob,
@@ -41,6 +43,15 @@
ParsoidCacheUpdateJobOnDependencyChange
]
},
+restbase: {
+runners: %= @runners_restbase %,
+include: [
+RestbaseUpdateJobOnEdit
+],
+low-priority: [
+RestbaseUpdateJobOnDependencyChange
+]
+},
transcode: {
runners: %= @runners_transcode %,
include: [
--
To view, visit https://gerrit.wikimedia.org/r/195364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70a841b8e6b19482af727515891f887ee391d955
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Eevans eev...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: RobH r...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added code tag to list of tags special tags - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Added code tag to list of tags special tags
..
Added code tag to list of tags special tags
The content of code tags must not be altered. So they are treated as
special tags in the future.
Change-Id: I95e6ccd5e8a2bbfc2f63b30f2a04d5f4a9d6f359
---
M VisualEditor/VisualEditor.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 5e3a31d..7b8833e 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -314,7 +314,7 @@
$aDefaultTags = array(
syntaxhighlight, source, infobox, categorytree,
presentation, includeonly, onlyinclude,
noinclude,
- backlink, gallery, math, video, rss,
tagcloud
+ backlink, gallery, math, video, rss,
tagcloud, code
);
$this-aConfigStandard[specialtaglist] =
BsConfig::get('MW::VisualEditor::SpecialTags')
. implode('|', $aDefaultTags);
--
To view, visit https://gerrit.wikimedia.org/r/196209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95e6ccd5e8a2bbfc2f63b30f2a04d5f4a9d6f359
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update TemplateData for cherry-pick - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update TemplateData for cherry-pick .. Update TemplateData for cherry-pick New changes: 582d3ed Prevent a dependent property from updating on infinite loops Change-Id: Ib4d82b87afa850e839b02914f4f5528be51d3e3a --- M extensions/TemplateData 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/TemplateData b/extensions/TemplateData index e6322dd..582d3ed 16 --- a/extensions/TemplateData +++ b/extensions/TemplateData -Subproject commit e6322dd07584b93f741a11d1ecde52fb951bbed7 +Subproject commit 582d3ed11d1378e9d83185bf0159a1b9a5c7a30e -- To view, visit https://gerrit.wikimedia.org/r/196439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4d82b87afa850e839b02914f4f5528be51d3e3a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring back mwext-VisualEditor-jsduck override for submodules - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196491
Change subject: Bring back mwext-VisualEditor-jsduck override for submodules
..
Bring back mwext-VisualEditor-jsduck override for submodules
Follows-up ddd8d0e, 82f4c2f.
Change-Id: I46c60d5205a170a2c58e126cceac242b344a26f4
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
2 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/91/196491/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 9977fec..fd1d61f 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -31,6 +31,19 @@
builders:
- jsduck
+# Deprecated non-generic jsduck job. You should use the above 'jsduck' job.
+# For repos that need to preserve workspace or have submodules, this is
+# used as workaround.
+- job-template:
+name: '{name}-jsduck'
+node: contintLabsSlave UbuntuTrusty
+defaults: use-remoteonly-zuul
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - npm
+
- job-template:
name: '{name}-npm'
node: contintLabsSlave UbuntuTrusty
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b6f8647..2912b9a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1142,6 +1142,11 @@
- '{name}-ruby1.9.3lint'
- project:
+name: 'mwext-VisualEditor'
+jobs:
+ - '{name}-jsduck'
+
+- project:
name: 'mwext-BlameMaps'
jobs:
- python-jobs
--
To view, visit https://gerrit.wikimedia.org/r/196491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46c60d5205a170a2c58e126cceac242b344a26f4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (792b450) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/196490 Change subject: Update VE core submodule to master (792b450) .. Update VE core submodule to master (792b450) New changes: 681804e Only call execCommand() on the surface in Firefox c9ed5d8 Include editing-core icon pack 792b450 Update OOjs UI to v0.9.2 Change-Id: If75e4993b8c9c7134a69bc5fbffb335beacd8b9e --- M .jsduck/eg-iframe.html M VisualEditor.php M extension.json M lib/ve 4 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/90/196490/1 diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index c94ce33..4257a39 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -6,6 +6,7 @@ !-- oojs-ui-apex -- link rel=stylesheet href=lib/ve/lib/oojs-ui/oojs-ui-apex.vector.css + link rel=stylesheet href=lib/ve/lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css !-- visualEditor.core.build -- link rel=stylesheet href=lib/ve/src/ce/styles/nodes/ve.ce.FocusableNode.css class=stylesheet-ve diff --git a/VisualEditor.php b/VisualEditor.php index dd2dcb3..299ecf1 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -277,6 +277,7 @@ 'dependencies' = array( 'oojs', 'oojs-ui', + 'oojs-ui.styles.icons-editing-core', 'unicodejs', 'ext.visualEditor.ve', ), diff --git a/extension.json b/extension.json index 3dea1dd..fb52e67 100644 --- a/extension.json +++ b/extension.json @@ -359,6 +359,7 @@ dependencies: [ oojs, oojs-ui, + oojs-ui.styles.icons-editing-core, unicodejs, ext.visualEditor.ve ], diff --git a/lib/ve b/lib/ve index 82f0e1e..792b450 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 82f0e1eb7325b3064be84ab1acaaa4a6bfe1a905 +Subproject commit 792b450dd33619073fbd0ad850201f6cdc0f4301 -- To view, visit https://gerrit.wikimedia.org/r/196490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If75e4993b8c9c7134a69bc5fbffb335beacd8b9e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] A user can delete their own collection - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: A user can delete their own collection
..
A user can delete their own collection
* Add delete button to a removable collection view
* Adds a ContentOverlay for deleting a collection
* Add api method for removing a collection
* On delete, redirect to Special:Gather as collection
** No longer will exist
Bug: T91776
Change-Id: Ic561292d483502e4a44dfa0aa00acba83bf43f8f
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/views/Collection.php
M resources/Resources.php
A resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
A resources/ext.gather.collection.delete/content.hogan
A resources/ext.gather.collection.delete/deleteOverlay.less
M resources/ext.gather.special/init.js
M resources/ext.gather.styles/collections.less
M resources/ext.gather.watchstar/CollectionsApi.js
11 files changed, 249 insertions(+), 9 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 209a1e9..4fbaafe 100644
--- a/extension.json
+++ b/extension.json
@@ -168,7 +168,8 @@
gather-edit-collection-label-name,
gather-edit-collection-label-description,
gather-edit-collection-label-privacy,
- gather-edit-collection-save-label
+ gather-edit-collection-save-label,
+ gather-error-unknown-collection
],
templates: {
content.hogan:
ext.gather.collection.editor/content.hogan
@@ -180,6 +181,36 @@
ext.gather.collection.editor/editOverlay.less
]
},
+ ext.gather.collection.delete: {
+ targets: [
+ mobile,
+ desktop
+ ],
+ dependencies: [
+ mobile.overlays,
+ mobile.toast,
+ ext.gather.api,
+ mediawiki.util
+ ],
+ messages: [
+ gather-delete-collection-confirm,
+ gather-delete-collection-heading,
+ gather-delete-collection-delete-label,
+ gather-delete-collection-cancel-label,
+ gather-delete-collection-success,
+ gather-delete-collection-failed-error,
+ gather-error-unknown-collection
+ ],
+ templates: {
+ content.hogan:
ext.gather.collection.delete/content.hogan
+ },
+ scripts: [
+
ext.gather.collection.delete/CollectionDeleteOverlay.js
+ ],
+ styles: [
+
ext.gather.collection.delete/deleteOverlay.less
+ ]
+ },
ext.gather.special: {
targets: [
mobile,
@@ -187,7 +218,8 @@
],
group: other,
dependencies: [
- ext.gather.collection.editor
+ ext.gather.collection.editor,
+ ext.gather.collection.delete
],
scripts: [
ext.gather.special/init.js
diff --git a/i18n/en.json b/i18n/en.json
index d18f52d..94976b7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,6 +8,12 @@
gather-edit-collection-label-privacy: Private collection,
gather-edit-collection-save-label: Done,
gather-edit-collection-failed-error: There was a problem saving the
changes.,
+ gather-delete-collection-confirm: Are you sure you want to delete
this collection?,
+ gather-delete-collection-heading: Delete collection,
+ gather-delete-collection-delete-label: Delete,
+ gather-delete-collection-cancel-label: Cancel,
+ gather-delete-collection-success: Collection was successfully
deleted.,
+ gather-delete-collection-failed-error: There was a problem deleting
this collection.,
gather-error-unknown-collection: Cannot find the requested
collection to edit.,
gather-collection-member: Is member of collection.,
gather-collection-non-member: Is not member of collection.,
@@ -32,6 +38,7 @@
gather-empty: Nothing in this collection yet...,
[MediaWiki-commits] [Gerrit] plugin: Role settings feature description - change (mediawiki/vagrant)
Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196492
Change subject: plugin: Role settings feature description
..
plugin: Role settings feature description
Trying my hand at a little ATTD here.
Bug: T92549
Change-Id: I56caacba910d027846a63ff4507247c70446c980
---
A features/role_settings.feature
1 file changed, 66 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/92/196492/1
diff --git a/features/role_settings.feature b/features/role_settings.feature
new file mode 100644
index 000..db5918e
--- /dev/null
+++ b/features/role_settings.feature
@@ -0,0 +1,66 @@
+@wip
+Feature: Role settings
+
+ Roles should be able to define changes to the core environment settings to
+ better accommodate services requiring more memory, forwarded ports, etc.
+ Such changes should be communicated to the user both when viewing
+ documentation and upon enabling new roles. Enabling and disabling a role with
+ settings should trigger a reload before the next provision and warn the user.
+
+ Background:
+Given the following roles are defined:
+ | foo |
+ | bar |
+
+ Scenario: Running `vagrant roles info role` displays the role's settings
+Given the settings for the foo role are:
+
+ vagrant_ram: 200
+
+When I run `vagrant roles info foo`
+Then the command should have completed successfully
+And the output should contain:
+
+ Enabling this role will adjust the following settings:
+
+ Amount of RAM (in MB) allocated to the guest VM
+ vagrant_ram: +200
+
+
+ Scenario: Running `vagrant roles enable role` warns of changes to settings
+Given my current settings are:
+
+ vagrant_ram: 1536
+ forward_ports:
+123: 321
+
+And the settings for the foo role are:
+
+ vagrant_ram: 200
+ forward_ports:
+234: 432
+
+When I run `vagrant roles enable foo`
+Then the command should have completed successfully
+And the output should contain:
+
+ Ok. Run `vagrant provision` to apply your changes.
+
+ Note the following settings have changed and your environment will be
reloaded.
+ vagrant_ram: 1536 - 1736
+ forward_ports: { 123: 321 } - { 123: 321, 234: 432 }
+
+
+ Scenario: Running `vagrant provision` after enabling a role with settings
reloads
+Given the environment is up
+And the settings for the foo role are:
+
+ vagrant_ram: 200
+
+When I enable the foo role
+And I run `vagrant provision`
+Then the command should have completed successfully
+And the output should contain:
+
+ Reloading vagrant...
+
--
To view, visit https://gerrit.wikimedia.org/r/196492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56caacba910d027846a63ff4507247c70446c980
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall dduv...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Redlinker to WikiLinkFixer - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196493
Change subject: Rename Redlinker to WikiLinkFixer
..
Rename Redlinker to WikiLinkFixer
This reflects that we're relying on this functionality for more
than just red links.
Change-Id: Ia3561e085b5b5fd6e739c5a4fe6a8ff576c26e70
---
M autoload.php
M container.php
M includes/Parsoid/Fixer/BaseHrefFixer.php
R includes/Parsoid/Fixer/WikiLinkFixer.php
R tests/phpunit/Parsoid/Fixer/WikiLinkFixerTest.php
5 files changed, 18 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/93/196493/1
diff --git a/autoload.php b/autoload.php
index ed3e21d..efb1bd5 100644
--- a/autoload.php
+++ b/autoload.php
@@ -257,7 +257,7 @@
'Flow\\Parsoid\\Fixer' = __DIR__ . '/includes/Parsoid/Fixer.php',
'Flow\\Parsoid\\Fixer\\BadImageRemover' = __DIR__ .
'/includes/Parsoid/Fixer/BadImageRemover.php',
'Flow\\Parsoid\\Fixer\\BaseHrefFixer' = __DIR__ .
'/includes/Parsoid/Fixer/BaseHrefFixer.php',
- 'Flow\\Parsoid\\Fixer\\Redlinker' = __DIR__ .
'/includes/Parsoid/Fixer/Redlinker.php',
+ 'Flow\\Parsoid\\Fixer\\WikiLinkFixer' = __DIR__ .
'/includes/Parsoid/Fixer/WikiLinkFixer.php',
'Flow\\Parsoid\\ReferenceExtractor' = __DIR__ .
'/includes/Parsoid/ReferenceExtractor.php',
'Flow\\Parsoid\\ReferenceFactory' = __DIR__ .
'/includes/Parsoid/ReferenceFactory.php',
'Flow\\Parsoid\\Utils' = __DIR__ . '/includes/Parsoid/Utils.php',
@@ -343,8 +343,8 @@
'Flow\\Tests\\NotifiedUsersTest' = __DIR__ .
'/tests/phpunit/Notifications/NotifiedUsersTest.php',
'Flow\\Tests\\PagerTest' = __DIR__ . '/tests/phpunit/PagerTest.php',
'Flow\\Tests\\Parsoid\\BadImageRemoverTest' = __DIR__ .
'/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php',
- 'Flow\\Tests\\Parsoid\\Fixer\\MethodReturnsConstraint' = __DIR__ .
'/tests/phpunit/Parsoid/Fixer/RedlinkerTest.php',
- 'Flow\\Tests\\Parsoid\\Fixer\\RedlinkerTest' = __DIR__ .
'/tests/phpunit/Parsoid/Fixer/RedlinkerTest.php',
+ 'Flow\\Tests\\Parsoid\\Fixer\\MethodReturnsConstraint' = __DIR__ .
'/tests/phpunit/Parsoid/Fixer/WikiLinkFixerTest.php',
+ 'Flow\\Tests\\Parsoid\\Fixer\\WikiLinkFixerTest' = __DIR__ .
'/tests/phpunit/Parsoid/Fixer/WikiLinkFixerTest.php',
'Flow\\Tests\\Parsoid\\ParsoidUtilsTest' = __DIR__ .
'/tests/phpunit/Parsoid/UtilsTest.php',
'Flow\\Tests\\Parsoid\\ReferenceExtractorTestCase' = __DIR__ .
'/tests/phpunit/Parsoid/ReferenceExtractorTest.php',
'Flow\\Tests\\Parsoid\\ReferenceFactoryTest' = __DIR__ .
'/tests/phpunit/Parsoid/ReferenceFactoryTest.php',
diff --git a/container.php b/container.php
index 176e9d8..46f3a07 100644
--- a/container.php
+++ b/container.php
@@ -64,8 +64,8 @@
return new LinkBatch;
};
-$c['redlinker'] = function( $c ) {
- return new Flow\Parsoid\Fixer\Redlinker( $c['link_batch'] );
+$c['wiki_link_fixer'] = function( $c ) {
+ return new Flow\Parsoid\Fixer\WikiLinkFixer( $c['link_batch'] );
};
$c['bad_image_remover'] = function( $c ) {
@@ -80,7 +80,7 @@
$c['content_fixer'] = function( $c ) {
return new Flow\Parsoid\ContentFixer(
- $c['redlinker'],
+ $c['wiki_link_fixer'],
$c['bad_image_remover'],
$c['base_href_fixer']
);
diff --git a/includes/Parsoid/Fixer/BaseHrefFixer.php
b/includes/Parsoid/Fixer/BaseHrefFixer.php
index 6a1e68f..5529790 100644
--- a/includes/Parsoid/Fixer/BaseHrefFixer.php
+++ b/includes/Parsoid/Fixer/BaseHrefFixer.php
@@ -11,7 +11,7 @@
*
* For now, we just apply this transformation to our own user
* Parsoid content. It does not need to be done for WikiLink, since
- * that is handled by Redlinker in another way.
+ * that is handled by WikiLinkFixer in another way.
*/
class BaseHrefFixer implements Fixer {
/**
@@ -30,7 +30,7 @@
* Returns XPath matching elements that need to be transformed
*/
public function getXPath() {
- // Redlinker handles mw:WikiLink
+ // WikiLinkFixer handles mw:WikiLink
return '//a[@href and not(@rel=mw:WikiLink)]';
}
diff --git a/includes/Parsoid/Fixer/Redlinker.php
b/includes/Parsoid/Fixer/WikiLinkFixer.php
similarity index 86%
rename from includes/Parsoid/Fixer/Redlinker.php
rename to includes/Parsoid/Fixer/WikiLinkFixer.php
index c181423..5fa3139 100644
--- a/includes/Parsoid/Fixer/Redlinker.php
+++ b/includes/Parsoid/Fixer/WikiLinkFixer.php
@@ -14,27 +14,24 @@
/**
* Parsoid ignores red links. With good reason: redlinks should only be
- * applied when rendering the content, not when it's created. This
- * class updates HTML content from Parsoid with anchors generated by
- * Linker::link.
+ * applied when rendering the content, not when it's created.
+ *
+ * This class
[MediaWiki-commits] [Gerrit] Revert inputs.less: Change focus state - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert inputs.less: Change focus state
..
Revert inputs.less: Change focus state
Prematurely merged ahead of the synchronised OOjs UI change; let's do this in
wmf22 instead.
This reverts commit 8b73bc2df9b94a692528cf692c5e111fc5d34b53.
Change-Id: I24f33a40cd0126ae95698c2a46858a15f502ca5a
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.ui/components/inputs.less
b/resources/src/mediawiki.ui/components/inputs.less
index 1992cce..b16570a 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -39,7 +39,7 @@
font-family: inherit;
font-size: inherit;
line-height: inherit;
- .transition(~border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1),
box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1));
+ .transition(~border linear .2s, box-shadow linear .2s);
// Placeholder text styling must be set individually for each browser
@winter
::-webkit-input-placeholder { // webkit
@@ -64,9 +64,8 @@
}
:focus {
- box-shadow: inset 0 0 0 2px @colorProgressive;
- // Color being used to match inset shadow, not semantic reasons
- border-color: @colorProgressive;
+ box-shadow: inset .45em 0 0 @colorProgressive;
+ border-color: @colorGrayDark;
// Remove focus glow on input[type=search]
outline: 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/196308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24f33a40cd0126ae95698c2a46858a15f502ca5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf21
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring back mwext-VisualEditor-jsduck override for submodules - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Bring back mwext-VisualEditor-jsduck override for submodules
..
Bring back mwext-VisualEditor-jsduck override for submodules
Follows-up ddd8d0e, 82f4c2f.
Change-Id: I46c60d5205a170a2c58e126cceac242b344a26f4
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
3 files changed, 20 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 9977fec..fd1d61f 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -31,6 +31,19 @@
builders:
- jsduck
+# Deprecated non-generic jsduck job. You should use the above 'jsduck' job.
+# For repos that need to preserve workspace or have submodules, this is
+# used as workaround.
+- job-template:
+name: '{name}-jsduck'
+node: contintLabsSlave UbuntuTrusty
+defaults: use-remoteonly-zuul
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - npm
+
- job-template:
name: '{name}-npm'
node: contintLabsSlave UbuntuTrusty
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b6f8647..2912b9a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1142,6 +1142,11 @@
- '{name}-ruby1.9.3lint'
- project:
+name: 'mwext-VisualEditor'
+jobs:
+ - '{name}-jsduck'
+
+- project:
name: 'mwext-BlameMaps'
jobs:
- python-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 124e862..3be9117 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5886,12 +5886,12 @@
- phplint
test:
- mwext-VisualEditor-npm
- - jsduck
+ - mwext-VisualEditor-jsduck
- mwext-VisualEditor-qunit-karma
gate-and-submit:
- mediawiki-gate
- mwext-VisualEditor-npm
- - jsduck
+ - mwext-VisualEditor-jsduck
- experiment-gating-dependencies
postmerge:
- mwext-VisualEditor-jsduck-publish
--
To view, visit https://gerrit.wikimedia.org/r/196491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46c60d5205a170a2c58e126cceac242b344a26f4
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass if log entry is legacy to ApiQueryLogEvents::addLogPara... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() .. Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() Querying via ApiQueryRecentChanges and ApiQueryWatchlist did not pass if a particular log entry was a legacy log entry. Ultimately CheckUser should stop writing legacy style log entries too but we can at least behave properly when we hit them. Bug: T91466 Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 (cherry picked from commit cc2eb92668cd731594fa7b3025768c533c7846f4) --- M includes/api/ApiQueryRecentChanges.php M includes/api/ApiQueryWatchlist.php 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 1482034..aa22264 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -542,7 +542,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 11008cf..3857a08 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -419,7 +419,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } -- To view, visit https://gerrit.wikimedia.org/r/196317 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf20 Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add composer test entry point for linting and phpunit - change (integration/jenkins)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196494
Change subject: Add composer test entry point for linting and phpunit
..
Add composer test entry point for linting and phpunit
Change-Id: Id2ae4fb4868425be925526ad6262f5e5f4675f97
---
M .gitignore
A composer.json
M phpunit.xml.dist
3 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/94/196494/1
diff --git a/.gitignore b/.gitignore
index fdec625..24e6ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
!mediawiki/
!tests/
!tools/
+!composer.json
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..12ee475
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+require-dev: {
+jakub-onderka/php-parallel-lint: 0.8.*,
+phpunit/phpunit: ~4.5
+},
+scripts: {
+test: [
+parallel-lint . --exclude vendor --exclude bin/lint.php,
+phpunit $PHPUNIT_ARGS
+]
+}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f525d9c..2fdac8f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,5 @@
phpunit
colors=true
- strict=true
testsuites
testsuite
--
To view, visit https://gerrit.wikimedia.org/r/196494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2ae4fb4868425be925526ad6262f5e5f4675f97
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix closing the media viewer - change (mediawiki...MobileFrontend)
MaxSem has submitted this change and it was merged.
Change subject: Fix closing the media viewer
..
Fix closing the media viewer
Properly inherit Overlay events and defaults
Bug: T92346
Change-Id: I2880d070b0de04928f40320536b02a483d2c2681
(cherry picked from commit ba7af25a3c0733d7a119c75ca5d9a0cc6e35ab3e)
---
M javascripts/modules/mediaViewer/ImageOverlay.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
MaxSem: Verified
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index f33dd23..733899e 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -28,7 +28,7 @@
* @cfg {String} defaults.licenseLinkMsg Link to license
information in media viewer.
* @cfg {Thumbnail[]} defaults.thumbnails a list of thumbnails
to browse
*/
- defaults: {
+ defaults: $.extend( {}, Overlay.prototype.defaults, {
cancelButton: new Icon( {
tagName: 'button',
// Uses a dark theme so swap out the icon
@@ -39,12 +39,12 @@
detailsMsg: mw.msg( 'mobile-frontend-media-details' ),
licenseLinkMsg: mw.msg(
'mobile-frontend-media-license-link' ),
thumbnails: []
- },
+ } ),
/** @inheritdoc */
- events: {
+ events: $.extend( {}, Overlay.prototype.events, {
'click .image-wrapper': 'onToggleDetails'
- },
+ } ),
/** @inheritdoc */
preRender: function ( options ) {
--
To view, visit https://gerrit.wikimedia.org/r/196448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2880d070b0de04928f40320536b02a483d2c2681
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.25wmf21
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Create a base class for our content overlays - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196495
Change subject: WIP: Create a base class for our content overlays
..
WIP: Create a base class for our content overlays
This will ensure better consistency and make sure the position fixed issues
work on the overlay.
Change-Id: Id1d1436be2adb1d3db4769ebfb13bc07e2c02fc4
---
M resources/Resources.php
A resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
M resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.watchstar/CollectionsContentOverlay.js
5 files changed, 69 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/95/196495/1
diff --git a/resources/Resources.php b/resources/Resources.php
index e36c54e..39e661a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -89,11 +89,23 @@
),
),
+ 'ext.gather.collection.base' = $wgGatherResourceFileModuleBoilerplate
+ array(
+ 'dependencies' = array(
+ 'mobile.contentOverlays',
+ 'mobile.toast',
+ 'ext.gather.api',
+ 'mediawiki.util'
+ ),
+ 'scripts' = array(
+
'ext.gather.collection.base/CollectionsContentOverlayBase.js',
+ ),
+ ),
+
'ext.gather.watchstar' = $wgGatherResourceFileModuleBoilerplate +
array(
'dependencies' = array(
'mobile.watchstar',
'ext.gather.api',
- 'mobile.contentOverlays',
+ 'ext.gather.collection.base',
'ext.gather.watchstar.icons',
),
'styles' = array(
@@ -146,7 +158,7 @@
'ext.gather.collection.delete' =
$wgGatherResourceFileModuleBoilerplate + array(
'dependencies' = array(
- 'mobile.overlays',
+ 'ext.gather.collection.base',
'mobile.toast',
'ext.gather.api',
'mediawiki.util'
diff --git
a/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
b/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
new file mode 100644
index 000..59acecc
--- /dev/null
+++ b/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
@@ -0,0 +1,42 @@
+( function ( M, $ ) {
+
+ var CollectionsContentOverlayBase,
+ ContentOverlay = M.require( 'modules/tutorials/ContentOverlay'
);
+
+ /**
+* A clickable watchstar for managing collections
+* @class CollectionsContentOverlayBase
+* @extends ContentOverlay
+*/
+ CollectionsContentOverlayBase = ContentOverlay.extend( {
+ /**
+* FIXME: re-evaluate content overlay default classes/css.
+* @inheritdoc
+*/
+ appendTo: 'body',
+ /** @inheritdoc */
+ hasFixedHeader: false,
+ /** @inheritdoc */
+ postRender: function () {
+ this.hideSpinner();
+ },
+ /**
+* Reveal all interface elements and cancel the spinner.
+*/
+ hideSpinner: function () {
+ this.$( '.overlay-content' ).children().show();
+ this.$( '.spinner' ).hide();
+ // For position absolute to work the parent must have a
specified height
+ this.$el.parent().css( 'height', '100%' );
+ },
+ /**
+* Hide all interface elements and show spinner.
+*/
+ showSpinner: function () {
+ this.$( '.overlay-content' ).children().hide();
+ this.$( '.spinner' ).show();
+ }
+ } );
+ M.define( 'ext.gather.collection.base/CollectionsContentOverlayBase',
CollectionsContentOverlayBase );
+
+}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
b/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
index e8487e1..86e84ee 100644
--- a/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
+++ b/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
@@ -4,20 +4,18 @@
toast = M.require( 'toast' ),
icons = M.require( 'icons' ),
CollectionsApi = M.require(
'ext.gather.watchstar/CollectionsApi' ),
- ContentOverlay = M.require( 'modules/tutorials/ContentOverlay'
);
+
[MediaWiki-commits] [Gerrit] Update flow pages on te.wiki - change (operations/mediawiki-config)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/196496 Change subject: Update flow pages on te.wiki .. Update flow pages on te.wiki It looks like I messed up the utf8 for these pages the first time through, to ensure they come through correctly these are now urlencoded values which will be decoded at runtime. Verified on terbium that these values are what comes out of Title::newFromText on the desired pages. Change-Id: I3be204c27794165036b4f614ddde4eba19e1ef19 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/96/196496/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f41b37e..931173a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14160,8 +14160,8 @@ 'Viquipèdia Discussió:La taverna/Tecnicismes', ), 'tewiki' = array( - 'వికీపీడియా_చర్చ:ఫ్లో', - 'వికీపీడియా_చర్చ:ఫ్లో_ప్రయోగశాల', + urldecode( '%E0%B0%B5%E0%B0%BF%E0%B0%95%E0%B1%80%E0%B0%AA%E0%B1%80%E0%B0%A1%E0%B0%BF%E0%B0%AF%E0%B0%BE+%E0%B0%9A%E0%B0%B0%E0%B1%8D%E0%B0%9A%3A%E0%B0%AB%E0%B1%8D%E0%B0%B2%E0%B1%8B' ), + urldecode( '%E0%B0%B5%E0%B0%BF%E0%B0%95%E0%B1%80%E0%B0%AA%E0%B1%80%E0%B0%A1%E0%B0%BF%E0%B0%AF%E0%B0%BE+%E0%B0%9A%E0%B0%B0%E0%B1%8D%E0%B0%9A%3A%E0%B0%AB%E0%B1%8D%E0%B0%B2%E0%B1%8B+%E0%B0%AA%E0%B1%8D%E0%B0%B0%E0%B0%AF%E0%B1%8B%E0%B0%97%E0%B0%B6%E0%B0%BE%E0%B0%B2' ), ), ), // Use separate database on extension1 cluster for all non-private wikis. -- To view, visit https://gerrit.wikimedia.org/r/196496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3be204c27794165036b4f614ddde4eba19e1ef19 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update MobileFrontend for I2880d070 - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/196497 Change subject: Update MobileFrontend for I2880d070 .. Update MobileFrontend for I2880d070 Change-Id: Iae3404debb9e7818da7068a9314cc2bc0896 --- M extensions/MobileFrontend 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/97/196497/1 diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend index 50e3d7e..ce445b1 16 --- a/extensions/MobileFrontend +++ b/extensions/MobileFrontend -Subproject commit 50e3d7edfbf6e7ed7b29c1b6908dbf57c3b3ceb4 +Subproject commit ce445b10bd511e74b70bbac61eff1cbc6d8b7382 -- To view, visit https://gerrit.wikimedia.org/r/196497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae3404debb9e7818da7068a9314cc2bc0896 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated Revision::newFromId() callers to use READ_LATEST as ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Updated Revision::newFromId() callers to use READ_LATEST as
needed
..
Updated Revision::newFromId() callers to use READ_LATEST as needed
Change-Id: Idcc071e99a712cf3208c10059d476dafe95044cf
---
M includes/page/WikiPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index b1e4f2d..23bbc7c 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3061,7 +3061,7 @@
}
// Generate the edit summary if necessary
- $target = Revision::newFromId( $s-rev_id );
+ $target = Revision::newFromId( $s-rev_id,
Revision::READ_LATEST );
if ( empty( $summary ) ) {
if ( $from == '' ) { // no public user name
$summary = wfMessage( 'revertpage-nouser' );
--
To view, visit https://gerrit.wikimedia.org/r/196486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcc071e99a712cf3208c10059d476dafe95044cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass if log entry is legacy to ApiQueryLogEvents::addLogPara... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() .. Pass if log entry is legacy to ApiQueryLogEvents::addLogParams() Querying via ApiQueryRecentChanges and ApiQueryWatchlist did not pass if a particular log entry was a legacy log entry. Ultimately CheckUser should stop writing legacy style log entries too but we can at least behave properly when we hit them. Bug: T91466 Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 (cherry picked from commit cc2eb92668cd731594fa7b3025768c533c7846f4) --- M includes/api/ApiQueryRecentChanges.php M includes/api/ApiQueryWatchlist.php 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 1482034..aa22264 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -542,7 +542,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 11008cf..3857a08 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -419,7 +419,8 @@ $logEntry-getParameters(), $logEntry-getType(), $logEntry-getSubtype(), - $logEntry-getTimestamp() + $logEntry-getTimestamp(), + $logEntry-isLegacy() ); } } -- To view, visit https://gerrit.wikimedia.org/r/196313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1564ec7e599e2f9d78775e63e06eca84db497a43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] IPsec: big off switch - change (operations/puppet)
Gage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196498
Change subject: IPsec: big off switch
..
IPsec: big off switch
* /usr/local/sbin/ipsec-global
* Takes args up or down to loop through all configured SAs
* Use 'sudo ipsec-global down' to disable all SAs on a node
* Doesn't conflict with daemon's puppet config to ensure = running
* Also outputs status for convenience
* Uses non-blocking commands
* Phab: T88546
Change-Id: I910f828a9d4dcb947d9679adf1f3ce316c69bf7a
---
A modules/strongswan/files/ipsec-global
M modules/strongswan/manifests/init.pp
2 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/196498/1
diff --git a/modules/strongswan/files/ipsec-global
b/modules/strongswan/files/ipsec-global
new file mode 100644
index 000..1129515
--- /dev/null
+++ b/modules/strongswan/files/ipsec-global
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Tells the StrongSwan IKE daemon to start up or terminate
+# all configured IPsec connections.
+# Uses internal non-blocking commands.
+# jg...@wikimedia.org 2015-03-12
+
+CONF=/etc/ipsec.conf
+CONNLIST=`/usr/bin/awk '/^conn [^%]/ {print $2}' $CONF`
+IPSEC=/usr/sbin/ipsec
+
+case $1 in
+up) for c in $CONNLIST ; do $IPSEC stroke up-nb $c done
+;;
+down) for c in $CONNLIST ; do $IPSEC stroke down-nb $c ; done
+;;
+# Included for convenience; there is no status-nb:
+status | statusall) $IPSEC stroke statusall-nb
+;;
+*) echo Please supply an argument: \up\, \down\, or \status\
+;;
+esac
diff --git a/modules/strongswan/manifests/init.pp
b/modules/strongswan/manifests/init.pp
index 7a75413..b6051f6 100644
--- a/modules/strongswan/manifests/init.pp
+++ b/modules/strongswan/manifests/init.pp
@@ -73,6 +73,14 @@
require = Package['strongswan'],
}
+file { /usr/local/sbin/ipsec-global:
+owner = 'root',
+group = 'root',
+mode = '0755',
+ensure = present,
+source = 'puppet:///modules/strongswan/ipsec-global',
+}
+
$svcname = $::lsbdistcodename ? {
# in Ubuntu/Trusty this service is /etc/init/strongswan.conf
# in Ubuntu/Precise and Debian/Jessie it's /etc/init.d/ipsec
--
To view, visit https://gerrit.wikimedia.org/r/196498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I910f828a9d4dcb947d9679adf1f3ce316c69bf7a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage jger...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually commit mwext-VisualEditor-jsduck - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196499
Change subject: Actually commit mwext-VisualEditor-jsduck
..
Actually commit mwext-VisualEditor-jsduck
Follows-up ed3618da98.
The previous code contained the same key twice so the first one
never ran. It worked because when the job was dereferenced in ddd8d0e,
it was not removed from the Jenkins database.
It was still using generateDocs.sh instead of plain jsduck.
Change-Id: Ida0d2051aea187cc74cfba84f611c8a913d9e1cf
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/99/196499/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index fd1d61f..ef0e732 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -42,7 +42,7 @@
triggers:
- zuul
builders:
- - npm
+ - jsduck
- job-template:
name: '{name}-npm'
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 2912b9a..c1681e2 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1142,11 +1142,6 @@
- '{name}-ruby1.9.3lint'
- project:
-name: 'mwext-VisualEditor'
-jobs:
- - '{name}-jsduck'
-
-- project:
name: 'mwext-BlameMaps'
jobs:
- python-jobs
@@ -1382,6 +1377,7 @@
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
+ - '{name}-jsduck'
- '{name}-ruby1.9.3lint'
- 'mwext-VisualEditor-sync-gerrit'
- 'mwext-VisualEditor-qunit'
--
To view, visit https://gerrit.wikimedia.org/r/196499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida0d2051aea187cc74cfba84f611c8a913d9e1cf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run jscs on Jenkins - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/196500 Change subject: Run jscs on Jenkins .. Run jscs on Jenkins Change-Id: I1b5cb7d0daf2393aabdcf338aed0415ea99dfce7 --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/00/196500/1 diff --git a/Gruntfile.js b/Gruntfile.js index 03a9b5c..c9f1815 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -137,7 +137,7 @@ // grunt test will be run by npm test which will be run by Jenkins // Do not execute qunit here, or other tasks that require full mediawiki // running. - grunt.registerTask( 'test', [ 'lint' ] ); + grunt.registerTask( 'test', [ 'lint', 'jscs' ] ); grunt.registerTask( 'default', [ 'test' ] ); }; -- To view, visit https://gerrit.wikimedia.org/r/196500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b5cb7d0daf2393aabdcf338aed0415ea99dfce7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update flow pages on te.wiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Update flow pages on te.wiki .. Update flow pages on te.wiki It looks like I messed up the utf8 for these pages the first time through, to ensure they come through correctly these are now urlencoded values which will be decoded at runtime. Verified on terbium that these values are what comes out of Title::newFromText on the desired pages. Change-Id: I3be204c27794165036b4f614ddde4eba19e1ef19 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 14e3ce4..ec8b861 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14164,8 +14164,8 @@ 'Viquipèdia Discussió:La taverna/Tecnicismes', ), 'tewiki' = array( - 'వికీపీడియా_చర్చ:ఫ్లో', - 'వికీపీడియా_చర్చ:ఫ్లో_ప్రయోగశాల', + urldecode( '%E0%B0%B5%E0%B0%BF%E0%B0%95%E0%B1%80%E0%B0%AA%E0%B1%80%E0%B0%A1%E0%B0%BF%E0%B0%AF%E0%B0%BE+%E0%B0%9A%E0%B0%B0%E0%B1%8D%E0%B0%9A%3A%E0%B0%AB%E0%B1%8D%E0%B0%B2%E0%B1%8B' ), + urldecode( '%E0%B0%B5%E0%B0%BF%E0%B0%95%E0%B1%80%E0%B0%AA%E0%B1%80%E0%B0%A1%E0%B0%BF%E0%B0%AF%E0%B0%BE+%E0%B0%9A%E0%B0%B0%E0%B1%8D%E0%B0%9A%3A%E0%B0%AB%E0%B1%8D%E0%B0%B2%E0%B1%8B+%E0%B0%AA%E0%B1%8D%E0%B0%B0%E0%B0%AF%E0%B1%8B%E0%B0%97%E0%B0%B6%E0%B0%BE%E0%B0%B2' ), ), ), // Use separate database on extension1 cluster for all non-private wikis. -- To view, visit https://gerrit.wikimedia.org/r/196496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3be204c27794165036b4f614ddde4eba19e1ef19 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update MobileFrontend for I2880d070 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update MobileFrontend for I2880d070 .. Update MobileFrontend for I2880d070 Change-Id: Iae3404debb9e7818da7068a9314cc2bc0896 --- M extensions/MobileFrontend 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend index 50e3d7e..ce445b1 16 --- a/extensions/MobileFrontend +++ b/extensions/MobileFrontend -Subproject commit 50e3d7edfbf6e7ed7b29c1b6908dbf57c3b3ceb4 +Subproject commit ce445b10bd511e74b70bbac61eff1cbc6d8b7382 -- To view, visit https://gerrit.wikimedia.org/r/196497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae3404debb9e7818da7068a9314cc2bc0896 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add setBatchSize() call for refreshGlobalimagelinks.php - change (mediawiki...GlobalUsage)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196501
Change subject: Add setBatchSize() call for refreshGlobalimagelinks.php
..
Add setBatchSize() call for refreshGlobalimagelinks.php
Bug: T65594
Change-Id: I4b15b5dfdc61d71d1dc8b37acedb271969aa1a18
---
M refreshGlobalimagelinks.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage
refs/changes/01/196501/1
diff --git a/refreshGlobalimagelinks.php b/refreshGlobalimagelinks.php
index 345e028..1e6aec9 100644
--- a/refreshGlobalimagelinks.php
+++ b/refreshGlobalimagelinks.php
@@ -17,6 +17,7 @@
$this-addOption( 'start-page', 'page_id of the page to start
with' );
$this-addOption( 'start-image', 'il_to of the image to start
with' );
$this-addOption( 'pages', 'CSV of (existing,nonexisting)',
true, true );
+ $this-setBatchSize( 500 );
}
public function execute() {
@@ -32,7 +33,6 @@
if ( in_array( 'existing', $pages ) ) {
$lastPageId = intval( $this-getOption( 'start-page', 0
) );
$lastIlTo = $this-getOption( 'start-image' );
- $limit = 500;
do {
$this-output( Querying links after (page_id,
il_to) = ($lastPageId, $lastIlTo)\n );
@@ -50,7 +50,7 @@
__METHOD__,
array(
'ORDER BY' =
$dbr-implicitOrderBy() ? 'page_id' : 'page_id, il_to',
- 'LIMIT' = $limit
+ 'LIMIT' = $this-mBatchSize,
),
array(
# LEFT JOIN imagelinks since we
need to delete usage
--
To view, visit https://gerrit.wikimedia.org/r/196501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b15b5dfdc61d71d1dc8b37acedb271969aa1a18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable RESTBase updates on all wikis - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable RESTBase updates on all wikis .. Enable RESTBase updates on all wikis Load has been very moderate so far, and an error in file upload updates has been fixed. We'll keep an eye on Parsoid and API cluster load, but expect less load than the dumps we have been running so far. Change-Id: I8a8898909422b9b789335208eca8bfdd2b49e707 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Mobrovac: Looks good to me, but someone else must approve GWicke: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ddcf17d..c273f61 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12235,10 +12235,7 @@ // whether to activate the extension sending page edit // updates to RESTBase 'wmgUseRestbaseUpdateJobs' = array( - 'default' = false, - 'testwiki' = true, - 'test2wiki' = true, - 'mediawikiwiki' = true + 'default' = true ), // whether to configure RESTBase as a Virtual REST Service -- To view, visit https://gerrit.wikimedia.org/r/196472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a8898909422b9b789335208eca8bfdd2b49e707 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: I should be able to view other users public lists - change (mediawiki...Gather)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196502
Change subject: WIP: I should be able to view other users public lists
..
WIP: I should be able to view other users public lists
Blocked on: T92299
Bug: T92543
Change-Id: Iecab1d22a3df8b5da693a30d4a6aacf4d8f8afec
---
M includes/api/ApiQueryListPages.php
M includes/models/Collection.php
M includes/models/CollectionsList.php
M includes/specials/SpecialGather.php
4 files changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/02/196502/1
diff --git a/includes/api/ApiQueryListPages.php
b/includes/api/ApiQueryListPages.php
index 02475a1..c4e7f86 100644
--- a/includes/api/ApiQueryListPages.php
+++ b/includes/api/ApiQueryListPages.php
@@ -62,9 +62,13 @@
if ( $params['id'] ) {
// Runs this code whenever ID is given and is not 0
(watchlist)
// Will be removed once DB storage is implemented
+ if ( isset( $params['owner'] ) ) {
+ $user = User::newFromName( $params['owner'] );
+ }
$this-tempProcessCollectionFromJson( $resultPageSet,
$params, $user );
return;
}
+
$this-selectNamedDB( 'watchlist', DB_SLAVE, 'watchlist' );
$this-addTables( 'watchlist' );
@@ -239,7 +243,7 @@
ApiBase::PARAM_MAX2 = ApiBase::LIMIT_BIG2,
),
'owner' = array(
- ApiBase::PARAM_TYPE = 'user',
+ ApiBase::PARAM_TYPE = 'string',
),
'token' = array(
ApiBase::PARAM_TYPE = 'string',
diff --git a/includes/models/Collection.php b/includes/models/Collection.php
index 8ef87c2..45d7cab 100644
--- a/includes/models/Collection.php
+++ b/includes/models/Collection.php
@@ -111,12 +111,14 @@
$collection = self::newFromCollectionInfo( $c );
}
}
+
if ( $collection ) {
$api = new ApiMain( new FauxRequest( array(
'action' = 'query',
'prop' = 'pageimages|extracts',
'generator' = 'listpages',
'glspid' = $id,
+ 'glspowner' = $user-getName(),
'explaintext' = true,
'exintro' = true,
'exchars' = ItemExtracts::CHAR_LIMIT,
diff --git a/includes/models/CollectionsList.php
b/includes/models/CollectionsList.php
index c87c4e4..744da80 100644
--- a/includes/models/CollectionsList.php
+++ b/includes/models/CollectionsList.php
@@ -90,6 +90,7 @@
$api = new ApiMain( new FauxRequest( array(
'action' = 'query',
'list' = 'lists',
+ 'owner' = $user-getName(),
) ) );
$api-execute();
$data = $api-getResultData();
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index b141559..c4d3658 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -84,18 +84,14 @@
* @param int $id collection id
*/
public function renderUserCollection( User $user, $id ) {
- $collection = null;
- // FIXME: It should be possible to view public lists by other
user. Limitation with API stops this.
- if ( $this-isOwner( $user ) ) {
- $collection = models\Collection::newFromApi( $id, $user
);
- }
+ $collection = models\Collection::newFromApi( $id, $user );
if ( $collection === null ||
( !$collection-isPublic() !$this-isOwner( $user )
) ) {
// FIXME: No permissions to visit this. Showing not
found ATM.
$this-renderError( new views\NotFound() );
} else {
- $this-render( new views\Collection( $this-getUser(),
$collection ) );
+ $this-render( new views\Collection( $user, $collection
) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/196502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecab1d22a3df8b5da693a30d4a6aacf4d8f8afec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Robmoen rm...@wikimedia.org
___
[MediaWiki-commits] [Gerrit] Actually commit mwext-VisualEditor-jsduck - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Actually commit mwext-VisualEditor-jsduck
..
Actually commit mwext-VisualEditor-jsduck
Follows-up ed3618da98.
The previous code contained the same key twice so the first one
never ran. It worked because when the job was dereferenced in ddd8d0e,
it was not removed from the Jenkins database.
It was still using generateDocs.sh instead of plain jsduck.
Change-Id: Ida0d2051aea187cc74cfba84f611c8a913d9e1cf
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
2 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index fd1d61f..ef0e732 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -42,7 +42,7 @@
triggers:
- zuul
builders:
- - npm
+ - jsduck
- job-template:
name: '{name}-npm'
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 2912b9a..c1681e2 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1142,11 +1142,6 @@
- '{name}-ruby1.9.3lint'
- project:
-name: 'mwext-VisualEditor'
-jobs:
- - '{name}-jsduck'
-
-- project:
name: 'mwext-BlameMaps'
jobs:
- python-jobs
@@ -1382,6 +1377,7 @@
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
+ - '{name}-jsduck'
- '{name}-ruby1.9.3lint'
- 'mwext-VisualEditor-sync-gerrit'
- 'mwext-VisualEditor-qunit'
--
To view, visit https://gerrit.wikimedia.org/r/196499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida0d2051aea187cc74cfba84f611c8a913d9e1cf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to access x-parsoid-performance on restbase cache ... - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196503
Change subject: Don't try to access x-parsoid-performance on restbase cache hits
..
Don't try to access x-parsoid-performance on restbase cache hits
It doesn't get set
Change-Id: I6695ab0e7d461b7541dd56e392f8d1479998f2b5
---
M ApiVisualEditor.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/03/196503/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index acd92ea..2ec1dae 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -94,9 +94,10 @@
// served directly from Varnish, in which case discard
the value of the XPP header
// and use it to declare the cache hit instead.
$headers = $response['headers'];
+ $xpp = null;
if ( isset( $headers['x-cache'] ) strpos(
$headers['x-cache'], 'hit' ) !== false ) {
$xpp = 'cached-response=true';
- } else {
+ } elseif ( isset( $headers['x-parsoid-performance'] ) )
{
$xpp = $headers['x-parsoid-performance'];
}
if ( $xpp !== null ) {
--
To view, visit https://gerrit.wikimedia.org/r/196503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6695ab0e7d461b7541dd56e392f8d1479998f2b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to access x-parsoid-performance on restbase cache ... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't try to access x-parsoid-performance on restbase cache hits
..
Don't try to access x-parsoid-performance on restbase cache hits
It doesn't get set
Change-Id: I6695ab0e7d461b7541dd56e392f8d1479998f2b5
---
M ApiVisualEditor.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index acd92ea..2ec1dae 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -94,9 +94,10 @@
// served directly from Varnish, in which case discard
the value of the XPP header
// and use it to declare the cache hit instead.
$headers = $response['headers'];
+ $xpp = null;
if ( isset( $headers['x-cache'] ) strpos(
$headers['x-cache'], 'hit' ) !== false ) {
$xpp = 'cached-response=true';
- } else {
+ } elseif ( isset( $headers['x-parsoid-performance'] ) )
{
$xpp = $headers['x-parsoid-performance'];
}
if ( $xpp !== null ) {
--
To view, visit https://gerrit.wikimedia.org/r/196503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6695ab0e7d461b7541dd56e392f8d1479998f2b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Report duplicate list label name error - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Report duplicate list label name error
..
Report duplicate list label name error
When updating the label of an existing list with this query
api.php?action=editlistid=7label=newlabel
It is possible that the user has another list with the same label.
This patch will show an error 'duplicatelabel'
Without this patch, API currently returns an internal SQL error
Change-Id: Ia5e056b3c16663afc0790d50eaafddd34b142f55
---
M includes/api/ApiEditList.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiEditList.php b/includes/api/ApiEditList.php
index 0504f96..86f912e 100644
--- a/includes/api/ApiEditList.php
+++ b/includes/api/ApiEditList.php
@@ -290,7 +290,11 @@
}
if ( $update ) {
// ACTION: update list record
- $dbw-update( 'gather_list', $update, array( 'gl_id' =
$row-gl_id ), __METHOD__ );
+ $dbw-update( 'gather_list', $update, array( 'gl_id' =
$row-gl_id ), __METHOD__, 'IGNORE' );
+ if ( $dbw-affectedRows() === 0 ) {
+ // update failed due to the duplicate label
restriction. Report
+ $this-dieUsage( 'A list with this label
already exists', 'duplicatelabel' );
+ }
$this-getResult()-addValue( null,
$this-getModuleName(), array(
'status' = 'updated',
) );
--
To view, visit https://gerrit.wikimedia.org/r/196485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e056b3c16663afc0790d50eaafddd34b142f55
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 993c7ec..28a293e - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/196504 Change subject: Syncronize VisualEditor: 993c7ec..28a293e .. Syncronize VisualEditor: 993c7ec..28a293e Change-Id: Ic2157c8906fbf555abd31f37c4889ec93a333550 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/04/196504/1 diff --git a/VisualEditor b/VisualEditor index 993c7ec..28a293e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 993c7ecfe564f1b474712654e3ad60386f088c7b +Subproject commit 28a293ebaf625deaab06223b6e5a8f7f59f69a31 -- To view, visit https://gerrit.wikimedia.org/r/196504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2157c8906fbf555abd31f37c4889ec93a333550 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 993c7ec..28a293e - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 993c7ec..28a293e .. Syncronize VisualEditor: 993c7ec..28a293e Change-Id: Ic2157c8906fbf555abd31f37c4889ec93a333550 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 993c7ec..28a293e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 993c7ecfe564f1b474712654e3ad60386f088c7b +Subproject commit 28a293ebaf625deaab06223b6e5a8f7f59f69a31 -- To view, visit https://gerrit.wikimedia.org/r/196504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2157c8906fbf555abd31f37c4889ec93a333550 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add npm test for Citoid extension - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add npm test for Citoid extension
..
Add npm test for Citoid extension
Change-Id: Ifbfd9fec9b9fb56ed7b294c6c1294a83000daf71
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 21 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index c1681e2..db1392a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1035,6 +1035,9 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: CentralNotice
+ - '{name}-{ext-name}-npm':
+name: mwext
+ext-name: Citoid
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: ContentTranslation
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3be9117..8f27b19 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3000,8 +3000,24 @@
- name: extension-checks
- name: mediawiki/extensions/Citoid
-template:
- - name: extension-unittests
+check:
+ - mwext-Citoid-lint
+ - php-composer-validate
+test:
+ - mwext-Citoid-lint
+ - mwext-Citoid-testextension-hhvm
+ - mwext-Citoid-testextension-zend
+ - mwext-Citoid-npm
+ - php-composer-validate
+gate-and-submit:
+ - mediawiki-gate
+ - mwext-Citoid-lint
+ - mwext-Citoid-testextension-hhvm
+ - mwext-Citoid-testextension-zend
+ - mwext-Citoid-npm
+ - php-composer-validate
+experimental:
+ - mediawiki-extensions-hhvm
- name: mediawiki/extensions/cldr
template:
--
To view, visit https://gerrit.wikimedia.org/r/191063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbfd9fec9b9fb56ed7b294c6c1294a83000daf71
Gerrit-PatchSet: 9
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Mvolz mv...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-Citoid-lint -- phplint - change (integration/config)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/196505 Change subject: mwext-Citoid-lint -- phplint .. mwext-Citoid-lint -- phplint Change-Id: I0421d22455e5b28e34a85511e2921f7e7c956867 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/05/196505/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8f27b19..a13ecfe 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3001,17 +3001,17 @@ - name: mediawiki/extensions/Citoid check: - - mwext-Citoid-lint + - phplint - php-composer-validate test: - - mwext-Citoid-lint + - phplint - mwext-Citoid-testextension-hhvm - mwext-Citoid-testextension-zend - mwext-Citoid-npm - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-Citoid-lint + - phplint - mwext-Citoid-testextension-hhvm - mwext-Citoid-testextension-zend - mwext-Citoid-npm -- To view, visit https://gerrit.wikimedia.org/r/196505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0421d22455e5b28e34a85511e2921f7e7c956867 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-Citoid-lint -- phplint - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: mwext-Citoid-lint -- phplint .. mwext-Citoid-lint -- phplint Change-Id: I0421d22455e5b28e34a85511e2921f7e7c956867 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8f27b19..a13ecfe 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3001,17 +3001,17 @@ - name: mediawiki/extensions/Citoid check: - - mwext-Citoid-lint + - phplint - php-composer-validate test: - - mwext-Citoid-lint + - phplint - mwext-Citoid-testextension-hhvm - mwext-Citoid-testextension-zend - mwext-Citoid-npm - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-Citoid-lint + - phplint - mwext-Citoid-testextension-hhvm - mwext-Citoid-testextension-zend - mwext-Citoid-npm -- To view, visit https://gerrit.wikimedia.org/r/196505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0421d22455e5b28e34a85511e2921f7e7c956867 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jenkins job validation, do not submit - change (mediawiki...Citoid)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/196506 Change subject: jenkins job validation, do not submit .. jenkins job validation, do not submit Change-Id: Icb90567ae9da2d7c11682d5349111c7f17e1a3ba --- A test.php A test.py 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid refs/changes/06/196506/1 diff --git a/test.php b/test.php new file mode 100644 index 000..71625a4 --- /dev/null +++ b/test.php @@ -0,0 +1,2 @@ +?php +echo hi; diff --git a/test.py b/test.py new file mode 100644 index 000..f1a1813 --- /dev/null +++ b/test.py @@ -0,0 +1 @@ +print(Hello world!) -- To view, visit https://gerrit.wikimedia.org/r/196506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb90567ae9da2d7c11682d5349111c7f17e1a3ba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Citoid Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use urlencode so slashes can be encoded properly - change (mediawiki...RestBaseUpdateJobs)
GWicke has submitted this change and it was merged. Change subject: Use urlencode so slashes can be encoded properly .. Use urlencode so slashes can be encoded properly Change-Id: I9e567b33251564b5429eada32f399a5fd949a8a8 --- M RestbaseUpdateJob.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/RestbaseUpdateJob.php b/RestbaseUpdateJob.php index 2347207..981881e 100644 --- a/RestbaseUpdateJob.php +++ b/RestbaseUpdateJob.php @@ -89,7 +89,7 @@ // construct the URL return implode( '/', array( self::getRestbasePrefix(), 'page', - 'html', wfUrlencode( $title-getPrefixedDBkey() ), $revid ) ); + 'html', urlencode( $title-getPrefixedDBkey() ), $revid ) ); } -- To view, visit https://gerrit.wikimedia.org/r/196444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e567b33251564b5429eada32f399a5fd949a8a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RestBaseUpdateJobs Gerrit-Branch: master Gerrit-Owner: Mobrovac mobro...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch VisualEditor to use RESTBase on all phase0 wikis - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Switch VisualEditor to use RESTBase on all phase0 wikis .. Switch VisualEditor to use RESTBase on all phase0 wikis After tests on https://test.wikipedia.org have gone well, we decided in consultation with James to proceed to roll out VE's RESTBase use to all phase0 wikis including mediawiki.org. Change-Id: Ib55461b08a1dfede145db03c0580febc9cc72b8e --- M wmf-config/InitialiseSettings.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Mobrovac: Looks good to me, but someone else must approve GWicke: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 21fddee..e2cfbac 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12243,7 +12243,9 @@ // in MW Core 'wmgUseRestbaseVRS' = array( 'default' = false, - 'testwiki' = true + 'testwiki' = true, + 'test2wiki' = true, + 'mediawikiwiki' = true ), // -- RESTBase end -- -- To view, visit https://gerrit.wikimedia.org/r/196429 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib55461b08a1dfede145db03c0580febc9cc72b8e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: GWicke gwi...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Roll out RESTBase updates to all small wikis - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Roll out RESTBase updates to all small wikis .. Roll out RESTBase updates to all small wikis Testing of updates on test.wikipedia.org has gone well, so lets proceed to keep most other wikis up to date as well. To avoid a sudden jump in load we leave out most large wikis for now. Change-Id: Idc8582d539b59f0f9012d151fcb7d03cd23bed0c --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Mobrovac: Looks good to me, but someone else must approve GWicke: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 21fddee..94207df 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12235,8 +12235,14 @@ // whether to activate the extension sending page edit // updates to RESTBase 'wmgUseRestbaseUpdateJobs' = array( - 'default' = false, - 'testwiki' = true + 'default' = true, + 'enwiki' = false, + 'dewiki' = false, + 'frwiki' = false, + 'ruwiki' = false, + 'eswiki' = false, + 'jawiki' = false, + 'itwiki' = false ), // whether to configure RESTBase as a Virtual REST Service -- To view, visit https://gerrit.wikimedia.org/r/196415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc8582d539b59f0f9012d151fcb7d03cd23bed0c Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Verifies tokens from paraminfo - change (pywikibot/core)
Akashagarwal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196450
Change subject: Verifies tokens from paraminfo
..
Verifies tokens from paraminfo
Resolves the API warnings due to tokens which only concern global accounts.
For mwVersion 1.24wmf19 verifies the tokens from
action=paraminfomodules=tokens
and for mwVersion 1.24wmf19 verifies the same from
action=paraminfoquerymodules=tokens
Partially resolves Bug: T85725
Bug: T72965
Change-Id: I3ff70dd8b9ee33fde15bd13d7af15db408aefc7d
---
M pywikibot/site.py
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/50/196450/1
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 4edb41d..0121eac 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2635,6 +2635,13 @@
elif _version MediaWikiVersion('1.24wmf19'):
valid_types = [token for token in types if token in self.TOKENS_1]
+req = api.Request(site=self, action='paraminfo',
+ modules='tokens')
+data = req.submit()
+modules = data['paraminfo']['modules'][0]
+types = modules['parameters'][0]['type']
+valid_types = [token for token in valid_types if token in types]
+
else:
valid_types = []
for token in types:
@@ -2643,6 +2650,12 @@
token = 'csrf'
if token in self.TOKENS_2:
valid_types.append(token)
+req = api.Request(site=self, action='paraminfo',
+ querymodules='tokens')
+data = req.submit()
+querymodules = data['paraminfo']['querymodules'][0]
+types = querymodules['parameters'][0]['type']
+valid_types = [token for token in valid_types if token in types]
return valid_types
--
To view, visit https://gerrit.wikimedia.org/r/196450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ff70dd8b9ee33fde15bd13d7af15db408aefc7d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Akashagarwal akash...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid excess master queries in getTimestampFromId - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid excess master queries in getTimestampFromId
..
Avoid excess master queries in getTimestampFromId
Bug: T92357
Change-Id: Id5cf7a5620daeee12abfa778f9be19435f3e5e84
---
M includes/Revision.php
M includes/api/ApiSetNotificationTimestamp.php
2 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Revision.php b/includes/Revision.php
index d535028..cc00f9f 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1684,23 +1684,21 @@
*
* @param Title $title
* @param int $id
-* @return string
+* @return string|bool False if not found
*/
- static function getTimestampFromId( $title, $id ) {
- $dbr = wfGetDB( DB_SLAVE );
+ static function getTimestampFromId( $title, $id, $flags = 0 ) {
+ $db = ( $flags self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
// Casting fix for databases that can't take '' for rev_id
if ( $id == '' ) {
$id = 0;
}
$conds = array( 'rev_id' = $id );
$conds['rev_page'] = $title-getArticleID();
- $timestamp = $dbr-selectField( 'revision', 'rev_timestamp',
$conds, __METHOD__ );
- if ( $timestamp === false wfGetLB()-getServerCount() 1 ) {
- # Not in slave, try master
- $dbw = wfGetDB( DB_MASTER );
- $timestamp = $dbw-selectField( 'revision',
'rev_timestamp', $conds, __METHOD__ );
- }
- return wfTimestamp( TS_MW, $timestamp );
+ $timestamp = $db-selectField( 'revision', 'rev_timestamp',
$conds, __METHOD__ );
+
+ return ( $timestamp !== false ) ? wfTimestamp( TS_MW,
$timestamp ) : false;
}
/**
diff --git a/includes/api/ApiSetNotificationTimestamp.php
b/includes/api/ApiSetNotificationTimestamp.php
index 5d37e20..dec64cc 100644
--- a/includes/api/ApiSetNotificationTimestamp.php
+++ b/includes/api/ApiSetNotificationTimestamp.php
@@ -73,7 +73,8 @@
}
$title = reset( $pageSet-getGoodTitles() );
if ( $title ) {
- $timestamp = Revision::getTimestampFromId(
$title, $params['torevid'] );
+ $timestamp = Revision::getTimestampFromId(
+ $title, $params['torevid'],
Revision::READ_LATEST );
if ( $timestamp ) {
$timestamp = $dbw-timestamp(
$timestamp );
} else {
@@ -86,7 +87,8 @@
}
$title = reset( $pageSet-getGoodTitles() );
if ( $title ) {
- $revid = $title-getNextRevisionID(
$params['newerthanrevid'] );
+ $revid = $title-getNextRevisionID(
+ $params['newerthanrevid'],
Title::GAID_FOR_UPDATE );
if ( $revid ) {
$timestamp = $dbw-timestamp(
Revision::getTimestampFromId( $title, $revid ) );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/195837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5cf7a5620daeee12abfa778f9be19435f3e5e84
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Toolbar: Be less aggressive with 'white-space: nowrap' - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Toolbar: Be less aggressive with 'white-space: nowrap'
..
Toolbar: Be less aggressive with 'white-space: nowrap'
Tools like PopupToolGroup can have a lot of content, which should be
wrapped normally.
Follow-up to 5addf7d7f5c0b8b10c62d3e83101fcfce78fa390.
Change-Id: If9b8af3b9ea34e032a1da7ca1a57e0cc4b9863eb
---
M src/styles/Toolbar.less
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/styles/Toolbar.less b/src/styles/Toolbar.less
index dd1a8c0..2bc054f 100644
--- a/src/styles/Toolbar.less
+++ b/src/styles/Toolbar.less
@@ -18,6 +18,11 @@
.oo-ui-toolbar-narrow {
white-space: normal;
}
+
+ // Tools like PopupToolGroup can have a lot of content, which
should be wrapped normally
+ .oo-ui-tool {
+ white-space: normal;
+ }
}
-tools,
--
To view, visit https://gerrit.wikimedia.org/r/196445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9b8af3b9ea34e032a1da7ca1a57e0cc4b9863eb
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow multiple types in Reindexer - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow multiple types in Reindexer
..
Allow multiple types in Reindexer
Change-Id: I044594e060cebf52890aa0b45a99cd625af142b2
---
M includes/Maintenance/ConfigUtils.php
M includes/Maintenance/Reindexer.php
M includes/Maintenance/Validators/IndexAllAliasValidator.php
M maintenance/updateOneSearchIndexConfig.php
4 files changed, 50 insertions(+), 33 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Maintenance/ConfigUtils.php
b/includes/Maintenance/ConfigUtils.php
index dfc81fe..014cdc2 100644
--- a/includes/Maintenance/ConfigUtils.php
+++ b/includes/Maintenance/ConfigUtils.php
@@ -98,7 +98,7 @@
} else {
$identifier = 'first';
}
- $this-output( ${typeName}_${identifier}\n );
+ $this-output( ${typeName}_${identifier}\n);
return $identifier;
}
return $option;
diff --git a/includes/Maintenance/Reindexer.php
b/includes/Maintenance/Reindexer.php
index 6779426..5b4de27 100644
--- a/includes/Maintenance/Reindexer.php
+++ b/includes/Maintenance/Reindexer.php
@@ -47,14 +47,14 @@
private $specificIndexName;
/**
-* @var Type
+* @var Type[]
*/
- private $type;
+ private $types;
/**
-* @var Type
+* @var Type[]
*/
- private $oldType;
+ private $oldTypes;
/**
* @var int
@@ -94,8 +94,8 @@
/**
* @param Index $index
* @param \ElasticaConnection $connection
-* @param Type $type
-* @param Type $oldType
+* @param Type[] $types
+* @param Type[] $oldTypes
* @param int $shardCount
* @param string $replicaCount
* @param int $connectionTimeout
@@ -103,14 +103,14 @@
* @param array $mappingConfig
* @param Maintenance $out
*/
- public function __construct( Index $index, \ElasticaConnection
$connection, Type $type, Type $oldType, $shardCount, $replicaCount,
$connectionTimeout, array $mergeSettings, array $mappingConfig, Maintenance
$out = null ) {
+ public function __construct( Index $index, \ElasticaConnection
$connection, array $types, array $oldTypes, $shardCount, $replicaCount,
$connectionTimeout, array $mergeSettings, array $mappingConfig, Maintenance
$out = null ) {
// @todo: this constructor has too many arguments - refactor!
$this-index = $index;
$this-client = $this-index-getClient();
$this-specificIndexName = $this-index-getName();
$this-connection = $connection;
- $this-type = $type;
- $this-oldType = $oldType;
+ $this-types = $types;
+ $this-oldTypes = $oldTypes;
$this-shardCount = $shardCount;
$this-replicaCount = $replicaCount;
$this-connectionTimeout = $connectionTimeout;
@@ -150,7 +150,10 @@
switch ( $forkResult ) {
case 'child':
- $this-reindexInternal( $processes,
$fork-getChildNumber(), $chunkSize, $retryAttempts );
+ foreach ( $this-types as $i = $type )
{
+ $oldType = $this-oldTypes[$i];
+ $this-reindexInternal( $type,
$oldType, $processes, $fork-getChildNumber(), $chunkSize, $retryAttempts );
+ }
die( 0 );
case 'done':
break;
@@ -161,19 +164,25 @@
$this-outputIndented( Verifying counts... );
// We can't verify counts are exactly equal because
they won't be - we still push updates into
// the old index while reindexing the new one.
- $oldCount = (float) $this-oldType-count();
- $this-index-refresh();
- $newCount = (float) $this-type-count();
- $difference = $oldCount 0 ? abs( $oldCount -
$newCount ) / $oldCount : 0;
- if ( $difference $acceptableCountDeviation ) {
- $this-output( Not close enough!
old=$oldCount new=$newCount difference=$difference\n );
- $this-error( 'Failed to load index - counts
not close enough. ' .
- old=$oldCount new=$newCount
difference=$difference. .
- 'Check for warnings above.', 1 );
+
[MediaWiki-commits] [Gerrit] Enable RESTBase updates on all wikis but enwiki - change (operations/mediawiki-config)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/196455 Change subject: Enable RESTBase updates on all wikis but enwiki .. Enable RESTBase updates on all wikis but enwiki The base load increase on Parsoid and RESTBase has been neglible, and we want to stop spidering those wikis to keep them up to date. This patch leaves out enwiki as a last step. Change-Id: I29941eaca312c5358444c70046bfd50d6bfc29ce --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/55/196455/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4968e67..77e4c2f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12236,13 +12236,7 @@ // updates to RESTBase 'wmgUseRestbaseUpdateJobs' = array( 'default' = true, - 'enwiki' = false, - 'dewiki' = false, - 'frwiki' = false, - 'ruwiki' = false, - 'eswiki' = false, - 'jawiki' = false, - 'itwiki' = false + 'enwiki' = false ), // whether to configure RESTBase as a Virtual REST Service -- To view, visit https://gerrit.wikimedia.org/r/196455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29941eaca312c5358444c70046bfd50d6bfc29ce Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: GWicke gwi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert labs/tools/extdist, wikibugs2 to use generic tox jobs - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert labs/tools/extdist,wikibugs2 to use generic tox jobs
..
Convert labs/tools/extdist,wikibugs2 to use generic tox jobs
Change-Id: Id768a0898cb6d5769968120a8c1d85383dcbd05d
---
M jjb/labs.yaml
M jjb/python-jobs.yaml
M zuul/layout.yaml
3 files changed, 5 insertions(+), 14 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index 42d9837..03c3d13 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -18,13 +18,6 @@
- '{name}-jslint'
- project:
-name: 'labs-tools-extdist'
-toxenv:
- - tests
-jobs:
- - '{name}-tox-{toxenv}-trusty'
-
-- project:
name: 'labs-tools-grrrit'
jobs:
- '{name}-jslint'
@@ -32,10 +25,7 @@
- project:
name: 'labs-tools-wikibugs2'
-toxenv:
- - channels
jobs:
- - '{name}-tox-{toxenv}-trusty'
- 'labs-tools-wikibugs2-autopull'
- job-template:
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index b04ecac..befc627 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -124,6 +124,7 @@
- flake8
- flake8-bin
- py27
+ - py34
jobs:
- 'tox-{toxenv}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5bb2e1c..a4c8bfe 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2251,10 +2251,10 @@
- name: labs/tools/extdist
test:
- tox-flake8-trusty
- - labs-tools-extdist-tox-tests-trusty
+ - tox-py27-trusty
gate-and-submit:
- tox-flake8-trusty
- - labs-tools-extdist-tox-tests-trusty
+ - tox-py27-trusty
- name: labs/tools/gblrenamemon
test:
@@ -2272,10 +2272,10 @@
- name: labs/tools/wikibugs2
test:
- - labs-tools-wikibugs2-tox-channels-trusty
+ - tox-py34-trusty
- tox-flake8-trusty
gate-and-submit:
- - labs-tools-wikibugs2-tox-channels-trusty
+ - tox-py34-trusty
- tox-flake8-trusty
postmerge:
- labs-tools-wikibugs2-autopull
--
To view, visit https://gerrit.wikimedia.org/r/196451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id768a0898cb6d5769968120a8c1d85383dcbd05d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix function call - change (mediawiki...RestBaseUpdateJobs)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196460
Change subject: Fix function call
..
Fix function call
Change-Id: I8ec45f036fb46e7dc2dda90b6f576d2c1a63cce2
---
M RestbaseUpdate.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RestBaseUpdateJobs
refs/changes/60/196460/1
diff --git a/RestbaseUpdate.hooks.php b/RestbaseUpdate.hooks.php
index 5948457..3de2d33 100644
--- a/RestbaseUpdate.hooks.php
+++ b/RestbaseUpdate.hooks.php
@@ -148,7 +148,7 @@
*/
public static function onFileUpload( File $file ) {
- self::updateTitle( $file-getTitle(), 'file' );
+ self::schedule( $file-getTitle(), 'file' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/196460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ec45f036fb46e7dc2dda90b6f576d2c1a63cce2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RestBaseUpdateJobs
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool cp1050 for reinstall - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: depool cp1050 for reinstall .. depool cp1050 for reinstall Change-Id: I93f695d96247b2e0e933fcecf693b2deb7fe24e2 --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index a5c3436..6dc9acf 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -140,7 +140,7 @@ 'eqiad' = [ 'cp1048.eqiad.wmnet', 'cp1049.eqiad.wmnet', -'cp1050.eqiad.wmnet', +#'cp1050.eqiad.wmnet', 'cp1051.eqiad.wmnet', # Jessie 'cp1061.eqiad.wmnet', # Jessie 'cp1062.eqiad.wmnet', # Jessie -- To view, visit https://gerrit.wikimedia.org/r/196459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93f695d96247b2e0e933fcecf693b2deb7fe24e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix function call - change (mediawiki...RestBaseUpdateJobs)
Ori.livneh has submitted this change and it was merged.
Change subject: Fix function call
..
Fix function call
Bug: T92574
Change-Id: I8ec45f036fb46e7dc2dda90b6f576d2c1a63cce2
---
M RestbaseUpdate.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/RestbaseUpdate.hooks.php b/RestbaseUpdate.hooks.php
index 5948457..3de2d33 100644
--- a/RestbaseUpdate.hooks.php
+++ b/RestbaseUpdate.hooks.php
@@ -148,7 +148,7 @@
*/
public static function onFileUpload( File $file ) {
- self::updateTitle( $file-getTitle(), 'file' );
+ self::schedule( $file-getTitle(), 'file' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/196460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ec45f036fb46e7dc2dda90b6f576d2c1a63cce2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/RestBaseUpdateJobs
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix function call - change (mediawiki...RestBaseUpdateJobs)
Ori.livneh has submitted this change and it was merged.
Change subject: Fix function call
..
Fix function call
Bug: T92574
Change-Id: I8ec45f036fb46e7dc2dda90b6f576d2c1a63cce2
(cherry picked from commit d52eee9c77f1ffd940390471b62c30aa130b18d0)
---
M RestbaseUpdate.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/RestbaseUpdate.hooks.php b/RestbaseUpdate.hooks.php
index 5948457..3de2d33 100644
--- a/RestbaseUpdate.hooks.php
+++ b/RestbaseUpdate.hooks.php
@@ -148,7 +148,7 @@
*/
public static function onFileUpload( File $file ) {
- self::updateTitle( $file-getTitle(), 'file' );
+ self::schedule( $file-getTitle(), 'file' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/196461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ec45f036fb46e7dc2dda90b6f576d2c1a63cce2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RestBaseUpdateJobs
Gerrit-Branch: wmf/1.25wmf21
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
