[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: UEModulePDF: Bugs on new class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364655 ) Change subject: UEModulePDF: Bugs on new class .. UEModulePDF: Bugs on new class Change-Id: I968a3375f1ea6b3949bbfe628016b84892f91426 --- M UEModulePDF/includes/PDFFileResolver.php 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/UEModulePDF/includes/PDFFileResolver.php b/UEModulePDF/includes/PDFFileResolver.php index 99906b7..d565ec5 100644 --- a/UEModulePDF/includes/PDFFileResolver.php +++ b/UEModulePDF/includes/PDFFileResolver.php @@ -40,7 +40,7 @@ /** * @var string */ - protected $sAbsoluteFilesystemName = ''; + protected $sAbsoluteFilesystemPath = ''; /** * @@ -134,6 +134,7 @@ if ( !is_null( $oFileRepoLocalRef ) ) { $this->sAbsoluteFilesystemPath = $oFileRepoLocalRef->getPath(); } + $this->sSourceFileName = $this->oFileObject->getName(); } else { $this->sAbsoluteFilesystemPath = $this->getFileSystemPath( $wgUploadPath . $this->sSourceFilePath ); } @@ -141,7 +142,7 @@ protected function setFileName() { if( !empty( $this->sAbsoluteFilesystemPath ) ) { - $this->sSourceFileName = $this->oFileObject->getName(); + $this->sFileName = $this->oFileObject->getName(); } } @@ -151,7 +152,7 @@ } public function getAbsoluteFilesystemPath() { - return $this->sAbsoluteFilesystemName; + return $this->sAbsoluteFilesystemPath; } public function getFileName() { -- To view, visit https://gerrit.wikimedia.org/r/364655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I968a3375f1ea6b3949bbfe628016b84892f91426 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Robert VogelGerrit-Reviewer: ItSpiderman Gerrit-Reviewer: Robert Vogel 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...BlueSpiceExtensions[master]: UEModulePDF: Bugs on new class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364420 ) Change subject: UEModulePDF: Bugs on new class .. UEModulePDF: Bugs on new class Change-Id: I968a3375f1ea6b3949bbfe628016b84892f91426 --- M UEModulePDF/includes/PDFFileResolver.php 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/UEModulePDF/includes/PDFFileResolver.php b/UEModulePDF/includes/PDFFileResolver.php index 99906b7..d565ec5 100644 --- a/UEModulePDF/includes/PDFFileResolver.php +++ b/UEModulePDF/includes/PDFFileResolver.php @@ -40,7 +40,7 @@ /** * @var string */ - protected $sAbsoluteFilesystemName = ''; + protected $sAbsoluteFilesystemPath = ''; /** * @@ -134,6 +134,7 @@ if ( !is_null( $oFileRepoLocalRef ) ) { $this->sAbsoluteFilesystemPath = $oFileRepoLocalRef->getPath(); } + $this->sSourceFileName = $this->oFileObject->getName(); } else { $this->sAbsoluteFilesystemPath = $this->getFileSystemPath( $wgUploadPath . $this->sSourceFilePath ); } @@ -141,7 +142,7 @@ protected function setFileName() { if( !empty( $this->sAbsoluteFilesystemPath ) ) { - $this->sSourceFileName = $this->oFileObject->getName(); + $this->sFileName = $this->oFileObject->getName(); } } @@ -151,7 +152,7 @@ } public function getAbsoluteFilesystemPath() { - return $this->sAbsoluteFilesystemName; + return $this->sAbsoluteFilesystemPath; } public function getFileName() { -- To view, visit https://gerrit.wikimedia.org/r/364420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I968a3375f1ea6b3949bbfe628016b84892f91426 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: ItSpidermanGerrit-Reviewer: Robert Vogel 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...BlueSpiceExtensions[REL1_27]: UEModulePDF: Bugs on new class
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364655 ) Change subject: UEModulePDF: Bugs on new class .. UEModulePDF: Bugs on new class Change-Id: I968a3375f1ea6b3949bbfe628016b84892f91426 --- M UEModulePDF/includes/PDFFileResolver.php 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/55/364655/1 diff --git a/UEModulePDF/includes/PDFFileResolver.php b/UEModulePDF/includes/PDFFileResolver.php index 99906b7..d565ec5 100644 --- a/UEModulePDF/includes/PDFFileResolver.php +++ b/UEModulePDF/includes/PDFFileResolver.php @@ -40,7 +40,7 @@ /** * @var string */ - protected $sAbsoluteFilesystemName = ''; + protected $sAbsoluteFilesystemPath = ''; /** * @@ -134,6 +134,7 @@ if ( !is_null( $oFileRepoLocalRef ) ) { $this->sAbsoluteFilesystemPath = $oFileRepoLocalRef->getPath(); } + $this->sSourceFileName = $this->oFileObject->getName(); } else { $this->sAbsoluteFilesystemPath = $this->getFileSystemPath( $wgUploadPath . $this->sSourceFilePath ); } @@ -141,7 +142,7 @@ protected function setFileName() { if( !empty( $this->sAbsoluteFilesystemPath ) ) { - $this->sSourceFileName = $this->oFileObject->getName(); + $this->sFileName = $this->oFileObject->getName(); } } @@ -151,7 +152,7 @@ } public function getAbsoluteFilesystemPath() { - return $this->sAbsoluteFilesystemName; + return $this->sAbsoluteFilesystemPath; } public function getFileName() { -- To view, visit https://gerrit.wikimedia.org/r/364655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I968a3375f1ea6b3949bbfe628016b84892f91426 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Robert VogelGerrit-Reviewer: ItSpiderman ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OpenGraphMeta[master]: Version 0.5.0 -- extension registration support and more
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357961 ) Change subject: Version 0.5.0 -- extension registration support and more .. Version 0.5.0 -- extension registration support and more * Moved PHP code into a new, separate class & file * Added extension.json for extension registration support * Added version number to extension credits * Removed old PHP i18n file MediaWiki 1.25 or newer is now required Change-Id: Ied8476ee5e0143d78f291d986c7e79abe3c3b1ce --- A OpenGraphMeta.class.php D OpenGraphMeta.i18n.php M OpenGraphMeta.php A extension.json 4 files changed, 156 insertions(+), 134 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/OpenGraphMeta.class.php b/OpenGraphMeta.class.php new file mode 100644 index 000..c0efcc8 --- /dev/null +++ b/OpenGraphMeta.class.php @@ -0,0 +1,111 @@ +http://danf.ca/mw/) + * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @link https://www.mediawiki.org/wiki/Extension:OpenGraphMeta Documentation + */ + +class OpenGraphMeta { + + /** +* @param Parser $parser +* @return bool +*/ + public static function onParserFirstCallInit( Parser $parser ) { + $parser->setFunctionHook( 'setmainimage', array( __CLASS__, 'setMainImagePF' ) ); + return true; + } + + /** +* @param Parser $parser +* @param string $mainImage +* @return string +*/ + public static function setMainImagePF( Parser $parser, $mainImage ) { + $parserOutput = $parser->getOutput(); + $setMainImage = $parserOutput->getExtensionData( 'setmainimage' ); + if ( $setMainImage !== null ) { + return $mainImage; + } + + $file = Title::newFromText( $mainImage, NS_FILE ); + $parserOutput->setExtensionData( 'setmainimage', $file->getDBkey() ); + + return $mainImage; + } + + public static function onOutputPageParserOutput( OutputPage &$out, ParserOutput $parserOutput ) { + global $wgLogo, $wgSitename, $wgXhtmlNamespaces, $egFacebookAppId, $egFacebookAdmins; + + $setMainImage = $parserOutput->getExtensionData( 'setmainimage' ); + if ( $setMainImage !== null ) { + $mainImage = wfFindFile( Title::newFromDBkey( $setMainImage ) ); + } else { + $mainImage = false; + } + + $wgXhtmlNamespaces['og'] = 'http://opengraphprotocol.org/schema/'; + $title = $out->getTitle(); + $isMainpage = $title->isMainPage(); + + $meta = array(); + + if ( $isMainpage ) { + $meta['og:type'] = 'website'; + $meta['og:title'] = $wgSitename; + } else { + $meta['og:type'] = 'article'; + $meta['og:site_name'] = $wgSitename; + // Try to chose the most appropriate title for showing in news feeds. + if ( + ( defined( 'NS_BLOG_ARTICLE' ) && $title->getNamespace() == NS_BLOG_ARTICLE ) || + ( defined( 'NS_BLOG_ARTICLE_TALK' ) && $title->getNamespace() == NS_BLOG_ARTICLE_TALK ) + ) { + $meta['og:title'] = $title->getSubpageText(); + } else { + $meta['og:title'] = $title->getText(); + } + } + + if ( ( $mainImage !== false ) ) { + if ( is_object( $mainImage ) ) { + $meta['og:image'] = wfExpandUrl( $mainImage->createThumb( 100 * 3, 100 ) ); + } else { + // In some edge-cases we won't have defined an object but rather a full URL. + $meta['og:image'] = $mainImage; + } + } elseif ( $isMainpage ) { + $meta['og:image'] = wfExpandUrl( $wgLogo ); + } + $description = $parserOutput->getProperty( 'description' ); + if ( $description !== false ) { // set by Description2 extension, install it if you want proper og:description support + $meta['og:description'] = $description; + } + $meta['og:url'] = $title->getFullURL(); + if ( $egFacebookAppId ) { + $meta['fb:app_id'] = $egFacebookAppId; + } + if ( $egFacebookAdmins ) { + $meta['fb:admins'] = $egFacebookAdmins; + } + + foreach( $meta as
[MediaWiki-commits] [Gerrit] mediawiki...Description2[master]: Version 0.4.0 -- cleanup, extension registration support, etc.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357800 ) Change subject: Version 0.4.0 -- cleanup, extension registration support, etc. .. Version 0.4.0 -- cleanup, extension registration support, etc. * Old i18n shim removed * extension.json added * PHP code moved into the new Description2 class * Old PHP entry point still exists for b/c with older installations, but MW 1.25 or newer is now required Change-Id: I0670c203b62dcf500ded1b82957e473edf864fb1 --- A Description2.class.php D Description2.i18n.php M Description2.php A extension.json 4 files changed, 150 insertions(+), 127 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Description2.class.php b/Description2.class.php new file mode 100644 index 000..c3a6683 --- /dev/null +++ b/Description2.class.php @@ -0,0 +1,105 @@ + tag to MW pages and into the parser output + * + * @file + * @ingroup Extensions + * @author Daniel Friesen (http://danf.ca/mw/) + * @copyright Copyright 2010 – Daniel Friesen + * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @link https://www.mediawiki.org/wiki/Extension:Description2 Documentation + */ + +class Description2 { + + /** +* @param Parser $parser +* @param string $desc +*/ + public static function setDescription( Parser $parser, $desc ) { + $parserOutput = $parser->getOutput(); + if ( $parserOutput->getProperty( 'description' ) !== false ) { + return; + } + $parserOutput->setProperty( 'description', $desc ); + } + + /** +* @param Parser $parser +* @param string $text +* @return bool +*/ + public static function onParserAfterTidy( Parser &$parser, &$text ) { + $desc = ''; + + $myText = preg_replace( '%]*+>(?:(?R)|[^<]*+(?:(?!%i', '', $text ); + + $paragraphs = array(); + if ( preg_match_all( '#.*?#is', $myText, $paragraphs ) ) { + foreach ( $paragraphs[0] as $paragraph ) { + $paragraph = trim( strip_tags( $paragraph ) ); + if ( !$paragraph ) { + continue; + } + $desc = $paragraph; + break; + } + } + + if ( $desc ) { + self::setDescription( $parser, $desc ); + } + + return true; + } + + /** +* @param Parser $parser +* @return bool +*/ + public static function onParserFirstCallInit( Parser &$parser ) { + global $wgEnableMetaDescriptionFunctions; + if ( !$wgEnableMetaDescriptionFunctions ) { + // Functions and tags are disabled + return true; + } + $parser->setFunctionHook( 'description2', array( 'Description2', 'parserFunctionCallback' ), Parser::SFH_OBJECT_ARGS ); + $parser->setFunctionTagHook( 'metadesc', array( 'Description2', 'tagCallback' ), Parser::SFH_OBJECT_ARGS ); + return true; + } + + /** +* @param Parser $parser +* @param $frame +* @param $args +* @return string +*/ + public static function parserFunctionCallback( Parser $parser, $frame, $args ) { + $desc = isset( $args[0] ) ? $frame->expand( $args[0] ) : ''; + self::setDescription( $parser, $desc ); + return ''; + } + + /** +* @param Parser $parser +* @param $frame +* @param $content +* @param $attributes +* @return string +*/ + public static function tagCallback( Parser $parser, $frame, $content, $attributes ) { + $desc = ( isset( $content ) ? $content : ( isset( $attributes['content'] ) ? $attributes['content'] : null ) ); + if ( isset( $desc ) ) { + self::setDescription( $parser, $desc ); + } + return ''; + } + + public static function onOutputPageParserOutput( OutputPage &$out, ParserOutput $parserOutput ) { + // Export the description from the main parser output into the OutputPage + $description = $parserOutput->getProperty( 'description' ); + if ( $description !== false ) { + $out->addMeta( 'description', $description ); + } + } +} diff --git a/Description2.i18n.php b/Description2.i18n.php deleted file mode 100644 index f635e78..000 --- a/Description2.i18n.php +++ /dev/null @@ -1,35 +0,0 @@
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Fixes to migrate script with regards to i18n
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364653 ) Change subject: Fixes to migrate script with regards to i18n .. Fixes to migrate script with regards to i18n * Make sure metadata field is present * Make sure not to copy entire messages file Change-Id: I9525f1cb35e6194de6594634c52d9f6c0587286d --- M scripts/migrate.py 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/scripts/migrate.py b/scripts/migrate.py index ca017f8..d5b9fc2 100644 --- a/scripts/migrate.py +++ b/scripts/migrate.py @@ -206,11 +206,15 @@ print('migrating i18n') for root, dirs, files in os.walk(mfdir + '/i18n/'): for language in files: -f = open(mfdir + '/i18n/' + language, 'r') try: +f = open('/i18n/' + language, 'r') newLanguageData = json.load(f, object_pairs_hook=OrderedDict) -except IOError: -newLanguageData = {} +except FileNotFoundError: +newLanguageData = { +"@metadata": { +"authors": [] +} +} f.close() f = open(mfdir + '/i18n/' + language, 'r') -- To view, visit https://gerrit.wikimedia.org/r/364653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9525f1cb35e6194de6594634c52d9f6c0587286d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: JdlrobsonGerrit-Reviewer: Jdlrobson 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...MinervaNeue[master]: Add .gitignore file
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364652 ) Change subject: Add .gitignore file .. Add .gitignore file Change-Id: Ie5112a5eef02fba9b70ef7483008b27090cc3f81 --- A .gitignore 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a587932 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +node_modules/ +/vendor +/composer.lock +/composer.phar +.DS_Store + -- To view, visit https://gerrit.wikimedia.org/r/364652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5112a5eef02fba9b70ef7483008b27090cc3f81 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: JdlrobsonGerrit-Reviewer: Jdlrobson 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...MobileFrontend[master]: Final fixups prior to Minerva/MobileFrontend separation
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364654 ) Change subject: Final fixups prior to Minerva/MobileFrontend separation .. Final fixups prior to Minerva/MobileFrontend separation * Correct dependency tree - a MobileFrontend module should not depend on a Minerva module - move "skins.minerva.icons.images.variants" dependency to Minerva entry point * Update jsduck config so that MainMenu is a global (MainMenu will become an abstract concept and the code defined in Minerva) * Messages are defined twice inside mobile.startup and skins.minerva.scripts since the latter depends on the former, remove the messages from it * Mark module definitions with resource-modules-disable-line that will be unused by MobileFrontend after the separation. In future we will consider whether these modules should be ported to the Minerva skin. Change-Id: I598e9230fc27aae46d8d55c63fb18d5e4aedf939 --- M extension.json M jsduck.json M resources/mobile.backtotop/BackToTopOverlay.js M resources/mobile.betaoptin/BetaOptinPanel.js M resources/mobile.categories.overlays/CategoryAddOverlay.js M resources/mobile.categories.overlays/CategoryOverlay.js M resources/mobile.issues/CleanupOverlay.js M resources/mobile.languages.structured/LanguageOverlay.js M resources/mobile.mediaViewer/ImageOverlay.js M resources/mobile.references.gateway/ReferencesMobileViewGateway.js M resources/mobile.references/ReferencesDrawer.js M resources/mobile.search/MobileWebSearchLogger.js M resources/mobile.search/SearchOverlay.js M resources/mobile.startup/OverlayManager.js M resources/mobile.startup/Skin.js M resources/mobile.startup/rlModuleLoader.js M resources/mobile.talk.overlays/TalkOverlay.js M resources/mobile.talk.overlays/TalkSectionAddOverlay.js M resources/mobile.talk.overlays/TalkSectionOverlay.js M resources/mobile.toc/TableOfContents.js M resources/mobile.toggle/toggle.js M resources/mobile.watchlist/WatchList.js 22 files changed, 31 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/54/364654/1 diff --git a/extension.json b/extension.json index 95c150e..d571650 100644 --- a/extension.json +++ b/extension.json @@ -504,11 +504,17 @@ "mobile-frontend-overlay-continue", "mobile-frontend-last-modified-with-user-seconds", "mobile-frontend-last-modified-with-user-minutes", - "mobile-frontend-last-modified-with-user-hours", "mobile-frontend-last-modified-with-user-days", "mobile-frontend-last-modified-with-user-months", "mobile-frontend-last-modified-with-user-years", "mobile-frontend-last-modified-with-user-just-now", + "mobile-frontend-joined-just-now", + "mobile-frontend-joined-seconds", + "mobile-frontend-joined-minutes", + "mobile-frontend-joined-hours", + "mobile-frontend-joined-days", + "mobile-frontend-joined-months", + "mobile-frontend-joined-years", "mobile-frontend-loading-message", "mobile-frontend-editor-licensing", "mobile-frontend-editor-licensing-with-terms", @@ -908,7 +914,6 @@ "desktop" ], "dependencies": [ - "skins.minerva.icons.images.variants", "mobile.startup" ], "styles": [ @@ -1358,20 +1363,6 @@ "mobile-frontend-meta-data-issues-header", "mobile-frontend-meta-data-issues-header-talk", "mobile-frontend-languages-not-available", - "mobile-frontend-last-modified-with-user-seconds", - "mobile-frontend-last-modified-with-user-minutes", - "mobile-frontend-last-modified-with-user-hours", - "mobile-frontend-last-modified-with-user-days", - "mobile-frontend-last-modified-with-user-months", - "mobile-frontend-last-modified-with-user-years", - "mobile-frontend-last-modified-with-user-just-now", - "mobile-frontend-joined-just-now", - "mobile-frontend-joined-seconds", - "mobile-frontend-joined-minutes", -
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Fixes to migrate script with regards to i18n
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364653 ) Change subject: Fixes to migrate script with regards to i18n .. Fixes to migrate script with regards to i18n * Make sure metadata field is present * Make sure not to copy entire messages file Change-Id: I9525f1cb35e6194de6594634c52d9f6c0587286d --- M scripts/migrate.py 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/53/364653/1 diff --git a/scripts/migrate.py b/scripts/migrate.py index ca017f8..d5b9fc2 100644 --- a/scripts/migrate.py +++ b/scripts/migrate.py @@ -206,11 +206,15 @@ print('migrating i18n') for root, dirs, files in os.walk(mfdir + '/i18n/'): for language in files: -f = open(mfdir + '/i18n/' + language, 'r') try: +f = open('/i18n/' + language, 'r') newLanguageData = json.load(f, object_pairs_hook=OrderedDict) -except IOError: -newLanguageData = {} +except FileNotFoundError: +newLanguageData = { +"@metadata": { +"authors": [] +} +} f.close() f = open(mfdir + '/i18n/' + language, 'r') -- To view, visit https://gerrit.wikimedia.org/r/364653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9525f1cb35e6194de6594634c52d9f6c0587286d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue 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...MinervaNeue[master]: Add .gitignore file
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364652 ) Change subject: Add .gitignore file .. Add .gitignore file Change-Id: Ie5112a5eef02fba9b70ef7483008b27090cc3f81 --- A .gitignore 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/52/364652/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a587932 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +node_modules/ +/vendor +/composer.lock +/composer.phar +.DS_Store + -- To view, visit https://gerrit.wikimedia.org/r/364652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5112a5eef02fba9b70ef7483008b27090cc3f81 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue 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] operations/puppet[production]: rsync::quickdatacopy: add ferm rule also for IPv6
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364642 ) Change subject: rsync::quickdatacopy: add ferm rule also for IPv6 .. rsync::quickdatacopy: add ferm rule also for IPv6 Do not just add firewall rule for IPv4, but also for IPv6 (ip6tables). Otherwise rsync will not work when IPv6 is preferred because it's available unless we'd add -4 to the rsync command. Change-Id: Iad29297171887b960802a8266cc1999d34d5b216 --- M modules/rsync/manifests/quickdatacopy.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/rsync/manifests/quickdatacopy.pp b/modules/rsync/manifests/quickdatacopy.pp index ec8ff1f..71b9de0 100644 --- a/modules/rsync/manifests/quickdatacopy.pp +++ b/modules/rsync/manifests/quickdatacopy.pp @@ -37,7 +37,7 @@ ensure => $ensure, proto => 'tcp', port => 873, - srange => "@resolve(${dest_host})", + srange => "(@resolve((${dest_host})) @resolve((${dest_host}), ))", } rsync::server::module { $title: -- To view, visit https://gerrit.wikimedia.org/r/364642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad29297171887b960802a8266cc1999d34d5b216 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn 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...CharRangeSpan[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364651 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: Id1925b16152bcb648b615d6273fc47bd4d4900a5 --- M CharRangeSpan.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharRangeSpan refs/changes/51/364651/1 diff --git a/CharRangeSpan.i18n.php b/CharRangeSpan.i18n.php index d85473f..8768ef5 100644 --- a/CharRangeSpan.i18n.php +++ b/CharRangeSpan.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1925b16152bcb648b615d6273fc47bd4d4900a5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CharRangeSpan Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RT[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364650 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: I313088e4ad4dc4588a11eff5293d39f652d12457 --- M RT.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RT refs/changes/50/364650/1 diff --git a/RT.i18n.php b/RT.i18n.php index 381e27c..9d58301 100644 --- a/RT.i18n.php +++ b/RT.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I313088e4ad4dc4588a11eff5293d39f652d12457 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RT Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ConditionalShowSection[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364649 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: I05c72e8aec4cd0776de8e791b8786ac2fe17812d --- M ConditionalShowSection.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConditionalShowSection refs/changes/49/364649/1 diff --git a/ConditionalShowSection.i18n.php b/ConditionalShowSection.i18n.php index 228910d..b65e29b 100644 --- a/ConditionalShowSection.i18n.php +++ b/ConditionalShowSection.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05c72e8aec4cd0776de8e791b8786ac2fe17812d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConditionalShowSection Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PagedTiffHandler[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364648 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: I9941f1801406bbd44703a1ca7d29105f78534889 --- M PagedTiffHandler.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PagedTiffHandler refs/changes/48/364648/1 diff --git a/PagedTiffHandler.i18n.php b/PagedTiffHandler.i18n.php index 3e11603..6b1dd36 100644 --- a/PagedTiffHandler.i18n.php +++ b/PagedTiffHandler.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9941f1801406bbd44703a1ca7d29105f78534889 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PagedTiffHandler Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: add IPv6 records for netmon2001
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364641 ) Change subject: add IPv6 records for netmon2001 .. add IPv6 records for netmon2001 Add missing IPv6 and reverse records. Also capitalize the "a" for the A record. Bug: T166180 Change-Id: I0b3318900043b5b4ec3ff34a0b1b032ac1723f85 --- M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index cf07f16..28edd86 100644 --- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -60,6 +60,8 @@ 6.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit2001.wikimedia.org. 7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit-slave.wikimedia.org. +0.1.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR netmon2001.wikimedia.org. + ; codfw private subnets (2620:0:860:100::/56) ; private1-a-codfw (2620:0:860:101::/64) diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e57ccfa..9af9916 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -189,7 +189,8 @@ netmon1001 1H IN 2620:0:861:2:208:80:154:159 netmon1002 1H IN A208.80.154.5 netmon1002 1H IN 2620:0:861:1:208:80:154:5 -netmon2001 1H IN a208.80.153.110 +netmon2001 1H IN A208.80.153.110 +netmon2001 1H IN 2620:0:860:4:208:80:153:110 pay-lvs1001 1H IN A208.80.155.2 pay-lvs1002 1H IN A208.80.155.3 pollux 1H IN A208.80.153.43 ; VM on the ganeti01.svc.codfw.wmnet cluster -- To view, visit https://gerrit.wikimedia.org/r/364641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b3318900043b5b4ec3ff34a0b1b032ac1723f85 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn 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...SlimboxThumbs[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364647 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: Id47b3caadf4af684b51a1dcf1fa4dfcd1331f003 --- M SlimboxThumbs.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SlimboxThumbs refs/changes/47/364647/1 diff --git a/SlimboxThumbs.i18n.php b/SlimboxThumbs.i18n.php index 1023e07..95e0448 100644 --- a/SlimboxThumbs.i18n.php +++ b/SlimboxThumbs.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id47b3caadf4af684b51a1dcf1fa4dfcd1331f003 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SlimboxThumbs Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticImageInput[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364646 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: I459fc8c168df0c74dd18a076e6e601f49caba445 --- M SemanticImageInput.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticImageInput refs/changes/46/364646/1 diff --git a/SemanticImageInput.i18n.php b/SemanticImageInput.i18n.php index 1cb0dc6..8c301b8 100644 --- a/SemanticImageInput.i18n.php +++ b/SemanticImageInput.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I459fc8c168df0c74dd18a076e6e601f49caba445 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticImageInput Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SwiftCloudFiles[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364645 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: I19d64697f0ca23969d27fb6abaee574534d9a6d7 --- M SwiftCloudFiles.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SwiftCloudFiles refs/changes/45/364645/1 diff --git a/SwiftCloudFiles.i18n.php b/SwiftCloudFiles.i18n.php index 2b3b571..b53c64a 100644 --- a/SwiftCloudFiles.i18n.php +++ b/SwiftCloudFiles.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19d64697f0ca23969d27fb6abaee574534d9a6d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SwiftCloudFiles Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...JSBreadCrumbs[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364644 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: Id926b09a1a75e3cf49839447c6e80dce74b6794f --- M JSBreadCrumbs.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JSBreadCrumbs refs/changes/44/364644/1 diff --git a/JSBreadCrumbs.i18n.php b/JSBreadCrumbs.i18n.php index ef6a673..05d97c8 100644 --- a/JSBreadCrumbs.i18n.php +++ b/JSBreadCrumbs.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364644 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id926b09a1a75e3cf49839447c6e80dce74b6794f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/JSBreadCrumbs Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LDAPAuthorization[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364643 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: Iefa8d196d6824af54cce7d9a179c55ea9f88da5d --- M LDAPAuthorization.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LDAPAuthorization refs/changes/43/364643/1 diff --git a/LDAPAuthorization.i18n.php b/LDAPAuthorization.i18n.php index 2cec9c7..3b07d79 100644 --- a/LDAPAuthorization.i18n.php +++ b/LDAPAuthorization.i18n.php @@ -1,7 +1,7 @@ https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php * * Beginning with MediaWiki 1.23, translation strings are stored in json files, * and the EXTENSION.i18n.php file only exists to provide compatibility with -- To view, visit https://gerrit.wikimedia.org/r/364643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefa8d196d6824af54cce7d9a179c55ea9f88da5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LDAPAuthorization Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync::quickdatacopy: add ferm rule also for IPv6
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364642 ) Change subject: rsync::quickdatacopy: add ferm rule also for IPv6 .. rsync::quickdatacopy: add ferm rule also for IPv6 Do not just add firewall rall for IPv4, but also for IPv6 (ip6tables), otherwise rsync will not work when IPv6 is preferred because it's available unless we'd add -4 to the rsync command. Change-Id: Iad29297171887b960802a8266cc1999d34d5b216 --- M modules/rsync/manifests/quickdatacopy.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/364642/1 diff --git a/modules/rsync/manifests/quickdatacopy.pp b/modules/rsync/manifests/quickdatacopy.pp index ec8ff1f..71b9de0 100644 --- a/modules/rsync/manifests/quickdatacopy.pp +++ b/modules/rsync/manifests/quickdatacopy.pp @@ -37,7 +37,7 @@ ensure => $ensure, proto => 'tcp', port => 873, - srange => "@resolve(${dest_host})", + srange => "(@resolve((${dest_host})) @resolve((${dest_host}), ))", } rsync::server::module { $title: -- To view, visit https://gerrit.wikimedia.org/r/364642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad29297171887b960802a8266cc1999d34d5b216 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: add IPv6 records for netmon2001
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364641 ) Change subject: add IPv6 records for netmon2001 .. add IPv6 records for netmon2001 Bug: T166180 Change-Id: I0b3318900043b5b4ec3ff34a0b1b032ac1723f85 --- M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/41/364641/1 diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index cf07f16..28edd86 100644 --- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -60,6 +60,8 @@ 6.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit2001.wikimedia.org. 7.0.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR gerrit-slave.wikimedia.org. +0.1.1.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR netmon2001.wikimedia.org. + ; codfw private subnets (2620:0:860:100::/56) ; private1-a-codfw (2620:0:860:101::/64) diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e57ccfa..0ad7414 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -190,6 +190,7 @@ netmon1002 1H IN A208.80.154.5 netmon1002 1H IN 2620:0:861:1:208:80:154:5 netmon2001 1H IN a208.80.153.110 +netmon2001 1H IN 2620:0:860:4:208:80:153:110 pay-lvs1001 1H IN A208.80.155.2 pay-lvs1002 1H IN A208.80.155.3 pollux 1H IN A208.80.153.43 ; VM on the ganeti01.svc.codfw.wmnet cluster -- To view, visit https://gerrit.wikimedia.org/r/364641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b3318900043b5b4ec3ff34a0b1b032ac1723f85 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync::quickdatacopy: copy data via IPv4, don't rely on IPv6...
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364640 ) Change subject: rsync::quickdatacopy: copy data via IPv4, don't rely on IPv6 setup .. rsync::quickdatacopy: copy data via IPv4, don't rely on IPv6 setup It's cool to have IPv6 and i always love to add it but we don't have it by default and the ferm rules need to specifically also add rules for ip6tables. If that isn't the case we end up with rsync just silently not working because it tries IPv6 first and then isn't allowed by firewalling. Add -4 as parameter to rsync to force always using IPv4, it's more reliable to just work this way. Change-Id: I4d809aa3da3c6b08fed3c7bd4a98844899fb7006 --- M modules/rsync/templates/quickdatacopy.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/364640/1 diff --git a/modules/rsync/templates/quickdatacopy.erb b/modules/rsync/templates/quickdatacopy.erb index fea2243..0d8a15f 100644 --- a/modules/rsync/templates/quickdatacopy.erb +++ b/modules/rsync/templates/quickdatacopy.erb @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/rsync -a rsync://<%= @source_host %>/<%= @title %> <%= @module_path %>/ +/usr/bin/rsync -4 -a rsync://<%= @source_host %>/<%= @title %> <%= @module_path %>/ -- To view, visit https://gerrit.wikimedia.org/r/364640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d809aa3da3c6b08fed3c7bd4a98844899fb7006 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Calculate CV splits on the driver
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364637 ) Change subject: Calculate CV splits on the driver .. Calculate CV splits on the driver The calculation of CV splits is only deterministic if it is called each time with the exact same rows per partition. This guarnatee is not met because catalyst decides how many partitions a parquet df read from disk should have based on the query plan. This led to intermittent information leakage between test and train, and ocasionally the groupData passed to xgboost being incorrect if the splits were re-calculated after calculating the groupData. This new solution collects all the rows to the driver and calculates the splits there. This guarantees the splits are calculated a single time and any re-calculation will use the provided splits. Change-Id: I8a8189f999d5a59cbf699b39b98b4e3a4ce0549b --- M mjolnir/cli/training_pipeline.py A mjolnir/feature_engineering.py M mjolnir/test/training/test_hyperopt.py M mjolnir/test/training/test_tuning.py M mjolnir/training/hyperopt.py M mjolnir/training/tuning.py M mjolnir/training/xgboost.py 7 files changed, 42 insertions(+), 49 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR refs/changes/37/364637/1 diff --git a/mjolnir/cli/training_pipeline.py b/mjolnir/cli/training_pipeline.py index dab8301..2304de2 100644 --- a/mjolnir/cli/training_pipeline.py +++ b/mjolnir/cli/training_pipeline.py @@ -34,15 +34,10 @@ print '' continue -# Make a guess at the number of fold partitions needed based on data size. -# This requires there to be around 40k data points, arbitrarily chosen, -# per partition used to calculate the folds, up to 100 partitions. -num_fold_partitions = min(100, max(1, data_size / 4)) - # Explore a hyperparameter space. Skip the most expensive part of tuning, # increasing the # of trees, with target_node_evaluations=None tune_results = mjolnir.training.xgboost.tune( -df_hits_with_features, num_folds=num_folds, num_fold_partitions=num_fold_partitions, +df_hits_with_features, num_folds=num_folds, num_cv_jobs=num_cv_jobs, num_workers=num_workers, target_node_evaluations=target_node_evaluations) diff --git a/mjolnir/feature_engineering.py b/mjolnir/feature_engineering.py new file mode 100644 index 000..8b942d2 --- /dev/null +++ b/mjolnir/feature_engineering.py @@ -0,0 +1,12 @@ +import numpy as np +from pyspark.ml.linalg import Vectors, VectorUDT + +def append_features(df, *cols): +def add_features(feat, *other): +raw = feat.toArray() +return Vectors.dense(np.append(raw, map(float, other))) +add_features_udf = F.udf(add_features, VectorUDT()) +new_feat_list = df.schema['features'].metadata['features'] + cols +return df.withColumn('features', mjolnir.spark.add_meta(df._sc, add_features_udf('features', *cols), +{'features': new_feat_list})) + diff --git a/mjolnir/test/training/test_hyperopt.py b/mjolnir/test/training/test_hyperopt.py index f0bafad..ea2e334 100644 --- a/mjolnir/test/training/test_hyperopt.py +++ b/mjolnir/test/training/test_hyperopt.py @@ -31,7 +31,7 @@ # mock it out w/MockModel. best_params, trails = mjolnir.training.hyperopt.minimize( df_train, MockModel, space, max_evals=5, num_folds=2, -num_fold_partitions=1, num_cv_jobs=1, num_workers=1) +num_cv_jobs=1, num_workers=1) assert isinstance(best_params, dict) # num_rounds should have been unchanged assert 'num_rounds' in best_params @@ -49,7 +49,7 @@ gen = MockModelGen() best_params, trials = mjolnir.training.hyperopt.grid_search( df_train, gen, space, num_folds=2, -num_fold_partitions=1, num_cv_jobs=1, num_workers=1) +num_cv_jobs=1, num_workers=1) assert isinstance(best_params, dict) assert 'num_rounds' in best_params # num rounds should be unchanged diff --git a/mjolnir/test/training/test_tuning.py b/mjolnir/test/training/test_tuning.py index 73d9057..f0e8344 100644 --- a/mjolnir/test/training/test_tuning.py +++ b/mjolnir/test/training/test_tuning.py @@ -54,6 +54,6 @@ # xgboost needs all jobs to have a worker assigned before it will # finish a round of training, so we have to be careful not to use # too many workers -num_folds=2, num_fold_partitions=1, num_cv_jobs=1, num_workers=1) +num_folds=2, num_cv_jobs=1, num_workers=1) # one score for each fold assert len(scores) == 2 diff --git a/mjolnir/training/hyperopt.py b/mjolnir/training/hyperopt.py index 518497b..b15be07 100644 --- a/mjolnir/training/hyperopt.py +++ b/mjolnir/training/hyperopt.py @@ -37,18 +37,17 @@ return rval -def grid_search(df, train_func, space,
[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Add option to evaluate test set after model training
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364639 ) Change subject: Add option to evaluate test set after model training .. Add option to evaluate test set after model training Change-Id: If0a17907bbe56b6f567af5f02b340295b1d16b29 --- M mjolnir/cli/training_pipeline.py M mjolnir/training/xgboost.py 2 files changed, 40 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR refs/changes/39/364639/1 diff --git a/mjolnir/cli/training_pipeline.py b/mjolnir/cli/training_pipeline.py index 2304de2..7e91457 100644 --- a/mjolnir/cli/training_pipeline.py +++ b/mjolnir/cli/training_pipeline.py @@ -14,13 +14,23 @@ import mjolnir.training.xgboost import os import pickle +import sys from pyspark import SparkContext from pyspark.sql import HiveContext from pyspark.sql import functions as F def main(sc, sqlContext, input_dir, output_dir, wikis, target_node_evaluations, - num_workers, num_cv_jobs, num_folds): + num_workers, num_cv_jobs, num_folds, test_dir): + +if os.path.exists(output_dir): +logging.error('Output directory (%s) already exists' % (output_dir)) +sys.exit(1) + +# Maybe this is a bit early to create the path ... but should be fine. +# The annoyance might be that an error in training requires deleting +# this directory to try again. +os.mkdir(output_dir) for wiki in wikis: print 'Training wiki: %s' % (wiki) @@ -41,13 +51,6 @@ num_cv_jobs=num_cv_jobs, num_workers=num_workers, target_node_evaluations=target_node_evaluations) -# Save the tune results somewhere for later analysis. Use pickle -# to maintain the hyperopt.Trials objects as is. -tune_output = os.path.join(output_dir, 'tune_%s.pickle' % (wiki)) -with open(tune_output, 'w') as f: -f.write(pickle.dumps(tune_results)) -print 'Wrote tuning results to %s' % (tune_output) - print 'CV test-ndcg@10: %.4f' % (tune_results['metrics']['test']) print 'CV train-ndcg@10: %.4f' % (tune_results['metrics']['train']) @@ -61,7 +64,27 @@ best_params['groupData'] = j_groups model = mjolnir.training.xgboost.train(df_grouped, best_params) -print 'train-ndcg@10: %.3f' % (model.eval(df_grouped, j_groups)) +tune_results['metrics']['train'] = model.eval(df_grouped, j_groups) +print 'train-ndcg@10: %.5f' % (tune_results['metrics']['train']) + +if test_dir is not None: +try: +df_test = sqlContext.read.parquet(test_dir) +tune_results['metrics']['test'] = model.eval(df_test) +print 'test-ndcg@10: %.5f' % (tune_results['metrics']['test']) +except: +# It has probably taken some time to get this far. Don't bail +# because the user input an invalid test dir. +logging.exception('Could not evaluate test_dir: %s' % (test_dir)) + +# Save the tune results somewhere for later analysis. Use pickle +# to maintain the hyperopt.Trials objects as is. It might be nice +# to write out a json version, but the Trials objects require +# some more work before they can be json encoded. +tune_output_pickle = os.path.join(output_dir, 'tune_%s.pickle' % (wiki)) +with open(tune_output_pickle, 'w') as f: +f.write(pickle.dumps(tune_results)) +print 'Wrote tuning results to %s' % (tune_output_pickle) # Generate a feature map so xgboost can include feature names in the dump. # The final `q` indicates all features are quantitative values (floats). @@ -106,6 +129,12 @@ + 'trees used in the final result. Default uses 100 trees rather ' + 'than dynamically choosing based on max_depth. (Default: None)') parser.add_argument( +'-t', '--test-path', dest='test_dir', type=str, required=False, default=None, +help='A holdout test set to evaluate the final model against') +parser.add_argument( +'-z', '--zero-feature', dest='zero_features', type=str, nargs='+', +help='Zero out feature in input') +parser.add_argument( '-v', '--verbose', dest='verbose', default=False, action='store_true', help='Increase logging to INFO') parser.add_argument( diff --git a/mjolnir/training/xgboost.py b/mjolnir/training/xgboost.py index 46b4c9b..5b699c8 100644 --- a/mjolnir/training/xgboost.py +++ b/mjolnir/training/xgboost.py @@ -561,7 +561,7 @@ }, 'params': space, 'metrics': { -'test': -loss, -'train': -loss + true_loss +'cv-test': -loss, +'cv-train': -loss + true_loss } } -- To view, visit https://gerrit.wikimedia.org/r/364639 To unsubscribe, visit
[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Add some feature engineering helper functions
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364638 ) Change subject: Add some feature engineering helper functions .. Add some feature engineering helper functions A couple small functions to assist with feature engineering, and some documentation of how to create and test new features. Change-Id: Ic87b0a48c94c5b8f449cebb496626cdb2cb90011 --- A docs/feature_engineering.rst M mjolnir/feature_engineering.py 2 files changed, 170 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR refs/changes/38/364638/1 diff --git a/docs/feature_engineering.rst b/docs/feature_engineering.rst new file mode 100644 index 000..eae851b --- /dev/null +++ b/docs/feature_engineering.rst @@ -0,0 +1,110 @@ +This document contains examples of testing new features with mjolnir to hopefully +guide future experimentation with new features quickly, without having to import +all the relevant data or create new fields in elasticsearch for the initial evaluation. + +Features that seem to be useful should then be implemented as part of the elasticsearch +feature collection pipeline and re-verified. + + +Evaluating new query independent features += + +The example calculates a new query independent feature in mysql and append it to an +existing test and train dataset. + +Calculate a potential new feature from mysql:: + +echo 'select rev_page, min(rev_timestamp) from enwiki.revision group by rev_page' | \ +mysql -sN --defaults-extra-file=/etc/mysql/conf.d/analytics-research-client.cnf -h analytics-store > page_min_timestamp + +Open a pyspark shell with mjolnir:: + +PYSPARK_PYTHON=venv/bin/python SPARK_CONF_DIR=/etc/spark/conf ~/spark-2.1.0-bin-hadoop2.6/bin/pyspark --jars /home/ebernhardson/mjolnir-0.1-jar-with-dependencies.jar --driver-class-path /home/ebernhardson/mjolnir-0.1-jar-with-dependencies.jar --master yarn --files /usr/lib/libhdfs.so.0.0.0 --archives 'mjolnir_venv.zip#venv' + +Load the feature file into a dataframe:: + +import pyspark.sql.types +df_mwts = sqlContext.read.csv( +'/path/to/page_min_timestamp', +sep='\t', schema=pyspark.sql.types.StructType([ +pyspark.sql.types.StructField('hit_page_id', pyspark.sql.types.IntegerType()), +pyspark.sql.types.StructField('mwts', pyspark.sql.types.StringType()), +])) + +Munge the feature from a mediawiki timestamp into a normal ts:: + +import datetime +from pyspark.sql import functions as F +import time +mwts_to_ts_udf = F.udf(lambda mwts: time.mktime(datetime.datetime.strptime(mwts, '%Y%m%d%H%M%S').timetuple()), pyspark.sql.types.FloatType()) +df_page_created = df_mwts.select('hit_page_id', mwts_to_ts_udf('mwts').alias('page_created')) + +Load an existing df generated by data_pipeline.py and merge new feature:: + +df_train = sqlContext.read.parquet('hdfs://analytics-hadoop/user/ebernhardson/training_size/train_1193k') +df_joined = df_train.join(df_page_created, how='inner', on=['hit_page_id']) + +Append the new feature to existing feature:: + +import mjolnir.feature_engineering +df_merged = mjolnir.feature_engineering.append_features(df_joined, 'page_created').drop('page_created') + df_merged.write.parquet('hdfs://analytics-hadoop/user/ebernhardson/mjolnir/1193k_with_page_created') + +Do the same thing for a holdout set:: + +df_test = sqlContext.read.parquet('hdfs://analytics-hadoop/user/ebernhardson/training_size/test') +df_joined = df_test.join(df_page_created, how='inner', on=['hit_page_id']) +df_merged = mjolnir.feature_engineering.append_features(df_joined, 'page_created').drop('page_created') + df_merged.write.parquet('hdfs://analytics-hadoop/user/ebernhardson/mjolnir/test_with_page_created') + +Now we have two new datasets that contain the new feature, one for training and one for evaluation. The training set can be fed into training_pipeline.py as the --input parameter. The test set can be provided as --test-dir to be evaluated against the model after training is complete. + +Calculating a new query dependent feature from the elasticsearch analyze api + + +Open a pyspark shell with mjolnir:: + +PYSPARK_PYTHON=venv/bin/python SPARK_CONF_DIR=/etc/spark/conf ~/spark-2.1.0-bin-hadoop2.6/bin/pyspark --jars /home/ebernhardson/mjolnir-0.1-jar-with-dependencies.jar --driver-class-path /home/ebernhardson/mjolnir-0.1-jar-with-dependencies.jar --master yarn --files /usr/lib/libhdfs.so.0.0.0 --archives 'mjolnir_venv.zip#venv' + +Load all the relevant query strings into an rdd:: + +rdd_queries = sc.union([sqlContext.read.parquet('hdfs://analytics-hadoop/user/ebernhardson/mjolnir/training_size/' + f).select('query').rdd for f in ['train_1193k', 'test']]).distinct()
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync::quickdatacopy: add 'sync-' prefix to /usr/local/sbin/...
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364636 ) Change subject: rsync::quickdatacopy: add 'sync-' prefix to /usr/local/sbin/ file .. rsync::quickdatacopy: add 'sync-' prefix to /usr/local/sbin/ file The executable file in /usr/local/sbin/ should be named better to tell us what it does. Currently we ended up with f.e. "var-lib-rancid" next to others like "run-puppet-agent" which i found a bit ugly. Add a "sync-" prefix to it. Change-Id: I2fb5977fbc792055634c1cf88afbb9e684a3453b --- M modules/rsync/manifests/quickdatacopy.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/rsync/manifests/quickdatacopy.pp b/modules/rsync/manifests/quickdatacopy.pp index e421591..ec8ff1f 100644 --- a/modules/rsync/manifests/quickdatacopy.pp +++ b/modules/rsync/manifests/quickdatacopy.pp @@ -49,7 +49,7 @@ if $dest_host == $::fqdn { - file { "/usr/local/sbin/${title}": + file { "/usr/local/sbin/sync-${title}": ensure => $ensure, owner => 'root', group => 'root', @@ -65,7 +65,7 @@ cron { 'sync-rsync-data': ensure => $cron_ensure, minute => '*/10', - command => "/usr/local/sbin/${title} >/dev/null 2>&1", + command => "/usr/local/sbin/sync-${title} >/dev/null 2>&1", } } } -- To view, visit https://gerrit.wikimedia.org/r/364636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fb5977fbc792055634c1cf88afbb9e684a3453b Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync::quickdatacopy: add 'sync-' prefix to /usr/local/sbin/...
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364636 ) Change subject: rsync::quickdatacopy: add 'sync-' prefix to /usr/local/sbin/ file .. rsync::quickdatacopy: add 'sync-' prefix to /usr/local/sbin/ file The executable file in /usr/local/sbin/ should be named better to tell us what it does. Currently we ended up with f.e. "var-lib-rancid" next to others like "run-puppet-agent" which i found a bit ugly. Add a "sync-" prefix to it. Change-Id: I2fb5977fbc792055634c1cf88afbb9e684a3453b --- M modules/rsync/manifests/quickdatacopy.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/36/364636/1 diff --git a/modules/rsync/manifests/quickdatacopy.pp b/modules/rsync/manifests/quickdatacopy.pp index e421591..e011435 100644 --- a/modules/rsync/manifests/quickdatacopy.pp +++ b/modules/rsync/manifests/quickdatacopy.pp @@ -49,7 +49,7 @@ if $dest_host == $::fqdn { - file { "/usr/local/sbin/${title}": + file { "/usr/local/sbin/sync-${title}": ensure => $ensure, owner => 'root', group => 'root', -- To view, visit https://gerrit.wikimedia.org/r/364636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2fb5977fbc792055634c1cf88afbb9e684a3453b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Disallow slow query when filtering only by namespace
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364635 ) Change subject: Disallow slow query when filtering only by namespace .. Disallow slow query when filtering only by namespace Bug: T168599 Change-Id: I9c5a1c364b7a8df796c931d3f3a12f0549ff3933 --- M i18n/en.json M i18n/qqq.json M src/SpecialPage.php 3 files changed, 21 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments refs/changes/35/364635/1 diff --git a/i18n/en.json b/i18n/en.json index 30c4dd8..d5594e3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -36,5 +36,6 @@ "pageassessments-importance": "Importance", "pageassessments-class": "Class", "pageassessments-timestamp": "Timestamp", - "pageassessments-total-results": "Total results: $1" + "pageassessments-total-results": "Total results: $1", + "pageassessments-error-namespace-filter": "Filtering by namespace also requires filtering by project or page title." } diff --git a/i18n/qqq.json b/i18n/qqq.json index 1dcd474..c0d52a8 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -38,5 +38,6 @@ "pageassessments-importance": "Label for the results table column header\n{{Identical|Importance}}", "pageassessments-class": "Label for the results table column header\n{{Identical|Class}}", "pageassessments-timestamp": "Label for the results table column header\n{{Identical|Timestamp}}", - "pageassessments-total-results": "Summary shown above the search results, with total number found" + "pageassessments-total-results": "Summary shown above the search results, with total number found", + "pageassessments-error-namespace-filter": "Shown by Special:PageAssessments when an invalid combination of filters is used" } diff --git a/src/SpecialPage.php b/src/SpecialPage.php index a83abca..30d3142 100644 --- a/src/SpecialPage.php +++ b/src/SpecialPage.php @@ -10,6 +10,7 @@ use QueryPage; use ResultWrapper; use Skin; +use Status; use Title; /** @@ -77,16 +78,16 @@ if ( strlen( $project ) > 0 ) { $info['conds']['pap_project_title'] = $project; } - // Namespace (if it's set, it's either an integer >= 0, 'all', or the empty string). - $namespace = $this->getRequest()->getVal( 'namespace' ); - if ( strlen( $namespace ) > 0 && $namespace !== 'all' ) { - $info['conds']['page_namespace'] = $namespace; - } // Page title. $pageTitle = $this->getRequest()->getVal( 'page_title' ); if ( strlen( $pageTitle ) > 0 ) { $title = Title::newFromText( $pageTitle )->getDBkey(); $info['conds']['page_title'] = $title; + } + // Namespace (if it's set, it's either an integer >= 0, 'all', or the empty string). + $namespace = $this->getRequest()->getVal( 'namespace' ); + if ( strlen( $namespace ) > 0 && $namespace !== 'all' ) { + $info['conds']['page_namespace'] = $namespace; } return $info; } @@ -296,10 +297,18 @@ $form = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() ); $form->setMethod( 'get' ); $form->setSubmitTextMsg( 'pageassessments-search' ); - $form->setSubmitCallback( function () { - // No callback required, but HTMLForm says we have to set one. + $form->setSubmitCallback( function ( array $data, HTMLForm $form ) { + // Filtering only by namespace can be slow, disallow it: + // https://phabricator.wikimedia.org/T168599 + if ( $data['namespace'] !== null + && $data['namespace'] !== 'all' + // strlen( null ) produces 0 + && !strlen( $data['project'] ) + && !strlen( $data['page_title'] ) + ) { + return Status::newFatal( 'pageassessments-error-namespace-filter' ); + } } ); return $form; } - } -- To view, visit https://gerrit.wikimedia.org/r/364635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c5a1c364b7a8df796c931d3f3a12f0549ff3933 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageAssessments Gerrit-Branch: master Gerrit-Owner: MaxSem___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [WIP] WikimediaUI theme: Directly use the LESS values rather...
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364634 ) Change subject: [WIP] WikimediaUI theme: Directly use the LESS values rather than via copy-paste .. [WIP] WikimediaUI theme: Directly use the LESS values rather than via copy-paste Bug: T165650 Change-Id: I92322d8c4c31868153f0d85173b2a3127cfd6b69 --- M src/themes/wikimediaui/common.less 1 file changed, 35 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/34/364634/1 diff --git a/src/themes/wikimediaui/common.less b/src/themes/wikimediaui/common.less index ecb1cb3..535d51c 100644 --- a/src/themes/wikimediaui/common.less +++ b/src/themes/wikimediaui/common.less @@ -4,16 +4,20 @@ @oo-ui-font-size-browser: 16; // assumed browser default of `16px` @oo-ui-font-size-base: 0.8em; // equals `12.8px` at browser default of `16px` -@background-color-base: #fff; +// Pull in the main set of variables from the shared UI base; reaching into node_modules like this +// to avoid a symlink that Windows users won't like. +@import '../../../node_modules/wikimedia-ui-base/wikimedia-ui-base.less'; + +// @background-color-base: #fff; @background-color-base--hover: #eaecf0; @background-color-base--read-only: #f8f9fa; -@color-base: #222; -@color-base--hover: #444; -@color-base--active: #000; -@color-base--inverted: #fff; +// @color-base: #222; +// @color-base--hover: #444; +// @color-base--active: #000; +// @color-base--inverted: #fff; @color-emphasized: @color-base--active; -@color-placeholder: #72777d; // equals HSB 210°/9%/49%, aligns to WCAG 2.0 level AA at 4.52:1 contrast ratio +// @color-placeholder: #72777d; // equals HSB 210°/9%/49%, aligns to WCAG 2.0 level AA at 4.52:1 contrast ratio @color-subtle: #72777d; // Primary 'Progressive' and 'Destructive' Colors @@ -25,33 +29,33 @@ @color-progressive--active-hover: @color-progressive; @color-progressive--focus: @color-progressive; -@background-color-destructive: #fee7e6; -@color-destructive: #d33; // equals HSB 360°/77%/87% -@color-destructive--hover: #ff4242; // equals HSB 360°/74%/100% -@color-destructive--active: #b32424; // equals HSB 360°/80%/70% -@color-destructive--focus: @color-destructive; +// @background-color-destructive: #fee7e6; +// @color-destructive: #d33; // equals HSB 360°/77%/87% +// @color-destructive--hover: #ff4242; // equals HSB 360°/74%/100% +// @color-destructive--active: #b32424; // equals HSB 360°/80%/70% +// @color-destructive--focus: @color-destructive; @color-destructive-non-primary: #d7; // Exemption for non-primary buttons, foremost used in VE, lightened up R50 to align to AA contrast ratio // Disabled Widgets @background-color-base--disabled: #eaecf0; @background-color-filled--disabled: #c8ccd1; -@color-base--disabled: #72777d; -@color-filled--disabled: @color-base--inverted; +// @color-base--disabled: #72777d; +// @color-filled--disabled: @color-base--inverted; @opacity--disabled: 0.51; // `0.51` equals `#7d7d7d` on background-color `#fff`, HSB 0°/0%/49% @opacity-filled--disabled: 1; @opacity-indicator--disabled: 0.15; // equals `#c7c8cc` on background-color `#fff` @opacity-tool--disabled: 0.3; // Invalid Widget (validation error feedback) -@color-erroneous: @color-destructive; +// @color-erroneous: @color-destructive; // "Framed" Widgets (Framed ButtonWidget, ToggleSwitchWidget...) -@background-color-framed: #f8f9fa; -@background-color-framed--hover: @background-color-base; // equals `lighten( #f8f9fa, 10% )`, although `2%` is already resulting in `#fff` -@background-color-framed--active: #c8ccd1; +// @background-color-framed: #f8f9fa; +// @background-color-framed--hover: @background-color-base; // equals `lighten( #f8f9fa, 10% )`, although `2%` is already resulting in `#fff` +// @background-color-framed--active: #c8ccd1; // Tabbed Navigation -@background-color-tabs: #eaecf0; +// @background-color-tabs: #eaecf0; // Toolbar, Tools & Menus @background-color-toolbar: @background-color-base; @@ -111,19 +115,19 @@ @margin-top-fieldsetlayout-help: -( 6 / @oo-ui-font-size-browser / @oo-ui-font-size-base ) / 2; @margin-bottom-fieldset-header: 8 / @oo-ui-font-size-browser / ( @oo-ui-font-size-base * @font-size-fieldset-header ); -@border-base: @border-width-base solid @border-color-base; +// @border-base: @border-width-base solid @border-color-base; @border-base--disabled: @border-width-base solid @border-color-base--disabled; @border-filled--disabled: @border-width-base solid @border-color-filled--disabled; -@border-dialog: @border-base; +// @border-dialog: @border-base; @border-dialog-bar: @border-width-base solid @border-color-dialog-bar; -@border-menu: @border-base; +// @border-menu: @border-base; -@border-color-base: #a2a9b1; -@border-color-base--hover: #a2a9b1; -@border-color-base--active: #72777d; +// @border-color-base: #a2a9b1; +// @border-color-base--hover: #a2a9b1; +//
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid/netmon: add active_server parameter to DC-switch
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364629 ) Change subject: rancid/netmon: add active_server parameter to DC-switch .. rancid/netmon: add active_server parameter to DC-switch - Add setting for netmon server to Hiera common.yaml, like we do for deployment and install servers - Add parameter $active_server to class rancid{} - Enable cronjobs if current server is active server, otherwise disable - In role, instantiate rancid class instead of include to add parameter, add Hiera lookup - next up: move to profile and Hiera lookup to profile parameter Bug: T166180 Change-Id: I5d8cf0f1d4a8ff8f7365ad0f2155a2c4e095800e --- M hieradata/common.yaml M modules/rancid/manifests/init.pp M modules/role/manifests/rancid.pp 3 files changed, 19 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/common.yaml b/hieradata/common.yaml index ff20792..e3350f6 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -467,6 +467,8 @@ install_server: install1002.wikimedia.org install_server_failover: install2002.wikimedia.org +netmon_server: netmon1002.wikimedia.org + # Etcd client global configuration etcd_client_srv_domain: "conftool.%{::site}.wmnet" etcd_host: '' diff --git a/modules/rancid/manifests/init.pp b/modules/rancid/manifests/init.pp index 495630c..2ccde54 100644 --- a/modules/rancid/manifests/init.pp +++ b/modules/rancid/manifests/init.pp @@ -1,5 +1,7 @@ # Really Awful Notorious CIsco config Differ -class rancid { +class rancid ( +$active_server +){ package { 'rancid': ensure => present, @@ -49,15 +51,21 @@ content => template('rancid/cloginrc.erb'), } +if $active_server == $::fqdn { +$cron_ensure = 'present' +} else { +$cron_ensure = 'absent' +} + cron { 'rancid_differ': -ensure => 'present', +ensure => $cron_ensure, command => 'SSH_AUTH_SOCK=/run/keyholder/proxy.sock /usr/lib/rancid/bin/rancid-run', user=> 'rancid', minute => '1', } cron { 'rancid_clean_logs': -ensure => 'present', +ensure => $cron_ensure, command => '/usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm {} \;', user=> 'rancid', minute => '50', diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp index 504661e..804bd5e 100644 --- a/modules/role/manifests/rancid.pp +++ b/modules/role/manifests/rancid.pp @@ -6,7 +6,6 @@ } include ::standard -include ::rancid include ::profile::backup::host backup::set { 'rancid': } @@ -18,4 +17,10 @@ dest_host => 'netmon2001.wikimedia.org', module_path => '/var/lib/rancid', } + +$active_server = hiera('netmon_server', 'netmon1002.wikimedia.org') + +class { '::rancid': +active_server => $active_server, +} } -- To view, visit https://gerrit.wikimedia.org/r/364629 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d8cf0f1d4a8ff8f7365ad0f2155a2c4e095800e Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn 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...Thanks[master]: FlowThanksPresentationModel: Use NS_TOPIC directly instead o...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/249359 ) Change subject: FlowThanksPresentationModel: Use NS_TOPIC directly instead of obsolete = parameter .. FlowThanksPresentationModel: Use NS_TOPIC directly instead of obsolete = parameter Change-Id: I95bb78c79a8c4944e3794d06738d519baca913ed --- M FlowThanksPresentationModel.php 1 file changed, 8 insertions(+), 9 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/FlowThanksPresentationModel.php b/FlowThanksPresentationModel.php index 543f46f..3928e8f 100644 --- a/FlowThanksPresentationModel.php +++ b/FlowThanksPresentationModel.php @@ -41,18 +41,17 @@ } public function getPrimaryLink() { - $title = $this->event->getTitle(); + $title = Title::makeTitleSafe( NS_TOPIC, $this->event->getExtraParam( 'workflow' ) ); + if ( !$title ) { + // Workflow IDs that are invalid titles should never happen; we can try + // falling back on the page title and hope the #flow-post- anchor will be there. + $title = $this->event->getTitle(); + } // Make a link to #flow-post-{postid} - $title = Title::makeTitle( - $title->getNamespace(), - $title->getDBKey(), - 'flow-post-' . $this->event->getExtraParam( 'post-id' ) - ); + $title->setFragment( '#flow-post-' . $this->event->getExtraParam( 'post-id' ) ); return [ - 'url' => $title->getFullURL( [ - 'workflow' => $this->event->getExtraParam( 'workflow' ) - ] ), + 'url' => $title->getFullURL(), 'label' => $this->msg( 'notification-link-text-view-post' )->text(), ]; } -- To view, visit https://gerrit.wikimedia.org/r/249359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95bb78c79a8c4944e3794d06738d519baca913ed Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: CatropeGerrit-Reviewer: Catrope Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: Matthias Mullie Gerrit-Reviewer: Sbisson 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]: Advise extensions not to modify $wgWhitelistRead
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364633 ) Change subject: Advise extensions not to modify $wgWhitelistRead .. Advise extensions not to modify $wgWhitelistRead Instead they should use the TitleReadWhitelist hook. I've seen this pattern in multiple extensions now, each causing different problems, so it should be explicitly documented. Change-Id: I670b0acde660bdc27a6c7e91c4b1b3baeea8b2e5 --- M includes/DefaultSettings.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/33/364633/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 11f08b2..6ce9a66 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5027,6 +5027,9 @@ * @note Also that this will only protect _pages in the wiki_. Uploaded files * will remain readable. You can use img_auth.php to protect uploaded files, * see https://www.mediawiki.org/wiki/Manual:Image_Authorization + * + * @note Extensions should not modify this, but use the TitleReadWhitelist + * hook instead. */ $wgWhitelistRead = false; -- To view, visit https://gerrit.wikimedia.org/r/364633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I670b0acde660bdc27a6c7e91c4b1b3baeea8b2e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't call ChangeTags::tagUsageStatistics() for now
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364632 ) Change subject: RCFilters: Don't call ChangeTags::tagUsageStatistics() for now .. RCFilters: Don't call ChangeTags::tagUsageStatistics() for now We need to fix its performance first, it currently takes >30s on wikidatawiki. Fake all hit counts to be zero. Instead of sorting by hit count, sort by internal name. This isn't great but at least it gives us a consistent sort order. Bug: T169997 Change-Id: I4075ea4d43a8f75e21a87a892211699ba3bc7058 --- M includes/specials/SpecialRecentchanges.php 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/364632/1 diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 2fe56f9..84afad5 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -210,12 +210,17 @@ protected function buildChangeTagList() { $explicitlyDefinedTags = array_fill_keys( ChangeTags::listExplicitlyDefinedTags(), 0 ); $softwareActivatedTags = array_fill_keys( ChangeTags::listSoftwareActivatedTags(), 0 ); - $tagStats = ChangeTags::tagUsageStatistics(); + // Hit counts disabled for perf reasons, see T169997 + /* + $tagStats = ChangeTags::tagUsageStatistics(); $tagHitCounts = array_merge( $explicitlyDefinedTags, $softwareActivatedTags, $tagStats ); // Sort by hits arsort( $tagHitCounts ); + */ + $tagHitCounts = array_merge( $explicitlyDefinedTags, $softwareActivatedTags ); + ksort( $tagHitCounts ); // Build the list and data $result = []; -- To view, visit https://gerrit.wikimedia.org/r/364632 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4075ea4d43a8f75e21a87a892211699ba3bc7058 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Catrope___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/reportupdater-queries[master]: Add "desktop by browser" tab to browser reports
Nuria has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364631 ) Change subject: Add "desktop by browser" tab to browser reports .. Add "desktop by browser" tab to browser reports Bug: T170286 Change-Id: Ic4990bc1da8271247a967d6d5e0397ecaaef4816 --- A browser/desktop_site_by_browser_family_and_major_percent 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater-queries refs/changes/31/364631/1 diff --git a/browser/desktop_site_by_browser_family_and_major_percent b/browser/desktop_site_by_browser_family_and_major_percent new file mode 100755 index 000..77c43a3 --- /dev/null +++ b/browser/desktop_site_by_browser_family_and_major_percent @@ -0,0 +1,31 @@ +#!/bin/bash +hive -e " +SET hive.mapred.mode = nonstrict; +WITH +slice AS ( +SELECT * +FROM wmf.browser_general +WHERE +access_method = 'desktop' AND +CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' AND +CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2' +), +total AS ( +SELECT SUM(view_count) as view_count_total +FROM slice +) +SELECT +'$1' AS date, +browser_family, +browser_major, +SUM(view_count) / view_count_total AS percent +FROM slice JOIN total +GROUP BY +'$1', +browser_family, +browser_major, +view_count_total +ORDER BY percent DESC +LIMIT 1000 +; +" 2> /dev/null | grep -v parquet.hadoop -- To view, visit https://gerrit.wikimedia.org/r/364631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4990bc1da8271247a967d6d5e0397ecaaef4816 Gerrit-PatchSet: 1 Gerrit-Project: analytics/reportupdater-queries Gerrit-Branch: master Gerrit-Owner: Nuria___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet-run: manual splay at the top
BBlack has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364630 ) Change subject: puppet-run: manual splay at the top .. puppet-run: manual splay at the top Change-Id: Ic1ba3f66c5f5cd8a570df14b56c92a09ee441adf --- M modules/base/templates/puppet-run.erb 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/364630/1 diff --git a/modules/base/templates/puppet-run.erb b/modules/base/templates/puppet-run.erb index 29fa0e6..5e89d7b 100644 --- a/modules/base/templates/puppet-run.erb +++ b/modules/base/templates/puppet-run.erb @@ -15,6 +15,18 @@ # From here out, make a best effort to continue in the face of failure set +e +# Splay sleep at the top, so that the remaining lock checks and acquisitions, +# while not perfect, at least execute reasonably quickly. The intent of this +# splay is only to dither the cron execution time anyways, and having it dither +# before the apt run is probably more helpful than just the agent run at the +# bottom. Also, puppet's built-in splay sleep only checks for agent-disable +# before the sleep (but not after), and does not create the agent lockfile +# until after the sleep, which creates a wide race window against tools trying +# to avoid puppet agent concurrency with the "disable and then poll lockfile". +SLEEPVAL=$(($RANDOM % 60)) +echo "Sleeping $SLEEPVAL for random splay" >> /var/log/puppet.log +sleep $SLEEPVAL + if [ -n "$PUPPETLOCK" -a -e "$PUPPETLOCK" ]; then PUPPETPID=$(cat $PUPPETLOCK) CMDLINE_FILE="/proc/$PUPPETPID/cmdline" @@ -52,6 +64,4 @@ --no-daemonize \ --verbose \ --show_diff \ - --splay \ - --splaylimit 59 \ >> /var/log/puppet.log 2>&1 -- To view, visit https://gerrit.wikimedia.org/r/364630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1ba3f66c5f5cd8a570df14b56c92a09ee441adf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid/netmon: add active_server parameter to DC-switch
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364629 ) Change subject: rancid/netmon: add active_server parameter to DC-switch .. rancid/netmon: add active_server parameter to DC-switch Change-Id: I5d8cf0f1d4a8ff8f7365ad0f2155a2c4e095800e --- M hieradata/common.yaml M modules/rancid/manifests/init.pp M modules/role/manifests/rancid.pp 3 files changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/29/364629/1 diff --git a/hieradata/common.yaml b/hieradata/common.yaml index ff20792..49ee494 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -467,6 +467,8 @@ install_server: install1002.wikimedia.org install_server_failover: install2002.wikimedia.org +netmon_server: netmon1002.wikimedia.org + # Etcd client global configuration etcd_client_srv_domain: "conftool.%{::site}.wmnet" etcd_host: '' @@ -484,3 +486,4 @@ tcpircbot_host: 'icinga.wikimedia.org' tcpircbot_port: 9200 + diff --git a/modules/rancid/manifests/init.pp b/modules/rancid/manifests/init.pp index 495630c..d729c05 100644 --- a/modules/rancid/manifests/init.pp +++ b/modules/rancid/manifests/init.pp @@ -1,5 +1,7 @@ # Really Awful Notorious CIsco config Differ -class rancid { +class rancid ( +$active_server +){ package { 'rancid': ensure => present, @@ -48,16 +50,22 @@ mode=> '0440', content => template('rancid/cloginrc.erb'), } + +if $active_server == $::fqdn { +$cron_ensure = 'present', +} else { +$cron_ensure = 'absent', +} cron { 'rancid_differ': -ensure => 'present', +ensure => $cron_ensure, command => 'SSH_AUTH_SOCK=/run/keyholder/proxy.sock /usr/lib/rancid/bin/rancid-run', user=> 'rancid', minute => '1', } cron { 'rancid_clean_logs': -ensure => 'present', +ensure => $cron_ensure, command => '/usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm {} \;', user=> 'rancid', minute => '50', diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp index 504661e..abd49d6 100644 --- a/modules/role/manifests/rancid.pp +++ b/modules/role/manifests/rancid.pp @@ -18,4 +18,10 @@ dest_host => 'netmon2001.wikimedia.org', module_path => '/var/lib/rancid', } + +$active_server = hiera('netmon_server', 'netmon1002.wikimedia.org') + +class { '::rancid': +active_server => $active_server, +} } -- To view, visit https://gerrit.wikimedia.org/r/364629 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d8cf0f1d4a8ff8f7365ad0f2155a2c4e095800e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove myself from tests whitelist
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364628 ) Change subject: Remove myself from tests whitelist .. Remove myself from tests whitelist We'll add it later :) Change-Id: I47d70c7e91ea943859cd3267180cb7ffe8706ef1 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c5d369b..e2fb31b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -139,7 +139,6 @@ | krinklemail@gmail\.com | kumariankita002@gmail\.com | l10n-bot@translatewiki\.net -| [Ll]adsgroup@gmail\.com | legoktm@member\.fsf\.org | lewis@lewiscawte\.me | liangent@gmail\.com @@ -392,7 +391,6 @@ - ^karsten@hoffmeyer\.info$ # Kghbln - ^krenair@gmail\.com$ - ^kumariankita002@gmail\.com$ - - ^[lL]adsgroup@gmail\.com$ # Pywikibot maintainer - ^lewis@lewiscawte\.me$ - ^liangent@gmail\.com$ - ^lokal\.profil@gmail\.com$ -- To view, visit https://gerrit.wikimedia.org/r/364628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47d70c7e91ea943859cd3267180cb7ffe8706ef1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: AnotherLadsgroupGerrit-Reviewer: Chad Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove myself from tests whitelist
AnotherLadsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364628 ) Change subject: Remove myself from tests whitelist .. Remove myself from tests whitelist We'll add it later :) Change-Id: I47d70c7e91ea943859cd3267180cb7ffe8706ef1 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/28/364628/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c5d369b..e2fb31b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -139,7 +139,6 @@ | krinklemail@gmail\.com | kumariankita002@gmail\.com | l10n-bot@translatewiki\.net -| [Ll]adsgroup@gmail\.com | legoktm@member\.fsf\.org | lewis@lewiscawte\.me | liangent@gmail\.com @@ -392,7 +391,6 @@ - ^karsten@hoffmeyer\.info$ # Kghbln - ^krenair@gmail\.com$ - ^kumariankita002@gmail\.com$ - - ^[lL]adsgroup@gmail\.com$ # Pywikibot maintainer - ^lewis@lewiscawte\.me$ - ^liangent@gmail\.com$ - ^lokal\.profil@gmail\.com$ -- To view, visit https://gerrit.wikimedia.org/r/364628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47d70c7e91ea943859cd3267180cb7ffe8706ef1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: AnotherLadsgroup___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid: use cron{} resource instead of file in /etc/cron.d/
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364625 ) Change subject: rancid: use cron{} resource instead of file in /etc/cron.d/ .. rancid: use cron{} resource instead of file in /etc/cron.d/ Instead of just putting a file into /etc/cron.d/ use proper cron{} puppet resource for the 2 cronjobs. There should be no change to the actual commands or times here. Change-Id: I27fa405adf48bb1e1675080bdbe72170e365f0d7 --- D modules/rancid/files/rancid.cron M modules/rancid/manifests/init.pp 2 files changed, 13 insertions(+), 10 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/rancid/files/rancid.cron b/modules/rancid/files/rancid.cron deleted file mode 100644 index a3d1251..000 --- a/modules/rancid/files/rancid.cron +++ /dev/null @@ -1,4 +0,0 @@ -# Run config differ hourly -1 * * * * rancid SSH_AUTH_SOCK=/run/keyholder/proxy.sock /usr/lib/rancid/bin/rancid-run -# Clean out rancid logs -50 23 * * *rancid /usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm {} \; diff --git a/modules/rancid/manifests/init.pp b/modules/rancid/manifests/init.pp index 65a2a12..495630c 100644 --- a/modules/rancid/manifests/init.pp +++ b/modules/rancid/manifests/init.pp @@ -49,12 +49,19 @@ content => template('rancid/cloginrc.erb'), } -file { '/etc/cron.d/rancid': -require => File['/var/lib/rancid/core'], -owner => 'root', -group => 'root', -mode=> '0444', -source => 'puppet:///modules/rancid/rancid.cron', +cron { 'rancid_differ': +ensure => 'present', +command => 'SSH_AUTH_SOCK=/run/keyholder/proxy.sock /usr/lib/rancid/bin/rancid-run', +user=> 'rancid', +minute => '1', +} + +cron { 'rancid_clean_logs': +ensure => 'present', +command => '/usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm {} \;', +user=> 'rancid', +minute => '50', +hour=> '23', } file { '/var/log/rancid': -- To view, visit https://gerrit.wikimedia.org/r/364625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27fa405adf48bb1e1675080bdbe72170e365f0d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn 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...MobileFrontend[master]: test push
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364626 ) Change subject: test push .. test push Change-Id: Ib4d8eed21f9acedb1ad2e87c2ce932230c2dda92 --- A test.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/26/364626/1 diff --git a/test.txt b/test.txt new file mode 100644 index 000..038d718 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +testing -- To view, visit https://gerrit.wikimedia.org/r/364626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4d8eed21f9acedb1ad2e87c2ce932230c2dda92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend 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] operations/puppet[production]: rancid: use cron{} resource instead of file in /etc/cron.d/
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364625 ) Change subject: rancid: use cron{} resource instead of file in /etc/cron.d/ .. rancid: use cron{} resource instead of file in /etc/cron.d/ Instead of just putting a file into /etc/cron.d/ use proper cron{} puppet resource for the 2 cronjobs. There should be no change to the actual commands or times here. Change-Id: I27fa405adf48bb1e1675080bdbe72170e365f0d7 --- D modules/rancid/files/rancid.cron M modules/rancid/manifests/init.pp 2 files changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/25/364625/1 diff --git a/modules/rancid/files/rancid.cron b/modules/rancid/files/rancid.cron deleted file mode 100644 index a3d1251..000 --- a/modules/rancid/files/rancid.cron +++ /dev/null @@ -1,4 +0,0 @@ -# Run config differ hourly -1 * * * * rancid SSH_AUTH_SOCK=/run/keyholder/proxy.sock /usr/lib/rancid/bin/rancid-run -# Clean out rancid logs -50 23 * * *rancid /usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm {} \; diff --git a/modules/rancid/manifests/init.pp b/modules/rancid/manifests/init.pp index 65a2a12..495630c 100644 --- a/modules/rancid/manifests/init.pp +++ b/modules/rancid/manifests/init.pp @@ -49,12 +49,19 @@ content => template('rancid/cloginrc.erb'), } -file { '/etc/cron.d/rancid': -require => File['/var/lib/rancid/core'], -owner => 'root', -group => 'root', -mode=> '0444', -source => 'puppet:///modules/rancid/rancid.cron', +cron { 'rancid_differ': +ensure => 'present', +command => 'SSH_AUTH_SOCK=/run/keyholder/proxy.sock /usr/lib/rancid/bin/rancid-run', +user=> 'rancid', +minute => '1', +} + +cron { 'rancid_clean_logs': +ensure => 'present', +command => '/usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm {} \;', +user=> 'rancid', +minute => '50', +hour=> '23', } file { '/var/log/rancid': -- To view, visit https://gerrit.wikimedia.org/r/364625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27fa405adf48bb1e1675080bdbe72170e365f0d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid: disable fully automatic rsyncing of app data
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364624 ) Change subject: rancid: disable fully automatic rsyncing of app data .. rancid: disable fully automatic rsyncing of app data We want to be able to rsync application data for rancid between netmon1002/2001 servers but we don't want fully automatic rsyncing of if the whole time, at least not at this point. Added this parameter to rsync::quickdatacopy in I14a3faa9341419d for this. Bug: T166180 Change-Id: I54bba90ae2c6b72dd229cb97d35e24324033e82e --- M modules/role/manifests/rancid.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp index 1bdd707..504661e 100644 --- a/modules/role/manifests/rancid.pp +++ b/modules/role/manifests/rancid.pp @@ -13,6 +13,7 @@ rsync::quickdatacopy { 'var-lib-rancid': ensure => present, + auto_sync => false, source_host => 'netmon1002.wikimedia.org', dest_host => 'netmon2001.wikimedia.org', module_path => '/var/lib/rancid', -- To view, visit https://gerrit.wikimedia.org/r/364624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54bba90ae2c6b72dd229cb97d35e24324033e82e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid: disable fully automatic rsyncing of app data
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364624 ) Change subject: rancid: disable fully automatic rsyncing of app data .. rancid: disable fully automatic rsyncing of app data We want to be able to rsync application data for rancid between netmon1002/2001 servers but we don't want fully automatic rsyncing of if the whole time, at least not at this point. Added this parameter to rsync::quickdatacopy in I14a3faa9341419d for this. Bug: T166180 Change-Id: I54bba90ae2c6b72dd229cb97d35e24324033e82e --- M modules/role/manifests/rancid.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/24/364624/1 diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp index 1bdd707..504661e 100644 --- a/modules/role/manifests/rancid.pp +++ b/modules/role/manifests/rancid.pp @@ -13,6 +13,7 @@ rsync::quickdatacopy { 'var-lib-rancid': ensure => present, + auto_sync => false, source_host => 'netmon1002.wikimedia.org', dest_host => 'netmon2001.wikimedia.org', module_path => '/var/lib/rancid', -- To view, visit https://gerrit.wikimedia.org/r/364624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54bba90ae2c6b72dd229cb97d35e24324033e82e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add props parameter to SearchEntities API module
AnotherLadsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364623 ) Change subject: Add props parameter to SearchEntities API module .. Add props parameter to SearchEntities API module It's not a breaking change but we can easily turn off url now Bug: T103875 Change-Id: I4f1f546042a03b578f4b6736060fca40c70f13fe --- M repo/i18n/en.json M repo/i18n/qqq.json M repo/includes/Api/SearchEntities.php M repo/tests/phpunit/includes/Api/SearchEntitiesTest.php 4 files changed, 38 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/23/364623/1 diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 60aaaec..cddcac8 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -569,12 +569,14 @@ "apihelp-wbsearchentities-param-language": "Search in this language.", "apihelp-wbsearchentities-param-strictlanguage": "Whether to disable language fallback", "apihelp-wbsearchentities-param-type": "Search for this type of entity.", + "apihelp-wbsearchentities-param-props": "Return these properties for each entity.", "apihelp-wbsearchentities-param-limit": "Maximal number of results", "apihelp-wbsearchentities-param-continue": "Offset where to continue a search", "apihelp-wbsearchentities-example-1": "Search for \"abc\" in English language, with defaults for type and limit", "apihelp-wbsearchentities-example-2": "Search for \"abc\" in English language with a limit of 50", "apihelp-wbsearchentities-example-3": "Search for \"alphabet\" in English language for type property", "apihelp-wbsearchentities-example-4": "Search for \"abc\" in English language with a limit of 2 and an offset of 2", + "apihelp-wbsearchentities-example-5": "Search for \"alphabet\" in English language omitting url parameter", "apihelp-query+wbsearch-description": "Searches for entities using labels and aliases.\nThis can be used as a generator for other queries.\nReturns the matched term that should be displayed.", "apihelp-query+wbsearch-summary": "Searches for entities using labels and aliases.", "apihelp-query+wbsearch-extended-description": "This can be used as a generator for other queries.\nReturns the matched term that should be displayed.", diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json index f5d9889..0eabbdf 100644 --- a/repo/i18n/qqq.json +++ b/repo/i18n/qqq.json @@ -602,12 +602,14 @@ "apihelp-wbsearchentities-param-language": "{{doc-apihelp-param|wbsearchentities|language}}", "apihelp-wbsearchentities-param-strictlanguage": "{{doc-apihelp-param|wbsearchentities|strictlanguage|info = This message is used [https://www.wikidata.org/wiki/Special:ApiSandbox#action=wbsearchentities here] at param 3. If enabled only matches in the current language are shown}}", "apihelp-wbsearchentities-param-type": "{{doc-apihelp-param|wbsearchentities|type}}", + "apihelp-wbsearchentities-param-props": "{{doc-apihelp-param|wbsearchentities|props}}", "apihelp-wbsearchentities-param-limit": "{{doc-apihelp-param|wbsearchentities|limit}}", "apihelp-wbsearchentities-param-continue": "{{doc-apihelp-param|wbsearchentities|continue}}", "apihelp-wbsearchentities-example-1": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-wbsearchentities-example-2": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-wbsearchentities-example-3": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-wbsearchentities-example-4": "{{doc-apihelp-example|wbsearchentities}}", + "apihelp-wbsearchentities-example-5": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-query+wbsearch-description": "{{doc-apihelp-description|query+wbsearch}}", "apihelp-query+wbsearch-summary": "{{doc-apihelp-summary|query+wbsearch}}", "apihelp-query+wbsearch-extended-description": "{{doc-apihelp-extended-description|query+wbsearch}}", diff --git a/repo/includes/Api/SearchEntities.php b/repo/includes/Api/SearchEntities.php index afdbc6a..0131b72 100644 --- a/repo/includes/Api/SearchEntities.php +++ b/repo/includes/Api/SearchEntities.php @@ -103,7 +103,7 @@ $entries = []; foreach ( $searchResults as $match ) { - $entries[] = $this->buildTermSearchMatchEntry( $match ); + $entries[] = $this->buildTermSearchMatchEntry( $match, $params['props'] ); } return $entries; @@ -111,10 +111,11 @@ /** * @param TermSearchResult $match +* @param string[] $props * * @return array */ - private function buildTermSearchMatchEntry( TermSearchResult $match ) { + private function buildTermSearchMatchEntry( TermSearchResult $match, array $props =
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync::quickdatacopy: make auto-sync via cron optional
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364621 ) Change subject: rsync::quickdatacopy: make auto-sync via cron optional .. rsync::quickdatacopy: make auto-sync via cron optional Add a parameter to disable the cronjob that automatically syncs data every 10 minutes. Sometimes we want the rsyncd setup but just a manual copy for a migration and not constant background syncing. It depends on the case. But leaving it the default to be enabled. Change-Id: I14a3faa9341419dbec848b91a6271d1b82d66599 --- M modules/rsync/manifests/quickdatacopy.pp 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/rsync/manifests/quickdatacopy.pp b/modules/rsync/manifests/quickdatacopy.pp index 3b6a21e..e421591 100644 --- a/modules/rsync/manifests/quickdatacopy.pp +++ b/modules/rsync/manifests/quickdatacopy.pp @@ -16,6 +16,8 @@ # # [*file_path*] What file within that document root do we need? (currently not used) # +# [*auto_sync*] Whether to also have a cronjob that automatically syncs data or not (default: true) +# # [*ensure*] The usual meaning, set to absent to clean up when done # define rsync::quickdatacopy( @@ -23,6 +25,7 @@ $dest_host, $module_path, $file_path = '*', + $auto_sync = true, $ensure = present, ) { @@ -54,8 +57,13 @@ content => template('rsync/quickdatacopy.erb'), } + if $auto_sync { + $cron_ensure = $ensure + } else { + $cron_ensure = 'absent' + } cron { 'sync-rsync-data': - ensure => $ensure, + ensure => $cron_ensure, minute => '*/10', command => "/usr/local/sbin/${title} >/dev/null 2>&1", } -- To view, visit https://gerrit.wikimedia.org/r/364621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14a3faa9341419dbec848b91a6271d1b82d66599 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Vendor update
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364622 ) Change subject: Vendor update .. Vendor update Add Omnimail libraries Change-Id: Ieeb5845e51dcd01e2a716a1593cf181d4d0c4fc3 --- M autoload.php M composer/ClassLoader.php M composer/LICENSE M composer/autoload_files.php M composer/autoload_namespaces.php M composer/autoload_psr4.php M composer/autoload_real.php M composer/autoload_static.php D composer/include_paths.php M composer/installed.json A guzzlehttp/guzzle/CHANGELOG.md A guzzlehttp/guzzle/LICENSE A guzzlehttp/guzzle/README.md A guzzlehttp/guzzle/UPGRADING.md A guzzlehttp/guzzle/composer.json A guzzlehttp/guzzle/src/Client.php A guzzlehttp/guzzle/src/ClientInterface.php A guzzlehttp/guzzle/src/Cookie/CookieJar.php A guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php A guzzlehttp/guzzle/src/Cookie/FileCookieJar.php A guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php A guzzlehttp/guzzle/src/Cookie/SetCookie.php A guzzlehttp/guzzle/src/Exception/BadResponseException.php A guzzlehttp/guzzle/src/Exception/ClientException.php A guzzlehttp/guzzle/src/Exception/ConnectException.php A guzzlehttp/guzzle/src/Exception/GuzzleException.php A guzzlehttp/guzzle/src/Exception/RequestException.php A guzzlehttp/guzzle/src/Exception/SeekException.php A guzzlehttp/guzzle/src/Exception/ServerException.php A guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php A guzzlehttp/guzzle/src/Exception/TransferException.php A guzzlehttp/guzzle/src/Handler/CurlFactory.php A guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php A guzzlehttp/guzzle/src/Handler/CurlHandler.php A guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php A guzzlehttp/guzzle/src/Handler/EasyHandle.php A guzzlehttp/guzzle/src/Handler/MockHandler.php A guzzlehttp/guzzle/src/Handler/Proxy.php A guzzlehttp/guzzle/src/Handler/StreamHandler.php A guzzlehttp/guzzle/src/HandlerStack.php A guzzlehttp/guzzle/src/MessageFormatter.php A guzzlehttp/guzzle/src/Middleware.php A guzzlehttp/guzzle/src/Pool.php A guzzlehttp/guzzle/src/PrepareBodyMiddleware.php A guzzlehttp/guzzle/src/RedirectMiddleware.php A guzzlehttp/guzzle/src/RequestOptions.php A guzzlehttp/guzzle/src/RetryMiddleware.php A guzzlehttp/guzzle/src/TransferStats.php A guzzlehttp/guzzle/src/UriTemplate.php A guzzlehttp/guzzle/src/functions.php A guzzlehttp/guzzle/src/functions_include.php A guzzlehttp/promises/CHANGELOG.md A guzzlehttp/promises/LICENSE A guzzlehttp/promises/Makefile A guzzlehttp/promises/README.md A guzzlehttp/promises/composer.json A guzzlehttp/promises/src/AggregateException.php A guzzlehttp/promises/src/CancellationException.php A guzzlehttp/promises/src/Coroutine.php A guzzlehttp/promises/src/EachPromise.php A guzzlehttp/promises/src/FulfilledPromise.php A guzzlehttp/promises/src/Promise.php A guzzlehttp/promises/src/PromiseInterface.php A guzzlehttp/promises/src/PromisorInterface.php A guzzlehttp/promises/src/RejectedPromise.php A guzzlehttp/promises/src/RejectionException.php A guzzlehttp/promises/src/TaskQueue.php A guzzlehttp/promises/src/TaskQueueInterface.php A guzzlehttp/promises/src/functions.php A guzzlehttp/promises/src/functions_include.php A guzzlehttp/psr7/CHANGELOG.md A guzzlehttp/psr7/LICENSE A guzzlehttp/psr7/README.md A guzzlehttp/psr7/composer.json A guzzlehttp/psr7/src/AppendStream.php A guzzlehttp/psr7/src/BufferStream.php A guzzlehttp/psr7/src/CachingStream.php A guzzlehttp/psr7/src/DroppingStream.php A guzzlehttp/psr7/src/FnStream.php A guzzlehttp/psr7/src/InflateStream.php A guzzlehttp/psr7/src/LazyOpenStream.php A guzzlehttp/psr7/src/LimitStream.php A guzzlehttp/psr7/src/MessageTrait.php A guzzlehttp/psr7/src/MultipartStream.php A guzzlehttp/psr7/src/NoSeekStream.php A guzzlehttp/psr7/src/PumpStream.php A guzzlehttp/psr7/src/Request.php A guzzlehttp/psr7/src/Response.php A guzzlehttp/psr7/src/ServerRequest.php A guzzlehttp/psr7/src/Stream.php A guzzlehttp/psr7/src/StreamDecoratorTrait.php A guzzlehttp/psr7/src/StreamWrapper.php A guzzlehttp/psr7/src/UploadedFile.php A guzzlehttp/psr7/src/Uri.php A guzzlehttp/psr7/src/UriNormalizer.php A guzzlehttp/psr7/src/UriResolver.php A guzzlehttp/psr7/src/functions.php A guzzlehttp/psr7/src/functions_include.php A league/csv/LICENSE A league/csv/autoload.php A league/csv/composer.json A league/csv/src/AbstractCsv.php A league/csv/src/Config/Controls.php A league/csv/src/Config/Output.php A league/csv/src/Exception/InvalidRowException.php A league/csv/src/Modifier/MapIterator.php A league/csv/src/Modifier/QueryFilter.php A league/csv/src/Modifier/RowFilter.php A league/csv/src/Modifier/StreamFilter.php A league/csv/src/Modifier/StreamIterator.php A league/csv/src/Plugin/ColumnConsistencyValidator.php A league/csv/src/Plugin/ForbiddenNullValuesValidator.php A league/csv/src/Plugin/SkipNullValuesFormatter.php A league/csv/src/Reader.php A league/csv/src/Writer.php A mrmarkfrench/silverpop-php-connector/.gitignore A
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Remove unused selectors for action menu
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357340 ) Change subject: Remove unused selectors for action menu .. Remove unused selectors for action menu This change is a follow-up to aba11a7b1c. Do not deploy this change until HTML cache from before aba11a7b1c expired. Change-Id: I631260d58229b1b70e2d4e55f8302f9769de3511 --- M components/tabs.less M vector.js 2 files changed, 4 insertions(+), 14 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve jenkins-bot: Verified Jdlrobson: Looks good to me, but someone else must approve Jforrester: Looks good to me, approved diff --git a/components/tabs.less b/components/tabs.less index 9126a89..d936903 100644 --- a/components/tabs.less +++ b/components/tabs.less @@ -153,7 +153,6 @@ color: @menu-main-heading-color; } -div.vectorMenu h3 a, // FIXME: Remove selector in 1wk (T44241) div.vectorMenu h3 div { position: absolute; top: 0; @@ -166,12 +165,10 @@ .transition(background-position 250ms); } -div.vectorMenu.menuForceShow h3 a, // FIXME: Remove selector in 1wk (T44241) div.vectorMenu.menuForceShow h3 div { background-position: 100% 100%; } -div.vectorMenuFocus h3 a, // FIXME: Remove selector in 1wk (T44241) div.vectorMenuFocus h3 div { .background-image-svg('images/arrow-down-focus-icon.svg', 'images/arrow-down-focus-icon.png'); } diff --git a/vector.js b/vector.js index 3f577e8..6e4a2a7 100644 --- a/vector.js +++ b/vector.js @@ -30,8 +30,7 @@ */ $( 'div.vectorMenu' ).each( function () { var $el = $( this ); - // FIXME: Remove > a selector in 1wk (T44241) - $el.find( '> h3 > div, > h3 > a' ).parent() + $el.find( '> h3 > div' ).parent() .attr( 'tabindex', '0' ) // For accessibility, show the menu when the h3 is clicked (bug 24298/46486) .on( 'click keypress', function ( e ) { @@ -42,17 +41,11 @@ } ) // When the heading has focus, also set a class that will change the arrow icon .focus( function () { - // FIXME: Remove > a selector in 1wk (T44241) - $el.find( '> div, > a' ).addClass( 'vectorMenuFocus' ); + $el.find( '> div' ).addClass( 'vectorMenuFocus' ); } ) .blur( function () { - // FIXME: Remove > a selector in 1wk (T44241) - $el.find( '> div, > a' ).removeClass( 'vectorMenuFocus' ); - } ) - // FIXME: Remove > a selector in 1wk (T44241) - .find( '> a:first' ) - // As the h3 can already be focused there's no need for the link to be focusable - .attr( 'tabindex', '-1' ); + $el.find( '> div' ).removeClass( 'vectorMenuFocus' ); + } ); } ); // Bind callback functions to animate our drop down menu in and out -- To view, visit https://gerrit.wikimedia.org/r/357340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I631260d58229b1b70e2d4e55f8302f9769de3511 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/skins/Vector Gerrit-Branch: master Gerrit-Owner: FomafixGerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync::quickdatacopy: make auto-sync via cron optional
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364621 ) Change subject: rsync::quickdatacopy: make auto-sync via cron optional .. rsync::quickdatacopy: make auto-sync via cron optional Add a parameter to disable the cronjob that automatically syncs date every 10 minutes. Sometimes i just want manual copy for a migration and not constant background syncing. But leaving it the default to be enabled. Change-Id: I14a3faa9341419dbec848b91a6271d1b82d66599 --- M modules/rsync/manifests/quickdatacopy.pp 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/364621/1 diff --git a/modules/rsync/manifests/quickdatacopy.pp b/modules/rsync/manifests/quickdatacopy.pp index 3b6a21e..664e5ec 100644 --- a/modules/rsync/manifests/quickdatacopy.pp +++ b/modules/rsync/manifests/quickdatacopy.pp @@ -16,6 +16,8 @@ # # [*file_path*] What file within that document root do we need? (currently not used) # +# [*auto_sync*] Whether to also have a cronjob that automatically syncs data or not (default: true) +# # [*ensure*] The usual meaning, set to absent to clean up when done # define rsync::quickdatacopy( @@ -23,6 +25,7 @@ $dest_host, $module_path, $file_path = '*', + $auto_sync = 'true', $ensure = present, ) { @@ -53,11 +56,13 @@ mode=> '0755', content => template('rsync/quickdatacopy.erb'), } - - cron { 'sync-rsync-data': - ensure => $ensure, - minute => '*/10', - command => "/usr/local/sbin/${title} >/dev/null 2>&1", + + if $auto_sync { + cron { 'sync-rsync-data': + ensure => $ensure, + minute => '*/10', + command => "/usr/local/sbin/${title} >/dev/null 2>&1", + } } } } -- To view, visit https://gerrit.wikimedia.org/r/364621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14a3faa9341419dbec848b91a6271d1b82d66599 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid: add rsync::quickdatacopy to sync /var/lib/rancid
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364620 ) Change subject: rancid: add rsync::quickdatacopy to sync /var/lib/rancid .. rancid: add rsync::quickdatacopy to sync /var/lib/rancid netmon1002 needs to be reinstalled again. rancid has already switched to it from netmon1001. rsync /var/lib/rancid data (GIT repo etc) from netmon1002 to new netmon2001 before reinstalling netmon1002 another time, then copy data back later. Also, copy it to netmon2001 for new setup there anyways. Bug: T166180 Bug: T159756 Change-Id: I0d9aa1e9f55d26f7eececbde98036e59ede7b1d4 --- M modules/role/manifests/rancid.pp 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp index f0d00b3..1bdd707 100644 --- a/modules/role/manifests/rancid.pp +++ b/modules/role/manifests/rancid.pp @@ -10,4 +10,11 @@ include ::profile::backup::host backup::set { 'rancid': } + +rsync::quickdatacopy { 'var-lib-rancid': + ensure => present, + source_host => 'netmon1002.wikimedia.org', + dest_host => 'netmon2001.wikimedia.org', + module_path => '/var/lib/rancid', +} } -- To view, visit https://gerrit.wikimedia.org/r/364620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d9aa1e9f55d26f7eececbde98036e59ede7b1d4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid: add rsync::quickdatacopy to sync /var/lib/rancid
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364620 ) Change subject: rancid: add rsync::quickdatacopy to sync /var/lib/rancid .. rancid: add rsync::quickdatacopy to sync /var/lib/rancid netmon1002 needs to be reinstalled again. rancid has already switched to it from netmon1001. rsync /var/lib/rancid data (GIT repo etc) from netmon1002 to new netmon2001 before reinstalling netmon1002 another time, then copy data back later. Also, copy it to netmon2001 for new setup there anyways. Bug: T166180 Bug: T159756 Change-Id: I0d9aa1e9f55d26f7eececbde98036e59ede7b1d4 --- M modules/role/manifests/rancid.pp 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/364620/1 diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp index f0d00b3..1bdd707 100644 --- a/modules/role/manifests/rancid.pp +++ b/modules/role/manifests/rancid.pp @@ -10,4 +10,11 @@ include ::profile::backup::host backup::set { 'rancid': } + +rsync::quickdatacopy { 'var-lib-rancid': + ensure => present, + source_host => 'netmon1002.wikimedia.org', + dest_host => 'netmon2001.wikimedia.org', + module_path => '/var/lib/rancid', +} } -- To view, visit https://gerrit.wikimedia.org/r/364620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d9aa1e9f55d26f7eececbde98036e59ede7b1d4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WhitelistPages[master]: Version 0.5.0: rewritten to use the TitleReadWhitelist hook
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332045 ) Change subject: Version 0.5.0: rewritten to use the TitleReadWhitelist hook .. Version 0.5.0: rewritten to use the TitleReadWhitelist hook Old PHP entry point dropped, a modern MW (1.25+) is now required to use this extension. Change-Id: I7e21e9b67f38a4c7ad1899cbbc80d7aed1bd292e --- M WhitelistPages.class.php D WhitelistPages.php M extension.json 3 files changed, 19 insertions(+), 44 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/WhitelistPages.class.php b/WhitelistPages.class.php index 7f771ab..9db878e 100644 --- a/WhitelistPages.class.php +++ b/WhitelistPages.class.php @@ -6,38 +6,40 @@ * @ingroup Extensions * @author Jack Phoenix* @author Misza - * @date 19 November 2015 + * @date 21 December 2016 * @license https://en.wikipedia.org/wiki/Public_domain Public domain */ class WhitelistPages { - public static function main() { - global $wgWhitelistRead, $wgGroupPermissions; + /** +* @param Title $title Title object being checked against +* @param User $user Current user object +* @param bool &$whitelisted Whether this title is whitelisted +*/ + public static function onTitleReadWhitelist( $title, $user, &$whitelisted ) { + global $wgGroupPermissions; $message = wfMessage( 'public_read_whitelist' )->inContentLanguage(); - // If MediaWiki:Public read whitelist is empty, bail out + // If [[MediaWiki:Public read whitelist]] is empty, bail out if ( $message->isDisabled() ) { - return; + return true; } // If anonymous users can read the wiki, then it's not a private one // and we don't need this feature for non-private wikis if ( $wgGroupPermissions['*']['read'] ) { - return; - } - - // $wgWhitelistRead is *false* by default instead of being an empty array - if ( $wgWhitelistRead === false ) { - $wgWhitelistRead = array(); + return true; } // Explode along newlines $whitelistedPages = explode( "\n", trim( $message->plain() ) ); + if ( in_array( $title->getPrefixedText(), $whitelistedPages ) ) { + $whitelisted = true; + } - // Merge with current list - $wgWhitelistRead = array_merge( $wgWhitelistRead, $whitelistedPages ); + return true; } } \ No newline at end of file diff --git a/WhitelistPages.php b/WhitelistPages.php deleted file mode 100644 index 7186bac..000 --- a/WhitelistPages.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @author Misza - * @date 19 November 2015 - * @license https://en.wikipedia.org/wiki/Public_domain Public domain - */ - -// Extension credits that will show up on Special:Version -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'Whitelist Pages', - 'author' => array( 'Jack Phoenix', 'Misza' ), - 'version' => '0.4.0', - 'descriptionmsg' => 'whitelistpages-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:Whitelist_Pages', -); - -$wgMessagesDirs['WhitelistPages'] = __DIR__ . '/i18n'; - -$wgAutoloadClasses['WhitelistPages'] = __DIR__ . '/WhitelistPages.class.php'; - -$wgExtensionFunctions[] = 'WhitelistPages::main'; diff --git a/extension.json b/extension.json index 1c2596c..15c4e9a 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "Whitelist Pages", - "version": "0.4.0", + "version": "0.5.0", "author": [ "Jack Phoenix", "Misza" @@ -16,8 +16,8 @@ "AutoloadClasses": { "WhitelistPages": "WhitelistPages.class.php" }, - "ExtensionFunctions": [ - "WhitelistPages::main" - ], + "Hooks": { + "TitleReadWhitelist": "WhitelistPages::onTitleReadWhitelist" + }, "manifest_version": 1 } -- To view, visit https://gerrit.wikimedia.org/r/332045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e21e9b67f38a4c7ad1899cbbc80d7aed1bd292e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WhitelistPages Gerrit-Branch: master Gerrit-Owner: Jack Phoenix Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364619 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 1253580 Initial commit, omnimail extension & extendedmailingreport 8a86f99 Add composer-merge-plugin 34cf6cc PHPunit 5.7, not 5.6 7f680ea Update phpunit to use 5.7 a375a01 CurrencyRates template: add SmashPig namespace Change-Id: If6079ab119bd1518b2a531d0ec6e6517f79a68c6 --- D phpunit.xml D sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php 2 files changed, 0 insertions(+), 185 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 0f6cfbb..000 --- a/phpunit.xml +++ /dev/null @@ -1,47 +0,0 @@ -<<< HEAD (d26886 Merge branch 'master' into deployment) -=== -http://www.w3.org/2001/XMLSchema-instance; -xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd; -bootstrap="sites/default/bootstrap-phpunit.php"> - - - - -sites/all/modules/large_donation/tests - - -sites/all/modules/offline2civicrm/tests - sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php - - -sites/all/modules/exchange_rates/tests/phpunit - - -sites/all/modules/queue2civicrm/tests/phpunit - - -sites/all/modules/recurring_globalcollect/tests - - -sites/all/modules/wmf_audit/tests - - -sites/all/modules/wmf_campaigns/tests - - -sites/all/modules/wmf_civicrm/tests/phpunit - - -sites/all/modules/wmf_common/tests/phpunit - - - sites/all/modules/wmf_communication/tests/phpunit - sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php - - - sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit - - - ->>> BRANCH (125358 Initial commit, omnimail extension & extendedmailingreport) diff --git a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php b/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php deleted file mode 100644 index 94b4d36..000 --- a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php +++ /dev/null @@ -1,138 +0,0 @@ -<<< HEAD (d26886 Merge branch 'master' into deployment) -=== -getMockBuilder( 'Net_SFTP' ) - ->disableOriginalConstructor() - ->setMethods( array( 'login', 'get', 'disconnect' ) ) - ->getMock(); - $mailStore = $this->createMock( 'wmf_communication\CiviMailBulkStore'); - $zipper = $this->createMock( 'ZipArchive'); - $mailing = $this->createMock( 'wmf_communication\ICiviMailingRecord'); - - $tempDir = file_directory_temp(); - - $sftp->expects( $this->atLeastOnce() ) - ->method( 'login' ) - ->with( 'TestUser', 'TestPass' ) - ->will( $this->returnValue( true ) ); - - $sftp->expects( $this->once() ) - ->method( 'get' ) - ->with( 'download/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip', - "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'open' ) - ->with( "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'extractTo' ) - ->with( $tempDir ) - ->will( $this->returnValue( true ) ); - - $mailStore->expects( $this->once() ) - ->method( 'getMailing' ) - ->with( 'Silverpop', '9876543' ) - ->will( $this->ThrowException( new CiviMailingMissingException() ) ); - - $mailStore->expects( $this->once() ) - ->method( 'addMailing' ) - ->with( 'Silverpop', '9876543', $this->anything(), 'Test Subject', 0, 'RUNNING' ) - ->will( $this->returnValue( $mailing ) ); - - $emails = array(); - $fileContents = "Recipient Id,Recipient Type,Mailing Id,Report Id,Campaign Id,Email,Event Type,Event Timestamp,Body Type,Content Id,Click
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364619 ) Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment 1253580 Initial commit, omnimail extension & extendedmailingreport 8a86f99 Add composer-merge-plugin 34cf6cc PHPunit 5.7, not 5.6 7f680ea Update phpunit to use 5.7 a375a01 CurrencyRates template: add SmashPig namespace Change-Id: If6079ab119bd1518b2a531d0ec6e6517f79a68c6 --- D phpunit.xml D sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php 2 files changed, 0 insertions(+), 185 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/19/364619/1 diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 0f6cfbb..000 --- a/phpunit.xml +++ /dev/null @@ -1,47 +0,0 @@ -<<< HEAD (d26886 Merge branch 'master' into deployment) -=== -http://www.w3.org/2001/XMLSchema-instance; -xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd; -bootstrap="sites/default/bootstrap-phpunit.php"> - - - - -sites/all/modules/large_donation/tests - - -sites/all/modules/offline2civicrm/tests - sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php - - -sites/all/modules/exchange_rates/tests/phpunit - - -sites/all/modules/queue2civicrm/tests/phpunit - - -sites/all/modules/recurring_globalcollect/tests - - -sites/all/modules/wmf_audit/tests - - -sites/all/modules/wmf_campaigns/tests - - -sites/all/modules/wmf_civicrm/tests/phpunit - - -sites/all/modules/wmf_common/tests/phpunit - - - sites/all/modules/wmf_communication/tests/phpunit - sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php - - - sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit - - - ->>> BRANCH (125358 Initial commit, omnimail extension & extendedmailingreport) diff --git a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php b/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php deleted file mode 100644 index 94b4d36..000 --- a/sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php +++ /dev/null @@ -1,138 +0,0 @@ -<<< HEAD (d26886 Merge branch 'master' into deployment) -=== -getMockBuilder( 'Net_SFTP' ) - ->disableOriginalConstructor() - ->setMethods( array( 'login', 'get', 'disconnect' ) ) - ->getMock(); - $mailStore = $this->createMock( 'wmf_communication\CiviMailBulkStore'); - $zipper = $this->createMock( 'ZipArchive'); - $mailing = $this->createMock( 'wmf_communication\ICiviMailingRecord'); - - $tempDir = file_directory_temp(); - - $sftp->expects( $this->atLeastOnce() ) - ->method( 'login' ) - ->with( 'TestUser', 'TestPass' ) - ->will( $this->returnValue( true ) ); - - $sftp->expects( $this->once() ) - ->method( 'get' ) - ->with( 'download/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip', - "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'open' ) - ->with( "$tempDir/Raw Recipient Data Export Sep 02 2014 18-45-05 PM 1200.zip" ) - ->will( $this->returnValue( true ) ); - - $zipper->expects( $this->once() ) - ->method( 'extractTo' ) - ->with( $tempDir ) - ->will( $this->returnValue( true ) ); - - $mailStore->expects( $this->once() ) - ->method( 'getMailing' ) - ->with( 'Silverpop', '9876543' ) - ->will( $this->ThrowException( new CiviMailingMissingException() ) ); - - $mailStore->expects( $this->once() ) - ->method( 'addMailing' ) - ->with( 'Silverpop', '9876543', $this->anything(), 'Test Subject', 0, 'RUNNING' ) - ->will( $this->returnValue( $mailing ) ); - - $emails = array(); - $fileContents = "Recipient Id,Recipient Type,Mailing Id,Report Id,Campaign Id,Email,Event Type,Event Timestamp,Body Type,Content Id,Click
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Config changes for LoginNotify
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362323 ) Change subject: Config changes for LoginNotify .. Config changes for LoginNotify Bug: T107707 Change-Id: I5dd77a0fb6b844ea1a4218900ea4f68be3e9c83c --- M wmf-config/CommonSettings.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index c8c36fa..fba23f6 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1938,7 +1938,8 @@ if ( $wmgUseLoginNotify ) { wfLoadExtension( 'LoginNotify' ); - $wgLoginNotifyEnableOnSuccess = false; + $wgNotifyTypeAvailabilityByCategory['login-success']['web'] = false; + } if ( $wmgUseCodeMirror ) { -- To view, visit https://gerrit.wikimedia.org/r/362323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5dd77a0fb6b844ea1a4218900ea4f68be3e9c83c Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Kaldari Gerrit-Reviewer: Niharika29 Gerrit-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]: Initial commit, omnimail extension & extendedmailingreport
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/360610 ) Change subject: Initial commit, omnimail extension & extendedmailingreport .. Initial commit, omnimail extension & extendedmailingreport Once this is enabled the next steps are to 1) edit civicrm settings with credentials global '$civicrm_setting; '$civicrm_setting['Omnimail Preferences']['omnimail_credentials']['Silverpop'] = array('username' => 'abc', 'password' => 'xyz'); (I am thinking to just use my silverpop credentials) 2) enable the following jobs half- Hourly or similar - drush cvapi Omnimailing.load mail_provider=Silverpop start_date=yesterday daily or similar drush cvapi Omnimailing.load mail_provider=Silverpop start_date='1 week ago' weekly or similar drush cvapi Omnimailing.load mail_provider=Silverpop start_date='2 months ago' The mailing load job is not hugely slow but we probably want to keep at least the frequent one fairly small so it turns around fairly fast. We can backfill 450 days worth of data but running this from the command line - all in one hit is probably ok 3) enable the following job hourly or similar drush cvapi Omnirecipient.load mail_provider=Silverpop mailing_prefix=sp This will take a few runs to get the last 450 days of data as it will transfer many GB of data 4) We can probably also kick off drush cvapi Omnirecipient.process_ubsubscribes mail_provider=Silverpop but they statuses there still need to be widened a little (which does not need to delay starting it) 5) Not yet ready is the Omnigroupmember.load command Bug: T169593 Bug: T161758 Change-Id: I2663137377ffceadceedfbdde3fd6af24843f56a --- M .gitignore M composer.lock M phpunit.xml M sites/all/modules/wmf_civicrm/wmf_civicrm.install M sites/all/modules/wmf_communication/tests/phpunit/SilverpopImporterTest.php M sites/default/bootstrap-phpunit.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/BAO/MailingStats.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/DAO/MailingStats.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.mgd.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Upgrader.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Upgrader/Base.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/Mailingstats/Form/Report/ExtendedMailingStats.mgd.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/Mailingstats/Form/Report/ExtendedMailingStats.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/LICENSE.txt A sites/default/civicrm/extensions/civicrm-extendedmailingstats/Readme.md A sites/default/civicrm/extensions/civicrm-extendedmailingstats/api/v3/Extendedmailingstats/Cron.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/api/v3/MailingStats.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/extendedmailingstats.civix.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/extendedmailingstats.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/info.xml A sites/default/civicrm/extensions/civicrm-extendedmailingstats/sql/mailing_stats__install.sql A sites/default/civicrm/extensions/civicrm-extendedmailingstats/sql/uninstall.sql A sites/default/civicrm/extensions/civicrm-extendedmailingstats/templates/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.tpl A sites/default/civicrm/extensions/civicrm-extendedmailingstats/xml/schema/CRM/ExtendedMailingStats/MailingStats.entityType.php A sites/default/civicrm/extensions/civicrm-extendedmailingstats/xml/schema/CRM/ExtendedMailingStats/MailingStats.xml A sites/default/civicrm/extensions/org.wikimedia.omnimail/.gitignore A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/BAO/MailingProviderData.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/DAO/MailingProviderData.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Helper.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/IncompleteDownloadException.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Page/MailingsView.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Upgrader.php A
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add hidden field for base revision id in SpecialModifyEntity
AnotherLadsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364618 ) Change subject: Add hidden field for base revision id in SpecialModifyEntity .. Add hidden field for base revision id in SpecialModifyEntity This later will be needed when detecting edit conflicts Change-Id: Ic754ae6f0c850511a54910fdfc31ac8538c5f835 --- M repo/includes/Specials/SpecialModifyEntity.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/18/364618/1 diff --git a/repo/includes/Specials/SpecialModifyEntity.php b/repo/includes/Specials/SpecialModifyEntity.php index 34c455b..46a1e9d 100644 --- a/repo/includes/Specials/SpecialModifyEntity.php +++ b/repo/includes/Specials/SpecialModifyEntity.php @@ -236,6 +236,11 @@ 'id' => $id, 'default' => $entity === null ? '' : $entity->getId(), ], + 'revid' => [ + 'name' => 'revid', + 'type' => 'hidden', + 'default' => $this->entityRevision->getRevisionId() + ] ]; } -- To view, visit https://gerrit.wikimedia.org/r/364618 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic754ae6f0c850511a54910fdfc31ac8538c5f835 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: AnotherLadsgroup___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Use LogFormatter::getLinkRenderer in LogFormatter extensions
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364160 ) Change subject: Use LogFormatter::getLinkRenderer in LogFormatter extensions .. Use LogFormatter::getLinkRenderer in LogFormatter extensions This raises MediaWiki version requirement to 1.30.0. Change-Id: I8b0f415b87f1d3b7e5ea14af1813afa380c8657e --- M extension.json M includes/GlobalRename/GlobalRenameLogFormatter.php M includes/GlobalRename/GlobalUserMergeLogFormatter.php 3 files changed, 11 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 597a041..5d8bda6 100644 --- a/extension.json +++ b/extension.json @@ -6,7 +6,7 @@ "license-name": "GPL-2.0", "type": "specialpage", "requires": { - "MediaWiki": ">= 1.29.0" + "MediaWiki": ">= 1.30.0" }, "GroupPermissions": { "steward": { diff --git a/includes/GlobalRename/GlobalRenameLogFormatter.php b/includes/GlobalRename/GlobalRenameLogFormatter.php index 84f8bef..992a252 100644 --- a/includes/GlobalRename/GlobalRenameLogFormatter.php +++ b/includes/GlobalRename/GlobalRenameLogFormatter.php @@ -23,7 +23,7 @@ /** * @param string $name -* @return array +* @return array|string */ protected function getCentralAuthLink( $name ) { $title = Title::makeTitle( NS_SPECIAL, 'CentralAuth/' . $name ); @@ -31,9 +31,14 @@ return "[[{$title->getPrefixedText()}]]"; } - return Message::rawParam( Linker::link( $title, htmlspecialchars( $name ) ) ); + return Message::rawParam( $this->getLinkRenderer()->makeLink( $title, $name ) ); } + /** +* @param string $name +* @param string $wiki +* @return array|string +*/ protected function getLocalWikiLink( $name, $wiki ) { $text = "User:$name@$wiki"; if ( $this->plaintext ) { diff --git a/includes/GlobalRename/GlobalUserMergeLogFormatter.php b/includes/GlobalRename/GlobalUserMergeLogFormatter.php index 4c3e478..da38dab 100644 --- a/includes/GlobalRename/GlobalUserMergeLogFormatter.php +++ b/includes/GlobalRename/GlobalUserMergeLogFormatter.php @@ -23,15 +23,15 @@ /** * @param string $name -* @return array +* @return array|Title */ protected function getCentralAuthLink( $name ) { if ( $this->plaintext ) { return Title::newFromText( 'CentralAuth/' . $name, NS_SPECIAL ); } else { - return Linker::linkKnown( + return $this->getLinkRenderer()->makeKnownLink( SpecialPage::getTitleFor( 'CentralAuth', $name ), - htmlspecialchars( $name ) + $name ); } } -- To view, visit https://gerrit.wikimedia.org/r/364160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b0f415b87f1d3b7e5ea14af1813afa380c8657e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: Brion VIBBER 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...ArticleFeedbackv5[master]: Replace a Linker::link call in SpecialArticleFeedbackv5.php
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364127 ) Change subject: Replace a Linker::link call in SpecialArticleFeedbackv5.php .. Replace a Linker::link call in SpecialArticleFeedbackv5.php This raises MediaWiki version requirement to 1.28.0 and bumps the version number to 5.2.5. Bug: T149346 Change-Id: I9308f9d410a834cb0c5e70c53614ba3578202f33 --- M SpecialArticleFeedbackv5.php M extension.json 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php index 91d95ab..2f447f8 100644 --- a/SpecialArticleFeedbackv5.php +++ b/SpecialArticleFeedbackv5.php @@ -493,9 +493,9 @@ // admins can change settings at page protection if ( $this->getUser()->isAllowed( 'aft-administrator' ) ) { $title = Title::newFromID( $this->pageId ); - $link = Linker::linkKnown( + $link = $this->getLinkRenderer()->makeKnownLink( $title, - $this->msg( 'articlefeedbackv5-disabled-admin-button-text' )->escaped(), + $this->msg( 'articlefeedbackv5-disabled-admin-button-text' )->text(), array( 'class' => 'articlefeedbackv5-enable-button' ), array( 'action' => 'protect' ) ); diff --git a/extension.json b/extension.json index 1d4ab22..4ed275a 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "Article Feedback", - "version": "5.2.4", + "version": "5.2.5", "author": [ "Greg Chiasson", "Reha Sterbin", @@ -19,6 +19,9 @@ "Jack Phoenix" ], "license-name": "GPL-2.0+", + "requires": { + "MediaWiki": ">= 1.28.0" + }, "url": "https://www.mediawiki.org/wiki/Extension:ArticleFeedbackv5;, "descriptionmsg": "articlefeedbackv5-desc", "type": "other", -- To view, visit https://gerrit.wikimedia.org/r/364127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9308f9d410a834cb0c5e70c53614ba3578202f33 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: Jack Phoenix 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...Newsletter[master]: Use LogFormatter::getLinkRenderer in NewsletterLogFormatter
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364126 ) Change subject: Use LogFormatter::getLinkRenderer in NewsletterLogFormatter .. Use LogFormatter::getLinkRenderer in NewsletterLogFormatter This raises MediaWiki version requirement to 1.30.0 and bumps the version number to 1.2.1. Change-Id: I354ad01e577cefe2059112f3e1aeea60029d42b7 --- M Newsletter.php M extension.json M includes/logging/NewsletterLogFormatter.php 3 files changed, 6 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Newsletter.php b/Newsletter.php index 5bb248a..77883be 100755 --- a/Newsletter.php +++ b/Newsletter.php @@ -11,5 +11,5 @@ ); */ return true; } else { - die( 'This version of the Newsletter extension requires MediaWiki 1.25+' ); + die( 'This version of the Newsletter extension requires MediaWiki 1.30+' ); } diff --git a/extension.json b/extension.json index 96fe06b..6d6e59a 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "Newsletter", - "version": "1.2.0", + "version": "1.2.1", "author": [ "Siebrand Mazeland", "Tina Johnson", @@ -9,6 +9,9 @@ "url": "https://www.mediawiki.org/wiki/Extension:Newsletter;, "descriptionmsg": "newsletter-extension-desc", "license-name": "GPL-2.0", + "requires": { + "MediaWiki": ">= 1.30.0" + }, "type": "other", "AvailableRights": [ "newsletter-create", @@ -92,7 +95,6 @@ "EchoNewsletterPublisherPresentationModel": "includes/Echo/EchoNewsletterPublisherPresentationModel.php", "EchoNewsletterUnsubscribedPresentationModel": "includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php", "EchoNewsletterSubscribedPresentationModel": "includes/Echo/EchoNewsletterSubscribedPresentationModel.php" - }, "DefaultUserOptions": { "echo-subscriptions-web-newsletter": true, diff --git a/includes/logging/NewsletterLogFormatter.php b/includes/logging/NewsletterLogFormatter.php index 86c8562..8770efa 100644 --- a/includes/logging/NewsletterLogFormatter.php +++ b/includes/logging/NewsletterLogFormatter.php @@ -7,8 +7,6 @@ * @author Tyler Romeo */ -use MediaWiki\MediaWikiServices; - class NewsletterLogFormatter extends LogFormatter { /** * Reformat the target as a user link if the target was a user @@ -46,7 +44,7 @@ list( $id, $name ) = explode( ':', $value, 2 ); $title = SpecialPage::getTitleFor( 'Newsletter', $id ); if ( !$this->plaintext ) { - return Message::rawParam( MediaWikiServices::getInstance()->getLinkRenderer()->makeLink( + return Message::rawParam( $this->getLinkRenderer()->makeLink( $title, $name, [] -- To view, visit https://gerrit.wikimedia.org/r/364126 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I354ad01e577cefe2059112f3e1aeea60029d42b7 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> 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...MobileFrontend[master]: Update main menu icons
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364509 ) Change subject: Update main menu icons .. Update main menu icons New icon sizes are 24x24px so that they look good on IE8. Note that the new icons are slightly different from the old ones and that's intentional. Bug: T72961 Change-Id: I8dd07725e2e977efb29d107fb046c8e9e2368e13 --- M resources/skins.minerva.mainMenu.icons/anonymous.svg M resources/skins.minerva.mainMenu.icons/contributions.svg M resources/skins.minerva.mainMenu.icons/home.svg M resources/skins.minerva.mainMenu.icons/logout.svg M resources/skins.minerva.mainMenu.icons/nearby.svg M resources/skins.minerva.mainMenu.icons/profile.svg M resources/skins.minerva.mainMenu.icons/random.svg M resources/skins.minerva.mainMenu.icons/settings.svg M resources/skins.minerva.mainMenu.icons/watchlist.svg 9 files changed, 9 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/resources/skins.minerva.mainMenu.icons/anonymous.svg b/resources/skins.minerva.mainMenu.icons/anonymous.svg index 23e618b..85337fe 100644 --- a/resources/skins.minerva.mainMenu.icons/anonymous.svg +++ b/resources/skins.minerva.mainMenu.icons/anonymous.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="0 0 48 48" width="48" height="48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/contributions.svg b/resources/skins.minerva.mainMenu.icons/contributions.svg index 3908e1f..2c43623 100644 --- a/resources/skins.minerva.mainMenu.icons/contributions.svg +++ b/resources/skins.minerva.mainMenu.icons/contributions.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg;>edit-history \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/home.svg b/resources/skins.minerva.mainMenu.icons/home.svg index 53e08c6..b85005d 100644 --- a/resources/skins.minerva.mainMenu.icons/home.svg +++ b/resources/skins.minerva.mainMenu.icons/home.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; width="48" height="48" viewBox="0 0 48 48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/logout.svg b/resources/skins.minerva.mainMenu.icons/logout.svg index 5ff1b5e..2cb9886 100644 --- a/resources/skins.minerva.mainMenu.icons/logout.svg +++ b/resources/skins.minerva.mainMenu.icons/logout.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; width="48" height="48" viewBox="0 0 48 48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/nearby.svg b/resources/skins.minerva.mainMenu.icons/nearby.svg index dade06d..36a87b9 100644 --- a/resources/skins.minerva.mainMenu.icons/nearby.svg +++ b/resources/skins.minerva.mainMenu.icons/nearby.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="0 0 48 48" width="48" height="48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/profile.svg b/resources/skins.minerva.mainMenu.icons/profile.svg index c668084..d562f83 100644 --- a/resources/skins.minerva.mainMenu.icons/profile.svg +++ b/resources/skins.minerva.mainMenu.icons/profile.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="0 0 48 48" width="48" height="48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/random.svg b/resources/skins.minerva.mainMenu.icons/random.svg index 0551bf2..521389b 100644 --- a/resources/skins.minerva.mainMenu.icons/random.svg +++ b/resources/skins.minerva.mainMenu.icons/random.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="0 0 48 48" width="48" height="48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/settings.svg b/resources/skins.minerva.mainMenu.icons/settings.svg index 0b505ae..9b05185 100644 --- a/resources/skins.minerva.mainMenu.icons/settings.svg +++ b/resources/skins.minerva.mainMenu.icons/settings.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="0 0 48 48" width="48" height="48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/resources/skins.minerva.mainMenu.icons/watchlist.svg b/resources/skins.minerva.mainMenu.icons/watchlist.svg index bd326a8..63e8c20 100644 --- a/resources/skins.minerva.mainMenu.icons/watchlist.svg +++ b/resources/skins.minerva.mainMenu.icons/watchlist.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="0 0 48 48" width="48" height="48"> \ No newline at end of file +http://www.w3.org/2000/svg;> \ No newline at end of file -- To view, visit
[MediaWiki-commits] [Gerrit] operations/dns[master]: switch librenms from netmon1002 to netmon1002
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364617 ) Change subject: switch librenms from netmon1002 to netmon1002 .. switch librenms from netmon1002 to netmon1002 This is now ready to switch over. The role works, i see the dashboards with data. Bug: T159756 Change-Id: I39cd83bd7188c68c7fbf5a1fedd884ccda603be1 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/17/364617/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 49fed50..c6fa224 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -524,7 +524,7 @@ login 600 IN DYNA geoip!text-addrs -librenms1H IN CNAMEnetmon1001 +librenms1H IN CNAMEnetmon1002 servermon 600 IN DYNA geoip!misc-addrs payments5M IN A208.80.155.5 ; eqiad -- To view, visit https://gerrit.wikimedia.org/r/364617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39cd83bd7188c68c7fbf5a1fedd884ccda603be1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.22.3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364612 ) Change subject: Update OOjs UI to v0.22.3 .. Update OOjs UI to v0.22.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.3 Depends-On: If676bfab1d2040a9d360c741a5ab4e1c81b36b87 Change-Id: I684822b564663a94e03fc8b559617974502c8e52 --- M composer.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-core.js.map M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-toolbars.js.map M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-widgets.js.map M resources/lib/oojs-ui/oojs-ui-wikimediaui.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/oojs-ui-windows.js.map M resources/lib/oojs-ui/themes/apex/icons-content.json M resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json A resources/lib/oojs-ui/themes/apex/images/icons/article-ltr.png A resources/lib/oojs-ui/themes/apex/images/icons/article-ltr.svg A resources/lib/oojs-ui/themes/apex/images/icons/article-rtl.png A resources/lib/oojs-ui/themes/apex/images/icons/article-rtl.svg D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-ltr.png D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-ltr.svg D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-rtl.png D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-rtl.svg A resources/lib/oojs-ui/themes/apex/images/icons/puzzle.png A resources/lib/oojs-ui/themes/apex/images/icons/puzzle.svg M resources/lib/oojs-ui/themes/wikimediaui/icons-editing-advanced.json M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-invert.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-invert.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-progressive.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-progressive.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-invert.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-invert.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-progressive.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-progressive.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-invert.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-invert.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-progressive.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-progressive.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl.svg A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-invert.png A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-invert.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-invert.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-invert.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-progressive.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-progressive.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr.svg A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-progressive.png A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-progressive.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-invert.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-invert.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-progressive.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-progressive.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl.svg A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle.png A
[MediaWiki-commits] [Gerrit] mediawiki...UserMerge[master]: Use SpecialPage::getLinkRenderer
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364162 ) Change subject: Use SpecialPage::getLinkRenderer .. Use SpecialPage::getLinkRenderer And fix dependency in extension.json. Change-Id: Ia749db44342e68d5931bc030be72806795f05971 --- M SpecialUserMerge.php M extension.json 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php index ab38df4..9af48d5 100644 --- a/SpecialUserMerge.php +++ b/SpecialUserMerge.php @@ -15,8 +15,6 @@ * */ -use MediaWiki\MediaWikiServices; - class SpecialUserMerge extends FormSpecialPage { public function __construct() { parent::__construct( 'UserMerge', 'usermerge' ); @@ -154,7 +152,7 @@ if ( $failed ) { // Output an error message for failed moves $out->addHTML( Html::openElement( 'ul' ) ); - $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); + $linkRenderer = $this->getLinkRenderer(); foreach ( $failed as $oldTitleText => $newTitle ) { $oldTitle = Title::newFromText( $oldTitleText ); $out->addHTML( diff --git a/extension.json b/extension.json index 08ded52..ddca3eb 100644 --- a/extension.json +++ b/extension.json @@ -9,6 +9,9 @@ "url": "https://www.mediawiki.org/wiki/Extension:UserMerge;, "descriptionmsg": "usermerge-desc", "license-name": "GPL-2.0+", + "requires": { + "MediaWiki": ">= 1.28.0" + }, "type": "specialpage", "AvailableRights": [ "usermerge" -- To view, visit https://gerrit.wikimedia.org/r/364162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia749db44342e68d5931bc030be72806795f05971 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UserMerge Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-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/vendor[master]: Update OOjs UI to v0.22.3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364614 ) Change subject: Update OOjs UI to v0.22.3 .. Update OOjs UI to v0.22.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.3 Change-Id: If676bfab1d2040a9d360c741a5ab4e1c81b36b87 --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/bin/testsuitegenerator.rb M oojs/oojs-ui/demos/demos.php M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/package.json M oojs/oojs-ui/php/Element.php M oojs/oojs-ui/php/HtmlSnippet.php M oojs/oojs-ui/php/Tag.php M oojs/oojs-ui/php/Theme.php M oojs/oojs-ui/php/layouts/FieldLayout.php M oojs/oojs-ui/php/mixins/AccessKeyedElement.php M oojs/oojs-ui/php/mixins/ButtonElement.php M oojs/oojs-ui/php/mixins/FlaggedElement.php M oojs/oojs-ui/php/mixins/GroupElement.php M oojs/oojs-ui/php/mixins/IconElement.php M oojs/oojs-ui/php/mixins/IndicatorElement.php M oojs/oojs-ui/php/mixins/LabelElement.php M oojs/oojs-ui/php/mixins/TabIndexedElement.php M oojs/oojs-ui/php/mixins/TitledElement.php M oojs/oojs-ui/php/widgets/HiddenInputWidget.php M oojs/oojs-ui/php/widgets/InputWidget.php M oojs/oojs-ui/php/widgets/ProgressBarWidget.php 25 files changed, 182 insertions(+), 124 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 46cf220..ca0c907 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "monolog/monolog": "1.22.1", "mustangostang/spyc": "0.6.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.22.2", + "oojs/oojs-ui": "0.22.3", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index fe25852..ac09db5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"content-hash": "5c4ef9054eed327bfd6cee4e658c4fea", +"content-hash": "6ca887a2dbd1d8050bbc5727c0ac9619", "packages": [ { "name": "composer/semver", @@ -516,16 +516,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.22.2", +"version": "v0.22.3", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24" +"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/ca5f31425138961c4a779d8e0d7674f16dbc7d24;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/796f52473294e923d0133bb1b0b3629d9b1332bc;, +"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc", "shasum": "" }, "require": { @@ -534,7 +534,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", -"mediawiki/mediawiki-codesniffer": "0.6.0", +"mediawiki/mediawiki-codesniffer": "0.10.0", "phpunit/phpunit": "4.8.21" }, "type": "library", @@ -591,7 +591,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;, -"time": "2017-06-28T19:15:29+00:00" +"time": "2017-07-11T21:50:03+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 1f23170..df92c7d 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2205,87 +2205,6 @@ "homepage": "https://www.mediawiki.org/wiki/Css-sanitizer; }, { -"name": "oojs/oojs-ui", -"version": "v0.22.2", -"version_normalized": "0.22.2.0", -"source": { -"type": "git", -"url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/ca5f31425138961c4a779d8e0d7674f16dbc7d24;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24", -"shasum": "" -}, -"require": { -"mediawiki/at-ease": "1.1.0", -
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Restore unsubscribe tag replacement
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364616 ) Change subject: Restore unsubscribe tag replacement .. Restore unsubscribe tag replacement Bug: T170302 Change-Id: If4eab0a9ab95980445b606a5f7b47a7980ea0596 --- M sites/all/modules/thank_you/generators/ThankYou.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/16/364616/1 diff --git a/sites/all/modules/thank_you/generators/ThankYou.php b/sites/all/modules/thank_you/generators/ThankYou.php index fa6fc89..9eb26cd 100644 --- a/sites/all/modules/thank_you/generators/ThankYou.php +++ b/sites/all/modules/thank_you/generators/ThankYou.php @@ -28,6 +28,7 @@ '/\[endifRecurringProblem\]<\/p>/' => "\n{% endif %}", '/()?\[ifRecurring\]\s*/' => "{% if recurring %}\n\\1", '/\s*\[endifRecurring\]\s*(<\/p>)?/' => "\\1\n{% endif %}", + '/\[#?unsubscribe ((?:(?!\]).)*)\]/' => '$1', // All of the thank you letter's if...endif blocks should be outside p tags, not inside '/\s*({%\s*if [^}]+})\s*/i' => "\\1\n", '/\s*{%\s*endif\s*%}\s*<\/p>/i' => "\n{% endif %}", -- To view, visit https://gerrit.wikimedia.org/r/364616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4eab0a9ab95980445b606a5f7b47a7980ea0596 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.22.3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364611 ) Change subject: Update OOjs UI to v0.22.3 .. Update OOjs UI to v0.22.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.3 Change-Id: I684822b564663a94e03fc8b559617974502c8e52 --- M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-layout.css M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-user.css M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core-wikimediaui.css M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-core.js.map M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-wikimediaui.css M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-toolbars.js.map M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-widgets.js.map M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css M
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Do not show edit buttons when it's being printed
AnotherLadsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364615 ) Change subject: Do not show edit buttons when it's being printed .. Do not show edit buttons when it's being printed Bug: T87108 Change-Id: Id4dadea9b919fbcfab2d863e56592fc407b331a6 --- M view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/15/364615/1 diff --git a/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css b/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css index d35e97f..05776f2 100644 --- a/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css +++ b/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css @@ -112,3 +112,9 @@ /* @embed */ background-image: linear-gradient( transparent, transparent ), url( images/icons/oojs-ui/add.svg ); } + +@media print { + .wikibase-toolbarbutton { + display: none; + } +} -- To view, visit https://gerrit.wikimedia.org/r/364615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4dadea9b919fbcfab2d863e56592fc407b331a6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: AnotherLadsgroup___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.22.3
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364614 ) Change subject: Update OOjs UI to v0.22.3 .. Update OOjs UI to v0.22.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.3 Change-Id: If676bfab1d2040a9d360c741a5ab4e1c81b36b87 --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/bin/testsuitegenerator.rb M oojs/oojs-ui/demos/demos.php M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/package.json M oojs/oojs-ui/php/Element.php M oojs/oojs-ui/php/HtmlSnippet.php M oojs/oojs-ui/php/Tag.php M oojs/oojs-ui/php/Theme.php M oojs/oojs-ui/php/layouts/FieldLayout.php M oojs/oojs-ui/php/mixins/AccessKeyedElement.php M oojs/oojs-ui/php/mixins/ButtonElement.php M oojs/oojs-ui/php/mixins/FlaggedElement.php M oojs/oojs-ui/php/mixins/GroupElement.php M oojs/oojs-ui/php/mixins/IconElement.php M oojs/oojs-ui/php/mixins/IndicatorElement.php M oojs/oojs-ui/php/mixins/LabelElement.php M oojs/oojs-ui/php/mixins/TabIndexedElement.php M oojs/oojs-ui/php/mixins/TitledElement.php M oojs/oojs-ui/php/widgets/HiddenInputWidget.php M oojs/oojs-ui/php/widgets/InputWidget.php M oojs/oojs-ui/php/widgets/ProgressBarWidget.php 25 files changed, 182 insertions(+), 124 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/14/364614/1 diff --git a/composer.json b/composer.json index 46cf220..ca0c907 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "monolog/monolog": "1.22.1", "mustangostang/spyc": "0.6.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.22.2", + "oojs/oojs-ui": "0.22.3", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index fe25852..ac09db5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"content-hash": "5c4ef9054eed327bfd6cee4e658c4fea", +"content-hash": "6ca887a2dbd1d8050bbc5727c0ac9619", "packages": [ { "name": "composer/semver", @@ -516,16 +516,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.22.2", +"version": "v0.22.3", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24" +"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/ca5f31425138961c4a779d8e0d7674f16dbc7d24;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/796f52473294e923d0133bb1b0b3629d9b1332bc;, +"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc", "shasum": "" }, "require": { @@ -534,7 +534,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", -"mediawiki/mediawiki-codesniffer": "0.6.0", +"mediawiki/mediawiki-codesniffer": "0.10.0", "phpunit/phpunit": "4.8.21" }, "type": "library", @@ -591,7 +591,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;, -"time": "2017-06-28T19:15:29+00:00" +"time": "2017-07-11T21:50:03+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 1f23170..df92c7d 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2205,87 +2205,6 @@ "homepage": "https://www.mediawiki.org/wiki/Css-sanitizer; }, { -"name": "oojs/oojs-ui", -"version": "v0.22.2", -"version_normalized": "0.22.2.0", -"source": { -"type": "git", -"url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/ca5f31425138961c4a779d8e0d7674f16dbc7d24;, -"reference": "ca5f31425138961c4a779d8e0d7674f16dbc7d24", -"shasum": "" -}, -"require": { -"mediawiki/at-ease": "1.1.0", -
[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon: disable Letsencrypt on netmon2001
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364613 ) Change subject: netmon: disable Letsencrypt on netmon2001 .. netmon: disable Letsencrypt on netmon2001 Bug: T166180 Change-Id: I927e83cf16df8a30e41223dca2c7d1ee8a86bc6a --- A hieradata/hosts/netmon2001.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml new file mode 100644 index 000..370806d --- /dev/null +++ b/hieradata/hosts/netmon2001.yaml @@ -0,0 +1 @@ +do_acme: false -- To view, visit https://gerrit.wikimedia.org/r/364613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I927e83cf16df8a30e41223dca2c7d1ee8a86bc6a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn 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/vendor[master]: Fix elastica to use 5.6+ package as before.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364610 ) Change subject: Fix elastica to use 5.6+ package as before. .. Fix elastica to use 5.6+ package as before. Change-Id: Ie935f8d31aa85cebba458c66cf9be9e6111642c2 --- M composer.lock M composer/installed.json 2 files changed, 72 insertions(+), 6 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/composer.lock b/composer.lock index f4084da..fe25852 100644 --- a/composer.lock +++ b/composer.lock @@ -1172,17 +1172,50 @@ "type": "zip", "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip;, "reference": "tags/5.1.0", -"shasum": null +"shasum": "" }, "require": { -"php": ">=5.5.0 <5.6.0" +"php": ">=5.6.0", +"psr/log": "~1.0" +}, +"require-dev": { +"aws/aws-sdk-php": "~3.0", +"guzzlehttp/guzzle": "~6.0" +}, +"suggest": { +"aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", +"egeloen/http-adapter": "Allow using httpadapter transport", +"guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport", +"monolog/monolog": "Logging request" }, "type": "library", +"extra": { +"branch-alias": { +"dev-master": "5.1.x-dev" +} +}, "autoload": { "psr-4": { "Elastica\\": "lib/Elastica/" } -} +}, +"notification-url": "https://packagist.org/downloads/;, +"license": [ +"MIT" +], +"authors": [ +{ +"name": "Nicolas Ruflin", +"homepage": "http://ruflin.com/; +} +], +"description": "Elasticsearch Client", +"homepage": "http://elastica.io/;, +"keywords": [ +"client", +"search" +], +"time": "2017-02-15T11:19:35+00:00" }, { "name": "stil/gd-text", diff --git a/composer/installed.json b/composer/installed.json index 37b3477..1f23170 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2359,17 +2359,50 @@ "type": "zip", "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip;, "reference": "tags/5.1.0", -"shasum": null +"shasum": "" }, "require": { -"php": ">=5.5.0 <5.6.0" +"php": ">=5.6.0", +"psr/log": "~1.0" }, +"require-dev": { +"aws/aws-sdk-php": "~3.0", +"guzzlehttp/guzzle": "~6.0" +}, +"suggest": { +"aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", +"egeloen/http-adapter": "Allow using httpadapter transport", +"guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport", +"monolog/monolog": "Logging request" +}, +"time": "2017-02-15T11:19:35+00:00", "type": "library", +"extra": { +"branch-alias": { +"dev-master": "5.1.x-dev" +} +}, "installation-source": "dist", "autoload": { "psr-4": { "Elastica\\": "lib/Elastica/" } -} +}, +"notification-url": "https://packagist.org/downloads/;, +"license": [ +"MIT" +], +"authors": [ +{ +"name": "Nicolas Ruflin", +"homepage": "http://ruflin.com/; +} +], +"description": "Elasticsearch Client", +"homepage": "http://elastica.io/;, +"keywords": [ +"client", +"search" +] } ] -- To view, visit https://gerrit.wikimedia.org/r/364610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie935f8d31aa85cebba458c66cf9be9e6111642c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: SmalyshevGerrit-Reviewer: EBernhardson Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Reedy Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <>
[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon: disable Letsencrypt on netmon2001
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364613 ) Change subject: netmon: disable Letsencrypt on netmon2001 .. netmon: disable Letsencrypt on netmon2001 Bug: T166180 Change-Id: I927e83cf16df8a30e41223dca2c7d1ee8a86bc6a --- A hieradata/hosts/netmon2001.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/364613/1 diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml new file mode 100644 index 000..370806d --- /dev/null +++ b/hieradata/hosts/netmon2001.yaml @@ -0,0 +1 @@ +do_acme: false -- To view, visit https://gerrit.wikimedia.org/r/364613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I927e83cf16df8a30e41223dca2c7d1ee8a86bc6a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: QA: Add note about git history of browser tests in this repo
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364608 ) Change subject: QA: Add note about git history of browser tests in this repo .. QA: Add note about git history of browser tests in this repo Bug: T168758 Change-Id: I8363eb3270f8660c0057fa42803577c9cdff400a --- M tests/browser/README.mediawiki 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki index 449d255..4c8af26 100644 --- a/tests/browser/README.mediawiki +++ b/tests/browser/README.mediawiki @@ -1,3 +1,7 @@ += Git history = +Browser tests were migrated here from MobileFrontend. +For any git history prior to the migration, please review the git history of MobileFrontend (see https://gerrit.wikimedia.org/r/364325). + = Setup = Include the LocalSettings.php in this folder into your MediaWiki LocalSettings.php. Note including this in a production instance is not advised given it fiddles with permissions. -- To view, visit https://gerrit.wikimedia.org/r/364608 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8363eb3270f8660c0057fa42803577c9cdff400a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: JdlrobsonGerrit-Reviewer: Jdlrobson 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]: Update OOjs UI to v0.22.3
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364612 ) Change subject: Update OOjs UI to v0.22.3 .. Update OOjs UI to v0.22.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.3 Depends-On: If676bfab1d2040a9d360c741a5ab4e1c81b36b87 Change-Id: I684822b564663a94e03fc8b559617974502c8e52 --- M composer.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-core.js.map M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-toolbars.js.map M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-widgets.js.map M resources/lib/oojs-ui/oojs-ui-wikimediaui.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/oojs-ui-windows.js.map M resources/lib/oojs-ui/themes/apex/icons-content.json M resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json A resources/lib/oojs-ui/themes/apex/images/icons/article-ltr.png A resources/lib/oojs-ui/themes/apex/images/icons/article-ltr.svg A resources/lib/oojs-ui/themes/apex/images/icons/article-rtl.png A resources/lib/oojs-ui/themes/apex/images/icons/article-rtl.svg D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-ltr.png D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-ltr.svg D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-rtl.png D resources/lib/oojs-ui/themes/apex/images/icons/puzzle-rtl.svg A resources/lib/oojs-ui/themes/apex/images/icons/puzzle.png A resources/lib/oojs-ui/themes/apex/images/icons/puzzle.svg M resources/lib/oojs-ui/themes/wikimediaui/icons-editing-advanced.json M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-invert.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-invert.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-progressive.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin-progressive.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/mapPin.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-invert.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-invert.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-progressive.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr-progressive.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-ltr.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-invert.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-invert.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-progressive.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl-progressive.svg M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl.png M resources/lib/oojs-ui/themes/wikimediaui/images/icons/ongoingConversation-rtl.svg A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-invert.png A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-invert.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-invert.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-invert.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-progressive.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr-progressive.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-ltr.svg A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-progressive.png A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-progressive.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-invert.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-invert.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-progressive.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl-progressive.svg D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl.png D resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle-rtl.svg A resources/lib/oojs-ui/themes/wikimediaui/images/icons/puzzle.png A
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Move expensive processing into job queue
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/360787 ) Change subject: Move expensive processing into job queue .. Move expensive processing into job queue Bug: T167731 Depends-On: I618840fafd22d9b6471eb470ef0414e354aa17f5 Change-Id: I1fcd15f523828141e8fadee9a8ad824eacefc0f9 --- M extension.json A includes/DeferredChecksJob.php M includes/Hooks.php M includes/LoginNotify.php 4 files changed, 249 insertions(+), 75 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index b7f69ba..84334b1 100644 --- a/extension.json +++ b/extension.json @@ -25,8 +25,9 @@ ] }, "AutoloadClasses": { - "LoginNotify\\LoginNotify": "includes/LoginNotify.php", + "LoginNotify\\DeferredChecksJob": "includes/DeferredChecksJob.php", "LoginNotify\\Hooks": "includes/Hooks.php", + "LoginNotify\\LoginNotify": "includes/LoginNotify.php", "LoginNotify\\PresentationModel": "includes/PresentationModel.php" }, "Hooks": { @@ -37,7 +38,7 @@ "LoginNotify\\Hooks::onEchoGetBundleRules" ], "LoginAuthenticateAudit": [ - "LoginNotifyHooks::onLoginAuthenticateAudit" + "LoginNotify\\Hooks::onLoginAuthenticateAudit" ], "AuthManagerLoginAuthenticateAudit": [ "LoginNotify\\Hooks::onAuthManagerLoginAuthenticateAudit" @@ -55,6 +56,9 @@ "LoginNotify\\Hooks::onLocalUserCreated" ] }, + "JobClasses": { + "LoginNotifyChecks": "LoginNotify\\DeferredChecksJob" + }, "config": { "@docLoginNotifyAttemptsKnownIP": "The number of failed login attempts to permit from a known IP before a notification is triggered.", "LoginNotifyAttemptsKnownIP": 5, diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php new file mode 100644 index 000..05096eb --- /dev/null +++ b/includes/DeferredChecksJob.php @@ -0,0 +1,67 @@ +params['checkType']; + $userId = $this->params['userId']; + $user = User::newFromId( $userId ); + if ( !$user ) { + throw new Exception( "Can't find user for user id=" . print_r( $userId, true ) ); + } + if ( !isset( $this->params['subnet'] ) || !is_string( $this->params['subnet'] ) ) { + throw new Exception( __CLASS__ + . " expected to receive a string parameter 'subnet', got " + . print_r( $this->params['subnet'], true ) + ); + } + $subnet = $this->params['resultSoFar']; + if ( !isset( $this->params['resultSoFar'] ) || !is_string( $this->params['resultSoFar'] ) ) { + throw new Exception( __CLASS__ + . " expected to receive a string parameter 'resultSoFar', got " + . print_r( $this->params['resultSoFar'], true ) + ); + } + $resultSoFar = $this->params['resultSoFar']; + + $loginNotify = new LoginNotify(); + + switch ( $checkType ) { + case self::TYPE_LOGIN_FAILED: + $loginNotify->recordFailureDeferred( $user, $subnet, $resultSoFar ); + break; + case self::TYPE_LOGIN_SUCCESS: + $loginNotify->sendSuccessNoticeDeferred( $user, $subnet, $resultSoFar ); + break; + default: + throw new Exception( 'Unknown check type ' . print_r( $checkType, true ) ); + } + + return true; + } +} diff --git a/includes/Hooks.php b/includes/Hooks.php index 82a9cce..9685022 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -50,6 +50,14 @@ 'category' => 'login-fail', 'group' => 'negative', 'presentation-model' => PresentationModel::class, + // fixme, what does this actually do? + 'title-message' => 'loginnotify-login-fail', + 'title-params' => [], + // FIXME Should count be a parameter + 'email-subject-params' => [ 'agent', 'count' ], + 'email-body-batch-params' => [ 'agent', 'count' ], + // FIXME is it ok not to set batch email messages, since + // we have immediate flag?
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix bundling issues with LoginNotify
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364609 ) Change subject: Fix bundling issues with LoginNotify .. Fix bundling issues with LoginNotify Bug: T169833 Change-Id: Ia38fe0c0eca452af1a9be57e4a4382ebdb9b5a6e --- M includes/PresentationModel.php 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/PresentationModel.php b/includes/PresentationModel.php index 9e88172..b4ce87a 100644 --- a/includes/PresentationModel.php +++ b/includes/PresentationModel.php @@ -57,15 +57,20 @@ */ public function getHeaderMessage() { switch ( $this->event->getType() ) { + // Known IP? Don't bundle because we issue notifications after every 5 attempts anyway case 'login-fail-known': $msg = $this->msg( 'notification-known-header-login-fail' ); $msg->params( $this->event->getExtraParam( 'count', 0 ) ); break; + // New IP? case 'login-fail-new': + // If it's a bundle, pass it the bundle count as param if ( $this->isBundled() ) { $msg = $this->msg( 'notification-new-bundled-header-login-fail' ); - $msg->params( $this->event->getExtraParam( 'count', 0 ) ); + $msg->params( $this->getBundleCount() ); } else { + // If the bundle is read or user goes to Special:Notifications, show + // one notification per attempt (aligned with how unbundled bundles work) $msg = $this->msg( 'notification-new-unbundled-header-login-fail' ); $msg->params( $this->event->getExtraParam( 'count', 0 ) ); } -- To view, visit https://gerrit.wikimedia.org/r/364609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia38fe0c0eca452af1a9be57e4a4382ebdb9b5a6e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LoginNotify Gerrit-Branch: master Gerrit-Owner: Niharika29Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.22.3
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364611 ) Change subject: Update OOjs UI to v0.22.3 .. Update OOjs UI to v0.22.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.22.3 Change-Id: I684822b564663a94e03fc8b559617974502c8e52 --- M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-layout.css M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-user.css M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core-wikimediaui.css M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-core.js.map M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-wikimediaui.css M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-toolbars.js.map M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-widgets.js.map M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css M
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add netmon2001 to site, equal to netmon1002
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364585 ) Change subject: add netmon2001 to site, equal to netmon1002 .. add netmon2001 to site, equal to netmon1002 Add netmon2001 to site, make it identical to netmon1002. Both replace netmon1001, just one in each DC. Bug: T166180 Change-Id: I78057b36d56c6134474702686e4e3363b7d83825 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index a0a17f7..7a6c05b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1773,8 +1773,8 @@ interface::add_ip6_mapped { 'main': } } -# network monitoring tool server - replacement server (T125020) -node 'netmon1002.wikimedia.org' { +# network monitoring tool server - replacement servers (T125020, T166180) +node /^netmon(1002|2001)\.wikimedia\.org$/ { # TODO: role(librenms, servermon::wmf) role(network::monitor, librenms, rancid, smokeping) -- To view, visit https://gerrit.wikimedia.org/r/364585 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78057b36d56c6134474702686e4e3363b7d83825 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn 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/vendor[master]: Fix elastica to use 5.6+ package as before.
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364610 ) Change subject: Fix elastica to use 5.6+ package as before. .. Fix elastica to use 5.6+ package as before. Change-Id: Ie935f8d31aa85cebba458c66cf9be9e6111642c2 --- M composer.lock M composer/installed.json 2 files changed, 72 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/10/364610/1 diff --git a/composer.lock b/composer.lock index f4084da..fe25852 100644 --- a/composer.lock +++ b/composer.lock @@ -1172,17 +1172,50 @@ "type": "zip", "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip;, "reference": "tags/5.1.0", -"shasum": null +"shasum": "" }, "require": { -"php": ">=5.5.0 <5.6.0" +"php": ">=5.6.0", +"psr/log": "~1.0" +}, +"require-dev": { +"aws/aws-sdk-php": "~3.0", +"guzzlehttp/guzzle": "~6.0" +}, +"suggest": { +"aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", +"egeloen/http-adapter": "Allow using httpadapter transport", +"guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport", +"monolog/monolog": "Logging request" }, "type": "library", +"extra": { +"branch-alias": { +"dev-master": "5.1.x-dev" +} +}, "autoload": { "psr-4": { "Elastica\\": "lib/Elastica/" } -} +}, +"notification-url": "https://packagist.org/downloads/;, +"license": [ +"MIT" +], +"authors": [ +{ +"name": "Nicolas Ruflin", +"homepage": "http://ruflin.com/; +} +], +"description": "Elasticsearch Client", +"homepage": "http://elastica.io/;, +"keywords": [ +"client", +"search" +], +"time": "2017-02-15T11:19:35+00:00" }, { "name": "stil/gd-text", diff --git a/composer/installed.json b/composer/installed.json index 37b3477..1f23170 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2359,17 +2359,50 @@ "type": "zip", "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip;, "reference": "tags/5.1.0", -"shasum": null +"shasum": "" }, "require": { -"php": ">=5.5.0 <5.6.0" +"php": ">=5.6.0", +"psr/log": "~1.0" }, +"require-dev": { +"aws/aws-sdk-php": "~3.0", +"guzzlehttp/guzzle": "~6.0" +}, +"suggest": { +"aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", +"egeloen/http-adapter": "Allow using httpadapter transport", +"guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport", +"monolog/monolog": "Logging request" +}, +"time": "2017-02-15T11:19:35+00:00", "type": "library", +"extra": { +"branch-alias": { +"dev-master": "5.1.x-dev" +} +}, "installation-source": "dist", "autoload": { "psr-4": { "Elastica\\": "lib/Elastica/" } -} +}, +"notification-url": "https://packagist.org/downloads/;, +"license": [ +"MIT" +], +"authors": [ +{ +"name": "Nicolas Ruflin", +"homepage": "http://ruflin.com/; +} +], +"description": "Elasticsearch Client", +"homepage": "http://elastica.io/;, +"keywords": [ +"client", +"search" +] } ] -- To view, visit https://gerrit.wikimedia.org/r/364610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie935f8d31aa85cebba458c66cf9be9e6111642c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Smalyshev___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Setup browser test job for Minerva skin
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361012 ) Change subject: Setup browser test job for Minerva skin .. Setup browser test job for Minerva skin There are no browser tests in the repo yet but there will be soon so I want to get a head start and get this running! Bug: T166750 Change-Id: I8de3ed49c5847d2b91d7cd9ac8ef5c6cf672b4c0 Depends-On: I84ae3ea14191f672cabcd52020e80b0a40a72ce1 --- M jjb/selenium.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Jdlrobson: Looks good to me, but someone else must approve diff --git a/jjb/selenium.yaml b/jjb/selenium.yaml index 4545570..d91182c 100644 --- a/jjb/selenium.yaml +++ b/jjb/selenium.yaml @@ -58,6 +58,14 @@ - 'selenium-{name}' - project: +name: MinervaNeue +recipients: jrob...@wikimedia.org qa-ale...@lists.wikimedia.org # @Jdlrobson +repository: mediawiki/skins/MinervaNeue + +jobs: + - 'selenium-{name}' + +- project: name: MobileFrontend # do not sent e-mail messages to Jon until jobs are more stable # recipients: jrob...@wikimedia.org qa-ale...@lists.wikimedia.org # @jdlrobson -- To view, visit https://gerrit.wikimedia.org/r/361012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8de3ed49c5847d2b91d7cd9ac8ef5c6cf672b4c0 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: JdlrobsonGerrit-Reviewer: Dduvall Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: Zfilipin 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...Wikidata[master]: Updated deployment build (but for master)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364597 ) Change subject: Updated deployment build (but for master) .. Updated deployment build (but for master) Shouldn't break anything... Bug: T169539 Change-Id: I4123790d71c3eeac9b9cedabf61f429851e969cc --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.json M composer.lock M extensions/ArticlePlaceholder/composer.json M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php M extensions/ArticlePlaceholder/phpcs.xml M extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/SearchHookHandlerTest.php M extensions/Constraints/.eslintignore M extensions/Constraints/README.md M extensions/Constraints/api/CheckConstraints.php D extensions/Constraints/docs/user.js M extensions/Constraints/extension.json M extensions/Constraints/i18n/ast.json M extensions/Constraints/i18n/cs.json M extensions/Constraints/i18n/de.json M extensions/Constraints/i18n/en.json M extensions/Constraints/i18n/es.json M extensions/Constraints/i18n/eu.json M extensions/Constraints/i18n/fr.json M extensions/Constraints/i18n/gl.json M extensions/Constraints/i18n/he.json M extensions/Constraints/i18n/hi.json A extensions/Constraints/i18n/ia.json M extensions/Constraints/i18n/it.json M extensions/Constraints/i18n/ko.json M extensions/Constraints/i18n/lb.json M extensions/Constraints/i18n/lv.json M extensions/Constraints/i18n/nb.json M extensions/Constraints/i18n/nl.json M extensions/Constraints/i18n/pl.json M extensions/Constraints/i18n/pt.json M extensions/Constraints/i18n/qqq.json A extensions/Constraints/i18n/roa-tara.json M extensions/Constraints/i18n/sv.json A extensions/Constraints/i18n/th.json M extensions/Constraints/i18n/zh-hans.json M extensions/Constraints/includes/Constraint.php M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/QualifierChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php D extensions/Constraints/includes/ConstraintCheck/Checker/TypeSparqlChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php D extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeSparqlChecker.php M extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php M extensions/Constraints/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintParameterParser.php D extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintStatementParameterParser.php M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php M extensions/Constraints/includes/ConstraintParameterRenderer.php M extensions/Constraints/includes/ConstraintReportFactory.php M extensions/Constraints/includes/ConstraintRepository.php M extensions/Constraints/includes/UpdateConstraintsTableJob.php A extensions/Constraints/maintenance/ImportConstraintStatements.php M extensions/Constraints/maintenance/UpdateConstraintsTable.php M extensions/Constraints/modules/SpecialConstraintReportPage.css M extensions/Constraints/modules/SpecialConstraintReportPage.js A extensions/Constraints/modules/gadget-skip.js A extensions/Constraints/modules/gadget.css A extensions/Constraints/modules/gadget.js M
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix bundling issues with LoginNotify
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364609 ) Change subject: Fix bundling issues with LoginNotify .. Fix bundling issues with LoginNotify Bug: T169833 Change-Id: Ia38fe0c0eca452af1a9be57e4a4382ebdb9b5a6e --- M includes/PresentationModel.php 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify refs/changes/09/364609/1 diff --git a/includes/PresentationModel.php b/includes/PresentationModel.php index 9e88172..b4ce87a 100644 --- a/includes/PresentationModel.php +++ b/includes/PresentationModel.php @@ -57,15 +57,20 @@ */ public function getHeaderMessage() { switch ( $this->event->getType() ) { + // Known IP? Don't bundle because we issue notifications after every 5 attempts anyway case 'login-fail-known': $msg = $this->msg( 'notification-known-header-login-fail' ); $msg->params( $this->event->getExtraParam( 'count', 0 ) ); break; + // New IP? case 'login-fail-new': + // If it's a bundle, pass it the bundle count as param if ( $this->isBundled() ) { $msg = $this->msg( 'notification-new-bundled-header-login-fail' ); - $msg->params( $this->event->getExtraParam( 'count', 0 ) ); + $msg->params( $this->getBundleCount() ); } else { + // If the bundle is read or user goes to Special:Notifications, show + // one notification per attempt (aligned with how unbundled bundles work) $msg = $this->msg( 'notification-new-unbundled-header-login-fail' ); $msg->params( $this->event->getExtraParam( 'count', 0 ) ); } -- To view, visit https://gerrit.wikimedia.org/r/364609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia38fe0c0eca452af1a9be57e4a4382ebdb9b5a6e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LoginNotify Gerrit-Branch: master Gerrit-Owner: Niharika29___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: QA: Add note about git history of browser tests in this repo
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364608 ) Change subject: QA: Add note about git history of browser tests in this repo .. QA: Add note about git history of browser tests in this repo Bug: T168758 Change-Id: I8363eb3270f8660c0057fa42803577c9cdff400a --- M tests/browser/README.mediawiki 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/08/364608/1 diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki index 449d255..4c8af26 100644 --- a/tests/browser/README.mediawiki +++ b/tests/browser/README.mediawiki @@ -1,3 +1,7 @@ += Git history = +Browser tests were migrated here from MobileFrontend. +For any git history prior to the migration, please review the git history of MobileFrontend (see https://gerrit.wikimedia.org/r/364325). + = Setup = Include the LocalSettings.php in this folder into your MediaWiki LocalSettings.php. Note including this in a production instance is not advised given it fiddles with permissions. -- To view, visit https://gerrit.wikimedia.org/r/364608 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8363eb3270f8660c0057fa42803577c9cdff400a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue 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/vendor[master]: Spaces to tabs
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364607 ) Change subject: Spaces to tabs .. Spaces to tabs Change-Id: Ib0380ebb246dc581d80037c6de83894e1fa4197f --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 3e9d982..46cf220 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "wikimedia/html-formatter": "1.0.1", "wikimedia/ip-set": "1.1.0", "wikimedia/php-session-serializer": "1.0.4", -"wikimedia/purtle": "1.0.6", + "wikimedia/purtle": "1.0.6", "wikimedia/relpath": "1.0.3", "wikimedia/remex-html": "1.0.1", "wikimedia/running-stat": "1.1.0", -- To view, visit https://gerrit.wikimedia.org/r/364607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0380ebb246dc581d80037c6de83894e1fa4197f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: ReedyGerrit-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...MinervaNeue[master]: Port browser tests from MobileFrontend to Minerva
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358083 ) Change subject: Port browser tests from MobileFrontend to Minerva .. Port browser tests from MobileFrontend to Minerva This moves all browser tests from MobileFrontend to the Minerva repo in preparation for separating the two. Note, this means browser tests will exist in both repositories for a period of time. This is important and necessary to ensure we do not break anything. See: https://lists.wikimedia.org/pipermail/mobile-l/2017-July/010536.html Bug: T168758 Change-Id: I84ae3ea14191f672cabcd52020e80b0a40a72ce1 --- A .rubocop.yml A Rakefile A tests/browser/LocalSettings.php A tests/browser/README.mediawiki A tests/browser/ci.yml A tests/browser/environments.yml D tests/browser/features/README.txt A tests/browser/features/category.feature A tests/browser/features/diff.feature A tests/browser/features/editor_wikitext_nosave.feature A tests/browser/features/editor_wikitext_saving.feature A tests/browser/features/issues.feature A tests/browser/features/language.feature A tests/browser/features/mainmenu.feature A tests/browser/features/mainmenu_loggedin.feature A tests/browser/features/no_javascript_site.feature A tests/browser/features/notification.feature A tests/browser/features/pageactions.feature A tests/browser/features/pageactions_protected.feature A tests/browser/features/references.feature A tests/browser/features/search.feature A tests/browser/features/search_loggedin.feature A tests/browser/features/search_tablet.feature A tests/browser/features/signup_edit_tutorial.feature A tests/browser/features/special.feature A tests/browser/features/step_definitions/category_steps.rb A tests/browser/features/step_definitions/common_article_steps.rb A tests/browser/features/step_definitions/common_steps.rb A tests/browser/features/step_definitions/create_page_api_steps.rb A tests/browser/features/step_definitions/diff_steps.rb A tests/browser/features/step_definitions/editor_steps.rb A tests/browser/features/step_definitions/issues_steps.rb A tests/browser/features/step_definitions/language_icon_steps.rb A tests/browser/features/step_definitions/language_steps.rb A tests/browser/features/step_definitions/mainmenu_steps.rb A tests/browser/features/step_definitions/notification_steps.rb A tests/browser/features/step_definitions/pageactions_steps.rb A tests/browser/features/step_definitions/references_steps.rb A tests/browser/features/step_definitions/search_steps.rb A tests/browser/features/step_definitions/signup_edit_tutorial.rb A tests/browser/features/step_definitions/special_history_steps.rb A tests/browser/features/step_definitions/talk_steps.rb A tests/browser/features/step_definitions/toc_steps.rb A tests/browser/features/step_definitions/toggling_steps.rb A tests/browser/features/step_definitions/ui_links_steps.rb A tests/browser/features/step_definitions/user_page_steps.rb A tests/browser/features/step_definitions/watchstar_steps.rb A tests/browser/features/step_definitions/wikidata_descriptions.rb A tests/browser/features/support/env.rb A tests/browser/features/support/exif.jpg A tests/browser/features/support/hooks.rb A tests/browser/features/support/pages/article_page.rb A tests/browser/features/support/pages/create_article_page.rb A tests/browser/features/support/pages/diff_page.rb A tests/browser/features/support/pages/language_page.rb A tests/browser/features/support/pages/main_page.rb A tests/browser/features/support/pages/notification_page.rb A tests/browser/features/support/pages/page.rb A tests/browser/features/support/pages/special_history_page.rb A tests/browser/features/support/pages/special_mobilediff_page.rb A tests/browser/features/support/pages/special_search_page.rb A tests/browser/features/support/pages/special_userlogin_page.rb A tests/browser/features/support/pages/user_page.rb A tests/browser/features/support/permissions.sqlite A tests/browser/features/talk.feature A tests/browser/features/toc.feature A tests/browser/features/toggling.feature A tests/browser/features/toggling_tablet.feature A tests/browser/features/ui.feature A tests/browser/features/user_page.feature A tests/browser/features/watchstar.feature A tests/browser/features/wikidata_descriptions.feature 72 files changed, 1,892 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 000..cc32da4 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1 @@ +inherit_from: .rubocop_todo.yml diff --git a/Rakefile b/Rakefile new file mode 100644 index 000..2877bf6 --- /dev/null +++ b/Rakefile @@ -0,0 +1,17 @@ +require 'bundler/setup' + +require 'rubocop/rake_task' +RuboCop::RakeTask.new(:rubocop) do |task| + # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml + # the next line makes it explicit that you want
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.22.3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364598 ) Change subject: Tag v0.22.3 .. Tag v0.22.3 Change-Id: I6f9008458b898877bac88aae4bd4382b0ec87ed9 --- M History.md M package.json 2 files changed, 34 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/History.md b/History.md index b5bf1a2..8be0c72 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,37 @@ # OOjs UI Release History +## v0.22.3 / 2017-07-11 +### Features +* Tag-/CapsuleMultiselectWidget: Avoid visual focusTrap feedback (Volker E.) +* WindowManager: Avoid inconsistent state due to asynchronous promise resolution (Bartosz Dziewoński) +* WindowManager: fix closing promise state check (David Lynch) + +### Styles +* icons: Align ongoingConversation to grid (Ed Sanders) +* icons: Replace the puzzle icon, using the one from VisualEditor (James D. Forrester) +* icons: Vertically center mapPin icon (Volker E.) +* Apex theme: Add 'article' icon, copied from WikimediaUI (Moriel Schottlender) + +### Code +* DropdownWidget, MenuSelectWidget: Set `aria-expanded` attribute (Prateek Saxena) +* FieldLayout: Add `role='alert'` for error messages (Prateek Saxena) +* FieldLayout: Set `aria-describedby` on the fieldWidget (Prateek Saxena) +* PopupWidget: Update function name in a comment (Bartosz Dziewoński) +* TagMultiselectWidget: Skip `updateInputSize()` for invisible inputs (Roan Kattouw) +* Toolbar: Add comment for greppability of dynamic CSS classes (Bartosz Dziewoński) +* themes: Align read-only variable names to pseudo-class selector scheme (Volker E.) +* themes: Align variable names to WikimediaUI Base scheme (Volker E.) +* WikimediaUI theme: Align `@opacity-icon*` variable names to WikimediaUI Base (Volker E.) +* WikimediaUI theme: Align checked variable names to pseudo-class scheme (Volker E.) +* WikimediaUI theme: Align disabled variable names to pseudo-class scheme (Volker E.) +* WikimediaUI theme: Align variable pseudo classes names to WikimediaUI Base (Volker E.) +* WikimediaUI theme: Replace `@color-base-light` with `@color-base--inverted` (Volker E.) +* WikimediaUI theme: Variablize PopupWidget values (Volker E.) +* WikimediaUI theme: Pull in the upstream WikimediaUI package (James D. Forrester) +* build: Updating mediawiki/mediawiki-codesniffer to 0.10.0 (Kunal Mehta) +* phpcs: Enable more rules, or document why they are disabled (Bartosz Dziewoński) +* testsuitegenerator: Blacklist deprecated `multiline` config option (Bartosz Dziewoński) + + ## v0.22.2 / 2017-06-28 ### Deprecations * [DEPRECATING CHANGE] TextInputWidget: Move multi-line support out (Prateek Saxena) diff --git a/package.json b/package.json index fb48d4d..e7dc161 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.22.2", + "version": "0.22.3", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/364598 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f9008458b898877bac88aae4bd4382b0ec87ed9 Gerrit-PatchSet: 4 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Jforrester Gerrit-Reviewer: VolkerE 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]: Apex theme: Add 'article' icon, copied from WikimediaUI
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364599 ) Change subject: Apex theme: Add 'article' icon, copied from WikimediaUI .. Apex theme: Add 'article' icon, copied from WikimediaUI Bug: T170329 Change-Id: I282eed901eefb34983514069d283f3aee488c47b --- M src/themes/apex/icons-content.json A src/themes/apex/images/icons/article-ltr.svg A src/themes/apex/images/icons/article-rtl.svg 3 files changed, 12 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, but someone else must approve jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/themes/apex/icons-content.json b/src/themes/apex/icons-content.json index a9db33f..cb40574 100644 --- a/src/themes/apex/icons-content.json +++ b/src/themes/apex/icons-content.json @@ -2,6 +2,10 @@ "prefix": "oo-ui-icon", "intro": "@import '../../../../src/styles/common';", "images": { + "article": { "file": { + "ltr": "images/icons/article-ltr.svg", + "rtl": "images/icons/article-rtl.svg" + } }, "articles": { "file": { "ltr": "images/icons/articles-ltr.svg", "rtl": "images/icons/articles-rtl.svg" diff --git a/src/themes/apex/images/icons/article-ltr.svg b/src/themes/apex/images/icons/article-ltr.svg new file mode 100644 index 000..862bc2b --- /dev/null +++ b/src/themes/apex/images/icons/article-ltr.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + diff --git a/src/themes/apex/images/icons/article-rtl.svg b/src/themes/apex/images/icons/article-rtl.svg new file mode 100644 index 000..3b16dcb --- /dev/null +++ b/src/themes/apex/images/icons/article-rtl.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + -- To view, visit https://gerrit.wikimedia.org/r/364599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I282eed901eefb34983514069d283f3aee488c47b Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: MooeypooGerrit-Reviewer: Catrope Gerrit-Reviewer: Jforrester 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/vendor[master]: Spaces to tabs
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364607 ) Change subject: Spaces to tabs .. Spaces to tabs Change-Id: Ib0380ebb246dc581d80037c6de83894e1fa4197f --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/07/364607/1 diff --git a/composer.json b/composer.json index 3e9d982..46cf220 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "wikimedia/html-formatter": "1.0.1", "wikimedia/ip-set": "1.1.0", "wikimedia/php-session-serializer": "1.0.4", -"wikimedia/purtle": "1.0.6", + "wikimedia/purtle": "1.0.6", "wikimedia/relpath": "1.0.3", "wikimedia/remex-html": "1.0.1", "wikimedia/running-stat": "1.1.0", -- To view, visit https://gerrit.wikimedia.org/r/364607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0380ebb246dc581d80037c6de83894e1fa4197f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: B
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364597 ) Change subject: B .. B Change-Id: I4123790d71c3eeac9b9cedabf61f429851e969cc --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.json M composer.lock M extensions/ArticlePlaceholder/composer.json M extensions/ArticlePlaceholder/includes/ItemNotabilityFilter.php M extensions/ArticlePlaceholder/phpcs.xml M extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/BaseTemplateToolboxHookHandlerTest.php M extensions/ArticlePlaceholder/tests/phpunit/includes/SearchHookHandlerTest.php M extensions/Constraints/.eslintignore M extensions/Constraints/README.md M extensions/Constraints/api/CheckConstraints.php D extensions/Constraints/docs/user.js M extensions/Constraints/extension.json M extensions/Constraints/i18n/ast.json M extensions/Constraints/i18n/cs.json M extensions/Constraints/i18n/de.json M extensions/Constraints/i18n/en.json M extensions/Constraints/i18n/es.json M extensions/Constraints/i18n/eu.json M extensions/Constraints/i18n/fr.json M extensions/Constraints/i18n/gl.json M extensions/Constraints/i18n/he.json M extensions/Constraints/i18n/hi.json M extensions/Constraints/i18n/it.json M extensions/Constraints/i18n/ko.json M extensions/Constraints/i18n/lb.json M extensions/Constraints/i18n/lv.json M extensions/Constraints/i18n/nb.json M extensions/Constraints/i18n/nl.json M extensions/Constraints/i18n/pl.json M extensions/Constraints/i18n/pt.json M extensions/Constraints/i18n/qqq.json M extensions/Constraints/i18n/sv.json M extensions/Constraints/i18n/zh-hans.json M extensions/Constraints/includes/Constraint.php M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/QualifierChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php D extensions/Constraints/includes/ConstraintCheck/Checker/TypeSparqlChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php D extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeSparqlChecker.php M extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php M extensions/Constraints/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintParameterParser.php D extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintStatementParameterParser.php M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php M extensions/Constraints/includes/ConstraintParameterRenderer.php M extensions/Constraints/includes/ConstraintReportFactory.php M extensions/Constraints/includes/ConstraintRepository.php M extensions/Constraints/includes/UpdateConstraintsTableJob.php M extensions/Constraints/maintenance/UpdateConstraintsTable.php M extensions/Constraints/modules/SpecialConstraintReportPage.css M extensions/Constraints/modules/SpecialConstraintReportPage.js M extensions/Constraints/specials/SpecialConstraintReport.php M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php M extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php M extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php M extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php M
[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Remove ores-compute-01
Paladox has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364604 ) Change subject: Remove ores-compute-01 .. Remove ores-compute-01 The host has been deleted. Change-Id: Id12d8fae47104bd7ecbf29e5d6f30800d560043f --- M templates/hosts.conf.erb 1 file changed, 0 insertions(+), 21 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb index d06b6f0..ec8bac1 100644 --- a/templates/hosts.conf.erb +++ b/templates/hosts.conf.erb @@ -250,27 +250,6 @@ } } -object Host "ores-compute-01" { -import "generic-host" - -address = "ores-compute-01.ores.eqiad.wmflabs" -vars.os = "Linux OS" -vars.sla = "24x7" -vars.check_user = true -vars.address = "ores-compute-01.ores.eqiad.wmflabs" -vars.check_disk_ores = true -vars.host = "ores-compute-01.ores.eqiad.wmflabs" -vars.notification.ores = true -vars.check_puppet = true -vars.load_check = "disable" - -/* Define notification mail attributes for notification apply rules in `notifications.conf`. */ -vars.notification["mail"] = { - /* The UserGroup `icingaadmins` is defined in `users.conf`. */ - groups = [ "icingaadmins" ] -} -} - object Host "ores-lb-02" { import "generic-host" -- To view, visit https://gerrit.wikimedia.org/r/364604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id12d8fae47104bd7ecbf29e5d6f30800d560043f Gerrit-PatchSet: 2 Gerrit-Project: labs/icinga2 Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Remove ores-compute-01
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364604 ) Change subject: Remove ores-compute-01 .. Remove ores-compute-01 The host has been deleted. Change-Id: Id12d8fae47104bd7ecbf29e5d6f30800d560043f --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 refs/changes/04/364604/1 -- To view, visit https://gerrit.wikimedia.org/r/364604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id12d8fae47104bd7ecbf29e5d6f30800d560043f Gerrit-PatchSet: 1 Gerrit-Project: labs/icinga2 Gerrit-Branch: master Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: VCL: fix keep values at 7d
BBlack has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364605 ) Change subject: VCL: fix keep values at 7d .. VCL: fix keep values at 7d We need to double-check that MW doesn't expect this to cause problems with invalid 304s on shorter objects. The original idea of scaling to the TTL doesn't make much sense on text in light of the fact that the TTLs emitted by MW are counting down over time anyways, resulting in artificially-low keep values. On the upload cluster the problem was worse because our default TTL is 1d anyways, resulting in 1d keep times. Change-Id: Ibb4be5b2311e3e4b0b6aa33f3dc59c1be0128923 --- M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 1 file changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/364605/1 diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb index 014e85f..aa65804 100644 --- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb +++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb @@ -383,15 +383,10 @@ set beresp.ttl = 10m; } - // Set keep, which influences the amount of time objects are kept available - // in cache for IMS requests (TTL+grace+keep). Scale keep to the app-provided - // TTL. + // For valid positive-TTL objects: if (beresp.ttl > 0s) { - if (beresp.ttl < <%= @vcl_config.fetch("keep", "7d") %>) { - set beresp.keep = beresp.ttl; - } else { - set beresp.keep = <%= @vcl_config.fetch("keep", "7d") %>; - } + // Set keep values at a fixed 7d regardless of TTLs + set beresp.keep = <%= @vcl_config.fetch("keep", "7d") %>; // Hard TTL cap on all fetched objects (default 1d) if (beresp.ttl > <%= @vcl_config.fetch("ttl_cap", "1d") %>) { -- To view, visit https://gerrit.wikimedia.org/r/364605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb4be5b2311e3e4b0b6aa33f3dc59c1be0128923 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: VCL: grace-within-TTL
BBlack has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364606 ) Change subject: VCL: grace-within-TTL .. VCL: grace-within-TTL The normal idea is that "grace" is a time beyond the TTL during which we serve known-stale responses while asynchronously refreshing. Because we're violating the indicated TTL, there's pressure to keep the grace-time very short, and thus also a desire to raise it to a slightly-less-short time when a backend might be unhealthy or slow. We were using a fixed 5m for healthy grace and a fixed 60m for the unhealthy case (for the few backends for which we detect health at all in this sense, which is none of the really important ones anyways). In some cases that 60m may hurt more than help, and in many others the 5m value isn't enough. In addition to the constraining "violating the TTL" problem of this approach, the resulting short grace times on long-TTL objects considerably reduce our chances of getting async refreshes at all, which results in more stalls and user-facing latency as objects expire. At first the answer seems to be to avoid all violations of the TTL and give ourselves broader grace windows by moving the entire grace window *inside* of the original TTL, while also making it larger (percentage-based), and slightly randomized (to swizzle away stampeding refresh effects). However, grace-after-ttl has its purpose and shouldn't be reduced to zero while doing the above. If the TTL being advertised by the application turns out to be accurate (it really changes its content exactly when the original TTL expires, and counts down TTL on its own responses until that point), then the opportunistic attempts at asynchronous grace-within-TTL refreshes turn out to be pointless, as they refresh the same TTL information we already had. And if we have no grace-after-ttl, this will result in a latency/stall-inducing synchronous refresh of a hot object the moment after expiry. The approach in this commit is to create larger, randomized grace-within-TTL windows to capture the cases where the TTL we have is probably inaccurate or capped, while also keeping a fixed 5 minute grace-after-TTL window in place as well for the above case. For TTLs >= 3750s, the grace-within-TTL window is randomly set at 8%-12% of the total TTL (up to ~3h in the maximal case, and down to ~5 mins in the minimal case). For TTLs in the range 3749-600, we choose a random grace-within-TTL value of 5m +/- 15s, which approaches half the total TTL as we approach the 600 mark. For TTLs in the range 599-300, the grace-within-TTL scales down to zero (grace-within-ttl = ttl - 300), and for anything under 300 the grace-within-ttl is zero. After this value is calculated in beresp.grace, it is moved inside the ttl via "beresp.ttl = beresp.ttl - beresp.grace", and then a grace-after-TTL of 5 minutes is added via "beresp.grace = beresp.grace + 5m". Change-Id: Ia09d2cae2dfc3bd02195e35f274dd5b04cd1ff84 --- M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 1 file changed, 40 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/06/364606/1 diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb index aa65804..7655eca 100644 --- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb +++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb @@ -336,22 +336,12 @@ } sub wm_common_hit_grace { - if (obj.ttl < 0s) { - # TTL expired - if (std.healthy(req.backend_hint) && obj.grace > <%= @vcl_config.fetch("grace_healthy", "5m") %>) { - # Backend is healthy. Limit age to max vcl_config['grace_healthy'] - if (obj.ttl + <%= @vcl_config.fetch("grace_healthy", "5m") %> <= 0s) { - # No candidate for grace. Fetch a fresh object. - return (miss); - } - } else { - # Backend is sick, or object grace was < grace_healthy, so use full grace. - # We set beresp.grace in wm_common_backend_response. - if (obj.ttl + obj.grace <= 0s) { - # No candidate for grace. - return (miss); - } - } + // Grace is managed during backend_response, and we don't have health + // info for the apps that matter the most anyways + if (obj.ttl + obj.grace > 0s) { + return (deliver); + } else { + return (miss); } } @@ -393,7 +383,40 @@ set beresp.ttl = <%= @vcl_config.fetch("ttl_cap", "1d") %>; } - set beresp.grace = <%= @vcl_config.fetch("grace_sick", "60m") %>; +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add 'article' icon manually until it is available...
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364603 ) Change subject: RCFilters: Add 'article' icon manually until it is available in Apex .. RCFilters: Add 'article' icon manually until it is available in Apex Bug: T170329 Change-Id: I26a006e16861520287fae4729f5af0545cf4ec14 --- A resources/src/mediawiki.rcfilters/images/article-ltr.svg A resources/src/mediawiki.rcfilters/images/article-rtl.svg M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less 3 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/364603/1 diff --git a/resources/src/mediawiki.rcfilters/images/article-ltr.svg b/resources/src/mediawiki.rcfilters/images/article-ltr.svg new file mode 100644 index 000..862bc2b --- /dev/null +++ b/resources/src/mediawiki.rcfilters/images/article-ltr.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + diff --git a/resources/src/mediawiki.rcfilters/images/article-rtl.svg b/resources/src/mediawiki.rcfilters/images/article-rtl.svg new file mode 100644 index 000..3b16dcb --- /dev/null +++ b/resources/src/mediawiki.rcfilters/images/article-rtl.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less index c0f24c6..6028402 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less @@ -30,3 +30,12 @@ /* @embed */ background-image: url( ../images/pushPin.svg ); } + +// Temporarily include article icon, because +// Apex doesn't have it +// Should be removed when +// https://gerrit.wikimedia.org/r/#/c/364599/ is deployed +.oo-ui-iconElement-icon.oo-ui-icon-article { + /* @embed */ + background-image: url( ../images/article-ltr.svg ); +} -- To view, visit https://gerrit.wikimedia.org/r/364603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26a006e16861520287fae4729f5af0545cf4ec14 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mooeypoo___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Wikidata extension depends upon CirrusSearch
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364601 ) Change subject: Wikidata extension depends upon CirrusSearch .. Wikidata extension depends upon CirrusSearch Change-Id: I246d883e992d56ca752cc0753bb956ccd65c0f88 --- M zuul/parameter_functions.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Addshore: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index c56c6bc..6abc2cf 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -242,7 +242,7 @@ 'WikibaseQuality': ['Wikibase'], 'WikibaseQualityConstraints': ['Wikibase', 'WikibaseQuality'], 'WikibaseQualityExternalValidation': ['Wikibase', 'WikibaseQuality'], -'Wikidata': ['cldr', 'Elastica', +'Wikidata': ['CirrusSearch', 'cldr', 'Elastica', 'GeoData', 'Scribunto'], 'Wikidata.org': ['Wikibase'], 'WikidataPageBanner': ['Wikidata'], -- To view, visit https://gerrit.wikimedia.org/r/364601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I246d883e992d56ca752cc0753bb956ccd65c0f88 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: LegoktmGerrit-Reviewer: Addshore 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...EventBus[master]: Recentchange: Populate the parsedcomment field
Ppchelko has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364602 ) Change subject: Recentchange: Populate the parsedcomment field .. Recentchange: Populate the parsedcomment field Bug: T170145 Change-Id: I3ea4db6d8ccc7bc1d302039049b45226f70fc9e7 Depends-On: I20a9dc013ea4f989e7bafd0fc980d97fa6b3060c --- M EventBusRCFeedFormatter.php 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus refs/changes/02/364602/1 diff --git a/EventBusRCFeedFormatter.php b/EventBusRCFeedFormatter.php index 9556c97..9dd3206 100644 --- a/EventBusRCFeedFormatter.php +++ b/EventBusRCFeedFormatter.php @@ -24,10 +24,16 @@ * @see MachineReadableRCFeedFormatter::getLine */ public function getLine( array $feed, RecentChange $rc, $actionComment ) { + $attrs = parent::getLine( $feed, $rc, $actionComment ); + + if ( isset( $attrs['comment'] ) ) { + $attrs['parsedcomment'] = Linker::formatComment( $attrs['comment'], $rc->getTitle() ); + } + $event = EventBus::createEvent( EventBus::getArticleURL( $rc->getTitle() ), self::TOPIC, - parent::getLine( $feed, $rc, $actionComment ) + $attrs ); // If timestamp exists on the recentchange event (it should), @@ -36,6 +42,7 @@ $event['meta']['dt'] = date( 'c', $event['timestamp'] ); } $events = [ $event ]; + return EventBus::serializeEvents( $events ); } -- To view, visit https://gerrit.wikimedia.org/r/364602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ea4db6d8ccc7bc1d302039049b45226f70fc9e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventBus Gerrit-Branch: master Gerrit-Owner: Ppchelko___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Wikidata extension depends upon CirrusSearch
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364601 ) Change subject: Wikidata extension depends upon CirrusSearch .. Wikidata extension depends upon CirrusSearch Change-Id: I246d883e992d56ca752cc0753bb956ccd65c0f88 --- M zuul/parameter_functions.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/01/364601/1 diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index c56c6bc..6abc2cf 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -242,7 +242,7 @@ 'WikibaseQuality': ['Wikibase'], 'WikibaseQualityConstraints': ['Wikibase', 'WikibaseQuality'], 'WikibaseQualityExternalValidation': ['Wikibase', 'WikibaseQuality'], -'Wikidata': ['cldr', 'Elastica', +'Wikidata': ['CirrusSearch', 'cldr', 'Elastica', 'GeoData', 'Scribunto'], 'Wikidata.org': ['Wikibase'], 'WikidataPageBanner': ['Wikidata'], -- To view, visit https://gerrit.wikimedia.org/r/364601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I246d883e992d56ca752cc0753bb956ccd65c0f88 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Recentchange: Add optional parsedcomment to the schema.
Ppchelko has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364600 ) Change subject: Recentchange: Add optional parsedcomment to the schema. .. Recentchange: Add optional parsedcomment to the schema. Bug: T170145 Change-Id: I20a9dc013ea4f989e7bafd0fc980d97fa6b3060c --- M jsonschema/mediawiki/recentchange/1.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas refs/changes/00/364600/1 diff --git a/jsonschema/mediawiki/recentchange/1.yaml b/jsonschema/mediawiki/recentchange/1.yaml index 6d1b154..a3ebbad 100644 --- a/jsonschema/mediawiki/recentchange/1.yaml +++ b/jsonschema/mediawiki/recentchange/1.yaml @@ -70,6 +70,10 @@ description: (rc_comment) type: string + parsedcomment: +description: The rc_comment parsed into simple HTML. Optional +type: string + timestamp: description: Unix timestamp (derived from rc_timestamp). type: integer -- To view, visit https://gerrit.wikimedia.org/r/364600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20a9dc013ea4f989e7bafd0fc980d97fa6b3060c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/event-schemas Gerrit-Branch: master Gerrit-Owner: Ppchelko___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Add 'article' icon to Apex
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364599 ) Change subject: Add 'article' icon to Apex .. Add 'article' icon to Apex Bug: T170329 Change-Id: I282eed901eefb34983514069d283f3aee488c47b --- M src/themes/apex/icons-content.json A src/themes/apex/images/icons/article-ltr.svg A src/themes/apex/images/icons/article-rtl.svg 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/99/364599/1 diff --git a/src/themes/apex/icons-content.json b/src/themes/apex/icons-content.json index a9db33f..cb40574 100644 --- a/src/themes/apex/icons-content.json +++ b/src/themes/apex/icons-content.json @@ -2,6 +2,10 @@ "prefix": "oo-ui-icon", "intro": "@import '../../../../src/styles/common';", "images": { + "article": { "file": { + "ltr": "images/icons/article-ltr.svg", + "rtl": "images/icons/article-rtl.svg" + } }, "articles": { "file": { "ltr": "images/icons/articles-ltr.svg", "rtl": "images/icons/articles-rtl.svg" diff --git a/src/themes/apex/images/icons/article-ltr.svg b/src/themes/apex/images/icons/article-ltr.svg new file mode 100644 index 000..862bc2b --- /dev/null +++ b/src/themes/apex/images/icons/article-ltr.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + diff --git a/src/themes/apex/images/icons/article-rtl.svg b/src/themes/apex/images/icons/article-rtl.svg new file mode 100644 index 000..3b16dcb --- /dev/null +++ b/src/themes/apex/images/icons/article-rtl.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + -- To view, visit https://gerrit.wikimedia.org/r/364599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I282eed901eefb34983514069d283f3aee488c47b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Mooeypoo___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
1 2 3 4 5 >