[MediaWiki-commits] [Gerrit] operations/switchdc[master]: Fix typo in discovery name
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345868 ) Change subject: Fix typo in discovery name .. Fix typo in discovery name Bug: T160178 Change-Id: Iccc6de763c53a63364eb6206a926dcdda4c19432 --- M switchdc/stages/t05_switch_datacenter.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/switchdc/stages/t05_switch_datacenter.py b/switchdc/stages/t05_switch_datacenter.py index d573ae8..95e7c17 100644 --- a/switchdc/stages/t05_switch_datacenter.py +++ b/switchdc/stages/t05_switch_datacenter.py @@ -11,7 +11,7 @@ discovery = Confctl('discovery') # 1: switch DNS discovery record for the new dc to on. # This will NOT trigger confd to change the DNS admin state as it will cause a validation error -mw_records = '(appserver|api|imagescaler)-rw' +mw_records = '(appservers|api|imagescaler)-rw' discovery.update({'pooled': True}, dnsdisc=mw_records, name=dc_to) for obj in discovery.get(dnsdisc=mw_records, name=dc_to): if not obj.pooled: -- To view, visit https://gerrit.wikimedia.org/r/345868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iccc6de763c53a63364eb6206a926dcdda4c19432 Gerrit-PatchSet: 1 Gerrit-Project: operations/switchdc Gerrit-Branch: master Gerrit-Owner: VolansGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: page_tests.py: Use raw string notation for regular expressions
Dalba has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346092 ) Change subject: page_tests.py: Use raw string notation for regular expressions .. page_tests.py: Use raw string notation for regular expressions Pyhton 3.6 issues "DeprecationWarning: invalid escape sequence" for using "\." in normal string literals. Change-Id: Ic5c3069e9cc04a17d44ead417219c75bdb61808c --- M tests/page_tests.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/92/346092/1 diff --git a/tests/page_tests.py b/tests/page_tests.py index 44b561a..1997d6c 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -37,9 +37,9 @@ ) -EMPTY_TITLE_RE = 'Title must be specified and not empty if source is a Site\.' -INVALID_TITLE_RE = 'The link does not contain a page title' -NO_PAGE_RE = 'doesn\'t exist\.' +EMPTY_TITLE_RE = r'Title must be specified and not empty if source is a Site\.' +INVALID_TITLE_RE = r'The link does not contain a page title' +NO_PAGE_RE = r'doesn\'t exist\.' class TestLinkObject(SiteAttributeTestCase): @@ -856,7 +856,7 @@ text = u'This page is used in the [[mw:Manual:Pywikipediabot]] testing suite.' self.assertEqual(p1.get(), text) self.assertRaisesRegex(pywikibot.exceptions.IsRedirectPage, - '{0} is a redirect page\.' + r'{0} is a redirect page\.' .format(re.escape(str(p2))), p2.get) self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, p3.get) @@ -870,7 +870,7 @@ text = p2.get(get_redirect=True) self.assertRaisesRegex(pywikibot.exceptions.IsNotRedirectPage, - '{0} is not a redirect page\.' + r'{0} is not a redirect page\.' .format(re.escape(str(p1))), p1.set_redirect_target, p2) self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, -- To view, visit https://gerrit.wikimedia.org/r/346092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5c3069e9cc04a17d44ead417219c75bdb61808c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix two bugs in installer session error display
Tim Starling has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346091 ) Change subject: Fix two bugs in installer session error display .. Fix two bugs in installer session error display If Installer::startSession() returns false, then showError() is called before setParserLanguage(), which causes DB access via Title::getContentModel(). The code which was meant to handle DB access from the parser did not do so, since the exception class which is thrown on attempted DB access has changed. Change-Id: I1478ec06a441851c5336bdde15734642615d45e9 --- M includes/installer/Installer.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/91/346091/1 diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index f03fe6a..0a2b808 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -446,6 +446,8 @@ $this->parserTitle = Title::newFromText( 'Installer' ); $this->parserOptions = new ParserOptions( $wgUser ); // language will be wrong :( $this->parserOptions->setEditSection( false ); + // Don't try to access DB before user language is initialised + $this->setParserLanguage( Language::factory( 'en' ) ); } /** @@ -674,7 +676,7 @@ try { $out = $wgParser->parse( $text, $this->parserTitle, $this->parserOptions, $lineStart ); $html = $out->getText(); - } catch ( DBAccessError $e ) { + } catch ( MediaWiki\Services\ServiceDisabledException $e ) { $html = ' ' . htmlspecialchars( $text ); if ( !empty( $this->debug ) ) { -- To view, visit https://gerrit.wikimedia.org/r/346091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1478ec06a441851c5336bdde15734642615d45e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tim Starling___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...kubernetes[master]: Get rid of nonsensical default
Yuvipanda has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345909 ) Change subject: Get rid of nonsensical default .. Get rid of nonsensical default Change-Id: Ic9a278bad4dce8b74088a606e5315db083be5924 --- M debian/changelog M debian/kubernetes-node.kube-proxy.service 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 9d362fd..9f79273 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +kubernetes (1.4.6-6) unstable; urgency=medium + + * Get rid of nonsensical default + + -- Yuvi PandaFri, 31 Mar 2017 14:23:15 + + kubernetes (1.4.6-5) unstable; urgency=medium * Just get rid of /s in HostPathAutoMounter, since starting diff --git a/debian/kubernetes-node.kube-proxy.service b/debian/kubernetes-node.kube-proxy.service index 88b9fea..49c6f7c 100644 --- a/debian/kubernetes-node.kube-proxy.service +++ b/debian/kubernetes-node.kube-proxy.service @@ -5,7 +5,6 @@ After=network.target [Service] -Environment=KUBE_MASTER=--master=127.0.0.1:8080 EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/default/%p ExecStart=/usr/bin/kube-proxy \ -- To view, visit https://gerrit.wikimedia.org/r/345909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9a278bad4dce8b74088a606e5315db083be5924 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/kubernetes Gerrit-Branch: master Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix incorrect index name in new 1.28.0 installations
Tim Starling has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346090 ) Change subject: Fix incorrect index name in new 1.28.0 installations .. Fix incorrect index name in new 1.28.0 installations This index name should be the same in new installations as in all other MySQL installations. This is necessary so that Special:DeletedContributions does not give an SQL error. Release notes will go in the 1.28 branch. Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3 --- M includes/installer/MysqlUpdater.php A maintenance/archives/patch-rename-ar_usertext_timestamp.sql 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/90/346090/1 diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index ff13196..70e790c 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -294,6 +294,7 @@ [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ], [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ], [ 'modifyField', 'recentchanges', 'rc_ip', 'patch-rc_ip_modify.sql' ], + [ 'addIndex', 'archive', 'usertext_timestamp', 'patch-rename-ar_usertext_timestamp.sql' ], // 1.29 [ 'addField', 'externallinks', 'el_index_60', 'patch-externallinks-el_index_60.sql' ], diff --git a/maintenance/archives/patch-rename-ar_usertext_timestamp.sql b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql new file mode 100644 index 000..cde96c0 --- /dev/null +++ b/maintenance/archives/patch-rename-ar_usertext_timestamp.sql @@ -0,0 +1,6 @@ +-- Rename the archive.ar_usertext_timestamp index to usertext_timestamp. +-- This is for MySQL only and is only necessary on wikis freshly installed on +-- 1.28.0 when bug T154872 was present. The patch will probably be removed in +-- 1.29 since we plan on renaming the index properly to ar_usertext_timestamp. +ALTER TABLE /*$wgDBprefix*/archive + RENAME INDEX ar_usertext_timestamp TO usertext_timestamp; -- To view, visit https://gerrit.wikimedia.org/r/346090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I535a5513ab56203139c4cf64874ea7e7498990e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tim Starling___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DeepSea[master]: Remove media toolbar as it's no longer needed
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346089 ) Change subject: Remove media toolbar as it's no longer needed .. Remove media toolbar as it's no longer needed Change-Id: I4c6164a132eb5dd3aeeb1909f721b0a2bc1610d8 --- M DeepSea.skin.php M deepsea/big.css M deepsea/example-colours.css M deepsea/interactive.css M deepsea/screen.css M deepsea/small.css M skin.json 7 files changed, 9 insertions(+), 89 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeepSea refs/changes/89/346089/1 diff --git a/DeepSea.skin.php b/DeepSea.skin.php index b7c89f0..9e5eb9e 100644 --- a/DeepSea.skin.php +++ b/DeepSea.skin.php @@ -172,7 +172,6 @@ - renderNavigation( 'MEDIA' ); ?> renderNavigation( 'PERSONAL' ); ?> renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?> @@ -450,60 +449,6 @@ - array( - 'name' => 'Brickipedia', - 'hover' => 'The LEGO Wiki' - ), - 'gbc' => array( - 'name' => 'GBC', - 'hover' => 'Great Ball Contraptions' - ) - ); - global $bmProject; - -?> - - Brickimedia Navigation - - - Brickimedia: - -$info ) { - $liAttributes = array( 'title' => $info['hover'] ); - // Empty class attribute makes W3C Validator sad, so add it - // only if we have a reason to! - if ( $bmProject == $code ) { - array_merge( $liAttributes, array( 'class' => 'selected' ) ); - } - $li = Html::openElement( 'li', $liAttributes ); - echo $li . "\n"; // the newline is just to prettify the HTML output a bit :P - ?> - - - - plain() ?> - plain() ?> - plain() ?> - plain() ?> - getSkin()->getTitle()->getPrefixedURL(); - $thisPageMsg = wfMessage( 'deepsea-this-page' )->plain(); - echo "http://$code.brickimedia.org/wiki/{$thisTitle}\;>{$thisPageMsg}"; - } - ?> - - - - - - https://mediawiki.org/wiki/User:UltrasonicNXT Adam Carter]", "[https://mediawiki.org/wiki/User:GeorgeBarnick George Barnick]", -- To view, visit https://gerrit.wikimedia.org/r/346089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c6164a132eb5dd3aeeb1909f721b0a2bc1610d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DeepSea Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update comment for indexName(), explaining why it exists
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345494 ) Change subject: Update comment for indexName(), explaining why it exists .. Update comment for indexName(), explaining why it exists Bug: T154872 Change-Id: Idf64b85dc56dcc28f3a25b2b8ded44c5490cf56c --- M includes/libs/rdbms/database/DatabaseMysqlBase.php 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php index 4b3a644..6725090 100644 --- a/includes/libs/rdbms/database/DatabaseMysqlBase.php +++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php @@ -1343,7 +1343,20 @@ * @return string */ protected function indexName( $index ) { - // Backwards-compatibility hack + /** +* When SQLite indexes were introduced in r45764, it was noted that +* SQLite requires index names to be unique within the whole database, +* not just within a schema. As discussed in CR r45819, to avoid the +* need for a schema change on existing installations, the indexes +* were implicitly mapped from the new names to the old names. +* +* This mapping can be removed if DB patches are introduced to alter +* the relevant tables in existing installations. Note that because +* this index mapping applies to table creation, even new installations +* of MySQL have the old names (except for installations created during +* a period where this mapping was inappropriately removed, see +* T154872). +*/ $renamed = [ 'ar_usertext_timestamp' => 'usertext_timestamp', 'un_user_id' => 'user_id', -- To view, visit https://gerrit.wikimedia.org/r/345494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf64b85dc56dcc28f3a25b2b8ded44c5490cf56c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tim StarlingGerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make the indexName functions more obviously laid out
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345533 ) Change subject: Make the indexName functions more obviously laid out .. Make the indexName functions more obviously laid out Move Sqlites's indexName to Database to have no remapping by default. This is because MSSQL and Postgresql both don't need remapping, it's just MySQL that's the problem. So move the one from Database into MysqlBase to only do the remappings there. Also fix up the comments to make them less vague, not mentioning tables when the function has no table parameter passed, so hence, no context as to which table said index is wanted to be used Bug: T154872 Change-Id: I46c575771e6cb36176bcf6cd1a865b703db0275d --- M includes/libs/rdbms/database/Database.php M includes/libs/rdbms/database/DatabaseMysqlBase.php M includes/libs/rdbms/database/DatabaseSqlite.php 3 files changed, 23 insertions(+), 23 deletions(-) Approvals: Tim Starling: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index fbfd899..49ddd14 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -1951,24 +1951,13 @@ } /** -* Get the name of an index in a given table. +* Allows for index remapping in queries where this is not consistent across DBMS * * @param string $index * @return string */ protected function indexName( $index ) { - // Backwards-compatibility hack - $renamed = [ - 'ar_usertext_timestamp' => 'usertext_timestamp', - 'un_user_id' => 'user_id', - 'un_user_ip' => 'user_ip', - ]; - - if ( isset( $renamed[$index] ) ) { - return $renamed[$index]; - } else { - return $index; - } + return $index; } public function addQuotes( $s ) { diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php index e900027..4b3a644 100644 --- a/includes/libs/rdbms/database/DatabaseMysqlBase.php +++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php @@ -1335,4 +1335,25 @@ public function isView( $name, $prefix = null ) { return in_array( $name, $this->listViews( $prefix ) ); } + + /** +* Allows for index remapping in queries where this is not consistent across DBMS +* +* @param string $index +* @return string +*/ + protected function indexName( $index ) { + // Backwards-compatibility hack + $renamed = [ + 'ar_usertext_timestamp' => 'usertext_timestamp', + 'un_user_id' => 'user_id', + 'un_user_ip' => 'user_ip', + ]; + + if ( isset( $renamed[$index] ) ) { + return $renamed[$index]; + } else { + return $index; + } + } } diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php index 2a5deb6..090ce8e 100644 --- a/includes/libs/rdbms/database/DatabaseSqlite.php +++ b/includes/libs/rdbms/database/DatabaseSqlite.php @@ -431,16 +431,6 @@ } /** -* Index names have DB scope -* -* @param string $index -* @return string -*/ - protected function indexName( $index ) { - return $index; - } - - /** * This must be called after nextSequenceVal * * @return int -- To view, visit https://gerrit.wikimedia.org/r/345533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46c575771e6cb36176bcf6cd1a865b703db0275d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: ReedyGerrit-Reviewer: Reedy Gerrit-Reviewer: Tim Starling Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for 70a2c63ab3aa
Yaron Koren has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346088 ) Change subject: Fix for 70a2c63ab3aa .. Fix for 70a2c63ab3aa Change-Id: I6fa2af557ae7040bbbdac717ee0d049d1f5a9ae1 --- M libs/PageForms.js 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/libs/PageForms.js b/libs/PageForms.js index ef92d22..1b55447 100644 --- a/libs/PageForms.js +++ b/libs/PageForms.js @@ -97,7 +97,6 @@ // regular one - grep() requires a regular one. // (Is this "if" check necessary, or useful?) if ( typeof array === 'object' ) { - array = Object.values( array ); // Unfortunately, Object.values() is // not supported on all browsers. array = Object.keys(array).map(function(key) { -- To view, visit https://gerrit.wikimedia.org/r/346088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fa2af557ae7040bbbdac717ee0d049d1f5a9ae1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Yaron KorenGerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for 70a2c63ab3aa
Yaron Koren has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346088 ) Change subject: Fix for 70a2c63ab3aa .. Fix for 70a2c63ab3aa Change-Id: I6fa2af557ae7040bbbdac717ee0d049d1f5a9ae1 --- M libs/PageForms.js 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/88/346088/2 diff --git a/libs/PageForms.js b/libs/PageForms.js index ef92d22..1b55447 100644 --- a/libs/PageForms.js +++ b/libs/PageForms.js @@ -97,7 +97,6 @@ // regular one - grep() requires a regular one. // (Is this "if" check necessary, or useful?) if ( typeof array === 'object' ) { - array = Object.values( array ); // Unfortunately, Object.values() is // not supported on all browsers. array = Object.keys(array).map(function(key) { -- To view, visit https://gerrit.wikimedia.org/r/346088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6fa2af557ae7040bbbdac717ee0d049d1f5a9ae1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Yaron Koren___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move atj in RELEASE-NOTES-1.29 to language section
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346087 ) Change subject: Move atj in RELEASE-NOTES-1.29 to language section .. Move atj in RELEASE-NOTES-1.29 to language section Change-Id: I5ca54f5c749d2c65435647f1e8737fa139e641a9 --- M RELEASE-NOTES-1.29 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/346087/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 2371ed3..b9b6485 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -37,7 +37,6 @@ added to $wgExtraLanguageCodes instead. === New features in 1.29 === -* (T137376) New language support: Atikamekw (atj) * (T5233) A cookie can now be set when a user is autoblocked, to track that user if they move to a new IP address. This is disabled by default. * Added ILocalizedException interface to standardize the use of localized @@ -161,6 +160,7 @@ The new or reinstated language fallbacks are (after cs ↔ sk in 1.28): ca ↔ oc; hsb ↔ dsb; io → eo; mdf → ru; pnt → el; roa-tara → it; rup → ro; sh → bs, sr-el, hr. +* (T137376) New language support: Atikamekw (atj). * (T155957) Talk Namespaces for Javanese language (jv) have been updated. No fallback for Ukrainian -- To view, visit https://gerrit.wikimedia.org/r/346087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ca54f5c749d2c65435647f1e8737fa139e641a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Adds canadian aboriginal to mw.language.specialcharacters
Tpt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346062 ) Change subject: Adds canadian aboriginal to mw.language.specialcharacters .. Adds canadian aboriginal to mw.language.specialcharacters Bug: T108626 Change-Id: Ia337d42c6ef7f9645f1dd843ef0e7553857f6aa3 --- M resources/src/mediawiki.language/specialcharacters.json 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/346062/1 diff --git a/resources/src/mediawiki.language/specialcharacters.json b/resources/src/mediawiki.language/specialcharacters.json index 0dffd7d..c8b8a99 100644 --- a/resources/src/mediawiki.language/specialcharacters.json +++ b/resources/src/mediawiki.language/specialcharacters.json @@ -444,5 +444,47 @@ ], "khmer": [ "ក", "ខ", "គ", "ឃ", "ង", "ច", "ឆ", "ជ", "ឈ", "ញ", "ដ", "ឋ", "ឌ", "ឍ", "ណ", "ត", "ថ", "ទ", "ធ", "ន", "ប", "ផ", "ព", "ភ", "ម", "យ", "រ", "ល", "វ", "ស", "ហ", "ឡ", "អ", "ឣ", "ឤ", "ឥ", "ឦ", "ឧ", "ឨ", "ឩ", "ឪ", "ឫ", "ឬ", "ឭ", "ឮ", "ឯ", "ឰ", "ឱ", "ឲ", "ឳ", "្", "឴", "឵", "ា", "ិ", "ី", "ឹ", "ឺ", "ុ", "ូ", "ួ", "ើ", "ឿ", "ៀ", "េ", "ែ", "ៃ", "ោ", "ៅ", "ំ", "ះ", "ៈ", "៉", "៊", "់", "៌", "៍", "៎", "៏", "័", "៑", "៓", "៝", "ៜ", "០", "១", "២", "៣", "៤", "៥", "៦", "៧", "៨", "៩", "៛", "។", "៕", "៖", "ៗ", "៘", "៙", "៚", "៰", "៱", "៲", "៳", "៴", "៵", "៶", "៷", "៸", "៹", "᧠", "᧡", "᧢", "᧣", "᧤", "᧥", "᧦", "᧧", "᧨", "᧩", "᧪", "᧫", "᧬", "᧭", "᧮", "᧯", "᧰", "᧱", "᧲", "᧳", "᧴", "᧵", "᧶", "᧷", "᧸", "᧹", "᧺", "᧻", "᧼", "᧽", "᧾", "᧿" + ], + "canadian-aboriginal": [ + "ᐁ", "ᐂ", "ᐃ", "ᐄ", "ᐅ", "ᐆ", "ᐇ", "ᐈ", "ᐉ", "ᐊ", "ᐋ", "ᐌ", "ᐍ", "ᐎ", "ᐏ", "ᐐ", + "ᐑ", "ᐒ", "ᐓ", "ᐔ", "ᐕ", "ᐖ", "ᐗ", "ᐘ", "ᐙ", "ᐚ", "ᐛ", "ᐜ", "ᐝ", "ᐞ", "ᐟ", "ᐠ", + "ᐡ", "ᐢ", "ᐣ", "ᐤ", "ᐥ", "ᐦ", "ᐧ", "ᐨ", "ᐩ", "ᐪ", "ᐫ", "ᐬ", "ᐭ", "ᐮ", "ᐯ", "ᐰ", + "ᐱ", "ᐲ", "ᐳ", "ᐴ", "ᐵ", "ᐶ", "ᐷ", "ᐸ", "ᐹ", "ᐺ", "ᐻ", "ᐼ", "ᐽ", "ᐾ", "ᐿ", "ᑀ", + "ᑁ", "ᑂ", "ᑃ", "ᑄ", "ᑅ", "ᑆ", "ᑇ", "ᑈ", "ᑉ", "ᑊ", "ᑋ", "ᑌ", "ᑍ", "ᑎ", "ᑏ", "ᑐ", + "ᑑ", "ᑒ", "ᑓ", "ᑔ", "ᑕ", "ᑖ", "ᑗ", "ᑘ", "ᑙ", "ᑚ", "ᑛ", "ᑜ", "ᑝ", "ᑞ", "ᑟ", "ᑠ", + "ᑡ", "ᑢ", "ᑣ", "ᑤ", "ᑥ", "ᑦ", "ᑧ", "ᑨ", "ᑩ", "ᑪ", "ᑫ", "ᑬ", "ᑭ", "ᑮ", "ᑯ", "ᑰ", + "ᑱ", "ᑲ", "ᑳ", "ᑴ", "ᑵ", "ᑶ", "ᑷ", "ᑸ", "ᑹ", "ᑺ", "ᑻ", "ᑼ", "ᑽ", "ᑾ", "ᑿ", "ᒀ", + "ᒁ", "ᒂ", "ᒃ", "ᒄ", "ᒅ", "ᒆ", "ᒇ", "ᒈ", "ᒉ", "ᒊ", "ᒋ", "ᒌ", "ᒍ", "ᒎ", "ᒏ", "ᒐ", + "ᒑ", "ᒒ", "ᒓ", "ᒔ", "ᒕ", "ᒖ", "ᒗ", "ᒘ", "ᒙ", "ᒚ", "ᒛ", "ᒜ", "ᒝ", "ᒞ", "ᒟ", "ᒠ", + "ᒡ", "ᒢ", "ᒣ", "ᒤ", "ᒥ", "ᒦ", "ᒧ", "ᒨ", "ᒩ", "ᒪ", "ᒫ", "ᒬ", "ᒭ", "ᒮ", "ᒯ", "ᒰ", + "ᒱ", "ᒲ", "ᒳ", "ᒴ", "ᒵ", "ᒶ", "ᒷ", "ᒸ", "ᒹ", "ᒺ", "ᒻ", "ᒼ", "ᒽ", "ᒾ", "ᒿ", "ᓀ", + "ᓁ", "ᓂ", "ᓃ", "ᓄ", "ᓅ", "ᓆ", "ᓇ", "ᓈ", "ᓉ", "ᓊ", "ᓋ", "ᓌ", "ᓍ", "ᓎ", "ᓏ", "ᓐ", + "ᓑ", "ᓒ", "ᓓ", "ᓔ", "ᓕ", "ᓖ", "ᓗ", "ᓘ", "ᓙ", "ᓚ", "ᓛ", "ᓜ", "ᓝ", "ᓞ", "ᓟ", "ᓠ", + "ᓡ", "ᓢ", "ᓣ", "ᓤ", "ᓥ", "ᓦ", "ᓧ", "ᓨ", "ᓩ", "ᓪ", "ᓫ", "ᓬ", "ᓭ", "ᓮ", "ᓯ", "ᓰ", + "ᓱ", "ᓲ", "ᓳ", "ᓴ", "ᓵ", "ᓶ", "ᓷ", "ᓸ", "ᓹ", "ᓺ", "ᓻ", "ᓼ", "ᓽ", "ᓾ", "ᓿ", "ᔀ", + "ᔁ", "ᔂ", "ᔃ", "ᔄ", "ᔅ", "ᔆ", "ᔇ", "ᔈ", "ᔉ", "ᔊ", "ᔋ", "ᔌ", "ᔍ", "ᔎ", "ᔏ", "ᔐ", + "ᔑ", "ᔒ", "ᔓ", "ᔔ", "ᔕ", "ᔖ", "ᔗ", "ᔘ", "ᔙ", "ᔚ", "ᔛ", "ᔜ", "ᔝ", "ᔞ", "ᔟ", "ᔠ", + "ᔡ", "ᔢ", "ᔣ", "ᔤ", "ᔥ", "ᔦ", "ᔧ", "ᔨ", "ᔩ", "ᔪ", "ᔫ", "ᔬ", "ᔭ", "ᔮ", "ᔯ", "ᔰ", + "ᔱ", "ᔲ", "ᔳ", "ᔴ", "ᔵ", "ᔶ", "ᔷ", "ᔸ", "ᔹ", "ᔺ", "ᔻ", "ᔼ", "ᔽ", "ᔾ", "ᔿ", "ᕀ", + "ᕁ", "ᕂ", "ᕃ", "ᕄ", "ᕅ", "ᕆ", "ᕇ", "ᕈ", "ᕉ", "ᕊ", "ᕋ", "ᕌ", "ᕍ", "ᕎ", "ᕏ", "ᕐ", + "ᕑ", "ᕒ", "ᕓ", "ᕔ", "ᕕ", "ᕖ", "ᕗ", "ᕘ", "ᕙ", "ᕚ", "ᕛ", "ᕜ", "ᕝ", "ᕞ", "ᕟ", "ᕠ", + "ᕡ", "ᕢ", "ᕣ", "ᕤ", "ᕥ", "ᕦ", "ᕧ", "ᕨ", "ᕩ", "ᕪ", "ᕫ", "ᕬ", "ᕭ", "ᕮ", "ᕯ", "ᕰ", + "ᕱ", "ᕲ", "ᕳ", "ᕴ", "ᕵ", "ᕶ", "ᕷ", "ᕸ", "ᕹ", "ᕺ", "ᕻ", "ᕼ", "ᕽ", "ᕾ", "ᕿ", "ᖀ", + "ᖁ", "ᖂ", "ᖃ", "ᖄ", "ᖅ", "ᖆ", "ᖇ", "ᖈ", "ᖉ", "ᖊ", "ᖋ", "ᖌ", "ᖍ", "ᖎ", "ᖏ", "ᖐ", + "ᖑ", "ᖒ", "ᖓ", "ᖔ", "ᖕ", "ᖖ", "ᖗ", "ᖘ", "ᖙ", "ᖚ", "ᖛ", "ᖜ", "ᖝ", "ᖞ", "ᖟ", "ᖠ", + "ᖡ", "ᖢ", "ᖣ", "ᖤ", "ᖥ", "ᖦ", "ᖧ", "ᖨ", "ᖩ", "ᖪ", "ᖫ", "ᖬ", "ᖭ", "ᖮ", "ᖯ", "ᖰ", + "ᖱ", "ᖲ", "ᖳ", "ᖴ", "ᖵ", "ᖶ", "ᖷ", "ᖸ", "ᖹ", "ᖺ", "ᖻ", "ᖼ", "ᖽ", "ᖾ", "ᖿ", "ᗀ", + "ᗁ", "ᗂ", "ᗃ", "ᗄ", "ᗅ", "ᗆ", "ᗇ", "ᗈ", "ᗉ", "ᗊ", "ᗋ", "ᗌ", "ᗍ", "ᗎ", "ᗏ", "ᗐ", + "ᗑ", "ᗒ", "ᗓ", "ᗔ", "ᗕ", "ᗖ", "ᗗ", "ᗘ", "ᗙ", "ᗚ", "ᗛ", "ᗜ", "ᗝ", "ᗞ", "ᗟ", "ᗠ", + "ᗡ", "ᗢ", "ᗣ", "ᗤ", "ᗥ", "ᗦ", "ᗧ", "ᗨ", "ᗩ", "ᗪ", "ᗫ", "ᗬ", "ᗭ", "ᗮ", "ᗯ", "ᗰ", + "ᗱ", "ᗲ", "ᗳ", "ᗴ", "ᗵ", "ᗶ", "ᗷ", "ᗸ", "ᗹ", "ᗺ", "ᗻ", "ᗼ", "ᗽ", "ᗾ", "ᗿ", "ᘀ", + "ᘁ", "ᘂ", "ᘃ", "ᘄ", "ᘅ", "ᘆ", "ᘇ", "ᘈ", "ᘉ", "ᘊ", "ᘋ", "ᘌ", "ᘍ", "ᘎ", "ᘏ", "ᘐ", + "ᘑ", "ᘒ", "ᘓ", "ᘔ", "ᘕ", "ᘖ", "ᘗ", "ᘘ", "ᘙ", "ᘚ", "ᘛ", "ᘜ", "ᘝ", "ᘞ", "ᘟ", "ᘠ", + "ᘡ",
[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 282867eb7a210a9a2393d62ed9d619b4248f95fe:
Smalyshev has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346061 ) Change subject: Merging from 282867eb7a210a9a2393d62ed9d619b4248f95fe: .. Merging from 282867eb7a210a9a2393d62ed9d619b4248f95fe: Add Commons to the licensing terms. Change-Id: I6910de718c80073463e684791830430b358ddd7b --- M copyright.html 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smalyshev: Verified; Looks good to me, approved diff --git a/copyright.html b/copyright.html index c9defef..2977a3c 100644 --- a/copyright.html +++ b/copyright.html @@ -1 +1 @@ -Wikidata Query ServiceLicensing informationThis site provides information from https://www.wikidata.org/;>Wikidata, which is available under https://creativecommons.org/publicdomain/zero/1.0/;>Creative Commons CC0 License. See more information in the https://wikimediafoundation.org/wiki/Terms_of_Use;>Terms of Use.Query data on this site may also include information for the following sources:http://labs.europeana.eu/api/linked-open-data-sparql-endpoint;>Europeanahttp://nomisma.org/;>Nomisma.orghttp://data.cervantesvirtual.com/about;>Biblioteca Virtual Miguel de Cervanteshttp://datos.bne.es/sparql?help=intro;>Biblioteca Nacional de España \ No newline at end of file +Wikidata Query ServiceLicensing informationThis site provides information from https://www.wikidata.org/;>Wikidata, which is available under https://creativecommons.org/publicdomain/zero/1.0/;>Creative Commons CC0 License. See more information in the https://wikimediafoundation.org/wiki/Terms_of_Use;>Terms of Use.It also includes information from https://commons.wikimedia.org/;>Wikimedia Commons, such as images, available under https://creativecommons.org/licenses/by-sa/3.0/;>CC-BY-SA. See more information in the https://commons.wikimedia.org/wiki/Commons:Reusing_content_outside_Wikimedia;>Commons reuse terms.Query data on this site may also include information for the following sources:http://labs.europeana.eu/api/linked-open-data-sparql-endpoint;>Europeanahttp://nomisma.org/;>Nomisma.orghttp://data.cervantesvirtual.com/about;>Biblioteca Virtual Miguel de Cervanteshttp://datos.bne.es/sparql?help=intro;>Biblioteca Nacional de España \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/346061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6910de718c80073463e684791830430b358ddd7b Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: SmalyshevGerrit-Reviewer: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346059 ) Change subject: Update GUI .. Update GUI Change-Id: I1549407d58f4e8d6d205515ccfd655e0bbc8166d --- M gui 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/gui b/gui index c8be52c..282867e 16 --- a/gui +++ b/gui @@ -1 +1 @@ -Subproject commit c8be52c606f5594665956bc80a562252bbe356a9 +Subproject commit 282867eb7a210a9a2393d62ed9d619b4248f95fe -- To view, visit https://gerrit.wikimedia.org/r/346059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1549407d58f4e8d6d205515ccfd655e0bbc8166d Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: SmalyshevGerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 282867eb7a210a9a2393d62ed9d619b4248f95fe:
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346061 ) Change subject: Merging from 282867eb7a210a9a2393d62ed9d619b4248f95fe: .. Merging from 282867eb7a210a9a2393d62ed9d619b4248f95fe: Add Commons to the licensing terms. Change-Id: I6910de718c80073463e684791830430b358ddd7b --- M copyright.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy refs/changes/61/346061/1 diff --git a/copyright.html b/copyright.html index c9defef..2977a3c 100644 --- a/copyright.html +++ b/copyright.html @@ -1 +1 @@ -Wikidata Query ServiceLicensing informationThis site provides information from https://www.wikidata.org/;>Wikidata, which is available under https://creativecommons.org/publicdomain/zero/1.0/;>Creative Commons CC0 License. See more information in the https://wikimediafoundation.org/wiki/Terms_of_Use;>Terms of Use.Query data on this site may also include information for the following sources:http://labs.europeana.eu/api/linked-open-data-sparql-endpoint;>Europeanahttp://nomisma.org/;>Nomisma.orghttp://data.cervantesvirtual.com/about;>Biblioteca Virtual Miguel de Cervanteshttp://datos.bne.es/sparql?help=intro;>Biblioteca Nacional de España \ No newline at end of file +Wikidata Query ServiceLicensing informationThis site provides information from https://www.wikidata.org/;>Wikidata, which is available under https://creativecommons.org/publicdomain/zero/1.0/;>Creative Commons CC0 License. See more information in the https://wikimediafoundation.org/wiki/Terms_of_Use;>Terms of Use.It also includes information from https://commons.wikimedia.org/;>Wikimedia Commons, such as images, available under https://creativecommons.org/licenses/by-sa/3.0/;>CC-BY-SA. See more information in the https://commons.wikimedia.org/wiki/Commons:Reusing_content_outside_Wikimedia;>Commons reuse terms.Query data on this site may also include information for the following sources:http://labs.europeana.eu/api/linked-open-data-sparql-endpoint;>Europeanahttp://nomisma.org/;>Nomisma.orghttp://data.cervantesvirtual.com/about;>Biblioteca Virtual Miguel de Cervanteshttp://datos.bne.es/sparql?help=intro;>Biblioteca Nacional de España \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/346061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6910de718c80073463e684791830430b358ddd7b Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add User-Agent string to the Query Service federation requests.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346056 ) Change subject: Add User-Agent string to the Query Service federation requests. .. Add User-Agent string to the Query Service federation requests. Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26 --- M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java M dist/src/script/runBlazegraph.sh 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java index a029aa3..e27b572 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java @@ -3,6 +3,8 @@ import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpProxy; import org.eclipse.jetty.client.ProxyConfiguration; +import org.eclipse.jetty.http.HttpField; +import org.eclipse.jetty.http.HttpHeader; import com.bigdata.rdf.sail.webapp.client.DefaultHttpClientFactory; import com.bigdata.rdf.sail.webapp.client.IHttpClientFactory; @@ -25,7 +27,10 @@ * Configuration name for proxy port. */ private static final String HTTP_PROXY_PORT = "http.proxyPort"; - +/** + * Configuration name for User agent. + */ +private static final String HTTP_USER_AGENT = "http.userAgent"; public ProxiedHttpConnectionFactory() { defaultFactory = new DefaultHttpClientFactory(); } @@ -44,6 +49,10 @@ proxy.getExcludedAddresses().add("127.0.0.1"); proxyConfig.getProxies().add(proxy); } +final String userAgent = System.getProperty(HTTP_USER_AGENT); +if (userAgent != null) { +client.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, userAgent)); +} return client; } diff --git a/dist/src/script/runBlazegraph.sh b/dist/src/script/runBlazegraph.sh index b923a15..3027837 100755 --- a/dist/src/script/runBlazegraph.sh +++ b/dist/src/script/runBlazegraph.sh @@ -49,6 +49,8 @@ # Q-id of the default globe DEFAULT_GLOBE=2 +# Blazegraph HTTP User Agent for federation +USER_AGENT="Wikidata Query Service; https://query.wikidata.org/;; echo "Running Blazegraph from `pwd` on :$PORT/$CONTEXT" java -server -XX:+UseG1GC ${MEMORY} ${DEBUG} ${GC_LOGS} \ @@ -61,6 +63,7 @@ -Dcom.bigdata.rdf.sail.webapp.client.RemoteRepository.maxRequestURLLength=7168 \ -Dcom.bigdata.rdf.sail.sparql.PrefixDeclProcessor.additionalDeclsFile=$DIR/prefixes.conf \ -Dcom.bigdata.rdf.sail.webapp.client.HttpClientConfigurator=org.wikidata.query.rdf.blazegraph.ProxiedHttpConnectionFactory \ + -Dhttp.userAgent="${USER_AGENT}" \ ${BLAZEGRAPH_OPTS} \ -jar jetty-runner*.jar \ --host $HOST \ -- To view, visit https://gerrit.wikimedia.org/r/346056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: SmalyshevGerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Lydia Pintscher Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346059 ) Change subject: Update GUI .. Update GUI Change-Id: I1549407d58f4e8d6d205515ccfd655e0bbc8166d --- M gui 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/59/346059/1 diff --git a/gui b/gui index c8be52c..282867e 16 --- a/gui +++ b/gui @@ -1 +1 @@ -Subproject commit c8be52c606f5594665956bc80a562252bbe356a9 +Subproject commit 282867eb7a210a9a2393d62ed9d619b4248f95fe -- To view, visit https://gerrit.wikimedia.org/r/346059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1549407d58f4e8d6d205515ccfd655e0bbc8166d Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...cldr[wmf/1.29.0-wmf.18]: Translate Atikamekw language name in French
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346058 ) Change subject: Translate Atikamekw language name in French .. Translate Atikamekw language name in French MediaWiki recently added support for Atikamekw, but CLDR doesn't provide translation into French. Fralambert provided 'atikamekw', with the following reference: http://www.atlas-ling.ca/pdf/ATIKAMEKW_Manuel_Conversation.pdf Change-Id: I8a74c4f6c97615010d5ef403003b7e40ace5bf04 (cherry picked from commit 45d69637f107747e49c81095d0f901966fd8104b) --- A LocalNames/LocalNamesFr.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/cldr refs/changes/58/346058/1 diff --git a/LocalNames/LocalNamesFr.php b/LocalNames/LocalNamesFr.php new file mode 100644 index 000..eda59bc --- /dev/null +++ b/LocalNames/LocalNamesFr.php @@ -0,0 +1,8 @@ + 'atikamekw', + +]; -- To view, visit https://gerrit.wikimedia.org/r/346058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a74c4f6c97615010d5ef403003b7e40ace5bf04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/cldr Gerrit-Branch: wmf/1.29.0-wmf.18 Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Optimalize all not-optimalized logos
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346057 ) Change subject: Optimalize all not-optimalized logos .. Optimalize all not-optimalized logos Bug: T161999 Change-Id: I57364533267e9f88ed705d3a468979249439e127 --- M static/images/project-logos/avwiki-1.5x.png M static/images/project-logos/avwiki-2x.png M static/images/project-logos/azbwiki.png M static/images/project-logos/bswiki.png M static/images/project-logos/bswiktionary.png M static/images/project-logos/enwiktionary.png M static/images/project-logos/lrcwiki.png M static/images/project-logos/nostalgiawiki.png M static/images/project-logos/shwiktionary.png M static/images/project-logos/sqwikiquote.png M static/images/project-logos/tcywiki-1.5x.png M static/images/project-logos/tcywiki-2x.png M static/images/project-logos/tcywiki.png M static/images/project-logos/trwikimedia.png M static/images/project-logos/wikitech.png M static/images/project-logos/wuuwiki.png 16 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/57/346057/1 diff --git a/static/images/project-logos/avwiki-1.5x.png b/static/images/project-logos/avwiki-1.5x.png index d35dac4..e88496d 100644 --- a/static/images/project-logos/avwiki-1.5x.png +++ b/static/images/project-logos/avwiki-1.5x.png Binary files differ diff --git a/static/images/project-logos/avwiki-2x.png b/static/images/project-logos/avwiki-2x.png index 9c4d3dd..46fa6e6 100644 --- a/static/images/project-logos/avwiki-2x.png +++ b/static/images/project-logos/avwiki-2x.png Binary files differ diff --git a/static/images/project-logos/azbwiki.png b/static/images/project-logos/azbwiki.png index 58c0cf3..6b26c36 100644 --- a/static/images/project-logos/azbwiki.png +++ b/static/images/project-logos/azbwiki.png Binary files differ diff --git a/static/images/project-logos/bswiki.png b/static/images/project-logos/bswiki.png index 5f83247..4da6801 100644 --- a/static/images/project-logos/bswiki.png +++ b/static/images/project-logos/bswiki.png Binary files differ diff --git a/static/images/project-logos/bswiktionary.png b/static/images/project-logos/bswiktionary.png index fec6189..fb635e0 100644 --- a/static/images/project-logos/bswiktionary.png +++ b/static/images/project-logos/bswiktionary.png Binary files differ diff --git a/static/images/project-logos/enwiktionary.png b/static/images/project-logos/enwiktionary.png index 5224392..30128d0 100644 --- a/static/images/project-logos/enwiktionary.png +++ b/static/images/project-logos/enwiktionary.png Binary files differ diff --git a/static/images/project-logos/lrcwiki.png b/static/images/project-logos/lrcwiki.png index c80eec2..a6ee413 100644 --- a/static/images/project-logos/lrcwiki.png +++ b/static/images/project-logos/lrcwiki.png Binary files differ diff --git a/static/images/project-logos/nostalgiawiki.png b/static/images/project-logos/nostalgiawiki.png index 586282c..d8536b7 100644 --- a/static/images/project-logos/nostalgiawiki.png +++ b/static/images/project-logos/nostalgiawiki.png Binary files differ diff --git a/static/images/project-logos/shwiktionary.png b/static/images/project-logos/shwiktionary.png index 0fa3616..72f7595 100644 --- a/static/images/project-logos/shwiktionary.png +++ b/static/images/project-logos/shwiktionary.png Binary files differ diff --git a/static/images/project-logos/sqwikiquote.png b/static/images/project-logos/sqwikiquote.png index ef2f553..eaabf1c 100644 --- a/static/images/project-logos/sqwikiquote.png +++ b/static/images/project-logos/sqwikiquote.png Binary files differ diff --git a/static/images/project-logos/tcywiki-1.5x.png b/static/images/project-logos/tcywiki-1.5x.png index 82a7369..7a2b4ef 100644 --- a/static/images/project-logos/tcywiki-1.5x.png +++ b/static/images/project-logos/tcywiki-1.5x.png Binary files differ diff --git a/static/images/project-logos/tcywiki-2x.png b/static/images/project-logos/tcywiki-2x.png index bb91249..4d54b8b 100644 --- a/static/images/project-logos/tcywiki-2x.png +++ b/static/images/project-logos/tcywiki-2x.png Binary files differ diff --git a/static/images/project-logos/tcywiki.png b/static/images/project-logos/tcywiki.png index 6191c93..c4b6831 100644 --- a/static/images/project-logos/tcywiki.png +++ b/static/images/project-logos/tcywiki.png Binary files differ diff --git a/static/images/project-logos/trwikimedia.png b/static/images/project-logos/trwikimedia.png index 42652ae..890120c 100644 --- a/static/images/project-logos/trwikimedia.png +++ b/static/images/project-logos/trwikimedia.png Binary files differ diff --git a/static/images/project-logos/wikitech.png b/static/images/project-logos/wikitech.png index d24bc53..4ba85a3 100644 --- a/static/images/project-logos/wikitech.png +++ b/static/images/project-logos/wikitech.png Binary files differ diff --git a/static/images/project-logos/wuuwiki.png
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add User-Agent string to the Query Service federation requests.
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346056 ) Change subject: Add User-Agent string to the Query Service federation requests. .. Add User-Agent string to the Query Service federation requests. Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26 --- M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java M dist/src/script/runBlazegraph.sh 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/56/346056/1 diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java index a029aa3..e27b572 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java @@ -3,6 +3,8 @@ import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpProxy; import org.eclipse.jetty.client.ProxyConfiguration; +import org.eclipse.jetty.http.HttpField; +import org.eclipse.jetty.http.HttpHeader; import com.bigdata.rdf.sail.webapp.client.DefaultHttpClientFactory; import com.bigdata.rdf.sail.webapp.client.IHttpClientFactory; @@ -25,7 +27,10 @@ * Configuration name for proxy port. */ private static final String HTTP_PROXY_PORT = "http.proxyPort"; - +/** + * Configuration name for User agent. + */ +private static final String HTTP_USER_AGENT = "http.userAgent"; public ProxiedHttpConnectionFactory() { defaultFactory = new DefaultHttpClientFactory(); } @@ -44,6 +49,10 @@ proxy.getExcludedAddresses().add("127.0.0.1"); proxyConfig.getProxies().add(proxy); } +final String userAgent = System.getProperty(HTTP_USER_AGENT); +if (userAgent != null) { +client.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, userAgent)); +} return client; } diff --git a/dist/src/script/runBlazegraph.sh b/dist/src/script/runBlazegraph.sh index b923a15..3027837 100755 --- a/dist/src/script/runBlazegraph.sh +++ b/dist/src/script/runBlazegraph.sh @@ -49,6 +49,8 @@ # Q-id of the default globe DEFAULT_GLOBE=2 +# Blazegraph HTTP User Agent for federation +USER_AGENT="Wikidata Query Service; https://query.wikidata.org/;; echo "Running Blazegraph from `pwd` on :$PORT/$CONTEXT" java -server -XX:+UseG1GC ${MEMORY} ${DEBUG} ${GC_LOGS} \ @@ -61,6 +63,7 @@ -Dcom.bigdata.rdf.sail.webapp.client.RemoteRepository.maxRequestURLLength=7168 \ -Dcom.bigdata.rdf.sail.sparql.PrefixDeclProcessor.additionalDeclsFile=$DIR/prefixes.conf \ -Dcom.bigdata.rdf.sail.webapp.client.HttpClientConfigurator=org.wikidata.query.rdf.blazegraph.ProxiedHttpConnectionFactory \ + -Dhttp.userAgent="${USER_AGENT}" \ ${BLAZEGRAPH_OPTS} \ -jar jetty-runner*.jar \ --host $HOST \ -- To view, visit https://gerrit.wikimedia.org/r/346056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...cldr[master]: Translate Atikamekw language name in French
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345988 ) Change subject: Translate Atikamekw language name in French .. Translate Atikamekw language name in French MediaWiki recently added support for Atikamekw, but CLDR doesn't provide translation into French. Fralambert provided 'atikamekw', with the following reference: http://www.atlas-ling.ca/pdf/ATIKAMEKW_Manuel_Conversation.pdf Change-Id: I8a74c4f6c97615010d5ef403003b7e40ace5bf04 --- A LocalNames/LocalNamesFr.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/LocalNames/LocalNamesFr.php b/LocalNames/LocalNamesFr.php new file mode 100644 index 000..eda59bc --- /dev/null +++ b/LocalNames/LocalNamesFr.php @@ -0,0 +1,8 @@ + 'atikamekw', + +]; -- To view, visit https://gerrit.wikimedia.org/r/345988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a74c4f6c97615010d5ef403003b7e40ace5bf04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/cldr Gerrit-Branch: master Gerrit-Owner: DerecksonGerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Sync DB tables manually on a newsletter edit over API
01tonythomas has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346055 ) Change subject: Sync DB tables manually on a newsletter edit over API .. Sync DB tables manually on a newsletter edit over API SecondaryDataUpdates hook is implemented in the extension to keep the Newsletter content values in sync with the newsletter and its subsribers table. TODO: * Uniqueness of MainPage is not implemented for an APIEdit. Might lead to inconsistency later ? Bug: T160854 Change-Id: I2f631e336b0219958c917242078d88ec94a95ae5 --- M Newsletter.hooks.php M extension.json 2 files changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/55/346055/1 diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php index 71db636..d79cfc5 100755 --- a/Newsletter.hooks.php +++ b/Newsletter.hooks.php @@ -304,4 +304,81 @@ } return true; } + + /** +* @param Title $title Title of the page that is being edited. +* @param Content $oldContent Content object representing the page's content before the edit. +* @param bool $recursive bool indicating whether DataUpdates should trigger recursive +* updates (relevant mostly for LinksUpdate). +* @param ParserOutput $parserOutput ParserOutput representing the rendered version of the page + after the edit. +* @param &$updates: a list of DataUpdate objects, to be modified or replaced by + the hook handler. +* @return bool +*/ + public static function onSecondaryDataUpdates( Title $title, Content $oldContent = null, + $recursive = true, ParserOutput $parserOutput = null, &$updates ) { + if ( $title->inNamespace( NS_NEWSLETTER ) && $title->hasContentModel( 'NewsletterContent' ) ) { + $newsletter = Newsletter::newFromName( $title->getText() ); + if ( $newsletter ) { + $newsletterId = $newsletter->getId(); + $newsletterArticle = Article::newFromID($title->getArticleID()); + $newsletterArticleContent = $newsletterArticle->getPage()->getContent(); + + $editedDescription = $newsletterArticleContent->getDescription(); + $editedPublishersList = $newsletterArticleContent->getPublishers(); + $editedMainPage = $newsletterArticleContent->getMainPage(); + + $store = NewsletterStore::getDefaultInstance(); + + if ( $newsletter->getDescription() != $editedDescription ) { + $store->updateDescription( $newsletterId, $editedDescription ); + } + + $updatedMainPageId = Title::newFromText( $editedMainPage )->getArticleID(); + if ( $newsletter->getPageId() != $updatedMainPageId ) { + $store->updateMainPage($newsletterId, $updatedMainPageId); + } + if ( $editedPublishersList ) { + /** @var User[] $newPublishers */ + $newPublishers = array_map( 'User::newFromName', $editedPublishersList ); + + $oldPublishersIds = $newsletter->getPublishers(); + $newPublishersIds = array(); + + foreach ( $newPublishers as $user ) { + $newPublishersIds[] = $user->getId(); + } + + // Do the actual modifications now + $added = array_diff( $newPublishersIds, $oldPublishersIds ); + $removed = array_diff( $oldPublishersIds, $newPublishersIds ); + + // @todo Do this in a batch.. + foreach ( $added as $auId ) { + $store->addPublisher( $newsletter, User::newFromId( $auId ) ); + } + global $wgUser; + + if ( $added ) { + EchoEvent::create( + array( + 'type' => 'newsletter-newpublisher', + 'extra'
[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare for next development iteration
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346053 ) Change subject: [maven-release-plugin] prepare for next development iteration .. [maven-release-plugin] prepare for next development iteration closes #30 Change-Id: I501c63949c1b566f50bd5cc84e182c9ed43f4024 --- M README.md M experimental-highlighter-build-tools/pom.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 6 files changed, 8 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified DCausse: Looks good to me, approved diff --git a/README.md b/README.md index 61c9eb7..7655633 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ | Experimental Highlighter Plugin | ElasticSearch | |-|-| -| 5.2.2, master branch| 5.2.2 | +| 5.3.0, master branch| 5.3.0 | +| 5.2.2 | 5.2.2 | | 5.2.1 | 5.2.1 | | 5.2.0 | 5.2.0 | | 5.1.2 | 5.1.2 | diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml index ab1d934..9d6f159 100644 --- a/experimental-highlighter-build-tools/pom.xml +++ b/experimental-highlighter-build-tools/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-build-tools diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index e2dd712..5ab88de 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-core jar diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index 2323b89..91ed856 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-elasticsearch-plugin jar diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index 7e973e3..b986581 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-lucene jar diff --git a/pom.xml b/pom.xml index ea97808..fedf7cc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search.highlighter experimental - 5.3.0 + 5.3.1-SNAPSHOT pom @@ -41,7 +41,7 @@ https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter -experimental-5.3.0 +HEAD -- To view, visit https://gerrit.wikimedia.org/r/346053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I501c63949c1b566f50bd5cc84e182c9ed43f4024 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: DCausseGerrit-Reviewer: DCausse Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare release experimental-5.3.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346052 ) Change subject: [maven-release-plugin] prepare release experimental-5.3.0 .. [maven-release-plugin] prepare release experimental-5.3.0 Change-Id: Id91a95f29eae1697c0aa825c1efb6f448c07c431 --- M experimental-highlighter-build-tools/pom.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 5 files changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified DCausse: Looks good to me, approved diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml index 90914e2..ab1d934 100644 --- a/experimental-highlighter-build-tools/pom.xml +++ b/experimental-highlighter-build-tools/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-build-tools diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index af28969..e2dd712 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-core jar diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index aaa77b4..2323b89 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-elasticsearch-plugin jar diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index 2ea86d0..7e973e3 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-lucene jar diff --git a/pom.xml b/pom.xml index 93999c7..ea97808 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search.highlighter experimental - 5.3.0-SNAPSHOT + 5.3.0 pom @@ -41,7 +41,7 @@ https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter -HEAD +experimental-5.3.0 -- To view, visit https://gerrit.wikimedia.org/r/346052 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id91a95f29eae1697c0aa825c1efb6f448c07c431 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: DCausseGerrit-Reviewer: DCausse Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 5.3.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346051 ) Change subject: Upgrade to elastic 5.3.0 .. Upgrade to elastic 5.3.0 Change-Id: Ic2a8b29256e3f1805a343399a62f05f0ba19af15 --- M experimental-highlighter-build-tools/pom.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 5 files changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified DCausse: Looks good to me, approved diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml index 0531d75..90914e2 100644 --- a/experimental-highlighter-build-tools/pom.xml +++ b/experimental-highlighter-build-tools/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-build-tools diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index a26ec61..af28969 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-core jar diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index 1c91ce3..aaa77b4 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-elasticsearch-plugin jar diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index 7de3e96..2ea86d0 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-lucene jar diff --git a/pom.xml b/pom.xml index c7aaa6a..93999c7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search.highlighter experimental - 5.2.3-SNAPSHOT + 5.3.0-SNAPSHOT pom @@ -51,7 +51,7 @@ UTF-8 -5.2.2 +5.3.0 6.4.1 -- To view, visit https://gerrit.wikimedia.org/r/346051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2a8b29256e3f1805a343399a62f05f0ba19af15 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: DCausseGerrit-Reviewer: DCausse Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Convert $stdlogo to static/images/project-logos resources at...
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346054 ) Change subject: Convert $stdlogo to static/images/project-logos resources at Wikinews .. Convert $stdlogo to static/images/project-logos resources at Wikinews Logos should be set the same way. I've updated static resources to current version of Wiki.png and added all wikinews to IS.php Bug: T161980 Change-Id: I5862ca656bab38d04066fbc0ddfb07c7c3cb6c2a --- M static/images/project-logos/nowikinews.png M static/images/project-logos/ruwikinews.png M wmf-config/InitialiseSettings.php 3 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/54/346054/1 diff --git a/static/images/project-logos/nowikinews.png b/static/images/project-logos/nowikinews.png index c244294..32fc2a7 100644 --- a/static/images/project-logos/nowikinews.png +++ b/static/images/project-logos/nowikinews.png Binary files differ diff --git a/static/images/project-logos/ruwikinews.png b/static/images/project-logos/ruwikinews.png index 13de3fb..82db9f9 100644 --- a/static/images/project-logos/ruwikinews.png +++ b/static/images/project-logos/ruwikinews.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8501028..e135b30 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -976,22 +976,39 @@ 'zhwikibooks' => '/static/images/project-logos/zhwikibooks.png', // Wikinews + 'arwikinews' => '/static/images/project-logos/arwikinews.png', + 'bgwikinews' => '/static/images/project-logos/bgwikinews.png', 'bswikinews' => '/static/images/project-logos/bswikinews.png', 'cawikinews' => '/static/images/project-logos/cawikinews.png', + 'cswikinews' => '/static/images/project-logos/cswikinews.png', + 'dewikinews' => '/static/images/project-logos/dewikinews.png', 'elwikinews' => '/static/images/project-logos/elwikinews.png', + 'enwikinews' => '/static/images/project-logos/enwikinews.png', 'eowikinews' => '/static/images/project-logos/eowikinews.png', 'eswikinews' => '/static/images/project-logos/eswikinews.png', 'fawikinews' => '/static/images/project-logos/fawikinews.png', + 'fiwikinews' => '/static/images/project-logos/fiwikinews.png', + 'frwikinews' => '/static/images/project-logos/frwikinews.png', + 'hewikinews' => '/static/images/project-logos/hewikinews.png', 'huwikinews' => '/static/images/project-logos/huwikinews.png', + 'itwikinews' => '/static/images/project-logos/itwikinews.png', + 'jawikinews' => '/static/images/project-logos/jawikinews.png', 'kowikinews' => '/static/images/project-logos/kowikinews.png', + 'nlwikinews' => '/static/images/project-logos/nlwikinews.png', + 'nowikinews' => '/static/images/project-logos/nowikinews.png', + 'plwikinews' => '/static/images/project-logos/plwikinews.png', 'ptwikinews' => '/static/images/project-logos/ptwikinews.png', 'rowikinews' => '/static/images/project-logos/rowikinews.png', + 'ruwikinews' => '/static/images/project-logos/ruwikinews.png', 'sdwikinews' => '/static/images/project-logos/sdwikinews.png', - 'sqwikinews' => '/static/images/project-logos/sqwikinews.png', // T30114 + 'sqwikinews' => '/static/images/project-logos/sqwikinews.png', // T30114 'srwikinews' => '/static/images/project-logos/srwikinews.png', + 'svwikinews' => '/static/images/project-logos/svwikinews.png', 'tawikinews' => '/static/images/project-logos/tawikinews.png', 'thwikinews' => '/static/images/project-logos/thwikinews.png', + 'trwikinews' => '/static/images/project-logos/trwikinews.png', 'ukwikinews' => '/static/images/project-logos/ukwikinews.png', // T124778 + 'zhwikinews' => '/static/images/project-logos/zhwikinews.png', // Wikisource 'sourceswiki' => '/static/images/project-logos/sourceswiki.png', -- To view, visit https://gerrit.wikimedia.org/r/346054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5862ca656bab38d04066fbc0ddfb07c7c3cb6c2a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Use ResourceLoader::makeConfigSetScript to generate mw.confi...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346046 ) Change subject: Use ResourceLoader::makeConfigSetScript to generate mw.config.set() script .. Use ResourceLoader::makeConfigSetScript to generate mw.config.set() script Change-Id: If2ca0585c17f772567fffeab0fc32239e87d8cd7 --- M includes/ResourceLoaderULSModule.php 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ResourceLoaderULSModule.php b/includes/ResourceLoaderULSModule.php index be839f9..17330d6 100644 --- a/includes/ResourceLoaderULSModule.php +++ b/includes/ResourceLoaderULSModule.php @@ -46,9 +46,7 @@ */ public function getScript( ResourceLoaderContext $context ) { $languageCode = $context->getLanguage(); - return Xml::encodeJsCall( 'mw.config.set', [ - $this->getData( $languageCode ) - ] ); + return ResourceLoader::makeConfigSetScript( $this->getData( $languageCode ) ); } /** -- To view, visit https://gerrit.wikimedia.org/r/346046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2ca0585c17f772567fffeab0fc32239e87d8cd7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: FomafixGerrit-Reviewer: Hoo man Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare for next development iteration
DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346053 ) Change subject: [maven-release-plugin] prepare for next development iteration .. [maven-release-plugin] prepare for next development iteration closes #30 Change-Id: I501c63949c1b566f50bd5cc84e182c9ed43f4024 --- M README.md M experimental-highlighter-build-tools/pom.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 6 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/53/346053/1 diff --git a/README.md b/README.md index 61c9eb7..7655633 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ | Experimental Highlighter Plugin | ElasticSearch | |-|-| -| 5.2.2, master branch| 5.2.2 | +| 5.3.0, master branch| 5.3.0 | +| 5.2.2 | 5.2.2 | | 5.2.1 | 5.2.1 | | 5.2.0 | 5.2.0 | | 5.1.2 | 5.1.2 | diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml index ab1d934..9d6f159 100644 --- a/experimental-highlighter-build-tools/pom.xml +++ b/experimental-highlighter-build-tools/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-build-tools diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index e2dd712..5ab88de 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-core jar diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index 2323b89..91ed856 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-elasticsearch-plugin jar diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index 7e973e3..b986581 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0 +5.3.1-SNAPSHOT experimental-highlighter-lucene jar diff --git a/pom.xml b/pom.xml index ea97808..fedf7cc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search.highlighter experimental - 5.3.0 + 5.3.1-SNAPSHOT pom @@ -41,7 +41,7 @@ https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter -experimental-5.3.0 +HEAD -- To view, visit https://gerrit.wikimedia.org/r/346053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I501c63949c1b566f50bd5cc84e182c9ed43f4024 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: DCausse___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 5.3.0
DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346051 ) Change subject: Upgrade to elastic 5.3.0 .. Upgrade to elastic 5.3.0 Change-Id: Ic2a8b29256e3f1805a343399a62f05f0ba19af15 --- M experimental-highlighter-build-tools/pom.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 5 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/51/346051/1 diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml index 0531d75..90914e2 100644 --- a/experimental-highlighter-build-tools/pom.xml +++ b/experimental-highlighter-build-tools/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-build-tools diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index a26ec61..af28969 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-core jar diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index 1c91ce3..aaa77b4 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-elasticsearch-plugin jar diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index 7de3e96..2ea86d0 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.2.3-SNAPSHOT +5.3.0-SNAPSHOT experimental-highlighter-lucene jar diff --git a/pom.xml b/pom.xml index c7aaa6a..93999c7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search.highlighter experimental - 5.2.3-SNAPSHOT + 5.3.0-SNAPSHOT pom @@ -51,7 +51,7 @@ UTF-8 -5.2.2 +5.3.0 6.4.1 -- To view, visit https://gerrit.wikimedia.org/r/346051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2a8b29256e3f1805a343399a62f05f0ba19af15 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: DCausse___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare release experimental-5.3.0
DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346052 ) Change subject: [maven-release-plugin] prepare release experimental-5.3.0 .. [maven-release-plugin] prepare release experimental-5.3.0 Change-Id: Id91a95f29eae1697c0aa825c1efb6f448c07c431 --- M experimental-highlighter-build-tools/pom.xml M experimental-highlighter-core/pom.xml M experimental-highlighter-elasticsearch-plugin/pom.xml M experimental-highlighter-lucene/pom.xml M pom.xml 5 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/52/346052/1 diff --git a/experimental-highlighter-build-tools/pom.xml b/experimental-highlighter-build-tools/pom.xml index 90914e2..ab1d934 100644 --- a/experimental-highlighter-build-tools/pom.xml +++ b/experimental-highlighter-build-tools/pom.xml @@ -5,7 +5,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-build-tools diff --git a/experimental-highlighter-core/pom.xml b/experimental-highlighter-core/pom.xml index af28969..e2dd712 100644 --- a/experimental-highlighter-core/pom.xml +++ b/experimental-highlighter-core/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-core jar diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml b/experimental-highlighter-elasticsearch-plugin/pom.xml index aaa77b4..2323b89 100644 --- a/experimental-highlighter-elasticsearch-plugin/pom.xml +++ b/experimental-highlighter-elasticsearch-plugin/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-elasticsearch-plugin jar diff --git a/experimental-highlighter-lucene/pom.xml b/experimental-highlighter-lucene/pom.xml index 2ea86d0..7e973e3 100644 --- a/experimental-highlighter-lucene/pom.xml +++ b/experimental-highlighter-lucene/pom.xml @@ -3,7 +3,7 @@ org.wikimedia.search.highlighter experimental -5.3.0-SNAPSHOT +5.3.0 experimental-highlighter-lucene jar diff --git a/pom.xml b/pom.xml index 93999c7..ea97808 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search.highlighter experimental - 5.3.0-SNAPSHOT + 5.3.0 pom @@ -41,7 +41,7 @@ https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter scm:git:https://gerrit.wikimedia.org/r/search/highlighter -HEAD +experimental-5.3.0 -- To view, visit https://gerrit.wikimedia.org/r/346052 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id91a95f29eae1697c0aa825c1efb6f448c07c431 Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: DCausse___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Refactor RdfBuilder to handle properties metadata properly
Daniel Kinzler has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342537 ) Change subject: Refactor RdfBuilder to handle properties metadata properly .. Refactor RdfBuilder to handle properties metadata properly Bug: T160382 Change-Id: Iaf79a0012e691445751644a194a67b8ae14fba1e --- M repo/WikibaseRepo.entitytypes.php A repo/includes/Rdf/PropertyRdfBuilder.php M repo/includes/Rdf/RdfBuilder.php M repo/tests/phpunit/data/maintenance/dumpRdf-out.txt A repo/tests/phpunit/data/rdf/PropertyRdfBuilder/P2_all.nt A repo/tests/phpunit/data/rdf/entities/P2.json A repo/tests/phpunit/includes/Rdf/PropertyRdfBuilderTest.php 7 files changed, 333 insertions(+), 82 deletions(-) Approvals: Daniel Kinzler: Verified; Looks good to me, approved diff --git a/repo/WikibaseRepo.entitytypes.php b/repo/WikibaseRepo.entitytypes.php index 18bb53d..846885f 100644 --- a/repo/WikibaseRepo.entitytypes.php +++ b/repo/WikibaseRepo.entitytypes.php @@ -20,11 +20,14 @@ use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup; use Wikibase\LanguageFallbackChain; +use Wikibase\Rdf\PropertyRdfBuilder; +use Wikibase\Rdf\RdfVocabulary; use Wikibase\Repo\ChangeOp\Deserialization\ItemChangeOpDeserializer; use Wikibase\Repo\ChangeOp\Deserialization\PropertyChangeOpDeserializer; use Wikibase\Repo\WikibaseRepo; use Wikibase\View\EditSectionGenerator; use Wikibase\View\EntityTermsView; +use Wikimedia\Purtle\RdfWriter; return array( 'item' => array( @@ -88,5 +91,17 @@ WikibaseRepo::getDefaultInstance()->getChangeOpDeserializerFactory() ); }, + 'rdf-builder-factory-callback' => function( + $flavorFlags, + RdfVocabulary $vocabulary, + RdfWriter $writer, + $mentionedEntityTracker, + $dedupe + ) { + return new PropertyRdfBuilder( + $vocabulary, + $writer + ); + } ) ); diff --git a/repo/includes/Rdf/PropertyRdfBuilder.php b/repo/includes/Rdf/PropertyRdfBuilder.php new file mode 100644 index 000..8b2f40b --- /dev/null +++ b/repo/includes/Rdf/PropertyRdfBuilder.php @@ -0,0 +1,148 @@ + + */ +class PropertyRdfBuilder implements EntityRdfBuilder { + + /** +* @var RdfVocabulary +*/ + private $vocabulary; + + /** +* @var RdfWriter +*/ + private $writer; + + /** +* @param RdfVocabulary $vocabulary +* @param RdfWriter $writer +*/ + public function __construct( + RdfVocabulary $vocabulary, + RdfWriter $writer + ) { + $this->vocabulary = $vocabulary; + $this->writer = $writer; + } + + /** +* Write predicates linking property entity to property predicates +* @param string $id +* @param boolean $isObjectProperty Is the property data or object property? +*/ + private function writePropertyPredicates( $id, $isObjectProperty ) { + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'directClaim' )->is( RdfVocabulary::NSP_DIRECT_CLAIM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'claim' )->is( RdfVocabulary::NSP_CLAIM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementProperty' )->is( RdfVocabulary::NSP_CLAIM_STATEMENT, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementValue' )->is( RdfVocabulary::NSP_CLAIM_VALUE, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementValueNormalized' )->is( RdfVocabulary::NSP_CLAIM_VALUE_NORM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifier' )->is( RdfVocabulary::NSP_QUALIFIER, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifierValue' )->is( RdfVocabulary::NSP_QUALIFIER_VALUE, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifierValueNormalized' )->is( RdfVocabulary::NSP_QUALIFIER_VALUE_NORM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'reference' )->is( RdfVocabulary::NSP_REFERENCE, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'referenceValue' )->is( RdfVocabulary::NSP_REFERENCE_VALUE, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'referenceValueNormalized' )->is( RdfVocabulary::NSP_REFERENCE_VALUE_NORM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'novalue' )->is( RdfVocabulary::NSP_NOVALUE, $id ); + // Always object properties + $this->writer->about( RdfVocabulary::NSP_CLAIM,
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Use i18n.translate in WikidataBot.getSource
Matěj Suchánek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346050 ) Change subject: Use i18n.translate in WikidataBot.getSource .. Use i18n.translate in WikidataBot.getSource Change-Id: Ib804608e7956d0bc2a50ecaae442a1fa2d68efb6 --- M pywikibot/bot.py 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/50/346050/2 diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 1e0135a..f99972e 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -83,6 +83,7 @@ from pywikibot import backports from pywikibot import config from pywikibot import daemonize +from pywikibot import i18n from pywikibot import version from pywikibot.bot_choice import ( Option, StandardOption, NestedOption, IntegerOption, ContextOption, @@ -1124,7 +1125,6 @@ def open_webbrowser(page): """Open the web browser displaying the page and wait for input.""" -from pywikibot import i18n webbrowser.open(page.full_url()) i18n.input('pywikibot-enter-finished-browser') @@ -1700,7 +1700,6 @@ def put_current(self, *args, **kwargs): """Defining a summary if not already defined and then call original.""" if not kwargs.get('summary'): -from pywikibot import i18n if self.summary_key is None: raise ValueError('The summary_key must be set.') summary = i18n.twtranslate(self.current_page.site, self.summary_key, @@ -1901,13 +1900,14 @@ @param site: site that is the source of assertions. @type site: Site -@return: Claim +@return: pywikibot.Claim or None """ -if (site.family.name in self.source_values and -site.code in self.source_values[site.family.name]): +source = None +item = i18n.translate(site, self.source_values) +if item: source = pywikibot.Claim(self.repo, 'P143') - source.setTarget(self.source_values.get(site.family.name).get(site.code)) -return source +source.setTarget(item) +return source def run(self): """Process all pages in generator.""" -- To view, visit https://gerrit.wikimedia.org/r/346050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib804608e7956d0bc2a50ecaae442a1fa2d68efb6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: Dalba Gerrit-Reviewer: Magul Gerrit-Reviewer: Mpaa Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject EditEntity API module dependencies
Daniel Kinzler has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345324 ) Change subject: Inject EditEntity API module dependencies .. Inject EditEntity API module dependencies Bug: T161705 Change-Id: I3e575fab2ed913ade72f97dff8462f43b0d1e3b7 --- M repo/Wikibase.php M repo/includes/Api/EditEntity.php M repo/tests/phpunit/includes/Api/ApiXmlFormatTest.php 3 files changed, 57 insertions(+), 18 deletions(-) Approvals: Daniel Kinzler: Verified; Looks good to me, approved diff --git a/repo/Wikibase.php b/repo/Wikibase.php index 4fd17d3..cfb8947 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -232,7 +232,27 @@ ); } ]; - $wgAPIModules['wbeditentity'] = Wikibase\Repo\Api\EditEntity::class; + $wgAPIModules['wbeditentity'] = [ + 'class' => Wikibase\Repo\Api\EditEntity::class, + 'factory' => function ( ApiMain $mainModule, $moduleName ) { + $wikibaseRepo = Wikibase\Repo\WikibaseRepo::getDefaultInstance(); + $changeOpFactoryProvider = $wikibaseRepo->getChangeOpFactoryProvider(); + return new Wikibase\Repo\Api\EditEntity( + $mainModule, + $moduleName, + $wikibaseRepo->getTermsLanguages(), + $wikibaseRepo->getEntityRevisionLookup( 'uncached' ), + $wikibaseRepo->getEntityIdParser(), + $wikibaseRepo->getEntityFactory(), + $wikibaseRepo->getExternalFormatStatementDeserializer(), + $wikibaseRepo->getDataTypeDefinitions()->getTypeIds(), + $changeOpFactoryProvider->getFingerprintChangeOpFactory(), + $changeOpFactoryProvider->getStatementChangeOpFactory(), + $changeOpFactoryProvider->getSiteLinkChangeOpFactory(), + $wikibaseRepo->getEntityChangeOpProvider() + ); + } + ]; $wgAPIModules['wblinktitles'] = [ 'class' => Wikibase\Repo\Api\LinkTitles::class, 'factory' => function ( ApiMain $mainModule, $moduleName ) { diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php index 342cdc8..1ca8c25 100644 --- a/repo/includes/Api/EditEntity.php +++ b/repo/includes/Api/EditEntity.php @@ -93,26 +93,45 @@ * * @param ApiMain $mainModule * @param string $moduleName -* @param string $modulePrefix +* @param ContentLanguages $termsLanguages +* @param EntityRevisionLookup $revisionLookup +* @param EntityIdParser $idParser +* @param EntityFactory $entityFactory +* @param Deserializer $statementDeserializer +* @param string[] $propertyDataTypes +* @param FingerprintChangeOpFactory $termChangeOpFactory +* @param StatementChangeOpFactory $statementChangeOpFactory +* @param SiteLinkChangeOpFactory $siteLinkChangeOpFactory +* @param EntityChangeOpProvider $entityChangeOpProvider * -* @throws MWException */ - public function __construct( ApiMain $mainModule, $moduleName, $modulePrefix = '' ) { - parent::__construct( $mainModule, $moduleName, $modulePrefix ); + public function __construct( + ApiMain $mainModule, + $moduleName, + ContentLanguages $termsLanguages, + EntityRevisionLookup $revisionLookup, + EntityIdParser $idParser, + EntityFactory $entityFactory, + Deserializer $statementDeserializer, + array $propertyDataTypes, + FingerprintChangeOpFactory $termChangeOpFactory, + StatementChangeOpFactory $statementChangeOpFactory, + SiteLinkChangeOpFactory $siteLinkChangeOpFactory, + EntityChangeOpProvider $entityChangeOpProvider + ) { + parent::__construct( $mainModule, $moduleName ); - $wikibaseRepo = WikibaseRepo::getDefaultInstance(); - $this->termsLanguages = $wikibaseRepo->getTermsLanguages(); - $this->revisionLookup = $wikibaseRepo->getEntityRevisionLookup( 'uncached' ); - $this->idParser = $wikibaseRepo->getEntityIdParser(); - $this->entityFactory = $wikibaseRepo->getEntityFactory(); - $this->propertyDataTypes = $wikibaseRepo->getDataTypeDefinitions()->getTypeIds(); - $this->statementDeserializer = $wikibaseRepo->getExternalFormatStatementDeserializer(); + $this->termsLanguages = $termsLanguages; + $this->revisionLookup = $revisionLookup;
[MediaWiki-commits] [Gerrit] operations/puppet[production]: instance-info-dumper: fix config path debug change
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346049 ) Change subject: instance-info-dumper: fix config path debug change .. instance-info-dumper: fix config path debug change Change-Id: I1a4b468026d671818b4d9b56406022c5d6c9c1f7 --- M modules/role/files/labs/instance-info-dumper.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/files/labs/instance-info-dumper.py b/modules/role/files/labs/instance-info-dumper.py index adaf6ca..ebaee08 100644 --- a/modules/role/files/labs/instance-info-dumper.py +++ b/modules/role/files/labs/instance-info-dumper.py @@ -54,7 +54,7 @@ def main(): -with open('/home/andrew/instance-dumper.yaml') as f: +with open('/etc/instance-dumper.yaml') as f: config = yaml.safe_load(f) clients = mwopenstackclients.Clients(envfile='/etc/novaobserver.yaml') -- To view, visit https://gerrit.wikimedia.org/r/346049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a4b468026d671818b4d9b56406022c5d6c9c1f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew BogottGerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: instance-info-dumper: fix config path debug change
Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346049 ) Change subject: instance-info-dumper: fix config path debug change .. instance-info-dumper: fix config path debug change Change-Id: I1a4b468026d671818b4d9b56406022c5d6c9c1f7 --- M modules/role/files/labs/instance-info-dumper.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/346049/1 diff --git a/modules/role/files/labs/instance-info-dumper.py b/modules/role/files/labs/instance-info-dumper.py index adaf6ca..ebaee08 100644 --- a/modules/role/files/labs/instance-info-dumper.py +++ b/modules/role/files/labs/instance-info-dumper.py @@ -54,7 +54,7 @@ def main(): -with open('/home/andrew/instance-dumper.yaml') as f: +with open('/etc/instance-dumper.yaml') as f: config = yaml.safe_load(f) clients = mwopenstackclients.Clients(envfile='/etc/novaobserver.yaml') -- To view, visit https://gerrit.wikimedia.org/r/346049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a4b468026d671818b4d9b56406022c5d6c9c1f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: instance-info-dumper: Use mwopenstackclient rather than the...
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346048 ) Change subject: instance-info-dumper: Use mwopenstackclient rather than the nova client directly. .. instance-info-dumper: Use mwopenstackclient rather than the nova client directly. This uses keystone/nova/glance properly rather than pushing everything through the old nova api, and also uses observer creds rather than admin creds. Bug: T158650 Change-Id: I1cbd913cfe43a3c633c4946ac4b893cb72b8b2d8 --- M modules/role/files/labs/instance-info-dumper.py M modules/role/manifests/labs/instance_info_dumper.pp 2 files changed, 18 insertions(+), 23 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/files/labs/instance-info-dumper.py b/modules/role/files/labs/instance-info-dumper.py index e5593ab..adaf6ca 100644 --- a/modules/role/files/labs/instance-info-dumper.py +++ b/modules/role/files/labs/instance-info-dumper.py @@ -2,16 +2,16 @@ """ Dump info about all instances in all projects to a JSON file """ -from novaclient import client as novaclient import yaml import json import requests +import mwopenstackclients -image_name_cache = {} +all_images = None -def get_image_name(client, id): +def get_image_name(clients, id): """ Find name of an image with given id @@ -22,13 +22,16 @@ Returns name of the image, or None if it can't be found """ -if id not in image_name_cache: -try: -image_name_cache[id] = client.images.get(id).name -except novaclient.exceptions.NotFound: -image_name_cache[id] = None +global all_images -return image_name_cache[id] +if not all_images: +global_images = clients.globalimages() +all_images = {image.id: image for image in global_images} + +if id in all_images: +return all_images[id].name +else: +return None def get_enc_info(api_host, project, instance): @@ -51,12 +54,11 @@ def main(): -with open('/etc/instance-dumper.yaml') as f: +with open('/home/andrew/instance-dumper.yaml') as f: config = yaml.safe_load(f) -client = novaclient.Client("2.0", project_id='admin', **config['credentials']) - -servers = client.servers.list(search_opts={'all_tenants': 1}) +clients = mwopenstackclients.Clients(envfile='/etc/novaobserver.yaml') +servers = clients.allinstances() data = {} for s in servers: @@ -67,7 +69,7 @@ 'status': s.status, 'project': s.tenant_id, 'ips': s.networks['public'], -'image': get_image_name(client, s.image['id']), +'image': get_image_name(clients, s.image['id']), } server_info.update(get_enc_info(config['enc_host'], s.tenant_id, s.name)) if s.tenant_id in data: diff --git a/modules/role/manifests/labs/instance_info_dumper.pp b/modules/role/manifests/labs/instance_info_dumper.pp index ed27435..c0f7342 100644 --- a/modules/role/manifests/labs/instance_info_dumper.pp +++ b/modules/role/manifests/labs/instance_info_dumper.pp @@ -5,8 +5,6 @@ class role::labs::instance_info_dumper { require_package('python-requests') -$novaconfig = hiera_hash('novaconfig', {}) - file { '/usr/local/sbin/instance-info-dumper': ensure => present, source => 'puppet:///modules/role/labs/instance-info-dumper.py', @@ -16,13 +14,8 @@ } $config = { -'credentials' => { -'username' => 'novaadmin', -'api_key' => $novaconfig['ldap_user_pass'], -'auth_url' => "http://${novaconfig['controller_hostname']}:35357/v2.0", -}, -'enc_host'=> hiera('labs_puppet_master'), -'output_path' => '/srv/instance-info.yaml', +'enc_host'=> hiera('labs_puppet_master'), +'output_path' => '/srv/instance-info.yaml', } -- To view, visit https://gerrit.wikimedia.org/r/346048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cbd913cfe43a3c633c4946ac4b893cb72b8b2d8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew BogottGerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: instance-info-dumper: Use mwopenstackclient rather than the...
Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346048 ) Change subject: instance-info-dumper: Use mwopenstackclient rather than the nova client directly. .. instance-info-dumper: Use mwopenstackclient rather than the nova client directly. This uses keystone/nova/glance properly rather than pushing everything through the old nova api, and also uses observer creds rather than admin creds. Bug: T158650 Change-Id: I1cbd913cfe43a3c633c4946ac4b893cb72b8b2d8 --- M modules/role/files/labs/instance-info-dumper.py M modules/role/manifests/labs/instance_info_dumper.pp 2 files changed, 18 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/346048/1 diff --git a/modules/role/files/labs/instance-info-dumper.py b/modules/role/files/labs/instance-info-dumper.py index e5593ab..adaf6ca 100644 --- a/modules/role/files/labs/instance-info-dumper.py +++ b/modules/role/files/labs/instance-info-dumper.py @@ -2,16 +2,16 @@ """ Dump info about all instances in all projects to a JSON file """ -from novaclient import client as novaclient import yaml import json import requests +import mwopenstackclients -image_name_cache = {} +all_images = None -def get_image_name(client, id): +def get_image_name(clients, id): """ Find name of an image with given id @@ -22,13 +22,16 @@ Returns name of the image, or None if it can't be found """ -if id not in image_name_cache: -try: -image_name_cache[id] = client.images.get(id).name -except novaclient.exceptions.NotFound: -image_name_cache[id] = None +global all_images -return image_name_cache[id] +if not all_images: +global_images = clients.globalimages() +all_images = {image.id: image for image in global_images} + +if id in all_images: +return all_images[id].name +else: +return None def get_enc_info(api_host, project, instance): @@ -51,12 +54,11 @@ def main(): -with open('/etc/instance-dumper.yaml') as f: +with open('/home/andrew/instance-dumper.yaml') as f: config = yaml.safe_load(f) -client = novaclient.Client("2.0", project_id='admin', **config['credentials']) - -servers = client.servers.list(search_opts={'all_tenants': 1}) +clients = mwopenstackclients.Clients(envfile='/etc/novaobserver.yaml') +servers = clients.allinstances() data = {} for s in servers: @@ -67,7 +69,7 @@ 'status': s.status, 'project': s.tenant_id, 'ips': s.networks['public'], -'image': get_image_name(client, s.image['id']), +'image': get_image_name(clients, s.image['id']), } server_info.update(get_enc_info(config['enc_host'], s.tenant_id, s.name)) if s.tenant_id in data: diff --git a/modules/role/manifests/labs/instance_info_dumper.pp b/modules/role/manifests/labs/instance_info_dumper.pp index ed27435..c0f7342 100644 --- a/modules/role/manifests/labs/instance_info_dumper.pp +++ b/modules/role/manifests/labs/instance_info_dumper.pp @@ -5,8 +5,6 @@ class role::labs::instance_info_dumper { require_package('python-requests') -$novaconfig = hiera_hash('novaconfig', {}) - file { '/usr/local/sbin/instance-info-dumper': ensure => present, source => 'puppet:///modules/role/labs/instance-info-dumper.py', @@ -16,13 +14,8 @@ } $config = { -'credentials' => { -'username' => 'novaadmin', -'api_key' => $novaconfig['ldap_user_pass'], -'auth_url' => "http://${novaconfig['controller_hostname']}:35357/v2.0", -}, -'enc_host'=> hiera('labs_puppet_master'), -'output_path' => '/srv/instance-info.yaml', +'enc_host'=> hiera('labs_puppet_master'), +'output_path' => '/srv/instance-info.yaml', } -- To view, visit https://gerrit.wikimedia.org/r/346048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cbd913cfe43a3c633c4946ac4b893cb72b8b2d8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch from $stdlogo to static resources
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346047 ) Change subject: Switch from $stdlogo to static resources .. Switch from $stdlogo to static resources Bug: T161980 Change-Id: Ibae0decd0c8359729d2c723cbe9219e04dd72f2d --- M static/images/project-logos/elwikiversity.png M wmf-config/InitialiseSettings.php 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/47/346047/1 diff --git a/static/images/project-logos/elwikiversity.png b/static/images/project-logos/elwikiversity.png index 7cd9799..ac79ca8 100644 --- a/static/images/project-logos/elwikiversity.png +++ b/static/images/project-logos/elwikiversity.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8501028..2258db6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1048,10 +1048,21 @@ // Wikiversity 'arwikiversity' => '/static/images/project-logos/arwikiversity.png', + 'betawikiversity' => '/static/images/project-logos/betawikiversity.png', 'cswikiversity' => '/static/images/project-logos/cswikiversity.png', // T54019 + 'dewikiversity' => '/static/images/project-logos/dewikiversity.png', + 'elwikiversity' => '/static/images/project-logos/elwikiversity.png', + 'enwikiversity' => '/static/images/project-logos/enwikiversity.png', + 'eswikiversity' => '/static/images/project-logos/eswikiversity.png', + 'fiwikiversity' => '/static/images/project-logos/fiwikiversity.png', + 'frwikiversity' => '/static/images/project-logos/frwikiversity.png', + 'itwikiversity' => '/static/images/project-logos/itwikiversity.png', + 'jawikiversity' => '/static/images/project-logos/jawikiversity.png', 'kowikiversity' => '/static/images/project-logos/kowikiversity.png', + 'ptwikiversity' => '/static/images/project-logos/ptwikiversity.png', 'ruwikiversity' => '/static/images/project-logos/ruwikiversity.png', 'slwikiversity' => '/static/images/project-logos/slwikiversity.png', + 'svwikiversity' => '/static/images/project-logos/svwikiversity.png', // Wikivoyage 'elwikivoyage' => '/static/images/project-logos/elwikivoyage.png', -- To view, visit https://gerrit.wikimedia.org/r/346047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibae0decd0c8359729d2c723cbe9219e04dd72f2d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Use ResourceLoader::makeConfigSetScript to generate mw.confi...
Fomafix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346046 ) Change subject: Use ResourceLoader::makeConfigSetScript to generate mw.config.set() script .. Use ResourceLoader::makeConfigSetScript to generate mw.config.set() script Change-Id: If2ca0585c17f772567fffeab0fc32239e87d8cd7 --- M includes/ResourceLoaderULSModule.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/46/346046/1 diff --git a/includes/ResourceLoaderULSModule.php b/includes/ResourceLoaderULSModule.php index be839f9..17330d6 100644 --- a/includes/ResourceLoaderULSModule.php +++ b/includes/ResourceLoaderULSModule.php @@ -46,9 +46,7 @@ */ public function getScript( ResourceLoaderContext $context ) { $languageCode = $context->getLanguage(); - return Xml::encodeJsCall( 'mw.config.set', [ - $this->getData( $languageCode ) - ] ); + return ResourceLoader::makeConfigSetScript( $this->getData( $languageCode ) ); } /** -- To view, visit https://gerrit.wikimedia.org/r/346046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2ca0585c17f772567fffeab0fc32239e87d8cd7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Fomafix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Extract method normalize_identifier and add unit tests
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338008 ) Change subject: Extract method normalize_identifier and add unit tests .. Extract method normalize_identifier and add unit tests This extracts the method normalize_identifier from processSource, and add some unit tests for its current behaviour. It also disentangles the decoding of the identifier and that of the page name (which may be the actual reason for the error that we see in the logs). It keeps the current behaviour of not tracking images where the title fails to be decoded, in the spirit of not breaking functionality in the refactoring steps (although unit tests have not yet reproduced that behaviour). Change-Id: I407ce29dc0ea14cc3bcfe617ad4bedad3bf58aca --- M erfgoedbot/populate_image_table.py M tests/test_populate_image_table.py 2 files changed, 105 insertions(+), 19 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/erfgoedbot/populate_image_table.py b/erfgoedbot/populate_image_table.py index b2d4765..172fdcd 100644 --- a/erfgoedbot/populate_image_table.py +++ b/erfgoedbot/populate_image_table.py @@ -35,6 +35,10 @@ from database_connection import connect_to_monuments_database, connect_to_commons_database +class CannotNormalizeException(Exception): +pass + + def getSources(countrycode=u''): """Get a dictionary of sources to go harvest.""" sources = {} @@ -75,34 +79,51 @@ for catSortKey, page_title in photos: try: -monumentId = unicode(catSortKey, 'utf-8') -name = unicode(page_title, 'utf-8') -# Just want the first line -mLines = monumentId.splitlines() -monumentId = mLines[0] -# Remove leading and trailing spaces -monumentId = monumentId.strip() -# Remove leading zero's. FIXME: This should be replaced with -# underscores -monumentId = monumentId.lstrip(u'0') -# Remove leading underscors. -monumentId = monumentId.lstrip(u'_') -# All uppercase, same happens in other list -# monumentId = monumentId.upper() -image_has_geolocation = has_geolocation(page_title) -updateImage(countrycode, monumentId, name, -image_has_geolocation, conn, cursor) +monumentId = normalize_identifier(catSortKey) +except CannotNormalizeException: +pywikibot.output( +u'Could not normalize monument identifier %s (%s)' % (catSortKey, page_title)) +# We could not normalize the monument identifier: not adding to the table +continue +try: +name = unicode(page_title, 'utf-8') except UnicodeDecodeError: pywikibot.output( -u'Got unicode decode error for %s' % (monumentId,)) +u'Got unicode decode error with name %s (%s)' % (name, monumentId)) +# This results in not tracking this file. That may not be the desired behaviour. +continue # UnicodeDecodeError is a subclass of ValueError and should catch most except ValueError: -pywikibot.output(u'Got value error for %s' % (monumentId,)) +pywikibot.output( +u'Got value error with name %s (%s)' % (name, monumentId)) +continue +image_has_geolocation = has_geolocation(page_title) +updateImage(countrycode, monumentId, name, image_has_geolocation, conn, cursor) return len(photos) +def normalize_identifier(data): +try: +monumentId = unicode(data, 'utf-8') +# Just want the first line +mLines = monumentId.splitlines() +monumentId = mLines[0] +# Remove leading and trailing spaces +monumentId = monumentId.strip() +# Remove leading zero's. FIXME: This should be replaced with +# underscores +monumentId = monumentId.lstrip(u'0') +# Remove leading underscors. +monumentId = monumentId.lstrip(u'_') +# All uppercase, same happens in other list +# monumentId = monumentId.upper() +return monumentId +except (UnicodeDecodeError, TypeError) as e: +raise CannotNormalizeException(e) + + def has_geolocation(page_title): site = pywikibot.Site(u'commons', u'commons') page = pywikibot.ImagePage(site, page_title) diff --git a/tests/test_populate_image_table.py b/tests/test_populate_image_table.py index 9d39d7f..adc89ae 100644 --- a/tests/test_populate_image_table.py +++ b/tests/test_populate_image_table.py @@ -79,6 +79,24 @@ mock.call('aa', u'44', u'Example_-_02.jpg', True, None, self.mock_cursor_1)]) self.assertEquals(result, 2) +@mock.patch('erfgoedbot.populate_image_table.normalize_identifier',
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Add unittest to populate_image_table.processSource
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338007 ) Change subject: Add unittest to populate_image_table.processSource .. Add unittest to populate_image_table.processSource Change-Id: I0d077267eb92617b9ba9560f2b7f8eaa73b29d18 --- M tests/test_populate_image_table.py 1 file changed, 50 insertions(+), 1 deletion(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/test_populate_image_table.py b/tests/test_populate_image_table.py index f1d44be..9d39d7f 100644 --- a/tests/test_populate_image_table.py +++ b/tests/test_populate_image_table.py @@ -1,4 +1,7 @@ -"""Unit tests for update_database.""" +#!/usr/bin/python +# -*- coding: utf-8 -*- + +"""Unit tests for populate_image_table.""" import mock import unittest @@ -43,3 +46,49 @@ } } self.assertItemsEqual(result, expected) + + +class TestProcessSource(unittest.TestCase): + +def setUp(self): +self.country_config = { +"country": "aa", +"lang": "xx", +"commonsTemplate": "Template A", +"commonsTrackerCategory": "Tracker category A", +} +self.mock_cursor_1 = mock.Mock() +self.mock_cursor_2 = mock.Mock() +patcher = mock.patch('erfgoedbot.populate_image_table.getMonumentPhotos') +self.mock_get_monuments = patcher.start() + +self.addCleanup(patcher.stop) + +@mock.patch('erfgoedbot.populate_image_table.has_geolocation', autospec=True) +@mock.patch('erfgoedbot.populate_image_table.updateImage', autospec=True) +def test_processSource_with_two_okay_pictures(self, mock_updateImage, mock_has_geolocation): +mock_has_geolocation.return_value = True +self.mock_get_monuments.return_value = ( +(' 0044\nEXAMPLE - 01.JPG', 'Example_-_01.jpg'), +(' 0044\nEXAMPLE - 02.JPG', 'Example_-_02.jpg') +) +result = populate_image_table.processSource('aa', self.country_config, None, +self.mock_cursor_1, None, self.mock_cursor_2) +self.assertItemsEqual(mock_updateImage.mock_calls, [ +mock.call('aa', u'44', u'Example_-_01.jpg', True, None, self.mock_cursor_1), +mock.call('aa', u'44', u'Example_-_02.jpg', True, None, self.mock_cursor_1)]) +self.assertEquals(result, 2) + +@mock.patch('erfgoedbot.populate_image_table.has_geolocation', autospec=True) +@mock.patch('erfgoedbot.populate_image_table.updateImage', autospec=True) +def test_processSource_with_one_unicode_title(self, mock_updateImage, mock_has_geolocation): +mock_has_geolocation.return_value = True +self.mock_get_monuments.return_value = ( +(' 0044\nEXAMPLE - 01.JPG', '71_Cathédrale_Saint-Sauveur.JPG'), +) +result = populate_image_table.processSource('aa', self.country_config, None, +self.mock_cursor_1, None, self.mock_cursor_2) +self.assertItemsEqual(mock_updateImage.mock_calls, [ +mock.call('aa', u'44', u'71_Cath\xe9drale_Saint-Sauveur.JPG', + True, None, self.mock_cursor_1)]) +self.assertEquals(result, 1) -- To view, visit https://gerrit.wikimedia.org/r/338007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d077267eb92617b9ba9560f2b7f8eaa73b29d18 Gerrit-PatchSet: 3 Gerrit-Project: labs/tools/heritage Gerrit-Branch: master Gerrit-Owner: Jean-FrédéricGerrit-Reviewer: Jean-Frédéric Gerrit-Reviewer: Lokal Profil Gerrit-Reviewer: Multichill Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Tweak Parsoid CSS for images with borders
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346035 ) Change subject: Tweak Parsoid CSS for images with borders .. Tweak Parsoid CSS for images with borders * This fixes rendering diffs seen in visual diff testing. Change-Id: I15f469b580d5d05d764a22d88b06237ce3571b62 --- M resources/src/mediawiki.skinning/content.parsoid.less 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less index ec5b429..ee18979 100644 --- a/resources/src/mediawiki.skinning/content.parsoid.less +++ b/resources/src/mediawiki.skinning/content.parsoid.less @@ -125,13 +125,17 @@ } figure[typeof~='mw:Image/Thumb'] > *:first-child > img, -figure[typeof~='mw:Image/Frame'] > *:first-child > img, -.mw-image-border > *:first-child > img { +figure[typeof~='mw:Image/Frame'] > *:first-child > img { border: 1px solid #c8ccd1; margin: 3px; background: #fff; } +/* Same as img.thumbborder in content.css */ +.mw-image-border > *:first-child > img { + border: 1px solid #eaecf0; +} + /* Hide the caption for frameless and plain floated images */ figure[typeof~='mw:Image/Frameless'] > figcaption, figure[typeof~='mw:Image'] > figcaption { -- To view, visit https://gerrit.wikimedia.org/r/346035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15f469b580d5d05d764a22d88b06237ce3571b62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Subramanya SastryGerrit-Reviewer: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: SiteModule.php: Use ResourceLoader::makeConfigSetScript
Fomafix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346045 ) Change subject: SiteModule.php: Use ResourceLoader::makeConfigSetScript .. SiteModule.php: Use ResourceLoader::makeConfigSetScript Change-Id: Iac5147450664e5accf1413102f694352566fee20 --- M client/includes/Modules/SiteModule.php M client/tests/phpunit/includes/Modules/SiteModuleTest.php 2 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/346045/1 diff --git a/client/includes/Modules/SiteModule.php b/client/includes/Modules/SiteModule.php index e2183ab..2818909 100644 --- a/client/includes/Modules/SiteModule.php +++ b/client/includes/Modules/SiteModule.php @@ -43,11 +43,7 @@ ); } - return Xml::encodeJsCall( - 'mw.config.set', - [ 'wbCurrentSite', $currentSite ], - ResourceLoader::inDebugMode() - ); + return ResourceLoader::makeConfigSetScript( [ 'wbCurrentSite' => $currentSite ] ); } } diff --git a/client/tests/phpunit/includes/Modules/SiteModuleTest.php b/client/tests/phpunit/includes/Modules/SiteModuleTest.php index 1353eea..69e2b56 100644 --- a/client/tests/phpunit/includes/Modules/SiteModuleTest.php +++ b/client/tests/phpunit/includes/Modules/SiteModuleTest.php @@ -29,7 +29,7 @@ public function testGetScript() { $module = new SiteModule(); $script = $module->getScript( $this->getContext() ); - $this->assertStringStartsWith( 'mw.config.set("wbCurrentSite",', $script ); + $this->assertStringStartsWith( 'mw.config.set({"wbCurrentSite":', $script ); $this->assertStringEndsWith( ');', $script ); } -- To view, visit https://gerrit.wikimedia.org/r/346045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac5147450664e5accf1413102f694352566fee20 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Fomafix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Configure Babel for elwikisource
DatGuy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346044 ) Change subject: Configure Babel for elwikisource .. Configure Babel for elwikisource Per local consensus, configuring the extension 'Babel' for the Greek Wikisource. Bug: T161593 Change-Id: Ieb561172a2b7f4b18bdceded17bb3e22b6d7a29b --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/44/346044/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8501028..26dc635 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15408,6 +15408,15 @@ '5' => false, 'N' => 'User %code%-M', ], + 'elwikisource' => [ // T161593 + '0' => 'Χρήστης %code%-0', + '1' => 'Χρήστης %code%-1', + '2' => 'Χρήστης %code%-2', + '3' => 'Χρήστης %code%-3', + '4' => 'Χρήστης %code%-4', + '5' => 'Χρήστης %code%-5', + 'N' => 'Χρήστης %code%-M', + ], 'enwiki' => [ '0' => false, '1' => 'User %code%-1', @@ -16012,6 +16021,7 @@ 'checkuserwiki' => 'User %code%', 'commonswiki' => 'User %code%', 'cswikiversity' => 'Uživatel %code%', // T15530 + 'elwikisource' => 'Χρήστης %code%', //T161593 'enwiki' => 'User %code%', 'enwikibooks' => 'User %code%', 'enwiktionary' => 'User %code%', -- To view, visit https://gerrit.wikimedia.org/r/346044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb561172a2b7f4b18bdceded17bb3e22b6d7a29b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: DatGuy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Convert reference lists to 'responsive' on hewiki
DatGuy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346043 ) Change subject: Convert reference lists to 'responsive' on hewiki .. Convert reference lists to 'responsive' on hewiki Per consensus at the village pump of hewiki, enabling responsive references. Bug: T161804 Change-Id: I378e8254d52a8630e228a0694be146cb5482014b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/43/346043/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8501028..4280c7c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14602,6 +14602,7 @@ 'itwiki' => true, // T160932 'lawiki' => true, // T160844 'nowiki' => true, // T160362 + 'hewiki' => true, // T161804 'enwiktionary' => true, // T160933 ], -- To view, visit https://gerrit.wikimedia.org/r/346043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I378e8254d52a8630e228a0694be146cb5482014b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: DatGuy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-04-02T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346042 ) Change subject: New Wikidata Build - 2017-04-02T10:00:01+ .. New Wikidata Build - 2017-04-02T10:00:01+ Change-Id: I87e219d30e023ff3775c16bd135e1ba14f7da60c --- M composer.lock M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/da.json M extensions/Wikibase/repo/i18n/fr.json M extensions/Wikibase/repo/i18n/ko.json M extensions/Wikibase/repo/i18n/pl.json M extensions/Wikibase/repo/i18n/sv.json M vendor/composer/installed.json 8 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/42/346042/1 diff --git a/composer.lock b/composer.lock index c7cd143..8d702ee 100644 --- a/composer.lock +++ b/composer.lock @@ -1557,12 +1557,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -"reference": "6484e5db882e855b57da284776b9861835dca3bf" +"reference": "5fba19116d4004d850cde13ae732dcefc0c79b93" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6484e5db882e855b57da284776b9861835dca3bf;, -"reference": "6484e5db882e855b57da284776b9861835dca3bf", +"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5fba19116d4004d850cde13ae732dcefc0c79b93;, +"reference": "5fba19116d4004d850cde13ae732dcefc0c79b93", "shasum": "" }, "require": { @@ -1636,7 +1636,7 @@ "wikibaserepo", "wikidata" ], -"time": "2017-03-30 23:02:19" +"time": "2017-04-01 21:10:48" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/repo/i18n/bn.json b/extensions/Wikibase/repo/i18n/bn.json index f4d6c9c..21a0bdf 100644 --- a/extensions/Wikibase/repo/i18n/bn.json +++ b/extensions/Wikibase/repo/i18n/bn.json @@ -57,6 +57,8 @@ "wikibase-diffview-alias": "উপনাম", "wikibase-diffview-description": "বিবরণ", "wikibase-diffview-link": "সংযোগ", + "wikibase-diffview-link-name": "নাম", + "wikibase-diffview-link-badges": "ব্যাজ", "wikibase-sitelink-site-edit-placeholder": "উইকি", "wikibase-sitelink-page-edit-placeholder": "পাতা", "wikibase-alias-edit-placeholder": "উপনাম লিখুন", @@ -236,7 +238,6 @@ "wikibase-entitieswithoutlabel-legend": "লেবেল ছাড়া ভুক্তি তালিকা পান", "wikibase-entitieswithoutlabel-label-language": "ভাষার কোড:", "wikibase-entitieswithoutlabel-label-type": "ধরণ:", - "wikibase-entitieswithoutlabel-label-alltypes": "সমস্ত", "wikibase-entitieswithoutlabel-submit": "অনুসন্ধান করুন", "wikibase-entitieswithoutlabel-invalid-language": "\"$1\" বৈধ ভাষা কোড নয়।", "wikibase-entitieswithoutlabel-invalid-type": "\"$1\" কোন বৈধ সত্তা নয়।", @@ -246,6 +247,8 @@ "wikibase-entitydata-storage-error": "$1 সত্তা লোড করতে ব্যর্থ।", "wikibase-entitydata-title": "সত্তার উপাত্ত", "special-entitypage": "সত্তা পাতা", + "wikibase-entitypage-title": "সত্তার পাতা", + "wikibase-entitypage-bad-id": "অবৈধ আইডি: $1।", "special-redirectentity": "একটি সত্তা পুনঃনির্দেশ করুন", "wikibase-redirectentity-success": "$1 $2-এর দিকে পুনঃনির্দেশিত হয়েছে।", "wikibase-redirectentity-submit": "পুনঃনির্দেশ", diff --git a/extensions/Wikibase/repo/i18n/da.json b/extensions/Wikibase/repo/i18n/da.json index 890c877..ad17439 100644 --- a/extensions/Wikibase/repo/i18n/da.json +++ b/extensions/Wikibase/repo/i18n/da.json @@ -203,7 +203,6 @@ "wikibase-entitieswithoutlabel-legend": "Få en liste over entiteter uden etiket", "wikibase-entitieswithoutlabel-label-language": "Sprogkode:", "wikibase-entitieswithoutlabel-label-type": "Type:", - "wikibase-entitieswithoutlabel-label-alltypes": "alle", "wikibase-entitieswithoutlabel-submit": "Søg", "wikibase-entitieswithoutlabel-invalid-language": "\"$1\" er ikke en gyldig sprogkode.", "wikibase-entitieswithoutlabel-invalid-type": "\"$1\" er ikke en gyldig entitetstype.", diff --git a/extensions/Wikibase/repo/i18n/fr.json b/extensions/Wikibase/repo/i18n/fr.json index 81b941a..9368957 100644 --- a/extensions/Wikibase/repo/i18n/fr.json +++ b/extensions/Wikibase/repo/i18n/fr.json @@ -322,7 +322,6 @@ "wikibase-entitieswithoutlabel-legend": "Récupérer la liste des entités sans libellé", "wikibase-entitieswithoutlabel-label-language": "Code de langue :", "wikibase-entitieswithoutlabel-label-type": "Type :", -
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Drops OAI-PMH support
Tpt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346041 ) Change subject: Drops OAI-PMH support .. Drops OAI-PMH support Has nearly no usage Change-Id: I8ad1a3ac4bda865e3580caf4a2e4bb37499e3a80 --- M extension.json M includes/index/ProofreadIndexEntry.php D includes/index/ProofreadIndexValue.php D includes/index/oai/ProofreadIndexOaiError.php D includes/index/oai/ProofreadIndexOaiRecord.php D includes/index/oai/ProofreadIndexOaiSets.php D includes/index/oai/SpecialProofreadIndexOai.php D includes/index/oai/SpecialProofreadIndexOaiSchema.php D includes/index/oai/schemas/qdc.xsd 9 files changed, 0 insertions(+), 1,994 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/41/346041/1 diff --git a/extension.json b/extension.json index 33ca862..5598903 100644 --- a/extension.json +++ b/extension.json @@ -18,8 +18,6 @@ "pagequality" ], "SpecialPages": { - "ProofreadIndexOai": "SpecialProofreadIndexOai", - "ProofreadIndexOaiSchema": "SpecialProofreadIndexOaiSchema", "IndexPages": "ProofreadPages", "PagesWithoutScans": "PagesWithoutScans" }, @@ -46,18 +44,6 @@ "ProofreadPage\\FileProvider": "includes/FileProvider.php", "EditProofreadIndexPage": "includes/index/EditProofreadIndexPage.php", "ProofreadIndexEntry": "includes/index/ProofreadIndexEntry.php", - "ProofreadIndexValue": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueString": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueNumber": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValuePage": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueLangcode": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueIdentifier": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueIsbn": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueIssn": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueOclc": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueLccn": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueArc": "includes/index/ProofreadIndexValue.php", - "ProofreadIndexValueArk": "includes/index/ProofreadIndexValue.php", "ProofreadIndexPage": "includes/index/ProofreadIndexPage.php", "ProofreadIndexDbConnector": "includes/index/ProofreadIndexDbConnector.php", "ProofreadPage\\Pagination\\PaginationFactory": "includes/Pagination/PaginationFactory.php", @@ -83,11 +69,6 @@ "ProofreadPage\\Parser\\PagelistTagParser": "includes/Parser/PagelistTagParser.php", "ProofreadPage\\Parser\\PagesTagParser": "includes/Parser/PagesTagParser.php", "ProofreadPage\\Parser\\PagequalityTagParser": "includes/Parser/PagequalityTagParser.php", - "SpecialProofreadIndexOai": "includes/index/oai/SpecialProofreadIndexOai.php", - "ProofreadIndexOaiRecord": "includes/index/oai/ProofreadIndexOaiRecord.php", - "ProofreadIndexOaiSets": "includes/index/oai/ProofreadIndexOaiSets.php", - "ProofreadIndexOaiError": "includes/index/oai/ProofreadIndexOaiError.php", - "SpecialProofreadIndexOaiSchema": "includes/index/oai/SpecialProofreadIndexOaiSchema.php", "ProofreadPages": "SpecialProofreadPages.php", "PagesWithoutScans": "SpecialPagesWithoutScans.php", "ApiQueryProofread": "ApiQueryProofread.php", diff --git a/includes/index/ProofreadIndexEntry.php b/includes/index/ProofreadIndexEntry.php index a6529d4..0dfb34b 100644 --- a/includes/index/ProofreadIndexEntry.php +++ b/includes/index/ProofreadIndexEntry.php @@ -119,35 +119,6 @@ } /** -* Return typed value. If the value doesn't match the value pattern a ProofreadIndexValueString is return. -* @param string $value -* @return ProofreadIndexValue -*/ - protected function getTypedValue( $value ) { - try { - $class = ProofreadIndexValue::getIndexValueClassNameForType( $this->getType() ); - $val = new $class( $value, $this->config ); - } catch ( MWException $e ) { - $class = ProofreadIndexValue::getIndexValueClassNameForType( 'string' ); - $val = new $class( $value, $this->config ); - } - return $val; - } - - /** -* Return the values of the entry as ProofreadIndexValue and splitted with the delimiter content -*
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialRecentchanges.php: Use ResourceLoader::makeMessageSet...
Fomafix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346040 ) Change subject: SpecialRecentchanges.php: Use ResourceLoader::makeMessageSetScript .. SpecialRecentchanges.php: Use ResourceLoader::makeMessageSetScript Change-Id: Ie0c8a8e5290e966935a9765cd8cc6c781b19f759 --- M includes/specials/SpecialRecentchanges.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/40/346040/1 diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 1f88d61..ae0887d 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -78,9 +78,7 @@ $out->addHTML( ResourceLoader::makeInlineScript( - Xml::encodeJsCall( 'mw.messages.set', [ - $messages - ] ) + ResourceLoader::makeMessageSetScript( $messages ) ) ); -- To view, visit https://gerrit.wikimedia.org/r/346040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0c8a8e5290e966935a9765cd8cc6c781b19f759 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fomafix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "disable full dumps cron job for a bit"
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346039 ) Change subject: Revert "disable full dumps cron job for a bit" .. Revert "disable full dumps cron job for a bit" Back to business as usual. This reverts commit 064c36ba3246daa8769db95ed45809b455d9000a. Change-Id: Ie795377178cab816fa65fe6e49e986fd7b9539b7 --- M modules/snapshot/manifests/dumps/cron.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/snapshot/manifests/dumps/cron.pp b/modules/snapshot/manifests/dumps/cron.pp index 30bdbb8..85e109a 100644 --- a/modules/snapshot/manifests/dumps/cron.pp +++ b/modules/snapshot/manifests/dumps/cron.pp @@ -39,7 +39,7 @@ command => "/usr/local/bin/fulldumps.sh 01 14 ${runtype} full > /dev/null", minute => '05', hour=> [8, 20], -monthday=> '02-14', +monthday=> '01-14', } cron { 'partialdumps_rest': -- To view, visit https://gerrit.wikimedia.org/r/346039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie795377178cab816fa65fe6e49e986fd7b9539b7 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "disable full dumps cron job for a bit"
Hello jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/346039 to review the following change. Change subject: Revert "disable full dumps cron job for a bit" .. Revert "disable full dumps cron job for a bit" Back to business as usual. This reverts commit 064c36ba3246daa8769db95ed45809b455d9000a. Change-Id: Ie795377178cab816fa65fe6e49e986fd7b9539b7 --- M modules/snapshot/manifests/dumps/cron.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/346039/1 diff --git a/modules/snapshot/manifests/dumps/cron.pp b/modules/snapshot/manifests/dumps/cron.pp index 30bdbb8..85e109a 100644 --- a/modules/snapshot/manifests/dumps/cron.pp +++ b/modules/snapshot/manifests/dumps/cron.pp @@ -39,7 +39,7 @@ command => "/usr/local/bin/fulldumps.sh 01 14 ${runtype} full > /dev/null", minute => '05', hour=> [8, 20], -monthday=> '02-14', +monthday=> '01-14', } cron { 'partialdumps_rest': -- To view, visit https://gerrit.wikimedia.org/r/346039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie795377178cab816fa65fe6e49e986fd7b9539b7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlennGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dumps[master]: retry failed page content pieces immediately after page cont...
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345985 ) Change subject: retry failed page content pieces immediately after page content step completes .. retry failed page content pieces immediately after page content step completes This means we don't regenerate partial stubs, we just put the failed commands back in the queue and retry until success or we hit max retry limit. There are several new config settings as a result of this update. Bug: T160507 Change-Id: I7db012f3ca8670e3274d33c7ff860962a7eae8f2 --- M xmldumps-backup/defaults.conf M xmldumps-backup/dumps/CommandManagement.py M xmldumps-backup/dumps/WikiDump.py M xmldumps-backup/dumps/apijobs.py M xmldumps-backup/dumps/flowjob.py M xmldumps-backup/dumps/pagerange.py M xmldumps-backup/dumps/recombinejobs.py M xmldumps-backup/dumps/recompressjobs.py M xmldumps-backup/dumps/runner.py M xmldumps-backup/dumps/tablesjobs.py M xmldumps-backup/dumps/xmlcontentjobs.py M xmldumps-backup/dumps/xmljobs.py 12 files changed, 72 insertions(+), 50 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/xmldumps-backup/defaults.conf b/xmldumps-backup/defaults.conf index 4025b62..d17cbbb 100644 --- a/xmldumps-backup/defaults.conf +++ b/xmldumps-backup/defaults.conf @@ -62,6 +62,9 @@ pagesPerChunkAbstract=0 jobsperbatch="" revsPerJob=100 +maxRetries=0 +retryWait=30 +revsMargin=100 [otherformats] multistream=0 diff --git a/xmldumps-backup/dumps/CommandManagement.py b/xmldumps-backup/dumps/CommandManagement.py index 9b054bb..8877eca 100644 --- a/xmldumps-backup/dumps/CommandManagement.py +++ b/xmldumps-backup/dumps/CommandManagement.py @@ -173,11 +173,14 @@ return False return True -def exited_with_errors(self): +def exited_with_errors(self, stringfmt=True): if not self.exited_successfully(): # we wil return the whole pipeline I guess, they might as well # see it in the error report instead of the specific issue in the pipe. -return self.pipeline_string() +if stringfmt: +return self.pipeline_string() +else: +return self._commands return None # Checks the exit values of the individual commands in the @@ -352,12 +355,12 @@ return False return True -def exited_with_errors(self): +def exited_with_errors(self, stringfmt=True): """Return list of commands that exited with errors.""" commands = [] for pipeline in self._command_pipelines: if not pipeline.exited_successfully(): -command = pipeline.exited_with_errors() +command = pipeline.exited_with_errors(stringfmt) if command is not None: commands.append(command) return commands @@ -575,11 +578,11 @@ return False return True -def commands_with_errors(self): +def commands_with_errors(self, stringfmt=True): commands = [] for series in self._command_serieses: if not series.exited_successfully(): -commands.extend(series.exited_with_errors()) +commands.extend(series.exited_with_errors(stringfmt)) return commands def watch_output_queue(self): diff --git a/xmldumps-backup/dumps/WikiDump.py b/xmldumps-backup/dumps/WikiDump.py index 9c4801e..09d3b6a 100644 --- a/xmldumps-backup/dumps/WikiDump.py +++ b/xmldumps-backup/dumps/WikiDump.py @@ -210,6 +210,12 @@ "chunks", "checkpointTime", 1) self.revs_per_job = self.get_opt_for_proj_or_default( "chunks", "revsPerJob", 1) +self.max_retries = self.get_opt_for_proj_or_default( +"chunks", "maxRetries", 1) +self.retry_wait = self.get_opt_for_proj_or_default( +"chunks", "retryWait", 1) +self.revs_margin = self.get_opt_for_proj_or_default( +"chunks", "revsMargin", 1) if not self.conf.has_section('otherformats'): self.conf.add_section('otherformats') diff --git a/xmldumps-backup/dumps/apijobs.py b/xmldumps-backup/dumps/apijobs.py index 089a4da..341be04 100644 --- a/xmldumps-backup/dumps/apijobs.py +++ b/xmldumps-backup/dumps/apijobs.py @@ -27,17 +27,17 @@ raise BackupError("siteinfo dump %s trying to produce more than one file" % self.dumpname) output_dfname = dfnames[0] -error = self.get_siteinfo( +error, broken = self.get_siteinfo( runner.dump_dir.filename_public_path(output_dfname), runner) while error and retries < maxretries: retries = retries + 1 time.sleep(5) -error = self.get_siteinfo( +error, broken = self.get_siteinfo(
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add new config settings for en wikipedia dumps
ArielGlenn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346038 ) Change subject: add new config settings for en wikipedia dumps .. add new config settings for en wikipedia dumps retries, pregeneration of page ranges for page content jobs Change-Id: I5365dd6e9d933a3c06f47b98802c67ff697d62b4 --- M modules/snapshot/manifests/dumps/configs.pp 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/346038/1 diff --git a/modules/snapshot/manifests/dumps/configs.pp b/modules/snapshot/manifests/dumps/configs.pp index 04ee6ae..afd4ee5 100644 --- a/modules/snapshot/manifests/dumps/configs.pp +++ b/modules/snapshot/manifests/dumps/configs.pp @@ -111,6 +111,10 @@ chunksEnabled=> '1', recombineHistory => '0', checkpointTime => '720', +revsPerJob => '150', +retryWait=> '30', +maxRetries => '3', +revsMargin => '100', wikis => { enwiki => { jobsperbatch => 'xmlstubsdump=14', -- To view, visit https://gerrit.wikimedia.org/r/346038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5365dd6e9d933a3c06f47b98802c67ff697d62b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add new config settings for en wikipedia dumps
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346038 ) Change subject: add new config settings for en wikipedia dumps .. add new config settings for en wikipedia dumps retries, pregeneration of page ranges for page content jobs Change-Id: I5365dd6e9d933a3c06f47b98802c67ff697d62b4 --- M modules/snapshot/manifests/dumps/configs.pp 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/snapshot/manifests/dumps/configs.pp b/modules/snapshot/manifests/dumps/configs.pp index 04ee6ae..afd4ee5 100644 --- a/modules/snapshot/manifests/dumps/configs.pp +++ b/modules/snapshot/manifests/dumps/configs.pp @@ -111,6 +111,10 @@ chunksEnabled=> '1', recombineHistory => '0', checkpointTime => '720', +revsPerJob => '150', +retryWait=> '30', +maxRetries => '3', +revsMargin => '100', wikis => { enwiki => { jobsperbatch => 'xmlstubsdump=14', -- To view, visit https://gerrit.wikimedia.org/r/346038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5365dd6e9d933a3c06f47b98802c67ff697d62b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add new config options for dumps of big wikis
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346037 ) Change subject: add new config options for dumps of big wikis .. add new config options for dumps of big wikis we pregenerate page ranges for lists of jobs and do automatic retry of jobs that fail; the new config settings are used for this Change-Id: Ia5c7f29f41e1d5c294f2f79a1fe345da89baa8e6 --- M modules/snapshot/manifests/dumps/configs.pp M modules/snapshot/templates/dumps/wikidump.conf.erb 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/snapshot/manifests/dumps/configs.pp b/modules/snapshot/manifests/dumps/configs.pp index f169e3c..04ee6ae 100644 --- a/modules/snapshot/manifests/dumps/configs.pp +++ b/modules/snapshot/manifests/dumps/configs.pp @@ -21,6 +21,10 @@ keep => '8', chunksEnabled=> '1', recombineHistory => '0', +revsPerJob => '150', +retryWait=> '30', +maxRetries => '3', +revsMargin => '100', wikis=> { ruwiki => { pagesPerChunkHistory => '311181,1142420,1627923,3122803', diff --git a/modules/snapshot/templates/dumps/wikidump.conf.erb b/modules/snapshot/templates/dumps/wikidump.conf.erb index dc239aa..2d72cfc 100644 --- a/modules/snapshot/templates/dumps/wikidump.conf.erb +++ b/modules/snapshot/templates/dumps/wikidump.conf.erb @@ -58,6 +58,18 @@ <% if @config[@configtype].has_key?('checkpointTime') -%> checkpointTime=<%= @config[@configtype]['checkpointTime'] %> <% end -%> +<% if @config[@configtype].has_key?('revsPerJob') -%> +revsPerJob=<%= @config[@configtype]['revsPerJob'] %> +<% end -%> +<% if @config[@configtype].has_key?('retryWait') -%> +retryWait=<%= @config[@configtype]['retryWait'] %> +<% end -%> +<% if @config[@configtype].has_key?('maxRetries') -%> +maxRetries=<%= @config[@configtype]['maxRetries'] %> +<% end -%> +<% if @config[@configtype].has_key?('revsMargin') -%> +revsMargin=<%= @config[@configtype]['revsMargin'] %> +<% end -%> [otherformats] multistream=1 -- To view, visit https://gerrit.wikimedia.org/r/346037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5c7f29f41e1d5c294f2f79a1fe345da89baa8e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlennGerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add new config options for dumps of big wikis
ArielGlenn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346037 ) Change subject: add new config options for dumps of big wikis .. add new config options for dumps of big wikis we pregenerate page ranges for lists of jobs and do automatic retry of jobs that fail; the new config settings are used for this Change-Id: Ia5c7f29f41e1d5c294f2f79a1fe345da89baa8e6 --- M modules/snapshot/manifests/dumps/configs.pp M modules/snapshot/templates/dumps/wikidump.conf.erb 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/37/346037/1 diff --git a/modules/snapshot/manifests/dumps/configs.pp b/modules/snapshot/manifests/dumps/configs.pp index f169e3c..04ee6ae 100644 --- a/modules/snapshot/manifests/dumps/configs.pp +++ b/modules/snapshot/manifests/dumps/configs.pp @@ -21,6 +21,10 @@ keep => '8', chunksEnabled=> '1', recombineHistory => '0', +revsPerJob => '150', +retryWait=> '30', +maxRetries => '3', +revsMargin => '100', wikis=> { ruwiki => { pagesPerChunkHistory => '311181,1142420,1627923,3122803', diff --git a/modules/snapshot/templates/dumps/wikidump.conf.erb b/modules/snapshot/templates/dumps/wikidump.conf.erb index dc239aa..2d72cfc 100644 --- a/modules/snapshot/templates/dumps/wikidump.conf.erb +++ b/modules/snapshot/templates/dumps/wikidump.conf.erb @@ -58,6 +58,18 @@ <% if @config[@configtype].has_key?('checkpointTime') -%> checkpointTime=<%= @config[@configtype]['checkpointTime'] %> <% end -%> +<% if @config[@configtype].has_key?('revsPerJob') -%> +revsPerJob=<%= @config[@configtype]['revsPerJob'] %> +<% end -%> +<% if @config[@configtype].has_key?('retryWait') -%> +retryWait=<%= @config[@configtype]['retryWait'] %> +<% end -%> +<% if @config[@configtype].has_key?('maxRetries') -%> +maxRetries=<%= @config[@configtype]['maxRetries'] %> +<% end -%> +<% if @config[@configtype].has_key?('revsMargin') -%> +revsMargin=<%= @config[@configtype]['revsMargin'] %> +<% end -%> [otherformats] multistream=1 -- To view, visit https://gerrit.wikimedia.org/r/346037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5c7f29f41e1d5c294f2f79a1fe345da89baa8e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update jquery.uls from upstream
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346036 ) Change subject: Update jquery.uls from upstream .. Update jquery.uls from upstream * Changes: ** Added Nyungar (nys) language. ** Localization update. Change-Id: Iae72f59a28bf2ffa3946aa7da004ece56619119b --- M lib/jquery.uls/i18n/et.json M lib/jquery.uls/src/jquery.uls.data.js 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.uls/i18n/et.json b/lib/jquery.uls/i18n/et.json index ac3ef66..738a985 100644 --- a/lib/jquery.uls/i18n/et.json +++ b/lib/jquery.uls/i18n/et.json @@ -12,8 +12,9 @@ "uls-region-AS": "Aasia", "uls-region-ME": "Lähis-Ida", "uls-region-PA": "Vaikne ookean", + "uls-region-all": "Kõik keeled", "uls-no-results-found": "Tulemusi ei leitud.", - "uls-common-languages": "Eelistatavad keeled", + "uls-common-languages": "Soovitatavad keeled", "uls-no-results-suggestion-title": "Võid eelistada neid:", "uls-search-help": "Saad otsida keeli keelenimetuse, kirjanimetuse või keele ISO-koodi järgi või sirvida keeli piirkonna järgi.", "uls-search-placeholder": "Keeleotsing" diff --git a/lib/jquery.uls/src/jquery.uls.data.js b/lib/jquery.uls/src/jquery.uls.data.js index 537c21d..52108cc 100644 --- a/lib/jquery.uls/src/jquery.uls.data.js +++ b/lib/jquery.uls/src/jquery.uls.data.js @@ -3,5 +3,5 @@ 'use strict'; $.uls = $.uls || {}; //noinspection JSHint - $.uls.data = {"languages":{"aa":["Latn",["AF"],"Qafár af"],"ab":["Cyrl",["EU"],"Аҧсшәа"],"abs":["Latn",["AS"],"Bahasa Ambon"],"ace":["Latn",["AS","PA"],"Acèh"],"acf":["Latn",["AM"],"kwéyòl"],"ady":["Cyrl",["EU","ME"],"Адыгабзэ"],"ady-cyrl":["ady"],"ady-latn":["Latn",["EU","ME"],"Adygabze"],"aeb":["aeb-arab"],"aeb-arab":["Arab",["AF"],"تونسي"],"aeb-latn":["Latn",["AF"],"Tûnsî"],"af":["Latn",["AF"],"Afrikaans"],"ahr":["Deva",["AS"],"अहिराणी"],"ak":["Latn",["AF"],"Akan"],"akz":["Latn",["AM"],"Albaamo innaaɬiilka"],"aln":["Latn",["EU"],"Gegë"],"am":["Ethi",["AF"],"አማርኛ"],"an":["Latn",["EU"],"aragonés"],"ang":["Latn",["EU"],"Ænglisc"],"anp":["Deva",["AS"],"अङ्गिका"],"ar":["Arab",["ME"],"العربية"],"arc":["Syrc",["ME"],"ܐܪܡܝܐ"],"arn":["Latn",["AM"],"mapudungun"],"aro":["Latn",["AM"],"Araona"],"arq":["Arab",["AF"],"جازايرية"],"ary":["Latn",["ME"],"Maġribi"],"arz":["Arab",["ME"],"مصرى"],"as":["Beng",["AS"],"অসমীয়া"],"ase":["Sgnw",["AM"],"American sign language"],"ast":["Latn",["EU"],"asturianu"],"atj":["Latn",["AM"],"atikamekw"],"av":["Cyrl",["EU"],"авар"],"avk":["Latn",["WW"],"Kotava"],"ay":["Latn",["AM"],"Aymar aru"],"az":["az-latn"],"az-arab":["Arab",["AS","ME"],"تۆرکجه"],"az-latn":["Latn",["EU","ME"],"azərbaycanca"],"az-cyrl":["Cyrl",["EU","ME"],"азәрбајҹанҹа"],"azb":["az-arab"],"azj":["az-latn"],"ba":["Cyrl",["EU"],"башҡортса"],"ban":["Bali",["AS"],"ᬩᬲᬩᬮᬶ"],"bar":["Latn",["EU"],"Boarisch"],"bat-smg":["sgs"],"bbc-latn":["Latn",["AS"],"Batak Toba"],"bbc-batk":["Batk",["AS"],"Batak Toba"],"bbc":["Latn",["AS"],"Batak Toba"],"bcc":["Arab",["AS","ME"],"جهلسری بلوچی"],"bcl":["Latn",["AS"],"Bikol Central"],"be-tarask":["Cyrl",["EU"],"беларуская (тарашкевіца)"],"be-x-old":["be-tarask"],"be":["Cyrl",["EU"],"беларуская"],"bew":["Latn",["AS"],"Bahasa Betawi"],"bfa":["Latn",["AF"],"Bari"],"bft":["Arab",["AS"],"بلتی"],"bfq":["Taml",["AS"],"படகா"],"bg":["Cyrl",["EU"],"български"],"bgn":["Arab",["AS","ME"],"روچ کپتین بلوچی"],"bh":["bho"],"bho":["Deva",["AS"],"भोजपुरी"],"bi":["Latn",["PA"],"Bislama"],"bjn":["Latn",["AS"],"Bahasa Banjar"],"bm":["Latn",["AF"],"bamanankan"],"bn":["Beng",["AS"],"বাংলা"],"bo":["Tibt",["AS"],"བོད་ཡིག"],"bpy":["Beng",["AS"],"বিষ্ণুপ্রিয়া মণিপুরী"],"bqi":["Arab",["AS","ME"],"بختیاری"],"br":["Latn",["EU"],"brezhoneg"],"brh":["Latn",["ME","AS"],"Bráhuí"],"brx":["Deva",["AS"],"बड़ो"],"bs":["Latn",["EU"],"bosanski"],"bto":["Latn",["AS"],"Iriga Bicolano"],"bug":["Bugi",["AS"],"ᨅᨔ ᨕᨘᨁᨗ"],"bxr":["Cyrl",["AS"],"буряад"],"ca":["Latn",["EU"],"català"],"cbk-zam":["Latn",["AS"],"Chavacano de Zamboanga"],"cdo":["Latn",["AS"],"Mìng-dĕ̤ng-ngṳ̄"],"ce":["Cyrl",["EU"],"нохчийн"],"ceb":["Latn",["AS"],"Cebuano"],"ch":["Latn",["PA"],"Chamoru"],"chm":["mhr"],"cho":["Latn",["AM"],"Choctaw"],"chr":["Cher",["AM"],"ᏣᎳᎩ"],"chy":["Latn",["AM"],"Tsetsêhestâhese"],"ciw":["Latn",["AM"],"Ojibwemowin"],"cjy":["cjy-hant"],"cjy-hans":["Hans",["AS"],"晋语(简化字)"],"cjy-hant":["Hant",["AS"],"晉語"],"ckb":["Arab",["ME"],"کوردیی ناوەندی"],"cnh":["Latn",["AS"],"Lai