[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageSeries[master]: Replaced deprecated 'Article::getContent' usage
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330191 ) Change subject: Replaced deprecated 'Article::getContent' usage .. Replaced deprecated 'Article::getContent' usage Bug: T151973 Change-Id: I88b079a2f7367704578e0b0aaec684205ba2603b --- M includes/SPSSpecialSeriesEdit.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageSeries refs/changes/91/330191/1 diff --git a/includes/SPSSpecialSeriesEdit.php b/includes/SPSSpecialSeriesEdit.php index 8161404..c5a22a4 100644 --- a/includes/SPSSpecialSeriesEdit.php +++ b/includes/SPSSpecialSeriesEdit.php @@ -98,7 +98,8 @@ } $formArticle = new Article( $formTitle ); - $formDefinition = StringUtils::delimiterReplace( '', '', '', $formArticle->getContent() ); + $formArticleText = ContentHandler::getContentText( $formArticle->getContentObject() ); + $formDefinition = StringUtils::delimiterReplace( '', '', '', $formArticleText ); // formSubmitted $formSubmitted = false; -- To view, visit https://gerrit.wikimedia.org/r/330191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88b079a2f7367704578e0b0aaec684205ba2603b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticPageSeries Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageMaker[master]: Replaced deprecated 'Article::getContent()' usage
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330190 ) Change subject: Replaced deprecated 'Article::getContent()' usage .. Replaced deprecated 'Article::getContent()' usage Bug: T151973 Change-Id: Ic154bb3ce94a72faaffcfc8be38ea5bca1b30b6a --- M includes/models/SPM_OM_Template.php M includes/widgets/SPM_WFAjaxAccess.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageMaker refs/changes/90/330190/1 diff --git a/includes/models/SPM_OM_Template.php b/includes/models/SPM_OM_Template.php index 0c5fd8a..c065a88 100644 --- a/includes/models/SPM_OM_Template.php +++ b/includes/models/SPM_OM_Template.php @@ -47,7 +47,7 @@ return null; } - $text = $article->getContent(); + $text = ContentHandler::getContentText( $article->getContentObject() ); $len = strlen( $text ); $offset = 0; $content2 = ''; diff --git a/includes/widgets/SPM_WFAjaxAccess.php b/includes/widgets/SPM_WFAjaxAccess.php index 56e8dcd..04f0968 100644 --- a/includes/widgets/SPM_WFAjaxAccess.php +++ b/includes/widgets/SPM_WFAjaxAccess.php @@ -296,7 +296,7 @@ // $article = new Article( $tmpl_title ); // if ( !$article->exists() ) continue; // -// $text = $article->getContent(); +// $text = ContentHandler::getContentText( $article->getContent() ); // $len = strlen( $text ); // $offset = 0; // $content2 = ''; -- To view, visit https://gerrit.wikimedia.org/r/330190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic154bb3ce94a72faaffcfc8be38ea5bca1b30b6a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticPageMaker Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added $wgHTTPImportTimeout setting
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330171 ) Change subject: Added $wgHTTPImportTimeout setting .. Added $wgHTTPImportTimeout setting Bug: T17000 Change-Id: Ic97ae4faec173c32af38df4554831dca7068226b --- M RELEASE-NOTES-1.29 M includes/DefaultSettings.php M includes/import/ImportStreamSource.php 3 files changed, 18 insertions(+), 1 deletion(-) Approvals: TTO: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 14b5692..9fc0cbe 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -35,6 +35,8 @@ exceptions, largely so the API can handle them more sensibly. * Blocks created automatically by MediaWiki, such as for configured proxies or dnsbls, are now indicated as such and use a new i18n message when displayed. +* Added new $wgHTTPImportTimeout setting. Sets timeout for + downloading the XML dump during a transwiki import in seconds. === External library changes in 1.29 === diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 3274480..449e1c2 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -8056,6 +8056,12 @@ $wgHTTPTimeout = 25; /** + * Timeout for HTTP requests done internally for transwiki imports, in seconds. + * @since 1.29 + */ +$wgHTTPImportTimeout = 25; + +/** * Timeout for Asynchronous (background) HTTP requests, in seconds. */ $wgAsyncHTTPTimeout = 25; diff --git a/includes/import/ImportStreamSource.php b/includes/import/ImportStreamSource.php index e2e8dd5..0c12ebb 100644 --- a/includes/import/ImportStreamSource.php +++ b/includes/import/ImportStreamSource.php @@ -104,12 +104,21 @@ * @return Status */ static function newFromURL( $url, $method = 'GET' ) { + global $wgHTTPImportTimeout; wfDebug( __METHOD__ . ": opening $url\n" ); # Use the standard HTTP fetch function; it times out # quicker and sorts out user-agent problems which might # otherwise prevent importing from large sites, such # as the Wikimedia cluster, etc. - $data = Http::request( $method, $url, [ 'followRedirects' => true ], __METHOD__ ); + $data = Http::request( + $method, + $url, + [ + 'followRedirects' => true, + 'timeout' => $wgHTTPImportTimeout + ], + __METHOD__ + ); if ( $data !== false ) { $file = tmpfile(); fwrite( $file, $data ); -- To view, visit https://gerrit.wikimedia.org/r/330171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic97ae4faec173c32af38df4554831dca7068226b Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Divadsn Gerrit-Reviewer: Reedy Gerrit-Reviewer: TTO Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Removed deprecated 'UnknownAction' hook usage
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330168 ) Change subject: Removed deprecated 'UnknownAction' hook usage .. Removed deprecated 'UnknownAction' hook usage Bug: T54027 Change-Id: Iaec7aa5e6fbb1c53c69da84948d8648285774a10 --- M ContentAction/ContentAction.php M ContentAction/extension.json 2 files changed, 17 insertions(+), 17 deletions(-) Approvals: TTO: Looks good to me, approved jenkins-bot: Verified diff --git a/ContentAction/ContentAction.php b/ContentAction/ContentAction.php index 82aea21..553c905 100644 --- a/ContentAction/ContentAction.php +++ b/ContentAction/ContentAction.php @@ -8,10 +8,9 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -class ContentAction { - +class ContentAction extends FormlessAction { public static function onSkinTemplateNavigation( $skin, &$content_actions ) { - $action = $skin->getRequest->getText( 'action' ); + $action = $skin->getRequest()->getText( 'action' ); if ( $skin->getTitle()->getNamespace() != NS_SPECIAL ) { $content_actions['actions']['myact'] = array( @@ -23,17 +22,16 @@ return true; } - - public static function onUnknownAction( $action, $article ) { - $title = $article->getTitle(); - - if ( $action === 'myact' ) { - $article->getContext()->getOutput()->addWikiText( - 'The page name is ' . $title->getText() . ' and you are ' . $article->getUserText() - ); - return false; - } - - return true; + public function getName() { + return 'myact'; } + public function onView() { + } + + public function show() { + $this->getContext()->getOutput()->addWikiText( + 'The page name is ' . $this->getTitle()->getText() . ' and you are ' . $this->getUser()->getName() + ); + } + } diff --git a/ContentAction/extension.json b/ContentAction/extension.json index 47fea6c..6d6d265 100644 --- a/ContentAction/extension.json +++ b/ContentAction/extension.json @@ -9,11 +9,13 @@ ] }, "Hooks": { - "UnknownAction": "ContentAction::onUnknownAction", - "SkinTemplateNavigation": "ConentAction::onSkinTemplateNavigation" + "SkinTemplateNavigation": "ContentAction::onSkinTemplateNavigation" }, "AutoloadClasses": { "ContentAction": "ContentAction.php" }, + "Actions": { + "myact": "ContentAction" + }, "manifest_version": 2 } -- To view, visit https://gerrit.wikimedia.org/r/330168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaec7aa5e6fbb1c53c69da84948d8648285774a10 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Reedy Gerrit-Reviewer: TTO Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Replace `transform` with dedicated mixin
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330189 ) Change subject: Replace `transform` with dedicated mixin .. Replace `transform` with dedicated mixin Replacing `transform` with dedicated “GPU hack” mixin. Change-Id: Iac4acb6728ad82e2d834b703fd31ffd31a324908 --- M src/styles/widgets/ToggleSwitchWidget.less 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Prtksxna: Looks good to me, approved jenkins-bot: Verified diff --git a/src/styles/widgets/ToggleSwitchWidget.less b/src/styles/widgets/ToggleSwitchWidget.less index 78c9937..985ddb9 100644 --- a/src/styles/widgets/ToggleSwitchWidget.less +++ b/src/styles/widgets/ToggleSwitchWidget.less @@ -6,7 +6,7 @@ vertical-align: middle; overflow: hidden; .oo-ui-box-sizing( border-box ); - .oo-ui-transform( translateZ( 0 ) ); + .oo-ui-force-webkit-gpu(); &.oo-ui-widget-enabled { cursor: pointer; -- To view, visit https://gerrit.wikimedia.org/r/330189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac4acb6728ad82e2d834b703fd31ffd31a324908 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Esanders Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix broken LDAP based login
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330144 ) Change subject: Fix broken LDAP based login .. Fix broken LDAP based login Fixed that LDAP based login failed, if wiki used two or more domains. Bug: T90149 Change-Id: I819137c4592cf43608904a4d30a981d965dee1c3 --- M pywikibot/data/api.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 3b2ae9d..4b251eb 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3034,6 +3034,9 @@ lgname=self.login_name, lgpassword=self.password)) +if self.site.family.ldapDomain: +login_request['lgdomain'] = self.site.family.ldapDomain + # get token using meta=tokens if supported if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.27'): login_request["lgtoken"] = self.get_login_token() -- To view, visit https://gerrit.wikimedia.org/r/330144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I819137c4592cf43608904a4d30a981d965dee1c3 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Phantom42Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Mpaa Gerrit-Reviewer: Phantom42 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Replace `transform` with dedicated mixin
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330189 ) Change subject: Replace `transform` with dedicated mixin .. Replace `transform` with dedicated mixin Replacing `transform` with dedicated “GPU hack” mixin. Change-Id: Iac4acb6728ad82e2d834b703fd31ffd31a324908 --- M src/styles/widgets/ToggleSwitchWidget.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/89/330189/1 diff --git a/src/styles/widgets/ToggleSwitchWidget.less b/src/styles/widgets/ToggleSwitchWidget.less index 78c9937..985ddb9 100644 --- a/src/styles/widgets/ToggleSwitchWidget.less +++ b/src/styles/widgets/ToggleSwitchWidget.less @@ -6,7 +6,7 @@ vertical-align: middle; overflow: hidden; .oo-ui-box-sizing( border-box ); - .oo-ui-transform( translateZ( 0 ) ); + .oo-ui-force-webkit-gpu(); &.oo-ui-widget-enabled { cursor: pointer; -- To view, visit https://gerrit.wikimedia.org/r/330189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac4acb6728ad82e2d834b703fd31ffd31a324908 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: Remove deprecated PHP entry point for AFTv5
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330188 ) Change subject: Remove deprecated PHP entry point for AFTv5 .. Remove deprecated PHP entry point for AFTv5 Bug: T154411 Change-Id: Ibc9d0a438743f8dba04bf8642c2b3b8f4a558a7b --- D ArticleFeedbackv5.php M extension.json 2 files changed, 3 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/88/330188/1 diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php deleted file mode 100644 index f2310ee..000 --- a/ArticleFeedbackv5.php +++ /dev/null @@ -1,15 +0,0 @@ -https://www.mediawiki.org/wiki/Extension_registration for more details.' - ); - return true; -} else { - die( 'This version of the ArticleFeedbackv5 extension requires MediaWiki 1.25+' ); -} \ No newline at end of file diff --git a/extension.json b/extension.json index 3a2c09e..7873b88 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "Article Feedback", - "version": "5.2.0", + "version": "5.2.1", "author": [ "Greg Chiasson", "Reha Sterbin", @@ -15,7 +15,8 @@ "Ryan Kaldari", "Elizabeth M Smith", "Michael Jackson", - "Matthias Mullie" + "Matthias Mullie", + "Jack Phoenix" ], "license-name": "GPL-2.0+", "url": "https://www.mediawiki.org/wiki/Extension:ArticleFeedbackv5;, -- To view, visit https://gerrit.wikimedia.org/r/330188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc9d0a438743f8dba04bf8642c2b3b8f4a558a7b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: DONOTMERGE: Unit test scaffolding
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330187 ) Change subject: DONOTMERGE: Unit test scaffolding .. DONOTMERGE: Unit test scaffolding Change-Id: I4eebd605b9e310f58fabbb79dd5d311b87b244ed --- M tests/phpunit/includes/EditPageTest.php 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/330187/1 diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php index 5a01dc0..3dbf8f3 100644 --- a/tests/phpunit/includes/EditPageTest.php +++ b/tests/phpunit/includes/EditPageTest.php @@ -613,6 +613,25 @@ return array_merge( $tests, $testsWithAdam, $testsWithBerta ); } + public function provideAddWarningsToHtml() { + return [ + 'Hello', [], false, + 'Hello', [ 'warning' ], true + ]; + } + + /** +* @dataProvider provideAddWarningsToHtml +* @covers EditPage::addWarningsToHtml +*/ + public function testAddWarningsToHtml( $note, $warnings, $expected ) { + $ep = new EditPage(); + $newNote = $ed->addWarningsToHtml( $note, $warnings ); + // TODO: what test can do you do here that will always ensure expected and actual are the same? + $actual = true === false; + $this->assertEquals( $expected, $actual ); + } + /** * @dataProvider provideAutoMerge * @covers EditPage -- To view, visit https://gerrit.wikimedia.org/r/330187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4eebd605b9e310f58fabbb79dd5d311b87b244ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jdlrobson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace deprecated mediawiki.UI Less variables with current ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329793 ) Change subject: Replace deprecated mediawiki.UI Less variables with current ones .. Replace deprecated mediawiki.UI Less variables with current ones Replacing mediawiki.UI Less variables, which were deprecated since MW 1.24 with current ones. This is an intermediate step necessary to proceed in preparation of new WMUI Base variables. Also removing unnecessary custom login screen input border colors and exchange leftover constructive submit button with progressive background-color. Bug: T154362 Change-Id: I3e2e1438a92c77d9f7e3b914fcb2381073534a0a --- M resources/mobile.editor.ve/VisualEditorOverlay.less M resources/mobile.overlays/Overlay.less M resources/skins.minerva.special.userlogin.styles/userlogin.less 3 files changed, 3 insertions(+), 5 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, but someone else must approve jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.less b/resources/mobile.editor.ve/VisualEditorOverlay.less index 9b69745..19e54d7 100644 --- a/resources/mobile.editor.ve/VisualEditorOverlay.less +++ b/resources/mobile.editor.ve/VisualEditorOverlay.less @@ -86,7 +86,7 @@ .ve-init-mw-mobileArticleTarget-toolbar { @media all and ( min-width: @wgMFDeviceWidthDesktop ) { - border: 1px solid @colorGrayLighter; + border: 1px solid @colorGray13; border-width: 0 1px; } // Everything is measured in ems so the easiest way to scale diff --git a/resources/mobile.overlays/Overlay.less b/resources/mobile.overlays/Overlay.less index ea243fb..a1b1ee6 100644 --- a/resources/mobile.overlays/Overlay.less +++ b/resources/mobile.overlays/Overlay.less @@ -233,13 +233,13 @@ } .continue { - color: #fff; background-color: @colorProgressive; + color: #fff; } .submit { + background-color: @colorProgressive; color: #fff; - background-color: @colorConstructive; } h2 { diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less b/resources/skins.minerva.special.userlogin.styles/userlogin.less index 5f84221..0d4520d 100644 --- a/resources/skins.minerva.special.userlogin.styles/userlogin.less +++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less @@ -171,8 +171,6 @@ // Make the inputs look connected in mobile mode .mw-ui-input { - border: solid 1px @colorGrayLight; -
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Fix failing tests after adding tags parameter to core ApiUse...
TTO has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330186 ) Change subject: Fix failing tests after adding tags parameter to core ApiUserrights .. Fix failing tests after adding tags parameter to core ApiUserrights Broken after I4f6dacd0ddf7b45d62aff6f85c329bc15be27daf. Ideally the parameter would be unset in an overridden getAllowedParams(), but that would cause undefined variable errors. Change-Id: I2761820a3f52061361a15bc9d9a5927620edb5d1 --- M i18n/en.json M i18n/qqq.json 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/86/330186/1 diff --git a/i18n/en.json b/i18n/en.json index 9d14736..9b6eb8e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -513,6 +513,7 @@ "apihelp-globaluserrights-param-add": "Add the user to these global groups.", "apihelp-globaluserrights-param-remove": "Remove the user from these global groups.", "apihelp-globaluserrights-param-reason": "Reason for the change.", + "apihelp-globaluserrights-param-tags": "This parameter is currently unused.", "apihelp-globaluserrights-example-1": "Add user FooBot to global group \"bot\", and remove from global groups \"sysop\" and \"bureaucrat\"", "apihelp-globaluserrights-example-2": "Add the global user with ID 123 to global group \"bot\", and remove from global groups \"sysop\" and \"bureaucrat\"", "apihelp-query+globalallusers-description": "Enumerate all global users.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 716a8d7..0c17fa1 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -529,6 +529,7 @@ "apihelp-globaluserrights-param-add": "{{doc-apihelp-param|globaluserrights|add}}", "apihelp-globaluserrights-param-remove": "{{doc-apihelp-param|globaluserrights|remove}}", "apihelp-globaluserrights-param-reason": "{{doc-apihelp-param|globaluserrights|reason}}", + "apihelp-globaluserrights-param-tags": "{{doc-apihelp-param|globaluserrights|tags}}", "apihelp-globaluserrights-example-1": "{{doc-apihelp-example|globaluserrights}}", "apihelp-globaluserrights-example-2": "{{doc-apihelp-example|globaluserrights}}", "apihelp-query+globalallusers-description": "{{doc-apihelp-description|query+globalallusers}}", -- To view, visit https://gerrit.wikimedia.org/r/330186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2761820a3f52061361a15bc9d9a5927620edb5d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: TTO___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiArticleFeeds[master]: Replace Article::getContent() usage with WikiPage::getContent()
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330150 ) Change subject: Replace Article::getContent() usage with WikiPage::getContent() .. Replace Article::getContent() usage with WikiPage::getContent() Bug: T154203 Change-Id: Ia816a80a36103d893e1843c4993e3884873dfa4b --- M WikiArticleFeeds_body.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified Objections: Filip: There's a problem with this change, please improve diff --git a/WikiArticleFeeds_body.php b/WikiArticleFeeds_body.php index 9e3259e..5e994b9 100644 --- a/WikiArticleFeeds_body.php +++ b/WikiArticleFeeds_body.php @@ -313,7 +313,8 @@ $feedUrl = $title->getFullURL(); # Parse page into feed items. - $content = $wgOut->parse( $article->getContent() . "\n__NOEDITSECTION__ __NOTOC__" ); + $content = $wgOut->parse( ContentHandler::getContentText( $article->getPage()->getContent() ) . + "\n__NOEDITSECTION__ __NOTOC__" ); preg_match_all( '/(.*?)/s', $content, -- To view, visit https://gerrit.wikimedia.org/r/330150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia816a80a36103d893e1843c4993e3884873dfa4b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikiArticleFeeds Gerrit-Branch: master Gerrit-Owner: LukBukkitGerrit-Reviewer: Filip Gerrit-Reviewer: LukBukkit Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Adding support for task forces to the assessment processing ...
Kaldari has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330185 ) Change subject: Adding support for task forces to the assessment processing code .. Adding support for task forces to the assessment processing code Bug: T154216 Change-Id: I578a4f4d25b7cead1ebeb0ac66b631f6e89c55d4 --- M PageAssessmentsBody.php 1 file changed, 30 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments refs/changes/85/330185/1 diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php index 0c3dde3..2718720 100644 --- a/PageAssessmentsBody.php +++ b/PageAssessmentsBody.php @@ -49,14 +49,18 @@ foreach ( $assessmentData as $parserData ) { // If the name of the project is set... if ( isset( $parserData[0] ) && $parserData[0] !== '' ) { + $projectName = $parserData[0]; // ...get the corresponding ID from page_assessments_projects table. - $projectId = self::getProjectId( $parserData[0] ); + $projectId = self::getProjectId( $projectName ); // If there is no existing project by that name, add it to the table. if ( $projectId === false ) { - $projectId = self::insertProject( $parserData[0] ); + // Extract possible parent from the project name. + $parentId = self::extractParentProjectId( $projectName ); + // Insert project data into the database table. + $projectId = self::insertProject( $projectName, $parentId ); } // Add the project's ID to the array. - $projects[$parserData[0]] = $projectId; + $projects[$projectName] = $projectId; } } // Get a list of all the projects previously assigned to the page. @@ -137,9 +141,24 @@ return false; } + /** +* Extract parent from a project name and return the ID. For example, if the +* project name is "Novels/Crime task force", the parent will be "Novels", +* i.e. WikiProject Novels. +* +* @param string $project Project title +* @return int|false project ID or false if not found +*/ + protected static function extractParentProjectId( $projectName ) { + $projectNameParts = explode( '/', $projectName ); + if ( count( $projectNameParts ) > 1 && $projectNameParts[0] !== '' ) { + return self::getProjectId( $projectNameParts[0] ); + } + return false; + } /** -* Get project ID for a give wikiproject title +* Get project ID for a given wikiproject title * @param string $project Project title * @return int|false project ID or false if not found */ @@ -156,14 +175,18 @@ /** * Insert a new wikiproject into the projects table * @param string $project Wikiproject title +* @param int $parentId ID of the parent project (for subprojects) (optional) * @return int Insert Id for new project */ - public static function insertProject( $project ) { + public static function insertProject( $project, $parentId = null ) { $dbw = wfGetDB( DB_MASTER ); - $values = array( + $values = [ 'pap_project_title' => $project, 'pap_project_id' => $dbw->nextSequenceValue( 'pap_project_id_seq' ) - ); + ]; + if ( $parentId ) { + $values[ 'pap_parent_id' ] = (int)$parentId; + } $dbw->insert( 'page_assessments_projects', $values, __METHOD__ ); $id = $dbw->insertId(); return $id; -- To view, visit https://gerrit.wikimedia.org/r/330185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I578a4f4d25b7cead1ebeb0ac66b631f6e89c55d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageAssessments Gerrit-Branch: master Gerrit-Owner: Kaldari___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Ids[master]: Add ability to configure the web service endpoint in the IDS...
Divadsn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330184 ) Change subject: Add ability to configure the web service endpoint in the IDS extension .. Add ability to configure the web service endpoint in the IDS extension Bug: T154043 Change-Id: I4b47c87465c5aef5a88ce73113cd687247caa4b9 --- M extension.json M ids_body.php 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ids refs/changes/84/330184/1 diff --git a/extension.json b/extension.json index dc6ffa2..c48b8b4 100644 --- a/extension.json +++ b/extension.json @@ -20,5 +20,9 @@ "i18n" ] }, + "config": { + "@doc": "https://www.mediawiki.org/wiki/Extension:Ids;, + "IdsEndpoint": "https://tools.wmflabs.org/idsgen/; + }, "manifest_version": 1 } diff --git a/ids_body.php b/ids_body.php index 76b5268..33931c0 100644 --- a/ids_body.php +++ b/ids_body.php @@ -1,4 +1,7 @@ https://www.mediawiki.org/wiki/Manual:Tag_extensions */ static function idsRender( $input, array $args, Parser $parser, PPFrame $frame ) { + // Add ability to configure the web service endpoint in the IDS extension (T154043) + $config = MediaWikiServices::getInstance()->getConfigFactory() + ->makeConfig( 'ids' ); + // Support for Simplified "體" (font) $font = isset($args['font']) ? strtr($args['font'] , '体', '體') : '宋體'; - $src = 'https://tools.wmflabs.org/idsgen/' . rawurlencode($input) . '.svg?字體=' . rawurlencode($font); + $src = $config->get( 'IdsEndpoint' ) . rawurlencode($input) . '.svg?字體=' . rawurlencode($font); return Html::element('img', [ 'align' => 'middle', -- To view, visit https://gerrit.wikimedia.org/r/330184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b47c87465c5aef5a88ce73113cd687247caa4b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Ids Gerrit-Branch: master Gerrit-Owner: Divadsn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ¡Ándale! ¡Arriba! ¡Arriba! ¡Epa! ¡Epa!
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330183 ) Change subject: ¡Ándale! ¡Arriba! ¡Arriba! ¡Epa! ¡Epa! .. ¡Ándale! ¡Arriba! ¡Arriba! ¡Epa! ¡Epa! Friz Freleng & Hawley Pratt -- 1955 Really: require test to explicity run deferred updates. Change-Id: I41fc8e9f548a879ead192cd013c6a7fc604113b8 --- M includes/deferred/DeferredUpdates.php M tests/phpunit/MediaWikiTestCase.php M tests/phpunit/includes/EditPageTest.php M tests/phpunit/includes/TemplateCategoriesTest.php M tests/phpunit/includes/WatchedItemIntegrationTest.php M tests/phpunit/includes/WatchedItemStoreIntegrationTest.php M tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php M tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php M tests/phpunit/includes/api/ApiTestCase.php M tests/phpunit/includes/deferred/LinksUpdateTest.php M tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php M tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php M tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php M tests/phpunit/includes/page/ArticleTablesTest.php M tests/phpunit/includes/page/WikiPageTest.php 15 files changed, 66 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/83/330183/1 diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php index 1ba6c1f..2dec642 100644 --- a/includes/deferred/DeferredUpdates.php +++ b/includes/deferred/DeferredUpdates.php @@ -54,6 +54,8 @@ private static $postSendUpdates = []; /** @var bool Whether to just run updates in addUpdate() */ private static $immediateMode = false; + /** @var bool Whether to try running updates when possible */ + private static $opportunisticMode = true; const ALL = 0; // all updates; in web requests, use only after flushing the output buffer const PRESEND = 1; // for updates that should run before flushing output buffer @@ -140,6 +142,14 @@ */ public static function setImmediateMode( $value ) { self::$immediateMode = (bool)$value; + } + + /** +* @param bool $value Whether to try running updates when possible +* @since 1.29 +*/ + public static function setOpportunisticMode( $value ) { + self::$opportunisticMode = (bool)$value; } /** @@ -289,6 +299,10 @@ return false; } + if ( !self::$opportunisticMode ) { + return false; + } + // Avoiding running updates without them having outer scope if ( !self::getBusyDbConnections() ) { self::doUpdates( $mode ); diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index fd02a3e..9b88e5b 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -494,6 +494,9 @@ } DeferredUpdates::clearPendingUpdates(); + DeferredUpdates::setImmediateMode( false ); + DeferredUpdates::setOpportunisticMode( false ); + ObjectCache::getMainWANInstance()->clearProcessCache(); // XXX: reset maintenance triggers @@ -967,6 +970,7 @@ $page = WikiPage::factory( $title ); $page->doEditContent( ContentHandler::makeContent( $text, $title ), $comment, 0, false, $user ); + DeferredUpdates::doUpdates(); return [ 'title' => $title, diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php index 5a01dc0..bf4cba4 100644 --- a/tests/phpunit/includes/EditPageTest.php +++ b/tests/phpunit/includes/EditPageTest.php @@ -297,6 +297,7 @@ } $page = $this->assertEdit( $pageTitle, null, $user, $edit, $expectedCode, $expectedText, $desc ); + DeferredUpdates::doUpdates(); if ( $expectedCode != EditPage::AS_BLANK_ARTICLE ) { $latest = $page->getLatest(); @@ -348,6 +349,7 @@ wfGetDB( DB_MASTER )->commit( __METHOD__ ); + DeferredUpdates::doUpdates(); $this->assertEquals( 0, DeferredUpdates::pendingUpdatesCount(), 'No deferred updates' ); if ( $expectedCode != EditPage::AS_BLANK_ARTICLE ) { @@ -394,6 +396,8 @@ $page = $this->assertEdit( 'EditPageTest_testUpdatePage', "zero", null, $edit, EditPage::AS_SUCCESS_UPDATE, $text, "expected successfull update with given text" ); + DeferredUpdates::doUpdates(); + $this->assertGreaterThan( 0, $checkIds[0], "First event rev ID set" );
[MediaWiki-commits] [Gerrit] mediawiki...Wikilog[master]: Test: Do not merge
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330182 ) Change subject: Test: Do not merge .. Test: Do not merge Change-Id: I3ae0a1e6cc16e7ac638f8849ad1e0ee5dbdad287 --- D .gitignore D .gitreview A HtmlToMediaWiki.php D README A README.mediawiki D RELEASE-NOTES A RELEASE-NOTES.mediawiki A SVN-REV M SpecialWikilog.php A SpecialWikilogSubscriptions.php D TODO M Wikilog.i18n.alias.php M Wikilog.i18n.magic.php A Wikilog.i18n.ns.php M Wikilog.i18n.php M Wikilog.php A WikilogBloggerImport.php A WikilogCalendar.php M WikilogComment.php M WikilogCommentPager.php A WikilogCommentPagerSwitcher.php M WikilogCommentsPage.php M WikilogDefaultSettings.php M WikilogFeed.php M WikilogHooks.php M WikilogItem.php M WikilogItemPage.php M WikilogItemPager.php M WikilogLinksUpdate.php M WikilogMainPage.php M WikilogParser.php M WikilogQuery.php M WikilogUtils.php M WlCaptchaAdapter.php M WlFeed.body.php M WlFeed.i18n.php M WlFeed.php A archives/fill-wikilog-comment-meta.sql A archives/patch-subscriptions.sql A archives/patch-talkinfo.sql A archives/patch-visits.sql A html2mw.php D i18n/wikilog/ab.json D i18n/wikilog/af.json D i18n/wikilog/aln.json D i18n/wikilog/an.json D i18n/wikilog/ar.json D i18n/wikilog/arc.json D i18n/wikilog/arz.json D i18n/wikilog/az.json D i18n/wikilog/azb.json D i18n/wikilog/ba.json D i18n/wikilog/be-tarask.json D i18n/wikilog/be.json D i18n/wikilog/bg.json D i18n/wikilog/bn.json D i18n/wikilog/br.json D i18n/wikilog/bs.json D i18n/wikilog/ca.json D i18n/wikilog/ce.json D i18n/wikilog/ckb.json D i18n/wikilog/crh-cyrl.json D i18n/wikilog/crh-latn.json D i18n/wikilog/cs.json D i18n/wikilog/cu.json D i18n/wikilog/da.json D i18n/wikilog/de-formal.json D i18n/wikilog/de.json D i18n/wikilog/diq.json D i18n/wikilog/dsb.json D i18n/wikilog/ee.json D i18n/wikilog/el.json D i18n/wikilog/en-gb.json D i18n/wikilog/en.json D i18n/wikilog/eo.json D i18n/wikilog/es.json D i18n/wikilog/et.json D i18n/wikilog/eu.json D i18n/wikilog/fa.json D i18n/wikilog/fi.json D i18n/wikilog/fr.json D i18n/wikilog/frp.json D i18n/wikilog/ga.json D i18n/wikilog/gl.json D i18n/wikilog/grc.json D i18n/wikilog/gsw.json D i18n/wikilog/ha.json D i18n/wikilog/he.json D i18n/wikilog/hr.json D i18n/wikilog/hsb.json D i18n/wikilog/hu.json D i18n/wikilog/ia.json D i18n/wikilog/id.json D i18n/wikilog/ig.json D i18n/wikilog/it.json D i18n/wikilog/ja.json D i18n/wikilog/jv.json D i18n/wikilog/ka.json D i18n/wikilog/kn.json D i18n/wikilog/ko.json D i18n/wikilog/koi.json D i18n/wikilog/ksh.json D i18n/wikilog/ku-latn.json D i18n/wikilog/ky.json D i18n/wikilog/lb.json D i18n/wikilog/lg.json D i18n/wikilog/li.json D i18n/wikilog/lt.json D i18n/wikilog/ltg.json D i18n/wikilog/lv.json D i18n/wikilog/lzz.json D i18n/wikilog/mg.json D i18n/wikilog/mk.json D i18n/wikilog/ml.json D i18n/wikilog/mn.json D i18n/wikilog/ms.json D i18n/wikilog/nb.json D i18n/wikilog/nds-nl.json D i18n/wikilog/ne.json D i18n/wikilog/nl.json D i18n/wikilog/nn.json D i18n/wikilog/oc.json D i18n/wikilog/or.json D i18n/wikilog/pdc.json D i18n/wikilog/pfl.json D i18n/wikilog/pl.json D i18n/wikilog/pms.json D i18n/wikilog/ps.json D i18n/wikilog/pt-br.json D i18n/wikilog/pt.json D i18n/wikilog/qqq.json D i18n/wikilog/ro.json D i18n/wikilog/roa-tara.json D i18n/wikilog/ru.json D i18n/wikilog/rue.json D i18n/wikilog/sc.json D i18n/wikilog/si.json D i18n/wikilog/sl.json D i18n/wikilog/so.json D i18n/wikilog/sq.json D i18n/wikilog/sr-ec.json D i18n/wikilog/sr-el.json D i18n/wikilog/sv.json D i18n/wikilog/ta.json D i18n/wikilog/te.json D i18n/wikilog/tet.json D i18n/wikilog/tk.json D i18n/wikilog/tl.json D i18n/wikilog/tly.json D i18n/wikilog/tr.json D i18n/wikilog/tt-cyrl.json D i18n/wikilog/tzm.json D i18n/wikilog/uk.json D i18n/wikilog/vi.json D i18n/wikilog/yi.json D i18n/wikilog/zh-hans.json D i18n/wikilog/zh-hant.json D i18n/wlfeed/af.json D i18n/wlfeed/aln.json D i18n/wlfeed/ar.json D i18n/wlfeed/arz.json D i18n/wlfeed/ast.json D i18n/wlfeed/be-tarask.json D i18n/wlfeed/br.json D i18n/wlfeed/bs.json D i18n/wlfeed/ca.json D i18n/wlfeed/cs.json D i18n/wlfeed/de.json D i18n/wlfeed/dsb.json D i18n/wlfeed/en.json D i18n/wlfeed/es.json D i18n/wlfeed/fi.json D i18n/wlfeed/fr.json D i18n/wlfeed/frp.json D i18n/wlfeed/gl.json D i18n/wlfeed/gsw.json D i18n/wlfeed/he.json D i18n/wlfeed/hr.json D i18n/wlfeed/hsb.json D i18n/wlfeed/hu.json D i18n/wlfeed/ia.json D i18n/wlfeed/id.json D i18n/wlfeed/it.json D i18n/wlfeed/ja.json D i18n/wlfeed/ko.json D i18n/wlfeed/ksh.json D i18n/wlfeed/lb.json D i18n/wlfeed/li.json D i18n/wlfeed/mk.json D i18n/wlfeed/ms.json D i18n/wlfeed/nb.json D i18n/wlfeed/nl.json D i18n/wlfeed/oc.json D i18n/wlfeed/pl.json D i18n/wlfeed/pms.json D i18n/wlfeed/pt-br.json D i18n/wlfeed/pt.json D i18n/wlfeed/qqq.json D i18n/wlfeed/roa-tara.json D i18n/wlfeed/ru.json D i18n/wlfeed/si.json D i18n/wlfeed/sl.json D i18n/wlfeed/sr-ec.json D i18n/wlfeed/sr-el.json D
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make some replication logging more structured
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330181 ) Change subject: Make some replication logging more structured .. Make some replication logging more structured Change-Id: I0ec3c615047b666ff5ee430453c1de2a1316ef61 --- M includes/libs/rdbms/loadbalancer/LoadBalancer.php 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/81/330181/1 diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index 14d049c..95f55b6 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -241,10 +241,14 @@ $host = $this->getServerName( $i ); if ( $lag === false && !is_infinite( $maxServerLag ) ) { - $this->replLogger->error( "Server $host (#$i) is not replicating?" ); + $this->replLogger->error( + "Server {host} (#$i) is not replicating?", [ 'host' => $host ] ); unset( $loads[$i] ); } elseif ( $lag > $maxServerLag ) { - $this->replLogger->warning( "Server $host (#$i) has >= $lag seconds of lag" ); + $this->replLogger->warning( + "Server {host} (#$i) has {lag} seconds of lag (>= {maxlag})", + [ 'host' => $host, 'lag' => $lag, 'maxlag' => $maxServerLag ] + ); unset( $loads[$i] ); } } @@ -503,8 +507,10 @@ if ( $result == -1 || is_null( $result ) ) { // Timed out waiting for replica DB, use master instead - $msg = __METHOD__ . ": Timed out waiting on $server pos {$this->mWaitForPos}"; - $this->replLogger->warning( "$msg" ); + $this->replLogger->warning( + __METHOD__ . ": Timed out waiting on {host} pos {$this->mWaitForPos}", + [ 'host' => $server ] + ); $ok = false; } else { $this->replLogger->info( __METHOD__ . ": Done" ); -- To view, visit https://gerrit.wikimedia.org/r/330181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ec3c615047b666ff5ee430453c1de2a1316ef61 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikilog[master]: Use wfMessage instead of $this->msg
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330180 ) Change subject: Use wfMessage instead of $this->msg .. Use wfMessage instead of $this->msg This is because you can't use $this in static functions Bug: T154442 Change-Id: I8bd7c2b536a5406abcdc1dbb9075d7e487a01a9b --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikilog refs/changes/80/330180/1 -- To view, visit https://gerrit.wikimedia.org/r/330180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bd7c2b536a5406abcdc1dbb9075d7e487a01a9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikilog Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove entity tags for 'Review'.
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330179 ) Change subject: Remove entity tags for 'Review'. .. Remove entity tags for 'Review'. Cleaning these up as stakeholders have confirmed they are not using the automatic tagging. Should we remove the tag itself? I have left for now as it seems like exactly the sort of thing one would use tags for, now that the DB is not full of contacts tagged for review but could be convinced to remove it. Bug: T118904 Change-Id: Ib7847283ded3ff9bf975c51057f3457f12ec676f --- M sites/all/modules/wmf_civicrm/wmf_civicrm.install 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/79/330179/1 diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install b/sites/all/modules/wmf_civicrm/wmf_civicrm.install index 7dc24ba..f15b5ea 100644 --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install @@ -2452,3 +2452,18 @@ require_once 'update_receipt.php'; _wmf_civicrm_update_offline_receipt(); } + +/** + * Remove review tag. + * + * Bug: T118904 + */ +function wmf_civicrm_update_7440() { + civicrm_initialize(); + $tagID = civicrm_api3('Tag', 'getvalue', array('name' => 'Review', 'return' => 'id')); + CRM_Core_DAO::executeQuery(" +DELETE FROM civicrm_entity_tag +WHERE tag_id = $tagID +AND entity_table = 'civicrm_contact' + "); +} -- To view, visit https://gerrit.wikimedia.org/r/330179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7847283ded3ff9bf975c51057f3457f12ec676f Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Eileen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Redirect https://toolserver.org/~magnus/
DatGuy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330178 ) Change subject: Redirect https://toolserver.org/~magnus/ .. Redirect https://toolserver.org/~magnus/ To any reviewer - I am very new in MediaWiki development. My two questions are whether I should remove ALL the other magnus redirects and if the Regexp would work. Thanks. Bug: T113696 Change-Id: Ia54cffc4c45670292bbfd20297d04bf41256fe78 --- M modules/toolserver_legacy/templates/www.toolserver.org.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/78/330178/1 diff --git a/modules/toolserver_legacy/templates/www.toolserver.org.erb b/modules/toolserver_legacy/templates/www.toolserver.org.erb index 72f922a..afd539a 100644 --- a/modules/toolserver_legacy/templates/www.toolserver.org.erb +++ b/modules/toolserver_legacy/templates/www.toolserver.org.erb @@ -153,6 +153,7 @@ Redirect 301 /~locator https://tools.wmflabs.org/locator Redirect 301 /~luxo/contributions/contributions.php https://tools.wmflabs.org/guc/index.php Redirect 301 /~lvova https://tools.wmflabs.org/connectivity/ + Redirect 301 /^\/~magnus\/(.*)$/ https://tools.wmflabs.org/magnustools/$1 Redirect 301 /~magnus/commonsapi.php https://tools.wmflabs.org/magnus-toolserver/commonsapi.php Redirect 301 /~magnus/ts2/geneawiki2 https://tools.wmflabs.org/reasonator/geneawiki2 Redirect 301 /~magnus/catscan_rewrite.php https://tools.wmflabs.org/catscan2/catscan2.php -- To view, visit https://gerrit.wikimedia.org/r/330178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia54cffc4c45670292bbfd20297d04bf41256fe78 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DatGuy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Material[master]: Fix user menu drop down
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330176 ) Change subject: Fix user menu drop down .. Fix user menu drop down Also fixes an issue where logged out users didn't get the default avatar image Change-Id: I390b99153e1bfb162a597b9a46d03d218d2ce608 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Material refs/changes/76/330176/1 -- To view, visit https://gerrit.wikimedia.org/r/330176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I390b99153e1bfb162a597b9a46d03d218d2ce608 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Material Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove code tagging of contacts for Review.
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330177 ) Change subject: Remove code tagging of contacts for Review. .. Remove code tagging of contacts for Review. This is not used by any of our stakeholders & has passed it's best before. Bug: T118904 Change-Id: I9c875917d5ca440808b993ebfb6d01a16376927b --- M sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php M sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php M sites/all/modules/wmf_civicrm/wmf_civicrm.module 3 files changed, 0 insertions(+), 70 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/77/330177/1 diff --git a/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php b/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php index 288ab7a..ebabfba 100644 --- a/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php +++ b/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php @@ -319,9 +319,6 @@ // Insert the location record wmf_civicrm_message_location_update( $msg, $contact ); - - // Tag contact for review - wmf_civicrm_tag_contact_for_review( $contact ); } // update subscription record with next payment date @@ -398,9 +395,6 @@ // Insert the location record wmf_civicrm_message_location_insert( $msg, $contact ); - - // Tag contact for review - wmf_civicrm_tag_contact_for_review( $contact ); $api = civicrm_api_classapi(); $insert_params = array( @@ -526,9 +520,6 @@ // Insert the location record wmf_civicrm_message_location_insert( $msg, $contact ); - - // Tag contact for review - wmf_civicrm_tag_contact_for_review( $contact ); watchdog( 'recurring', 'Subscription succesfully modified for subscription id: %subscr_id', array( '%subscr_id' => print_r( $msg['subscr_id'], true )), WATCHDOG_NOTICE ); } diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php b/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php index 2015bf2..9d9557d 100644 --- a/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php +++ b/sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php @@ -6,28 +6,6 @@ class HelperFunctionsTest extends BaseWmfDrupalPhpUnitTestCase { /** - * Test wmf_civicrm_tag_contact_for_review. - * - * Maintenance note: the civicrm entity_tag get api returns an odd syntax. - * - * If that ever gets fixed it may break this test - but only the test would - * need to be altered to adapt. - * - * @throws \CiviCRM_API3_Exception - */ -public function testTagContactForReview() { -civicrm_initialize(); -$contact = civicrm_api3('Contact', 'create', array( -'contact_type' => 'Organization', -'organization_name' => 'The Evil Empire', -)); -wmf_civicrm_tag_contact_for_review($contact); -$entityTags = civicrm_api3('EntityTag', 'get', array('entity_id' => $contact['id'])); -$tag = reset($entityTags['values']); -$this->assertEquals(civicrm_api3('Tag', 'getvalue', array('name' => 'Review', 'return' => 'id')), $tag['tag_id']); -} - -/** * Test wmf_ensure_language_exists * * Maintenance note: the civicrm entity_tag get api returns an odd syntax. diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module b/sites/all/modules/wmf_civicrm/wmf_civicrm.module index 6ffde7d..fa1fd5b 100644 --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module @@ -260,14 +260,6 @@ // Insert the location record $location = wmf_civicrm_message_location_insert( $msg, $contact ); -// TODO: Add to contact_tags instead. -// Tag contact for review -try { -wmf_civicrm_tag_contact_for_review( $contact ); -} catch ( WmfException $ex ) { -watchdog( 'queue2civicrm_import', 'Failed to tag contact for review.', NULL, WATCHDOG_ERROR ); -} - $msg['contact_id'] = $contact['id']; } @@ -538,16 +530,6 @@ throw new WmfException("CIVI_CONFIG", t("Payment Instrument '!name' not found!", array("!name" => $name))); } break; -case 'tag_id': -require_once 'api/v3/Tag.php'; -$tag_id = civicrm_api3_tag_get(array('name'=> $name, 'version' => '3')); -if (is_array($tag_id) && array_key_exists('id', $tag_id)){ -$civi_ids[$type][$name] = $tag_id['id']; -watchdog('wmf_civicrm', "Found id for
[MediaWiki-commits] [Gerrit] mediawiki...Material[master]: Add npm package.json
SamanthaNguyen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330174 ) Change subject: Add npm package.json .. Add npm package.json Change-Id: I4af683a7d8adeff327e918f0a084cf476f882f1c --- A .eslintrc.json A Gruntfile.js A package.json 3 files changed, 58 insertions(+), 0 deletions(-) Approvals: SamanthaNguyen: Verified; Looks good to me, approved diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 000..cbad6a2 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,13 @@ +{ + "extends": "wikimedia", + "env": { + "browser": true, + "jquery": true + }, + "globals": { + "mediaWiki": false + }, + "rules": { + "valid-jsdoc": "off" + } +} diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..963ac50 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,32 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + var conf = grunt.file.readJSON( 'skin.json' ); + grunt.loadNpmTasks( 'grunt-eslint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + eslint: { + all: [ + '*.js', + '**/*.js', + '!node_modules/**', + '!js/overthrow.js' + ] + }, + banana: conf.MessagesDirs, + jsonlint: { + options: { + reporter: 'jshint' + }, + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..921cde7 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-eslint": "19.0.0", + "eslint-config-wikimedia": "0.3.0", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/330174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4af683a7d8adeff327e918f0a084cf476f882f1c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/skins/Material Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: SamanthaNguyen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Material[master]: Add npm package.json
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330174 ) Change subject: Add npm package.json .. Add npm package.json Change-Id: I4af683a7d8adeff327e918f0a084cf476f882f1c --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Material refs/changes/74/330174/1 -- To view, visit https://gerrit.wikimedia.org/r/330174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4af683a7d8adeff327e918f0a084cf476f882f1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Material Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Don't show the back to top in iOS
Gavinb has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330175 ) Change subject: Don't show the back to top in iOS .. Don't show the back to top in iOS This feature duplicates a feature in Safari and does not display properly, therefore I removed it. I have tested this code in both an iPhone and iPad simulator and it works fine. Change-Id: I355175e4d6017a0120118b28b8c35d78ccd4a82a --- M resources/skins.minerva.backtotop/init.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/75/330175/1 diff --git a/resources/skins.minerva.backtotop/init.js b/resources/skins.minerva.backtotop/init.js index 3c2efff..1945a04 100644 --- a/resources/skins.minerva.backtotop/init.js +++ b/resources/skins.minerva.backtotop/init.js @@ -4,9 +4,10 @@ // initialize the back to top element backtotop.appendTo( 'body' ); + var except= /iPod|iPhone|iPad/; M.on( 'scroll', function () { - if ( $( window ).height() - $( window ).scrollTop() <= 0 ) { + if ( $( window ).height() - $( window ).scrollTop() <= 0 && !(except.test(navigator.userAgent))) { backtotop.show(); } else { backtotop.hide(); -- To view, visit https://gerrit.wikimedia.org/r/330175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I355175e4d6017a0120118b28b8c35d78ccd4a82a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Gavinb___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs-mounts: Remove wikidata-quality from nfs-mount yaml
Madhuvishy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330173 ) Change subject: nfs-mounts: Remove wikidata-quality from nfs-mount yaml .. nfs-mounts: Remove wikidata-quality from nfs-mount yaml The wikidata-quality project was removed as part of https://wikitech.wikimedia.org/wiki/Purge_2016. This patch removes it from list of projects with nfs mounted. Change-Id: Id4beff5a913592193e4a9e4d129e9a95a959808c --- M modules/labstore/files/nfs-mounts.yaml 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/330173/1 diff --git a/modules/labstore/files/nfs-mounts.yaml b/modules/labstore/files/nfs-mounts.yaml index 18fc584..2fe5202 100644 --- a/modules/labstore/files/nfs-mounts.yaml +++ b/modules/labstore/files/nfs-mounts.yaml @@ -153,13 +153,6 @@ home: true project: true scratch: true - wikidata-quality: -gid: 52377 -mounts: - dumps: true - home: true - project: true - scratch: true wikidata-topicmaps: gid: 51980 mounts: -- To view, visit https://gerrit.wikimedia.org/r/330173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4beff5a913592193e4a9e4d129e9a95a959808c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Run loaded banana task on test
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330172 ) Change subject: Run loaded banana task on test .. Run loaded banana task on test It was already in package.json, just use it Change-Id: Ic9f965a52d0fb8a75d69442b86eeb83f82515f81 --- M Gruntfile.js 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/72/330172/1 diff --git a/Gruntfile.js b/Gruntfile.js index 154d77c..ac8dce5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,7 @@ /*jshint node:true */ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { jsonlint: { @@ -9,9 +10,14 @@ '**/*.json', '!node_modules/**' ] + }, + banana: { + all: [ + '**/i18n/' + ] } } ); - grunt.registerTask( 'test', [ 'jsonlint' ] ); + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; -- To view, visit https://gerrit.wikimedia.org/r/330172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9f965a52d0fb8a75d69442b86eeb83f82515f81 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added $wgHTTPImportTimeout setting
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330171 ) Change subject: Added $wgHTTPImportTimeout setting .. Added $wgHTTPImportTimeout setting Bug: T17000 Change-Id: Ic97ae4faec173c32af38df4554831dca7068226b --- M includes/DefaultSettings.php M includes/import/ImportStreamSource.php 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/330171/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 3274480..e71c0d2 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -8056,6 +8056,11 @@ $wgHTTPTimeout = 25; /** + * Timeout for HTTP requests done internally in imports, in seconds. + */ +$wgHTTPImportTimeout = 60; + +/** * Timeout for Asynchronous (background) HTTP requests, in seconds. */ $wgAsyncHTTPTimeout = 25; diff --git a/includes/import/ImportStreamSource.php b/includes/import/ImportStreamSource.php index e2e8dd5..7f8d64b 100644 --- a/includes/import/ImportStreamSource.php +++ b/includes/import/ImportStreamSource.php @@ -29,6 +29,7 @@ * @ingroup SpecialPage */ class ImportStreamSource implements ImportSource { + global $wgHTTPTimeout = $wgHTTPImportTimeout; function __construct( $handle ) { $this->mHandle = $handle; } -- To view, visit https://gerrit.wikimedia.org/r/330171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic97ae4faec173c32af38df4554831dca7068226b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apply webkit GPU hack to scrollable panels
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330068 ) Change subject: Apply webkit GPU hack to scrollable panels .. Apply webkit GPU hack to scrollable panels Bug: T154385 Change-Id: Ie8b99bf84dc71b4f6a50b441bf0a6f5a11050eff --- M src/styles/layouts/PanelLayout.less 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/styles/layouts/PanelLayout.less b/src/styles/layouts/PanelLayout.less index ed488ed..193b783 100644 --- a/src/styles/layouts/PanelLayout.less +++ b/src/styles/layouts/PanelLayout.less @@ -5,6 +5,8 @@ &-scrollable { overflow-y: auto; + /* Make scrolling smooth */ + .oo-ui-force-webkit-gpu(); } &-expanded { -- To view, visit https://gerrit.wikimedia.org/r/330068 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8b99bf84dc71b4f6a50b441bf0a6f5a11050eff Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: ComboBoxInputWidget: Make it impossible to set multiline to ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330109 ) Change subject: ComboBoxInputWidget: Make it impossible to set multiline to true .. ComboBoxInputWidget: Make it impossible to set multiline to true Change-Id: Id53db3c61e9f65d1c6f16b49748069807b369988 --- M src/widgets/ComboBoxInputWidget.js 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/widgets/ComboBoxInputWidget.js b/src/widgets/ComboBoxInputWidget.js index a681ef0..748e64d 100644 --- a/src/widgets/ComboBoxInputWidget.js +++ b/src/widgets/ComboBoxInputWidget.js @@ -63,6 +63,9 @@ autocomplete: false }, config ); + // ComboBoxInputWidget shouldn't support multiline + config.multiline = false; + // Parent constructor OO.ui.ComboBoxInputWidget.parent.call( this, config ); -- To view, visit https://gerrit.wikimedia.org/r/330109 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id53db3c61e9f65d1c6f16b49748069807b369988 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: PrtksxnaGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FileAnnotations[master]: Finally run loaded banana task on test
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330169 ) Change subject: Finally run loaded banana task on test .. Finally run loaded banana task on test Change-Id: I6f518d1191fcea4b0fef0bcd566ed42d25dc0165 --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index b296062..02aa997 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -30,6 +30,6 @@ } } ); - grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; -- To view, visit https://gerrit.wikimedia.org/r/330169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f518d1191fcea4b0fef0bcd566ed42d25dc0165 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FileAnnotations Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Hashar Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Cast stashed values to integer
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330074 ) Change subject: Cast stashed values to integer .. Cast stashed values to integer Stash may return false if the value hasn't been set yet. This basically means 'zero'. Steps to reproduce: create a new filter and open it. If it doesn't have any hits, the second message parameter is missing instead of being '0'. Change-Id: I8f240dd87664ec99a98b843f9e5c4c8c9eed0532 --- M Views/AbuseFilterViewEdit.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved Addshore: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php index b47ad13..ca25b6a 100644 --- a/Views/AbuseFilterViewEdit.php +++ b/Views/AbuseFilterViewEdit.php @@ -389,8 +389,8 @@ // Statistics global $wgAbuseFilterProfile; $stash = ObjectCache::getMainStashInstance(); - $matches_count = $stash->get( AbuseFilter::filterMatchesKey( $filter ) ); - $total = $stash->get( AbuseFilter::filterUsedKey( $row->af_group ) ); + $matches_count = (int)$stash->get( AbuseFilter::filterMatchesKey( $filter ) ); + $total = (int)$stash->get( AbuseFilter::filterUsedKey( $row->af_group ) ); if ( $total > 0 ) { $matches_percent = sprintf( '%.2f', 100 * $matches_count / $total ); -- To view, visit https://gerrit.wikimedia.org/r/330074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f240dd87664ec99a98b843f9e5c4c8c9eed0532 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: Addshore Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Huji Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fully deprecate 'ContentAction' hook
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330138 ) Change subject: Fully deprecate 'ContentAction' hook .. Fully deprecate 'ContentAction' hook Bug: T54027 Change-Id: Ia765e25a9f76b34f7b10125d3b6e0c8e00fac2ca --- M RELEASE-NOTES-1.29 M docs/hooks.txt M includes/MediaWiki.php 3 files changed, 14 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 14b5692..f2d738a 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -152,6 +152,8 @@ * Class ImageGallery (deprecated in 1.22) was removed. Use ImageGalleryBase::factory instead. * Title::moveNoAuth() (deprecated in 1.25) was removed. Use MovePage class instead. +* Hook UnknownAction (deprecated in 1.19) was actually deprecated (it will now emit warnings). + Create a subclass of Action, and add it to $wgActions instead. == Compatibility == diff --git a/docs/hooks.txt b/docs/hooks.txt index e8335cd..2f99fff 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -3420,8 +3420,9 @@ test case files matching the suffix "Test.php". &$paths: list of test cases and directories to search. -'UnknownAction': An unknown "action" has occurred (useful for defining your own -actions). +'UnknownAction': DEPRECATED! To add an action in an extension, +create a subclass of Action, and add a new key to $wgActions. +An unknown "action" has occurred (useful for defining your own actions). $action: action name $article: article "acted on" diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index eaa1c995..faca533 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -495,8 +495,15 @@ $action->show(); return; } - - if ( Hooks::run( 'UnknownAction', [ $request->getVal( 'action', 'view' ), $page ] ) ) { + // NOTE: deprecated hook. Add to $wgActions instead + if ( Hooks::run( + 'UnknownAction', + [ + $request->getVal( 'action', 'view' ), + $page + ], + '1.19' + ) ) { $output->setStatusCode( 404 ); $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); } -- To view, visit https://gerrit.wikimedia.org/r/330138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia765e25a9f76b34f7b10125d3b6e0c8e00fac2ca Gerrit-PatchSet: 7 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Reedy Gerrit-Reviewer: TTO Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: When switching check wikitext is a non string, not just empty
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330170 ) Change subject: When switching check wikitext is a non string, not just empty .. When switching check wikitext is a non string, not just empty Also add documentation. Bug: T154437 Change-Id: Icacc0ad522d3e7fa28ecea9876c2c0465c4eb8e6 --- M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js 1 file changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/70/330170/1 diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js index 804f874..2b7f66a 100644 --- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js +++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js @@ -103,7 +103,7 @@ }, /** -* Request the page HTML and various metadata from the MediaWiki API (which will use +* Request the page data and various metadata from the MediaWiki API (which will use * Parsoid or RESTBase). * * @param {string} mode Target mode: 'visual' or 'source' @@ -122,6 +122,17 @@ } }, + /** +* Request the page HTML and various metadata from the MediaWiki API (which will use +* Parsoid or RESTBase). +* +* @param {string} pageName Page name to request +* @param {string} [oldid] Old revision ID, current if omitted +* @param {string} [targetName] Optional target name for tracking +* @param {boolean} [modified] The page was been modified before loading (e.g. in source mode) +* @param {string} [wikitext] Wikitext to convert to HTML. The original document is fetched if undefined. +* @return {jQuery.Promise} Abortable promise resolved with a JSON object +*/ requestParsoidData: function ( pageName, oldid, targetName, modified, wikitext ) { var start, apiXhr, restbaseXhr, apiPromise, restbasePromise, dataPromise, pageHtmlUrl, headers, switched = false, @@ -165,9 +176,14 @@ 'Api-User-Agent': 'VisualEditor-MediaWiki/' + mw.config.get( 'wgVersion' ) }; + if ( wikitext === undefined ) { + wikitext = $( '#wpTextbox1' ).textSelection( 'getContents' ); + } + if ( conf.fullRestbaseUrl && - ( wikitext || ( wikitext = $( '#wpTextbox1' ).textSelection( 'getContents' ) ) ) && + // wikitext can be an empty string + wikitext !== undefined && !$( '[name=wpSection]' ).val() ) { switched = true; @@ -244,7 +260,17 @@ return dataPromise; }, - requestWikitext: function ( pageName, section, oldid /* , targetName */ ) { + /** +* Request the page wikitext and various metadata from the MediaWiki API. +* +* @param {string} pageName Page name to request +* @param {number|string} [section] Section to edit, number or 'new' (currently just source mode) +* @param {string} [oldid] Old revision ID, current if omitted +* @param {string} [targetName] Optional target name for tracking +* @param {boolean} [modified] The page was been modified before loading +* @return {jQuery.Promise} Abortable promise resolved with a JSON object +*/ + requestWikitext: function ( pageName, section, oldid ) { var data = { action: 'visualeditor', paction: 'wikitext', -- To view, visit https://gerrit.wikimedia.org/r/330170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icacc0ad522d3e7fa28ecea9876c2c0465c4eb8e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FileAnnotations[master]: Finally run loaded banana task on test
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330169 ) Change subject: Finally run loaded banana task on test .. Finally run loaded banana task on test Change-Id: I6f518d1191fcea4b0fef0bcd566ed42d25dc0165 --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileAnnotations refs/changes/69/330169/1 diff --git a/Gruntfile.js b/Gruntfile.js index b296062..02aa997 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -30,6 +30,6 @@ } } ); - grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; -- To view, visit https://gerrit.wikimedia.org/r/330169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f518d1191fcea4b0fef0bcd566ed42d25dc0165 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FileAnnotations Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make MwTimeIsoFormatterTest compatible with DataValues Time ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329489 ) Change subject: Make MwTimeIsoFormatterTest compatible with DataValues Time master .. Make MwTimeIsoFormatterTest compatible with DataValues Time master This data provider is not compatible with the current (unreleased) master of DataValues Time, see https://github.com/DataValues/Time/compare/0.8.4...master Change-Id: Ifd9f47c6658d010f3c3d2c76a7e3ce95ccda2973 --- M lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Aleksey Bekh-Ivanov (WMDE): Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php index bfa3600..3dcd4c8 100644 --- a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php +++ b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php @@ -356,21 +356,21 @@ '1997', ), array( - '+0-00-00T00:00:42Z', TimeValue::PRECISION_YEAR, + '+0-01-01T00:00:42Z', TimeValue::PRECISION_YEAR, '0', ), // centuries and millenia start with 1, so we can format "low" years just fine array( - '+100-00-00T00:00:06Z', TimeValue::PRECISION_YEAR1K, + '+100-01-01T00:00:06Z', TimeValue::PRECISION_YEAR1K, '1. millennium' ), array( - '-100-00-00T00:00:06Z', TimeValue::PRECISION_YEAR1K, + '-100-01-01T00:00:06Z', TimeValue::PRECISION_YEAR1K, '1. millennium BCE' ), array( - '+10-00-00T00:00:07Z', TimeValue::PRECISION_YEAR100, + '+10-01-01T00:00:07Z', TimeValue::PRECISION_YEAR100, '1. century' ), @@ -458,31 +458,31 @@ '1', ), array( - '+1000-00-00T00:00:01Z', TimeValue::PRECISION_YEAR100M, + '+1000-01-01T00:00:01Z', TimeValue::PRECISION_YEAR100M, '1000', ), array( - '+100-00-00T00:00:02Z', TimeValue::PRECISION_YEAR10M, + '+100-01-01T00:00:02Z', TimeValue::PRECISION_YEAR10M, '100', ), array( - '+10-00-00T00:00:03Z', TimeValue::PRECISION_YEAR1M, + '+10-01-01T00:00:03Z', TimeValue::PRECISION_YEAR1M, '10', ), array( - '+1-00-00T00:00:04Z', TimeValue::PRECISION_YEAR100K, + '+1-01-01T00:00:04Z', TimeValue::PRECISION_YEAR100K, '1', ), array( - '+1000-00-00T00:00:05Z', TimeValue::PRECISION_YEAR10K, + '+1000-01-01T00:00:05Z', TimeValue::PRECISION_YEAR10K, '1000', ), array( - '+1-00-00T00:00:08Z', TimeValue::PRECISION_YEAR10, + '+1-01-01T00:00:08Z', TimeValue::PRECISION_YEAR10, '1', ), array( - '-0-00-00T00:00:42Z', TimeValue::PRECISION_YEAR, + '-0-01-01T00:00:42Z', TimeValue::PRECISION_YEAR, '0 BCE', ), @@ -506,7 +506,7 @@ 'de' ), array( - '+1000-00-00T00:00:01Z', TimeValue::PRECISION_YEAR100M, + '+1000-01-01T00:00:01Z', TimeValue::PRECISION_YEAR100M, '1000', 'de' ), -- To view, visit https://gerrit.wikimedia.org/r/329489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd9f47c6658d010f3c3d2c76a7e3ce95ccda2973 Gerrit-PatchSet: 1 Gerrit-Project:
[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Removed deprecated 'UnknownAction' hook usage
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330168 ) Change subject: Removed deprecated 'UnknownAction' hook usage .. Removed deprecated 'UnknownAction' hook usage Bug: T54027 Change-Id: Iaec7aa5e6fbb1c53c69da84948d8648285774a10 --- M ContentAction/ContentAction.php M ContentAction/extension.json M examples.php 3 files changed, 12 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples refs/changes/68/330168/1 diff --git a/ContentAction/ContentAction.php b/ContentAction/ContentAction.php index 82aea21..99a1ba4 100644 --- a/ContentAction/ContentAction.php +++ b/ContentAction/ContentAction.php @@ -8,8 +8,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -class ContentAction { - +class ContentAction extends FormlessAction { public static function onSkinTemplateNavigation( $skin, &$content_actions ) { $action = $skin->getRequest->getText( 'action' ); @@ -23,17 +22,14 @@ return true; } - - public static function onUnknownAction( $action, $article ) { - $title = $article->getTitle(); - - if ( $action === 'myact' ) { - $article->getContext()->getOutput()->addWikiText( - 'The page name is ' . $title->getText() . ' and you are ' . $article->getUserText() - ); - return false; - } - - return true; + public function getName() { + return 'myact'; } + + public function show() { + $this->getContext()->getOutput()->addWikiText( + 'The page name is ' . $this->getTitle->getText() . ' and you are ' . $this->getUser()->getName() + ); + } + } diff --git a/ContentAction/extension.json b/ContentAction/extension.json index 47fea6c..d72c43a 100644 --- a/ContentAction/extension.json +++ b/ContentAction/extension.json @@ -9,7 +9,6 @@ ] }, "Hooks": { - "UnknownAction": "ContentAction::onUnknownAction", "SkinTemplateNavigation": "ConentAction::onSkinTemplateNavigation" }, "AutoloadClasses": { diff --git a/examples.php b/examples.php index 095d448..5147efc 100644 --- a/examples.php +++ b/examples.php @@ -6,3 +6,5 @@ require_once __DIR__ . "/DataPages/DataPages.php"; require_once __DIR__ . "/Example/Example.php"; + +$wgActions['myact'] = ContentAction; -- To view, visit https://gerrit.wikimedia.org/r/330168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaec7aa5e6fbb1c53c69da84948d8648285774a10 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Use strlen to get length of string
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330167 ) Change subject: Use strlen to get length of string .. Use strlen to get length of string Count is used for arrays Change-Id: Ica9871d020bcb8db0f9149aaf3f838c93af54327 --- M frontend/RejectConfirmationFormUI.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs refs/changes/67/330167/1 diff --git a/frontend/RejectConfirmationFormUI.php b/frontend/RejectConfirmationFormUI.php index 025b144..4637193 100755 --- a/frontend/RejectConfirmationFormUI.php +++ b/frontend/RejectConfirmationFormUI.php @@ -120,7 +120,7 @@ )->numParams( count( $rejectAuthors ) )->inContentLanguage()->text(); // If the message is too big, then fallback to the shorter one $colonSeparator = wfMessage( 'colon-separator' )->text(); - $maxLen = 255 - count( $colonSeparator ) - count( $comment ); + $maxLen = 255 - strlen( $colonSeparator ) - strlen( $comment ); if ( strlen( $defaultSummary ) > $maxLen ) { $msg = $newRev->isCurrent() ? 'revreview-reject-summary-cur-short' -- To view, visit https://gerrit.wikimedia.org/r/330167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica9871d020bcb8db0f9149aaf3f838c93af54327 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FlaggedRevs Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NSFileRepo[master]: WIP: Rewrite of (nsfr_)img_auth.php
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330166 ) Change subject: WIP: Rewrite of (nsfr_)img_auth.php .. WIP: Rewrite of (nsfr_)img_auth.php See T153174 Change-Id: I3dc922b18ba79f7105936b13ece4de4454deff23 --- A RepoFileLoader.php M nsfr_img_auth.php 2 files changed, 63 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NSFileRepo refs/changes/66/330166/1 diff --git a/RepoFileLoader.php b/RepoFileLoader.php new file mode 100644 index 000..9fd4d10 --- /dev/null +++ b/RepoFileLoader.php @@ -0,0 +1,53 @@ +config = $config; +$this->context = $context; +$this->logger = $logger; +} + +public function respond() { +$this->initPath(); +if( $this->isUrlExtensionNotOnWhitelist() ) { +return; +} +if( $this->handleByExtensionBackend() ) { +return; +} +if( $this->handleThumb() ) { +return; +} +if( $this->handleTranscoded() ) { +return; +} + +$this->setHeaders(); +$this->streamFile(); +} +} diff --git a/nsfr_img_auth.php b/nsfr_img_auth.php index 3ee839e..edfb839 100644 --- a/nsfr_img_auth.php +++ b/nsfr_img_auth.php @@ -43,6 +43,10 @@ * @file */ +use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MediaWikiServices; +use NSFileRepo; + define( 'MW_NO_OUTPUT_COMPRESSION', 1 ); $baseDir = dirname( $_SERVER['SCRIPT_FILENAME'] ); @@ -56,7 +60,12 @@ $wgArticlePath = false; # Don't let a "/*" article path clober our action path $wgActionPaths = [ "$wgUploadPath/" ]; -wfImageAuthMain(); +$fileLoader = new NSFileRepo\RepoFileLoader( +MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'main' ), +RequestContext::getMain(), +LoggerFactory::getInstance( 'filerepoloader' ) +); +$fileLoader->respond(); $mediawiki = new MediaWiki(); $mediawiki->doPostOutputShutdown( 'fast' ); -- To view, visit https://gerrit.wikimedia.org/r/330166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dc922b18ba79f7105936b13ece4de4454deff23 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NSFileRepo Gerrit-Branch: master Gerrit-Owner: Robert Vogel___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add missing check to API response code in snakview.variation...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326412 ) Change subject: Add missing check to API response code in snakview.variations.Value .. Add missing check to API response code in snakview.variations.Value Bug: T115267 Change-Id: Iefa8ca4086f2adb5ccee8c18ae4f8dc87c0a2622 --- M view/resources/jquery/wikibase/snakview/snakview.variations.Value.js M view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: Aleksey Bekh-Ivanov (WMDE): Checked; Looks good to me, approved Addshore: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js index b113f98..0380f3f 100644 --- a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js +++ b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js @@ -176,6 +176,10 @@ this._entityStore .get( this._viewState.propertyId() ) .done( function( fetchedProperty ) { + if ( self.isDestroyed() ) { + return; + } + if ( newValue !== self.__currentNewValue ) { // If the API response is not for the most recent newValue, discard it return; @@ -339,6 +343,8 @@ * Creates and inserts a new `jQuery.valueview` while destroying the previously used * `jQuery.valueview` instance. * +* @private +* * @param {dataValues.DataValue} dataValue * @param {dataTypes.DataType} [dataType] The `DataTypes` which the given `DataValue` has *been created for. Can be omitted but might result in a less specialized diff --git a/view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js b/view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js index a80c4ad..89088f0 100644 --- a/view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js +++ b/view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js @@ -128,12 +128,22 @@ }, /** +* @protected +* +* @return {boolean} +*/ + isDestroyed: function() { + return !this._viewState; + }, + + /** * Returns an object that offers information about the related `snakview`'s current state as * well as allows updating the `snakview` instance. * * @see jQuery.wikibase.snakview * -* @return {jQuery.wikibase.snakview.ViewState} +* @return {jQuery.wikibase.snakview.ViewState|null} Null when called after the object got +* destroyed. */ viewState: function() { return this._viewState; -- To view, visit https://gerrit.wikimedia.org/r/326412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefa8ca4086f2adb5ccee8c18ae4f8dc87c0a2622 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)Gerrit-Reviewer: Addshore Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Initial import from the SocialProfile extension, adds suppor...
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330165 ) Change subject: Initial import from the SocialProfile extension, adds support for avatars .. Initial import from the SocialProfile extension, adds support for avatars This is not a social feature instead this just adds supports for avatars in users profiles. This is similar to what we do in phabricator. Change-Id: I82d9c57e5a143a5dc8a3e089f0536bc338e5e968 --- M autoload.php A includes/specials/SpecialUploadAvatar.php A includes/upload/UploadAvatar.php M resources/Resources.php A resources/src/mediawiki/mediawiki.avatar.css 5 files changed, 1,274 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/330165/1 diff --git a/autoload.php b/autoload.php index cdbdf1f..442266c 100644 --- a/autoload.php +++ b/autoload.php @@ -1380,6 +1380,7 @@ 'SpecialUnlinkAccounts' => __DIR__ . '/includes/specials/SpecialUnlinkAccounts.php', 'SpecialUnlockdb' => __DIR__ . '/includes/specials/SpecialUnlockdb.php', 'SpecialUpload' => __DIR__ . '/includes/specials/SpecialUpload.php', + 'SpecialUploadAvatar' => __DIR__ . '/includes/specials/SpecialUploadAvatar.php', 'SpecialUploadStash' => __DIR__ . '/includes/specials/SpecialUploadStash.php', 'SpecialUploadStashTooLargeException' => __DIR__ . '/includes/specials/SpecialUploadStash.php', 'SpecialUserLogin' => __DIR__ . '/includes/specials/SpecialUserLogin.php', @@ -1482,6 +1483,7 @@ 'UpdateRestrictions' => __DIR__ . '/maintenance/updateRestrictions.php', 'UpdateSearchIndex' => __DIR__ . '/maintenance/updateSearchIndex.php', 'UpdateSpecialPages' => __DIR__ . '/maintenance/updateSpecialPages.php', + 'UploadAvatar' => __DIR__ . '/includes/upload/UploadAvatar.php', 'UploadBase' => __DIR__ . '/includes/upload/UploadBase.php', 'UploadChunkFileException' => __DIR__ . '/includes/upload/UploadFromChunks.php', 'UploadChunkVerificationException' => __DIR__ . '/includes/upload/UploadFromChunks.php', diff --git a/includes/specials/SpecialUploadAvatar.php b/includes/specials/SpecialUploadAvatar.php new file mode 100644 index 000..3759bdf --- /dev/null +++ b/includes/specials/SpecialUploadAvatar.php @@ -0,0 +1,254 @@ + + * @copyright Copyright © 2007, Wikia Inc. + * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + */ + +class SpecialUploadAvatar extends SpecialUpload { + public $avatarUploadDirectory; + + /** +* Constructor +*/ + public function __construct( $request = null ) { + SpecialPage::__construct( 'UploadAvatar', 'upload', false/* listed? */ ); + } + + /** +* Let the parent handle most of the request, but specify the Upload +* class ourselves +*/ + protected function loadRequest() { + $request = $this->getRequest(); + parent::loadRequest( $request ); + $this->mUpload = new UploadAvatar(); + $this->mUpload->initializeFromRequest( $request ); + } + + /** +* Show the special page. Let the parent handle most stuff, but handle a +* successful upload ourselves +* +* @param $params Mixed: parameter(s) passed to the page or null +*/ + public function execute( $params ) { + $out = $this->getOutput(); + + // Add CSS + $out->addModuleStyles( array( + 'mediawiki.avatar.clearfix', + 'mediawiki.avatar.userprofile.css' + ) ); + + // Let the parent class do most of the heavy lifting. + parent::execute( $params ); + + if ( $this->mUploadSuccessful ) { + // Cancel redirect + $out->redirect( '' ); + + $this->showSuccess( $this->mUpload->mExtension ); + // Run a hook on avatar change + Hooks::run( 'NewAvatarUploaded', array( $this->getUser() ) ); + } + } + + /** +* Show some text and linkage on successful upload. +* +* @param $ext String: file extension (gif, jpg or png) +*/ + private function showSuccess( $ext ) { + global $wgAvatarKey, $wgUploadPath, $wgUploadAvatarInRecentChanges; + + $user = $this->getUser(); + $log = new LogPage( 'avatar' ); + if ( !$wgUploadAvatarInRecentChanges ) { + $log->updateRecentChanges = false; + } + $log->addEntry( + 'avatar', + $user->getUserPage(), + $this->msg( 'user-profile-picture-log-entry'
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add Special:EntityPage for addressing entities without knowi...
WMDE-leszek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330164 ) Change subject: Add Special:EntityPage for addressing entities without knowing the namespace .. Add Special:EntityPage for addressing entities without knowing the namespace Special:EntityPage expected entity ID as a sub page parameter. Given local entity ID, it redirects to Special:EntityData of local wiki. Given foreign entity ID, it redirects to Special:EntityPage on the foreign repo's wiki. This allows wikis to link to an entity page without needing to know namespace names of entity types configured on the target wiki. Bug: T153499 Change-Id: I4452689ef7869dd61c158e8a314b564680945967 --- M repo/Wikibase.i18n.alias.php M repo/Wikibase.php M repo/i18n/en.json M repo/i18n/qqq.json M repo/includes/Content/EntityContentFactory.php A repo/includes/Specials/SpecialEntityPage.php A repo/tests/phpunit/includes/Specials/SpecialEntityPageTest.php 7 files changed, 226 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/64/330164/1 diff --git a/repo/Wikibase.i18n.alias.php b/repo/Wikibase.i18n.alias.php index 61e80aa..9a33ea0 100644 --- a/repo/Wikibase.i18n.alias.php +++ b/repo/Wikibase.i18n.alias.php @@ -18,6 +18,7 @@ 'EntitiesWithoutDescription' => array( 'EntitiesWithoutDescription' ), 'EntitiesWithoutLabel' => array( 'EntitiesWithoutLabel' ), 'EntityData' => array( 'EntityData' ), + 'EntityPage' => array( 'EntityPage' ), 'GoToLinkedPage' => array( 'GoToLinkedPage' ), 'ItemByTitle' => array( 'ItemByTitle' ), 'ItemDisambiguation' => array( 'ItemDisambiguation' ), diff --git a/repo/Wikibase.php b/repo/Wikibase.php index f4cb472..f6e68a7 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -205,6 +205,11 @@ $wgSpecialPages['ListProperties'] = Wikibase\Repo\Specials\SpecialListProperties::class; $wgSpecialPages['DispatchStats'] = Wikibase\Repo\Specials\SpecialDispatchStats::class; $wgSpecialPages['EntityData'] = Wikibase\Repo\Specials\SpecialEntityData::class; + $wgSpecialPages['EntityPage'] = function() { + return new Wikibase\Repo\Specials\SpecialEntityPage( + Wikibase\Repo\WikibaseRepo::getDefaultInstance()->getEntityIdParser() + ); + }; $wgSpecialPages['MyLanguageFallbackChain'] = Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain::class; $wgSpecialPages['MergeItems'] = Wikibase\Repo\Specials\SpecialMergeItems::class; diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 727b9f8..23e5aae 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -293,6 +293,9 @@ "wikibase-entitydata-storage-error": "Failed to load entity $1.", "wikibase-entitydata-title": "Entity Data", "wikibase-entitydata-text": "This page provides a linked data interface to entity values. Please provide the entity ID in the URL, using subpage syntax.\n* Content negotiation applies based on you client's Accept header. This means that the entity data will be provided in the format preferred by your client. For a web browser, this will be HTML, causing your browser to be redirected to the regular entity page.\n* You can explicitly request a specific data format by adding the appropriate file extension to the entity ID: Q23.json will return data in the JSON format, Q23.ttl will return RDF/Turtle, and so on.", + "wikibase-entitypage-title": "Entity Page", + "wikibase-entitypage-text": "This page redirects to a entity's page. Please provide the entity ID in the URL, using subpage syntax.", + "wikibase-entitypage-bad-id": "Invalid ID: $1.", "special-redirectentity": "Redirect an entity", "wikibase-redirectentity-success": "$1 was redirected to $2.", "wikibase-redirectentity-fromid": "The ID to redirect from", diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json index af7c8f1..29af1ed 100644 --- a/repo/i18n/qqq.json +++ b/repo/i18n/qqq.json @@ -324,6 +324,9 @@ "wikibase-entitydata-storage-error": "Error shown when the requested entity could not be loaded.\n\nParameters:\n* $1 - entity ID\n* $2 - (Unused) revision ID\nSee also:\n* {{msg-mw|Wikibase-entitydata-bad-revision}}", "wikibase-entitydata-title": "Title shown on the special page when a form or text is presented", "wikibase-entitydata-text": "Explanatory text shown on the special page.", + "wikibase-entitypage-title": "Title shown on the special page when the explanatory text is presented", + "wikibase-entitypage-text": "Explanatory text shown on the special page.", + "wikibase-entitypage-bad-id": "Error shown when the requested ID is invalid. Parameters:\n* $1: the malformed ID", "special-redirectentity": "{{doc-special|RedirectEntity}}",
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Fix spelling of accusative and locative in comments
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/318890 ) Change subject: Fix spelling of accusative and locative in comments .. Fix spelling of accusative and locative in comments Change-Id: I352b96b655b5f15960d3d078d6977694e195779e --- M WikimediaMessages.hooks.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved WMDE-Fisch: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php index 61282b3..e4e4d93 100644 --- a/WikimediaMessages.hooks.php +++ b/WikimediaMessages.hooks.php @@ -447,7 +447,7 @@ 'Wikipodaci' => 'Wikipodacima', 'Wikivijesti' => 'Wikivijestima', ), - # akusative + # accusative 'akuzativ' => array( 'Vikirječnik' => 'Vikirječnika', 'Wikicitati' => 'Wikicitate', @@ -471,7 +471,7 @@ 'Wikipodaci' => 's Wikipodacima', 'Wikivijesti' => 's Wikivijestima', ), - # lokative + # locative 'lokativ' => array( 'Vikirječnik' => 'o Vikirječniku', 'Wikicitati' => 'o Wikicitatima', @@ -758,7 +758,7 @@ 'Wikicitaty' => 'Wikicitatam', 'Wikisłownik' => 'Wikisłownikej', ), - # akuzative + # accusative 'akuzativ' => array( 'Wikipedija' => 'Wikipediju', 'Wikiknihi' => 'Wikiknknihi', @@ -772,7 +772,7 @@ 'Wikicitaty' => 'Wikicitatami', 'Wikisłownik' => 'Wikisłownikom', ), - # lokative + # locative 'lokatiw' => array( 'Wikipedija' => 'Wikipediji', 'Wikiknihi' => 'Wikiknihach', @@ -909,7 +909,7 @@ 'Wikicitaty' => 'Wikicitatam', 'Wikisłownik' => 'Wikisłownikej', ), - # akuzative + # accusative 'akuzativ' => array( 'Wikipedija' => 'Wikipediju', 'Wikiknihi' => 'Wikiknknihi', @@ -923,7 +923,7 @@ 'Wikicitaty' => 'Wikicitatami', 'Wikisłownik' => 'Wikisłownikom', ), - # lokative + # locative 'lokatiw' => array( 'Wikipedija' => 'Wikipediji', 'Wikiknihi' => 'Wikiknihach', -- To view, visit https://gerrit.wikimedia.org/r/318890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I352b96b655b5f15960d3d078d6977694e195779e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: master Gerrit-Owner: WMDE-leszekGerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: WMDE-Fisch Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove deleted repos
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330162 ) Change subject: Remove deleted repos .. Remove deleted repos https://gerrit.wikimedia.org/r/#/c/330141/ Change-Id: I1fab64afcbf8112d17f4ee07b44959eff9673258 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 13 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index d9ac59a..8174fd8 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1554,8 +1554,6 @@ Mol Handler -# Mood Bar // Archived 2016-12-13 - MP3 Media Handler Mpdf @@ -1959,10 +1957,6 @@ #Post Edit / Merged into core / 2013-06-01 -Pref Stats -aliasfile = PrefStats/PrefStats.alias.php -ignored = prefstats-list-elem - #Pref Switch / No longer used at WMF / 2010-11-23 Raymond. Premoderation @@ -2154,13 +2148,6 @@ Semantic Expressiveness magicfile = SemanticExpressiveness/SemanticExpressiveness.i18n.magic.php - -# Renamed to PageForms - T147582 -# Semantic Forms -# aliasfile = SemanticForms/languages/SF_Aliases.php -# magicfile = SemanticForms/languages/SF_Magic.php -# ignored = sf_formedit_accesskey_saveandcontinueediting, accesskey-ca-formedit -# optional = sf-datepicker-dateformatlong, sf-datepicker-dateformatshort, sf-datepicker-firstdayofweek Semantic Forms Inputs -- To view, visit https://gerrit.wikimedia.org/r/330162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1fab64afcbf8112d17f4ee07b44959eff9673258 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond SpekkingGerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove deleted repos
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330162 ) Change subject: Remove deleted repos .. Remove deleted repos https://gerrit.wikimedia.org/r/#/c/330141/ Change-Id: I1fab64afcbf8112d17f4ee07b44959eff9673258 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/62/330162/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index d9ac59a..8174fd8 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1554,8 +1554,6 @@ Mol Handler -# Mood Bar // Archived 2016-12-13 - MP3 Media Handler Mpdf @@ -1959,10 +1957,6 @@ #Post Edit / Merged into core / 2013-06-01 -Pref Stats -aliasfile = PrefStats/PrefStats.alias.php -ignored = prefstats-list-elem - #Pref Switch / No longer used at WMF / 2010-11-23 Raymond. Premoderation @@ -2154,13 +2148,6 @@ Semantic Expressiveness magicfile = SemanticExpressiveness/SemanticExpressiveness.i18n.magic.php - -# Renamed to PageForms - T147582 -# Semantic Forms -# aliasfile = SemanticForms/languages/SF_Aliases.php -# magicfile = SemanticForms/languages/SF_Magic.php -# ignored = sf_formedit_accesskey_saveandcontinueediting, accesskey-ca-formedit -# optional = sf-datepicker-dateformatlong, sf-datepicker-dateformatshort, sf-datepicker-firstdayofweek Semantic Forms Inputs -- To view, visit https://gerrit.wikimedia.org/r/330162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fab64afcbf8112d17f4ee07b44959eff9673258 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Buggy[master]: Fix extension name in $wgMessagesDirs key
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330065 ) Change subject: Fix extension name in $wgMessagesDirs key .. Fix extension name in $wgMessagesDirs key Change-Id: I44754e462e21c0f0142bb65d71d52f4d331ca7c2 --- M Buggy.php M extension.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/Buggy.php b/Buggy.php index d9dc192..10d065a 100644 --- a/Buggy.php +++ b/Buggy.php @@ -48,7 +48,7 @@ // Register files $wgAutoloadClasses['BuggyHooks'] = __DIR__ . '/Buggy.hooks.php'; $wgAutoloadClasses['ApiBuggy'] = __DIR__ . '/ApiBuggy.php'; -$wgMessagesDirs['BoilerPlate'] = __DIR__ . '/i18n'; +$wgMessagesDirs['Buggy'] = __DIR__ . '/i18n'; // Register hooks $wgHooks['BeforePageDisplay'][] = 'BuggyHooks::onBeforePageDisplay'; diff --git a/extension.json b/extension.json index 18f03a8..ff9b9b0 100644 --- a/extension.json +++ b/extension.json @@ -17,7 +17,7 @@ "buggy": "ApiBuggy" }, "MessagesDirs": { - "BoilerPlate": [ + "Buggy": [ "i18n" ] }, -- To view, visit https://gerrit.wikimedia.org/r/330065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44754e462e21c0f0142bb65d71d52f4d331ca7c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Buggy Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Paladox Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use EntityIdPager interface from DataModel Services
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330161 ) Change subject: Use EntityIdPager interface from DataModel Services .. Use EntityIdPager interface from DataModel Services This is a 100% copy-paste job. We already require the Services version needed for this. Change-Id: I7d522ef949f6980961cba3da48ab350d00134cd7 --- M repo/includes/Dumpers/DumpGenerator.php M repo/includes/IO/EntityIdReader.php D repo/includes/Store/EntityIdPager.php M repo/includes/Store/Sql/ItemsPerSiteBuilder.php M repo/includes/Store/Sql/SqlEntityIdPager.php M repo/includes/Store/Sql/SqlEntityIdPagerFactory.php M repo/maintenance/dumpEntities.php M repo/maintenance/dumpRdf.php M repo/tests/phpunit/MockEntityIdPager.php M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php M repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php M repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php M repo/tests/phpunit/maintenance/dumpJsonTest.php M repo/tests/phpunit/maintenance/dumpRdfTest.php 14 files changed, 13 insertions(+), 62 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/61/330161/1 diff --git a/repo/includes/Dumpers/DumpGenerator.php b/repo/includes/Dumpers/DumpGenerator.php index 65f6323..a827959 100644 --- a/repo/includes/Dumpers/DumpGenerator.php +++ b/repo/includes/Dumpers/DumpGenerator.php @@ -12,7 +12,7 @@ use Wikibase\Lib\Reporting\NullMessageReporter; use Wikibase\Lib\Reporting\RethrowingExceptionHandler; use Wikibase\Lib\Store\StorageException; -use Wikibase\Repo\Store\EntityIdPager; +use Wikibase\DataModel\Services\EntityId\EntityIdPager; /** * DumpGenerator generates a dump of a given set of entities, excluding diff --git a/repo/includes/IO/EntityIdReader.php b/repo/includes/IO/EntityIdReader.php index f76f933..3f8dbca 100644 --- a/repo/includes/IO/EntityIdReader.php +++ b/repo/includes/IO/EntityIdReader.php @@ -8,7 +8,7 @@ use Wikibase\Lib\Reporting\ExceptionHandler; use Wikibase\Lib\Reporting\RethrowingExceptionHandler; use Wikibase\Repo\Disposable; -use Wikibase\Repo\Store\EntityIdPager; +use Wikibase\DataModel\Services\EntityId\EntityIdPager; /** * EntityIdReader reads entity IDs from a file, one per line. diff --git a/repo/includes/Store/EntityIdPager.php b/repo/includes/Store/EntityIdPager.php deleted file mode 100644 index a16dab3..000 --- a/repo/includes/Store/EntityIdPager.php +++ /dev/null @@ -1,49 +0,0 @@ -https://gerrit.wikimedia.org/r/330161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d522ef949f6980961cba3da48ab350d00134cd7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove jquery.uls also from REPOCONF*
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330160 ) Change subject: Remove jquery.uls also from REPOCONF* .. Remove jquery.uls also from REPOCONF* Change-Id: I5ae96ea3750d466eb1b592ccefdb4242b224c152 --- M REPOCONF M REPOCONF.commit 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/REPOCONF b/REPOCONF index 06456a6..f67b560 100644 --- a/REPOCONF +++ b/REPOCONF @@ -15,7 +15,6 @@ REPO_INTORPHANTALK=https://github.com/Krinkle/mw-tool-orphantalk.git REPO_INTRAUN=https://github.com/kenrick95/Raun.git REPO_INTREFILL=https://github.com/zhaofengli/refill.git -REPO_JQUERY_ULS=https://github.com/wikimedia/jquery.uls.git REPO_KIWIX=https://github.com/kiwix/maintenance.git REPO_MATHJAX=https://github.com/mathjax/MathJax-i18n.git REPO_MIFOS=https://github.com/openMF/community-app.git diff --git a/REPOCONF.commit b/REPOCONF.commit index b9bbf09..6c24ba3 100644 --- a/REPOCONF.commit +++ b/REPOCONF.commit @@ -24,7 +24,6 @@ REPO_INTORPHANTALK=g...@github.com:Krinkle/mw-tool-orphantalk.git REPO_INTRAUN=g...@github.com:kenrick95/Raun.git REPO_INTREFILL=g...@github.com:zhaofengli/refill.git -REPO_JQUERY_ULS=g...@github.com:wikimedia/jquery.uls.git REPO_KIWIX=g...@github.com:kiwix/maintenance.git REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git REPO_MIFOS=g...@github.com:openMF/community-app.git -- To view, visit https://gerrit.wikimedia.org/r/330160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ae96ea3750d466eb1b592ccefdb4242b224c152 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: NikerabbitGerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix whitespace in translatewiki-composer.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330159 ) Change subject: Fix whitespace in translatewiki-composer.json .. Fix whitespace in translatewiki-composer.json Change-Id: I1853327040c45cbce1edc9eaca377e3820463452 --- M translatewiki-composer.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/translatewiki-composer.json b/translatewiki-composer.json index ca6ad15..a2ed2f9 100644 --- a/translatewiki-composer.json +++ b/translatewiki-composer.json @@ -1,7 +1,7 @@ { "require": { -"mediawiki/maps": "~4.0", -"mediawiki/page-forms": "~4.0", + "mediawiki/maps": "~4.0", + "mediawiki/page-forms": "~4.0", "mediawiki/semantic-media-wiki": "~2.4", "romaricdrigon/metayaml": "~1.0" }, -- To view, visit https://gerrit.wikimedia.org/r/330159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1853327040c45cbce1edc9eaca377e3820463452 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: NikerabbitGerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove jquery.uls also from REPOCONF*
Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330160 ) Change subject: Remove jquery.uls also from REPOCONF* .. Remove jquery.uls also from REPOCONF* Change-Id: I5ae96ea3750d466eb1b592ccefdb4242b224c152 --- M REPOCONF M REPOCONF.commit 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/60/330160/1 diff --git a/REPOCONF b/REPOCONF index 06456a6..f67b560 100644 --- a/REPOCONF +++ b/REPOCONF @@ -15,7 +15,6 @@ REPO_INTORPHANTALK=https://github.com/Krinkle/mw-tool-orphantalk.git REPO_INTRAUN=https://github.com/kenrick95/Raun.git REPO_INTREFILL=https://github.com/zhaofengli/refill.git -REPO_JQUERY_ULS=https://github.com/wikimedia/jquery.uls.git REPO_KIWIX=https://github.com/kiwix/maintenance.git REPO_MATHJAX=https://github.com/mathjax/MathJax-i18n.git REPO_MIFOS=https://github.com/openMF/community-app.git diff --git a/REPOCONF.commit b/REPOCONF.commit index b9bbf09..6c24ba3 100644 --- a/REPOCONF.commit +++ b/REPOCONF.commit @@ -24,7 +24,6 @@ REPO_INTORPHANTALK=g...@github.com:Krinkle/mw-tool-orphantalk.git REPO_INTRAUN=g...@github.com:kenrick95/Raun.git REPO_INTREFILL=g...@github.com:zhaofengli/refill.git -REPO_JQUERY_ULS=g...@github.com:wikimedia/jquery.uls.git REPO_KIWIX=g...@github.com:kiwix/maintenance.git REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git REPO_MIFOS=g...@github.com:openMF/community-app.git -- To view, visit https://gerrit.wikimedia.org/r/330160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ae96ea3750d466eb1b592ccefdb4242b224c152 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix whitespace in translatewiki-composer.json
Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330159 ) Change subject: Fix whitespace in translatewiki-composer.json .. Fix whitespace in translatewiki-composer.json Change-Id: I1853327040c45cbce1edc9eaca377e3820463452 --- M translatewiki-composer.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/59/330159/1 diff --git a/translatewiki-composer.json b/translatewiki-composer.json index ca6ad15..a2ed2f9 100644 --- a/translatewiki-composer.json +++ b/translatewiki-composer.json @@ -1,7 +1,7 @@ { "require": { -"mediawiki/maps": "~4.0", -"mediawiki/page-forms": "~4.0", + "mediawiki/maps": "~4.0", + "mediawiki/page-forms": "~4.0", "mediawiki/semantic-media-wiki": "~2.4", "romaricdrigon/metayaml": "~1.0" }, -- To view, visit https://gerrit.wikimedia.org/r/330159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1853327040c45cbce1edc9eaca377e3820463452 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Move jquery.uls to repong system and translatewiki GitHub ac...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330158 ) Change subject: Move jquery.uls to repong system and translatewiki GitHub account .. Move jquery.uls to repong system and translatewiki GitHub account Change-Id: I08bc0634634515a6478d296cba97c09ac9d74548 --- M bin/REPONG-PROJECTS M bin/repocommit M bin/repoexport M bin/repoupdate M repoconfig.commit.json M repoconfig.json 6 files changed, 21 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS index a59687e..df2b974 100644 --- a/bin/REPONG-PROJECTS +++ b/bin/REPONG-PROJECTS @@ -4,8 +4,6 @@ commons-android copypatrol crosswatch -int-dcatap -int-heritage entryscape etherpad-lite europeana @@ -15,6 +13,9 @@ hivejs huggle inaturalist +int-dcatap +int-heritage +jquery.uls lib.reviews mantis mwgerrit diff --git a/bin/repocommit b/bin/repocommit index 56ae14a..5408f86 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -42,7 +42,6 @@ int-orphantalk \ int-raun \ int-refill \ -jquery.uls \ kiwix \ mathjax \ nfcring-control \ diff --git a/bin/repoexport b/bin/repoexport index da58961..1de0a09 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -58,11 +58,6 @@ php "$EXPORTER" --target . --group=int-refill --lang='*' --skip en $HOURS php "$EXPORTER" --target . --group=int-refill --lang qqq -elif [ "$PROJECT" = "jquery.uls" ] -then - php "$EXPORTER" --target . --group=out-jquery-uls --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-jquery-uls --lang qqq - elif [ "$PROJECT" = "kiwix" ] then php "$EXPORTER" --target . --group=out-kiwix --lang='*' --skip en --threshold 80 diff --git a/bin/repoupdate b/bin/repoupdate index 9208d75..6734378 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -50,7 +50,6 @@ int-orphantalk \ int-raun \ int-refill \ -jquery.uls \ kiwix \ mathjax \ nfcring-control \ diff --git a/repoconfig.commit.json b/repoconfig.commit.json index f879625..e234617 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -80,6 +80,15 @@ } } }, + "jquery.uls": { + "group": "out-jquery-uls", + "repos": { + "jquery.uls": { + "type": "github", + "url": "g...@github.com:wikimedia/jquery.uls.git" + } + } + }, "entryscape": { "group": "entryscape-*", "repos": { diff --git a/repoconfig.json b/repoconfig.json index cf6924d..379eb1b 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -78,6 +78,15 @@ } } }, + "jquery.uls": { + "group": "out-jquery-uls", + "repos": { + "jquery.uls": { + "type": "github", + "url": "https://github.com/wikimedia/jquery.uls.git; + } + } + }, "entryscape": { "group": "entryscape-*", "repos": { -- To view, visit https://gerrit.wikimedia.org/r/330158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08bc0634634515a6478d296cba97c09ac9d74548 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: NikerabbitGerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Move jquery.uls to repong system and translatewiki GitHub ac...
Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330158 ) Change subject: Move jquery.uls to repong system and translatewiki GitHub account .. Move jquery.uls to repong system and translatewiki GitHub account Change-Id: I08bc0634634515a6478d296cba97c09ac9d74548 --- M bin/REPONG-PROJECTS M bin/repocommit M bin/repoexport M bin/repoupdate M repoconfig.commit.json M repoconfig.json 6 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/58/330158/1 diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS index a59687e..df2b974 100644 --- a/bin/REPONG-PROJECTS +++ b/bin/REPONG-PROJECTS @@ -4,8 +4,6 @@ commons-android copypatrol crosswatch -int-dcatap -int-heritage entryscape etherpad-lite europeana @@ -15,6 +13,9 @@ hivejs huggle inaturalist +int-dcatap +int-heritage +jquery.uls lib.reviews mantis mwgerrit diff --git a/bin/repocommit b/bin/repocommit index 56ae14a..5408f86 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -42,7 +42,6 @@ int-orphantalk \ int-raun \ int-refill \ -jquery.uls \ kiwix \ mathjax \ nfcring-control \ diff --git a/bin/repoexport b/bin/repoexport index da58961..1de0a09 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -58,11 +58,6 @@ php "$EXPORTER" --target . --group=int-refill --lang='*' --skip en $HOURS php "$EXPORTER" --target . --group=int-refill --lang qqq -elif [ "$PROJECT" = "jquery.uls" ] -then - php "$EXPORTER" --target . --group=out-jquery-uls --lang='*' --skip en,qqq $THRESHOLD - php "$EXPORTER" --target . --group=out-jquery-uls --lang qqq - elif [ "$PROJECT" = "kiwix" ] then php "$EXPORTER" --target . --group=out-kiwix --lang='*' --skip en --threshold 80 diff --git a/bin/repoupdate b/bin/repoupdate index 9208d75..6734378 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -50,7 +50,6 @@ int-orphantalk \ int-raun \ int-refill \ -jquery.uls \ kiwix \ mathjax \ nfcring-control \ diff --git a/repoconfig.commit.json b/repoconfig.commit.json index f879625..e234617 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -80,6 +80,15 @@ } } }, + "jquery.uls": { + "group": "out-jquery-uls", + "repos": { + "jquery.uls": { + "type": "github", + "url": "g...@github.com:wikimedia/jquery.uls.git" + } + } + }, "entryscape": { "group": "entryscape-*", "repos": { diff --git a/repoconfig.json b/repoconfig.json index cf6924d..379eb1b 100644 --- a/repoconfig.json +++ b/repoconfig.json @@ -78,6 +78,15 @@ } } }, + "jquery.uls": { + "group": "out-jquery-uls", + "repos": { + "jquery.uls": { + "type": "github", + "url": "https://github.com/wikimedia/jquery.uls.git; + } + } + }, "entryscape": { "group": "entryscape-*", "repos": { -- To view, visit https://gerrit.wikimedia.org/r/330158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08bc0634634515a6478d296cba97c09ac9d74548 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add poolcounter to thumbor role
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330157 ) Change subject: Add poolcounter to thumbor role .. Add poolcounter to thumbor role Bug: T151066 Change-Id: I8d070e4effacf601ac285c348ac8ceb53cf39c39 --- M puppet/modules/role/manifests/thumbor.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Gilles: Looks good to me, approved diff --git a/puppet/modules/role/manifests/thumbor.pp b/puppet/modules/role/manifests/thumbor.pp index e25a59b..fe9ec23 100644 --- a/puppet/modules/role/manifests/thumbor.pp +++ b/puppet/modules/role/manifests/thumbor.pp @@ -8,6 +8,7 @@ require ::role::memcached require ::role::pagedtiffhandler require ::role::pdfhandler +require ::role::poolcounter require ::role::swift require ::role::timedmediahandler require ::role::multimedia -- To view, visit https://gerrit.wikimedia.org/r/330157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d070e4effacf601ac285c348ac8ceb53cf39c39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: GillesGerrit-Reviewer: Gilles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add poolcounter to thumbor role
Gilles has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330157 ) Change subject: Add poolcounter to thumbor role .. Add poolcounter to thumbor role Bug: T151066 Change-Id: I8d070e4effacf601ac285c348ac8ceb53cf39c39 --- M puppet/modules/role/manifests/thumbor.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/57/330157/1 diff --git a/puppet/modules/role/manifests/thumbor.pp b/puppet/modules/role/manifests/thumbor.pp index e25a59b..fe9ec23 100644 --- a/puppet/modules/role/manifests/thumbor.pp +++ b/puppet/modules/role/manifests/thumbor.pp @@ -8,6 +8,7 @@ require ::role::memcached require ::role::pagedtiffhandler require ::role::pdfhandler +require ::role::poolcounter require ::role::swift require ::role::timedmediahandler require ::role::multimedia -- To view, visit https://gerrit.wikimedia.org/r/330157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d070e4effacf601ac285c348ac8ceb53cf39c39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add new mandatory config value to Thumbor
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330156 ) Change subject: Add new mandatory config value to Thumbor .. Add new mandatory config value to Thumbor Bug: T150754 Change-Id: I66eecb7ae1bf18e170cf00b31436075689ca4717 --- M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Gilles: Looks good to me, approved diff --git a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb index 78b25e1..7d0e942 100644 --- a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb +++ b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb @@ -58,6 +58,8 @@ HTTP_LOADER_MAX_BODY_SIZE = 1024 * 1024 * 1024 # 1GB +LOADER_EXCERPT_LENGTH = 4096 + # 2 minutes, for situations where an engine failed to clean up after itself HTTP_LOADER_TEMP_FILE_TIMEOUT = 120 -- To view, visit https://gerrit.wikimedia.org/r/330156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I66eecb7ae1bf18e170cf00b31436075689ca4717 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: GillesGerrit-Reviewer: Gilles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add new mandatory config value to Thumbor
Gilles has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330156 ) Change subject: Add new mandatory config value to Thumbor .. Add new mandatory config value to Thumbor Bug: T150754 Change-Id: I66eecb7ae1bf18e170cf00b31436075689ca4717 --- M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/56/330156/1 diff --git a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb index 78b25e1..7d0e942 100644 --- a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb +++ b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb @@ -58,6 +58,8 @@ HTTP_LOADER_MAX_BODY_SIZE = 1024 * 1024 * 1024 # 1GB +LOADER_EXCERPT_LENGTH = 4096 + # 2 minutes, for situations where an engine failed to clean up after itself HTTP_LOADER_TEMP_FILE_TIMEOUT = 120 -- To view, visit https://gerrit.wikimedia.org/r/330156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66eecb7ae1bf18e170cf00b31436075689ca4717 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MwEmbedSupport[master]: Remove eclipse project file
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/327844 ) Change subject: Remove eclipse project file .. Remove eclipse project file Also expand .gitignore Change-Id: I765c42f687ff4ec3bb4cbbff76d6dfac1806290c --- M .gitignore D .project 2 files changed, 20 insertions(+), 15 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 9d06b20..542ef3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -*~ -*.kate-swp -.*.swp -.project node_modules/ # Composer @@ -9,3 +5,23 @@ /composer.lock /composer.json /composer.local.json + +# Editors +*.kate-swp +*~ +\#*# +.#* +.*.swp +.project +.buildpath +.classpath +.settings +cscope.files +cscope.out +*.orig +## NetBeans +nbproject* +project.index +## Sublime +sublime-* +sftp-config.json diff --git a/.project b/.project deleted file mode 100644 index 7c299e3..000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - MwEmbedSupport - - - - - - - - -- To view, visit https://gerrit.wikimedia.org/r/327844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I765c42f687ff4ec3bb4cbbff76d6dfac1806290c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MwEmbedSupport Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: (WIP)tests: only setup database when needed
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330155 ) Change subject: (WIP)tests: only setup database when needed .. (WIP)tests: only setup database when needed Follow-up e63807593. Which causes the database setup to be done once per class even when they dont need any database access. Change-Id: I1570f900077b86b172824ab49e1c8e238055c039 --- M tests/phpunit/MediaWikiTestCase.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/55/330155/1 diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index fd02a3e..0d959fd 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -366,7 +366,7 @@ $needsResetDB = false; - if ( !self::$dbSetup || $this->needsDB() ) { + if ( !self::$dbSetup && $this->needsDB() ) { // set up a DB connection for this test to use self::$useTemporaryTables = !$this->getCliArg( 'use-normal-tables' ); -- To view, visit https://gerrit.wikimedia.org/r/330155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1570f900077b86b172824ab49e1c8e238055c039 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageDisqus[master]: Change extension url to https
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330049 ) Change subject: Change extension url to https .. Change extension url to https Change-Id: Ibac2dcf811d414ed844caf14a1990d59bcee3ebb --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 0bcf1f0..9666353 100644 --- a/extension.json +++ b/extension.json @@ -5,7 +5,7 @@ "Michael Platzer", "[[mw:User:Felipe Schenone|Felipe Schenone]]" ], - "url": "http://www.mediawiki.org/wiki/Extension:PageDisqus;, + "url": "https://www.mediawiki.org/wiki/Extension:PageDisqus;, "descriptionmsg": "pagedisqus-desc", "type": "other", "MessagesDirs": { -- To view, visit https://gerrit.wikimedia.org/r/330049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibac2dcf811d414ed844caf14a1990d59bcee3ebb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageDisqus Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VikiSemanticTitle[master]: Change extension url to https
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330051 ) Change subject: Change extension url to https .. Change extension url to https Change-Id: If1b65e737a83d8e235f8103443c92d33573b6401 --- M extension.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index ef8bdd0..fc2039e 100644 --- a/extension.json +++ b/extension.json @@ -1,8 +1,8 @@ { "name": "VikiSemanticTitle", "version": "1.3", - "author": "[http://www.mediawiki.org/wiki/User:Jji Jason Ji]", - "url": "http://www.mediawiki.org/wiki/Extension:VikiSemanticTitle;, + "author": "[https://www.mediawiki.org/wiki/User:Jji Jason Ji]", + "url": "https://www.mediawiki.org/wiki/Extension:VikiSemanticTitle;, "descriptionmsg": "vikisemantictitle-desc", "type": "parserhook", "MessagesDirs": { -- To view, visit https://gerrit.wikimedia.org/r/330051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1b65e737a83d8e235f8103443c92d33573b6401 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VikiSemanticTitle Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Buggy[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330073 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker Bug: T94547 Change-Id: I830665f626bc71b8332262a300acbb693e80fd25 --- M Gruntfile.js M package.json 2 files changed, 15 insertions(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index c9e1a11..2fb0681 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,8 @@ /*jshint node:true */ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { jshint: { @@ -11,10 +13,20 @@ '*.js', 'modules/*.js' ] + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + }, + banana: { + all: 'i18n/' } } ); - grunt.registerTask( 'lint', [ 'jshint' ] ); + grunt.registerTask( 'lint', [ 'jshint', 'jsonlint', 'banana' ] ); grunt.registerTask( 'test', 'lint' ); grunt.registerTask( 'default', 'test' ); }; diff --git a/package.json b/package.json index baada8c..a30de34 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ }, "devDependencies": { "grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0", "grunt-contrib-jshint": "1.0.0" } } -- To view, visit https://gerrit.wikimedia.org/r/330073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I830665f626bc71b8332262a300acbb693e80fd25 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Buggy Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VikiTitleIcon[master]: Change extension url to https
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330052 ) Change subject: Change extension url to https .. Change extension url to https Change-Id: I628231f57fcc95f2686611354199d38e873ac38d --- M extension.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 2ce7d14..ff5c6a6 100644 --- a/extension.json +++ b/extension.json @@ -1,8 +1,8 @@ { "name": "VikiTitleIcon", "version": "1.3.1", - "author": "[http://www.mediawiki.org/wiki/User:Jji Jason Ji]", - "url": "http://www.mediawiki.org/wiki/Extension:VikiTitleIcon;, + "author": "[https://www.mediawiki.org/wiki/User:Jji Jason Ji]", + "url": "https://www.mediawiki.org/wiki/Extension:VikiTitleIcon;, "descriptionmsg": "vikititleicon-desc", "type": "parserhook", "APIModules": { -- To view, visit https://gerrit.wikimedia.org/r/330052 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I628231f57fcc95f2686611354199d38e873ac38d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VikiTitleIcon Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Buggy[master]: Call jshint over grunt
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330072 ) Change subject: Call jshint over grunt .. Call jshint over grunt This allows to add grunt-banana-checker later Change-Id: I50a1084a60d32de309713c5d820fb7eec821f7cb --- A Gruntfile.js M package.json 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..c9e1a11 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,20 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '*.js', + 'modules/*.js' + ] + } + } ); + + grunt.registerTask( 'lint', [ 'jshint' ] ); + grunt.registerTask( 'test', 'lint' ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json index 22d4ca4..baada8c 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ { "scripts": { -"test": "jshint ." +"test": "grunt test" }, "devDependencies": { -"jshint": "2.8.0" +"grunt": "1.0.1", +"grunt-contrib-jshint": "1.0.0" } } -- To view, visit https://gerrit.wikimedia.org/r/330072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50a1084a60d32de309713c5d820fb7eec821f7cb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Buggy Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Add grunt-jsonlint
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330089 ) Change subject: Add grunt-jsonlint .. Add grunt-jsonlint Together with existing grunt-banana-checker this will check for valid i18n files Change-Id: I638017b9e691611e6ad7dbe543d9ce2a171e06c1 --- M Gruntfile.js M package.json 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index 931b835..d7f05c8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,5 +1,6 @@ /*jshint node:true */ module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { @@ -7,10 +8,17 @@ all: [ 'i18n/', ] + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] } } ); - grunt.registerTask( 'lint', [ 'banana' ] ); + grunt.registerTask( 'lint', [ 'jsonlint', 'banana' ] ); grunt.registerTask( 'test', [ 'lint' ] ); grunt.registerTask( 'default', [ 'test' ] ); }; diff --git a/package.json b/package.json index d916fde..12df97f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "devDependencies": { "grunt": "1.0.1", -"grunt-banana-checker": "0.5.0" +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" }, "scripts": { "test": "grunt test" -- To view, visit https://gerrit.wikimedia.org/r/330089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I638017b9e691611e6ad7dbe543d9ce2a171e06c1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLove Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LanguageTool[master]: Add grunt-jsonlint
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330086 ) Change subject: Add grunt-jsonlint .. Add grunt-jsonlint Together with existing grunt-banana-checker this will check for valid i18n files Change-Id: Id7afe489d9639a2d498417ba90773ea0d1c2f19f --- M Gruntfile.js M package.json 2 files changed, 10 insertions(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index a6da383..a260757 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,6 +2,7 @@ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-jscs' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { @@ -19,10 +20,17 @@ }, banana: { all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] } } ); - grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'banana' ] ); + grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); grunt.registerTask( 'test', [ 'lint' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/package.json b/package.json index cc5ae03..d29a4ea 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-banana-checker": "0.4.0", +"grunt-jsonlint": "1.1.0", "grunt-contrib-jshint": "0.11.3", "grunt-jscs": "1.8.0" } -- To view, visit https://gerrit.wikimedia.org/r/330086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7afe489d9639a2d498417ba90773ea0d1c2f19f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LanguageTool Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ParsoidBatchAPI[master]: Add grunt-jsonlint
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330087 ) Change subject: Add grunt-jsonlint .. Add grunt-jsonlint Together with existing grunt-banana-checker this will check for valid i18n files Change-Id: I29d298cbbdf4d50bde20741fc7c1eaba9d8638c8 --- M Gruntfile.js M package.json 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index ee7863f..d990810 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,5 @@ module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { @@ -6,10 +7,17 @@ all: [ 'i18n/', ] + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] } } ); - grunt.registerTask( 'lint', ['banana'] ); + grunt.registerTask( 'lint', ['jsonlint', 'banana'] ); grunt.registerTask( 'test', ['lint'] ); grunt.registerTask( 'default', ['test'] ); }; diff --git a/package.json b/package.json index d916fde..12df97f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "devDependencies": { "grunt": "1.0.1", -"grunt-banana-checker": "0.5.0" +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" }, "scripts": { "test": "grunt test" -- To view, visit https://gerrit.wikimedia.org/r/330087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29d298cbbdf4d50bde20741fc7c1eaba9d8638c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Add grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/328942 ) Change subject: Add grunt-banana-checker .. Add grunt-banana-checker Bug: T94547 Change-Id: I2ed9b401412c8718c3bf1911d7360c7ccf3b4621 --- M Gruntfile.js M package.json 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, but someone else must approve diff --git a/Gruntfile.js b/Gruntfile.js index 4eeaabf..a3c49a8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,6 +3,7 @@ grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-jscs' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { jshint: { @@ -21,9 +22,12 @@ '**/*.json', '!node_modules/**' ] + }, + banana: { + all: 'i18n/' } } ); - grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/package.json b/package.json index fa62efd..4a2ae24 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "license": "GPLv2", "devDependencies": { "grunt": "0.4.5", +"grunt-banana-checker": "0.5.0", "grunt-cli": "0.1.13", "grunt-jsonlint": "1.0.7", "grunt-contrib-jshint": "0.11.3", -- To view, visit https://gerrit.wikimedia.org/r/328942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ed9b401412c8718c3bf1911d7360c7ccf3b4621 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Dashiki[master]: Add empty @metadata to i18n file for banana check
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329633 ) Change subject: Add empty @metadata to i18n file for banana check .. Add empty @metadata to i18n file for banana check Change-Id: I8fee864b29ae720f7a4a60b4d76c91371421807c --- M i18n/en.json M i18n/qqq.json 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index a676e3b..131b114 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,4 +1,5 @@ { + "@metadata": {}, "dashiki-desc": "Dashiki is a dashboarding tool that uses wiki pages as configuration. This extension helps Dashiki authors read and edit valid configuration pages on wiki.", "dashiki-build": "Build a dashboard with this config using the command:" } diff --git a/i18n/qqq.json b/i18n/qqq.json index b190771..9d2879c 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -1,4 +1,5 @@ { + "@metadata": {}, "dashiki-desc": "{{desc|name=Dashiki|url=https://www.mediawiki.org/wiki/Extension:Dashiki}};, "dashiki-build": "Label shown next to the command used to build a Dashiki dashboard based on this configuration" } -- To view, visit https://gerrit.wikimedia.org/r/329633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fee864b29ae720f7a4a60b4d76c91371421807c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Dashiki Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Memento[master]: Add empty @metadata to i18n file
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329678 ) Change subject: Add empty @metadata to i18n file .. Add empty @metadata to i18n file Change-Id: Ia133d0a1c8fb809e25b332d7566abd3406c0916e --- M Memento/i18n/en.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/Memento/i18n/en.json b/Memento/i18n/en.json index b864bb9..f8cf706 100644 --- a/Memento/i18n/en.json +++ b/Memento/i18n/en.json @@ -1,4 +1,5 @@ { + "@metadata": {}, "memento" : "Memento", "memento-desc" : "The Memento extension implements support for the Accept-Datetime HTTP header to perform content negotiation in the date-time dimension. It will retrieve the revision of a given article by matching a specified datetime. Please visit http://mementoweb.org for more information.", "timegate" : "Memento TimeGate", -- To view, visit https://gerrit.wikimedia.org/r/329678 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia133d0a1c8fb809e25b332d7566abd3406c0916e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Memento Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: Use lowercase letters for query string params
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330130 ) Change subject: Use lowercase letters for query string params .. Use lowercase letters for query string params Also remove extdist_submit, as it is unused. Change-Id: I232cb0402b1e99d3f675966587baf21ee287e3e9 --- M includes/specials/SpecialBaseDistributor.php M resources/ext.extensiondistributor.special.js 2 files changed, 9 insertions(+), 14 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialBaseDistributor.php b/includes/specials/SpecialBaseDistributor.php index e121666..1a176a0 100644 --- a/includes/specials/SpecialBaseDistributor.php +++ b/includes/specials/SpecialBaseDistributor.php @@ -56,8 +56,8 @@ list( $name, $version ) = $parts; } else { - $name = $this->getRequest()->getVal( 'extdist_name' ); - $version = $this->getRequest()->getVal( 'extdist_version' ); + $name = $this->getRequest()->getVal( 'extdistname' ); + $version = $this->getRequest()->getVal( 'extdistversion' ); } if ( !$name ) { @@ -125,13 +125,12 @@ 'classes' => [ 'mw-extdist-selector' ], 'infusable' => true, 'options' => $items, - 'name' => 'extdist_name', + 'name' => 'extdistname', ] ) . // only shown to no-JS users via CSS new OOUI\ButtonInputWidget( [ 'classes' => [ 'mw-extdist-ext-submit' ], 'infusable' => true, - 'name' => 'extdist_submit', 'label' => $this->msg( 'extdist-submit-extension' )->text(), 'type' => 'submit', 'flags' => [ 'primary', 'progressive' ], @@ -230,7 +229,7 @@ Xml::openElement( 'form', [ 'action' => $this->getPageTitle()->getLocalURL(), 'method' => 'GET' ] ) . - Html::hidden( 'extdist_name', $repoName ); + Html::hidden( 'extdistname', $repoName ); $options = []; $selected = 0; @@ -251,10 +250,9 @@ 'infusable' => true, 'options' => $options, 'value' => $wgExtDistDefaultSnapshot, - 'name' => 'extdist_version', + 'name' => 'extdistversion', ] ), new OOUI\ButtonInputWidget( [ - 'name' => 'extdist_submit', 'label' => $this->msg( 'extdist-submit-version' )->text(), 'type' => 'submit', 'flags' => [ 'primary', 'progressive' ], diff --git a/resources/ext.extensiondistributor.special.js b/resources/ext.extensiondistributor.special.js index 92bf73a..fb94936 100644 --- a/resources/ext.extensiondistributor.special.js +++ b/resources/ext.extensiondistributor.special.js @@ -104,7 +104,7 @@ classes: [ 'mw-extdist-selector-version' ], options: options, value: mw.config.get( 'wgExtDistDefaultSnapshot' ), - name: 'extdist_version' + name: 'extdistversion' } ); // JS parser doesn't handle \n\n, see T100229 $continue.html( mw.message( @@ -113,17 +113,14 @@ ).parse().replace( /\n\n/g, '' ) ); versionButton = new OO.ui.ButtonInputWidget( { classes: [ 'mw-extdist-submit-button' ], - name: 'extdist_submit', label: mw.msg( 'extdist-submit-version' ), flags: [ 'primary', 'progressive' ] } ).on( 'click', function () { // Redirect to download page: - // extdist_name=ExtensionDistributor_version=master + // extdistname=ExtensionDistributor=master window.location.href = mw.util.getUrl( mw.config.get(
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add JVM Heap usage alarms for basic Hadoop daemons
Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330154 ) Change subject: Add JVM Heap usage alarms for basic Hadoop daemons .. Add JVM Heap usage alarms for basic Hadoop daemons Bug: T88640 Change-Id: I6d47880bd69106268eb0ff03bd9ee2293d59049c --- M modules/role/manifests/analytics_cluster/hadoop/master.pp M modules/role/manifests/analytics_cluster/hadoop/standby.pp M modules/role/manifests/analytics_cluster/hadoop/worker.pp 3 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/330154/1 diff --git a/modules/role/manifests/analytics_cluster/hadoop/master.pp b/modules/role/manifests/analytics_cluster/hadoop/master.pp index cecd152..15c9c02 100644 --- a/modules/role/manifests/analytics_cluster/hadoop/master.pp +++ b/modules/role/manifests/analytics_cluster/hadoop/master.pp @@ -90,6 +90,18 @@ Sudo::User['nagios-check_hdfs_active_namenode'], ], } + +# Java heap space used alerts +# The goal is to get alarms for long running memory leaks like T153951 +monitoring::graphite_threshold { "analytics_hadoop_namenode_hdfs": +description => 'HDFS active Namenode JVM Heap usage', +metric=> "Hadoop.NameNode.${::hostname}_eqiad_wmnet_9980.Hadoop.NameNode.JvmMetrics.MemHeapUsedM.upper", +from => '60min', +warning => '2867', # 70% of available space +critical => '3868', # 90% of available space +percentage=> '60', +contact_group => 'admins,analytics', +} } # Firewall diff --git a/modules/role/manifests/analytics_cluster/hadoop/standby.pp b/modules/role/manifests/analytics_cluster/hadoop/standby.pp index 4ae5e29..2eaf606 100644 --- a/modules/role/manifests/analytics_cluster/hadoop/standby.pp +++ b/modules/role/manifests/analytics_cluster/hadoop/standby.pp @@ -31,6 +31,18 @@ contact_group => 'admins,analytics', require => Class['cdh::hadoop::namenode::standby'], } + +# Java heap space used alerts +# The goal is to get alarms for long running memory leaks like T153951 +monitoring::graphite_threshold { "analytics_hadoop_namenode_hdfs": +description => 'HDFS standby Namenode JVM Heap usage', +metric=> "Hadoop.NameNode.${::hostname}_eqiad_wmnet_9980.Hadoop.NameNode.JvmMetrics.MemHeapUsedM.upper", +from => '60min', +warning => '2867', # 70% of available space +critical => '3868', # 90% of available space +percentage=> '60', +contact_group => 'admins,analytics', +} } # Firewall diff --git a/modules/role/manifests/analytics_cluster/hadoop/worker.pp b/modules/role/manifests/analytics_cluster/hadoop/worker.pp index 402df25..9c1e320 100644 --- a/modules/role/manifests/analytics_cluster/hadoop/worker.pp +++ b/modules/role/manifests/analytics_cluster/hadoop/worker.pp @@ -53,6 +53,27 @@ nrpe_command => '/usr/local/lib/nagios/plugins/check_hadoop_yarn_node_state', contact_group => 'admins,analytics', } + +# Java heap space used alerts +# The goal is to get alarms for long running memory leaks like T153951 +monitoring::graphite_threshold { "analytics_hadoop_yarn_nodemanager": +description => 'YARN NodeManager JVM Heap usage', +metric=> "Hadoop.NodeManager.${::hostname}_eqiad_wmnet_9984.Hadoop.NodeManager.JvmMetrics.MemHeapUsedM.upper", +from => '60min', +warning => '1433', # 70% of available space +critical => '1843', # 90% of available space +percentage=> '60', +contact_group => 'admins,analytics', +} +monitoring::graphite_threshold { "analytics_hadoop_datanode_hdfs": +description => 'HDFS DataNode JVM Heap usage', +metric=> "Hadoop.DataNode.${::hostname}_eqiad_wmnet_9981.Hadoop.DataNode.JvmMetrics.MemHeapUsedM.upper", +from => '60min', +warning => '1433', # 70% of available space +critical => '1843', # 90% of available space +percentage=> '60', +contact_group => 'admins,analytics', +} } # hive::client is nice to have for jobs launched -- To view, visit https://gerrit.wikimedia.org/r/330154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d47880bd69106268eb0ff03bd9ee2293d59049c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey___ MediaWiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Collapse and expand smoothly
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330120 ) Change subject: Collapse and expand smoothly .. Collapse and expand smoothly Some changes to the DOM where necessary to avoid sliding of identical lines. Bug: T149721 Change-Id: Id801317356252686fa5b3c4228b4b5c8f9e9090e --- M includes/TwoColConflictPage.php M modules/ext.TwoColConflict.filter.js M tests/phpunit/includes/TwoColConflictPageTest.php 3 files changed, 33 insertions(+), 23 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php index e3c8a3f..996d369 100644 --- a/includes/TwoColConflictPage.php +++ b/includes/TwoColConflictPage.php @@ -247,10 +247,7 @@ break; case 'copy': $output[] = '' . - '' . - $changeSet['copy'] . '' . - '' . - $this->getCollapsedText( $changeSet['copy'] ) . '' . + $this->addUnchangedText( $changeSet['copy'] ) . ''; break; } @@ -262,18 +259,36 @@ } /** +* Build HTML for the unchanged text in the unified diff box. +* +* @return string +*/ + private function addUnchangedText( $text ) { + $collapsedText = $this->getCollapsedText( $text ); + + if ( !$collapsedText ) { + return $text; + } + + return + '' . $text . '' . + '' . $collapsedText . ''; + } + + /** * Get a collapsed version of multi-line text. +* Returns false if text is within length-limit. * * @param string $text * @param int $maxLength -* @return string +* @return string|false */ private function getCollapsedText( $text, $maxLength = 150 ) { $text = $this->trimWhiteSpaces( html_entity_decode( $text ) ); $lines = explode( "\n", $text ); if ( mb_strlen( $text ) <= $maxLength && count( $lines ) <= 2 ) { - return htmlentities( $text ); + return false; } return diff --git a/modules/ext.TwoColConflict.filter.js b/modules/ext.TwoColConflict.filter.js index 4c36d49..13eb737 100644 --- a/modules/ext.TwoColConflict.filter.js +++ b/modules/ext.TwoColConflict.filter.js @@ -4,11 +4,11 @@ $( 'input[name="mw-twocolconflict-same"]' ).change( function () { if ( $( this ).val() === 'show' ) { - $( '.mw-twocolconflict-diffchange-same-collapsed' ).hide(); - $( '.mw-twocolconflict-diffchange-same-full' ).show(); + $( '.mw-twocolconflict-diffchange-same-collapsed' ).slideUp(); + $( '.mw-twocolconflict-diffchange-same-full' ).slideDown(); } else { - $( '.mw-twocolconflict-diffchange-same-full' ).hide(); - $( '.mw-twocolconflict-diffchange-same-collapsed' ).show(); + $( '.mw-twocolconflict-diffchange-same-full' ).slideUp(); + $( '.mw-twocolconflict-diffchange-same-collapsed' ).slideDown(); } } ); diff --git a/tests/phpunit/includes/TwoColConflictPageTest.php b/tests/phpunit/includes/TwoColConflictPageTest.php index e2e0cfb..1dd821c 100644 --- a/tests/phpunit/includes/TwoColConflictPageTest.php +++ b/tests/phpunit/includes/TwoColConflictPageTest.php @@ -9,14 +9,12 @@ /** * @covers TwoColConflictPageTest::getCollapsedText */ - public function testGetCollapsedText_noCutWhenInLimit() { + public function testGetCollapsedText_returnFalseWhenInLimit() { $twoColConflictPageMock = TestingAccessWrapper::newFromObject( $this->getMockPage() ); - $this->assertEquals( - 'One Two Three.', + $this->assertFalse( $twoColConflictPageMock->getCollapsedText( 'One Two Three.', 14 ) ); - $this->assertEquals( - 'واحد اثنين ثلاثة', +
[MediaWiki-commits] [Gerrit] mediawiki...NamespacePopups[master]: LinksUpdateConstructed branch
VictorPorton has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330153 ) Change subject: LinksUpdateConstructed branch .. LinksUpdateConstructed branch Change-Id: Id6912ca1d6e2dfa986e16131303e9c32a4185b7b --- M NamespacePopups.hooks.php M extension.json 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NamespacePopups refs/changes/53/330153/1 diff --git a/NamespacePopups.hooks.php b/NamespacePopups.hooks.php index de11249..ab7fee6 100644 --- a/NamespacePopups.hooks.php +++ b/NamespacePopups.hooks.php @@ -28,6 +28,8 @@ // $url = wfExpandUrl( $url, $proto = PROTO_RELATIVE ); // $proto $url = preg_replace( '/\$1/', $page, $wgArticlePath ); +// $html .= "$anchor"; + $title = Title::newFromLinkTarget( Title::newFromText( $page ) ); if ( $title->isKnown() ) { $html .= "$anchor"; @@ -38,4 +40,32 @@ $ret = $html; return false; } + + public static function onLinksUpdateConstructed( LinksUpdate &$updater ) { +global $wgNamespacePopupsNamespaceMap; + +if(!$wgNamespacePopupsNamespaceMap) return; + +$oldLinks = $updater->mLinks; + +foreach(array_keys($oldLinks) as $linkPage) { +if(preg_match( '|^([^:/]+):(.*)|', $linkPage, $m )) { +$linkNS = $matches[1]; +$remains = $matches[2]; +} else { +$linkNS = ''; +$remains = $linkPage; +} +$popupNS = @$wgNamespacePopupsNamespaceMap[$linkNS] ?: @$wgNamespacePopupsNamespaceMap['*']; +if(!$popupNS) continue; +if($popupNS === '*') { +$popupPage = $linkPage; +} else { +$popupPage = $popupNS === '' ? $remains : "$popupNS:$remains"; +} +// FIXME: What's about spaces and underscores? +if(!isset($updater->mLinks[$popupPage])) // cache +$updater->mLinks[$popupPage] = Title::newFromDBkey($popupPage)->getArticleID(); +} + } } diff --git a/extension.json b/extension.json index 780499a..5e969a0 100644 --- a/extension.json +++ b/extension.json @@ -18,6 +18,9 @@ "Hooks": { "HtmlPageLinkRendererEnd": [ "NamespacePopupsHooks::onHtmlPageLinkRendererEnd" + ], + "LinksUpdateConstructed": [ +"NamespacePopupsHooks::onLinksUpdateConstructed" ] }, "ResourceFileModulePaths": { -- To view, visit https://gerrit.wikimedia.org/r/330153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6912ca1d6e2dfa986e16131303e9c32a4185b7b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NamespacePopups Gerrit-Branch: master Gerrit-Owner: VictorPorton___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NamespacePopups[master]: initial version
VictorPorton has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330152 ) Change subject: initial version .. initial version Change-Id: I52160a18986884fb27b4494c7881c16a97c1b677 --- A .gitignore A Gruntfile.js A NamespacePopups.hooks.php A NamespacePopups.php A README.md A composer.json A extension.json A package.json A phpcs.xml 9 files changed, 163 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NamespacePopups refs/changes/52/330152/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..6ad5e33 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,31 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-jscs' ); + + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '**/*.js', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/NamespacePopups.hooks.php b/NamespacePopups.hooks.php new file mode 100644 index 000..de11249 --- /dev/null +++ b/NamespacePopups.hooks.php @@ -0,0 +1,41 @@ +getSubjectNsText(); + global $wgContLang; + $linkNS = $wgContLang->getNsText( MWNamespace::getSubject( $target->getNamespace() ) ); + +if(!$linkNS) $linkNS = ''; // needed? + +$popupNS = isset($wgNamespacePopupsNamespaceMap[$linkNS]) ? $wgNamespacePopupsNamespaceMap[$linkNS] : null; +if(!$popupNS) $popupNS = isset($wgNamespacePopupsNamespaceMap['*']) ? $wgNamespacePopupsNamespaceMap['*'] : null; +if(!$popupNS) return true; +if($popupNS === '*') $popupNS = $linkNS; + + $html = HtmlArmor::getHtml( $text ); + $html = Html::rawElement( 'a', $attribs, $html ); + $remains = $target->getDBkey(); +$anchor = $wgNamespacePopupsAnchor ? $wgNamespacePopupsAnchor : ''; +$page = $popupNS === '' ? $remains : "$popupNS:$remains"; +// $url = wfExpandUrl( $url, $proto = PROTO_RELATIVE ); // $proto +$url = preg_replace( '/\$1/', $page, $wgArticlePath ); + + $title = Title::newFromLinkTarget( Title::newFromText( $page ) ); + if ( $title->isKnown() ) { + $html .= "$anchor"; + } else { + $html .= "$anchor"; + } + + $ret = $html; +return false; + } +} diff --git a/NamespacePopups.php b/NamespacePopups.php new file mode 100644 index 000..2834a93 --- /dev/null +++ b/NamespacePopups.php @@ -0,0 +1,14 @@ +https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the NamespacePopups extension requires MediaWiki 1.25+' ); +} diff --git a/README.md b/README.md new file mode 100644 index 000..e2382b1 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +Automatically add a small popup (see Extension:PagePopups) link at +the right of links of certain namespaces. + +Normal namespaces are mapped to popup namespaces with +$wgNamespacePopupsNamespaceMap configuration variable. + +It works ONLY when $wgArticlePage is set!! + +See https://www.mediawiki.org/wiki/Extension:NamespacePopups +for detailed help. + + cd extensions + git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/NamespacePopups.git diff --git a/composer.json b/composer.json new file mode 100644 index 000..083767b --- /dev/null +++ b/composer.json @@ -0,0 +1,12 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.5.1" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor", + "phpcs -p -s" + ] + } +} diff --git a/extension.json b/extension.json new file mode 100644 index 000..780499a --- /dev/null +++
[MediaWiki-commits] [Gerrit] mediawiki...PagePopups[master]: initial version
VictorPorton has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330151 ) Change subject: initial version .. initial version Change-Id: Ib9ed86149771b8b66e0e1312aebb9a2a8e5df731 --- A .gitignore A Gruntfile.js A PagePopups.css A PagePopups.hooks.php A PagePopups.js A PagePopups.php A README.md A composer.json A extension.json A package.json A phpcs.xml 11 files changed, 202 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PagePopups refs/changes/51/330151/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..6ad5e33 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,31 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-jscs' ); + + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '**/*.js', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/PagePopups.css b/PagePopups.css new file mode 100644 index 000..fec5523 --- /dev/null +++ b/PagePopups.css @@ -0,0 +1,14 @@ +/*TODO: Add a small arrow to the popup*/ + +.pagepopup-dialog .ui-dialog-titlebar { display: none } + +.pagepopup-dialog.ui-dialog { + width: auto !important; + height: auto !important; +} + +.pagepopup-dialog .ui-dialog-content { + /*max-*/width: 300px; + max-height: 400px; + overflow: auto; +} diff --git a/PagePopups.hooks.php b/PagePopups.hooks.php new file mode 100644 index 000..562497a --- /dev/null +++ b/PagePopups.hooks.php @@ -0,0 +1,22 @@ +addScriptFile( "//code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js" ); +// $out->addStyle( "//code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css" ); +// $out->addModules( 'jquery' ); // loaded automatically +// $out->addModules( array('jquery.ui.dialog', 'ext.PagePopups.popup') ); +$out->addModules( array('ext.PagePopups.popup') ); +// $out->addScriptFile( "$wgScriptPath/extensions/PagePopups/PagePopups.js" ); + +return true; // TODO: needed? + } +} diff --git a/PagePopups.js b/PagePopups.js new file mode 100644 index 000..9d9a4ce --- /dev/null +++ b/PagePopups.js @@ -0,0 +1,43 @@ +(function($) { + var dialog; + + function click_body() { +if(!dialog) return; + +// Must destroy the dialog, so that its resizing is not "remembered": +dialog.dialog("destroy"); +dialog.remove(); +dialog = null; + } + + function showPopup(html, base) { +$('body').append(''); +dialog = $('#pagepopup-dialog'); +dialog.html(html); +dialog.dialog({draggable: false, + position: {my: "center top", at: "center bottom", of: base}, + dialogClass: "pagepopup-dialog" +}); +dialog.find('.mw-pagepopup').click(initEvents); +dialog.click(function(event) { + event.stopPropagation(); +}); +$('body').click(click_body); + } + + function initEvents(event) { + click_body(); + $('body').off('click', click_body); + var href = $(this).attr('href') || $(this).children('a').attr('href'); + var self = this; + $.get(href, {action: 'render'}, function(data) { +showPopup(data, self); + }); + event.preventDefault(); // don't follow the link + event.stopPropagation(); // if the link is inside with class="mw-pagepopup" + } + + $(function() { +$('.mw-pagepopup').click(initEvents); + }); +})(jQuery); diff --git a/PagePopups.php b/PagePopups.php new file mode 100644 index 000..b924def --- /dev/null +++ b/PagePopups.php @@ -0,0 +1,14 @@ +https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the PagePopups extension requires MediaWiki 1.25+' ); +} diff --git a/README.md b/README.md new file mode 100644 index 000..68d0ef5 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +[[Link]] transforms the link into a popup, +which shows the complete text (scrolling if necessary) of the
[MediaWiki-commits] [Gerrit] mediawiki...WikiArticleFeeds[master]: Replaced Article::getContent() usage with WikiPage::getConte...
LukBukkit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330150 ) Change subject: Replaced Article::getContent() usage with WikiPage::getContent() .. Replaced Article::getContent() usage with WikiPage::getContent() Change-Id: Ia816a80a36103d893e1843c4993e3884873dfa4b --- M WikiArticleFeeds_body.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiArticleFeeds refs/changes/50/330150/1 diff --git a/WikiArticleFeeds_body.php b/WikiArticleFeeds_body.php index 9e3259e..5e994b9 100644 --- a/WikiArticleFeeds_body.php +++ b/WikiArticleFeeds_body.php @@ -313,7 +313,8 @@ $feedUrl = $title->getFullURL(); # Parse page into feed items. - $content = $wgOut->parse( $article->getContent() . "\n__NOEDITSECTION__ __NOTOC__" ); + $content = $wgOut->parse( ContentHandler::getContentText( $article->getPage()->getContent() ) . + "\n__NOEDITSECTION__ __NOTOC__" ); preg_match_all( '/(.*?)/s', $content, -- To view, visit https://gerrit.wikimedia.org/r/330150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia816a80a36103d893e1843c4993e3884873dfa4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiArticleFeeds Gerrit-Branch: master Gerrit-Owner: LukBukkit___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Ids[master]: Remove executable bit from AUTHOR and ids_body.php
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330148 ) Change subject: Remove executable bit from AUTHOR and ids_body.php .. Remove executable bit from AUTHOR and ids_body.php Change-Id: I36d910c01c0f43eaae9eb54ba4381a5801deb00c --- M AUTHOR M ids_body.php 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/AUTHOR b/AUTHOR old mode 100755 new mode 100644 diff --git a/ids_body.php b/ids_body.php old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/330148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36d910c01c0f43eaae9eb54ba4381a5801deb00c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Ids Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: Shoichi Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [FundraisingEmailUnsubscribe] add npm job
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330079 ) Change subject: [FundraisingEmailUnsubscribe] add npm job .. [FundraisingEmailUnsubscribe] add npm job package.json was added with Ie9a7163c3bd92b5e75c723fb0d56d5fbb178af56 Change-Id: I181e535bba1275375fce47c99c572a6f3425f452 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e7f6dbe..c52c741 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5300,6 +5300,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/Genderize template: -- To view, visit https://gerrit.wikimedia.org/r/330079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I181e535bba1275375fce47c99c572a6f3425f452 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Ids] add generic tests
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330149 ) Change subject: [Ids] add generic tests .. [Ids] add generic tests Change-Id: Iacd16f786361f308a5e52c860f703566358dc66a --- M zuul/layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c52c741..fc1dee9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3896,6 +3896,12 @@ check: - jsonlint + - name: mediawiki/extensions/Ids +template: + - name: extension-unittests-generic +check: + - jsonlint + - name: mediawiki/extensions/ImageMap template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/330149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacd16f786361f308a5e52c860f703566358dc66a Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: Shoichi Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [FundraisingChart] add npm job
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330078 ) Change subject: [FundraisingChart] add npm job .. [FundraisingChart] add npm job package.json was added with If04653306e13d428c2c69f8500fe0e477174d046 Change-Id: If165e04700f7a9cc833f792adc05b4eda3023532 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 581aace..e7f6dbe 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3252,6 +3252,7 @@ template: - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/ContributionReporting template: -- To view, visit https://gerrit.wikimedia.org/r/330078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If165e04700f7a9cc833f792adc05b4eda3023532 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Ids] add generic tests
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330149 ) Change subject: [Ids] add generic tests .. [Ids] add generic tests Change-Id: Iacd16f786361f308a5e52c860f703566358dc66a --- M zuul/layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/49/330149/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 581aace..70855ab 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3895,6 +3895,12 @@ check: - jsonlint + - name: mediawiki/extensions/Ids +template: + - name: extension-unittests-generic +check: + - jsonlint + - name: mediawiki/extensions/ImageMap template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/330149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacd16f786361f308a5e52c860f703566358dc66a Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Ids[master]: Remove executable bit from AUTHOR and ids_body.php
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330148 ) Change subject: Remove executable bit from AUTHOR and ids_body.php .. Remove executable bit from AUTHOR and ids_body.php Change-Id: I36d910c01c0f43eaae9eb54ba4381a5801deb00c --- M AUTHOR M ids_body.php 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ids refs/changes/48/330148/1 diff --git a/AUTHOR b/AUTHOR old mode 100755 new mode 100644 diff --git a/ids_body.php b/ids_body.php old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/330148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36d910c01c0f43eaae9eb54ba4381a5801deb00c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Ids Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwitterLogin[master]: Fix case of OutputPage::setPageTitle
Thiemo Mättig (WMDE) has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329475 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: I8eab9f38ea0e606b28a9112303d3386a9618bef3 --- M SpecialTwitterLogin.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Thiemo Mättig (WMDE): Verified; Looks good to me, approved diff --git a/SpecialTwitterLogin.php b/SpecialTwitterLogin.php index f1b33f0..0ba0dd2 100644 --- a/SpecialTwitterLogin.php +++ b/SpecialTwitterLogin.php @@ -57,7 +57,7 @@ private function _default(){ global $wgOut, $wgUser, $wgExtensionAssetsPath; - $wgOut->setPagetitle("Twitter Login"); + $wgOut->setPageTitle("Twitter Login"); if ( !$wgUser->isLoggedIn() ) { $wgOut->addWikiMsg( 'twitterlogin-signup' ); -- To view, visit https://gerrit.wikimedia.org/r/329475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8eab9f38ea0e606b28a9112303d3386a9618bef3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwitterLogin Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Allow betawiki to restart mw-jobrunner
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330040 ) Change subject: Allow betawiki to restart mw-jobrunner .. Allow betawiki to restart mw-jobrunner This allows me to add restart command to oregano post-deploy hook that restarts jobrunner when code is changed. Removed hhvm-fastcgi, as the service name is now hhvm and this has not been used for some time. Change-Id: I498641e0253bb182c6cc51a56526decca06d465f --- M puppet/modules/sudo/files/local 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, but someone else must approve jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/puppet/modules/sudo/files/local b/puppet/modules/sudo/files/local index 6923559..ef44c0a 100644 --- a/puppet/modules/sudo/files/local +++ b/puppet/modules/sudo/files/local @@ -3,4 +3,4 @@ siebrandALL = NOPASSWD: ALL mah ALL = NOPASSWD: ALL %betawiki ALL = (betawiki) NOPASSWD: ALL -%betawiki ALL = NOPASSWD: /sbin/restart hhvm-fastcgi +%betawiki ALL = NOPASSWD: /usr/sbin/service mw-jobrunner restart -- To view, visit https://gerrit.wikimedia.org/r/330040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I498641e0253bb182c6cc51a56526decca06d465f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: NikerabbitGerrit-Reviewer: Amire80 Gerrit-Reviewer: KartikMistry Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/extra[master]: Add token_count_router
DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330147 ) Change subject: Add token_count_router .. Add token_count_router A simple query wrapper that counts the number of tokens and to decide which sub-query to run by evaluating a set of conditions. Bug: T152094 Change-Id: I582bf27e77f87f1e1d0f86d81371a46afb4ffcab --- M README.md A docs/token_count_router.md M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java A src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java A src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryParser.java A src/test/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryTest.java 6 files changed, 463 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/search/extra refs/changes/47/330147/1 diff --git a/README.md b/README.md index cf444ea..792f53a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ score functions, and anything else we think we end up creating to make search nice for Wikimedia. At this point it only contains: -Filters: +Queries: * [source_regex](docs/source_regex.md) - An nGram accelerated regular expression filter that is generally much much faster than sequentially checking all documents. @@ -13,6 +13,8 @@ independantly. For example, it can be used by multiple processes to reindex all documents without any interprocess communication. Added in 1.5.0, 1.4.1, and 1.3.0. +* [token_count_router](docs/token_count_router.md) - Simple query wrapper that +evaluates some conditions based on the number of tokens of the input query. Native Scripts: * [super_detect_noop](docs/super_detect_noop.md) - Like ```detect_noop``` but diff --git a/docs/token_count_router.md b/docs/token_count_router.md new file mode 100644 index 000..a4e9bf0 --- /dev/null +++ b/docs/token_count_router.md @@ -0,0 +1,55 @@ +token_count_router +== + +The ```token_count_router``` is a simple query wrapper that counts the number +of tokens in the provided text. It then evaluates a set of conditions to decide +which subquery to run. +It's useful in case the client would like to activate some proximity rescoring +features based on the number of tokens and the analyzers available. + +Example +--- + +Analyze a field with trigrams like so: +``` +GET /_search +{ +"token_count_router": { +"field": "text", +"text": "input query", +"conditions" : [ +{ +"gte": 2, +"query": { +"match_phrase": { +"text": "input query", +} +} +} +], +"fallback": { +"match_none": {} +} +} +} +``` + +A phrase query will be executed if the umber of tokens emitted by the +search analyzer of the `text` field is greater or equal to `2`. +A ` match_none` query is executed otherwise. +This allows to move some decision logic based on token count to the +backend allowing to use query templates and analyzer behaviors. + +Options +--- + +* `field` Use the search analyzer difined for this field. +* `analyzer` Use this analyzer (`field` or `analyzer` must be defined) +* `discount_overlaps` Set to true to ignore tokens emitted at the same position (defaults to `true`). +* `conditions` Array of conditions (the first that matches wins): +* `predicate` : can be `eq`, `gt`, `gte`, `lt` or `lte`, the value is the number of tokens to evaluate. +`"lt": 10` is true when the number of tokens is lower than 10. +* `query` The query to apply if the condition is met. +* `fallback` The query to apply if none of the conditions applies. + +Note that the query parser does not check the conditions coherence. \ No newline at end of file diff --git a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java index 8fa20a6..8f73054 100644 --- a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java +++ b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java @@ -22,6 +22,7 @@ import org.wikimedia.search.extra.superdetectnoop.VersionedDocumentHandler; import org.wikimedia.search.extra.superdetectnoop.WithinAbsoluteHandler; import org.wikimedia.search.extra.superdetectnoop.WithinPercentageHandler; +import org.wikimedia.search.extra.tokencount.TokenCountRouterQueryParser; /** * Setup the Elasticsearch plugin. @@ -44,6 +45,7 @@ module.registerQueryParser(SourceRegexQueryParser.class); module.registerQueryParser(IdHashModQueryParser.class); module.registerQueryParser(FuzzyLikeThisQueryParser.class); +module.registerQueryParser(TokenCountRouterQueryParser.class); } /** diff --git a/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Add php-parallel-lint
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330137 ) Change subject: Add php-parallel-lint .. Add php-parallel-lint Change-Id: Ic4dd05a15f119967f6805320094ce46d12a82c07 --- M composer.json 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index a8bf451..04e2392 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,12 @@ "minimum-stability": "dev", "require-dev": { "facebook/webdriver": "1.1.1", - "symfony/css-selector": "3.1.0" + "symfony/css-selector": "3.1.0", + "jakub-onderka/php-parallel-lint": "0.9.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] } } -- To view, visit https://gerrit.wikimedia.org/r/330137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4dd05a15f119967f6805320094ce46d12a82c07 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Addshore Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Improve text fadeout layout
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330127 ) Change subject: Improve text fadeout layout .. Improve text fadeout layout Especially when applied on one line collapsing this helps to notice the gap. Change-Id: I98fd522d7ecd88c8509e895807131e8744330e01 --- M modules/ext.TwoColConflict.css 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css index 627cae1..95c30f5 100644 --- a/modules/ext.TwoColConflict.css +++ b/modules/ext.TwoColConflict.css @@ -157,10 +157,17 @@ { position: relative; overflow: hidden; - white-space: nowrap; background-color: #e2e2e2; } +.mw-twocolconflict-diffchange-fadeout-start { + margin-left: 2em; +} + +.mw-twocolconflict-diffchange-fadeout-end { + margin-right: 2em; +} + .mw-twocolconflict-diffchange-fadeout-end:after, .mw-twocolconflict-diffchange-fadeout-start:before { -- To view, visit https://gerrit.wikimedia.org/r/330127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98fd522d7ecd88c8509e895807131e8744330e01 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: WMDE-FischGerrit-Reviewer: Addshore Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Reduce visible jumping when enabling edit mode
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330146 ) Change subject: Reduce visible jumping when enabling edit mode .. Reduce visible jumping when enabling edit mode This will possibly waste a tiny little bit of space (I believe less than 1 pixel per statement), but greatly reduces jumping. Try with a complex statement that has qualifiers! Change-Id: Ifd55bf5d740bbfdf22ecd43787e056c0dce8ef5c --- M view/resources/wikibase/wikibase.css 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/46/330146/1 diff --git a/view/resources/wikibase/wikibase.css b/view/resources/wikibase/wikibase.css index 4cf26f5..e681e81 100644 --- a/view/resources/wikibase/wikibase.css +++ b/view/resources/wikibase/wikibase.css @@ -231,7 +231,7 @@ div.wikibase-snakview .wikibase-snakview-value-container { margin-left: 16px; - min-height: .8em; /* reduces jumping when clicking edit */ + min-height: 1.6em; /* reduces jumping when clicking edit */ } div .wikibase-snakview-value span.error.wb-format-error { -- To view, visit https://gerrit.wikimedia.org/r/330146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd55bf5d740bbfdf22ecd43787e056c0dce8ef5c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Temporarily disable "whack a mole" animations on expert exte...
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330145 ) Change subject: Temporarily disable "whack a mole" animations on expert extenders .. Temporarily disable "whack a mole" animations on expert extenders Not removing this code for the moment because this is meant to be a public test only, and we want to wait for the outcome. Change-Id: I5cc37cffd29fa85b8c837f02cee7948fe5d2e0e9 --- M view/resources/jquery/wikibase/snakview/snakview.variations.Value.js 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/330145/1 diff --git a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js index b113f98..23e67c9 100644 --- a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js +++ b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js @@ -285,6 +285,9 @@ self._viewState.notify( self._valueView.value() ? 'valid' : 'invalid' ); } ) .on( 'inputextenderanimation.' + this.variationBaseClass, function( animationEvent ) { + // FIXME: Temporarily disabled for user testing. Either re-enable or remove. + return; + animationEvent.animationCallbacks.add( 'done', function() { var $input = $( animationEvent.target ), $extension = $input.data( 'inputextender' ).extension(), @@ -314,6 +317,9 @@ } ); } ) .on( 'inputextendercontentanimation.' + this.variationBaseClass, function( animationEvent ) { + // FIXME: Temporarily disabled for user testing. Either re-enable or remove. + return; + var $input = $( animationEvent.target ), inputHeight = $input.outerHeight(), $extension = $input.data( 'inputextender' ).extension(); -- To view, visit https://gerrit.wikimedia.org/r/330145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cc37cffd29fa85b8c837f02cee7948fe5d2e0e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix broken LDAP based login
Phantom42 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330144 ) Change subject: Fix broken LDAP based login .. Fix broken LDAP based login Fixed that LDAP based login failed, if wiki used two or more domains. Bug: T90149 Change-Id: I819137c4592cf43608904a4d30a981d965dee1c3 --- M pywikibot/data/api.py 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/44/330144/1 diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 3b2ae9d..cf635b0 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3028,11 +3028,14 @@ time.sleep(diff.seconds) # base login request -login_request = self.site._request( -use_get=False, -parameters=dict(action='login', -lgname=self.login_name, -lgpassword=self.password)) +predata = dict(action='login', + lgname=self.login_name, + lgpassword=self.password) + +if self.site.family.ldapDomain: +predata['lgdomain'] = self.site.family.ldapDomain + +login_request = self.site._request(use_get=False, parameters=predata) # get token using meta=tokens if supported if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.27'): -- To view, visit https://gerrit.wikimedia.org/r/330144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I819137c4592cf43608904a4d30a981d965dee1c3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Phantom42___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Register more extensions
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330143 ) Change subject: Register more extensions .. Register more extensions Change-Id: I6ab65c1939703c317c483796dd993028b2e9d5b2 --- M .gitmodules A BlueSpicePageVersion A CreatePageUw A HighlightjsIntegration A Ids A RegexBlock A RelatedLinks A SpamRegex A TheWikipediaLibrary A UnCaptcha A UploadLogo 11 files changed, 50 insertions(+), 0 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4ce8a99..f99342a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -234,6 +234,10 @@ path = BlueSpicePageAssignments url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageAssignments branch = . +[submodule "BlueSpicePageVersion"] + path = BlueSpicePageVersion + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageVersion + branch = . [submodule "BlueSpiceSMWConnector"] path = BlueSpiceSMWConnector url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSMWConnector @@ -521,6 +525,10 @@ [submodule "CreatePage"] path = CreatePage url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CreatePage + branch = . +[submodule "CreatePageUw"] + path = CreatePageUw + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CreatePageUw branch = . [submodule "CreateRedirect"] path = CreateRedirect @@ -1058,6 +1066,10 @@ path = HierarchyBuilder url = https://gerrit.wikimedia.org/r/mediawiki/extensions/HierarchyBuilder branch = . +[submodule "HighlightjsIntegration"] + path = HighlightjsIntegration + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/HighlightjsIntegration + branch = . [submodule "HitCounters"] path = HitCounters url = https://gerrit.wikimedia.org/r/mediawiki/extensions/HitCounters @@ -1081,6 +1093,10 @@ [submodule "I18nTags"] path = I18nTags url = https://gerrit.wikimedia.org/r/mediawiki/extensions/I18nTags + branch = . +[submodule "Ids"] + path = Ids + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Ids branch = . [submodule "IfTemplates"] path = IfTemplates @@ -2058,6 +2074,10 @@ path = RefreshSpecial url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RefreshSpecial branch = . +[submodule "RegexBlock"] + path = RegexBlock + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RegexBlock + branch = . [submodule "RegexFun"] path = RegexFun url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RegexFun @@ -2069,6 +2089,10 @@ [submodule "RelatedArticles"] path = RelatedArticles url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedArticles + branch = . +[submodule "RelatedLinks"] + path = RelatedLinks + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedLinks branch = . [submodule "RelatedSites"] path = RelatedSites @@ -2462,6 +2486,10 @@ path = SpamDiffTool url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamDiffTool branch = . +[submodule "SpamRegex"] + path = SpamRegex + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamRegex + branch = . [submodule "Spark"] path = Spark url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Spark @@ -2618,6 +2646,10 @@ path = Thanks url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Thanks branch = . +[submodule "TheWikipediaLibrary"] + path = TheWikipediaLibrary + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/TheWikipediaLibrary + branch = . [submodule "Theme"] path = Theme url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Theme @@ -2734,6 +2766,10 @@ path = USERNAME url = https://gerrit.wikimedia.org/r/mediawiki/extensions/USERNAME branch = . +[submodule "UnCaptcha"] + path = UnCaptcha + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnCaptcha + branch = . [submodule "UnicodeConverter"] path = UnicodeConverter url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnicodeConverter @@ -2762,6 +2798,10 @@ path = UploadLocal url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadLocal branch = . +[submodule "UploadLogo"] + path = UploadLogo + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadLogo + branch = . [submodule "UploadWizard"] path = UploadWizard url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard diff --git a/BlueSpicePageVersion b/BlueSpicePageVersion new file mode 16 index 000..7a8eb40 --- /dev/null +++
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Register more extensions
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330143 ) Change subject: Register more extensions .. Register more extensions Change-Id: I6ab65c1939703c317c483796dd993028b2e9d5b2 --- M .gitmodules A BlueSpicePageVersion A CreatePageUw A HighlightjsIntegration A Ids A RegexBlock A RelatedLinks A SpamRegex A TheWikipediaLibrary A UnCaptcha A UploadLogo 11 files changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/43/330143/1 diff --git a/.gitmodules b/.gitmodules index 4ce8a99..f99342a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -234,6 +234,10 @@ path = BlueSpicePageAssignments url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageAssignments branch = . +[submodule "BlueSpicePageVersion"] + path = BlueSpicePageVersion + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageVersion + branch = . [submodule "BlueSpiceSMWConnector"] path = BlueSpiceSMWConnector url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSMWConnector @@ -521,6 +525,10 @@ [submodule "CreatePage"] path = CreatePage url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CreatePage + branch = . +[submodule "CreatePageUw"] + path = CreatePageUw + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CreatePageUw branch = . [submodule "CreateRedirect"] path = CreateRedirect @@ -1058,6 +1066,10 @@ path = HierarchyBuilder url = https://gerrit.wikimedia.org/r/mediawiki/extensions/HierarchyBuilder branch = . +[submodule "HighlightjsIntegration"] + path = HighlightjsIntegration + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/HighlightjsIntegration + branch = . [submodule "HitCounters"] path = HitCounters url = https://gerrit.wikimedia.org/r/mediawiki/extensions/HitCounters @@ -1081,6 +1093,10 @@ [submodule "I18nTags"] path = I18nTags url = https://gerrit.wikimedia.org/r/mediawiki/extensions/I18nTags + branch = . +[submodule "Ids"] + path = Ids + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Ids branch = . [submodule "IfTemplates"] path = IfTemplates @@ -2058,6 +2074,10 @@ path = RefreshSpecial url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RefreshSpecial branch = . +[submodule "RegexBlock"] + path = RegexBlock + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RegexBlock + branch = . [submodule "RegexFun"] path = RegexFun url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RegexFun @@ -2069,6 +2089,10 @@ [submodule "RelatedArticles"] path = RelatedArticles url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedArticles + branch = . +[submodule "RelatedLinks"] + path = RelatedLinks + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedLinks branch = . [submodule "RelatedSites"] path = RelatedSites @@ -2462,6 +2486,10 @@ path = SpamDiffTool url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamDiffTool branch = . +[submodule "SpamRegex"] + path = SpamRegex + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamRegex + branch = . [submodule "Spark"] path = Spark url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Spark @@ -2618,6 +2646,10 @@ path = Thanks url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Thanks branch = . +[submodule "TheWikipediaLibrary"] + path = TheWikipediaLibrary + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/TheWikipediaLibrary + branch = . [submodule "Theme"] path = Theme url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Theme @@ -2734,6 +2766,10 @@ path = USERNAME url = https://gerrit.wikimedia.org/r/mediawiki/extensions/USERNAME branch = . +[submodule "UnCaptcha"] + path = UnCaptcha + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnCaptcha + branch = . [submodule "UnicodeConverter"] path = UnicodeConverter url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnicodeConverter @@ -2762,6 +2798,10 @@ path = UploadLocal url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadLocal branch = . +[submodule "UploadLogo"] + path = UploadLogo + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadLogo + branch = . [submodule "UploadWizard"] path = UploadWizard url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UploadWizard diff --git a/BlueSpicePageVersion
[MediaWiki-commits] [Gerrit] mediawiki...ConfirmAccount[master]: Fix case of OutputPage::setPageTitle
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329466 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: I9623e635eda71a49555d4ffa3c95df923a058cb4 --- M frontend/specialpages/actions/ConfirmAccount_body.php M frontend/specialpages/actions/RequestAccount_body.php 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/frontend/specialpages/actions/ConfirmAccount_body.php b/frontend/specialpages/actions/ConfirmAccount_body.php index c8561a0..31ffec3 100644 --- a/frontend/specialpages/actions/ConfirmAccount_body.php +++ b/frontend/specialpages/actions/ConfirmAccount_body.php @@ -680,7 +680,7 @@ protected function showSuccess( $submitType, $name = null, $errors = [] ) { $out = $this->getOutput(); - $out->setPagetitle( $this->msg( 'actioncomplete' )->escaped() ); + $out->setPageTitle( $this->msg( 'actioncomplete' )->escaped() ); if ( $this->submitType == 'accept' ) { $out->addWikiMsg( 'confirmaccount-acc', $name ); } elseif ( $this->submitType == 'reject' || $this->submitType == 'spam' ) { diff --git a/frontend/specialpages/actions/RequestAccount_body.php b/frontend/specialpages/actions/RequestAccount_body.php index 56960c6..de65afd 100755 --- a/frontend/specialpages/actions/RequestAccount_body.php +++ b/frontend/specialpages/actions/RequestAccount_body.php @@ -99,7 +99,7 @@ $this->mForgotAttachment = $forgotFile; $out = $this->getOutput(); - $out->setPagetitle( $this->msg( "requestaccount" )->escaped() ); + $out->setPagetTitle( $this->msg( "requestaccount" )->escaped() ); # Output failure message if any if ( $msg ) { $out->addHTML( '' . $msg . '' ); @@ -357,7 +357,7 @@ protected function showSuccess() { $out = $this->getOutput(); - $out->setPagetitle( $this->msg( "requestaccount" )->escaped() ); + $out->setPageTitle( $this->msg( "requestaccount" )->escaped() ); $out->addWikiMsg( 'requestaccount-sent' ); $out->returnToMain(); } -- To view, visit https://gerrit.wikimedia.org/r/329466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9623e635eda71a49555d4ffa3c95df923a058cb4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmAccount Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Fix case of OutputPage::setPageTitle
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329472 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: I64517ac756be334de72b0055d95627019f950469 --- M SpecialNewPagesFeed.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/SpecialNewPagesFeed.php b/SpecialNewPagesFeed.php index d4f71ac..a598f96 100644 --- a/SpecialNewPagesFeed.php +++ b/SpecialNewPagesFeed.php @@ -41,7 +41,7 @@ } // Output the title of the page - $out->setPagetitle( $this->msg( 'newpagesfeed' ) ); + $out->setPageTitle( $this->msg( 'newpagesfeed' ) ); // Make sure global vars are strings rather than booleans (for passing to mw.config) $wgPageTriageInfiniteScrolling = $this->booleanToString( $wgPageTriageInfiniteScrolling ); -- To view, visit https://gerrit.wikimedia.org/r/329472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64517ac756be334de72b0055d95627019f950469 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add php-parallel-lint
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330135 ) Change subject: Add php-parallel-lint .. Add php-parallel-lint Change-Id: I9d6d6a09a0285e59eb20b3eb835a7981b4ab4c82 --- M composer.json 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/composer.json b/composer.json index 58040e5..6819f06 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ }, "require-dev": { "phpunit/phpunit": "^3.7.37|~4.5", - "satooshi/php-coveralls": "master-dev" + "satooshi/php-coveralls": "master-dev", + "jakub-onderka/php-parallel-lint": "0.9.2" }, "autoload": { "psr-4": { @@ -34,5 +35,10 @@ "WikibaseQualityConstraintsHooks.php", "maintenance/UpdateConstraintsTable.php" ] + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] } } -- To view, visit https://gerrit.wikimedia.org/r/330135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d6d6a09a0285e59eb20b3eb835a7981b4ab4c82 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SpecialNamespaces[master]: Fix case of OutputPage::setPageTitle
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329474 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: I409861e8f94235758cb2f867c167e2943714bb38 --- M SpecialNamespaces_body.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/SpecialNamespaces_body.php b/SpecialNamespaces_body.php index 32b4951..a0d0847 100644 --- a/SpecialNamespaces_body.php +++ b/SpecialNamespaces_body.php @@ -23,9 +23,9 @@ $this->outputHeader(); if ( $admin ) { - $this->getOutput()->setPagetitle( wfMessage( 'namespaces' ) ); + $this->getOutput()->setPageTitle( wfMessage( 'namespaces' ) ); } else { - $this->getOutput()->setPagetitle( wfMessage( 'namespaces-title-norights' ) ); + $this->getOutput()->setPageTitle( wfMessage( 'namespaces-title-norights' ) ); } $req = $this->getRequest(); $action = $req->getVal( 'action', $par ); -- To view, visit https://gerrit.wikimedia.org/r/329474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I409861e8f94235758cb2f867c167e2943714bb38 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpecialNamespaces Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...InterwikiIntegration[master]: Fix case of OutputPage::setPageTitle
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329469 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: I955e9d2661693f7d04de8b2d7239e4f9453b9401 --- M SpecialInterwikiIntegration.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/SpecialInterwikiIntegration.php b/SpecialInterwikiIntegration.php index 42270fe..7acef72 100644 --- a/SpecialInterwikiIntegration.php +++ b/SpecialInterwikiIntegration.php @@ -99,7 +99,7 @@ 'integration_namespace_title' => 'DisregardForPWD' ); $dbw->insert ( 'integration_namespace', $newNamespaceRow); - $wgOut->setPagetitle( $this->msg( 'actioncomplete' ) ); + $wgOut->setPageTitle( $this->msg( 'actioncomplete' ) ); $wgOut->addWikiMsg( 'interwikiintegration-setuptext', $wgSitename ); return; } @@ -145,7 +145,7 @@ } } } - $wgOut->setPagetitle( $this->msg( 'actioncomplete' ) ); + $wgOut->setPageTitle( $this->msg( 'actioncomplete' ) ); $wgOut->addWikiMsg( 'interwikiintegration-interwikiwatchlist-setuptext' ); return; } @@ -191,7 +191,7 @@ } } } - $wgOut->setPagetitle( $this->msg( 'actioncomplete' ) ); + $wgOut->setPageTitle( $this->msg( 'actioncomplete' ) ); $wgOut->addWikiMsg( 'interwikiintegration-interwikirecentchanges-setuptext' ); return; } @@ -237,7 +237,7 @@ } } } - $wgOut->setPagetitle( $this->msg( 'actioncomplete' ) ); + $wgOut->setPageTitle( $this->msg( 'actioncomplete' ) ); $wgOut->addWikiMsg( 'interwikiintegration-interwikipage-setuptext' ); return; } -- To view, visit https://gerrit.wikimedia.org/r/329469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I955e9d2661693f7d04de8b2d7239e4f9453b9401 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/InterwikiIntegration Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Poll[master]: Fix case of OutputPage::setPageTitle
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329473 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: I5ec66d62d14affbc2284c5a955295c632f9c5ec8 --- M Poll_body.php 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/Poll_body.php b/Poll_body.php index e8a20c4..a9fb23c 100644 --- a/Poll_body.php +++ b/Poll_body.php @@ -101,7 +101,7 @@ public function make_list() { $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll' )->text() ); + $output->setPageTitle( wfMessage( 'poll' )->text() ); $dbr = wfGetDB( DB_SLAVE ); $query = $dbr->select( 'poll', 'question, dis, id', array( 'end' => 0 ) ); @@ -140,7 +140,7 @@ public function list_old( $page ) { $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll' )->text() ); + $output->setPageTitle( wfMessage( 'poll' )->text() ); if ( $page > 1 ) { $page *= 50; @@ -184,7 +184,7 @@ $userObject = $this->getUser(); $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll-title-create' )->text() ); + $output->setPageTitle( wfMessage( 'poll-title-create' )->text() ); if ( !$userObject->isAllowed( 'poll-create' ) ) { $output->addWikiMsg( 'poll-create-right-error' ); @@ -232,7 +232,7 @@ $userObject = $this->getUser(); $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll-title-vote' )->text() ); + $output->setPageTitle( wfMessage( 'poll-title-vote' )->text() ); if ( !$userObject->isAllowed( 'poll-vote' ) ) { $output->addWikiMsg( 'poll-vote-right-error' ); @@ -314,7 +314,7 @@ $userObject = $this->getUser(); $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll-title-score' )->text() ); + $output->setPageTitle( wfMessage( 'poll-title-score' )->text() ); if ( !$userObject->isAllowed( 'poll-score' ) ) { $output->addWikiMsg( 'poll-score-right-error' ); @@ -421,7 +421,7 @@ public function delete( $did ) { $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll-title-delete' )->text() ); + $output->setPageTitle( wfMessage( 'poll-title-delete' )->text() ); $dbr = wfGetDB( DB_SLAVE ); $query = $dbr->select( 'poll', 'question', array( 'id' => $did ), __METHOD__ ); @@ -448,7 +448,7 @@ public function change( $cid ) { $output = $this->getOutput(); - $output->setPagetitle( wfMessage( 'poll-title-change' )->text() ); + $output->setPageTitle( wfMessage( 'poll-title-change' )->text() ); $dbr = wfGetDB( DB_SLAVE ); $query = $dbr->select( 'poll', 'question, alternative_1, alternative_2, alternative_3, alternative_4, alternative_5, alternative_6, creater, dis', -- To view, visit https://gerrit.wikimedia.org/r/329473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ec66d62d14affbc2284c5a955295c632f9c5ec8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Poll Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Athena[master]: Fix case of OutputPage::setPageTitle
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329463 ) Change subject: Fix case of OutputPage::setPageTitle .. Fix case of OutputPage::setPageTitle Change-Id: Ieea6c8f69fc0c5ec7826a0f7a411c0915eeade62 --- M Athena_body.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/Athena_body.php b/Athena_body.php index 0c6e587..19afe00 100644 --- a/Athena_body.php +++ b/Athena_body.php @@ -80,7 +80,7 @@ public function showAthenaHome() { $output = $this->getOutput(); $this->setHeaders(); - $output->setPagetitle( wfMessage( 'athena-title' ) ); + $output->setPageTitle( wfMessage( 'athena-title' ) ); $output->addWikiMsg( 'athena-pagetext' ); @@ -649,7 +649,7 @@ $output = $this->getOutput(); $this->setHeaders(); - $output->setPagetitle( wfMessage( 'athena-title' ) . ' - ' . wfMessage( 'athena-create-title', $id ) ); + $output->setPageTitle( wfMessage( 'athena-title' ) . ' - ' . wfMessage( 'athena-create-title', $id ) ); $dbw = wfGetDB( DB_SLAVE ); $res = $dbw->selectRow( -- To view, visit https://gerrit.wikimedia.org/r/329463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieea6c8f69fc0c5ec7826a0f7a411c0915eeade62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Athena Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits