[MediaWiki-commits] [Gerrit] Update model class memory semantics, use properties for access. - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review. https://gerrit.wikimedia.org/r/211716 Change subject: Update model class memory semantics, use properties for access. .. Update model class memory semantics, use properties for access. Change-Id: I4938141e8cdfc76241bafd220d7362c32b55be6c --- M MediaWikiKit/MediaWikiKit/MWKArticle.h M MediaWikiKit/MediaWikiKit/MWKArticle.m M MediaWikiKit/MediaWikiKit/MWKDataStore.h M MediaWikiKit/MediaWikiKit/MWKDataStore.m M MediaWikiKit/MediaWikiKit/MWKHistoryEntry.h M MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m M MediaWikiKit/MediaWikiKit/MWKHistoryList.h M MediaWikiKit/MediaWikiKit/MWKHistoryList.m M MediaWikiKit/MediaWikiKit/MWKImage.h M MediaWikiKit/MediaWikiKit/MWKImage.m M MediaWikiKit/MediaWikiKit/MWKImageInfo.h M MediaWikiKit/MediaWikiKit/MWKImageInfo.m M MediaWikiKit/MediaWikiKit/MWKImageList.h M MediaWikiKit/MediaWikiKit/MWKImageList.m M MediaWikiKit/MediaWikiKit/MWKLicense.h M MediaWikiKit/MediaWikiKit/MWKLicense.m M MediaWikiKit/MediaWikiKit/MWKProtectionStatus.m M MediaWikiKit/MediaWikiKit/MWKRecentSearchEntry.h M MediaWikiKit/MediaWikiKit/MWKRecentSearchEntry.m M MediaWikiKit/MediaWikiKit/MWKRecentSearchList.h M MediaWikiKit/MediaWikiKit/MWKRecentSearchList.m M MediaWikiKit/MediaWikiKit/MWKSavedPageEntry.h M MediaWikiKit/MediaWikiKit/MWKSavedPageEntry.m M MediaWikiKit/MediaWikiKit/MWKSavedPageList.h M MediaWikiKit/MediaWikiKit/MWKSavedPageList.m M MediaWikiKit/MediaWikiKit/MWKSection.h M MediaWikiKit/MediaWikiKit/MWKSection.m M MediaWikiKit/MediaWikiKit/MWKSectionList.h M MediaWikiKit/MediaWikiKit/MWKSectionList.m M MediaWikiKit/MediaWikiKit/MWKSite.h M MediaWikiKit/MediaWikiKit/MWKSite.m M MediaWikiKit/MediaWikiKit/MWKSiteDataObject.h M MediaWikiKit/MediaWikiKit/MWKSiteDataObject.m M MediaWikiKit/MediaWikiKit/MWKTitle.h M MediaWikiKit/MediaWikiKit/MWKTitle.m M MediaWikiKit/MediaWikiKit/MWKUser.h M MediaWikiKit/MediaWikiKit/MWKUser.m M MediaWikiKit/MediaWikiKit/MWKUserDataStore.h M MediaWikiKit/MediaWikiKit/MWKUserDataStore.m M Wikipedia/Data/SchemaConverter.h M Wikipedia/Session/SessionSingleton.m 41 files changed, 593 insertions(+), 409 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/16/211716/1 diff --git a/MediaWikiKit/MediaWikiKit/MWKArticle.h b/MediaWikiKit/MediaWikiKit/MWKArticle.h index 93f55de..975dc07 100644 --- a/MediaWikiKit/MediaWikiKit/MWKArticle.h +++ b/MediaWikiKit/MediaWikiKit/MWKArticle.h @@ -26,30 +26,29 @@ } // Identifiers -@property (readonly) MWKSite* site; -@property (readonly) MWKTitle* title; -@property (readonly) MWKDataStore* dataStore; +@property (readonly, strong, nonatomic) MWKTitle* title; +@property (readonly, weak, nonatomic) MWKDataStore* dataStore; // Metadata -@property (readonly) MWKTitle* redirected;// optional -@property (readonly) NSDate* lastmodified;// required -@property (readonly) MWKUser* lastmodifiedby; // required -@property (readonly) int articleId; // required; - 'id' -@property (readonly) int languagecount; // required; int -@property (readonly) NSString* displaytitle; // optional -@property (readonly) MWKProtectionStatus* protection; // required -@property (readonly) BOOL editable; // required +@property (readonly, strong, nonatomic) MWKTitle* redirected; // optional +@property (readonly, strong, nonatomic) NSDate* lastmodified; // required +@property (readonly, strong, nonatomic) MWKUser* lastmodifiedby; // required +@property (readonly, assign, nonatomic) int articleId; // required; - 'id' +@property (readonly, assign, nonatomic) int languagecount; // required; int +@property (readonly, copy, nonatomic) NSString* displaytitle; // optional +@property (readonly, strong, nonatomic) MWKProtectionStatus* protection; // required +@property (readonly, assign, nonatomic) BOOL editable; // required -@property (readwrite, nonatomic) NSString* thumbnailURL; // optional; pulled separately via search -@property (readwrite, nonatomic) NSString* imageURL; // optional; pulled in article request +@property (readwrite, copy, nonatomic) NSString* thumbnailURL; // optional; pulled separately via search +@property (readwrite, copy, nonatomic) NSString* imageURL; // optional; pulled in article request -@property (readonly) NSString* entityDescription;// optional; currently pulled separately via wikidata +@property (readonly, copy, nonatomic) NSString* entityDescription; // optional; currently pulled separately via wikidata -@property (readonly) MWKSectionList* sections; +@property (readonly, strong, nonatomic) MWKSectionList* sections; -@property (readonly) MWKImageList* images; -@property (readonly)
[MediaWiki-commits] [Gerrit] Update Wikidata - fix rdf dump script - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata - fix rdf dump script .. Update Wikidata - fix rdf dump script Change-Id: I55fc24a10866766e991d36ac476091b8f8232d1f --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Wikidata b/extensions/Wikidata index a1076ab..3eec383 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit a1076ab3607588cf434fba133face2e748db7721 +Subproject commit 3eec38343adeef51c3ffd0ece021158f3dd459c4 -- To view, visit https://gerrit.wikimedia.org/r/211700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I55fc24a10866766e991d36ac476091b8f8232d1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Graph extension on Wikidata - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable Graph extension on Wikidata .. Enable Graph extension on Wikidata default = true for everywhere now Change-Id: Ia04a621cf8e3cc98628ea65f1c8d013d21ede327 --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 2f532a2..45e5e54 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -1082,11 +1082,6 @@ 'default' = true, ), - 'wmgUseGraph' = array( - 'default' = true, - 'wikidatawiki' = true, - ), - 'wmgGraphImgServiceAlways' = array( 'default' = true, ), diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e9cc1bd..31bbe80 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12996,7 +12996,6 @@ 'wmgUseGraph' = array( 'default' = true, - 'wikidatawiki' = false, // safety - need to test wikidata separatelly ), // All graph data requests should be trusted on these wikis -- To view, visit https://gerrit.wikimedia.org/r/211714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia04a621cf8e3cc98628ea65f1c8d013d21ede327 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Wikibase arbitrary access on enwikivoyage, fawiki and... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable Wikibase arbitrary access on enwikivoyage, fawiki and hewiki .. Enable Wikibase arbitrary access on enwikivoyage, fawiki and hewiki Bug: T98249 Change-Id: Ie30291ec0631920617d8795d6c0c8934a6759961 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 67c698f..e9cc1bd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14831,7 +14831,10 @@ 'wmgWikibaseEnableArbitraryAccess' = array( 'default' = false, + 'enwikivoyage' = true, + 'fawiki' = true, 'frwikisource' = true, + 'hewiki' = true, 'nlwiki' = true, 'testwiki' = true, 'wikidata' = true, @@ -15452,7 +15455,7 @@ 'default' = '//bits.wikimedia.org/beacon/media', ), -// open external/specific links on voteWiki in new tab or window +// open external/specific links on voteWiki in new tab or window // Partially for T98013 and in general help SecurePoll fail less often 'wgExternalLinkTarget' = array( 'default' = false, -- To view, visit https://gerrit.wikimedia.org/r/211712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie30291ec0631920617d8795d6c0c8934a6759961 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Core data performance improvements. Bug T99260 - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review. https://gerrit.wikimedia.org/r/211717 Change subject: Core data performance improvements. Bug T99260 .. Core data performance improvements. Bug T99260 Separate core data fetches into batches. Reset context in-between fetches to reduce memory. Move to async operations to allow UI to update progress during saves. Change-Id: Iffdb31166dacde1caef5d89f2050f11b404a85c7 --- M Wikipedia/Data/OldDataSchemaMigrator.m 1 file changed, 98 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/17/211717/1 diff --git a/Wikipedia/Data/OldDataSchemaMigrator.m b/Wikipedia/Data/OldDataSchemaMigrator.m index 616cb07..609bb32 100644 --- a/Wikipedia/Data/OldDataSchemaMigrator.m +++ b/Wikipedia/Data/OldDataSchemaMigrator.m @@ -105,48 +105,110 @@ } - (void)migrateData { -[self.context performBlock:^{ -NSFetchRequest* req = [NSFetchRequest fetchRequestWithEntityName:@Saved]; -req.sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@dateSaved ascending:YES]]; -NSError* err; -NSArray* savedEntries = [self.context executeFetchRequest:req error:err]; - -if (err) { -NSLog(@Error reading old Saved entries: %@, err); +dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ +if (![self migrateHistory]) { } -NSFetchRequest* req2 = [NSFetchRequest fetchRequestWithEntityName:@History]; -req2.sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@dateVisited ascending:YES]]; -NSError* err2; -NSArray* historyEntries = [self.context executeFetchRequest:req2 error:err2]; - -if (err2) { -NSLog(@Error reading old History entries: %@, err2); -} - -NSUInteger totalArticlesToMigrate = [savedEntries count]; -__block NSUInteger numberOfArticlesMigrated = 0; - -void (^ incrementAndNotify)(void) = ^void (void) { -numberOfArticlesMigrated++; -dispatch_async(dispatch_get_main_queue(), ^{ -[self.progressDelegate oldDataSchema:self didUpdateProgressWithArticlesCompleted:numberOfArticlesMigrated total:totalArticlesToMigrate]; -}); -}; - -for (History* history in historyEntries) { -[self migrateHistory:history]; -} - -for (Saved* saved in savedEntries) { -[self migrateSaved:saved]; -[self migrateArticle:saved.article]; -incrementAndNotify(); +if (![self migrateSavedPages]) { } [self moveOldDataToBackupLocation]; -[self.progressDelegate oldDataSchemaDidFinishMigration:self]; + +dispatch_async(dispatch_get_main_queue(), ^{ +[self.progressDelegate oldDataSchemaDidFinishMigration:self]; +}); +}); +} + +- (BOOL)migrateHistory { +__block NSError* error; + +[self.context performBlockAndWait:^{ +NSFetchRequest* req2 = [NSFetchRequest fetchRequestWithEntityName:@History]; +req2.sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@dateVisited ascending:YES]]; +NSArray* historyEntries = [self.context executeFetchRequest:req2 error:error]; + +if (error) { +NSLog(@Error reading old History entries: %@, error); +} + +for (History* history in historyEntries) { +@autoreleasepool { +[self migrateHistory:history]; +} +} + +[self.context reset]; }]; + + +return error == nil; +} + +- (BOOL)migrateSavedPages { +__block NSError* error; +__block NSUInteger totalArticlesToMigrate = 0; +__block NSUInteger numberOfArticlesMigrated = 0; + +[self.context performBlockAndWait:^{ +NSFetchRequest* req = [NSFetchRequest fetchRequestWithEntityName:@Saved]; +req.sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@dateSaved ascending:YES]]; +totalArticlesToMigrate = [self.context countForFetchRequest:req error:error]; +NSLog(@total articles: %lu, totalArticlesToMigrate); +}]; + +NSUInteger fetchSize = 25; +__block BOOL moreSavedEntriesToProcess = YES; +__block NSUInteger fetchOffset = 0; + +if (totalArticlesToMigrate 0) { +while (moreSavedEntriesToProcess) { +NSFetchRequest* req = [NSFetchRequest fetchRequestWithEntityName:@Saved]; +req.sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey:@dateSaved ascending:YES]]; +req.fetchLimit = fetchSize; +req.fetchOffset = fetchOffset; + +[self.context performBlock:^{ +NSError* innerError; +NSArray* savedEntries = [self.context executeFetchRequest:req error:innerError]; + +if (savedEntries) { +
[MediaWiki-commits] [Gerrit] API Import: Die when namespace and rootpage is set - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: API Import: Die when namespace and rootpage is set .. API Import: Die when namespace and rootpage is set With I11521260a88a7f4a95fbdb71ac50bcf7b4fe5cd1 the rootpage parameter gets ignored when namespace parameter is set. This can break the behaviour for the client. Just break the client by returning an error instead of silent ignoring a parameter. Change-Id: Ie1c7447b5d59ff4d3466b504d5d1afc0d296841a --- M includes/api/ApiImport.php M includes/api/i18n/en.json 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Anomie: Looks good to me, approved TTO: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index 40cf6e2..4154083 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -35,6 +35,8 @@ $user = $this-getUser(); $params = $this-extractRequestParams(); + $this-requireMaxOneParameter( $params, 'namespace', 'rootpage' ); + $isUpload = false; if ( isset( $params['interwikisource'] ) ) { if ( !$user-isAllowed( 'import' ) ) { diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index 3c53be1..bece0b2 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -196,8 +196,8 @@ apihelp-import-param-interwikipage: For interwiki imports: page to import., apihelp-import-param-fullhistory: For interwiki imports: import the full history, not just the current version., apihelp-import-param-templates: For interwiki imports: import all included templates as well., - apihelp-import-param-namespace: Import to this namespace. Overrides the kbd$1rootpage/kbd parameter., - apihelp-import-param-rootpage: Import as subpage of this page. Ignored if the kbd$1namespace/kbd parameter is provided., + apihelp-import-param-namespace: Import to this namespace. Cannot be used together with var$1rootpage/var., + apihelp-import-param-rootpage: Import as subpage of this page. Cannot be used together with var$1namespace/var., apihelp-import-example-import: Import [[meta:Help:Parserfunctions]] to namespace 100 with full history., apihelp-login-description: Log in and get authentication cookies.\n\nIn the event of a successful log-in, the needed cookies will be included in the HTTP response headers. In the event of a failed log-in, further attempts may be throttled to limit automated password guessing attacks., -- To view, visit https://gerrit.wikimedia.org/r/210945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1c7447b5d59ff4d3466b504d5d1afc0d296841a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: TTO at.li...@live.com.au Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Title::isExternal, not Title::isLocal - change (mediawiki...TemplateSandbox)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/211715 Change subject: Use Title::isExternal, not Title::isLocal .. Use Title::isExternal, not Title::isLocal The latter considers prefixes such as 'fr:' to be local on enwiki, which is completely not what we want here. Bug: T99523 Change-Id: I7becc344cf41c7f7551dc469005a52fba5374742 --- M SpecialTemplateSandbox.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox refs/changes/15/211715/1 diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php index fdf5471..83953e6 100644 --- a/SpecialTemplateSandbox.php +++ b/SpecialTemplateSandbox.php @@ -194,7 +194,7 @@ if ( !$title instanceof Title || $title-getFragment() !== '' ) { return $this-msg( 'templatesandbox-invalid-prefix' )-parseAsBlock(); } - if ( !$title-isLocal() ) { + if ( $title-isExternal() ) { return $this-msg( 'templatesandbox-prefix-not-local' )-parseAsBlock(); } $this-prefixes[] = $title-getFullText(); -- To view, visit https://gerrit.wikimedia.org/r/211715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7becc344cf41c7f7551dc469005a52fba5374742 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateSandbox Gerrit-Branch: master Gerrit-Owner: Anomie bjor...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only enforce subpage rules on batch wikitext-Flow conversions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Only enforce subpage rules on batch wikitext-Flow conversions .. Only enforce subpage rules on batch wikitext-Flow conversions Refactor isAllowed to move the subpage rules to ConversionStrategy Also move logic about LQT vs. wikitext (and which conversions can handle which) to the same place. Bug: T99111 Change-Id: I0fb1b2e3bbca97802520f54d2ed864edb482f414 --- M autoload.php M includes/Import/Converter.php A includes/Import/EnableFlow/EnableFlowWikitextConversionStrategy.php M includes/Import/IConversionStrategy.php M includes/Import/LiquidThreadsApi/ConversionStrategy.php M includes/Import/Wikitext/ConversionStrategy.php M includes/Specials/SpecialEnableFlow.php M maintenance/convertNamespaceFromWikitext.php M tests/phpunit/Import/Wikitext/ConversionStrategyTest.php 9 files changed, 194 insertions(+), 27 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index 0bb4d83..e7fae7c 100644 --- a/autoload.php +++ b/autoload.php @@ -162,6 +162,7 @@ 'Flow\\Formatter\\TopicListQuery' = __DIR__ . '/includes/Formatter/TopicListQuery.php', 'Flow\\Formatter\\TopicRow' = __DIR__ . '/includes/Formatter/TopicRow.php', 'Flow\\Import\\Converter' = __DIR__ . '/includes/Import/Converter.php', + 'Flow\\Import\\EnableFlow\\EnableFlowWikitextConversionStrategy' = __DIR__ . '/includes/Import/EnableFlow/EnableFlowWikitextConversionStrategy.php', 'Flow\\Import\\FileImportSourceStore' = __DIR__ . '/includes/Import/ImportSourceStore.php', 'Flow\\Import\\HistoricalUIDGenerator' = __DIR__ . '/includes/Import/Importer.php', 'Flow\\Import\\IConversionStrategy' = __DIR__ . '/includes/Import/IConversionStrategy.php', diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php index 8c9c95a..1b64679 100644 --- a/includes/Import/Converter.php +++ b/includes/Import/Converter.php @@ -155,15 +155,8 @@ return true; } - // Don't allow conversion of sub pages unless it is - // a talk page with matching subject page. For example - // we will convert User_talk:Foo/bar only if User:Foo/bar - // exists, and we will never convert User:Baz/bang. - if ( $title-isSubPage() ( !$title-isTalkPage() || !$title-getSubjectPage()-exists() ) ) { - return false; - } - - return true; + // Finally, check strategy-specific logic + return $this-strategy-shouldConvert( $title ); } protected function doConversion( Title $title, Title $movedFrom = null ) { diff --git a/includes/Import/EnableFlow/EnableFlowWikitextConversionStrategy.php b/includes/Import/EnableFlow/EnableFlowWikitextConversionStrategy.php new file mode 100644 index 000..f8bea89 --- /dev/null +++ b/includes/Import/EnableFlow/EnableFlowWikitextConversionStrategy.php @@ -0,0 +1,18 @@ +?php + +namespace Flow\Import\EnableFlow; + +use Title; + +class EnableFlowWikitextConversionStrategy extends \Flow\Import\Wikitext\ConversionStrategy { + /** +* {@inheritDoc} +*/ + public function meetsSubpageRequirements( Title $sourceTitle ) { + // If they're using Special:EnableFlow, they're choosing a specific page + // one at a time, so assume they know what they're doing. This allows: + // * Namespace_talk:Foo/bar even if Namespace:Foo/bar does not exist + // * Namespace:Baz/bang + return true; + } +} diff --git a/includes/Import/IConversionStrategy.php b/includes/Import/IConversionStrategy.php index c797da2..a035a2c 100644 --- a/includes/Import/IConversionStrategy.php +++ b/includes/Import/IConversionStrategy.php @@ -9,6 +9,7 @@ /** * Interface between the Converter and an implementation of IImportSource. + * Informs conversion behavior and which pages should be converted. */ interface IConversionStrategy { /** @@ -79,4 +80,14 @@ * @return Postprocessor|null */ function getPostprocessor(); + + /** +* Checks whether the title should be converted. +* This is a secondary filter in addition to the original list (which might be a +* single title, a namespace, etc.) passed into convert/convertAll. +* +* @param Title $sourceTitle +* @return bool True if and only if it should be converted +*/ + function shouldConvert( Title $sourceTitle ); } diff --git a/includes/Import/LiquidThreadsApi/ConversionStrategy.php b/includes/Import/LiquidThreadsApi/ConversionStrategy.php index 26dfd9b..853a9ba 100644 --- a/includes/Import/LiquidThreadsApi/ConversionStrategy.php +++
[MediaWiki-commits] [Gerrit] Log frontend parsoid varnish requests to kafka via varnishkafka - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/211720 Change subject: Log frontend parsoid varnish requests to kafka via varnishkafka .. Log frontend parsoid varnish requests to kafka via varnishkafka Bug: T99372 Change-Id: Ie48a4a9aaf179173e1de029f69c3da3265f118d2 --- M modules/role/manifests/cache/parsoid.pp 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/211720/1 diff --git a/modules/role/manifests/cache/parsoid.pp b/modules/role/manifests/cache/parsoid.pp index 851b02b..6bd2381 100644 --- a/modules/role/manifests/cache/parsoid.pp +++ b/modules/role/manifests/cache/parsoid.pp @@ -121,4 +121,14 @@ }, ]), } + +# ToDo: Remove production conditional once this works +# is verified to work in labs. +if $::realm == 'production' { +# Install a varnishkafka producer to send +# varnish webrequest logs to Kafka. +class { 'role::cache::kafka::webrequest': +topic = 'webrequest_parsoid', +} +} } -- To view, visit https://gerrit.wikimedia.org/r/211720 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie48a4a9aaf179173e1de029f69c3da3265f118d2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use udp2log::rsyncd class to set up rsyncd on fluorine - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Use udp2log::rsyncd class to set up rsyncd on fluorine .. Use udp2log::rsyncd class to set up rsyncd on fluorine This gives default ferm rules to allow rsyncing of files Bug: T99245 Change-Id: I564b3b77b07035b15965dcf869a035630a1e2f2e --- M manifests/role/logging.pp M modules/statistics/manifests/rsync/mediawiki.pp 2 files changed, 7 insertions(+), 13 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp index 47d9ad0..a2b87fd 100644 --- a/manifests/role/logging.pp +++ b/manifests/role/logging.pp @@ -75,6 +75,12 @@ }, } +# Allow rsyncing of udp2log generated files to +# analysis hosts. +class { 'misc::udp2log::rsyncd': +path = $log_directory, +} + cron { 'mw-log-cleanup': command = '/usr/local/bin/mw-log-cleanup', user= 'root', @@ -101,18 +107,6 @@ group = 'root', mode = '0555', source = 'puppet:///files/misc/scripts/fatalmonitor', -} - -include rsync::server -# Allow rsyncing of mw-log files to other places for analysis. -rsync::server::module { 'mw-log': -path= $log_directory, -read_only = 'yes', -list= 'yes', -# There is some private data in mw-log files, so -# only allow rsyncing to stat1002.eqiad.wmnet, -# the stat server with other private data. -hosts_allow = ['stat1002.eqiad.wmnet'], } $cirrussearch_slow_log_check_interval = 5 diff --git a/modules/statistics/manifests/rsync/mediawiki.pp b/modules/statistics/manifests/rsync/mediawiki.pp index 0dee4a5..bf3ea2f 100644 --- a/modules/statistics/manifests/rsync/mediawiki.pp +++ b/modules/statistics/manifests/rsync/mediawiki.pp @@ -20,7 +20,7 @@ # Search request logs from fluorine statistics::rsync_job { 'CirrusSearchRequests': -source = 'fluorine.eqiad.wmnet::mw-log/archive/CirrusSearchRequests.*.gz', +source = 'fluorine.eqiad.wmnet::udp2log/archive/CirrusSearchRequests.*.gz', destination= ${working_path}/mw-log/archive, retention_days = $retention_days, } -- To view, visit https://gerrit.wikimedia.org/r/211721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I564b3b77b07035b15965dcf869a035630a1e2f2e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiResult::META_BC_BOOLS in ApiAbuseFilterCheckMatch - change (mediawiki...AbuseFilter)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/211722 Change subject: ApiResult::META_BC_BOOLS in ApiAbuseFilterCheckMatch .. ApiResult::META_BC_BOOLS in ApiAbuseFilterCheckMatch Coded to maintain BC with older versions of MediaWiki core. If that's not needed anymore, a followup should remove all the instances of the check. Bug: T99240 Change-Id: I5dc112598676915416fbacd4c30f218ac84d324d --- M api/ApiAbuseFilterCheckMatch.php 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/22/211722/1 diff --git a/api/ApiAbuseFilterCheckMatch.php b/api/ApiAbuseFilterCheckMatch.php index 9129b97..f426eec 100644 --- a/api/ApiAbuseFilterCheckMatch.php +++ b/api/ApiAbuseFilterCheckMatch.php @@ -54,11 +54,17 @@ $this-dieUsage( 'The filter has invalid syntax', 'badsyntax' ); } - $result = AbuseFilter::checkConditions( $params['filter'], $vars ); + $result = array( + 'result' = AbuseFilter::checkConditions( $params['filter'], $vars ), + ); + if ( defined( 'ApiResult::META_CONTENT' ) ) { + $result[ApiResult::META_BC_BOOLS][] = 'result'; + } + $this-getResult()-addValue( null, $this-getModuleName(), - array( 'result' = $result ) + $result ); } -- To view, visit https://gerrit.wikimedia.org/r/211722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5dc112598676915416fbacd4c30f218ac84d324d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Anomie bjor...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add se-sme in languagenames.json - change (mediawiki...cxserver)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/211691 Change subject: Add se-sme in languagenames.json .. Add se-sme in languagenames.json Change-Id: Id6891b80f7ad3ed8ea84072fffdb87caba640079 --- M mt/Apertium.languagenames.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/91/211691/1 diff --git a/mt/Apertium.languagenames.json b/mt/Apertium.languagenames.json index 468a0b5..6610930 100644 --- a/mt/Apertium.languagenames.json +++ b/mt/Apertium.languagenames.json @@ -33,6 +33,7 @@ oc: oci, pt: por, ro: ron, + se: sme, sh: hbs, simple: eng, sl: slv, -- To view, visit https://gerrit.wikimedia.org/r/211691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6891b80f7ad3ed8ea84072fffdb87caba640079 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depooling db1063 for configuration and restart - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211693 Change subject: Depooling db1063 for configuration and restart .. Depooling db1063 for configuration and restart Change-Id: I3cde09a33cc4d2309e1def6f4dc2d5a1db24cb31 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/93/211693/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index db1cc57..44e83ce 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -105,7 +105,7 @@ 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api - 'db1063' = 400, # 2.8TB 128GB +# 'db1063' = 400, # 2.8TB 128GB depooling for configuration and restart 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( -- To view, visit https://gerrit.wikimedia.org/r/211693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cde09a33cc4d2309e1def6f4dc2d5a1db24cb31 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depooling db1063 for configuration and restart - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: Depooling db1063 for configuration and restart .. Depooling db1063 for configuration and restart Change-Id: I3cde09a33cc4d2309e1def6f4dc2d5a1db24cb31 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved Springle: Looks good to me, but someone else must approve diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index db1cc57..44e83ce 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -105,7 +105,7 @@ 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api - 'db1063' = 400, # 2.8TB 128GB +# 'db1063' = 400, # 2.8TB 128GB depooling for configuration and restart 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( -- To view, visit https://gerrit.wikimedia.org/r/211693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3cde09a33cc4d2309e1def6f4dc2d5a1db24cb31 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Promisify Scraper.js - change (mediawiki...citoid)
Mvolz has uploaded a new change for review. https://gerrit.wikimedia.org/r/211718 Change subject: [WIP] Promisify Scraper.js .. [WIP] Promisify Scraper.js Currently WIP; only method currently promisified is parseHTML. Uses promisifymerged branch of html-metadata until changes are merged into master there. Bug: T75993 Change-Id: I4c2c3638f4c6cc580f1ed45f82874da8ed3db06c --- M lib/Scraper.js M package.json 2 files changed, 69 insertions(+), 58 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid refs/changes/18/211718/1 diff --git a/lib/Scraper.js b/lib/Scraper.js index 0df0d52..2022760 100644 --- a/lib/Scraper.js +++ b/lib/Scraper.js @@ -11,11 +11,12 @@ var request = require('request'); var urlParse = require('url'); var cheerio = require('cheerio'); -var parseMetaData = require('html-metadata').parseAll; +var parseOpenGraph = require('html-metadata').parseOpenGraph; var og = require('./translators/openGraph.js'); var gen = require('./translators/general.js'); var iconv = require('iconv-lite'); var contentType = require('content-type'); +var BBPromise = require('bluebird'); var Scraper = function(citoidConfig, logger){ this.logger = logger; @@ -103,7 +104,8 @@ // If the html has been successfully loaded into cheerio, proceed. if (chtml){ citation.title = null; - scraper.parseHTML(url, chtml, citation, function(citation){ + scraper.parseHTML(url, chtml, citation) + .then(function(citation){ logger.log('debug/scraper', Sucessfully scraped resource at + url); callback(null, 200, [citation]); }); @@ -196,68 +198,77 @@ }; /** - * Adds html metadata to a given citation object given - * the html loaded into cheerio - * @param {String} url url being scraped - * @param {Objct} chtml Cheerio object with html loaded - * @param {Object} citation a citation object contain default parameters - * @param {Function} callback callback(citation) + * Promise for citation object with html metadata added to default + * citation object + * + * @param {String} url url being scraped + * @param {Object} chtml Cheerio object with html loaded + * @param {Object} citationa citation object contain default parameters + * @return {Object} Bluebird promise for citation object */ -Scraper.prototype.parseHTML = function(url, chtml, citation, callback){ - var metaData, typeTranslator, parsedUrl; +Scraper.prototype.parseHTML = BBPromise.method(function(url, chtml, citation){ + var metaData = {}; + var typeTranslator; + var parsedUrl; - parseMetaData(chtml, function(err, results){ - metaData = results; //only use open graph here - }); + return parseOpenGraph(chtml) + .catch(function(e){ + console.log('error'); + return citation; + }) + .then(function(results){ + console.log('results'); + metaData.openGraph = results; //only currently using open graph - // translator/openGraph.js properties + // translator/openGraph.js properties - // Set zotero type from OpenGraph type - if (metaData.openGraph['type'] og.types[metaData.openGraph['type']]){ // if there is a type in the results and that type is defined in openGraph.js - citation.itemType = og.types[metaData.openGraph['type']]; - } - else { - citation.itemType = 'webpage'; //default itemType - } - - // Add universal (non type specific) OpenGraph properties - citation = translate(citation, metaData.openGraph, og.general); - - // Add type specific Open Graph properties - typeTranslator = og[citation.itemType]; - if (typeTranslator){ - citation = translate(citation, metaData.openGraph, typeTranslator); - } - - // Fall back on general metadata - citation = translate(citation, metaData.general, gen.general); - - // Fall back methods - - // Title - if (!citation.title){ - citation.title = getTitle(url, chtml); - } - - // Access date - universal - format -MM-DD - citation.accessDate = (new Date()).toISOString().substring(0, 10); - - // Fall back websiteTitle - webpage only - if (citation.itemType === 'webpage' !citation.websiteTitle){ - parsedUrl = urlParse.parse(url); - if (citation.title parsedUrl parsedUrl.hostname) { - citation.websiteTitle =
[MediaWiki-commits] [Gerrit] Another fix for addition of having param - fix for 21e6796 - change (mediawiki...Cargo)
jenkins-bot has submitted this change and it was merged. Change subject: Another fix for addition of having param - fix for 21e6796 .. Another fix for addition of having param - fix for 21e6796 Change-Id: I53e5bc0c6c3219051f8832f35fd7013f12fee648 --- M api/CargoQueryAPI.php 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/api/CargoQueryAPI.php b/api/CargoQueryAPI.php index 90628d1..c591a42 100644 --- a/api/CargoQueryAPI.php +++ b/api/CargoQueryAPI.php @@ -20,6 +20,7 @@ $joinOnStr = $params['join_on']; $orderByStr = $params['order_by']; $groupByStr = $params['group_by']; + $havingStr = $params['having']; $limitStr = $params['limit']; if ( $tablesStr == '' ) { @@ -27,7 +28,7 @@ } $sqlQuery = CargoSQLQuery::newFromValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, - $groupByStr, $orderByStr, $limitStr ); + $havingStr, $groupByStr, $orderByStr, $limitStr ); try { $queryResults = $sqlQuery-run(); } catch ( Exception $e ) { @@ -59,8 +60,9 @@ 'fields' = null, 'where' = null, 'join_on' = null, - 'order_by' = null, 'group_by' = null, + 'having' = null, + 'order_by' = null, ); } @@ -72,6 +74,7 @@ 'join_on' = 'Conditions for joining multiple tables, corresponding to an SQL JOIN ON clause', 'order_by' = 'The order of results, corresponding to an SQL ORDER BY clause', 'group_by' = 'Field(s) on which to group results, corresponding to an SQL GROUP BY clause', + 'having' = 'Conditions for grouped values, corresponding to an SQL HAVING clause', 'limit' = 'Limit how many entries to return', ); } -- To view, visit https://gerrit.wikimedia.org/r/211719 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53e5bc0c6c3219051f8832f35fd7013f12fee648 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor: Move PageTitle and PageQueryTask classes to packag... - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Refactor: Move PageTitle and PageQueryTask classes to package org.wikipedia.page .. Refactor: Move PageTitle and PageQueryTask classes to package org.wikipedia.page Change-Id: I5ed9770d7f68283e29fc6c067a2fd58f0db9c09d --- M wikipedia-it/src/main/java/org/wikipedia/test/DoEditTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/PageFetchTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java M wikipedia-it/src/main/java/org/wikipedia/test/PageTitleTests.java M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/SiteTests.java M wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java M wikipedia-it/src/main/java/org/wikipedia/test/TriggerAbuseFilterTest.java M wikipedia-it/src/main/java/org/wikipedia/test/TriggerEditCaptchaTest.java M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java M wikipedia/src/main/java/org/wikipedia/Site.java M wikipedia/src/main/java/org/wikipedia/analytics/EditFunnel.java M wikipedia/src/main/java/org/wikipedia/analytics/FunnelManager.java M wikipedia/src/main/java/org/wikipedia/analytics/GalleryFunnel.java M wikipedia/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java M wikipedia/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java M wikipedia/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java M wikipedia/src/main/java/org/wikipedia/editing/DoEditTask.java M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewTask.java M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java M wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java M wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryFragment.java M wikipedia/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java M wikipedia/src/main/java/org/wikipedia/history/HistoryEntry.java M wikipedia/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java M wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java M wikipedia/src/main/java/org/wikipedia/migration/BookmarksMigrator.java M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java M wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java M wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java M wikipedia/src/main/java/org/wikipedia/page/Page.java M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java M wikipedia/src/main/java/org/wikipedia/page/PageBackStackItem.java M wikipedia/src/main/java/org/wikipedia/page/PageCache.java M wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java R wikipedia/src/main/java/org/wikipedia/page/PageQueryTask.java R wikipedia/src/main/java/org/wikipedia/page/PageTitle.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java M wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java M wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java M wikipedia/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java M wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java M wikipedia/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java M wikipedia/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java M wikipedia/src/main/java/org/wikipedia/pagehistory/PageHistoryItem.java M wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java M
[MediaWiki-commits] [Gerrit] Another fix for addition of having param - fix for 21e6796 - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/211719 Change subject: Another fix for addition of having param - fix for 21e6796 .. Another fix for addition of having param - fix for 21e6796 Change-Id: I53e5bc0c6c3219051f8832f35fd7013f12fee648 --- M api/CargoQueryAPI.php 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/19/211719/1 diff --git a/api/CargoQueryAPI.php b/api/CargoQueryAPI.php index 90628d1..c591a42 100644 --- a/api/CargoQueryAPI.php +++ b/api/CargoQueryAPI.php @@ -20,6 +20,7 @@ $joinOnStr = $params['join_on']; $orderByStr = $params['order_by']; $groupByStr = $params['group_by']; + $havingStr = $params['having']; $limitStr = $params['limit']; if ( $tablesStr == '' ) { @@ -27,7 +28,7 @@ } $sqlQuery = CargoSQLQuery::newFromValues( $tablesStr, $fieldsStr, $whereStr, $joinOnStr, - $groupByStr, $orderByStr, $limitStr ); + $havingStr, $groupByStr, $orderByStr, $limitStr ); try { $queryResults = $sqlQuery-run(); } catch ( Exception $e ) { @@ -59,8 +60,9 @@ 'fields' = null, 'where' = null, 'join_on' = null, - 'order_by' = null, 'group_by' = null, + 'having' = null, + 'order_by' = null, ); } @@ -72,6 +74,7 @@ 'join_on' = 'Conditions for joining multiple tables, corresponding to an SQL JOIN ON clause', 'order_by' = 'The order of results, corresponding to an SQL ORDER BY clause', 'group_by' = 'Field(s) on which to group results, corresponding to an SQL GROUP BY clause', + 'having' = 'Conditions for grouped values, corresponding to an SQL HAVING clause', 'limit' = 'Limit how many entries to return', ); } -- To view, visit https://gerrit.wikimedia.org/r/211719 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53e5bc0c6c3219051f8832f35fd7013f12fee648 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use udp2log::rsyncd class to set up rsyncd on fluorine - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/211721 Change subject: Use udp2log::rsyncd class to set up rsyncd on fluorine .. Use udp2log::rsyncd class to set up rsyncd on fluorine This gives default ferm rules to allow rsyncing of files Bug: T99245 Change-Id: I564b3b77b07035b15965dcf869a035630a1e2f2e --- M manifests/role/logging.pp M modules/statistics/manifests/rsync/mediawiki.pp 2 files changed, 7 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/211721/1 diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp index 47d9ad0..a2b87fd 100644 --- a/manifests/role/logging.pp +++ b/manifests/role/logging.pp @@ -75,6 +75,12 @@ }, } +# Allow rsyncing of udp2log generated files to +# analysis hosts. +class { 'misc::udp2log::rsyncd': +path = $log_directory, +} + cron { 'mw-log-cleanup': command = '/usr/local/bin/mw-log-cleanup', user= 'root', @@ -101,18 +107,6 @@ group = 'root', mode = '0555', source = 'puppet:///files/misc/scripts/fatalmonitor', -} - -include rsync::server -# Allow rsyncing of mw-log files to other places for analysis. -rsync::server::module { 'mw-log': -path= $log_directory, -read_only = 'yes', -list= 'yes', -# There is some private data in mw-log files, so -# only allow rsyncing to stat1002.eqiad.wmnet, -# the stat server with other private data. -hosts_allow = ['stat1002.eqiad.wmnet'], } $cirrussearch_slow_log_check_interval = 5 diff --git a/modules/statistics/manifests/rsync/mediawiki.pp b/modules/statistics/manifests/rsync/mediawiki.pp index 0dee4a5..bf3ea2f 100644 --- a/modules/statistics/manifests/rsync/mediawiki.pp +++ b/modules/statistics/manifests/rsync/mediawiki.pp @@ -20,7 +20,7 @@ # Search request logs from fluorine statistics::rsync_job { 'CirrusSearchRequests': -source = 'fluorine.eqiad.wmnet::mw-log/archive/CirrusSearchRequests.*.gz', +source = 'fluorine.eqiad.wmnet::udp2log/archive/CirrusSearchRequests.*.gz', destination= ${working_path}/mw-log/archive, retention_days = $retention_days, } -- To view, visit https://gerrit.wikimedia.org/r/211721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I564b3b77b07035b15965dcf869a035630a1e2f2e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: CX: Add Hebrew (he) as target language - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: Beta: CX: Add Hebrew (he) as target language .. Beta: CX: Add Hebrew (he) as target language Bug: T99082 Change-Id: Ie507750cb791d475910cb029b5534ea08b30af68 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Amire80: Looks good to me, but someone else must approve diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index ed285b4..884f324 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -83,6 +83,7 @@ - 'gag' - 'gl' - 'gu' +- 'he' - 'hy' - 'id' - 'it' @@ -170,6 +171,7 @@ - 'gag' - 'gl' - 'gu' +- 'he' - 'hy' - 'id' - 'it' -- To view, visit https://gerrit.wikimedia.org/r/210914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie507750cb791d475910cb029b5534ea08b30af68 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove main and disambiguation pages from read more section - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Remove main and disambiguation pages from read more section .. Remove main and disambiguation pages from read more section Bug: T95365 Change-Id: Iacaa689e8f8760ea1609160c0fc5d568eff1ccb0 --- M wikipedia/src/main/java/org/wikipedia/page/PageProperties.java M wikipedia/src/main/java/org/wikipedia/page/PageTitle.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java R wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 6 files changed, 67 insertions(+), 16 deletions(-) Approvals: Dbrant: Looks good to me, approved diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageProperties.java b/wikipedia/src/main/java/org/wikipedia/page/PageProperties.java index b7f6282..90f32c0 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageProperties.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageProperties.java @@ -25,6 +25,7 @@ private final String editProtectionStatus; private final int languageCount; private final boolean isMainPage; +private final boolean isDisambiguationPage; private final String leadImageUrl; private final String leadImageName; private SimpleDateFormat sdf = new SimpleDateFormat(-MM-dd'T'HH:mm:ss'Z', Locale.ROOT); @@ -74,6 +75,7 @@ || json.optString(editable).equals(true); isMainPage = json.has(mainpage); +isDisambiguationPage = json.has(disambiguation); } public int getPageId() { @@ -108,6 +110,10 @@ return isMainPage; } +public boolean isDisambiguationPage() { +return isDisambiguationPage; +} + public String getLeadImageUrl() { return leadImageUrl; } @@ -131,6 +137,7 @@ parcel.writeInt(languageCount); parcel.writeInt(canEdit ? 1 : 0); parcel.writeInt(isMainPage ? 1 : 0); +parcel.writeInt(isDisambiguationPage ? 1 : 0); parcel.writeString(leadImageUrl); parcel.writeString(leadImageName); } @@ -145,6 +152,7 @@ languageCount = in.readInt(); canEdit = in.readInt() == 1; isMainPage = in.readInt() == 1; +isDisambiguationPage = in.readInt() == 1; leadImageUrl = in.readString(); leadImageName = in.readString(); } @@ -178,6 +186,7 @@ languageCount == that.languageCount canEdit == that.canEdit isMainPage == that.isMainPage + isDisambiguationPage == that.isDisambiguationPage TextUtils.equals(editProtectionStatus, that.editProtectionStatus) TextUtils.equals(leadImageUrl, that.leadImageUrl) TextUtils.equals(leadImageName, that.leadImageName); @@ -190,6 +199,7 @@ result = 31 * result + (editProtectionStatus != null ? editProtectionStatus.hashCode() : 0); result = 31 * result + languageCount; result = 31 * result + (isMainPage ? 1 : 0); +result = 31 * result + (isDisambiguationPage ? 1 : 0); result = 31 * result + (leadImageUrl != null ? leadImageUrl.hashCode() : 0); result = 31 * result + (leadImageName != null ? leadImageName.hashCode() : 0); result = 31 * result + (canEdit ? 1 : 0); @@ -224,6 +234,9 @@ if (isMainPage) { json.put(mainpage, ); } +if (isDisambiguationPage) { +json.put(disambiguation, ); +} if (leadImageUrl != null) { JSONObject thumbObject = new JSONObject(); thumbObject.put(url, leadImageUrl); diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageTitle.java b/wikipedia/src/main/java/org/wikipedia/page/PageTitle.java index 7776464..8b921dc 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageTitle.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageTitle.java @@ -47,13 +47,20 @@ private String thumbUrl; private final Site site; private String description = null; +private PageProperties properties = null; public PageTitle(final String namespace, final String text, final String fragment, final String thumbUrl, final Site site) { this.namespace = namespace; this.text = text; this.fragment = fragment; -this.thumbUrl = thumbUrl; this.site = site; +this.thumbUrl = thumbUrl; +} + +public PageTitle(final String text, final Site site, final String thumbUrl, final String description, final PageProperties properties) { +this(text, site, thumbUrl); +this.properties = properties; +this.description = description; } public PageTitle(final String
[MediaWiki-commits] [Gerrit] Beta: CX: Enable all languages in source and target - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: Beta: CX: Enable all languages in source and target .. Beta: CX: Enable all languages in source and target \0/ Bug: T98946 Change-Id: I7075df8ce023fe03c014d804713418451e15ff02 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 401 insertions(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 884f324..90fac3e 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -56,181 +56,581 @@ cxserver::yandex_url: 'https://translate.yandex.net' cxserver::registry: source: +- 'aa' - 'ab' +- 'ace' - 'af' - 'ak' +- 'als' +- 'am' +- 'ang' - 'an' +- 'arc' +- 'ar' +- 'arz' - 'ast' +- 'as' - 'av' +- 'ay' - 'az' +- 'bar' +- 'bat-smg' - 'ba' +- 'bcl' +- 'be-x-old' +- 'be' - 'bg' +- 'bh' +- 'bi' +- 'bjn' - 'bm' +- 'bn' +- 'bo' +- 'bpy' +- 'br' +- 'bs' +- 'bug' +- 'bxr' - 'ca' +- 'cbk-zam' +- 'cdo' +- 'ceb' +- 'ce' +- 'cho' +- 'chr' +- 'ch' +- 'chy' +- 'ckb' +- 'co' - 'crh' +- 'cr' +- 'csb' - 'cs' +- 'cu' - 'cv' +- 'cy' - 'da' - 'de' +- 'diq' +- 'dsb' +- 'dv' +- 'dz' - 'ee' - 'el' +- 'eml' - 'en' - 'eo' - 'es' +- 'et' - 'eu' +- 'ext' +- 'fa' - 'ff' +- 'fiu-vro' +- 'fi' +- 'fj' +- 'fo' +- 'frp' +- 'frr' - 'fr' +- 'fur' +- 'fy' - 'gag' +- 'gan' +- 'ga' +- 'gd' +- 'glk' - 'gl' +- 'gn' +- 'got' - 'gu' +- 'gv' +- 'hak' +- 'ha' +- 'haw' - 'he' +- 'hif' +- 'hi' +- 'ho' +- 'hr' +- 'hsb' +- 'ht' +- 'hu' - 'hy' +- 'hz' +- 'ia' - 'id' +- 'ie' +- 'ig' +- 'ii' +- 'ik' +- 'ilo' +- 'io' +- 'is' - 'it' +- 'iu' +- 'ja' +- 'jbo' +- 'jv' - 'kaa' +- 'kab' +- 'ka' - 'kbd' - 'kg' - 'ki' +- 'kj' - 'kk' +- 'kl' +- 'km' - 'kn' - 'koi' +- 'ko' - 'krc' +- 'kr' +- 'ksh' +- 'ks' +- 'ku' - 'kv' +- 'kw' - 'ky' - 'lad' +- 'la' +- 'lbe' +- 'lb' - 'lez' - 'lg' +- 'lij' +- 'li' +- 'lmo' +- 'ln' +- 'lo' +- 'ltg' +- 'lt' +- 'lv' +- 'mai' +- 'map-bms' +- 'mdf' +- 'mg' +- 'mhr' +- 'mh' - 'min' +- 'mi' - 'mk' +- 'ml' +- 'mn' +- 'mo' +- 'mrj' +- 'mr' - 'ms' - 'mt' +- 'mus' - 'mwl' +- 'myv' +- 'my' +- 'mzn' +- 'nah' +- 'nap' +- 'na' +- 'nds-nl' +- 'nds' +- 'ne' +- 'new' +- 'ng' - 'nl' - 'nn' +- 'nov' - 'no' +- 'nrm' +- 'nso' +- 'nv' - 'ny' - 'oc' - 'om' +- 'or' - 'os' +- 'pag' +- 'pam' +- 'pap' - 'pa' +- 'pcd' +- 'pdc' +- 'pfl' +- 'pih' +- 'pi' - 'pl' +- 'pms' +- 'pnb' +- 'pnt' +- 'ps' - 'pt' +- 'qu' +- 'rm' - 'rmy' - 'rn' - 'roa-rup' +- 'roa-tara' +- 'ro' +- 'rue' - 'ru' +- 'rw' - 'sah' +- 'sa' +- 'scn' +- 'sco' +- 'sc' +- 'sd' +- 'se' - 'sg' - 'sh' - 'simple' +- 'si' +- 'sk' - 'sl' +- 'sm' +- 'sn' +- 'so' - 'sq' +- 'srn' +- 'sr' - 'ss' +- 'stq' - 'st' +- 'su' - 'sv' +- 'sw' +- 'szl' +- 'ta' +- 'tet' +- 'te' +- 'tg' +- 'th' - 'ti' +- 'tk' +- 'tl' - 'tn' +- 'to' +- 'tpi' - 'tr' - 'ts' - 'tt' - 'tum' -- 'tyv' - 'tw' +- 'tyv' +- 'ty' - 'udm' +- 'ug' - 'uk' +- 'ur' - 'uz' +- 'vec' +- 'vep' - 've' - 'vi' +- 'vls' +- 'vo' +- 'war' +- 'wa' +- 'wo' +- 'wuu' +- 'xal' - 'xh' +- 'xmf' +- 'yi' +- 'yo' +- 'za' +- 'zea' +- 'zh-classical' +- 'zh-min-nan' +- 'zh-yue' - 'zh' - 'zu' target: +- 'aa' - 'ab' +- 'ace' - 'af' - 'ak' +- 'als' +- 'am' +- 'ang' - 'an' +- 'arc' +- 'ar' +- 'arz' - 'ast' +- 'as' - 'av' +- 'ay' - 'az' +- 'bar' +- 'bat-smg' - 'ba' +- 'bcl' +- 'be-x-old' +- 'be' - 'bg' +- 'bh' +- 'bi' +- 'bjn' - 'bm' +- 'bn' +- 'bo' +- 'bpy' +- 'br' +- 'bs' +- 'bug' +- 'bxr' - 'ca' +- 'cbk-zam' +- 'cdo' +-
[MediaWiki-commits] [Gerrit] change job so it should finally work - change (mediawiki...WikidataQualityConstraints)
Andreasburmeister has submitted this change and it was merged. Change subject: change job so it should finally work .. change job so it should finally work only use scalars in params use full namespace Change-Id: I2cefe3504cafa65265c75c7bf30cde98fb6e494b --- M WikibaseQualityConstraints.php M composer.json M includes/Constraint.php M includes/ConstraintRepository.php M includes/EvaluateConstraintReportJob.php M includes/EvaluateConstraintReportJobService.php M maintenance/UpdateTable.php M specials/SpecialConstraintReport.php M tests/phpunit/EvaluateConstraintReportJobServiceTest.php 9 files changed, 140 insertions(+), 135 deletions(-) Approvals: Andreasburmeister: Verified; Looks good to me, approved diff --git a/WikibaseQualityConstraints.php b/WikibaseQualityConstraints.php index 8fff9a5..600fff3 100755 --- a/WikibaseQualityConstraints.php +++ b/WikibaseQualityConstraints.php @@ -40,6 +40,6 @@ define( 'CONSTRAINT_TABLE', 'wbqc_constraints' ); // Jobs - $GLOBALS['wgJobClasses']['evaluateConstraintReportJob'] = 'EvaluateConstraintReportJob'; + $GLOBALS['wgJobClasses']['evaluateConstraintReportJob'] = 'WikidataQuality\ConstraintReport\EvaluateConstraintReportJob'; $GLOBALS['wgDebugLogGroups']['wbq_evaluation'] = '/var/log/mediawiki/wbq_evaluation.log'; } ); \ No newline at end of file diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 diff --git a/includes/Constraint.php b/includes/Constraint.php old mode 100755 new mode 100644 diff --git a/includes/ConstraintRepository.php b/includes/ConstraintRepository.php old mode 100755 new mode 100644 diff --git a/includes/EvaluateConstraintReportJob.php b/includes/EvaluateConstraintReportJob.php index 8480707..6931bd2 100755 --- a/includes/EvaluateConstraintReportJob.php +++ b/includes/EvaluateConstraintReportJob.php @@ -4,73 +4,68 @@ use Job; use Title; -use Wikibase\DataModel\Entity\EntityId; class EvaluateConstraintReportJob extends Job { private $service; /** -* @param EvaluateConstraintReportJobService $service -* @param EntityId $entityId -* @param $checkTimestamp -* @param $results +* @param string $entityId +* @param int $checkTimestamp +* @param string $results * * @return EvaluateConstraintReportJob * @throws \MWException */ - public static function newInsertNow( EvaluateConstraintReportJobService $service, EntityId $entity, $checkTimestamp, $results ) { + public static function newInsertNow( $entityId, $checkTimestamp, $results ) { // The Job class wants a Title object for some reason. Supply a dummy. $dummyTitle = Title::newFromText( EvaluateConstraintReportJob, NS_SPECIAL ); $params = array (); - $params['entityId'] = $entity; + $params['entityId'] = $entityId; $params['results'] = $results; $params['checkTimestamp'] = $checkTimestamp; - $params['referenceTimestamp'] = null; + $params['referenceTimestamp'] = 'null'; - return new EvaluateConstraintReportJob( $service, $dummyTitle, $params ); + return new EvaluateConstraintReportJob( $dummyTitle, $params ); } /** -* @param EvaluateConstraintReportJobService $service -* @param EntityId $entityId -* @param null $referenceTimestamp +* @param string $entityId +* @param int $referenceTimestamp * @param int $releaseTimestamp * * @return EvaluateConstraintReportJob * @throws \MWException */ - public static function newInsertDeferred( EvaluateConstraintReportJobService $service, EntityId $entity, $referenceTimestamp = null, $releaseTimestamp = 0 ) { + public static function newInsertDeferred( $entityId, $referenceTimestamp = 'null', $releaseTimestamp = 0 ) { // The Job class wants a Title object for some reason. Supply a dummy. $dummyTitle = Title::newFromText( EvaluateConstraintReportJob, NS_SPECIAL ); $params = array (); - $params['entityId'] = $entity; - $params['results'] = null; + $params['entityId'] = $entityId; $params['referenceTimestamp'] = $referenceTimestamp; $params['releaseTimestamp'] = wfTimestamp( TS_MW ) + $releaseTimestamp; - return new EvaluateConstraintReportJob( $service, $dummyTitle, $params ); + return new EvaluateConstraintReportJob( $dummyTitle, $params ); } /** -* @param EvaluateConstraintReportJobService $service * @param Title $title * @param array|bool $params */ - public function __construct(
[MediaWiki-commits] [Gerrit] Update to 3.19.8 - change (operations...linux)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/211702 Change subject: Update to 3.19.8 .. Update to 3.19.8 Change-Id: I37c54ff397beb607ddba18340a3f777aff60d60c --- M debian/changelog A debian/patches/bugfix/all/stable-3.19.8.patch M debian/patches/series 3 files changed, 214 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux refs/changes/02/211702/1 diff --git a/debian/changelog b/debian/changelog index 9237515..828dce1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ * New upstream stable updates: 3.19.7 (no changelog on https://www.kernel.org/pub/linux/kernel/v3.x/): +https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.19.8 +- CVE-2015-3636 (a134f083e79fb4c3d0a925691e732c56911b4326) -- Moritz Muehlenhoff mor...@wikimedia.org Mon, 18 May 2015 13:14:15 +0200 diff --git a/debian/patches/bugfix/all/stable-3.19.8.patch b/debian/patches/bugfix/all/stable-3.19.8.patch new file mode 100644 index 000..a053bf4 --- /dev/null +++ b/debian/patches/bugfix/all/stable-3.19.8.patch @@ -0,0 +1,211 @@ +diff --git a/Makefile b/Makefile +index 69952c1404b2..110782bba50d 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 3 + PATCHLEVEL = 19 +-SUBLEVEL = 7 ++SUBLEVEL = 8 + EXTRAVERSION = + NAME = Diseased Newt + +diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c +index 0b7c3e8840ba..0283a5713d6c 100644 +--- a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c +@@ -58,8 +58,6 @@ static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw, + + static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, + unsigned long rate, +-unsigned long min_rate, +-unsigned long max_rate, + unsigned long *best_parent_rate, + struct clk_hw **best_parent_hw) + { +diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +index c132d9030729..0589a849d2a5 100644 +--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +@@ -489,7 +489,7 @@ int t4_memory_rw(struct adapter *adap, int win, int mtype, u32 addr, + memoffset = (mtype * (edc_size * 1024 * 1024)); + else { + mc_size = EXT_MEM0_SIZE_G(t4_read_reg(adap, +-MA_EXT_MEMORY1_BAR_A)); ++MA_EXT_MEMORY0_BAR_A)); + memoffset = (MEM_MC0 * edc_size + mc_size) * 1024 * 1024; + } + +diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +index 2617c9d68d9b..c998c4d8c7e9 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +@@ -1467,6 +1467,7 @@ static void mlx4_en_service_task(struct work_struct *work) + if (mdev-dev-caps.flags2 MLX4_DEV_CAP_FLAG2_TS) + mlx4_en_ptp_overflow_check(mdev); + ++ mlx4_en_recover_from_oom(priv); + queue_delayed_work(mdev-workqueue, priv-service_task, + SERVICE_TASK_DELAY); + } +diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c +index a0474eb94aa3..10d353356b88 100644 +--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c +@@ -240,6 +240,12 @@ static int mlx4_en_prepare_rx_desc(struct mlx4_en_priv *priv, + return mlx4_en_alloc_frags(priv, rx_desc, frags, ring-page_alloc, gfp); + } + ++static inline bool mlx4_en_is_ring_empty(struct mlx4_en_rx_ring *ring) ++{ ++ BUG_ON((u32)(ring-prod - ring-cons) ring-actual_size); ++ return ring-prod == ring-cons; ++} ++ + static inline void mlx4_en_update_rx_prod_db(struct mlx4_en_rx_ring *ring) + { + *ring-wqres.db.db = cpu_to_be32(ring-prod 0x); +@@ -311,8 +317,7 @@ static void mlx4_en_free_rx_buf(struct mlx4_en_priv *priv, + ring-cons, ring-prod); + + /* Unmap and free Rx buffers */ +- BUG_ON((u32) (ring-prod - ring-cons) ring-actual_size); +- while (ring-cons != ring-prod) { ++ while (!mlx4_en_is_ring_empty(ring)) { + index = ring-cons ring-size_mask; + en_dbg(DRV, priv, Processing descriptor:%d\n, index); + mlx4_en_free_rx_desc(priv, ring, index); +@@ -487,6 +492,23 @@ err_allocator: + return err; + } + ++/* We recover from out of memory by scheduling our napi poll ++ * function (mlx4_en_process_cq), which tries to allocate ++ * all missing RX buffers (call to
[MediaWiki-commits] [Gerrit] change job so it should finally work - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has uploaded a new change for review. https://gerrit.wikimedia.org/r/211703 Change subject: change job so it should finally work .. change job so it should finally work only use scalars in params use full namespace Change-Id: I2cefe3504cafa65265c75c7bf30cde98fb6e494b --- M WikibaseQualityConstraints.php M composer.json M includes/Constraint.php M includes/ConstraintRepository.php M includes/EvaluateConstraintReportJob.php M includes/EvaluateConstraintReportJobService.php M maintenance/UpdateTable.php M specials/SpecialConstraintReport.php M tests/phpunit/EvaluateConstraintReportJobServiceTest.php 9 files changed, 140 insertions(+), 135 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints refs/changes/03/211703/1 diff --git a/WikibaseQualityConstraints.php b/WikibaseQualityConstraints.php index 8fff9a5..600fff3 100755 --- a/WikibaseQualityConstraints.php +++ b/WikibaseQualityConstraints.php @@ -40,6 +40,6 @@ define( 'CONSTRAINT_TABLE', 'wbqc_constraints' ); // Jobs - $GLOBALS['wgJobClasses']['evaluateConstraintReportJob'] = 'EvaluateConstraintReportJob'; + $GLOBALS['wgJobClasses']['evaluateConstraintReportJob'] = 'WikidataQuality\ConstraintReport\EvaluateConstraintReportJob'; $GLOBALS['wgDebugLogGroups']['wbq_evaluation'] = '/var/log/mediawiki/wbq_evaluation.log'; } ); \ No newline at end of file diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 diff --git a/includes/Constraint.php b/includes/Constraint.php old mode 100755 new mode 100644 diff --git a/includes/ConstraintRepository.php b/includes/ConstraintRepository.php old mode 100755 new mode 100644 diff --git a/includes/EvaluateConstraintReportJob.php b/includes/EvaluateConstraintReportJob.php index 8480707..6931bd2 100755 --- a/includes/EvaluateConstraintReportJob.php +++ b/includes/EvaluateConstraintReportJob.php @@ -4,73 +4,68 @@ use Job; use Title; -use Wikibase\DataModel\Entity\EntityId; class EvaluateConstraintReportJob extends Job { private $service; /** -* @param EvaluateConstraintReportJobService $service -* @param EntityId $entityId -* @param $checkTimestamp -* @param $results +* @param string $entityId +* @param int $checkTimestamp +* @param string $results * * @return EvaluateConstraintReportJob * @throws \MWException */ - public static function newInsertNow( EvaluateConstraintReportJobService $service, EntityId $entity, $checkTimestamp, $results ) { + public static function newInsertNow( $entityId, $checkTimestamp, $results ) { // The Job class wants a Title object for some reason. Supply a dummy. $dummyTitle = Title::newFromText( EvaluateConstraintReportJob, NS_SPECIAL ); $params = array (); - $params['entityId'] = $entity; + $params['entityId'] = $entityId; $params['results'] = $results; $params['checkTimestamp'] = $checkTimestamp; - $params['referenceTimestamp'] = null; + $params['referenceTimestamp'] = 'null'; - return new EvaluateConstraintReportJob( $service, $dummyTitle, $params ); + return new EvaluateConstraintReportJob( $dummyTitle, $params ); } /** -* @param EvaluateConstraintReportJobService $service -* @param EntityId $entityId -* @param null $referenceTimestamp +* @param string $entityId +* @param int $referenceTimestamp * @param int $releaseTimestamp * * @return EvaluateConstraintReportJob * @throws \MWException */ - public static function newInsertDeferred( EvaluateConstraintReportJobService $service, EntityId $entity, $referenceTimestamp = null, $releaseTimestamp = 0 ) { + public static function newInsertDeferred( $entityId, $referenceTimestamp = 'null', $releaseTimestamp = 0 ) { // The Job class wants a Title object for some reason. Supply a dummy. $dummyTitle = Title::newFromText( EvaluateConstraintReportJob, NS_SPECIAL ); $params = array (); - $params['entityId'] = $entity; - $params['results'] = null; + $params['entityId'] = $entityId; $params['referenceTimestamp'] = $referenceTimestamp; $params['releaseTimestamp'] = wfTimestamp( TS_MW ) + $releaseTimestamp; - return new EvaluateConstraintReportJob( $service, $dummyTitle, $params ); + return new EvaluateConstraintReportJob( $dummyTitle, $params ); } /** -* @param EvaluateConstraintReportJobService $service * @param Title $title * @param
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityConstraints)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211707 Change subject: Updated README .. Updated README Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints refs/changes/07/211707/1 diff --git a/README.md b/README.md index 7a02abe..87729be 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityConstraints -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) +# Wikibase Quality Constraints +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs constraint checks in Wikidata. +This is a complementary extension for the [Wikibase Quality base extension] +(https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs constraint checks in Wikibase. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityConstraints/WikidataQualityConstraints.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityConstraints directory \ No newline at end of file +* Add the following lines: +```json +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityConstraints; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/constraints: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the constraints table - for that you need the +[constraints from templates script](https://github.com/WikidataQuality/ConstraintsFromTemplates). +Follow the instruction in the README to create a csv file. +Run `php maintenance/runScript.php extensions/Constraints/maintenance/UpdateTable.php --csv-file path_to_csv_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityExternalValidation)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211708 Change subject: Updated README .. Updated README Change-Id: I1232baaa9fa9ed278933fce6edfc67a4ebfbf912 --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/08/211708/1 diff --git a/README.md b/README.md index 1b04c10..982371b 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityExternalValidation -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master) +# Wikibase Quality External Validation +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs cross checks between Wikidata and external databases to validate data. +This is a complementary extension for the +[Wikibase Quality base extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs cross checks between Wikibase and external databases to validate data. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityExternalValidation/WikidataQualityExternalValidation.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityExternalValidation directory \ No newline at end of file +* Add the following lines: +``` +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityExternalValidation; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/external-validation: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the tables that contain external data - for that you need the +[dump converter script](https://github.com/WikidataQuality/DumpConverter). +Follow the instruction in the README to create a tar file (that contains a number of csv files). +Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateTable.php --tar-file path_to_tar_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1232baaa9fa9ed278933fce6edfc67a4ebfbf912 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: v1
[MediaWiki-commits] [Gerrit] Repooling of db1063 after reststart - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211706 Change subject: Repooling of db1063 after reststart .. Repooling of db1063 after reststart Starting with 0 for progressive load handling Change-Id: I52dac77fc2d0df3156f96eda4a17f52710b7e0d7 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/06/211706/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 44e83ce..77c13fb 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -105,7 +105,7 @@ 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api -# 'db1063' = 400, # 2.8TB 128GB depooling for configuration and restart + 'db1063' = 0, # 2.8TB 128GB (repooling after configuration and restart) 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( -- To view, visit https://gerrit.wikimedia.org/r/211706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52dac77fc2d0df3156f96eda4a17f52710b7e0d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix inconsistent state issues and fatal on Special:EnableFlow - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix inconsistent state issues and fatal on Special:EnableFlow .. Fix inconsistent state issues and fatal on Special:EnableFlow * Fix LqtDispatch call (global namespace) * Change importHeader to always return a header; I was getting inconsistent state issues when there were neither headers nor topics. LQT already always returned a header. Although the source page may be blank, it should always exist. This also means we will always put our template and any user-specified suffix (on Special:EnableFlow). * Fix several master/slave issues. A few of these I hit using fake slave lag on master/slave; title-exists( Title::GAID_FOR_UPDATE ) is potential. * Don't have Special:EnableFlow allowCreation itself if the page already exists. The import process handles that. Bug: T99278 Change-Id: Ia0fb1911f5238e6e7bd436676e58e11107128da9 --- M includes/Import/Converter.php M includes/Import/ImportSource.php M includes/Import/Importer.php M includes/Import/Wikitext/ImportSource.php M includes/Specials/SpecialEnableFlow.php 5 files changed, 33 insertions(+), 31 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php index 5e1e6cb..8c9c95a 100644 --- a/includes/Import/Converter.php +++ b/includes/Import/Converter.php @@ -276,6 +276,8 @@ */ protected function createArchiveCleanupRevision( Title $title, Title $archiveTitle ) { $page = WikiPage::factory( $archiveTitle ); +// doEditContent will do this anyway, but we need to now for the revision. + $page-loadPageData( 'fromdbmaster' ); $revision = $page-getRevision(); if ( $revision === null ) { throw new ImportException( Expected a revision at {$archiveTitle} ); diff --git a/includes/Import/ImportSource.php b/includes/Import/ImportSource.php index c73bd62..4753c37 100644 --- a/includes/Import/ImportSource.php +++ b/includes/Import/ImportSource.php @@ -11,7 +11,8 @@ function getTopics(); /** -* @return IImportHeader|null +* @return IImportHeader +* @throws ImportException */ function getHeader(); } diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php index 9ee0e31..a7d05da 100644 --- a/includes/Import/Importer.php +++ b/includes/Import/Importer.php @@ -559,26 +559,24 @@ $imported = $failed = 0; $header = $this-importSource-getHeader(); - if ( $header ) { - try { - $state-begin(); - $this-importHeader( $state, $header ); - $state-commit(); - $state-postprocessor-afterHeaderImported( $state, $header ); - $imported++; - } catch ( ImportSourceStoreException $e ) { - // errors from the source store are more serious and should - // not just be logged and swallowed. This may indicate that - // we are not properly recording progress. - $state-rollback(); - throw $e; - } catch ( \Exception $e ) { - $state-rollback(); - \MWExceptionHandler::logException( $e ); - $state-logger-error( 'Failed importing header: ' . $header-getObjectKey() ); - $state-logger-error( (string)$e ); - $failed++; - } + try { + $state-begin(); + $this-importHeader( $state, $header ); + $state-commit(); + $state-postprocessor-afterHeaderImported( $state, $header ); + $imported++; + } catch ( ImportSourceStoreException $e ) { + // errors from the source store are more serious and should + // not just be logged and swallowed. This may indicate that + // we are not properly recording progress. + $state-rollback(); + throw $e; + } catch ( \Exception $e ) { + $state-rollback(); + \MWExceptionHandler::logException( $e ); + $state-logger-error( 'Failed importing header: ' . $header-getObjectKey() ); + $state-logger-error( (string)$e ); + $failed++; } foreach(
[MediaWiki-commits] [Gerrit] Add missing ( ) to extension.php template - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing ( ) to extension.php template .. Add missing ( ) to extension.php template Otherwise vagrant provision fails with PHP syntax error in generated settings.d/puppet-managed/ files. Follows up 7e81fef48211a3db2. Change-Id: I07cc36cfa3becf8851b25c2e1095d5dfe92b3571 --- M puppet/modules/mediawiki/templates/extension.php.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Spage: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/mediawiki/templates/extension.php.erb b/puppet/modules/mediawiki/templates/extension.php.erb index 7eb450a..21f9a97 100644 --- a/puppet/modules/mediawiki/templates/extension.php.erb +++ b/puppet/modules/mediawiki/templates/extension.php.erb @@ -1,6 +1,6 @@ if ( class_exists( 'ExtensionRegistry' ) file_exists( $IP/extensions/%= @ext_name %/extension.json ) ) { wfLoadExtension( '%= @ext_name %' ); -} elseif file_exists( $IP/extensions/%= @ext_name %/%= @ext_entrypoint % ) { +} elseif ( file_exists( $IP/extensions/%= @ext_name %/%= @ext_entrypoint % ) ) { include_once $IP/extensions/%= @ext_name %/%= @ext_entrypoint %; } -- To view, visit https://gerrit.wikimedia.org/r/211660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07cc36cfa3becf8851b25c2e1095d5dfe92b3571 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Spage sp...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registration: Remove duplicate ParserTestFiles key from sc... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: registration: Remove duplicate ParserTestFiles key from schema .. registration: Remove duplicate ParserTestFiles key from schema Bug: T99493 Change-Id: I43ea510162d01424171e738310b0519c85d28f68 --- M docs/extension.schema.json 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/extension.schema.json b/docs/extension.schema.json index 8e8b23b..e03c295 100644 --- a/docs/extension.schema.json +++ b/docs/extension.schema.json @@ -534,10 +534,6 @@ type: object, description: Rate limits }, - ParserTestFiles: { - type: array, - description: Parser test files to run - }, RecentChangesFlags: { type: object, description: Flags (letter symbols) shown on RecentChanges pages -- To view, visit https://gerrit.wikimedia.org/r/211662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43ea510162d01424171e738310b0519c85d28f68 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Waldir wal...@email.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registration: Remove duplicate ParserTestFiles key from sc... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: registration: Remove duplicate ParserTestFiles key from schema .. registration: Remove duplicate ParserTestFiles key from schema Bug: T99493 Change-Id: I43ea510162d01424171e738310b0519c85d28f68 --- M docs/extension.schema.json 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/extension.schema.json b/docs/extension.schema.json index 8e8b23b..e03c295 100644 --- a/docs/extension.schema.json +++ b/docs/extension.schema.json @@ -534,10 +534,6 @@ type: object, description: Rate limits }, - ParserTestFiles: { - type: array, - description: Parser test files to run - }, RecentChangesFlags: { type: object, description: Flags (letter symbols) shown on RecentChanges pages -- To view, visit https://gerrit.wikimedia.org/r/211692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43ea510162d01424171e738310b0519c85d28f68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repooling of db1063 after reststart - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: Repooling of db1063 after reststart .. Repooling of db1063 after reststart Change-Id: I52dac77fc2d0df3156f96eda4a17f52710b7e0d7 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved Springle: Looks good to me, but someone else must approve diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 44e83ce..db1cc57 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -105,7 +105,7 @@ 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api -# 'db1063' = 400, # 2.8TB 128GB depooling for configuration and restart + 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( -- To view, visit https://gerrit.wikimedia.org/r/211706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52dac77fc2d0df3156f96eda4a17f52710b7e0d7 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registration: Remove duplicate ParserTestFiles key from sc... - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/211692 Change subject: registration: Remove duplicate ParserTestFiles key from schema .. registration: Remove duplicate ParserTestFiles key from schema Bug: T99493 Change-Id: I43ea510162d01424171e738310b0519c85d28f68 --- M docs/extension.schema.json 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/211692/1 diff --git a/docs/extension.schema.json b/docs/extension.schema.json index 8e8b23b..e03c295 100644 --- a/docs/extension.schema.json +++ b/docs/extension.schema.json @@ -534,10 +534,6 @@ type: object, description: Rate limits }, - ParserTestFiles: { - type: array, - description: Parser test files to run - }, RecentChangesFlags: { type: object, description: Flags (letter symbols) shown on RecentChanges pages -- To view, visit https://gerrit.wikimedia.org/r/211692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43ea510162d01424171e738310b0519c85d28f68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable A/B test of VisualEditor for new accounts on English ... - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/211697 Change subject: Enable A/B test of VisualEditor for new accounts on English Wikipedia .. Enable A/B test of VisualEditor for new accounts on English Wikipedia Bug: T90666 Change-Id: Ia93c9356fb8c2e8611ad163bfc637f28be6cf9a4 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/211697/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2e9..fdbb1e7 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12676,6 +12676,7 @@ // Should 50% of new accounts be opted in to VisualEditor (A/B test) 'wmgVisualEditorEnableSplitTest' = array( 'default' = false, +'enwiki' = true, ), // --- VisualEditor end --- -- To view, visit https://gerrit.wikimedia.org/r/211697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia93c9356fb8c2e8611ad163bfc637f28be6cf9a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - fix rdf dump script - change (mediawiki/core)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/211700 Change subject: Update Wikidata - fix rdf dump script .. Update Wikidata - fix rdf dump script Change-Id: I55fc24a10866766e991d36ac476091b8f8232d1f --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/211700/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index a1076ab..3eec383 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit a1076ab3607588cf434fba133face2e748db7721 +Subproject commit 3eec38343adeef51c3ffd0ece021158f3dd459c4 -- To view, visit https://gerrit.wikimedia.org/r/211700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55fc24a10866766e991d36ac476091b8f8232d1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityExternalValidation)
Tamslo has submitted this change and it was merged. Change subject: Updated README .. Updated README Change-Id: I1232baaa9fa9ed278933fce6edfc67a4ebfbf912 --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) Approvals: Tamslo: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 1b04c10..982371b 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityExternalValidation -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master) +# Wikibase Quality External Validation +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs cross checks between Wikidata and external databases to validate data. +This is a complementary extension for the +[Wikibase Quality base extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs cross checks between Wikibase and external databases to validate data. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityExternalValidation/WikidataQualityExternalValidation.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityExternalValidation directory \ No newline at end of file +* Add the following lines: +``` +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityExternalValidation; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/external-validation: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the tables that contain external data - for that you need the +[dump converter script](https://github.com/WikidataQuality/DumpConverter). +Follow the instruction in the README to create a tar file (that contains a number of csv files). +Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateTable.php --tar-file path_to_tar_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1232baaa9fa9ed278933fce6edfc67a4ebfbf912 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: Tamslo tamaraslosa...@gmail.com
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityExternalValidation)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211711 Change subject: Updated README .. Updated README Change-Id: I1232baaa9fa9ed278933fce6edfc67a4ebfbf912 (cherry picked from commit e96fd35c2323c6b49ecf2bb0ce5fd3424b4846b1) --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation refs/changes/11/211711/1 diff --git a/README.md b/README.md index 1b04c10..982371b 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityExternalValidation -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master) +# Wikibase Quality External Validation +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs cross checks between Wikidata and external databases to validate data. +This is a complementary extension for the +[Wikibase Quality base extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs cross checks between Wikibase and external databases to validate data. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityExternalValidation/WikidataQualityExternalValidation.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityExternalValidation directory \ No newline at end of file +* Add the following lines: +``` +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityExternalValidation; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/external-validation: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the tables that contain external data - for that you need the +[dump converter script](https://github.com/WikidataQuality/DumpConverter). +Follow the instruction in the README to create a tar file (that contains a number of csv files). +Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateTable.php --tar-file path_to_tar_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1232baaa9fa9ed278933fce6edfc67a4ebfbf912 Gerrit-PatchSet: 1 Gerrit-Project:
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityConstraints)
Tamslo has submitted this change and it was merged. Change subject: Updated README .. Updated README Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d (cherry picked from commit dfd93b0ea0a754eff46b21ad78836b3e7089e77a) --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) Approvals: Tamslo: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 7a02abe..87729be 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityConstraints -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) +# Wikibase Quality Constraints +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs constraint checks in Wikidata. +This is a complementary extension for the [Wikibase Quality base extension] +(https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs constraint checks in Wikibase. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityConstraints/WikidataQualityConstraints.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityConstraints directory \ No newline at end of file +* Add the following lines: +```json +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityConstraints; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/constraints: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the constraints table - for that you need the +[constraints from templates script](https://github.com/WikidataQuality/ConstraintsFromTemplates). +Follow the instruction in the README to create a csv file. +Run `php maintenance/runScript.php extensions/Constraints/maintenance/UpdateTable.php --csv-file path_to_csv_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-05-17T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 2015-05-17T10:00:01+ .. New Wikidata Build - 2015-05-17T10:00:01+ Change-Id: Ia11365cec6480738d28d6ac533ab80994090d01e --- M composer.lock M extensions/Wikibase/repo/i18n/be-tarask.json M extensions/Wikibase/repo/i18n/zh-hans.json M extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php M extensions/Wikidata.org/resources/Resources.php M extensions/WikimediaBadges/WikimediaBadges.hooks.php M extensions/WikimediaBadges/resources/Resources.php M vendor/composer/installed.json 8 files changed, 32 insertions(+), 31 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index 254b6ed..92b2656 100644 --- a/composer.lock +++ b/composer.lock @@ -863,12 +863,12 @@ source: { type: git, url: https://github.com/wmde/Wikidata.org.git;, -reference: b024e917b202be21c1f5df10408167b28003c911 +reference: 2ce996a452942f27a1345b5446ca1a6e60c689ed }, dist: { type: zip, -url: https://api.github.com/repos/wmde/Wikidata.org/zipball/b024e917b202be21c1f5df10408167b28003c911;, -reference: b024e917b202be21c1f5df10408167b28003c911, +url: https://api.github.com/repos/wmde/Wikidata.org/zipball/2ce996a452942f27a1345b5446ca1a6e60c689ed;, +reference: 2ce996a452942f27a1345b5446ca1a6e60c689ed, shasum: }, require: { @@ -901,7 +901,7 @@ irc: irc://irc.freenode.net/wikidata, source: https://github.com/wmde/Wikidata.org/tree/master; }, -time: 2015-05-14 19:02:19 +time: 2015-05-16 16:49:57 }, { name: wikibase/data-model, @@ -1213,12 +1213,12 @@ source: { type: git, url: https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -reference: a38aad2a87c800c11a6e53b71bc26536bcc742dc +reference: 2b5baa09537f3b15521d91d58908913117a95b20 }, dist: { type: zip, -url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a38aad2a87c800c11a6e53b71bc26536bcc742dc;, -reference: a38aad2a87c800c11a6e53b71bc26536bcc742dc, +url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2b5baa09537f3b15521d91d58908913117a95b20;, +reference: 2b5baa09537f3b15521d91d58908913117a95b20, shasum: }, require: { @@ -1286,7 +1286,7 @@ wikibaserepo, wikidata ], -time: 2015-05-15 19:47:56 +time: 2015-05-16 20:02:05 }, { name: wikibase/wikimedia-badges, @@ -1294,12 +1294,12 @@ source: { type: git, url: https://github.com/wmde/WikimediaBadges.git;, -reference: a4cb3fa96adee3f634999873c8bfe432783bf47e +reference: 8dfea8bb0afa937cdca0e33c24115d83f9b417cf }, dist: { type: zip, -url: https://api.github.com/repos/wmde/WikimediaBadges/zipball/a4cb3fa96adee3f634999873c8bfe432783bf47e;, -reference: a4cb3fa96adee3f634999873c8bfe432783bf47e, +url: https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf;, +reference: 8dfea8bb0afa937cdca0e33c24115d83f9b417cf, shasum: }, require: { @@ -1336,7 +1336,7 @@ source: https://github.com/wmde/WikimediaBadges/tree/master;, issues: https://github.com/wmde/WikimediaBadges/issues; }, -time: 2015-04-29 15:52:39 +time: 2015-05-16 16:54:06 } ], packages-dev: [], diff --git a/extensions/Wikibase/repo/i18n/be-tarask.json b/extensions/Wikibase/repo/i18n/be-tarask.json index 14afa96..9008d96 100644 --- a/extensions/Wikibase/repo/i18n/be-tarask.json +++ b/extensions/Wikibase/repo/i18n/be-tarask.json @@ -190,6 +190,7 @@ wikibase-noentity-createone: Вы можаце таксама [[$1|стварыць яго]]., wikibase-item-summary-wbsetitem: Створаны новы прадмет, wikibase-item-summary-wbcreate-new: Створаны новы аб’ект, + wikibase-item-summary-wbcreateredirect: Перанакіраваны на $4, wikibase-item-summary-wbeditentity: Створаны новы аб’ект, wikibase-item-summary-wbeditentity-create: Створаны новы аб’ект, wikibase-item-summary-wbeditentity-update: Абноўлены аб’ект, diff --git
[MediaWiki-commits] [Gerrit] Update Wikidata - fix rdf dump script - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata - fix rdf dump script .. Update Wikidata - fix rdf dump script Change-Id: I512fe1615da0714572175aeb785ba85e4fc7d3c9 --- M composer.lock M extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php M vendor/composer/installed.json 3 files changed, 12 insertions(+), 11 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index 5252e5a..2762b02 100644 --- a/composer.lock +++ b/composer.lock @@ -867,7 +867,7 @@ }, dist: { type: zip, -url: https://api.github.com/repos/wmde/Wikidata.org/zipball/58718af4a34d9fc067d9b103f0e5d9c9b9c87028;, +url: https://api.github.com/repos/wmde/Wikidata.org/zipball/2ce996a452942f27a1345b5446ca1a6e60c689ed;, reference: 58718af4a34d9fc067d9b103f0e5d9c9b9c87028, shasum: }, @@ -1213,7 +1213,7 @@ source: { type: git, url: https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;, -reference: 1be5ea067d20ff52f8d55d4132736ed65af49588 +reference: 9eabd536196d41b66b6921aa28c506c94960e4bc }, require: { data-values/common: ~0.2.0, @@ -1283,7 +1283,7 @@ issues: https://bugzilla.wikimedia.org/;, irc: irc://irc.freenode.net/wikidata }, -time: 2015-05-13 10:19:29 +time: 2015-05-16 15:55:32 }, { name: wikibase/wikimedia-badges, @@ -1295,7 +1295,7 @@ }, dist: { type: zip, -url: https://api.github.com/repos/wmde/WikimediaBadges/zipball/a4cb3fa96adee3f634999873c8bfe432783bf47e;, +url: https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf;, reference: a4cb3fa96adee3f634999873c8bfe432783bf47e, shasum: }, diff --git a/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php b/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php index c44c9e7..5305eb6 100644 --- a/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php +++ b/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php @@ -98,6 +98,10 @@ try { $entityRevision = $this-entityRevisionLookup-getEntityRevision( $entityId ); + if ( !$entityRevision ) { + throw new StorageException( 'Entity not found: ' . $entityId-getSerialization() ); + } + $this-rdfBuilder-addEntityRevisionInfo( $entityRevision-getEntity()-getId(), $entityRevision-getRevisionId(), @@ -108,9 +112,6 @@ $entityRevision-getEntity() ); - if ( !$entityRevision ) { - throw new StorageException( 'Entity not found: ' . $entityId-getSerialization() ); - } } catch ( MWContentSerializationException $ex ) { throw new StorageException( 'Deserialization error for ' . $entityId-getSerialization() ); } catch ( UnresolvedRedirectException $e ) { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d4aa7c3..76bdc00 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -154,7 +154,7 @@ }, dist: { type: zip, -url: https://api.github.com/repos/wmde/WikimediaBadges/zipball/a4cb3fa96adee3f634999873c8bfe432783bf47e;, +url: https://api.github.com/repos/wmde/WikimediaBadges/zipball/8dfea8bb0afa937cdca0e33c24115d83f9b417cf;, reference: a4cb3fa96adee3f634999873c8bfe432783bf47e, shasum: }, @@ -206,7 +206,7 @@ }, dist: { type: zip, -url: https://api.github.com/repos/wmde/Wikidata.org/zipball/58718af4a34d9fc067d9b103f0e5d9c9b9c87028;, +url: https://api.github.com/repos/wmde/Wikidata.org/zipball/2ce996a452942f27a1345b5446ca1a6e60c689ed;, reference: 58718af4a34d9fc067d9b103f0e5d9c9b9c87028, shasum: }, @@ -1303,7 +1303,7 @@ source: { type: git, url: https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;, -reference: 1be5ea067d20ff52f8d55d4132736ed65af49588 +reference: 9eabd536196d41b66b6921aa28c506c94960e4bc }, require: { data-values/common: ~0.2.0, @@ -1329,7 +1329,7 @@ conflict: {
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (5cc6989) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/211695 Change subject: Update VE core submodule to master (5cc6989) .. Update VE core submodule to master (5cc6989) New changes: de4690d Remove redundant check 8747dd1 Update OOjs UI to v0.11.3 5e266ba Fix attributeClassNode setup if model has changed 3377cfa Localisation updates from https://translatewiki.net. a125222 Localisation updates from https://translatewiki.net. 48c70fe Localisation updates from https://translatewiki.net. 5cc6989 Localisation updates from https://translatewiki.net. Change-Id: I078d63eddba5fe0a49abcedf053489a47dae82b5 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/95/211695/1 diff --git a/lib/ve b/lib/ve index 9c2b380..5cc6989 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 9c2b380e00d672817933873bcfc2f34ad2ec1487 +Subproject commit 5cc69899d25e25d699a56395d577fe6734d8b8ae -- To view, visit https://gerrit.wikimedia.org/r/211695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I078d63eddba5fe0a49abcedf053489a47dae82b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable A/B test of VisualEditor for new accounts on English... - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/211698 Change subject: Disable A/B test of VisualEditor for new accounts on English Wikipedia .. Disable A/B test of VisualEditor for new accounts on English Wikipedia To be merged 7 days after the parent commit. Bug: T90666 Change-Id: I30c657a93820d05aa908920d14ed2815b8b9bb49 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/211698/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fdbb1e7..2e9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12676,7 +12676,6 @@ // Should 50% of new accounts be opted in to VisualEditor (A/B test) 'wmgVisualEditorEnableSplitTest' = array( 'default' = false, -'enwiki' = true, ), // --- VisualEditor end --- -- To view, visit https://gerrit.wikimedia.org/r/211698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30c657a93820d05aa908920d14ed2815b8b9bb49 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityConstraints)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211710 Change subject: Updated README .. Updated README Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d (cherry picked from commit dfd93b0ea0a754eff46b21ad78836b3e7089e77a) --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints refs/changes/10/211710/1 diff --git a/README.md b/README.md index 7a02abe..87729be 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityConstraints -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) +# Wikibase Quality Constraints +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs constraint checks in Wikidata. +This is a complementary extension for the [Wikibase Quality base extension] +(https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs constraint checks in Wikibase. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityConstraints/WikidataQualityConstraints.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityConstraints directory \ No newline at end of file +* Add the following lines: +```json +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityConstraints; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/constraints: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the constraints table - for that you need the +[constraints from templates script](https://github.com/WikidataQuality/ConstraintsFromTemplates). +Follow the instruction in the README to create a csv file. +Run `php maintenance/runScript.php extensions/Constraints/maintenance/UpdateTable.php --csv-file path_to_csv_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211709 Change subject: Updated README .. Updated README Change-Id: I0119e2c1b19b58b2277d81bfa429bc3352bd0801 (cherry picked from commit 2f3fde1be6bf72a401b4d1ce61891e17bffa274f) --- M README.md 1 file changed, 6 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/09/211709/1 diff --git a/README.md b/README.md index 572b954..23dcdb3 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,11 @@ -# WikidataQuality [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQuality/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) +# Wikibase Quality [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQuality/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) -This is the base extension for our Wikidata Quality extensions. -To add functionality you need to install at least one Wikidata Quality extension -(see [list of extensions below](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality#wikidata-quality-extensions)). - -## Installation - -* Clone this repo into Wikidata/extensions - -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git` - -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/WikidataQuality.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQuality directory - -## Wikidata Quality extensions +This is the base extension for our Wikibase Quality extensions. +It doesn't do anything without at least one complementary Wikibase Quality extension (listed below). +There you can also find installation instructions. [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) -[WikidataQualityConstraints](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints) + [WikidataQualityConstraints](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) -[WikidataQualityExternalValidation](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) \ No newline at end of file + [WikidataQualityExternalValidation](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0119e2c1b19b58b2277d81bfa429bc3352bd0801 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: master Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQuality)
Tamslo has submitted this change and it was merged. Change subject: Updated README .. Updated README Change-Id: I0119e2c1b19b58b2277d81bfa429bc3352bd0801 --- M README.md 1 file changed, 6 insertions(+), 18 deletions(-) Approvals: Tamslo: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 572b954..23dcdb3 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,11 @@ -# WikidataQuality [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQuality/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) +# Wikibase Quality [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQuality/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) -This is the base extension for our Wikidata Quality extensions. -To add functionality you need to install at least one Wikidata Quality extension -(see [list of extensions below](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality#wikidata-quality-extensions)). - -## Installation - -* Clone this repo into Wikidata/extensions - -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git` - -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/WikidataQuality.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQuality directory - -## Wikidata Quality extensions +This is the base extension for our Wikibase Quality extensions. +It doesn't do anything without at least one complementary Wikibase Quality extension (listed below). +There you can also find installation instructions. [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) -[WikidataQualityConstraints](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints) + [WikidataQualityConstraints](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) -[WikidataQualityExternalValidation](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) \ No newline at end of file + [WikidataQualityExternalValidation](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0119e2c1b19b58b2277d81bfa429bc3352bd0801 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQualityConstraints)
Tamslo has submitted this change and it was merged. Change subject: Updated README .. Updated README Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d --- M README.md 1 file changed, 50 insertions(+), 9 deletions(-) Approvals: Tamslo: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 7a02abe..87729be 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,56 @@ -# WikidataQualityConstraints -[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) +# Wikibase Quality Constraints +[![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)] +(https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badge.svg)] +(https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQualityConstraints) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/badges/quality-score.png?b=master)] +(https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQualityConstraints/?branch=master) -This is a complementary extension for the [Wikidata Quality extension](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). -It performs constraint checks in Wikidata. +This is a complementary extension for the [Wikibase Quality base extension] +(https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git). +It performs constraint checks in Wikibase. ## Installation -* Clone this repo into WikidataQuality/extensions +_If you have already installed a complementary Wikibase Quality extension you can skip the first two steps and just +add the repository (second entry in repositories and the required version (last entry in require) to the +composer.local.json._ -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints.git` +* Create the file `composer.local.json` in the directory of your mediawiki installation. -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/extensions/WikidataQualityConstraints/WikidataQualityConstraints.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQualityConstraints directory \ No newline at end of file +* Add the following lines: +```json +{ +repositories: [ +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQuality; +}, +{ +type: git, +url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataQualityConstraints; +} +], +require: { +wikibase/quality: @dev, +wikibase/wikibase: @dev, +wikibase/constraints: 1.x-dev +} +} +``` + +* Run `composer install`. + +* If not already done, add the following lines to your `LocalSettings.php` to enable Wikibase: +```php +$wgEnableWikibaseRepo = true; +$wgEnableWikibaseClient = false; +require_once $IP/extensions/Wikibase/repo/ExampleSettings.php; +``` + +* Run `php maintenance/update.php --quick`. + +* Last but not least, you need to fill the constraints table - for that you need the +[constraints from templates script](https://github.com/WikidataQuality/ConstraintsFromTemplates). +Follow the instruction in the README to create a csv file. +Run `php maintenance/runScript.php extensions/Constraints/maintenance/UpdateTable.php --csv-file path_to_csv_file`. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie749fc6d03094e2c2b793c5923cf18b5239a996d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com Gerrit-Reviewer: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable VisualEditor A/B test pilot - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/211696 Change subject: Disable VisualEditor A/B test pilot .. Disable VisualEditor A/B test pilot To be deployed 24 hours after parent commit. Change-Id: I165428bca0914d0d5decd47ef535f1b6a645342a --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/96/211696/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ee7dbbb..2e9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12676,7 +12676,6 @@ // Should 50% of new accounts be opted in to VisualEditor (A/B test) 'wmgVisualEditorEnableSplitTest' = array( 'default' = false, - 'enwiki' = true, ), // --- VisualEditor end --- -- To view, visit https://gerrit.wikimedia.org/r/211696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I165428bca0914d0d5decd47ef535f1b6a645342a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing newlines between namespace and use blocks - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/211705 Change subject: Add missing newlines between namespace and use blocks .. Add missing newlines between namespace and use blocks This fixes a single style guide issue accross the whole Wikibase.git code base: there must be a blank line between namespace and use (according to phpmd) and there should be a blank line before namespace. This is split from If24d3d1 to make it easier to review. Change-Id: Icf93d0219f73a5901b7e9eebd4bc3ce60a7d3d64 --- M client/tests/phpunit/includes/Usage/PageEntityUsagesTest.php M client/tests/phpunit/includes/Usage/UsageAspectTransformerTest.php M lib/includes/Reporting/NullMessageReporter.php M lib/includes/formatters/DispatchingValueFormatter.php M lib/includes/formatters/OutputFormatSnakFormatterFactory.php M lib/includes/formatters/OutputFormatValueFormatterFactory.php M lib/includes/modules/RepoAccessModule.php M lib/tests/phpunit/Validators/MembershipValidatorTest.php M lib/tests/phpunit/Validators/NotEntityIdValidatorTest.php M lib/tests/phpunit/Validators/NumberRangeValidatorTest.php M lib/tests/phpunit/formatters/UnDeserializableValueFormatterTest.php M repo/includes/rdf/DateTimeValueCleaner.php M repo/includes/rdf/JulianDateTimeValueCleaner.php M repo/includes/store/ChangeDispatchCoordinator.php M repo/tests/phpunit/includes/ChangeOp/FingerprintChangeOpFactoryTest.php M repo/tests/phpunit/includes/api/GetEntitiesRedirectTest.php M repo/tests/phpunit/includes/rdf/DateValueCleanerTest.php M view/src/EntityIdFormatterFactory.php 18 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/05/211705/1 diff --git a/client/tests/phpunit/includes/Usage/PageEntityUsagesTest.php b/client/tests/phpunit/includes/Usage/PageEntityUsagesTest.php index d923d26..9ab69b7 100644 --- a/client/tests/phpunit/includes/Usage/PageEntityUsagesTest.php +++ b/client/tests/phpunit/includes/Usage/PageEntityUsagesTest.php @@ -1,4 +1,5 @@ ?php + namespace Wikibase\Client\Tests\Usage; use PHPUnit_Framework_TestCase; diff --git a/client/tests/phpunit/includes/Usage/UsageAspectTransformerTest.php b/client/tests/phpunit/includes/Usage/UsageAspectTransformerTest.php index 7d7c041..0e0f1cf 100644 --- a/client/tests/phpunit/includes/Usage/UsageAspectTransformerTest.php +++ b/client/tests/phpunit/includes/Usage/UsageAspectTransformerTest.php @@ -1,4 +1,5 @@ ?php + namespace Wikibase\Client\Usage\Tests; use Wikibase\Client\Usage\EntityUsage; diff --git a/lib/includes/Reporting/NullMessageReporter.php b/lib/includes/Reporting/NullMessageReporter.php index 2296b60..ba39f1d 100644 --- a/lib/includes/Reporting/NullMessageReporter.php +++ b/lib/includes/Reporting/NullMessageReporter.php @@ -1,6 +1,7 @@ ?php namespace Wikibase\Lib\Reporting; + /** * Mock implementation of the MessageReporter interface that * does nothing with messages it receives. diff --git a/lib/includes/formatters/DispatchingValueFormatter.php b/lib/includes/formatters/DispatchingValueFormatter.php index 10aae2a..38ced97 100644 --- a/lib/includes/formatters/DispatchingValueFormatter.php +++ b/lib/includes/formatters/DispatchingValueFormatter.php @@ -1,4 +1,5 @@ ?php + namespace Wikibase\Lib; use DataValues\DataValue; diff --git a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php index 1351c87..79c5084 100644 --- a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php +++ b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php @@ -1,5 +1,7 @@ ?php + namespace Wikibase\Lib; + use InvalidArgumentException; use RuntimeException; use ValueFormatters\FormatterOptions; diff --git a/lib/includes/formatters/OutputFormatValueFormatterFactory.php b/lib/includes/formatters/OutputFormatValueFormatterFactory.php index c43eb48..50a066f 100644 --- a/lib/includes/formatters/OutputFormatValueFormatterFactory.php +++ b/lib/includes/formatters/OutputFormatValueFormatterFactory.php @@ -1,5 +1,7 @@ ?php + namespace Wikibase\Lib; + use InvalidArgumentException; use RuntimeException; use ValueFormatters\FormatterOptions; diff --git a/lib/includes/modules/RepoAccessModule.php b/lib/includes/modules/RepoAccessModule.php index fd9c9d6..3f24932 100644 --- a/lib/includes/modules/RepoAccessModule.php +++ b/lib/includes/modules/RepoAccessModule.php @@ -1,6 +1,7 @@ ?php namespace Wikibase; + use ResourceLoaderContext; use ResourceLoaderModule; use Xml; diff --git a/lib/tests/phpunit/Validators/MembershipValidatorTest.php b/lib/tests/phpunit/Validators/MembershipValidatorTest.php index 60be618..9ff754c 100644 --- a/lib/tests/phpunit/Validators/MembershipValidatorTest.php +++ b/lib/tests/phpunit/Validators/MembershipValidatorTest.php @@ -1,4 +1,5 @@ ?php + namespace Wikibase\Test\Validators;
[MediaWiki-commits] [Gerrit] Updated README - change (mediawiki...WikidataQuality)
Tamslo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211704 Change subject: Updated README .. Updated README Change-Id: I0119e2c1b19b58b2277d81bfa429bc3352bd0801 --- M README.md 1 file changed, 6 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality refs/changes/04/211704/1 diff --git a/README.md b/README.md index 572b954..23dcdb3 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,11 @@ -# WikidataQuality [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQuality/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) +# Wikibase Quality [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQuality) [![Coverage Status](https://coveralls.io/repos/wikimedia/mediawiki-extensions-WikidataQuality/badge.svg)](https://coveralls.io/r/wikimedia/mediawiki-extensions-WikidataQuality) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-WikidataQuality/?branch=master) -This is the base extension for our Wikidata Quality extensions. -To add functionality you need to install at least one Wikidata Quality extension -(see [list of extensions below](https://github.com/wikimedia/mediawiki-extensions-WikidataQuality#wikidata-quality-extensions)). - -## Installation - -* Clone this repo into Wikidata/extensions - -`git clone https://github.com/wikimedia/mediawiki-extensions-WikidataQuality.git` - -* Add `require_once __DIR__ . /extensions/Wikidata/extensions/WikidataQuality/WikidataQuality.php;` to your LocalSettings.php -* Run `php maintenance/update.php --quick` in your Mediawiki directory -* Run `composer install` in the WikidataQuality directory - -## Wikidata Quality extensions +This is the base extension for our Wikibase Quality extensions. +It doesn't do anything without at least one complementary Wikibase Quality extension (listed below). +There you can also find installation instructions. [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityConstraints) -[WikidataQualityConstraints](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints) + [WikidataQualityConstraints](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityConstraints) [![Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) -[WikidataQualityExternalValidation](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) \ No newline at end of file + [WikidataQualityExternalValidation](https://github.com/wikimedia/mediawiki-extensions-WikidataQualityExternalValidation) \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0119e2c1b19b58b2277d81bfa429bc3352bd0801 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataQuality Gerrit-Branch: v1 Gerrit-Owner: Tamslo tamaraslosa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added RedisBagOStuff FIXME comments - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Added RedisBagOStuff FIXME comments .. Added RedisBagOStuff FIXME comments Change-Id: I6f4f85166584439a38d632356f3ed95e4fd4fd6f --- M includes/objectcache/RedisBagOStuff.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/objectcache/RedisBagOStuff.php b/includes/objectcache/RedisBagOStuff.php index 9d5d0ef..ed0aaa2 100644 --- a/includes/objectcache/RedisBagOStuff.php +++ b/includes/objectcache/RedisBagOStuff.php @@ -264,8 +264,6 @@ return $result; } - - public function add( $key, $value, $expiry = 0 ) { list( $server, $conn ) = $this-getConnection( $key ); @@ -277,6 +275,7 @@ if ( $expiry ) { $conn-multi(); $conn-setnx( $key, $this-serialize( $value ) ); + // @FIXME: this always bumps the TTL; use Redis 2.8 or Lua $conn-expire( $key, $expiry ); $result = ( $conn-exec() == array( true, true ) ); } else { @@ -313,6 +312,7 @@ return null; } try { + // @FIXME: on races, the key may have a 0 TTL $result = $conn-incrBy( $key, $value ); } catch ( RedisException $e ) { $result = false; -- To view, visit https://gerrit.wikimedia.org/r/211307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f4f85166584439a38d632356f3ed95e4fd4fd6f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove gather-hidelist from AvailableRights - change (operations/mediawiki-config)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/211663 Change subject: Remove gather-hidelist from AvailableRights .. Remove gather-hidelist from AvailableRights It's already set (and should be set) by Extension:Gather itself. Bug: T94652 Change-Id: Ib05d38209a09926995fc39db5bc7fa5da3d92185 --- M wmf-config/CommonSettings.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/211663/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 7dea9fa..cb0dfce 100755 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -3018,9 +3018,6 @@ $wgImgAuthDetails = true; -// Enable gather-hidelist for global user groups - JRA 4-1-2015 T94652 -$wgAvailableRights[] = 'gather-hidelist'; - if ( file_exists( $wmfConfigDir/extension-list-$wmfVersionNumber ) ) { // Version specific extension-list files // -- To view, visit https://gerrit.wikimedia.org/r/211663 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib05d38209a09926995fc39db5bc7fa5da3d92185 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanups to WANObjectCache::getWithSetCallback code - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Cleanups to WANObjectCache::getWithSetCallback code .. Cleanups to WANObjectCache::getWithSetCallback code * Do not use lock() for tombstoned keys unless lockTSE was set * Moved the is_callable() check down a bit further * Also removed one inaccurate comment Change-Id: I904e0681faa48b1dc2bc2a3c005a29d2f8347065 --- M includes/libs/objectcache/WANObjectCache.php 1 file changed, 16 insertions(+), 14 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index 8d202c7..6ec7e48 100755 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -404,16 +404,12 @@ return $value; } - if ( !is_callable( $callback ) ) { - throw new InvalidArgumentException( Invalid cache miss callback provided. ); - } - + $isTombstone = ( $curTTL !== null $value === false ); // Assume a key is hot if requested soon after invalidation $isHot = ( $curTTL !== null $curTTL = 0 abs( $curTTL ) = $lockTSE ); - $isTombstone = ( $curTTL !== null $value === false ); $locked = false; - if ( $isHot || $isTombstone ) { + if ( $isHot ) { // Acquire a cluster-local non-blocking lock if ( $this-cache-lock( $key, 0, self::LOCK_TTL ) ) { // Lock acquired; this thread should update the key @@ -421,17 +417,23 @@ } elseif ( $value !== false ) { // If it cannot be acquired; then the stale value can be used return $value; - } else { - // Either another thread has the lock or the lock failed. - // Use the stash value, which is likely from the prior thread. - $value = $this-cache-get( self::STASH_KEY_PREFIX . $key ); - // Regenerate on timeout or if the other thread failed - if ( $value !== false ) { - return $value; - } } } + if ( !$locked ( $isTombstone || $isHot ) ) { + // Use the stash value for tombstoned keys to reduce regeneration load. + // For hot keys, either another thread has the lock or the lock failed; + // use the stash value from the last thread that regenerated it. + $value = $this-cache-get( self::STASH_KEY_PREFIX . $key ); + if ( $value !== false ) { + return $value; + } + } + + if ( !is_callable( $callback ) ) { + throw new InvalidArgumentException( Invalid cache miss callback provided. ); + } + // Generate the new value from the callback... $value = call_user_func_array( $callback, array( $cValue, $ttl ) ); // When delete() is called, writes are write-holed by the tombstone, -- To view, visit https://gerrit.wikimedia.org/r/211082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I904e0681faa48b1dc2bc2a3c005a29d2f8347065 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registration: Use a static whitelist of keys that are not at... - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/211664 Change subject: registration: Use a static whitelist of keys that are not attributes .. registration: Use a static whitelist of keys that are not attributes Rather than continuously creating an array of keys that were used, just hardcode a list of keys that aren't attributes. This also handles keys like AutoloadClasses that is handled by the registry. Bug: T98977 Change-Id: I35088a76ff4c58db71e8c9bc139fa0ccca738e3b --- M includes/registration/ExtensionProcessor.php M tests/phpunit/includes/registration/ExtensionProcessorTest.php 2 files changed, 26 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/211664/1 diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index 23a2993..bac020d 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -64,6 +64,27 @@ ); /** +* Things that are not 'attributes', but are not in +* $globalSettings or $creditsAttributes. +* +* @var array +*/ + protected static $notAttributes = array( + 'callback', + 'Hooks', + 'namespaces', + 'ResourceFileModulePaths', + 'ResourceModules', + 'ResourceModuleSkinStyles', + 'ExtensionMessagesFiles', + 'MessagesDirs', + 'type', + 'config', + 'ParserTestFiles', + 'AutoloadClasses', + ); + + /** * Stuff that is going to be set to $GLOBALS * * Some keys are pre-set to arrays so we can += to them @@ -103,13 +124,6 @@ protected $attributes = array(); /** -* List of keys that have already been processed -* -* @var array -*/ - protected $processed = array(); - - /** * @param string $path * @param array $info * @return array @@ -125,7 +139,6 @@ $this-extractParserTestFiles( $dir, $info ); if ( isset( $info['callback'] ) ) { $this-callbacks[] = $info['callback']; - $this-processed[] = 'callback'; } $this-extractCredits( $path, $info ); @@ -133,11 +146,12 @@ if ( in_array( $key, self::$globalSettings ) ) { $this-storeToArray( wg$key, $val, $this-globals ); // Ignore anything that starts with a @ - } elseif ( $key[0] !== '@' !in_array( $key, $this-processed ) ) { + } elseif ( $key[0] !== '@' !in_array( $key, self::$notAttributes ) +!in_array( $key, self::$creditsAttributes ) + ) { $this-storeToArray( $key, $val, $this-attributes ); } } - } public function getExtractedInfo() { @@ -157,7 +171,6 @@ $this-globals['wgHooks'][$name][] = $callback; } } - $this-processed[] = 'Hooks'; } } @@ -185,7 +198,6 @@ $this-globals['wgNamespaceContentModels'][$id] = $ns['defaultcontentmodel']; } } - $this-processed[] = 'namespaces'; } } @@ -217,7 +229,6 @@ $this-globals[wgExtensionMessagesFiles] += array_map( function( $file ) use ( $dir ) { return $dir/$file; }, $info['ExtensionMessagesFiles'] ); - $this-processed[] = 'ExtensionMessagesFiles'; } } @@ -235,7 +246,6 @@ $this-globals[wgMessagesDirs][$name][] = $dir/$file; } } - $this-processed[] = 'MessagesDirs'; } } @@ -244,11 +254,9 @@ 'path' = $path, 'type' = isset( $info['type'] ) ? $info['type'] : 'other', ); - $this-processed[] = 'type'; foreach ( self::$creditsAttributes as $attr ) { if ( isset( $info[$attr] ) ) { $credits[$attr] = $info[$attr]; - $this-processed[] = $attr; } } @@ -268,7 +276,6 @@ $this-globals[wg$key] = $val;
[MediaWiki-commits] [Gerrit] hiera: use the proxy backend, rationalize the hierarchy - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: hiera: use the proxy backend, rationalize the hierarchy .. hiera: use the proxy backend, rationalize the hierarchy As any hiera hierarchy should move from more-specifc to less-specific lookups, it is natural to have per-role configs to be searched right before global (non role-specific) configs, so that they are easy to override per-role without reverting to use of regexes Change-Id: Ibae4a30f2abcf49ee6288bc12bfcc99285957a06 --- M modules/puppetmaster/files/production.hiera.yaml 1 file changed, 10 insertions(+), 8 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/puppetmaster/files/production.hiera.yaml b/modules/puppetmaster/files/production.hiera.yaml index 33701db..3e38065 100644 --- a/modules/puppetmaster/files/production.hiera.yaml +++ b/modules/puppetmaster/files/production.hiera.yaml @@ -1,6 +1,10 @@ :backends: - - nuyaml - - role + - proxy +:proxy: + :plugins: +- nuyaml +- role + :default_plugin: nuyaml :role: :datadir: /etc/puppet/hieradata :nuyaml: @@ -13,13 +17,11 @@ :hierarchy: - hosts/%{::hostname} - regex/%{::fqdn} + - role://%{::site} - %{::site} + - role://private/%{::site} - private/%{::site} + - role://common - common - - private/common - -:role_hierarchy: - - %{::site} - - common - - private/%{::site} + - role://private/common - private/common -- To view, visit https://gerrit.wikimedia.org/r/207129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibae4a30f2abcf49ee6288bc12bfcc99285957a06 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing ( to extension.php template - change (mediawiki/vagrant)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/211660 Change subject: Add missing ( to extension.php template .. Add missing ( to extension.php template Follows up 7e81fef48211a3db2. Change-Id: I07cc36cfa3becf8851b25c2e1095d5dfe92b3571 --- M puppet/modules/mediawiki/templates/extension.php.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/60/211660/1 diff --git a/puppet/modules/mediawiki/templates/extension.php.erb b/puppet/modules/mediawiki/templates/extension.php.erb index 7eb450a..0141a26 100644 --- a/puppet/modules/mediawiki/templates/extension.php.erb +++ b/puppet/modules/mediawiki/templates/extension.php.erb @@ -1,6 +1,6 @@ if ( class_exists( 'ExtensionRegistry' ) file_exists( $IP/extensions/%= @ext_name %/extension.json ) ) { wfLoadExtension( '%= @ext_name %' ); -} elseif file_exists( $IP/extensions/%= @ext_name %/%= @ext_entrypoint % ) { +} elseif ( file_exists( $IP/extensions/%= @ext_name %/%= @ext_entrypoint % ) { include_once $IP/extensions/%= @ext_name %/%= @ext_entrypoint %; } -- To view, visit https://gerrit.wikimedia.org/r/211660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07cc36cfa3becf8851b25c2e1095d5dfe92b3571 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced the rate of RecentChangesUpdateJob insertion - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Reduced the rate of RecentChangesUpdateJob insertion .. Reduced the rate of RecentChangesUpdateJob insertion Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 --- M includes/page/WikiPage.php 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 7b33b02..2098bec 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2206,12 +2206,14 @@ Hooks::run( 'ArticleEditUpdates', array( $this, $editInfo, $options['changed'] ) ); if ( Hooks::run( 'ArticleEditUpdatesDeleteFromRecentchanges', array( $this ) ) ) { - JobQueueGroup::singleton()-push( array( - // Flush old entries from the `recentchanges` table - RecentChangesUpdateJob::newPurgeJob(), - // Update the cached list of active users - RecentChangesUpdateJob::newCacheUpdateJob() - ) ); + // Update the cached list of active users + $jobs = array( RecentChangesUpdateJob::newCacheUpdateJob() ); + // Flush old entries from the `recentchanges` table + if ( mt_rand( 0, 9 ) == 0 ) { + $jobs[] = RecentChangesUpdateJob::newPurgeJob(); + } + + JobQueueGroup::singleton()-push( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Converted User object cache to the WAN cache - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Converted User object cache to the WAN cache .. Converted User object cache to the WAN cache Bug: T93141 Change-Id: I93dc5367d85d661bd5bdce29f4665bb8cd21ba02 --- M includes/User.php M includes/UserRightsProxy.php 2 files changed, 10 insertions(+), 11 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/User.php b/includes/User.php index c3d4a65..1936efd 100644 --- a/includes/User.php +++ b/includes/User.php @@ -410,15 +410,14 @@ * @since 1.25 */ protected function loadFromCache() { - global $wgMemc; - if ( $this-mId == 0 ) { $this-loadDefaults(); return false; } + $cache = ObjectCache::getMainWANInstance(); $key = wfMemcKey( 'user', 'id', $this-mId ); - $data = $wgMemc-get( $key ); + $data = $cache-get( $key ); if ( !is_array( $data ) || $data['mVersion'] self::VERSION ) { // Object is expired return false; @@ -440,8 +439,6 @@ * This method should not be called outside the User class */ public function saveToCache() { - global $wgMemc; - $this-load(); $this-loadGroups(); $this-loadOptions(); @@ -450,6 +447,8 @@ // Anonymous users are uncached return; } + + $cache = ObjectCache::getMainWANInstance(); // The cache needs good consistency due to its high TTL, so the user // should have been loaded from the master to avoid lag amplification. @@ -465,7 +464,7 @@ $data['mVersion'] = self::VERSION; $key = wfMemcKey( 'user', 'id', $this-mId ); - $wgMemc-set( $key, $data ); + $cache-set( $key, $data ); } /** @name newFrom*() static factory methods */ @@ -2310,11 +2309,11 @@ * Called implicitly from invalidateCache() and saveSettings(). */ public function clearSharedCache() { - global $wgMemc; - $this-load(); if ( $this-mId ) { - $wgMemc-delete( wfMemcKey( 'user', 'id', $this-mId ) ); + $cache = ObjectCache::getMainWANInstance(); + + $cache-delete( wfMemcKey( 'user', 'id', $this-mId ) ); } } diff --git a/includes/UserRightsProxy.php b/includes/UserRightsProxy.php index 1b9e4b69..a19f698 100644 --- a/includes/UserRightsProxy.php +++ b/includes/UserRightsProxy.php @@ -278,8 +278,8 @@ array( 'user_id' = $this-id ), __METHOD__ ); - global $wgMemc; + $cache = ObjectCache::getMainWANInstance(); $key = wfForeignMemcKey( $this-database, false, 'user', 'id', $this-id ); - $wgMemc-delete( $key ); + $cache-delete( $key ); } } -- To view, visit https://gerrit.wikimedia.org/r/207001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93dc5367d85d661bd5bdce29f4665bb8cd21ba02 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added deferred actions - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/211665 Change subject: Added deferred actions .. Added deferred actions The deferred actions components make it easier to create batch processing tasks with asynchronous behavior. It features some MW API default actions and an dialog/panel to visualize the progress. Change-Id: I7736553699b09f441cb775e08532d4eaa3da036a --- M BlueSpiceFoundation.php A i18n/deferred/de.json A i18n/deferred/en.json M i18n/extjs/de.json M i18n/extjs/en.json M i18n/extjs/qqq.json A languages/BlueSpice.Deferred.i18n.php M resources/Resources.php A resources/bluespice.extjs/BS/action/APICopyPage.js A resources/bluespice.extjs/BS/action/APIEditPage.js A resources/bluespice.extjs/BS/action/Base.js A resources/bluespice.extjs/BS/dialog/BatchActions.js A resources/bluespice.extjs/BS/panel/BatchActions.js 13 files changed, 396 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/65/211665/1 diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php index 3b8e5e6..529f338 100644 --- a/BlueSpiceFoundation.php +++ b/BlueSpiceFoundation.php @@ -73,6 +73,7 @@ $wgMessagesDirs['BlueSpiceDiagnostics'] = __DIR__ . '/i18n/diagnostics'; $wgMessagesDirs['BlueSpice.ExtJS'] = __DIR__ . '/i18n/extjs'; $wgMessagesDirs['BlueSpice.ExtJS.Portal'] = __DIR__ . '/i18n/extjs-portal'; +$wgMessagesDirs['BlueSpice.Deferred'] = __DIR__ . '/i18n/deferred'; $wgMessagesDirs['Validator'] = __DIR__ . '/i18n/validator'; //I18N Backwards compatibility @@ -81,6 +82,7 @@ 'Validator' = __DIR__./languages/Validator.i18n.php, 'BlueSpice.ExtJS' = __DIR__./languages/BlueSpice.ExtJS.i18n.php, 'BlueSpice.ExtJS.Portal' = __DIR__./languages/BlueSpice.ExtJS.Portal.i18n.php, + 'BlueSpice.Deferred' = __DIR__.'/languages/BlueSpice.Deferred.i18n.php'; 'BlueSpiceDiagnostics' = __DIR__./languages/BlueSpice.Diagnostics.i18n.php, 'DiagnosticsAlias' = __DIR__./languages/BlueSpice.Diagnostics.alias.php, 'BlueSpiceCredits' = __DIR__./languages/BlueSpice.Credits.i18n.php, diff --git a/i18n/deferred/de.json b/i18n/deferred/de.json new file mode 100644 index 000..96e19b5 --- /dev/null +++ b/i18n/deferred/de.json @@ -0,0 +1,18 @@ +{ + @metadata: { + authors: [ + Robert Vogel vo...@hallowelt.biz + ] + }, + bs-deferred-action-status-pending: Warten., + bs-deferred-action-status-running: Läuft..., + bs-deferred-action-status-done: Abgeschloßen., + bs-deferred-action-status-error: Fehlgeschlagen., + bs-deferred-action-apicopypage-description: Kopieren von '$1' nach '$2'., + bs-deferred-action-apieditpage-description: Bearbeiten von '$1'., + bs-deferred-batch-title: Stapelverarbeitung, + bs-deferred-batch-progress-desc: Fortschritt, + bs-deferred-batch-actions: Aktionen, + bs-deferred-batch-description: Beschreibung, + bs-deferred-batch-status: Status +} diff --git a/i18n/deferred/en.json b/i18n/deferred/en.json new file mode 100644 index 000..014df0f --- /dev/null +++ b/i18n/deferred/en.json @@ -0,0 +1,18 @@ +{ + @metadata: { + authors: [ + Robert Vogel vo...@hallowelt.biz + ] + }, + bs-deferred-action-status-pending: Pending., + bs-deferred-action-status-running: Running..., + bs-deferred-action-status-done: Done., + bs-deferred-action-status-error: Failed., + bs-deferred-action-apicopypage-description: Copy '$1' to '$2'., + bs-deferred-action-apieditpage-description: Edit '$1'., + bs-deferred-batch-title: Batch processing, + bs-deferred-batch-progress-desc: Progress, + bs-deferred-batch-actions: Actions, + bs-deferred-batch-description: Description, + bs-deferred-batch-status: Status +} diff --git a/i18n/extjs/de.json b/i18n/extjs/de.json index f2e3570..d649306 100644 --- a/i18n/extjs/de.json +++ b/i18n/extjs/de.json @@ -13,6 +13,7 @@ bs-extjs-add: Hinzufügen, bs-extjs-remove: Entfernen, bs-extjs-edit: Bearbeiten, + bs-extjs-copy: Kopieren, bs-extjs-hint: Hinweis, bs-extjs-error: Fehler, bs-extjs-confirm: Bestätigen, diff --git a/i18n/extjs/en.json b/i18n/extjs/en.json index feae8f8..80ddaf3 100644 --- a/i18n/extjs/en.json +++ b/i18n/extjs/en.json @@ -13,6 +13,7 @@ bs-extjs-add: Add, bs-extjs-remove: Remove, bs-extjs-edit: Edit, + bs-extjs-copy: Copy, bs-extjs-hint: Hint, bs-extjs-error: Error, bs-extjs-confirm: Confirm, diff --git a/i18n/extjs/qqq.json b/i18n/extjs/qqq.json index 36e7470..5ea4264 100644 --- a/i18n/extjs/qqq.json +++ b/i18n/extjs/qqq.json @@ -16,6 +16,7 @@ bs-extjs-add: {{Identical|Add}},
[MediaWiki-commits] [Gerrit] Add vp9 support - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/211726 Change subject: Add vp9 support .. Add vp9 support Change-Id: I1c2a143b15762da27775779b26dd29d782ed9df1 --- M MwEmbedModules/EmbedPlayer/i18n/fy.json M WebVideoTranscode/WebVideoTranscode.php M i18n/fy.json M i18n/ro.json A i18n/vro.json M i18n/zh-hans.json 6 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/26/211726/1 diff --git a/MwEmbedModules/EmbedPlayer/i18n/fy.json b/MwEmbedModules/EmbedPlayer/i18n/fy.json index 1181ac7..7c57dd3 100644 --- a/MwEmbedModules/EmbedPlayer/i18n/fy.json +++ b/MwEmbedModules/EmbedPlayer/i18n/fy.json @@ -4,5 +4,6 @@ Robin0van0der0vliet ] }, - mwe-embedplayer-player_fullscreen: Folsleinskerm + mwe-embedplayer-player_fullscreen: Folsleinskerm, + mwe-embedplayer-close_btn: Slute } diff --git a/WebVideoTranscode/WebVideoTranscode.php b/WebVideoTranscode/WebVideoTranscode.php index 20d8a66..04c5381 100644 --- a/WebVideoTranscode/WebVideoTranscode.php +++ b/WebVideoTranscode/WebVideoTranscode.php @@ -542,6 +542,9 @@ if( $codec == 'vp8' ){ $addWebMFlag = true; } + if( $codec == 'vp9' ){ + $addWebMFlag = true; + } if( $codec == 'h264' ){ $addH264Flag = true; } @@ -560,6 +563,10 @@ self::addSourceIfReady( $file, $sources, $transcodeKey, $options ); $addWebMFlag = true; } + if( !$addWebMFlag self::$derivativeSettings[$transcodeKey]['videoCodec'] == 'vp9' ){ + self::addSourceIfReady( $file, $sources, $transcodeKey, $options ); + $addWebMFlag = true; + } if( !$addH264Flag self::$derivativeSettings[$transcodeKey]['videoCodec'] == 'h264' ){ self::addSourceIfReady( $file, $sources, $transcodeKey, $options ); $addH264Flag = true; diff --git a/i18n/fy.json b/i18n/fy.json index 254fea7..17b90b7 100644 --- a/i18n/fy.json +++ b/i18n/fy.json @@ -5,6 +5,7 @@ ] }, timedmedia-more: Mear…, + timedmedia-dismiss: Slute, timedmedia-days: {{PLURAL:$1|1 dei|$1 dagen}}, timedmedia-hours: {{PLURAL:$1|1 oere|$1 oeren}}, timedmedia-minutes: {{PLURAL:$1|1 minút|$1 minuten}}, diff --git a/i18n/ro.json b/i18n/ro.json index c488e25..0605f4c 100644 --- a/i18n/ro.json +++ b/i18n/ro.json @@ -24,7 +24,7 @@ timedmedia-flac-long-audio: fișier audio FLAC, lungime $1, $2 per ansmablu, timedmedia-mp4-short-video: fișier video MP4 $1, $2, timedmedia-mp4-long-video: fișier audio/video MP4, $1, lungime $2, $4 × $5 pixeli, $3 per ansamblu, - timedmedia-no-player-js: Ne pare rău, însă navigatorul tău fie are JavaScript dezactivat, fie nu conține niciun player suportat.br /\nPpți a href=\$1\descărca clipul/a sau poți a href=\https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download\;descărca un player/a pentru a-l reda direct în navigator., + timedmedia-no-player-js: Ne pare rău, însă navigatorul dumneavoastră fie are JavaScript dezactivat, fie nu conține niciun player suportat.br /\nPuteți a href=\$1\descărca clipul/a sau puteți a href=\https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download\;descărca un player/a pentru a-l reda direct în navigator., timedmedia-more: Mai mult…, timedmedia-dismiss: Închide, timedmedia-download: Descarcă fișierul, @@ -56,7 +56,7 @@ timedmedia-mp4: MP4, timedmedia-source-file: Sursă $1, timedmedia-source-file-desc: Fișier $1 original, $2 × $3 ($4), - timedmedia-source-audio-file-desc: Fișierul $1 original ($2), + timedmedia-source-audio-file-desc: Fișier $1 original ($2), timedmedia-derivative-desc-160p.ogv: Videoclip Ogg cu lățime de bandă mică (160P), timedmedia-derivative-desc-360p.ogv: Videoclip Ogg pentru redare pe web (360P), timedmedia-derivative-desc-480p.ogv: Videoclip Ogg pentru redare pe web (480P), diff --git a/i18n/vro.json b/i18n/vro.json new file mode 100644 index 000..475 --- /dev/null +++ b/i18n/vro.json @@ -0,0 +1,10 @@ +{ + @metadata: { + authors: [ + Võrok + ] + }, + timedmedia-no-player-js: Kah'os om suq võrgokaejan
[MediaWiki-commits] [Gerrit] Renamed FULL_PRECISION and TIME_MISSING date precision const... - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/211727 Change subject: Renamed FULL_PRECISION and TIME_MISSING date precision constants .. Renamed FULL_PRECISION and TIME_MISSING date precision constants They are now DATE_AND_TIME and DATE_ONLY, respectively. Also, a field of type 'Date' that has a full date is of precision DATE_ONLY (it used to be FULL_PRECISION), which makes the correct display in the 'calendar' format easier to do. Change-Id: Ia546ccc45660dab1a0f36b9fa179f12c2365424c --- M CargoQueryDisplayer.php M parserfunctions/CargoStore.php M specials/CargoExport.php 3 files changed, 33 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/27/211727/1 diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php index 1e9272d..7873921 100644 --- a/CargoQueryDisplayer.php +++ b/CargoQueryDisplayer.php @@ -124,7 +124,7 @@ // happen, but if it // does - let's just // give up. - $datePrecision = CargoStore::FULL_PRECISION; + $datePrecision = CargoStore::DATE_ONLY; } } $text = self::formatDateFieldValue( $value, $datePrecision, $fieldType ); @@ -188,8 +188,8 @@ return CargoDrilldownUtils::monthToString( date( 'm', $seconds ) ) . ' ' . date( 'o', $seconds ); } else { - // CargoStore::FULL_PRECISION or - // CargoStore::TIME_MISSING + // CargoStore::DATE_AND_TIME or + // CargoStore::DATE_ONLY global $wgAmericanDates; if ( $wgAmericanDates ) { // We use MediaWiki's representation of month @@ -200,7 +200,10 @@ } else { $dateText = date( 'o-m-d', $seconds ); } - if ( $type == 'Date' || $datePrecision == CargoStore::TIME_MISSING ) { + // @TODO - remove the redundant 'Date' check at some + // point. It's here because the precision constants + // changed a little in version 0.8. + if ( $type == 'Date' || $datePrecision == CargoStore::DATE_ONLY ) { return $dateText; } diff --git a/parserfunctions/CargoStore.php b/parserfunctions/CargoStore.php index 98adcc8..96c4eb7 100644 --- a/parserfunctions/CargoStore.php +++ b/parserfunctions/CargoStore.php @@ -10,8 +10,8 @@ public static $settings = array(); - const FULL_PRECISION = 0; - const TIME_MISSING = 1; + const DATE_AND_TIME = 0; + const DATE_ONLY = 1; const MONTH_ONLY = 2; const YEAR_ONLY = 3; @@ -285,6 +285,7 @@ } } if ( $fieldType == 'Date' || $fieldType == 'Datetime' ) { + $precision = null; if ( $curValue != '' ) { // Special handling if it's just a year. // If it's a number and less than 8 @@ -315,20 +316,26 @@ // of the month. $precision = self::MONTH_ONLY; } else { - $precision = self::FULL_PRECISION; + // We have at least a + // full date. + if ( $fieldType == 'Date' ) { + $precision = self::DATE_ONLY; + } } } $seconds = strtotime( $curValue ); - if ( $precision != self::FULL_PRECISION || $fieldType == 'Date' ) { + if ( $precision == self::DATE_ONLY ) { // Put into -MM-DD format. $tableFieldValues[$fieldName] = date( 'Y-m-d', $seconds ); -
[MediaWiki-commits] [Gerrit] Add vp9 support to webm - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/211729 Change subject: Add vp9 support to webm .. Add vp9 support to webm Requires patch https://gerrit.wikimedia.org/r/#/c/211726/ Change-Id: I7909ac98f8b18b46b53a02d2ffd1382a6f451938 --- M MwEmbedModules/EmbedPlayer/i18n/fy.json M WebVideoTranscode/WebVideoTranscode.php M i18n/fy.json M i18n/ro.json A i18n/vro.json M i18n/zh-hans.json 6 files changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/29/211729/1 diff --git a/MwEmbedModules/EmbedPlayer/i18n/fy.json b/MwEmbedModules/EmbedPlayer/i18n/fy.json index 1181ac7..7c57dd3 100644 --- a/MwEmbedModules/EmbedPlayer/i18n/fy.json +++ b/MwEmbedModules/EmbedPlayer/i18n/fy.json @@ -4,5 +4,6 @@ Robin0van0der0vliet ] }, - mwe-embedplayer-player_fullscreen: Folsleinskerm + mwe-embedplayer-player_fullscreen: Folsleinskerm, + mwe-embedplayer-close_btn: Slute } diff --git a/WebVideoTranscode/WebVideoTranscode.php b/WebVideoTranscode/WebVideoTranscode.php index 20d8a66..94fa1ef 100644 --- a/WebVideoTranscode/WebVideoTranscode.php +++ b/WebVideoTranscode/WebVideoTranscode.php @@ -140,8 +140,8 @@ 'twopass'= 'true', 'keyframeInterval' = '128', 'bufDelay' = '256', - 'videoCodec' = 'vp8', - 'type' = 'video/webm; codecs=vp8, vorbis', + 'videoCodec' = array('vp8', 'vp9'), + 'type' = 'video/webm; codecs=vp8, vp9, vorbis', ), WebVideoTranscode::ENC_WEBM_360P = array( @@ -153,8 +153,8 @@ 'twopass'= 'true', 'keyframeInterval' = '128', 'bufDelay' = '256', - 'videoCodec' = 'vp8', - 'type' = 'video/webm; codecs=vp8, vorbis', + 'videoCodec' = array('vp8', 'vp9'), + 'type' = 'video/webm; codecs=vp8, vp9, vorbis', ), WebVideoTranscode::ENC_WEBM_480P = array( @@ -166,8 +166,8 @@ 'twopass'= 'true', 'keyframeInterval' = '128', 'bufDelay' = '256', - 'videoCodec' = 'vp8', - 'type' = 'video/webm; codecs=vp8, vorbis', + 'videoCodec' = array('vp8', 'vp9'), + 'type' = 'video/webm; codecs=vp8, vp9, vorbis', ), WebVideoTranscode::ENC_WEBM_720P = array( @@ -175,8 +175,8 @@ 'videoQuality' = 7, 'audioQuality' = 3, 'noUpscaling'= 'true', - 'videoCodec' = 'vp8', - 'type' = 'video/webm; codecs=vp8, vorbis', + 'videoCodec' = array('vp8', 'vp9'), + 'type' = 'video/webm; codecs=vp8, vp9, vorbis', ), WebVideoTranscode::ENC_WEBM_1080P = array( @@ -184,8 +184,8 @@ 'videoQuality' = 7, 'audioQuality' = 3, 'noUpscaling'= 'true', - 'videoCodec' = 'vp8', - 'type' = 'video/webm; codecs=vp8, vorbis', + 'videoCodec' = array('vp8', 'vp9'), + 'type' = 'video/webm; codecs=vp8, vp9, vorbis', ), // Losly defined per PCF guide to mp4 profiles: diff --git a/i18n/fy.json b/i18n/fy.json index 254fea7..17b90b7 100644 --- a/i18n/fy.json +++ b/i18n/fy.json @@ -5,6 +5,7 @@ ] }, timedmedia-more: Mear…, +
[MediaWiki-commits] [Gerrit] Fix build and analyzer warnings - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review. https://gerrit.wikimedia.org/r/211730 Change subject: Fix build and analyzer warnings .. Fix build and analyzer warnings Bug T99260 Change-Id: Ibc9fd00c9916371f01ce086eaafbd639782a0708 --- M Wikipedia/Categories/NSDate-Utilities.m M Wikipedia/Custom Views/MenuLabel.m M Wikipedia/Networking/Fetchers/BaseFetcher/FetcherBase.m M Wikipedia/mw-utils/WikipediaAppUtils.m 4 files changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/30/211730/1 diff --git a/Wikipedia/Categories/NSDate-Utilities.m b/Wikipedia/Categories/NSDate-Utilities.m index a43b95f..ac8168a 100644 --- a/Wikipedia/Categories/NSDate-Utilities.m +++ b/Wikipedia/Categories/NSDate-Utilities.m @@ -94,7 +94,7 @@ } // Must have a time interval under 1 week. Thanks @aclark -return (abs([self timeIntervalSinceDate:aDate]) D_WEEK); +return (fabs([self timeIntervalSinceDate:aDate]) D_WEEK); } - (BOOL)isThisWeek { diff --git a/Wikipedia/Custom Views/MenuLabel.m b/Wikipedia/Custom Views/MenuLabel.m index 64c0b6e..d0869b7 100644 --- a/Wikipedia/Custom Views/MenuLabel.m +++ b/Wikipedia/Custom Views/MenuLabel.m @@ -8,15 +8,11 @@ @interface MenuLabel () -@property (strong, nonatomic) NSString* text; - @property (strong, nonatomic) MenuLabel* label; @property (nonatomic) CGFloat fontSize; @property (nonatomic) BOOL fontBold; - -@property (nonatomic) UIEdgeInsets padding; @end diff --git a/Wikipedia/Networking/Fetchers/BaseFetcher/FetcherBase.m b/Wikipedia/Networking/Fetchers/BaseFetcher/FetcherBase.m index 4ba2e74..408b38d 100644 --- a/Wikipedia/Networking/Fetchers/BaseFetcher/FetcherBase.m +++ b/Wikipedia/Networking/Fetchers/BaseFetcher/FetcherBase.m @@ -62,7 +62,7 @@ } - (NSDictionary*)dictionaryFromDataResponse:(id)responseObject { -NSDictionary* output = @{}; +NSDictionary* output = nil; // Convert the raw NSData response to a dictionary. if (![self isDataResponseValid:responseObject]) { // Fake out an error if bad response received. diff --git a/Wikipedia/mw-utils/WikipediaAppUtils.m b/Wikipedia/mw-utils/WikipediaAppUtils.m index 086a629..384c06b 100644 --- a/Wikipedia/mw-utils/WikipediaAppUtils.m +++ b/Wikipedia/mw-utils/WikipediaAppUtils.m @@ -95,7 +95,7 @@ } + (NSString*)relativeTimestamp:(NSDate*)date { -NSTimeInterval interval = abs([date timeIntervalSinceNow]); +NSTimeInterval interval = fabs([date timeIntervalSinceNow]); double minutes = interval / 60.0; double hours= minutes / 60.0; double days = hours / 24.0; -- To view, visit https://gerrit.wikimedia.org/r/211730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc9fd00c9916371f01ce086eaafbd639782a0708 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Fjalapeno cfl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log callers that trigger Title::newFromText $text type warning - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Log callers that trigger Title::newFromText $text type warning .. Log callers that trigger Title::newFromText $text type warning Follows-up Ic85d27d79, Ibedc31659. See T76305. Change-Id: I8245744a9291d221f4e9302bb83db328a24f115f --- M includes/Title.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Title.php b/includes/Title.php index 509fc27..601211d 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -265,6 +265,7 @@ if ( is_object( $text ) ) { throw new InvalidArgumentException( '$text must be a string.' ); } elseif ( !is_string( $text ) ) { + wfDebugLog( 'T76305', wfGetAllCallers( 5 ) ); wfWarn( __METHOD__ . ': $text must be a string. This will throw an InvalidArgumentException in future.', 2 ); } -- To view, visit https://gerrit.wikimedia.org/r/211654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8245744a9291d221f4e9302bb83db328a24f115f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Expand maximum post length to be based on $wgMaxArticleSize - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Expand maximum post length to be based on $wgMaxArticleSize .. Expand maximum post length to be based on $wgMaxArticleSize It's not the same exact limit as $wgMaxArticleSize because ours is a character limit whereas that is a byte limit. Bug: T95978 Change-Id: I50d93478b8413296389268e50ca5e9aa39c45dd1 --- M container.php M includes/Model/PostRevision.php M includes/SpamFilter/ContentLengthFilter.php 3 files changed, 9 insertions(+), 3 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/container.php b/container.php index d08bf15..c113647 100644 --- a/container.php +++ b/container.php @@ -804,7 +804,14 @@ }; $c['controller.contentlength'] = function( $c ) { - return new Flow\SpamFilter\ContentLengthFilter; + global $wgMaxArticleSize; + + // wgMaxArticleSize is in kilobytes, + // whereas this really is characters (it uses + // mb_strlen), so it's not the exact same limit. + $maxCharCount = $wgMaxArticleSize * 1024; + + return new Flow\SpamFilter\ContentLengthFilter( $maxCharCount ); }; $c['controller.spamfilter'] = function( $c ) { diff --git a/includes/Model/PostRevision.php b/includes/Model/PostRevision.php index 2f2411e..a901844 100644 --- a/includes/Model/PostRevision.php +++ b/includes/Model/PostRevision.php @@ -12,7 +12,6 @@ class PostRevision extends AbstractRevision { const MAX_TOPIC_LENGTH = 260; - const MAX_POST_LENGTH = 25600; /** * @var UUID diff --git a/includes/SpamFilter/ContentLengthFilter.php b/includes/SpamFilter/ContentLengthFilter.php index b8cb270..33ea50b 100644 --- a/includes/SpamFilter/ContentLengthFilter.php +++ b/includes/SpamFilter/ContentLengthFilter.php @@ -14,7 +14,7 @@ */ protected $maxLength; - public function __construct( $maxLength = 25600 ) { + public function __construct( $maxLength ) { $this-maxLength = $maxLength; } -- To view, visit https://gerrit.wikimedia.org/r/211332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50d93478b8413296389268e50ca5e9aa39c45dd1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix to show dates with no time in calendar as all-day events - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged. Change subject: Fix to show dates with no time in calendar as all-day events .. Fix to show dates with no time in calendar as all-day events Change-Id: I36a97a6072d6cf1218a70f41bda288509d20a17c --- M specials/CargoExport.php 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/specials/CargoExport.php b/specials/CargoExport.php index 8f54909..b72e66e 100644 --- a/specials/CargoExport.php +++ b/specials/CargoExport.php @@ -114,7 +114,11 @@ $eventTitle = reset( $queryResult ); } $title = Title::newFromText( $queryResult['_pageName'] ); - $displayedArray[] = array( + $startDateField = $dateFieldAliases[0]; + $startDate = $queryResult[$startDateField]; + $startDatePrecisionField = str_replace( ' ', '_', $startDateField ) . '__precision'; + $startDatePrecision = $queryResult[$startDatePrecisionField]; + $curEvent = array( // Get first field for the title - not // necessarily the page name. 'title' = $eventTitle, @@ -122,6 +126,10 @@ 'start' = $queryResult[$dateFieldAliases[0]], 'color' = $colorArray[$i] ); + if ( $startDatePrecision != CargoStore::DATE_AND_TIME ) { + $curEvent['allDay'] = true; + } + $displayedArray[] = $curEvent; } } -- To view, visit https://gerrit.wikimedia.org/r/211740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36a97a6072d6cf1218a70f41bda288509d20a17c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Add monitoring grants for databases on m5 shard - change (operations/puppet)
Jcrespo has submitted this change and it was merged. Change subject: Revert Add monitoring grants for databases on m5 shard .. Revert Add monitoring grants for databases on m5 shard Not needed (duplicate grants). This reverts commit 83455e6cf2ac1bbf998848ce30c091180f7ba52f. Change-Id: I31dc6fe83407d4a64ca49ad75db65a947c0caf7a --- M templates/mariadb/production-grants-m5.sql.erb 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: Jcrespo: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/production-grants-m5.sql.erb b/templates/mariadb/production-grants-m5.sql.erb index 246ba06..e69de29 100644 --- a/templates/mariadb/production-grants-m5.sql.erb +++ b/templates/mariadb/production-grants-m5.sql.erb @@ -1,17 +0,0 @@ --- Grants for 'nagios'@'localhost' (icinga) - -GRANT PROCESS, REPLICATION CLIENT -ON *.* TO 'nagios'@'localhost' -IDENTIFIED BY '%= @nagios_pass %'; - --- Grants for 'tendril'@'10.%' (tendril) - -GRANT PROCESS, REPLICATION CLIENT, SELECT, SHOW DATABASES -ON *.* TO '%= @tendril_user %'@'10.%' -IDENTIFIED BY '%= @tendril_pass %'; - --- Grants for 'repl'@'10.%' (replication) -GRANT REPLICATION SLAVE -ON *.* TO 'repl'@'10.%' -IDENTIFIED BY '%= @repl_pass %'; - -- To view, visit https://gerrit.wikimedia.org/r/211745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31dc6fe83407d4a64ca49ad75db65a947c0caf7a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for display of Special:CargoExport with incomplete (or n... - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged. Change subject: Fix for display of Special:CargoExport with incomplete (or null) query string .. Fix for display of Special:CargoExport with incomplete (or null) query string Change-Id: Ic6c9692cfed16223bfa661f2fffaab89e02b023f --- M specials/CargoExport.php 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/specials/CargoExport.php b/specials/CargoExport.php index b72e66e..aeba680 100644 --- a/specials/CargoExport.php +++ b/specials/CargoExport.php @@ -21,7 +21,16 @@ $this-getOutput()-setArticleBodyOnly( true ); $req = $this-getRequest(); - $tableArray = $req-getArray( 'tables' ); + + // If no value has been set for 'tables', or 'table', just + // display a blank screen. + if ( $req-getCheck( 'tables' ) ) { + $tableArray = $req-getArray( 'tables' ); + } elseif ( $req-getCheck( 'table' ) ) { + $tableArray = $req-getArray( 'table' ); + } else { + return; + } $fieldsArray = $req-getArray( 'fields' ); $whereArray = $req-getArray( 'where' ); $joinOnArray = $req-getArray( 'join_on' ); @@ -65,6 +74,8 @@ $this-displayExcelData( $sqlQueries, $filename ); } elseif ( $format == 'json' ) { $this-displayJSONData( $sqlQueries ); + } else { + print Error: format must be set.; } } -- To view, visit https://gerrit.wikimedia.org/r/211746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6c9692cfed16223bfa661f2fffaab89e02b023f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced the rate of RecentChangesUpdateJob insertion - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Reduced the rate of RecentChangesUpdateJob insertion .. Reduced the rate of RecentChangesUpdateJob insertion Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 (cherry picked from commit 93d3373edca42d2e954367d2a4a916a11dbf4b10) --- M includes/page/WikiPage.php 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 2027102..68ae096 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2206,12 +2206,14 @@ Hooks::run( 'ArticleEditUpdates', array( $this, $editInfo, $options['changed'] ) ); if ( Hooks::run( 'ArticleEditUpdatesDeleteFromRecentchanges', array( $this ) ) ) { - JobQueueGroup::singleton()-push( array( - // Flush old entries from the `recentchanges` table - RecentChangesUpdateJob::newPurgeJob(), - // Update the cached list of active users - RecentChangesUpdateJob::newCacheUpdateJob() - ) ); + // Update the cached list of active users + $jobs = array( RecentChangesUpdateJob::newCacheUpdateJob() ); + // Flush old entries from the `recentchanges` table + if ( mt_rand( 0, 9 ) == 0 ) { + $jobs[] = RecentChangesUpdateJob::newPurgeJob(); + } + + JobQueueGroup::singleton()-push( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211751 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] EventEmitter: Remove TODO about return value of #emit and tw... - change (oojs/core)
jenkins-bot has submitted this change and it was merged. Change subject: EventEmitter: Remove TODO about return value of #emit and tweak tests .. EventEmitter: Remove TODO about return value of #emit and tweak tests I ran into a use case for the current behavior (T91132), so clearly it is a good idea after all. This was being tested, but mostly by chance, in unrelated test cases; added some dedicated ones. Change-Id: I7bd46247a3c3ffa2036b570b3b90b45e68530ea5 --- M src/EventEmitter.js M tests/unit/EventEmitter.test.js 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Krinkle: Looks good to me, approved Bartosz Dziewoński: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/src/EventEmitter.js b/src/EventEmitter.js index aa2a919..ca7aa74 100644 --- a/src/EventEmitter.js +++ b/src/EventEmitter.js @@ -152,12 +152,9 @@ /** * Emit an event. * -* TODO: Should this be chainable? What is the usefulness of the boolean -* return value here? -* * @param {string} event Type of event * @param {Mixed} args First in a list of variadic arguments passed to event handler (optional) -* @return {boolean} If event was handled by at least one listener +* @return {boolean} Whether the event was handled by at least one listener */ oo.EventEmitter.prototype.emit = function ( event ) { var args = [], diff --git a/tests/unit/EventEmitter.test.js b/tests/unit/EventEmitter.test.js index 0090bf7..fdf0637 100644 --- a/tests/unit/EventEmitter.test.js +++ b/tests/unit/EventEmitter.test.js @@ -83,9 +83,15 @@ assert.deepEqual( seq, [ 'call' ], 'Callback ran only once' ); } ); - QUnit.test( 'emit', 4, function ( assert ) { + QUnit.test( 'emit', 7, function ( assert ) { var data1, data2A, data2B, data2C, ee = new oo.EventEmitter(); + + assert.strictEqual( ee.emit( 'return' ), false, 'Return value when no handlers are registered' ); + ee.on( 'return', function () {} ); + assert.strictEqual( ee.emit( 'return' ), true, 'Return value when a handler is registered' ); + ee.off( 'return' ); + assert.strictEqual( ee.emit( 'return' ), false, 'Return value when handlers were removed' ); ee.on( 'dataParam', function ( data ) { assert.strictEqual( data, data1, 'Data is passed on to event handler' ); @@ -267,13 +273,12 @@ }, 'method must exist on host object even if event has no listeners' ); } ); - QUnit.test( 'chainable', 6, function ( assert ) { + QUnit.test( 'chainable', 5, function ( assert ) { var fn = function () {}, ee = new oo.EventEmitter(); assert.strictEqual( ee.on( 'basic', fn ), ee, 'on() is chainable' ); assert.strictEqual( ee.once( 'basic', fn ), ee, 'once() is chainable' ); - assert.strictEqual( ee.emit( 'basic' ), true, 'emit() is NOT chainable' ); assert.strictEqual( ee.off( 'basic' ), ee, 'off() is chainable' ); assert.strictEqual( ee.connect( {}, {} ), ee, 'connect() is chainable' ); assert.strictEqual( ee.disconnect( {} ), ee, 'disconnect() is chainable' ); -- To view, visit https://gerrit.wikimedia.org/r/208465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bd46247a3c3ffa2036b570b3b90b45e68530ea5 Gerrit-PatchSet: 3 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced the rate of RecentChangesUpdateJob insertion - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Reduced the rate of RecentChangesUpdateJob insertion .. Reduced the rate of RecentChangesUpdateJob insertion Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 (cherry picked from commit 93d3373edca42d2e954367d2a4a916a11dbf4b10) --- M includes/page/WikiPage.php 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 2027102..68ae096 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2206,12 +2206,14 @@ Hooks::run( 'ArticleEditUpdates', array( $this, $editInfo, $options['changed'] ) ); if ( Hooks::run( 'ArticleEditUpdatesDeleteFromRecentchanges', array( $this ) ) ) { - JobQueueGroup::singleton()-push( array( - // Flush old entries from the `recentchanges` table - RecentChangesUpdateJob::newPurgeJob(), - // Update the cached list of active users - RecentChangesUpdateJob::newCacheUpdateJob() - ) ); + // Update the cached list of active users + $jobs = array( RecentChangesUpdateJob::newCacheUpdateJob() ); + // Flush old entries from the `recentchanges` table + if ( mt_rand( 0, 9 ) == 0 ) { + $jobs[] = RecentChangesUpdateJob::newPurgeJob(); + } + + JobQueueGroup::singleton()-push( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to 8ed3e503 to update beta cluster - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Bump src to 8ed3e503 to update beta cluster .. Bump src to 8ed3e503 to update beta cluster Change-Id: I7442ca5f75fd6aa1fe50be8756d402c3133b40eb --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index a8108fe..8ed3e50 16 --- a/src +++ b/src -Subproject commit a8108fe65d1a6e7224e5bb910fb0e13ac7689c90 +Subproject commit 8ed3e5033add21285dd5d6b4aaac33a2189c2c1b -- To view, visit https://gerrit.wikimedia.org/r/211747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7442ca5f75fd6aa1fe50be8756d402c3133b40eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for display of Special:CargoExport with incomplete (or n... - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/211746 Change subject: Fix for display of Special:CargoExport with incomplete (or null) query string .. Fix for display of Special:CargoExport with incomplete (or null) query string Change-Id: Ic6c9692cfed16223bfa661f2fffaab89e02b023f --- M specials/CargoExport.php 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/46/211746/1 diff --git a/specials/CargoExport.php b/specials/CargoExport.php index b72e66e..aeba680 100644 --- a/specials/CargoExport.php +++ b/specials/CargoExport.php @@ -21,7 +21,16 @@ $this-getOutput()-setArticleBodyOnly( true ); $req = $this-getRequest(); - $tableArray = $req-getArray( 'tables' ); + + // If no value has been set for 'tables', or 'table', just + // display a blank screen. + if ( $req-getCheck( 'tables' ) ) { + $tableArray = $req-getArray( 'tables' ); + } elseif ( $req-getCheck( 'table' ) ) { + $tableArray = $req-getArray( 'table' ); + } else { + return; + } $fieldsArray = $req-getArray( 'fields' ); $whereArray = $req-getArray( 'where' ); $joinOnArray = $req-getArray( 'join_on' ); @@ -65,6 +74,8 @@ $this-displayExcelData( $sqlQueries, $filename ); } elseif ( $format == 'json' ) { $this-displayJSONData( $sqlQueries ); + } else { + print Error: format must be set.; } } -- To view, visit https://gerrit.wikimedia.org/r/211746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6c9692cfed16223bfa661f2fffaab89e02b023f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Provide section-offsets for immediate children of body - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Provide section-offsets for immediate children of body .. Provide section-offsets for immediate children of body * Changes xmlserializer.serializeToString and DU.serializeNode to return an object with the str and, if options.captureOffsets, the html offsets of top-level nodes. * Added mocha tests to capture expectations about offsets computation. Bug: T96279 Change-Id: Id74988d3ef39078fbfea72359884b75290da041b --- M api/routes.js M lib/XMLSerializer.js M lib/ext.Cite.js M lib/mediawiki.DOMUtils.js M tests/mocha/api.js A tests/mocha/xmlserializer.js M tests/parse.js M tests/parserTests.js M tests/roundtrip-test.js 9 files changed, 171 insertions(+), 60 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved GWicke: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/api/routes.js b/api/routes.js index 9e07508..7722383 100644 --- a/api/routes.js +++ b/api/routes.js @@ -116,7 +116,7 @@ var headNodes = ; for (var i = 0; i hNodes.length; i++) { if (hNodes[i].nodeName.toLowerCase() === 'base') { - headNodes += DU.serializeNode(hNodes[i]); + headNodes += DU.serializeNode(hNodes[i]).str; break; } } @@ -124,7 +124,7 @@ var bNodes = doc.body.childNodes; var bodyNodes = ; for (i = 0; i bNodes.length; i++) { - bodyNodes += DU.serializeNode(bNodes[i]); + bodyNodes += DU.serializeNode(bNodes[i]).str; } var htmlSpeChars = apiUtils.htmlSpecialChars(out); @@ -331,10 +331,9 @@ function sendRes(doc) { var contentType = 'text/html;profile=mediawiki.org/specs/html/1.0.0;charset=utf-8'; var output; - if ( v2 v2.format === pagebundle ) { - var dpScriptElt = doc.getElementById('mw-data-parsoid'); - dpScriptElt.parentNode.removeChild(dpScriptElt); - output = DU.serializeNode( res.local('body') ? doc.body : doc ); + if (v2 v2.format === 'pagebundle') { + var out = DU.extractDpAndSerialize(doc, res.local('body')); + output = out.str; apiUtils.jsonResponse(res, env, { // revid: 12345 (maybe?), html: { @@ -342,12 +341,12 @@ body: output }, data-parsoid: { - headers: { 'content-type': dpScriptElt.getAttribute('type') }, - body: JSON.parse( dpScriptElt.text ) + headers: { 'content-type': out.type }, + body: out.dp } }); } else { - output = DU.serializeNode( res.local('body') ? doc.body : doc ); + output = DU.serializeNode(res.local('body') ? doc.body : doc).str; apiUtils.setHeader(res, env, 'content-type', contentType); apiUtils.endResponse(res, env, output); } @@ -693,7 +692,7 @@ var p = TemplateRequest.setPageSrcInfo(env, target, oldid).then( parse.bind( null, env, req, res ) ).then(function( doc ) { - doc = DU.parseHTML( DU.serializeNode(doc) ); + doc = DU.parseHTML(DU.serializeNode(doc).str); var comment = doc.createComment('rtSelserEditTestComment'); doc.body.appendChild(comment); return roundTripDiff( env, req, res, true, doc ); diff --git a/lib/XMLSerializer.js b/lib/XMLSerializer.js index d068353..da33174 100644 --- a/lib/XMLSerializer.js +++ b/lib/XMLSerializer.js @@ -3,8 +3,6 @@ */ 'use strict'; -var htmlns = 'http://www.w3.org/1999/xhtml'; - // nodeType constants var ELEMENT_NODE = 1; var ATTRIBUTE_NODE = 2; @@ -41,7 +39,7 @@ param: true, source: true, track: true, - wbr: true + wbr: true, }; /** @@ -55,14 +53,14 @@ noembed: true,
[MediaWiki-commits] [Gerrit] Responsive side rail - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Responsive side rail .. Responsive side rail Move the board description to a collapsible side rail when the page is wide enough. Bug: T88114 Change-Id: I5b23449d5a581a6d6de5518fea1a69298de1f869 --- M Resources.php M handlebars/compiled/flow_block_header.handlebars.php M handlebars/compiled/flow_block_header_edit.handlebars.php M handlebars/flow_block_header.handlebars M handlebars/flow_block_header_edit.handlebars M handlebars/flow_header_detail.partial.handlebars A handlebars/flow_header_title.partial.handlebars M i18n/en.json M i18n/qqq.json M includes/View.php M modules/engine/components/board/features/flow-board-navigation.js A modules/engine/components/board/features/flow-board-side-rail.js M modules/styles/board/form-actions.less M modules/styles/board/header.less M modules/styles/board/menu.less M modules/styles/board/navigation.less M modules/styles/board/terms-of-use.less M modules/styles/board/topic/post.less M modules/styles/board/topic/titlebar.less M modules/styles/board/topic/watchlist.less M modules/styles/common.less M modules/styles/flow.less/flow.variables.less 22 files changed, 304 insertions(+), 50 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 9233e58..6291274 100644 --- a/Resources.php +++ b/Resources.php @@ -58,6 +58,7 @@ 'handlebars/flow_editor_switcher.partial.handlebars', 'handlebars/flow_errors.partial.handlebars', 'handlebars/flow_form_buttons.partial.handlebars', + 'handlebars/flow_header_title.partial.handlebars', 'handlebars/flow_header_detail.partial.handlebars', 'handlebars/flow_load_more.partial.handlebars', 'handlebars/flow_moderate_post_confirmation.partial.handlebars', @@ -91,6 +92,10 @@ 'messages' = array( 'flow-anon-warning', 'flow-cancel', + 'flow-board-header', + 'flow-board-collapse-description', + 'flow-board-expand-description', + 'flow-edit-header-link', 'flow-edit-header-placeholder', 'flow-edit-header-submit', 'flow-edit-title-submit', @@ -367,6 +372,8 @@ 'engine/components/board/features/flow-board-navigation.js', // Feature: Table of Contents 'engine/components/board/features/flow-board-toc.js', + // Feature: Side Rail + 'engine/components/board/features/flow-board-side-rail.js', // Feature: VisualEditor 'engine/components/board/features/flow-board-visualeditor.js', // Feature: Switch between editors diff --git a/handlebars/compiled/flow_block_header.handlebars.php b/handlebars/compiled/flow_block_header.handlebars.php index 06e2bcf..57022ff 100644 --- a/handlebars/compiled/flow_block_header.handlebars.php +++ b/handlebars/compiled/flow_block_header.handlebars.php @@ -12,12 +12,17 @@ 'debug' = $debugopt, ), 'constants' = array(), -'helpers' = array('html' = 'Flow\TemplateHelper::htmlHelper', +'helpers' = array('l10n' = 'Flow\TemplateHelper::l10n', +'html' = 'Flow\TemplateHelper::htmlHelper', 'escapeContent' = 'Flow\TemplateHelper::escapeContent', ), 'blockhelpers' = array(), 'hbhelpers' = array(), -'partials' = array('flow_errors' = function ($cx, $in) {return 'div class=flow-error-container +'partials' = array('flow_header_title' = function ($cx, $in) {return 'h2 class=flow-board-header-title + span class=wikiglyph wikiglyph-speech-bubbles/span + '.LCRun3::ch($cx, 'l10n', array(array('flow-board-header'),array()), 'encq').' +/h2 +';},'flow_errors' = function ($cx, $in) {return 'div class=flow-error-container '.((LCRun3::ifvar($cx, ((isset($cx['sp_vars']['root']['errors']) is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['errors'] : null))) ? ' div class=flow-errors errorbox ul '.LCRun3::sec($cx, ((isset($cx['sp_vars']['root']['errors']) is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['errors'] : null), $in, true, function($cx, $in) {return ' li'.LCRun3::ch($cx, 'html', array(array(((isset($in['message']) is_array($in)) ? $in['message'] : null)),array()), 'encq').'/li @@ -25,28 +30,35 @@ /div ' : '').'/div ';},'flow_header_detail' = function ($cx, $in) {return 'div class=flow-board-header-detail-view
[MediaWiki-commits] [Gerrit] Use lazyPush() instead of push() in a few places for jobs - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/211752 Change subject: Use lazyPush() instead of push() in a few places for jobs .. Use lazyPush() instead of push() in a few places for jobs Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 (cherry picked from commit a17cdcbf5bac5453a7127482761bb3a8129de2ad) --- M includes/deferred/HTMLCacheUpdate.php M includes/mail/EmailNotification.php M includes/page/WikiPage.php 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/52/211752/1 diff --git a/includes/deferred/HTMLCacheUpdate.php b/includes/deferred/HTMLCacheUpdate.php index 79a10e6..20e4a4c 100644 --- a/includes/deferred/HTMLCacheUpdate.php +++ b/includes/deferred/HTMLCacheUpdate.php @@ -55,7 +55,7 @@ $count = $this-mTitle-getBacklinkCache()-getNumLinks( $this-mTable, 100 ); if ( $count = 100 ) { // many backlinks - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); JobQueueGroup::singleton()-deduplicateRootJob( $job ); } else { // few backlinks ($count might be off even if 0) $dbw = wfGetDB( DB_MASTER ); diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index 81c4e38..5ed52c4 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -168,7 +168,7 @@ 'pageStatus' = $pageStatus ); $job = new EnotifNotifyJob( $title, $params ); - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); } else { $this-actuallyNotifyOnPageChange( $editor, diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 68ae096..03d908c 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2213,7 +2213,7 @@ $jobs[] = RecentChangesUpdateJob::newPurgeJob(); } - JobQueueGroup::singleton()-push( $jobs ); + JobQueueGroup::singleton()-lazyPush( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211752 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added JobQueueGroup::lazyPush method - change (mediawiki/core)
Ori.livneh has submitted this change and it was merged. Change subject: Added JobQueueGroup::lazyPush method .. Added JobQueueGroup::lazyPush method * Made use of this in triggerOpportunisticLinksUpdate() * This will defer and better batch job insertion * Lazy job insertion and other deferred updates make use of register_postsend_function if present * Also cleaned up some return types and exceptions in JobQueueGroup Bug: T99302 Change-Id: I3a3968d75cb37563f970be08e63f31a090e0e037 (cherry picked from commit 7e97ce6a4402edae8bd626a9a6aa39060095aa42) --- M includes/MediaWiki.php M includes/jobqueue/JobQueueGroup.php M includes/page/WikiPage.php 3 files changed, 95 insertions(+), 17 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index b1d0738..84001ff 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -422,8 +422,7 @@ } /** -* Run the current MediaWiki instance -* index.php just calls this +* Run the current MediaWiki instance; index.php just calls this */ public function run() { try { @@ -437,9 +436,30 @@ wfGetLBFactory()-commitMasterChanges(); $e-report(); // display the GUI error } - if ( function_exists( 'fastcgi_finish_request' ) ) { - fastcgi_finish_request(); - } + } catch ( Exception $e ) { + MWExceptionHandler::handleException( $e ); + } + + if ( function_exists( 'register_postsend_function' ) ) { + // https://github.com/facebook/hhvm/issues/1230 + register_postsend_function( array( $this, 'postSendUpdates' ) ); + } elseif ( function_exists( 'fastcgi_finish_request' ) ) { + fastcgi_finish_request(); + $this-postSendUpdates(); + } else { + $this-postSendUpdates(); + } + } + + /** +* This function does work that can be done *after* the +* user gets the HTTP response so they don't block on it +* +* @since 1.26 +*/ + public function postSendUpdates() { + try { + JobQueueGroup::singleton()-pushLazyJobs(); $this-triggerJobs(); $this-restInPeace(); } catch ( Exception $e ) { @@ -605,6 +625,9 @@ // Do any deferred jobs DeferredUpdates::doUpdates( 'commit' ); + // Make sure any lazy jobs are pushed + JobQueueGroup::singleton()-pushLazyJobs(); + // Log profiling data, e.g. in the database or UDP wfLogProfilingData(); diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php index ebd547a..ed193b0 100644 --- a/includes/jobqueue/JobQueueGroup.php +++ b/includes/jobqueue/JobQueueGroup.php @@ -40,6 +40,9 @@ /** @var array Map of (bucket = (queue = JobQueue, types = list of types) */ protected $coalescedQueues; + /** @var Job[] */ + protected $bufferedJobs = array(); + const TYPE_DEFAULT = 1; // integer; jobs popped by default const TYPE_ANY = 2; // integer; any job @@ -100,13 +103,13 @@ } /** -* Insert jobs into the respective queues of with the belong. +* Insert jobs into the respective queues of which they belong * * This inserts the jobs into the queue specified by $wgJobTypeConf * and updates the aggregate job queue information cache as needed. * -* @param Job|Job[] $jobs A single Job or a list of Jobs -* @throws MWException +* @param IJobSpecification|IJobSpecification[] $jobs A single Job or a list of Jobs +* @throws InvalidArgumentException * @return void */ public function push( $jobs ) { @@ -115,13 +118,11 @@ return; } + $this-assertValidJobs( $jobs ); + $jobsByType = array(); // (job type = list of jobs) foreach ( $jobs as $job ) { - if ( $job instanceof IJobSpecification ) { - $jobsByType[$job-getType()][] = $job; - } else { - throw new MWException( Attempted to push a non-Job object into a queue. ); - } + $jobsByType[$job-getType()][] = $job; } foreach ( $jobsByType as $type = $jobs ) { @@ -134,6 +135,41 @@
[MediaWiki-commits] [Gerrit] Bump src to 8ed3e503 to update beta cluster - change (mediawiki...deploy)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/211747 Change subject: Bump src to 8ed3e503 to update beta cluster .. Bump src to 8ed3e503 to update beta cluster Change-Id: I7442ca5f75fd6aa1fe50be8756d402c3133b40eb --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/47/211747/1 diff --git a/src b/src index a8108fe..8ed3e50 16 --- a/src +++ b/src -Subproject commit a8108fe65d1a6e7224e5bb910fb0e13ac7689c90 +Subproject commit 8ed3e5033add21285dd5d6b4aaac33a2189c2c1b -- To view, visit https://gerrit.wikimedia.org/r/211747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7442ca5f75fd6aa1fe50be8756d402c3133b40eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small typo fixes for ve.dm.APIResultsProvider - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211749 Change subject: Small typo fixes for ve.dm.APIResultsProvider .. Small typo fixes for ve.dm.APIResultsProvider Make sure fetch limit is actually stored by using its setter, and fix a small typo in documentation. Change-Id: I1c2f7d5f2f38f4b08e3ec1fe6af01e36f6b26dde --- M src/dm/ve.dm.APIResultsProvider.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/49/211749/1 diff --git a/src/dm/ve.dm.APIResultsProvider.js b/src/dm/ve.dm.APIResultsProvider.js index 81e53c8..b185da6 100644 --- a/src/dm/ve.dm.APIResultsProvider.js +++ b/src/dm/ve.dm.APIResultsProvider.js @@ -27,7 +27,7 @@ config = config || {}; this.setAPIurl( apiurl ); - this.fetchLimit = config.fetchLimit || 30; + this.setDefaultFetchLimit( config.fetchLimit || 30 ); this.lang = config.lang; this.offset = config.offset || 0; this.ajaxSettings = config.ajaxSettings || {}; @@ -103,7 +103,7 @@ }; /** - * Get the user-inputted dybamic data parameters sent to the API + * Get the user-inputted dynamic data parameters sent to the API * * @returns {Object} Data parameters */ -- To view, visit https://gerrit.wikimedia.org/r/211749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c2f7d5f2f38f4b08e3ec1fe6af01e36f6b26dde Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Mooeypoo mor...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use lazyPush() instead of push() in a few places for jobs - change (mediawiki/core)
Aaron Schulz has submitted this change and it was merged. Change subject: Use lazyPush() instead of push() in a few places for jobs .. Use lazyPush() instead of push() in a few places for jobs Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 --- M includes/deferred/HTMLCacheUpdate.php M includes/mail/EmailNotification.php M includes/page/WikiPage.php 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/deferred/HTMLCacheUpdate.php b/includes/deferred/HTMLCacheUpdate.php index 79a10e6..20e4a4c 100644 --- a/includes/deferred/HTMLCacheUpdate.php +++ b/includes/deferred/HTMLCacheUpdate.php @@ -55,7 +55,7 @@ $count = $this-mTitle-getBacklinkCache()-getNumLinks( $this-mTable, 100 ); if ( $count = 100 ) { // many backlinks - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); JobQueueGroup::singleton()-deduplicateRootJob( $job ); } else { // few backlinks ($count might be off even if 0) $dbw = wfGetDB( DB_MASTER ); diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index 81c4e38..5ed52c4 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -168,7 +168,7 @@ 'pageStatus' = $pageStatus ); $job = new EnotifNotifyJob( $title, $params ); - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); } else { $this-actuallyNotifyOnPageChange( $editor, diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 914522f..8ef3063 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2213,7 +2213,7 @@ $jobs[] = RecentChangesUpdateJob::newPurgeJob(); } - JobQueueGroup::singleton()-push( $jobs ); + JobQueueGroup::singleton()-lazyPush( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support for cached menu data in HTML - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Support for cached menu data in HTML .. Support for cached menu data in HTML Follow on Ibf1cea If the user is looking at a cached page -- they're logged out -- then reformat the `wgMFMenuData` configuration variable. Bug: T98964 Bug: T98759 Change-Id: I768dbed35823ff0cdd96795a68c1eb39075d44bd --- M resources/mobile.mainMenu/MainMenu.js M resources/mobile.mainMenu/menu.mustache 2 files changed, 42 insertions(+), 4 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/mobile.mainMenu/MainMenu.js b/resources/mobile.mainMenu/MainMenu.js index b7e6bac..7edcdbd 100644 --- a/resources/mobile.mainMenu/MainMenu.js +++ b/resources/mobile.mainMenu/MainMenu.js @@ -11,11 +11,49 @@ */ MainMenu = View.extend( { template: mw.template.get( 'mobile.mainMenu', 'menu.hogan' ), + + /** @inheritdoc **/ + initialize: function ( options ) { + this.defaults = this._handleCachedMenuData( + mw.config.get( 'wgMFMenuData' ) + ); + + View.prototype.initialize.apply( this, options ); + }, + + // FIXME: [CACHE] Remove when cache clears. /** -* @inheritdoc -* @cfg {Object} defaults Default options hash +* Translates the old, but cached, format of `wgMFMenuData` to the new +* new format. +* +* @param {Object[]} menu The value of the `wgMFMenuData` config variable +* @private */ - defaults: $.extend( {}, mw.config.get( 'wgMFMenuData' ) || {} ), + _handleCachedMenuData: function ( menu ) { + var result = {}; + + $.each( menu, function ( key, entries ) { + + // New format? + if ( entries[0].components ) { + result = menu; + + return false; + } + + result[key] = $.map( entries, function ( entry ) { + // We don't have to address T98759 here as this bug only + // affects logged out users who are seeing a cached version + // of the page. + return { + name: entry.name, + components: [ entry ] + }; + } ); + } ); + + return result; + }, /** * Turn on event logging on the existing main menu by reading `event-name` data diff --git a/resources/mobile.mainMenu/menu.mustache b/resources/mobile.mainMenu/menu.mustache index 97a078c..83cb5a0 100644 --- a/resources/mobile.mainMenu/menu.mustache +++ b/resources/mobile.mainMenu/menu.mustache @@ -21,7 +21,7 @@ {{#sitelinks}} li {{#components}} - a href={{href}} class={{class}} data-event-name={{data-event-name}}{{text}}/a + a href={{href}} class={{class}} data-event-name={{data-event-name}}{{text}}/a {{/components}} /li {{/sitelinks}} -- To view, visit https://gerrit.wikimedia.org/r/211078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I768dbed35823ff0cdd96795a68c1eb39075d44bd Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced the rate of RecentChangesUpdateJob insertion - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/211751 Change subject: Reduced the rate of RecentChangesUpdateJob insertion .. Reduced the rate of RecentChangesUpdateJob insertion Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 (cherry picked from commit 93d3373edca42d2e954367d2a4a916a11dbf4b10) --- M includes/page/WikiPage.php 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/211751/1 diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 2027102..68ae096 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2206,12 +2206,14 @@ Hooks::run( 'ArticleEditUpdates', array( $this, $editInfo, $options['changed'] ) ); if ( Hooks::run( 'ArticleEditUpdatesDeleteFromRecentchanges', array( $this ) ) ) { - JobQueueGroup::singleton()-push( array( - // Flush old entries from the `recentchanges` table - RecentChangesUpdateJob::newPurgeJob(), - // Update the cached list of active users - RecentChangesUpdateJob::newCacheUpdateJob() - ) ); + // Update the cached list of active users + $jobs = array( RecentChangesUpdateJob::newCacheUpdateJob() ); + // Flush old entries from the `recentchanges` table + if ( mt_rand( 0, 9 ) == 0 ) { + $jobs[] = RecentChangesUpdateJob::newPurgeJob(); + } + + JobQueueGroup::singleton()-push( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211751 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced the rate of RecentChangesUpdateJob insertion - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/211750 Change subject: Reduced the rate of RecentChangesUpdateJob insertion .. Reduced the rate of RecentChangesUpdateJob insertion Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 (cherry picked from commit 93d3373edca42d2e954367d2a4a916a11dbf4b10) --- M includes/page/WikiPage.php 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/211750/1 diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 2027102..68ae096 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2206,12 +2206,14 @@ Hooks::run( 'ArticleEditUpdates', array( $this, $editInfo, $options['changed'] ) ); if ( Hooks::run( 'ArticleEditUpdatesDeleteFromRecentchanges', array( $this ) ) ) { - JobQueueGroup::singleton()-push( array( - // Flush old entries from the `recentchanges` table - RecentChangesUpdateJob::newPurgeJob(), - // Update the cached list of active users - RecentChangesUpdateJob::newCacheUpdateJob() - ) ); + // Update the cached list of active users + $jobs = array( RecentChangesUpdateJob::newCacheUpdateJob() ); + // Flush old entries from the `recentchanges` table + if ( mt_rand( 0, 9 ) == 0 ) { + $jobs[] = RecentChangesUpdateJob::newPurgeJob(); + } + + JobQueueGroup::singleton()-push( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7db658f45365ca8ddf7f9dc807a30bc707fe517 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf6 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use lazyPush() instead of push() in a few places for jobs - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/211748 Change subject: Use lazyPush() instead of push() in a few places for jobs .. Use lazyPush() instead of push() in a few places for jobs Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 --- M includes/mail/EmailNotification.php M includes/page/WikiPage.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/48/211748/1 diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index 81c4e38..5ed52c4 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -168,7 +168,7 @@ 'pageStatus' = $pageStatus ); $job = new EnotifNotifyJob( $title, $params ); - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); } else { $this-actuallyNotifyOnPageChange( $editor, diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 914522f..8ef3063 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2213,7 +2213,7 @@ $jobs[] = RecentChangesUpdateJob::newPurgeJob(); } - JobQueueGroup::singleton()-push( $jobs ); + JobQueueGroup::singleton()-lazyPush( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix memory seepage Bug T99260 - change (apps...wikipedia)
Mhurd has submitted this change and it was merged. Change subject: Fix memory seepage Bug T99260 .. Fix memory seepage Bug T99260 Add memory semantics to property declarations in MWK model class Use properties for accessing properties Change-Id: I4938141e8cdfc76241bafd220d7362c32b55be6c --- M MediaWikiKit/MediaWikiKit/MWKArticle.h M MediaWikiKit/MediaWikiKit/MWKArticle.m M MediaWikiKit/MediaWikiKit/MWKDataStore.h M MediaWikiKit/MediaWikiKit/MWKDataStore.m M MediaWikiKit/MediaWikiKit/MWKHistoryEntry.h M MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m M MediaWikiKit/MediaWikiKit/MWKHistoryList.h M MediaWikiKit/MediaWikiKit/MWKHistoryList.m M MediaWikiKit/MediaWikiKit/MWKImage.h M MediaWikiKit/MediaWikiKit/MWKImage.m M MediaWikiKit/MediaWikiKit/MWKImageInfo.h M MediaWikiKit/MediaWikiKit/MWKImageInfo.m M MediaWikiKit/MediaWikiKit/MWKImageList.h M MediaWikiKit/MediaWikiKit/MWKImageList.m M MediaWikiKit/MediaWikiKit/MWKLicense.h M MediaWikiKit/MediaWikiKit/MWKLicense.m M MediaWikiKit/MediaWikiKit/MWKProtectionStatus.m M MediaWikiKit/MediaWikiKit/MWKRecentSearchEntry.h M MediaWikiKit/MediaWikiKit/MWKRecentSearchEntry.m M MediaWikiKit/MediaWikiKit/MWKRecentSearchList.h M MediaWikiKit/MediaWikiKit/MWKRecentSearchList.m M MediaWikiKit/MediaWikiKit/MWKSavedPageEntry.h M MediaWikiKit/MediaWikiKit/MWKSavedPageEntry.m M MediaWikiKit/MediaWikiKit/MWKSavedPageList.h M MediaWikiKit/MediaWikiKit/MWKSavedPageList.m M MediaWikiKit/MediaWikiKit/MWKSection.h M MediaWikiKit/MediaWikiKit/MWKSection.m M MediaWikiKit/MediaWikiKit/MWKSectionList.h M MediaWikiKit/MediaWikiKit/MWKSectionList.m M MediaWikiKit/MediaWikiKit/MWKSite.h M MediaWikiKit/MediaWikiKit/MWKSite.m M MediaWikiKit/MediaWikiKit/MWKSiteDataObject.h M MediaWikiKit/MediaWikiKit/MWKSiteDataObject.m M MediaWikiKit/MediaWikiKit/MWKTitle.h M MediaWikiKit/MediaWikiKit/MWKTitle.m M MediaWikiKit/MediaWikiKit/MWKUser.h M MediaWikiKit/MediaWikiKit/MWKUser.m M MediaWikiKit/MediaWikiKit/MWKUserDataStore.h M MediaWikiKit/MediaWikiKit/MWKUserDataStore.m M Wikipedia/Data/SchemaConverter.h M Wikipedia/Session/SessionSingleton.m 41 files changed, 593 insertions(+), 409 deletions(-) Approvals: Mhurd: Looks good to me, approved Bgerstle: Looks good to me, but someone else must approve diff --git a/MediaWikiKit/MediaWikiKit/MWKArticle.h b/MediaWikiKit/MediaWikiKit/MWKArticle.h index 93f55de..975dc07 100644 --- a/MediaWikiKit/MediaWikiKit/MWKArticle.h +++ b/MediaWikiKit/MediaWikiKit/MWKArticle.h @@ -26,30 +26,29 @@ } // Identifiers -@property (readonly) MWKSite* site; -@property (readonly) MWKTitle* title; -@property (readonly) MWKDataStore* dataStore; +@property (readonly, strong, nonatomic) MWKTitle* title; +@property (readonly, weak, nonatomic) MWKDataStore* dataStore; // Metadata -@property (readonly) MWKTitle* redirected;// optional -@property (readonly) NSDate* lastmodified;// required -@property (readonly) MWKUser* lastmodifiedby; // required -@property (readonly) int articleId; // required; - 'id' -@property (readonly) int languagecount; // required; int -@property (readonly) NSString* displaytitle; // optional -@property (readonly) MWKProtectionStatus* protection; // required -@property (readonly) BOOL editable; // required +@property (readonly, strong, nonatomic) MWKTitle* redirected; // optional +@property (readonly, strong, nonatomic) NSDate* lastmodified; // required +@property (readonly, strong, nonatomic) MWKUser* lastmodifiedby; // required +@property (readonly, assign, nonatomic) int articleId; // required; - 'id' +@property (readonly, assign, nonatomic) int languagecount; // required; int +@property (readonly, copy, nonatomic) NSString* displaytitle; // optional +@property (readonly, strong, nonatomic) MWKProtectionStatus* protection; // required +@property (readonly, assign, nonatomic) BOOL editable; // required -@property (readwrite, nonatomic) NSString* thumbnailURL; // optional; pulled separately via search -@property (readwrite, nonatomic) NSString* imageURL; // optional; pulled in article request +@property (readwrite, copy, nonatomic) NSString* thumbnailURL; // optional; pulled separately via search +@property (readwrite, copy, nonatomic) NSString* imageURL; // optional; pulled in article request -@property (readonly) NSString* entityDescription;// optional; currently pulled separately via wikidata +@property (readonly, copy, nonatomic) NSString* entityDescription; // optional; currently pulled separately via wikidata -@property (readonly) MWKSectionList* sections; +@property (readonly, strong, nonatomic) MWKSectionList* sections; -@property (readonly) MWKImageList* images;
[MediaWiki-commits] [Gerrit] Use lazyPush() instead of push() in a few places for jobs - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/211753 Change subject: Use lazyPush() instead of push() in a few places for jobs .. Use lazyPush() instead of push() in a few places for jobs Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 (cherry picked from commit a17cdcbf5bac5453a7127482761bb3a8129de2ad) --- M includes/deferred/HTMLCacheUpdate.php M includes/mail/EmailNotification.php M includes/page/WikiPage.php 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/53/211753/1 diff --git a/includes/deferred/HTMLCacheUpdate.php b/includes/deferred/HTMLCacheUpdate.php index 79a10e6..20e4a4c 100644 --- a/includes/deferred/HTMLCacheUpdate.php +++ b/includes/deferred/HTMLCacheUpdate.php @@ -55,7 +55,7 @@ $count = $this-mTitle-getBacklinkCache()-getNumLinks( $this-mTable, 100 ); if ( $count = 100 ) { // many backlinks - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); JobQueueGroup::singleton()-deduplicateRootJob( $job ); } else { // few backlinks ($count might be off even if 0) $dbw = wfGetDB( DB_MASTER ); diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index 81c4e38..5ed52c4 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -168,7 +168,7 @@ 'pageStatus' = $pageStatus ); $job = new EnotifNotifyJob( $title, $params ); - JobQueueGroup::singleton()-push( $job ); + JobQueueGroup::singleton()-lazyPush( $job ); } else { $this-actuallyNotifyOnPageChange( $editor, diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 68ae096..03d908c 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2213,7 +2213,7 @@ $jobs[] = RecentChangesUpdateJob::newPurgeJob(); } - JobQueueGroup::singleton()-push( $jobs ); + JobQueueGroup::singleton()-lazyPush( $jobs ); } if ( !$this-exists() ) { -- To view, visit https://gerrit.wikimedia.org/r/211753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56661ea29988e4ee217a63f4c3ffcb78333cc454 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small typo fixes for ve.dm.APIResultsProvider - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Small typo fixes for ve.dm.APIResultsProvider .. Small typo fixes for ve.dm.APIResultsProvider Make sure fetch limit is actually stored by using its setter, use setters for all relevant properties, and fix a small typo in documentation. Change-Id: I1c2f7d5f2f38f4b08e3ec1fe6af01e36f6b26dde --- M src/dm/ve.dm.APIResultsProvider.js 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jforrester: Looks good to me, but someone else must approve Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/src/dm/ve.dm.APIResultsProvider.js b/src/dm/ve.dm.APIResultsProvider.js index 81e53c8..294a8b2 100644 --- a/src/dm/ve.dm.APIResultsProvider.js +++ b/src/dm/ve.dm.APIResultsProvider.js @@ -27,10 +27,10 @@ config = config || {}; this.setAPIurl( apiurl ); - this.fetchLimit = config.fetchLimit || 30; - this.lang = config.lang; - this.offset = config.offset || 0; - this.ajaxSettings = config.ajaxSettings || {}; + this.setDefaultFetchLimit( config.fetchLimit || 30 ); + this.setLang( config.lang ); + this.setOffset( config.offset || 0 ); + this.setAjaxSettings( config.ajaxSettings || {} ); this.staticParams = config.staticParams || {}; this.userParams = config.userParams || {}; @@ -103,7 +103,7 @@ }; /** - * Get the user-inputted dybamic data parameters sent to the API + * Get the user-inputted dynamic data parameters sent to the API * * @returns {Object} Data parameters */ -- To view, visit https://gerrit.wikimedia.org/r/211749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c2f7d5f2f38f4b08e3ec1fe6af01e36f6b26dde Gerrit-PatchSet: 2 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Mooeypoo mor...@gmail.com Gerrit-Reviewer: Esanders esand...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove registry test hacks now that MW is fixed - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/211754 Change subject: Remove registry test hacks now that MW is fixed .. Remove registry test hacks now that MW is fixed Can't be pulled through to MW before I7b56bc7. Change-Id: I0657ee9b585363f371a16ddab2a2efba06efcf2c --- M tests/ve.test.utils.js 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/54/211754/1 diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js index d0eafd4..0af0aac 100644 --- a/tests/ve.test.utils.js +++ b/tests/ve.test.utils.js @@ -50,12 +50,6 @@ */ ve.test = { utils: {} }; - // TODO: this is a hack to make normal heading/preformatted/table - // nodes the most recently registered, instead of any integration versions - ve.dm.modelRegistry.register( ve.dm.HeadingNode ); - ve.dm.modelRegistry.register( ve.dm.PreformattedNode ); - ve.dm.modelRegistry.register( ve.dm.TableNode ); - ve.test.utils.runIsolateTest = function ( assert, type, range, expected, label ) { var doc = ve.dm.example.createExampleDocument( 'isolationData' ), surface = new ve.dm.Surface( doc ), -- To view, visit https://gerrit.wikimedia.org/r/211754 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0657ee9b585363f371a16ddab2a2efba06efcf2c Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Add languages for deployment 20150518 and all source lan... - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: CX: Add languages for deployment 20150518 and all source languages .. CX: Add languages for deployment 20150518 and all source languages Bug: T98946 Bug: T98454 Bug: T99527 Bug: T99528 Bug: T99529 Change-Id: Ib0f35772c6bf32d25b40f66a250f3585a28fdd3e --- M hieradata/common/cxserver.yaml 1 file changed, 220 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 47b8305..460b149 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -1,91 +1,292 @@ registry: source: +- 'aa' - 'ab' +- 'ace' - 'af' - 'ak' +- 'als' +- 'am' +- 'ang' - 'an' +- 'arc' +- 'ar' +- 'arz' - 'ast' +- 'as' - 'av' +- 'ay' - 'az' +- 'bar' +- 'bat-smg' - 'ba' +- 'bcl' +- 'be-x-old' +- 'be' - 'bg' +- 'bh' +- 'bi' +- 'bjn' - 'bm' +- 'bn' +- 'bo' +- 'bpy' +- 'br' +- 'bs' +- 'bug' +- 'bxr' - 'ca' +- 'cbk-zam' +- 'cdo' - 'ceb' +- 'ce' +- 'cho' +- 'chr' +- 'ch' +- 'chy' +- 'ckb' +- 'co' +- 'crh' +- 'cr' +- 'csb' - 'cs' +- 'cu' - 'cv' +- 'cy' - 'da' +- 'de' +- 'diq' +- 'dsb' +- 'dv' +- 'dz' - 'ee' - 'el' +- 'eml' - 'en' - 'eo' - 'es' +- 'et' - 'eu' -- 'de' +- 'ext' +- 'fa' - 'ff' +- 'fiu-vro' +- 'fi' +- 'fj' +- 'fo' +- 'frp' +- 'frr' - 'fr' +- 'fur' +- 'fy' - 'gag' +- 'gan' +- 'ga' +- 'gd' +- 'glk' - 'gl' +- 'gn' +- 'got' - 'gu' +- 'gv' +- 'hak' +- 'ha' +- 'haw' +- 'he' +- 'hif' +- 'hi' +- 'ho' +- 'hr' +- 'hsb' +- 'ht' +- 'hu' - 'hy' +- 'hz' +- 'ia' - 'id' +- 'ie' +- 'ig' +- 'ii' +- 'ik' +- 'ilo' +- 'io' +- 'is' - 'it' +- 'iu' +- 'ja' +- 'jbo' +- 'jv' - 'kaa' +- 'kab' +- 'ka' - 'kbd' - 'kg' - 'ki' +- 'kj' - 'kk' +- 'kl' +- 'km' - 'kn' - 'koi' +- 'ko' - 'krc' +- 'kr' +- 'ksh' +- 'ks' +- 'ku' - 'kv' +- 'kw' - 'ky' -- 'kz' - 'lad' +- 'la' +- 'lbe' +- 'lb' - 'lez' - 'lg' +- 'lij' +- 'li' +- 'lmo' +- 'ln' +- 'lo' +- 'ltg' +- 'lt' +- 'lv' +- 'mai' +- 'map-bms' +- 'mdf' +- 'mg' +- 'mhr' +- 'mh' - 'min' +- 'mi' - 'mk' +- 'ml' +- 'mn' +- 'mo' +- 'mrj' +- 'mr' - 'ms' - 'mt' +- 'mus' - 'mwl' +- 'myv' +- 'my' +- 'mzn' +- 'nah' +- 'nap' +- 'na' +- 'nds-nl' +- 'nds' +- 'ne' +- 'new' +- 'ng' - 'nl' - 'nn' +- 'nov' - 'no' +- 'nrm' +- 'nso' +- 'nv' - 'ny' - 'oc' - 'om' +- 'or' - 'os' +- 'pag' +- 'pam' +- 'pap' - 'pa' +- 'pcd' +- 'pdc' +- 'pfl' +- 'pih' +- 'pi' - 'pl' +- 'pms' +- 'pnb' +- 'pnt' +- 'ps' - 'pt' +- 'qu' +- 'rm' - 'rmy' - 'rn' - 'roa-rup' +- 'roa-tara' +- 'ro' +- 'rue' - 'ru' +- 'rw' - 'sah' +- 'sa' +- 'scn' +- 'sco' +- 'sc' +- 'sd' +- 'se' - 'sg' - 'sh' - 'simple' +- 'si' +- 'sk' - 'sl' +- 'sm' +- 'sn' +- 'so' - 'sq' +- 'srn' +- 'sr' - 'ss' +- 'stq' - 'st' +- 'su' - 'sv' +- 'sw' +- 'szl' +- 'ta' +- 'tet' +- 'te' +- 'tg' +- 'th' - 'ti' +- 'tk' +- 'tl' - 'tn' +- 'to' +- 'tpi' - 'tr' - 'ts' - 'tt' - 'tum' - 'tw' - 'tyv' +- 'ty' - 'udm' +- 'ug' - 'uk' +- 'ur' - 'uz' +- 'vec' +- 'vep' +- 've' - 'vi' +- 'vls' +- 'vo' - 'war' +- 'wa' +- 'wo' +- 'wuu' +- 'xal' - 'xh' +- 'xmf' +- 'yi' +- 'yo' +- 'za' +- 'zea' +- 'zh-classical' +- 'zh-min-nan' +- 'zh-yue' +- 'zh' - 'zu' target: - 'ab' @@ -96,11 +297,18 @@ - 'av' - 'az' - 'ba' +- 'be-x-old' +- 'be' +- 'bcl' - 'bg' +- 'bh' - 'bm' - 'ca' +- 'cbk-za' +- 'ceb' - 'cv' - 'cs' +- 'csb' - 'da' - 'ee' - 'el' @@ -114,6 +322,8 @@ - 'gu' - 'hy' - 'id' +- 'ilo' +- 'ka' - 'kaa' - 'kbd' - 'kg' @@ -126,7 +336,10 @@ - 'ky' - 'lad' - 'lez' +- 'li' - 'lg' +- 'ltg' +- 'lv' - 'min' - 'mk' - 'ms' @@ -139,10 +352,13 @@ - 'om
[MediaWiki-commits] [Gerrit] Clarify what pages LQT conversion affects and how page prop ... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Clarify what pages LQT conversion affects and how page prop works .. Clarify what pages LQT conversion affects and how page prop works Change-Id: Id9b066860556ad38a0e485926b55e3d132fe30fb --- M includes/Import/Converter.php M includes/Import/LiquidThreadsApi/ConversionStrategy.php M includes/Import/Wikitext/ConversionStrategy.php R maintenance/convertLqtPagesWithProp.php M maintenance/convertNamespaceFromWikitext.php 5 files changed, 10 insertions(+), 7 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php index 1b64679..2d57921 100644 --- a/includes/Import/Converter.php +++ b/includes/Import/Converter.php @@ -258,10 +258,7 @@ } /** -* Creates a new revision of the archived page that strips the LQT magic word -* and injects a template about the move. With the magic word stripped these pages -* will no longer contain the use-liquid-threads page property and will effectively -* no longer be lqt pages. +* Creates a new revision of the archived page with strategy-specific changes. * * @param Title $title Previous location of the page, before moving * @param Title $archiveTitle Current location of the page, after moving diff --git a/includes/Import/LiquidThreadsApi/ConversionStrategy.php b/includes/Import/LiquidThreadsApi/ConversionStrategy.php index 853a9ba..cb77dc8 100644 --- a/includes/Import/LiquidThreadsApi/ConversionStrategy.php +++ b/includes/Import/LiquidThreadsApi/ConversionStrategy.php @@ -115,6 +115,12 @@ } /** +* Creates a new revision that strips the LQT magic word (if any) and injects a +* template about the move. With the magic word stripped, these pages will no +* longer contain the use-liquid-threads page property. Unless LQT applies for an +* additional reason ($wgLqtTalkPages, $wgLqtNamespaces, $wgLqtPages), they will +* effectively no longer be LQT pages. +* * @param WikitextContent $content * @param Title $title * @return WikitextContent diff --git a/includes/Import/Wikitext/ConversionStrategy.php b/includes/Import/Wikitext/ConversionStrategy.php index cfd9bbb..990819d 100644 --- a/includes/Import/Wikitext/ConversionStrategy.php +++ b/includes/Import/Wikitext/ConversionStrategy.php @@ -179,7 +179,7 @@ // be converted separately. if ( class_exists( 'LqtDispatch' ) ) { if ( \LqtDispatch::isLqtPage( $sourceTitle ) ) { - $this-logger-info( Skipping LQT enabled page, conversion must be done with convertLqt.php or convertLqtPageOnLocalWiki.php: $sourceTitle ); + $this-logger-info( Skipping LQT enabled page, conversion must be done with convertLqtPagesWithProp.php or convertLqtPageOnLocalWiki.php: $sourceTitle ); return false; } } diff --git a/maintenance/convertLqt.php b/maintenance/convertLqtPagesWithProp.php similarity index 100% rename from maintenance/convertLqt.php rename to maintenance/convertLqtPagesWithProp.php diff --git a/maintenance/convertNamespaceFromWikitext.php b/maintenance/convertNamespaceFromWikitext.php index 229ffc8..b83be2f 100644 --- a/maintenance/convertNamespaceFromWikitext.php +++ b/maintenance/convertNamespaceFromWikitext.php @@ -9,8 +9,8 @@ /** * Converts a single namespace from wikitext talk pages to flow talk pages. Does not - * modify liquid threads pages it comes across, use convertLqt.php for that. Does not - * modify sub-pages. Does not modify LiquidThreads enabled pages. + * modify LiquidThreads pages it comes across; use convertLqtPagesWithProp.php for that. Does not + * modify sub-pages (except talk subpages with a corresponding subject page). */ class ConvertNamespaceFromWikitext extends Maintenance { public function __construct() { -- To view, visit https://gerrit.wikimedia.org/r/211340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9b066860556ad38a0e485926b55e3d132fe30fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Limit udp2log rsync daemon's bandwidth usage - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/211733 Change subject: Limit udp2log rsync daemon's bandwidth usage .. Limit udp2log rsync daemon's bandwidth usage Change-Id: I38a7e35252bdb094a6cc8f7d9e956280a8e3998e --- M manifests/misc/udp2log.pp M modules/rsync/manifests/server.pp M modules/rsync/templates/rsync.default.erb 3 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/211733/1 diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp index faf4395..5d5c8c0 100644 --- a/manifests/misc/udp2log.pp +++ b/manifests/misc/udp2log.pp @@ -73,7 +73,14 @@ $path= '/var/log/udp2log/archive', $hosts_allow = ['stat1002.eqiad.wmnet'] ) { -include rsync::server + + +class { 'rsync::server': +# We don't want rsyncs to saturate udp2log host NICs. +# Limit to 500M / sec. +rsync_opts = ['--bwlimit 512000'], +} + rsync::server::module { 'udp2log': comment = 'udp2log log files', path= $path, diff --git a/modules/rsync/manifests/server.pp b/modules/rsync/manifests/server.pp index 75aea85..4ba72d1 100644 --- a/modules/rsync/manifests/server.pp +++ b/modules/rsync/manifests/server.pp @@ -14,8 +14,9 @@ $use_xinetd = false, # this parameter should not be used. xinetd is not available. $address= '0.0.0.0', $motd_file = 'UNSET', - $log_file = 'UNSET', - $use_chroot = 'yes' + $log_file = 'UNSET', + $use_chroot = 'yes', + $rsync_opts = [], ) inherits rsync { $rsync_fragments = '/etc/rsync.d' diff --git a/modules/rsync/templates/rsync.default.erb b/modules/rsync/templates/rsync.default.erb index e120f48..7a5ad7c 100644 --- a/modules/rsync/templates/rsync.default.erb +++ b/modules/rsync/templates/rsync.default.erb @@ -25,7 +25,7 @@ # Possibilities are: # --address=123.45.67.89 (bind to a specific IP address) # --port=8730(bind to specified port; default 873) -RSYNC_OPTS='' +RSYNC_OPTS='%= @rsync_opts.sort.join(' ') %' # run rsyncd at a nice level? # the rsync daemon can impact performance due to much I/O and CPU usage, -- To view, visit https://gerrit.wikimedia.org/r/211733 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38a7e35252bdb094a6cc8f7d9e956280a8e3998e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Create account password mismatch message test - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Fix Create account password mismatch message test .. Fix Create account password mismatch message test * Add the SpecialUserLoginPage error_box element, consistent with the recently added warning_box element * Use the element in the Then I should see an error indicating they do not match step Change-Id: I53c831c3f876db2414e8fdca992fb44d17a75f06 --- M tests/browser/features/step_definitions/create_account_failure_messages_steps.rb M tests/browser/features/support/pages/special_userlogin_page.rb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb b/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb index be9de08..6a4bc8b 100644 --- a/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb +++ b/tests/browser/features/step_definitions/create_account_failure_messages_steps.rb @@ -8,7 +8,7 @@ end Then(/^I should see an error indicating they do not match$/) do - expect(on(SpecialUserLoginPage).feedback).to match('The passwords you entered do not match') + expect(on(SpecialUserLoginPage).error_box).to match('The passwords you entered do not match') end Then(/^I should still be on the sign-up page$/) do diff --git a/tests/browser/features/support/pages/special_userlogin_page.rb b/tests/browser/features/support/pages/special_userlogin_page.rb index 4e8520a..92db741 100644 --- a/tests/browser/features/support/pages/special_userlogin_page.rb +++ b/tests/browser/features/support/pages/special_userlogin_page.rb @@ -6,7 +6,6 @@ h1(:first_heading, id: 'section_0') - div(:feedback, class: 'alert error') button(:login, id: 'wpLoginAttempt') text_field(:username, name: 'wpName') text_field(:password, name: 'wpPassword') @@ -15,6 +14,7 @@ button(:signup_submit, id: 'wpCreateaccount') a(:create_account_link, text: 'Create account') div(:message_box, class: 'warningbox') + div(:error_box, class: 'errorbox') a(:password_reset, css: '.mw-userlogin-help') # signup specific -- To view, visit https://gerrit.wikimedia.org/r/211734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53c831c3f876db2414e8fdca992fb44d17a75f06 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Further optimize sql insertion - change (mediawiki...EventLogging)
Milimetric has submitted this change and it was merged. Change subject: Further optimize sql insertion .. Further optimize sql insertion This changeset tries to reduce the number of batch insertions by increasing the size of the event queues. To avoid that low-traffic schemas have to wait for a long time until the queue is full, schema queues whose first and last events are more than 5 minutes apart, are flushed to insertion as well. Bug: T98588 Change-Id: I7804f83dfaa6fd824b9641e13240518eb430cde1 --- M server/eventlogging/handlers.py 1 file changed, 12 insertions(+), 8 deletions(-) Approvals: Milimetric: Verified; Looks good to me, approved diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py index 5fb0751..a3833b5 100644 --- a/server/eventlogging/handlers.py +++ b/server/eventlogging/handlers.py @@ -12,6 +12,7 @@ import collections import datetime +import time import glob import imp import json @@ -90,7 +91,8 @@ uri = uri_delete_query_item(uri, 'replace') logger = logging.getLogger('Log') meta = sqlalchemy.MetaData(bind=uri) -events = collections.defaultdict(list) +# Each scid stores a buffer and the timestamp of the first insertion. +events = collections.defaultdict(lambda: ([], time.time())) events_batch = collections.deque() worker = PeriodicThread(interval=DB_FLUSH_INTERVAL, target=store_sql_events, @@ -105,19 +107,20 @@ # that the connection is alive, and reconnect if necessary. dbapi_connection.ping(True) try: +batch_size = 400 +batch_time = 300 # in seconds # Link the main thread to the worker thread so we # don't keep filling the queue if the worker died. -batch_size = 100 while worker.is_alive(): event = (yield) # Break the event stream by schema (and revision) scid = (event['schema'], event['revision']) -scid_events = events[scid] +scid_events, first_timestamp = events[scid] scid_events.append(event) -# TODO: Don't wait until len(scid_events) = batch_size -# if the scid is very low traffic (could take too long). -if len(scid_events) = batch_size: -logger.debug('%s_%s queue is large, sending to worker', *scid) +# Check if the schema queue is too long or too old +if (len(scid_events) = batch_size or +time.time() - first_timestamp = batch_time): +logger.debug('%s_%s queue is large or old, flushing', *scid) events_batch.append((scid, scid_events)) del events[scid] except GeneratorExit: @@ -134,7 +137,8 @@ finally: # If there are any events remaining in the queue, # process them in the main thread before exiting. -events_batch.extend(events.items()) +for scid, (scid_events, _) in events.iteritems(): +events_batch.append((scid, scid_events)) store_sql_events(meta, events_batch, replace=replace) -- To view, visit https://gerrit.wikimedia.org/r/210017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7804f83dfaa6fd824b9641e13240518eb430cde1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Mforns mfo...@wikimedia.org Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove reflinks - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Remove reflinks .. Remove reflinks Causing troubles. Was removed from intuition. Change-Id: I5d620422d0d117d976bf9b3ae1c7947e2ff58323 --- M groups/Intuition/intuition-textdomains.txt 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/Intuition/intuition-textdomains.txt b/groups/Intuition/intuition-textdomains.txt index c0a87ca..efda80b 100644 --- a/groups/Intuition/intuition-textdomains.txt +++ b/groups/Intuition/intuition-textdomains.txt @@ -45,8 +45,6 @@ ignored = ns11, ns12, ns13, ns14, ns15, ns2 ignored = ns3, ns4, ns5, ns6, ns7, ns8, ns9 -Reflinks - Rtrc ignored = rtrc-months -- To view, visit https://gerrit.wikimedia.org/r/211736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d620422d0d117d976bf9b3ae1c7947e2ff58323 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed FULL_PRECISION and TIME_MISSING date precision const... - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/211738 Change subject: Renamed FULL_PRECISION and TIME_MISSING date precision constants .. Renamed FULL_PRECISION and TIME_MISSING date precision constants They are now DATE_AND_TIME and DATE_ONLY, respectively. Also, a field of type 'Date' that has a full date is of precision DATE_ONLY (it used to be FULL_PRECISION), which makes the correct display in the 'calendar' format easier to do. Change-Id: Ib330d17cb22625c7c3116afb077a79ca2e7f8a8f --- M CargoQueryDisplayer.php M parserfunctions/CargoStore.php 2 files changed, 24 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/38/211738/1 diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php index 1e9272d..18f99e5 100644 --- a/CargoQueryDisplayer.php +++ b/CargoQueryDisplayer.php @@ -124,7 +124,7 @@ // happen, but if it // does - let's just // give up. - $datePrecision = CargoStore::FULL_PRECISION; + $datePrecision = CargoStore::DATE_ONLY; } } $text = self::formatDateFieldValue( $value, $datePrecision, $fieldType ); @@ -188,8 +188,8 @@ return CargoDrilldownUtils::monthToString( date( 'm', $seconds ) ) . ' ' . date( 'o', $seconds ); } else { - // CargoStore::FULL_PRECISION or - // CargoStore::TIME_MISSING + // CargoStore::DATE_AND_TIME or + // CargoStore::DATE_ONLY global $wgAmericanDates; if ( $wgAmericanDates ) { // We use MediaWiki's representation of month @@ -200,7 +200,10 @@ } else { $dateText = date( 'o-m-d', $seconds ); } - if ( $type == 'Date' || $datePrecision == CargoStore::TIME_MISSING ) { + // @TODO - remove the redundant 'Date' check at some + // point. It's here because the precision constants + // changed a ittle in version 0.8. + if ( $type == 'Date' || $datePrecision == CargoStore::DATE_ONLY ) { return $dateText; } diff --git a/parserfunctions/CargoStore.php b/parserfunctions/CargoStore.php index 98adcc8..96c4eb7 100644 --- a/parserfunctions/CargoStore.php +++ b/parserfunctions/CargoStore.php @@ -10,8 +10,8 @@ public static $settings = array(); - const FULL_PRECISION = 0; - const TIME_MISSING = 1; + const DATE_AND_TIME = 0; + const DATE_ONLY = 1; const MONTH_ONLY = 2; const YEAR_ONLY = 3; @@ -285,6 +285,7 @@ } } if ( $fieldType == 'Date' || $fieldType == 'Datetime' ) { + $precision = null; if ( $curValue != '' ) { // Special handling if it's just a year. // If it's a number and less than 8 @@ -315,20 +316,26 @@ // of the month. $precision = self::MONTH_ONLY; } else { - $precision = self::FULL_PRECISION; + // We have at least a + // full date. + if ( $fieldType == 'Date' ) { + $precision = self::DATE_ONLY; + } } } $seconds = strtotime( $curValue ); - if ( $precision != self::FULL_PRECISION || $fieldType == 'Date' ) { + if ( $precision == self::DATE_ONLY ) { // Put into -MM-DD format. $tableFieldValues[$fieldName] = date( 'Y-m-d', $seconds ); -
[MediaWiki-commits] [Gerrit] ApiResult::META_BC_BOOLS in ApiAbuseFilterCheckMatch - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged. Change subject: ApiResult::META_BC_BOOLS in ApiAbuseFilterCheckMatch .. ApiResult::META_BC_BOOLS in ApiAbuseFilterCheckMatch Coded to maintain BC with older versions of MediaWiki core. If that's not needed anymore, a followup should remove all the instances of the check. Bug: T99240 Change-Id: I5dc112598676915416fbacd4c30f218ac84d324d --- M api/ApiAbuseFilterCheckMatch.php 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Mormegil: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/api/ApiAbuseFilterCheckMatch.php b/api/ApiAbuseFilterCheckMatch.php index 9129b97..f426eec 100644 --- a/api/ApiAbuseFilterCheckMatch.php +++ b/api/ApiAbuseFilterCheckMatch.php @@ -54,11 +54,17 @@ $this-dieUsage( 'The filter has invalid syntax', 'badsyntax' ); } - $result = AbuseFilter::checkConditions( $params['filter'], $vars ); + $result = array( + 'result' = AbuseFilter::checkConditions( $params['filter'], $vars ), + ); + if ( defined( 'ApiResult::META_CONTENT' ) ) { + $result[ApiResult::META_BC_BOOLS][] = 'result'; + } + $this-getResult()-addValue( null, $this-getModuleName(), - array( 'result' = $result ) + $result ); } -- To view, visit https://gerrit.wikimedia.org/r/211722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5dc112598676915416fbacd4c30f218ac84d324d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Mormegil morme...@centrum.cz Gerrit-Reviewer: Se4598 se4...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add monitoring grants for databases on m5 shard - change (operations/puppet)
Jcrespo has submitted this change and it was merged. Change subject: Add monitoring grants for databases on m5 shard .. Add monitoring grants for databases on m5 shard References T92693 Change-Id: I550c2f04231f03242f6244ad173cb4bfdbd7dd0c --- M templates/mariadb/production-grants-m5.sql.erb 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jcrespo: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/production-grants-m5.sql.erb b/templates/mariadb/production-grants-m5.sql.erb index e69de29..246ba06 100644 --- a/templates/mariadb/production-grants-m5.sql.erb +++ b/templates/mariadb/production-grants-m5.sql.erb @@ -0,0 +1,17 @@ +-- Grants for 'nagios'@'localhost' (icinga) + +GRANT PROCESS, REPLICATION CLIENT +ON *.* TO 'nagios'@'localhost' +IDENTIFIED BY '%= @nagios_pass %'; + +-- Grants for 'tendril'@'10.%' (tendril) + +GRANT PROCESS, REPLICATION CLIENT, SELECT, SHOW DATABASES +ON *.* TO '%= @tendril_user %'@'10.%' +IDENTIFIED BY '%= @tendril_pass %'; + +-- Grants for 'repl'@'10.%' (replication) +GRANT REPLICATION SLAVE +ON *.* TO 'repl'@'10.%' +IDENTIFIED BY '%= @repl_pass %'; + -- To view, visit https://gerrit.wikimedia.org/r/211732 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I550c2f04231f03242f6244ad173cb4bfdbd7dd0c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Add monitoring grants for databases on m5 shard - change (operations/puppet)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/211745 Change subject: Revert Add monitoring grants for databases on m5 shard .. Revert Add monitoring grants for databases on m5 shard Not needed (duplicate grants). This reverts commit 83455e6cf2ac1bbf998848ce30c091180f7ba52f. Change-Id: I31dc6fe83407d4a64ca49ad75db65a947c0caf7a --- M templates/mariadb/production-grants-m5.sql.erb 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/211745/1 diff --git a/templates/mariadb/production-grants-m5.sql.erb b/templates/mariadb/production-grants-m5.sql.erb index 246ba06..e69de29 100644 --- a/templates/mariadb/production-grants-m5.sql.erb +++ b/templates/mariadb/production-grants-m5.sql.erb @@ -1,17 +0,0 @@ --- Grants for 'nagios'@'localhost' (icinga) - -GRANT PROCESS, REPLICATION CLIENT -ON *.* TO 'nagios'@'localhost' -IDENTIFIED BY '%= @nagios_pass %'; - --- Grants for 'tendril'@'10.%' (tendril) - -GRANT PROCESS, REPLICATION CLIENT, SELECT, SHOW DATABASES -ON *.* TO '%= @tendril_user %'@'10.%' -IDENTIFIED BY '%= @tendril_pass %'; - --- Grants for 'repl'@'10.%' (replication) -GRANT REPLICATION SLAVE -ON *.* TO 'repl'@'10.%' -IDENTIFIED BY '%= @repl_pass %'; - -- To view, visit https://gerrit.wikimedia.org/r/211745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31dc6fe83407d4a64ca49ad75db65a947c0caf7a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: RESTBase: Switch to deployment-logstash1's IP address - change (operations/puppet)
Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/211724 Change subject: Beta: RESTBase: Switch to deployment-logstash1's IP address .. Beta: RESTBase: Switch to deployment-logstash1's IP address deployment-logstash1 seems to be having DNS resolution problems, and having its hostname in the RB config brings it down in Beta every time a log entry needs to be sent. As a temporary work-around, switch to its IP instead, which has been confirmed to work. Bug: T99506 Change-Id: I46f93e400acf2886a2ee02f576297da59f0606a9 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/24/211724/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index ed285b4..283bdba 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -37,7 +37,7 @@ restbase::config_template: restbase/config.labs.yaml.erb restbase::parsoid_uri: http://deployment-parsoid05.eqiad.wmflabs:8000 restbase::statsd_host: labmon1001.eqiad.wmnet -restbase::logstash_host: deployment-logstash1.eqiad.wmflabs +restbase::logstash_host: 10.68.16.134 # deployment-logstash1.eqiad.wmflabs restbase::cassandra_defaultConsistency: localQuorum mediawiki::log_aggregator: deployment-fluorine.eqiad.wmflabs:8420 mediawiki::forward_syslog: deployment-logstash1.eqiad.wmflabs:10514 -- To view, visit https://gerrit.wikimedia.org/r/211724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46f93e400acf2886a2ee02f576297da59f0606a9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac mobro...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log callers that trigger Title::newFromText $text type warning - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Log callers that trigger Title::newFromText $text type warning .. Log callers that trigger Title::newFromText $text type warning Follows-up Ic85d27d79, Ibedc31659. See T76305. Change-Id: I8245744a9291d221f4e9302bb83db328a24f115f --- M includes/Title.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Title.php b/includes/Title.php index 509fc27..601211d 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -265,6 +265,7 @@ if ( is_object( $text ) ) { throw new InvalidArgumentException( '$text must be a string.' ); } elseif ( !is_string( $text ) ) { + wfDebugLog( 'T76305', wfGetAllCallers( 5 ) ); wfWarn( __METHOD__ . ': $text must be a string. This will throw an InvalidArgumentException in future.', 2 ); } -- To view, visit https://gerrit.wikimedia.org/r/211655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8245744a9291d221f4e9302bb83db328a24f115f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf5 Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits