[MediaWiki-commits] [Gerrit] Output ogg metadata on image description page. - change (mediawiki...TimedMediaHandler)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108203
Change subject: Output ogg metadata on image description page.
..
Output ogg metadata on image description page.
As an aside, this was one of the primary goals of my 2010
gsoc project. I'm only 4 years late.
This just does basic support (throws all the metadata of each
type together), nothing fancy like separating out metadata by
different streams is attempted.
Change-Id: I2adacf4199a4da559f8225fd9f37cbcc3eac21ce
---
M handlers/OggHandler/OggHandler.php
1 file changed, 87 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/03/108203/1
diff --git a/handlers/OggHandler/OggHandler.php
b/handlers/OggHandler/OggHandler.php
index a225483..c90e8c2 100644
--- a/handlers/OggHandler/OggHandler.php
+++ b/handlers/OggHandler/OggHandler.php
@@ -49,6 +49,93 @@
}
/**
+* Display metadata box on file description page.
+*
+* This is pretty basic, it puts data from all the streams together,
+* and only outputs a couple of the most commonly used ogg "comments",
+* with comments from all the streams combined
+*
+* @param File $file
+* @return array|bool
+*/
+ public function formatMetadata( $file ) {
+ $meta = $this->getCommonMetaArray( $file );
+ if ( count( $meta ) === 0 ) {
+ return false;
+ }
+ return $this->formatMetadataHelper( $meta );
+ }
+
+ /**
+* Get some basic metadata properties that are common across file types.
+*
+* @param File $file
+* @return array Array of metadata. See MW's FormatMetadata class for
format.
+*/
+ public function getCommonMetaArray( $file ) {
+ $metadata = $this->unpackMetadata( $file->getMetadata() );
+ if ( !$metadata || isset( $metadata['error'] ) || !isset(
$metadata['streams'] ) ) {
+ return false;
+ }
+ wfProfileIn( __METHOD__ );
+
+ // See http://www.xiph.org/vorbis/doc/v-comment.html
+ // http://age.hobba.nl/audio/mirroredpages/ogg-tagging.html
+ $metadataMap = array(
+ 'title' => 'ObjectName',
+ 'artist' => 'Artist',
+ 'performer' => 'Artist',
+ 'description' => 'ImageDescription',
+ 'license' => 'UsageTerms',
+ 'copyright' => 'Copyright',
+ 'organization' => 'dc-publisher',
+ 'date' => 'DateTimeDigitized',
+ 'location' => 'LocationDest',
+ 'contact' => 'Contact',
+ 'encoded_using' => 'Software',
+ 'encoder' => 'Software',
+ // OpenSubtitles.org hash. Identifies source video.
+ 'source_ohash' => 'OriginalDocumentID',
+ 'comment' => 'UserComment',
+ 'language' => 'LanguageCode',
+ );
+
+ $props = array();
+
+ foreach( $metadata['streams'] as $stream ) {
+ if ( isset( $stream['vendor'] ) ) {
+ if ( !isset( $props['Software'] ) ) {
+ $props['Software'] = array();
+ }
+ $props['Software'][] = trim( $stream['vendor']
);
+ }
+ if ( !isset( $stream['comments'] ) ) {
+ continue;
+ }
+ foreach( $stream['comments'] as $name => $value ) {
+ if ( trim( $value ) === '' ) {
+ continue;
+ }
+ if ( isset( $metadataMap[strtolower( $name )] )
) {
+ $convertedName =
$metadataMap[strtolower( $name )];
+ if ( !isset( $props[$convertedName] ) )
{
+ $props[$convertedName] =
array();
+ }
+ $props[$convertedName][] = trim( $value
);
+ }
+ }
+
+ }
+ // properties might be duplicated across streams
+ foreach( $props as &$type ) {
+ $type = array_unique( $type );
+ $type = array_values( $type );
+ }
+ wfProfileOut( __METHOD__ );
+ return $props;
+ }
+
+ /**
[MediaWiki-commits] [Gerrit] Go to original image link added, as well the zoom - change (mediawiki...MultimediaViewer)
Apsdehal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108204
Change subject: Go to original image link added, as well the zoom
..
Go to original image link added, as well the zoom
Bug: 59936
Change-Id: Ide5279e7ae48714e73bd5bbdc7e4a07da76582ca
---
M MultimediaViewer.i18n.php
M MultimediaViewer.php
M resources/ext.multimediaViewer/ext.multimediaViewer.css
M resources/ext.multimediaViewer/ext.multimediaViewer.js
M resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
A resources/ext.multimediaViewer/img/zoom.svg
6 files changed, 49 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/04/108204/1
diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php
index eac7346..731f82b 100644
--- a/MultimediaViewer.i18n.php
+++ b/MultimediaViewer.i18n.php
@@ -31,6 +31,7 @@
'multimediaviewer-pref' => 'Media Viewer',
'multimediaviewer-pref-desc' => 'Improve your multimedia viewing
experience with this new tool. It displays images in larger size on pages that
have thumbnails. Images are shown in a nicer fullscreen interface overlay, and
can also be viewed in full-size.',
'multimediaviewer-file-page' => 'Go to corresponding file page',
+ 'multimediaviewer-file-zoom' => 'Closer look at Image',
'multimediaviewer-repository' => 'Learn more on $1',
'multimediaviewer-repository-local' => 'Learn more',
'multimediaviewer-datetime-created' => 'Created on $1',
@@ -81,6 +82,7 @@
'multimediaviewer-pref' => 'Preference title',
'multimediaviewer-pref-desc' => 'Description of preference',
'multimediaviewer-file-page' => 'Text for a link to the file page for
an image.',
+ 'multimediaviewer-file-zoom' => 'Description for link to image zoom
page',
'multimediaviewer-repository' => 'Link to the repository where the
image is hosted. Parameters:
* $1 - the display name of that site
See also:
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index b9001f5..690e26d 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -131,6 +131,7 @@
'messages' => array(
'multimediaviewer-file-page',
+ 'multimediaviewer-file-zoom',
'multimediaviewer-repository',
'multimediaviewer-repository-local',
'multimediaviewer-datetime-created',
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.css
b/resources/ext.multimediaViewer/ext.multimediaViewer.css
index 7ed0428..e549ff2 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.css
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css
@@ -219,6 +219,10 @@
background-image: url(img/use-ltr.svg);
}
+.mw-mlb-image-links li.mw-mlb-zoom-li:before {
+ /* @embed */
+ background-image: url(img/zoom.svg);
+}
.mw-mlb-image-links li.empty:before {
background-image: none !important;
}
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 740153a..4093509 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -487,6 +487,9 @@
ui.initUseFileData( fileTitle, imageData.url, repoData.isLocal
);
ui.$useFileLi.removeClass( 'empty' );
+ ui.initZoomData( imageData.url, repoData.isLocal );
+ ui.$zoomLi.removeClass( 'empty' );
+
ui.setRepoDisplay( repoData.displayName, repoData.favIcon,
repoData.isLocal );
ui.setFilePageLink( imageData.descriptionUrl );
@@ -608,6 +611,7 @@
this.setLocationData( imageData );
ui.$locationLi.toggleClass( 'empty', !imageData.hasCoords() );
+
};
/**
diff --git
a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
index ffc2bda..d578da3 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
@@ -53,6 +53,9 @@
this.$location.empty();
this.$locationLi.addClass( 'empty' );
+ this.$zoom.empty();
+ this.$zoomLi.addClass( 'empty' );
+
this.$useFile.data( 'title', null );
this.$useFile.data( 'link', null );
this.$useFile.data( 'src', null );
@@ -269,6 +272,7 @@
this.initializeUploader();
this.initializeLocation();
this.initializeFileUsage();
+ this.initializeZoom();
};
LIP.initializeRepoLink = function () {
@@ -327,6 +331,16 @@
this.$location = $( '
[MediaWiki-commits] [Gerrit] Added timedmedia-wav message - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Added timedmedia-wav message
..
Added timedmedia-wav message
Updated comment in WebVideoTranscode::getPrimarySourceAttributes
Bug: 60194
Change-Id: I16f7c09e1cf055a297d9b94cee316669dd919bbb
---
M TimedMediaHandler.i18n.php
M WebVideoTranscode/WebVideoTranscode.php
2 files changed, 10 insertions(+), 3 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.i18n.php b/TimedMediaHandler.i18n.php
index 44d7a27..46d09f3 100755
--- a/TimedMediaHandler.i18n.php
+++ b/TimedMediaHandler.i18n.php
@@ -71,6 +71,7 @@
'timedmedia-ogg' => 'Ogg',
'timedmedia-webm' => 'WebM',
'timedmedia-mp4' => 'MP4',
+ 'timedmedia-wav' => 'WAV',
'timedmedia-flac' => 'FLAC',
'timedmedia-source-file' => '$1 source',
'timedmedia-source-file-desc' => 'Original $1 file, $2 × $3 ($4)',
@@ -395,7 +396,11 @@
* {{msg-mw|Timedmedia-source-file-desc}}
* {{msg-mw|Timedmedia-source-file}}',
'timedmedia-mp4' => '{{Optional}}
-
+Used as $1 in the following messages:
+* {{msg-mw|Timedmedia-source-audio-file-desc}}
+* {{msg-mw|Timedmedia-source-file-desc}}
+* {{msg-mw|Timedmedia-source-file}}',
+ 'timedmedia-wav' => '{{Optional}}
Used as $1 in the following messages:
* {{msg-mw|Timedmedia-source-audio-file-desc}}
* {{msg-mw|Timedmedia-source-file-desc}}
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index a1a6d86..b290d4d 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -702,7 +702,8 @@
$bitrate = $file->getHandler()->getBitrate( $file );
$metadataType = $file->getHandler()->getMetadataType( $file );
- // Give grep a chance to find the usages: timedmedia-ogg,
timedmedia-webm, timedmedia-mp4
+ // Give grep a chance to find the usages: timedmedia-ogg,
timedmedia-webm,
+ // timedmedia-mp4, timedmedia-flac, timedmedia-wav
if( $file->getHandler()->isAudio( $file ) ){
$title = wfMessage( 'timedmedia-source-audio-file-desc',
wfMessage( 'timedmedia-' . $metadataType
)->text() )
@@ -714,7 +715,8 @@
->params( $wgLang->formatBitrate( $bitrate )
)->text();
}
- // Give grep a chance to find the usages: timedmedia-ogg,
timedmedia-webm, timedmedia-mp4
+ // Give grep a chance to find the usages: timedmedia-ogg,
timedmedia-webm,
+ // timedmedia-mp4, timedmedia-flac, timedmedia-wav
$source = array(
'src' => $src,
'type' => $file->getHandler()->getWebType( $file ),
--
To view, visit https://gerrit.wikimedia.org/r/108199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16f7c09e1cf055a297d9b94cee316669dd919bbb
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add widget elements as member variables to the class - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Add widget elements as member variables to the class
..
Add widget elements as member variables to the class
Change-Id: I2c9bb0ddc2d5451f2f7e0015efe97488742644f0
---
M modules/source/ext.cx.source.js
M modules/translation/ext.cx.translation.js
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/ext.cx.source.js b/modules/source/ext.cx.source.js
index 6d39846..8f34bc1 100644
--- a/modules/source/ext.cx.source.js
+++ b/modules/source/ext.cx.source.js
@@ -20,6 +20,8 @@
this.$container = $( element );
this.options = $.extend( true, {}, $.fn.cxSource.defaults,
options );
this.page = null;
+ this.$title = null;
+ this.$content = null;
this.init();
}
@@ -49,6 +51,8 @@
.addClass( 'cx-column__content' )
.text( mw.msg( 'cx-source-loading', this.page )
)
);
+ this.$title = this.$container.find( '.cx-column__title' );
+ this.$content = this.$container.find( '.cx-column__content' );
};
ContentTranslationSource.prototype.load = function () {
@@ -60,14 +64,14 @@
page: this.page,
disablepp: true
} ).done( function ( result ) {
- cxSource.$container.find( '.cx-column__title' ).html(
result.parse.title );
- cxSource.$container.find( '.cx-column__content' ).html(
result.parse.text['*'] );
+ cxSource.$title.html( result.parse.title );
+ cxSource.$content.html( result.parse.text['*'] );
} );
};
ContentTranslationSource.prototype.listen = function () {
- this.$container.find( '.cx-column__content' ).on( 'click',
function () {
+ this.$content.on( 'click', function () {
mw.hook( 'mw.cx.translation.add' ).fire( $( this
).html() );
} );
};
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index 07946f1..e38d3a3 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -20,6 +20,8 @@
this.$container = $( element );
this.options = $.extend( true, {}, $.fn.cxTranslation.defaults,
options );
this.language = '';
+ this.$title = null;
+ this.$content = null;
this.init();
}
@@ -51,6 +53,8 @@
.addClass( 'cx-column__content' );
this.$container.append( $content );
+ this.$title = this.$container.find( '.cx-column__title' );
+ this.$content = this.$container.find( '.cx-column__content' );
};
ContentTranslationEditor.prototype.listen = function () {
@@ -58,7 +62,7 @@
};
ContentTranslationEditor.prototype.update = function ( data ) {
- this.$container.find( '.cx-column__content' ).html( data );
+ this.$content.html( data );
mw.hook( 'mw.cx.progress' ).fire( 100 );
};
--
To view, visit https://gerrit.wikimedia.org/r/108197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c9bb0ddc2d5451f2f7e0015efe97488742644f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: KartikMistry
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow to upload WAV files with 32 bit float uncmopressed audio - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow to upload WAV files with 32 bit float uncmopressed audio
..
Allow to upload WAV files with 32 bit float uncmopressed audio
This is also an uncompressed audio, but the name that getID3 returns
is different.
When playing such a file mplayer shows:
Opening audio decoder: [pcm] Uncompressed PCM audio decoderAUDIO: 44100
Hz, 2 ch, floatle, 2822.4 kbit/100.00% (ratio: 352800->352800)
Selected audio codec: [pcm] afm: pcm (Uncompressed PCM)
Bug: 60015
Change-Id: I93dc2a3fe87067411d2719a9f981024c074d0cbc
---
M handlers/WAVHandler/WAVHandler.php
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, but someone else must approve
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlers/WAVHandler/WAVHandler.php
b/handlers/WAVHandler/WAVHandler.php
index 8e1c2c7..9fae12b 100755
--- a/handlers/WAVHandler/WAVHandler.php
+++ b/handlers/WAVHandler/WAVHandler.php
@@ -22,11 +22,16 @@
function verifyUpload( $filename ) {
$metadata = $this->getID3( $filename );
- if( isset( $metadata['audio'] ) &&
$metadata['audio']['dataformat'] == 'wav' && $metadata['audio']['codec'] ==
'Pulse Code Modulation (PCM)') {
+
+ if(
+ isset( $metadata['audio'] )
+ && $metadata['audio']['dataformat'] == 'wav'
+ && ( $metadata['audio']['codec'] == 'Pulse Code
Modulation (PCM)' || $metadata['audio']['codec'] == 'IEEE Float' )
+ ){
return Status::newGood();
}
- return Status::newFatal( 'timedmedia-wav-pcm-required' );
+ return Status::newFatal( 'timedmedia-wav-pcm-required' );
}
/**
* @param $file File
--
To view, visit https://gerrit.wikimedia.org/r/103402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93dc2a3fe87067411d2719a9f981024c074d0cbc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Michał Łazowik
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: J
Gerrit-Reviewer: Mdale
Gerrit-Reviewer: Rahul21
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Put the space before category links to consideration - change (mediawiki/core)
Arav93 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108205
Change subject: Put the space before category links to consideration
..
Put the space before category links to consideration
The space given before any category link was ignored. It was put
to consideration.
Bug: 17988
Change-Id: I6f6389aad305b2dd0ba1f30106503a706a4766ae
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/108205/1
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index cdf5e98..6bbea31 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2095,7 +2095,7 @@
if ( $ns == NS_CATEGORY ) {
wfProfileIn( __METHOD__ . "-category" );
- $s = rtrim( $s . "\n" ); # bug 87
+ $s = rtrim( $s , "\n" ); # bug 87
if ( $wasblank ) {
$sortkey =
$this->getDefaultSort();
--
To view, visit https://gerrit.wikimedia.org/r/108205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f6389aad305b2dd0ba1f30106503a706a4766ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arav93
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MultimediaViewer] [TimedMediaHandler] Add new optional mess... - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/108206 Change subject: [MultimediaViewer] [TimedMediaHandler] Add new optional message keys .. [MultimediaViewer] [TimedMediaHandler] Add new optional message keys https://gerrit.wikimedia.org/r/#/c/107256/8/MultimediaViewer.i18n.php,unified https://gerrit.wikimedia.org/r/#/c/108199/4/TimedMediaHandler.i18n.php,unified Change-Id: I8436867480d6b1599548057ae2c4e71dca82bc16 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/06/108206/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index f553c1f..9a15ef9 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -913,6 +913,9 @@ optional = multimediaviewer-license-cc-by-2.5, multimediaviewer-license-cc-by-sa-2.5 optional = multimediaviewer-license-cc-by-3.0, multimediaviewer-license-cc-by-sa-3.0 optional = multimediaviewer-license-cc-zero +optional = multimediaviewer-geoloc-north, multimediaviewer-geoloc-east +optional = multimediaviewer-geoloc-south, multimediaviewer-geoloc-west +optional = multimediaviewer-geoloc-coord, multimediaviewer-geoloc-coords MwEmbed Support descmsg = mwembed-desc @@ -1619,7 +1622,7 @@ # Siebrand 201005-13: conflicting magic words with Ogghandler #magicfile = TimedMediaHandler/TimedMediaHandler.i18n.magic.php aliasfile = TimedMediaHandler/TimedMediaHandler.i18n.alias.php -optional = timedmedia-ogg, timedmedia-webm +optional = timedmedia-ogg, timedmedia-webm, timedmedia-wav optional = timedmedia-mp4, timedmedia-flac optional = timedmedia-derivative-160p.ogv, timedmedia-derivative-360p.ogv optional = timedmedia-derivative-480p.ogv, timedmedia-derivative-720p.ogv -- To view, visit https://gerrit.wikimedia.org/r/108206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8436867480d6b1599548057ae2c4e71dca82bc16 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MultimediaViewer] [TimedMediaHandler] Add new optional mess... - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [MultimediaViewer] [TimedMediaHandler] Add new optional message keys .. [MultimediaViewer] [TimedMediaHandler] Add new optional message keys https://gerrit.wikimedia.org/r/#/c/107256/8/MultimediaViewer.i18n.php,unified https://gerrit.wikimedia.org/r/#/c/108199/4/TimedMediaHandler.i18n.php,unified Change-Id: I8436867480d6b1599548057ae2c4e71dca82bc16 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index f553c1f..9a15ef9 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -913,6 +913,9 @@ optional = multimediaviewer-license-cc-by-2.5, multimediaviewer-license-cc-by-sa-2.5 optional = multimediaviewer-license-cc-by-3.0, multimediaviewer-license-cc-by-sa-3.0 optional = multimediaviewer-license-cc-zero +optional = multimediaviewer-geoloc-north, multimediaviewer-geoloc-east +optional = multimediaviewer-geoloc-south, multimediaviewer-geoloc-west +optional = multimediaviewer-geoloc-coord, multimediaviewer-geoloc-coords MwEmbed Support descmsg = mwembed-desc @@ -1619,7 +1622,7 @@ # Siebrand 201005-13: conflicting magic words with Ogghandler #magicfile = TimedMediaHandler/TimedMediaHandler.i18n.magic.php aliasfile = TimedMediaHandler/TimedMediaHandler.i18n.alias.php -optional = timedmedia-ogg, timedmedia-webm +optional = timedmedia-ogg, timedmedia-webm, timedmedia-wav optional = timedmedia-mp4, timedmedia-flac optional = timedmedia-derivative-160p.ogv, timedmedia-derivative-360p.ogv optional = timedmedia-derivative-480p.ogv, timedmedia-derivative-720p.ogv -- To view, visit https://gerrit.wikimedia.org/r/108206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8436867480d6b1599548057ae2c4e71dca82bc16 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking 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 some more documentation - change (mediawiki...Flow)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108207
Change subject: Add some more documentation
..
Add some more documentation
Change-Id: I4a3ecc6f5bafeffd6708afe4e88d080561e0a8d2
---
M includes/Block/Block.php
M includes/Contributions/Formatter.php
M includes/Contributions/Query.php
M includes/Model/AbstractRevision.php
4 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/07/108207/1
diff --git a/includes/Block/Block.php b/includes/Block/Block.php
index 71abbcc..bd635cf 100644
--- a/includes/Block/Block.php
+++ b/includes/Block/Block.php
@@ -45,6 +45,7 @@
protected $workflow;
protected $storage;
+ /** @var User $user */
protected $user;
protected $submitted;
protected $errors;
diff --git a/includes/Contributions/Formatter.php
b/includes/Contributions/Formatter.php
index 9e4a25a..ec5c4a6 100644
--- a/includes/Contributions/Formatter.php
+++ b/includes/Contributions/Formatter.php
@@ -9,7 +9,7 @@
class Formatter extends AbstractFormatter {
/**
* @param ContribsPager $pager
-* @param stdClass $row
+* @param \stdClass $row
* @return string|bool HTML for contributions entry, or false on failure
*/
public function format( ContribsPager $pager, $row ) {
diff --git a/includes/Contributions/Query.php b/includes/Contributions/Query.php
index 08d25ef..c0d5a40 100644
--- a/includes/Contributions/Query.php
+++ b/includes/Contributions/Query.php
@@ -57,7 +57,6 @@
}
/**
-* @param $data array an array of results of all contribs queries, to
be merged to form all contributions data
* @param ContribsPager $pager Object hooked into
* @param string $offset Index offset, inclusive
* @param int $limit Exact query limit
@@ -196,7 +195,7 @@
* @param ContribsPager $pager
* @param AbstractRevision $revision
* @param string $blockType Block name (e.g. "topic", "header")
-* @return stdClass
+* @return \stdClass
*/
protected function buildResult( ContribsPager $pager, AbstractRevision
$revision, $blockType ) {
$uuid = $revision->getRevisionId();
@@ -270,6 +269,7 @@
* Retrieves the root post for a given PostRevision
* @param PostRevision $revision The revision to retrieve the root
post for.
* @return PostRevision PostRevision of the root post.
+* @throws \MWException
*/
protected function getRootPost( PostRevision $revision ) {
$rootPostId = $this->getRootPostId( $revision );
@@ -291,6 +291,7 @@
* Gets the root post ID for a given PostRevision
* @param PostRevision $revision The revision to get the root post ID
for.
* @return UUID The UUID for the root post.
+* @throws \MWException
*/
protected function getRootPostId( PostRevision $revision ) {
$postId = $revision->getPostId();
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index da1efe8..c06e62d 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -283,6 +283,9 @@
return self::$perms[$state]['historical'];
}
+ /**
+* @return UUID
+*/
public function getRevisionId() {
return $this->revId;
}
--
To view, visit https://gerrit.wikimedia.org/r/108207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a3ecc6f5bafeffd6708afe4e88d080561e0a8d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually restart with new code when running the clustered rt... - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Actually restart with new code when running the clustered rt
client
..
Actually restart with new code when running the clustered rt client
We need to prevent the coordinator from simply forking off a new copy of the
old code by committing suicide in the recommended cluster way. This causes the
parent to exit when all clients have quit, which in turn leads to a restart
from upstart with new code.
Change-Id: I992bb46c3a001dfe30560d635a0b6a8abd58117c
---
M tests/client/client.js
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/client/client.js b/tests/client/client.js
index 9decfeb..9a960c1 100755
--- a/tests/client/client.js
+++ b/tests/client/client.js
@@ -6,6 +6,7 @@
var http = require( 'http' ),
request = require('request'),
+ cluster = require('cluster'),
qs = require( 'querystring' ),
exec = require( 'child_process' ).exec,
apiServer = require( '../apiServer.js' ),
@@ -45,7 +46,15 @@
break;
case 426:
console.log( "Update required, exiting." );
- process.exit( 0 );
+ // Signal our voluntary suicide to the parent
if running as a
+ // cluster worker, so that it does not restart
this client.
+ // Without this, the code is never actually
updated as a newly
+ // forked client will still run the old code.
+ if (cluster.worker) {
+ cluster.worker.kill();
+ } else {
+ process.exit( 0 );
+ }
break;
default:
console.log( 'There was some error (' +
response.statusCode + '), but that is fine. Waiting 15 seconds to resume' );
--
To view, visit https://gerrit.wikimedia.org/r/108186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I992bb46c3a001dfe30560d635a0b6a8abd58117c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke
Gerrit-Reviewer: Marcoil
Gerrit-Reviewer: Subramanya Sastry
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 obsolete logging import - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/108208 Change subject: remove obsolete logging import .. remove obsolete logging import Change-Id: I54c353b98a90504107505c4b4f47f6f5bb17c8ce --- M pywikibot/throttle.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/08/108208/1 diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py index a6854e8..4e56464 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -10,7 +10,6 @@ __version__ = '$Id$' # -import logging import math import threading import time -- To view, visit https://gerrit.wikimedia.org/r/108208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54c353b98a90504107505c4b4f47f6f5bb17c8ce Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1041 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108209 Change subject: repool db1041 .. repool db1041 Change-Id: Ie0ffa3f04510b5d9fc3435e4cee8be52bfaf2d78 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/09/108209/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index b45f448..e3cb119 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -136,7 +136,7 @@ 's7' => array( 'db1039' => 0, 'db1007' => 0, # snapshot, vslow - # schema changes 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager + 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1024' => 400, 'db1028' => 400, ), @@ -263,16 +263,16 @@ 'db1007' => 1, ), 'watchlist' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), 'recentchangeslinked' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), 'contributions' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), 'logpager' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), ), ), -- To view, visit https://gerrit.wikimedia.org/r/108209 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0ffa3f04510b5d9fc3435e4cee8be52bfaf2d78 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1041 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1041 .. repool db1041 Change-Id: Ie0ffa3f04510b5d9fc3435e4cee8be52bfaf2d78 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index b45f448..e3cb119 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -136,7 +136,7 @@ 's7' => array( 'db1039' => 0, 'db1007' => 0, # snapshot, vslow - # schema changes 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager + 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1024' => 400, 'db1028' => 400, ), @@ -263,16 +263,16 @@ 'db1007' => 1, ), 'watchlist' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), 'recentchangeslinked' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), 'contributions' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), 'logpager' => array( - # schema changes 'db1041' => 1, + 'db1041' => 1, ), ), ), -- To view, visit https://gerrit.wikimedia.org/r/108209 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0ffa3f04510b5d9fc3435e4cee8be52bfaf2d78 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reassign db1033 to s7 during schema changes - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108210
Change subject: reassign db1033 to s7 during schema changes
..
reassign db1033 to s7 during schema changes
Change-Id: I216d2b6a9989a765c4c289979021762306d1abdf
---
M manifests/site.pp
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/108210/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 06d80f3..902ddfe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -546,13 +546,13 @@
}
# eqiad dbs
-node /^db10(33|37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
+node /^db10(37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
if $::hostname =~ /^db10(56)/ {
$ganglia_aggregator = true
include mha::manager
}
-if $::hostname =~ /^db10(33|37|49|50|51|52|55|56)/ {
+if $::hostname =~ /^db10(37|49|50|51|52|55|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true, mariadb =>
true }
} elsif $::hostname =~ /^db10(43)/ {
class { role::coredb::s1 : mariadb => true }
@@ -612,8 +612,8 @@
}
}
-node /^db10(07|24|28|39|41)\.eqiad\.wmnet/ {
-if $::hostname =~ /^db10(07|24|39|41)/ {
+node /^db10(07|24|28|33|39|41)\.eqiad\.wmnet/ {
+if $::hostname =~ /^db10(07|24|33|39|41)/ {
class { role::coredb::s7 : innodb_file_per_table => true, mariadb =>
true }
} elsif $::hostname == "db1028" {
class { role::coredb::s7 : mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/108210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I216d2b6a9989a765c4c289979021762306d1abdf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reassign db1033 to s7 during schema changes - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: reassign db1033 to s7 during schema changes
..
reassign db1033 to s7 during schema changes
Change-Id: I216d2b6a9989a765c4c289979021762306d1abdf
---
M manifests/site.pp
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 06d80f3..902ddfe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -546,13 +546,13 @@
}
# eqiad dbs
-node /^db10(33|37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
+node /^db10(37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
if $::hostname =~ /^db10(56)/ {
$ganglia_aggregator = true
include mha::manager
}
-if $::hostname =~ /^db10(33|37|49|50|51|52|55|56)/ {
+if $::hostname =~ /^db10(37|49|50|51|52|55|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true, mariadb =>
true }
} elsif $::hostname =~ /^db10(43)/ {
class { role::coredb::s1 : mariadb => true }
@@ -612,8 +612,8 @@
}
}
-node /^db10(07|24|28|39|41)\.eqiad\.wmnet/ {
-if $::hostname =~ /^db10(07|24|39|41)/ {
+node /^db10(07|24|28|33|39|41)\.eqiad\.wmnet/ {
+if $::hostname =~ /^db10(07|24|33|39|41)/ {
class { role::coredb::s7 : innodb_file_per_table => true, mariadb =>
true }
} elsif $::hostname == "db1028" {
class { role::coredb::s7 : mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/108210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I216d2b6a9989a765c4c289979021762306d1abdf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Strip descriptions from ResourceLoaderSchemaModule modules - change (mediawiki...EventLogging)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108211
Change subject: Strip descriptions from ResourceLoaderSchemaModule modules
..
Strip descriptions from ResourceLoaderSchemaModule modules
Immutability and consistency should not be compromised lightly, but no one ever
looks at the descriptions client-side, so the bandwidth is wasted in affirming
this abstract principle.
Change-Id: Ibe13fb16917a7aaaebf91217e70004e366baa454
---
M EventLogging.php
M includes/ResourceLoaderSchemaModule.php
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/11/108211/1
diff --git a/EventLogging.php b/EventLogging.php
index 81a85a4..e5e0f12 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -195,6 +195,23 @@
}
+/**
+ * Recursively remove a key from an array and all its subarray members.
+ * Does not detect cycles.
+ *
+ * @param array &$array Array from which key should be stripped.
+ * @param string $key Key to remove.
+ */
+function efStripKeyRecursive( &$array, $key ) {
+ unset( $array[ $key ] );
+ foreach( $array as $k => &$v ) {
+ if ( is_array( $v ) ) {
+ efStripKeyRecursive( $v, $key );
+ }
+ }
+}
+
+
// Classes
$wgAutoloadClasses += array(
diff --git a/includes/ResourceLoaderSchemaModule.php
b/includes/ResourceLoaderSchemaModule.php
index b6498f8..b95f36f 100644
--- a/includes/ResourceLoaderSchemaModule.php
+++ b/includes/ResourceLoaderSchemaModule.php
@@ -83,7 +83,9 @@
* @return string: JavaScript code.
*/
function getScript( ResourceLoaderContext $context ) {
- $params = array( $this->schema->title,
$this->schema->jsonSerialize() );
+ $schema = $this->schema->jsonSerialize();
+ efStripKeyRecursive( $schema, 'description' );
+ $params = array( $this->schema->title, $schema );
return Xml::encodeJsCall( 'mediaWiki.eventLog.declareSchema',
$params );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe13fb16917a7aaaebf91217e70004e366baa454
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maintenance folder for helper scripts (comming soon...) - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/108212 Change subject: maintenance folder for helper scripts (comming soon...) .. maintenance folder for helper scripts (comming soon...) Change-Id: I21a2d2d44978986c1dd8886a557fa04a46053ce8 --- A scripts/maintenance/README 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/12/108212/1 diff --git a/scripts/maintenance/README b/scripts/maintenance/README new file mode 100644 index 000..09c332f --- /dev/null +++ b/scripts/maintenance/README @@ -0,0 +1,2 @@ +This directory/folder is reserved for maintaining scripts and helper scripts +only. -- To view, visit https://gerrit.wikimedia.org/r/108212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21a2d2d44978986c1dd8886a557fa04a46053ce8 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Niharika Kohli's blog to the English Planet - change (operations/puppet)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/108213 Change subject: Add Niharika Kohli's blog to the English Planet .. Add Niharika Kohli's blog to the English Planet Requested at https://meta.wikimedia.org/w/index.php?oldid=7131901 Change-Id: I5b71194f1398d7a3d056cab2fd297847af2a9789 --- M templates/planet/en_config.erb 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/108213/1 diff --git a/templates/planet/en_config.erb b/templates/planet/en_config.erb index 54dc7f1..c30537f 100644 --- a/templates/planet/en_config.erb +++ b/templates/planet/en_config.erb @@ -559,4 +559,7 @@ name=Maria Pacana [http://www.wikiphotographer.net/category/wikimedia-commons/feed/] -name=Frank Schulenburg \ No newline at end of file +name=Frank Schulenburg + +[http://niharika29.roon.io/feed] +name=Niharika Kohli \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/108213 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b71194f1398d7a3d056cab2fd297847af2a9789 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Odder ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add lang 'zh' to family 'wikivoyage' for recent site creation - change (pywikibot/compat)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108214
Change subject: Add lang 'zh' to family 'wikivoyage' for recent site creation
..
Add lang 'zh' to family 'wikivoyage' for recent site creation
Change-Id: I02355f439df0029662d5e57181cf656052d13850
---
M families/wikivoyage_family.py
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/14/108214/1
diff --git a/families/wikivoyage_family.py b/families/wikivoyage_family.py
index 8809a57..94e7408 100644
--- a/families/wikivoyage_family.py
+++ b/families/wikivoyage_family.py
@@ -13,7 +13,7 @@
self.name = 'wikivoyage'
self.languages_by_size = [
'en', 'de', 'pt', 'fr', 'it', 'nl', 'pl', 'ru', 'es', 'vi', 'sv',
-'he', 'ro', 'uk', 'el',
+'he', 'zh', 'ro', 'uk', 'el',
]
self.langs = dict([(lang, '%s.wikivoyage.org' % lang)
@@ -53,6 +53,7 @@
'sv': u'Wikivoyage',
'uk': u'Вікімандри',
'vi': u'Wikivoyage',
+'zh': u'Wikivoyage',
}
self.namespaces[5] = {
@@ -71,6 +72,7 @@
'sv': u'Wikivoyagediskussion',
'uk': u'Обговорення Вікімандри',
'vi': u'Thảo luận Wikivoyage',
+'zh': u'Wikivoyage talk',
}
self.namespaces[100] = {
--
To view, visit https://gerrit.wikimedia.org/r/108214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02355f439df0029662d5e57181cf656052d13850
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Zhuyifei1999
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add lang 'zh' to family 'wikivoyage' for recent site creation - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: Add lang 'zh' to family 'wikivoyage' for recent site creation
..
Add lang 'zh' to family 'wikivoyage' for recent site creation
Change-Id: I02355f439df0029662d5e57181cf656052d13850
---
M families/wikivoyage_family.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/families/wikivoyage_family.py b/families/wikivoyage_family.py
index 8809a57..94e7408 100644
--- a/families/wikivoyage_family.py
+++ b/families/wikivoyage_family.py
@@ -13,7 +13,7 @@
self.name = 'wikivoyage'
self.languages_by_size = [
'en', 'de', 'pt', 'fr', 'it', 'nl', 'pl', 'ru', 'es', 'vi', 'sv',
-'he', 'ro', 'uk', 'el',
+'he', 'zh', 'ro', 'uk', 'el',
]
self.langs = dict([(lang, '%s.wikivoyage.org' % lang)
@@ -53,6 +53,7 @@
'sv': u'Wikivoyage',
'uk': u'Вікімандри',
'vi': u'Wikivoyage',
+'zh': u'Wikivoyage',
}
self.namespaces[5] = {
@@ -71,6 +72,7 @@
'sv': u'Wikivoyagediskussion',
'uk': u'Обговорення Вікімандри',
'vi': u'Thảo luận Wikivoyage',
+'zh': u'Wikivoyage talk',
}
self.namespaces[100] = {
--
To view, visit https://gerrit.wikimedia.org/r/108214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02355f439df0029662d5e57181cf656052d13850
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Gerrit Patch Uploader
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: Zhuyifei1999
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 lang 'zh' to family 'wikivoyage' , update from compat - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/108215 Change subject: Add lang 'zh' to family 'wikivoyage' , update from compat .. Add lang 'zh' to family 'wikivoyage' , update from compat Change-Id: Ic6c64f356511d1f92eefe9e813c9564786b2b5a5 --- M pywikibot/families/wikivoyage_family.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/15/108215/1 diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index 83c97d0..4784137 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -13,7 +13,7 @@ self.name = 'wikivoyage' self.languages_by_size = [ 'en', 'de', 'pt', 'fr', 'it', 'nl', 'pl', 'ru', 'es', 'vi', 'sv', -'he', 'ro', 'uk', 'el', +'he', 'zh', 'ro', 'uk', 'el', ] self.langs = dict([(lang, '%s.wikivoyage.org' % lang) -- To view, visit https://gerrit.wikimedia.org/r/108215 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6c64f356511d1f92eefe9e813c9564786b2b5a5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add site.unblockuser() - change (pywikibot/core)
Mpaa has uploaded a new change for review. https://gerrit.wikimedia.org/r/108216 Change subject: Add site.unblockuser() .. Add site.unblockuser() Change-Id: Ib6dc1b87b126cff89a0beeb0bcd1713fb5bd3304 --- M pywikibot/site.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/16/108216/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index a232365..5400729 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3142,6 +3142,16 @@ data = req.submit() return data +@must_be(group='sysop') +def unblockuser(self, user, reason): + +token = self.token(user, 'block') +req = api.Request(site=self, action='unblock', user=user.username, + reason=reason, token=token) + +data = req.submit() +return data + def watchpage(self, page, unwatch=False): """Add or remove page from watchlist. -- To view, visit https://gerrit.wikimedia.org/r/108216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6dc1b87b126cff89a0beeb0bcd1713fb5bd3304 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] warm up db1033 in s7 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108217 Change subject: warm up db1033 in s7 .. warm up db1033 in s7 Change-Id: If8e6b28167c3945d138992d415d57565f2020be2 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/17/108217/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index e3cb119..2908f8c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -90,7 +90,6 @@ 'db1050'=> 0, # 2.8TB sas 64GB, snapshot 'db1055'=> 0, # watchlist, recentchangeslinked, contributions, logpager 'db1043'=> 100, # 1.4TB sas 64GB, vslow, dump - # schema changes 'db1033'=> 300, # 1.4TB sas 64GB 'db1037'=> 300, # 1.4TB sas 64GB 'db1049'=> 300, # 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB @@ -137,6 +136,7 @@ 'db1039' => 0, 'db1007' => 0, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager + 'db1033' => 50, 'db1024' => 400, 'db1028' => 400, ), -- To view, visit https://gerrit.wikimedia.org/r/108217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8e6b28167c3945d138992d415d57565f2020be2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] warm up db1033 in s7 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: warm up db1033 in s7 .. warm up db1033 in s7 Change-Id: If8e6b28167c3945d138992d415d57565f2020be2 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index e3cb119..2908f8c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -90,7 +90,6 @@ 'db1050'=> 0, # 2.8TB sas 64GB, snapshot 'db1055'=> 0, # watchlist, recentchangeslinked, contributions, logpager 'db1043'=> 100, # 1.4TB sas 64GB, vslow, dump - # schema changes 'db1033'=> 300, # 1.4TB sas 64GB 'db1037'=> 300, # 1.4TB sas 64GB 'db1049'=> 300, # 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB @@ -137,6 +136,7 @@ 'db1039' => 0, 'db1007' => 0, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager + 'db1033' => 50, 'db1024' => 400, 'db1028' => 400, ), -- To view, visit https://gerrit.wikimedia.org/r/108217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8e6b28167c3945d138992d415d57565f2020be2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1028 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108218 Change subject: depool db1028 .. depool db1028 Change-Id: I609eacc1e5ff70c45592e929b9f8b8405b66df40 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/18/108218/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2908f8c..babfd88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -136,9 +136,9 @@ 'db1039' => 0, 'db1007' => 0, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager - 'db1033' => 50, + 'db1033' => 400, 'db1024' => 400, - 'db1028' => 400, + #scheme changes 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/108218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I609eacc1e5ff70c45592e929b9f8b8405b66df40 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add lang 'zh' to family 'wikivoyage' , update from compat - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add lang 'zh' to family 'wikivoyage' , update from compat .. Add lang 'zh' to family 'wikivoyage' , update from compat Change-Id: Ic6c64f356511d1f92eefe9e813c9564786b2b5a5 --- M pywikibot/families/wikivoyage_family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index 83c97d0..4784137 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -13,7 +13,7 @@ self.name = 'wikivoyage' self.languages_by_size = [ 'en', 'de', 'pt', 'fr', 'it', 'nl', 'pl', 'ru', 'es', 'vi', 'sv', -'he', 'ro', 'uk', 'el', +'he', 'zh', 'ro', 'uk', 'el', ] self.langs = dict([(lang, '%s.wikivoyage.org' % lang) -- To view, visit https://gerrit.wikimedia.org/r/108215 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6c64f356511d1f92eefe9e813c9564786b2b5a5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1028 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: depool db1028 .. depool db1028 Change-Id: I609eacc1e5ff70c45592e929b9f8b8405b66df40 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2908f8c..babfd88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -136,9 +136,9 @@ 'db1039' => 0, 'db1007' => 0, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager - 'db1033' => 50, + 'db1033' => 400, 'db1024' => 400, - 'db1028' => 400, + #scheme changes 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/108218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I609eacc1e5ff70c45592e929b9f8b8405b66df40 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing page_restrictions from page table - change (mediawiki/core)
Tinaj1234 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108219
Change subject: Removing page_restrictions from page table
..
Removing page_restrictions from page table
Experimental patch-Do not merge.
Removing page_restrictions from page table as it is superseded by the
page_restriction table.
Bug: 4
Change-Id: I1509ad3cc9a99eeff7df4cfc548dd1640053ccc7
---
M includes/WikiPage.php
M includes/api/ApiQueryInfo.php
M includes/installer/MysqlUpdater.php
M includes/installer/SqliteUpdater.php
A maintenance/archives/patch-drop-page_restrictions.sql
A maintenance/sqlite/archives/patch-drop-page_restrictions.sql
M maintenance/tables.sql
7 files changed, 51 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/19/108219/1
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 8c035aa..d8988af 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -278,7 +278,6 @@
'page_id',
'page_namespace',
'page_title',
- 'page_restrictions',
'page_counter',
'page_is_redirect',
'page_is_new',
@@ -407,7 +406,6 @@
$this->mTitle->loadFromRow( $data );
// Old-fashioned restrictions
- $this->mTitle->loadRestrictions(
$data->page_restrictions );
$this->mId = intval( $data->page_id );
$this->mCounter = intval( $data->page_counter );
@@ -1253,7 +1251,6 @@
'page_namespace'=> $this->mTitle->getNamespace(),
'page_title'=> $this->mTitle->getDBkey(),
'page_counter' => 0,
- 'page_restrictions' => '',
'page_is_redirect' => 0, // Will set this shortly...
'page_is_new' => 1,
'page_random' => wfRandom(),
@@ -2405,7 +2402,6 @@
// Clear out legacy restriction fields
$dbw->update(
'page',
- array( 'page_restrictions' => '' ),
array( 'page_id' => $id ),
__METHOD__
);
@@ -2594,20 +2590,20 @@
* @throws MWException
* @return String
*/
- protected static function flattenRestrictions( $limit ) {
- if ( !is_array( $limit ) ) {
- throw new MWException( 'WikiPage::flattenRestrictions
given non-array restriction set' );
- }
-
- $bits = array();
- ksort( $limit );
-
- foreach ( array_filter( $limit ) as $action => $restrictions ) {
- $bits[] = "$action=$restrictions";
- }
-
- return implode( ':', $bits );
- }
+// protected static function flattenRestrictions( $limit ) {
+// if ( !is_array( $limit ) ) {
+// throw new MWException( 'WikiPage::flattenRestrictions
given non-array restriction set' );
+// }
+//
+// $bits = array();
+// ksort( $limit );
+//
+// foreach ( array_filter( $limit ) as $action => $restrictions ) {
+// $bits[] = "$action=$restrictions";
+// }
+//
+// return implode( ':', $bits );
+// }
/**
* Same as doDeleteArticleReal(), but returns a simple boolean. This is
kept around for
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 43b8c0c..bc12675 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -59,7 +59,6 @@
public function requestExtraData( $pageSet ) {
global $wgDisableCounters, $wgContentHandlerUseDB;
- $pageSet->requestField( 'page_restrictions' );
// when resolving redirects, no page will have this field
if ( !$pageSet->isResolvingRedirects() ) {
$pageSet->requestField( 'page_is_redirect' );
@@ -288,7 +287,6 @@
}
}
- $this->pageRestrictions = $pageSet->getCustomField(
'page_restrictions' );
// when resolving redirects, no page will have this field
$this->pageIsRedir = !$pageSet->isResolvingRedirects()
? $pageSet->getCustomField( 'page_is_redirect' )
diff --git a/includes/installer/MysqlUpdater.php
b/includes/installer/MysqlUpdater.php
index 9dfbff8..96eb3bb 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -249,6 +249,8 @@
array( 'ad
[MediaWiki-commits] [Gerrit] Don't pass empty strings to strpos - change (mediawiki...AbuseFilter)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108220
Change subject: Don't pass empty strings to strpos
..
Don't pass empty strings to strpos
When an empty parameter is passed to a function using strpos, such as when
an extra comma appears at the end of contains_any's parameter list, don't
call strpos on the empty string.
Bug: 60203
Change-Id: I6221a01ad1ec9090de7bfc1d9d6583f22ba0eb2e
---
M AbuseFilter.parser.php
1 file changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/20/108220/1
diff --git a/AbuseFilter.parser.php b/AbuseFilter.parser.php
index 86582b9..83ba736 100644
--- a/AbuseFilter.parser.php
+++ b/AbuseFilter.parser.php
@@ -1787,8 +1787,12 @@
$haystack = $args[1]->toString();
$count = 0;
- while ( ( $offset = strpos( $haystack, $needle, $offset
+ 1 ) ) !== false ) {
- $count++;
+
+ // Bug #60203: Keep empty parameters from causing PHP
warnings
+ if ( $needle !== '' ) {
+ while ( ( $offset = strpos( $haystack, $needle,
$offset + 1 ) ) !== false ) {
+ $count++;
+ }
}
}
@@ -1910,7 +1914,8 @@
} else {
$ok = false;
foreach ( $searchStrings as $needle ) {
- if ( strpos( $s, $needle ) !== false ) {
+ // Bug #60203: Keep empty parameters from
causing PHP warnings
+ if ( $needle !== '' && strpos( $s, $needle )
!== false ) {
$ok = true;
break;
}
@@ -2100,6 +2105,11 @@
$haystack = $args[0]->toString();
$needle = $args[1]->toString();
+ // Bug #60203: Keep empty parameters from causing PHP warnings
+ if ( $needle === '' ) {
+ return new AFPData( AFPData::DInt, -1 );
+ }
+
if ( isset( $args[2] ) ) {
$offset = $args[2]->toInt();
--
To view, visit https://gerrit.wikimedia.org/r/108220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6221a01ad1ec9090de7bfc1d9d6583f22ba0eb2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated includes/Skin.php footer images #30113 - change (mediawiki/core)
Westurner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108221
Change subject: Updated includes/Skin.php footer images #30113
..
Updated includes/Skin.php footer images #30113
->
-> in order to support social network sharing.
Change-Id: If8a41c5768faa20add44bdb3948ca5a1f821077f
---
M includes/Skin.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/108221/1
diff --git a/includes/Skin.php b/includes/Skin.php
index 6722cca..704a93f 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -841,14 +841,14 @@
$out = $wgCopyrightIcon;
} elseif ( $wgRightsIcon ) {
$icon = htmlspecialchars( $wgRightsIcon );
+$text = htmlspecialchars( $wgRightsText );
if ( $wgRightsUrl ) {
$url = htmlspecialchars( $wgRightsUrl );
- $out .= '';
+ $out .= '';
}
- $text = htmlspecialchars( $wgRightsText );
- $out .= "";
+ $out .= '';
if ( $wgRightsUrl ) {
$out .= '';
@@ -866,7 +866,7 @@
global $wgStylePath;
$url = htmlspecialchars(
"$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
- $text = '';
+ $text = '';
wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );
return $text;
}
--
To view, visit https://gerrit.wikimedia.org/r/108221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8a41c5768faa20add44bdb3948ca5a1f821077f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Westurner
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create python::pil; relax restrictions on packages.pp - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108222
Change subject: Create python::pil; relax restrictions on packages.pp
..
Create python::pil; relax restrictions on packages.pp
- The rule that packages must be declared with no parameters is too strict for
packages installable via pip, since those must at least specify provider =>
'pip'. So relax the restriction for now.
- At the same time, the setup for PIL really is a bit too involved for
packages.pp, so move it to a python::pil class in its own module.
Change-Id: I575809a87b62346b11d254a8a1d1e72daf9a9e24
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
2 files changed, 2 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/22/108222/1
diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index 566c0ae..9e5e39b 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -9,8 +9,7 @@
# prohibition on duplicate definitions.
#
# *Note*:: each class in this file must correspond to a package of the
-# same name. The package must be declared with no parameters. If you
-# need to do anything fancier, create a module instead.
+# same name. If you need anything fancy, create a module instead.
#
class packages::imagemagick {
@@ -61,14 +60,6 @@
package { 'openjdk-7-jdk': }
}
-class packages::python_dev {
-package { 'python-dev': }
-}
-
-class packages::zlib1g_dev {
-package { 'zlib1g-dev': }
-}
-
class packages::wikitools {
package { 'wikitools':
ensure => '1.1',
@@ -80,24 +71,5 @@
package { 'poster':
ensure => '0.8.0',
provider => 'pip',
-}
-}
-
-class packages::pil {
-include packages::zlib1g_dev
-include packages::python_dev
-
-# Workaround for 'pip install pil' failing to find libz.so and thus
-# installing without zlib support. See .
-file { '/usr/lib/libz.so':
-ensure => link,
-target => "/usr/lib/${::hardwaremodel}-linux-gnu/libz.so",
-before => Package['pil'],
-}
-
-package { 'pil':
-ensure => '1.1.7',
-provider => 'pip',
-require => Package['python-dev', 'zlib1g-dev'],
}
}
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index b1165c6..98062fc 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -267,7 +267,7 @@
include role::codeeditor
# API smoke test dependencies
-include packages::pil
+include python::pil
include packages::poster
include packages::wikitools
--
To view, visit https://gerrit.wikimedia.org/r/108222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I575809a87b62346b11d254a8a1d1e72daf9a9e24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create python::pil; relax restrictions on packages.pp - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Create python::pil; relax restrictions on packages.pp
..
Create python::pil; relax restrictions on packages.pp
- The rule that packages must be declared with no parameters is too strict for
packages installable via pip, since those must at least specify provider =>
'pip'. So relax the restriction for now.
- At the same time, the setup for PIL really is a bit too involved for
packages.pp, so move it to a python::pil class in its own module.
Change-Id: I575809a87b62346b11d254a8a1d1e72daf9a9e24
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
2 files changed, 2 insertions(+), 30 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index 566c0ae..9e5e39b 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -9,8 +9,7 @@
# prohibition on duplicate definitions.
#
# *Note*:: each class in this file must correspond to a package of the
-# same name. The package must be declared with no parameters. If you
-# need to do anything fancier, create a module instead.
+# same name. If you need anything fancy, create a module instead.
#
class packages::imagemagick {
@@ -61,14 +60,6 @@
package { 'openjdk-7-jdk': }
}
-class packages::python_dev {
-package { 'python-dev': }
-}
-
-class packages::zlib1g_dev {
-package { 'zlib1g-dev': }
-}
-
class packages::wikitools {
package { 'wikitools':
ensure => '1.1',
@@ -80,24 +71,5 @@
package { 'poster':
ensure => '0.8.0',
provider => 'pip',
-}
-}
-
-class packages::pil {
-include packages::zlib1g_dev
-include packages::python_dev
-
-# Workaround for 'pip install pil' failing to find libz.so and thus
-# installing without zlib support. See .
-file { '/usr/lib/libz.so':
-ensure => link,
-target => "/usr/lib/${::hardwaremodel}-linux-gnu/libz.so",
-before => Package['pil'],
-}
-
-package { 'pil':
-ensure => '1.1.7',
-provider => 'pip',
-require => Package['python-dev', 'zlib1g-dev'],
}
}
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index b1165c6..98062fc 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -267,7 +267,7 @@
include role::codeeditor
# API smoke test dependencies
-include packages::pil
+include python::pil
include packages::poster
include packages::wikitools
--
To view, visit https://gerrit.wikimedia.org/r/108222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I575809a87b62346b11d254a8a1d1e72daf9a9e24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Gergő Tisza
Gerrit-Reviewer: Ori.livneh
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 all usage of virtual resources - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108223
Change subject: Remove all usage of virtual resources
..
Remove all usage of virtual resources
It dawned on me today that I had fundamentally misunderstood virtual resources,
and that their usage in MediaWiki-Vagrant was entirely voodoo.
What I got right:
- Virtual resources allow a resource to be declared in multiple places.
What I got wrong:
- You can include these multiple places without causing a duplicate definition
conflict.
- The resource should be declared in the same manner in all places.
Virtual resources are meant for when there are varying implementations of a
particular resource. Puppet still expects that only a single variant will be
declared for a given node.
This patch removes all usage of virtual resources from MediaWiki-Vagrant. There
should be no change in behavior / functionality.
Change-Id: I3313b394157a9daedf1bbe6e33e375c1603555db
---
M puppet/manifests/roles.pp
M puppet/modules/apache/manifests/init.pp
M puppet/modules/git/manifests/init.pp
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/php/manifests/init.pp
M puppet/modules/user_metrics/manifests/init.pp
M puppet/modules/xhprof/manifests/init.pp
10 files changed, 57 insertions(+), 66 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/23/108223/1
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 98062fc..454ad09 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -107,13 +107,13 @@
require => Exec['mediawiki setup'],
}
-@mediawiki::extension { [ 'ContributionTracking', 'ParserFunctions' ]: }
+mediawiki::extension { [ 'ContributionTracking', 'ParserFunctions' ]: }
-@mediawiki::extension { 'FundraisingEmailUnsubscribe':
+mediawiki::extension { 'FundraisingEmailUnsubscribe':
entrypoint => 'FundraiserUnsubscribe.php',
}
-@mediawiki::extension { 'DonationInterface':
+mediawiki::extension { 'DonationInterface':
entrypoint => 'donationinterface.php',
settings => template('fr-config.php.erb'),
needs_update => true,
@@ -137,7 +137,7 @@
include role::mediawiki
include role::geshi
-@mediawiki::extension { 'EventLogging':
+mediawiki::extension { 'EventLogging':
priority => $LOAD_EARLY,
settings => {
wgEventLoggingBaseUri=> 'http://localhost:8100/event.gif',
@@ -153,7 +153,7 @@
class role::oauth {
include role::mediawiki
-@mediawiki::extension { 'OAuth':
+mediawiki::extension { 'OAuth':
needs_update => true,
settings => [
'$wgMWOAuthSecureTokenTransfer = false',
@@ -172,7 +172,7 @@
include role::mediawiki
include role::eventlogging
-@mediawiki::extension { 'MobileFrontend':
+mediawiki::extension { 'MobileFrontend':
settings => {
wgMFForceSecureLogin => false,
wgMFLogEvents=> true,
@@ -189,7 +189,7 @@
include role::mediawiki
include role::eventlogging
-@mediawiki::extension { 'GuidedTour': }
+mediawiki::extension { 'GuidedTour': }
}
# == Class: role::gettingstarted
@@ -201,7 +201,7 @@
include role::eventlogging
include role::guidedtour
-@mediawiki::extension { 'GettingStarted':
+mediawiki::extension { 'GettingStarted':
settings => {
wgGettingStartedRedis => '127.0.0.1',
},
@@ -214,14 +214,14 @@
include role::mediawiki
include role::eventlogging
-@mediawiki::extension { 'Echo':
+mediawiki::extension { 'Echo':
needs_update => true,
settings => {
wgEchoEnableEmailBatch => false,
},
}
-@mediawiki::extension { 'Thanks':
+mediawiki::extension { 'Thanks':
require => Mediawiki::Extension['Echo'],
}
}
@@ -233,7 +233,7 @@
include role::mediawiki
class { '::mediawiki::parsoid': }
-@mediawiki::extension { 'VisualEditor':
+mediawiki::extension { 'VisualEditor':
settings => template('ve-config.php.erb'),
}
}
@@ -271,9 +271,9 @@
include packages::poster
include packages::wikitools
-@mediawiki::extension { 'Campaigns': }
+mediawiki::extension { 'Campaigns': }
-@mediawiki::extension { 'UploadWizard':
+mediawiki::extension { 'UploadWizard':
require => Package['imagemagick'],
settings => {
wgEnableUploads => true,
@@ -299,7 +299,7 @@
include role::mediawiki
include role::wikieditor
-@mediawiki::extension { 'CodeEditor': }
+mediawiki::extension { 'CodeEditor': }
}
# == Class: role::geshi
@@ -307,7 +307,
[MediaWiki-commits] [Gerrit] Add python::* classes accidentally omitted from 1d92fb85c5 - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108224
Change subject: Add python::* classes accidentally omitted from 1d92fb85c5
..
Add python::* classes accidentally omitted from 1d92fb85c5
Follows I575809a87.
Change-Id: I6c1c81aedebed4ba4338bd6cb012e378a5c9884b
---
A puppet/modules/python/manifests/dev.pp
A puppet/modules/python/manifests/pil.pp
2 files changed, 36 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/24/108224/1
diff --git a/puppet/modules/python/manifests/dev.pp
b/puppet/modules/python/manifests/dev.pp
new file mode 100644
index 000..648f747
--- /dev/null
+++ b/puppet/modules/python/manifests/dev.pp
@@ -0,0 +1,8 @@
+# == Class: python::dev
+#
+# This includable class provides an easy way for classes to expresses a
+# dependency on python-dev without causing duplicate definition errors.
+#
+class python::dev {
+package { 'python-dev': }
+}
diff --git a/puppet/modules/python/manifests/pil.pp
b/puppet/modules/python/manifests/pil.pp
new file mode 100644
index 000..3c787eb
--- /dev/null
+++ b/puppet/modules/python/manifests/pil.pp
@@ -0,0 +1,28 @@
+# == Class: python::pil
+#
+# The Python Imaging Library (PIL) adds image processing capabilities to your
+# Python interpreter. This library supports many file formats, and provides
+# powerful image processing and graphics capabilities.
+#
+class python::pil {
+include ::python::dev
+
+package { 'zlib1g-dev': }
+
+# Workaround for 'pip install pil' failing to find libz.so and thus
+# installing without zlib support. See .
+file { '/usr/lib/libz.so':
+ensure => link,
+target => "/usr/lib/${::hardwaremodel}-linux-gnu/libz.so",
+require => Package['zlib1g-dev'],
+}
+
+package { 'PIL':
+ensure => '1.1.7',
+provider => 'pip',
+require => [
+Package['python-dev', 'zlib1g-dev'],
+File['/usr/lib/libz.so'],
+],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/108224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c1c81aedebed4ba4338bd6cb012e378a5c9884b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove all usage of virtual resources - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove all usage of virtual resources
..
Remove all usage of virtual resources
It dawned on me today that I had fundamentally misunderstood virtual resources,
and that their usage in MediaWiki-Vagrant was entirely voodoo.
What I got right:
- Virtual resources allow a resource to be declared in multiple places.
What I got wrong:
- You can include these multiple places without causing a duplicate definition
conflict.
- The resource should be declared in the same manner in all places.
Virtual resources are meant for when there are varying implementations of a
particular resource. Puppet still expects that only a single variant will be
declared for a given node.
This patch removes all usage of virtual resources from MediaWiki-Vagrant. There
should be no change in behavior / functionality.
Change-Id: I3313b394157a9daedf1bbe6e33e375c1603555db
---
M puppet/manifests/roles.pp
M puppet/modules/apache/manifests/init.pp
M puppet/modules/git/manifests/init.pp
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/php/manifests/init.pp
M puppet/modules/user_metrics/manifests/init.pp
M puppet/modules/xhprof/manifests/init.pp
10 files changed, 57 insertions(+), 66 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 98062fc..454ad09 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -107,13 +107,13 @@
require => Exec['mediawiki setup'],
}
-@mediawiki::extension { [ 'ContributionTracking', 'ParserFunctions' ]: }
+mediawiki::extension { [ 'ContributionTracking', 'ParserFunctions' ]: }
-@mediawiki::extension { 'FundraisingEmailUnsubscribe':
+mediawiki::extension { 'FundraisingEmailUnsubscribe':
entrypoint => 'FundraiserUnsubscribe.php',
}
-@mediawiki::extension { 'DonationInterface':
+mediawiki::extension { 'DonationInterface':
entrypoint => 'donationinterface.php',
settings => template('fr-config.php.erb'),
needs_update => true,
@@ -137,7 +137,7 @@
include role::mediawiki
include role::geshi
-@mediawiki::extension { 'EventLogging':
+mediawiki::extension { 'EventLogging':
priority => $LOAD_EARLY,
settings => {
wgEventLoggingBaseUri=> 'http://localhost:8100/event.gif',
@@ -153,7 +153,7 @@
class role::oauth {
include role::mediawiki
-@mediawiki::extension { 'OAuth':
+mediawiki::extension { 'OAuth':
needs_update => true,
settings => [
'$wgMWOAuthSecureTokenTransfer = false',
@@ -172,7 +172,7 @@
include role::mediawiki
include role::eventlogging
-@mediawiki::extension { 'MobileFrontend':
+mediawiki::extension { 'MobileFrontend':
settings => {
wgMFForceSecureLogin => false,
wgMFLogEvents=> true,
@@ -189,7 +189,7 @@
include role::mediawiki
include role::eventlogging
-@mediawiki::extension { 'GuidedTour': }
+mediawiki::extension { 'GuidedTour': }
}
# == Class: role::gettingstarted
@@ -201,7 +201,7 @@
include role::eventlogging
include role::guidedtour
-@mediawiki::extension { 'GettingStarted':
+mediawiki::extension { 'GettingStarted':
settings => {
wgGettingStartedRedis => '127.0.0.1',
},
@@ -214,14 +214,14 @@
include role::mediawiki
include role::eventlogging
-@mediawiki::extension { 'Echo':
+mediawiki::extension { 'Echo':
needs_update => true,
settings => {
wgEchoEnableEmailBatch => false,
},
}
-@mediawiki::extension { 'Thanks':
+mediawiki::extension { 'Thanks':
require => Mediawiki::Extension['Echo'],
}
}
@@ -233,7 +233,7 @@
include role::mediawiki
class { '::mediawiki::parsoid': }
-@mediawiki::extension { 'VisualEditor':
+mediawiki::extension { 'VisualEditor':
settings => template('ve-config.php.erb'),
}
}
@@ -271,9 +271,9 @@
include packages::poster
include packages::wikitools
-@mediawiki::extension { 'Campaigns': }
+mediawiki::extension { 'Campaigns': }
-@mediawiki::extension { 'UploadWizard':
+mediawiki::extension { 'UploadWizard':
require => Package['imagemagick'],
settings => {
wgEnableUploads => true,
@@ -299,7 +299,7 @@
include role::mediawiki
include role::wikieditor
-@mediawiki::extension { 'CodeEditor': }
+mediawiki::extension { 'CodeEditor': }
}
# == Class: role::geshi
@@ -307,7 +307,7 @@
class role::geshi {
include role:
[MediaWiki-commits] [Gerrit] Add python::* classes accidentally omitted from 1d92fb85c5 - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add python::* classes accidentally omitted from 1d92fb85c5
..
Add python::* classes accidentally omitted from 1d92fb85c5
Follows I575809a87.
Change-Id: I6c1c81aedebed4ba4338bd6cb012e378a5c9884b
---
A puppet/modules/python/manifests/dev.pp
A puppet/modules/python/manifests/pil.pp
2 files changed, 36 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/python/manifests/dev.pp
b/puppet/modules/python/manifests/dev.pp
new file mode 100644
index 000..648f747
--- /dev/null
+++ b/puppet/modules/python/manifests/dev.pp
@@ -0,0 +1,8 @@
+# == Class: python::dev
+#
+# This includable class provides an easy way for classes to expresses a
+# dependency on python-dev without causing duplicate definition errors.
+#
+class python::dev {
+package { 'python-dev': }
+}
diff --git a/puppet/modules/python/manifests/pil.pp
b/puppet/modules/python/manifests/pil.pp
new file mode 100644
index 000..3c787eb
--- /dev/null
+++ b/puppet/modules/python/manifests/pil.pp
@@ -0,0 +1,28 @@
+# == Class: python::pil
+#
+# The Python Imaging Library (PIL) adds image processing capabilities to your
+# Python interpreter. This library supports many file formats, and provides
+# powerful image processing and graphics capabilities.
+#
+class python::pil {
+include ::python::dev
+
+package { 'zlib1g-dev': }
+
+# Workaround for 'pip install pil' failing to find libz.so and thus
+# installing without zlib support. See .
+file { '/usr/lib/libz.so':
+ensure => link,
+target => "/usr/lib/${::hardwaremodel}-linux-gnu/libz.so",
+require => Package['zlib1g-dev'],
+}
+
+package { 'PIL':
+ensure => '1.1.7',
+provider => 'pip',
+require => [
+Package['python-dev', 'zlib1g-dev'],
+File['/usr/lib/libz.so'],
+],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/108224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c1c81aedebed4ba4338bd6cb012e378a5c9884b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
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 apache::mods::* to make Apache mods multiply-includable - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108225
Change subject: Add apache::mods::* to make Apache mods multiply-includable
..
Add apache::mods::* to make Apache mods multiply-includable
Use the same pattern we use for packages::* to allow Apache modules to be
included multiple times without causing duplicate definition errors.
Change-Id: I012f5e9bbee7764a9eae2a138611bebd828896ff
---
A puppet/modules/apache/manifests/mods.pp
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/php/manifests/init.pp
M puppet/modules/user_metrics/manifests/init.pp
4 files changed, 39 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/25/108225/1
diff --git a/puppet/modules/apache/manifests/mods.pp
b/puppet/modules/apache/manifests/mods.pp
new file mode 100644
index 000..a99d390
--- /dev/null
+++ b/puppet/modules/apache/manifests/mods.pp
@@ -0,0 +1,32 @@
+# == Class: apache::mods
+#
+# This module contains unparametrized classes that wrap some popular
+# Apache mods. Because the classes are not parametrized, they may be
+# included multiple times without causing duplicate definition errors.
+#
+
+# mod_rewrite
+class apache::mods::rewrite {
+apache::mod { 'rewrite': }
+}
+
+# mod_alias
+class apache::mods::alias {
+apache::mod { 'alias': }
+}
+
+# mod_php5
+class apache::mods::php5 {
+apache::mod { 'php5': }
+}
+
+# mod_wsgi
+class apache::mods::wsgi {
+package { 'libapache2-mod-wsgi':
+ensure => present,
+}
+
+apache::mod { 'wsgi':
+require => Package['libapache2-mod-wsgi'],
+}
+}
diff --git a/puppet/modules/mediawiki/manifests/apache.pp
b/puppet/modules/mediawiki/manifests/apache.pp
index 5eb31cd..9da8779 100644
--- a/puppet/modules/mediawiki/manifests/apache.pp
+++ b/puppet/modules/mediawiki/manifests/apache.pp
@@ -5,6 +5,8 @@
class mediawiki::apache {
include ::mediawiki
include ::apache
+include ::apache::mods::alias
+include ::apache::mods::rewrite
apache::site { 'default':
ensure => absent,
@@ -16,13 +18,6 @@
require => [ Apache::Mod['alias'], Apache::Mod['rewrite'] ],
}
-apache::mod { 'alias':
-ensure => present,
-}
-
-apache::mod { 'rewrite':
-ensure => present,
-}
file { '/var/www/favicon.ico':
ensure => file,
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index ac980e3..45054b5 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -5,7 +5,8 @@
# implemented.
#
class php {
-include apache
+include ::apache
+include ::apache::mods::php5
package { [
'php5',
@@ -20,10 +21,6 @@
'php5-mysql',
'php5-xdebug'
]:
-ensure => present,
-}
-
-apache::mod { 'php5':
ensure => present,
}
diff --git a/puppet/modules/user_metrics/manifests/init.pp
b/puppet/modules/user_metrics/manifests/init.pp
index e841e0a..08c2077 100644
--- a/puppet/modules/user_metrics/manifests/init.pp
+++ b/puppet/modules/user_metrics/manifests/init.pp
@@ -45,7 +45,9 @@
}
}
-include apache
+include ::apache
+include ::apache::mods::wsgi
+include ::apache::mods::alias
package { [ 'python-flask', 'python-flask-login', 'python-mysqldb',
'python-numpy' ]:
ensure => 'installed',
@@ -85,14 +87,6 @@
command => "mysql -f -pvagrant wiki <
${user_metrics_path}/scripts/seed.sql;",
unless=> 'mysql -pvagrant wiki -e "SELECT \'exists\' FROM page
WHERE page_title = \'Hydriz\'" | grep -q exists',
require => [ Git::Clone['analytics/user-metrics'], Service['mysql'] ]
-}
-
-package { 'libapache2-mod-wsgi':
-ensure => present,
-}
-
-apache::mod { 'wsgi':
-require => Package['libapache2-mod-wsgi'],
}
apache::site { $site_name:
--
To view, visit https://gerrit.wikimedia.org/r/108225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I012f5e9bbee7764a9eae2a138611bebd828896ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add apache::mods::* to make Apache mods multiply-includable - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add apache::mods::* to make Apache mods multiply-includable
..
Add apache::mods::* to make Apache mods multiply-includable
Use the same pattern we use for packages::* to allow Apache modules to be
included multiple times without causing duplicate definition errors.
Change-Id: I012f5e9bbee7764a9eae2a138611bebd828896ff
---
A puppet/modules/apache/manifests/mods.pp
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/php/manifests/init.pp
M puppet/modules/user_metrics/manifests/init.pp
4 files changed, 39 insertions(+), 21 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/apache/manifests/mods.pp
b/puppet/modules/apache/manifests/mods.pp
new file mode 100644
index 000..a99d390
--- /dev/null
+++ b/puppet/modules/apache/manifests/mods.pp
@@ -0,0 +1,32 @@
+# == Class: apache::mods
+#
+# This module contains unparametrized classes that wrap some popular
+# Apache mods. Because the classes are not parametrized, they may be
+# included multiple times without causing duplicate definition errors.
+#
+
+# mod_rewrite
+class apache::mods::rewrite {
+apache::mod { 'rewrite': }
+}
+
+# mod_alias
+class apache::mods::alias {
+apache::mod { 'alias': }
+}
+
+# mod_php5
+class apache::mods::php5 {
+apache::mod { 'php5': }
+}
+
+# mod_wsgi
+class apache::mods::wsgi {
+package { 'libapache2-mod-wsgi':
+ensure => present,
+}
+
+apache::mod { 'wsgi':
+require => Package['libapache2-mod-wsgi'],
+}
+}
diff --git a/puppet/modules/mediawiki/manifests/apache.pp
b/puppet/modules/mediawiki/manifests/apache.pp
index 5eb31cd..9da8779 100644
--- a/puppet/modules/mediawiki/manifests/apache.pp
+++ b/puppet/modules/mediawiki/manifests/apache.pp
@@ -5,6 +5,8 @@
class mediawiki::apache {
include ::mediawiki
include ::apache
+include ::apache::mods::alias
+include ::apache::mods::rewrite
apache::site { 'default':
ensure => absent,
@@ -16,13 +18,6 @@
require => [ Apache::Mod['alias'], Apache::Mod['rewrite'] ],
}
-apache::mod { 'alias':
-ensure => present,
-}
-
-apache::mod { 'rewrite':
-ensure => present,
-}
file { '/var/www/favicon.ico':
ensure => file,
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index ac980e3..45054b5 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -5,7 +5,8 @@
# implemented.
#
class php {
-include apache
+include ::apache
+include ::apache::mods::php5
package { [
'php5',
@@ -20,10 +21,6 @@
'php5-mysql',
'php5-xdebug'
]:
-ensure => present,
-}
-
-apache::mod { 'php5':
ensure => present,
}
diff --git a/puppet/modules/user_metrics/manifests/init.pp
b/puppet/modules/user_metrics/manifests/init.pp
index e841e0a..08c2077 100644
--- a/puppet/modules/user_metrics/manifests/init.pp
+++ b/puppet/modules/user_metrics/manifests/init.pp
@@ -45,7 +45,9 @@
}
}
-include apache
+include ::apache
+include ::apache::mods::wsgi
+include ::apache::mods::alias
package { [ 'python-flask', 'python-flask-login', 'python-mysqldb',
'python-numpy' ]:
ensure => 'installed',
@@ -85,14 +87,6 @@
command => "mysql -f -pvagrant wiki <
${user_metrics_path}/scripts/seed.sql;",
unless=> 'mysql -pvagrant wiki -e "SELECT \'exists\' FROM page
WHERE page_title = \'Hydriz\'" | grep -q exists',
require => [ Git::Clone['analytics/user-metrics'], Service['mysql'] ]
-}
-
-package { 'libapache2-mod-wsgi':
-ensure => present,
-}
-
-apache::mod { 'wsgi':
-require => Package['libapache2-mod-wsgi'],
}
apache::site { $site_name:
--
To view, visit https://gerrit.wikimedia.org/r/108225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I012f5e9bbee7764a9eae2a138611bebd828896ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
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 - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108226
Change subject: Lint
..
Lint
- Have puppet-lint ignore packages.pp and Apache's mods.pp.
- Alignment / spacing tweaks for conformity with puppet-lint style.
Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950
---
M Rakefile
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/xhprof/manifests/init.pp
3 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/26/108226/1
diff --git a/Rakefile b/Rakefile
index a3cd591..5fd54e3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,6 +8,10 @@
PuppetLint.configuration.send('disable_2sp_soft_tabs')
PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.ignore_paths = ['puppet/manifests/roles.pp']
+PuppetLint.configuration.ignore_paths = [
+'puppet/manifests/roles.pp',
+'puppet/manifests/packages.pp',
+'puppet/modules/apache/manifests/mods.pp',
+]
task :default => [:lint]
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index 05a6bbb..08a02ef 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -13,8 +13,8 @@
}
service { 'elasticsearch':
-enable => true,
ensure => running,
+enable => true,
require => Package['elasticsearch', 'openjdk-7-jre-headless'],
}
}
diff --git a/puppet/modules/xhprof/manifests/init.pp
b/puppet/modules/xhprof/manifests/init.pp
index e52e6ed..b22c330 100644
--- a/puppet/modules/xhprof/manifests/init.pp
+++ b/puppet/modules/xhprof/manifests/init.pp
@@ -44,9 +44,9 @@
}
php::ini { 'xhprof':
-require => Exec['install xhprof'],
+require => Exec['install xhprof'],
settings => {
-'extension' => 'xhprof.so',
+'extension' => 'xhprof.so',
# Not used by the extension directly, used by the
# XHProf_Runs utility class
'xhprof.output_dir' => $profile_storage_dir,
@@ -58,14 +58,14 @@
ensure => directory,
owner => 'vagrant',
group => 'www-data',
-mode => 0775,
+mode => '0775',
}
# Enable xhprof viewer on /xhprof directory of devwiki
apache::conf { 'xhprof':
-ensure => present,
-site => $role::mediawiki::wiki_name,
-source => 'puppet:///modules/xhprof/xhprof-apache-config',
+ensure => present,
+site=> $role::mediawiki::wiki_name,
+source => 'puppet:///modules/xhprof/xhprof-apache-config',
require => Php::Ini['xhprof'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lint - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Lint
..
Lint
- Have puppet-lint ignore packages.pp and Apache's mods.pp.
- Alignment / spacing tweaks for conformity with puppet-lint style.
Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950
---
M Rakefile
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/xhprof/manifests/init.pp
3 files changed, 12 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Rakefile b/Rakefile
index a3cd591..5fd54e3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,6 +8,10 @@
PuppetLint.configuration.send('disable_2sp_soft_tabs')
PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.ignore_paths = ['puppet/manifests/roles.pp']
+PuppetLint.configuration.ignore_paths = [
+'puppet/manifests/roles.pp',
+'puppet/manifests/packages.pp',
+'puppet/modules/apache/manifests/mods.pp',
+]
task :default => [:lint]
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index 05a6bbb..08a02ef 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -13,8 +13,8 @@
}
service { 'elasticsearch':
-enable => true,
ensure => running,
+enable => true,
require => Package['elasticsearch', 'openjdk-7-jre-headless'],
}
}
diff --git a/puppet/modules/xhprof/manifests/init.pp
b/puppet/modules/xhprof/manifests/init.pp
index e52e6ed..b22c330 100644
--- a/puppet/modules/xhprof/manifests/init.pp
+++ b/puppet/modules/xhprof/manifests/init.pp
@@ -44,9 +44,9 @@
}
php::ini { 'xhprof':
-require => Exec['install xhprof'],
+require => Exec['install xhprof'],
settings => {
-'extension' => 'xhprof.so',
+'extension' => 'xhprof.so',
# Not used by the extension directly, used by the
# XHProf_Runs utility class
'xhprof.output_dir' => $profile_storage_dir,
@@ -58,14 +58,14 @@
ensure => directory,
owner => 'vagrant',
group => 'www-data',
-mode => 0775,
+mode => '0775',
}
# Enable xhprof viewer on /xhprof directory of devwiki
apache::conf { 'xhprof':
-ensure => present,
-site => $role::mediawiki::wiki_name,
-source => 'puppet:///modules/xhprof/xhprof-apache-config',
+ensure => present,
+site=> $role::mediawiki::wiki_name,
+source => 'puppet:///modules/xhprof/xhprof-apache-config',
require => Php::Ini['xhprof'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added user_name information for CSV output - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: Added user_name information for CSV output
..
Added user_name information for CSV output
Changed the CSV output on simple CSV and timeseries CSV to display the
user_name in addition to the user_id.
Created new function get_username_via_id(user_id) to map the user_name from the
id given.
Change-Id: I839eb8cf9dc7f31e84782bd66ad882e96d54b6f7
---
M tests/test_controllers/test_reports.py
M wikimetrics/controllers/reports.py
2 files changed, 28 insertions(+), 12 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/tests/test_controllers/test_reports.py
b/tests/test_controllers/test_reports.py
index c0904d4..5c729ed 100644
--- a/tests/test_controllers/test_reports.py
+++ b/tests/test_controllers/test_reports.py
@@ -199,7 +199,7 @@
# Check the csv result
response = self.app.get('/reports/result/{0}.csv'.format(result_key))
-assert_true(response.data.find('Average,2.0') >= 0)
+assert_true(response.data.find('Average,,2.0') >= 0)
# Testing to see if the parameters are also in the CSV
# (related to Mingle 1089)
@@ -245,8 +245,7 @@
# Check the csv result
response = self.app.get('/reports/result/{0}.csv'.format(result_key))
-print(response.data)
-assert_true(response.data.find('Sum,8.0') >= 0)
+assert_true(response.data.find('Sum,,8.0') >= 0)
def test_report_result_std_dev_only_csv(self):
# Make the request
@@ -324,18 +323,20 @@
# Check the csv result
response = self.app.get('/reports/result/{0}.csv'.format(result_key))
assert_true(response.data.find(
-'user_id,submetric,'
+'user_id,user_name,submetric,'
'2013-01-01 00:00:00,2013-02-01 00:00:00,'
'2013-03-01 00:00:00,2013-04-01 00:00:00'
) >= 0)
assert_true(response.data.find(
-'{0},edits,1,2,1,0'.format(self.editors[0].user_id)
+'{0},{1},edits,1,2,1,0'.format(
+self.editors[0].user_id, self.editors[0].user_name)
) >= 0)
assert_true(response.data.find(
-'{0},edits,1,2,1,0'.format(self.editors[1].user_id)
+'{0},{1},edits,1,2,1,0'.format(
+self.editors[1].user_id, self.editors[1].user_name)
) >= 0)
assert_true(response.data.find(
-'Average,edits,0.5000,1.,0.5000,0.'
+'Average,,edits,0.5000,1.,0.5000,0.'
) >= 0)
# Testing to see if the parameters are also in the CSV
diff --git a/wikimetrics/controllers/reports.py
b/wikimetrics/controllers/reports.py
index 4f47c17..18f579c 100644
--- a/wikimetrics/controllers/reports.py
+++ b/wikimetrics/controllers/reports.py
@@ -6,7 +6,7 @@
from flask.ext.login import current_user
from wikimetrics.configurables import app, db
-from wikimetrics.models import Report, RunReport, PersistentReport
+from wikimetrics.models import Report, RunReport, PersistentReport, WikiUser
from wikimetrics.metrics import TimeseriesChoices
from wikimetrics.models.report_nodes import Aggregation
from wikimetrics.utils import (
@@ -126,6 +126,19 @@
return json_response(status=celery_task.status)
+def get_username_via_id(user_id):
+"""
+Parameters
+user_id : id to match for user_name
+"""
+db_session = db.get_session()
+ret = db_session.query(WikiUser.mediawiki_userid,
WikiUser.mediawiki_username)\
+.filter(WikiUser.mediawiki_userid.in_([user_id]))\
+.all()
+db_session.close()
+return ret[0][1]
+
+
def get_timeseries_csv(task_result, pj, parameters):
"""
Parameters
@@ -150,9 +163,9 @@
columns = task_result[Aggregation.STD].values()[0].keys()
# if task_result is not empty find header in first row
-fieldnames = ['user_id', 'submetric'] + sorted(columns)
+fieldnames = ['user_id', 'user_name', 'submetric'] + sorted(columns)
else:
-fieldnames = ['user_id', 'submetric']
+fieldnames = ['user_id', 'user_name', 'submetric']
writer = DictWriter(csv_io, fieldnames)
# collect rows to output in CSV
@@ -165,6 +178,7 @@
for subrow in row.keys():
task_row = row[subrow].copy()
task_row['user_id'] = user_id
+task_row['user_name'] = get_username_via_id(user_id)
task_row['submetric'] = subrow
task_rows.append(task_row)
@@ -234,9 +248,9 @@
columns = task_result[Aggregation.STD].keys()
# if task_result is not empty find header in first row
-fieldnames = ['user_id'] + columns
+fieldnames = ['user_id', 'user_name'] + columns
else:
-fieldnames = ['user_id']
+fieldnames
[MediaWiki-commits] [Gerrit] Allow extensions to set a custom error message in the BlockI... - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108285
Change subject: Allow extensions to set a custom error message in the BlockIp
hook
..
Allow extensions to set a custom error message in the BlockIp hook
Change-Id: I2e3773e22c78370e6ca1de49e7b0976b68d8d76b
---
M docs/hooks.txt
M includes/specials/SpecialBlock.php
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/85/108285/1
diff --git a/docs/hooks.txt b/docs/hooks.txt
index b617430..dc0a7e2 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -772,6 +772,7 @@
'BlockIp': Before an IP address or user is blocked.
$block: the Block object about to be saved
$user: the user _doing_ the block (not the one being blocked)
+$reason: if the hook is aborted, the error message to be returned
'BlockIpComplete': After an IP address or user is blocked.
$block: the Block object that was saved
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 1aa8006..61b59b9 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -695,8 +695,9 @@
$block->isAutoblocking( $data['AutoBlock'] );
$block->mHideName = $data['HideUser'];
- if ( !wfRunHooks( 'BlockIp', array( &$block, &$performer ) ) ) {
- return array( 'hookaborted' );
+ $reason = array( 'hookaborted' );
+ if ( !wfRunHooks( 'BlockIp', array( &$block, &$performer,
&$reason ) ) ) {
+ return $reason;
}
# Try to insert block. Is there a conflicting block?
--
To view, visit https://gerrit.wikimedia.org/r/108285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e3773e22c78370e6ca1de49e7b0976b68d8d76b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dependency install script, handles httplib - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: dependency install script, handles httplib
..
dependency install script, handles httplib
Change-Id: I15b2d5c1bbae0410ad2578525266abdd624c20cd
---
A scripts/install
1 file changed, 22 insertions(+), 0 deletions(-)
diff --git a/scripts/install b/scripts/install
new file mode 100755
index 000..c6be8a3
--- /dev/null
+++ b/scripts/install
@@ -0,0 +1,22 @@
+# installs dependencies
+
+(pip freeze | grep -P httplib2==[0-9.]+) && pip uninstall httplib2 && echo
"*** uninstalled httplib2"
+
+# is it wikimetrics_dir=${$1:-$(pwd)}?
+wikimetrics_dir=${1:-$(pwd)}
+
+good_httplib=$(pip freeze | grep 'httplib2.*pywikibot')
+if [[ -z "${good_httplib}" ]]
+then
+tmpdir=$(mktemp -d /tmp/wikimetrics_httplib2.X)
+cd $tmpdir
+git clone --depth=1
https://github.com/wikimedia/pywikibot-externals-httplib2
+cd pywikibot-externals-httplib2
+sudo python setup.py install
+rm -rf $tmpdir
+echo "*** installed pywikibot's httplib2"
+fi
+
+cd $wikimetrics_dir
+sudo pip install -e .
+echo "*** installed dependencies"
--
To view, visit https://gerrit.wikimedia.org/r/108160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15b2d5c1bbae0410ad2578525266abdd624c20cd
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add $wgHideUserContribLimit config setting - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add $wgHideUserContribLimit config setting
..
Add $wgHideUserContribLimit config setting
Replace const in Special:Block by a config setting in
DefaultSettings.php
Setting to false will disable the limit (instead of setting to a
very high number).
The value is unchanged, but now it is possible to change it in
LocalSettings.php
Also add the value to the message to give better feedback to the
performer of the action.
Change-Id: I3fd39c1c9dfa65a24a3451800dc623b40162aeb5
---
M includes/DefaultSettings.php
M includes/specials/SpecialBlock.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
4 files changed, 18 insertions(+), 9 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 69d4633..31cbb4c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4556,6 +4556,15 @@
$wgDeleteRevisionsLimit = 0;
/**
+ * The maximum number of edits a user can have and
+ * can still be hidden by users with the hideuser permission.
+ * This is limited for performance reason.
+ * Set to false to disable the limit.
+ * @since 1.23
+ */
+$wgHideUserContribLimit = 1000;
+
+/**
* Number of accounts each IP address may create, 0 to disable.
*
* @warning Requires memcached
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 1aa8006..3780660 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -28,10 +28,6 @@
* @ingroup SpecialPage
*/
class SpecialBlock extends FormSpecialPage {
- /** The maximum number of edits a user can have and still be hidden
-* TODO: config setting? */
- const HIDEUSER_CONTRIBLIMIT = 1000;
-
/** @var User user to be blocked, as passed either by parameter
(url?wpTarget=Foo)
* or as subpage (Special:Block/Foo) */
protected $target;
@@ -602,7 +598,7 @@
* @return Bool|String
*/
public static function processForm( array $data, IContextSource
$context ) {
- global $wgBlockAllowsUTEdit;
+ global $wgBlockAllowsUTEdit, $wgHideUserContribLimit;
$performer = $context->getUser();
@@ -673,10 +669,13 @@
} elseif ( !in_array( $data['Expiry'], array(
'infinite', 'infinity', 'indefinite' ) ) ) {
# Bad expiry.
return array( 'ipb_expiry_temp' );
- } elseif ( $user->getEditCount() >
self::HIDEUSER_CONTRIBLIMIT ) {
+ } elseif ( $wgHideUserContribLimit !== false
+ && $user->getEditCount() >
$wgHideUserContribLimit
+ ) {
# Typically, the user should have a handful of
edits.
# Disallow hiding users with many edits for
performance.
- return array( 'ipb_hide_invalid' );
+ return array( array( 'ipb_hide_invalid',
+ Message::numParam(
$wgHideUserContribLimit ) ) );
} elseif ( !$data['Confirm'] ) {
return array( 'ipb-confirmhideuser',
'ipb-confirmaction' );
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 11e2597..726b8f0 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3376,7 +3376,7 @@
'range_block_disabled'=> 'The administrator ability to create
range blocks is disabled.',
'ipb_expiry_invalid' => 'Expiry time invalid.',
'ipb_expiry_temp' => 'Hidden username blocks must be
permanent.',
-'ipb_hide_invalid'=> 'Unable to suppress this account; it may
have too many edits.',
+'ipb_hide_invalid'=> 'Unable to suppress this account; it has
more than {{PLURAL:$1|one edit|$1 edits}}.',
'ipb_already_blocked' => '"$1" is already blocked.',
'ipb-needreblock' => '$1 is already blocked. Do you want to
change the settings?',
'ipb-otherblocks-header' => 'Other {{PLURAL:$1|block|blocks}}',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index dc7a9ec..538eed5 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -6596,7 +6596,8 @@
* {{msg-mw|Ip range toolarge}}',
'ipb_expiry_invalid' => 'Used as error message in [[Special:Block]].',
'ipb_expiry_temp' => 'Warning message displayed on [[Special:BlockIP]] if the
option "hide username" is selected but the expiry time is not infinite.',
-'ipb_hide_invalid' => 'Used as error message in [[Sp
[MediaWiki-commits] [Gerrit] Special:Contributions: add all params to feed URL - change (mediawiki/core)
MrBlueSky has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108287
Change subject: Special:Contributions: add all params to feed URL
..
Special:Contributions: add all params to feed URL
On Special:Contributions, the parameters namespace, year, month, tagfilter,
deletedonly, toponly are not applied to the feed link in the toolbox
(action=feedcontributions).
Bug 54093
Change-Id: Ib070b53786360d1c4911e0e4b50e61140466526c
---
M includes/specials/SpecialContributions.php
1 file changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/87/108287/1
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 6b56c2f..737f325 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -130,35 +130,35 @@
$this->opts['month'] = $request->getIntOrNull( 'month'
);
}
+ $feedParams = array(
+ 'action' => 'feedcontributions',
+ 'user' => $target,
+ );
+ if ( $this->opts['topOnly'] ) {
+ $feedParams['toponly'] = true;
+ }
+ if ( $this->opts['deletedOnly'] ) {
+ $feedParams['deletedonly'] = true;
+ }
+ if ( $this->opts['tagfilter'] !== '' ) {
+ $feedParams['tagfilter'] = $this->opts['tagfilter'];
+ }
+ if ( $this->opts['namespace'] !== '' ) {
+ $feedParams['namespace'] = $this->opts['namespace'];
+ }
+ if ( $this->opts['year'] !== null ) {
+ $feedParams['year'] = $this->opts['year'];
+ }
+ if ( $this->opts['month'] !== null ) {
+ $feedParams['month'] = $this->opts['month'];
+ }
+
$feedType = $request->getVal( 'feed' );
if ( $feedType ) {
// Maintain some level of backwards compatability
// If people request feeds using the old parameters,
redirect to API
- $apiParams = array(
- 'action' => 'feedcontributions',
- 'feedformat' => $feedType,
- 'user' => $target,
- );
- if ( $this->opts['topOnly'] ) {
- $apiParams['toponly'] = true;
- }
- if ( $this->opts['deletedOnly'] ) {
- $apiParams['deletedonly'] = true;
- }
- if ( $this->opts['tagfilter'] !== '' ) {
- $apiParams['tagfilter'] =
$this->opts['tagfilter'];
- }
- if ( $this->opts['namespace'] !== '' ) {
- $apiParams['namespace'] =
$this->opts['namespace'];
- }
- if ( $this->opts['year'] !== null ) {
- $apiParams['year'] = $this->opts['year'];
- }
- if ( $this->opts['month'] !== null ) {
- $apiParams['month'] = $this->opts['month'];
- }
-
- $url = wfAppendQuery( wfScript( 'api' ), $apiParams );
+ $feedParams['feedformat'] = $feedType;
+ $url = wfAppendQuery( wfScript( 'api' ), $feedParams );
$out->redirect( $url, '301' );
@@ -166,7 +166,7 @@
}
// Add RSS/atom links
- $this->addFeedLinks( array( 'action' => 'feedcontributions',
'user' => $target ) );
+ $this->addFeedLinks( $feedParams );
if ( wfRunHooks( 'SpecialContributionsBeforeMainOutput', array(
$id, $userObj, $this ) ) ) {
$out->addHTML( $this->getForm() );
--
To view, visit https://gerrit.wikimedia.org/r/108287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib070b53786360d1c4911e0e4b50e61140466526c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MrBlueSky
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove obsolete warning import - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: remove obsolete warning import .. remove obsolete warning import Change-Id: I83c146eca7528df07d6b92182755999146c78a4f --- M tests/site_tests.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index ee86e70..a980e51 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -11,7 +11,6 @@ import pywikibot -import warnings from tests import patch_request, unpatch_request from utils import PywikibotTestCase, unittest -- To view, visit https://gerrit.wikimedia.org/r/108201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83c146eca7528df07d6b92182755999146c78a4f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Merlijn van Deen 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 2 messages optional for translation - change (mediawiki/core)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/108288 Change subject: Make 2 messages optional for translation .. Make 2 messages optional for translation Spotted by Joseph https://translatewiki.net/wiki/Thread:Support/Optional_messages_(10) Change-Id: Iaf9e42ed21edffd2d36f4ba09a5316f369b4812c --- M maintenance/language/messageTypes.inc 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/88/108288/1 diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index a7d1ceb..7704668 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -498,6 +498,8 @@ 'limitreport-expensivefunctioncount-value', 'interlanguage-link-title', 'img-lang-opt', + 'quotation-marks', + 'recentchanges-legend-plusminus', ); /** Exif messages, which may be set as optional in several checks, but are generally mandatory */ -- To view, visit https://gerrit.wikimedia.org/r/108288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf9e42ed21edffd2d36f4ba09a5316f369b4812c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make 2 messages optional for translation - change (mediawiki/core)
Raimond Spekking has submitted this change and it was merged. Change subject: Make 2 messages optional for translation .. Make 2 messages optional for translation Spotted by Joseph https://translatewiki.net/wiki/Thread:Support/Optional_messages_(10) Change-Id: Iaf9e42ed21edffd2d36f4ba09a5316f369b4812c --- M maintenance/language/messageTypes.inc 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index a7d1ceb..7704668 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -498,6 +498,8 @@ 'limitreport-expensivefunctioncount-value', 'interlanguage-link-title', 'img-lang-opt', + 'quotation-marks', + 'recentchanges-legend-plusminus', ); /** Exif messages, which may be set as optional in several checks, but are generally mandatory */ -- To view, visit https://gerrit.wikimedia.org/r/108288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf9e42ed21edffd2d36f4ba09a5316f369b4812c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: convert into a module - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108289
Change subject: beta: convert into a module
..
beta: convert into a module
Change-Id: I2200ce11e948ba96c1fedd20083db1fd62c64620
---
D manifests/misc/beta.pp
M manifests/role/beta.pp
R modules/beta/files/sync-site-resources
R modules/beta/files/wmf-beta-autoupdate.py
A modules/beta/manifests/autoupdater.pp
A modules/beta/manifests/init.pp
A modules/beta/manifests/natdestrewrite.pp
A modules/beta/manifests/natfix.pp
A modules/beta/manifests/syncsiteresources.pp
9 files changed, 111 insertions(+), 125 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/108289/1
diff --git a/manifests/misc/beta.pp b/manifests/misc/beta.pp
deleted file mode 100644
index 815960c..000
--- a/manifests/misc/beta.pp
+++ /dev/null
@@ -1,121 +0,0 @@
-class misc::beta::autoupdater {
-
- require misc::deployment::common_scripts
-
- # Parsoid JavaScript dependencies are updated on beta via npm
- package { 'npm':
- ensure => present,
- }
-
- file {
- # Old shell version
- "/usr/local/bin/wmf-beta-autoupdate":
- ensure => absent;
- # Python rewrite
- "/usr/local/bin/wmf-beta-autoupdate.py":
- owner => root,
- group => root,
- mode => 0555,
- require => [
- Package['git-core'],
- ],
- source =>
'puppet:///files/misc/beta/wmf-beta-autoupdate.py';
- "/etc/default/wmf-beta-autoupdate":
- ensure => absent;
- "/etc/init/wmf-beta-autoupdate.conf":
- ensure => absent;
- }
-
- # Phased out in favor of a dedicated Jenkins job running directly on the
- # beta parsoid instance.
- file { '/usr/local/bin/wmf-beta-parsoid-remote.sh':
- ensure => absent,
- }
-
- # Make sure wmf-beta-autoupdate can run the l10n updater as l10nupdate
- sudo_user { "mwdeploy" : privileges => [
- 'ALL = (l10nupdate) NOPASSWD:/usr/local/bin/mw-update-l10n',
- 'ALL = (l10nupdate) NOPASSWD:/usr/local/bin/mwscript',
- 'ALL = (l10nupdate)
NOPASSWD:/usr/local/bin/refreshCdbJsonFiles',
- # Some script running as mwdeploy explicily use "sudo -u
mwdeploy"
- # which makes Ubuntu to request a password. The following rule
- # make sure we are not going to ask the password to mwdeploy
when
- # it tries to identify as mwdeploy.
- 'ALL = (mwdeploy) NOPASSWD: ALL',
-
- # mergeMessageFileList.php is run by mw-update-l10n as the
apache user
- # since https://gerrit.wikimedia.org/r/#/c/44548/
- # Let it runs mwscript and others as apache user.
- 'ALL = (apache) NOPASSWD: ALL',
- ] }
-
- # Phase out old upstart job
- file { '/etc/init.d/wmf-beta-autoupdate':
- ensure => absent;
- }
-
-}
-
-# Workaround NAT traversal issue when a beta cluster instance attempt to
-# connect to a beta public IP. The NAT would get the packet loss, instead
-# transparently destination IP of outgoing packets to point directly to the
-# private IP instance instead of the public IP.
-#
-# FIXME should probably be applied by default on ALL beta cluster instances.
-#
-# References:
-#
-# RT #4824 - https://rt.wikimedia.org/Ticket/Display.html?id=4824
-# bug #45868 - https://bugzilla.wikimedia.org/show_bug.cgi?id=45868
-class misc::beta::natfixup {
-
- # List out the instance public IP and private IP as described in
OpenStack
- # manager interface
- #
- # FIXME ideally that should be fetched directly from OpenStack
- # configuration to make sure the iptables revwrites are always in sync
with
- # the web interface :-D
- #
- $nat_mappings = {
- 'deployment-cache-text1'=> { public_ip => '208.80.153.219',
private_ip => '10.4.1.133' },
- 'deployment-cache-upload04' => { public_ip => '208.80.153.242',
private_ip => '10.4.0.211' },
- 'deployment-cache-bits03' => { public_ip => '208.80.153.243',
private_ip => '10.4.0.51' },
- 'deployment-eventlogging' => { public_ip => '208.80.153.244',
private_ip => '10.4.0.48' },
- 'deployment-cache-mobile01' => { public_ip => '208.80.153.143',
private_ip => '10.4.1.82' },
- }
- create_resources( 'misc::beta::natdestrewrite', $nat_mappings )
-}
-
-define misc::beta::natdestrewrite( $public_ip, $private_ip ) {
-
- include base::firewall
-
- # iptables -t nat -I OUTPUT --dest $public_ip -j DNAT --to-dest
$private_ip
- fer
[MediaWiki-commits] [Gerrit] Show error message when user is not logged in - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Show error message when user is not logged in
..
Show error message when user is not logged in
Change-Id: If513185ab518925248881aad1ea5ad415b286826
---
M i18n/en.json
M i18n/qqq.json
M specials/SpecialContentTranslation.php
3 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 7d62a50..f60d8ce 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,6 +13,7 @@
"cx-publish-page-error": "Error while saving page.",
"cx-publish-button": "Publish translation",
"cx-source-loading": "Loading $1",
+"cx-special-login-error": "You must be logged in to translate in this
page.",
"cx-tools-instructions-title": "Create a translation",
"cx-tools-instructions-text1": "Add some paragraphs to the translation.",
"cx-tools-instructions-text2": "Adjust the automatic translations provided
to ensure quality",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 856c975..e52e988 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -14,10 +14,11 @@
"cx-publish-page-error": "Error message to display when page saving
fails.",
"cx-publish-button": "Publish button text in
[[Special:ContentTranslation]].",
"cx-source-loading": "Status text shown in the source article pane while
article is being loaded.\n\nParameters:\n* $1 - the title of the page being
loaded",
+"cx-special-login-error": "Error to show when user try to use
[[Special:ContentTranslation]] without logging in.",
"cx-tools-instructions-title": "Title for the translation aids pane.",
"cx-tools-instructions-text1": "Help text for the translation aids pane.",
"cx-tools-instructions-text2": "Help text for the translation aids pane.",
"cx-tools-instructions-text3": "Help text for the translation aids pane.",
"cx-tools-instructions-text4": "Help text for the translation aids pane.",
"cx-tools-instructions-text5": "Help text for the translation aids pane."
-}
\ No newline at end of file
+}
diff --git a/specials/SpecialContentTranslation.php
b/specials/SpecialContentTranslation.php
index 0307c84..4425981 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -23,16 +23,23 @@
public function execute( $parameters ) {
$out = $this->getOutput();
- $out->addModules( 'ext.cx.base' );
$skin = $this->getSkin();
- $this->setHeaders();
- $out->setArticleBodyOnly( true );
- // Default modules copied from OutputPage::addDefaultModules
- $out->addModules( array(
- 'mediawiki.user',
- 'mediawiki.page.startup',
- 'mediawiki.page.ready',
- ) );
+ $user = $this->getUser();
+
+ if ( !($user->isLoggedIn() ) ) {
+ $out->addHTML( $this->msg('cx-special-login-error'));
+ }
+ else {
+ $out->addModules( 'ext.cx.base' );
+ $this->setHeaders();
+ $out->setArticleBodyOnly( true );
+ // Default modules copied from
OutputPage::addDefaultModules
+ $out->addModules( array(
+ 'mediawiki.user',
+ 'mediawiki.page.startup',
+ 'mediawiki.page.ready',
+ ) );
+ }
$out->addHTML( $out->headElement( $skin ) );
--
To view, visit https://gerrit.wikimedia.org/r/108058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If513185ab518925248881aad1ea5ad415b286826
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Pginer
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: SuchetaG
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 unused variable - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused variable .. Remove unused variable Change-Id: I95c360f9adabfe2caa48cc0b88dae5642ca863ad --- M includes/Searcher.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Searcher.php b/includes/Searcher.php index 9c6981b..8ab8b55 100644 --- a/includes/Searcher.php +++ b/includes/Searcher.php @@ -555,7 +555,7 @@ } $result = $result->getData(); $result = $result[ 'version' ][ 'number' ]; - $setResult = $wgMemc->set( $mcKey, $result, 3600 * 12 ); + $wgMemc->set( $mcKey, $result, 3600 * 12 ); } wfProfileOut( __METHOD__ ); return Status::newGood( $result ); -- To view, visit https://gerrit.wikimedia.org/r/108183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95c360f9adabfe2caa48cc0b88dae5642ca863ad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Manybubbles 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 tests for API's assert={user|bot} - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108291
Change subject: Add tests for API's assert={user|bot}
..
Add tests for API's assert={user|bot}
Change-Id: I5bff0adf11bccef137d59c05edae45d774596994
---
M tests/phpunit/includes/api/ApiMainTest.php
1 file changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/91/108291/1
diff --git a/tests/phpunit/includes/api/ApiMainTest.php
b/tests/phpunit/includes/api/ApiMainTest.php
index 4ed5aa9..5c2a9fc 100644
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -30,4 +30,41 @@
$this->assertThat( $sxe, $this->isInstanceOf(
"SimpleXMLElement" ) );
}
+ public static function provideAssert() {
+ $anon = new User();
+ $bot = new User();
+ $bot->setName( 'Bot' );
+ $bot->addToDatabase();
+ $bot->addGroup( 'bot' );
+ $user = self::$users['sysop']->user; // Not a bot
+ return array(
+ array( $anon, 'user', 'assertuserfailed' ),
+ array( $user, 'user', false ),
+ array( $user, 'bot', 'assertbotfailed' ),
+ array( $bot, 'user', false ),
+ array( $bot, 'bot', false ),
+ );
+ }
+
+ /**
+* Tests the assert={user|bot} functionality
+*
+* @covers ApiMain::checkAsserts
+* @dataProvider provideAssert
+* @param User $user
+* @param string $assert
+* @param string|bool $error false if no error expected
+*/
+ public function testAssert( $user, $assert, $error ) {
+ try {
+ $this->doApiRequest( array(
+ 'action' => 'query',
+ 'assert' => $assert,
+ ), null, null, $user );
+ $this->assertFalse( $error ); // That no error was
expected
+ } catch ( UsageException $e ) {
+ $this->assertEquals( $e->getCodeString(), $error );
+ }
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/108291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bff0adf11bccef137d59c05edae45d774596994
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lower caching time on MassMessage::getDBName - change (mediawiki...MassMessage)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108292
Change subject: Lower caching time on MassMessage::getDBName
..
Lower caching time on MassMessage::getDBName
Bug: 60075
Change-Id: I4e6156f22d0a7d47a6b0549f60c360f9a3a72d87
---
M MassMessage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/92/108292/1
diff --git a/MassMessage.body.php b/MassMessage.body.php
index 21e5d33..73688f2 100644
--- a/MassMessage.body.php
+++ b/MassMessage.body.php
@@ -104,7 +104,7 @@
$parse = wfParseUrl( $url );
$mapping[$parse['host']] = $dbname;
}
- $wgMemc->set( $key, $mapping, 60 * 60 * 24 * 7
);
+ $wgMemc->set( $key, $mapping, 60 * 60 );
} else {
$mapping = $data;
}
--
To view, visit https://gerrit.wikimedia.org/r/108292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e6156f22d0a7d47a6b0549f60c360f9a3a72d87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clear MassMessage cache when creating a new wiki - change (mediawiki...WikimediaMaintenance)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/108293 Change subject: Clear MassMessage cache when creating a new wiki .. Clear MassMessage cache when creating a new wiki Bug: 60075 Change-Id: I06d99a68ff6445b9e4d87e53cd2bf17d1ba114e1 --- M addWiki.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance refs/changes/93/108293/1 diff --git a/addWiki.php b/addWiki.php index ecfb8cb..585d959 100644 --- a/addWiki.php +++ b/addWiki.php @@ -202,6 +202,10 @@ $searchIndex->mOptions[ 'baseName' ] = $dbName; $searchIndex->execute(); + # Clear MassMessage cache (bug 60075) + global $wgMemc; + $wgMemc->delete( 'massmessage:urltodb' ); + # print "Constructing interwiki SQL\n"; # Rebuild interwiki tables # passthru( '/home/wikipedia/conf/interwiki/update' ); // FIXME -- To view, visit https://gerrit.wikimedia.org/r/108293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06d99a68ff6445b9e4d87e53cd2bf17d1ba114e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1028, warm up - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108294 Change subject: repool db1028, warm up .. repool db1028, warm up Change-Id: I421e6eb6325294c4734bbd1a1779a5cf88bb9706 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/94/108294/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index babfd88..a8dbbbf 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -138,7 +138,7 @@ 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1033' => 400, 'db1024' => 400, - #scheme changes 'db1028' => 400, + 'db1028' => 100, # warm up ), ), -- To view, visit https://gerrit.wikimedia.org/r/108294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I421e6eb6325294c4734bbd1a1779a5cf88bb9706 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1028, warm up - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1028, warm up .. repool db1028, warm up Change-Id: I421e6eb6325294c4734bbd1a1779a5cf88bb9706 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index babfd88..a8dbbbf 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -138,7 +138,7 @@ 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1033' => 400, 'db1024' => 400, - #scheme changes 'db1028' => 400, + 'db1028' => 100, # warm up ), ), -- To view, visit https://gerrit.wikimedia.org/r/108294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I421e6eb6325294c4734bbd1a1779a5cf88bb9706 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Check for article edit permissions - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108295
Change subject: Check for article edit permissions
..
Check for article edit permissions
During the standard submit/commit process used by both
api and page action's for writes check Title::userCan
for permission.
Bug: 60218
Change-Id: Ic331595ddc1014657e9582b657b0351044ae327d
---
M includes/WorkflowLoader.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/95/108295/1
diff --git a/includes/WorkflowLoader.php b/includes/WorkflowLoader.php
index d396f71..3d1e5d4 100644
--- a/includes/WorkflowLoader.php
+++ b/includes/WorkflowLoader.php
@@ -190,6 +190,15 @@
// All blocks returned null, nothing knows how to
handle this action
throw new InvalidActionException( "No block accepted
the '$action' action: " . implode( ',', array_unique( $type ) ),
'invalid-action' );
}
+
+ // Check permissions before allowing any writes
+ if ( $user->isBlocked() ||
+ !$this->workflow->getArticleTitle()->userCan( 'edit',
$user )
+ ) {
+ reset( $interestedBlocks )->addError( 'permissions',
wfMessage( 'flow-error-not-allowed' ) );
+ $success = false;
+ }
+
return $success ? $interestedBlocks : array();
}
--
To view, visit https://gerrit.wikimedia.org/r/108295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic331595ddc1014657e9582b657b0351044ae327d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1024 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108296 Change subject: depool db1024 .. depool db1024 Change-Id: I8fb76ac41ea8df45d5576dd547dcd5da7296125a --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/96/108296/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a8dbbbf..c2cb839 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -137,8 +137,8 @@ 'db1007' => 0, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1033' => 400, - 'db1024' => 400, - 'db1028' => 100, # warm up + #schema changes 'db1024' => 400, + 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/108296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fb76ac41ea8df45d5576dd547dcd5da7296125a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1024 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: depool db1024 .. depool db1024 Change-Id: I8fb76ac41ea8df45d5576dd547dcd5da7296125a --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a8dbbbf..c2cb839 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -137,8 +137,8 @@ 'db1007' => 0, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1033' => 400, - 'db1024' => 400, - 'db1028' => 100, # warm up + #schema changes 'db1024' => 400, + 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/108296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fb76ac41ea8df45d5576dd547dcd5da7296125a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Check for article edit permissions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Check for article edit permissions
..
Check for article edit permissions
During the standard submit/commit process used by both
api and page action's for writes check Title::userCan
for permission.
Bug: 60218
Change-Id: Ic331595ddc1014657e9582b657b0351044ae327d
---
M includes/WorkflowLoader.php
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/WorkflowLoader.php b/includes/WorkflowLoader.php
index d396f71..3d1e5d4 100644
--- a/includes/WorkflowLoader.php
+++ b/includes/WorkflowLoader.php
@@ -190,6 +190,15 @@
// All blocks returned null, nothing knows how to
handle this action
throw new InvalidActionException( "No block accepted
the '$action' action: " . implode( ',', array_unique( $type ) ),
'invalid-action' );
}
+
+ // Check permissions before allowing any writes
+ if ( $user->isBlocked() ||
+ !$this->workflow->getArticleTitle()->userCan( 'edit',
$user )
+ ) {
+ reset( $interestedBlocks )->addError( 'permissions',
wfMessage( 'flow-error-not-allowed' ) );
+ $success = false;
+ }
+
return $success ? $interestedBlocks : array();
}
--
To view, visit https://gerrit.wikimedia.org/r/108295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic331595ddc1014657e9582b657b0351044ae327d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Integration tests for Client's Scribunto integration - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108298
Change subject: Integration tests for Client's Scribunto integration
..
Integration tests for Client's Scribunto integration
Change-Id: I026fa93047f9564c997a4005952306c853ff5334
---
M client/WikibaseClient.classes.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
A client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M
client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTest.php
A
client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
A client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestHelper.php
8 files changed, 386 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/98/108298/1
diff --git a/client/WikibaseClient.classes.php
b/client/WikibaseClient.classes.php
index 0589530..4b6aed6 100644
--- a/client/WikibaseClient.classes.php
+++ b/client/WikibaseClient.classes.php
@@ -67,7 +67,9 @@
'Wikibase\Client\Scribunto\WikibaseLuaEntityBindings' =>
'includes/scribunto/WikibaseLuaEntityBindings.php',
// test
- 'Wikibase\Test\MockPageUpdater' =>
'tests/phpunit/MockPageUpdater.php'
+ 'Wikibase\Test\MockPageUpdater' =>
'tests/phpunit/MockPageUpdater.php',
+
'Wikibase\Client\Scribunto\Test\WikibaseLuaIntegrationTestHelper' =>
'tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestHelper.php',
+
'Wikibase\Client\Scribunto\Test\Scribunto_LuaWikibaseLibraryTestCase' =>
'tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php'
);
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index f2f72a7..2a052d9 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -194,10 +194,6 @@
* @return EntityLookup
*/
private function getEntityLookup() {
- if ( $this->inTestMode ) {
- return new MockRepository();
- }
-
return $this->getStore()->getEntityLookup();
}
diff --git
a/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
b/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
index 0b1626b..104da89 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
@@ -1,12 +1,11 @@
--[[
- Unit tests for the mw.wikibase.entity module
+ Unit and integration tests for the mw.wikibase.entity module
@license GNU GPL v2+
@author Marius Hoch < h...@online.de >
]]
local testframework = require 'Module:TestFramework'
-local render = mw.wikibase.entity
-- A test item (the structure isn't complete... but good enough for tests)
local testItem = {
@@ -37,7 +36,7 @@
return mw.wikibase.entity.create( testItem )
end
--- Tests
+-- Unit Tests
local function testExists()
return type( mw.wikibase.entity )
@@ -63,8 +62,30 @@
return getNewTestItem():formatPropertyValues( propertyId )
end
--- Tests
+-- Integration tests
+
+local function integrationTestGetPropertiesCount()
+ return #( mw.wikibase.getEntityObject():getProperties() )
+end
+
+local function integrationTestGetLabel( langCode )
+ return mw.wikibase.getEntityObject():getLabel( langCode )
+end
+
+local function integrationTestGetSitelink( globalSiteId )
+ return mw.wikibase.getEntityObject():getSitelink( globalSiteId )
+end
+
+local function integrationTestFormatPropertyValues()
+ local entity = mw.wikibase.getEntityObject()
+ local propertyId = entity:getProperties()[1]
+
+ return mw.wikibase.getEntityObject():formatPropertyValues( propertyId )
+end
+
local tests = {
+ -- Unit Tests
+
{ name = 'mw.wikibase.entity exists', func = testExists,
type='ToString',
expect = { 'table' }
},
@@ -113,7 +134,30 @@
{ name = 'mw.wikibase.entity.formatPropertyValues', func =
testFormatPropertyValues,
args = { function() end },
expect = "bad argument #1 to 'formatPropertyValues' (string expected,
got function)"
- }
+ },
+
+ -- Integration tests
+
+ { name = 'mw.wikibase.entity.getLabel integration 1', func =
integrationTestGetLabel, type='ToString',
+ expect = { 'Lua Test Item' }
+ },
+ { name = 'mw.wikibase.entity.getLabel integration 2', func =
integrationTestGetLabel, type='ToString',
+ args = { 'en' },
+ expect = { 'Test all the code paths' }
+ },
+ { name = 'mw.wikibase.enti
[MediaWiki-commits] [Gerrit] Check for article edit permissions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Check for article edit permissions
..
Check for article edit permissions
During the standard submit/commit process used by both
api and page action's for writes check Title::userCan
for permission.
Bug: 60218
Change-Id: Ic331595ddc1014657e9582b657b0351044ae327d
(cherry picked from commit fc500dc7c476fed3fa42b53fa4088de5ac64fa3f)
---
M includes/WorkflowLoader.php
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/WorkflowLoader.php b/includes/WorkflowLoader.php
index d396f71..3d1e5d4 100644
--- a/includes/WorkflowLoader.php
+++ b/includes/WorkflowLoader.php
@@ -190,6 +190,15 @@
// All blocks returned null, nothing knows how to
handle this action
throw new InvalidActionException( "No block accepted
the '$action' action: " . implode( ',', array_unique( $type ) ),
'invalid-action' );
}
+
+ // Check permissions before allowing any writes
+ if ( $user->isBlocked() ||
+ !$this->workflow->getArticleTitle()->userCan( 'edit',
$user )
+ ) {
+ reset( $interestedBlocks )->addError( 'permissions',
wfMessage( 'flow-error-not-allowed' ) );
+ $success = false;
+ }
+
return $success ? $interestedBlocks : array();
}
--
To view, visit https://gerrit.wikimedia.org/r/108297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic331595ddc1014657e9582b657b0351044ae327d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Flow - change (mediawiki/core)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/108299 Change subject: Update Flow .. Update Flow Change-Id: I5b57aef519855fb1b6d86e46abf4ad138eb248de --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/99/108299/1 diff --git a/extensions/Flow b/extensions/Flow index c0e3a02..f957e72 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit c0e3a02765cea7488775075cbb1639645713bc73 +Subproject commit f957e725b26c8c80bb9d372b3d477c1221b3e943 -- To view, visit https://gerrit.wikimedia.org/r/108299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b57aef519855fb1b6d86e46abf4ad138eb248de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf11 Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Flow - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Flow .. Update Flow Change-Id: I5b57aef519855fb1b6d86e46abf4ad138eb248de --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Flow b/extensions/Flow index c0e3a02..f957e72 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit c0e3a02765cea7488775075cbb1639645713bc73 +Subproject commit f957e725b26c8c80bb9d372b3d477c1221b3e943 -- To view, visit https://gerrit.wikimedia.org/r/108299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b57aef519855fb1b6d86e46abf4ad138eb248de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf11 Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Allow users to adjust the font size - change (mediawiki...MobileFrontend)
Theopolisme has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108300
Change subject: [WIP] Allow users to adjust the font size
..
[WIP] Allow users to adjust the font size
The font size control is available to alpha users via
Special:MobileOptions.
Bug: 48946
Change-Id: If774f09ce5254a9dda8db30cbaca68b1a6cd00da
---
M MobileFrontend.i18n.php
M includes/MobileContext.php
M includes/skins/MinervaTemplateAlpha.php
M includes/skins/SkinMinervaAlpha.php
M includes/specials/SpecialMobileOptions.php
M javascripts/specials/mobileoptions.js
M less/mixins.less
M less/specials/mobileoptions.less
8 files changed, 190 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/108300/1
diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index f4ee4d2..e5a8ce1 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -72,9 +72,13 @@
'mobile-frontend-enable-images' => 'Enable images on mobile site',
'mobile-frontend-expand-sections-status' => 'Expand all sections',
'mobile-frontend-expand-sections-description' => 'Always expand all
sections when navigating to a new page.',
+ 'mobile-frontend-fontsize-status' => 'Relative text size',
+ 'mobile-frontend-fontsize-description' => 'Increase or decrease the
text size of page content on the mobile site.',
'mobile-frontend-missing-image' => 'Image',
'mobile-frontend-off' => 'OFF',
'mobile-frontend-on' => 'ON',
+ 'mobile-frontend-plus' => '+', # do not translate or duplicate this
message to other languages
+ 'mobile-frontend-minus' => '-', # do not translate or duplicate this
message to other languages
'mobile-frontend-featured-article' => 'Today\'s featured content',
'mobile-frontend-news-items' => 'In The News',
@@ -530,6 +534,8 @@
* {{msg-mw|Mobile-frontend-disable-images}}',
'mobile-frontend-expand-sections-status' => 'On settings page label for
turning on/off expansion of all sections on page load.',
'mobile-frontend-expand-sections-description' => 'On settings page
description for turning on/off expansion of all sections on page load.',
+ 'mobile-frontend-fontsize-status' => 'On settings page, label for
changing the content font size.',
+ 'mobile-frontend-fontsize-description' => 'On settings page,
description for changing the content font size',
'mobile-frontend-missing-image' => 'When the mobile site removes images
it replaces them with a link to the image and the alt text of the image. If no
alt text is provided this string is shown to inform the user it is an image.
{{Identical|Image}}',
'mobile-frontend-off' => 'On settings page signals that a feature will
be turned off. Appears in {{msg-mw|Mobile-frontend-toggle-images}}.',
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 2427584..98e6339 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -5,6 +5,7 @@
protected $mobileMode;
protected $contentFormat = '';
protected $disableImages;
+ protected $fontSize;
protected $useFormat;
protected $blacklistedPage;
@@ -109,6 +110,22 @@
return 'WML';
}
return 'HTML';
+ }
+
+ /**
+* Gets the relative font size for the content
+* @return float user-set font size; false if not set
+*/
+ public function getCustomFontSize() {
+ if ( is_null( $this->fontSize ) ) {
+ $fontCookie = (float)$this->getRequest()->getCookie(
'fontSize' );
+ if ( $fontCookie && $fontCookie !== 1.0 ) {
+ $this->fontSize = $fontCookie;
+ } else {
+ $this->fontSize = false;
+ }
+ }
+ return $this->fontSize;
}
public function imagesDisabled() {
@@ -482,6 +499,13 @@
}
/**
+* @param $size float
+*/
+ public function setMobileFontSize( $size ) {
+ $this->getRequest()->response()->setcookie( 'fontSize', $size );
+ }
+
+ /**
* @return string
*/
public function getBaseDomain() {
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index 7a34d37..6142c91 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -21,4 +21,12 @@
$this->renderCategories();
parent::renderMetaSections();
}
+
+ protected function renderContent( $data ) {
+ // Render
[MediaWiki-commits] [Gerrit] Strip descriptions from ResourceLoaderSchemaModule modules - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged.
Change subject: Strip descriptions from ResourceLoaderSchemaModule modules
..
Strip descriptions from ResourceLoaderSchemaModule modules
Immutability and consistency should not be compromised lightly, but no one ever
looks at the descriptions client-side, so the bandwidth is wasted in affirming
this abstract principle.
Change-Id: Ibe13fb16917a7aaaebf91217e70004e366baa454
---
M EventLogging.php
M includes/ResourceLoaderSchemaModule.php
2 files changed, 20 insertions(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EventLogging.php b/EventLogging.php
index 81a85a4..e5e0f12 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -195,6 +195,23 @@
}
+/**
+ * Recursively remove a key from an array and all its subarray members.
+ * Does not detect cycles.
+ *
+ * @param array &$array Array from which key should be stripped.
+ * @param string $key Key to remove.
+ */
+function efStripKeyRecursive( &$array, $key ) {
+ unset( $array[ $key ] );
+ foreach( $array as $k => &$v ) {
+ if ( is_array( $v ) ) {
+ efStripKeyRecursive( $v, $key );
+ }
+ }
+}
+
+
// Classes
$wgAutoloadClasses += array(
diff --git a/includes/ResourceLoaderSchemaModule.php
b/includes/ResourceLoaderSchemaModule.php
index b6498f8..b95f36f 100644
--- a/includes/ResourceLoaderSchemaModule.php
+++ b/includes/ResourceLoaderSchemaModule.php
@@ -83,7 +83,9 @@
* @return string: JavaScript code.
*/
function getScript( ResourceLoaderContext $context ) {
- $params = array( $this->schema->title,
$this->schema->jsonSerialize() );
+ $schema = $this->schema->jsonSerialize();
+ efStripKeyRecursive( $schema, 'description' );
+ $params = array( $this->schema->title, $schema );
return Xml::encodeJsCall( 'mediaWiki.eventLog.declareSchema',
$params );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe13fb16917a7aaaebf91217e70004e366baa454
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] sideline db1024, RT 6672 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108301
Change subject: sideline db1024, RT 6672
..
sideline db1024, RT 6672
Change-Id: I6a8b1ccaec268c486ea8ddd8b13f887dca5127eb
---
M manifests/site.pp
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/108301/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 902ddfe..100b8a1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -612,14 +612,8 @@
}
}
-node /^db10(07|24|28|33|39|41)\.eqiad\.wmnet/ {
-if $::hostname =~ /^db10(07|24|33|39|41)/ {
-class { role::coredb::s7 : innodb_file_per_table => true, mariadb =>
true }
-} elsif $::hostname == "db1028" {
-class { role::coredb::s7 : mariadb => true }
-} else {
-include role::coredb::s7
-}
+node /^db10(07|28|33|39|41)\.eqiad\.wmnet/ {
+class { role::coredb::s7 : innodb_file_per_table => true, mariadb => true }
}
## x1 shard
@@ -756,6 +750,12 @@
mysql_wmf::mysqluser
}
+# out of action
+# db1024 RT 6672
+node /^db10(24)\.eqiad\.wmnet/ {
+include standard
+}
+
node "dobson.wikimedia.org" {
interface::ip { "dns::recursor": interface => "eth0", address =>
"208.80.152.131" }
--
To view, visit https://gerrit.wikimedia.org/r/108301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a8b1ccaec268c486ea8ddd8b13f887dca5127eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] sideline db1024, RT 6672 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: sideline db1024, RT 6672
..
sideline db1024, RT 6672
Change-Id: I6a8b1ccaec268c486ea8ddd8b13f887dca5127eb
---
M manifests/site.pp
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 902ddfe..100b8a1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -612,14 +612,8 @@
}
}
-node /^db10(07|24|28|33|39|41)\.eqiad\.wmnet/ {
-if $::hostname =~ /^db10(07|24|33|39|41)/ {
-class { role::coredb::s7 : innodb_file_per_table => true, mariadb =>
true }
-} elsif $::hostname == "db1028" {
-class { role::coredb::s7 : mariadb => true }
-} else {
-include role::coredb::s7
-}
+node /^db10(07|28|33|39|41)\.eqiad\.wmnet/ {
+class { role::coredb::s7 : innodb_file_per_table => true, mariadb => true }
}
## x1 shard
@@ -756,6 +750,12 @@
mysql_wmf::mysqluser
}
+# out of action
+# db1024 RT 6672
+node /^db10(24)\.eqiad\.wmnet/ {
+include standard
+}
+
node "dobson.wikimedia.org" {
interface::ip { "dns::recursor": interface => "eth0", address =>
"208.80.152.131" }
--
To view, visit https://gerrit.wikimedia.org/r/108301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a8b1ccaec268c486ea8ddd8b13f887dca5127eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] https://bugzilla.wikimedia.org/show_bug.cgi?id=56408 - change (operations/mediawiki-config)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108302
Change subject: https://bugzilla.wikimedia.org/show_bug.cgi?id=56408
..
https://bugzilla.wikimedia.org/show_bug.cgi?id=56408
Change-Id: I6aa6c69d668f79ee2b7916808adb972f64038448
---
M wmf-config/flaggedrevs.php
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/02/108302/1
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index c1c805b..8df0a40 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -91,6 +91,20 @@
$wgRemoveGroups['sysop'] = array_diff( $wgRemoveGroups['sysop'], array(
'editor' ) );
}
+elseif ( $wgDBname == 'cewiki' ) { // based on ruwiki settings
+
+ // Bug 56408
+ $wgFlaggedRevsNamespaces = array( NS_MAIN, NS_FILE, NS_TEMPLATE,
NS_CATEGORY, 100, 828 );
+
+ $wgFlaggedRevTags['accuracy']['levels'] = 3; // Is this needed?
+ $wgFlaggedRevsOverride = false;
+
+ $wgGroupPermissions['autoeditor']['autoreview'] = true;
+ $wgGroupPermissions['autoeditor']['autoconfirmed'] = true;
+
+ $wgGroupPermissions['sysop']['stablesettings'] = true;
+}
+
elseif ( $wgDBname == 'testwiki' && false ) {
// Disabled temporarily, give testwiki enwiki's settings instead --Roan
May 7 2012
$wgGroupsAddToSelf['*'][] = 'editor';
--
To view, visit https://gerrit.wikimedia.org/r/108302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aa6c69d668f79ee2b7916808adb972f64038448
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rotate s7 master, demote db1039, promote db1033 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108303 Change subject: rotate s7 master, demote db1039, promote db1033 .. rotate s7 master, demote db1039, promote db1033 Change-Id: I8ecb82c5b0713a1f70dabec6d04f22d9b7238b7f --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/108303/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c2cb839..f10cd5c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -133,11 +133,10 @@ 'db1006' => 400, ), 's7' => array( - 'db1039' => 0, - 'db1007' => 0, # snapshot, vslow + #'db1039' => 0, + 'db1033' => 0, + 'db1007' => 100, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager - 'db1033' => 400, - #schema changes 'db1024' => 400, 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/108303 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ecb82c5b0713a1f70dabec6d04f22d9b7238b7f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rotate s7 master, demote db1039, promote db1033 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: rotate s7 master, demote db1039, promote db1033 .. rotate s7 master, demote db1039, promote db1033 Change-Id: I8ecb82c5b0713a1f70dabec6d04f22d9b7238b7f --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c2cb839..f10cd5c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -133,11 +133,10 @@ 'db1006' => 400, ), 's7' => array( - 'db1039' => 0, - 'db1007' => 0, # snapshot, vslow + #'db1039' => 0, + 'db1033' => 0, + 'db1007' => 100, # snapshot, vslow 'db1041' => 0, # watchlist, recentchangeslinked, contributions, logpager - 'db1033' => 400, - #schema changes 'db1024' => 400, 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/108303 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ecb82c5b0713a1f70dabec6d04f22d9b7238b7f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s7 master switch to db1033 - change (operations/dns)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108304 Change subject: s7 master switch to db1033 .. s7 master switch to db1033 Change-Id: Idd9d58a8a75189a21c0a5c41061731237db512cc --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/04/108304/1 diff --git a/templates/wmnet b/templates/wmnet index 7d9eea2..fc9681a 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -705,7 +705,7 @@ s4-master 5M IN CNAMEdb1059.eqiad.wmnet. s5-master 5M IN CNAMEdb1058.eqiad.wmnet. s6-master 5M IN CNAMEdb1027.eqiad.wmnet. -s7-master 5M IN CNAMEdb1039.eqiad.wmnet. +s7-master 5M IN CNAMEdb1033.eqiad.wmnet. m1-master 5M IN CNAMEdb1001.eqiad.wmnet. m2-master 5M IN CNAMEdb1048.eqiad.wmnet. x1-master 5M IN CNAMEdb1029.eqiad.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/108304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd9d58a8a75189a21c0a5c41061731237db512cc Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s7 master switch to db1033 - change (operations/dns)
Springle has submitted this change and it was merged. Change subject: s7 master switch to db1033 .. s7 master switch to db1033 Change-Id: Idd9d58a8a75189a21c0a5c41061731237db512cc --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wmnet b/templates/wmnet index 7d9eea2..fc9681a 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -705,7 +705,7 @@ s4-master 5M IN CNAMEdb1059.eqiad.wmnet. s5-master 5M IN CNAMEdb1058.eqiad.wmnet. s6-master 5M IN CNAMEdb1027.eqiad.wmnet. -s7-master 5M IN CNAMEdb1039.eqiad.wmnet. +s7-master 5M IN CNAMEdb1033.eqiad.wmnet. m1-master 5M IN CNAMEdb1001.eqiad.wmnet. m2-master 5M IN CNAMEdb1048.eqiad.wmnet. x1-master 5M IN CNAMEdb1029.eqiad.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/108304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd9d58a8a75189a21c0a5c41061731237db512cc Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update coredb topology for mha. - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108305
Change subject: Update coredb topology for mha.
..
Update coredb topology for mha.
- Add logpager/recentcontribution slaves to 'no_master'
- Switch s7 master to db1033
Change-Id: I76df3fb22fef53d643ee5dd9ea28f1531e009f6e
---
M manifests/role/coredb.pp
1 file changed, 36 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/108305/1
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 7b10468..1a09cfe 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -10,82 +10,82 @@
$topology = {
's1' => {
'hosts' => { 'pmtpa' => [ 'db63', 'db67' ],
- 'eqiad' => [ 'db1037', 'db1043', 'db1049',
'db1050', 'db1051', 'db1052', 'db1056' ] },
+ 'eqiad' => [ 'db1037', 'db1043', 'db1049',
'db1050', 'db1051', 'db1052', 'db1055', 'db1056' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db63", 'eqiad' => "db1056" },
- 'snapshot' => [ "db1050" ],
- 'no_master' => [ 'db67', 'db1047' ]
+ 'masters' => { 'pmtpa' => "db63", 'eqiad' => 'db1056' },
+ 'snapshot' => [ 'db1050' ],
+ 'no_master' => [ 'db67', 'db1047', 'db1050', 'db1055' ]
},
's2' => {
'hosts' => { 'pmtpa' => [ 'db69' ],
- 'eqiad' => [ 'db1002', 'db1009', 'db1018',
'db1034', 'db1036' ] },
+ 'eqiad' => [ 'db1002', 'db1009', 'db1018',
'db1034', 'db1036', 'db1060' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db69", 'eqiad' => "db1036" },
- 'snapshot' => [ "db1018" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db69', 'eqiad' => 'db1036' },
+ 'snapshot' => [ 'db1018' ],
+ 'no_master' => [ 'db1002', 'db1018' ]
},
's3' => {
'hosts' => { 'pmtpa' => [ 'db71' ],
'eqiad' => [ 'db1003', 'db1010', 'db1019',
'db1035', 'db1038' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db71", 'eqiad' => "db1038" },
- 'snapshot' => [ "db1035" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db71', 'eqiad' => 'db1038' },
+ 'snapshot' => [ 'db1035' ],
+ 'no_master' => [ 'db1003', 'db1035' ]
},
's4' => {
'hosts' => { 'pmtpa' => [ 'db72' ],
- 'eqiad' => [ 'db1004', 'db1011', 'db1020',
'db1042', 'db1059' ] },
+ 'eqiad' => [ 'db1004', 'db1011', 'db1020',
'db1040', 'db1042', 'db1059' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db72", 'eqiad' => "db1059" },
- 'snapshot' => [ "db1042" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db72', 'eqiad' => 'db1059' },
+ 'snapshot' => [ 'db1042' ],
+ 'no_master' => [ 'db1004', 'db1042' ]
},
's5' => {
'hosts' => { 'pmtpa' => [ 'db73' ],
'eqiad' => [ 'db1005', 'db1021', 'db1026',
'db1045', 'db1058' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db73", 'eqiad' => "db1058" },
- 'snapshot' => [ "db1005" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db73', 'eqiad' => 'db1058' },
+ 'snapshot' => [ 'db1005' ],
+ 'no_master' => [ 'db1005', 'db1026' ]
},
's6' => {
'hosts' => { 'pmtpa' => [ 'db74' ],
- 'eqiad' => [ 'db1006', 'db1015', 'db1022',
'db1027', 'db1040' ] },
+ 'eqiad' => [ 'db1006', 'db1015', 'db1022',
'db1023', 'db1027' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db74", 'eqiad' => "db1027" },
- 'snapshot' => [ "db1022" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db74', 'eqiad' => 'db1027' },
+ 'snapshot' => [ 'db1022' ],
+
[MediaWiki-commits] [Gerrit] Update coredb topology for mha. - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: Update coredb topology for mha.
..
Update coredb topology for mha.
- Add logpager/recentcontribution slaves to 'no_master'
- Switch s7 master to db1033
Change-Id: I76df3fb22fef53d643ee5dd9ea28f1531e009f6e
---
M manifests/role/coredb.pp
1 file changed, 36 insertions(+), 36 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 7b10468..1a09cfe 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -10,82 +10,82 @@
$topology = {
's1' => {
'hosts' => { 'pmtpa' => [ 'db63', 'db67' ],
- 'eqiad' => [ 'db1037', 'db1043', 'db1049',
'db1050', 'db1051', 'db1052', 'db1056' ] },
+ 'eqiad' => [ 'db1037', 'db1043', 'db1049',
'db1050', 'db1051', 'db1052', 'db1055', 'db1056' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db63", 'eqiad' => "db1056" },
- 'snapshot' => [ "db1050" ],
- 'no_master' => [ 'db67', 'db1047' ]
+ 'masters' => { 'pmtpa' => "db63", 'eqiad' => 'db1056' },
+ 'snapshot' => [ 'db1050' ],
+ 'no_master' => [ 'db67', 'db1047', 'db1050', 'db1055' ]
},
's2' => {
'hosts' => { 'pmtpa' => [ 'db69' ],
- 'eqiad' => [ 'db1002', 'db1009', 'db1018',
'db1034', 'db1036' ] },
+ 'eqiad' => [ 'db1002', 'db1009', 'db1018',
'db1034', 'db1036', 'db1060' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db69", 'eqiad' => "db1036" },
- 'snapshot' => [ "db1018" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db69', 'eqiad' => 'db1036' },
+ 'snapshot' => [ 'db1018' ],
+ 'no_master' => [ 'db1002', 'db1018' ]
},
's3' => {
'hosts' => { 'pmtpa' => [ 'db71' ],
'eqiad' => [ 'db1003', 'db1010', 'db1019',
'db1035', 'db1038' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db71", 'eqiad' => "db1038" },
- 'snapshot' => [ "db1035" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db71', 'eqiad' => 'db1038' },
+ 'snapshot' => [ 'db1035' ],
+ 'no_master' => [ 'db1003', 'db1035' ]
},
's4' => {
'hosts' => { 'pmtpa' => [ 'db72' ],
- 'eqiad' => [ 'db1004', 'db1011', 'db1020',
'db1042', 'db1059' ] },
+ 'eqiad' => [ 'db1004', 'db1011', 'db1020',
'db1040', 'db1042', 'db1059' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db72", 'eqiad' => "db1059" },
- 'snapshot' => [ "db1042" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db72', 'eqiad' => 'db1059' },
+ 'snapshot' => [ 'db1042' ],
+ 'no_master' => [ 'db1004', 'db1042' ]
},
's5' => {
'hosts' => { 'pmtpa' => [ 'db73' ],
'eqiad' => [ 'db1005', 'db1021', 'db1026',
'db1045', 'db1058' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db73", 'eqiad' => "db1058" },
- 'snapshot' => [ "db1005" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db73', 'eqiad' => 'db1058' },
+ 'snapshot' => [ 'db1005' ],
+ 'no_master' => [ 'db1005', 'db1026' ]
},
's6' => {
'hosts' => { 'pmtpa' => [ 'db74' ],
- 'eqiad' => [ 'db1006', 'db1015', 'db1022',
'db1027', 'db1040' ] },
+ 'eqiad' => [ 'db1006', 'db1015', 'db1022',
'db1023', 'db1027' ] },
'primary_site' => $::mw_primary,
- 'masters' => { 'pmtpa' => "db74", 'eqiad' => "db1027" },
- 'snapshot' => [ "db1022" ],
- 'no_master' => []
+ 'masters' => { 'pmtpa' => 'db74', 'eqiad' => 'db1027' },
+ 'snapshot' => [ 'db1022' ],
+ 'no_master' => [ 'db1022', 'db1023' ]
[MediaWiki-commits] [Gerrit] Go to top button for pages. Implements go to top button with... - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108306
Change subject: Go to top button for pages. Implements go to top button with
smooth scrolling. Hidden when on top of page and appears when scrolled down to
some extent. Configurable-Enabled by default. Can be disabled by using
"$wgShowTopButton = false;" in LocalSettings
..
Go to top button for pages.
Implements go to top button with smooth scrolling. Hidden when on top of page
and appears when scrolled down to some extent. Configurable-Enabled by default.
Can be disabled by using "$wgShowTopButton = false;" in LocalSettings.php.
Bug: 26032
Change-Id: I2dfb8953737ef4e3e38eb848bbc6ed32111557bf
---
M includes/DefaultSettings.php
M includes/Skin.php
M resources/Resources.php
A skins/common/topbutton.css
A skins/common/topbutton.js
5 files changed, 52 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/06/108306/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 31cbb4c..fae215a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6981,6 +6981,10 @@
*/
$wgCompiledFiles = array();
+
+// Enabled go to top button by default- To disable, do "$wgShowTopButton =
false;" in LocalSettings.php
+$wgShowTopButton = true;
+
/**
* For really cool vim folding this needs to be at the end:
* vim: foldmarker=@{,@} foldmethod=marker
diff --git a/includes/Skin.php b/includes/Skin.php
index 6722cca..507a360 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -209,6 +209,13 @@
$wgAjaxWatch, $wgEnableAPI, $wgEnableWriteAPI;
$out = $this->getOutput();
+
+ // Add go to top button if declared in LocalSettings.php
+ global $wgShowTopButton;
+ if($wgShowTopButton) {
+ $out->addModules('topbutton');
+ }
+
$user = $out->getUser();
$modules = array(
// modules that enhance the page content in some way
diff --git a/resources/Resources.php b/resources/Resources.php
index 01d4a3f..686955a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -193,6 +193,14 @@
'position' => 'bottom',
),
+ /* Go to top button */
+ 'topbutton' => array(
+ 'scripts' => 'skins/common/topbutton.js',
+ 'styles' => array(
+ 'skins/common/topbutton.css' => array( 'media' =>
'screen' ),
+ ),
+ ),
+
/* jQuery */
'jquery' => array(
diff --git a/skins/common/topbutton.css b/skins/common/topbutton.css
new file mode 100644
index 000..adf87bf
--- /dev/null
+++ b/skins/common/topbutton.css
@@ -0,0 +1,17 @@
+#go-to-top {
+position: fixed;
+bottom: 2em;
+left: 40px;
+text-decoration: none;
+color: #0645ad;
+background-color: rgba(165, 155, 235, 0.80);
+font-size: 12px;
+padding: 1em;
+display: none;
+border-radius: 4px;
+ }
+
+#go-to-top:hover {
+background-color: rgba(135, 135, 135, 0.40);
+cursor: pointer;
+}
\ No newline at end of file
diff --git a/skins/common/topbutton.js b/skins/common/topbutton.js
new file mode 100644
index 000..ac300d3
--- /dev/null
+++ b/skins/common/topbutton.js
@@ -0,0 +1,16 @@
+(function( $ ) {
+ $('body').append('Go to Top');
+jQuery(window).scroll(function() {
+if (jQuery(this).scrollTop() > 300) {
+jQuery('#go-to-top').fadeIn(500);
+} else {
+jQuery('#go-to-top').fadeOut(500);
+}
+});
+
+jQuery('#go-to-top').click(function(event) {
+event.preventDefault();
+jQuery('html, body').animate({scrollTop: 0}, 500);
+return false;
+})
+})( jQuery );
--
To view, visit https://gerrit.wikimedia.org/r/108306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dfb8953737ef4e3e38eb848bbc6ed32111557bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Kunalgrover05
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update documentation and suppress warning when parsing summary - change (mediawiki/core)
Nullzero has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108307
Change subject: Update documentation and suppress warning when parsing summary
..
Update documentation and suppress warning when parsing summary
The documentation states that if contentmodel and title are not given,
but text exists, "wikitext" will be the default model. However, the
actual code will show a warning if do so. This patch fixes the inconsistence
by removing some parts of the documentation which encourages giving
only text as the parameter and corrects the example. The patch
also suppresses the warning that contentmodel must be given when
summary parameter is given.
bug: 60192
Change-Id: I0f41c83763fbb5551aa3ceaff59c1f8fe38310be
---
M includes/api/ApiParse.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/108307/1
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 464fde6..13d234c 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -186,8 +186,9 @@
}
$popts = $this->makeParserOptions( $pageObj, $params );
+ $textProvided = !is_null( $text );
- if ( is_null( $text ) ) {
+ if ( !$textProvided ) {
if ( $titleProvided && ( $prop ||
$params['generatexml'] ) ) {
$this->setWarning(
"'title' used without 'text',
and parsed page properties were requested " .
@@ -200,7 +201,7 @@
// If we are parsing text, do not use the content model
of the default
// API title, but default to wikitext to keep BC.
- if ( !$titleProvided && is_null( $model ) ) {
+ if ( $textProvided && !$titleProvided && is_null(
$model ) ) {
$model = CONTENT_MODEL_WIKITEXT;
$this->setWarning( "No 'title' or
'contentmodel' was given, assuming $model." );
}
@@ -710,14 +711,13 @@
public function getParamDescription() {
$p = $this->getModulePrefix();
- $wikitext = CONTENT_MODEL_WIKITEXT;
return array(
'text' => "Text to parse. Use {$p}title or
{$p}contentmodel to control the content model",
'summary' => 'Summary to parse',
'redirects' => "If the {$p}page or the {$p}pageid
parameter is set to a redirect, resolve it",
'title' => "Title of page the text belongs to. " .
- "If omitted, \"API\" is used as the title with
content model $wikitext",
+ "If omitted, \"API\" is used as the title",
'page' => "Parse the content of this page. Cannot be
used together with {$p}text and {$p}title",
'pageid' => "Parse the content of this page. Overrides
{$p}page",
'oldid' => "Parse the content of this revision.
Overrides {$p}page and {$p}pageid",
@@ -768,7 +768,7 @@
),
'contentmodel' => array(
"Content model of the input text. Default is
the model of the " .
- "specified ${p}title, or $wikitext if ${p}title
is not specified",
+ "specified ${p}title if ${p}title is specified",
"Only valid when used with {$p}text",
),
);
@@ -814,7 +814,7 @@
public function getExamples() {
return array(
'api.php?action=parse&page=Project:Sandbox' => 'Parse a
page',
- 'api.php?action=parse&text={{Project:Sandbox}}' =>
'Parse wikitext',
+
'api.php?action=parse&text={{Project:Sandbox}}&contentmodel=wikitext' => 'Parse
wikitext',
'api.php?action=parse&text={{PAGENAME}}&title=Test'
=> 'Parse wikitext, specifying the page title',
'api.php?action=parse&summary=Some+[[link]]&prop=' =>
'Parse a summary',
--
To view, visit https://gerrit.wikimedia.org/r/108307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f41c83763fbb5551aa3ceaff59c1f8fe38310be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nullzero
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db63 ganglia aggregator for remaining pmtpa db boxes - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108308
Change subject: db63 ganglia aggregator for remaining pmtpa db boxes
..
db63 ganglia aggregator for remaining pmtpa db boxes
Change-Id: I22cb19da603a5560e22e1354613dc68a5098f17d
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/108308/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 100b8a1..5b30a61 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -488,6 +488,7 @@
# pmtpa dbs
node /^db(63)\.pmtpa\.wmnet/ {
+$ganglia_aggregator = true
class { role::coredb::s1 : mariadb => true, innodb_file_per_table => true }
}
--
To view, visit https://gerrit.wikimedia.org/r/108308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22cb19da603a5560e22e1354613dc68a5098f17d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db63 ganglia aggregator for remaining pmtpa db boxes - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: db63 ganglia aggregator for remaining pmtpa db boxes
..
db63 ganglia aggregator for remaining pmtpa db boxes
Change-Id: I22cb19da603a5560e22e1354613dc68a5098f17d
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 100b8a1..5b30a61 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -488,6 +488,7 @@
# pmtpa dbs
node /^db(63)\.pmtpa\.wmnet/ {
+$ganglia_aggregator = true
class { role::coredb::s1 : mariadb => true, innodb_file_per_table => true }
}
--
To view, visit https://gerrit.wikimedia.org/r/108308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22cb19da603a5560e22e1354613dc68a5098f17d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmtpa s7 master update - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108309 Change subject: pmtpa s7 master update .. pmtpa s7 master update Change-Id: Ia0de035f61ae6fbb7a107b500b774a4bfe6a3394 --- M wmf-config/db-pmtpa.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/09/108309/1 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 5bd314a..ce67770 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -108,7 +108,7 @@ 'db74' => 100, # pmtpa master ), 's7' => array( - 'db1039' => 0, + 'db1033' => 0, 'db68' => 100, # pmtpa master ), ), -- To view, visit https://gerrit.wikimedia.org/r/108309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0de035f61ae6fbb7a107b500b774a4bfe6a3394 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmtpa s7 master update - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: pmtpa s7 master update .. pmtpa s7 master update Change-Id: Ia0de035f61ae6fbb7a107b500b774a4bfe6a3394 --- M wmf-config/db-pmtpa.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 5bd314a..b32fa8f 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -108,7 +108,7 @@ 'db74' => 100, # pmtpa master ), 's7' => array( - 'db1039' => 0, + 'db1033' => 0, 'db68' => 100, # pmtpa master ), ), @@ -216,6 +216,7 @@ 'db1026' => '10.64.16.15', #do not remove or comment out 'db1027' => '10.64.16.16', #do not remove or comment out 'db1028' => '10.64.16.17', #do not remove or comment out + 'db1033' => '10.64.16.22', #do not remove or comment out 'db1034' => '10.64.16.23', #do not remove or comment out 'db1035' => '10.64.16.24', #do not remove or comment out 'db1036' => '10.64.16.25', #do not remove or comment out -- To view, visit https://gerrit.wikimedia.org/r/108309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0de035f61ae6fbb7a107b500b774a4bfe6a3394 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable dbstats slow query until better solution can be found. - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108310
Change subject: Disable dbstats slow query until better solution can be found.
..
Disable dbstats slow query until better solution can be found.
Change-Id: I88999365cffccf6e06490f99b1e01dcd31cae66c
---
M modules/mysql_wmf/files/ganglia/plugins/mysql.py
1 file changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/108310/1
diff --git a/modules/mysql_wmf/files/ganglia/plugins/mysql.py
b/modules/mysql_wmf/files/ganglia/plugins/mysql.py
index 9be9c20..4f610a9 100644
--- a/modules/mysql_wmf/files/ganglia/plugins/mysql.py
+++ b/modules/mysql_wmf/files/ganglia/plugins/mysql.py
@@ -120,15 +120,17 @@
# if the ganglia mysql users has been granted select
access to an innodb table
# in the global space, this will report data_free for
the global space.
- cursor = conn.cursor(MySQLdb.cursors.Cursor)
- cursor.execute('SELECT DATA_FREE FROM
information_schema.TABLES WHERE ENGINE="InnoDB" LIMIT 1')
- ibdata_free = ""
- res = cursor.fetchone()
- if res:
- ibdata_free = res[0]
- else:
- ibdata_free = False
- cursor.close()
+ #cursor = conn.cursor(MySQLdb.cursors.Cursor)
+ # Disabled 2014-01-19 springle: too slow
+ #cursor.execute('SELECT DATA_FREE FROM
information_schema.TABLES WHERE ENGINE="InnoDB" LIMIT 1')
+ #ibdata_free = ""
+ #res = cursor.fetchone()
+ #if res:
+ # ibdata_free = res[0]
+ #else:
+ # ibdata_free = False
+ #cursor.close()
+ ibdata_free = False
if get_master:
cursor = conn.cursor(MySQLdb.cursors.Cursor)
--
To view, visit https://gerrit.wikimedia.org/r/108310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88999365cffccf6e06490f99b1e01dcd31cae66c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable dbstats slow query until better solution can be found. - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: Disable dbstats slow query until better solution can be found.
..
Disable dbstats slow query until better solution can be found.
Change-Id: I88999365cffccf6e06490f99b1e01dcd31cae66c
---
M modules/mysql_wmf/files/ganglia/plugins/mysql.py
1 file changed, 11 insertions(+), 9 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mysql_wmf/files/ganglia/plugins/mysql.py
b/modules/mysql_wmf/files/ganglia/plugins/mysql.py
index 9be9c20..4f610a9 100644
--- a/modules/mysql_wmf/files/ganglia/plugins/mysql.py
+++ b/modules/mysql_wmf/files/ganglia/plugins/mysql.py
@@ -120,15 +120,17 @@
# if the ganglia mysql users has been granted select
access to an innodb table
# in the global space, this will report data_free for
the global space.
- cursor = conn.cursor(MySQLdb.cursors.Cursor)
- cursor.execute('SELECT DATA_FREE FROM
information_schema.TABLES WHERE ENGINE="InnoDB" LIMIT 1')
- ibdata_free = ""
- res = cursor.fetchone()
- if res:
- ibdata_free = res[0]
- else:
- ibdata_free = False
- cursor.close()
+ #cursor = conn.cursor(MySQLdb.cursors.Cursor)
+ # Disabled 2014-01-19 springle: too slow
+ #cursor.execute('SELECT DATA_FREE FROM
information_schema.TABLES WHERE ENGINE="InnoDB" LIMIT 1')
+ #ibdata_free = ""
+ #res = cursor.fetchone()
+ #if res:
+ # ibdata_free = res[0]
+ #else:
+ # ibdata_free = False
+ #cursor.close()
+ ibdata_free = False
if get_master:
cursor = conn.cursor(MySQLdb.cursors.Cursor)
--
To view, visit https://gerrit.wikimedia.org/r/108310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88999365cffccf6e06490f99b1e01dcd31cae66c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1022 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/108311 Change subject: depool db1022 .. depool db1022 Change-Id: I186fc2ffb75538cf9ff515966a69b3f62f6ac4de --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/11/108311/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f10cd5c..4f7269b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -127,7 +127,7 @@ ), 's6' => array( 'db1027' => 0, - 'db1022' => 0, # snapshot, vslow, dump + #schema changes 'db1022' => 0, # snapshot, vslow, dump 'db1023' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1015' => 400, 'db1006' => 400, @@ -236,10 +236,12 @@ ), 's6' => array( 'vslow' => array( - 'db1022' => 1, + # schema changes 'db1022' => 1, + 'db1023' => 1, ), 'dump' => array( - 'db1022' => 1, + # schema changes 'db1022' => 1, + 'db1023' => 1, ), 'watchlist' => array( 'db1023' => 1, -- To view, visit https://gerrit.wikimedia.org/r/108311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I186fc2ffb75538cf9ff515966a69b3f62f6ac4de Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1022 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: depool db1022 .. depool db1022 Change-Id: I186fc2ffb75538cf9ff515966a69b3f62f6ac4de --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f10cd5c..4f7269b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -127,7 +127,7 @@ ), 's6' => array( 'db1027' => 0, - 'db1022' => 0, # snapshot, vslow, dump + #schema changes 'db1022' => 0, # snapshot, vslow, dump 'db1023' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1015' => 400, 'db1006' => 400, @@ -236,10 +236,12 @@ ), 's6' => array( 'vslow' => array( - 'db1022' => 1, + # schema changes 'db1022' => 1, + 'db1023' => 1, ), 'dump' => array( - 'db1022' => 1, + # schema changes 'db1022' => 1, + 'db1023' => 1, ), 'watchlist' => array( 'db1023' => 1, -- To view, visit https://gerrit.wikimedia.org/r/108311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I186fc2ffb75538cf9ff515966a69b3f62f6ac4de Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle 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 misc::evergreen resource to refresh services on config u... - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108312
Change subject: Add misc::evergreen resource to refresh services on config
updates
..
Add misc::evergreen resource to refresh services on config updates
If a role that writes its configuration to a recursively-managed foo.d/-type
directory is disabled, its configuration file will be purged, but the service
it configures will not necessarily be refreshed. This patch adds a
misc::evergreen resource that takes a service name and one or more paths to
search. If the most recent modification time of the path or any of the files or
directories within it is newer than the oldest instance of the service, the
service is automatically refreshed.
Change-Id: Ib969eb352461ab655d1b0f368c91e6737122f1c3
---
M puppet/modules/apache/manifests/init.pp
A puppet/modules/misc/files/check_service_freshness
A puppet/modules/misc/manifests/evergreen.pp
M puppet/modules/misc/manifests/init.pp
4 files changed, 116 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/12/108312/1
diff --git a/puppet/modules/apache/manifests/init.pp
b/puppet/modules/apache/manifests/init.pp
index 84a088c..cd96d06 100644
--- a/puppet/modules/apache/manifests/init.pp
+++ b/puppet/modules/apache/manifests/init.pp
@@ -35,4 +35,6 @@
require=> Package['apache2'],
hasrestart => true,
}
+
+misc::evergreen { 'apache2': }
}
diff --git a/puppet/modules/misc/files/check_service_freshness
b/puppet/modules/misc/files/check_service_freshness
new file mode 100755
index 000..d7c7cd4
--- /dev/null
+++ b/puppet/modules/misc/files/check_service_freshness
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ check_service_freshness
+
+ Usage: check_service_freshness program_name config_path [config_path ...]
+ Example: check_service_freshness apache2 /etc/apache2
+
+ If the most recently-modified file in `config_path` is newer than the oldest
+ running process with `program_name` as its executable, set exit code to 1,
+ indicating that the service needs to be restarted to load the updated
+ configs. Otherwise set exit code to 0, indicating that the service is
+ up-to-date.
+
+"""
+import os
+import re
+import sys
+
+
+JIFFY = os.sysconf('SC_CLK_TCK')
+
+if len(sys.argv) < 3:
+sys.stderr.write('Usage: %s program_name config_path [config_path ...]\n'
+ % __file__)
+sys.exit(126)
+
+program_name, config_paths = sys.argv[1], sys.argv[2:]
+
+
+def get_system_start():
+"""Get the system start time, expressed as seconds since epoch."""
+with open('/proc/stat') as f:
+match = re.search('(?<=btime )\d+', f.read())
+return float(match.group(0))
+
+
+def iter_files(dir):
+"""Yields (path, mtime) for `dir` and each file or dir within it."""
+yield dir, os.path.getmtime(dir)
+for root, dirs, files in os.walk('/etc/apache2'):
+for f in (dirs + files):
+path = os.path.join(root, f)
+yield path, os.path.getmtime(path)
+
+
+def iter_procs():
+"""Yields (executable name, start time) for each running process."""
+system_start = get_system_start()
+for pid in os.listdir('/proc'):
+try:
+with open('/proc/%s/stat' % pid) as f:
+stats = f.read().split()
+executable = stats[1].strip('()')
+start_time = (float(stats[21]) / JIFFY) + system_start
+yield executable, start_time
+except (IOError, ValueError):
+pass
+
+
+service_start = min(start_time for executable_name, start_time in iter_procs()
+if executable_name == program_name)
+latest_modification = max(modified_time for config_path in config_paths
+ for path, modified_time in iter_files(config_path))
+
+if service_start < latest_modification:
+# Service needs to be refreshed
+sys.exit(1)
+else:
+# Service is up-to-date
+sys.exit(0)
diff --git a/puppet/modules/misc/manifests/evergreen.pp
b/puppet/modules/misc/manifests/evergreen.pp
new file mode 100644
index 000..84ddcac
--- /dev/null
+++ b/puppet/modules/misc/manifests/evergreen.pp
@@ -0,0 +1,38 @@
+# == Define: misc::evergreen
+#
+# Refresh a service if its configuration files have changed.
+#
+# === Parameters
+#
+# [*service*]
+# Service name. Defaults to the resource title.
+#
+# [*executable*]
+# Base name of program's executable file. The process table will be
+# scanned for processes matching this name to determine if the service
+# needs to be refreshed. Defaults to the resource title.
+#
+# [*config_path*]
+# Path to service's configuration directory. Defaults to /etc/$title.
+# Multiple paths may be specified as an array.
+#
+# === Examples
+#
+# misc::evergreen { 'apache2':
+#config_path => '/etc/apache2',
+# }
[MediaWiki-commits] [Gerrit] Add misc::evergreen resource to refresh services on config u... - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add misc::evergreen resource to refresh services on config
updates
..
Add misc::evergreen resource to refresh services on config updates
If a role that writes its configuration to a recursively-managed foo.d/-type
directory is disabled, its configuration file will be purged, but the service
it configures will not necessarily be refreshed. This patch adds a
misc::evergreen resource that takes a service name and one or more paths to
search. If the most recent modification time of the path or any of the files or
directories within it is newer than the oldest instance of the service, the
service is automatically refreshed.
Change-Id: Ib969eb352461ab655d1b0f368c91e6737122f1c3
---
M puppet/modules/apache/manifests/init.pp
A puppet/modules/misc/files/check_service_freshness
A puppet/modules/misc/manifests/evergreen.pp
M puppet/modules/misc/manifests/init.pp
4 files changed, 116 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/apache/manifests/init.pp
b/puppet/modules/apache/manifests/init.pp
index 84a088c..cd96d06 100644
--- a/puppet/modules/apache/manifests/init.pp
+++ b/puppet/modules/apache/manifests/init.pp
@@ -35,4 +35,6 @@
require=> Package['apache2'],
hasrestart => true,
}
+
+misc::evergreen { 'apache2': }
}
diff --git a/puppet/modules/misc/files/check_service_freshness
b/puppet/modules/misc/files/check_service_freshness
new file mode 100755
index 000..d7c7cd4
--- /dev/null
+++ b/puppet/modules/misc/files/check_service_freshness
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ check_service_freshness
+
+ Usage: check_service_freshness program_name config_path [config_path ...]
+ Example: check_service_freshness apache2 /etc/apache2
+
+ If the most recently-modified file in `config_path` is newer than the oldest
+ running process with `program_name` as its executable, set exit code to 1,
+ indicating that the service needs to be restarted to load the updated
+ configs. Otherwise set exit code to 0, indicating that the service is
+ up-to-date.
+
+"""
+import os
+import re
+import sys
+
+
+JIFFY = os.sysconf('SC_CLK_TCK')
+
+if len(sys.argv) < 3:
+sys.stderr.write('Usage: %s program_name config_path [config_path ...]\n'
+ % __file__)
+sys.exit(126)
+
+program_name, config_paths = sys.argv[1], sys.argv[2:]
+
+
+def get_system_start():
+"""Get the system start time, expressed as seconds since epoch."""
+with open('/proc/stat') as f:
+match = re.search('(?<=btime )\d+', f.read())
+return float(match.group(0))
+
+
+def iter_files(dir):
+"""Yields (path, mtime) for `dir` and each file or dir within it."""
+yield dir, os.path.getmtime(dir)
+for root, dirs, files in os.walk('/etc/apache2'):
+for f in (dirs + files):
+path = os.path.join(root, f)
+yield path, os.path.getmtime(path)
+
+
+def iter_procs():
+"""Yields (executable name, start time) for each running process."""
+system_start = get_system_start()
+for pid in os.listdir('/proc'):
+try:
+with open('/proc/%s/stat' % pid) as f:
+stats = f.read().split()
+executable = stats[1].strip('()')
+start_time = (float(stats[21]) / JIFFY) + system_start
+yield executable, start_time
+except (IOError, ValueError):
+pass
+
+
+service_start = min(start_time for executable_name, start_time in iter_procs()
+if executable_name == program_name)
+latest_modification = max(modified_time for config_path in config_paths
+ for path, modified_time in iter_files(config_path))
+
+if service_start < latest_modification:
+# Service needs to be refreshed
+sys.exit(1)
+else:
+# Service is up-to-date
+sys.exit(0)
diff --git a/puppet/modules/misc/manifests/evergreen.pp
b/puppet/modules/misc/manifests/evergreen.pp
new file mode 100644
index 000..84ddcac
--- /dev/null
+++ b/puppet/modules/misc/manifests/evergreen.pp
@@ -0,0 +1,38 @@
+# == Define: misc::evergreen
+#
+# Refresh a service if its configuration files have changed.
+#
+# === Parameters
+#
+# [*service*]
+# Service name. Defaults to the resource title.
+#
+# [*executable*]
+# Base name of program's executable file. The process table will be
+# scanned for processes matching this name to determine if the service
+# needs to be refreshed. Defaults to the resource title.
+#
+# [*config_path*]
+# Path to service's configuration directory. Defaults to /etc/$title.
+# Multiple paths may be specified as an array.
+#
+# === Examples
+#
+# misc::evergreen { 'apache2':
+#config_path => '/etc/apache2',
+# }
+#
+define misc::evergreen(
+$service
[MediaWiki-commits] [Gerrit] Update ACE to Jan 17, 2014 - change (mediawiki...CodeEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update ACE to Jan 17, 2014 .. Update ACE to Jan 17, 2014 This fixes a breakage with } pairing Also adds support for CORS loading of the workers. Bug: 60156 Change-Id: I7333a107b49bb6aec0f91f443f5823e82a327fab --- M modules/ace/ace.js A modules/ace/ext-error_marker.js M modules/ace/ext-settings_menu.js M modules/ace/mode-c9search.js M modules/ace/mode-c_cpp.js M modules/ace/mode-coldfusion.js M modules/ace/mode-csharp.js M modules/ace/mode-css.js M modules/ace/mode-curly.js M modules/ace/mode-dart.js M modules/ace/mode-django.js M modules/ace/mode-ejs.js M modules/ace/mode-ftl.js M modules/ace/mode-glsl.js M modules/ace/mode-golang.js M modules/ace/mode-groovy.js M modules/ace/mode-handlebars.js M modules/ace/mode-haxe.js M modules/ace/mode-html.js M modules/ace/mode-html_ruby.js M modules/ace/mode-jack.js M modules/ace/mode-jade.js M modules/ace/mode-java.js M modules/ace/mode-javascript.js M modules/ace/mode-json.js M modules/ace/mode-jsoniq.js M modules/ace/mode-jsp.js M modules/ace/mode-jsx.js M modules/ace/mode-less.js M modules/ace/mode-liquid.js M modules/ace/mode-logiql.js M modules/ace/mode-lsl.js M modules/ace/mode-lua.js M modules/ace/mode-luapage.js M modules/ace/mode-markdown.js M modules/ace/mode-mel.js M modules/ace/mode-nix.js M modules/ace/mode-pgsql.js M modules/ace/mode-php.js M modules/ace/mode-powershell.js M modules/ace/mode-protobuf.js M modules/ace/mode-rhtml.js M modules/ace/mode-scad.js M modules/ace/mode-scala.js M modules/ace/mode-scss.js M modules/ace/mode-sjs.js M modules/ace/mode-soy_template.js M modules/ace/mode-stylus.js M modules/ace/mode-svg.js M modules/ace/mode-twig.js M modules/ace/mode-typescript.js M modules/ace/mode-velocity.js M modules/ace/mode-xml.js M modules/ace/mode-xquery.js M modules/ace/worker-javascript.js 55 files changed, 1,414 insertions(+), 561 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/108050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7333a107b49bb6aec0f91f443f5823e82a327fab Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: TheDJ Gerrit-Reviewer: Anomie Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] coredb_mysql: puppet 3 compatibility fix: fully qualify vari... - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108313
Change subject: coredb_mysql: puppet 3 compatibility fix: fully qualify variable
..
coredb_mysql: puppet 3 compatibility fix: fully qualify variable
Change-Id: I08f15f62ef4186e6dbf7ae7b669e18abb26c56a7
---
M modules/coredb_mysql/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/108313/1
diff --git a/modules/coredb_mysql/manifests/packages.pp
b/modules/coredb_mysql/manifests/packages.pp
index 41a03ad..fb6072b 100644
--- a/modules/coredb_mysql/manifests/packages.pp
+++ b/modules/coredb_mysql/manifests/packages.pp
@@ -1,7 +1,7 @@
# coredb_mysql required packages
class coredb_mysql::packages {
if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '12.04') >=
0 {
-if $mariadb == true {
+if $mysql_wmf::mariadb == true {
file { '/etc/apt/sources.list.d/wikimedia-mariadb.list':
group => 'root',
mode => '0444',
--
To view, visit https://gerrit.wikimedia.org/r/108313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08f15f62ef4186e6dbf7ae7b669e18abb26c56a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
