[MediaWiki-commits] [Gerrit] Empty the default ID blacklist - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/172504 Change subject: Empty the default ID blacklist .. Empty the default ID blacklist Change-Id: Iaf12e09290be6a3a37cec012e70678b4b456d15d --- M repo/config/Wikibase.default.php 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/04/172504/1 diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php index 1eb1e3d..4c94830 100644 --- a/repo/config/Wikibase.default.php +++ b/repo/config/Wikibase.default.php @@ -18,13 +18,6 @@ $defaults = array( 'idBlacklist' = array( - 1, - 23, - 42, - 1337, - 9001, - 31337, - 720101010, ), // Allow the TermIndex table to work without the term_search_key field, -- To view, visit https://gerrit.wikimedia.org/r/172504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf12e09290be6a3a37cec012e70678b4b456d15d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix GenericObject::checkArguments() (v 3.10.3) - change (mediawiki...PhpTags)
jenkins-bot has submitted this change and it was merged. Change subject: fix GenericObject::checkArguments() (v 3.10.3) .. fix GenericObject::checkArguments() (v 3.10.3) Change-Id: I7fe524bca0b78bf96a844937846bfb9776a97d58 --- M includes/GenericObject.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pastakhov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GenericObject.php b/includes/GenericObject.php index c0994f0..d7569dc 100644 --- a/includes/GenericObject.php +++ b/includes/GenericObject.php @@ -93,7 +93,7 @@ Runtime::$transit[PHPTAGS_TRANSIT_EXCEPTION][] = new PhpTagsException( $exception, $arguments ); } - public static function checkArguments( $object, $method, $arguments, $expects = false ) { + public static function checkArguments( $object, $method, $arguments, $expects = false ) { if ( false === $expects ) { return true; } -- To view, visit https://gerrit.wikimedia.org/r/172505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fe524bca0b78bf96a844937846bfb9776a97d58 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhpTags Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru Gerrit-Reviewer: Pastakhov pastak...@yandex.ru Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix GenericObject::checkArguments() (v 3.10.3) - change (mediawiki...PhpTags)
Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/172505 Change subject: fix GenericObject::checkArguments() (v 3.10.3) .. fix GenericObject::checkArguments() (v 3.10.3) Change-Id: I7fe524bca0b78bf96a844937846bfb9776a97d58 --- M includes/GenericObject.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags refs/changes/05/172505/1 diff --git a/includes/GenericObject.php b/includes/GenericObject.php index c0994f0..d7569dc 100644 --- a/includes/GenericObject.php +++ b/includes/GenericObject.php @@ -93,7 +93,7 @@ Runtime::$transit[PHPTAGS_TRANSIT_EXCEPTION][] = new PhpTagsException( $exception, $arguments ); } - public static function checkArguments( $object, $method, $arguments, $expects = false ) { + public static function checkArguments( $object, $method, $arguments, $expects = false ) { if ( false === $expects ) { return true; } -- To view, visit https://gerrit.wikimedia.org/r/172505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fe524bca0b78bf96a844937846bfb9776a97d58 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhpTags Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added TemplatedWidget QUnit tests - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/172506 Change subject: Added TemplatedWidget QUnit tests .. Added TemplatedWidget QUnit tests Change-Id: Ib38ae165188d7fa23e97d7b2ff0eaafcb00e839f --- A lib/tests/qunit/jquery.ui/jquery.ui.TemplatedWidget.tests.js M lib/tests/qunit/resources.php 2 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/06/172506/1 diff --git a/lib/tests/qunit/jquery.ui/jquery.ui.TemplatedWidget.tests.js b/lib/tests/qunit/jquery.ui/jquery.ui.TemplatedWidget.tests.js new file mode 100644 index 000..dab7e11 --- /dev/null +++ b/lib/tests/qunit/jquery.ui/jquery.ui.TemplatedWidget.tests.js @@ -0,0 +1,73 @@ +/** + * @licence GNU GPL v2+ + * @author H. Snater mediaw...@snater.com + */ +( function( mw, $, QUnit ) { + 'use strict'; + +QUnit.module( 'jquery.ui.TemplatedWidget' ); + +QUnit.test( 'Create destroy', function( assert ) { + var testSets = [ + [ + 'divspan$1/span/div', + { + templateParams: ['test'], + templateShortCuts: { + $div: 'span' + } + } + ] + ]; + + /** +* @param {Object} templateShortCuts +*/ + function checkShortCuts( templateShortCuts ) { + $.each( templateShortCuts, function( key, selector ) { + assert.ok( + $subject.data( 'TemplatedWidget' )[key] instanceof $, + 'Assigned templateShortCut: ' + key + '.' + ); + } ); + } + + for( var i = 0; i testSets.length; i++ ) { + mw.wbTemplates.store.set( 'templatedWidget-test', testSets[i][0] ); + + var $subject = $( 'div/' ); + + $subject.TemplatedWidget( $.extend( { + template: 'templatedWidget-test' + }, testSets[i][1] ) ); + + assert.ok( + $subject.data( 'TemplatedWidget' ) instanceof $.ui.TemplatedWidget, + 'Test set #' + i + ': Initialized widget.' + ); + + $subject.removeAttr( 'class' ); + + assert.equal( + $( 'div/' ).append( $subject ).html(), + $( 'div/' ).append( + mw.wbTemplate( 'templatedWidget-test', testSets[i][1].templateParams ) + ).html(), + 'Verified generated HTML.' + ); + + if( testSets[i][1].templateShortCuts ) { + checkShortCuts( testSets[i][1].templateShortCuts ); + } + + $subject.data( 'TemplatedWidget' ).destroy(); + + assert.ok( + $subject.data( 'TemplatedWidget' ) === undefined, + 'Destroyed widget.' + ); + } + +} ); + +}( mediaWiki, jQuery, QUnit ) ); diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php index 6031765..b3356e3 100644 --- a/lib/tests/qunit/resources.php +++ b/lib/tests/qunit/resources.php @@ -62,6 +62,16 @@ ), ), + 'jquery.ui.TemplatedWidget.tests' = $moduleBase + array( + 'scripts' = array( + 'jquery.ui/jquery.ui.TemplatedWidget.tests.js', + ), + 'dependencies' = array( + 'jquery.ui.TemplatedWidget', + 'wikibase.templates', + ), + ), + 'wikibase.dataTypes.tests' = $moduleBase + array( 'scripts' = array( 'wikibase.dataTypes/wikibase.dataTypes.tests.js', -- To view, visit https://gerrit.wikimedia.org/r/172506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib38ae165188d7fa23e97d7b2ff0eaafcb00e839f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented EditableTemplated widget - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/172507 Change subject: Implemented EditableTemplated widget .. Implemented EditableTemplated widget TemplatedWidget is supposed to be the common base constructor for all wikibase.*view widgets. -72666 Change-Id: Ib21c2d50d1acd0c32024ad226956cd0840fe3e13 --- M lib/resources/Resources.php A lib/resources/jquery.ui/jquery.ui.EditableTemplatedWidget.js M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js M lib/resources/jquery.wikibase/resources.php A lib/tests/qunit/jquery.ui/jquery.ui.EditableTemplatedWidget.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js M lib/tests/qunit/resources.php 7 files changed, 487 insertions(+), 155 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/07/172507/1 diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index bd7ce2a..689f73a 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -140,6 +140,17 @@ ), ), + 'jquery.ui.EditableTemplatedWidget' = $moduleTemplate + array( + 'scripts' = array( + 'jquery.ui/jquery.ui.EditableTemplatedWidget.js', + ), + 'dependencies' = array( + 'jquery.ui.TemplatedWidget', + 'util.inherit', + 'wikibase.templates', + ), + ), + 'jquery.ui.tagadata' = $moduleTemplate + array( 'scripts' = array( 'jquery.ui/jquery.ui.tagadata.js', diff --git a/lib/resources/jquery.ui/jquery.ui.EditableTemplatedWidget.js b/lib/resources/jquery.ui/jquery.ui.EditableTemplatedWidget.js new file mode 100644 index 000..5d9daa2 --- /dev/null +++ b/lib/resources/jquery.ui/jquery.ui.EditableTemplatedWidget.js @@ -0,0 +1,257 @@ +/** + * @licence GNU GPL v2+ + * @author H. Snater mediaw...@snater.com + */ +( function( $ ) { + 'use strict'; + + var PARENT = $.ui.TemplatedWidget; + +/** + * TemplatedWidget enhanced with editing capabilities. + * @constructor + * @abstract + * @extends jQuery.ui.TemplatedWidget + * @since 0.5 + * + * @option {*} [value] + * + * @event afterstartediting + *Triggered after having started the widget's edit mode and edit mode has been rendered. + *- {jQuery.Event} + * + * @event stopediting + *Triggered when stopping the widget's edit mode, immediately before re-drawing. + *- {jQuery.Event} + *- {boolean} dropValue + * Whether the widget's value will be reset to the one from before starting edit mode. + * + * @event afterstopediting + *Triggered after having stopped the widget's edit mode and non-edit mode is redrawn. + *- {jQuery.Event} + *- {boolean} dropValue + * Whether the widget's value has been reset to the one from before starting edit mode. + * + * @event change + *Triggered whenever the widget's value is changed. + *- {jQuery.Event} event + * + * @event toggleerror + *Triggered when an error occurred or has been resolved. + *- {jQuery.Event} + *- {Error|undefined} + */ +$.widget( 'ui.EditableTemplatedWidget', PARENT, { + /** +* @see jQuery.ui.TemplatedWidget.options +*/ + options: $.extend( true, {}, PARENT.prototype.options, { + value: null + } ), + + /** +* @see jQuery.ui.TemplatedWidget._create +*/ + _create: function() { + PARENT.prototype._create.call( this ); + }, + + /** +* @see jQuery.ui.TemplatedWidget.destroy +*/ + destroy: function() { + this.element.removeClass( 'wb-edit' ); + PARENT.prototype.destroy.call( this ); + }, + + /** +* Draws the widget according to whether it is in edit mode or not. +* +* @return {Object} jQuery.Promise +* No resolved parameters. +* Rejected parameters: +* - {Error} +*/ + _draw: util.abstractMember, + + /** +* Starts the widget's edit mode. +* +* @return {Object} jQuery.Promise +* No resolved parameters. +* Rejected parameters: +* - {Error} +*/ + startEditing: function() { + var deferred = $.Deferred(); + + if( this.isInEditMode() ) { + return deferred.resolve().promise(); + } + + var self = this; + + self.element.addClass( 'wb-edit' ); + + this._draw() + .done(
[MediaWiki-commits] [Gerrit] Filters needed for newitem.py - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Filters needed for newitem.py .. Filters needed for newitem.py EdittimeFilterPageGenerator, functionally equivalent to the compat version, but better. Also added filter WikibaseItemFilterPageGenerator, and Page.oldest_revision. Renamed WikidataItemGenerator to WikibaseItemGenerator. Bug: 55007 Change-Id: I71b051818773e8b2f78eab534c4dfb23072d0ee9 --- M pywikibot/page.py M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 3 files changed, 221 insertions(+), 31 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 961fe6f..cc094bf 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -563,6 +563,9 @@ return self.site.page_exists(self) +def oldest_revision(self): +return self.getVersionHistory(reverseOrder=True, total=1)[0] + def isRedirectPage(self): Return True if this is a redirect, False if not or not existing. return self.site.page_isredirect(self) diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index f946bfb..922c0a9 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -21,10 +21,11 @@ __version__ = '$Id$' # -import sys import codecs +import datetime import itertools import re +import sys import time import pywikibot @@ -977,13 +978,30 @@ yield page -def RedirectFilterPageGenerator(generator, no_redirects=True): -Yield pages from another generator that are redirects or not. -for page in generator: -if not page.isRedirectPage() and no_redirects: -yield page -elif page.isRedirectPage() and not no_redirects: -yield page +def RedirectFilterPageGenerator(generator, no_redirects=True, +show_filtered=False): + +Yield pages from another generator that are redirects or not. + +@param no_redirects: Exclude redirects if True, else only include +redirects. +@param no_redirects: bool +@param show_filtered: Output a message for each page not yielded +@type show_filtered: bool + +for page in generator or []: +if no_redirects: +if not page.isRedirectPage(): +yield page +elif show_filtered: +pywikibot.output(u'%s is a redirect page. Skipping.' % page) + +else: +if page.isRedirectPage(): +yield page +elif show_filtered: +pywikibot.output(u'%s is not a redirect page. Skipping.' + % page) def DuplicateFilterPageGenerator(generator): @@ -1079,6 +1097,74 @@ # name the generator methods RegexFilterPageGenerator = RegexFilter.titlefilter RegexBodyFilterPageGenerator = RegexFilter.contentfilter + + +@deprecated_args(begintime='last_edit_start', endtime='last_edit_end') +def EdittimeFilterPageGenerator(generator, +last_edit_start=None, +last_edit_end=None, +first_edit_start=None, +first_edit_end=None, +show_filtered=False): + +Wrap a generator to filter pages outside last or first edit range. + +@param generator: A generator object +@param last_edit_start: Only yield pages last edited after this time +@type last_edit_start: datetime +@param last_edit_end: Only yield pages last edited before this time +@type last_edit_end: datetime +@param first_edit_start: Only yield pages first edited after this time +@type first_edit_start: datetime +@param first_edit_end: Only yield pages first edited before this time +@type first_edit_end: datetime +@param show_filtered: Output a message for each page not yielded +@type show_filtered: bool + + +do_last_edit = last_edit_start or last_edit_end +do_first_edit = first_edit_start or first_edit_end + +last_edit_start = last_edit_start or datetime.datetime.min +last_edit_end = last_edit_end or datetime.datetime.max +first_edit_start = first_edit_start or datetime.datetime.min +first_edit_end = first_edit_end or datetime.datetime.max + +for page in generator or []: +if do_last_edit: +last_edit = page.editTime() + +if last_edit last_edit_start: +if show_filtered: +pywikibot.output( +u'Last edit on %s was on %s.\nToo old. Skipping.' +% (page, last_edit.isoformat())) +continue + +if last_edit last_edit_end: +if show_filtered: +pywikibot.output( +
[MediaWiki-commits] [Gerrit] Load style module only when needed - change (mediawiki...GoogleLogin)
jenkins-bot has submitted this change and it was merged. Change subject: Load style module only when needed .. Load style module only when needed Change-Id: I5626325ad634de4fb5c97282d14e48e4d3d812cc Phabricator: T672 --- M GoogleLogin.php M includes/GoogleLogin.body.php M includes/GoogleLogin.hooks.php M includes/specials/SpecialGoogleLogin.php 4 files changed, 7 insertions(+), 10 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/GoogleLogin.php b/GoogleLogin.php index fa8c198..bf07d15 100644 --- a/GoogleLogin.php +++ b/GoogleLogin.php @@ -81,7 +81,6 @@ $wgHooks['PersonalUrls'][] = 'GoogleLoginHooks::onPersonalUrls'; $wgHooks['SpecialPage_initList'][] = 'GoogleLoginHooks::onSpecialPage_initList'; $wgHooks['GetPreferences'][] = 'GoogleLoginHooks::onGetPreferences'; - $wgHooks['BeforePageDisplay'][] = 'GoogleLoginHooks::onBeforePageDisplay'; $wgHooks['RecentChange_save'][] = 'GoogleLoginHooks::onRecentChange_save'; // ResourceLoader modules diff --git a/includes/GoogleLogin.body.php b/includes/GoogleLogin.body.php index 18c00fc..bb9acac 100644 --- a/includes/GoogleLogin.body.php +++ b/includes/GoogleLogin.body.php @@ -549,6 +549,10 @@ // we don't want to delete the output of other extensions, so extend header $header = $tpl-get( 'header' ); + // add css module + $out = $tpl-getSkin()-getOutput(); + $out-addModules( 'ext.GoogleLogin.style' ); + $keepLogin = ''; if ( $glConfig-get( 'GLShowKeepLogin' ) $login ) { $keepLogin = Html::openElement( 'div', array( 'class' = 'mw-ui-vform-field' ) ) . diff --git a/includes/GoogleLogin.hooks.php b/includes/GoogleLogin.hooks.php index 3149d67..90e774e 100644 --- a/includes/GoogleLogin.hooks.php +++ b/includes/GoogleLogin.hooks.php @@ -121,15 +121,6 @@ } /** -* Load our css module -* @param OutputPage $out OutputPage object -* @param Skin $skin Skin object that will be used to generate the page -*/ - public static function onBeforePageDisplay( OutputPage $out, Skin $skin ) { - $out-addModules( 'ext.GoogleLogin.style' ); - } - - /** * Replaces the RC comment with a filterable RC tag * * @param RecentChange $recentChange The recentChange object diff --git a/includes/specials/SpecialGoogleLogin.php b/includes/specials/SpecialGoogleLogin.php index a21233b..009df54 100644 --- a/includes/specials/SpecialGoogleLogin.php +++ b/includes/specials/SpecialGoogleLogin.php @@ -29,6 +29,9 @@ $db = new GoogleLoginDB; $this-mGoogleLogin = $googleLogin = new GoogleLogin; + // add module styles + $out-addModules( 'ext.GoogleLogin.style' ); + $par = (empty( $par ) ? $request-getVal( 'action' ) : $par); $googleLogin-setLoginParameter( $request ); $client = $googleLogin-getClient(); -- To view, visit https://gerrit.wikimedia.org/r/170685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5626325ad634de4fb5c97282d14e48e4d3d812cc Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/GoogleLogin Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] merge OutputPageParserOutput hook to ParserAfterTidy hook (v... - change (mediawiki...PhpTags)
Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/172508 Change subject: merge OutputPageParserOutput hook to ParserAfterTidy hook (v 3.11.0) .. merge OutputPageParserOutput hook to ParserAfterTidy hook (v 3.11.0) Change-Id: I8d83792a864eaaede608d86c31f9d6cd5c4a41e7 --- M PhpTags.body.php M PhpTags.php 2 files changed, 11 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags refs/changes/08/172508/1 diff --git a/PhpTags.body.php b/PhpTags.body.php index c77b1e5..3060961 100644 --- a/PhpTags.body.php +++ b/PhpTags.body.php @@ -171,20 +171,6 @@ \PhpTags\Runtime::$transit[PHPTAGS_TRANSIT_PPFRAME] = $frame; } - public static function onOutputPageParserOutput() { - wfProfileIn( __METHOD__ ); - global $wgPhpTagsCounter, $wgPhpTagsBytecodeExptime; - - if ( $wgPhpTagsCounter 0 ) { - if ( $wgPhpTagsBytecodeExptime 0 self::$bytecodeNeedsUpdate ) { - self::updateBytecodeCache(); - } - PhpTags::reset(); - } - - wfProfileOut( __METHOD__ ); - } - private static function updateBytecodeCache() { global $wgPhpTagsBytecodeExptime; @@ -295,6 +281,9 @@ } public static function onParserAfterTidy( $parser, $text ) { + global $wgPhpTagsBytecodeExptime; + wfProfileIn( __METHOD__ ); + if ( self::$globalVariablesScript ) { $vars = array(); foreach ( self::$globalVariablesScript as $key= $value ) { @@ -306,6 +295,12 @@ ) ); } + if ( $wgPhpTagsBytecodeExptime 0 self::$bytecodeNeedsUpdate ) { + self::updateBytecodeCache(); + } + self::reset(); + + wfProfileOut( __METHOD__ ); return true; } diff --git a/PhpTags.php b/PhpTags.php index 26e6706..965db85 100644 --- a/PhpTags.php +++ b/PhpTags.php @@ -16,8 +16,8 @@ } const PHPTAGS_MAJOR_VERSION = 3; -const PHPTAGS_MINOR_VERSION = 10; -const PHPTAGS_RELEASE_VERSION = 2; +const PHPTAGS_MINOR_VERSION = 11; +const PHPTAGS_RELEASE_VERSION = 0; define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION . '.' . PHPTAGS_RELEASE_VERSION ); const PHPTAGS_HOOK_RELEASE = 5; @@ -54,15 +54,6 @@ $wgHooks['CodeMirrorGetExtensionMode'][] = 'PhpTags::getCodeMirrorMode'; $wgPhpTagsCounter = 0; - -/** - * @codeCoverageIgnore - */ -$wgHooks['OutputPageParserOutput'][] = function () use ( $wgPhpTagsCounter ) { - if ( $wgPhpTagsCounter 0 ) { - \PhpTags::onOutputPageParserOutput(); - } -}; /** * @codeCoverageIgnore -- To view, visit https://gerrit.wikimedia.org/r/172508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d83792a864eaaede608d86c31f9d6cd5c4a41e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhpTags Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] merge OutputPageParserOutput hook to ParserAfterTidy hook (v... - change (mediawiki...PhpTags)
jenkins-bot has submitted this change and it was merged. Change subject: merge OutputPageParserOutput hook to ParserAfterTidy hook (v 3.11.0) .. merge OutputPageParserOutput hook to ParserAfterTidy hook (v 3.11.0) Change-Id: I8d83792a864eaaede608d86c31f9d6cd5c4a41e7 --- M PhpTags.body.php M PhpTags.php 2 files changed, 11 insertions(+), 25 deletions(-) Approvals: Pastakhov: Looks good to me, approved jenkins-bot: Verified diff --git a/PhpTags.body.php b/PhpTags.body.php index c77b1e5..3060961 100644 --- a/PhpTags.body.php +++ b/PhpTags.body.php @@ -171,20 +171,6 @@ \PhpTags\Runtime::$transit[PHPTAGS_TRANSIT_PPFRAME] = $frame; } - public static function onOutputPageParserOutput() { - wfProfileIn( __METHOD__ ); - global $wgPhpTagsCounter, $wgPhpTagsBytecodeExptime; - - if ( $wgPhpTagsCounter 0 ) { - if ( $wgPhpTagsBytecodeExptime 0 self::$bytecodeNeedsUpdate ) { - self::updateBytecodeCache(); - } - PhpTags::reset(); - } - - wfProfileOut( __METHOD__ ); - } - private static function updateBytecodeCache() { global $wgPhpTagsBytecodeExptime; @@ -295,6 +281,9 @@ } public static function onParserAfterTidy( $parser, $text ) { + global $wgPhpTagsBytecodeExptime; + wfProfileIn( __METHOD__ ); + if ( self::$globalVariablesScript ) { $vars = array(); foreach ( self::$globalVariablesScript as $key= $value ) { @@ -306,6 +295,12 @@ ) ); } + if ( $wgPhpTagsBytecodeExptime 0 self::$bytecodeNeedsUpdate ) { + self::updateBytecodeCache(); + } + self::reset(); + + wfProfileOut( __METHOD__ ); return true; } diff --git a/PhpTags.php b/PhpTags.php index 26e6706..965db85 100644 --- a/PhpTags.php +++ b/PhpTags.php @@ -16,8 +16,8 @@ } const PHPTAGS_MAJOR_VERSION = 3; -const PHPTAGS_MINOR_VERSION = 10; -const PHPTAGS_RELEASE_VERSION = 2; +const PHPTAGS_MINOR_VERSION = 11; +const PHPTAGS_RELEASE_VERSION = 0; define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION . '.' . PHPTAGS_RELEASE_VERSION ); const PHPTAGS_HOOK_RELEASE = 5; @@ -54,15 +54,6 @@ $wgHooks['CodeMirrorGetExtensionMode'][] = 'PhpTags::getCodeMirrorMode'; $wgPhpTagsCounter = 0; - -/** - * @codeCoverageIgnore - */ -$wgHooks['OutputPageParserOutput'][] = function () use ( $wgPhpTagsCounter ) { - if ( $wgPhpTagsCounter 0 ) { - \PhpTags::onOutputPageParserOutput(); - } -}; /** * @codeCoverageIgnore -- To view, visit https://gerrit.wikimedia.org/r/172508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d83792a864eaaede608d86c31f9d6cd5c4a41e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhpTags Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru Gerrit-Reviewer: Pastakhov pastak...@yandex.ru Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix __construc method in Slick class (v 1.1.0) incompatible ... - change (mediawiki...PhpTagsWidgets)
jenkins-bot has submitted this change and it was merged. Change subject: fix __construc method in Slick class (v 1.1.0) incompatible changes!!! .. fix __construc method in Slick class (v 1.1.0) incompatible changes!!! I reordered the parameters in the constructor method since version 1.1.0, because this sequence will be better for all future widgets. Change-Id: Ia6d08104581744f3ea4114d322628df9f47bdd5f --- M PhpTagsWidgets.php M includes/WidgetSlick.php M tests/phpunit/Slick_Test.php 3 files changed, 21 insertions(+), 9 deletions(-) Approvals: Pastakhov: Looks good to me, approved jenkins-bot: Verified diff --git a/PhpTagsWidgets.php b/PhpTagsWidgets.php index 7771cbd..156a827 100644 --- a/PhpTagsWidgets.php +++ b/PhpTagsWidgets.php @@ -33,7 +33,7 @@ ); } -define( 'PHPTAGS_WIDGETS_VERSION' , '1.0.0' ); +define( 'PHPTAGS_WIDGETS_VERSION' , '1.1.0' ); // Register this extension on Special:Version $wgExtensionCredits['phptags'][] = array( @@ -71,7 +71,7 @@ return true; }; -$wgParserTestFiles[] = __DIR__ . '/tests/parser/PhpTagsWidgetsTests.txt'; +// @todo $wgParserTestFiles[] = __DIR__ . '/tests/parser/PhpTagsWidgetsTests.txt'; $tpl = array( 'localBasePath' = __DIR__ . '/resources', diff --git a/includes/WidgetSlick.php b/includes/WidgetSlick.php index adc25fd..ab6d5be 100644 --- a/includes/WidgetSlick.php +++ b/includes/WidgetSlick.php @@ -9,7 +9,6 @@ */ class WidgetSlick extends \PhpTags\GenericWidget { - protected static $modules = false; protected static $trueCase = array( 'adaptiveheight' = 'adaptiveHeight', 'autoplayspeed' = 'autoplaySpeed', @@ -29,7 +28,7 @@ 'variablewidth' = 'variableWidth', ); - public function m___construct( $properties = null, $value = null ) { + public function m___construct( $value = null, $properties = null ) { $this-value[self::DATA] = $value; return parent::m___construct( $properties ); } @@ -51,6 +50,19 @@ $data = 'div' . implode( '/divdiv', $this-value[self::DATA] ) . '/div'; } return $data; + } + + public static function checkArguments( $object, $method, $arguments, $expects = false ) { + switch ( $method ) { + case '__construct': + $expects = array( + \PhpTags\Hooks::TYPE_MIXED, + \PhpTags\Hooks::TYPE_ARRAY, + \PhpTags\Hooks::EXPECTS_MAXIMUM_PARAMETERS = 2, + ); + break; + } + return parent::checkArguments( $object, $method, $arguments, $expects ); } private function checkProperty( $property, $value ) { @@ -94,7 +106,7 @@ case 'cssEase': // @???todo case 'customPaging': ??? // @todo case 'easing': -// case 'lazyLoad': +// case 'lazyLoad': // do not allow it!!! case 'slide': $expects = \PhpTags\Hooks::TYPE_STRING; break; diff --git a/tests/phpunit/Slick_Test.php b/tests/phpunit/Slick_Test.php index cbab1f9..7fbbb81 100644 --- a/tests/phpunit/Slick_Test.php +++ b/tests/phpunit/Slick_Test.php @@ -5,27 +5,27 @@ public function testRun_property_style() { $this-assertEquals( - Runtime::runSource( '$s = new Slick( [sTyLe=myStyle] ); echo $s-StYlE;' ), + Runtime::runSource( '$s = new Slick( null, [sTyLe=myStyle] ); echo $s-StYlE;' ), array( 'myStyle' ) ); } public function testRun_property_unset_1() { $this-assertEquals( - Runtime::runSource( '$s = new Slick( [style=myStyle] ); echo $s-style; $s-sTyle = null; echo $s-style;' ), + Runtime::runSource( '$s = new Slick( null, [style=myStyle] ); echo $s-style; $s-sTyle = null; echo $s-style;' ), array( 'myStyle', null ) ); } public function testRun_property_unset_2() { $this-assertEquals( - Runtime::runSource( '$s = new Slick( [dotS=it must be boolean true] ); echo $s-dOts; $s-Dots = null; echo $s-doTs;' ), + Runtime::runSource( '$s = new Slick( null, [dotS=it must be boolean true] ); echo $s-dOts; $s-Dots = null; echo $s-doTs;' ), array( true, null ) ); } public function testRun_property_rtl() {
[MediaWiki-commits] [Gerrit] Alias table names to support prefixed schemas - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/172509 Change subject: Alias table names to support prefixed schemas .. Alias table names to support prefixed schemas Change-Id: Ida27133b44f3b026cd372143bf3613102c559930 --- M includes/CNCampaignPager.php 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/09/172509/1 diff --git a/includes/CNCampaignPager.php b/includes/CNCampaignPager.php index 76084b3..218ed89 100644 --- a/includes/CNCampaignPager.php +++ b/includes/CNCampaignPager.php @@ -62,10 +62,11 @@ // Query for only campaigns associated with a specific banner id return array( 'tables' = array( - 'cn_notices', 'cn_assignments' + 'notices' = 'cn_notices', + 'assignments' = 'cn_assignments' ), 'fields' = array( - 'cn_notices.not_id', + 'notices.not_id', 'not_name', 'not_start', 'not_end', @@ -76,8 +77,8 @@ 'not_archived' ), 'conds' = array( - 'cn_notices.not_id = cn_assignments.not_id', - 'cn_assignments.tmp_id = ' . (int)$this-assignedBannerId + 'notices.not_id = assignments.not_id', + 'assignments.tmp_id = ' . (int)$this-assignedBannerId ) ); @@ -363,7 +364,7 @@ */ public function getDefaultSort() { return $this-assignedBannerId === null ? - 'not_id' : 'cn_notices.not_id'; + 'not_id' : 'notices.not_id'; } /** -- To view, visit https://gerrit.wikimedia.org/r/172509 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida27133b44f3b026cd372143bf3613102c559930 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix detection of multiple empty listitems in sitelinklistview - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/172510 Change subject: Fix detection of multiple empty listitems in sitelinklistview .. Fix detection of multiple empty listitems in sitelinklistview Change-Id: I75a258b9e58da26846e97daab61d9ddcf458b978 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/10/172510/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js index c285bba..bce75b0 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js @@ -316,11 +316,11 @@ $sitelinkview.each( function() { if( $( this ).data( 'sitelinkview' ).isEmpty() ) { - return ++emptyItems === 2; + return ++emptyItems 1; } } ); - return emptyItems === 2; + return emptyItems 1; } var listview = this.$listview.data( 'listview' ), @@ -328,7 +328,6 @@ $items = listview.items(), $lastSitelinkview = $items.last(), lastSitelinkview = lia.liInstance( $lastSitelinkview ), - multipleEmpty = moreThanOneEmpty( $items ).length 1, secondToLast = $items.length 1 lia.liInstance( $items.eq( -2 ) ), secondToLastInvalidPending = secondToLast !secondToLast.isValid() !secondToLast.option( 'value' ); @@ -336,7 +335,7 @@ if( lastSitelinkview lastSitelinkview.isEmpty() -( multipleEmpty || secondToLastInvalidPending ) +( moreThanOneEmpty( $items ) || secondToLastInvalidPending ) ) { listview.removeItem( $lastSitelinkview ); } else if( !lastSitelinkview || lastSitelinkview.isValid() !this.isFull() ) { -- To view, visit https://gerrit.wikimedia.org/r/172510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75a258b9e58da26846e97daab61d9ddcf458b978 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Page.latest_revision property - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/172511 Change subject: Page.latest_revision property .. Page.latest_revision property Also pep8-ified a few revision related properties. Change-Id: I3e0caa081e9f2e0f06d2d814199531c8af739644 --- M pywikibot/page.py 1 file changed, 28 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/11/172511/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index 961fe6f..8c82395 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -338,7 +338,7 @@ if not get_redirect: raise -return self._revisions[self._revid].text +return self.latest_revision.text def _getInternals(self, sysop): Helper function for get(). @@ -396,11 +396,24 @@ self.title(asUrl=True), (oldid if oldid is not None else self.latestRevision())) -def latestRevision(self): +@property +def latest_revision_id(self): Return the current revision id for this page. if not hasattr(self, '_revid'): self.site.loadrevisions(self) return self._revid + +def latestRevision(self): +Return the current revision id for this page. +return self.latest_revision_id + +@property +def latest_revision(self): +Return the current revision for this page. +rev = self.latest_revision_id +if rev not in self._revisions: +self.site.loadrevisions(self) +return self._revisions[rev] @property def text(self): @@ -491,20 +504,14 @@ @return: unicode -rev = self.latestRevision() -if rev not in self._revisions: -self.site.loadrevisions(self) -return self._revisions[rev].user +return self.latest_revision.user def isIpEdit(self): Return True if last editor was unregistered. @return: bool -rev = self.latestRevision() -if rev not in self._revisions: -self.site.loadrevisions(self) -return self._revisions[rev].anon +return self.latest_revision.anon def lastNonBotUser(self): Return name or IP address of last human/non-bot user to edit page. @@ -529,17 +536,16 @@ return self._lastNonBotUser +@deprecated_args(datetime=None) def editTime(self): Return timestamp of last revision to page. -@return: pywikibot.Timestamp +@rtype: pywikibot.Timestamp -rev = self.latestRevision() -if rev not in self._revisions: -self.site.loadrevisions(self) -return self._revisions[rev].timestamp +return self.latest_revision.timestamp -def previousRevision(self): +@property +def previous_revision_id(self): Return the revision id for the previous revision of this Page. If the page has only one revision, it shall return -1. @@ -553,6 +559,12 @@ else: return min(x.revid for x in history) +def previousRevision(self): +return self.previous_revision_id + +def oldest_revision(self): +return self.getVersionHistory(reverseOrder=True, total=1)[0] + def exists(self): Return True if page exists on the wiki, even if it's a redirect. -- To view, visit https://gerrit.wikimedia.org/r/172511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e0caa081e9f2e0f06d2d814199531c8af739644 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bold italic icons for Armenian - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Bold italic icons for Armenian .. Bold italic icons for Armenian Change-Id: I19d38733a79d38c33c0c454e5e5026ba94fb900f --- A src/ui/styles/images/icons/bold-armn-to.svg A src/ui/styles/images/icons/italic-armn-sha.svg M src/ui/styles/ve.ui.Icons.css M src/ui/tools/ve.ui.AnnotationTool.js 4 files changed, 24 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ui/styles/images/icons/bold-armn-to.svg b/src/ui/styles/images/icons/bold-armn-to.svg new file mode 100644 index 000..4dbec6d --- /dev/null +++ b/src/ui/styles/images/icons/bold-armn-to.svg @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=utf-8? +svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 24 +g id=bold-armn-to +path id=armn-to d=M13.86 16.257c.124 0 .254-.026.39-.078.135-.058.257-.15.367-.274.114-.13.205-.302.273-.516.073-.213.11-.48.11-.797V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.218.175.395.29.53.12.136.247.232.383.29.14.05.276.077.406.077m-2.97-7.84c-.37.082-.695.247-.976.45-.28.198-.505.47-.672.813-.16.343-.242.78-.242 1.312V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.348.49.738.64 1.17.15.433.226 1.094.226 1.61h1.353v2.04H17.78v1.6c0 .58-.103 1.092-.31 1.54-.21.442-.49.815-.845 1.117-.35.302-.834.53-1.297.687-.464.15-.953.226-1.47.226-.51 0-.996-.078-1.46-.234-.464-.156-.87-.39-1.22-.703-.348-.313-.626-.703-.835-1.172-.203-.473-.304-1.028-.304-1.663s.105-1.182.32-1.64c.213-.46.497-.685.85-.977.355-.297.76-.513 1.22-.648.458-.14.935-.21 1.43-.21h1.132c-.01-.49-.04-1.043-.242-1.36-.198-.323-.453-.58-.766-.766-.312-.193-.598-.332-.984-.426-.374-.09-.577-.094-1.1-.094-.52 0-.64.02-1.01.102z/ +/g +/svg diff --git a/src/ui/styles/images/icons/italic-armn-sha.svg b/src/ui/styles/images/icons/italic-armn-sha.svg new file mode 100644 index 000..63de0f6 --- /dev/null +++ b/src/ui/styles/images/icons/italic-armn-sha.svg @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=utf-8? +svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 24 +g id=italic-armn-sha +path id=armn-sha d=M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.586 6h1.724c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.324 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.038-.356-.057-.576-.057-.583 0-1.137.095-1.663.284-.524.19-1 .46-1.425.812-.42.35-.777.78-1.072 1.283-.294.504-.504 1.074-.63 1.71-.242 1.255-.152 2.21.268 2.868.426.652 1.19.978 2.294.978.55 0 1.045-.08 1.48-.237.437-.156.815-.377 1.136-.66.326-.29.59-.633.796-1.033.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.026-1.214 1.425-.488.394-1.053.7-1.694.922-.642.215-1.343.323-2.105.323-.767 0-1.434-.113-2-.34-.568-.225-1.025-.553-1.372-.984-.347-.436-.573-.97-.678-1.607-.105-.637-.078-1.364.08-2.184.125-.66.346-1.273.66-1.835.316-.567.697-1.066 1.144-1.496.445-.436.944-.794 1.496-1.072.55-.284 1.13-.475 1.733-.575l-.466-.23/ +/g +/svg diff --git a/src/ui/styles/ve.ui.Icons.css b/src/ui/styles/ve.ui.Icons.css index 3bff6c1..3234eda 100644 --- a/src/ui/styles/ve.ui.Icons.css +++ b/src/ui/styles/ve.ui.Icons.css @@ -40,6 +40,11 @@ background-image: url(images/icons/bold-arab-dad.svg); } +.oo-ui-icon-bold-armn-to { + /* @embed */ + background-image: url(images/icons/bold-armn-to.svg); +} + .oo-ui-icon-bold-cyrl-be { /* @embed */ background-image: url(images/icons/bold-cyrl-be.svg); @@ -159,6 +164,11 @@ background-image: url(images/icons/italic-arab-keheh-jeem.svg); } +.oo-ui-icon-italic-armn-sha { + /* @embed */ + background-image: url(images/icons/italic-armn-sha.svg); +} + .oo-ui-icon-italic-geor-kan { /* @embed */ background-image: url(images/icons/italic-geor-kan.svg); diff --git a/src/ui/tools/ve.ui.AnnotationTool.js b/src/ui/tools/ve.ui.AnnotationTool.js index 989e607..fbb3063 100644 --- a/src/ui/tools/ve.ui.AnnotationTool.js +++ b/src/ui/tools/ve.ui.AnnotationTool.js @@ -82,6 +82,7 @@ gl: 'bold-n', he: 'bold-b', hu: 'bold-f', + hy: 'bold-armn-to', it: 'bold-g', ka: 'bold-geor-man', ksh: 'bold-f', @@ -133,6 +134,7 @@ gl: 'italic-c', he: 'italic-i', hu: 'italic-d', + hy: 'italic-armn-sha', it: 'italic-c', ka: 'italic-geor-kan', ksh: 'italic-s', -- To view, visit https://gerrit.wikimedia.org/r/171906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] Add missing config documentation for PendingElement - change (oojs/ui)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/172512 Change subject: Add missing config documentation for PendingElement .. Add missing config documentation for PendingElement Change-Id: I2eefe8c8e8ded85b656d8d0a08c33c2290a9feac --- M src/elements/PendingElement.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/12/172512/1 diff --git a/src/elements/PendingElement.js b/src/elements/PendingElement.js index 7bc136c..c5f71d5 100644 --- a/src/elements/PendingElement.js +++ b/src/elements/PendingElement.js @@ -6,6 +6,7 @@ * * @constructor * @param {Object} [config] Configuration options + * @cfg {jQuery} [$pending] Element to mark as pending, defaults to this.$element */ OO.ui.PendingElement = function OoUiPendingElement( config ) { // Configuration initialization -- To view, visit https://gerrit.wikimedia.org/r/172512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2eefe8c8e8ded85b656d8d0a08c33c2290a9feac Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Releasing patch version 0.4.1 - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/172513 Change subject: Releasing patch version 0.4.1 .. Releasing patch version 0.4.1 Change-Id: I8fe9ff827da79ccaa2cfbd83c72214ea22a60c34 Paired-With: Amir Aharoni --- M README.md M lib/mediawiki_selenium/version.rb 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/13/172513/1 diff --git a/README.md b/README.md index bebe3e7..07c6348 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,9 @@ ## Release notes +### 0.4.1 2014-11-11 +* Additional headless environment variables: HEADLESS_DISPLAY, HEADLESS_REUSE, HEADLESS_DESTROY_AT_EXIT. + ### 0.4.0 2014-09-23 * Stricter pending behavior for falsely passing steps diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 50d6b08..025822d 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -10,5 +10,5 @@ =end module MediawikiSelenium - VERSION = 0.4.0 + VERSION = 0.4.1 end -- To view, visit https://gerrit.wikimedia.org/r/172513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fe9ff827da79ccaa2cfbd83c72214ea22a60c34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Releasing patch version 0.4.1 - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Releasing patch version 0.4.1 .. Releasing patch version 0.4.1 Change-Id: I8fe9ff827da79ccaa2cfbd83c72214ea22a60c34 Paired-With: Amir Aharoni --- M README.md M lib/mediawiki_selenium/version.rb 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index bebe3e7..07c6348 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,9 @@ ## Release notes +### 0.4.1 2014-11-11 +* Additional headless environment variables: HEADLESS_DISPLAY, HEADLESS_REUSE, HEADLESS_DESTROY_AT_EXIT. + ### 0.4.0 2014-09-23 * Stricter pending behavior for falsely passing steps diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 50d6b08..025822d 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -10,5 +10,5 @@ =end module MediawikiSelenium - VERSION = 0.4.0 + VERSION = 0.4.1 end -- To view, visit https://gerrit.wikimedia.org/r/172513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fe9ff827da79ccaa2cfbd83c72214ea22a60c34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wgDebugLog group for FSFileBackend - change (operations/mediawiki-config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/172514 Change subject: Add wgDebugLog group for FSFileBackend .. Add wgDebugLog group for FSFileBackend Bug: 73229 Change-Id: I98e090a4ca5c3c6951dde3c4ca70300411b94bfc --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/14/172514/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 743a0a0..3e97c52 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4198,6 +4198,7 @@ 'Echo' = udp://$wmfUdp2logDest/echo, 'collection' = udp://$wmfUdp2logDest/collection, // -cscott for bug 71675 'GlobalTitleFail' = udp://$wmfUdp2logDest/globaltitlefail, // chad hates $wgTitle + 'FSFileBackend' = udp://$wmfUdp2logDest/fsfilebackend, // - gilles for bug 73229 ), '+enwiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/172514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98e090a4ca5c3c6951dde3c4ca70300411b94bfc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Update Ruby gems - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/172515 Change subject: [BrowserTest] Update Ruby gems .. [BrowserTest] Update Ruby gems Language screenshots need mediawiki_selenium 0.4.1 because it has additional options for running headless. Change-Id: I01649def8a7ccf8adf3705b590c0b706feaaf2d3 Paired-With: Amir Aharoni --- M Gemfile.lock 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/15/172515/1 diff --git a/Gemfile.lock b/Gemfile.lock index d00a8e7..e9df15d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ mediawiki_api (0.3.0) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.4.0) +mediawiki_selenium (0.4.1) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -74,9 +74,9 @@ rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) rspec-mocks (2.99.2) -rubocop (0.27.0) +rubocop (0.27.1) astrolabe (~ 1.3) - parser (= 2.2.0.pre.6, 3.0) + parser (= 2.2.0.pre.7, 3.0) powerpack (~ 0.0.6) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -- To view, visit https://gerrit.wikimedia.org/r/172515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01649def8a7ccf8adf3705b590c0b706feaaf2d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Update Ruby gems - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] Update Ruby gems .. [BrowserTest] Update Ruby gems Language screenshots need mediawiki_selenium 0.4.1 because it has additional options for running headless. Change-Id: I01649def8a7ccf8adf3705b590c0b706feaaf2d3 Paired-With: Amir Aharoni --- M Gemfile.lock 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile.lock b/Gemfile.lock index d00a8e7..e9df15d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ mediawiki_api (0.3.0) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.4.0) +mediawiki_selenium (0.4.1) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -74,9 +74,9 @@ rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) rspec-mocks (2.99.2) -rubocop (0.27.0) +rubocop (0.27.1) astrolabe (~ 1.3) - parser (= 2.2.0.pre.6, 3.0) + parser (= 2.2.0.pre.7, 3.0) powerpack (~ 0.0.6) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -- To view, visit https://gerrit.wikimedia.org/r/172515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01649def8a7ccf8adf3705b590c0b706feaaf2d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Vikassy vikasyaligar...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing config documentation for PendingElement - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing config documentation for PendingElement .. Add missing config documentation for PendingElement Change-Id: I2eefe8c8e8ded85b656d8d0a08c33c2290a9feac --- M src/elements/PendingElement.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/elements/PendingElement.js b/src/elements/PendingElement.js index 7bc136c..c5f71d5 100644 --- a/src/elements/PendingElement.js +++ b/src/elements/PendingElement.js @@ -6,6 +6,7 @@ * * @constructor * @param {Object} [config] Configuration options + * @cfg {jQuery} [$pending] Element to mark as pending, defaults to this.$element */ OO.ui.PendingElement = function OoUiPendingElement( config ) { // Configuration initialization -- To view, visit https://gerrit.wikimedia.org/r/172512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2eefe8c8e8ded85b656d8d0a08c33c2290a9feac Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5cfa2f5..8fb1be9 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/172516 Change subject: Syncronize VisualEditor: 5cfa2f5..8fb1be9 .. Syncronize VisualEditor: 5cfa2f5..8fb1be9 Change-Id: I3b94dd50f1ef4c6b03d5f513f05578cc1d294e9f --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/16/172516/1 diff --git a/VisualEditor b/VisualEditor index 5cfa2f5..8fb1be9 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 5cfa2f5fcb31bab5010e99db38af4aa85139dc38 +Subproject commit 8fb1be9291b2582e9161ba045d68fe6479180793 -- To view, visit https://gerrit.wikimedia.org/r/172516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b94dd50f1ef4c6b03d5f513f05578cc1d294e9f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5cfa2f5..8fb1be9 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 5cfa2f5..8fb1be9 .. Syncronize VisualEditor: 5cfa2f5..8fb1be9 Change-Id: I3b94dd50f1ef4c6b03d5f513f05578cc1d294e9f --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 5cfa2f5..8fb1be9 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 5cfa2f5fcb31bab5010e99db38af4aa85139dc38 +Subproject commit 8fb1be9291b2582e9161ba045d68fe6479180793 -- To view, visit https://gerrit.wikimedia.org/r/172516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b94dd50f1ef4c6b03d5f513f05578cc1d294e9f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed gem build warnings - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/172518 Change subject: Fixed gem build warnings .. Fixed gem build warnings $ gem build mediawiki_selenium.gemspec WARNING: open-ended dependency on redcarpet (= 0, development) is not recommended if redcarpet is semantically versioned, use: add_development_dependency 'redcarpet', '~ 0' WARNING: open-ended dependency on yard (= 0, development) is not recommended if yard is semantically versioned, use: add_development_dependency 'yard', '~ 0' WARNING: See http://guides.rubygems.org/specification-reference/ for help Successfully built RubyGem Name: mediawiki_selenium Version: 0.4.1 File: mediawiki_selenium-0.4.1.gem Change-Id: Icebd706dfaa45ec1c9f5339e85294927aa68d0d3 --- M mediawiki_selenium.gemspec 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/18/172518/1 diff --git a/mediawiki_selenium.gemspec b/mediawiki_selenium.gemspec index 39c1c44..32dd72e 100644 --- a/mediawiki_selenium.gemspec +++ b/mediawiki_selenium.gemspec @@ -26,7 +26,7 @@ spec.add_runtime_dependency rspec-expectations, ~ 2.14, = 2.14.4 spec.add_runtime_dependency syntax, ~ 1.2, = 1.2.0 - spec.add_development_dependency redcarpet + spec.add_development_dependency redcarpet, ~ 1 spec.add_development_dependency rubocop, ~ 0.26.1 - spec.add_development_dependency yard + spec.add_development_dependency yard, ~ 0 end -- To view, visit https://gerrit.wikimedia.org/r/172518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icebd706dfaa45ec1c9f5339e85294927aa68d0d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] mediawiki.ui: checkbox: Fix states according to spec - change (mediawiki/core)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/172519 Change subject: [WIP] mediawiki.ui: checkbox: Fix states according to spec .. [WIP] mediawiki.ui: checkbox: Fix states according to spec * Color changes * Introduces hover state * Separates focus and active state * Removes need for inset border Design specification on Trello- https://trello.com/c/JETLmm7F/7-check-boxes Todo: 1. Get white check image 2. Make the checkbox bigger or the check image smaller (ask May) 3. Fix the shift being caused by the different states dues to the border-box box-sizing. Change-Id: I891f05c8edd010b81bd5f35eeae5d5dd22169933 --- M resources/src/mediawiki.ui/components/checkbox.less 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/172519/1 diff --git a/resources/src/mediawiki.ui/components/checkbox.less b/resources/src/mediawiki.ui/components/checkbox.less index 0735a80..556d094 100644 --- a/resources/src/mediawiki.ui/components/checkbox.less +++ b/resources/src/mediawiki.ui/components/checkbox.less @@ -30,7 +30,6 @@ } @checkboxSize: 1.6em; -@focusBottomBorderSize: 0.2em; // We use the not selector to cancel out styling on IE 8 and below .mw-ui-checkbox:not(#noop) { @@ -63,26 +62,36 @@ width: @checkboxSize; height: @checkboxSize; background-color: #fff; - border: 1px solid grey; + border: 1px solid @colorGray7; + box-sizing: border-box; } // when the input is checked, style the label pseudo before element that followed as a checked checkbox :checked + label::before { .background-image-svg('images/checked.svg', 'images/checked.png'); - .background-size( @checkboxSize, @checkboxSize ); + .background-size( @checkboxSize - 0.2em, @checkboxSize - 0.2em ); background-repeat: no-repeat; background-position: center top; } - :active + label::before, + :active + label::before { + background-color: @colorGray13; + border-color: @colorGray13; + } + :focus + label::before { - box-shadow: inset 0 -@focusBottomBorderSize 0 0 lightgrey; + border-width: 2px; + } + + :hover + label::before { + border-bottom-width: 2px; } // disabled checked boxes have a gray background :disabled + label::before { cursor: default; - background-color: lightgrey; + background-color: @colorGray14; + border-color: @colorGray14; } } } -- To view, visit https://gerrit.wikimedia.org/r/172519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I891f05c8edd010b81bd5f35eeae5d5dd22169933 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add FontAwesome widget (v 1.2.0) - change (mediawiki...PhpTagsWidgets)
Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/172520 Change subject: add FontAwesome widget (v 1.2.0) .. add FontAwesome widget (v 1.2.0) Change-Id: I561b7d60ac1a5592e7b6e6639f6cc2135288072b --- M PhpTagsWidgets.init.php M PhpTagsWidgets.php M includes/GenericWidget.php A includes/WidgetFontAwesomeIcon.php M includes/WidgetSlick.php A resources/libs/font-awesome/css/font-awesome.css A resources/libs/font-awesome/fonts/FontAwesome.otf A resources/libs/font-awesome/fonts/fontawesome-webfont.eot A resources/libs/font-awesome/fonts/fontawesome-webfont.svg A resources/libs/font-awesome/fonts/fontawesome-webfont.ttf A resources/libs/font-awesome/fonts/fontawesome-webfont.woff A tests/parser/PhpTagsWidgetsTests.txt 12 files changed, 2,881 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTagsWidgets refs/changes/20/172520/1 -- To view, visit https://gerrit.wikimedia.org/r/172520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I561b7d60ac1a5592e7b6e6639f6cc2135288072b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhpTagsWidgets Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix planet sync cron command - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/172521 Change subject: Fix planet sync cron command .. Fix planet sync cron command Percent signs need to be escaped Change-Id: I2809b677ea9c948afd9671b81ed7abcc62d5b0b3 --- M modules/osm/manifests/planet_sync.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/172521/1 diff --git a/modules/osm/manifests/planet_sync.pp b/modules/osm/manifests/planet_sync.pp index add6ff5..4bdf407 100644 --- a/modules/osm/manifests/planet_sync.pp +++ b/modules/osm/manifests/planet_sync.pp @@ -44,7 +44,7 @@ content = template('osm/osmosis_configuration.txt.erb'), } -$sync_planet_cmd = inline_template(%- data=@memoryfree.split(' '); multi={'MB' = 1, 'GB' = 1000}[data[1]]-%/usr/bin/osmosis --read-replication-interval workingDirectory=%= @osmosis_dir % --simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C %= data[0].to_i/10*multi % --number-processes %= @processorcount % -e15 -o %= @expire_dir %/expire.list.$(date \+%Y%m%d%H%M\) --append -) +$sync_planet_cmd = inline_template(%- data=@memoryfree.split(' '); multi={'MB' = 1, 'GB' = 1000}[data[1]]-%/usr/bin/osmosis --read-replication-interval workingDirectory=%= @osmosis_dir % --simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C %= data[0].to_i/10*multi % --number-processes %= @processorcount % -e15 -o %= @expire_dir %/expire.list.$(date \+\\%Y\\%m\\%d\\%H\\%M\) --append -) cron { planet_sync-${name}: environment = JAVACMD_OPTIONS='-Dhttp.proxyHost=webproxy.eqiad.wmnet -Dhttp.proxyPort=8080', command = $sync_planet_cmd /tmp/osmosis.log 21, -- To view, visit https://gerrit.wikimedia.org/r/172521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2809b677ea9c948afd9671b81ed7abcc62d5b0b3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix planet sync cron command - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Fix planet sync cron command .. Fix planet sync cron command Percent signs need to be escaped Change-Id: I2809b677ea9c948afd9671b81ed7abcc62d5b0b3 --- M modules/osm/manifests/planet_sync.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/osm/manifests/planet_sync.pp b/modules/osm/manifests/planet_sync.pp index add6ff5..4bdf407 100644 --- a/modules/osm/manifests/planet_sync.pp +++ b/modules/osm/manifests/planet_sync.pp @@ -44,7 +44,7 @@ content = template('osm/osmosis_configuration.txt.erb'), } -$sync_planet_cmd = inline_template(%- data=@memoryfree.split(' '); multi={'MB' = 1, 'GB' = 1000}[data[1]]-%/usr/bin/osmosis --read-replication-interval workingDirectory=%= @osmosis_dir % --simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C %= data[0].to_i/10*multi % --number-processes %= @processorcount % -e15 -o %= @expire_dir %/expire.list.$(date \+%Y%m%d%H%M\) --append -) +$sync_planet_cmd = inline_template(%- data=@memoryfree.split(' '); multi={'MB' = 1, 'GB' = 1000}[data[1]]-%/usr/bin/osmosis --read-replication-interval workingDirectory=%= @osmosis_dir % --simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C %= data[0].to_i/10*multi % --number-processes %= @processorcount % -e15 -o %= @expire_dir %/expire.list.$(date \+\\%Y\\%m\\%d\\%H\\%M\) --append -) cron { planet_sync-${name}: environment = JAVACMD_OPTIONS='-Dhttp.proxyHost=webproxy.eqiad.wmnet -Dhttp.proxyPort=8080', command = $sync_planet_cmd /tmp/osmosis.log 21, -- To view, visit https://gerrit.wikimedia.org/r/172521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2809b677ea9c948afd9671b81ed7abcc62d5b0b3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move RepoApi{, Error} usages - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/172523 Change subject: Move RepoApi{,Error} usages .. Move RepoApi{,Error} usages Change-Id: I5515fb02f48255e5bb7e629655f6731f1ad84581 --- M client/resources/Resources.php M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js M client/resources/wikibase.client.PageConnector.js M lib/resources/api/FormatValueCaller.js M lib/resources/api/ParseValueCaller.js M lib/resources/api/resources.php M lib/resources/entityChangers/AliasesChanger.js M lib/resources/entityChangers/ClaimsChanger.js M lib/resources/entityChangers/DescriptionsChanger.js M lib/resources/entityChangers/EntityChangersFactory.js M lib/resources/entityChangers/LabelsChanger.js M lib/resources/entityChangers/ReferencesChanger.js M lib/resources/entityChangers/SiteLinksChanger.js M lib/resources/entityChangers/resources.php M lib/resources/formatters/getApiBasedValueFormatterConstructor.js M lib/resources/formatters/getStore.js M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js M lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js M lib/resources/jquery.wikibase/toolbar/resources.php M lib/resources/parsers/getApiBasedValueParserConstructor.js M lib/resources/parsers/getStore.js M lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js M lib/resources/wikibase.store/store.ApiEntityStore.js M lib/tests/qunit/entityChangers/AliasesChanger.tests.js M lib/tests/qunit/entityChangers/ClaimsChanger.tests.js M lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js M lib/tests/qunit/entityChangers/LabelsChanger.tests.js M lib/tests/qunit/entityChangers/ReferencesChanger.tests.js M lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js M repo/resources/Resources.php M repo/resources/wikibase.ui.entityViewInit.js 35 files changed, 94 insertions(+), 93 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/23/172523/1 diff --git a/client/resources/Resources.php b/client/resources/Resources.php index 2c90075..0903419 100644 --- a/client/resources/Resources.php +++ b/client/resources/Resources.php @@ -86,8 +86,8 @@ 'mediawiki.jqueryMsg', 'wikibase.client.currentSite', 'wikibase.sites', - 'wikibase.RepoApi', - 'wikibase.RepoApiError', + 'wikibase.api.RepoApi', + 'wikibase.api.RepoApiError', 'wikibase.client.PageConnector' ), 'messages' = array( diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js index e1bc376..02e9a2a 100644 --- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js +++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js @@ -347,7 +347,7 @@ this.targetArticle = $( '#wbclient-linkItem-page' ).val(); this._pageConnector = new wb.PageConnector( - new wb.RepoApi( this.options.mwApiForRepo ), + new wb.api.RepoApi( this.options.mwApiForRepo ), this.options.globalSiteId, this.options.pageTitle, this.targetSite, @@ -582,7 +582,7 @@ */ _onError: function( errorCode, errorInfo ) { var error = errorInfo - ? wb.RepoApiError.newFromApiResponse( errorInfo ) + ? wb.api.RepoApiError.newFromApiResponse( errorInfo ) : errorCode; var $elem = $( '#wbclient-linkItem-page' ); diff --git a/client/resources/wikibase.client.PageConnector.js b/client/resources/wikibase.client.PageConnector.js index 01735bd..ba5c5b0 100644 --- a/client/resources/wikibase.client.PageConnector.js +++ b/client/resources/wikibase.client.PageConnector.js @@ -10,7 +10,7 @@ * @constructor * @since 0.5 * - * @param {wb.RepoApi} repoApi + * @param {wikibase.api.RepoApi} repoApi * @param {string} firstSiteId * @param {string} firstPageName * @param {string} secondSiteId @@ -33,7 +33,7 @@ $.extend( wb.PageConnector.prototype, { /** -* @type wikibase.RepoApi +* @type wikibase.api.RepoApi */ _repoApi: null, diff --git a/lib/resources/api/FormatValueCaller.js b/lib/resources/api/FormatValueCaller.js index 1224b46..9836a1f 100644 --- a/lib/resources/api/FormatValueCaller.js +++
[MediaWiki-commits] [Gerrit] Move wikibase.RepoApi{, Error} to wikibase.api - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/172522 Change subject: Move wikibase.RepoApi{,Error} to wikibase.api .. Move wikibase.RepoApi{,Error} to wikibase.api Change-Id: I77e7368cf0352884b6762b16a7557480be1f4e26 --- M lib/resources/Resources.php A lib/resources/deprecated/resources.php A lib/resources/deprecated/wikibase.RepoApi.js A lib/resources/deprecated/wikibase.RepoApiError.js M lib/resources/wikibase.RepoApi/resources.php M lib/resources/wikibase.RepoApi/wikibase.RepoApi.js M lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js M lib/tests/qunit/resources.php M lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js M lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js 10 files changed, 102 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/22/172522/1 diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index bd7ce2a..13cdf11 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -183,6 +183,7 @@ $modules = array_merge( $modules, include( __DIR__ . '/api/resources.php' ), + include( __DIR__ . '/deprecated/resources.php' ), include( __DIR__ . '/entityChangers/resources.php' ), include( __DIR__ . '/experts/resources.php' ), include( __DIR__ . '/formatters/resources.php' ), diff --git a/lib/resources/deprecated/resources.php b/lib/resources/deprecated/resources.php new file mode 100644 index 000..1bb49ff --- /dev/null +++ b/lib/resources/deprecated/resources.php @@ -0,0 +1,41 @@ +?php +/** + * @license GNU GPL v2+ + * @author Adrian Lang adrian.l...@wikimedia.de + */ +return call_user_func( function() { + preg_match( + '+' . preg_quote( DIRECTORY_SEPARATOR, '+' ) . '((?:vendor|extensions)' . + preg_quote( DIRECTORY_SEPARATOR, '+' ) . '.*)$+', + __DIR__, + $remoteExtPathParts + ); + $moduleTemplate = array( + 'localBasePath' = __DIR__, + 'remoteExtPath' = '..' . DIRECTORY_SEPARATOR . $remoteExtPathParts[1], + ); + + $modules = array( + 'wikibase.RepoApi' = $moduleTemplate + array( + 'scripts' = array( + 'wikibase.RepoApi.js', + ), + 'dependencies' = array( + 'wikibase', + 'wikibase.api.RepoApi', + ), + ), + 'wikibase.RepoApiError' = $moduleTemplate + array( + 'scripts' = array( + 'wikibase.RepoApiError.js', + ), + 'dependencies' = array( + 'wikibase', + 'wikibase.api.RepoApiError', + ), + ), + ); + + return $modules; + +} ); diff --git a/lib/resources/deprecated/wikibase.RepoApi.js b/lib/resources/deprecated/wikibase.RepoApi.js new file mode 100644 index 000..8649a2e --- /dev/null +++ b/lib/resources/deprecated/wikibase.RepoApi.js @@ -0,0 +1,13 @@ +/** + * @licence GNU GPL v2+ + * @author Adrian Lang adrian.l...@wikimedia.de + */ + +'use strict'; + +mediaWiki.log.deprecate( + wikibase, + 'RepoApi', + wikibase.api.RepoApi, + 'It has been moved from wikibase.RepoApi to wikibase.api.RepoApi.' +); diff --git a/lib/resources/deprecated/wikibase.RepoApiError.js b/lib/resources/deprecated/wikibase.RepoApiError.js new file mode 100644 index 000..cdfb999 --- /dev/null +++ b/lib/resources/deprecated/wikibase.RepoApiError.js @@ -0,0 +1,13 @@ +/** + * @licence GNU GPL v2+ + * @author Adrian Lang adrian.l...@wikimedia.de + */ + +'use strict'; + +mediaWiki.log.deprecate( + wikibase, + 'RepoApiError', + wikibase.api.RepoApiError, + 'It has been moved from wikibase.RepoApiError to wikibase.api.RepoApiError.' +); diff --git a/lib/resources/wikibase.RepoApi/resources.php b/lib/resources/wikibase.RepoApi/resources.php index 4cc66c8..4403ed4 100644 --- a/lib/resources/wikibase.RepoApi/resources.php +++ b/lib/resources/wikibase.RepoApi/resources.php @@ -19,17 +19,17 @@ $modules = array( - 'wikibase.RepoApi' = $moduleTemplate + array( + 'wikibase.api.RepoApi' = $moduleTemplate + array( 'scripts' = array( 'wikibase.RepoApi.js', ), 'dependencies' = array( 'json', - 'wikibase', + 'wikibase.api.__namespace', ),
[MediaWiki-commits] [Gerrit] Introduce EntityInfoTermLookup. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Introduce EntityInfoTermLookup. .. Introduce EntityInfoTermLookup. This provides a term lookup based on data pre-fetched by EntityInfoBuilder. Bug: 72307 Change-Id: I954197e733166941b4d38e273512c04a2aea4557 --- A lib/includes/store/EntityInfoTermLookup.php M lib/includes/store/TermLookup.php A lib/tests/phpunit/store/EntityInfoTermLookupTest.php M lib/tests/phpunit/store/EntityTermLookupTest.php 4 files changed, 280 insertions(+), 2 deletions(-) Approvals: Adrian Lang: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/includes/store/EntityInfoTermLookup.php b/lib/includes/store/EntityInfoTermLookup.php new file mode 100644 index 000..bc2d677 --- /dev/null +++ b/lib/includes/store/EntityInfoTermLookup.php @@ -0,0 +1,145 @@ +?php + +namespace Wikibase\Lib\Store; + +use OutOfBoundsException; +use Wikibase\DataModel\Entity\EntityId; + +/** + * TermLookup based on plain array data structures. + * This allows term lookups to be performed directly on prefetched data, + * such as the data structured generated by EntityInfoBuilder. + * + * @see EntityInfoBuilder + * + * @since 0.5 + * + * @licence GNU GPL v2+ + * @author Daniel Kinzler + */ +class EntityInfoTermLookup implements TermLookup { + + /** +* @var array +*/ + private $entityRecords; + + /** +* @param array $entityRecords An array of entity records, as returned +* by EntityInfoBuilder::getEntityInfo. +*/ + public function __construct( array $entityRecords ) { + $this-entityRecords = $entityRecords; + } + + /** +* @param EntityId $entityId +* @param string $field +* @param string $languageCode +* +* @return string|null +* @throws OutOfBoundsException +*/ + private function getValue( EntityId $entityId, $field, $languageCode ) { + $id = $entityId-getSerialization(); + + if ( !isset( $this-entityRecords[$id] ) ) { + throw new OutOfBoundsException( 'No terms known for entity ' . $id ); + } + + if ( !isset( $this-entityRecords[$id][$field] ) ) { + throw new OutOfBoundsException( 'No ' . $field . ' known for entity ' . $id ); + } + + if ( !isset( $this-entityRecords[$id][$field][$languageCode] ) ) { + throw new OutOfBoundsException( 'No ' . $field . ' known in ' . $languageCode . ' for entity ' . $id ); + } + + $value = $this-entityRecords[$id][$field][$languageCode]; + + if ( is_array( $value ) ) { + // $value may be a record with language and value fields. + $value = $value['value']; + } + + return $value; + } + + /** +* @param EntityId $entityId +* @param string $field +* +* @return string[] +*/ + private function getLanguageToValueMapping( EntityId $entityId, $field ) { + $id = $entityId-getSerialization(); + + if ( !isset( $this-entityRecords[$id] ) ) { + return array(); + } + + if ( !isset( $this-entityRecords[$id][$field] ) ) { + return array(); + } + + $values = array(); + + foreach ( $this-entityRecords[$id][$field] as $languageCode = $value ) { + if ( is_array( $value ) ) { + // $value may be a record with language and value fields. + $value = $value['value']; + } + + $values[$languageCode] = $value; + } + + return $values; + } + + /** +* Gets the label of an Entity with the specified EntityId and language code. +* +* @param EntityId $entityId +* @param string $languageCode +* +* @return string +*/ + public function getLabel( EntityId $entityId, $languageCode ) { + return $this-getValue( $entityId, 'labels', $languageCode ); + } + + /** +* Gets all labels of an Entity with the specified EntityId. +* +* @param EntityId $entityId +* +* @return string[] +*/ + public function getLabels( EntityId $entityId ) { + return $this-getLanguageToValueMapping( $entityId, 'labels' ); + } + + /** +* Gets the description of an Entity with the specified EntityId and language code. +* +* @param EntityId $entityId +* @param string $languageCode +* +* @return string +*/ + public function
[MediaWiki-commits] [Gerrit] Fixup WikibaseItemFilterPageGenerator - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/172524 Change subject: Fixup WikibaseItemFilterPageGenerator .. Fixup WikibaseItemFilterPageGenerator Need to yield pages from the generator. Change-Id: I1cd4c144a0e575478a563d62afa0f88b50674e88 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/24/172524/1 diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 922c0a9..0cc9c9a 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1417,6 +1417,7 @@ '%s doesn\'t have a wikidata item. Skipping.' % page) continue +yield page # TODO below @deprecated_args(extension=None, number=total, repeat=None) -- To view, visit https://gerrit.wikimedia.org/r/172524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cd4c144a0e575478a563d62afa0f88b50674e88 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix pep257 - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/172525 Change subject: Fix pep257 .. Fix pep257 Change-Id: Ie37fb72d4dd9fabd154ff082509b9cb1e7eec4a1 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/25/172525/1 diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 0cc9c9a..cc37416 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1419,6 +1419,7 @@ yield page + # TODO below @deprecated_args(extension=None, number=total, repeat=None) def UnusedFilesGenerator(total=100, site=None, extension=None): -- To view, visit https://gerrit.wikimedia.org/r/172525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie37fb72d4dd9fabd154ff082509b9cb1e7eec4a1 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2014/11/11 - change (mediawiki...Wikidata)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/172526 Change subject: New Wikidata Build - 2014/11/11 .. New Wikidata Build - 2014/11/11 Change-Id: I0c71d54a00fa400d13ac5badeaedf8ba8d46be63 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/PropertySuggester/PropertySuggester.php M extensions/PropertySuggester/README.md M extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php M extensions/Wikibase/lib/i18n/he.json A extensions/Wikibase/lib/includes/store/EntityInfoTermLookup.php M extensions/Wikibase/lib/includes/store/TermLookup.php A extensions/Wikibase/lib/tests/phpunit/store/EntityInfoTermLookupTest.php M extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php M vendor/autoload.php M vendor/composer/autoload_classmap.php M vendor/composer/autoload_real.php M vendor/composer/installed.json M vendor/wikibase/data-model/RELEASE-NOTES.md M vendor/wikibase/data-model/WikibaseDataModel.php M vendor/wikibase/data-model/composer.json M vendor/wikibase/data-model/src/ByPropertyIdArray.php M vendor/wikibase/data-model/src/ByPropertyIdGrouper.php M vendor/wikibase/data-model/src/Claim/Claim.php M vendor/wikibase/data-model/src/Claim/ClaimGuid.php M vendor/wikibase/data-model/src/Claim/ClaimGuidParser.php M vendor/wikibase/data-model/src/Claim/ClaimList.php M vendor/wikibase/data-model/src/Claim/Claims.php M vendor/wikibase/data-model/src/Entity/Diff/ItemDiffer.php M vendor/wikibase/data-model/src/Entity/Diff/ItemPatcher.php M vendor/wikibase/data-model/src/Entity/Diff/PropertyDiffer.php M vendor/wikibase/data-model/src/Entity/Diff/PropertyPatcher.php M vendor/wikibase/data-model/src/Entity/DispatchingEntityIdParser.php M vendor/wikibase/data-model/src/Entity/Entity.php M vendor/wikibase/data-model/src/Entity/EntityIdValue.php M vendor/wikibase/data-model/src/Entity/InMemoryDataTypeLookup.php M vendor/wikibase/data-model/src/Entity/Item.php M vendor/wikibase/data-model/src/Entity/ItemId.php M vendor/wikibase/data-model/src/Entity/ItemIdSet.php M vendor/wikibase/data-model/src/Entity/Property.php M vendor/wikibase/data-model/src/Entity/PropertyId.php M vendor/wikibase/data-model/src/HashArray.php M vendor/wikibase/data-model/src/Internal/MapValueHasher.php M vendor/wikibase/data-model/src/Reference.php M vendor/wikibase/data-model/src/ReferenceList.php M vendor/wikibase/data-model/src/SiteLink.php M vendor/wikibase/data-model/src/SiteLinkList.php M vendor/wikibase/data-model/src/Snak/PropertyNoValueSnak.php M vendor/wikibase/data-model/src/Snak/PropertySomeValueSnak.php M vendor/wikibase/data-model/src/Snak/PropertyValueSnak.php M vendor/wikibase/data-model/src/Snak/Snak.php M vendor/wikibase/data-model/src/Snak/SnakObject.php M vendor/wikibase/data-model/src/Statement/Statement.php M vendor/wikibase/data-model/src/Statement/StatementList.php M vendor/wikibase/data-model/src/Statement/StatementListDiffer.php A vendor/wikibase/data-model/src/StatementListProvider.php M vendor/wikibase/data-model/src/Term/AliasGroup.php M vendor/wikibase/data-model/src/Term/AliasGroupList.php M vendor/wikibase/data-model/src/Term/Term.php M vendor/wikibase/data-model/src/Term/TermList.php M vendor/wikibase/data-model/tests/unit/Entity/PropertyNotFoundExceptionTest.php M vendor/wikibase/data-model/tests/unit/Statement/StatementListDifferTest.php M vendor/wikibase/data-model/tests/unit/Statement/StatementTest.php 62 files changed, 583 insertions(+), 282 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/26/172526/1 diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php index 42bbcb2..3f2723c 100644 --- a/WikibaseClient.settings.php +++ b/WikibaseClient.settings.php @@ -1,2 +1,2 @@ ?php -$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415608596; \ No newline at end of file +$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415705197; \ No newline at end of file diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php index 034be32..0326233 100644 --- a/WikibaseRepo.settings.php +++ b/WikibaseRepo.settings.php @@ -1,2 +1,2 @@ ?php -$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415608596; \ No newline at end of file +$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415705197; \ No newline at end of file diff --git a/composer.lock b/composer.lock index d169986..ef3d711 100644 --- a/composer.lock +++ b/composer.lock @@ -743,16 +743,16 @@ }, { name: propertysuggester/property-suggester, -version: 1.1.4, +version: 1.1.5, source: { type: git, url: https://github.com/Wikidata-lib/PropertySuggester.git;, -
[MediaWiki-commits] [Gerrit] Fixup WikibaseItemFilterPageGenerator - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fixup WikibaseItemFilterPageGenerator .. Fixup WikibaseItemFilterPageGenerator Need to yield pages from the generator. Change-Id: I1cd4c144a0e575478a563d62afa0f88b50674e88 --- M pywikibot/pagegenerators.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 922c0a9..cc37416 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1417,6 +1417,8 @@ '%s doesn\'t have a wikidata item. Skipping.' % page) continue +yield page + # TODO below @deprecated_args(extension=None, number=total, repeat=None) -- To view, visit https://gerrit.wikimedia.org/r/172524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cd4c144a0e575478a563d62afa0f88b50674e88 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: disable noisy check_elasticsearch - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/172527 Change subject: elasticsearch: disable noisy check_elasticsearch .. elasticsearch: disable noisy check_elasticsearch this check is based on ES cluster status != green, which is too sensitive e.g. when moving shards around the cluster goes red. its replacement checks the percentage of shards that are moving and alerts according to a threshold, which has proven much less noisy Change-Id: Iffb6f05d9b7ab024e706c96280fd3c6a2a58879f --- M modules/elasticsearch/manifests/nagios/check.pp 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/172527/1 diff --git a/modules/elasticsearch/manifests/nagios/check.pp b/modules/elasticsearch/manifests/nagios/check.pp index 3d63f9d..f16769f 100644 --- a/modules/elasticsearch/manifests/nagios/check.pp +++ b/modules/elasticsearch/manifests/nagios/check.pp @@ -4,11 +4,6 @@ # the elasticsearch::nagios::plugin class. # class elasticsearch::nagios::check { -monitor_service { 'elasticsearch': -check_command = 'check_elasticsearch', -description = 'ElasticSearch health check', -} - monitor_service { 'elasticsearch shards': check_command = 'check_elasticsearch_shards', description = 'ElasticSearch health check for shards', -- To view, visit https://gerrit.wikimedia.org/r/172527 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffb6f05d9b7ab024e706c96280fd3c6a2a58879f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2014/11/11 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 2014/11/11 .. New Wikidata Build - 2014/11/11 Change-Id: I0c71d54a00fa400d13ac5badeaedf8ba8d46be63 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/PropertySuggester/PropertySuggester.php M extensions/PropertySuggester/README.md M extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php M extensions/Wikibase/lib/i18n/he.json A extensions/Wikibase/lib/includes/store/EntityInfoTermLookup.php M extensions/Wikibase/lib/includes/store/TermLookup.php A extensions/Wikibase/lib/tests/phpunit/store/EntityInfoTermLookupTest.php M extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php M vendor/autoload.php M vendor/composer/autoload_classmap.php M vendor/composer/autoload_real.php M vendor/composer/installed.json M vendor/wikibase/data-model/RELEASE-NOTES.md M vendor/wikibase/data-model/WikibaseDataModel.php M vendor/wikibase/data-model/composer.json M vendor/wikibase/data-model/src/ByPropertyIdArray.php M vendor/wikibase/data-model/src/ByPropertyIdGrouper.php M vendor/wikibase/data-model/src/Claim/Claim.php M vendor/wikibase/data-model/src/Claim/ClaimGuid.php M vendor/wikibase/data-model/src/Claim/ClaimGuidParser.php M vendor/wikibase/data-model/src/Claim/ClaimList.php M vendor/wikibase/data-model/src/Claim/Claims.php M vendor/wikibase/data-model/src/Entity/Diff/ItemDiffer.php M vendor/wikibase/data-model/src/Entity/Diff/ItemPatcher.php M vendor/wikibase/data-model/src/Entity/Diff/PropertyDiffer.php M vendor/wikibase/data-model/src/Entity/Diff/PropertyPatcher.php M vendor/wikibase/data-model/src/Entity/DispatchingEntityIdParser.php M vendor/wikibase/data-model/src/Entity/Entity.php M vendor/wikibase/data-model/src/Entity/EntityIdValue.php M vendor/wikibase/data-model/src/Entity/InMemoryDataTypeLookup.php M vendor/wikibase/data-model/src/Entity/Item.php M vendor/wikibase/data-model/src/Entity/ItemId.php M vendor/wikibase/data-model/src/Entity/ItemIdSet.php M vendor/wikibase/data-model/src/Entity/Property.php M vendor/wikibase/data-model/src/Entity/PropertyId.php M vendor/wikibase/data-model/src/HashArray.php M vendor/wikibase/data-model/src/Internal/MapValueHasher.php M vendor/wikibase/data-model/src/Reference.php M vendor/wikibase/data-model/src/ReferenceList.php M vendor/wikibase/data-model/src/SiteLink.php M vendor/wikibase/data-model/src/SiteLinkList.php M vendor/wikibase/data-model/src/Snak/PropertyNoValueSnak.php M vendor/wikibase/data-model/src/Snak/PropertySomeValueSnak.php M vendor/wikibase/data-model/src/Snak/PropertyValueSnak.php M vendor/wikibase/data-model/src/Snak/Snak.php M vendor/wikibase/data-model/src/Snak/SnakObject.php M vendor/wikibase/data-model/src/Statement/Statement.php M vendor/wikibase/data-model/src/Statement/StatementList.php M vendor/wikibase/data-model/src/Statement/StatementListDiffer.php A vendor/wikibase/data-model/src/StatementListProvider.php M vendor/wikibase/data-model/src/Term/AliasGroup.php M vendor/wikibase/data-model/src/Term/AliasGroupList.php M vendor/wikibase/data-model/src/Term/Term.php M vendor/wikibase/data-model/src/Term/TermList.php M vendor/wikibase/data-model/tests/unit/Entity/PropertyNotFoundExceptionTest.php M vendor/wikibase/data-model/tests/unit/Statement/StatementListDifferTest.php M vendor/wikibase/data-model/tests/unit/Statement/StatementTest.php 62 files changed, 583 insertions(+), 282 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php index 42bbcb2..3f2723c 100644 --- a/WikibaseClient.settings.php +++ b/WikibaseClient.settings.php @@ -1,2 +1,2 @@ ?php -$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415608596; \ No newline at end of file +$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415705197; \ No newline at end of file diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php index 034be32..0326233 100644 --- a/WikibaseRepo.settings.php +++ b/WikibaseRepo.settings.php @@ -1,2 +1,2 @@ ?php -$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415608596; \ No newline at end of file +$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1415705197; \ No newline at end of file diff --git a/composer.lock b/composer.lock index d169986..ef3d711 100644 --- a/composer.lock +++ b/composer.lock @@ -743,16 +743,16 @@ }, { name: propertysuggester/property-suggester, -version: 1.1.4, +version: 1.1.5, source: { type: git, url: https://github.com/Wikidata-lib/PropertySuggester.git;, -reference:
[MediaWiki-commits] [Gerrit] WIP: Draft translations - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/172528 Change subject: WIP: Draft translations .. WIP: Draft translations Change-Id: If97c80f6df69dab9eac68faf7d9a4fc0097df837 --- M ContentTranslation.hooks.php M Resources.php M api/ApiContentTranslationPublish.php M i18n/en.json M i18n/qqq.json A includes/Draft.php M includes/Translation.php M modules/header/ext.cx.header.js M modules/header/styles/ext.cx.header.less A modules/publish/ext.cx.draft.js M modules/publish/ext.cx.publish.js M sql/contenttranslation.sql 12 files changed, 180 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/28/172528/1 diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php index 5be3f6a..513b5ca 100644 --- a/ContentTranslation.hooks.php +++ b/ContentTranslation.hooks.php @@ -76,6 +76,7 @@ global $wgContentTranslationServerURL, $wgContentTranslationTranslateInTarget, $wgContentTranslationExperimentalFeatures, + $wgContentTranslationDatabase, $wgContentTranslationSiteTemplates; // Temporary BC code for old configuration @@ -86,5 +87,6 @@ $vars['wgContentTranslationSiteTemplates'] = $wgContentTranslationSiteTemplates; $vars['wgContentTranslationTranslateInTarget'] = $wgContentTranslationTranslateInTarget; $vars['wgContentTranslationExperimentalFeatures'] = $wgContentTranslationExperimentalFeatures; + $vars['wgContentTranslationDatabase'] = $wgContentTranslationDatabase; } } diff --git a/Resources.php b/Resources.php index c1e8dfe..778af9c 100644 --- a/Resources.php +++ b/Resources.php @@ -100,6 +100,7 @@ 'cx-error-page-not-found', 'cx-header-new-translation', 'cx-publish-button', + 'cx-save-draft-button', 'cx-special-login-error', 'cx-translation-target-page-exists', 'login', @@ -403,6 +404,7 @@ $wgResourceModules['ext.cx.publish'] = array( 'scripts' = array( 'publish/ext.cx.publish.js', + 'publish/ext.cx.draft.js', ), 'styles' = array( 'publish/styles/ext.cx.publish.less', @@ -417,6 +419,7 @@ 'cx-publish-page-success', 'cx-publish-page-error', 'cx-publish-button-publishing', + 'cx-save-draft-saving', 'cx-publish-captcha-title', ), ) + $resourcePaths; diff --git a/api/ApiContentTranslationPublish.php b/api/ApiContentTranslationPublish.php index d43a990..f344e34 100644 --- a/api/ApiContentTranslationPublish.php +++ b/api/ApiContentTranslationPublish.php @@ -96,11 +96,18 @@ public function execute() { $params = $this-extractRequestParams(); - $title = Title::newFromText( $params['title'] ); - if ( !$title ) { - $this-dieUsageMsg( 'invalidtitle', $params['title'] ); + if( $params['status'] === 'draft' ) { + $this-saveAsDraft(); + }else { + $this-publish(); } + } + + public function publish() { + $params = $this-extractRequestParams(); + + $title = Title::newFromText( $params['title'] ); try { $wikitext = $this-convertHtmlToWikitext( $title, $params['html'] ); } catch ( MWException $e ) { @@ -142,6 +149,15 @@ $this-getResult()-addValue( null, $this-getModuleName(), $result ); } + public function saveAsDraft() { + $params = $this-extractRequestParams(); + $this-saveTranslationHistory( $params ); + $result = array( + 'result' = 'success', + ); + $this-getResult()-addValue( null, $this-getModuleName(), $result ); + } + public function saveTranslationHistory( $params ) { global $wgContentTranslationDatabase; @@ -162,7 +178,7 @@ 'targetURL' = ContentTranslation\SiteMapper::getPageURL( $params['to'], $params['title'] ), - 'status' = 'published', + 'status' = $params['status'], 'progress' = $params['progress'], // XXX Do not overwrite startedTranslator when we have draft save feature. 'startedTranslator' = $translator-getGlobalUserId(), @@ -170,6 +186,9 @@ ) ); $translation-save(); $translator-addTranslation(
[MediaWiki-commits] [Gerrit] Quote all parameters in filter query - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged. Change subject: Quote all parameters in filter query .. Quote all parameters in filter query Change-Id: I4ec023ebf075b36b5db6261ea92fa1e605a98874 --- M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smuggli: Verified; Looks good to me, approved diff --git a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php index 1476f41..5e8d445 100644 --- a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php +++ b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php @@ -429,7 +429,7 @@ $bTagNamespace = true; $aFq[] = ( BsConfig::get( 'MW::ExtendedSearch::ShowFacets' ) ) ? '{!tag=na}namespace:(' . implode( ' ', $aFqNamespaces ) . ')' - : 'namespace:(' . implode( ' ', $aFqNamespaces ) . ')'; + : 'namespace:(' . implode( ' ', $aFqNamespaces ) . ')'; } // $this-aOptions['cats'] = $this-oSearchRequest-sCat; // string, defaults to '' if 'search_cat' not set in REQUEST -- To view, visit https://gerrit.wikimedia.org/r/172241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ec023ebf075b36b5db6261ea92fa1e605a98874 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jheapdump: gdb-based heap dump for JVM - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: jheapdump: gdb-based heap dump for JVM .. jheapdump: gdb-based heap dump for JVM create a java::tools class to include this tool since it might get used elsewhere beside elasticsearch module Change-Id: I7fc40ff5a0ebd29824f9dbf76bf3d989343ce515 --- M modules/elasticsearch/manifests/packages.pp A modules/java/files/jheapdump A modules/java/manifests/tools.pp 3 files changed, 96 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Manybubbles: Looks good to me, but someone else must approve diff --git a/modules/elasticsearch/manifests/packages.pp b/modules/elasticsearch/manifests/packages.pp index 4886476..98b0dab 100644 --- a/modules/elasticsearch/manifests/packages.pp +++ b/modules/elasticsearch/manifests/packages.pp @@ -3,6 +3,8 @@ # Provisions Elasticsearch package and dependencies. # class elasticsearch::packages { +include ::java::tools + if ! defined ( Package['openjdk-7-jdk'] ) { package { 'openjdk-7-jdk': ensure = 'present', diff --git a/modules/java/files/jheapdump b/modules/java/files/jheapdump new file mode 100644 index 000..acbfeae --- /dev/null +++ b/modules/java/files/jheapdump @@ -0,0 +1,73 @@ +#!/bin/bash + +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# Copyright 2014 Filippo Giunchedi fgiunch...@wikimedia.org +# Copyright 2014 Wikimedia Foundation + +set -e +set -u + +pid=${1:-} +path=${2:-} + +function usage_exit() { + echo usage: $0 PID BASE_NAME + echo capture a core from PID into BASE_NAME.core.PID + echo and extract java heap dump into BASE_NAME.hprof.PID + exit 1 +} + +if [ -z $pid -o -z $path ]; then + usage_exit +fi + +jmap=${JMAP:-$(command -vp jmap)} +gcore=${GCORE:-$(command -vp gcore)} +java=${JAVA:-$(command -vp java)} + +if [ -z $jmap -o -z $gcore -o -z $java ]; then + echo jmap or gcore or java not found + usage_exit +fi + +if [ -d $path ]; then + echo BASE_NAME can't be a directory + usage_exit +fi + +core_path=${path}.core.${pid} +heap_path=${path}.hprof.${pid} +jmap_options=-dump:format=b,file=${heap_path} +# remove trailing .${pid} +gcore_options=-o ${core_path%*.${pid}} + +# XXX check disk space +if [ ! -e $core_path ]; then + echo dumping core from ${pid} into ${core_path} + echo WARNING: this file can get very big! + echo make sure there is enough disk space available + sudo ${gcore} ${gcore_options} ${pid} +fi + +if [ ! -e $heap_path ]; then + echo writing heap profile to ${heap_path} + sudo ${jmap} ${jmap_options} ${java} ${core_path} +fi + +echo done. + +echo NOTE: the core file at ${core_path}, if unused remove with: +echo sudo rm ${core_path} diff --git a/modules/java/manifests/tools.pp b/modules/java/manifests/tools.pp new file mode 100644 index 000..61c6273 --- /dev/null +++ b/modules/java/manifests/tools.pp @@ -0,0 +1,21 @@ +# == Class: java::tools +# +# This class aims at providing convenience tools to be used on systems where +# java (JRE or JDK) is installed. + +class java::tools { +if ! defined ( Package['gdb'] ) { +package { 'gdb': +ensure = present +} +} + +# NOTE jmap is used, thus requiring a jdk to be installed +file { '/usr/local/bin/jheapdump': +ensure = file, +owner = root, +group = root, +mode= '0555', +source = 'puppet:///modules/java/jheapdump', +} +} -- To view, visit https://gerrit.wikimedia.org/r/170996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fc40ff5a0ebd29824f9dbf76bf3d989343ce515 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dashboard: do not display the header bar with publish button - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Dashboard: do not display the header bar with publish button .. Dashboard: do not display the header bar with publish button Change-Id: I6e152f89644ef72c7f1b53d704931972be1adb07 --- M modules/dashboard/styles/ext.cx.dashboard.less 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dashboard/styles/ext.cx.dashboard.less b/modules/dashboard/styles/ext.cx.dashboard.less index 4a6c245..d2e39ba 100644 --- a/modules/dashboard/styles/ext.cx.dashboard.less +++ b/modules/dashboard/styles/ext.cx.dashboard.less @@ -32,3 +32,8 @@ padding: 0 20px; } } + +// Do not display the header bar containing the link to dashboard in dashboard page. +.cx-header__bar { + display: none; +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/172478 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e152f89644ef72c7f1b53d704931972be1adb07 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Instrument search, hamburger and notification clicks - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Instrument search, hamburger and notification clicks .. Instrument search, hamburger and notification clicks Change-Id: Id78ac96d9940b179f1bcd5d755fa25e86c33cff3 --- M includes/Resources.php M javascripts/loggingSchemas/MobileWebClickTracking.js M javascripts/modules/notifications/notifications.js M javascripts/modules/search/search.js 4 files changed, 21 insertions(+), 12 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 272be02..04121ab 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -489,6 +489,7 @@ 'mobile.pagelist.scripts', 'mobile.overlays', 'mobile.templates', + 'mobile.loggingSchemas', ), 'styles' = array( 'less/modules/search/SearchOverlay.less', diff --git a/javascripts/loggingSchemas/MobileWebClickTracking.js b/javascripts/loggingSchemas/MobileWebClickTracking.js index 23c977d..5a8e6f7 100644 --- a/javascripts/loggingSchemas/MobileWebClickTracking.js +++ b/javascripts/loggingSchemas/MobileWebClickTracking.js @@ -52,16 +52,20 @@ return $( this ).children().length === 0; } ); - hijackLink( '#mw-mf-page-left .icon-home', 'hamburger-home' ); - hijackLink( '#mw-mf-page-left .icon-random', 'hamburger-random' ); - hijackLink( '#mw-mf-page-left .icon-nearby', 'hamburger-nearby' ); - hijackLink( '#mw-mf-page-left .icon-watchlist', 'hamburger-watchlist' ); - hijackLink( '#mw-mf-page-left .icon-settings', 'hamburger-settings' ); - hijackLink( '#mw-mf-page-left .icon-uploads', 'hamburger-uploads' ); - hijackLink( '#mw-mf-page-left .icon-profile', 'hamburger-profile' ); - hijackLink( '#mw-mf-page-left .icon-anon', 'hamburger-login' ); - hijackLink( '#mw-mf-page-left .icon-secondary-logout', 'hamburger-logout' ); - hijackLink( $( '#mw-mf-last-modified a span' ).parent(), 'lastmodified-history' ); - hijackLink( $profileLink, 'lastmodified-profile' ); + $( '#mw-mf-main-menu-button' ).on( 'click', function () { + log( 'hamburger' ); + } ); + + hijackLink( '#mw-mf-page-left .icon-home', 'hamburger-home' ); + hijackLink( '#mw-mf-page-left .icon-random', 'hamburger-random' ); + hijackLink( '#mw-mf-page-left .icon-nearby', 'hamburger-nearby' ); + hijackLink( '#mw-mf-page-left .icon-watchlist', 'hamburger-watchlist' ); + hijackLink( '#mw-mf-page-left .icon-settings', 'hamburger-settings' ); + hijackLink( '#mw-mf-page-left .icon-uploads', 'hamburger-uploads' ); + hijackLink( '#mw-mf-page-left .icon-profile', 'hamburger-profile' ); + hijackLink( '#mw-mf-page-left .icon-anon', 'hamburger-login' ); + hijackLink( '#mw-mf-page-left .icon-secondary-logout', 'hamburger-logout' ); + hijackLink( $( '#mw-mf-last-modified a span' ).parent(), 'lastmodified-history' ); + hijackLink( $profileLink, 'lastmodified-profile' ); } ); } )( mw.mobileFrontend, jQuery ); diff --git a/javascripts/modules/notifications/notifications.js b/javascripts/modules/notifications/notifications.js index 98b753f..c4bdf59 100644 --- a/javascripts/modules/notifications/notifications.js +++ b/javascripts/modules/notifications/notifications.js @@ -4,6 +4,7 @@ */ ( function ( M, $ ) { var Icon = M.require( 'Icon' ), + schema = M.require( 'loggingSchemas/MobileWebClickTracking' ), mainmenu = M.require( 'mainmenu' ), $btn = $( '#secondary-button.user-button' ); @@ -34,6 +35,7 @@ // than linking to Special:Notifications. $( function () { $btn.on( 'click', function () { + schema.log( 'notifications' ); M.router.navigate( '#/notifications' ); // Important that we also prevent propagation to avoid interference with events that may be // binded on #mw-mf-page-center that close overlay diff --git a/javascripts/modules/search/search.js b/javascripts/modules/search/search.js index 80ef11b..fc2b6fe 100644 --- a/javascripts/modules/search/search.js +++ b/javascripts/modules/search/search.js @@ -1,6 +1,7 @@ ( function ( M, $ ) { - var SearchOverlay = M.require( 'modules/search/SearchOverlay' ); + var
[MediaWiki-commits] [Gerrit] testing - change (mediawiki...ArticleFeedbackv5)
Lubaochuan has uploaded a new change for review. https://gerrit.wikimedia.org/r/172529 Change subject: testing .. testing Change-Id: I20c1a513944c8229351f012c914c23c6c7df6179 --- M Gemfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/29/172529/1 diff --git a/Gemfile b/Gemfile index d6fba3b..7d04125 100755 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ #ruby=ruby-2.1.1 #ruby-gemset=browsertests + source https://rubygems.org; gem mediawiki_selenium -- To view, visit https://gerrit.wikimedia.org/r/172529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20c1a513944c8229351f012c914c23c6c7df6179 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Lubaochuan lubaoch...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet: get rid of the nagios_group global variable - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/172531 Change subject: puppet: get rid of the nagios_group global variable .. puppet: get rid of the nagios_group global variable Change-Id: I8fbef8279d4b7d00997086a2851cb65dcd898823 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- A hieradata/hosts/analytics1004.yaml A hieradata/hosts/analytics1009.yaml A hieradata/hosts/analytics1010.yaml A hieradata/hosts/analytics1011.yaml A hieradata/hosts/analytics1012.yaml A hieradata/hosts/analytics1013.yaml A hieradata/hosts/analytics1014.yaml A hieradata/hosts/analytics1015.yaml A hieradata/hosts/analytics1016.yaml A hieradata/hosts/analytics1017.yaml A hieradata/hosts/analytics1018.yaml A hieradata/hosts/analytics1019.yaml A hieradata/hosts/analytics1020.yaml A hieradata/hosts/analytics1021.yaml A hieradata/hosts/analytics1022.yaml A hieradata/hosts/analytics1023.yaml A hieradata/hosts/analytics1024.yaml A hieradata/hosts/analytics1025.yaml A hieradata/hosts/analytics1026.yaml A hieradata/hosts/analytics1027.yaml A hieradata/hosts/analytics1028.yaml A hieradata/hosts/analytics1029.yaml A hieradata/hosts/analytics1030.yaml A hieradata/hosts/analytics1031.yaml A hieradata/hosts/analytics1032.yaml A hieradata/hosts/analytics1033.yaml A hieradata/hosts/analytics1034.yaml A hieradata/hosts/analytics1035.yaml A hieradata/hosts/analytics1036.yaml A hieradata/hosts/analytics1037.yaml A hieradata/hosts/analytics1038.yaml A hieradata/hosts/analytics1039.yaml A hieradata/hosts/analytics1040.yaml A hieradata/hosts/analytics1041.yaml A hieradata/hosts/ms-be1001.yaml A hieradata/hosts/ms-be1002.yaml A hieradata/hosts/ms-be1003.yaml A hieradata/hosts/ms-be1004.yaml A hieradata/hosts/ms-be1005.yaml A hieradata/hosts/ms-be1006.yaml A hieradata/hosts/ms-be1007.yaml A hieradata/hosts/ms-be1008.yaml A hieradata/hosts/ms-be1009.yaml A hieradata/hosts/ms-be1010.yaml A hieradata/hosts/ms-be1011.yaml A hieradata/hosts/ms-be1012.yaml A hieradata/hosts/ms-be1013.yaml A hieradata/hosts/ms-be1014.yaml A hieradata/hosts/ms-be1015.yaml A hieradata/hosts/ms-be2001.yaml A hieradata/hosts/ms-be2002.yaml A hieradata/hosts/ms-be2003.yaml A hieradata/hosts/ms-be2004.yaml A hieradata/hosts/ms-be2005.yaml A hieradata/hosts/ms-be2006.yaml A hieradata/hosts/ms-be2007.yaml A hieradata/hosts/ms-be2008.yaml A hieradata/hosts/ms-be2009.yaml A hieradata/hosts/ms-be2010.yaml A hieradata/hosts/ms-be2011.yaml A hieradata/hosts/ms-be2012.yaml A hieradata/hosts/ms-be3001.yaml A hieradata/hosts/ms-be3002.yaml A hieradata/hosts/ms-be3003.yaml A hieradata/hosts/ms-be3004.yaml A hieradata/hosts/ms-fe1001.yaml A hieradata/hosts/ms-fe1002.yaml A hieradata/hosts/ms-fe1003.yaml A hieradata/hosts/ms-fe1004.yaml A hieradata/hosts/ms-fe3001.yaml A hieradata/hosts/ms-fe3002.yaml A hieradata/hosts/search1001.yaml A hieradata/hosts/search1002.yaml A hieradata/hosts/search1003.yaml A hieradata/hosts/search1004.yaml A hieradata/hosts/search1005.yaml A hieradata/hosts/search1006.yaml A hieradata/hosts/search1007.yaml A hieradata/hosts/search1008.yaml A hieradata/hosts/search1009.yaml A hieradata/hosts/search1010.yaml A hieradata/hosts/search1011.yaml A hieradata/hosts/search1012.yaml A hieradata/hosts/search1013.yaml A hieradata/hosts/search1014.yaml A hieradata/hosts/search1015.yaml A hieradata/hosts/search1016.yaml A hieradata/hosts/search1017.yaml A hieradata/hosts/search1018.yaml A hieradata/hosts/search1019.yaml A hieradata/hosts/search1020.yaml A hieradata/hosts/search1021.yaml A hieradata/hosts/search1022.yaml A hieradata/hosts/search1023.yaml A hieradata/hosts/search1024.yaml A hieradata/hosts/searchidx1001.yaml A hieradata/mainrole/analytics_hadoop_master.yml A hieradata/mainrole/analytics_hadoop_standby.yaml A hieradata/mainrole/analytics_hadoop_worker.yaml A hieradata/mainrole/analytics_kafka.yaml A hieradata/mainrole/analytics_zookeeper.yaml A hieradata/mainrole/swift_storage.yaml M manifests/nagios.pp M manifests/site.pp M modules/monitoring/manifests/host.pp 105 files changed, 189 insertions(+), 108 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/172531/1 diff --git a/hieradata/hosts/analytics1004.yaml b/hieradata/hosts/analytics1004.yaml new file mode 100644 index 000..4e4c788 --- /dev/null +++ b/hieradata/hosts/analytics1004.yaml @@ -0,0 +1 @@ +mainrole: analytics_hadoop_standby diff --git a/hieradata/hosts/analytics1009.yaml b/hieradata/hosts/analytics1009.yaml new file mode 100644 index 000..2501ef9 --- /dev/null +++ b/hieradata/hosts/analytics1009.yaml @@ -0,0 +1,2 @@ +nagios_group: analytics_eqiad +cluster: analytics diff --git a/hieradata/hosts/analytics1010.yaml b/hieradata/hosts/analytics1010.yaml new file mode 100644 index 000..2159967 --- /dev/null +++ b/hieradata/hosts/analytics1010.yaml @@ -0,0 +1 @@ +mainrole: analytics_hadoop_master diff --git
[MediaWiki-commits] [Gerrit] monitoring: move monitor_host to monitoring::host - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/172530 Change subject: monitoring: move monitor_host to monitoring::host .. monitoring: move monitor_host to monitoring::host Change-Id: I362dac76eb4d2d58d91c138a2b708396888ad721 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M manifests/dns.pp M manifests/facilities.pp M manifests/nagios.pp M manifests/network.pp M modules/authdns/manifests/monitoring/global.pp M modules/base/manifests/monitoring/host.pp M modules/icinga/manifests/gsbmonitoring.pp M modules/icinga/manifests/monitor/wikidata.pp M modules/icinga/manifests/naggen.pp M modules/lvs/manifests/init.pp A modules/monitoring/manifests/host.pp 11 files changed, 87 insertions(+), 86 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/172530/1 diff --git a/manifests/dns.pp b/manifests/dns.pp index 3931eef..1c9a3ea 100644 --- a/manifests/dns.pp +++ b/manifests/dns.pp @@ -43,7 +43,7 @@ } # Monitoring -monitor_host { $dns_auth_soa_name: +monitoring::host { $dns_auth_soa_name: ip_address = $dns_auth_ipaddress, } monitor_service { 'auth dns': @@ -114,7 +114,7 @@ define monitor() { # Monitoring -monitor_host { $title: +monitoring::host { $title: ip_address = $title, } monitor_service { recursive dns ${title}: diff --git a/manifests/facilities.pp b/manifests/facilities.pp index 373b16d..2a1e07c 100644 --- a/manifests/facilities.pp +++ b/manifests/facilities.pp @@ -45,7 +45,7 @@ $breaker = '30', $redundant= true ) { -@monitor_host { $title: +@monitoring::host { $title: ip_address = $ip, group = 'pdus', } diff --git a/manifests/nagios.pp b/manifests/nagios.pp index f7262e1..5e2fdc8 100644 --- a/manifests/nagios.pp +++ b/manifests/nagios.pp @@ -4,66 +4,6 @@ $ganglia_url = 'http://ganglia.wikimedia.org' -define monitor_host( -$ip_address= $::ipaddress, -$group = $nagios_group, -$ensure= present, -$critical = 'false', -$contact_group = 'admins' -) -{ -if ! $ip_address { -fail(Parameter $ip_address not defined!) -} - -# Determine the hostgroup: -# If defined in the declaration of resource, we use it; -# If not, adopt the standard format -$hostgroup = $group ? { -/.+/= $group, -default = $cluster ? { -default = ${cluster}_${::site} -} -} - -# Export the nagios host instance -@@nagios_host { $title: -ensure = $ensure, -target = ${::nagios_config_dir}/puppet_hosts.cfg, -host_name= $title, -address = $ip_address, -hostgroups = $hostgroup, -check_command= 'check_ping!500,20%!2000,100%', -check_period = '24x7', -max_check_attempts = 2, -contact_groups = $critical ? { -'true' = 'admins,sms', -default = $contact_group, -}, -notification_interval = 0, -notification_period = '24x7', -notification_options = 'd,u,r,f', -} - -if $title == $::hostname { -$image = $::operatingsystem ? { -'Ubuntu' = 'ubuntu', -default = 'linux40' -} - -# Couple it with some hostextinfo -@@nagios_hostextinfo { $title: -ensure = $ensure, -target = ${::nagios_config_dir}/puppet_hostextinfo.cfg, -host_name = $title, -notes = $title, -icon_image = ${image}.png, -vrml_image = ${image}.png, -statusmap_image = ${image}.gd2, -} -} -} - define monitor_service( $description, $check_command, diff --git a/manifests/network.pp b/manifests/network.pp index da2e937..2b1aa12 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -283,7 +283,7 @@ ### ESAMS ### # cr1-esams -@monitor_host { 'cr1-esams': +@monitoring::host { 'cr1-esams': ip_address = '91.198.174.245', group = 'routers', } @@ -308,7 +308,7 @@ #} # cr2-knams -@monitor_host { 'cr2-knams': +@monitoring::host { 'cr2-knams': ip_address = '91.198.174.246', group = 'routers', } @@ -326,7 +326,7 @@ } # mr1-esams -@monitor_host { 'mr1-esams': +@monitoring::host { 'mr1-esams': ip_address = '91.198.174.247', group = 'routers' } @@ -340,7 +340,7 @@ ### EQIAD ### # cr1-eqiad -@monitor_host { 'cr1-eqiad': +@monitoring::host { 'cr1-eqiad': ip_address = '208.80.154.196', group = 'routers', } @@ -358,7 +358,7 @@ } # cr2-eqiad -
[MediaWiki-commits] [Gerrit] Disable TestTextfilePageGenerator on Wiktionary - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/172532 Change subject: Disable TestTextfilePageGenerator on Wiktionary .. Disable TestTextfilePageGenerator on Wiktionary tests.utils.DrySite returns 'case-sensitive' in case() only if the family name is wiktionary. The test logic in TestTextfilePageGenerator is incompatible with a 'case-sensitive' site. Change-Id: Icf58120a16bde720f2875f22370a23b55b96bb32 --- M tests/pagegenerators_tests.py 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/32/172532/1 diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 0ce3bba..88365ae 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -252,6 +252,13 @@ expected_titles = ('File', 'Bracket', 'MediaWiki:Test', 'Under score') +@classmethod +def setUpClass(cls): +super(TestTextfilePageGenerator, cls).setUpClass() +if cls.site.case() == 'case-sensitive': +raise unittest.SkipTest( +'Test incompatible with case sensitive site') + def test_brackets(self): filename = os.path.join(_data_dir, 'pagelist-brackets.txt') site = self.get_site() -- To view, visit https://gerrit.wikimedia.org/r/172532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf58120a16bde720f2875f22370a23b55b96bb32 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: report statsd data to localhost - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: swift: report statsd data to localhost .. swift: report statsd data to localhost swift statsd traffic seems to account for = 50% of the statsd traffic, thus driving txstatsd cpu usage very high on tungsten. A more reasonable solution is to have statsd locally and let txstatsd push it to tungsten. NOTE: this works only because the swift metrics are per-machine, and thus don't need to get aggregated across machines in a central statsd Change-Id: Ia95564b1b2950d16d44c347e1a612ef5b079822c --- M hieradata/codfw.yaml M manifests/role/swift.pp M modules/swift_new/manifests/params.pp 3 files changed, 19 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml index 72807ef..3468965 100644 --- a/hieradata/codfw.yaml +++ b/hieradata/codfw.yaml @@ -29,9 +29,9 @@ #search_backup: key swift_new::hash_path_suffix: 'de4227064232ed08' -swift_new::storage::statsd_host: 'statsd.eqiad.wmnet' +swift_new::storage::statsd_host: 'localhost' swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet' -swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet' +swift_new::proxy::statsd_host: 'localhost' swift_new::proxy::backend_url_format: 'sitelang' swift_new::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet' swift_new::proxy::dispersion_account: 'dispersion' diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp index 8a94de4..55e315b 100644 --- a/manifests/role/swift.pp +++ b/manifests/role/swift.pp @@ -358,6 +358,14 @@ memcached_port = '11211', } +class { '::txstatsd': +settings = { +statsd = { +'carbon-cache-host' = ${::swift_new::params::graphite_host}, +}, +}, +} + monitor_service { 'swift-http-frontend': description = 'Swift HTTP frontend', check_command = check_http_url!${swift_check_http_host}!/monitoring/frontend, @@ -385,6 +393,14 @@ include ::swift_new::container_sync include ::swift_new::storage::monitoring +class { '::txstatsd': +settings = { +statsd = { +'carbon-cache-host' = ${::swift_new::params::graphite_host}, +}, +}, +} + $all_drives = hiera('swift_storage_drives') swift_new::init_device { $all_drives: diff --git a/modules/swift_new/manifests/params.pp b/modules/swift_new/manifests/params.pp index a946632..c41c6f7 100644 --- a/modules/swift_new/manifests/params.pp +++ b/modules/swift_new/manifests/params.pp @@ -4,6 +4,7 @@ $account_keys = {}, $replication_accounts = {}, $replication_keys = {}, + $graphite_host = 'graphite-in.eqiad.wmnet', ) { # Noop class } -- To view, visit https://gerrit.wikimedia.org/r/171547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia95564b1b2950d16d44c347e1a612ef5b079822c Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sum stats - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/172533 Change subject: Fix sum stats .. Fix sum stats Add tests Change-Id: I33b905c250eef000fe88648bb65eee726f4e5395 --- M src/__phutil_library_map__.php A src/__tests__/BurndownDataDateTestCase.php M src/__tests__/SprintQueryTestCase.php A src/__tests__/xdebug_code_coverage.php M src/storage/SprintBuildStats.php M src/util/BurndownDataDate.php 6 files changed, 69 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint refs/changes/33/172533/1 diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index b79e59d..b9da3d2 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -13,6 +13,7 @@ 'BurndownApplication' = 'application/BurndownApplication.php', 'BurndownController' = 'controller/BurndownController.php', 'BurndownDataDate' = 'util/BurndownDataDate.php', +'BurndownDataDateTestCase' = '__tests__/BurndownDataDateTestCase.php', 'BurndownDataView' = 'view/BurndownDataView.php', 'BurndownDataViewController' = 'controller/BurndownDataViewController.php', 'BurndownException' = 'exception/BurndownException.php', @@ -43,6 +44,7 @@ 'BurndownActionMenuEventListener' = 'PhabricatorEventListener', 'BurndownApplication' = 'PhabricatorApplication', 'BurndownController' = 'PhabricatorController', +'BurndownDataDateTestCase' = 'SprintTestCase', 'BurndownDataView' = 'SprintView', 'BurndownDataViewController' = 'BurndownController', 'BurndownException' = 'Exception', diff --git a/src/__tests__/BurndownDataDateTestCase.php b/src/__tests__/BurndownDataDateTestCase.php new file mode 100644 index 000..36e4ddb --- /dev/null +++ b/src/__tests__/BurndownDataDateTestCase.php @@ -0,0 +1,47 @@ +?php +final class BurndownDataDateTestCase extends SprintTestCase { + + public function testSumPointsTotal() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setPointsTotal('14'); +$current = id(new BurndownDataDate('tuesday')); +$current-setPointsTotal('4'); +$total = $date-sumPointsTotal($current, $previous); +$this-assertEqual(18, $total); + } + + public function testSumTasksTotal() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setTasksTotal('5'); +$current = id(new BurndownDataDate('tuesday')); +$current-setTasksTotal('8'); +$total = $date-sumTasksTotal($current, $previous); +$this-assertEqual(13, $total); + } + + public function testSumTasksRemaining() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setTasksRemaining('5'); +var_dump($previous); +$current = id(new BurndownDataDate('tuesday')); +for ($i=0;$i2; $i++) { + $current-setTasksClosedToday(); +} + // var_dump($current-getTasksClosedToday()); +$total = $date-sumTasksRemaining($current, $previous); +$this-assertEqual(3, $total); + } + + public function testSumPointsRemaining() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setPointsRemaining('5'); +$current = id(new BurndownDataDate('tuesday')); +$current-setPointsClosedToday('2'); +$total = $date-sumPointsRemaining($current, $previous); +$this-assertEqual(3, $total); + } +} \ No newline at end of file diff --git a/src/__tests__/SprintQueryTestCase.php b/src/__tests__/SprintQueryTestCase.php index 5286443..9fd839a 100644 --- a/src/__tests__/SprintQueryTestCase.php +++ b/src/__tests__/SprintQueryTestCase.php @@ -27,14 +27,14 @@ /** * @depends testRequestSetUser */ - public function testGetViewerHandles() - { -$r = new AphrontRequest('example.com', '/'); -$r-setUser($this-generateNewTestUser()); -$q = new SprintQuery(); -$phids = $this-PHIDProvider(); -$handle = $q-getViewerHandles($r, $phids); -$this-assertInstanceof('PhabricatorObjectHandle', $handle); - } +// public function testGetViewerHandles() +// { +//$r = new AphrontRequest('example.com', '/'); +//$r-setUser($this-generateNewTestUser()); +//$q = new SprintQuery(); +//$phids = $this-PHIDProvider(); +//$handle = $q-getViewerHandles($r, $phids); +//$this-assertInstanceof('PhabricatorObjectHandle', $handle); +// } } \ No newline at end of file diff --git a/src/__tests__/xdebug_code_coverage.php b/src/__tests__/xdebug_code_coverage.php new file mode 100644 index 000..ad1d089 --- /dev/null +++ b/src/__tests__/xdebug_code_coverage.php @@ -0,0 +1,7 @@ +?php +var_dump(xdebug_code_coverage_started()); + +xdebug_start_code_coverage(); + +var_dump(xdebug_code_coverage_started()); +? diff --git
[MediaWiki-commits] [Gerrit] Add timezone aware dates - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged. Change subject: Add timezone aware dates .. Add timezone aware dates Change-Id: Ifda10f566590847948df30dfc7e1e895d0b83d5a --- M src/storage/SprintBuildStats.php M src/view/BurndownDataView.php 2 files changed, 16 insertions(+), 13 deletions(-) Approvals: Christopher Johnson (WMDE): Verified; Looks good to me, approved diff --git a/src/storage/SprintBuildStats.php b/src/storage/SprintBuildStats.php index 5209514..d4ddb82 100644 --- a/src/storage/SprintBuildStats.php +++ b/src/storage/SprintBuildStats.php @@ -1,13 +1,19 @@ ?php final class SprintBuildStats { + private $timezone; -public function buildDateArray($start, $end, $timezone) { + public function setTimezone ($viewer) { +$this-timezone = new DateTimeZone($viewer-getTimezoneIdentifier()); +return $this-timezone; + } + + public function buildDateArray($start, $end, $timezone) { $period = new DatePeriod( -id(new DateTime(@ . $start, $timezone))-setTime(8, 0), +id(new DateTime(@ . $start))-setTime(2, 0)-setTimezone($timezone), new DateInterval('P1D'), // 1 day interval -id(new DateTime(@ . $end, $timezone))-modify('+1 day')-setTime(17, 0)); +id(new DateTime(@ . $end))-modify('+1 day')-setTime(17, 0)-setTimezone($timezone)); $dates = array('before' =$this-getBurndownDate('Before Sprint')); @@ -20,8 +26,8 @@ return $dates; } - public function buildTimeSeries($start, $end, $timezone) { -$timeseries = array_keys($this-buildDateArray ($start, $end, $timezone)); + public function buildTimeSeries($start, $end) { +$timeseries = array_keys($this-buildDateArray ($start, $end, $this-timezone)); return $timeseries; } @@ -93,7 +99,8 @@ $future = false; foreach ($dates as $key = $date) { if ($key != 'before' AND $key != 'after') { -$future = new DateTime($date-getDate()) id(new DateTime())-setTime(0, 0); +$now = id(new DateTime('now', $this-timezone)); +$future = new DateTime($date-getDate(), $this-timezone) $now; } $data[] = array( $future ? null : $date-getPointsTotal(), diff --git a/src/view/BurndownDataView.php b/src/view/BurndownDataView.php index 8a2888d..452339c 100644 --- a/src/view/BurndownDataView.php +++ b/src/view/BurndownDataView.php @@ -31,11 +31,6 @@ return $this; } - public function setTimeZone ($viewer) { -$timezone = new DateTimeZone($viewer-getTimezoneIdentifier()); -return $timezone; - } - public function render() { $chart = $this-buildC3Chart(); $tasks_table = $this-buildTasksTable(); @@ -53,8 +48,9 @@ $start = $query-getStartDate($aux_fields); $end = $query-getEndDate($aux_fields); $stats = id(new SprintBuildStats()); -$dates = $stats-buildDateArray($start, $end, $this-setTimeZone($this-viewer)); -$this-timeseries = $stats-buildTimeSeries($start, $end, $this-setTimeZone($this-viewer)); +$timezone = $stats-setTimezone($this-viewer); +$dates = $stats-buildDateArray($start, $end, $timezone); +$this-timeseries = $stats-buildTimeSeries($start, $end); $tasks = $query-getTasks(); $query-checkNull($start, $end, $tasks); -- To view, visit https://gerrit.wikimedia.org/r/172481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifda10f566590847948df30dfc7e1e895d0b83d5a Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix stat math - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged. Change subject: Fix stat math .. Fix stat math Change-Id: Ie062175dc3e6a5c869f6c71e5821a426f41ce4e6 --- M src/query/SprintQuery.php M src/storage/SprintBuildStats.php M src/storage/SprintTransaction.php 3 files changed, 7 insertions(+), 10 deletions(-) Approvals: Christopher Johnson (WMDE): Verified; Looks good to me, approved diff --git a/src/query/SprintQuery.php b/src/query/SprintQuery.php index 510340f..7e93e4d 100644 --- a/src/query/SprintQuery.php +++ b/src/query/SprintQuery.php @@ -118,12 +118,12 @@ } public function getEdges ($tasks) { - // Load all edges of depends and depended on tasks $edges = id(new PhabricatorEdgeQuery()) -withSourcePHIDs(array_keys($tasks)) -withEdgeTypes(array(PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK, PhabricatorEdgeConfig::TYPE_TASK_DEPENDED_ON_BY_TASK)) -execute(); +return $edges; } public function getEvents($xactions) { diff --git a/src/storage/SprintBuildStats.php b/src/storage/SprintBuildStats.php index c412391..5209514 100644 --- a/src/storage/SprintBuildStats.php +++ b/src/storage/SprintBuildStats.php @@ -2,9 +2,6 @@ final class SprintBuildStats { - private $task_open_status_sum; - private $task_closed_status_sum; - public function buildDateArray($start, $end, $timezone) { $period = new DatePeriod( diff --git a/src/storage/SprintTransaction.php b/src/storage/SprintTransaction.php index d4299ce..9d69a32 100644 --- a/src/storage/SprintTransaction.php +++ b/src/storage/SprintTransaction.php @@ -37,7 +37,7 @@ case task-add: // A task was added to the sprint $this-AddTasksToday($date, $dates); - $this-AddPointsToday($date, $task_phid, $dates); +// $this-AddPointsToday($date, $task_phid, $dates); $this-AddTaskInSprint($task_phid); break; case task-remove: @@ -108,7 +108,7 @@ } private function ClosePointsToday($date, $task_phid, $dates) { -$dates[$date]-setPointsClosedToday($this-task_points[$task_phid]); + $dates[$date]-setPointsClosedToday($this-task_points[$task_phid]); return $dates; } @@ -144,13 +144,13 @@ if (isset($this-task_in_sprint[$task_phid])) { // Adjust points for that day - $task_points = $xaction-getNewValue() - $xaction-getOldValue(); - $dates[$date]-setPointsAddedToday($task_points); + $this-task_points[$task_phid] = $xaction-getNewValue() - $xaction-getOldValue(); + $dates[$date]-setPointsAddedToday($this-task_points[$task_phid]); // If the task is closed, adjust completed points as well if (isset($this-task_statuses[$task_phid]) $this-task_statuses[$task_phid] == 'closed') { -$task_points = $xaction-getNewValue() - $xaction-getOldValue(); -$dates[$date]-setPointsClosedToday($task_points); +$this-task_points[$task_phid] = $xaction-getNewValue() - $xaction-getOldValue(); +$dates[$date]-setPointsClosedToday($this-task_points[$task_phid]); } } return $dates; -- To view, visit https://gerrit.wikimedia.org/r/172477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie062175dc3e6a5c869f6c71e5821a426f41ce4e6 Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sum stats - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged. Change subject: Fix sum stats .. Fix sum stats Add tests Change-Id: I33b905c250eef000fe88648bb65eee726f4e5395 --- M src/__phutil_library_map__.php A src/__tests__/BurndownDataDateTestCase.php M src/__tests__/SprintQueryTestCase.php M src/storage/SprintBuildStats.php M src/util/BurndownDataDate.php 5 files changed, 62 insertions(+), 13 deletions(-) Approvals: Christopher Johnson (WMDE): Verified; Looks good to me, approved diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index b79e59d..b9da3d2 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -13,6 +13,7 @@ 'BurndownApplication' = 'application/BurndownApplication.php', 'BurndownController' = 'controller/BurndownController.php', 'BurndownDataDate' = 'util/BurndownDataDate.php', +'BurndownDataDateTestCase' = '__tests__/BurndownDataDateTestCase.php', 'BurndownDataView' = 'view/BurndownDataView.php', 'BurndownDataViewController' = 'controller/BurndownDataViewController.php', 'BurndownException' = 'exception/BurndownException.php', @@ -43,6 +44,7 @@ 'BurndownActionMenuEventListener' = 'PhabricatorEventListener', 'BurndownApplication' = 'PhabricatorApplication', 'BurndownController' = 'PhabricatorController', +'BurndownDataDateTestCase' = 'SprintTestCase', 'BurndownDataView' = 'SprintView', 'BurndownDataViewController' = 'BurndownController', 'BurndownException' = 'Exception', diff --git a/src/__tests__/BurndownDataDateTestCase.php b/src/__tests__/BurndownDataDateTestCase.php new file mode 100644 index 000..36e4ddb --- /dev/null +++ b/src/__tests__/BurndownDataDateTestCase.php @@ -0,0 +1,47 @@ +?php +final class BurndownDataDateTestCase extends SprintTestCase { + + public function testSumPointsTotal() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setPointsTotal('14'); +$current = id(new BurndownDataDate('tuesday')); +$current-setPointsTotal('4'); +$total = $date-sumPointsTotal($current, $previous); +$this-assertEqual(18, $total); + } + + public function testSumTasksTotal() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setTasksTotal('5'); +$current = id(new BurndownDataDate('tuesday')); +$current-setTasksTotal('8'); +$total = $date-sumTasksTotal($current, $previous); +$this-assertEqual(13, $total); + } + + public function testSumTasksRemaining() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setTasksRemaining('5'); +var_dump($previous); +$current = id(new BurndownDataDate('tuesday')); +for ($i=0;$i2; $i++) { + $current-setTasksClosedToday(); +} + // var_dump($current-getTasksClosedToday()); +$total = $date-sumTasksRemaining($current, $previous); +$this-assertEqual(3, $total); + } + + public function testSumPointsRemaining() { +$date = new BurndownDataDate('test date'); +$previous = id(new BurndownDataDate('monday')); +$previous-setPointsRemaining('5'); +$current = id(new BurndownDataDate('tuesday')); +$current-setPointsClosedToday('2'); +$total = $date-sumPointsRemaining($current, $previous); +$this-assertEqual(3, $total); + } +} \ No newline at end of file diff --git a/src/__tests__/SprintQueryTestCase.php b/src/__tests__/SprintQueryTestCase.php index 5286443..9fd839a 100644 --- a/src/__tests__/SprintQueryTestCase.php +++ b/src/__tests__/SprintQueryTestCase.php @@ -27,14 +27,14 @@ /** * @depends testRequestSetUser */ - public function testGetViewerHandles() - { -$r = new AphrontRequest('example.com', '/'); -$r-setUser($this-generateNewTestUser()); -$q = new SprintQuery(); -$phids = $this-PHIDProvider(); -$handle = $q-getViewerHandles($r, $phids); -$this-assertInstanceof('PhabricatorObjectHandle', $handle); - } +// public function testGetViewerHandles() +// { +//$r = new AphrontRequest('example.com', '/'); +//$r-setUser($this-generateNewTestUser()); +//$q = new SprintQuery(); +//$phids = $this-PHIDProvider(); +//$handle = $q-getViewerHandles($r, $phids); +//$this-assertInstanceof('PhabricatorObjectHandle', $handle); +// } } \ No newline at end of file diff --git a/src/storage/SprintBuildStats.php b/src/storage/SprintBuildStats.php index d4ddb82..263c3bc 100644 --- a/src/storage/SprintBuildStats.php +++ b/src/storage/SprintBuildStats.php @@ -43,8 +43,8 @@ foreach ($dates as $current) { $current-setTasksTotal($current-getTasksAddedToday()); $current-setPointsTotal($current-getPointsAddedToday()); - $current-setTasksRemaining($current-getTasksAddedToday()); -
[MediaWiki-commits] [Gerrit] Fixed Style/Documentation RuboCop offense - change (mediawiki...ArticleFeedbackv5)
Lubaochuan has uploaded a new change for review. https://gerrit.wikimedia.org/r/172535 Change subject: Fixed Style/Documentation RuboCop offense .. Fixed Style/Documentation RuboCop offense Bug: 63307 Change-Id: Ic137a36f844dcb823cda33ec18d7dc662f4ed21d --- M .rubocop_todo.yml M tests/browser/features/support/pages/aftv5_page.rb 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/35/172535/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8079646..c58ead1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -10,10 +10,6 @@ Metrics/LineLength: Max: 158 -# Offense count: 1 -Style/Documentation: - Enabled: false - # Offense count: 5 # Cop supports --auto-correct. Style/LeadingCommentSpace: diff --git a/tests/browser/features/support/pages/aftv5_page.rb b/tests/browser/features/support/pages/aftv5_page.rb index cac9a79..de57316 100644 --- a/tests/browser/features/support/pages/aftv5_page.rb +++ b/tests/browser/features/support/pages/aftv5_page.rb @@ -11,6 +11,7 @@ # require page-object +# AFTv5 page object class AFTv5Page include PageObject -- To view, visit https://gerrit.wikimedia.org/r/172535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic137a36f844dcb823cda33ec18d7dc662f4ed21d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Lubaochuan lubaoch...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add read only configuration for ElasticSearchTTMServer - change (operations/mediawiki-config)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/172534 Change subject: Add read only configuration for ElasticSearchTTMServer .. Add read only configuration for ElasticSearchTTMServer Change-Id: I69d35657d527eab2f95aa983f0642012b57da3b1 --- M wmf-config/CommonSettings.php 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/34/172534/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 34b0983..cb1f58e 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2218,6 +2218,22 @@ 'adapter' = 'Solarium_Client_Adapter_Curl', ), ); + + $servers = array_map( + function ( $v ) { return array( 'host' = $v ); }, + $wgCirrusSearchServers + ); + // Read only until renamed to 'TTMServer' + $wgTranslateTranslationServices['TTMServer-esmigration'] = array( + 'type' = 'ttmserver', + 'class' = 'ElasticsearchTTMServer', + 'shards' = 1, + 'replicas' = 1, + 'index' = 'ttmserver', + 'config' = array( + 'servers' = $servers, + ), + ); } $wgTranslateWorkflowStates = $wmgTranslateWorkflowStates; -- To view, visit https://gerrit.wikimedia.org/r/172534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69d35657d527eab2f95aa983f0642012b57da3b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: Kill labs archiver - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/172536 Change subject: graphite: Kill labs archiver .. graphite: Kill labs archiver Due to the way txstatsd keeps recreating deleted instance metrics because it is not restarted, and the archiver archiving all deleted instances it could find, we ran out of space on labmon1001. Kill it for now. Change-Id: Id5f026abe1ac2de99d962ea9a8777598cb304e15 --- M manifests/role/graphite.pp 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/36/172536/1 diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp index c7bfcef..23d691a 100644 --- a/manifests/role/graphite.pp +++ b/manifests/role/graphite.pp @@ -253,6 +253,4 @@ include beta::monitoring::graphite include toollabs::monitoring::graphite include contint::monitoring::graphite - -include graphite::labs::archiver } -- To view, visit https://gerrit.wikimedia.org/r/172536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5f026abe1ac2de99d962ea9a8777598cb304e15 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: Kill labs archiver - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: graphite: Kill labs archiver .. graphite: Kill labs archiver Due to the way txstatsd keeps recreating deleted instance metrics because it is not restarted, and the archiver archiving all deleted instances it could find, we ran out of space on labmon1001. Kill it for now. Change-Id: Id5f026abe1ac2de99d962ea9a8777598cb304e15 --- M manifests/role/graphite.pp 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp index c7bfcef..23d691a 100644 --- a/manifests/role/graphite.pp +++ b/manifests/role/graphite.pp @@ -253,6 +253,4 @@ include beta::monitoring::graphite include toollabs::monitoring::graphite include contint::monitoring::graphite - -include graphite::labs::archiver } -- To view, visit https://gerrit.wikimedia.org/r/172536 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5f026abe1ac2de99d962ea9a8777598cb304e15 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Non wikipedias to 1.25wmf7 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/172537 Change subject: Non wikipedias to 1.25wmf7 .. Non wikipedias to 1.25wmf7 Change-Id: Ia2fe0e09fb6ef77f4afc97e7b3b703ce529be98c --- M docroot/bits/static-current/extensions M docroot/bits/static-current/resources M docroot/bits/static-current/skins M php M wikiversions.json 5 files changed, 600 insertions(+), 600 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/37/172537/1 diff --git a/docroot/bits/static-current/extensions b/docroot/bits/static-current/extensions index 30bc393..dc320d3 12 --- a/docroot/bits/static-current/extensions +++ b/docroot/bits/static-current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf6/extensions \ No newline at end of file +/srv/mediawiki/php-1.25wmf7/extensions \ No newline at end of file diff --git a/docroot/bits/static-current/resources b/docroot/bits/static-current/resources index 21c6fd2..1155e9f 12 --- a/docroot/bits/static-current/resources +++ b/docroot/bits/static-current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf6/resources \ No newline at end of file +/srv/mediawiki/php-1.25wmf7/resources \ No newline at end of file diff --git a/docroot/bits/static-current/skins b/docroot/bits/static-current/skins index fb4d727..96bb329 12 --- a/docroot/bits/static-current/skins +++ b/docroot/bits/static-current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf6/skins \ No newline at end of file +/srv/mediawiki/php-1.25wmf7/skins \ No newline at end of file diff --git a/php b/php index b4e1b2d..d00d744 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.25wmf6 \ No newline at end of file +php-1.25wmf7 \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index d606613..a634453 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -1,890 +1,890 @@ { aawiki: php-1.25wmf6, -aawikibooks: php-1.25wmf6, -aawiktionary: php-1.25wmf6, +aawikibooks: php-1.25wmf7, +aawiktionary: php-1.25wmf7, abwiki: php-1.25wmf6, -abwiktionary: php-1.25wmf6, +abwiktionary: php-1.25wmf7, acewiki: php-1.25wmf6, -advisorywiki: php-1.25wmf6, +advisorywiki: php-1.25wmf7, afwiki: php-1.25wmf6, -afwikibooks: php-1.25wmf6, -afwikiquote: php-1.25wmf6, -afwiktionary: php-1.25wmf6, +afwikibooks: php-1.25wmf7, +afwikiquote: php-1.25wmf7, +afwiktionary: php-1.25wmf7, akwiki: php-1.25wmf6, -akwikibooks: php-1.25wmf6, -akwiktionary: php-1.25wmf6, +akwikibooks: php-1.25wmf7, +akwiktionary: php-1.25wmf7, alswiki: php-1.25wmf6, -alswikibooks: php-1.25wmf6, -alswikiquote: php-1.25wmf6, -alswiktionary: php-1.25wmf6, +alswikibooks: php-1.25wmf7, +alswikiquote: php-1.25wmf7, +alswiktionary: php-1.25wmf7, amwiki: php-1.25wmf6, -amwikiquote: php-1.25wmf6, -amwiktionary: php-1.25wmf6, +amwikiquote: php-1.25wmf7, +amwiktionary: php-1.25wmf7, angwiki: php-1.25wmf6, -angwikibooks: php-1.25wmf6, -angwikiquote: php-1.25wmf6, -angwikisource: php-1.25wmf6, -angwiktionary: php-1.25wmf6, +angwikibooks: php-1.25wmf7, +angwikiquote: php-1.25wmf7, +angwikisource: php-1.25wmf7, +angwiktionary: php-1.25wmf7, anwiki: php-1.25wmf6, -anwiktionary: php-1.25wmf6, -arbcom_dewiki: php-1.25wmf6, -arbcom_enwiki: php-1.25wmf6, -arbcom_fiwiki: php-1.25wmf6, -arbcom_nlwiki: php-1.25wmf6, +anwiktionary: php-1.25wmf7, +arbcom_dewiki: php-1.25wmf7, +arbcom_enwiki: php-1.25wmf7, +arbcom_fiwiki: php-1.25wmf7, +arbcom_nlwiki: php-1.25wmf7, arcwiki: php-1.25wmf6, arwiki: php-1.25wmf6, -arwikibooks: php-1.25wmf6, -arwikimedia: php-1.25wmf6, -arwikinews: php-1.25wmf6, -arwikiquote: php-1.25wmf6, -arwikisource: php-1.25wmf6, -arwikiversity: php-1.25wmf6, -arwiktionary: php-1.25wmf6, +arwikibooks: php-1.25wmf7, +arwikimedia: php-1.25wmf7, +arwikinews: php-1.25wmf7, +arwikiquote: php-1.25wmf7, +arwikisource: php-1.25wmf7, +arwikiversity: php-1.25wmf7, +arwiktionary: php-1.25wmf7, arzwiki: php-1.25wmf6, astwiki: php-1.25wmf6, -astwikibooks: php-1.25wmf6, -astwikiquote: php-1.25wmf6, -astwiktionary: php-1.25wmf6, +astwikibooks: php-1.25wmf7, +astwikiquote: php-1.25wmf7, +astwiktionary: php-1.25wmf7, aswiki: php-1.25wmf6, -aswikibooks: php-1.25wmf6, -aswikisource: php-1.25wmf6, -aswiktionary: php-1.25wmf6, -auditcomwiki: php-1.25wmf6, +aswikibooks: php-1.25wmf7, +aswikisource: php-1.25wmf7, +aswiktionary: php-1.25wmf7, +auditcomwiki: php-1.25wmf7, avwiki: php-1.25wmf6, -avwiktionary: php-1.25wmf6, +avwiktionary: php-1.25wmf7, aywiki: php-1.25wmf6, -aywikibooks: php-1.25wmf6, -aywiktionary: php-1.25wmf6, +aywikibooks: php-1.25wmf7, +
[MediaWiki-commits] [Gerrit] Non wikipedias to 1.25wmf7 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Non wikipedias to 1.25wmf7 .. Non wikipedias to 1.25wmf7 Change-Id: Ia2fe0e09fb6ef77f4afc97e7b3b703ce529be98c --- M docroot/bits/static-current/extensions M docroot/bits/static-current/resources M docroot/bits/static-current/skins M php M wikiversions.json 5 files changed, 600 insertions(+), 600 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-current/extensions b/docroot/bits/static-current/extensions index 30bc393..dc320d3 12 --- a/docroot/bits/static-current/extensions +++ b/docroot/bits/static-current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf6/extensions \ No newline at end of file +/srv/mediawiki/php-1.25wmf7/extensions \ No newline at end of file diff --git a/docroot/bits/static-current/resources b/docroot/bits/static-current/resources index 21c6fd2..1155e9f 12 --- a/docroot/bits/static-current/resources +++ b/docroot/bits/static-current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf6/resources \ No newline at end of file +/srv/mediawiki/php-1.25wmf7/resources \ No newline at end of file diff --git a/docroot/bits/static-current/skins b/docroot/bits/static-current/skins index fb4d727..96bb329 12 --- a/docroot/bits/static-current/skins +++ b/docroot/bits/static-current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.25wmf6/skins \ No newline at end of file +/srv/mediawiki/php-1.25wmf7/skins \ No newline at end of file diff --git a/php b/php index b4e1b2d..d00d744 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.25wmf6 \ No newline at end of file +php-1.25wmf7 \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index d606613..a634453 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -1,890 +1,890 @@ { aawiki: php-1.25wmf6, -aawikibooks: php-1.25wmf6, -aawiktionary: php-1.25wmf6, +aawikibooks: php-1.25wmf7, +aawiktionary: php-1.25wmf7, abwiki: php-1.25wmf6, -abwiktionary: php-1.25wmf6, +abwiktionary: php-1.25wmf7, acewiki: php-1.25wmf6, -advisorywiki: php-1.25wmf6, +advisorywiki: php-1.25wmf7, afwiki: php-1.25wmf6, -afwikibooks: php-1.25wmf6, -afwikiquote: php-1.25wmf6, -afwiktionary: php-1.25wmf6, +afwikibooks: php-1.25wmf7, +afwikiquote: php-1.25wmf7, +afwiktionary: php-1.25wmf7, akwiki: php-1.25wmf6, -akwikibooks: php-1.25wmf6, -akwiktionary: php-1.25wmf6, +akwikibooks: php-1.25wmf7, +akwiktionary: php-1.25wmf7, alswiki: php-1.25wmf6, -alswikibooks: php-1.25wmf6, -alswikiquote: php-1.25wmf6, -alswiktionary: php-1.25wmf6, +alswikibooks: php-1.25wmf7, +alswikiquote: php-1.25wmf7, +alswiktionary: php-1.25wmf7, amwiki: php-1.25wmf6, -amwikiquote: php-1.25wmf6, -amwiktionary: php-1.25wmf6, +amwikiquote: php-1.25wmf7, +amwiktionary: php-1.25wmf7, angwiki: php-1.25wmf6, -angwikibooks: php-1.25wmf6, -angwikiquote: php-1.25wmf6, -angwikisource: php-1.25wmf6, -angwiktionary: php-1.25wmf6, +angwikibooks: php-1.25wmf7, +angwikiquote: php-1.25wmf7, +angwikisource: php-1.25wmf7, +angwiktionary: php-1.25wmf7, anwiki: php-1.25wmf6, -anwiktionary: php-1.25wmf6, -arbcom_dewiki: php-1.25wmf6, -arbcom_enwiki: php-1.25wmf6, -arbcom_fiwiki: php-1.25wmf6, -arbcom_nlwiki: php-1.25wmf6, +anwiktionary: php-1.25wmf7, +arbcom_dewiki: php-1.25wmf7, +arbcom_enwiki: php-1.25wmf7, +arbcom_fiwiki: php-1.25wmf7, +arbcom_nlwiki: php-1.25wmf7, arcwiki: php-1.25wmf6, arwiki: php-1.25wmf6, -arwikibooks: php-1.25wmf6, -arwikimedia: php-1.25wmf6, -arwikinews: php-1.25wmf6, -arwikiquote: php-1.25wmf6, -arwikisource: php-1.25wmf6, -arwikiversity: php-1.25wmf6, -arwiktionary: php-1.25wmf6, +arwikibooks: php-1.25wmf7, +arwikimedia: php-1.25wmf7, +arwikinews: php-1.25wmf7, +arwikiquote: php-1.25wmf7, +arwikisource: php-1.25wmf7, +arwikiversity: php-1.25wmf7, +arwiktionary: php-1.25wmf7, arzwiki: php-1.25wmf6, astwiki: php-1.25wmf6, -astwikibooks: php-1.25wmf6, -astwikiquote: php-1.25wmf6, -astwiktionary: php-1.25wmf6, +astwikibooks: php-1.25wmf7, +astwikiquote: php-1.25wmf7, +astwiktionary: php-1.25wmf7, aswiki: php-1.25wmf6, -aswikibooks: php-1.25wmf6, -aswikisource: php-1.25wmf6, -aswiktionary: php-1.25wmf6, -auditcomwiki: php-1.25wmf6, +aswikibooks: php-1.25wmf7, +aswikisource: php-1.25wmf7, +aswiktionary: php-1.25wmf7, +auditcomwiki: php-1.25wmf7, avwiki: php-1.25wmf6, -avwiktionary: php-1.25wmf6, +avwiktionary: php-1.25wmf7, aywiki: php-1.25wmf6, -aywikibooks: php-1.25wmf6, -aywiktionary: php-1.25wmf6, +aywikibooks: php-1.25wmf7, +aywiktionary: php-1.25wmf7, azwiki:
[MediaWiki-commits] [Gerrit] Remove php-1.24wmf22 and php-1.25wmf1 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/172538 Change subject: Remove php-1.24wmf22 and php-1.25wmf1 .. Remove php-1.24wmf22 and php-1.25wmf1 Change-Id: I6edbded3b0b4f1da6214940c81bc5587f7f706b1 --- D docroot/bits/static-1.24wmf22/extensions D docroot/bits/static-1.24wmf22/resources D docroot/bits/static-1.24wmf22/skins D docroot/bits/static-1.25wmf1/extensions D docroot/bits/static-1.25wmf1/resources D docroot/bits/static-1.25wmf1/skins D w/static-1.24wmf22/extensions D w/static-1.24wmf22/resources D w/static-1.24wmf22/skins D w/static-1.25wmf1/extensions D w/static-1.25wmf1/resources D w/static-1.25wmf1/skins 12 files changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/38/172538/1 diff --git a/docroot/bits/static-1.24wmf22/extensions b/docroot/bits/static-1.24wmf22/extensions deleted file mode 12 index 41316d5..000 --- a/docroot/bits/static-1.24wmf22/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf22/resources b/docroot/bits/static-1.24wmf22/resources deleted file mode 12 index d28c492..000 --- a/docroot/bits/static-1.24wmf22/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf22/skins b/docroot/bits/static-1.24wmf22/skins deleted file mode 12 index 01da255..000 --- a/docroot/bits/static-1.24wmf22/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf1/extensions b/docroot/bits/static-1.25wmf1/extensions deleted file mode 12 index 432e5f6..000 --- a/docroot/bits/static-1.25wmf1/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf1/resources b/docroot/bits/static-1.25wmf1/resources deleted file mode 12 index 7bd1c53..000 --- a/docroot/bits/static-1.25wmf1/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf1/skins b/docroot/bits/static-1.25wmf1/skins deleted file mode 12 index b1c371c..000 --- a/docroot/bits/static-1.25wmf1/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/skins/ \ No newline at end of file diff --git a/w/static-1.24wmf22/extensions b/w/static-1.24wmf22/extensions deleted file mode 12 index 41316d5..000 --- a/w/static-1.24wmf22/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/extensions \ No newline at end of file diff --git a/w/static-1.24wmf22/resources b/w/static-1.24wmf22/resources deleted file mode 12 index d28c492..000 --- a/w/static-1.24wmf22/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/resources \ No newline at end of file diff --git a/w/static-1.24wmf22/skins b/w/static-1.24wmf22/skins deleted file mode 12 index 6a04e90..000 --- a/w/static-1.24wmf22/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/skins \ No newline at end of file diff --git a/w/static-1.25wmf1/extensions b/w/static-1.25wmf1/extensions deleted file mode 12 index 432e5f6..000 --- a/w/static-1.25wmf1/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/extensions \ No newline at end of file diff --git a/w/static-1.25wmf1/resources b/w/static-1.25wmf1/resources deleted file mode 12 index 7bd1c53..000 --- a/w/static-1.25wmf1/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/resources \ No newline at end of file diff --git a/w/static-1.25wmf1/skins b/w/static-1.25wmf1/skins deleted file mode 12 index 95476da..000 --- a/w/static-1.25wmf1/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/172538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6edbded3b0b4f1da6214940c81bc5587f7f706b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove php-1.24wmf22 and php-1.25wmf1 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove php-1.24wmf22 and php-1.25wmf1 .. Remove php-1.24wmf22 and php-1.25wmf1 Change-Id: I6edbded3b0b4f1da6214940c81bc5587f7f706b1 --- D docroot/bits/static-1.24wmf22/extensions D docroot/bits/static-1.24wmf22/resources D docroot/bits/static-1.24wmf22/skins D docroot/bits/static-1.25wmf1/extensions D docroot/bits/static-1.25wmf1/resources D docroot/bits/static-1.25wmf1/skins D w/static-1.24wmf22/extensions D w/static-1.24wmf22/resources D w/static-1.24wmf22/skins D w/static-1.25wmf1/extensions D w/static-1.25wmf1/resources D w/static-1.25wmf1/skins 12 files changed, 0 insertions(+), 12 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.24wmf22/extensions b/docroot/bits/static-1.24wmf22/extensions deleted file mode 12 index 41316d5..000 --- a/docroot/bits/static-1.24wmf22/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf22/resources b/docroot/bits/static-1.24wmf22/resources deleted file mode 12 index d28c492..000 --- a/docroot/bits/static-1.24wmf22/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf22/skins b/docroot/bits/static-1.24wmf22/skins deleted file mode 12 index 01da255..000 --- a/docroot/bits/static-1.24wmf22/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf1/extensions b/docroot/bits/static-1.25wmf1/extensions deleted file mode 12 index 432e5f6..000 --- a/docroot/bits/static-1.25wmf1/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf1/resources b/docroot/bits/static-1.25wmf1/resources deleted file mode 12 index 7bd1c53..000 --- a/docroot/bits/static-1.25wmf1/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf1/skins b/docroot/bits/static-1.25wmf1/skins deleted file mode 12 index b1c371c..000 --- a/docroot/bits/static-1.25wmf1/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/skins/ \ No newline at end of file diff --git a/w/static-1.24wmf22/extensions b/w/static-1.24wmf22/extensions deleted file mode 12 index 41316d5..000 --- a/w/static-1.24wmf22/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/extensions \ No newline at end of file diff --git a/w/static-1.24wmf22/resources b/w/static-1.24wmf22/resources deleted file mode 12 index d28c492..000 --- a/w/static-1.24wmf22/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/resources \ No newline at end of file diff --git a/w/static-1.24wmf22/skins b/w/static-1.24wmf22/skins deleted file mode 12 index 6a04e90..000 --- a/w/static-1.24wmf22/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.24wmf22/skins \ No newline at end of file diff --git a/w/static-1.25wmf1/extensions b/w/static-1.25wmf1/extensions deleted file mode 12 index 432e5f6..000 --- a/w/static-1.25wmf1/extensions +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/extensions \ No newline at end of file diff --git a/w/static-1.25wmf1/resources b/w/static-1.25wmf1/resources deleted file mode 12 index 7bd1c53..000 --- a/w/static-1.25wmf1/resources +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/resources \ No newline at end of file diff --git a/w/static-1.25wmf1/skins b/w/static-1.25wmf1/skins deleted file mode 12 index 95476da..000 --- a/w/static-1.25wmf1/skins +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/php-1.25wmf1/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/172538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6edbded3b0b4f1da6214940c81bc5587f7f706b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding *.nasa.gov to wgCopyUploadsDomains. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Adding *.nasa.gov to wgCopyUploadsDomains. .. Adding *.nasa.gov to wgCopyUploadsDomains. To allow uploading publc domain photo from this url to commons. Requested: User_talk:Steinsplitteroldid=139115442#wgCopyUploadsDomains Change-Id: I2fd6532759ab22ec35879ffde309cc35c443be01 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Revi: Looks good to me, but someone else must approve Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4f305d8..df7fe79 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10929,6 +10929,7 @@ '*.kartverket.no', // Kartverket - bug 71195 '*.arkivverket.no', // The National Archives of Norway - bug 71195 'tools.wikimedia.pl', // Facilities server for Wikimedia users - bug 72897 + '*.nasa.gov', // Nasa ), ), -- To view, visit https://gerrit.wikimedia.org/r/172204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fd6532759ab22ec35879ffde309cc35c443be01 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de Gerrit-Reviewer: Dan-nl d_ent...@yahoo.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Revi ger...@revi.pe.kr 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 old AdminSettings.php (symlink) - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove old AdminSettings.php (symlink) .. Remove old AdminSettings.php (symlink) Bug: 67820 Change-Id: I61cfb42347ef28390a5698f686a3b956dadd5e7f --- D wmf-config/AdminSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/AdminSettings.php b/wmf-config/AdminSettings.php deleted file mode 12 index bfd5916..000 --- a/wmf-config/AdminSettings.php +++ /dev/null @@ -1 +0,0 @@ -../private/PrivateSettings.php \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/145408 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61cfb42347ef28390a5698f686a3b956dadd5e7f Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjustments to securepoll and usergroups for voteWiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Adjustments to securepoll and usergroups for voteWiki .. Adjustments to securepoll and usergroups for voteWiki * Enable SecurePoll namespace for voteWiki (supposed to happen last patch) * Add new user right for those running current election allowing editinterface * Allow permenant election committee and staff advisors add/remove electionadmin right Bug: 72589 Change-Id: I3170248669533bc7d7e83d068cb56d8acef0da15 --- M wmf-config/InitialiseSettings.php 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index df7fe79..8affbe7 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7816,6 +7816,9 @@ 'securepoll-create-poll' = true, 'editinterface' = true ), + 'electionadmin' = array( + 'editinterface' = true + ), ), 'wikidata' = array( 'autoconfirmed' = array( @@ -8493,6 +8496,12 @@ 'electcomm', 'staffsupport' ), + 'staffsupport' = array( + 'electionadmin' + ), + 'electcomm' = array( + 'electionadmin' + ), ), '+wikidata' = array( 'sysop' = array( @@ -9069,6 +9078,12 @@ 'staffsupport', 'sysop', 'bureaucrat' + ), + 'staffsupport' = array( + 'electionadmin' + ), + 'electcomm' = array( + 'electionadmin' ), ), '+wikidata' = array( @@ -13894,6 +13909,7 @@ 'wmgSecurePollUseNamespace' = array( 'default' = false, 'testwiki' = true, + 'votewiki' = true, ), 'wmgUseGlobalAbuseFilters' = array( -- To view, visit https://gerrit.wikimedia.org/r/172464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3170248669533bc7d7e83d068cb56d8acef0da15 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jalexander jalexan...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Task recommendations experiment is over - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Task recommendations experiment is over .. Task recommendations experiment is over Data was collected, analysis already done in part, full results pending. https://meta.wikimedia.org/wiki/Research_talk:Task_recommendations#Results.3F Change-Id: I1e25afd2dd257d56644a869849f96b002d213d81 --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 0 insertions(+), 14 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 34b0983..08fe358 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2550,8 +2550,6 @@ $wgGettingStartedExcludedCategories = $wmgGettingStartedExcludedCategories; $wgGettingStartedRunTest = $wmgGettingStartedRunTest; - $wgTaskRecommendationsExperimentV1StartDate = 1410472800; // 9/11/2014 22:00:00 - $wgTaskRecommendationsExperimentV1EndDate = 1411941600; // 9/28/2014 22:00:00 } if ( $wmgUseGeoCrumbs ) { diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8affbe7..10eb63d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13248,18 +13248,6 @@ ), 'wmgGettingStartedRunTest' = array( 'default' = false, - 'enwiki' = true, - 'dewiki' = true, - 'eswiki' = true, - 'fawiki' = true, - 'frwiki' = true, - 'hewiki' = true, - 'itwiki' = true, - 'nlwiki' = true, - 'ruwiki' = true, - 'svwiki' = true, - 'ukwiki' = true, - 'zhwiki' = true, ), 'wmgUseGuidedTour' = array( 'default' = false, -- To view, visit https://gerrit.wikimedia.org/r/172110 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e25afd2dd257d56644a869849f96b002d213d81 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: MZMcBride w...@mzmcbride.com Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wgDebugLog group for FSFileBackend - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add wgDebugLog group for FSFileBackend .. Add wgDebugLog group for FSFileBackend Bug: 73229 Change-Id: I98e090a4ca5c3c6951dde3c4ca70300411b94bfc --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 10eb63d..04bde8a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4198,6 +4198,7 @@ 'Echo' = udp://$wmfUdp2logDest/echo, 'collection' = udp://$wmfUdp2logDest/collection, // -cscott for bug 71675 'GlobalTitleFail' = udp://$wmfUdp2logDest/globaltitlefail, // chad hates $wgTitle + 'FSFileBackend' = udp://$wmfUdp2logDest/fsfilebackend, // - gilles for bug 73229 ), '+enwiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/172514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98e090a4ca5c3c6951dde3c4ca70300411b94bfc Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 73197) enable Patrolled edits on Hebrew Wiktionary - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 73197) enable Patrolled edits on Hebrew Wiktionary .. (bug 73197) enable Patrolled edits on Hebrew Wiktionary Change-Id: I7b0e38a41d53334aee167b3e2fd1e9b43b13057a --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 04bde8a..99508bc 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6349,6 +6349,7 @@ 'hewiki' = true, // bug 5232 'hewikibooks' = true, // Bug 27918 'hewikiquote' = true, + 'hewiktionary' = true, // bug 73197 'hiwiki' = true, 'hrwiki' = true, // by request of stemd from #wikipedia-hr 2007-05-15 -jeronim 'idwiki' = true, // bug 6042 @@ -7197,6 +7198,10 @@ 'autopatrolled' = array( 'autopatrol' = true ), // bug 50377 'sysop' = array( 'importupload' = true ), // bug 59601 ), + 'hewiktionary' = array( + 'patroller' = array( 'patrol' = true, 'autopatrol' = true, 'unwatchedpages' = true, 'rollback' = true,), // bug 73197 + 'autopatrolled' = array( 'autopatrol' = true, 'unwatchedpages' = true, ), // bug 73197 + ), 'hiwiki' = array( 'rollbacker' = array( 'rollback' = true ), // bug 54589 'filemover' = array( 'movefile' = true ), // bug 54589 -- To view, visit https://gerrit.wikimedia.org/r/172112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b0e38a41d53334aee167b3e2fd1e9b43b13057a Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: Matanya mata...@foss.co.il Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BEMify publish button class name - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: BEMify publish button class name .. BEMify publish button class name Change-Id: Ic2e958733fb4f153e6f8f7e8a468acf2561943f4 --- M modules/header/ext.cx.header.js M modules/header/styles/ext.cx.header.less M modules/publish/ext.cx.publish.js 3 files changed, 4 insertions(+), 3 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js index 408e5f4..5a7984f 100644 --- a/modules/header/ext.cx.header.js +++ b/modules/header/ext.cx.header.js @@ -173,7 +173,7 @@ .append( $translationCenterLink ); this.$publishButton = $( 'button' ) - .addClass( 'publish mw-ui-button mw-ui-constructive' ) + .addClass( 'cx-header__publish-button mw-ui-button mw-ui-constructive' ) .prop( 'disabled', true ) .text( mw.msg( 'cx-publish-button' ) ) .hide(); diff --git a/modules/header/styles/ext.cx.header.less b/modules/header/styles/ext.cx.header.less index feb10d7..0fc3665 100644 --- a/modules/header/styles/ext.cx.header.less +++ b/modules/header/styles/ext.cx.header.less @@ -112,7 +112,8 @@ border: none; margin: 0; } - .cx-header__publish .publish { + + .cx-header__publish-button { float: right; } diff --git a/modules/publish/ext.cx.publish.js b/modules/publish/ext.cx.publish.js index 76a8685..3f23614 100644 --- a/modules/publish/ext.cx.publish.js +++ b/modules/publish/ext.cx.publish.js @@ -111,7 +111,7 @@ sortedKeys, i, categoryTitles, categories; $publishArea = $( '.cx-header__publish' ); - $publishButton = $publishArea.find( 'button.publish' ); + $publishButton = $publishArea.find( '.cx-header__publish-button' ); translatedTitle = $( '.cx-column--translation h2' ).text(); translatedContent = prepareTranslationForPublish( -- To view, visit https://gerrit.wikimedia.org/r/171619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2e958733fb4f153e6f8f7e8a468acf2561943f4 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Pginer pgi...@wikimedia.org Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Separate the entry point modules - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Separate the entry point modules .. Separate the entry point modules Certain modules are used to setup features/routes (e.g. bind to certain hash fragments) or to progressively enhance the page. This splits those out to make it clearer and cleans up their dependencies in the process (if a parent has a dependency it doesn't need to be restated) Change-Id: I48d75893be973451e16ca0b593ac828b8e118eb3 --- M includes/Resources.php M includes/skins/SkinMinerva.php 2 files changed, 99 insertions(+), 86 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 272be02..6409e0d 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -123,40 +123,6 @@ ), ), - 'tablet.scripts' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.toc', - ), - ), - - // Important: This module is loaded on both mobile and desktop skin - 'mobile.head' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mediawiki.language', - 'mediawiki.jqueryMsg', - 'mobile.templates', - 'ext.mantle.modules', - 'ext.mantle.oo', - ), - 'scripts' = array( - 'javascripts/modes.js', - 'javascripts/mainmenu.js', - 'javascripts/modules/lastEdited/time.js', - 'javascripts/modules/lastEdited/lastEdited.js', - ), - 'messages' = array( - // lastEdited.js - 'mobile-frontend-last-modified-with-user-seconds', - 'mobile-frontend-last-modified-with-user-minutes', - 'mobile-frontend-last-modified-with-user-hours', - 'mobile-frontend-last-modified-with-user-days', - 'mobile-frontend-last-modified-with-user-months', - 'mobile-frontend-last-modified-with-user-years', - 'mobile-frontend-last-modified-with-user-just-now', - ), - 'position' = 'top', - ), - 'mobile.ajax' = $wgMFResourceFileModuleBoilerplate + array( 'templates' = array( 'spinner.hogan' = 'templates/spinner.hogan', @@ -469,20 +435,6 @@ ), ), - 'mobile.beta' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.stable', - 'mobile.overlays', - 'mobile.references.beta', - 'mobile.wikigrok', - 'mobile.preferredLanguages', - 'mobile.stable.common', - 'mobile.loggingSchemas', - 'mobile.templates', - ), - 'position' = 'bottom', - ), - 'mobile.search' = $wgMFResourceFileModuleBoilerplate + array( 'class' = 'ResourceLoaderParsedMessageModule', 'dependencies' = array( @@ -577,12 +529,6 @@ // mediaViewer.js 'mobile-frontend-media-details', 'mobile-frontend-media-license-link', - ), - ), - - 'mobile.alpha' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.beta', ), ), @@ -845,28 +791,6 @@ ), ), - 'mobile.stable' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.startup', - 'mobile.user', - 'mobile.stable.common', - 'mediawiki.util', - 'mobile.templates', - 'mobile.references', - 'mediawiki.language', - 'mobile.loggingSchemas', - 'mobile.watchstar', - 'mobile.pagelist.scripts', - ), - 'scripts' = array( - 'javascripts/externals/micro.autosize.js', - 'javascripts/modules/uploads/init.js', - 'javascripts/modules/mainmenutweaks.js', - 'javascripts/modules/mediaViewer/init.js', - 'javascripts/modules/languages/languages.js', - ), - ), - 'mobile.languages' = $wgMFResourceFileModuleBoilerplate + array( 'class' =
[MediaWiki-commits] [Gerrit] Revert Set wgMathDisableTexFilter to fix performance regres... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Set wgMathDisableTexFilter to fix performance regression .. Revert Set wgMathDisableTexFilter to fix performance regression This reverts commit 63992ec03c15a9bff7f7212254fb19b8acb5e224. Bug: 49169 Change-Id: I42f7afc29a7c794f4d70d7f15ecabcc56b2cc202 --- M wmf-config/CommonSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 08fe358..64da8be 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2173,7 +2173,6 @@ $wgMathDirectory = '/mnt/upload7/math'; // just for sanity $wgMathPath= $wmgMathPath; $wgUseMathJax = true; - $wgMathDisableTexFilter = true; // severe performance regression; --Aaron // This variable points to non-WMF servers by default. // Prevent accidental use. $wgMathLaTeXMLUrl = null; -- To view, visit https://gerrit.wikimedia.org/r/158559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42f7afc29a7c794f4d70d7f15ecabcc56b2cc202 Gerrit-PatchSet: 6 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: CSteipp cste...@wikimedia.org Gerrit-Reviewer: Frédéric Wang fred.w...@free.fr Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UserManager: Added multi select features - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/172539 Change subject: UserManager: Added multi select features .. UserManager: Added multi select features * Added checkbox column * Added multi group assginment * Added rowexpander for group lists (experimental) Change-Id: Ib8b840e8108ad0ba0be28e17342622a721515cd9 --- M UserManager/UserManager.setup.php R UserManager/resources/BS.UserManager/dialog/User.js A UserManager/resources/BS.UserManager/dialog/UserGroups.js R UserManager/resources/BS.UserManager/panel/Manager.js M UserManager/resources/bluespice.userManager.js 5 files changed, 199 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/39/172539/1 diff --git a/UserManager/UserManager.setup.php b/UserManager/UserManager.setup.php index 4758fd0..2d560d0 100644 --- a/UserManager/UserManager.setup.php +++ b/UserManager/UserManager.setup.php @@ -31,4 +31,5 @@ $wgAjaxExportList[] = 'UserManager::getUsers'; $wgAjaxExportList[] = 'UserManager::addUser'; $wgAjaxExportList[] = 'UserManager::editUser'; -$wgAjaxExportList[] = 'UserManager::deleteUser'; \ No newline at end of file +$wgAjaxExportList[] = 'UserManager::deleteUser'; +$wgAjaxExportList[] = 'UserManager::setUserGroups'; \ No newline at end of file diff --git a/UserManager/resources/BS.UserManager/UserDialog.js b/UserManager/resources/BS.UserManager/dialog/User.js similarity index 97% rename from UserManager/resources/BS.UserManager/UserDialog.js rename to UserManager/resources/BS.UserManager/dialog/User.js index e6b58b7..5b545b1 100644 --- a/UserManager/resources/BS.UserManager/UserDialog.js +++ b/UserManager/resources/BS.UserManager/dialog/User.js @@ -12,7 +12,7 @@ * @filesource */ -Ext.define( 'BS.UserManager.UserDialog', { +Ext.define( 'BS.UserManager.dialog.User', { extend: 'BS.Window', currentData: {}, selectedData: {}, @@ -56,7 +56,7 @@ labelAlign: 'right', name: 'realname' }); - + this.cbGroups = Ext.create( 'Ext.ux.form.MultiSelect', { fieldLabel: mw.message('bs-usermanager-headergroups').plain(), labelWidth: 130, @@ -106,7 +106,7 @@ return this.selectedData; }, - + getGroupsValue: function( data ) { var groups = []; for( var i = 0; i data.length; i++ ) { diff --git a/UserManager/resources/BS.UserManager/dialog/UserGroups.js b/UserManager/resources/BS.UserManager/dialog/UserGroups.js new file mode 100644 index 000..c82260d --- /dev/null +++ b/UserManager/resources/BS.UserManager/dialog/UserGroups.js @@ -0,0 +1,63 @@ +/** + * UserManager UserGroups Dialog + * + * Part of BlueSpice for MediaWiki + * + * @author Robert Vogel vo...@hallowelt.biz + * @packageBluespice_Extensions + * @subpackage UserManager + * @copyright Copyright (C) 2014 Hallo Welt! - Medienwerkstatt GmbH, All rights reserved. + * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or later + * @filesource + */ + +Ext.define( 'BS.UserManager.dialog.UserGroups', { + extend: 'BS.Window', + currentData: {}, + selectedData: {}, + maxHeight: 620, + title: mw.message('bs-usermanager-headergroups').plain(), + afterInitComponent: function() { + if( this.currentData.groups ) { + this.cbGroups.setValue( this.getGroupsValue(this.currentData.groups) ); + } + + this.cbGroups = Ext.create( 'Ext.ux.form.MultiSelect', { + fieldLabel: mw.message('bs-usermanager-headergroups').plain(), + labelWidth: 130, + labelAlign: 'right', + store: this.strGroups, + valueField: 'group', + displayField: 'displayname', + maxHeight: 350 + } ); + + this.items = [ + this.cbGroups + ]; + + this.callParent(arguments); + }, + resetData: function() { + this.cbGroups.reset(); + + this.callParent(arguments); + }, + setData: function( obj ) { + this.currentData = obj; + this.cbGroups.setValue( this.getGroupsValue(this.currentData.groups) ); + }, + getData: function() { + this.selectedData.groups = this.cbGroups.getValue(); + + return this.selectedData; + }, + + getGroupsValue: function( data ) { + var groups = []; + for( var i = 0; i data.length; i++ ) { + groups.push( data[i].group ); + } + return
[MediaWiki-commits] [Gerrit] Adding Ukraine photo sources to wgCopyUploadsDomains - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Adding Ukraine photo sources to wgCopyUploadsDomains .. Adding Ukraine photo sources to wgCopyUploadsDomains The following domains has been added to wgCopyUploadsDomains for Wikimedia Commons: - wikimapia.org - pslava.info - ukrainaincognita.com - klymenko.data-tec.net - serg-klymenko.narod.ru - ua.vlasenko.net Bug: 73045 Change-Id: I18d81c01b7da71e70ba5e38a95e26ef6620e518b --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 99508bc..4022fe0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10951,6 +10951,12 @@ '*.arkivverket.no', // The National Archives of Norway - bug 71195 'tools.wikimedia.pl', // Facilities server for Wikimedia users - bug 72897 '*.nasa.gov', // Nasa + 'wikimapia.org',// WikiMapia - bug 73045 + 'pslava.info', // Ukraine interesting photography source - bug 73045 + 'ukrainaincognita.com', // Ukraine interesting photography source - bug 73045 + 'klymenko.data-tec.net',// Ukraine interesting photography source - bug 73045 + 'serg-klymenko.narod.ru', // Ukraine interesting photography source - bug 73045 + 'ua.vlasenko.net', // Ukraine interesting photography source - bug 73045 ), ), -- To view, visit https://gerrit.wikimedia.org/r/171484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18d81c01b7da71e70ba5e38a95e26ef6620e518b Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Steinsplitter steinsplit...@wikipedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding *.wikiportret.nl to wgCopyUploadsDomains whitelist - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Adding *.wikiportret.nl to wgCopyUploadsDomains whitelist .. Adding *.wikiportret.nl to wgCopyUploadsDomains whitelist Bug: 72953 Change-Id: Ied66f7374ab07f8aef4ab503c42dbe6cf9dacc05 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4022fe0..39904db 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10957,6 +10957,7 @@ 'klymenko.data-tec.net',// Ukraine interesting photography source - bug 73045 'serg-klymenko.narod.ru', // Ukraine interesting photography source - bug 73045 'ua.vlasenko.net', // Ukraine interesting photography source - bug 73045 + '*.wikiportret.nl', // Wikiportret - bug 72953 ), ), -- To view, visit https://gerrit.wikimedia.org/r/171012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied66f7374ab07f8aef4ab503c42dbe6cf9dacc05 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de Gerrit-Reviewer: Dan-nl d_ent...@yahoo.com Gerrit-Reviewer: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Sjoerddebruin sjoerddebr...@me.com Gerrit-Reviewer: Steinsplitter steinsplit...@wikipedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update GeSHi to 1.0.8.12 release - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged. Change subject: Update GeSHi to 1.0.8.12 release .. Update GeSHi to 1.0.8.12 release https://github.com/GeSHi/geshi-1.0/commit/d9cfd3e0cc9b24e6bd3045a4d222e651e68accd8 Already updated to 1 commit behind 1.0.8.12 release, so this just tidies it up and brings it into line. Change-Id: I2e8c4bc39844baf397547d824d7419fa25506f37 --- M geshi/contrib/cssgen.php M geshi/docs/geshi-doc.html M geshi/geshi.php M geshi/geshi/4cs.php M geshi/geshi/6502acme.php M geshi/geshi/6502kickass.php M geshi/geshi/6502tasm.php M geshi/geshi/68000devpac.php M geshi/geshi/abap.php M geshi/geshi/actionscript.php M geshi/geshi/actionscript3.php M geshi/geshi/ada.php M geshi/geshi/algol68.php M geshi/geshi/apache.php M geshi/geshi/applescript.php M geshi/geshi/apt_sources.php M geshi/geshi/arm.php M geshi/geshi/asm.php M geshi/geshi/asp.php M geshi/geshi/asymptote.php M geshi/geshi/autoconf.php M geshi/geshi/autohotkey.php M geshi/geshi/autoit.php M geshi/geshi/avisynth.php M geshi/geshi/awk.php M geshi/geshi/bascomavr.php M geshi/geshi/bash.php M geshi/geshi/basic4gl.php M geshi/geshi/bf.php M geshi/geshi/bibtex.php M geshi/geshi/blitzbasic.php M geshi/geshi/bnf.php M geshi/geshi/boo.php M geshi/geshi/c.php M geshi/geshi/c_loadrunner.php M geshi/geshi/c_mac.php M geshi/geshi/c_winapi.php M geshi/geshi/caddcl.php M geshi/geshi/cadlisp.php M geshi/geshi/cfdg.php M geshi/geshi/cfm.php M geshi/geshi/chaiscript.php M geshi/geshi/cil.php M geshi/geshi/clojure.php M geshi/geshi/cmake.php M geshi/geshi/coffeescript.php M geshi/geshi/cpp-qt.php M geshi/geshi/cpp-winapi.php M geshi/geshi/cpp.php M geshi/geshi/csharp.php M geshi/geshi/cuesheet.php M geshi/geshi/d.php M geshi/geshi/dcl.php M geshi/geshi/dcpu16.php M geshi/geshi/dcs.php M geshi/geshi/delphi.php M geshi/geshi/diff.php M geshi/geshi/div.php M geshi/geshi/dos.php M geshi/geshi/dot.php M geshi/geshi/e.php M geshi/geshi/ecmascript.php M geshi/geshi/eiffel.php M geshi/geshi/email.php M geshi/geshi/epc.php M geshi/geshi/erlang.php M geshi/geshi/euphoria.php M geshi/geshi/ezt.php M geshi/geshi/f1.php M geshi/geshi/falcon.php M geshi/geshi/fo.php M geshi/geshi/fortran.php M geshi/geshi/freebasic.php M geshi/geshi/freeswitch.php M geshi/geshi/fsharp.php M geshi/geshi/gambas.php M geshi/geshi/gdb.php M geshi/geshi/genero.php M geshi/geshi/genie.php M geshi/geshi/gettext.php M geshi/geshi/glsl.php M geshi/geshi/gnuplot.php M geshi/geshi/go.php M geshi/geshi/groovy.php M geshi/geshi/gwbasic.php M geshi/geshi/haskell.php M geshi/geshi/haxe.php M geshi/geshi/hicest.php M geshi/geshi/hq9plus.php M geshi/geshi/html4strict.php M geshi/geshi/html5.php M geshi/geshi/icon.php M geshi/geshi/idl.php M geshi/geshi/ini.php M geshi/geshi/inno.php M geshi/geshi/intercal.php M geshi/geshi/io.php M geshi/geshi/ispfpanel.php M geshi/geshi/j.php M geshi/geshi/java.php M geshi/geshi/java5.php M geshi/geshi/javascript.php M geshi/geshi/jcl.php M geshi/geshi/jquery.php M geshi/geshi/kixtart.php M geshi/geshi/klonec.php M geshi/geshi/klonecpp.php M geshi/geshi/latex.php M geshi/geshi/lb.php M geshi/geshi/ldif.php M geshi/geshi/llvm.php M geshi/geshi/locobasic.php M geshi/geshi/logtalk.php M geshi/geshi/lolcode.php M geshi/geshi/lotusformulas.php M geshi/geshi/lotusscript.php M geshi/geshi/lscript.php M geshi/geshi/lua.php M geshi/geshi/m68k.php M geshi/geshi/magiksf.php M geshi/geshi/make.php M geshi/geshi/mapbasic.php M geshi/geshi/matlab.php M geshi/geshi/mirc.php M geshi/geshi/mmix.php M geshi/geshi/modula2.php M geshi/geshi/modula3.php M geshi/geshi/mpasm.php M geshi/geshi/mxml.php M geshi/geshi/mysql.php M geshi/geshi/nagios.php M geshi/geshi/netrexx.php M geshi/geshi/newlisp.php M geshi/geshi/nsis.php M geshi/geshi/oberon2.php M geshi/geshi/objc.php M geshi/geshi/objeck.php M geshi/geshi/ocaml-brief.php M geshi/geshi/ocaml.php M geshi/geshi/octave.php M geshi/geshi/oobas.php M geshi/geshi/oorexx.php M geshi/geshi/oracle11.php M geshi/geshi/oracle8.php M geshi/geshi/oxygene.php M geshi/geshi/oz.php M geshi/geshi/parasail.php M geshi/geshi/pascal.php M geshi/geshi/pcre.php M geshi/geshi/per.php M geshi/geshi/perl.php M geshi/geshi/perl6.php M geshi/geshi/pf.php M geshi/geshi/php-brief.php M geshi/geshi/php.php M geshi/geshi/pic16.php M geshi/geshi/pike.php M geshi/geshi/pixelbender.php M geshi/geshi/pli.php M geshi/geshi/plsql.php M geshi/geshi/postgresql.php M geshi/geshi/povray.php M geshi/geshi/powerbuilder.php M geshi/geshi/powershell.php M geshi/geshi/proftpd.php M geshi/geshi/progress.php M geshi/geshi/prolog.php M geshi/geshi/properties.php M geshi/geshi/providex.php M geshi/geshi/purebasic.php M geshi/geshi/pycon.php M geshi/geshi/pys60.php M geshi/geshi/python.php M geshi/geshi/q.php M geshi/geshi/qbasic.php M geshi/geshi/rails.php M geshi/geshi/rebol.php M geshi/geshi/reg.php M geshi/geshi/rexx.php M geshi/geshi/robots.php M geshi/geshi/rpmspec.php M
[MediaWiki-commits] [Gerrit] Uniform naming of Math anchors - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/172540 Change subject: Uniform naming of Math anchors .. Uniform naming of Math anchors Change-Id: I64b69aba6d479d020d5b2a219405ea011c24ed7f --- M FormulaInfo.php M MathEngineBaseX.php M MathQueryObject.php M MathSearch.hooks.php M SpecialUploadResult.php M maintenance/CreateBaseXMathTable.php M maintenance/CreateMWSHarvest.php 7 files changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch refs/changes/40/172540/1 diff --git a/FormulaInfo.php b/FormulaInfo.php index b57a89d..fffe20e 100644 --- a/FormulaInfo.php +++ b/FormulaInfo.php @@ -100,7 +100,6 @@ $mo-findSimilarPages( $pid ); $out-addWikiText( '==Variables==' ); $mo-getObservations(); - // $wgOut-addWikiText( [[$pagename#math$eid|Eq: $eid]] , false ); $out-addWikiText( '==MathML==' ); $out-addHtml( br / ); diff --git a/MathEngineBaseX.php b/MathEngineBaseX.php index 48ea045..6e64590 100644 --- a/MathEngineBaseX.php +++ b/MathEngineBaseX.php @@ -65,6 +65,7 @@ $this-relevanceMap = array(); $this-resultSet = array(); if( $res ){ + //TODO: ReEvaluate the regexp. $baseXRegExp = /a .*? href=\http.*?curid=(\d+)#math(\d?)\/; preg_match_all( $baseXRegExp , $res, $matches,PREG_SET_ORDER); foreach($matches as $match){ diff --git a/MathQueryObject.php b/MathQueryObject.php index d05b2bc..6eca335 100644 --- a/MathQueryObject.php +++ b/MathQueryObject.php @@ -58,11 +58,12 @@ $this-queryID = $id; } - public function exportTexDocument(){ - $texInput = htmlspecialchars( $this-getUserInputTex()); - $texInputComment = preg_replace(/[\n\r]/,\n%,$texInput); + public function exportTexDocument() { + $texInput = htmlspecialchars( $this-getUserInputTex() ); + $texInputComment = preg_replace( /[\n\r]/, \n%, $texInput ); $title = Title::newFromId( $this-getPageID() ); - $absUrl = $title-getFullURL(array(oldid=$title-getLatestRevID())).#math{$this-getAnchorID()}; + $absUrl = $title-getFullURL( array( oldid = $title-getLatestRevID() ) ) . + MathSearchHooks::generateMathAnchorString( $title-getLatestRevID(), $this-getAnchorID() ); return TeX \begin{topic}{{$this-getPageTitle()}-{$this-getAnchorID()}} \begin{fquery}\${$this-getTeXQuery()}\$\end{fquery} diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php index cab93d8..60d99b3 100644 --- a/MathSearch.hooks.php +++ b/MathSearch.hooks.php @@ -12,6 +12,7 @@ * LoadExtensionSchemaUpdates handler; set up math table on install/upgrade. * * @param $updater DatabaseUpdater +* @throws MWException * @return bool */ static function onLoadExtensionSchemaUpdates( $updater = null ) { @@ -206,7 +207,7 @@ if ( preg_match( '#math(.*)?\sid=(?Pid[\w\.]+)#', $Result, $matches ) ) { $rendererId = $matches['id']; $oldId = self::curId2OldId( $pid ); - $newID = math.${oldId}.${eid}; + $newID = self::generateMathAnchorString($oldId,$eid); $Result = str_replace( $rendererId, $newID, $Result ); } return true; @@ -223,4 +224,8 @@ $files = array_merge( $files, glob( $testDir/*Test.php ) ); return true; } + + static function generateMathAnchorString($pageID, $anchorID){ + return #math.$pageID.$anchorID; + } } diff --git a/SpecialUploadResult.php b/SpecialUploadResult.php index 49ac58d..e4bd25d 100644 --- a/SpecialUploadResult.php +++ b/SpecialUploadResult.php @@ -180,7 +180,7 @@ } else { $renderedMath = $md5; } - $formulaId = math.{$row['oldId']}.{$row['fId']}; + $formulaId = MathSearchHooks::generateMathAnchorString($row['oldId'],$row['fId']);; $link=Revision::newFromId( $row['oldId'] )-getTitle()-getCanonicalURL().#$formulaId; $this-getOutput()-addHTML(trtd${row['qId']}/tdtda href=\${link}\$formulaId/a/td td${row['rank']}/tdtd$renderedMath/td/tr); diff --git a/maintenance/CreateBaseXMathTable.php b/maintenance/CreateBaseXMathTable.php index 2124218..6ce615d 100644 --- a/maintenance/CreateBaseXMathTable.php +++ b/maintenance/CreateBaseXMathTable.php @@ -58,7 +58,8 @@ libxml_clear_errors(); return ; } - $out .= \n
[MediaWiki-commits] [Gerrit] Fixed Lint/UnusedBlockArgument RuboCop offense - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed Lint/UnusedBlockArgument RuboCop offense .. Fixed Lint/UnusedBlockArgument RuboCop offense Change-Id: Ic17fa0f6b3c2af0a4c3e75f6c847a6c033029b03 Paired-With: Amir Aharoni Bug: 63307 --- M .rubocop_todo.yml M tests/browser/features/step_definitions/special_content_translation_steps.rb 2 files changed, 3 insertions(+), 8 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3efff31..70fdca6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -9,11 +9,6 @@ Lint/AmbiguousRegexpLiteral: Enabled: false -# Offense count: 4 -# Cop supports --auto-correct. -Lint/UnusedBlockArgument: - Enabled: false - # Offense count: 36 # Configuration parameters: AllowURI, URISchemes. Metrics/LineLength: diff --git a/tests/browser/features/step_definitions/special_content_translation_steps.rb b/tests/browser/features/step_definitions/special_content_translation_steps.rb index 6aaf192..ff5704a 100644 --- a/tests/browser/features/step_definitions/special_content_translation_steps.rb +++ b/tests/browser/features/step_definitions/special_content_translation_steps.rb @@ -1,4 +1,4 @@ -Given(/^I am on the content translation page in a wiki in (.+?), translating the page (.+?) to (.+?)$/) do |source_language, page_name, target_language| +Given(/^I am on the content translation page in a wiki in (.+?), translating the page (.+?) to (.+?)$/) do |_source_language, page_name, target_language| language_code = { Danish = da, English = en, @@ -31,7 +31,7 @@ on(ContentTranslationPage).column(column_type).should_not exist end -Then(/^I see a (.*?) link that points to the page (.*?) on the same wiki$/) do |link_name, page_title| +Then(/^I see a (.*?) link that points to the page (.*?) on the same wiki$/) do |_link_name, page_title| page_title_in_url = page_title.gsub( , _) on(ContentTranslationPage).view_page.attribute_value(href).should end_with(page_title_in_url) end @@ -96,7 +96,7 @@ on(ContentTranslationPage).column(column_type).attribute_value(dir).should == direction end -Then(/^the first version in the history of the page (.+?) should have the tag (.+?)$/) do |page_title, tag_name| +Then(/^the first version in the history of the page (.+?) should have the tag (.+?)$/) do |_page_title, _tag_name| visit(TranslatedPageHistory).contenttranslation_tag_element.should be_visible end -- To view, visit https://gerrit.wikimedia.org/r/169363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic17fa0f6b3c2af0a4c3e75f6c847a6c033029b03 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistent SiteLink naming and dead code removed - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/172541 Change subject: Consistent SiteLink naming and dead code removed .. Consistent SiteLink naming and dead code removed I started this patch with uppercasing some L in $siteLink variable names and cleaned some more code I came accross while doing this. Change-Id: I176df356f2f6a48a79d35327c3786597ed9923fd --- M lib/includes/serializers/AliasSerializer.php M lib/includes/serializers/ByPropertyListSerializer.php M lib/includes/serializers/ByPropertyListUnserializer.php M lib/includes/serializers/ClaimsSerializer.php M lib/includes/serializers/DescriptionSerializer.php M lib/includes/serializers/EntitySerializer.php M lib/includes/serializers/ItemSerializer.php M lib/includes/serializers/LabelSerializer.php M lib/includes/serializers/ListSerializer.php M lib/includes/serializers/ListUnserializer.php M lib/includes/serializers/MultilingualSerializer.php M lib/includes/serializers/ReferenceSerializer.php M lib/includes/serializers/SerializerObject.php M lib/includes/serializers/SiteLinkSerializer.php M lib/includes/serializers/SnakSerializer.php M lib/tests/phpunit/serializers/SiteLinkSerializerTest.php M lib/tests/phpunit/store/SiteLinkTableTest.php M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php M repo/includes/api/EditEntity.php M repo/includes/api/ResultBuilder.php M repo/includes/specials/SpecialDispatchStats.php M repo/includes/specials/SpecialItemResolver.php M repo/tests/phpunit/includes/api/GetEntitiesTest.php M repo/tests/phpunit/includes/api/ResultBuilderTest.php M repo/tests/phpunit/includes/api/SetSiteLinkTest.php 25 files changed, 111 insertions(+), 146 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/41/172541/1 diff --git a/lib/includes/serializers/AliasSerializer.php b/lib/includes/serializers/AliasSerializer.php index 9cf8b4f..8fef354 100644 --- a/lib/includes/serializers/AliasSerializer.php +++ b/lib/includes/serializers/AliasSerializer.php @@ -18,17 +18,6 @@ class AliasSerializer extends SerializerObject implements Unserializer { /** -* Constructor. -* -* @since 0.4 -* -* @param SerializationOptions $options -*/ - public function __construct( SerializationOptions $options = null ) { - parent::__construct( $options ); - } - - /** * Returns a serialized array of aliases. * * @since 0.4 @@ -136,4 +125,5 @@ return $aliases; } + } diff --git a/lib/includes/serializers/ByPropertyListSerializer.php b/lib/includes/serializers/ByPropertyListSerializer.php index 86bce1a..8c4e5e6 100644 --- a/lib/includes/serializers/ByPropertyListSerializer.php +++ b/lib/includes/serializers/ByPropertyListSerializer.php @@ -20,29 +20,27 @@ const OPT_ADD_LOWER_CASE_KEYS = 'addLowerCaseKeys'; /** -* @since 0.2 -* * @var string */ - protected $elementName; + private $elementName; /** -* @since 0.2 -* * @var Serializer */ - protected $elementSerializer; + private $elementSerializer; /** -* Constructor. -* * @since 0.2 * * @param string $elementName * @param Serializer $elementSerializer * @param SerializationOptions|null $options */ - public function __construct( $elementName, Serializer $elementSerializer, SerializationOptions $options = null ) { + public function __construct( + $elementName, + Serializer $elementSerializer, + SerializationOptions $options = null + ) { parent::__construct( $options ); $this-elementName = $elementName; diff --git a/lib/includes/serializers/ByPropertyListUnserializer.php b/lib/includes/serializers/ByPropertyListUnserializer.php index 820abf3..a645188 100644 --- a/lib/includes/serializers/ByPropertyListUnserializer.php +++ b/lib/includes/serializers/ByPropertyListUnserializer.php @@ -22,11 +22,9 @@ * * @var Serializer */ - protected $elementUnserializer; + private $elementUnserializer; /** -* Constructor. -* * @since 0.2 * * @param Unserializer $elementUnserializer diff --git a/lib/includes/serializers/ClaimsSerializer.php b/lib/includes/serializers/ClaimsSerializer.php index 4f2b08a..d2e04be 100644 --- a/lib/includes/serializers/ClaimsSerializer.php +++ b/lib/includes/serializers/ClaimsSerializer.php @@ -39,7 +39,7 @@ * * @since 0.2 * -* @param mixed $claims +* @param Claims $claims * * @return array * @throws InvalidArgumentException diff --git
[MediaWiki-commits] [Gerrit] Small code improvements - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: Small code improvements .. Small code improvements * Changed from array_search to in_array * CC Change-Id: I0c94926b8f2303c8d9ba31595565e81a65c66423 --- M NamespaceManager/NamespaceManager.class.php 1 file changed, 20 insertions(+), 13 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/NamespaceManager/NamespaceManager.class.php b/NamespaceManager/NamespaceManager.class.php index af120a3..de2ebc6 100644 --- a/NamespaceManager/NamespaceManager.class.php +++ b/NamespaceManager/NamespaceManager.class.php @@ -324,11 +324,13 @@ for ( $i = 0; $i $iResults; $i++ ) { $iNs = $aResults[$i]['id']; - $aResults[ $i ][ 'editable' ] = ( isset($bsSystemNamespaces[$iNs] ) ) ? false : (array_search( $iNs, $aUserNamespaces ) !== false); - $aResults[ $i ][ 'content' ] = (array_search( $iNs, $wgContentNamespaces ) !== false); - $aResults[ $i ][ 'searchable' ] = (isset( $wgNamespacesToBeSearchedDefault[ $iNs ] ) $wgNamespacesToBeSearchedDefault[ $iNs ]); - $aResults[ $i ][ 'subpages' ] = (isset( $wgNamespacesWithSubpages[ $iNs ] ) $wgNamespacesWithSubpages[ $iNs ]); - if ( array_search( $iNs, $aUserNamespaces ) !== false ) { + $aResults[$i][ 'editable' ] = ( isset( $bsSystemNamespaces[$iNs] ) ) + ? false + : in_array( $iNs, $aUserNamespaces ); + $aResults[$i]['content'] = in_array( $iNs, $wgContentNamespaces ); + $aResults[$i]['searchable'] = (isset( $wgNamespacesToBeSearchedDefault[$iNs] ) $wgNamespacesToBeSearchedDefault[$iNs]); + $aResults[$i]['subpages'] = ( isset( $wgNamespacesWithSubpages[$iNs] ) $wgNamespacesWithSubpages[$iNs] ); + if ( in_array( $iNs, $aUserNamespaces ) ) { $aResults[$i]['empty'] = $this-isNamespaceEmpty( $iNs ); } } @@ -477,7 +479,7 @@ } if ( !isset( $bsSystemNamespaces[($iNS)] ) strstr( $sNamespace, '_' . $wgContLang-getNsText( NS_TALK ) ) ) { - $aUserNamespaces[ $iNS ] = array( + $aUserNamespaces[$iNS] = array( 'name' = $aUserNamespaces[$iNS]['name'], 'alias' = str_replace( '_' . $wgContLang-getNsText( NS_TALK ), '_talk', $sNamespace ), ); @@ -525,7 +527,7 @@ global $wgContLang; $aUserNamespaces = self::getUserNamespaces( true ); $aNamespacesToRemove = array( array( $iNS, 0 ) ); - $sNamespace = $aUserNamespaces[ $iNS ][ 'name' ]; + $sNamespace = $aUserNamespaces[$iNS][ 'name' ]; if ( !strstr( $sNamespace, '_'.$wgContLang-getNsText( NS_TALK ) ) ) { if ( isset( $aUserNamespaces[ ($iNS + 1) ] ) strstr( $aUserNamespaces[ ($iNS + 1) ][ 'name' ], '_'.$wgContLang-getNsText( NS_TALK ) ) ) { @@ -597,20 +599,25 @@ } $sConfigContent = file_get_contents( BSROOTDIR . DS . 'config' . DS . 'nm-settings.php' ); $aUserNamespaces = array(); - //if ( preg_match_all( '%// START Namespace ([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*).*define\(NS_\1, ([0-9]*)\).*?// END Namespace \1%s', $sConfigContent, $aMatches, PREG_PATTERN_ORDER ) ) { + /*if ( preg_match_all( + '%// START Namespace ([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*).*define\(NS_\1, ([0-9]*)\).*?// END Namespace \1%s', + $sConfigContent, + $aMatches, + PREG_PATTERN_ORDER ) ) { +*/ if ( preg_match_all( '%define\(NS_([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*), ([0-9]*)\)%s', $sConfigContent, $aMatches, PREG_PATTERN_ORDER ) ) { $aUserNamespaces = $aMatches[ 2 ]; } if ( $bFullDetails ) { $aTmp = array(); foreach ( $aUserNamespaces as $iNS ) { - $aTmp[ $iNS ] = array( - 'content' = ( array_search( $iNS, $wgContentNamespaces ) !== false ), - 'subpages' = ( isset( $wgNamespacesWithSubpages[ $iNS ] ) $wgNamespacesWithSubpages[ $iNS ] ), - 'searched' = ( isset( $wgNamespacesToBeSearchedDefault[ $iNS ] ) $wgNamespacesToBeSearchedDefault[ $iNS ] ) + $aTmp[$iNS] = array( +
[MediaWiki-commits] [Gerrit] Add Plancake to 1.25wmf6 - change (mediawiki/vendor)
jenkins-bot has submitted this change and it was merged. Change subject: Add Plancake to 1.25wmf6 .. Add Plancake to 1.25wmf6 Change-Id: I75ea928e34fa065cd7d5e2f518b1a0812979ba89 --- A Plancake/EmailParser/LICENSE.txt A Plancake/EmailParser/PlancakeEmailParser.php A Plancake/EmailParser/README.txt A Plancake/EmailParser/composer.json A Plancake/EmailParser/tests/emails/0.txt A Plancake/EmailParser/tests/emails/1.txt A Plancake/EmailParser/tests/emails/2.txt A Plancake/EmailParser/tests/emails/from_ipad_with_attachment.txt A Plancake/EmailParser/tests/emails/subject_on_multiple_lines.txt A Plancake/EmailParser/tests/run_tests.php M composer.json M composer.lock M composer/ClassLoader.php M composer/autoload_classmap.php M composer/autoload_namespaces.php M composer/installed.json 16 files changed, 1,020 insertions(+), 14 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/Plancake/EmailParser/LICENSE.txt b/Plancake/EmailParser/LICENSE.txt new file mode 100644 index 000..65c5ca8 --- /dev/null +++ b/Plancake/EmailParser/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, this License refers to version 3 of the GNU Lesser +General Public License, and the GNU GPL refers to version 3 of the GNU +General Public License. + + The Library refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An Application is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A Combined Work is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the Linked +Version. + + The Minimal Corresponding Source for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The Corresponding Application Code for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice
[MediaWiki-commits] [Gerrit] Update vendor to include plancake - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/172542 Change subject: Update vendor to include plancake .. Update vendor to include plancake Change-Id: Ica81326d824654cd7e05f561e73157a961d0796c --- M vendor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/42/172542/1 diff --git a/vendor b/vendor index 60fe30b..4e919cd 16 --- a/vendor +++ b/vendor -Subproject commit 60fe30b74dd56d994c1b28bc6bf1f4ee8f99ca43 +Subproject commit 4e919cdfe171f0cbe69154b7f63be1074107d6b0 -- To view, visit https://gerrit.wikimedia.org/r/172542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica81326d824654cd7e05f561e73157a961d0796c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf6 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update BounceHandler to 1.25wmf6 HEAD - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/172543 Change subject: Update BounceHandler to 1.25wmf6 HEAD .. Update BounceHandler to 1.25wmf6 HEAD Change-Id: Ie090e98e51f5036bca6d5d30faf4c32244b4a13e --- M extensions/BounceHandler 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/172543/1 diff --git a/extensions/BounceHandler b/extensions/BounceHandler index 6fff4d5..0b20d15 16 --- a/extensions/BounceHandler +++ b/extensions/BounceHandler -Subproject commit 6fff4d5179c5ca0c56107178bcd998acdd260a4c +Subproject commit 0b20d153d231c96f904c7c7392e9000f23f8f60c -- To view, visit https://gerrit.wikimedia.org/r/172543 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie090e98e51f5036bca6d5d30faf4c32244b4a13e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf6 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update vendor to include plancake - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update vendor to include plancake .. Update vendor to include plancake Change-Id: Ica81326d824654cd7e05f561e73157a961d0796c --- M vendor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/vendor b/vendor index 60fe30b..4e919cd 16 --- a/vendor +++ b/vendor -Subproject commit 60fe30b74dd56d994c1b28bc6bf1f4ee8f99ca43 +Subproject commit 4e919cdfe171f0cbe69154b7f63be1074107d6b0 -- To view, visit https://gerrit.wikimedia.org/r/172542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica81326d824654cd7e05f561e73157a961d0796c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf6 Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed Style/Documentation RuboCop offense - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed Style/Documentation RuboCop offense .. Fixed Style/Documentation RuboCop offense Bug: 63307 Change-Id: Ic137a36f844dcb823cda33ec18d7dc662f4ed21d --- M .rubocop_todo.yml M tests/browser/features/support/pages/aftv5_page.rb 2 files changed, 1 insertion(+), 4 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8079646..c58ead1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -10,10 +10,6 @@ Metrics/LineLength: Max: 158 -# Offense count: 1 -Style/Documentation: - Enabled: false - # Offense count: 5 # Cop supports --auto-correct. Style/LeadingCommentSpace: diff --git a/tests/browser/features/support/pages/aftv5_page.rb b/tests/browser/features/support/pages/aftv5_page.rb index cac9a79..de57316 100644 --- a/tests/browser/features/support/pages/aftv5_page.rb +++ b/tests/browser/features/support/pages/aftv5_page.rb @@ -11,6 +11,7 @@ # require page-object +# AFTv5 page object class AFTv5Page include PageObject -- To view, visit https://gerrit.wikimedia.org/r/172535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic137a36f844dcb823cda33ec18d7dc662f4ed21d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Lubaochuan lubaoch...@gmail.com Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update BounceHandler to 1.25wmf7 HEAD - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/172544 Change subject: Update BounceHandler to 1.25wmf7 HEAD .. Update BounceHandler to 1.25wmf7 HEAD Change-Id: Ie6cbea9eff3d1040824b3e83d5dedd53f076874c --- M extensions/BounceHandler 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/172544/1 diff --git a/extensions/BounceHandler b/extensions/BounceHandler index 2b5812e..498ada2 16 --- a/extensions/BounceHandler +++ b/extensions/BounceHandler -Subproject commit 2b5812eb2dcbbf949669d51f226e2271c53595ea +Subproject commit 498ada23c595d3c390f4ae3243ac85ebfc390bdf -- To view, visit https://gerrit.wikimedia.org/r/172544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6cbea9eff3d1040824b3e83d5dedd53f076874c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf7 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update BounceHandler to 1.25wmf7 HEAD - change (mediawiki/core)
Reedy has submitted this change and it was merged. Change subject: Update BounceHandler to 1.25wmf7 HEAD .. Update BounceHandler to 1.25wmf7 HEAD Change-Id: Ie6cbea9eff3d1040824b3e83d5dedd53f076874c --- M extensions/BounceHandler 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/extensions/BounceHandler b/extensions/BounceHandler index 2b5812e..498ada2 16 --- a/extensions/BounceHandler +++ b/extensions/BounceHandler -Subproject commit 2b5812eb2dcbbf949669d51f226e2271c53595ea +Subproject commit 498ada23c595d3c390f4ae3243ac85ebfc390bdf -- To view, visit https://gerrit.wikimedia.org/r/172544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6cbea9eff3d1040824b3e83d5dedd53f076874c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf7 Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add irc to the allowed URL schemas - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/172545 Change subject: Add irc to the allowed URL schemas .. Add irc to the allowed URL schemas I considered adding this to the operations/mediawiki-config, but why not simply allow irc by default? Please note that I currently don't want to add mailto by default, mainly for privacy reasons. Needs Ib9daa61. Bug: 72924 Change-Id: I86cff20d3826f90cdbb3086975b5fa8be4a24eac --- M lib/config/WikibaseLib.default.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/172545/1 diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index 37240c8..d65c575 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -101,7 +101,7 @@ // URL schemes allowed for values of the URL type. // Supported types include 'http', 'https', 'ftp', and 'mailto'. - 'urlSchemes' = array( 'http', 'https', 'ftp' ) + 'urlSchemes' = array( 'ftp', 'http', 'https', 'irc' ) ); // experimental stuff -- To view, visit https://gerrit.wikimedia.org/r/172545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86cff20d3826f90cdbb3086975b5fa8be4a24eac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] txstatsd/graphite: switch back to package - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/172546 Change subject: txstatsd/graphite: switch back to package .. txstatsd/graphite: switch back to package require_package interacts badly (with require = Package[]?) and makes puppet fail non-deterministically (!) on hosts, revert back to package. note this means that txstatsd is missing python-carbon dependency when installed on hosts that don't include graphite. Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7 --- M modules/graphite/manifests/init.pp M modules/graphite/manifests/web.pp M modules/txstatsd/manifests/init.pp 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/46/172546/1 diff --git a/modules/graphite/manifests/init.pp b/modules/graphite/manifests/init.pp index 6502af7..a27918a 100644 --- a/modules/graphite/manifests/init.pp +++ b/modules/graphite/manifests/init.pp @@ -14,7 +14,7 @@ $storage_aggregation = {}, $storage_dir = '/var/lib/carbon', ) { -require_package('graphite-carbon', 'python-whisper') +package { ['graphite-carbon', 'python-whisper']: } $carbon_service_defaults = { log_updates = false, diff --git a/modules/graphite/manifests/web.pp b/modules/graphite/manifests/web.pp index 1572609..9de4aba 100644 --- a/modules/graphite/manifests/web.pp +++ b/modules/graphite/manifests/web.pp @@ -45,7 +45,7 @@ ) { include ::graphite -require_package('memcached', 'python-memcache', 'graphite-web') +package { ['memcached', 'python-memcache', 'graphite-web']: } file { '/etc/graphite/cors.py': source = 'puppet:///modules/graphite/cors.py', diff --git a/modules/txstatsd/manifests/init.pp b/modules/txstatsd/manifests/init.pp index 5df52c0..1b8923f 100644 --- a/modules/txstatsd/manifests/init.pp +++ b/modules/txstatsd/manifests/init.pp @@ -23,7 +23,7 @@ # } # class txstatsd($settings) { -require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon') +package { ['python-txstatsd', 'python-twisted-web']: } file { '/etc/init/txstatsd.conf': source = 'puppet:///modules/txstatsd/txstatsd.conf', -- To view, visit https://gerrit.wikimedia.org/r/172546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Instance evaluate blocks for new environments - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Instance evaluate blocks for new environments .. Instance evaluate blocks for new environments Using instance evaluation for new environment contexts gives us a more compact DSL that's more congruent with how Cucumber evaluates its own step definitions. It also allows the user to receive the overridden configuration values as block arguments. It changes the following usage: When(/.../) do on_wiki(:b) do |env| as_user(:a) do |env| env.visit(LoginPage).login_with(env[:mediawiki_user], ...) end end end To a more natural and succinct: When(/.../) do on_wiki(:b) do as_user(:a) do |user, pass| visit(LoginPage).login_with(user, pass) end end end Change-Id: Id691e3a77c72445cfa9d3f4a2cbc270589703c6e --- M lib/mediawiki_selenium/environment.rb M spec/environment_spec.rb 2 files changed, 111 insertions(+), 53 deletions(-) Approvals: Hashar: Looks good to me, approved Zfilipin: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/lib/mediawiki_selenium/environment.rb b/lib/mediawiki_selenium/environment.rb index 737bf2d..eb6848e 100644 --- a/lib/mediawiki_selenium/environment.rb +++ b/lib/mediawiki_selenium/environment.rb @@ -55,8 +55,9 @@ # # @param id [Symbol] Alternative user ID. # -# @yield [env] -# @yieldparam env [Environment] Environment +# @yield [user, password] +# @yieldparam user [String] Alternative MediaWiki user. +# @yieldparam password [String] Alternative MediaWiki password. # # @return [Environment] # @@ -138,8 +139,7 @@ # @param id [Symbol] Browser session ID. # @param overrides [Hash] Browser configuration overrides. # -# @yield [env] -# @yieldparam env [Environment] Environment +# @yield [*args] Overridden browser configuration. # # @return [Environment] # @@ -201,10 +201,14 @@ # Executes the given block within the context of an environment that's # using the given alternative wiki URL and its corresponding API endpoint. # +# @example Visit a random page on wiki B +# on_wiki(:b) { visit(RandomPage) } +# # @param id [Symbol] Alternative wiki ID. # -# @yield [env] -# @yieldparam env [Environment] Environment +# @yield [wiki_url, api_url] +# @yieldparam wiki_url [String] Alternative wiki URL. +# @yieldparam api_url [String] Alternative API URL. # # @return [Environment] # @@ -258,15 +262,15 @@ # # @param id [Symbol] Alternative wiki ID. # -# @yield [env] -# @yieldparam env [Environment] Environment +# @yield [url] +# @yieldparam url [String] Wiki URL. # # @return [Environment] # def visit_wiki(id, blk) - on_wiki(id) do |env| -browser.goto env.wiki_url -blk.call(env) unless blk.nil? + on_wiki(id) do |url| +browser.goto url +instance_exec(url, blk) unless blk.nil? end end @@ -298,28 +302,30 @@ url end -# Yields a new environment using the alternative versions of the given -# configuration options. The alternative values are resolved by looking up -# options that correspond to the given ones but have the given ID -# appended. +# Executes the given block within the context of a new environment +# configured using the alternative versions of the given options. The +# alternative configuration values are resolved using the given ID and +# passed to the block as arguments. # # @example Overwrite :foo with the :b alternative -# # given an environment with { foo: x, foo_b: y, ... } -# env.with_alternative(:foo, :b) do |env| -# env # = { foo: y, ... } +# # given an environment with config { foo: x, foo_b: y, ... } +# with_alternative(:foo, :b) do |foo| +# self # = #Environment @config = { foo: y, ... } +# foo # = y # end # # @example Overwrite both :foo and :bar with the :b alternatives -# # given { foo: x, foo_b: y, bar: w, bar_b: z } -# env.with_alternative([:foo, :bar], :b) do |env| -# env # = { foo: y, bar: z, ... } +# # given an environment with config { foo: x, foo_b: y, bar: w, bar_b: z } +# with_alternative([:foo, :bar], :b) do |foo, bar| +# self # = #Environment @config = { foo: y, bar: z, ... } +# foo # = y +# bar # = z # end # -# @param names [Array|Symbol] Configuration option or options. +# @param names [Symbol|ArraySymbol] Configuration option or options. # @param id [Symbol] Alternative user ID. # -# @yield [env] -# @yieldparam env [Environment] The modified environment. +# @yield [*args] Values of the overridden configuration. # # @return
[MediaWiki-commits] [Gerrit] Add irc to the allowed URL schemas - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add irc to the allowed URL schemas .. Add irc to the allowed URL schemas I considered adding this to the operations/mediawiki-config, but why not simply allow irc by default? Please note that I currently don't want to add mailto by default, mainly for privacy reasons. Needs Ib9daa61. Bug: 72924 Change-Id: I86cff20d3826f90cdbb3086975b5fa8be4a24eac --- M lib/config/WikibaseLib.default.php 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index 37240c8..1e68026 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -99,9 +99,8 @@ 'wikibase-item', ), - // URL schemes allowed for values of the URL type. - // Supported types include 'http', 'https', 'ftp', and 'mailto'. - 'urlSchemes' = array( 'http', 'https', 'ftp' ) + // URL schemes allowed for URL values. See UrlSchemeValidators for a full list. + 'urlSchemes' = array( 'ftp', 'http', 'https', 'irc' ) ); // experimental stuff -- To view, visit https://gerrit.wikimedia.org/r/172545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86cff20d3826f90cdbb3086975b5fa8be4a24eac Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move templates from lib to repo - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/172547 Change subject: Move templates from lib to repo .. Move templates from lib to repo I'd like to try to refactor the hook setup and TemplateRegistry afterwards in a separate patch. This change creates a situation where lib depends on stuff in repo. I do it like that because lib/resources/jquery.wikibase/ is subject to a lot of pending changes, while these files are probably not touched currently. Change-Id: Ic79abfbc6aa67320070061008b3a5d81d6bc5f41 --- M lib/WikibaseLib.php M lib/resources/Resources.php M lib/tests/qunit/resources.php M repo/Wikibase.hooks.php M repo/Wikibase.php R repo/includes/Template.php R repo/includes/TemplateRegistry.php R repo/includes/modules/TemplateModule.php M repo/resources/Resources.php R repo/resources/jquery.ui/jquery.ui.TemplatedWidget.js R repo/resources/templates.js R repo/resources/templates.php R repo/tests/phpunit/TemplateRegistryTest.php R repo/tests/phpunit/TemplateTest.php A repo/tests/qunit/resources.php R repo/tests/qunit/templates.tests.js 16 files changed, 105 insertions(+), 62 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/47/172547/1 diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php index afe7ad9..543c842 100644 --- a/lib/WikibaseLib.php +++ b/lib/WikibaseLib.php @@ -95,43 +95,6 @@ // @codeCoverageIgnoreEnd }; - /** -* Called when setup is done. This is somewhat ugly, find a better time to register templates. -* @see https://www.mediawiki.org/wiki/Manual:Hooks/SetupAfterCache -* -* @return bool -*/ - $wgHooks['SetupAfterCache'][] = function() { - \Wikibase\TemplateRegistry::singleton()-addTemplates( include( __DIR__ . /resources/templates.php ) ); - return true; - }; - - /** -* Shorthand function to retrieve a template filled with the specified parameters. -* -* important! note that the Template class does not escape anything. -* be sure to escape your params before using this function! -* -* @since 0.2 -* -* @param $key string template key -* Varargs: normal template parameters -* -* @return string -*/ - function wfTemplate( $key /*...*/ ) { - $params = func_get_args(); - array_shift( $params ); - - if ( isset( $params[0] ) is_array( $params[0] ) ) { - $params = $params[0]; - } - - $template = new \Wikibase\Template( \Wikibase\TemplateRegistry::singleton(), $key, $params ); - - return $template-render(); - } - // Resource Loader Modules: $wgResourceModules = array_merge( $wgResourceModules, include( __DIR__ . /resources/Resources.php ) ); diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index bd7ce2a..fbb29e9 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -66,11 +66,6 @@ ) ), - 'wikibase.templates' = $moduleTemplate + array( - 'class' = 'Wikibase\TemplateModule', - 'scripts' = 'templates.js', - ), - 'wikibase' = $moduleTemplate + array( 'scripts' = array( 'wikibase.js', @@ -152,17 +147,6 @@ 'jquery.effects.blind', 'jquery.inputautoexpand', 'jquery.ui.widget', - ), - ), - - 'jquery.ui.TemplatedWidget' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.TemplatedWidget.js', - ), - 'dependencies' = array( - 'wikibase.templates', - 'jquery.ui.widget', - 'util.inherit', ), ), diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php index 6031765..2f58d55 100644 --- a/lib/tests/qunit/resources.php +++ b/lib/tests/qunit/resources.php @@ -135,15 +135,6 @@ ), ), - 'templates.tests' = $moduleBase + array( - 'scripts' = array( - 'templates.tests.js', - ), - 'dependencies' = array( - 'wikibase.templates', - ), - ), - 'wikibase.Site.tests' = $moduleBase + array( 'scripts' = array(
[MediaWiki-commits] [Gerrit] Merge useful scenarios from dialog.feature to red_link_dialo... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Merge useful scenarios from dialog.feature to red_link_dialog.feature .. Merge useful scenarios from dialog.feature to red_link_dialog.feature Change-Id: Ia4f152a6bf6a7ee14666aca91008db63f15a99a4 --- D tests/browser/features/dialog.feature M tests/browser/features/red_link_dialog.feature M tests/browser/features/red_link_logged_in.feature 3 files changed, 16 insertions(+), 53 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified Objections: Nikerabbit: There's a problem with this change, please improve diff --git a/tests/browser/features/dialog.feature b/tests/browser/features/dialog.feature deleted file mode 100644 index e06e46c..000 --- a/tests/browser/features/dialog.feature +++ /dev/null @@ -1,53 +0,0 @@ -@firefox @login -Feature: New Page dialog - - As a wiki editor - I can see a dialog when I click on the red link in the list of interlanguage links on the content page, - so that I can see the option to create the translation of the content from scratch - - Design: - - http://pauginer.github.io/prototype-uls/#mies - - Backgroud: -Given I am logged in - And I am on the English article of Ludwig Mies van der Rohe - And I have reset my preferences - And I set Nederlands as the interface language -When I click on the red link to Nederlands on the list of interlanguage links -Then I see a New Page dialog - - Scenario: Clicking on the New Page dialog gives an option to start a translation from scratch -Then I see a input box to write the title of the content in target language in the dialog - And I see a Create from scratch button in the dialog - And I see a Translate from English button in the dialog - - Scenario: Clicking on the Translate from button opens the Universal Language Selector -Given I see a Translate from split button in the dialog -When I click on the second part of the Translate from button -Then I see the Universal Language Selector - - Scenario: Clicking on the Translate from button helps the user to change the source language -Given I see a Translate from split button in the dialog - And I click on the second part of the Translate from button - And I see the Universal Language Selector -When I select Malayalam from the Universal Language Selector -Then I see a Translate from Malayalam button in the dialog - And I do not see the Universal Language Selector anymore - - Scenario: Clicking on the Create from scratch button takes the user to Special:ContentTranslation -Given I see a input box to write the title of the content in target language in the dialog - And I see a Create from scratch button in the dialog -When I enter the title Ludwig Mies van der Rohe in the input box - And I click the Create from scratch button in the dialog -Then I see the page Special:ContentTranslation - And I see the source pane title as Ludwig Mies van der Rohe - And I see the translation pane title as Ludwig Mies van der Rohe - - Scenario: Keeping the the input box blank makes the title of the translation pane same as the source pane -Given I see a input box to write the title of the content in the target language in the dialog - And I see a Create from scratch button in the dialog -When I keep the input box blank - And I click on the Create from Scratch button in the dialog -Then I see the page Special:ContentTranslation - And I see the source pane title as Ludwig Mies van der Rohe - And I see the translation pane title as Ludwig Mies van der Rohe diff --git a/tests/browser/features/red_link_dialog.feature b/tests/browser/features/red_link_dialog.feature index 4fe39d6..769e3a6 100644 --- a/tests/browser/features/red_link_dialog.feature +++ b/tests/browser/features/red_link_dialog.feature @@ -41,6 +41,7 @@ When I write Translated title in the input box in the red link dialog And I click the Translate from English button Then the Content translation page should open + And the language code of the source column should be en And the language code of the translation column should be nl And the name of the page should appear in the source column And the title in the translation column should be Translated title @@ -58,3 +59,17 @@ Then the page creation page should open And the name Translated title should appear in the main title And the language of the editing area should be nl + + Scenario: Selecting a different language to translate from +When I click on the second part of the Translate from button + And I select da as my source language +Then in the dialog for creating a page in Nederlands I should see a Translate from Dansk button + And I do not see the ULS panel for selecting
[MediaWiki-commits] [Gerrit] Debug mode - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged. Change subject: Debug mode .. Debug mode Override Wikidata id for the current page by appending wikidataid=Q... to the URL. Change-Id: Ib457201c0cb40b837a40c80df0c88556ef838b63 --- M WikiGrok.php M includes/Hooks.php 2 files changed, 11 insertions(+), 3 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/WikiGrok.php b/WikiGrok.php index e02d711..6d90f78 100644 --- a/WikiGrok.php +++ b/WikiGrok.php @@ -96,3 +96,8 @@ * Fast campaign cache expiry in seconds */ $wgWikiGrokFastCampaignsCacheTime = 60 * 60 * 24; // 1 day + +/** + * Enables developer mode that allows to override Wikidata item id for the current page + */ +$wgWikiGrokDebug = false; diff --git a/includes/Hooks.php b/includes/Hooks.php index bc97e81..6b6c8af 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -56,14 +56,17 @@ $config = self::getConfig(); $campaigns = new QuestionPicker( $config ); - $list = - self::filterCampaigns( + if ( $config-get( 'WikiGrokDebug' ) ) { + $item = $out-getRequest()-getText( 'wikidataid', $item ); + } + + $list = self::filterCampaigns( unserialize( $prop ), $config-get( 'WikiGrokSlowCampaigns' ) ) + self::filterCampaigns( $campaigns-getFastQuestions( $out-getTitle(), $item ), - $config-get( 'WikiGrokFastCampaigns') + $config-get( 'WikiGrokFastCampaigns' ) ); if ( $list ) { $out-addJsConfigVars( 'wgWikiGrokCampaigns', $list ); -- To view, visit https://gerrit.wikimedia.org/r/171453 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib457201c0cb40b837a40c80df0c88556ef838b63 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/WikiGrok Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Kaldari rkald...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: Robmoen rm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FEAT] Site: Search for interwiki prefix for a site - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/172548 Change subject: [FEAT] Site: Search for interwiki prefix for a site .. [FEAT] Site: Search for interwiki prefix for a site This returns al interwiki prefixes redirecting to a site from the original site. It is like the reverse of APISite.interwiki. This also changes the behaviour that now all sites are cached. So when requesting the site for an interwiki prefix it previously had only cached that site to that prefix. Change-Id: Id2b889ccaf3c3f122429d59f5cf064855b0b4fea --- M pywikibot/site.py 1 file changed, 54 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/48/172548/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index ba1b00c..b801536 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -597,6 +597,19 @@ return [lang for lang in self.languages() if lang[:1].upper() + lang[1:] not in nsnames] +def _cache_interwikimap(self, refresh=False): +Cache the interwikimap with usable site instances. +# _iw_sites is a local cache to return a APISite instance depending +# on the interwiki prefix of that site +if refresh or not hasattr(self, '_iw_sites'): +self._iw_sites = {} +for iw in self.siteinfo['interwikimap']: +try: +site = (pywikibot.Site(url=iw['url']), 'local' in iw) +except Error: +site = (None, False) +self._iw_sites[iw['prefix']] = site + def interwiki(self, prefix): Return the site for a corresponding interwiki prefix. @@ -605,30 +618,51 @@ doesn't match any of the existing families. @raise KeyError: if the prefix is not an interwiki prefix. -# _iw_sites is a local cache to return a APISite instance depending -# on the interwiki prefix of that site -if not hasattr(self, '_iw_sites'): -self._iw_sites = {} +self._cache_interwikimap() if prefix in self._iw_sites: site = self._iw_sites[prefix] -else: -for interwiki in self.siteinfo['interwikimap']: -if interwiki['prefix'] == prefix: -break +if site[0]: +return site[0] else: -raise KeyError( -u'{0}' is not an interwiki prefix..format(prefix)) -try: -site = (pywikibot.Site(url=interwiki['url']), -'local' in interwiki) -except Error: -site = (None, False) -self._iw_sites[prefix] = site -if site[0]: -return site[0] +raise SiteDefinitionError( +uNo family/site found for prefix '{0}'.format(prefix)) else: -raise SiteDefinitionError( -uNo family/site found for prefix '{0}'.format(prefix)) +raise KeyError(u'{0}' is not an interwiki prefix..format(prefix)) + +def interwiki_prefix(self, other_site): + +Return the interwiki prefixes going to that site. + +The interwiki prefixes are ordered first by length (shortest first) +and then alphabetically. The first entry might be different the +code if both sites belong to the same family and there is such prefix. + +@param other_site: The other site +@type other_site: L{BaseSite} +@return: The interwiki prefixes +@rtype: list (guaranteed to be not empty) +@raise KeyError: if there is no interwiki prefix for that site. + +assert(other_site is not None) +self._cache_interwikimap() +prefixes = set() +for prefix, site in self._iw_sites.items(): +if site[0] == other_site: +prefixes.add(prefix) +if prefixes: +if (self.family == other_site.family and +other_site.code in prefixes): +special = True +prefixes.remove(other_site.code) +else: +special = False +prefixes = sorted(prefixes, key=lambda p: (len(p), p)) +if special: +prefixes = [other_site.code] + prefixes +return prefixes +else: +raise KeyError( +uThere is no interwiki prefix to '{0}'.format(other_site)) def local_interwiki(self, prefix): -- To view, visit https://gerrit.wikimedia.org/r/172548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2b889ccaf3c3f122429d59f5cf064855b0b4fea Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de
[MediaWiki-commits] [Gerrit] swift: report statsd data to localhost - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/172549 Change subject: swift: report statsd data to localhost .. swift: report statsd data to localhost this is similar to Ia95564b1b but for the legacy swift puppet module/role in eqiad and esams Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0 --- M manifests/role/swift.pp M manifests/swift.pp 2 files changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/172549/1 diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp index 55e315b..3cdc702 100644 --- a/manifests/role/swift.pp +++ b/manifests/role/swift.pp @@ -84,7 +84,7 @@ } class proxy inherits role::swift::eqiad-prod { class { '::swift::proxy': -statsd_host = 'statsd.eqiad.wmnet', +statsd_host = 'localhost', statsd_metric_prefix = swift.eqiad-prod.${::hostname}, bind_port= '80', proxy_address= 'http://ms-fe.eqiad.wmnet', @@ -110,6 +110,14 @@ include role::swift::icehouse include ::swift_new::params include ::swift_new::container_sync + +class { '::txstatsd': +settings = { +statsd = { +'carbon-cache-host' = 'graphite-in.eqiad.wmnet', +}, +}, +} } class storage inherits role::swift::eqiad-prod { include ::swift::storage @@ -117,6 +125,14 @@ include role::swift::icehouse include ::swift_new::params include ::swift_new::container_sync + +class { '::txstatsd': +settings = { +statsd = { +'carbon-cache-host' = 'graphite-in.eqiad.wmnet', +}, +}, +} } } class esams-prod inherits role::swift::base { @@ -195,7 +211,7 @@ } class proxy inherits role::swift::esams-prod { class { '::swift::proxy': -statsd_host = 'statsd.eqiad.wmnet', +statsd_host = 'localhost', statsd_metric_prefix = swift.esams-prod.${::hostname}, bind_port= '80', proxy_address= 'http://ms-fe.esams.wmnet', @@ -217,11 +233,27 @@ host = 'ms-fe.esams.wmnet', } include role::swift::icehouse + +class { '::txstatsd': +settings = { +statsd = { +'carbon-cache-host' = 'graphite-in.eqiad.wmnet', +}, +}, +} } class storage inherits role::swift::esams-prod { include ::swift::storage include ::swift::storage::monitoring include role::swift::icehouse + +class { '::txstatsd': +settings = { +statsd = { +'carbon-cache-host' = 'graphite-in.eqiad.wmnet', +}, +}, +} } } diff --git a/manifests/swift.pp b/manifests/swift.pp index 84ccb19..13b7e5c 100644 --- a/manifests/swift.pp +++ b/manifests/swift.pp @@ -228,7 +228,7 @@ } class config ( -$statsd_host = 'statsd.eqiad.wmnet', +$statsd_host = 'localhost', $statsd_metric_prefix = swift.${::swift::base::cluster_name}.${::hostname} ){ require swift::storage::packages -- To view, visit https://gerrit.wikimedia.org/r/172549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] txstatsd/graphite: switch back to package - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: txstatsd/graphite: switch back to package .. txstatsd/graphite: switch back to package require_package interacts badly (with require = Package[]?) and makes puppet fail non-deterministically (!) on hosts, revert back to package. note this means that txstatsd is missing python-carbon dependency when installed on hosts that don't include graphite. Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7 --- M modules/graphite/manifests/init.pp M modules/graphite/manifests/web.pp M modules/txstatsd/manifests/init.pp 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Yuvipanda: Looks good to me, but someone else must approve Filippo Giunchedi: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/graphite/manifests/init.pp b/modules/graphite/manifests/init.pp index 6502af7..a27918a 100644 --- a/modules/graphite/manifests/init.pp +++ b/modules/graphite/manifests/init.pp @@ -14,7 +14,7 @@ $storage_aggregation = {}, $storage_dir = '/var/lib/carbon', ) { -require_package('graphite-carbon', 'python-whisper') +package { ['graphite-carbon', 'python-whisper']: } $carbon_service_defaults = { log_updates = false, diff --git a/modules/graphite/manifests/web.pp b/modules/graphite/manifests/web.pp index 1572609..9de4aba 100644 --- a/modules/graphite/manifests/web.pp +++ b/modules/graphite/manifests/web.pp @@ -45,7 +45,7 @@ ) { include ::graphite -require_package('memcached', 'python-memcache', 'graphite-web') +package { ['memcached', 'python-memcache', 'graphite-web']: } file { '/etc/graphite/cors.py': source = 'puppet:///modules/graphite/cors.py', diff --git a/modules/txstatsd/manifests/init.pp b/modules/txstatsd/manifests/init.pp index 5df52c0..1b8923f 100644 --- a/modules/txstatsd/manifests/init.pp +++ b/modules/txstatsd/manifests/init.pp @@ -23,7 +23,7 @@ # } # class txstatsd($settings) { -require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon') +package { ['python-txstatsd', 'python-twisted-web']: } file { '/etc/init/txstatsd.conf': source = 'puppet:///modules/txstatsd/txstatsd.conf', -- To view, visit https://gerrit.wikimedia.org/r/172546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Open up the WikiGrok A/B to alpha - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/172551 Change subject: Open up the WikiGrok A/B to alpha .. Open up the WikiGrok A/B to alpha Change-Id: I190716d7f68af9c8407b467399198173eddbab82 --- M javascripts/modules/wikigrok/WikiGrokAbTest.js M tests/qunit/modules/wikigrok/test_WikiGrokAbTest.js 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/51/172551/1 diff --git a/javascripts/modules/wikigrok/WikiGrokAbTest.js b/javascripts/modules/wikigrok/WikiGrokAbTest.js index a5fe732..69b2f94 100644 --- a/javascripts/modules/wikigrok/WikiGrokAbTest.js +++ b/javascripts/modules/wikigrok/WikiGrokAbTest.js @@ -24,7 +24,7 @@ this.isEnabled = startDate endDate ( startDate = now now = endDate ) - mode === 'beta'; + ( mode === 'alpha' || mode === 'beta' ); }, /** diff --git a/tests/qunit/modules/wikigrok/test_WikiGrokAbTest.js b/tests/qunit/modules/wikigrok/test_WikiGrokAbTest.js index ba3984e..66d3270 100644 --- a/tests/qunit/modules/wikigrok/test_WikiGrokAbTest.js +++ b/tests/qunit/modules/wikigrok/test_WikiGrokAbTest.js @@ -15,7 +15,7 @@ var dataProvider = [ [now + 86400, now + 86401, 'beta'], // startDate is in the future [now - 86400, now - 86401, 'beta'], // endDate in the past - [now - 86400, now + 86400, 'alpha'], // mode isn't beta + [now - 86400, now + 86400, 'stable'], // mode isn't alpha or beta ], test; @@ -30,6 +30,12 @@ assert.strictEqual( enabledTest.isEligible( wikiGrokUser ), true ); } ); + QUnit.test( 'isEligible() returns true when the mode is alpha and the user hasn\'t see WikiGrok as an anonymous user', 1, function ( assert ) { + var test = new WikiGrokAbTest( now - 86400, now + 86400, 'alpha' ); + + assert.strictEqual( test.isEligible( wikiGrokUser ), true ); + } ); + QUnit.test( 'getVersion() throws if the user isn\'t eligible to enter the test', 1, function ( assert ) { wikiGrokUser.hasAnonymousVersionCookie.returns( true ); -- To view, visit https://gerrit.wikimedia.org/r/172551 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I190716d7f68af9c8407b467399198173eddbab82 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make all truncatable text clickable when some text is untrun... - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/172550 Change subject: Make all truncatable text clickable when some text is untruncated .. Make all truncatable text clickable when some text is untruncated ...and re-truncate and close the panel on click. Also fixes a minor unrelated style bug which made truncate/untruncate more jarring than it had to be when the title was short. Change-Id: Ie0b3afb3833102b6a9812cb7fe2df78ec5eb8396 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/983 --- M resources/mmv/ui/mmv.ui.metadataPanel.js M resources/mmv/ui/mmv.ui.metadataPanel.less M resources/mmv/ui/mmv.ui.metadataPanelScroller.js 3 files changed, 38 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/50/172550/1 diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js b/resources/mmv/ui/mmv.ui.metadataPanel.js index 57ca9ab..154f37a 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanel.js +++ b/resources/mmv/ui/mmv.ui.metadataPanel.js @@ -62,9 +62,13 @@ .add( this.title.$ellipsis ) .add( this.creditField.$ellipsis ) .on( 'click.mmv-mp', function ( e ) { + var clickTargetIsLink = $( e.target ).is( 'a' ), + clickTargetIsTruncated = !!$( e.target ).closest( '.mw-mmv-ttf-truncated' ).length, + someTextisExpanded = !!$( e.target ).closest( '.mw-mmv-untruncated' ).length; + if ( - $( e.target ).is( 'a' ) // ignore clicks to external links - || !$( e.target ).closest( '.mw-mmv-ttf-truncated' ).length // text is not truncated + clickTargetIsLink || // don't interfere with clicks on links in the text + !clickTargetIsTruncated !someTextisExpanded // don't expand when non-truncated text is clicked ) { return; } @@ -74,7 +78,7 @@ $( this.$container ).on( 'mmv-metadata-open', function () { panel.revealTruncatedText( true ); } ).on( 'mmv-metadata-close', function () { - panel.hideTruncatedText(); + panel.hideTruncatedText( true ); } ); this.handleEvent( 'jq-fullscreen-change.lip', function() { @@ -718,9 +722,11 @@ }; /** -* Undoes changes made by revealTruncatedText(). +* Undoes changes made by revealTruncatedText() and closes the panel. +* @param {boolean} noScroll if set, do not scroll the panel (because the function was triggered from a +* scroll event in the first place) */ - MPP.hideTruncatedText = function () { + MPP.hideTruncatedText = function ( noScroll ) { if ( !this.$container.hasClass( 'mw-mmv-untruncated' ) ) { // avoid double-triggering return; @@ -728,6 +734,9 @@ this.title.shrink(); this.creditField.shrink(); this.$container.removeClass( 'mw-mmv-untruncated' ); + if ( this.scroller.panelIsOpen() !noScroll ) { + this.scroller.toggle( 'down' ); + } }; /** diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.less b/resources/mmv/ui/mmv.ui.metadataPanel.less index 125c767..306b38f 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanel.less +++ b/resources/mmv/ui/mmv.ui.metadataPanel.less @@ -30,7 +30,7 @@ .mw-mmv-title-para { @height: @metadatabar-above-fold-inner-height - 2 * @vertical-padding; // needs explicit height for text truncation logic - margin: 0 0 @horizontal-padding; // use margin instead of padding for bottom so text is not visible + margin: 0 0 @vertical-padding; // use margin instead of padding for bottom so text is not visible padding: @vertical-padding @horizontal-padding 0 @horizontal-padding; height: @height; line-height: @height; @@ -64,6 +64,10 @@ .fade-out-horizontal(@panel-above-fold-background-color); } } + + .mw-mmv-untruncated { + cursor: pointer; + } } .mw-mmv-credit { @@ -90,6 +94,10 @@ .fade-out-horizontal(@panel-below-fold-background-color); } } + + .mw-mmv-untruncated { + cursor: pointer; + } } .mw-mmv-title { diff --git a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js b/resources/mmv/ui/mmv.ui.metadataPanelScroller.js index
[MediaWiki-commits] [Gerrit] hiera: allow regex-based searches - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/172552 Change subject: hiera: allow regex-based searches .. hiera: allow regex-based searches This will allow us to put most host-specific definitions in one single, simple file. Change-Id: I74ce2e5d942eb1d46d043128d25b7ad45acb3908 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/puppetmaster/files/production.hiera.yaml M modules/wmflib/lib/hiera/backend/nuyaml_backend.rb 2 files changed, 59 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/52/172552/1 diff --git a/modules/puppetmaster/files/production.hiera.yaml b/modules/puppetmaster/files/production.hiera.yaml index 1600ea5..f2dc321 100644 --- a/modules/puppetmaster/files/production.hiera.yaml +++ b/modules/puppetmaster/files/production.hiera.yaml @@ -11,6 +11,7 @@ :datadir: /etc/puppet/private/hieradata :hierarchy: - hosts/%{::hostname} + - regex/%{::hostname} - %{::realm} - %{::site} - private/%{::site} diff --git a/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb b/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb index 2f4e376..f3a9613 100644 --- a/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb +++ b/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb @@ -21,7 +21,6 @@ # :expand_path be expanded when looking the file up on disk. This # allows both to have a more granular set of files, but also to avoid # unnecessary cache evictions for cached data. -# # === Example # # Say your hiera.yaml has defined @@ -40,6 +39,30 @@ # inside the file #{datadir}/module_data/passwords/mysql.yaml # # Unless very small, all files should be split up like this. +# +# == Regexp matching +# +# As multiple hosts may correspond to the same rules/configs in a +# large cluster, we allow to define a self-contained regex.yaml file +# in your datadir, where each different class of servers may be +# represented by a label and a corresponding regexp. +# +# === Example +# Say you have a lookup for cluster, and you have +#regex/%{hostname} in your hierarchy; also, let's say that your +# scope contains hostname = web1001.local. So if your regex.yaml +# file contains: +# +# databases: +# __regex: !ruby/regex '/db.*\.local/' +# cluster: db +# +# webservices: +# __regex: !ruby/regex '/^web.*\.local$/' +# cluster: www +# +# This will make it so that cluster will assume the value www +# given the regex matches the webservices stanza # # == Dynamic lookup # @@ -82,6 +105,11 @@ def get_path(key, scope, source) config_section = :nuyaml +# Special case: regex +if m = /^regex\//.match(source) + return key, Backend.datafile(config_section, scope, 'regex', yaml) +end + # Special case: 'private' repository. # We use a different datadir in this case. # Example: private/common will search in the common source @@ -110,6 +138,23 @@ return key, Backend.datafile(config_section, scope, source, yaml) end + def plain_lookup(key, data, scope) + return nil unless data.include?(key) + return Backend.parse_answer(data[key], scope) + end + + def regex_lookup(key, matchon, data, scope) +data.each do |label, datahash| + next unless datahash[:__regex].match(matchon) + next unless datahash.include?(key) + return Backend.parse_answer(data[key]) +end +return nil + rescue = detail +Hiera.debug(detail) +return nil + end + def lookup(key, scope, order_override, resolution_type) answer = nil @@ -127,31 +172,37 @@ dynsource ||= 'default' source += /#{dynsource} end - Hiera.debug(Loading info from #{source} for #{key}) lookup_key, yamlfile = get_path(key, scope, source) Hiera.debug(Searching for #{lookup_key} in #{yamlfile}) - next if yamlfile.nil? + return nil if yamlfile.nil? Hiera.debug(Loading file #{yamlfile}) - next unless File.exist?(yamlfile) + return nil unless File.exist?(yamlfile) data = @cache.read(yamlfile, Hash) do |content| YAML.load(content) end - next if data.empty? - next unless data.include?(lookup_key) + return nil if data.empty? + + if m = /regex\/(.*)/.match(source) +matchto = m[1] +new_answer = regex_lookup(lookup_key, matchto, data, scope) + else +new_answer = plain_lookup(key, data, scope) + end + next if new_aswer.nil? # Extra logging that we found the key. This can be outputted # multiple times if the resolution type is array or hash but that # should be expected as the logging will then tell
[MediaWiki-commits] [Gerrit] Introduce role::ganglia classes - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/172553 Change subject: Introduce role::ganglia classes .. Introduce role::ganglia classes Introducing role classes for ganglia, based on the ganglia_new module which also gets some new functionality. For now the role::ganglia::web exists only but more stuff needs to be migrated in the future. Update ganglia_new module to support: * gmetad configuration * rrdcached * Override the default gmetad upstart script for RRDCACHED support * gmetad configuration in the role * Some preliminary tests support * ganglia web frontend configuration Change-Id: Iedd12f64b8a733c8c9c7df706d1c33397754cc37 --- A manifests/role/ganglia.pp A modules/ganglia_new/manifests/gmetad.pp A modules/ganglia_new/manifests/gmetad/rrdcached.pp A modules/ganglia_new/manifests/web.pp A modules/ganglia_new/templates/conf_production.php.erb A modules/ganglia_new/templates/ganglia.wikimedia.org.erb A modules/ganglia_new/templates/gmetad.conf.erb A modules/ganglia_new/templates/gmetad.upstart A modules/ganglia_new/templates/rrdcached.default.erb A modules/ganglia_new/tests/Makefile A modules/ganglia_new/tests/gmetad.pp A modules/ganglia_new/tests/web.pp 12 files changed, 402 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/172553/1 diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp new file mode 100644 index 000..431c06b --- /dev/null +++ b/manifests/role/ganglia.pp @@ -0,0 +1,106 @@ +class role::ganglia::config { +# TODO: hiera this +$rra_sizes = 'RRA:AVERAGE:0.5:1:360 RRA:AVERAGE:0.5:24:245 RRA:AVERAGE:0.5:168:241 RRA:AVERAGE:0.5:672:241 RRA:AVERAGE:0.5:5760:371' + +$data_sources = { +'Video scalers eqiad'= 'tmh1001.eqiad.wmnet tmh1002.eqiad.wmnet', +'Image scalers eqiad'= 'mw1153.eqiad.wmnet mw1154.eqiad.wmnet', +'API application servers eqiad' = 'mw1114.eqiad.wmnet mw1115.eqiad.wmnet', +'Application servers eqaid' = 'mw1054.eqiad.wmnet mw1055.eqiad.wmnet', +'HHVM Appservers eqiad' = 'mw1017.eqiad.wmnet mw1018.eqiad.wmnet', +'Jobrunners eqiad' = 'mw1001.eqiad.wmnet mw1002.eqiad.wmnet', +'MySQL' = 'db1050.eqiad.wmnet', +'PDF servers eqiad' = 'ocg1001.eqiad.wmnet', +'Fundraising eqiad' = 'pay-lvs1001.frack.eqiad.wmnet pay-lvs1002.frack.eqiad.wmnet', +'SSL cluster esams' = 'hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org ssl3002.esams.wikimedia.org', +'Virtualization cluster eqiad' = 'labnet1001.eqiad.wmnet virt1000.wikimedia.org', +'Labs NFS cluster eqiad' = 'labstore1001.eqiad.wmnet labstore1003.eqiad.wmnet', +'MySQL eqiad'= 'db1053.eqiad.wmnet db1054.eqiad.wmnet db1057.eqiad.wmnet', +'LVS loadbalancers eqiad'= 'lvs1001.wikimedia.org lvs1002.wikimedia.org', +'LVS loadbalancers codfw'= 'install2001.wikimedia.org:10651 lvs2001.codfw.wmnet lvs2002.codfw.wmnet', +'Miscellaneous eqiad'= 'carbon.wikimedia.org ms1004.eqiad.wmnet', +'Miscellaneous codfw'= 'install2001.wikimedia.org:10657', +'Mobile caches eqiad'= 'cp1046.eqiad.wmnet cp1047.eqiad.wmnet', +'Mobile caches esams'= 'hooft.esams.wikimedia.org:11677', +'Bits caches eqiad' = 'cp1056.eqiad.wmnet cp1057.eqiad.wmnet', +'Upload caches eqiad'= 'cp1048.eqiad.wmnet cp1061.eqiad.wmnet', +'SSL cluster eqiad' = 'ssl1001.wikimedia.org ssl1002.wikimedia.org', +'Swift eqiad'= 'ms-fe1001.eqiad.wmnet ms-fe1002.eqiad.wmnet', +'Swift esams'= 'hooft.esams.wikimedia.org:11676', +'Swift codfw'= 'install2001.wikimedia.org:10676', +'Search eqiad' = 'search1001.eqiad.wmnet search1002.eqiad.wmnet', +'Bits caches esams' = 'hooft.esams.wikimedia.org:11670 cp3019.esams.wikimedia.org cp3020.esams.wikimedia.org', +'LVS loadbalancers esams'= 'hooft.esams.wikimedia.org:11651 lvs3001.esams.wmnet lvs3002.esams.wmnet', +'Miscellaneous esams'= 'hooft.esams.wikimedia.org:11657', +'Analytics cluster eqiad'= 'analytics1009.eqiad.wmnet analytics1010.eqiad.wmnet analytics1014.eqiad.wmnet', +'Memcached eqiad'= 'mc1001.eqiad.wmnet mc1002.eqiad.wmnet', +'Text caches esams' = 'hooft.esams.wikimedia.org:11669', +'Upload caches esams'= 'hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org cp3004.esams.wikimedia.org', +'Parsoid eqiad' = 'wtp1001.eqiad.wmnet
[MediaWiki-commits] [Gerrit] added i18n for log page - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review. https://gerrit.wikimedia.org/r/172554 Change subject: added i18n for log page .. added i18n for log page Change-Id: Iebc0ef2f299bd19c4ee992c41c512ca46c87025a --- M Review/languages/Review.i18n.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/54/172554/1 diff --git a/Review/languages/Review.i18n.php b/Review/languages/Review.i18n.php index 3b99ee4..1c360bd 100644 --- a/Review/languages/Review.i18n.php +++ b/Review/languages/Review.i18n.php @@ -146,6 +146,7 @@ 'bs-review-commentinputlabel'= 'Your comment', 'bs-review-ownercomment' = 'Comment of $1', 'bs-review-comments' = 'Comments', + 'log-show-hide-bs-review' = '$1 patrol log', //Permissions //'workflowedit' and 'workflowlist' don't need 'action-*'-messages as there @@ -330,6 +331,7 @@ 'bs-review-commentinputlabel'= 'Dein Kommentar', 'bs-review-ownercomment' = 'Kommentar von $1', 'bs-review-comments' = 'Kommentare', + 'log-show-hide-bs-review' = 'Review-Logbuch $1', //Permissions //'workflowedit' and 'workflowlist' don't need 'action-*'-messages as there -- To view, visit https://gerrit.wikimedia.org/r/172554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebc0ef2f299bd19c4ee992c41c512ca46c87025a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_22 Gerrit-Owner: Tweichart weich...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assign role::ganglia::web to uranium - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/172555 Change subject: Assign role::ganglia::web to uranium .. Assign role::ganglia::web to uranium This deprecates ganglia::web in production and adds rrdcached support for uranium Change-Id: Idb98668a2901d88e8f73741c55716bb3c3461e17 --- M manifests/site.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/172555/1 diff --git a/manifests/site.pp b/manifests/site.pp index 0a7adf3..ebcbf82 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -3039,7 +3039,7 @@ include standard include admin -include ganglia::web +include role::ganglia::web include misc::monitoring::views install_certificate{ 'ganglia.wikimedia.org': } -- To view, visit https://gerrit.wikimedia.org/r/172555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb98668a2901d88e8f73741c55716bb3c3461e17 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Turn MwEmbed loaderscripts into modules - change (mediawiki...MwEmbedSupport)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/172556 Change subject: [WIP] Turn MwEmbed loaderscripts into modules .. [WIP] Turn MwEmbed loaderscripts into modules Change-Id: Ib3360fa9271b9452cec5e86281c2859f7e0f464e --- M MwEmbedResourceManager.php 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MwEmbedSupport refs/changes/56/172556/1 diff --git a/MwEmbedResourceManager.php b/MwEmbedResourceManager.php index 0eb83aa..5c9fe3b 100644 --- a/MwEmbedResourceManager.php +++ b/MwEmbedResourceManager.php @@ -58,8 +58,9 @@ // Check for module loader: if ( is_file( $localResourcePath . '/' . $moduleName . '.loader.js' ) ) { - $resourceList[$moduleName . '.loader'] = array( - 'loaderScripts' = $moduleName . '.loader.js' + $resourceList['mw.' . $moduleName . '.loader'] = array( + 'scripts' = $moduleName . '.loader.js', + 'position' = 'top', ); } -- To view, visit https://gerrit.wikimedia.org/r/172556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3360fa9271b9452cec5e86281c2859f7e0f464e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MwEmbedSupport Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits