[MediaWiki-commits] [Gerrit] Allow login with passwords not meeting complexity requirements - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow login with passwords not meeting complexity requirements
..
Allow login with passwords not meeting complexity requirements
As part of https://www.mediawiki.org/wiki/Requests_for_comment/Passwords
This patch:
* Allows users to login with a password that does not meet the
requirements of User::isValidPassword(), including the minimum password
length.
* Adds a configuration flag that specifies if users should be sent to
the change password form when they login with a password that doesn't
meet the requirements of User::isValidPassword().
To test the UX as it will be on WMF wikis, set
$wgMinimalPasswordLength=6 in your LocalSettings.php.
Change-Id: Ib7b72005fea1c69073c0a33a68c0a0df0d6528d2
---
M includes/DefaultSettings.php
M includes/User.php
M includes/specials/SpecialUserlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
6 files changed, 25 insertions(+), 7 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 50db6c7..c6ebb35 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3978,6 +3978,13 @@
$wgMinimalPasswordLength = 1;
/**
+ * Specifies if users should be sent to a password-reset form on login, if
their
+ * password doesn't meet the requirements of User::isValidPassword().
+ * @since 1.23
+ */
+$wgInvalidPasswordReset = true;
+
+/**
* Whether to allow password resets (enter some identifying data, and we'll
send an email
* with a temporary password you can use to get back into the account)
identified by
* various bits of data. Setting all of these to false (or the whole variable
to false)
diff --git a/includes/User.php b/includes/User.php
index 9b47acf..a897d21 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3722,14 +3722,9 @@
global $wgAuth, $wgLegacyEncoding;
$this-load();
- // Even though we stop people from creating passwords that
- // are shorter than this, doesn't mean people wont be able
- // to. Certain authentication plugins do NOT want to save
+ // Certain authentication plugins do NOT want to save
// domain passwords in a mysql database, so we should
// check this (in case $wgAuth-strict() is false).
- if ( !$this-isValidPassword( $password ) ) {
- return false;
- }
if ( $wgAuth-authenticate( $this-getName(), $password ) ) {
return true;
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 69013b0..1c9fed7 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -767,7 +767,8 @@
}
function processLogin() {
- global $wgMemc, $wgLang, $wgSecureLogin,
$wgPasswordAttemptThrottle;
+ global $wgMemc, $wgLang, $wgSecureLogin,
$wgPasswordAttemptThrottle,
+ $wgInvalidPasswordReset;
switch ( $this-authenticateUserData() ) {
case self::SUCCESS:
@@ -808,6 +809,13 @@
$this-renewSessionId();
if (
$this-getUser()-getPasswordExpired() == 'soft' ) {
$this-resetLoginForm(
$this-msg( 'resetpass-expired-soft' ) );
+ } elseif ( $wgInvalidPasswordReset
+!$user-isValidPassword(
$this-mPassword )
+ ) {
+ $status =
$user-checkPasswordValidity( $this-mPassword );
+ $this-resetLoginForm(
+ $status-getMessage(
'resetpass-validity-soft' )
+ );
} else {
$this-successfulLogin();
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index f1725a3..d37d7b0 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1289,6 +1289,9 @@
'resetpass-abort-generic' = 'Password change has been aborted by an
extension.',
'resetpass-expired' = 'Your password has expired. Please set a new
password to log in.',
'resetpass-expired-soft'= 'Your password has expired and needs to be
reset. Please choose a new password now, or
[MediaWiki-commits] [Gerrit] [WIP^2] Refactor Scalable and MediaSizeWidget - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119435
Change subject: [WIP^2] Refactor Scalable and MediaSizeWidget
..
[WIP^2] Refactor Scalable and MediaSizeWidget
Scalable is now a dm calculation engine, responsible for all the
size and constraint calculations of a scalable object. MediaSizeWidget
takes a scalable object to interact with the user and process the values
supplied.
**
This commit is up on gerrit for backup purposes since my VM is
unpredictable. The commit requests you not look at it. It's hedious.
Seriously. Move along. Nothing to see here just yet.
***
Change-Id: Ie7ca3bbbe5d0287c7ce17d296c1827b8213ea950
---
M modules/ve/ce/ve.ce.ResizableNode.js
A modules/ve/dm/ve.dm.ResizableNode.js
R modules/ve/dm/ve.dm.Scalable.js
A modules/ve/ui/widgets/ve.ui.DimensionsWidget.js
M modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
5 files changed, 505 insertions(+), 154 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/35/119435/1
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js
b/modules/ve/ce/ve.ce.ResizableNode.js
index 89372e5..6c31ab1 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -23,9 +23,6 @@
ve.ce.ResizableNode = function VeCeResizableNode( $resizable, config ) {
config = config || {};
- // Mixin constructors
- ve.Scalable.call( this, config );
-
// Properties
this.$resizable = $resizable || this.$element;
this.resizing = false;
@@ -68,15 +65,15 @@
.addClass( 've-ce-resizableNode-swHandle
ve-ui-icon-resize-ne-sw' )
.data( 'handle', 'sw' ) );
- this.setCurrentDimensions( {
- 'width': this.model.getAttribute( 'width' ),
- 'height': this.model.getAttribute( 'height' )
- } );
+ // Scalable object ftw
+ this.scalable = this.model.getScalable();
+// this.setCurrentDimensions( {
+// 'width': this.model.getAttribute( 'width' ),
+// 'height': this.model.getAttribute( 'height' )
+// } );
};
/* Inheritance */
-
-OO.mixinClass( ve.ce.ResizableNode, ve.Scalable );
/* Events */
@@ -115,12 +112,12 @@
/** */
ve.ce.ResizableNode.prototype.setOriginalDimensions = function ( dimensions ) {
- // Parent method
- ve.Scalable.prototype.setOriginalDimensions.call( this, dimensions );
+ this.scalable.setOriginalDimensions( dimensions );
+// ve.Scalable.prototype.setOriginalDimensions.call( this, dimensions );
// If dimensions are valid and the scale label is desired, enable it
this.canShowScaleLabel = this.showScaleLabel
- this.getOriginalDimensions().width
- this.getOriginalDimensions().height;
+ this.scalable.getOriginalDimensions().width
+ this.scalable.getOriginalDimensions().height;
};
/**
diff --git a/modules/ve/dm/ve.dm.ResizableNode.js
b/modules/ve/dm/ve.dm.ResizableNode.js
new file mode 100644
index 000..198ca53
--- /dev/null
+++ b/modules/ve/dm/ve.dm.ResizableNode.js
@@ -0,0 +1,36 @@
+/*!
+ * VisualEditor DataModel Resizable node.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * A mixin class for resizable nodes.
+ *
+ * @class
+ * @abstract
+ * @constructor
+ */
+ve.dm.ResizableNode = function VeDmResizableNode( config ) {
+ config = config || {};
+};
+
+/**
+ * Produce a scalable object based on the current object's
+ * properties. This should be overriden in the specific instances
+ * of resizable nodes; the basic operation assumes at least current
+ * width and height.
+ * @returns {ve.dm.Scalable} Scalable object
+ */
+ve.dm.ResizableNode.prototype.getScalable = function() {
+ var width = this.getAttribute( 'width' ),
+ height = this.getAttribute( 'height' );
+
+ return new ve.dm.Scalable( {
+ 'currentDimensions': {
+ 'width': width,
+ 'height': height,
+ }
+ } );
+};
diff --git a/modules/ve/ve.Scalable.js b/modules/ve/dm/ve.dm.Scalable.js
similarity index 76%
rename from modules/ve/ve.Scalable.js
rename to modules/ve/dm/ve.dm.Scalable.js
index bc1bf23..e3fe77e 100644
--- a/modules/ve/ve.Scalable.js
+++ b/modules/ve/dm/ve.dm.Scalable.js
@@ -1,5 +1,5 @@
/*!
- * VisualEditor Scalable class.
+ * VisualEditor DataModel Scalable class.
*
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
@@ -21,15 +21,21 @@
* @cfg {boolean} [enforceMin=true] Enforce the minimum dimensions
* @cfg {boolean} [enforceMax=true] Enforce the maximum dimensions
*/
-ve.Scalable = function VeScalable( config ) {
+ve.dm.Scalable = function VeDmScalable( config ) {
[MediaWiki-commits] [Gerrit] Add lookupTitle attribute - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119436
Change subject: Add lookupTitle attribute
..
Add lookupTitle attribute
This is the normalized title without the fragment, which is what
should be used for existence check purposes.
Change-Id: I0e04f64c1bebeff84a0c17ef9b6c8dc06876f769
---
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkInspector.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
3 files changed, 26 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/36/119436/1
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 8ddfc51..1cd1f57 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -40,7 +40,7 @@
return str.replace( /([.?*+^$[\]\\(){}|-])/g, '\\$1' );
}
- var matches, normalizedTitle,
+ var matches, normalizedTitle, lookupTitle,
doc = converter.getTargetHtmlDocument(),
// Protocol relative base
relativeBase = ve.resolveUrl( mw.config.get( 'wgArticlePath' ),
doc ).toString().replace( /^https?:/, '' ),
@@ -61,7 +61,8 @@
/*jshint regexp:false */
matches = href.match( /^((?:\.\.?\/)*)(.*)$/ );
// Normalize capitalisation and underscores
- normalizedTitle = ve.dm.MWInternalLinkAnnotation.static.normalizeTitle(
matches[2] );
+ normalizedTitle = this.normalizeTitle( matches[2] );
+ lookupTitle = this.getLookupTitle( matches[2] );
return {
'type': this.name,
@@ -69,6 +70,7 @@
'hrefPrefix': matches[1],
'title': decodeURIComponent( matches[2] ).replace(
/_/g, ' ' ),
'normalizedTitle': normalizedTitle,
+ 'lookupTitle': lookupTitle,
'origTitle': matches[2]
}
};
@@ -98,17 +100,29 @@
};
/**
- * Normalize title for comparison purposes
+ * Normalize title for comparison purposes.
* @param {string} title Original title
* @returns {string} Normalized title, or the original if it is invalid
*/
ve.dm.MWInternalLinkAnnotation.static.normalizeTitle = function ( original ) {
var title = mw.Title.newFromText( original );
- if ( title ) {
- return title.getPrefixedText() + ( title.getFragment() !== null
? '#' + title.getFragment() : '' );
- } else {
+ if ( !title ) {
return original;
}
+ return title.getPrefixedText() + ( title.getFragment() !== null ? '#' +
title.getFragment() : '' );
+};
+
+/**
+ * Normalize title for lookup (search suggestion, existence) purposes.
+ * @param {string} title Original title
+ * @returns {string} Normalized title, or the original if it is invalid
+ */
+ve.dm.MWInternalLinkAnnotation.static.getLookupTitle = function ( original ) {
+ var title = mw.Title.newFromText( original );
+ if ( !title ) {
+ return original;
+ }
+ return title.getPrefixedText();
};
/* Methods */
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkInspector.js
index ae62b58..015c9b7 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkInspector.js
@@ -78,7 +78,9 @@
'type': 'link/mwInternal',
'attributes': {
'title': target,
- 'normalizedTitle':
ve.dm.MWInternalLinkAnnotation.static.normalizeTitle( target )
+ // bug 62816: we really need a builder for this
stuff
+ 'normalizedTitle':
ve.dm.MWInternalLinkAnnotation.static.normalizeTitle( target ),
+ 'lookupTitle':
ve.dm.MWInternalLinkAnnotation.static.getLookupTitle( target )
}
} );
} else {
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index da32ec9..e2e3d3d 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -275,7 +275,9 @@
'type': 'link/mwInternal',
'attributes': {
'title': target,
- 'normalizedTitle':
ve.dm.MWInternalLinkAnnotation.static.normalizeTitle( target )
+ // bug 62816: we really need a builder for this stuff
+ 'normalizedTitle':
[MediaWiki-commits] [Gerrit] Fix order of graphs for dashboards - change (operations/puppet)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/119437 Change subject: Fix order of graphs for dashboards .. Fix order of graphs for dashboards Graphs are sorted in lexical order, so 10-* comes between 1-* and 2-*. Use padding zeros for filenames when a dashboard is displaying 10 or more graphs so that 10-* sorts after 09-*. Change-Id: Ic02410fa3048013028e4a4b040f19674721eb952 --- R files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph R files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph R files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph R files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph R files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph R files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph R files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph R files/gdash/dashboards/frontend/08.mediaWikiLoadComplete.desktop.month.graph R files/gdash/dashboards/frontend/09.totalPageLoadTime.mobile.hour.graph R files/gdash/dashboards/reqerror/01.5xx.graph R files/gdash/dashboards/reqerror/02.4xx.graph R files/gdash/dashboards/reqerror/03.5xx-sum-1day.graph R files/gdash/dashboards/reqerror/04.4xx-sum-1day.graph R files/gdash/dashboards/reqerror/05.5xx-1wk.graph R files/gdash/dashboards/reqerror/06.4xx.graph R files/gdash/dashboards/reqerror/07.5xx-2m.graph R files/gdash/dashboards/reqerror/08.4xx-2m.graph R files/gdash/dashboards/reqerror/09.5xx-1y.graph R files/gdash/dashboards/totalphp/01.avg.graph R files/gdash/dashboards/totalphp/02.tp99.graph R files/gdash/dashboards/totalphp/03.avg-day.graph R files/gdash/dashboards/totalphp/04.tp99-day.graph R files/gdash/dashboards/totalphp/05.avg-week.graph R files/gdash/dashboards/totalphp/06.tp99-week.graph R files/gdash/dashboards/totalphp/07.avg-month.graph R files/gdash/dashboards/totalphp/08.tp99-month.graph R files/gdash/dashboards/totalphp/09.avg-year.graph 27 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/37/119437/1 diff --git a/files/gdash/dashboards/frontend/1.totalPageLoadTime.desktop.hour.graph b/files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph similarity index 100% rename from files/gdash/dashboards/frontend/1.totalPageLoadTime.desktop.hour.graph rename to files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph diff --git a/files/gdash/dashboards/frontend/2.totalPageLoadTime.desktop.day.graph b/files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph similarity index 100% rename from files/gdash/dashboards/frontend/2.totalPageLoadTime.desktop.day.graph rename to files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph diff --git a/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph b/files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph similarity index 100% rename from files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph rename to files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph diff --git a/files/gdash/dashboards/frontend/4.totalPageLoadTime.desktop.month.graph b/files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph similarity index 100% rename from files/gdash/dashboards/frontend/4.totalPageLoadTime.desktop.month.graph rename to files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph diff --git a/files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.hour.graph b/files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph similarity index 100% rename from files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.hour.graph rename to files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph diff --git a/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.day.graph b/files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph similarity index 100% rename from files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.day.graph rename to files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph diff --git a/files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.desktop.week.graph b/files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph similarity index 100% rename from files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.desktop.week.graph rename to files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph diff --git a/files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.desktop.month.graph b/files/gdash/dashboards/frontend/08.mediaWikiLoadComplete.desktop.month.graph similarity index 100% rename from files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.desktop.month.graph
[MediaWiki-commits] [Gerrit] Labs: Provide symbolic links to dumps for compatibility - change (operations/puppet)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119438
Change subject: Labs: Provide symbolic links to dumps for compatibility
..
Labs: Provide symbolic links to dumps for compatibility
Bug: 62296
Change-Id: Ia0dd680b5693882f3990e0753a794e763533cde8
---
M manifests/role/labs.pp
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/119438/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index de54e5d..ff1596e 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -63,6 +63,21 @@
require = File['/public/dumps'],
}
+# Symbolic links for pmtpa compatibility.
+file { '/public/datasets':
+ensure = 'directory',
+owner = 'root',
+group = 'root',
+require = File['/public'],
+}
+file { '/public/datasets/public':
+ensure = 'target',
+owner = 'root',
+group = 'root',
+target = '/public/dumps/public',
+require = File['/public/datasets'],
+}
+
file { '/public/backups':
ensure = directory,
require = File['/public'],
--
To view, visit https://gerrit.wikimedia.org/r/119438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0dd680b5693882f3990e0753a794e763533cde8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add HTML text to embed tab - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119439
Change subject: Add HTML text to embed tab
..
Add HTML text to embed tab
Change-Id: Idcafe6dad9ffb17ffac365a350feff3903b37ff3
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/148
---
M resources/mmv/mmv.EmbedFileFormatter.js
M resources/mmv/ui/mmv.ui.reuse.embed.js
M tests/qunit/mmv/mmv.EmbedFileFormatter.test.js
M tests/qunit/mmv/ui/mmv.ui.reuse.embed.test.js
4 files changed, 707 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/39/119439/1
diff --git a/resources/mmv/mmv.EmbedFileFormatter.js
b/resources/mmv/mmv.EmbedFileFormatter.js
index 30e403c..8065593 100644
--- a/resources/mmv/mmv.EmbedFileFormatter.js
+++ b/resources/mmv/mmv.EmbedFileFormatter.js
@@ -15,7 +15,7 @@
* along with MediaViewer. If not, see http://www.gnu.org/licenses/.
*/
-( function( mw ) {
+( function( mw, $ ) {
var AFP;
/**
@@ -56,5 +56,98 @@
caption ? caption.plain : title.getNameText() );
};
+ /**
+* Byline construction
+* @param {{html: string, plain: string}} [author]
+* @param {{html: string, plain: string}} [source]
+* @return {{html: string, plain: string}} byline in plain text and html
+*/
+ AFP.getBylines = function ( author, source ) {
+ var bylines = {};
+
+ if ( author source) {
+ bylines.plain = mw.message(
+ 'multimediaviewer-credit',
+ author.plain,
+ source.plain
+ ).text();
+
+ bylines.html = mw.message(
+ 'multimediaviewer-credit',
+ author.html,
+ source.html
+ ).parse();
+ } else if ( author ) {
+ bylines.plain = author.plain;
+ bylines.html = author.html;
+ } else if ( source ) {
+ bylines.plain = source.plain;
+ bylines.html = source.html;
+ }
+
+ return bylines;
+ };
+
+ /**
+* Generates the HTML embed code for the image credit line.
+* @param {mw.mmv.model.EmbedFileInfo} info
+* @return {string}
+*/
+ AFP.getCreditHtml = function ( info ) {
+ var creditText, creditFormat, creditParams,
+ title = info.title.getNameText(),
+ bylines = this.getBylines( info.author, info.source );
+
+ creditFormat = 't';
+ creditParams = [ title ];
+ if ( bylines.html ) {
+ creditFormat += 'b';
+ creditParams.push( bylines.html );
+ }
+ if ( info.license info.license.plain.length ) {
+ creditFormat += 'l';
+ creditParams.push( info.license.plain );
+ }
+ if ( info.siteName ) {
+ creditFormat += 's';
+ creditParams.push( info.siteName );
+ }
+
+ if ( creditFormat === 't' || creditFormat === 'ts' ) {
+ creditText = '' + title + '';
+ } else {
+ creditParams.unshift(
'multimediaviewer-html-embed-credit-text-' + creditFormat );
+ creditText = mw.message.apply( mw, creditParams
).plain();
+ }
+
+ return creditText;
+ };
+
+ /**
+* Generates the HTML embed code for the image.
+*
+* @param {mw.mmv.model.EmbedFileInfo} info
+* @param {string} imgUrl URL to the file itself.
+* @param {number} [width] Width to put into the image element.
+* @param {number} [height] Height to put into the image element.
+* @return {string} Embed code.
+*/
+ AFP.getThumbnailHtml = function ( info, imgUrl, width, height ) {
+ return $( 'div' ).append(
+ $( 'p' ).append(
+ $( 'a' )
+ .attr( 'href', info.url )
+ .append(
+ $( 'img' )
+ .attr( 'src', imgUrl )
+ .attr( 'height', height
)
+ .attr( 'width', width )
+ ),
+ $( 'br' ),
+ this.getCreditHtml( info )
+
[MediaWiki-commits] [Gerrit] Trim newline from gdash config - change (operations/puppet)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119440
Change subject: Trim newline from gdash config
..
Trim newline from gdash config
Add the - trim marker to the erb stanza that generates the
deploy_addon gdash option so that the resulting configuration does not
include an embedded newline. Without this change the setting ends up
looking something like alias(...)alias(...)alias(...)\n in the
generated gdash.yaml file.
Change-Id: Ie646e8e2b0f00e527e751c890a300aac389c3769
---
M templates/gdash/deploy_addon.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/119440/1
diff --git a/templates/gdash/deploy_addon.erb b/templates/gdash/deploy_addon.erb
index e1bd32d..b307746 100644
--- a/templates/gdash/deploy_addon.erb
+++ b/templates/gdash/deploy_addon.erb
@@ -15,4 +15,4 @@
'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),black),scap
deploy)',
].join('')
-%
+-%
--
To view, visit https://gerrit.wikimedia.org/r/119440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie646e8e2b0f00e527e751c890a300aac389c3769
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trim newline from gdash config - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Trim newline from gdash config
..
Trim newline from gdash config
Add the - trim marker to the erb stanza that generates the
deploy_addon gdash option so that the resulting configuration does not
include an embedded newline. Without this change the setting ends up
looking something like alias(...)alias(...)alias(...)\n in the
generated gdash.yaml file.
Change-Id: Ie646e8e2b0f00e527e751c890a300aac389c3769
---
M templates/gdash/deploy_addon.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/gdash/deploy_addon.erb b/templates/gdash/deploy_addon.erb
index e1bd32d..b307746 100644
--- a/templates/gdash/deploy_addon.erb
+++ b/templates/gdash/deploy_addon.erb
@@ -15,4 +15,4 @@
'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),black),scap
deploy)',
].join('')
-%
+-%
--
To view, visit https://gerrit.wikimedia.org/r/119440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie646e8e2b0f00e527e751c890a300aac389c3769
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@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] Improve _http_agent timeout handling - change (mediawiki...parsoid)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119442
Change subject: Improve _http_agent timeout handling
..
Improve _http_agent timeout handling
* move all connect timeout related logic into a single block
* call socket.emit('error', e) with an error object
Change-Id: I3bd49a4b0b436bd80dbcd919d08018eb365a7635
---
M lib/_http_agent.js
1 file changed, 16 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/42/119442/1
diff --git a/lib/_http_agent.js b/lib/_http_agent.js
index 0989911..507ad3e 100644
--- a/lib/_http_agent.js
+++ b/lib/_http_agent.js
@@ -191,12 +191,7 @@
debug('createConnection', name, options);
options.encoding = null;
- var connected = false,
- s = self.createConnection(options, function() {
- if (this.connectTimeoutTimer) {
- clearTimeout(s.connectTimeoutTimer);
- }
- });
+ var s = self.createConnection(options);
if (!self.sockets[name]) {
self.sockets[name] = [];
}
@@ -230,12 +225,23 @@
s.on('agentRemove', onRemove);
// Set up a connect timeout if connectTimeout option is set
- if (options.connectTimeout !s.connectTimeoutTimer !connected) {
+ if (options.connectTimeout !s.connectTimeoutTimer) {
// Set up a timer
s.connectTimeoutTimer = setTimeout(function () {
- s.destroy()
- //console.error('[AgentConnectTimeout]');
+ var e = new Error(ETIMEDOUT)
+ e.code = ETIMEDOUT
+ s.end();
+ s.emit(error, e)
+ onClose();
+ //console.error('[AgentConnectTimeout ' + hostHeader + ':' +
options.port + ']');
}, options.connectTimeout);
+s.once('connect', function() {
+ if (this.connectTimeoutTimer) {
+//console.log('canceled timeout');
+clearTimeout(s.connectTimeoutTimer);
+this.connectTimeoutTimer = undefined;
+ }
+});
}
return s;
@@ -281,5 +287,5 @@
};
exports = {
- Agent: Agent
+ Agent: Agent
};
--
To view, visit https://gerrit.wikimedia.org/r/119442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bd49a4b0b436bd80dbcd919d08018eb365a7635
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
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] Improve default logger error formatting - change (mediawiki...parsoid)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119441
Change subject: Improve default logger error formatting
..
Improve default logger error formatting
Use the more conventional 'location: message \n stack' format rather than
'message\nlocation\nstack'.
Change-Id: Ic7d0b6179f892d78721243e003a2fa228fdbae88
---
M lib/Logger.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/41/119441/1
diff --git a/lib/Logger.js b/lib/Logger.js
index a31ff83..c49a32d 100644
--- a/lib/Logger.js
+++ b/lib/Logger.js
@@ -127,12 +127,12 @@
Logger.prototype._defaultBackend = function(logData, cb) {
try {
var logType = logData.logType;
- var msg = logData.msg();
+ var msg;
if (/^(error|warning)(\/|$)/.test(logType)) {
- msg += \n + logData.locationMsg();
+ msg = logData.locationMsg() + ': ' + logData.msg();
}
if (/(^(error|fatal)|(^|\/)stacktrace)(\/|$)/.test(logType)) {
- msg += \n + logData.stack();
+ msg += '\n' + logData.stack();
}
console.warn(msg);
} catch (e) {
--
To view, visit https://gerrit.wikimedia.org/r/119441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7d0b6179f892d78721243e003a2fa228fdbae88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
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] WIP / for discussion: Several APIRequest tweaks - change (mediawiki...parsoid)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119443
Change subject: WIP / for discussion: Several APIRequest tweaks
..
WIP / for discussion: Several APIRequest tweaks
Testing tonight produced a lot of timeouts (with connection timeout and
without). This patch has some related changes:
* Improve concurrency from 25 to 50
* enable keepalive
* Improve error reporting
* Bring back URL randomization for POST requests, primarily for rt testing.
Need to check with ops whether api.php still hashes to a single backend
varnish or not.
* Increase some timeouts after seeing them trigger for [[enwiktionary:water]].
More testing with non-sucky API performance is needed to establish whether
higher timeouts are really needed.
Change-Id: Ic691473b0e3ecfb8e438e35d7e5edbd4aba33de5
---
M lib/mediawiki.ApiRequest.js
1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/43/119443/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index dd96bbe..baad918 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -6,8 +6,9 @@
var Agent = require('./_http_agent.js').Agent,
httpAgent = new Agent({
- connectTimeout: 5 * 1000,
- maxSockets: 25
+ connectTimeout: 10 * 1000,
+ keepAlive: true,
+ maxSockets: 50
});
require('http').globalAgent = httpAgent;
@@ -139,7 +140,7 @@
var self = this;
if (error) {
- this.env.log('warning/api', 'Failed API request,',
+ this.env.log('error/api', 'Failed API request for',
JSON.stringify((this.queueKey || '').substr(0, 20)) + ':', error, ';',
this.retries, 'retries remaining.');
if ( this.retries ) {
this.retries--;
@@ -375,7 +376,7 @@
title: title,
text: text
};
- var uri = env.conf.wiki.apiURI;
+ var uri = env.conf.wiki.apiURI + '?random=' + Math.random();
this.requestOptions = {
// Use POST since we are passing a bit of source, and GET has a
very
@@ -385,7 +386,7 @@
form: apiargs, // The API arguments
followRedirect: true,
uri: uri,
- timeout: 30 * 1000, // 30 seconds
+ timeout: 60 * 1000, // 30 seconds
proxy: env.conf.wiki.apiProxyURI,
headers: {
'User-Agent': userAgent,
@@ -484,7 +485,7 @@
text: text,
disablepp: 'true'
};
- var uri = env.conf.wiki.apiURI;
+ var uri = env.conf.wiki.apiURI + '?' + Math.random();
this.requestOptions = {
// Use POST since we are passing a bit of source, and GET has a
very
@@ -494,7 +495,7 @@
form: apiargs, // The API arguments
followRedirect: true,
uri: uri,
- timeout: 16 * 1000, // 16 seconds
+ timeout: 30 * 1000, // 30 seconds
proxy: env.conf.wiki.apiProxyURI,
headers: {
'User-Agent': userAgent,
--
To view, visit https://gerrit.wikimedia.org/r/119443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic691473b0e3ecfb8e438e35d7e5edbd4aba33de5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
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] Fix order of graphs for dashboards - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: Fix order of graphs for dashboards .. Fix order of graphs for dashboards Graphs are sorted in lexical order, so 10-* comes between 1-* and 2-*. Use padding zeros for filenames when a dashboard is displaying 10 or more graphs so that 10-* sorts after 09-*. Change-Id: Ic02410fa3048013028e4a4b040f19674721eb952 --- R files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph R files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph R files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph R files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph R files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph R files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph R files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph R files/gdash/dashboards/frontend/08.mediaWikiLoadComplete.desktop.month.graph R files/gdash/dashboards/frontend/09.totalPageLoadTime.mobile.hour.graph R files/gdash/dashboards/reqerror/01.5xx.graph R files/gdash/dashboards/reqerror/02.4xx.graph R files/gdash/dashboards/reqerror/03.5xx-sum-1day.graph R files/gdash/dashboards/reqerror/04.4xx-sum-1day.graph R files/gdash/dashboards/reqerror/05.5xx-1wk.graph R files/gdash/dashboards/reqerror/06.4xx.graph R files/gdash/dashboards/reqerror/07.5xx-2m.graph R files/gdash/dashboards/reqerror/08.4xx-2m.graph R files/gdash/dashboards/reqerror/09.5xx-1y.graph R files/gdash/dashboards/totalphp/01.avg.graph R files/gdash/dashboards/totalphp/02.tp99.graph R files/gdash/dashboards/totalphp/03.avg-day.graph R files/gdash/dashboards/totalphp/04.tp99-day.graph R files/gdash/dashboards/totalphp/05.avg-week.graph R files/gdash/dashboards/totalphp/06.tp99-week.graph R files/gdash/dashboards/totalphp/07.avg-month.graph R files/gdash/dashboards/totalphp/08.tp99-month.graph R files/gdash/dashboards/totalphp/09.avg-year.graph 27 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/files/gdash/dashboards/frontend/1.totalPageLoadTime.desktop.hour.graph b/files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph similarity index 100% rename from files/gdash/dashboards/frontend/1.totalPageLoadTime.desktop.hour.graph rename to files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph diff --git a/files/gdash/dashboards/frontend/2.totalPageLoadTime.desktop.day.graph b/files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph similarity index 100% rename from files/gdash/dashboards/frontend/2.totalPageLoadTime.desktop.day.graph rename to files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph diff --git a/files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph b/files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph similarity index 100% rename from files/gdash/dashboards/frontend/3.totalPageLoadTime.desktop.week.graph rename to files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph diff --git a/files/gdash/dashboards/frontend/4.totalPageLoadTime.desktop.month.graph b/files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph similarity index 100% rename from files/gdash/dashboards/frontend/4.totalPageLoadTime.desktop.month.graph rename to files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph diff --git a/files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.hour.graph b/files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph similarity index 100% rename from files/gdash/dashboards/frontend/5.mediaWikiLoadComplete.desktop.hour.graph rename to files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph diff --git a/files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.day.graph b/files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph similarity index 100% rename from files/gdash/dashboards/frontend/6.mediaWikiLoadComplete.desktop.day.graph rename to files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph diff --git a/files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.desktop.week.graph b/files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph similarity index 100% rename from files/gdash/dashboards/frontend/7.mediaWikiLoadComplete.desktop.week.graph rename to files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph diff --git a/files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.desktop.month.graph b/files/gdash/dashboards/frontend/08.mediaWikiLoadComplete.desktop.month.graph similarity index 100% rename from files/gdash/dashboards/frontend/8.mediaWikiLoadComplete.desktop.month.graph rename to
[MediaWiki-commits] [Gerrit] Enable Popups (Hovercards) on mediawiki.org - change (operations/mediawiki-config)
Spage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119445
Change subject: Enable Popups (Hovercards) on mediawiki.org
..
Enable Popups (Hovercards) on mediawiki.org
Also revise beta labs config to enable it on en-beta.
Bug: 61167
Change-Id: Ic78a4fc9eef17bed388d729072baed2b5aec53c1
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
6 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/45/119445/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index c8fac87..816bfd9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -99,8 +99,6 @@
require_once( $IP/extensions/MobileApp/MobileApp.php );
-require_once( $IP/extensions/Popups/Popups.php );
-
// Config for GlobalCssJs
// Only enable on CentralAuth wikis
if ( $wmgUseGlobalCssJs $wmgUseCentralAuth ) {
@@ -120,7 +118,6 @@
'source' = 'metawiki',
);
}
-
# temporary extensions
#
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4aa579a..39856fd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1777,6 +1777,10 @@
}
}
+if ( $wmgUsePopups ) {
+ require_once( $IP/extensions/Popups/Popups.php );
+}
+
if ( $wmgUseVectorBeta ) {
require_once( $IP/extensions/VectorBeta/VectorBeta.php );
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 1c226ba..7607147 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -258,6 +258,10 @@
'default' = true,
),
+ 'wmgUsePopups' = array(
+ 'default' = true,
+ ),
+
'wmgUseVectorBeta' = array(
'default' = true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 1ea4e32..4abf4d9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10680,6 +10680,11 @@
'votewiki' = false,
),
+'wmgUsePopups' = array(
+ 'default' = false,
+ 'mediawikiwiki' = true,
+),
+
'wmgUseVectorBeta' = array(
'default' = true,
'loginwiki' = false,
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 9d06a06..181de29 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -88,6 +88,7 @@
$IP/extensions/PdfHandler/PdfHandler.php
$IP/extensions/Poem/Poem.php
$IP/extensions/PoolCounter/PoolCounterClient.php
+$IP/extensions/Popups/Popups.php
$IP/extensions/ProofreadPage/ProofreadPage.php
$IP/extensions/Quiz/Quiz.php
$IP/extensions/RandomRootPage/Randomrootpage.php
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index e546cbb..305b53e 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,3 +1,2 @@
$IP/extensions/MobileApp/MobileApp.php
-$IP/extensions/Popups/Popups.php
$IP/extensions/GlobalCssJs/GlobalCssJs.php
--
To view, visit https://gerrit.wikimedia.org/r/119445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic78a4fc9eef17bed388d729072baed2b5aec53c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Spage sp...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix graph URL generation when deploy addon is enabled - change (operations...gdash)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119444
Change subject: Fix graph URL generation when deploy addon is enabled
..
Fix graph URL generation when deploy addon is enabled
'' mutates.
Change-Id: I99c4a1fe30ccb30f0bd07b3b23ef69c252696e83
---
M lib/gdash/sinatra_app.rb
M views/dashboard.erb
2 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/gdash
refs/changes/44/119444/1
diff --git a/lib/gdash/sinatra_app.rb b/lib/gdash/sinatra_app.rb
index 33e04ab..0780e40 100644
--- a/lib/gdash/sinatra_app.rb
+++ b/lib/gdash/sinatra_app.rb
@@ -86,8 +86,10 @@
end
get '/:category/:dash/?*' do
-if params[splat].include? 'deploys'
-@add_deploy = @deploy_addon '' unless @deploy_addon == nil
+if params[splat].include?('deploys') and not @deploy_addon.nil?
+@add_deploy = '' + @deploy_addon
+else
+@add_deploy = ''
end
if @top_level[#{params[:category]}].list.include?(params[:dash])
@dashboard =
@top_level[@params[:category]].dashboard(params[:dash])
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 4a06273..dd5e53d 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -10,9 +10,9 @@
td
% if graph %
% if graph[:graphite][:description] %
-img src='%=
[@top_level[@params[:category]].graphite_render, graph[:graphite][:url]].join
? @add_deploy ||= %' rel=%= row == 1 ? 'popover-below' :
'popover-above' % title=%= graph[:graphite][:title] % data-content=%=
graph[:graphite][:description] %
+ img src='%=
#{@top_level[@params[:category]].graphite_render}?#{graph[:graphite][:url]}#{@add_deploy}
%' rel=%= row == 1 ? 'popover-below' : 'popover-above' % title=%=
graph[:graphite][:title] % data-content=%= graph[:graphite][:description]
%
% else %
-img src='%=
[@top_level[@params[:category]].graphite_render, graph[:graphite][:url]].join
? @add_deploy ||= %'
+ img src='%=
#{@top_level[@params[:category]].graphite_render}?#{graph[:graphite][:url]}#{@add_deploy}
%'
% end %
% end %
/td
--
To view, visit https://gerrit.wikimedia.org/r/119444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99c4a1fe30ccb30f0bd07b3b23ef69c252696e83
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/gdash
Gerrit-Branch: master
Gerrit-Owner: 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 graph URL generation when deploy addon is enabled - change (operations...gdash)
Ori.livneh has submitted this change and it was merged.
Change subject: Fix graph URL generation when deploy addon is enabled
..
Fix graph URL generation when deploy addon is enabled
'' mutates.
Change-Id: I99c4a1fe30ccb30f0bd07b3b23ef69c252696e83
---
M lib/gdash/sinatra_app.rb
M views/dashboard.erb
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/lib/gdash/sinatra_app.rb b/lib/gdash/sinatra_app.rb
index 33e04ab..0780e40 100644
--- a/lib/gdash/sinatra_app.rb
+++ b/lib/gdash/sinatra_app.rb
@@ -86,8 +86,10 @@
end
get '/:category/:dash/?*' do
-if params[splat].include? 'deploys'
-@add_deploy = @deploy_addon '' unless @deploy_addon == nil
+if params[splat].include?('deploys') and not @deploy_addon.nil?
+@add_deploy = '' + @deploy_addon
+else
+@add_deploy = ''
end
if @top_level[#{params[:category]}].list.include?(params[:dash])
@dashboard =
@top_level[@params[:category]].dashboard(params[:dash])
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 4a06273..dd5e53d 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -10,9 +10,9 @@
td
% if graph %
% if graph[:graphite][:description] %
-img src='%=
[@top_level[@params[:category]].graphite_render, graph[:graphite][:url]].join
? @add_deploy ||= %' rel=%= row == 1 ? 'popover-below' :
'popover-above' % title=%= graph[:graphite][:title] % data-content=%=
graph[:graphite][:description] %
+ img src='%=
#{@top_level[@params[:category]].graphite_render}?#{graph[:graphite][:url]}#{@add_deploy}
%' rel=%= row == 1 ? 'popover-below' : 'popover-above' % title=%=
graph[:graphite][:title] % data-content=%= graph[:graphite][:description]
%
% else %
-img src='%=
[@top_level[@params[:category]].graphite_render, graph[:graphite][:url]].join
? @add_deploy ||= %'
+ img src='%=
#{@top_level[@params[:category]].graphite_render}?#{graph[:graphite][:url]}#{@add_deploy}
%'
% end %
% end %
/td
--
To view, visit https://gerrit.wikimedia.org/r/119444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99c4a1fe30ccb30f0bd07b3b23ef69c252696e83
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/gdash
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@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] Make js config handling more robust when config is not in Pa... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119311
Change subject: Make js config handling more robust when config is not in
ParserCache
..
Make js config handling more robust when config is not in ParserCache
Also improve/add test case for OutputPageJsConfigHookHandler
Also moves wbExperimental out of parser cache, since
this is something that would be good to change more easily
and should not be much of a performance issue to add
in output page.
Change-Id: Ie956b97bd632a0f6863a311fe0a8aff1a9319ea9
---
M repo/Wikibase.hooks.php
M repo/includes/Hook/OutputPageJsConfigHookHandler.php
M repo/includes/OutputPageJsConfigBuilder.php
M repo/includes/ParserOutputJsConfigBuilder.php
M repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
M repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php
M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
7 files changed, 113 insertions(+), 117 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/11/119311/3
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index aafd95a..cbc2b94 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -1153,15 +1153,23 @@
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
$langCode = $out-getContext()-getLanguage()-getCode();
+ $fallbackChainFactory =
$wikibaseRepo-getLanguageFallbackChainFactory();
+ $fallbackChain =
$fallbackChainFactory-newFromContextForPageView( $out-getContext() );
+
+ $langCodes = Utils::getLanguageCodes() + array( $langCode =
$fallbackChain );
+
$hookHandler = new OutputPageJsConfigHookHandler(
- $wikibaseRepo-getEntityIdParser(),
$wikibaseRepo-getEntityContentFactory(),
- $wikibaseRepo-getLanguageFallbackChainFactory(),
$wikibaseRepo-getParserOutputJsConfigBuilder(
$langCode ),
- $wikibaseRepo-getSettings()
+ $wikibaseRepo-getSettings(),
+ $langCodes
);
- return $hookHandler-handle( $out );
+ $isExperimental = defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES;
+
+ $out = $hookHandler-handle( $out, $isExperimental );
+
+ return true;
}
/**
diff --git a/repo/includes/Hook/OutputPageJsConfigHookHandler.php
b/repo/includes/Hook/OutputPageJsConfigHookHandler.php
index 4e03339..f150ed2 100644
--- a/repo/includes/Hook/OutputPageJsConfigHookHandler.php
+++ b/repo/includes/Hook/OutputPageJsConfigHookHandler.php
@@ -2,14 +2,14 @@
namespace Wikibase\Hook;
-use MWException;
use OutputPage;
use Title;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Wikibase\EntityContent;
use Wikibase\EntityContentFactory;
use Wikibase\LanguageFallbackChainFactory;
+use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\NamespaceUtils;
use Wikibase\OutputPageJsConfigBuilder;
use Wikibase\ParserOutputJsConfigBuilder;
@@ -24,19 +24,9 @@
class OutputPageJsConfigHookHandler {
/**
-* @var EntityIdParser
-*/
- protected $idParser;
-
- /**
* @var EntityContentFactory
*/
protected $entityContentFactory;
-
- /**
-* @var LanguageFallbackChainFactory
-*/
- protected $fallbackChainFactory;
/**
* @var ParserOutputJsConfigBuilder
@@ -54,81 +44,69 @@
protected $outputPageConfigBuilder;
/**
-* @param EntityIdParser $idParser
* @param EntityContentFactory $entityContentFactory
-* @param LanguageFallbackChainFactory $fallbackChainFactory
* @param Settings $settings
* @param ParserOutputJsConfigBuilder $configBuilder
+* @param array $langCodes
*/
public function __construct(
- EntityIdParser $idParser,
EntityContentFactory $entityContentFactory,
- LanguageFallbackChainFactory $fallbackChainFactory,
ParserOutputJsConfigBuilder $parserOutputConfigBuilder,
- Settings $settings
+ Settings $settings,
+ array $langCodes
) {
- $this-idParser = $idParser;
$this-entityContentFactory = $entityContentFactory;
- $this-fallbackChainFactory = $fallbackChainFactory;
$this-parserOutputConfigBuilder = $parserOutputConfigBuilder;
$this-settings = $settings;
+ $this-langCodes = $langCodes;
$this-outputPageConfigBuilder = new
OutputPageJsConfigBuilder();
}
/**
-
[MediaWiki-commits] [Gerrit] Renaming Popups to Hovercards in the i18n file - change (mediawiki...Popups)
Yuvipanda has submitted this change and it was merged.
Change subject: Renaming Popups to Hovercards in the i18n file
..
Renaming Popups to Hovercards in the i18n file
Bug: 62769
Change-Id: I21a31ef7d610b9214ee97187bd6b1588ba80760d
---
M Popups.i18n.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
Deskana: Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/Popups.i18n.php b/Popups.i18n.php
index 7159927..fa61baf 100644
--- a/Popups.i18n.php
+++ b/Popups.i18n.php
@@ -25,8 +25,8 @@
* English
*/
$messages['en'] = array(
- 'popups-message' = 'Popups',
- 'popups-desc' = 'Displays popups with summaries of page contents when
the user hovers over a page link.',
+ 'popups-message' = 'Hovercards',
+ 'popups-desc' = 'Displays hovercards with summaries of page contents
when the user hovers over a page link.',
'popups-last-edited' = 'Last edited $1',
'popups-redirects' = 'redirects to h3$1/h3',
);
@@ -39,7 +39,7 @@
'popups-desc' =
'{{desc|name=Popups|url=https://www.mediawiki.org/wiki/Extension:Popups}}',
'popups-last-edited' = 'Message to show time span since the page was
last edited. Parameters:
* $1 - the timespan in words (localized). e.g. 3 months ago',
- 'popups-redirects' = 'Message shown when the popup is showing a
redirected page',
+ 'popups-redirects' = 'Message shown when the hovercard is showing a
redirected page',
);
/** Arabic (العربية)
--
To view, visit https://gerrit.wikimedia.org/r/119429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21a31ef7d610b9214ee97187bd6b1588ba80760d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Deskana dga...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Popups (Hovercards) extension - change (mediawiki...release)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/119447 Change subject: Add Popups (Hovercards) extension .. Add Popups (Hovercards) extension Added to $branchedExtensions per https://wikitech.wikimedia.org/wiki/How_to_deploy_code Bug: 61167 Change-Id: I848bb9c85bc0374655fe2105de680fcc56b3dbeb --- M make-wmf-branch/default.conf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/47/119447/1 diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 8d9b5fc..13ff49c 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -99,6 +99,7 @@ 'PdfHandler', 'Poem', 'PoolCounter', + 'Popups', 'ProofreadPage', 'Quiz', 'RandomRootPage', -- To view, visit https://gerrit.wikimedia.org/r/119447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I848bb9c85bc0374655fe2105de680fcc56b3dbeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Spage sp...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use libvmod-header to set GeoIP cookie - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119448
Change subject: Use libvmod-header to set GeoIP cookie
..
Use libvmod-header to set GeoIP cookie
Depends on RT 7066
Change-Id: I71644f44167f4fc72f4f595bd50eb771f702085a
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 3 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/119448/1
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index 9f7942f..4b7e4e5 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -166,18 +166,9 @@
}
if (cookie_out) {
- /*
-* If multiple Set-Cookie headers are set, VRT_GetHdr
will only get the first,
-* but VRT_SetHdr will clobber all of them. Varnish
provides no facility for
-* combining multiple instances of a particular header.
We hack around that
-* by creating a header with a unique name
(Xet-Cookie), and then changing
-* the name to Set-Cookie.
-*/
- VRT_SetHdr(sp, HDR_RESP, \013Xet-Cookie:, cookie_out,
vrt_magic_string_end);
- geo_header = VRT_GetHdr(sp, HDR_RESP,
\013Xet-Cookie:);
- if (geo_header != NULL strncmp(geo_header - 12,
Xet-Cookie: , 12) == 0) {
- *(geo_header - 12) = 'S';
- }
+/* Use libvmod-header to ensure the Set-Cookie header
we are adding does not
+ clobber or manipulate existing cookie headers (if
any). */
+ Vmod_Func_header.append(sp, HDR_RESP,
\013Set-Cookie:, cookie_out, vrt_magic_string_end);
}
}C
}
--
To view, visit https://gerrit.wikimedia.org/r/119448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71644f44167f4fc72f4f595bd50eb771f702085a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] space out page titles and media titles generation on snapshots - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119449
Change subject: space out page titles and media titles generation on snapshots
..
space out page titles and media titles generation on snapshots
Change-Id: I9f1d4d85fce9b87fe99441576824e3791fd24930
---
M modules/snapshot/manifests/dumps/pagetitles.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/119449/1
diff --git a/modules/snapshot/manifests/dumps/pagetitles.pp
b/modules/snapshot/manifests/dumps/pagetitles.pp
index f25a2b4..a4584c0 100644
--- a/modules/snapshot/manifests/dumps/pagetitles.pp
+++ b/modules/snapshot/manifests/dumps/pagetitles.pp
@@ -61,7 +61,7 @@
environment = 'MAILTO=ops-du...@wikimedia.org',
user= $user,
command = cd ${snapshot::dirs::wikiqueriesdir}; python
wikiqueries.py --configfile confs/wq.conf --filenameformat
'{w}-{d}-all-media-titles.gz' --outdir
'${snapshot::dirs::datadir}/public/other/mediatitles/{d}' --query 'select
page_title from page where page_namespace=6;',
-minute = '30',
+minute = '50',
hour= '8',
require =
File[${snapshot::dirs::datadir}/public/other/mediatitles],
}
--
To view, visit https://gerrit.wikimedia.org/r/119449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f1d4d85fce9b87fe99441576824e3791fd24930
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] space out page titles and media titles generation on snapshots - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: space out page titles and media titles generation on snapshots
..
space out page titles and media titles generation on snapshots
Change-Id: I9f1d4d85fce9b87fe99441576824e3791fd24930
---
M modules/snapshot/manifests/dumps/pagetitles.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/pagetitles.pp
b/modules/snapshot/manifests/dumps/pagetitles.pp
index f25a2b4..a4584c0 100644
--- a/modules/snapshot/manifests/dumps/pagetitles.pp
+++ b/modules/snapshot/manifests/dumps/pagetitles.pp
@@ -61,7 +61,7 @@
environment = 'MAILTO=ops-du...@wikimedia.org',
user= $user,
command = cd ${snapshot::dirs::wikiqueriesdir}; python
wikiqueries.py --configfile confs/wq.conf --filenameformat
'{w}-{d}-all-media-titles.gz' --outdir
'${snapshot::dirs::datadir}/public/other/mediatitles/{d}' --query 'select
page_title from page where page_namespace=6;',
-minute = '30',
+minute = '50',
hour= '8',
require =
File[${snapshot::dirs::datadir}/public/other/mediatitles],
}
--
To view, visit https://gerrit.wikimedia.org/r/119449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f1d4d85fce9b87fe99441576824e3791fd24930
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@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 Popups extension - change (mediawiki/core)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/119450 Change subject: Add Popups extension .. Add Popups extension Bug: 61167 Change-Id: I36d9c1987d2dcab16eb77070d9084d3d2c825a7a --- M .gitmodules A extensions/Popups 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/119450/1 diff --git a/.gitmodules b/.gitmodules index 4f581e4..afde045 100644 --- a/.gitmodules +++ b/.gitmodules @@ -289,6 +289,9 @@ [submodule extensions/PoolCounter] path = extensions/PoolCounter url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PoolCounter.git +[submodule extensions/Popups] + path = extensions/Popups + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Popups.git [submodule extensions/ProofreadPage] path = extensions/ProofreadPage url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ProofreadPage.git diff --git a/extensions/Popups b/extensions/Popups new file mode 16 index 000..89868d2 --- /dev/null +++ b/extensions/Popups +Subproject commit 89868d2e182772c499787ed516020598f28d1087 -- To view, visit https://gerrit.wikimedia.org/r/119450 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36d9c1987d2dcab16eb77070d9084d3d2c825a7a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf18 Gerrit-Owner: Spage sp...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta cluster MemcachedPeclBagOStuff: use PHP serialization - change (operations/mediawiki-config)
Ori.livneh has submitted this change and it was merged. Change subject: Beta cluster MemcachedPeclBagOStuff: use PHP serialization .. Beta cluster MemcachedPeclBagOStuff: use PHP serialization The PECL memcache client stores the serialization format of each cached value in the flags bitfield that accompanies each value. When it gets an item, the client will use the value of that flag to determine which decoder to use. In other words, the serializer option only determines how newly-set values are encoded. HHVM does not support igbinary serialization, and Aaron's casual testing indicated that the savings provided by igbinary were minimal. So it makes sense to switch back to PHP serialization, which is supported by HHVM. There should be no substantial impact on the beta cluster: all the keys that are currently in the cache will continue to be readable. Change-Id: I46a9d180bfa5f954a7c793e6fdb8b1c7b19cca3a --- M wmf-config/mc-labs.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ori.livneh: Looks good to me, approved Aaron Schulz: Looks good to me, but someone else must approve diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php index 80f73e4..6011ca2 100644 --- a/wmf-config/mc-labs.php +++ b/wmf-config/mc-labs.php @@ -24,7 +24,7 @@ # pmtpa $wgObjectCaches['beta-memcached-pmtpa'] = array( 'class' = 'MemcachedPeclBagOStuff', - 'serializer' = 'igbinary', + 'serializer' = 'php', 'persistent' = false, 'servers'= array( 0 = '10.4.1.86:11211', # deployment-memc0.pmtpa @@ -36,7 +36,7 @@ # eqiad $wgObjectCaches['beta-memcached-eqiad'] = array( 'class' = 'MemcachedPeclBagOStuff', - 'serializer' = 'igbinary', + 'serializer' = 'php', 'persistent' = false, 'servers'= array( 0 = '10.68.16.14:11211', # deployment-memc2.eqiad -- To view, visit https://gerrit.wikimedia.org/r/119411 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46a9d180bfa5f954a7c793e6fdb8b1c7b19cca3a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr 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] Add Popups extension - change (mediawiki/core)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/119451 Change subject: Add Popups extension .. Add Popups extension This won't be used in any wikis running 1.23wmf17, but https://wikitech.wikimedia.org/wiki/How_to_deploy_code#Case_1d:_new_extension says add it to this branch anyway. Bug: 61167 Change-Id: I3c91badd1c025c98f073be8bf4c45f8163644550 --- M .gitmodules A extensions/Popups 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/119451/1 diff --git a/.gitmodules b/.gitmodules index 41c7a42..f0154cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -295,6 +295,9 @@ [submodule extensions/PoolCounter] path = extensions/PoolCounter url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PoolCounter.git +[submodule extensions/Popups] + path = extensions/Popups + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Popups.git [submodule extensions/ProofreadPage] path = extensions/ProofreadPage url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ProofreadPage.git diff --git a/extensions/Popups b/extensions/Popups new file mode 16 index 000..89868d2 --- /dev/null +++ b/extensions/Popups +Subproject commit 89868d2e182772c499787ed516020598f28d1087 -- To view, visit https://gerrit.wikimedia.org/r/119451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c91badd1c025c98f073be8bf4c45f8163644550 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf17 Gerrit-Owner: Spage sp...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore generic::upstart_job parameters - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Restore generic::upstart_job parameters
..
Restore generic::upstart_job parameters
The lint of the 'generic' module caused the parameters passed to
generic::upstart_job() to be checked as boolean instead of the string as
they used to be.
The parent call have not been updated and are still passing the boolean
as string which cause the condition to never be matched.
This patch let the define to recognize string and boolean values.
Regression introduced by: 4887dc90
https://gerrit.wikimedia.org/r/#/c/107037/
Change-Id: I03363419c238b696f83b636dc84a79e6a95436d1
---
M modules/generic/manifests/upstart_job.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/generic/manifests/upstart_job.pp
b/modules/generic/manifests/upstart_job.pp
index cd20c4c..1184987 100644
--- a/modules/generic/manifests/upstart_job.pp
+++ b/modules/generic/manifests/upstart_job.pp
@@ -8,7 +8,7 @@
target = '/lib/init/upstart-job',
}
-if $install == true {
+if $install == true or $install == 'true' {
file { /etc/init/${title}.conf:
owner= 'root',
group = 'root',
@@ -17,7 +17,7 @@
}
}
-if $start == true {
+if $start == true or $start == 'true' {
exec { start ${title}:
require = File[/etc/init/${title}.conf],
subscribe = File[/etc/init/${title}.conf],
--
To view, visit https://gerrit.wikimedia.org/r/118714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03363419c238b696f83b636dc84a79e6a95436d1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Guido.iaquinti guido.iaqui...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.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] Don't render empty listviews for qualifiers - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119452
Change subject: Don't render empty listviews for qualifiers
..
Don't render empty listviews for qualifiers
This is related to bug 62527.
Change-Id: I85c7953f372c2c64fac183abb12360d4a1cdaff1
---
M repo/includes/ClaimHtmlGenerator.php
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/52/119452/1
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 33e399d..d3f8f80 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -157,9 +157,7 @@
);
}
- return wfTemplate( 'wb-listview',
- $snaklistviewsHtml
- );
+ return $this-wrapInListview( $snaklistviewsHtml );
}
/**
@@ -175,13 +173,15 @@
$referencesHtml .= $this-getHtmlForReference(
$reference );
}
- if( $referencesHtml !== '' ) {
- $referencesHtml = wfTemplate( 'wb-listview',
- $referencesHtml
- );
- }
+ return $this-wrapInListview( $referencesHtml );
+ }
- return $referencesHtml;
+ private function wrapInListview( $listviewContent ) {
+ if( $listviewContent !== '' ) {
+ return wfTemplate( 'wb-listview', $listviewContent );
+ } else {
+ return '';
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/119452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85c7953f372c2c64fac183abb12360d4a1cdaff1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use different key for memckey - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Use different key for memckey .. Use different key for memckey Change-Id: Iee00180c9b356a510a28000203ac06f757822114 --- M includes/ResourceLoaderULSModule.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, but someone else must approve Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ResourceLoaderULSModule.php b/includes/ResourceLoaderULSModule.php index c60acb3..de625d9 100644 --- a/includes/ResourceLoaderULSModule.php +++ b/includes/ResourceLoaderULSModule.php @@ -71,7 +71,7 @@ // cache the hash per language to avoid updating the timestamp when // different languages are being requested. $key = wfMemcKey( - 'resourceloader', + 'uls', 'modulemodifiedhash', $this-getName(), $languageCode -- To view, visit https://gerrit.wikimedia.org/r/118433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee00180c9b356a510a28000203ac06f757822114 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl 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 --rewrite-blacklist after adding --exit-unexpected - change (mediawiki...parsoid)
Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119453
Change subject: Fix --rewrite-blacklist after adding --exit-unexpected
..
Fix --rewrite-blacklist after adding --exit-unexpected
finishHandler called reportFailure in a never-taken code path before
--exit-unexpected started using err to signal an unexpected result.
This resulted in duplicated reports.
Change-Id: Ie62a6b548929f1642b3cf862d1f44e6c002d590c
---
M tests/parserTests.js
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/53/119453/1
diff --git a/tests/parserTests.js b/tests/parserTests.js
index 635a399..dd68349 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -835,12 +835,6 @@
// Build a list of tasks for this test that will be passed to
async.waterfall
var finishHandler = function ( err, res ) {
- if ( err ) {
- options.reportFailure( item.title, item.comments,
item.options,
- options, null, null, false,
- true, mode, err, item );
- }
-
for ( i = 0; i extensions.length; i++ ) {
this.env.conf.wiki.removeExtensionTag( extensions[i] );
}
--
To view, visit https://gerrit.wikimedia.org/r/119453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie62a6b548929f1642b3cf862d1f44e6c002d590c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil marc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Git::clone: correct onlyif checks - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119454
Change subject: Git::clone: correct onlyif checks
..
Git::clone: correct onlyif checks
The exit status of 'find' is 0 if no problems were encountered executing the
search. The number of results have no bearing on it. '-print -quit' (both GNU
extensions) will cause find to print the first match and terminate the search;
grep '' checks if there was a match at all.
Change-Id: If6efa9bc17e2a78744cb2ad9a3c42fb962348834
---
M modules/git/manifests/clone.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/119454/1
diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index f096168..9a728c1 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -152,7 +152,7 @@
exec { git_clone_${title}_set_group_owner:
command = chgrp -R '${group}' '${directory}',
-onlyif = find '${directory}' ! -group '${group}',
+onlyif = find '${directory}' ! -group '${group}' -print
-quit | grep '',
cwd = $directory,
require =
Exec[git_clone_${title}_configure_shared_repository],
notify = Exec[git_clone_${title}_group_writable],
@@ -160,7 +160,7 @@
exec { git_clone_${title}_group_writable:
command = find '${directory}' ! -perm -g=wX,o= -exec
chmod g+wX,o= '{}' ';',
-onlyif = find '${directory}' ! -perm -g=wX,o=,
+onlyif = find '${directory}' ! -perm -g=wX,o= -print
-quit | grep '',
cwd = $directory,
require = Exec[git_clone_${title}_set_group_owner],
notify = Exec[git_clone_${title}_sgid_bit],
@@ -168,7 +168,7 @@
exec { git_clone_${title}_sgid_bit:
command = find '${directory}' -mindepth 1 -type d -and !
-perm -g+s -exec chmod g+s '{}' ';',
-onlyif = find '${directory}' -mindepth 1 -type d -and !
-perm -g+s,
+onlyif = find '${directory}' -mindepth 1 -type d -and !
-perm -g+s -print -quit | grep '',
cwd = $directory,
require = Exec[git_clone_${title}_group_writable],
}
--
To view, visit https://gerrit.wikimedia.org/r/119454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6efa9bc17e2a78744cb2ad9a3c42fb962348834
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] applicationserver: don't set beta's twemproxy to false - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119455
Change subject: applicationserver: don't set beta's twemproxy to false
..
applicationserver: don't set beta's twemproxy to false
It's not accomplishing anything anyway, since mediawiki is included
elsehwere; twemproxy is in fact already provisioned on labs hosts.
Change-Id: Ieffec56b7328b5d52da4e043512bba296701d1d0
---
M manifests/role/applicationserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/119455/1
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index 6dcfbc4..d11d434 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -74,7 +74,7 @@
if $::realm == 'labs' {
# MediaWiki configuration specific to labs instances
('beta' project)
- class { mediawiki: twemproxy = false }
+ include mediawiki
if $::site == 'pmtpa' {
# Umount /dev/vdb from /mnt ...
--
To view, visit https://gerrit.wikimedia.org/r/119455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieffec56b7328b5d52da4e043512bba296701d1d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] Git::clone: correct onlyif checks - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Git::clone: correct onlyif checks
..
Git::clone: correct onlyif checks
The exit status of 'find' is 0 if no problems were encountered executing the
search. The number of results have no bearing on it. '-print -quit' (both GNU
extensions) will cause find to print the first match and terminate the search;
grep '' checks if there was a match at all.
Change-Id: If6efa9bc17e2a78744cb2ad9a3c42fb962348834
---
M modules/git/manifests/clone.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index f096168..9a728c1 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -152,7 +152,7 @@
exec { git_clone_${title}_set_group_owner:
command = chgrp -R '${group}' '${directory}',
-onlyif = find '${directory}' ! -group '${group}',
+onlyif = find '${directory}' ! -group '${group}' -print
-quit | grep '',
cwd = $directory,
require =
Exec[git_clone_${title}_configure_shared_repository],
notify = Exec[git_clone_${title}_group_writable],
@@ -160,7 +160,7 @@
exec { git_clone_${title}_group_writable:
command = find '${directory}' ! -perm -g=wX,o= -exec
chmod g+wX,o= '{}' ';',
-onlyif = find '${directory}' ! -perm -g=wX,o=,
+onlyif = find '${directory}' ! -perm -g=wX,o= -print
-quit | grep '',
cwd = $directory,
require = Exec[git_clone_${title}_set_group_owner],
notify = Exec[git_clone_${title}_sgid_bit],
@@ -168,7 +168,7 @@
exec { git_clone_${title}_sgid_bit:
command = find '${directory}' -mindepth 1 -type d -and !
-perm -g+s -exec chmod g+s '{}' ';',
-onlyif = find '${directory}' -mindepth 1 -type d -and !
-perm -g+s,
+onlyif = find '${directory}' -mindepth 1 -type d -and !
-perm -g+s -print -quit | grep '',
cwd = $directory,
require = Exec[git_clone_${title}_group_writable],
}
--
To view, visit https://gerrit.wikimedia.org/r/119454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6efa9bc17e2a78744cb2ad9a3c42fb962348834
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@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] Simplify wb-snak template, pass template options in JS - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119457
Change subject: Simplify wb-snak template, pass template options in JS
..
Simplify wb-snak template, pass template options in JS
This removes an ugly $1 class in JS-rendered claims. It's related to bug 62527.
Change-Id: Ie030fc7e2a4ff6b840c02fe1c7ab75c65b7f13bf
---
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M lib/resources/templates.php
M repo/includes/ClaimHtmlGenerator.php
3 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/57/119457/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index db7e3fa..5159d05 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -56,6 +56,7 @@
*/
options: {
template: 'wb-snak',
+ templateParams: [ '', '', '' ],
templateShortCuts: {
'$property': '.wb-snak-property',
'$snakValue': '.wb-snak-value',
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 655ac33..0f9695f 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -111,8 +111,8 @@
div class=wb-snak-property dir=auto$2/div
/div
div class=wb-snak-value-container dir=auto
- div class=wb-snak-typeselector$3/div
- div class=wb-snak-value$4/div
+ div class=wb-snak-typeselector/div
+ div class=wb-snak-value$3/div
/div
/div
HTML;
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 33e399d..f4af15d 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -70,7 +70,6 @@
'', // Link to property. NOTE: we don't display this
ever (instead, we generate it on
// Claim group level) If this was a public
function, this should be generated
// anyhow since important when displaying a
Claim on its own.
- '', // type selector, JS only
( $formattedValue === '' ) ? 'nbsp;' : $formattedValue
);
@@ -254,7 +253,6 @@
'wb-snakview',
// Display property link only once for snaks featuring
the same property:
$propertyLink,
- '',
( $snak-getType() === 'value' ) ?
$this-getFormattedSnakValue( $snak ) : ''
);
}
--
To view, visit https://gerrit.wikimedia.org/r/119457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie030fc7e2a4ff6b840c02fe1c7ab75c65b7f13bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Git::clone: set core.sharedRepository=group for shared repos - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119458
Change subject: Git::clone: set core.sharedRepository=group for shared repos
..
Git::clone: set core.sharedRepository=group for shared repos
Fixes an omission of Iace8ded93.
Change-Id: I4f61a922dad05457e78a2e783354f9b44cf463a8
---
M modules/git/manifests/clone.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/119458/1
diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index 9a728c1..0d0f308 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -106,7 +106,7 @@
}
if $shared {
-$shared_arg = '-c core.sharedRepository=066'
+$shared_arg = '-c core.sharedRepository=group'
$git = 'umask 002; /usr/bin/git'
} else {
$shared_arg = ''
--
To view, visit https://gerrit.wikimedia.org/r/119458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f61a922dad05457e78a2e783354f9b44cf463a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] Git::clone: set core.sharedRepository=group for shared repos - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Git::clone: set core.sharedRepository=group for shared repos
..
Git::clone: set core.sharedRepository=group for shared repos
Fixes an omission of Iace8ded93.
Change-Id: I4f61a922dad05457e78a2e783354f9b44cf463a8
---
M modules/git/manifests/clone.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index 9a728c1..0d0f308 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -106,7 +106,7 @@
}
if $shared {
-$shared_arg = '-c core.sharedRepository=066'
+$shared_arg = '-c core.sharedRepository=group'
$git = 'umask 002; /usr/bin/git'
} else {
$shared_arg = ''
--
To view, visit https://gerrit.wikimedia.org/r/119458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f61a922dad05457e78a2e783354f9b44cf463a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@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] Remove useless and unused wb-last class - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119459
Change subject: Remove useless and unused wb-last class
..
Remove useless and unused wb-last class
Again, related to bug 62527.
Change-Id: I95d2ae96349a0efb7c3767a96c73f1f2f8f38570
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/templates.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
M repo/includes/ClaimHtmlGenerator.php
5 files changed, 13 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/59/119459/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 2b811a7..752ff79 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -73,10 +73,9 @@
options: {
template: 'wb-claim',
templateParams: [
- function() { // class='wb-claim-$2'
+ function() { // class='wb-claim-$1'
return ( this._claim this._claim.getGuid() )
|| 'new';
},
- 'wb-last', // class: wb-first|wb-last
'', // .wb-claim-mainsnak
'' // Qualifiers
],
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index ed45f86..1dc831a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -24,7 +24,6 @@
options: {
template: 'wb-statement',
templateParams: [
- 'wb-last', // class: wb-first|wb-last
'', // Rank selector
function() { // class='wb-claim-$2'
return ( this._claim this._claim.getGuid() )
|| 'new';
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 655ac33..a26b8b5 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -94,11 +94,11 @@
$templates['wb-claim'] =
HTML
-div class=wb-claim wb-claim-$1 $2
+div class=wb-claim wb-claim-$1
div class=wb-claim-mainsnak dir=auto
- $3 !-- wb-snak (Main Snak) --
+ $2 !-- wb-snak (Main Snak) --
/div
- div class=wb-claim-qualifiers$4/div
+ div class=wb-claim-qualifiers$3/div
/div
HTML;
@@ -121,18 +121,18 @@
// the non-JS toolbar to attach to. This parameter should be removed.
$templates['wb-statement'] =
HTML
-div class=wb-statement wb-statementview $1
- div class=wb-statement-rank$2/div
- div class=wb-claim wb-claim-$3
+div class=wb-statement wb-statementview
+ div class=wb-statement-rank$1/div
+ div class=wb-claim wb-claim-$2
div class=wb-claim-mainsnak dir=auto
- $4 !-- wb-snak (Main Snak) --
+ $3 !-- wb-snak (Main Snak) --
/div
- div class=wb-claim-qualifiers
wb-statement-qualifiers$5/div
+ div class=wb-claim-qualifiers
wb-statement-qualifiers$4/div
/div
- $6 !-- wikibase-toolbar --
- div class=wb-statement-references-heading$7/div
+ $5 !-- wikibase-toolbar --
+ div class=wb-statement-references-heading$6/div
div class=wb-statement-references
- $8 !-- [0,*] wb-referenceview --
+ $7 !-- [0,*] wb-referenceview --
/div
/div
HTML;
diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
index 45d887e..074e0b1 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
@@ -25,7 +25,7 @@
entityStore: entityStore
};
- return mw.template('wb-claim', 'new', 'wb-last', '', '')
+ return mw.template('wb-claim', 'new', '', '')
.addClass( 'test_claimview' )
.claimview( options );
}
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 33e399d..cc935b3 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -125,7 +125,6 @@
// @todo: Use 'wb-claim' or 'wb-statement' template accordingly
// @todo: get rid of usage of global wfTemplate function
$claimHtml = wfTemplate( 'wb-statement',
-
[MediaWiki-commits] [Gerrit] Unify coding style of jQuery( 'element' ) calls - change (mediawiki/core)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119460
Change subject: Unify coding style of jQuery( 'element' ) calls
..
Unify coding style of jQuery( 'element' ) calls
According to jQuery and our MediaWiki style guide all kinds of
$( 'element' )
$( 'element/' )
$( 'element /' )
$( 'element/element' )
are identical. So yes, all this patch does is removing characters
that are ignored anyway. Using the same style everywhere makes the
code easier to read and understand and may save a few bytes when it
is gzipped.
The current core/resources/ folder contains 148 jQuery calls of
that kind. Only this file (plus some jQuery plugins I don't want to
touch) do not use the most simple element style.
Plus:
* Added some line breaks.
* Fixed broken inline documentation.
Change-Id: I080716f21f2ab95164a9ca241a4ce4fc351e0b55
---
M resources/mediawiki/mediawiki.jqueryMsg.js
1 file changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/119460/1
diff --git a/resources/mediawiki/mediawiki.jqueryMsg.js
b/resources/mediawiki/mediawiki.jqueryMsg.js
index d7d90f4..40e6039 100644
--- a/resources/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/mediawiki/mediawiki.jqueryMsg.js
@@ -89,7 +89,7 @@
* Decodes the main HTML entities, those encoded by mw.html.escape.
*
* @private
-* @param {string} encode Encoded string
+* @param {string} encoded Encoded string
* @return {string} String with those entities decoded
*/
function decodePrimaryHtmlEntities( encoded ) {
@@ -108,7 +108,7 @@
* If there was an error parsing, return the key and the error message
(wrapped in jQuery). This should put the error right into
* the interface, without causing the page to halt script execution,
and it hopefully should be clearer how to fix it.
* @private
-* @param {Object} parser options
+* @param {Object} options Parser options
* @return {Function}
* @return {Array} return.args First element is the key, replacements
may be in array in 2nd element, or remaining elements.
* @return {jQuery} return.return
@@ -721,7 +721,8 @@
if ( parsedCloseTagResult === null ) {
// Closing tag failed. Return the
start tag and contents.
- return [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ].concat( parsedHtmlContents );
+ return [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ]
+ .concat( parsedHtmlContents );
}
endCloseTagPos = pos;
@@ -729,7 +730,8 @@
wrappedAttributes = parsedOpenTagResult[2];
attributes = wrappedAttributes.slice( 1 );
if ( isAllowedHtml( startTagName, endTagName,
attributes ) ) {
- result = [ 'HTMLELEMENT', startTagName,
wrappedAttributes ].concat( parsedHtmlContents );
+ result = [ 'HTMLELEMENT', startTagName,
wrappedAttributes ]
+ .concat( parsedHtmlContents );
} else {
// HTML is not allowed, so contents
will remain how
// it was, while HTML markup at this
level will be
@@ -743,7 +745,8 @@
// parsed HTML link.
//
// Concatenate everything from the tag,
flattening the contents.
- result = [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ].concat( parsedHtmlContents, input.substring(
startCloseTagPos, endCloseTagPos ) );
+ result = [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ]
+ .concat( parsedHtmlContents,
input.substring( startCloseTagPos, endCloseTagPos ) );
}
return result;
@@ -851,7 +854,6 @@
curlyBraceTransformExpressionLiteral
] );
-
/**
* Starts the parse
*
@@ -883,6 +885,7 @@
}
};
+
/**
* htmlEmitter - object which primarily exists to emit HTML from parser
ASTs
*/
@@ -894,10 +897,11 @@
return val;
};
} );
+
[MediaWiki-commits] [Gerrit] Unify coding style of jQuery( 'element' ) calls - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Unify coding style of jQuery( 'element' ) calls
..
Unify coding style of jQuery( 'element' ) calls
According to jQuery and our MediaWiki style guide all kinds of
$( 'element' )
$( 'element/' )
$( 'element /' )
$( 'element/element' )
are identical. So yes, all this patch does is removing characters
that are ignored anyway. Using the same style everywhere makes the
code easier to read and understand and may save a few bytes when it
is gzipped.
The current core/resources/ folder contains 148 jQuery calls of
that kind. Only this file (plus some jQuery plugins I don't want to
touch) do not use the most simple element style.
Plus:
* Added some line breaks.
* Fixed broken inline documentation.
Change-Id: I080716f21f2ab95164a9ca241a4ce4fc351e0b55
---
M resources/mediawiki/mediawiki.jqueryMsg.js
1 file changed, 15 insertions(+), 9 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki/mediawiki.jqueryMsg.js
b/resources/mediawiki/mediawiki.jqueryMsg.js
index d7d90f4..40e6039 100644
--- a/resources/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/mediawiki/mediawiki.jqueryMsg.js
@@ -89,7 +89,7 @@
* Decodes the main HTML entities, those encoded by mw.html.escape.
*
* @private
-* @param {string} encode Encoded string
+* @param {string} encoded Encoded string
* @return {string} String with those entities decoded
*/
function decodePrimaryHtmlEntities( encoded ) {
@@ -108,7 +108,7 @@
* If there was an error parsing, return the key and the error message
(wrapped in jQuery). This should put the error right into
* the interface, without causing the page to halt script execution,
and it hopefully should be clearer how to fix it.
* @private
-* @param {Object} parser options
+* @param {Object} options Parser options
* @return {Function}
* @return {Array} return.args First element is the key, replacements
may be in array in 2nd element, or remaining elements.
* @return {jQuery} return.return
@@ -721,7 +721,8 @@
if ( parsedCloseTagResult === null ) {
// Closing tag failed. Return the
start tag and contents.
- return [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ].concat( parsedHtmlContents );
+ return [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ]
+ .concat( parsedHtmlContents );
}
endCloseTagPos = pos;
@@ -729,7 +730,8 @@
wrappedAttributes = parsedOpenTagResult[2];
attributes = wrappedAttributes.slice( 1 );
if ( isAllowedHtml( startTagName, endTagName,
attributes ) ) {
- result = [ 'HTMLELEMENT', startTagName,
wrappedAttributes ].concat( parsedHtmlContents );
+ result = [ 'HTMLELEMENT', startTagName,
wrappedAttributes ]
+ .concat( parsedHtmlContents );
} else {
// HTML is not allowed, so contents
will remain how
// it was, while HTML markup at this
level will be
@@ -743,7 +745,8 @@
// parsed HTML link.
//
// Concatenate everything from the tag,
flattening the contents.
- result = [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ].concat( parsedHtmlContents, input.substring(
startCloseTagPos, endCloseTagPos ) );
+ result = [ 'CONCAT', input.substring(
startOpenTagPos, endOpenTagPos ) ]
+ .concat( parsedHtmlContents,
input.substring( startCloseTagPos, endCloseTagPos ) );
}
return result;
@@ -851,7 +854,6 @@
curlyBraceTransformExpressionLiteral
] );
-
/**
* Starts the parse
*
@@ -883,6 +885,7 @@
}
};
+
/**
* htmlEmitter - object which primarily exists to emit HTML from parser
ASTs
*/
@@ -894,10 +897,11 @@
return val;
};
} );
+
/**
* (We put
[MediaWiki-commits] [Gerrit] Link to existing login help page by default from helplogin-url - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Link to existing login help page by default from helplogin-url
..
Link to existing login help page by default from helplogin-url
Detailed rationale discussed on bugzilla, bug 53888 and parent,
where consensus on the design was gained.
Using https link per Brion et al. in comments and bug 54835,
with new keys for the messages in order to avoid any conflict
with existing messages. (The translations of the removed messages
will be automatically removed by localisation updates.)
https://www.mediawiki.org/wiki/Help:Logging_in was improved by Lloffiwr
and now also marked for translation. The link is ready for future
translations thanks to the use of the standard Special:MyLanguage, hence
the message is made ignored to allow customisations only locally.
Bug: 53888
Change-Id: I8cefafbcd3bd1d6a03cec7cf1d0efdf607fec21d
---
M includes/templates/Userlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
5 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
Objections:
Swalling: There's a problem with this change, please improve
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 68097e3..f1b9f0e 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -153,9 +153,18 @@
) );
?
/div
-
div id=mw-userlogin-help
- ?php echo $this-getMsg( 'userlogin-helplink'
)-parse(); ?
+ ?php
+ echo Html::element(
+ 'a',
+ array(
+ 'href' =
Skin::makeInternalOrExternalUrl(
+ wfMessage(
'helplogin-url' )-inContentLanguage()-text()
+ ),
+ ),
+ $this-getMsg( 'userlogin-helplink2'
)-text()
+ );
+ ?
/div
?php if ( $this-haveData( 'createOrLoginHref' ) ) { ?
?php if ( $this-data['loggedin'] ) { ?
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index efccdd9..a53d831 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1127,8 +1127,8 @@
'gotaccountlink' = 'Log in',
'userlogin-resetlink' = 'Forgotten your login details?',
'userlogin-resetpassword-link'= 'Forgot your password?',
-'helplogin-url' = 'Help:Logging in',
-'userlogin-helplink' = '[[{{MediaWiki:helplogin-url}}|Help with
logging in]]',
+'helplogin-url' =
'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Logging_in',
+'userlogin-helplink2' = 'Help with logging in',
'userlogin-loggedin' = 'You are already logged in as
{{GENDER:$1|$1}}.
Use the form below to log in as another user.',
'userlogin-createanother' = 'Create another account',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 50070df..c159536 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1345,12 +1345,11 @@
userlogin-resetpassword-link may have to be shorter than the old
{{msg-mw|userlogin-resetlink}}.
{{Identical|Forgot your password}}',
-'helplogin-url' = '{{doc-important|Do not translate the namespace name
codeHelp/code.}}
-Used as name of the page that provides information about logging into the wiki.
+'helplogin-url' = '{{doc-important|Do not translate the target page,
Special:MyLanguage handles it.}}
+Defines the URL to the page that provides information about logging into the
wiki.
-Used as a link target in the message {{msg-mw|Userlogin-helplink}}.',
-'userlogin-helplink' = '{{doc-important|Do not change
codenowiki{{MediaWiki:helplogin-url}}/nowiki/code.}}
-Wikitext linking to login help.
+Used as a link target for the link with label {{msg-mw|userlogin-helplink2}};
can be locally customised to be an URL or local page title.',
+'userlogin-helplink2' = 'Label for a link to login help.
See example: [[Special:UserLogin]]
diff --git a/maintenance/language/messageTypes.inc
b/maintenance/language/messageTypes.inc
index 142727c..e9d60aa 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -267,6 +267,7 @@
'today-at',
'redirect-text',
[MediaWiki-commits] [Gerrit] Set serializer to 'php' for production memcache - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/119461 Change subject: Set serializer to 'php' for production memcache .. Set serializer to 'php' for production memcache The rationale is explained in I46a9d180b, which made the same switch for labs. Things appear to work well on labs. Change-Id: I6f414061810efda9ba251222a67053c2f4192432 --- M wmf-config/mc.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/61/119461/1 diff --git a/wmf-config/mc.php b/wmf-config/mc.php index 7248a99..a38109f 100644 --- a/wmf-config/mc.php +++ b/wmf-config/mc.php @@ -16,7 +16,7 @@ # from the deploy host to make it live. $wgObjectCaches['memcached-pecl'] = array( 'class' = 'MemcachedPeclBagOStuff', - 'serializer' = 'igbinary', + 'serializer' = 'php', 'persistent' = false, 'servers'= array( '127.0.0.1' ), 'server_failure_limit' = 1e9, @@ -26,7 +26,7 @@ /*** No Twemproxy $wgObjectCaches['memcached-pecl'] = array( 'class' = 'MemcachedPeclBagOStuff', - 'serializer' = 'igbinary', + 'serializer' = 'php', 'servers'= array( '10.64.0.180', '10.64.0.181', -- To view, visit https://gerrit.wikimedia.org/r/119461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f414061810efda9ba251222a67053c2f4192432 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 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] Beutify JS in module - change (mediawiki...ContentTranslation)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119462
Change subject: Beutify JS in module
..
Beutify JS in module
* Used js-beautify tool.
* JS coding standards as per MediaWiki.
Change-Id: I1e92efdf70ff47e0c31ca7ffc1098dea5bac0aee
---
M modules/base/ext.cx.base.js
M modules/base/ext.cx.datamanager.js
M modules/header/ext.cx.header.js
M modules/header/ext.cx.header.render.js
M modules/header/ext.cx.progressbar.js
M modules/source/ext.cx.source.js
M modules/tools/ext.cx.tools.helpmessage.js
M modules/tools/ext.cx.tools.js
M modules/translation/ext.cx.translation.js
9 files changed, 76 insertions(+), 86 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/62/119462/1
diff --git a/modules/base/ext.cx.base.js b/modules/base/ext.cx.base.js
index b612fb0..b3c5c18 100644
--- a/modules/base/ext.cx.base.js
+++ b/modules/base/ext.cx.base.js
@@ -17,7 +17,7 @@
* @class
*/
function ContentTranslation( element, options ) {
- this.$container = $( element );
+ this.$container = $( element );
this.$translation = null;
this.$header = null;
this.$source = null;
@@ -46,12 +46,12 @@
.append(
$( 'div' ).addClass( 'cx-widget__header' ),
$( 'div' ).addClass( 'cx-widget__columns' )
- .append(
- $( 'div' ).addClass(
'cx-column cx-column--source' ),
- $( 'div' ).addClass(
'cx-column cx-column--translation' ),
- $( 'div' ).addClass(
'cx-column cx-column--tools' )
- )
- );
+ .append(
+ $( 'div' ).addClass( 'cx-column
cx-column--source' ),
+ $( 'div' ).addClass( 'cx-column
cx-column--translation' ),
+ $( 'div' ).addClass( 'cx-column
cx-column--tools' )
+ )
+ );
this.$container.append( $content );
this.$header = this.$container.find( '.cx-widget__header' );
@@ -66,13 +66,11 @@
data = $this.data( 'cx' );
if ( !data ) {
- $this.data( 'cx',
- ( data = new ContentTranslation( this,
options ) )
- );
+ $this.data( 'cx', ( data = new
ContentTranslation( this, options ) ) );
}
if ( typeof options === 'string' ) {
- data[options].call( $this );
+ data[ options ].call( $this );
}
} );
};
diff --git a/modules/base/ext.cx.datamanager.js
b/modules/base/ext.cx.datamanager.js
index 450be01..a404c73 100644
--- a/modules/base/ext.cx.datamanager.js
+++ b/modules/base/ext.cx.datamanager.js
@@ -19,7 +19,7 @@
mw.log( '[CX] Connected to server' );
}
- function updateModel( data) {
+ function updateModel( data ) {
mw.log( '[CX] Received data from server' );
mw.cx.data = data;
mw.hook( 'mw.cx.source.ready' ).fire();
diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js
index 9d19472..bd0fa09 100644
--- a/modules/header/ext.cx.header.js
+++ b/modules/header/ext.cx.header.js
@@ -51,13 +51,12 @@
if ( !data ) {
$this.data(
- 'cxHeader',
- ( data = new ContentTranslationHeader(
this, options ) )
+ 'cxHeader', ( data = new
ContentTranslationHeader( this, options ) )
);
}
if ( typeof options === 'string' ) {
- data[options].call( $this );
+ data[ options ].call( $this );
}
} );
};
diff --git a/modules/header/ext.cx.header.render.js
b/modules/header/ext.cx.header.render.js
index 618609b..cd29575 100644
--- a/modules/header/ext.cx.header.render.js
+++ b/modules/header/ext.cx.header.render.js
@@ -15,35 +15,35 @@
this.$container.addClass( 'cx-header' );
this.$container.append(
$( 'div' )
- .addClass( 'cx-header__logo' ),
+ .addClass(
[MediaWiki-commits] [Gerrit] shared.css: Canonicalize and simplify background image rules - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119463
Change subject: shared.css: Canonicalize and simplify background image rules
..
shared.css: Canonicalize and simplify background image rules
* Use the same form as in the LESS mixin:
* Don't embed the PNG version
* Do embed the SVG version
* Use the -webkit- form too
* Add a descriptive comment
* Don't use quotes inside url() syntax
Change-Id: I044a04a321f0dbba7687c2ce1681028ed5cf0ea4
---
M skins/common/shared.css
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/119463/1
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 1657d97..078b26f 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -221,15 +221,15 @@
}
.mw-icon-question {
- /* @embed */
- background: url('images/question-small.png') no-repeat;
/* SVG support using a transparent gradient to guarantee cross-browser
-* compatibility (browsers able to understand gradient syntax support
also SVG)
-* lifted from #pt-login css rule in skins/vector/screen.css */
+* compatibility (browsers able to understand gradient syntax support
also SVG).
+*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
/* @embed */
- background: -webkit-linear-gradient(transparent, transparent),
url('images/question.svg') no-repeat;
+ background-image: url(images/question-small.png);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/question.svg);
/* @embed */
- background: linear-gradient(transparent, transparent),
url('images/question.svg') no-repeat;
+ background-image: linear-gradient(transparent, transparent),
url(images/question.svg);
+ background-repeat: no-repeat;
background-size: 13px 13px;
display: inline-block;
height: 13px;
@@ -484,8 +484,13 @@
/* feed links */
a.feedlink {
- /* @embed */
+ /* SVG support using a transparent gradient to guarantee cross-browser
+* compatibility (browsers able to understand gradient syntax support
also SVG).
+*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
background-image: url(images/feed-icon.png);
+ /* @embed */
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/feed-icon.svg);
+ /* @embed */
background-image: linear-gradient(transparent, transparent),
url(images/feed-icon.svg);
background-position: center left;
background-repeat: no-repeat;
@@ -1046,7 +1051,7 @@
margin-bottom: -8px;
padding: 0 0 0 15px;
/* @embed */
- background-image: url('images/help-question.gif');
+ background-image: url(images/help-question.gif);
background-position: left center;
background-repeat: no-repeat;
cursor: pointer;
@@ -1056,7 +1061,7 @@
}
.mw-help-field-hint:hover {
/* @embed */
- background-image: url('images/help-question-hover.gif');
+ background-image: url(images/help-question-hover.gif);
}
.mw-help-field-data {
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/119463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I044a04a321f0dbba7687c2ce1681028ed5cf0ea4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...SemanticSifter)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119464
Change subject: Consistency tweaks in preparation for adding extension to
translatewiki.net
..
Consistency tweaks in preparation for adding extension to
translatewiki.net
* Add header
* Rephrase description message
* Tweak to message documentation
Change-Id: I63b16c7be4e533328d1495f494ecf98c16f1c782
---
M SemanticSifter.i18n.php
1 file changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticSifter
refs/changes/64/119464/1
diff --git a/SemanticSifter.i18n.php b/SemanticSifter.i18n.php
index b535483..62e7499 100644
--- a/SemanticSifter.i18n.php
+++ b/SemanticSifter.i18n.php
@@ -1,15 +1,28 @@
?php
+/**
+ * Internationalization file for Semantic Sifter extension.
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
$messages = array();
+/** English
+ * @author Kim Eik
+ */
$messages['en'] = array(
- 'semanticsifter-desc' = 'An extension which allows you to sift through
semantic data',
+ 'semanticsifter-desc' = 'Allows to sift through semantic data and
displays the result in a filterable view',
'semanticsifter-button-apply-filter' = 'Apply filter',
'semanticsifter-message-siftlink-params-error' = 'Missing parameters
to siftlink parser function.'
);
+/** Message documentation
+ * @author Kim Eik
+ */
$messages['qqq'] = array(
- 'semanticsifter-desc' = 'Extension description',
+ 'semanticsifter-desc' = '{{desc|name=Semantic
Sifter|url=https://www.mediawiki.org/wiki/Extension:SemanticSifter}}',
'semanticsifter-button-apply-filter' = 'Button which applies filter',
'semanticsifter-message-siftlink-params-error' = 'Message displayed
when error occurs in parameter handling of #siftlink parser function'
-);
\ No newline at end of file
+);
--
To view, visit https://gerrit.wikimedia.org/r/119464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63b16c7be4e533328d1495f494ecf98c16f1c782
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticSifter
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove link to edits with Oversight from Special:Contributions - change (mediawiki...Oversight)
Bartosz Dziewoński has submitted this change and it was merged.
Change subject: Remove link to edits with Oversight from Special:Contributions
..
Remove link to edits with Oversight from Special:Contributions
Core has one for suppression, and there is a script to convert them now.
Bug: 59120
Change-Id: I651143b3456379f92e0f5f4e786652ab6922ca0f
---
M HideRevision.hooks.php
M HideRevision.i18n.php
M HideRevision.php
3 files changed, 1 insertion(+), 24 deletions(-)
Approvals:
Bartosz Dziewoński: Verified; Looks good to me, approved
diff --git a/HideRevision.hooks.php b/HideRevision.hooks.php
index 7b88a63..902d237 100644
--- a/HideRevision.hooks.php
+++ b/HideRevision.hooks.php
@@ -43,26 +43,6 @@
}
/**
-* @param $id
-* @param $nt Title
-* @param $tools
-* @return bool
-*/
- public static function onContributionsToolLinks( $id, $nt, $tools ) {
- global $wgUser;
- if( $wgUser-isAllowed( 'oversight' ) ) {
- $title = SpecialPage::getTitleFor( 'Oversight' );
- $tools[] = Linker::link(
- $title,
- wfMessage( 'hiderevision-link' )-escaped(),
- array(),
- array( 'author' = $nt-getPartialUrl() )
- );
- }
- return true;
- }
-
- /**
* If the user is allowed, installs a tab hook on the skin
* which links to a handy permanent removal thingy.
* @param $id
diff --git a/HideRevision.i18n.php b/HideRevision.i18n.php
index 894abfd..08477bb 100644
--- a/HideRevision.i18n.php
+++ b/HideRevision.i18n.php
@@ -37,8 +37,6 @@
// Tab displayed to allowed users on old revision display
'hiderevision-tab' = 'Hide revision',
- // Displayed on Users contributions
- 'hiderevision-link' = 'hidden user contributions',
// Status errors on action
'hiderevision-norevisions'= 'No revisions specified to delete.',
diff --git a/HideRevision.php b/HideRevision.php
index d8e0c2e..52a267c 100644
--- a/HideRevision.php
+++ b/HideRevision.php
@@ -64,5 +64,4 @@
$wgHooks['ArticleViewHeader'][] = 'HideRevisionHooks::onArticleViewHeader';
$wgHooks['DiffViewHeader'][] = 'HideRevisionHooks::onDiffViewHeader';
$wgHooks['UndeleteShowRevision'][] =
'HideRevisionHooks::onUndeleteShowRevision';
-$wgHooks['ContributionsToolLinks'][] =
'HideRevisionHooks::onContributionsToolLinks';
-$wgHooks['LoadExtensionSchemaUpdates'][] =
'HideRevisionHooks::onLoadExtensionSchemaUpdates';
\ No newline at end of file
+$wgHooks['LoadExtensionSchemaUpdates'][] =
'HideRevisionHooks::onLoadExtensionSchemaUpdates';
--
To view, visit https://gerrit.wikimedia.org/r/117243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I651143b3456379f92e0f5f4e786652ab6922ca0f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Oversight
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make a wb-claim-mainsnak element have a wb-snak instead of b... - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119465
Change subject: Make a wb-claim-mainsnak element have a wb-snak instead of
being one itself
..
Make a wb-claim-mainsnak element have a wb-snak instead of being one itself
This is related to bug 62527.
Change-Id: I32ebe3b33e77c0f06a37e0c0779d6d2280db4f4d
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
2 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/119465/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 2b811a7..66b68db 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -77,11 +77,13 @@
return ( this._claim this._claim.getGuid() )
|| 'new';
},
'wb-last', // class: wb-first|wb-last
- '', // .wb-claim-mainsnak
+ function() {
+ return $( 'div/' );
+ }, // .wb-claim-mainsnak
'' // Qualifiers
],
templateShortCuts: {
- '$mainSnak': '.wb-claim-mainsnak',
+ '$mainSnak': '.wb-claim-mainsnak :first-child',
'$qualifiers': '.wb-claim-qualifiers'
},
value: null,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index ed45f86..a9f915d 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -30,14 +30,16 @@
return ( this._claim this._claim.getGuid() )
|| 'new';
},
'', // TODO: This toolbar placeholder should be removed
from the template.
- '', // .wb-claim-mainsnak
+ function() {
+ return $( 'div/' );
+ }, // .wb-claim-mainsnak
'', // Qualifiers
'', // References heading
'' // List of references
],
templateShortCuts: {
'$rankSelector': '.wb-statement-rank',
- '$mainSnak': '.wb-claim-mainsnak',
+ '$mainSnak': '.wb-claim-mainsnak :first-child',
'$qualifiers': '.wb-statement-qualifiers',
'$refsHeading': '.wb-statement-references-heading',
'$references': '.wb-statement-references'
--
To view, visit https://gerrit.wikimedia.org/r/119465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32ebe3b33e77c0f06a37e0c0779d6d2280db4f4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use this.constructor.super instead of ClassName.super - change (oojs/core)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119466
Change subject: Use this.constructor.super instead of ClassName.super
..
Use this.constructor.super instead of ClassName.super
Change-Id: I716d30c0673cb2e5870944c1b1a88daed6b89daa
---
M src/Factory.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/66/119466/1
diff --git a/src/Factory.js b/src/Factory.js
index efcc765..cdad0db 100644
--- a/src/Factory.js
+++ b/src/Factory.js
@@ -5,7 +5,7 @@
* @constructor
*/
oo.Factory = function OoFactory() {
- oo.Factory.super.call( this );
+ this.constructor.super.call( this );
// Properties
this.entries = [];
--
To view, visit https://gerrit.wikimedia.org/r/119466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I716d30c0673cb2e5870944c1b1a88daed6b89daa
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] don’t concatenate item specific categories - change (mediawiki...GWToolset)
Dan-nl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119467
Change subject: don’t concatenate item specific categories
..
don’t concatenate item specific categories
sometimes the metadata field specified for an item specific category
occurs several times within a metadata record. the application was
concatenating those values into one category entry. the desired goal
is to create a category entry for each occurance.
Change-Id: I6668e250e193df9006049264ca82f7a36f66210f
---
M includes/Handlers/UploadHandler.php
M includes/Models/Metadata.php
2 files changed, 56 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/67/119467/1
diff --git a/includes/Handlers/UploadHandler.php
b/includes/Handlers/UploadHandler.php
index c12caee..a6e3eb0 100644
--- a/includes/Handlers/UploadHandler.php
+++ b/includes/Handlers/UploadHandler.php
@@ -163,17 +163,16 @@
}
/**
-* creates wiki text category entries.
-* these categories represent specific categories for this
-* specific media file rather than global categories
-* that are applied to all of the media files being uploaded.
+* creates wikitext category entries.
+*
+* these categories represent specific categories for a single media
file
+* rather than global categories that are applied to all media files
being
+* uploaded.
*
* @return {null|string}
* the resulting wiki text is filtered
*/
protected function addItemSpecificCategories() {
- $phrase = null;
- $metadata = null;
$result = null;
if ( !empty( $this-user_options['gwtoolset-category-metadata']
) ) {
@@ -181,25 +180,29 @@
for ( $i = 0; $i $category_count; $i += 1 ) {
$phrase = null;
- $metadata = null;
+ $metadata_values = array();
if ( !empty(
$this-user_options['gwtoolset-category-phrase'][$i] ) ) {
- $phrase = Utils::sanitizeString(
$this-user_options['gwtoolset-category-phrase'][$i] ) . ' ';
+ $phrase =
+ Utils::sanitizeString(
+
$this-user_options['gwtoolset-category-phrase'][$i]
+ ) .
+ ' ';
}
if ( !empty(
$this-user_options['gwtoolset-category-metadata'][$i] ) ) {
- $metadata =
-
$this-_Metadata-getConcatenatedField(
+ $metadata_values =
+
$this-_Metadata-getFieldValuesAsArray(
$this-user_options['gwtoolset-category-metadata'][$i]
);
}
- if ( !empty( $metadata ) ) {
+ foreach( $metadata_values as $metadata_value ) {
$result .=
'[[' .
Utils::getNamespaceName( NS_CATEGORY ) .
Utils::stripIllegalCategoryChars( $phrase ) .
-
Utils::stripIllegalCategoryChars( $metadata ) .
+
Utils::stripIllegalCategoryChars( $metadata_value ) .
']]';
}
}
diff --git a/includes/Models/Metadata.php b/includes/Models/Metadata.php
index b8ba785..8d4a343 100644
--- a/includes/Models/Metadata.php
+++ b/includes/Models/Metadata.php
@@ -50,15 +50,15 @@
}
/**
-* locates an element within the metadata and concatenates its values
when there is more than
-* one of the same element within the metadata
+* locates an element within the metadata and concatenates its values
when
+* there is more than one of the same element within the metadata
*
* @todo should we cache the concatenated fields or pre-populate all of
them?
*
-* @param {string}
+* @param {string} $field
*
* @return {null|string}
-* the string is filtered
+* the string is sanitized
*/
public function getConcatenatedField( $field
[MediaWiki-commits] [Gerrit] coredb_mysql: qualify vars - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119468
Change subject: coredb_mysql: qualify vars
..
coredb_mysql: qualify vars
Change-Id: Ie968e39f58eff6410660e9cd2c7a76b8c1e45e4c
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/119468/1
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 92502bd..22c09fd 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -6,7 +6,7 @@
% ia = ipaddress.split('.'); server_id = ia[0] + ia[2] + ia[3]; %
server_id=%= server_id %
-% if read_only == false then -%
+% if @read_only == false then -%
# writes are enabled
read_only = 0
% else %
@@ -21,17 +21,17 @@
skip-external-locking
-% if skip_name_resolve == true then -%
+% if @skip_name_resolve == true then -%
skip-name-resolve
% end -%
-% if mysql_myisam == true then -%
+% if @mysql_myisam == true then -%
myisam-recover = QUICK
key_buffer = 1024M
% else %
key_buffer = 1M
% end -%
-max_allowed_packet = %= mysql_max_allowed_packet %
+max_allowed_packet = %= @mysql_max_allowed_packet %
thread_stack = 192K
thread_cache_size = 300
@@ -46,7 +46,7 @@
#log_queries_not_using_indexes
long_query_time = 0.45
-% if disable_binlogs != true then -%
+% if @disable_binlogs != true then -%
log_bin
log_slave_updates
sync_binlog = 1
@@ -62,7 +62,7 @@
temp-pool
-% if has_variable?(mariadb) and mariadb == true then -%
+% if @mariadb == true then -%
query_cache_type=0
# these were set as compile time defaults in our old 5.1 mysql builds
@@ -113,12 +113,12 @@
# might need to be even higher and innodb_stats_on_metadata=OFF
innodb_stats_sample_pages = 16
-% if has_variable?(mariadb) and mariadb == true then -%
+% if @mariadb == true then -%
# encourage more ref lookups when joining tables with nullable fields
innodb_stats_method = nulls_unequal
% end -%
-% if innodb_file_per_table == true then -%
+% if @innodb_file_per_table == true then -%
innodb_file_per_table
% end -%
@@ -126,17 +126,17 @@
#innodb-autoinc-lock-mode=2
#innodb-locks-unsafe-for-binlog
-% if long_timeouts == true then -%
+% if @long_timeouts == true then -%
interactive_timeout = 129600
wait_timeout = 129600
% end -%
-% if enable_unsafe_locks == true then -%
+% if @enable_unsafe_locks == true then -%
# since no binlogs on this slave, and writes only to intern db's
innodb-locks-unsafe-for-binlog
% end -%
-% if large_slave_trans_retries == true then -%
+% if @large_slave_trans_retries == true then -%
slave_transaction_retries = 4294967295
% end -%
--
To view, visit https://gerrit.wikimedia.org/r/119468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie968e39f58eff6410660e9cd2c7a76b8c1e45e4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: jobQueueAggregator for eqiad - change (operations/mediawiki-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119469
Change subject: beta: jobQueueAggregator for eqiad
..
beta: jobQueueAggregator for eqiad
Change-Id: I85a022151a7609dd74be5ee2d023d61693bb65e3
---
M wmf-config/jobqueue-labs.php
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/69/119469/1
diff --git a/wmf-config/jobqueue-labs.php b/wmf-config/jobqueue-labs.php
index 97b1ca8..acb772f 100644
--- a/wmf-config/jobqueue-labs.php
+++ b/wmf-config/jobqueue-labs.php
@@ -12,13 +12,19 @@
)
);
+if( $wmfDatacenter === 'pmtpa' ) {
+ $jobRedisServer = '10.4.0.83'; # deployment-redisdb
+} else { # eqiad
+ $jobRedisServer = '10.68.16.146'; # deployment-redis01
+}
$wgJobQueueAggregator = array(
'class' = 'JobQueueAggregatorRedis',
- 'redisServer' = '10.4.0.83', # deployment-redisdb
+ 'redisServer' = $jobRedisServer,
'redisConfig' = array(
'connectTimeout' = 1,
'password' = $wmgRedisPassword,
)
);
+unset($jobRedisServer);
} # end safe guard
--
To view, visit https://gerrit.wikimedia.org/r/119469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85a022151a7609dd74be5ee2d023d61693bb65e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: jobQueueAggregator for eqiad - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: beta: jobQueueAggregator for eqiad
..
beta: jobQueueAggregator for eqiad
Change-Id: I85a022151a7609dd74be5ee2d023d61693bb65e3
---
M wmf-config/jobqueue-labs.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/jobqueue-labs.php b/wmf-config/jobqueue-labs.php
index 97b1ca8..acb772f 100644
--- a/wmf-config/jobqueue-labs.php
+++ b/wmf-config/jobqueue-labs.php
@@ -12,13 +12,19 @@
)
);
+if( $wmfDatacenter === 'pmtpa' ) {
+ $jobRedisServer = '10.4.0.83'; # deployment-redisdb
+} else { # eqiad
+ $jobRedisServer = '10.68.16.146'; # deployment-redis01
+}
$wgJobQueueAggregator = array(
'class' = 'JobQueueAggregatorRedis',
- 'redisServer' = '10.4.0.83', # deployment-redisdb
+ 'redisServer' = $jobRedisServer,
'redisConfig' = array(
'connectTimeout' = 1,
'password' = $wmgRedisPassword,
)
);
+unset($jobRedisServer);
} # end safe guard
--
To view, visit https://gerrit.wikimedia.org/r/119469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85a022151a7609dd74be5ee2d023d61693bb65e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use super to call parent methods - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119471
Change subject: Use super to call parent methods
..
Use super to call parent methods
Change-Id: Ie5cc9a194e4c8ae3a7674f8e5ee44adb552ffc0c
---
M src/Dialog.js
M src/widgets/GroupWidget.js
M src/widgets/ItemWidget.js
M src/widgets/MenuWidget.js
M src/widgets/TextInputMenuWidget.js
M src/widgets/ToggleButtonWidget.js
6 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/71/119471/1
diff --git a/src/Dialog.js b/src/Dialog.js
index 33c71af..a3aa3e2 100644
--- a/src/Dialog.js
+++ b/src/Dialog.js
@@ -143,7 +143,7 @@
*/
OO.ui.Dialog.prototype.initialize = function () {
// Parent method
- OO.ui.Window.prototype.initialize.call( this );
+ OO.ui.Dialog.super.prototype.initialize.call( this );
// Properties
this.closeButton = new OO.ui.ButtonWidget( {
@@ -171,7 +171,7 @@
*/
OO.ui.Dialog.prototype.setup = function ( data ) {
// Parent method
- OO.ui.Window.prototype.setup.call( this, data );
+ OO.ui.Dialog.super.prototype.setup.call( this, data );
// Prevent scrolling in top-level window
this.$( window ).on( 'mousewheel', this.onWindowMouseWheelHandler );
@@ -183,7 +183,7 @@
*/
OO.ui.Dialog.prototype.teardown = function ( data ) {
// Parent method
- OO.ui.Window.prototype.teardown.call( this, data );
+ OO.ui.Dialog.super.prototype.teardown.call( this, data );
// Allow scrolling in top-level window
this.$( window ).off( 'mousewheel', this.onWindowMouseWheelHandler );
diff --git a/src/widgets/GroupWidget.js b/src/widgets/GroupWidget.js
index f8be0ad..ca03e7f 100644
--- a/src/widgets/GroupWidget.js
+++ b/src/widgets/GroupWidget.js
@@ -35,7 +35,7 @@
var i, len;
// Parent method
- OO.ui.Widget.prototype.setDisabled.call( this, disabled );
+ OO.ui.GroupWidget.super.prototype.setDisabled.call( this, disabled );
// During construction, #setDisabled is called before the
OO.ui.GroupElement constructor
if ( this.items ) {
diff --git a/src/widgets/ItemWidget.js b/src/widgets/ItemWidget.js
index 919da75..ffc3c36 100644
--- a/src/widgets/ItemWidget.js
+++ b/src/widgets/ItemWidget.js
@@ -34,7 +34,7 @@
*/
OO.ui.ItemWidget.prototype.setElementGroup = function ( group ) {
// Parent method
- OO.ui.Element.prototype.setElementGroup.call( this, group );
+ OO.ui.ItemWidget.super.prototype.setElementGroup.call( this, group );
// Initialize item disabled states
this.updateDisabled();
diff --git a/src/widgets/MenuWidget.js b/src/widgets/MenuWidget.js
index e4ca823..d13e3b4 100644
--- a/src/widgets/MenuWidget.js
+++ b/src/widgets/MenuWidget.js
@@ -137,7 +137,7 @@
*/
OO.ui.MenuWidget.prototype.selectItem = function ( item ) {
// Parent method
- OO.ui.SelectWidget.prototype.selectItem.call( this, item );
+ OO.ui.MenuWidget.super.prototype.selectItem.call( this, item );
if ( !this.disabled ) {
if ( item ) {
@@ -168,7 +168,7 @@
var i, len, item;
// Parent method
- OO.ui.SelectWidget.prototype.addItems.call( this, items, index );
+ OO.ui.MenuWidget.super.prototype.addItems.call( this, items, index );
// Auto-initialize
if ( !this.newItems ) {
diff --git a/src/widgets/TextInputMenuWidget.js
b/src/widgets/TextInputMenuWidget.js
index ab62f21..1060e08 100644
--- a/src/widgets/TextInputMenuWidget.js
+++ b/src/widgets/TextInputMenuWidget.js
@@ -46,7 +46,7 @@
*/
OO.ui.TextInputMenuWidget.prototype.show = function () {
// Parent method
- OO.ui.MenuWidget.prototype.show.call( this );
+ OO.ui.TextInputMenuWidget.super.prototype.show.call( this );
this.position();
this.$( this.getElementWindow() ).on( 'resize',
this.onWindowResizeHandler );
@@ -61,7 +61,7 @@
*/
OO.ui.TextInputMenuWidget.prototype.hide = function () {
// Parent method
- OO.ui.MenuWidget.prototype.hide.call( this );
+ OO.ui.TextInputMenuWidget.super.prototype.hide.call( this );
this.$( this.getElementWindow() ).off( 'resize',
this.onWindowResizeHandler );
return this;
diff --git a/src/widgets/ToggleButtonWidget.js
b/src/widgets/ToggleButtonWidget.js
index 7691492..297347e 100644
--- a/src/widgets/ToggleButtonWidget.js
+++ b/src/widgets/ToggleButtonWidget.js
@@ -51,7 +51,7 @@
}
// Parent method
- OO.ui.ToggleWidget.prototype.setValue.call( this, value );
+ OO.ui.ToggleButtonWidget.super.prototype.setValue.call( this, value );
return this;
};
--
To view, visit https://gerrit.wikimedia.org/r/119471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] User super to call parent constructor - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119470
Change subject: User super to call parent constructor
..
User super to call parent constructor
Change-Id: I8f3472bb1673de7cfe851197955ab58151358955
---
M src/Dialog.js
M src/Frame.js
M src/Layout.js
M src/Tool.js
M src/ToolFactory.js
M src/ToolGroup.js
M src/Toolbar.js
M src/Widget.js
M src/Window.js
M src/WindowSet.js
M src/layouts/BookletLayout.js
M src/layouts/FieldLayout.js
M src/layouts/FieldsetLayout.js
M src/layouts/GridLayout.js
M src/layouts/PageLayout.js
M src/layouts/PanelLayout.js
M src/layouts/StackLayout.js
M src/toolgroups/BarToolGroup.js
M src/toolgroups/ListToolGroup.js
M src/toolgroups/MenuToolGroup.js
M src/toolgroups/PopupToolGroup.js
M src/tools/PopupTool.js
M src/widgets/ButtonGroupWidget.js
M src/widgets/ButtonOptionWidget.js
M src/widgets/ButtonSelectWidget.js
M src/widgets/ButtonWidget.js
M src/widgets/CheckboxInputWidget.js
M src/widgets/GroupWidget.js
M src/widgets/IconWidget.js
M src/widgets/IndicatorWidget.js
M src/widgets/InlineMenuWidget.js
M src/widgets/InputWidget.js
M src/widgets/LabelWidget.js
M src/widgets/MenuItemWidget.js
M src/widgets/MenuSectionItemWidget.js
M src/widgets/MenuWidget.js
M src/widgets/OptionWidget.js
M src/widgets/OutlineControlsWidget.js
M src/widgets/OutlineItemWidget.js
M src/widgets/OutlineWidget.js
M src/widgets/PopupButtonWidget.js
M src/widgets/PopupWidget.js
M src/widgets/SearchWidget.js
M src/widgets/SelectWidget.js
M src/widgets/TextInputMenuWidget.js
M src/widgets/TextInputWidget.js
M src/widgets/ToggleButtonWidget.js
M src/widgets/ToggleSwitchWidget.js
48 files changed, 48 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/70/119470/1
diff --git a/src/Dialog.js b/src/Dialog.js
index f54166b..33c71af 100644
--- a/src/Dialog.js
+++ b/src/Dialog.js
@@ -13,7 +13,7 @@
config = $.extend( { 'size': 'large' }, config );
// Parent constructor
- OO.ui.Window.call( this, config );
+ OO.ui.Dialog.super.call( this, config );
// Properties
this.visible = false;
diff --git a/src/Frame.js b/src/Frame.js
index d1040dd..8bf9295 100644
--- a/src/Frame.js
+++ b/src/Frame.js
@@ -10,7 +10,7 @@
*/
OO.ui.Frame = function OoUiFrame( config ) {
// Parent constructor
- OO.ui.Element.call( this, config );
+ OO.ui.Frame.super.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
diff --git a/src/Layout.js b/src/Layout.js
index c5b7e71..31d6e6c 100644
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -14,7 +14,7 @@
config = config || {};
// Parent constructor
- OO.ui.Element.call( this, config );
+ OO.ui.Layout.super.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
diff --git a/src/Tool.js b/src/Tool.js
index 98b4ad1..de2034e 100644
--- a/src/Tool.js
+++ b/src/Tool.js
@@ -16,7 +16,7 @@
config = config || {};
// Parent constructor
- OO.ui.Widget.call( this, config );
+ OO.ui.Tool.super.call( this, config );
// Mixin constructors
OO.ui.IconedElement.call( this, this.$( 'span' ), config );
diff --git a/src/ToolFactory.js b/src/ToolFactory.js
index aa8fd0f..4ea4580 100644
--- a/src/ToolFactory.js
+++ b/src/ToolFactory.js
@@ -7,7 +7,7 @@
*/
OO.ui.ToolFactory = function OoUiToolFactory() {
// Parent constructor
- OO.Factory.call( this );
+ OO.ui.ToolFactory.super.call( this );
};
/* Inheritance */
diff --git a/src/ToolGroup.js b/src/ToolGroup.js
index affdecf..5816222 100644
--- a/src/ToolGroup.js
+++ b/src/ToolGroup.js
@@ -25,7 +25,7 @@
config = config || {};
// Parent constructor
- OO.ui.Widget.call( this, config );
+ OO.ui.ToolGroup.super.call( this, config );
// Mixin constructors
OO.ui.GroupElement.call( this, this.$( 'div' ), config );
diff --git a/src/Toolbar.js b/src/Toolbar.js
index 1556a2b..de16f9a 100644
--- a/src/Toolbar.js
+++ b/src/Toolbar.js
@@ -17,7 +17,7 @@
config = config || {};
// Parent constructor
- OO.ui.Element.call( this, config );
+ OO.ui.Toolbar.super.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
diff --git a/src/Widget.js b/src/Widget.js
index 765a78e..3e54a86 100644
--- a/src/Widget.js
+++ b/src/Widget.js
@@ -15,7 +15,7 @@
config = $.extend( { 'disabled': false }, config );
// Parent constructor
- OO.ui.Element.call( this, config );
+ OO.ui.Widget.super.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
diff --git a/src/Window.js b/src/Window.js
index 9a36bc1..82b68b1 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -17,7 +17,7 @@
*/
OO.ui.Window = function OoUiWindow( config ) {
// Parent
[MediaWiki-commits] [Gerrit] Slight modifications to the frontpage css - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Slight modifications to the frontpage css
..
Slight modifications to the frontpage css
* slightly adjust spacings and shadows
* let long words in boxes wrap
* also change their text size
Hopefully improves overall impression (which is not bad at all so far)
Change-Id: I4b4ee42e222c9efee6a1ba3caadd04e110bcb927
---
M resources/css/ext.translate.mainpage.css
1 file changed, 13 insertions(+), 7 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.mainpage.css
b/resources/css/ext.translate.mainpage.css
index d78a67f..2783f63 100644
--- a/resources/css/ext.translate.mainpage.css
+++ b/resources/css/ext.translate.mainpage.css
@@ -19,6 +19,7 @@
padding-bottom: 5px;
height: 75px;
line-height: 1.5em;
+ box-shadow: 0 0 4px;
}
.twn-mainpage-header .twn-mainpage-personal-actions {
@@ -30,14 +31,14 @@
background-position: center left;
padding-left: 30px;
color: #3366BB;
- margin-top: 50px;
+ margin-top: 8px;
cursor: pointer;
display: inline-block;
}
.twn-mainpage-title .twn-brand-name {
- padding-top: 18px;
- font-size: 24px;
+ padding-top: 12px;
+ font-size: 28px;
}
.twn-mainpage-title .twn-brand-motto {
@@ -47,7 +48,7 @@
}
.twn-mainpage-header {
- border-bottom: 2px solid #3366BB;
+ border-bottom: 4px solid #3366BB;
}
.twn-mainpage-header .login,
@@ -62,6 +63,8 @@
background: transparent none no-repeat scroll left center;
background-size: 100%;
position: relative;
+ box-shadow: 0 0 4px, inset 0 0 40px;
+ border-top: 1px solid #5787E5;
}
.banner-attribution {
@@ -95,7 +98,7 @@
.stats-tile {
background-color: #3366BB;
- background-color: rgba(51, 102, 187, 0.9);
+ background-color: rgba(51, 102, 187, 0.7);
color: white;
height: 130px;
margin: auto;
@@ -134,19 +137,22 @@
}
.stats-text {
- font-size: 18px;
+ font-size: 1em;
opacity: 0.85;
font-weight: normal;
+ word-break: break-word;
}
.main-widget {
background-color: #F8F8F8;
- background-color: rgba(248, 248, 248, 0.95);
+ background-color: rgba(248, 248, 248, 0.85);
color: #252525;
max-height: 580px;
padding: 10px;
margin-left: 4%;
overflow: auto;
+ margin-top: 10px;
+ box-shadow: inset 0 0 4px #ff;
}
.main-widget label {
--
To view, visit https://gerrit.wikimedia.org/r/112035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b4ee42e222c9efee6a1ba3caadd04e110bcb927
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Neverendingo i...@neverendingo.de
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Neverendingo i...@neverendingo.de
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...SemanticSifter)
Siebrand has submitted this change and it was merged.
Change subject: Consistency tweaks in preparation for adding extension to
translatewiki.net
..
Consistency tweaks in preparation for adding extension to
translatewiki.net
* Add header
* Rephrase description message
* Tweak to message documentation
Change-Id: I63b16c7be4e533328d1495f494ecf98c16f1c782
---
M SemanticSifter.i18n.php
1 file changed, 16 insertions(+), 3 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/SemanticSifter.i18n.php b/SemanticSifter.i18n.php
index b535483..62e7499 100644
--- a/SemanticSifter.i18n.php
+++ b/SemanticSifter.i18n.php
@@ -1,15 +1,28 @@
?php
+/**
+ * Internationalization file for Semantic Sifter extension.
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
$messages = array();
+/** English
+ * @author Kim Eik
+ */
$messages['en'] = array(
- 'semanticsifter-desc' = 'An extension which allows you to sift through
semantic data',
+ 'semanticsifter-desc' = 'Allows to sift through semantic data and
displays the result in a filterable view',
'semanticsifter-button-apply-filter' = 'Apply filter',
'semanticsifter-message-siftlink-params-error' = 'Missing parameters
to siftlink parser function.'
);
+/** Message documentation
+ * @author Kim Eik
+ */
$messages['qqq'] = array(
- 'semanticsifter-desc' = 'Extension description',
+ 'semanticsifter-desc' = '{{desc|name=Semantic
Sifter|url=https://www.mediawiki.org/wiki/Extension:SemanticSifter}}',
'semanticsifter-button-apply-filter' = 'Button which applies filter',
'semanticsifter-message-siftlink-params-error' = 'Message displayed
when error occurs in parameter handling of #siftlink parser function'
-);
\ No newline at end of file
+);
--
To view, visit https://gerrit.wikimedia.org/r/119464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63b16c7be4e533328d1495f494ecf98c16f1c782
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticSifter
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Netbrain k...@heldig.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase width of toggle switch widget - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119472
Change subject: Increase width of toggle switch widget
..
Increase width of toggle switch widget
Toggle is a 1.5em circle so it should travel at least this distance.
Increased from 1em to 2em.
Change-Id: I2bc50c94eeb80990904112c16e529e3efd2a06df
---
M src/styles/widgets/ToggleSwitchWidget.less
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/72/119472/1
diff --git a/src/styles/widgets/ToggleSwitchWidget.less
b/src/styles/widgets/ToggleSwitchWidget.less
index 1da92e3..24666af 100644
--- a/src/styles/widgets/ToggleSwitchWidget.less
+++ b/src/styles/widgets/ToggleSwitchWidget.less
@@ -5,7 +5,7 @@
display: inline-block;
vertical-align: middle;
height: 2em;
- width: 3em;
+ width: 4em;
overflow: hidden;
cursor: pointer;
.oo-ui-box-sizing(border-box);
@@ -38,7 +38,7 @@
.oo-ui-toggleWidget-on {
-grip {
- left: 1.25em;
+ left: 2.25em;
margin-left: -2px;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/119472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc50c94eeb80990904112c16e529e3efd2a06df
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use __DIR__ instead of dirname( __FILE__ ) - change (mediawiki...MobileFrontend)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119473
Change subject: Use __DIR__ instead of dirname( __FILE__ )
..
Use __DIR__ instead of dirname( __FILE__ )
Change-Id: I06be3b56fe83a561a2310a8505885b9888e8b6eb
---
M MobileFrontend.php
1 file changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/73/119473/1
diff --git a/MobileFrontend.php b/MobileFrontend.php
index a83b951..18cdf88 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -38,9 +38,9 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:MobileFrontend',
);
-$cwd = dirname( __FILE__ );
-$wgExtensionMessagesFiles['MobileFrontend'] = $cwd/MobileFrontend.i18n.php;
-$wgExtensionMessagesFiles['MobileFrontendAlias'] =
$cwd/MobileFrontend.alias.php;
+$wgMessagesDirs['MobileFrontend'] = __DIR__ . '/i18n';
+$wgExtensionMessagesFiles['MobileFrontend'] = __DIR__ .
/MobileFrontend.i18n.php;
+$wgExtensionMessagesFiles['MobileFrontendAlias'] = __DIR__ .
/MobileFrontend.alias.php;
// autoload extension classes
$autoloadClasses = array (
@@ -92,7 +92,7 @@
);
foreach ( $autoloadClasses as $className = $classFilename ) {
- $wgAutoloadClasses[$className] = $cwd/includes/$classFilename.php;
+ $wgAutoloadClasses[$className] = __DIR__ .
/includes/$classFilename.php;
}
$wgExtensionFunctions[] = 'efMobileFrontend_Setup';
@@ -172,8 +172,7 @@
}
// ResourceLoader modules
-require_once( $cwd/includes/Resources.php );
-unset( $cwd );
+require_once __DIR__ . /includes/Resources.php;
/**
* Begin configuration variables
@@ -469,4 +468,3 @@
* Scheme to use for the deep link. Per default, 'http' is used.
*/
$wgMFAppScheme = 'http';
-
--
To view, visit https://gerrit.wikimedia.org/r/119473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06be3b56fe83a561a2310a8505885b9888e8b6eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add cron job to run characterEditStats.php on multilingual w... - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Add cron job to run characterEditStats.php on multilingual
wikis weekly
..
Add cron job to run characterEditStats.php on multilingual wikis weekly
Publishes the output a wiki page on Meta. Needs a MediaWiki install (with
Translate), hence on terbium. Inspired partly by misc/beta/sync-site-resources
and files/icinga/check_job_queue.
Bug: 58440
Change-Id: I681539b6cf2463648d4c5669d689143c2f41cc33
---
A files/misc/scripts/characterEditStatsTranslate
M manifests/misc/maintenance.pp
M manifests/site.pp
3 files changed, 41 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/characterEditStatsTranslate
b/files/misc/scripts/characterEditStatsTranslate
new file mode 100644
index 000..75dd137
--- /dev/null
+++ b/files/misc/scripts/characterEditStatsTranslate
@@ -0,0 +1,18 @@
+#!/bin/bash
+{
+ # We transclude a subpage so that wikignomes can maintain documentation of
this
+ # report on wiki without bothering the code. Newlines needs -e.
+ echo -e {{/Report}} generated on $(date --rfc-3339=seconds)\n
+
+ # Pick the main multilingual Translate wikis, all closely related to Meta
+ for wiki in commonswiki incubatorwiki mediawikiwiki metawiki outreachwiki ;
do
+echo -e == $wiki ==\n=== Last 30 days ===\npre\n
+/usr/local/bin/mwscript
extensions/Translate/scripts/characterEditStats.php \
+--wiki $wiki --top 50 --days 30
+echo -e /pre\n=== Last year ===\npre
+/usr/local/bin/mwscript
extensions/Translate/scripts/characterEditStats.php \
+--wiki $wiki --days 365
+echo -e /pre\n
+ done
+} | /usr/local/bin/mwscript edit.php --wiki=metawiki --user FuzzyBot \
+--bot --summary Update stats Meta:Babylon/Translation_stats
diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index df011f6..20b2081 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -359,6 +359,26 @@
}
+class misc::maintenance::updatetranslationstats( $ensure = absent ) {
+# Include this to a maintenance host to update translation stats.
+
+file { '/usr/local/bin/characterEditStatsTranslate':
+ ensure = $ensure,
+ owner = 'mwdeploy',
+ group = 'mwdeploy',
+ mode = 0775,
+ source = 'puppet:///files/misc/scripts/characterEditStatsTranslate',
+}
+cron { 'updatetranslationstats':
+user= 'mwdeploy',
+minute = 0,
+hour= 0,
+weekday = 1,
+command = '/usr/local/bin/characterEditStatsTranslate',
+ensure = $ensure,
+}
+}
+
class misc::maintenance::updatequerypages( $enabled = false ) {
# Include this to add cron jobs calling updateSpecialPages.php on all
clusters.
diff --git a/manifests/site.pp b/manifests/site.pp
index b1e0e83..1d1e8fb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2518,6 +2518,9 @@
class { 'misc::maintenance::translationnotifications':
enabled = true,
}
+class { 'misc::maintenance::updatetranslationstats':
+enabled = true,
+}
class { 'misc::maintenance::wikidata':
enabled = true,
}
--
To view, visit https://gerrit.wikimedia.org/r/117250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I681539b6cf2463648d4c5669d689143c2f41cc33
Gerrit-PatchSet: 16
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Reedy re...@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] Migrate to JSON i18n with B/C shim - change (mediawiki...MobileFrontend)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/119474 Change subject: Migrate to JSON i18n with B/C shim .. Migrate to JSON i18n with B/C shim Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php Change-Id: Idc13d7ff5477a363f88016874bb02a18b930eaf4 --- M MobileFrontend.i18n.php A i18n/ace.json A i18n/af.json A i18n/ak.json A i18n/am.json A i18n/an.json A i18n/ang.json A i18n/anp.json A i18n/ar.json A i18n/arc.json A i18n/ary.json A i18n/as.json A i18n/ast.json A i18n/az.json A i18n/azb.json A i18n/ba.json A i18n/bar.json A i18n/bcl.json A i18n/be-tarask.json A i18n/be.json A i18n/bg.json A i18n/bho.json A i18n/bn.json A i18n/br.json A i18n/bs.json A i18n/ca.json A i18n/cdo.json A i18n/ce.json A i18n/ckb.json A i18n/co.json A i18n/cs.json A i18n/cu.json A i18n/cy.json A i18n/da.json A i18n/de-ch.json A i18n/de-formal.json A i18n/de.json A i18n/diq.json A i18n/dsb.json A i18n/dtp.json A i18n/ee.json A i18n/el.json A i18n/en-gb.json A i18n/en.json A i18n/eo.json A i18n/es.json A i18n/et.json A i18n/eu.json A i18n/ext.json A i18n/fa.json A i18n/fi.json A i18n/fo.json A i18n/fr.json A i18n/frp.json A i18n/frr.json A i18n/fur.json A i18n/fy.json A i18n/ga.json A i18n/gd.json A i18n/gl.json A i18n/gn.json A i18n/grc.json A i18n/gsw.json A i18n/gu.json A i18n/gv.json A i18n/ha.json A i18n/haw.json A i18n/he.json A i18n/hi.json A i18n/hif-latn.json A i18n/hil.json A i18n/hr.json A i18n/hsb.json A i18n/hu.json A i18n/hy.json A i18n/ia.json A i18n/id.json A i18n/ig.json A i18n/ilo.json A i18n/inh.json A i18n/is.json A i18n/it.json A i18n/ja.json A i18n/jv.json A i18n/ka.json A i18n/kbd-cyrl.json A i18n/kg.json A i18n/khw.json A i18n/kiu.json A i18n/kk-cyrl.json A i18n/kl.json A i18n/km.json A i18n/kn.json A i18n/ko.json A i18n/krc.json A i18n/ksh.json A i18n/ku-latn.json A i18n/ku.json A i18n/kv.json A i18n/kw.json A i18n/ky.json A i18n/la.json A i18n/lad.json A i18n/lb.json A i18n/lez.json A i18n/li.json A i18n/lmo.json A i18n/ln.json A i18n/lrc.json A i18n/lt.json A i18n/ltg.json A i18n/lus.json A i18n/lv.json A i18n/lzz.json A i18n/mg.json A i18n/mi.json A i18n/min.json A i18n/mk.json A i18n/ml.json A i18n/mn.json A i18n/mo.json A i18n/mr.json A i18n/ms.json A i18n/mt.json A i18n/my.json A i18n/mzn.json A i18n/nap.json A i18n/nb.json A i18n/nds-nl.json A i18n/nds.json A i18n/ne.json A i18n/nl-informal.json A i18n/nl.json A i18n/nn.json A i18n/oc.json A i18n/or.json A i18n/os.json A i18n/pa.json A i18n/pap.json A i18n/pdc.json A i18n/pfl.json A i18n/pl.json A i18n/pms.json A i18n/pnb.json A i18n/ps.json A i18n/pt-br.json A i18n/pt.json A i18n/qqq.json A i18n/qu.json A i18n/rm.json A i18n/ro.json A i18n/roa-tara.json A i18n/ru.json A i18n/rue.json A i18n/sa.json A i18n/sah.json A i18n/scn.json A i18n/sco.json A i18n/sdc.json A i18n/sh.json A i18n/shi.json A i18n/si.json A i18n/sk.json A i18n/sl.json A i18n/so.json A i18n/sq.json A i18n/sr-ec.json A i18n/sr-el.json A i18n/su.json A i18n/sv.json A i18n/sw.json A i18n/szl.json A i18n/ta.json A i18n/te.json A i18n/tg-cyrl.json A i18n/tg-latn.json A i18n/th.json A i18n/tk.json A i18n/tl.json A i18n/tly.json A i18n/tpi.json A i18n/tr.json A i18n/tru.json A i18n/tt-cyrl.json A i18n/ttt.json A i18n/tzm.json A i18n/ug-arab.json A i18n/uk.json A i18n/ur.json A i18n/uz.json A i18n/vec.json A i18n/vep.json A i18n/vi.json A i18n/vo.json A i18n/vro.json A i18n/wo.json A i18n/wuu.json A i18n/xal.json A i18n/xmf.json A i18n/yi.json A i18n/yo.json A i18n/yue.json A i18n/zh-hans.json A i18n/zh-hant.json A i18n/zh-hk.json 205 files changed, 21,620 insertions(+), 21,903 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/74/119474/1 -- To view, visit https://gerrit.wikimedia.org/r/119474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc13d7ff5477a363f88016874bb02a18b930eaf4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path after file got moved - change (mediawiki/core)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/119475 Change subject: Fix path after file got moved .. Fix path after file got moved Change-Id: I947b9f6c9b42a2d0e0061f92c5bedf6d2ecfba4d --- M includes/composer/ComposerHookHandler.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/75/119475/1 diff --git a/includes/composer/ComposerHookHandler.php b/includes/composer/ComposerHookHandler.php index 5cf8a9b..6c310fd 100644 --- a/includes/composer/ComposerHookHandler.php +++ b/includes/composer/ComposerHookHandler.php @@ -4,7 +4,7 @@ use Composer\Script\Event; $GLOBALS['IP'] = __DIR__ . '/../'; -require_once 'AutoLoader.php'; +require_once '../AutoLoader.php'; /** * @licence GNU GPL v2+ -- To view, visit https://gerrit.wikimedia.org/r/119475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I947b9f6c9b42a2d0e0061f92c5bedf6d2ecfba4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ComposerPackageModifierTest integration test - change (mediawiki/core)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119476
Change subject: Add ComposerPackageModifierTest integration test
..
Add ComposerPackageModifierTest integration test
Only runs when Composer is available
Change-Id: I59435b87d50fa5a37cae1dff8a00e8ec04246100
---
A tests/phpunit/includes/ComposerPackageModifierTest.php
1 file changed, 71 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/76/119476/1
diff --git a/tests/phpunit/includes/ComposerPackageModifierTest.php
b/tests/phpunit/includes/ComposerPackageModifierTest.php
new file mode 100644
index 000..1cef4ca
--- /dev/null
+++ b/tests/phpunit/includes/ComposerPackageModifierTest.php
@@ -0,0 +1,71 @@
+?php
+
+/**
+ * Note: this integration test requires Composer to be loaded.
+ * Add composer/composer in the require section of your composer.json and
run composer update.
+ *
+ * @covers ComposerPackageModifier
+ *
+ * @group ComposerHooks
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw jeroended...@gmail.com
+ */
+class ComposerPackageModifierTest extends PHPUnit_Framework_TestCase {
+
+ public static function setUpBeforeClass() {
+ if ( !class_exists( 'Composer\Package\Package' ) ) {
+ self::markTestSkipped( 'Composer needs to be loaded to
run ComposerPackageModifierTest' );
+ }
+ }
+
+ const MW_VERSION_RAW = '1.337alpha';
+ const MW_VERSION_CLEAN = '1.337-alpha';
+ const MW_VERSION_FULL = '1.337.0.0-alpha';
+
+ public function testIntegration() {
+ $versionFetcher = $this-getMock( 'MediaWikiVersionFetcher' );
+
+ $versionFetcher-expects( $this-once() )
+ -method( 'fetchVersion' )
+ -will( $this-returnValue( self::MW_VERSION_RAW ) );
+
+ $versionNormalizer = $this-getMock(
'ComposerVersionNormalizer' );
+
+ $versionNormalizer-expects( $this-once() )
+ -method( 'normalizeSuffix' )
+ -with( $this-equalTo( self::MW_VERSION_RAW ) )
+ -will( $this-returnValue( self::MW_VERSION_CLEAN ) );
+
+ $versionNormalizer-expects( $this-once() )
+ -method( 'normalizeLevelCount' )
+ -with( $this-equalTo( self::MW_VERSION_CLEAN ) )
+ -will( $this-returnValue( self::MW_VERSION_FULL ) );
+
+ $package = $this-getMockBuilder( 'Composer\Package\Package' )
+ -disableOriginalConstructor()-getMock();
+
+ $package-expects( $this-once() )
+ -method( 'setProvides' )
+ -with( $this-callback( array( $this,
'assertIsValidSetProvidesArgument' ) ) );
+
+ $packageModifier = new ComposerPackageModifier( $package,
$versionNormalizer, $versionFetcher );
+ $packageModifier-setProvidesMediaWiki();
+ }
+
+ public function assertIsValidSetProvidesArgument( $argument ) {
+ if ( !is_array( $argument ) || count( $argument ) !== 1 ) {
+ return false;
+ }
+
+ $link = $argument[0];
+
+ if ( !( $link instanceof Composer\Package\Link ) ) {
+ return false;
+ }
+
+ return $link-getTarget() ===
ComposerPackageModifier::MEDIAWIKI_PACKAGE_NAME
+$link-getPrettyConstraint() === self::MW_VERSION_FULL;
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/119476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59435b87d50fa5a37cae1dff8a00e8ec04246100
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path after file got moved - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix path after file got moved .. Fix path after file got moved Change-Id: I947b9f6c9b42a2d0e0061f92c5bedf6d2ecfba4d --- M includes/composer/ComposerHookHandler.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/composer/ComposerHookHandler.php b/includes/composer/ComposerHookHandler.php index 5cf8a9b..6c310fd 100644 --- a/includes/composer/ComposerHookHandler.php +++ b/includes/composer/ComposerHookHandler.php @@ -4,7 +4,7 @@ use Composer\Script\Event; $GLOBALS['IP'] = __DIR__ . '/../'; -require_once 'AutoLoader.php'; +require_once '../AutoLoader.php'; /** * @licence GNU GPL v2+ -- To view, visit https://gerrit.wikimedia.org/r/119475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I947b9f6c9b42a2d0e0061f92c5bedf6d2ecfba4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.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 bug introduced in 68e354d - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119477
Change subject: Fix bug introduced in 68e354d
..
Fix bug introduced in 68e354d
It broke puppet on terbium
Change-Id: I6b2ed821d090ef01ec50012567d4855e47cbd6d3
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/119477/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 1d1e8fb..f561e5b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2519,7 +2519,7 @@
enabled = true,
}
class { 'misc::maintenance::updatetranslationstats':
-enabled = true,
+ensure = 'present',
}
class { 'misc::maintenance::wikidata':
enabled = true,
--
To view, visit https://gerrit.wikimedia.org/r/119477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b2ed821d090ef01ec50012567d4855e47cbd6d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix bug introduced in 68e354d - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Fix bug introduced in 68e354d
..
Fix bug introduced in 68e354d
It broke puppet on terbium
Change-Id: I6b2ed821d090ef01ec50012567d4855e47cbd6d3
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 1d1e8fb..f561e5b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2519,7 +2519,7 @@
enabled = true,
}
class { 'misc::maintenance::updatetranslationstats':
-enabled = true,
+ensure = 'present',
}
class { 'misc::maintenance::wikidata':
enabled = true,
--
To view, visit https://gerrit.wikimedia.org/r/119477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b2ed821d090ef01ec50012567d4855e47cbd6d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@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] Don't launch in articles with no text - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't launch in articles with no text
..
Don't launch in articles with no text
This is a silly bug.
Change-Id: I5d54cda34d5b7f383c182e41da13dfce141e36bb
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 55bfdad..f308af0 100755
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -121,9 +121,14 @@
return;
}
- if ( $thumb.closest( '.metadata' ).length 0 ) {
+ if (
// This is almost certainly an icon for an
informational template like
// {{refimprove}} on enwiki.
+ $thumb.closest( '.metadata' ).length 0 ||
+
+ // This is an article with no text.
+ $thumb.closest( '.noarticletext' ).length 0
+ ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/118124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d54cda34d5b7f383c182e41da13dfce141e36bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.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] Cache created objects within the mapper - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Cache created objects within the mapper
..
Cache created objects within the mapper
Change-Id: Idc7c496683ecd03ff91d9276374cef738157b094
---
M Flow.php
M container.php
M includes/Data/ObjectManager.php
A tests/CachingObjectMapperTest.php
4 files changed, 155 insertions(+), 18 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.php b/Flow.php
index 7bbd1fc..cba4b95 100755
--- a/Flow.php
+++ b/Flow.php
@@ -125,6 +125,7 @@
$wgAutoloadClasses['Flow\Data\BasicDbStorage'] = $dir .
'includes/Data/ObjectManager.php';
$wgAutoloadClasses['Flow\Data\ObjectMapper'] = $dir .
'includes/Data/ObjectManager.php';
$wgAutoloadClasses['Flow\Data\BasicObjectMapper'] = $dir .
'includes/Data/ObjectManager.php';
+$wgAutoloadClasses['Flow\Data\CachingObjectMapper'] = $dir .
'includes/Data/ObjectManager.php';
$wgAutoloadClasses['Flow\Data\BufferedCache'] = $dir .
'includes/Data/ObjectManager.php';
$wgAutoloadClasses['Flow\Data\LocalBufferedCache'] = $dir .
'includes/Data/ObjectManager.php';
$wgAutoloadClasses['Flow\Data\SortArrayByKeys'] = $dir .
'includes/Data/ObjectManager.php';
diff --git a/container.php b/container.php
index cbec8d8..8e70d2d 100644
--- a/container.php
+++ b/container.php
@@ -113,6 +113,7 @@
use Flow\Data\BufferedCache;
use Flow\Data\LocalBufferedCache;
use Flow\Data\BasicObjectMapper;
+use Flow\Data\CachingObjectMapper;
use Flow\Data\BasicDbStorage;
use Flow\Data\PostRevisionStorage;
use Flow\Data\HeaderRevisionStorage;
@@ -140,16 +141,17 @@
} );
// Per wiki workflow definitions (types of workflows)
$c['storage.definition'] = $c-share( function( $c ) {
+ $primaryKey = array( 'definition_id' );
$cache = $c['memcache.buffered'];
- $mapper = BasicObjectMapper::model( 'Flow\\Model\\Definition' );
+ $mapper = CachingObjectMapper::model( 'Flow\\Model\\Definition',
$primaryKey );
$storage = new BasicDbStorage(
// factory and table
$c['db.factory'], 'flow_definition',
// pk
- array( 'definition_id' )
+ $primaryKey
);
$indexes = array(
- new UniqueFeatureIndex( $cache, $storage, 'flow_definition:pk',
array( 'definition_id' ) ),
+ new UniqueFeatureIndex( $cache, $storage, 'flow_definition:pk',
$primaryKey ),
new UniqueFeatureIndex( $cache, $storage,
'flow_definition:name', array( 'definition_wiki', 'definition_name' ) ),
);
@@ -157,15 +159,16 @@
} );
// Individual workflow instances
$c['storage.workflow'] = $c-share( function( $c ) {
+ $primaryKey = array( 'workflow_id' );
$cache = $c['memcache.buffered'];
- $mapper = BasicObjectMapper::model( 'Flow\\Model\\Workflow' );
+ $mapper = CachingObjectMapper::model( 'Flow\\Model\\Workflow',
$primaryKey );
$storage = new BasicDbStorage(
// factory and table
$c['db.factory'], 'flow_workflow',
// pk
- array( 'workflow_id' )
+ $primaryKey
);
- $pk = new UniqueFeatureIndex( $cache, $storage, 'flow_workflow:pk',
array( 'workflow_id' ) );
+ $pk = new UniqueFeatureIndex( $cache, $storage, 'flow_workflow:pk',
$primaryKey );
$indexes = array(
$pk,
// This is actually a unique index, but it wants the shallow
functionality.
@@ -203,14 +206,20 @@
$c['storage.board_history'] = $c-share( function( $c ) {
$cache = $c['memcache.buffered'];
$mapper = new BasicObjectMapper(
- function( $rev ) {
- return $rev-toStorageRow( $rev );
+ function( $rev ) use( $c ) {
+ if ( $rev instanceof PostRevision ) {
+ return $c['storage.post.mapper']-toStorageRow(
$rev );
+ } elseif ( $rev instanceof Header ) {
+ return
$c['storage.header.mapper']-toStorageRow( $rev );
+ } else {
+ throw new \Flow\Exception\InvalidDataException(
'Invalid class for board history entry: ' . get_class( $rev ), 'fail-load-data'
);
+ }
},
- function( array $row, $obj = null ) {
+ function( array $row, $obj = null ) use( $c ) {
if ( $row['rev_type'] === 'header' ) {
- return Header::fromStorageRow( $row, $obj );
+ return
$c['storage.header.mapper']-fromStorageRow( $row, $obj );
} elseif ( $row['rev_type'] === 'post' ) {
- return PostRevision::fromStorageRow( $row, $obj
);
+ return
[MediaWiki-commits] [Gerrit] Only load the container on flow pages - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Only load the container on flow pages
..
Only load the container on flow pages
Profiling was showing flow code taking longer than other extensions
to initialize. To reduce the amount of code run on non-flow pages
I have pulled two variables out of the container and initialized
them in FlowHooks from the extension initialization. This brings
flow in-line with other extensions in the time it takes to initialize.
Change-Id: Ief1490edd04c82ebe1eab7b13aaa2ba6da78b73f
---
M Hooks.php
M container.php
M includes/Notifications/Controller.php
M includes/SpamFilter/Controller.php
4 files changed, 81 insertions(+), 37 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 27fef73..a53a06d 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -3,31 +3,82 @@
use Flow\Container;
use Flow\Exception\FlowException;
use Flow\Model\UUID;
+use Flow\Notification\NotificationController;
+use Flow\OccupationController;
+use Flow\SpamFilter\AbuseFilter;
+use Flow\TalkpageManager;
class FlowHooks {
+ /**
+* @var OccupationController Initialized during extension intialization
+*/
+ protected static $occupationController;
+
+ /**
+* @var AbuseFilter Initialized during extension initialization
+*/
+ protected static $abuseFilter;
+
+ /**
+* Initialized during extension initialization rather than
+* in container so that non-flow pages don't load the container.
+*
+* @return OccupationController
+*/
+ public static function getOccupationController() {
+ if ( self::$occupationController === null ) {
+ global $wgFlowOccupyNamespaces,
+ $wgFlowOccupyPages;
+
+ self::$occupationController = new TalkpageManager(
+ $wgFlowOccupyNamespaces,
+ $wgFlowOccupyPages
+ );
+ }
+ return self::$occupationController;
+ }
+
+ /**
+* Initialized during extension initialization rather than
+* in container so that non-flow pages don't load the container.
+*
+* @return AbuseFilter|null when disabled
+*/
+ public static function getAbuseFilter() {
+ if ( self::$abuseFilter === null ) {
+ global $wgUser,
+ $wgEchoNotifications,
+ $wgFlowAbuseFilterGroup,
+ $wgFlowAbuseFilterEmergencyDisableThreshold,
+ $wgFlowAbuseFilterEmergencyDisableCount,
+ $wgFlowAbuseFilterEmergencyDisableAge;
+
+ self::$abuseFilter = new AbuseFilter( $wgUser,
$wgFlowAbuseFilterGroup );
+ self::$abuseFilter-setup( array(
+ 'threshold' =
$wgFlowAbuseFilterEmergencyDisableThreshold,
+ 'count' =
$wgFlowAbuseFilterEmergencyDisableCount,
+ 'age' = $wgFlowAbuseFilterEmergencyDisableAge,
+ ) );
+ }
+ return self::$abuseFilter;
+ }
+
/**
* Initialize Flow extension with necessary data, this function is
invoked
* from $wgExtensionFunctions
*/
public static function initFlowExtension() {
- global $wgEchoNotifications,
- $wgFlowAbuseFilterGroup,
- $wgFlowAbuseFilterEmergencyDisableThreshold,
- $wgFlowAbuseFilterEmergencyDisableCount,
- $wgFlowAbuseFilterEmergencyDisableAge;
+ // needed to determine if a page is occupied by flow
+ self::getOccupationController();
+ // necessary to render flow notifications
if ( isset( $wgEchoNotifications ) ) {
- Container::get( 'controller.notification' )-setup();
+ NotificationController::setup();
}
+ // necessary to provide flow options in abuse filter on-wiki
pages
if ( $wgFlowAbuseFilterGroup ) {
- Container::get( 'controller.abusefilter' )-setup(
- array(
- 'threshold' =
$wgFlowAbuseFilterEmergencyDisableThreshold,
- 'count' =
$wgFlowAbuseFilterEmergencyDisableCount,
- 'age' =
$wgFlowAbuseFilterEmergencyDisableAge,
- )
- );
+ self::getAbuseFilter();
}
[MediaWiki-commits] [Gerrit] Add more info to flakey permissions test - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Add more info to flakey permissions test
..
Add more info to flakey permissions test
Change-Id: I61f2e338e6e63e9a85b100c063385838205911ee
---
M tests/RevisionCollectionPermissionsTest.php
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/RevisionCollectionPermissionsTest.php
b/tests/RevisionCollectionPermissionsTest.php
index c4c7c44..012b131 100644
--- a/tests/RevisionCollectionPermissionsTest.php
+++ b/tests/RevisionCollectionPermissionsTest.php
@@ -82,6 +82,8 @@
$blockedUser = $this-blockedUser();
$this-block = new Block( $blockedUser-getName(),
$blockedUser-getID() );
$this-block-insert();
+ // ensure that block made it into the database
+ wfGetDB( DB_MASTER )-commit( __METHOD__, 'flush' );
}
/**
@@ -155,11 +157,18 @@
// so we have a full tree of moderated revisions
$revision = null;
$revisions = array();
+ $debug = array();
foreach ( $actions as $action ) {
+ $expect = current( $action );
$action = key( $action );
+ $debug[] = $action . ':' . ( $expect ? 'true' : 'false'
);
$revisions[] = $revision = $this-generateRevision(
$action, $revision );
}
+ // commit pending db transaction
+ Container::get( 'db.factory' )-getDB( DB_MASTER )-commit(
__METHOD__, 'flush' );
+
+ $debug = implode( ' ', $debug );
// secondly, iterate all revisions see if expected
permissions line up
foreach ( $actions as $action ) {
$expected = current( $action );
@@ -167,7 +176,7 @@
$this-assertEquals(
$expected,
$permissions-isAllowed( $revision,
$permisisonAction ),
- 'User ' . $user-getName() . ' should ' . (
$expected ? '' : 'not ' ) . 'be allowed action ' . $permisisonAction . ' on
revision ' . key( $action )
+ 'User ' . $user-getName() . ' should ' . (
$expected ? '' : 'not ' ) . 'be allowed action ' . $permisisonAction . ' on
revision ' . key( $action ) . ' : ' . $debug . ' : ' . json_encode(
$revision::toStorageRow( $revision ) )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/118722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61f2e338e6e63e9a85b100c063385838205911ee
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] beta: fill in swift backend for upload varnish - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119478
Change subject: beta: fill in swift backend for upload varnish
..
beta: fill in swift backend for upload varnish
The beta cluster is lacking a Swift cluster. We are using an instance
with Nginx which serves thumbnails much like we used to do in production
back in 2013.
The instance is not puppetized, we will look at adding a Swift cluster
later on. Meanwhile the instance got copy pasted from pmtpa to eqiad
and we have to fill in the LVS configuration used by the upload varnish
as a backend.
Change-Id: Id76d593dedff0a1ba3ed5ee524386d61f2c63598
---
M modules/lvs/manifests/configuration.pp
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/119478/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 6936e3f..5eb95ab 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -342,6 +342,9 @@
'search_poolbeta' = {},
'search_prefix' = {},
'swift' = {
+# ms emulator set in July 2013. Beta does not have Swift yet.
+# instance is an unpuppetized hack with nginx proxy.
+'eqiad' = '10.68.16.189', # deployment-upload.eqiad.wmflabs
'pmtpa' = '10.4.1.103', # deployment-upload.pmtpa.wmflabs
},
'payments' = {},
--
To view, visit https://gerrit.wikimedia.org/r/119478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id76d593dedff0a1ba3ed5ee524386d61f2c63598
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use ResultWrapper directly - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: use ResultWrapper directly
..
use ResultWrapper directly
Change-Id: I4f84870dfd9ab02211f96c536c40126d14bf32e6
---
M includes/Formatter/ContributionsQuery.php
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Formatter/ContributionsQuery.php
b/includes/Formatter/ContributionsQuery.php
index 97eec70..62455a5 100644
--- a/includes/Formatter/ContributionsQuery.php
+++ b/includes/Formatter/ContributionsQuery.php
@@ -2,7 +2,9 @@
namespace Flow\Formatter;
+use BagOStuff;
use ContribsPager;
+use Flow\Container;
use Flow\Data\RevisionStorage;
use Flow\DbFactory;
use Flow\Model\AbstractRevision;
@@ -14,9 +16,8 @@
use Flow\Model\UUID;
use Flow\Repository\TreeRepository;
use Flow\Exception\FlowException;
+use ResultWrapper;
use User;
-use BagOStuff;
-use Flow\Container;
class ContributionsQuery {
/**
@@ -297,11 +298,11 @@
/**
* Turns DB data into revision objects.
*
-* @param \ResultWrapper $rows
+* @param ResultWrapper $rows
* @param string $revisionClass Class of revision object to build:
PostRevision|Header
* @return array
*/
- protected function loadRevisions( \ResultWrapper $rows, $revisionClass
) {
+ protected function loadRevisions( ResultWrapper $rows, $revisionClass )
{
$revisions = array();
foreach ( $rows as $row ) {
$revisions[UUID::create( $row-rev_id
)-getAlphadecimal()] = (array) $row;
--
To view, visit https://gerrit.wikimedia.org/r/119080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f84870dfd9ab02211f96c536c40126d14bf32e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] Join ObjectStorage and WritableObjectStorage interfaces - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Join ObjectStorage and WritableObjectStorage interfaces
..
Join ObjectStorage and WritableObjectStorage interfaces
We had ObjectLocator (base ObjectManager class) and DbStorage (backend storage)
implementing the same ObjectStorage interface, this doesn't really make sense
as the query options are different, additionally backend returns rows and
the frontend returns domain models. This is basically a violation of LSP.
Make ObjectLocator no longer implement a particular interface, merge
WritableObjectStorage and ObjectStorage, and make DbStorage implement
ObjectStorage.
Also updated a few class comments.
Change-Id: I9962ff4b4e4aa42d2d5e210eab333bbbfcf2e754
---
M includes/Data/ObjectManager.php
M tests/MockStorage.php
2 files changed, 59 insertions(+), 35 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index 761a5e1..ae53501 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -13,13 +13,10 @@
use Flow\Exception\DataPersistenceException;
use Flow\Exception\NoIndexException;
-// Perhaps rethink lifecycle interface. Simpler.
-// Indexes need access to the cache and the backend storage.
-// It seems likely different Indexes could use different caches
(redis/memcache)
-// - But we want to be able to replace that cache with a buffered cache that
flushes
-// on db commit.
-// - Perhaps one buffered cache could wrap both redis and memcache? seems odd
though
-
+/**
+ * Listeners that receive notifications about the lifecycle of
+ * a domain model.
+ */
interface LifecycleHandler {
function onAfterLoad( $object, array $old );
function onAfterInsert( $object, array $new );
@@ -27,45 +24,72 @@
function onAfterRemove( $object, array $old );
}
-// Some denormalized data doesnt accept writes, it merely triggers cache
updates
-// when something else does the write. Indexes are the primary use case.
-// IteratorAggregate rather than traversable to simplify nested implementations
-interface ObjectStorage extends \IteratorAggregate {
- function find( array $attributes, array $options = array() );
+/**
+ * Interface representing backend data stores. Typically they
+ * will be implemented in SQL with the DbStorage base class.
+ */
+interface ObjectStorage {
+
/**
-* The BagOStuff interface returns with keys matching the key,
unfortunately
-* we deal with composite keys which makes that awkward. Instead all
findMulti
-* implementations must return their result as if it was array_map(
array( $obj, 'find' ), $queries ).
-* This is necessary so result sets stay ordered
+* Perform a single equality query.
*
+* @param array $attributes Map of attributes the model must contain
+* @param array $options Query options such as ORDER BY and LIMIT.
+* @return array
+*/
+ function find( array $attributes, array $options = array() );
+
+ /**
+* Perform the equivilent of array_map against self::find for multiple
+* equality queries with the minimum of network round trips.
*
* @param array $queries list of queries to perform
* @param array $options Options to use for all queries
* @return array
*/
function findMulti( array $queries, array $options = array() );
- function getPrimaryKeyColumns();
- // Clear any information stored about loaded objects
- // This interface is used by the frontend (ObjectLocator) and the
backend (BasicDbStorage, etc)
- //function clear();
-}
-// Backing stores, typically in SQL
-// Note that while ObjectLocator implements the above ObjectStorage interface,
ObjectManger
-// cant use this interface because backing stores deal in rows, and OM deals
in objects.
-interface WritableObjectStorage extends ObjectStorage {
/**
-* @param array $row
-* @return array The resulting $row including any auto-assigned ids or
false on failure
+* @return array The list of columns that together uniquely identify a
row
+*/
+ function getPrimaryKeyColumns();
+
+ /**
+* Insert the specified row into the data store.
+*
+* @param array $row Map of columns to values
+* @return array|false The resulting $row including any auto-assigned
ids or false on failure
*/
function insert( array $row );
+
+ /**
+* Perform all changes necessary to turn $old into $new in the data
store.
+*
+* @param array $old Map of columns to values that was initially loaded.
+* @param array $new Map of columns to values that the row should
become.
+* @return boolean true
[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/119479 Change subject: Fix typo .. Fix typo Change-Id: Ic8f4b19363622d71dfc29c12833d3627d235270d --- M includes/Data/ObjectManager.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/79/119479/1 diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php index ae53501..1cc8cc1 100644 --- a/includes/Data/ObjectManager.php +++ b/includes/Data/ObjectManager.php @@ -40,7 +40,7 @@ function find( array $attributes, array $options = array() ); /** -* Perform the equivilent of array_map against self::find for multiple +* Perform the equivalent of array_map against self::find for multiple * equality queries with the minimum of network round trips. * * @param array $queries list of queries to perform -- To view, visit https://gerrit.wikimedia.org/r/119479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8f4b19363622d71dfc29c12833d3627d235270d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use __DIR__ instead of dirname( __FILE__ ) - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Use __DIR__ instead of dirname( __FILE__ )
..
Use __DIR__ instead of dirname( __FILE__ )
Change-Id: I06be3b56fe83a561a2310a8505885b9888e8b6eb
---
M MobileFrontend.php
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MobileFrontend.php b/MobileFrontend.php
index a83b951..e14e83c 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -38,9 +38,8 @@
'url' = 'https://www.mediawiki.org/wiki/Extension:MobileFrontend',
);
-$cwd = dirname( __FILE__ );
-$wgExtensionMessagesFiles['MobileFrontend'] = $cwd/MobileFrontend.i18n.php;
-$wgExtensionMessagesFiles['MobileFrontendAlias'] =
$cwd/MobileFrontend.alias.php;
+$wgExtensionMessagesFiles['MobileFrontend'] = __DIR__ .
/MobileFrontend.i18n.php;
+$wgExtensionMessagesFiles['MobileFrontendAlias'] = __DIR__ .
/MobileFrontend.alias.php;
// autoload extension classes
$autoloadClasses = array (
@@ -92,7 +91,7 @@
);
foreach ( $autoloadClasses as $className = $classFilename ) {
- $wgAutoloadClasses[$className] = $cwd/includes/$classFilename.php;
+ $wgAutoloadClasses[$className] = __DIR__ .
/includes/$classFilename.php;
}
$wgExtensionFunctions[] = 'efMobileFrontend_Setup';
@@ -172,8 +171,7 @@
}
// ResourceLoader modules
-require_once( $cwd/includes/Resources.php );
-unset( $cwd );
+require_once __DIR__ . /includes/Resources.php;
/**
* Begin configuration variables
@@ -469,4 +467,3 @@
* Scheme to use for the deep link. Per default, 'http' is used.
*/
$wgMFAppScheme = 'http';
-
--
To view, visit https://gerrit.wikimedia.org/r/119473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06be3b56fe83a561a2310a8505885b9888e8b6eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@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 typo - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix typo .. Fix typo Change-Id: Ic8f4b19363622d71dfc29c12833d3627d235270d --- M includes/Data/ObjectManager.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php index ae53501..1cc8cc1 100644 --- a/includes/Data/ObjectManager.php +++ b/includes/Data/ObjectManager.php @@ -40,7 +40,7 @@ function find( array $attributes, array $options = array() ); /** -* Perform the equivilent of array_map against self::find for multiple +* Perform the equivalent of array_map against self::find for multiple * equality queries with the minimum of network round trips. * * @param array $queries list of queries to perform -- To view, visit https://gerrit.wikimedia.org/r/119479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8f4b19363622d71dfc29c12833d3627d235270d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@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] Use checkboxShiftClick for Copy Metadata checkboxes - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Use checkboxShiftClick for Copy Metadata checkboxes
..
Use checkboxShiftClick for Copy Metadata checkboxes
With CheckboxShiftClick functionality, the user can change the state of
multiple checkboxes at once by pressing the shift key. This
functionality is enabled by default for all checkboxes that are present
when mw.hook('wikipage.content') is fired but not for checkboxes like
these that are dynamically generated using JavaScript.
Another way to achieve this would be firing the hook as soon as Upload
Wizard makes changes to the HTML DOM:
mw.hooks('wikipage.content').fire( content that was newly created );
This would have the downside that other scripts could interfere with
UploadWizards controls in unforeseeable ways.
Also did some cleanup:
* Marking instances of jQuery with $-prefix
* Declaring variables in the beginning of the function.
Change-Id: I97f95e10bcfd03105a7907d95c10a78d944083db
---
M UploadWizardHooks.php
M resources/mw.UploadWizardDetails.js
2 files changed, 17 insertions(+), 9 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index fce286d..73e4d94 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -13,6 +13,7 @@
'dependencies' = array(
'jquery.arrowSteps',
'jquery.autoEllipsis',
+ 'jquery.checkboxShiftClick',
'jquery.client',
'jquery.ui.core',
'jquery.ui.dialog',
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 9a244c2..dc975da 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -611,14 +611,16 @@
* a metadata copy widget for the details view of this specific upload
*/
buildAndShowCopyMetadata: function() {
- var _this = this;
+ var _this = this,
+ $copyMetadataDiv = $( 'div
class=mwe-upwiz-metadata-copier/div' ),
+ $checkboxes = $();
+
if( mw.UploadWizard.config.copyMetadataFeature !== true ||
_this.copyMetadataCtrlDiv !== undefined ) {
return;
}
_this.copyMetadataCtrlDiv = $( 'div
class=mwe-upwiz-details-copy-metadata/div' );
- var copyMetadataDiv = $( 'div
class=mwe-upwiz-metadata-copier/div' );
$.each( _this.copyMetadataTypes, function addToMetadataDiv(
metadataName, defaultStatus ) {
var copyMessage = 'mwe-upwiz-copy-' + metadataName,
@@ -630,15 +632,20 @@
copyMetadataMsg = mw.message( copyMessage
).text();
}
$checkbox = $( 'input' ).attr( 'type', 'checkbox'
).attr( 'name', copyMessage ).attr( 'id', copyMessage );
+ $checkboxes = $checkboxes.add( $checkbox );
if ( defaultStatus === true ) {
$checkbox.attr( 'checked', 'checked' );
}
- copyMetadataDiv.append( $checkbox );
- copyMetadataDiv.append( $( 'label for=' + copyMessage
+ '/label' ).text( copyMetadataMsg ) );
- copyMetadataDiv.append( $( 'br /' ) );
- } ) ;
- copyMetadataDiv.append(
+ $copyMetadataDiv
+ .append( $checkbox )
+ .append( $( 'label for=' + copyMessage +
'/label' ).text( copyMetadataMsg ) )
+ .append( $( 'br /' ) );
+ } ) ;
+ $checkboxes.checkboxShiftClick();
+
+
+ $copyMetadataDiv.append(
$( 'button type=button
id=mwe-upwiz-copy-metadata-button/button' )
.msg( 'mwe-upwiz-copy-metadata-button' )
.button()
@@ -661,11 +668,11 @@
mw.UploadWizardUtil.makeToggler(
_this.copyMetadataCtrlDiv,
- copyMetadataDiv,
+ $copyMetadataDiv,
'mwe-upwiz-copy-metadata'
);
- _this.$form.append( _this.copyMetadataCtrlDiv, copyMetadataDiv
);
+ _this.$form.append( _this.copyMetadataCtrlDiv, $copyMetadataDiv
);
_this.copyMetadataCtrlDiv.show();
},
--
To view, visit https://gerrit.wikimedia.org/r/84003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97f95e10bcfd03105a7907d95c10a78d944083db
[MediaWiki-commits] [Gerrit] Remove unused PersistenceException class - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused PersistenceException class
..
Remove unused PersistenceException class
This was renamed to Flow\Exception\DataPersistenceException some
time ago, but it seems the class is still hanging around.
Change-Id: I9064aa01291d2c4c4bf92edf8e30b15989bdd40a
---
M includes/Data/ObjectManager.php
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index 6279438..c207fd7 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -738,8 +738,6 @@
throw new DataModelException( 'Not Implemented', 'process-data'
);
}
}
-class PersistenceException extends \MWException {
-}
/**
* $userMapper = new BasicObjectMapper(
--
To view, visit https://gerrit.wikimedia.org/r/119213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9064aa01291d2c4c4bf92edf8e30b15989bdd40a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] More fix to diff link from contribution recentchange page - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: More fix to diff link from contribution recentchange page
..
More fix to diff link from contribution recentchange page
The diff link could be either header revision or post revision
Bug: 62162
Change-Id: I28d479ae73e81eb85854e8a38b013dcf6776bb65
---
M includes/Formatter/AbstractFormatter.php
M includes/Formatter/Contributions.php
M includes/Formatter/RecentChanges.php
3 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Formatter/AbstractFormatter.php
b/includes/Formatter/AbstractFormatter.php
index 8dc326d..3072343 100644
--- a/includes/Formatter/AbstractFormatter.php
+++ b/includes/Formatter/AbstractFormatter.php
@@ -253,17 +253,19 @@
* @param UUID $workflowId
* @param UUID $oldId
* @param UUID $newId
+* @param string $revisionType
+* @param string $blockName
* @return array Two element array with string url and Message object
*/
- public function revisionDiffLink( Title $title, UUID $workflowId, UUID
$oldId, UUID $newId ) {
+ public function revisionDiffLink( Title $title, UUID $workflowId, UUID
$oldId, UUID $newId, $revisionType, $blockName ) {
return array(
$this-urlGenerator-buildUrl(
$title,
- 'compare-post-revisions',
+ 'compare-' . $revisionType . '-revisions',
array(
'workflow' =
$workflowId-getAlphadecimal(),
- 'topic_oldRevision' =
$oldId-getAlphadecimal(),
- 'topic_newRevision' =
$newId-getAlphadecimal(),
+ $blockName . '_oldRevision' =
$oldId-getAlphadecimal(),
+ $blockName . '_newRevision' =
$newId-getAlphadecimal(),
)
),
wfMessage( 'diff' )
diff --git a/includes/Formatter/Contributions.php
b/includes/Formatter/Contributions.php
index a2f8479..0002db5 100644
--- a/includes/Formatter/Contributions.php
+++ b/includes/Formatter/Contributions.php
@@ -91,7 +91,9 @@
$title,
$workflow-getId(),
$revision-getRevisionId(),
- $revision-getPrevRevisionId()
+ $revision-getPrevRevisionId(),
+ $revision-getRevisionType(),
+ $row-blocktype
);
$diffLink = wfMessage( 'parentheses' )
-rawParams( Html::rawElement(
diff --git a/includes/Formatter/RecentChanges.php
b/includes/Formatter/RecentChanges.php
index 089b2a4..1aa94a3 100644
--- a/includes/Formatter/RecentChanges.php
+++ b/includes/Formatter/RecentChanges.php
@@ -84,7 +84,9 @@
$title,
$workflowId,
$revision-getRevisionId(),
- $revision-getPrevRevisionId()
+ $revision-getPrevRevisionId(),
+ $revision-getRevisionType(),
+ $changeData['block']
);
$diffLink = wfMessage( 'parentheses' )
-rawParams( Html::rawElement(
--
To view, visit https://gerrit.wikimedia.org/r/119230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28d479ae73e81eb85854e8a38b013dcf6776bb65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] Lint misc/logging.pp - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Lint misc/logging.pp
..
Lint misc/logging.pp
No functional change.
Change-Id: I879685ddf7b0dae469f2d6decefd35d9243440fb
---
M manifests/misc/logging.pp
1 file changed, 67 insertions(+), 67 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index 6698e2a..35c71c8 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -1,51 +1,51 @@
# misc/logging.pp
# any logging hosts
+class misc::syslog-server($config='nfs') {
-class misc::syslog-server($config=nfs) {
- system::role { misc::syslog-server: description = central syslog
server ($config) }
+system::role { 'misc::syslog-server': description = central syslog
server (${config}) }
- package { syslog-ng:
- ensure = latest;
- }
+package { 'syslog-ng':
+ensure = latest,
+}
- file { /etc/syslog-ng/syslog-ng.conf:
- owner = 'root',
- group = 'root',
- mode= '0444',
- source = puppet:///files/syslog-ng/syslog-ng.conf.${config},
- require = Package['syslog-ng'],
- }
-
- # FIXME: handle properly
- if $config == nfs {
- file { '/etc/logrotate.d/remote-logs':
- owner = 'root',
- group = 'root',
- mode= '0444',
- source = 'puppet:///files/syslog-ng/remote-logs';
- '/home/wikipedia/syslog':
- owner = 'root',
- group = 'root',
- mode = '0755';
- }
- }
+file { '/etc/syslog-ng/syslog-ng.conf':
+owner = 'root',
+group = 'root',
+mode= '0444',
+source = puppet:///files/syslog-ng/syslog-ng.conf.${config},
+require = Package['syslog-ng'],
+}
- service { syslog-ng:
- require = [ Package[syslog-ng],
File[/etc/syslog-ng/syslog-ng.conf] ],
- subscribe = File[/etc/syslog-ng/syslog-ng.conf],
- ensure = running;
- }
+# FIXME: handle properly
+if $config == 'nfs' {
+file { '/etc/logrotate.d/remote-logs':
+owner = 'root',
+group = 'root',
+mode= '0444',
+source = 'puppet:///files/syslog-ng/remote-logs',
+}
+file { '/home/wikipedia/syslog':
+owner = 'root',
+group = 'root',
+mode = '0755',
+}
+}
+
+service { 'syslog-ng':
+ensure= running,
+require = [
+Package['syslog-ng'],
+File['/etc/syslog-ng/syslog-ng.conf'],
+],
+subscribe = File['/etc/syslog-ng/syslog-ng.conf'],
+}
}
-
-
-
class misc::logging::socat {
- package { 'socat':
- ensure = 'installed',
- }
+package { 'socat':
+ensure = 'installed',
+}
}
-
# == Define misc::logging::multicast-relay
# Sets up a UDP unicast to multicast relay process.
@@ -56,40 +56,40 @@
# $destination_port
# $multicast - boolean. Default false. If true, the received traffic
will be relayed to multicast group specified by $destination_ip and
$destination_port.
define misc::logging::relay(
- $listen_port,
- $destination_ip,
- $destination_port,
- $multicast = false
+$listen_port,
+$destination_ip,
+$destination_port,
+$multicast = false
)
{
- require misc::logging::socat
+require misc::logging::socat
- # Configure and start the upstart job for
- # luanching the socat multicast relay daemon.
- # Note: Not using generic::upstart_job define here since
- # it doesn't support using ERb templates.
+# Configure and start the upstart job for
+# luanching the socat multicast relay daemon.
+# Note: Not using generic::upstart_job define here since
+# it doesn't support using ERb templates.
- if $multicast {
- $daemon_name = ${title}-multicast-relay
- }
- else {
- $daemon_name = ${title}-unicast-relay
- }
+if $multicast {
+$daemon_name = ${title}-multicast-relay
+}
+else {
+$daemon_name = ${title}-unicast-relay
+}
- # Create symlink
- file { /etc/init.d/${daemon_name}:
- ensure = 'link',
- target = '/lib/init/upstart-job';
- }
+# Create symlink
+file { /etc/init.d/${daemon_name}:
+ensure = 'link',
+target = '/lib/init/upstart-job',
+}
- file { /etc/init/${daemon_name}.conf:
- content = template('misc/logging-relay.upstart.conf.erb'),
- }
+file {
[MediaWiki-commits] [Gerrit] coredb_mysql: qualify vars - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: coredb_mysql: qualify vars
..
coredb_mysql: qualify vars
Change-Id: Ie968e39f58eff6410660e9cd2c7a76b8c1e45e4c
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 11 insertions(+), 11 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 92502bd..22c09fd 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -6,7 +6,7 @@
% ia = ipaddress.split('.'); server_id = ia[0] + ia[2] + ia[3]; %
server_id=%= server_id %
-% if read_only == false then -%
+% if @read_only == false then -%
# writes are enabled
read_only = 0
% else %
@@ -21,17 +21,17 @@
skip-external-locking
-% if skip_name_resolve == true then -%
+% if @skip_name_resolve == true then -%
skip-name-resolve
% end -%
-% if mysql_myisam == true then -%
+% if @mysql_myisam == true then -%
myisam-recover = QUICK
key_buffer = 1024M
% else %
key_buffer = 1M
% end -%
-max_allowed_packet = %= mysql_max_allowed_packet %
+max_allowed_packet = %= @mysql_max_allowed_packet %
thread_stack = 192K
thread_cache_size = 300
@@ -46,7 +46,7 @@
#log_queries_not_using_indexes
long_query_time = 0.45
-% if disable_binlogs != true then -%
+% if @disable_binlogs != true then -%
log_bin
log_slave_updates
sync_binlog = 1
@@ -62,7 +62,7 @@
temp-pool
-% if has_variable?(mariadb) and mariadb == true then -%
+% if @mariadb == true then -%
query_cache_type=0
# these were set as compile time defaults in our old 5.1 mysql builds
@@ -113,12 +113,12 @@
# might need to be even higher and innodb_stats_on_metadata=OFF
innodb_stats_sample_pages = 16
-% if has_variable?(mariadb) and mariadb == true then -%
+% if @mariadb == true then -%
# encourage more ref lookups when joining tables with nullable fields
innodb_stats_method = nulls_unequal
% end -%
-% if innodb_file_per_table == true then -%
+% if @innodb_file_per_table == true then -%
innodb_file_per_table
% end -%
@@ -126,17 +126,17 @@
#innodb-autoinc-lock-mode=2
#innodb-locks-unsafe-for-binlog
-% if long_timeouts == true then -%
+% if @long_timeouts == true then -%
interactive_timeout = 129600
wait_timeout = 129600
% end -%
-% if enable_unsafe_locks == true then -%
+% if @enable_unsafe_locks == true then -%
# since no binlogs on this slave, and writes only to intern db's
innodb-locks-unsafe-for-binlog
% end -%
-% if large_slave_trans_retries == true then -%
+% if @large_slave_trans_retries == true then -%
slave_transaction_retries = 4294967295
% end -%
--
To view, visit https://gerrit.wikimedia.org/r/119468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie968e39f58eff6410660e9cd2c7a76b8c1e45e4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
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] Remove redundant code and improve accuracy - change (mediawiki...UniversalLanguageSelector)
Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119480
Change subject: Remove redundant code and improve accuracy
..
Remove redundant code and improve accuracy
Change-Id: I00c6953a041b38c68b658377516a82e8aa9cdb6c
---
M resources/js/ext.uls.compactlinks.js
1 file changed, 2 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/80/119480/1
diff --git a/resources/js/ext.uls.compactlinks.js
b/resources/js/ext.uls.compactlinks.js
index c3fdcfc..27b0695 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -198,7 +198,7 @@
currentLangs = getInterlanguageList(),
numLanguages = 9,
minLanguages = 7,
- flagForNumberOfLangs = 0, i,
+ i,
finalList; //Final list of languages to be displayed on
page
if ( $numOfLangCurrently 9) {
@@ -206,7 +206,6 @@
if ( $numOfLangCurrently 9 $numOfLangCurrently =
12 ) {
finalList = displayLanguages( minLanguages );
} else {
- flagForNumberOfLangs = 1;
finalList = displayLanguages( numLanguages );
}
@@ -215,11 +214,7 @@
}
addULSlink();
- if ( !flagForNumberOfLangs ) {
- addLabel( $numOfLangCurrently, minLanguages );
- } else {
- addLabel( $numOfLangCurrently, numLanguages );
- }
+ addLabel( $numOfLangCurrently, finalList.length );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/119480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00c6953a041b38c68b658377516a82e8aa9cdb6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Niharika29 niharikakohl...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fall back to ... in [en] if language name isn't available - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119481
Change subject: Fall back to ... in [en] if language name isn't available
..
Fall back to ... in [en] if language name isn't available
The placeholders use two messages, one being language aware and one
not. The tooltips behind the [?] icons do not. A possible solution
would be to do the same and use two messages.
But:
1. Completely removing the information could be confusing,
escpecially if you have a Babel box and are prompted for
multiple languages.
2. I don't want to introduce new messages at the moment since we
are going to redesign the whole thing anyway.
3. It's not really relevant since this only happens in environments
where ULS is not available (e.g. some of our own test
environments).
Simply falling back to '[en]' instead of 'English' is a decent
workaround, in my opinion. It's the same format as in the watchlist
and log summary lines so users should recognize it.
Change-Id: I32a893bed54454ef4b0a947a85d0b78f06d5aa95
---
M lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/81/119481/1
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
index fd153d0..fab55b4 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
@@ -831,9 +831,11 @@
* @return string
*/
getInputHelpMessage: function() {
- var langName = wb.getLanguageNameByCode(
this.getValueLanguageContext() );
+ var langCode = this.getValueLanguageContext(),
+ langName = wb.getLanguageNameByCode( langCode );
+ // TODO: Currently shows the code (which is better than
nothing) if ULS is not available
return this._options.inputHelpMessageKey
- ? mw.msg( this._options.inputHelpMessageKey, langName )
+ ? mw.msg( this._options.inputHelpMessageKey, langName
|| '[' + langCode + ']' )
: '';
},
--
To view, visit https://gerrit.wikimedia.org/r/119481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32a893bed54454ef4b0a947a85d0b78f06d5aa95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove useless [% PROCESS global/variables.none.tmpl %] - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: Remove useless [% PROCESS global/variables.none.tmpl %]
..
Remove useless [% PROCESS global/variables.none.tmpl %]
It's PRE_PROCESS'ed now, as per
https://bugzilla.mozilla.org/show_bug.cgi?id=696256
Bug: 61499
Change-Id: I896bd7d8b233a1e495ec3320e4e9711d8f692b7f
---
M
extensions/WeeklyReport/template/en/default/weeklyreport/component-report.html.tmpl
M
extensions/WeeklyReport/template/en/default/weeklyreport/weekly-bug-summary.html.tmpl
M template/en/custom/account/auth/login-small.html.tmpl
M template/en/custom/account/auth/login.html.tmpl
M template/en/custom/bug/create/create-guided.html.tmpl
M template/en/custom/bug/create/user-message.html.tmpl
M template/en/custom/global/footer.html.tmpl
M template/en/custom/index.html.tmpl
8 files changed, 0 insertions(+), 16 deletions(-)
Approvals:
Aklapper: Looks good to me, but someone else must approve
Dzahn: Verified; Looks good to me, approved
diff --git
a/extensions/WeeklyReport/template/en/default/weeklyreport/component-report.html.tmpl
b/extensions/WeeklyReport/template/en/default/weeklyreport/component-report.html.tmpl
index 7c7c0ee..f855dc6 100644
---
a/extensions/WeeklyReport/template/en/default/weeklyreport/component-report.html.tmpl
+++
b/extensions/WeeklyReport/template/en/default/weeklyreport/component-report.html.tmpl
@@ -1,7 +1,5 @@
[%# KDE component report template #%]
-[% PROCESS global/variables.none.tmpl %]
-
[% PROCESS global/header.html.tmpl
title = Component Report
h1 = Report Count by Component and Severity
diff --git
a/extensions/WeeklyReport/template/en/default/weeklyreport/weekly-bug-summary.html.tmpl
b/extensions/WeeklyReport/template/en/default/weeklyreport/weekly-bug-summary.html.tmpl
index a2d7f68..19825c4 100644
---
a/extensions/WeeklyReport/template/en/default/weeklyreport/weekly-bug-summary.html.tmpl
+++
b/extensions/WeeklyReport/template/en/default/weeklyreport/weekly-bug-summary.html.tmpl
@@ -1,7 +1,5 @@
[%# Wikimedia weekly bug summary template #%]
-[% PROCESS global/variables.none.tmpl %]
-
[% PROCESS global/header.html.tmpl
title = Wikimedia Weekly Bug Summary
%]
diff --git a/template/en/custom/account/auth/login-small.html.tmpl
b/template/en/custom/account/auth/login-small.html.tmpl
index a4cb14e..3878c0d 100644
--- a/template/en/custom/account/auth/login-small.html.tmpl
+++ b/template/en/custom/account/auth/login-small.html.tmpl
@@ -18,8 +18,6 @@
# Contributor(s): Jacob Steenhagen j...@bugzilla.org
#%]
-[% PROCESS global/variables.none.tmpl %]
-
[%# Use the current script name. If an empty name is returned,
# then we are accessing the home page. %]
diff --git a/template/en/custom/account/auth/login.html.tmpl
b/template/en/custom/account/auth/login.html.tmpl
index bd100cc..12bb611 100644
--- a/template/en/custom/account/auth/login.html.tmpl
+++ b/template/en/custom/account/auth/login.html.tmpl
@@ -26,8 +26,6 @@
[% IF !target %]
[% target = index.cgi %]
[% END %]
-
-[% PROCESS global/variables.none.tmpl %]
[% PROCESS global/header.html.tmpl
title = Log in to $terms.Bugzilla,
diff --git a/template/en/custom/bug/create/create-guided.html.tmpl
b/template/en/custom/bug/create/create-guided.html.tmpl
index f371acf..35ec6aa 100644
--- a/template/en/custom/bug/create/create-guided.html.tmpl
+++ b/template/en/custom/bug/create/create-guided.html.tmpl
@@ -23,8 +23,6 @@
# This template has the same interface as create.html.tmpl
#%]
-[% PROCESS global/variables.none.tmpl %]
-
[% USE Bugzilla %]
[% cgi = Bugzilla.cgi %]
diff --git a/template/en/custom/bug/create/user-message.html.tmpl
b/template/en/custom/bug/create/user-message.html.tmpl
index d5898b8..9ad47d7 100644
--- a/template/en/custom/bug/create/user-message.html.tmpl
+++ b/template/en/custom/bug/create/user-message.html.tmpl
@@ -27,6 +27,4 @@
# the 'product' variable.
#%]
-[% PROCESS global/variables.none.tmpl %]
-
Before reporting [% terms.abug %], please read the a target=_blank
href=https://www.mediawiki.org/wiki/How_to_report_a_bug;guidelines/a and a
href=query.cgisearch/a for existing [% terms.bug %] reports. If you prefer
a simpler way to create a [% terms.bug %] report, try the a
href=enter_bug.cgi?format=guidedamp;product=[% product.name %]guided bug
entry form/a.
diff --git a/template/en/custom/global/footer.html.tmpl
b/template/en/custom/global/footer.html.tmpl
index 1dd43eb..e92e492 100644
--- a/template/en/custom/global/footer.html.tmpl
+++ b/template/en/custom/global/footer.html.tmpl
@@ -1,4 +1,3 @@
-[% PROCESS global/variables.none.tmpl %]
div class=visualClear/div
[% Hook.process('main-end') %]
/div
diff --git a/template/en/custom/index.html.tmpl
b/template/en/custom/index.html.tmpl
index baab02f..a40fb20 100644
---
[MediaWiki-commits] [Gerrit] contint: use role::labs::lvm::mnt on eqiad slaves - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119483
Change subject: contint: use role::labs::lvm::mnt on eqiad slaves
..
contint: use role::labs::lvm::mnt on eqiad slaves
Andrew Bogott introduced a role class to allocate the eqiad instance
disk and mount it at /mnt. Use that role instead of a local hack.
Reference:
8e459cfd / https://gerrit.wikimedia.org/r/#/c/119398/
Change-Id: Iafb30f0c2dcde471d2e8f917da3cf94630aba360
---
M manifests/role/ci.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/119483/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 39d067d..d6acd5f 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -164,8 +164,8 @@
if $::site == 'eqiad' {
# Does not come with /dev/vdb, we need to mount it using lvm
-require labs_lvm
-labs_lvm::volume { 'second-local-disk': mountat = '/mnt' }
+require role::labs::lvm::mnt
+
# Will make sure /mnt is mounted before populating file there or they
# might end up being being created locally and hidden by the mount.
$slash_mnt_require = Mount['/mnt']
--
To view, visit https://gerrit.wikimedia.org/r/119483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafb30f0c2dcde471d2e8f917da3cf94630aba360
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] characterEditStats.php uses RC table, mention $wgRCMaxAge li... - change (mediawiki...Translate)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/119482 Change subject: characterEditStats.php uses RC table, mention $wgRCMaxAge limits .. characterEditStats.php uses RC table, mention $wgRCMaxAge limits Change-Id: I76aed23be2788ae09bebb05084418b1d39143b00 --- M scripts/characterEditStats.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/82/119482/1 diff --git a/scripts/characterEditStats.php b/scripts/characterEditStats.php index 6f341ef..782d008 100644 --- a/scripts/characterEditStats.php +++ b/scripts/characterEditStats.php @@ -30,7 +30,8 @@ ); $this-addOption( 'days', - '(optional) Calculate for given number of days (default: 30)', + '(optional) Calculate for given number of days (default: 30) ' . + '(capped by the max age of recent changes on the wiki)', false, /*required*/ true /*has arg*/ ); -- To view, visit https://gerrit.wikimedia.org/r/119482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76aed23be2788ae09bebb05084418b1d39143b00 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add HTML text to embed tab - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Add HTML text to embed tab
..
Add HTML text to embed tab
Change-Id: Idcafe6dad9ffb17ffac365a350feff3903b37ff3
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/148
---
M resources/mmv/mmv.EmbedFileFormatter.js
M resources/mmv/mmv.js
M resources/mmv/ui/mmv.ui.reuse.embed.js
M tests/qunit/mmv/mmv.EmbedFileFormatter.test.js
M tests/qunit/mmv/ui/mmv.ui.reuse.embed.test.js
5 files changed, 717 insertions(+), 14 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.EmbedFileFormatter.js
b/resources/mmv/mmv.EmbedFileFormatter.js
index 30e403c..8065593 100644
--- a/resources/mmv/mmv.EmbedFileFormatter.js
+++ b/resources/mmv/mmv.EmbedFileFormatter.js
@@ -15,7 +15,7 @@
* along with MediaViewer. If not, see http://www.gnu.org/licenses/.
*/
-( function( mw ) {
+( function( mw, $ ) {
var AFP;
/**
@@ -56,5 +56,98 @@
caption ? caption.plain : title.getNameText() );
};
+ /**
+* Byline construction
+* @param {{html: string, plain: string}} [author]
+* @param {{html: string, plain: string}} [source]
+* @return {{html: string, plain: string}} byline in plain text and html
+*/
+ AFP.getBylines = function ( author, source ) {
+ var bylines = {};
+
+ if ( author source) {
+ bylines.plain = mw.message(
+ 'multimediaviewer-credit',
+ author.plain,
+ source.plain
+ ).text();
+
+ bylines.html = mw.message(
+ 'multimediaviewer-credit',
+ author.html,
+ source.html
+ ).parse();
+ } else if ( author ) {
+ bylines.plain = author.plain;
+ bylines.html = author.html;
+ } else if ( source ) {
+ bylines.plain = source.plain;
+ bylines.html = source.html;
+ }
+
+ return bylines;
+ };
+
+ /**
+* Generates the HTML embed code for the image credit line.
+* @param {mw.mmv.model.EmbedFileInfo} info
+* @return {string}
+*/
+ AFP.getCreditHtml = function ( info ) {
+ var creditText, creditFormat, creditParams,
+ title = info.title.getNameText(),
+ bylines = this.getBylines( info.author, info.source );
+
+ creditFormat = 't';
+ creditParams = [ title ];
+ if ( bylines.html ) {
+ creditFormat += 'b';
+ creditParams.push( bylines.html );
+ }
+ if ( info.license info.license.plain.length ) {
+ creditFormat += 'l';
+ creditParams.push( info.license.plain );
+ }
+ if ( info.siteName ) {
+ creditFormat += 's';
+ creditParams.push( info.siteName );
+ }
+
+ if ( creditFormat === 't' || creditFormat === 'ts' ) {
+ creditText = '' + title + '';
+ } else {
+ creditParams.unshift(
'multimediaviewer-html-embed-credit-text-' + creditFormat );
+ creditText = mw.message.apply( mw, creditParams
).plain();
+ }
+
+ return creditText;
+ };
+
+ /**
+* Generates the HTML embed code for the image.
+*
+* @param {mw.mmv.model.EmbedFileInfo} info
+* @param {string} imgUrl URL to the file itself.
+* @param {number} [width] Width to put into the image element.
+* @param {number} [height] Height to put into the image element.
+* @return {string} Embed code.
+*/
+ AFP.getThumbnailHtml = function ( info, imgUrl, width, height ) {
+ return $( 'div' ).append(
+ $( 'p' ).append(
+ $( 'a' )
+ .attr( 'href', info.url )
+ .append(
+ $( 'img' )
+ .attr( 'src', imgUrl )
+ .attr( 'height', height
)
+ .attr( 'width', width )
+ ),
+ $( 'br' ),
+ this.getCreditHtml( info )
+ )
+ ).html();
+
[MediaWiki-commits] [Gerrit] Add embed tab to reuse dialog - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Add embed tab to reuse dialog .. Add embed tab to reuse dialog Implements the wikitext part of the mingle card Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/148 Change-Id: I5bcd8e2171f45c70736b7a7cfc695134269ed12d --- M MultimediaViewer.php M MultimediaViewerHooks.php A resources/mmv/mmv.EmbedFileFormatter.js A resources/mmv/model/mmv.model.EmbedFileInfo.js M resources/mmv/ui/mmv.ui.metadataPanel.js M resources/mmv/ui/mmv.ui.reuse.dialog.js A resources/mmv/ui/mmv.ui.reuse.embed.js A resources/mmv/ui/mmv.ui.reuse.embed.less A tests/qunit/mmv/mmv.EmbedFileFormatter.test.js M tests/qunit/mmv/model/mmv.model.test.js M tests/qunit/mmv/ui/mmv.ui.reuse.dialog.test.js A tests/qunit/mmv/ui/mmv.ui.reuse.embed.test.js 12 files changed, 1,041 insertions(+), 12 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.php b/MultimediaViewer.php index d18d364..1d76e19 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -96,6 +96,16 @@ ), ), $moduleInfo( 'mmv/model' ) ); + $wgResourceModules['mmv.model.EmbedFileInfo'] = array_merge( array( + 'scripts' = array( + 'mmv.model.EmbedFileInfo.js', + ), + + 'dependencies' = array( + 'mmv.model', + ), + ), $moduleInfo( 'mmv/model' ) ); + $wgResourceModules['mmv.model.FileUsage'] = array_merge( array( 'scripts' = array( 'mmv.model.FileUsage.js', @@ -353,6 +363,29 @@ ), ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.embedFileFormatter'] = array_merge( array( + 'scripts' = array( + 'mmv.EmbedFileFormatter.js', + ), + + 'dependencies' = array( + 'mmv.base', + 'oojs', + ), + + 'messages' = array( + 'multimediaviewer-credit', + + 'multimediaviewer-html-embed-credit-text-tbls', + 'multimediaviewer-html-embed-credit-text-tls', + 'multimediaviewer-html-embed-credit-text-tbs', + 'multimediaviewer-html-embed-credit-text-tbl', + 'multimediaviewer-html-embed-credit-text-tb', + 'multimediaviewer-html-embed-credit-text-ts', + 'multimediaviewer-html-embed-credit-text-tl', + ), + ), $moduleInfo( 'mmv' ) ); + $wgResourceModules['mmv.ui.reuse.dialog'] = array_merge( array( 'scripts' = array( 'mmv.ui.reuse.dialog.js', @@ -367,6 +400,7 @@ 'oojs', 'oojs-ui', 'mmv.ui.reuse.share', + 'mmv.ui.reuse.embed', ), 'messages' = array( @@ -412,6 +446,40 @@ ), ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.ui.reuse.embed'] = array_merge( array( + 'scripts' = array( + 'mmv.ui.reuse.embed.js', + ), + + 'styles' = array( + 'mmv.ui.reuse.embed.less', + ), + + 'dependencies' = array( + 'mmv.ui.reuse.tab', + 'oojs', + 'oojs-ui', + 'mmv.model.EmbedFileInfo', + 'mmv.embedFileFormatter', + ), + + 'messages' = array( + 'multimediaviewer-embed-tab', + 'multimediaviewer-embed-html', + 'multimediaviewer-embed-wt', + + 'multimediaviewer-embed-byline', + 'multimediaviewer-embed-license', + 'multimediaviewer-embed-via', + + 'multimediaviewer-default-embed-size', + 'multimediaviewer-original-embed-size', + 'multimediaviewer-large-embed-size', + 'multimediaviewer-medium-embed-size', + 'multimediaviewer-small-embed-size', + ), + ), $moduleInfo( 'mmv/ui' ) ); + $wgResourceModules['mmv.ui.buttons'] = array_merge( array( 'scripts' = array( 'mmv.ui.buttons.js', diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php index 94f270e..412b668 100644 --- a/MultimediaViewerHooks.php +++ b/MultimediaViewerHooks.php @@ -125,6 +125,7 @@ 'tests/qunit/mmv/mmv.lightboxinterface.test.js',
[MediaWiki-commits] [Gerrit] Show who moderated the most recent revision - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Show who moderated the most recent revision
..
Show who moderated the most recent revision
Change-Id: I14152b1a20557598211aeff7b2f685769af2568e
---
M includes/Templating.php
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Templating.php b/includes/Templating.php
index 331e4c9..a9e463a 100644
--- a/includes/Templating.php
+++ b/includes/Templating.php
@@ -339,6 +339,7 @@
if ( $this-permissions-isAllowed( $revision, 'view' ) ) {
return $this-usernames-get( wfWikiId(),
$revision-getUserId(), $revision-getUserIp() );
} else {
+ $revision = $this-getModeratedRevision( $revision );
$username = $this-usernames-get(
wfWikiId(),
$revision-getModeratedByUserId(),
@@ -371,6 +372,7 @@
$username = $this-usernames-get( wfWikiId(),
$revision-getUserId(), $revision-getUserIp() );
return Linker::userLink( $userid, $username ) .
Linker::userToolLinks( $userid, $username );
} else {
+ $revision = $this-getModeratedRevision( $revision );
$state = $revision-getModerationState();
$username = $this-usernames-get(
wfWikiId(),
@@ -414,6 +416,7 @@
$revision-getCreatorIp()
);
} else {
+ $revision = $this-getModeratedRevision( $revision );
$state = $revision-getModerationState();
$username = $this-usernames-get(
wfWikiId(),
@@ -463,6 +466,7 @@
return $content;
} else {
+ $revision = $this-getModeratedRevision( $revision );
$username = $this-usernames-get(
wfWikiId(),
$revision-getModeratedByUserId(),
@@ -494,6 +498,7 @@
if ( $state === $revision::MODERATED_NONE ) {
return '';
}
+ $revision = $this-getModeratedRevision( $revision );
$username = $this-usernames-get(
wfWikiId(),
$revision-getModeratedByUserId(),
@@ -527,4 +532,11 @@
}
}
+ protected function getModeratedRevision( AbstractRevision $revision ) {
+ if ( $revision-isModerated() ) {
+ return $revision;
+ } else {
+ return Container::get( 'collection.cache'
)-getLastRevisionFor( $revision );
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/117382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14152b1a20557598211aeff7b2f685769af2568e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] redis: hostname is a fact - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: redis: hostname is a fact
..
redis: hostname is a fact
Change-Id: I32088baa585fc291bd2f504b84592cc8d14feba2
---
M modules/redis/templates/redis.conf.erb
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index 0f04a16..eed5c00 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -127,7 +127,7 @@
rdbchecksum yes
# The filename where to dump the DB
-dbfilename %= hostname %-%= port %.rdb
+dbfilename %= @hostname %-%= port %.rdb
# The working directory.
#
@@ -149,9 +149,9 @@
#
# slaveof masterip masterport
% if @redis_replication and redis_replication.has_key?('site') and
redis_replication['site'] -%
-slaveof %= redis_replication[hostname] %.%= redis_replication['site'] %
%= port %
-% elsif @redis_replication and redis_replication.has_key?(hostname) -%
-slaveof %= redis_replication[hostname] % %= port %
+slaveof %= redis_replication[@hostname] %.%= redis_replication['site'] %
%= port %
+% elsif @redis_replication and redis_replication.has_key?(@hostname) -%
+slaveof %= redis_replication[@hostname] % %= port %
% end -%
# If the master is password protected (using the requirepass configuration
@@ -358,7 +358,7 @@
appendonly no
% end -%
# The name of the append only file (default: appendonly.aof)
-appendfilename %= hostname %-%= port %.aof
+appendfilename %= @hostname %-%= port %.aof
# The fsync() call tells the Operating System to actually write data on disk
# instead to wait for more data in the output buffer. Some OS will really flush
--
To view, visit https://gerrit.wikimedia.org/r/119259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32088baa585fc291bd2f504b84592cc8d14feba2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] Remove title must exist requirement - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove title must exist requirement
..
Remove title must exist requirement
At one point parsoid required a page title to exist to
convert back and forth. That requirement no longer exists
and we shouldn't enforce it.
Bug: 61873
Change-Id: I6fa29c3201cd69474c168438b83c6bca559b
---
M FlowActions.php
M includes/Block/Header.php
M includes/Block/TopicList.php
M includes/Parsoid/Utils.php
M includes/api/ApiParsoidUtilsFlow.php
5 files changed, 1 insertion(+), 31 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlowActions.php b/FlowActions.php
index a2c865e..fdb1740 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -466,7 +466,7 @@
if ( $revision-getChangeType() ==
'restore-post' ) {
$previous =
$collection-getPrevRevision( $revision );
- if ( $previous-getModerationState()
=== AbstractRevision::MODERATED_NONE ) {
+ if ( $previous === null ||
$previous-getModerationState() === AbstractRevision::MODERATED_NONE ) {
return '';
}
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 36c80c4..8e542e6 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -6,7 +6,6 @@
use Flow\Exception\InvalidActionException;
use Flow\Exception\InvalidInputException;
use Flow\Model\Header;
-use Flow\OccupationController;
use Flow\RevisionActionPermissions;
use Flow\Templating;
use Flow\View\HeaderRevisionView;
@@ -121,14 +120,6 @@
// is this even worth checking?
$this-addError( 'prev_revision', wfMessage(
'flow-error-prev-revision-does-not-exist' ) );
return;
- }
-
- $title = $this-workflow-getArticleTitle();
- if ( !$title-exists() ) {
- // if $wgFlowContentFormat is set to html the
Header::create
- // call will convert the wikitext input into html via
parsoid, and
- // parsoid requires the page exist.
- Container::get( 'occupation_controller'
)-ensureFlowRevision( new \Article( $title, 0 ) );
}
$this-header = Header::create( $this-workflow, $this-user,
$this-submitted['content'], 'create-header' );
diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index 3c8a6dc..1321cd5 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -12,7 +12,6 @@
use Flow\Model\UUID;
use Flow\Model\Workflow;
use Flow\NotificationController;
-use Flow\OccupationController;
use Flow\RevisionActionPermissions;
use Flow\Templating;
use Flow\Exception\FailCommitException;
@@ -127,15 +126,6 @@
$title = $this-workflow-getArticleTitle();
$topicWorkflow = Workflow::create( $topicDef, $this-user,
$title );
$topicListEntry = TopicListEntry::create( $this-workflow,
$topicWorkflow );
-
- if ( !$title-exists() ) {
- // if $wgFlowContentFormat is set to html the
PostRevision::create
- // call will convert the wikitext input into html via
parsoid, and
- // parsoid requires the page exist.
- /** @var OccupationController $occupationController */
- $occupationController = Container::get(
'occupation_controller' );
- $occupationController-ensureFlowRevision( new
\Article( $title, 0 ) );
- }
$topicPost = PostRevision::create( $topicWorkflow,
$this-submitted['topic'] );
$firstPost = null;
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index c78f3a9..f3ccb47 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -24,11 +24,6 @@
$section = new \ProfileSection( __METHOD__ );
- // Parsoid will fail if title does not exist
- if ( !$title-exists() ) {
- throw new InvalidDataException( 'Title ' .
$title-getPrefixedDBkey() . ' does not exist.', 'invalid-title' );
- }
-
try {
// use VE API (which connects to Parsoid) if
available...
$res = self::parsoid( $from, $to, $content, $title );
diff --git a/includes/api/ApiParsoidUtilsFlow.php
b/includes/api/ApiParsoidUtilsFlow.php
index 1868446..2d48f31 100644
--- a/includes/api/ApiParsoidUtilsFlow.php
+++ b/includes/api/ApiParsoidUtilsFlow.php
@@ -11,12 +11,6 @@
$params = $this-extractRequestParams();
[MediaWiki-commits] [Gerrit] Remove unused local variables - change (mediawiki...MobileFrontend)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119484
Change subject: Remove unused local variables
..
Remove unused local variables
Change-Id: I8b9d20d44db9f5fdc427bd80a28712c2f65ad285
---
M includes/MobilePage.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/84/119484/1
diff --git a/includes/MobilePage.php b/includes/MobilePage.php
index 9e2d425..b24ca65 100644
--- a/includes/MobilePage.php
+++ b/includes/MobilePage.php
@@ -57,9 +57,7 @@
private function getPageImageHtml( $size, $useBackgroundImage = false )
{
$imageHtml = '';
// FIXME: Use more generic classes - no longer restricted to
lists
- $className = 'listThumb needsPhoto';
if ( $this-usePageImages ) {
- $title = $this-title;
$file = $this-file;
if ( $file ) {
$thumb = $file-transform( array( 'width' =
$size ) );
@@ -84,4 +82,4 @@
return $imageHtml;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/119484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b9d20d44db9f5fdc427bd80a28712c2f65ad285
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clear the cursor hiding class when attaching the lightbox - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/119485 Change subject: Clear the cursor hiding class when attaching the lightbox .. Clear the cursor hiding class when attaching the lightbox This ensures that if fullscreen was exited with the cursor hidden reopening the lightbox should happen with a visible cursor Change-Id: I33846234fd4c314ff9ff924e9f42d4e8c5c5bd8d Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/288 --- M resources/mmv/mmv.lightboxinterface.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/85/119485/1 diff --git a/resources/mmv/mmv.lightboxinterface.js b/resources/mmv/mmv.lightboxinterface.js index 3b1357b..d330589 100644 --- a/resources/mmv/mmv.lightboxinterface.js +++ b/resources/mmv/mmv.lightboxinterface.js @@ -189,6 +189,9 @@ // This needs to happen after the parent attach() because the buttons need to be attached // to the DOM for $.fn.stop() to work this.buttons.stopFade(); + + // Reset the cursor fading + this.fadeStopped(); }; /** -- To view, visit https://gerrit.wikimedia.org/r/119485 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33846234fd4c314ff9ff924e9f42d4e8c5c5bd8d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add method to inject a workflow into the urlgenerators workf... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Add method to inject a workflow into the urlgenerators workflow
cache
..
Add method to inject a workflow into the urlgenerators workflow cache
Change-Id: Icff94d309c2f9e32b984de65a49faee52c4d74ac
---
M includes/UrlGenerator.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index d064bc2..f592a3f 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -170,4 +170,8 @@
return $this-buildUrlData( $workflow-getArticleTitle(),
$action, $query );
}
+
+ public function withWorkflow( Workflow $workflow ) {
+ $this-workflows[$workflow-getId()-getAlphadecimal()] =
$workflow;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/116673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icff94d309c2f9e32b984de65a49faee52c4d74ac
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] Make FlowActions accessible from permissions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Make FlowActions accessible from permissions
..
Make FlowActions accessible from permissions
Change-Id: I27ef48ce19ae159eee9035937641e26dde3ec1b2
---
M includes/RevisionActionPermissions.php
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/RevisionActionPermissions.php
b/includes/RevisionActionPermissions.php
index 2ee9a65..1749d62 100644
--- a/includes/RevisionActionPermissions.php
+++ b/includes/RevisionActionPermissions.php
@@ -166,4 +166,11 @@
public function getUser() {
return $this-user;
}
+
+ /**
+* @return FlowActions
+*/
+ public function getActions() {
+ return $this-actions;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/116674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27ef48ce19ae159eee9035937641e26dde3ec1b2
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] A cookie can optionally be set when starting the browser - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119487
Change subject: A cookie can optionally be set when starting the browser
..
A cookie can optionally be set when starting the browser
Paired with Chris McMahon.
Also extracted getting browser name to a method. Releasing 0.2.14 patch
version of the gem.
Bug: 62512
Change-Id: I0b647f98162d0070f3df8c14471d8d337daaca3f
---
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/version.rb
2 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/87/119487/1
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 1539106..4283a71 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -26,6 +26,13 @@
local_browser(configuration)
end
end
+def browser_name
+ if ENV[BROWSER]
+ENV[BROWSER].to_sym
+ else
+:firefox
+ end
+end
def environment
if ENV[SAUCE_ONDEMAND_USERNAME] and ENV[SAUCE_ONDEMAND_ACCESS_KEY] and
ENV[BROWSER] != phantomjs
:saucelabs
@@ -34,12 +41,6 @@
end
end
def local_browser(configuration)
- if ENV[BROWSER]
-browser_name = ENV[BROWSER].to_sym
- else
-browser_name = :firefox
- end
-
if ENV[BROWSER_TIMEOUT] browser_name == :firefox
timeout = ENV[BROWSER_TIMEOUT].to_i
@@ -70,6 +71,7 @@
end
browser.window.resize_to 1280, 1024
+ set_cookie
browser
end
def sauce_api(json)
@@ -129,6 +131,9 @@
browser
end
+def set_cookie
+ # implement this method in env.rb of the repository where it is needed
+end
def test_name(scenario)
if scenario.respond_to? :feature
#{scenario.feature.name}: #{scenario.name}
diff --git a/lib/mediawiki_selenium/version.rb
b/lib/mediawiki_selenium/version.rb
index 40e1aa8..d2af553 100644
--- a/lib/mediawiki_selenium/version.rb
+++ b/lib/mediawiki_selenium/version.rb
@@ -10,5 +10,5 @@
=end
module MediawikiSelenium
- VERSION = 0.2.13
+ VERSION = 0.2.14
end
--
To view, visit https://gerrit.wikimedia.org/r/119487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b647f98162d0070f3df8c14471d8d337daaca3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@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] beta: fill in swift backend for upload varnish - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: beta: fill in swift backend for upload varnish
..
beta: fill in swift backend for upload varnish
The beta cluster is lacking a Swift cluster. We are using an instance
with Nginx which serves thumbnails much like we used to do in production
back in 2013.
The instance is not puppetized, we will look at adding a Swift cluster
later on. Meanwhile the instance got copy pasted from pmtpa to eqiad
and we have to fill in the LVS configuration used by the upload varnish
as a backend.
Since the LVS configuration hash vary by realm, it must be a noon
for production.
Change-Id: Id76d593dedff0a1ba3ed5ee524386d61f2c63598
---
M modules/lvs/manifests/configuration.pp
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 6936e3f..5eb95ab 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -342,6 +342,9 @@
'search_poolbeta' = {},
'search_prefix' = {},
'swift' = {
+# ms emulator set in July 2013. Beta does not have Swift yet.
+# instance is an unpuppetized hack with nginx proxy.
+'eqiad' = '10.68.16.189', # deployment-upload.eqiad.wmflabs
'pmtpa' = '10.4.1.103', # deployment-upload.pmtpa.wmflabs
},
'payments' = {},
--
To view, visit https://gerrit.wikimedia.org/r/119478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id76d593dedff0a1ba3ed5ee524386d61f2c63598
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] A cookie can optionally be set when starting the browser - change (mediawiki/selenium)
Cmcmahon has submitted this change and it was merged.
Change subject: A cookie can optionally be set when starting the browser
..
A cookie can optionally be set when starting the browser
Paired with Chris McMahon.
Also extracted getting browser name to a method. Releasing 0.2.14 patch
version of the gem.
Bug: 62512
Change-Id: I0b647f98162d0070f3df8c14471d8d337daaca3f
---
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/version.rb
2 files changed, 12 insertions(+), 7 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 1539106..4283a71 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -26,6 +26,13 @@
local_browser(configuration)
end
end
+def browser_name
+ if ENV[BROWSER]
+ENV[BROWSER].to_sym
+ else
+:firefox
+ end
+end
def environment
if ENV[SAUCE_ONDEMAND_USERNAME] and ENV[SAUCE_ONDEMAND_ACCESS_KEY] and
ENV[BROWSER] != phantomjs
:saucelabs
@@ -34,12 +41,6 @@
end
end
def local_browser(configuration)
- if ENV[BROWSER]
-browser_name = ENV[BROWSER].to_sym
- else
-browser_name = :firefox
- end
-
if ENV[BROWSER_TIMEOUT] browser_name == :firefox
timeout = ENV[BROWSER_TIMEOUT].to_i
@@ -70,6 +71,7 @@
end
browser.window.resize_to 1280, 1024
+ set_cookie
browser
end
def sauce_api(json)
@@ -129,6 +131,9 @@
browser
end
+def set_cookie
+ # implement this method in env.rb of the repository where it is needed
+end
def test_name(scenario)
if scenario.respond_to? :feature
#{scenario.feature.name}: #{scenario.name}
diff --git a/lib/mediawiki_selenium/version.rb
b/lib/mediawiki_selenium/version.rb
index 40e1aa8..d2af553 100644
--- a/lib/mediawiki_selenium/version.rb
+++ b/lib/mediawiki_selenium/version.rb
@@ -10,5 +10,5 @@
=end
module MediawikiSelenium
- VERSION = 0.2.13
+ VERSION = 0.2.14
end
--
To view, visit https://gerrit.wikimedia.org/r/119487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b647f98162d0070f3df8c14471d8d337daaca3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@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] Remove current implementation of getInfo() - change (mediawiki...MWSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove current implementation of getInfo()
..
Remove current implementation of getInfo()
I7dc8cbe reworks the implementation and MWSearch
is no longer compatible.
Bug: 62768
Change-Id: I7a6768ad9d38bf3a03cbe50c5fb91660d4397dc0
---
M MWSearch_body.php
1 file changed, 0 insertions(+), 12 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MWSearch_body.php b/MWSearch_body.php
index 8f8b3c9..7be389e 100644
--- a/MWSearch_body.php
+++ b/MWSearch_body.php
@@ -708,18 +708,6 @@
}
/**
-* Return information about how and from where the results were fetched,
-* should be useful for diagnostics and debugging
-*
-* @return string
-*/
- function getInfo() {
- if( is_null($this-mInfo) )
- return null;
- return Search results fetched via .$this-mInfo;
- }
-
- /**
* Return a result set of hits on other (multiple) wikis associated
with this one
*
* @return SearchResultSet
--
To view, visit https://gerrit.wikimedia.org/r/119236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a6768ad9d38bf3a03cbe50c5fb91660d4397dc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MWSearch
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@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] Link to existing login help page by default from helplogin-url - change (mediawiki/core)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119489
Change subject: Link to existing login help page by default from helplogin-url
..
Link to existing login help page by default from helplogin-url
Detailed rationale discussed on bugzilla, bug 53888 and parent,
where consensus on the design was gained.
Using https link per Brion et al. in comments and bug 54835,
with new keys for the messages in order to avoid any conflict
with existing messages. (The translations of the removed messages
will be automatically removed by localisation updates.)
https://www.mediawiki.org/wiki/Help:Logging_in was improved by Lloffiwr
and now also marked for translation. The link is ready for future
translations thanks to the use of the standard Special:MyLanguage, hence
the message is made ignored to allow customisations only locally.
Bug: 53888
Change-Id: I8cefafbcd3bd1d6a03cec7cf1d0efdf607fec21d
Conflicts:
languages/messages/MessagesQqq.php
---
M RELEASE-NOTES-1.22
M includes/templates/Userlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
6 files changed, 33 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/119489/1
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 284ef1f..66a3bb9 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -3,6 +3,18 @@
Security reminder: MediaWiki does not require PHP's register_globals. If you
have it on, turn it '''off''' if you can.
+== MediaWiki 1.22.5 ==
+
+This is a maintenance release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.4 ===
+
+* (bug 53888) Corrected a regression in 1.22 which introduced red links on the
+ login page. If you previously installed 1.22.x and have created a local page
+ to make the red link blue, write its title as in [[MediaWiki:helplogin-url]]
+ if you didn't already. Otherwise, you don't need to do anything, but you can
+ translate the help page at https://www.mediawiki.org/wiki/Help:Logging_in .
+
== MediaWiki 1.22.4 ==
This is a maintenance release of the MediaWiki 1.22 branch.
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 5eb6094..9aedd3c 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -154,9 +154,18 @@
) );
?
/div
-
div id=mw-userlogin-help
- ?php echo $this-getMsg( 'userlogin-helplink'
)-parse(); ?
+ ?php
+ echo Html::element(
+ 'a',
+ array(
+ 'href' =
Skin::makeInternalOrExternalUrl(
+ wfMessage(
'helplogin-url' )-inContentLanguage()-text()
+ ),
+ ),
+ $this-getMsg( 'userlogin-helplink2'
)-text()
+ );
+ ?
/div
?php if ( $this-haveData( 'createOrLoginHref' ) ) { ?
?php if ( $this-data['loggedin'] ) { ?
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index e0ff25e..26ce598 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1131,8 +1131,8 @@
'gotaccountlink' = 'Log in',
'userlogin-resetlink' = 'Forgotten your login details?',
'userlogin-resetpassword-link'= 'Forgot your password?',
-'helplogin-url' = 'Help:Logging in',
-'userlogin-helplink' = '[[{{MediaWiki:helplogin-url}}|Help with
logging in]]',
+'helplogin-url' =
'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Logging_in',
+'userlogin-helplink2' = 'Help with logging in',
'userlogin-loggedin' = 'You are already logged in as
{{GENDER:$1|$1}}.
Use the form below to log in as another user.',
'userlogin-createanother' = 'Create another account',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 63dc845..741f329 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1343,13 +1343,13 @@
See example: [[Special:UserLogin]]
-userlogin-resetpassword-link may have to be shorter than the old
{{msg-mw|userlogin-resetlink}}',
-'helplogin-url' = '{{doc-important|Do not translate the namespace name
codeHelp/code.}}
-Used as name of the page that provides information about logging into the wiki.
[MediaWiki-commits] [Gerrit] openstack: qualify var - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119488
Change subject: openstack: qualify var
..
openstack: qualify var
Change-Id: If8532a1d11ebc534f01a82e44af3afca4e7ae1e4
---
M manifests/role/nova.pp
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/119488/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 7e72f88..8698fd5 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -226,7 +226,7 @@
include passwords::misc::scripts
class { openstack::common:
- openstack_version = $openstack_version,
+ openstack_version = $::openstack_version,
novaconfig = $novaconfig,
instance_status_wiki_host = wikitech.wikimedia.org,
instance_status_wiki_domain = labs,
@@ -261,7 +261,7 @@
}
class { openstack::openstack-manager:
- openstack_version = $openstack_version,
+ openstack_version = $::openstack_version,
novaconfig = $novaconfig,
certificate = $certificate,
}
@@ -287,15 +287,15 @@
include role::nova::common
- if ( $openstack_version == havana ) {
- class { openstack::conductor-service: openstack_version =
$openstack_version, novaconfig = $novaconfig }
+ if ( $::openstack_version == havana ) {
+ class { openstack::conductor-service: openstack_version =
$::openstack_version, novaconfig = $novaconfig }
}
- class { openstack::scheduler-service: openstack_version =
$openstack_version, novaconfig = $novaconfig }
- class { openstack::glance-service: openstack_version =
$openstack_version, glanceconfig = $glanceconfig }
- class { openstack::queue-server: openstack_version =
$openstack_version, novaconfig = $novaconfig }
+ class { openstack::scheduler-service: openstack_version =
$::openstack_version, novaconfig = $novaconfig }
+ class { openstack::glance-service: openstack_version =
$::openstack_version, glanceconfig = $glanceconfig }
+ class { openstack::queue-server: openstack_version =
$::openstack_version, novaconfig = $novaconfig }
class { openstack::firewall: }
class { openstack::database-server:
- openstack_version = $openstack_version,
+ openstack_version = $::openstack_version,
novaconfig = $novaconfig,
glanceconfig = $glanceconfig,
keystoneconfig = $keystoneconfig,
@@ -349,7 +349,7 @@
include role::nova::common
- class { openstack::api-service: openstack_version =
$openstack_version, novaconfig = $novaconfig }
+ class { openstack::api-service: openstack_version =
$::openstack_version, novaconfig = $novaconfig }
}
class role::nova::network::bonding {
@@ -376,7 +376,7 @@
down = 'ip link set $IFACE down',
}
- class { openstack::network-service: openstack_version =
$openstack_version, novaconfig = $novaconfig }
+ class { openstack::network-service: openstack_version =
$::openstack_version, novaconfig = $novaconfig }
}
class role::nova::wikiupdates {
@@ -385,7 +385,7 @@
package { 'python-mwclient': ensure = latest; }
}
-if ($openstack_version == folsom) {
+if ($::openstack_version == folsom) {
package { 'python-openstack-wikistatus':
ensure = installed,
require = Package[python-mwclient],
@@ -431,7 +431,7 @@
}
}
- class { openstack::compute-service: openstack_version =
$openstack_version, novaconfig = $novaconfig }
+ class { openstack::compute-service: openstack_version =
$::openstack_version, novaconfig = $novaconfig }
if $realm == labs {
include role::nova::api,
--
To view, visit https://gerrit.wikimedia.org/r/119488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8532a1d11ebc534f01a82e44af3afca4e7ae1e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Using the new way of starting a custom browser - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: QA: Using the new way of starting a custom browser
..
QA: Using the new way of starting a custom browser
mediawiki_selenium Ruby gem is now able to start local and remote
browsers with optional browser setup. Removed NEARBY_FIREFOX support.
Paired with Kartik Mistry, Chris McMahon.
Bug: 62512
Change-Id: Idb2cd0277278f85506273f80c3c975bc7db9f010
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/support/env.rb
3 files changed, 16 insertions(+), 52 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 5f91754..83e4be0 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -5,17 +5,17 @@
childprocess (0.5.1)
ffi (~ 1.0, = 1.0.11)
chunky_png (1.3.0)
-cucumber (1.3.11)
+cucumber (1.3.12)
builder (= 2.1.2)
diff-lcs (= 1.1.3)
gherkin (~ 2.12)
multi_json (= 1.7.5, 2.0)
- multi_test (= 0.0.2)
+ multi_test (= 0.1.1)
data_magic (0.18)
faker (= 1.1.2)
yml_reader (= 0.2)
diff-lcs (1.2.5)
-faker (1.2.0)
+faker (1.3.0)
i18n (~ 0.5)
ffi (1.9.3)
gherkin (2.12.2)
@@ -23,7 +23,7 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.9)
+mediawiki_selenium (0.2.15)
cucumber (~ 1.3, = 1.3.10)
headless (~ 1.0, = 1.0.1)
json (~ 1.8, = 1.8.1)
@@ -32,11 +32,11 @@
rest-client (~ 1.6, = 1.6.7)
rspec-expectations (~ 2.14, = 2.14.4)
syntax (~ 1.2, = 1.2.0)
-mime-types (2.1)
+mime-types (2.2)
multi_json (1.9.0)
-multi_test (0.0.3)
+multi_test (0.1.1)
net-http-persistent (2.9.4)
-page-object (0.9.7)
+page-object (0.9.8)
page_navigation (= 0.9)
selenium-webdriver (= 2.40.0)
watir-webdriver (= 0.6.8)
@@ -46,7 +46,7 @@
mime-types (= 1.16)
rspec-expectations (2.14.5)
diff-lcs (= 1.1.3, 2.0)
-rubyzip (1.1.0)
+rubyzip (1.1.2)
selenium-webdriver (2.40.0)
childprocess (= 0.5.0)
multi_json (~ 1.0)
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index 4818e7e..5b02a3a 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -2,7 +2,7 @@
# Add tags to no_javascript_site.feature when resolved
Given /^I am using user agent (.+)$/ do |user_agent|
@user_agent = user_agent
- @browser = browser(environment, test_name(@scenario), user_agent)
+ @browser = browser(test_name(@scenario), {user_agent: user_agent})
@browser.window.resize_to(480, 800)
$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index 80a0f8e..fe20d95 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1,45 +1,9 @@
require mediawiki_selenium
-def local_browser(user_agent)
- if ENV[BROWSER]
-browser_label = ENV[BROWSER].to_sym
- else
-browser_label = :firefox
- end
-
- if user_agent ==default !ENV[NEARBY_FIREFOX]
-browser = Watir::Browser.new browser_label
- else
-if browser_label == :firefox !ENV[NEARBY_FIREFOX]
- profile = Selenium::WebDriver::Firefox::Profile.new
- profile[general.useragent.override] = user_agent
- browser = Watir::Browser.new browser_label, :profile = profile
-else
- if ENV[NEARBY_FIREFOX]
-permissions_file = ./features/support/permissions.sqlite
-if RUBY_PLATFORM =~ /darwin/
- firefox_executable =
/Applications/Firefox.app/Contents/MacOS/firefox
-elsif RUBY_PLATFORM =~ /linux/
- firefox_executable = '/usr/bin/firefox'
-else
- puts 'Cannot identify local OS, so cannot locate Firefox executable!'
-end
-profile_path = (/tmp/NearbyProfile/)
-Dir.mkdir(profile_path) unless File.exists?(profile_path)
-system(firefox_executable + -CreateProfile 'NearbyProfile +
profile_path + ')
-system(cp + permissions_file + + profile_path)
-browser = Watir::Browser.new :firefox, :profile = 'NearbyProfile'
- else
-raise Changing user agent is currently supported only for Firefox!
- end
-end
- end
-
-
-# we can set cookies only for current domain
-# see http://code.google.com/p/selenium/issues/detail?id=1953
-browser.goto URL.url(Main_Page)
-# set a cookie forcing mobile mode
-browser.cookies.add mf_useformat, true
-browser
- end
+def set_cookie(browser)
+ # we can set cookies only for current domain
+ # see
[MediaWiki-commits] [Gerrit] Promote zIndex of InlineMenuWidget options list - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119492
Change subject: Promote zIndex of InlineMenuWidget options list
..
Promote zIndex of InlineMenuWidget options list
Otherwise the dropdown will appear under other widgets (see
the widgets demo as an example).
Change-Id: I1c3d35986fa0a6affad5e81c478ab14acee9128b
---
M src/styles/widgets/InlineMenuWidget.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/92/119492/1
diff --git a/src/styles/widgets/InlineMenuWidget.less
b/src/styles/widgets/InlineMenuWidget.less
index 82b79ec..73e3d33 100644
--- a/src/styles/widgets/InlineMenuWidget.less
+++ b/src/styles/widgets/InlineMenuWidget.less
@@ -49,6 +49,7 @@
.oo-ui-menuWidget {
width: 100%;
+ z-index: 1;
}
.oo-ui-widget-disabled .oo-ui-inlineMenuWidget-handle {
--
To view, visit https://gerrit.wikimedia.org/r/119492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c3d35986fa0a6affad5e81c478ab14acee9128b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed setting a cookie when starting the browser. - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed setting a cookie when starting the browser. .. Fixed setting a cookie when starting the browser. Releasing 0.2.15 patch version of the gem. Bug: 62512 Change-Id: I5145f1839c06c117987aa3c683c4c3165876e6bd --- M lib/mediawiki_selenium/support/env.rb M lib/mediawiki_selenium/version.rb 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki_selenium/support/env.rb b/lib/mediawiki_selenium/support/env.rb index 4283a71..36ec949 100644 --- a/lib/mediawiki_selenium/support/env.rb +++ b/lib/mediawiki_selenium/support/env.rb @@ -71,7 +71,7 @@ end browser.window.resize_to 1280, 1024 - set_cookie + set_cookie(browser) browser end def sauce_api(json) @@ -131,7 +131,7 @@ browser end -def set_cookie +def set_cookie(browser) # implement this method in env.rb of the repository where it is needed end def test_name(scenario) diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index d2af553..53a01ce 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -10,5 +10,5 @@ =end module MediawikiSelenium - VERSION = 0.2.14 + VERSION = 0.2.15 end -- To view, visit https://gerrit.wikimedia.org/r/119490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5145f1839c06c117987aa3c683c4c3165876e6bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
