[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Revert "Add fkv language code to monolingual codes"
Hello Aude, WMDE-leszek, Jonas Kress (WMDE), jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/357766 to review the following change. Change subject: Revert "Add fkv language code to monolingual codes" .. Revert "Add fkv language code to monolingual codes" This reverts commit 73b6a4961cb7c168904c8ae8033457c979ac28c6. Change-Id: Id4cff1fffaa7b22877c44f9e23d0218e0f63a1c2 --- M repo/includes/WikibaseRepo.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/66/357766/1 diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php index a06720e..967768f 100644 --- a/repo/includes/WikibaseRepo.php +++ b/repo/includes/WikibaseRepo.php @@ -1864,9 +1864,6 @@ // T161983 'lag', - - // T167259 - 'fkv', ) ) ), -- To view, visit https://gerrit.wikimedia.org/r/357766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4cff1fffaa7b22877c44f9e23d0218e0f63a1c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup Gerrit-Reviewer: Aude Gerrit-Reviewer: Jonas Kress (WMDE) Gerrit-Reviewer: WMDE-leszek Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Statistics: Fix for example in API documentation
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357765 ) Change subject: Statistics: Fix for example in API documentation .. Statistics: Fix for example in API documentation Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 --- M Statistics/includes/api/BSApiStatisticsTasks.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/Statistics/includes/api/BSApiStatisticsTasks.php b/Statistics/includes/api/BSApiStatisticsTasks.php index c830a45..a47c73c 100644 --- a/Statistics/includes/api/BSApiStatisticsTasks.php +++ b/Statistics/includes/api/BSApiStatisticsTasks.php @@ -7,10 +7,10 @@ 'params' => [ 'examples' => [ [ - 'diagram' => 'Number of pages', - 'grain' => 'Year', + 'diagram' => 'BsDiagramNumberOfPages', + 'grain' => 'Y', 'from' => '01.01.2017', - 'mode' => 'List', + 'mode' => 'list', 'to' => '31.12.2017' ] ], -- To view, visit https://gerrit.wikimedia.org/r/357765 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: ItSpiderman Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Statistics: Fix for example in API documentation
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357764 ) Change subject: Statistics: Fix for example in API documentation .. Statistics: Fix for example in API documentation Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 --- M Statistics/includes/api/BSApiStatisticsTasks.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/Statistics/includes/api/BSApiStatisticsTasks.php b/Statistics/includes/api/BSApiStatisticsTasks.php index c830a45..a47c73c 100644 --- a/Statistics/includes/api/BSApiStatisticsTasks.php +++ b/Statistics/includes/api/BSApiStatisticsTasks.php @@ -7,10 +7,10 @@ 'params' => [ 'examples' => [ [ - 'diagram' => 'Number of pages', - 'grain' => 'Year', + 'diagram' => 'BsDiagramNumberOfPages', + 'grain' => 'Y', 'from' => '01.01.2017', - 'mode' => 'List', + 'mode' => 'list', 'to' => '31.12.2017' ] ], -- To view, visit https://gerrit.wikimedia.org/r/357764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: ItSpiderman Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Statistics: Fix for example in API documentation
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357765 ) Change subject: Statistics: Fix for example in API documentation .. Statistics: Fix for example in API documentation Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 --- M Statistics/includes/api/BSApiStatisticsTasks.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/65/357765/1 diff --git a/Statistics/includes/api/BSApiStatisticsTasks.php b/Statistics/includes/api/BSApiStatisticsTasks.php index c830a45..a47c73c 100644 --- a/Statistics/includes/api/BSApiStatisticsTasks.php +++ b/Statistics/includes/api/BSApiStatisticsTasks.php @@ -7,10 +7,10 @@ 'params' => [ 'examples' => [ [ - 'diagram' => 'Number of pages', - 'grain' => 'Year', + 'diagram' => 'BsDiagramNumberOfPages', + 'grain' => 'Y', 'from' => '01.01.2017', - 'mode' => 'List', + 'mode' => 'list', 'to' => '31.12.2017' ] ], -- To view, visit https://gerrit.wikimedia.org/r/357765 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: ItSpiderman ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Statistics: Fix for example in API documentation
ItSpiderman has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357764 ) Change subject: Statistics: Fix for example in API documentation .. Statistics: Fix for example in API documentation Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 --- M Statistics/includes/api/BSApiStatisticsTasks.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/64/357764/1 diff --git a/Statistics/includes/api/BSApiStatisticsTasks.php b/Statistics/includes/api/BSApiStatisticsTasks.php index c830a45..a47c73c 100644 --- a/Statistics/includes/api/BSApiStatisticsTasks.php +++ b/Statistics/includes/api/BSApiStatisticsTasks.php @@ -7,10 +7,10 @@ 'params' => [ 'examples' => [ [ - 'diagram' => 'Number of pages', - 'grain' => 'Year', + 'diagram' => 'BsDiagramNumberOfPages', + 'grain' => 'Y', 'from' => '01.01.2017', - 'mode' => 'List', + 'mode' => 'list', 'to' => '31.12.2017' ] ], -- To view, visit https://gerrit.wikimedia.org/r/357764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e831cba1184ecee0d03151cc35052e4721a92c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: ItSpiderman ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1074
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357757 ) Change subject: db-eqiad.php: Depool db1074 .. db-eqiad.php: Depool db1074 db1074 needs an alter table pool db1076 to help with API meanwhile Bug: T166205 Change-Id: I77bae4eb7a4b24610d18b391da84bdb82684708a --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index efff5cf..9784d1f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,8 +111,8 @@ 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api - 'db1074' => 300, # A2 3.6TB 512GB, api - 'db1076' => 500, # B1 3.6TB 512GB +# 'db1074' => 300, # A2 3.6TB 512GB, api #T166205 + 'db1076' => 300, # B1 3.6TB 512GB #temporary api #T166205 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ @@ -274,7 +274,7 @@ ], 'api' => [ 'db1060' => 2, - 'db1074' => 1, + 'db1076' => 1, ], 'watchlist' => [ 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/357757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77bae4eb7a4b24610d18b391da84bdb82684708a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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]: db-eqiad.php: Depool db1074
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357757 ) Change subject: db-eqiad.php: Depool db1074 .. db-eqiad.php: Depool db1074 db1074 needs an alter table pool db1076 to help with API meanwhile Bug: T166205 Change-Id: I77bae4eb7a4b24610d18b391da84bdb82684708a --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/57/357757/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index efff5cf..9784d1f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,8 +111,8 @@ 'db1021' => 0, # B1 1.4TB 64GB, vslow, dump 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api - 'db1074' => 300, # A2 3.6TB 512GB, api - 'db1076' => 500, # B1 3.6TB 512GB +# 'db1074' => 300, # A2 3.6TB 512GB, api #T166205 + 'db1076' => 300, # B1 3.6TB 512GB #temporary api #T166205 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ @@ -274,7 +274,7 @@ ], 'api' => [ 'db1060' => 2, - 'db1074' => 1, + 'db1076' => 1, ], 'watchlist' => [ 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/357757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77bae4eb7a4b24610d18b391da84bdb82684708a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1076"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357756 ) Change subject: Revert "db-eqiad.php: Depool db1076" .. Revert "db-eqiad.php: Depool db1076" This reverts commit 7db9ff659f044de7af549469756d29e3ad6e10ca. Change-Id: I8de8776511305ff5a2b85ac5b6d7afe7b758420d --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7339a5d..efff5cf 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api 'db1074' => 300, # A2 3.6TB 512GB, api -# 'db1076' => 500, # B1 3.6TB 512GB #T166205 + 'db1076' => 500, # B1 3.6TB 512GB 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ -- To view, visit https://gerrit.wikimedia.org/r/357756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8de8776511305ff5a2b85ac5b6d7afe7b758420d Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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]: Revert "db-eqiad.php: Depool db1076"
Hello Florianschmidtwelzow, jenkins-bot, Jcrespo, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/357756 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1076" .. Revert "db-eqiad.php: Depool db1076" This reverts commit 7db9ff659f044de7af549469756d29e3ad6e10ca. Change-Id: I8de8776511305ff5a2b85ac5b6d7afe7b758420d --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/56/357756/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7339a5d..efff5cf 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1036' => 1, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1060' => 1, # C2 2.8TB 96GB, api 'db1074' => 300, # A2 3.6TB 512GB, api -# 'db1076' => 500, # B1 3.6TB 512GB #T166205 + 'db1076' => 500, # B1 3.6TB 512GB 'db1090' => 500, # C3 3.6TB 512GB ], /* s3 */ 'DEFAULT' => [ -- To view, visit https://gerrit.wikimedia.org/r/357756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8de8776511305ff5a2b85ac5b6d7afe7b758420d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo 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]: Update languages_by_size
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357755 ) Change subject: Update languages_by_size .. Update languages_by_size Change-Id: Ie621a3475e2a5b62173812879c74719205160b84 --- M pywikibot/families/wikipedia_family.py M pywikibot/families/wiktionary_family.py 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/55/357755/1 diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index c17422e..310843d 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -48,22 +48,22 @@ 'lmo', 'an', 'yo', 'ne', 'gu', 'io', 'nds', 'pa', 'scn', 'bpy', 'als', 'ku', 'bar', 'kn', 'azb', 'ia', 'qu', 'ckb', 'mn', 'arz', 'bat-smg', 'wa', 'nap', 'gd', 'bug', 'yi', 'am', 'si', 'map-bms', -'or', 'fo', 'mzn', 'li', 'hsb', 'sah', 'sa', 'mai', 'vec', 'ilo', -'os', 'mrj', 'xmf', 'diq', 'hif', 'mhr', 'roa-tara', 'bh', 'eml', -'pam', 'ps', 'sd', 'nso', 'hak', 'se', 'cdo', 'mi', 'nah', 'bcl', +'or', 'fo', 'mzn', 'hsb', 'li', 'sah', 'sa', 'mai', 'vec', 'ilo', +'os', 'mrj', 'xmf', 'cdo', 'hif', 'mhr', 'roa-tara', 'bh', 'eml', +'pam', 'diq', 'ps', 'sd', 'nso', 'hak', 'se', 'mi', 'nah', 'bcl', 'nds-nl', 'gan', 'zh-classical', 'glk', 'vls', 'rue', 'wuu', 'szl', 'bo', 'vep', 'sc', 'fiu-vro', 'co', 'lrc', 'crh', 'tk', 'kv', 'km', 'csb', 'gv', 'frr', 'as', 'so', 'lad', 'zea', 'ace', 'ay', 'udm', -'myv', 'lez', 'kw', 'stq', 'ie', 'nrm', 'nv', 'pcd', 'koi', 'rm', -'mwl', 'gom', 'ug', 'lij', 'mt', 'fur', 'gn', 'dsb', 'cbk-zam', +'myv', 'lez', 'kw', 'stq', 'ie', 'nrm', 'nv', 'pcd', 'mwl', 'koi', +'rm', 'gom', 'ug', 'lij', 'mt', 'fur', 'gn', 'dsb', 'cbk-zam', 'dv', 'ang', 'ext', 'kab', 'ln', 'ksh', 'gag', 'sn', 'lo', 'frp', 'pag', 'pi', 'av', 'olo', 'xal', 'pfl', 'krc', 'haw', 'bxr', 'kaa', 'rw', 'pdc', 'pap', 'bjn', 'to', 'nov', 'kl', 'arc', 'jam', 'kbd', 'ha', 'tyv', 'tet', 'tpi', 'ki', 'ig', 'na', 'ab', 'lbe', 'roa-rup', 'jbo', 'ty', 'kg', 'mdf', 'za', 'wo', 'lg', 'bi', 'srn', -'dty', 'sm', 'zu', 'ltg', 'chr', 'tcy', 'om', 'tn', 'xh', 'chy', +'dty', 'zu', 'ltg', 'chr', 'tcy', 'sm', 'om', 'xh', 'tn', 'chy', 'tw', 'rmy', 'cu', 'tum', 'pih', 'got', 'rn', 'pnt', 'ss', 'bm', -'ch', 'ady', 'ts', 'iu', 'st', 'fj', 'ny', 'ee', 'ak', 'ks', 'ik', +'ch', 'ts', 'ady', 'iu', 'st', 'fj', 'ny', 'ee', 'ak', 'ks', 'ik', 'sg', 've', 'dz', 'ff', 'ti', 'cr', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index b8df64a..db41e4d 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -41,7 +41,7 @@ 'ar', 'jv', 'eu', 'az', 'gl', 'da', 'lo', 'br', 'uk', 'oc', 'hr', 'fj', 'tg', 'bg', 'ps', 'simple', 'cy', 'vo', 'is', 'wa', 'zh-min-nan', 'sk', 'scn', 'la', 'ast', 'he', 'af', 'tl', 'sw', -'fy', 'ky', 'nn', 'co', 'lv', 'pnb', 'mn', 'ka', 'sl', 'sq', 'nds', +'fy', 'ky', 'nn', 'lv', 'co', 'pnb', 'mn', 'ka', 'sl', 'sq', 'nds', 'nah', 'lb', 'bs', 'sa', 'kk', 'tk', 'km', 'sm', 'mk', 'hsb', 'bn', 'be', 'pa', 'ms', 'ga', 'ur', 'an', 'wo', 'vec', 'ang', 'tt', 'sd', 'gn', 'mr', 'so', 'csb', 'ug', 'gd', 'mt', 'st', 'roa-rup', 'si', -- To view, visit https://gerrit.wikimedia.org/r/357755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie621a3475e2a5b62173812879c74719205160b84 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: update diff test results
BearND has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357754 ) Change subject: Hygiene: update diff test results .. Hygiene: update diff test results As preparation for an upcoming patch, to reduce the amount of noise there. Change-Id: Idd6852e27e52678287c37d1cb44c20d748a3b3a1 (cherry picked from commit 08231a121ddef67433ecec6069cc1c4e34d4ac1d) --- M test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-intro.html M test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-text.html M test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html M test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section8-text.html M test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/lead-section0-text.html M test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section15-text.html M test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein/section8-text.html 7 files changed, 17 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps refs/changes/54/357754/1 diff --git "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-intro.html" "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-intro.html" index 0cddb26..8ed800d 100644 --- "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-intro.html" +++ "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-intro.html" @@ -1,5 +1,4 @@ Frankenstein Castle is a medieval fortification on a spur above the village of Frankenstein, Rhineland-Palatinate in the Palatinate Forest in Germany. Its name derives from the local House of Frankenstein. - - + Layout of Frankenstein Castle diff --git "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html" "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html" index 0483189..e96e436 100644 --- "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html" +++ "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-text.html" @@ -8,8 +8,7 @@ - - + Frankenstein Castle diff --git "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section15-text.html" "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section15-text.html" index 81fc55d..a200ee7 100644 --- "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section15-text.html" +++ "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section15-text.html" @@ -8,8 +8,7 @@ Further information: Help:Section and Wikipedia:Manual of Style § Article titles, headings, and sections - - + Body sections appear after the lead and table of contents (click on image for larger view). diff --git "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section8-text.html" "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section8-text.html" index 38e4910..99f445d 100644 --- "a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section8-text.html" +++ "b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/section8-text.html" @@ -22,14 +22,12 @@ Imagemap: - -http://projects.vassar.edu/1896/democrats.html"; class="plainlinks" rel="nofollow" title="1896 Democrats"> - - - - - + http://projects.vassar.edu/1896/democrats.html"; class="plainlinks" rel="nofollow" title="1896 Democrats"> + + + + diff --git "a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-section0-text.html" "b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-section0-text.html" index a2e27b6..62a993e 100644 --- "a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-section0-text.html" +++ "b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein/lead-section0-text.html" @@ -10,8 +10,7 @@ - - + Frankenstein Castle diff --git "a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Update category_redirect_templates for wikipedia Family
Xqt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357753 )
Change subject: Update category_redirect_templates for wikipedia Family
..
Update category_redirect_templates for wikipedia Family
- remove template redirects because
they are fetched by family._get_cr_templates()
- update several templates
- template for pl-wiki has been deleted on that project
Change-Id: Ic6772a77a5e3ed834622c01bc18b8f86bcb1fb9e
---
M pywikibot/families/wikipedia_family.py
1 file changed, 25 insertions(+), 94 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/53/357753/1
diff --git a/pywikibot/families/wikipedia_family.py
b/pywikibot/families/wikipedia_family.py
index c17422e..4311242 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -74,111 +74,42 @@
self.category_redirect_templates = {
'_default': (),
-'ar': (u'تحويل تصنيف',
- u'تحويلة تصنيف',
- u'Category redirect',),
+'ar': ('تحويل تصنيف',),
'arz': (u'تحويل تصنيف',),
'cs': (u'Zastaralá kategorie',),
'da': (u'Kategoriomdirigering',),
-'en': ('Category redirect',
- 'Categoryredirect',
- 'Catredirect',
- 'Cat redirect',
- 'Cat redir',
- 'Cat red',
- 'Catred',
- 'Cat move',
- 'Category Redirect',
- 'Category move',
- 'Catr',),
-'es': (u'Categoría redirigida',
- 'Category redirect',
- 'Catred',),
-'eu': (u'Kategoria redirect',),
-'fa': (u'رده بهتر',
- u'انتقال رده',),
-'fr': (u'Redirection de catégorie',),
+'en': ('Category redirect',),
+'es': ('Categoría redirigida',),
+'eu': ('Kategoria birzuzendu',),
+'fa': ('رده بهتر',),
+'fr': ('Catégorie redirigée',),
'gv': (u'Aastiurey ronney',),
-'hi': (u'श्रेणीअनुप्रेषित',
- u'Categoryredirect',),
-'hu': (u'Kat-redir',
- u'Katredir',
- u'Kat-redirekt',),
-'id': (u'Alih kategori',
- u'Alihkategori',),
+'hi': ('श्रेणी अनुप्रेषित',),
+'hu': ('Kat-redir',),
+'id': ('Alih kategori',),
'ja': (u'Category redirect',),
'ko': (u'분류 넘겨주기',),
'mk': (u'Премести категорија',),
'ml': (u'Category redirect',),
-'ms': (u'Pengalihan kategori',
- u'Categoryredirect',
- u'Category redirect',),
-'mt': (u'Redirect kategorija',),
-'no': (u'Category redirect',
- u'Kategoriomdirigering',
- u'Kategori-omdirigering',),
-'pl': (u'Przekierowanie kategorii',
- u'Category redirect',),
-'pt': ('Redirecionamento de categoria',
- 'Redirecionamento de categorias',
- 'Redirect-categoria',
- 'Redircat',
- 'Category redirect',),
-'ro': (u'Redirect categorie',
- u'Redirecționare categorie',
- u'Redirect category',
- u'Category redirect',
- u'Rc',
- u'RedCat',
- u'Redcat',
- u'Red cat',
- u'RedirCat',
- u'Seecat',),
-'ru': (u'Переименованная категория',
- u'Categoryredirect',
- u'CategoryRedirect',
- u'Category redirect',
- u'Catredirect',),
+'ms': ('Pengalihan kategori',),
+'mt': ('Rindirizzament kategorija',),
+'no': ('Kategoriomdirigering',),
+'pt': ('Redirecionamento de categoria',),
+'ro': ('Redirect categorie',),
+'ru': ('Переименованная категория',),
'sco': ('Category redirect',),
-'simple': (u'Category redirect',
- u'Categoryredirect',
- u'Catredirect',),
-'sh': (u'Prekat',
- u'Preusmeri kategoriju',
- u'Preusmjeri kategoriju',
- u'Prekategorizuj',
- u'Catred',
- u'Catredirect',
- u'Category redirect'),
-'sl': (u'Category redirect',),
-'sq': (u'Kategori e zhvendosur',
- u'Category redirect',),
-'sv': (u'Kategoriomdirigering',
- u'Omdirigering kategori',),
+'sh': ('Prekat',),
+'simple': ('Cate
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove pilimit from PageImages API calls
Jcasariego has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357752 )
Change subject: Remove pilimit from PageImages API calls
..
Remove pilimit from PageImages API calls
pilimit will no longer be necessary as a result of T153709. PageImages will
default to returning an image for up to PARAM_MAX (=50, or 500 for bots)
results rather than 1.
Bug: T166080
Change-Id: I6c6fd0ae89c2dfb48b18931811e73beec25460ff
---
M app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/52/357752/1
diff --git a/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
b/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
index c30d635..63ade86 100644
--- a/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
+++ b/app/src/main/java/org/wikipedia/pageimages/PageImagesClient.java
@@ -43,7 +43,7 @@
@NonNull Service
service,
@NonNull final
List titles,
@NonNull final
Callback cb) {
-Call> call =
service.request(TextUtils.join("|", titles), titles.size());
+Call> call =
service.request(TextUtils.join("|", titles));
call.enqueue(new
retrofit2.Callback>() {
@Override public void
onResponse(Call> call,
Response> response) {
@@ -89,7 +89,6 @@
@VisibleForTesting interface Service {
@GET("w/api.php?action=query&format=json&formatversion=2&prop=pageimages&piprop=thumbnail"
+ "&pilicense=any&pithumbsize=" +
Constants.PREFERRED_THUMB_SIZE)
-Call> request(@NonNull
@Query("titles") String titles,
- @Query("pilimit") int
piLimit);
+Call> request(@NonNull
@Query("titles") String titles);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c6fd0ae89c2dfb48b18931811e73beec25460ff
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Jcasariego
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.4]: Update Wikidata - fix warning in MwTimeIsoFormatter
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357751 )
Change subject: Update Wikidata - fix warning in MwTimeIsoFormatter
..
Update Wikidata - fix warning in MwTimeIsoFormatter
Change-Id: Ic48b18efc85cfcadb0bc46eefa97aea12b7959c5
---
M composer.json
M composer.lock
M extensions/Wikibase/lib/includes/Formatters/MwTimeIsoFormatter.php
M extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
M vendor/composer/installed.json
5 files changed, 64 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/51/357751/1
diff --git a/composer.json b/composer.json
index f463389..0721f93 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,10 @@
{
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";
+},
+{
+"type": "git",
+"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";
}
],
"require": {
@@ -70,4 +74,4 @@
"merge-dev": false
}
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 05313a5..7a6b5ff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"content-hash": "5c451e9e3fa060de04f4cc2263ebd682",
+"content-hash": "3064c3cdaaf148104ce742f361a9bb03",
"packages": [
{
"name": "composer/installers",
@@ -1473,14 +1473,8 @@
"version": "dev-wmf/1.30.0-wmf.4",
"source": {
"type": "git",
-"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "764893cc86283b0d8d90dac3d3973d3299be8de9"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/764893cc86283b0d8d90dac3d3973d3299be8de9";,
-"reference": "764893cc86283b0d8d90dac3d3973d3299be8de9",
-"shasum": ""
+"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase";,
+"reference": "5d7b5008719039907d17381a80852e77a038c1fd"
},
"require": {
"data-values/common": "^0.3.0",
@@ -1537,7 +1531,22 @@
"Wikibase\\View\\Tests\\": "view/tests/phpunit"
}
},
-"notification-url": "https://packagist.org/downloads/";,
+"scripts": {
+"fix": [
+"phpcbf"
+],
+"test": [
+"@validate --no-interaction",
+"parallel-lint . --exclude vendor",
+"@cs"
+],
+"cs": [
+"@phpcs"
+],
+"phpcs": [
+"phpcs -p -s"
+]
+},
"license": [
"GPL-2.0+"
],
@@ -1555,7 +1564,11 @@
"wikibaserepo",
"wikidata"
],
-"time": "2017-06-07T00:44:15+00:00"
+"support": {
+"issues": "https://phabricator.wikimedia.org/";,
+"irc": "irc://irc.freenode.net/wikidata"
+},
+"time": "2017-06-08 01:32:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/lib/includes/Formatters/MwTimeIsoFormatter.php
b/extensions/Wikibase/lib/includes/Formatters/MwTimeIsoFormatter.php
index cf0127d..9835595 100644
--- a/extensions/Wikibase/lib/includes/Formatters/MwTimeIsoFormatter.php
+++ b/extensions/Wikibase/lib/includes/Formatters/MwTimeIsoFormatter.php
@@ -105,8 +105,9 @@
*/
private function getDateFormat( $precision ) {
$datePreference = 'dmy';
+ $datePreferences = $this->language->getDatePreferences();
- if ( !in_array( $datePreference,
$this->language->getDatePreferences() ) ) {
+ if ( $datePreferences === false || !in_array( $datePreference,
$datePreferences ) ) {
$datePreference = 'default';
}
diff --git
a/extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
b/extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
index 35107df..dd4c40f 100644
---
a/extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
+++
b/extensions/Wikibase/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
@@ -514,6 +514,13 @@
'1000',
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Limit video transform to videos
BearND has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357750 )
Change subject: Limit video transform to videos
..
Limit video transform to videos
This is a follow-up to Ic45c0254.
Parsoid uses video tags for both video and audio files. The previous
logic did not distinguish between video and audio files and treated
them the same. This was incorrect since audio files are to be played
embedded while videos go to the Gallery.
Bug: T167183
Bug: T164522
Change-Id: Iac99237d97ccdc76141d9f9ae0b783dfcd76adf6
---
M lib/mobile-util.js
M lib/transformations/anchorPopUpMediaTransforms.js
M test/lib/transforms/app-transforms-test.js
3 files changed, 63 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/50/357750/1
diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 87c792d..2a17989 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -7,7 +7,7 @@
mUtil.CONTENT_TYPES = {
-mobileSections: { name: 'mobile-sections', version: '0.10.2' },
+mobileSections: { name: 'mobile-sections', version: '0.10.3' },
definition: { name: 'definition', version: '0.7.1' },
random: { name: 'random', version: '0.6.0' },
diff --git a/lib/transformations/anchorPopUpMediaTransforms.js
b/lib/transformations/anchorPopUpMediaTransforms.js
index 7d0250d..feb342a 100644
--- a/lib/transformations/anchorPopUpMediaTransforms.js
+++ b/lib/transformations/anchorPopUpMediaTransforms.js
@@ -12,11 +12,42 @@
'use strict';
+/**
+ * Checks if a element is an actual video.
+ * Parsoid also uses tags for audio files.
+ * @return true if real video
+ */
+function isVideo(videoElem) {
+const MAX_LEVEL = 3;
+let node = videoElem.parentNode;
+for (let level = 0; level < MAX_LEVEL; level++) {
+if (! node) {
+return false;
+}
+
+// Look for an ancestor element
+if (node.nodeType === 1
+&& node.nodeName === 'FIGURE'
+&& node.getAttribute('typeof') === 'mw:Video/Thumb') {
+return true;
+}
+
+node = node.parentNode;
+}
+
+return false;
+}
+
function fixVideoAnchor(content) {
const videoElements = content.querySelectorAll('video');
for (let i = 0; i < videoElements.length; i++) {
const videoElem = videoElements[i];
+// T167183: Only handle videos
+if (!isVideo(videoElem)) {
+continue;
+}
+
const containerLink = content.createElement('a');
containerLink.setAttribute('href',
videoElem.getAttribute('resource').replace('./', '/wiki/'));
diff --git a/test/lib/transforms/app-transforms-test.js
b/test/lib/transforms/app-transforms-test.js
index 7d25c48..d6afd84 100644
--- a/test/lib/transforms/app-transforms-test.js
+++ b/test/lib/transforms/app-transforms-test.js
@@ -7,10 +7,39 @@
const html = fs.readFileSync(`${__dirname}/../bill-clinton.html`, 'utf-8');
describe('lib:app-transforms', () => {
-it('fixVideoAnchor should apply app_media class to all video anchors', ()
=> {
+it('fixVideoAnchor should skip video tags just holding audio', () => {
+const doc = domino.createDocument(`
+
+
+https://upload.wikimedia.org/wikipedia/en/c/c4/Radiohead_-_Creep_%28sample%29.ogg";
+type='audio/ogg; codecs="vorbis"'/>
+
+`);
+a.fixVideoAnchor(doc);
+const videoThumbImgElements = doc.querySelectorAll('a.app_media');
+assert.equal(videoThumbImgElements.length, 0, 'Should not have marked
the audio file');
+});
+
+it('fixVideoAnchor should transform actual videos', () => {
+const doc = domino.createDocument(`
+
+
+https://upload.wikimedia.org/wikipedia/commons/9/96/Curiosity%27s_Seven_Minutes_of_Terror.ogv";
+type='video/ogg; codecs="theora, vorbis"' />
+
+`);
+a.fixVideoAnchor(doc);
+const videoThumbImgElements = doc.querySelectorAll('a.app_media');
+assert.equal(videoThumbImgElements.length, 0, 'Should have marked the
video file');
+});
+
+it('fixVideoAnchor should apply app_media class to video anchors', () => {
const doc = domino.createDocument(html);
a.fixVideoAnchor(doc);
const videoThumbImgElements = doc.querySelectorAll('a.app_media');
-assert.equal(videoThumbImgElements.length, 6, 'Failed to find
app_media classes');
+assert.equal(videoThumbImgElements.length, 1, 'Failed to find
app_media classes');
});
});
--
To view, visit https://gerrit.wikimedia.org/r/357750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac99237d97ccdc76141d9f9ae0b783dfcd76adf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND
_
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Limit video transform to videos
BearND has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357749 )
Change subject: Limit video transform to videos
..
Limit video transform to videos
This is a follow-up to Ic45c0254.
Parsoid uses video tags for both video and audio files. The previous
logic did not distiguish between video and audio files and treated
them the same. This was incorrect since audio files are to be played
inline while videos go to the Gallery.
Bug: T167183
Bug: T164522
Change-Id: I522be549f2878050d54072cf1dc153a3de72a179
---
M lib/transformations/anchorPopUpMediaTransforms.js
M test/lib/transforms/app-transforms-test.js
2 files changed, 62 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/49/357749/1
diff --git a/lib/transformations/anchorPopUpMediaTransforms.js
b/lib/transformations/anchorPopUpMediaTransforms.js
index 7d0250d..feb342a 100644
--- a/lib/transformations/anchorPopUpMediaTransforms.js
+++ b/lib/transformations/anchorPopUpMediaTransforms.js
@@ -12,11 +12,42 @@
'use strict';
+/**
+ * Checks if a element is an actual video.
+ * Parsoid also uses tags for audio files.
+ * @return true if real video
+ */
+function isVideo(videoElem) {
+const MAX_LEVEL = 3;
+let node = videoElem.parentNode;
+for (let level = 0; level < MAX_LEVEL; level++) {
+if (! node) {
+return false;
+}
+
+// Look for an ancestor element
+if (node.nodeType === 1
+&& node.nodeName === 'FIGURE'
+&& node.getAttribute('typeof') === 'mw:Video/Thumb') {
+return true;
+}
+
+node = node.parentNode;
+}
+
+return false;
+}
+
function fixVideoAnchor(content) {
const videoElements = content.querySelectorAll('video');
for (let i = 0; i < videoElements.length; i++) {
const videoElem = videoElements[i];
+// T167183: Only handle videos
+if (!isVideo(videoElem)) {
+continue;
+}
+
const containerLink = content.createElement('a');
containerLink.setAttribute('href',
videoElem.getAttribute('resource').replace('./', '/wiki/'));
diff --git a/test/lib/transforms/app-transforms-test.js
b/test/lib/transforms/app-transforms-test.js
index 7d25c48..d6afd84 100644
--- a/test/lib/transforms/app-transforms-test.js
+++ b/test/lib/transforms/app-transforms-test.js
@@ -7,10 +7,39 @@
const html = fs.readFileSync(`${__dirname}/../bill-clinton.html`, 'utf-8');
describe('lib:app-transforms', () => {
-it('fixVideoAnchor should apply app_media class to all video anchors', ()
=> {
+it('fixVideoAnchor should skip video tags just holding audio', () => {
+const doc = domino.createDocument(`
+
+
+https://upload.wikimedia.org/wikipedia/en/c/c4/Radiohead_-_Creep_%28sample%29.ogg";
+type='audio/ogg; codecs="vorbis"'/>
+
+`);
+a.fixVideoAnchor(doc);
+const videoThumbImgElements = doc.querySelectorAll('a.app_media');
+assert.equal(videoThumbImgElements.length, 0, 'Should not have marked
the audio file');
+});
+
+it('fixVideoAnchor should transform actual videos', () => {
+const doc = domino.createDocument(`
+
+
+https://upload.wikimedia.org/wikipedia/commons/9/96/Curiosity%27s_Seven_Minutes_of_Terror.ogv";
+type='video/ogg; codecs="theora, vorbis"' />
+
+`);
+a.fixVideoAnchor(doc);
+const videoThumbImgElements = doc.querySelectorAll('a.app_media');
+assert.equal(videoThumbImgElements.length, 0, 'Should have marked the
video file');
+});
+
+it('fixVideoAnchor should apply app_media class to video anchors', () => {
const doc = domino.createDocument(html);
a.fixVideoAnchor(doc);
const videoThumbImgElements = doc.querySelectorAll('a.app_media');
-assert.equal(videoThumbImgElements.length, 6, 'Failed to find
app_media classes');
+assert.equal(videoThumbImgElements.length, 1, 'Failed to find
app_media classes');
});
});
--
To view, visit https://gerrit.wikimedia.org/r/357749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I522be549f2878050d54072cf1dc153a3de72a179
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.30.0-wmf.4]: Fix warning in MwTimeIsoFormatter
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357747 )
Change subject: Fix warning in MwTimeIsoFormatter
..
Fix warning in MwTimeIsoFormatter
Language::getDatePreferences may return false, if date
format preferences are disabled, so we need to check
if it is an array in addition to in_array check.
$datePreferences (in the Messages*.php) file is false
for 11 languages, including Spanish (es) and Esperanto (eo).
Bug: T167360
Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
---
M lib/includes/Formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/Formatters/MwTimeIsoFormatter.php
b/lib/includes/Formatters/MwTimeIsoFormatter.php
index cf0127d..9835595 100644
--- a/lib/includes/Formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/Formatters/MwTimeIsoFormatter.php
@@ -105,8 +105,9 @@
*/
private function getDateFormat( $precision ) {
$datePreference = 'dmy';
+ $datePreferences = $this->language->getDatePreferences();
- if ( !in_array( $datePreference,
$this->language->getDatePreferences() ) ) {
+ if ( $datePreferences === false || !in_array( $datePreference,
$datePreferences ) ) {
$datePreference = 'default';
}
diff --git a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
index 35107df..dd4c40f 100644
--- a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
@@ -514,6 +514,13 @@
'1000',
'de'
),
+
+ // Spanish has no date preferences
+ array(
+ '+2017-01-16T00:00:00Z',
TimeValue::PRECISION_DAY,
+ '16 ene 2017',
+ 'es'
+ ),
);
$argLists = array();
@@ -536,6 +543,7 @@
'ar', //replaces all numbers and separators
'bo', //replaces only numbers
'de', //switches separators
+ 'es', //no date preferences
'la', //defaults to genitive month names
'or', //replaces all numbers and separators
);
--
To view, visit https://gerrit.wikimedia.org/r/357747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix possible crash when downloading image from gallery.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357742 ) Change subject: Fix possible crash when downloading image from gallery. .. Fix possible crash when downloading image from gallery. It's possible that the Gallery loads a media item with an invalid URL, in which case we should disable the menu options for downloading or sharing it. https://rink.hockeyapp.net/manage/apps/226650/app_versions/102/crash_reasons/172380347 Change-Id: I8d5123c3b6137316939db55ed2f9aab77ff0560f --- M app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Niedzielski: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java b/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java index ccb9ba4..5d2e50a 100644 --- a/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java +++ b/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java @@ -181,9 +181,9 @@ } menu.findItem(R.id.menu_gallery_visit_page).setEnabled(galleryItem != null); menu.findItem(R.id.menu_gallery_share).setEnabled(galleryItem != null -&& imageView.getDrawable() != null); +&& !TextUtils.isEmpty(galleryItem.getUrl()) && imageView.getDrawable() != null); menu.findItem(R.id.menu_gallery_save).setEnabled(galleryItem != null -&& imageView.getDrawable() != null); +&& !TextUtils.isEmpty(galleryItem.getUrl()) && imageView.getDrawable() != null); } @Override -- To view, visit https://gerrit.wikimedia.org/r/357742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d5123c3b6137316939db55ed2f9aab77ff0560f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Niedzielski 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...RevisionSlider[master]: Handle possible null $oldRev in DiffViewHeader hook handler
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357748 )
Change subject: Handle possible null $oldRev in DiffViewHeader hook handler
..
Handle possible null $oldRev in DiffViewHeader hook handler
Sometimes $oldRev can be null (e.g. not a Revision, but
maybe is a missing revision), and also not sure we can be
certain about $newRev being a Revision object.
Bug: T167359
Change-Id: I4c483d711f2ec07a918c708a473aff1b2c150cf5
---
M src/RevisionSliderHooks.php
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/48/357748/1
diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index 93dc1cb..c89b0ec 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -29,11 +29,12 @@
return self::$config;
}
- public static function onDiffViewHeader(
- DifferenceEngine $diff,
- Revision $oldRev,
- Revision $newRev
- ) {
+ public static function onDiffViewHeader( DifferenceEngine $diff,
Revision $oldRev, $newRev ) {
+ // sometimes $oldRev can be null (e.g. missing rev), and
perhaps also $newRev (T167359)
+ if ( !( $oldRev instanceof Revision ) || !( $newRev instanceof
Revision ) ) {
+ return true;
+ }
+
$config = self::getConfig();
/**
--
To view, visit https://gerrit.wikimedia.org/r/357748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c483d711f2ec07a918c708a473aff1b2c150cf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add fkv language code to monolingual codes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357745 ) Change subject: Add fkv language code to monolingual codes .. Add fkv language code to monolingual codes Bug: T167259 Change-Id: I85c2fc7a6c9bf3d6b411eef19d547a00333a2534 --- M repo/includes/WikibaseRepo.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php index 967768f..a06720e 100644 --- a/repo/includes/WikibaseRepo.php +++ b/repo/includes/WikibaseRepo.php @@ -1864,6 +1864,9 @@ // T161983 'lag', + + // T167259 + 'fkv', ) ) ), -- To view, visit https://gerrit.wikimedia.org/r/357745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85c2fc7a6c9bf3d6b411eef19d547a00333a2534 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup Gerrit-Reviewer: Aude Gerrit-Reviewer: Jonas Kress (WMDE) Gerrit-Reviewer: WMDE-leszek 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]: Prevent saving duplicate Terms in TermSqlIndex::insertTerms
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354550 )
Change subject: Prevent saving duplicate Terms in TermSqlIndex::insertTerms
..
Prevent saving duplicate Terms in TermSqlIndex::insertTerms
and debug log these cases.
Removing the IGNORE from the INSERT is safe as it had no effect
anyway (the only thing unique on that table is the PK, which
is term_row_id).
Bug: T163551
Change-Id: I75579a6176c0fffc93852803f5b644cb499d1f1e
---
M lib/includes/Store/Sql/TermSqlIndex.php
M lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
2 files changed, 76 insertions(+), 10 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, but someone else must approve
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
diff --git a/lib/includes/Store/Sql/TermSqlIndex.php
b/lib/includes/Store/Sql/TermSqlIndex.php
index 3b9df4e..7c10c41 100644
--- a/lib/includes/Store/Sql/TermSqlIndex.php
+++ b/lib/includes/Store/Sql/TermSqlIndex.php
@@ -208,16 +208,7 @@
$success = true;
foreach ( $terms as $term ) {
- $success = $dbw->insert(
- $this->tableName,
- array_merge(
- $this->getTermFields( $term ),
- $entityIdentifiers
- ),
- __METHOD__,
- array( 'IGNORE' )
- );
-
+ $success = $this->insertTerm( $entityIdentifiers,
$term, $dbw );
if ( !$success ) {
break;
}
@@ -227,6 +218,43 @@
}
/**
+* @param array $entityIdentifiers Term table fields identifying an
entity
+* @param TermIndexEntry $term
+* @param Database $dbw
+*
+* @return bool Success indicator
+*/
+ private function insertTerm( array $entityIdentifiers, TermIndexEntry
$term, Database $dbw ) {
+ $fields = array_merge(
+ $this->getTermFields( $term ),
+ $entityIdentifiers
+ );
+
+ $hasRow = (bool)$dbw->selectField(
+ $this->tableName,
+ '1',
+ // Compare all fields to insert, but term_weight (as it
is a float)
+ array_diff_key( $fields, [ 'term_weight' => 1 ] ),
+ __METHOD__
+ );
+
+ if ( $hasRow ) {
+ wfDebugLog(
+ 'TermSqlIndex-duplicate',
+ 'Attempted to insert duplicate Term into ' .
$this->tableName .
+ ' for ' .
$term->getEntityId()->getSerialization() . ': ' . implode( ', ', $fields )
+ );
+ return true;
+ }
+
+ return $dbw->insert(
+ $this->tableName,
+ $fields,
+ __METHOD__
+ );
+ }
+
+ /**
* @param EntityDocument $entity
*
* @return TermIndexEntry[]
diff --git a/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
b/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
index e0df202..be3d9dd 100644
--- a/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
+++ b/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
@@ -21,6 +21,7 @@
use Wikibase\TermSqlIndex;
use Wikibase\WikibaseSettings;
use Wikimedia\Assert\ParameterAssertionException;
+use Wikimedia\TestingAccessWrapper;
/**
* @covers Wikibase\TermSqlIndex
@@ -634,6 +635,43 @@
$this->assertSame( 'Q1112362', $row->term_full_entity_id );
}
+ public function testInsertTerms_duplicate() {
+ $item = new Item( new ItemId( 'Q1112362' ) );
+ $termEs = new TermIndexEntry( [
+ 'entityId' => $item->getId(),
+ 'termText' => 'Spanish',
+ 'termLanguage' => 'es',
+ 'termType' => 'description'
+ ] );
+ $termDe = new TermIndexEntry( [
+ 'entityId' => $item->getId(),
+ 'termText' => 'German',
+ 'termLanguage' => 'de',
+ 'termType' => 'description'
+ ] );
+
+ $termIndex = $this->getTermIndex();
+ $termIndex->setReadFullEntityIdColumn( true );
+ $termIndex = TestingAccessWrapper::newFromObject( $termIndex );
+
+ $this->assertTrue(
+ $termIndex->insertTerms(
+ $item,
+
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix warning in MwTimeIsoFormatter
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357744 )
Change subject: Fix warning in MwTimeIsoFormatter
..
Fix warning in MwTimeIsoFormatter
Language::getDatePreferences may return false, if date
format preferences are disabled, so we need to check
if it is an array in addition to in_array check.
$datePreferences (in the Messages*.php) file is false
for 11 languages, including Spanish (es) and Esperanto (eo).
Bug: T167360
Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
---
M lib/includes/Formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/Formatters/MwTimeIsoFormatter.php
b/lib/includes/Formatters/MwTimeIsoFormatter.php
index cf0127d..9835595 100644
--- a/lib/includes/Formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/Formatters/MwTimeIsoFormatter.php
@@ -105,8 +105,9 @@
*/
private function getDateFormat( $precision ) {
$datePreference = 'dmy';
+ $datePreferences = $this->language->getDatePreferences();
- if ( !in_array( $datePreference,
$this->language->getDatePreferences() ) ) {
+ if ( $datePreferences === false || !in_array( $datePreference,
$datePreferences ) ) {
$datePreference = 'default';
}
diff --git a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
index 35107df..dd4c40f 100644
--- a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
@@ -514,6 +514,13 @@
'1000',
'de'
),
+
+ // Spanish has no date preferences
+ array(
+ '+2017-01-16T00:00:00Z',
TimeValue::PRECISION_DAY,
+ '16 ene 2017',
+ 'es'
+ ),
);
$argLists = array();
@@ -536,6 +543,7 @@
'ar', //replaces all numbers and separators
'bo', //replaces only numbers
'de', //switches separators
+ 'es', //no date preferences
'la', //defaults to genitive month names
'or', //replaces all numbers and separators
);
--
To view, visit https://gerrit.wikimedia.org/r/357744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.30.0-wmf.4]: Fix warning in MwTimeIsoFormatter
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357747 )
Change subject: Fix warning in MwTimeIsoFormatter
..
Fix warning in MwTimeIsoFormatter
Language::getDatePreferences may return false, if date
format preferences are disabled, so we need to check
if it is an array in addition to in_array check.
$datePreferences (in the Messages*.php) file is false
for 11 languages, including Spanish (es) and Esperanto (eo).
Bug: T167360
Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
---
M lib/includes/Formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/47/357747/1
diff --git a/lib/includes/Formatters/MwTimeIsoFormatter.php
b/lib/includes/Formatters/MwTimeIsoFormatter.php
index cf0127d..9835595 100644
--- a/lib/includes/Formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/Formatters/MwTimeIsoFormatter.php
@@ -105,8 +105,9 @@
*/
private function getDateFormat( $precision ) {
$datePreference = 'dmy';
+ $datePreferences = $this->language->getDatePreferences();
- if ( !in_array( $datePreference,
$this->language->getDatePreferences() ) ) {
+ if ( $datePreferences === false || !in_array( $datePreference,
$datePreferences ) ) {
$datePreference = 'default';
}
diff --git a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
index 35107df..dd4c40f 100644
--- a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php
@@ -514,6 +514,13 @@
'1000',
'de'
),
+
+ // Spanish has no date preferences
+ array(
+ '+2017-01-16T00:00:00Z',
TimeValue::PRECISION_DAY,
+ '16 ene 2017',
+ 'es'
+ ),
);
$argLists = array();
@@ -536,6 +543,7 @@
'ar', //replaces all numbers and separators
'bo', //replaces only numbers
'de', //switches separators
+ 'es', //no date preferences
'la', //defaults to genitive month names
'or', //replaces all numbers and separators
);
--
To view, visit https://gerrit.wikimedia.org/r/357747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Test for T167360 (on it's own) for jenkins
Aude has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357746 ) Change subject: Test for T167360 (on it's own) for jenkins .. Test for T167360 (on it's own) for jenkins Change-Id: I38e72743c329e35640d9fe653b1072fbf16c1927 --- M lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/46/357746/1 diff --git a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php index 35107df..4eb1dd4 100644 --- a/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php +++ b/lib/tests/phpunit/Formatters/MwTimeIsoFormatterTest.php @@ -514,6 +514,13 @@ '1000', 'de' ), + + // Spanish has no date preferences + array( + '+2017-01-16T00:00:00Z', TimeValue::PRECISION_DAY, + '16 ene 2017', + 'es' + ), ); $argLists = array(); -- To view, visit https://gerrit.wikimedia.org/r/357746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38e72743c329e35640d9fe653b1072fbf16c1927 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add fkv language code to monolingual codes
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357745 ) Change subject: Add fkv language code to monolingual codes .. Add fkv language code to monolingual codes Bug: T167259 Change-Id: I85c2fc7a6c9bf3d6b411eef19d547a00333a2534 --- M repo/includes/WikibaseRepo.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/357745/1 diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php index 967768f..a06720e 100644 --- a/repo/includes/WikibaseRepo.php +++ b/repo/includes/WikibaseRepo.php @@ -1864,6 +1864,9 @@ // T161983 'lag', + + // T167259 + 'fkv', ) ) ), -- To view, visit https://gerrit.wikimedia.org/r/357745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85c2fc7a6c9bf3d6b411eef19d547a00333a2534 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Update for deprecation of OOjs UI openWindow/closeWindow pro...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357434 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
..
Update for deprecation of OOjs UI openWindow/closeWindow promise
Bug: T166729
Change-Id: I59587589afebff3995ad50290e0da76ed4d08882
---
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
1 file changed, 8 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
index ba57887..7649df7 100644
--- a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
+++ b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
@@ -131,17 +131,14 @@
var widget = this;
if ( this.confirmCancel &&
this.editorSwitcherWidget.hasBeenChanged() ) {
- mw.flow.ui.windowManager.openWindow( 'cancelconfirm' )
- .then( function ( opened ) {
- opened.then( function ( closing, data )
{
- if ( data && data.action ===
'discard' ) {
- // Remove content
- widget.setContent( '',
'wikitext' );
-
widget.unbindBeforeUnloadHandler();
- widget.emit( 'cancel' );
- }
- } );
- } );
+ mw.flow.ui.windowManager.openWindow( 'cancelconfirm'
).closed.then( function ( data ) {
+ if ( data && data.action === 'discard' ) {
+ // Remove content
+ widget.setContent( '', 'wikitext' );
+ widget.unbindBeforeUnloadHandler();
+ widget.emit( 'cancel' );
+ }
+ } );
} else {
this.unbindBeforeUnloadHandler();
this.emit( 'cancel' );
--
To view, visit https://gerrit.wikimedia.org/r/357434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59587589afebff3995ad50290e0da76ed4d08882
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: ext.proofreadpage.page.edit: Really wait for WikiEditor to l...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357655 )
Change subject: ext.proofreadpage.page.edit: Really wait for WikiEditor to load
before adding proofread tools
..
ext.proofreadpage.page.edit: Really wait for WikiEditor to load before adding
proofread tools
The previous code only really worked if 'ext.wikiEditor' loaded
before 'ext.proofreadpage.page.edit'.
If 'ext.proofreadpage.page.edit' loaded before 'ext.wikiEditor',
things would happen in the following order, resulting in proofread
tools not being added to the page:
* 'ext.proofreadpage.page.edit' is loaded and executed
* 'ext.proofreadpage.page.edit' page ready handler is registered
* 'ext.wikiEditor' is loaded and executed
* 'ext.wikiEditor' page ready handler is registered
* Page ready event happens
* 'ext.proofreadpage.page.edit' page ready handler is executed
* 'ext.wikiEditor' is already loaded, so we do not wait
* 'addToToolbar' is called, doing nothing as there is no toolbar!
* 'ext.wikiEditor' page ready handler is executed
* WikiEditor toolbar is only set up now, without proofread tools
This change rearranges the code (moving the mw.loader.using() call
outside of the page ready handler) to ensure the following order:
* 'ext.proofreadpage.page.edit' is loaded and executed
* Wait for 'ext.wikiEditor' to load
* 'ext.wikiEditor' is loaded and executed
* 'ext.wikiEditor' page ready handler is registered
* 'ext.proofreadpage.page.edit' page ready handler is registered
* Page ready event happens
* 'ext.wikiEditor' ready handler is executed
* WikiEditor toolbar is set up
* 'ext.proofreadpage.page.edit' ready handler is executed
* 'addToToolbar' is called, adding our tools to the toolbar
Or:
* 'ext.wikiEditor' is loaded and executed
* 'ext.wikiEditor' page ready handler is registered
* 'ext.proofreadpage.page.edit' is loaded and executed
* 'ext.wikiEditor' is already loaded, so we do not wait
* 'ext.proofreadpage.page.edit' page ready handler is registered
* Page ready event happens
* 'ext.wikiEditor' ready handler is executed
* WikiEditor toolbar is set up
* 'ext.proofreadpage.page.edit' ready handler is executed
* 'addToToolbar' is called, adding our tools to the toolbar
Bug: T167317
Change-Id: I9d3d1c98545e5d8153460d1fe33640c71244012c
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 33 insertions(+), 21 deletions(-)
Approvals:
Esanders: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 0c02651..fe043ee 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -2,6 +2,8 @@
'use strict';
var
+ toolbarDependencies,
+
/**
* Is the layout horizontal (ie is the scan image on top of the
edit area)
* @type {boolean}
@@ -222,31 +224,29 @@
$edit = $( '#wpTextbox1' );
if ( getBooleanUserOption( 'usebetatoolbar' ) ) {
- mw.loader.using( 'ext.wikiEditor', function () {
- $editForm.find( '.prp-page-edit-body' ).append(
$( '#wpTextbox1' ) );
- $editForm.find( '.editOptions' ).before(
$editForm.find( '.wikiEditor-ui' ) );
- $editForm.find( '.wikiEditor-ui-text' ).append(
$editForm.find( '.prp-page-container' ) );
+ // 'ext.wikiEditor' was loaded before calling this
function
+ $editForm.find( '.prp-page-edit-body' ).append( $(
'#wpTextbox1' ) );
+ $editForm.find( '.editOptions' ).before(
$editForm.find( '.wikiEditor-ui' ) );
+ $editForm.find( '.wikiEditor-ui-text' ).append(
$editForm.find( '.prp-page-container' ) );
- $edit.wikiEditor( 'addToToolbar', {
- sections: {
- 'proofreadpage-tools': {
- type: 'toolbar',
- labelMsg:
'proofreadpage-section-tools',
- groups: tools
- }
+ $edit.wikiEditor( 'addToToolbar', {
+ sections: {
+ 'proofreadpage-tools': {
+ type: 'toolbar',
+ labelMsg:
'proofreadpage-section-tools',
+ groups: tools
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix warning in MwTimeIsoFormatter
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357744 )
Change subject: Fix warning in MwTimeIsoFormatter
..
Fix warning in MwTimeIsoFormatter
Language::getDatePreferences may return false, if date
format preferences are disabled, so we need to check
if it is an array in addition to in_array check.
Bug: T167360
Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
---
M lib/includes/Formatters/MwTimeIsoFormatter.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/357744/1
diff --git a/lib/includes/Formatters/MwTimeIsoFormatter.php
b/lib/includes/Formatters/MwTimeIsoFormatter.php
index cf0127d..9835595 100644
--- a/lib/includes/Formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/Formatters/MwTimeIsoFormatter.php
@@ -105,8 +105,9 @@
*/
private function getDateFormat( $precision ) {
$datePreference = 'dmy';
+ $datePreferences = $this->language->getDatePreferences();
- if ( !in_array( $datePreference,
$this->language->getDatePreferences() ) ) {
+ if ( $datePreferences === false || !in_array( $datePreference,
$datePreferences ) ) {
$datePreference = 'default';
}
--
To view, visit https://gerrit.wikimedia.org/r/357744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcc6191c108cc8c86d335274cc51d0dc7bc1136a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.4]: Add debug logging for DB connection errors
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357743 )
Change subject: Add debug logging for DB connection errors
..
Add debug logging for DB connection errors
Bug: T167354
Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
---
M LoginNotify_body.php
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LoginNotify_body.php b/LoginNotify_body.php
index 523c1d3..6828422 100644
--- a/LoginNotify_body.php
+++ b/LoginNotify_body.php
@@ -9,6 +9,7 @@
use MediaWiki\Logger\LoggerFactory;
use Psr\Log\LoggerInterface;
use Psr\Log\LoggerAwareInterface;
+use Wikimedia\Rdbms\DBConnectionError;
/**
* Handle sending notifications on login from unknown source.
@@ -210,8 +211,15 @@
if ( $count > 10 ||
$localInfo['editCount'] < 1 ) {
break;
}
- $lb = wfGetLB( $wiki );
- $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ try {
+ $lb = wfGetLB( $wiki );
+ $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ } catch ( DBConnectionError $ex ) {
+ // FIXME: sometimes, we get
garbage wiki names (T167354)
+ wfDebugLog( 'AdHocDebug',
"Couldn't connect to database $wiki, info: "
+ . json_encode( $info )
);
+ continue;
+ }
if ( !$this->hasCheckUserTables(
$dbrLocal ) ) {
// Skip this wiki, no checkuser
table.
--
To view, visit https://gerrit.wikimedia.org/r/357743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: MaxSem
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Add debug logging for DB connection errors
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357737 )
Change subject: Add debug logging for DB connection errors
..
Add debug logging for DB connection errors
Bug: T167354
Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
---
M LoginNotify_body.php
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Kaldari: Looks good to me, approved
diff --git a/LoginNotify_body.php b/LoginNotify_body.php
index 523c1d3..6828422 100644
--- a/LoginNotify_body.php
+++ b/LoginNotify_body.php
@@ -9,6 +9,7 @@
use MediaWiki\Logger\LoggerFactory;
use Psr\Log\LoggerInterface;
use Psr\Log\LoggerAwareInterface;
+use Wikimedia\Rdbms\DBConnectionError;
/**
* Handle sending notifications on login from unknown source.
@@ -210,8 +211,15 @@
if ( $count > 10 ||
$localInfo['editCount'] < 1 ) {
break;
}
- $lb = wfGetLB( $wiki );
- $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ try {
+ $lb = wfGetLB( $wiki );
+ $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ } catch ( DBConnectionError $ex ) {
+ // FIXME: sometimes, we get
garbage wiki names (T167354)
+ wfDebugLog( 'AdHocDebug',
"Couldn't connect to database $wiki, info: "
+ . json_encode( $info )
);
+ continue;
+ }
if ( !$this->hasCheckUserTables(
$dbrLocal ) ) {
// Skip this wiki, no checkuser
table.
--
To view, visit https://gerrit.wikimedia.org/r/357737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Dbarratt
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: MusikAnimal
Gerrit-Reviewer: Samwilson
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...LoginNotify[wmf/1.30.0-wmf.4]: Add debug logging for DB connection errors
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357743 )
Change subject: Add debug logging for DB connection errors
..
Add debug logging for DB connection errors
Bug: T167354
Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
---
M LoginNotify_body.php
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/43/357743/1
diff --git a/LoginNotify_body.php b/LoginNotify_body.php
index 523c1d3..6828422 100644
--- a/LoginNotify_body.php
+++ b/LoginNotify_body.php
@@ -9,6 +9,7 @@
use MediaWiki\Logger\LoggerFactory;
use Psr\Log\LoggerInterface;
use Psr\Log\LoggerAwareInterface;
+use Wikimedia\Rdbms\DBConnectionError;
/**
* Handle sending notifications on login from unknown source.
@@ -210,8 +211,15 @@
if ( $count > 10 ||
$localInfo['editCount'] < 1 ) {
break;
}
- $lb = wfGetLB( $wiki );
- $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ try {
+ $lb = wfGetLB( $wiki );
+ $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ } catch ( DBConnectionError $ex ) {
+ // FIXME: sometimes, we get
garbage wiki names (T167354)
+ wfDebugLog( 'AdHocDebug',
"Couldn't connect to database $wiki, info: "
+ . json_encode( $info )
);
+ continue;
+ }
if ( !$this->hasCheckUserTables(
$dbrLocal ) ) {
// Skip this wiki, no checkuser
table.
--
To view, visit https://gerrit.wikimedia.org/r/357743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Horizon role
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354988 )
Change subject: Horizon role
..
Horizon role
Bare bones role to provision Horizon (OpenStack Dashboard) running on
a horizon.local.wmftest.net vhost.
Bug: T166006
Change-Id: Id353154c70cca5825f24636940668423267a1753
---
M puppet/hieradata/common.yaml
M puppet/modules/apache/manifests/mod/proxy_balancer.pp
A puppet/modules/role/manifests/horizon.pp
A puppet/modules/role/templates/horizon/apache.conf.erb
A puppet/modules/role/templates/horizon/local_settings.py.erb
A puppet/modules/uwsgi/manifests/app.pp
A puppet/modules/uwsgi/manifests/init.pp
A puppet/modules/uwsgi/templates/app.ini.erb
A puppet/modules/uwsgi/templates/systemd/uwsgi.erb
9 files changed, 1,068 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 9c10af6..7b5d21a 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -343,6 +343,9 @@
role::globalblocking::db_pass: "%{hiera('mediawiki::multiwiki::db_pass')}"
role::globalblocking::db_name: globalblocking
+role::horizon::vhost_name: "horizon%{hiera('mwv::tld')}"
+role::horizon::log_dir: /vagrant/logs
+
role::keystone::admin_password: vagrant
role::keystone::db_password: vagrant
diff --git a/puppet/modules/apache/manifests/mod/proxy_balancer.pp
b/puppet/modules/apache/manifests/mod/proxy_balancer.pp
index 34fc4ac..131c620 100644
--- a/puppet/modules/apache/manifests/mod/proxy_balancer.pp
+++ b/puppet/modules/apache/manifests/mod/proxy_balancer.pp
@@ -2,4 +2,5 @@
#
class apache::mod::proxy_balancer {
apache::mod_conf { 'proxy_balancer': }
+apache::mod_conf { 'lbmethod_byrequests': }
}
diff --git a/puppet/modules/role/manifests/horizon.pp
b/puppet/modules/role/manifests/horizon.pp
new file mode 100644
index 000..b3c7324
--- /dev/null
+++ b/puppet/modules/role/manifests/horizon.pp
@@ -0,0 +1,164 @@
+# == Class: role::horizon
+#
+# Provision an OpenStack horizon service accessible on the
+# horizon.local.wmftest.net vhost.
+#
+# [*log_dir*]
+# Directory to write log files to. Directory must already exist.
+# A 'horizon' subdirectory will be created.
+#
+# [*vhost_name*]
+# Apache vhost name. (example: 'striker.local.wmftest.net')
+class role::horizon (
+$log_dir,
+$vhost_name,
+) {
+include ::role::keystone
+include ::apache
+include ::apache::mod::uwsgi
+include ::apache::mod::headers
+include ::apache::mod::proxy
+include ::apache::mod::proxy_balancer
+include ::apache::mod::proxy_http
+
+$deploy_dir = '/usr/share/openstack-dashboard/openstack_dashboard'
+$static_dir = '/var/lib/openstack-dashboard/static'
+
+$packages = [
+ 'fonts-font-awesome',
+ 'fonts-materialdesignicons-webfont',
+ 'fonts-roboto-fontface',
+ 'libjs-angular-gettext',
+ 'libjs-angularjs',
+ 'libjs-angularjs-smart-table',
+ 'libjs-bootswatch',
+ 'libjs-d3',
+ 'libjs-jquery-cookie',
+ 'libjs-jquery-metadata',
+ 'libjs-jquery-tablesorter',
+ 'libjs-jquery-ui',
+ 'libjs-jquery.quicksearch',
+ 'libjs-jsencrypt',
+ 'libjs-lrdragndrop',
+ 'libjs-magic-search',
+ 'libjs-rickshaw',
+ 'libjs-spin.js',
+ 'libjs-term.js',
+ 'libjs-twitter-bootstrap',
+ 'libjs-twitter-bootstrap-datepicker',
+ 'openstack-dashboard',
+ 'python-ceilometerclient',
+ 'python-compressor',
+ 'python-csscompressor',
+ 'python-designate-dashboard',
+ 'python-django',
+ 'python-django-appconf',
+ 'python-django-babel',
+ 'python-django-common',
+ 'python-django-compressor',
+ 'python-django-horizon',
+ 'python-django-openstack-auth',
+ 'python-django-overextends',
+ 'python-django-pyscss',
+ 'python-heatclient',
+ 'python-keystoneclient',
+ 'python-openstack-auth',
+ 'python-pint',
+ 'python-pyscss',
+ 'python-rcssmin',
+ 'python-rjsmin',
+ 'python-xstatic',
+ 'python-xstatic-angular',
+ 'python-xstatic-angular-bootstrap',
+ 'python-xstatic-angular-gettext',
+ 'python-xstatic-angular-lrdragndrop',
+ 'python-xstatic-bootstrap-datepicker',
+ 'python-xstatic-bootstrap-scss',
+ 'python-xstatic-bootswatch',
+ 'python-xstatic-d3',
+ 'python-xstatic-font-awesome',
+ 'python-xstatic-hogan',
+ 'python-xstatic-jasmine',
+ 'python-xstatic-jquery',
+ 'python-xstatic-jquery-migrate',
+ 'python-xstatic-jquery-ui',
+ 'python-xstatic-jquery.quicksearch',
+ 'python-xstatic-jquery.tablesorter',
+ 'python-xstatic-jsencrypt',
+ 'python-xstatic-magic-search',
+ 'python-xstatic-mdi',
+ 'python-xstatic-rickshaw',
+ 'python-xstatic-roboto-fontface',
+ 'python-xstati
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: packager: fix sub-shell issue in debian containers
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357740 )
Change subject: packager: fix sub-shell issue in debian containers
..
packager: fix sub-shell issue in debian containers
Change-Id: Ia2368f16f50e50c1ab3dbbbac505fc68b872d3f9
---
M support/packager/build.sh
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/support/packager/build.sh b/support/packager/build.sh
index 6c14b2b..5de8368 100755
--- a/support/packager/build.sh
+++ b/support/packager/build.sh
@@ -16,6 +16,8 @@
{
set -x
+export COMPOSER_CACHE_DIR="${MWV}/cache/composer"
+export SHELL=/bin/bash
# Get latest MediaWiki-Vagrant
cd ${MWV}
@@ -23,7 +25,6 @@
git reset --hard origin/master
# Get latest MediaWiki-core
-export COMPOSER_CACHE_DIR="${MWV}/cache/composer"
/usr/local/bin/run-git-update
cd ${MWV}/mediawiki
git reset --hard origin/master
--
To view, visit https://gerrit.wikimedia.org/r/357740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2368f16f50e50c1ab3dbbbac505fc68b872d3f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix possible crash when downloading image from gallery.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357742 ) Change subject: Fix possible crash when downloading image from gallery. .. Fix possible crash when downloading image from gallery. It's possible that the Gallery loads a media item with an invalid URL, in which case we should disable the menu options for downloading or sharing it. https://rink.hockeyapp.net/manage/apps/226650/app_versions/102/crash_reasons/172380347 Change-Id: I8d5123c3b6137316939db55ed2f9aab77ff0560f --- M app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/42/357742/1 diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java b/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java index ccb9ba4..5d2e50a 100644 --- a/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java +++ b/app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java @@ -181,9 +181,9 @@ } menu.findItem(R.id.menu_gallery_visit_page).setEnabled(galleryItem != null); menu.findItem(R.id.menu_gallery_share).setEnabled(galleryItem != null -&& imageView.getDrawable() != null); +&& !TextUtils.isEmpty(galleryItem.getUrl()) && imageView.getDrawable() != null); menu.findItem(R.id.menu_gallery_save).setEnabled(galleryItem != null -&& imageView.getDrawable() != null); +&& !TextUtils.isEmpty(galleryItem.getUrl()) && imageView.getDrawable() != null); } @Override -- To view, visit https://gerrit.wikimedia.org/r/357742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d5123c3b6137316939db55ed2f9aab77ff0560f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Docker for operations-puppet-tests
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357741 )
Change subject: Docker for operations-puppet-tests
..
Docker for operations-puppet-tests
For future iterations, we can build out a series of base images that can
handle broad categories of job. This is very similar to how we spin up
build base images using Debian Image Builder for nodepool and should
require very little maintenance.
One part that doesn't scale with the approach in this patch is the
/run.sh file is very specific to this particular job since it runs both
tox and rake in parallel for speed. Ideally, we could figure out a way
to use the information we have in jjb to automatically generate a file
similar to this one, but this is a first pass.
The part that I do like about this approach is that it moves cloning the
git repository inside the container, so after the container has run
there is nothing left to clean up. This does rely on a bare reference
repository on the host at /srv/git/operations/puppet.git that is mounted
as a read-only volume in the container. We will need to update that repo
periodically.
The total runtime for a change in this instance is ~30 seconds since we
run both tox and rake tasks in parallel.
Bug: T166888
Change-Id: I0a06afd0dae162eb61508b9dd7ddf17f11690a68
---
M .gitignore
A dockerfiles/build.sh
A dockerfiles/contint-operations-puppet/Dockerfile
A dockerfiles/contint-operations-puppet/run.sh
A dockerfiles/share/wikimedia.list
A dockerfiles/share/wikimedia.pref
M jjb/operations-puppet.yaml
7 files changed, 150 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/41/357741/1
diff --git a/.gitignore b/.gitignore
index da95b48..e14c72b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
.*.swp
/Gemfile.lock
+
+dockerfiles/share/wikimedia-archive-keyring.gpg
diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
new file mode 100755
index 000..2518136
--- /dev/null
+++ b/dockerfiles/build.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Use this file to rebuild all docker images in this repository
+
+set -eu
+
+BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+wget -O "$BASE_DIR/share/wikimedia-archive-keyring.gpg" \
+http://apt.wikimedia.org/autoinstall/keyring/wikimedia-archive-keyring.gpg
+
+for dockerbuild in "$BASE_DIR"/contint-*/Dockerfile; do
+CONTAINER_DIR="${dockerbuild%/*}"
+CONTAINER_NAME="${CONTAINER_DIR##*/}"
+docker build -t contint/"${CONTAINER_NAME:8}" -f "${dockerbuild}"
"$BASE_DIR"
+done
+
+rm -rf "$BASE_DIR/share/wikimedia-archive-keyring.gpg" \
diff --git a/dockerfiles/contint-operations-puppet/Dockerfile
b/dockerfiles/contint-operations-puppet/Dockerfile
new file mode 100644
index 000..d514e90
--- /dev/null
+++ b/dockerfiles/contint-operations-puppet/Dockerfile
@@ -0,0 +1,39 @@
+FROM debian:jessie
+COPY share /opt
+
+RUN apt-key add /opt/wikimedia-archive-keyring.gpg && \
+cp /opt/wikimedia.list /etc/apt/sources.list.d/wikimedia.list && \
+cp /opt/wikimedia.pref /etc/apt/preferences.d/wikimedia.pref
+
+RUN apt-get update && \
+apt-get install --yes --no-install-recommends \
+build-essential \
+git \
+rubygems-integration \
+rake \
+ruby2.1 \
+ruby2.1-dev \
+bundler \
+ruby-rspec \
+cucumber \
+python3 \
+python3-dev \
+python3-tk \
+python-dev \
+python-pip \
+libmysqlclient-dev \
+libxml2-dev \
+libxslt1-dev \
+libffi-dev \
+libssl-dev \
+&& \
+pip install pip==8.1.2 && \
+pip install tox==1.9.2 setuptools && \
+groupadd -g 500 wikidev && \
+useradd -u 2947 -g 500 --home-dir /var/lib/jenkins --create-home
jenkins
+
+USER jenkins
+WORKDIR /var/lib/jenkins
+ENTRYPOINT /bin/bash /run.sh
+
+COPY contint-operations-puppet/run.sh /run.sh
diff --git a/dockerfiles/contint-operations-puppet/run.sh
b/dockerfiles/contint-operations-puppet/run.sh
new file mode 100644
index 000..b5a4f90
--- /dev/null
+++ b/dockerfiles/contint-operations-puppet/run.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+set -eux
+
+TEMP_DIR=$(mktemp -d)
+LOG_DIR="$HOME/.cache/log"
+
+git clone \
+--reference "/srv/git/${ZUUL_PROJECT}.git" \
+"$ZUUL_URL/$ZUUL_PROJECT" \
+"$TEMP_DIR/puppet"
+
+cd "$TEMP_DIR/puppet"
+
+git fetch origin $ZUUL_REF
+git checkout FETCH_HEAD
+
+# Run tox tests
+{
+set -o pipefail
+PY_COLORS=1 tox -v | tee "${LOG_DIR}/tox.log"
+set +o pipefail
+} &
+PID_ONE=$!
+
+# Run rake tests
+{
+bundle install --path "${HOME}/.gems" --clean
+bundle exec rake test | tee "${LOG_DIR}/rake.log"
+} &
+PID_TWO=$!
+
+wait $PID_ONE
+EXIT_ONE=$?
+
+wait $PID_TWO
+EXIT_TWO=$?
+
+# Save logs
+mv "${TEMP_DIR}"/puppet/.tox/*/log/*.log "${LOG_DIR}/" || /bin/true
+mv "${TEMP_DIR}"/puppet/.tox
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: packager: fix sub-shell issue in debian containers
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357740 )
Change subject: packager: fix sub-shell issue in debian containers
..
packager: fix sub-shell issue in debian containers
Change-Id: Ia2368f16f50e50c1ab3dbbbac505fc68b872d3f9
---
M support/packager/build.sh
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/40/357740/1
diff --git a/support/packager/build.sh b/support/packager/build.sh
index 6c14b2b..5de8368 100755
--- a/support/packager/build.sh
+++ b/support/packager/build.sh
@@ -16,6 +16,8 @@
{
set -x
+export COMPOSER_CACHE_DIR="${MWV}/cache/composer"
+export SHELL=/bin/bash
# Get latest MediaWiki-Vagrant
cd ${MWV}
@@ -23,7 +25,6 @@
git reset --hard origin/master
# Get latest MediaWiki-core
-export COMPOSER_CACHE_DIR="${MWV}/cache/composer"
/usr/local/bin/run-git-update
cd ${MWV}/mediawiki
git reset --hard origin/master
--
To view, visit https://gerrit.wikimedia.org/r/357740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2368f16f50e50c1ab3dbbbac505fc68b872d3f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix possible crash when saving page with malformed image URL...
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357739 )
Change subject: Fix possible crash when saving page with malformed image URL(s).
..
Fix possible crash when saving page with malformed image URL(s).
The outer exception handler for saving a page was only expecting
IOException, when in fact the network call may throw additional exceptions
like IllegalArgumentException if the URL is malformed.
https://rink.hockeyapp.net/manage/apps/226650/app_versions/102/crash_reasons/172380347
This also tweaks the logic of the page saving loop, whereby an exception
caused by a single page *continues* the loop instead of breaking out of
it, preventing conditions such as malformed URLs from blocking the
download of the remaining queue of pages.
Change-Id: I10c46411ea0e26b67d2f78aed0b96eb95961c748
---
M app/src/main/java/org/wikipedia/database/async/AsyncDao.java
M
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
3 files changed, 20 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/39/357739/1
diff --git a/app/src/main/java/org/wikipedia/database/async/AsyncDao.java
b/app/src/main/java/org/wikipedia/database/async/AsyncDao.java
index eb0e193..16c56e3 100644
--- a/app/src/main/java/org/wikipedia/database/async/AsyncDao.java
+++ b/app/src/main/java/org/wikipedia/database/async/AsyncDao.java
@@ -40,6 +40,13 @@
}
}
+public synchronized void failTransaction(@NonNull Row row) {
+if (completableTransaction(row)) {
+row.failTransaction();
+upsert(row);
+}
+}
+
protected void resetTransaction(@NonNull Row row, @NonNull Status status) {
row.resetTransaction(status);
upsert(row);
@@ -48,13 +55,6 @@
protected void startTransaction(@NonNull Row row) {
row.startTransaction();
upsert(row);
-}
-
-protected synchronized void failTransaction(@NonNull Row row) {
-if (completableTransaction(row)) {
-row.failTransaction();
-upsert(row);
-}
}
private boolean completableTransaction(@NonNull Row row) {
diff --git
a/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
b/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
index f3bf76e..d62de97 100644
---
a/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
+++
b/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
@@ -136,8 +136,8 @@
}
}
-public synchronized void failDiskTransaction(@NonNull
Collection rows) {
-diskDao.failTransaction(rows);
+public synchronized void failDiskTransaction(@NonNull
ReadingListPageDiskRow row) {
+diskDao.failTransaction(row);
}
public void clearAsync() {
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
index fd80cc9..cd846cd 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
@@ -120,26 +120,30 @@
private void saveNewEntries(List queue) {
while (!queue.isEmpty()) {
-ReadingListPageDiskRow row = queue.get(0);
+ReadingListPageDiskRow row = queue.remove(0);
PageTitle pageTitle = makeTitleFrom(row);
if (pageTitle == null) {
// todo: won't this fail forever or until the page is marked
unsaved / removed somehow?
-dao.failDiskTransaction(queue);
-break;
+dao.failDiskTransaction(row);
+continue;
}
AggregatedResponseSize size;
try {
size = savePageFor(pageTitle);
-} catch (IOException e) {
-dao.failDiskTransaction(queue);
-break;
+} catch (Exception e) {
+// This can be an IOException from the storage media, or
several types
+// of network exceptions from malformed URLs, timeouts, etc.
+// Let's log the error remotely for now, and get a feel for
the kinds of errors
+// that are typical in the wild.
+dao.failDiskTransaction(row);
+L.logRemoteErrorIfProd(e);
+continue;
}
ReadingListPageDiskRow rowWithUpdatedSize = new
ReadingListPageDiskRow(row,
ReadingListPageRow.builder().copy(row.dat()).logicalSize(size.logicalSize()).physicalSize(size.physicalSize()).build());
dao.completeDiskTransaction(rowWithUpdatedSize);
-
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Specify iconWhenInvisible for math/chem nodes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357730 ) Change subject: Specify iconWhenInvisible for math/chem nodes .. Specify iconWhenInvisible for math/chem nodes Bug: T166526 Change-Id: I42703d15fa7e491d85d01899c706dbca4e5816b6 --- M modules/ve-math/ve.ce.MWChemNode.js M modules/ve-math/ve.ce.MWMathNode.js 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-math/ve.ce.MWChemNode.js b/modules/ve-math/ve.ce.MWChemNode.js index e78a48c..9edfedd 100644 --- a/modules/ve-math/ve.ce.MWChemNode.js +++ b/modules/ve-math/ve.ce.MWChemNode.js @@ -30,6 +30,8 @@ ve.ce.MWChemNode.static.primaryCommandName = 'chemDialog'; +ve.ce.MWChemNode.static.iconWhenInvisible = 'chem'; + /* Registration */ ve.ce.nodeFactory.register( ve.ce.MWChemNode ); diff --git a/modules/ve-math/ve.ce.MWMathNode.js b/modules/ve-math/ve.ce.MWMathNode.js index 2bbe294..ac859e0 100644 --- a/modules/ve-math/ve.ce.MWMathNode.js +++ b/modules/ve-math/ve.ce.MWMathNode.js @@ -30,6 +30,8 @@ ve.ce.MWMathNode.static.primaryCommandName = 'mathDialog'; +ve.ce.MWMathNode.static.iconWhenInvisible = 'math'; + /* Registration */ ve.ce.nodeFactory.register( ve.ce.MWMathNode ); -- To view, visit https://gerrit.wikimedia.org/r/357730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42703d15fa7e491d85d01899c706dbca4e5816b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Catrope Gerrit-Reviewer: Physikerwelt Gerrit-Reviewer: TheDJ 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...Score[master]: Specify iconWhenInvisible for score node
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357731 ) Change subject: Specify iconWhenInvisible for score node .. Specify iconWhenInvisible for score node Bug: T166526 Change-Id: Idaeb4f2a342c938a25970ec5cef1789f86a2f06f --- M modules/ve-score/ve.ce.MWScoreNode.js 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-score/ve.ce.MWScoreNode.js b/modules/ve-score/ve.ce.MWScoreNode.js index ebaf702..ed51eef 100644 --- a/modules/ve-score/ve.ce.MWScoreNode.js +++ b/modules/ve-score/ve.ce.MWScoreNode.js @@ -30,6 +30,8 @@ ve.ce.MWScoreNode.static.primaryCommandName = 'score'; +ve.ce.MWScoreNode.static.iconWhenInvisible = 'score'; + /* Methods */ /** -- To view, visit https://gerrit.wikimedia.org/r/357731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idaeb4f2a342c938a25970ec5cef1789f86a2f06f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Catrope 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...wikihiero[master]: Use 'hiero' icon when invisible
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357728 ) Change subject: Use 'hiero' icon when invisible .. Use 'hiero' icon when invisible Bug: T166526 Change-Id: I1a3833683b8d868ddd69ec982de5aa38dddc5953 --- M modules/ve-wikihiero/ve.ce.MWHieroNode.js 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-wikihiero/ve.ce.MWHieroNode.js b/modules/ve-wikihiero/ve.ce.MWHieroNode.js index bdd804c..84a2300 100644 --- a/modules/ve-wikihiero/ve.ce.MWHieroNode.js +++ b/modules/ve-wikihiero/ve.ce.MWHieroNode.js @@ -28,6 +28,8 @@ ve.ce.MWHieroNode.static.primaryCommandName = 'hiero'; +ve.ce.MWHieroNode.static.iconWhenInvisible = 'hiero'; + /* Registration */ ve.ce.nodeFactory.register( ve.ce.MWHieroNode ); -- To view, visit https://gerrit.wikimedia.org/r/357728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a3833683b8d868ddd69ec982de5aa38dddc5953 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/wikihiero Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Give extensions a fallback icon when invisible
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357726 ) Change subject: Give extensions a fallback icon when invisible .. Give extensions a fallback icon when invisible Bug: T166526 Change-Id: I5eafbef3b751a83cef353c8a9f09d90820fa9409 --- M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js index f0acccf..c0e4fd8 100644 --- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js +++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js @@ -46,6 +46,8 @@ */ ve.ce.MWExtensionNode.static.rendersEmpty = false; +ve.ce.MWExtensionNode.static.iconWhenInvisible = 'alienextension'; + /* Methods */ /** -- To view, visit https://gerrit.wikimedia.org/r/357726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5eafbef3b751a83cef353c8a9f09d90820fa9409 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Catrope 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...deploy[master]: Update trending-edits to dea5624
Ppchelko has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357738 ) Change subject: Update trending-edits to dea5624 .. Update trending-edits to dea5624 List of changes: 4b1cd09 Include reverts from bots b6cabae BECOME MODERN!! Use const/let xxx Update node module dependencies Change-Id: I889d7794829faf87627e22001fe9b7a0a09c64f3 --- M node_modules/ajv/dist/ajv.bundle.js M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/lib/compile/formats.js M node_modules/ajv/lib/dot/custom.jst M node_modules/ajv/lib/dot/validate.jst M node_modules/ajv/lib/dotjs/anyOf.js M node_modules/ajv/lib/dotjs/constant.js M node_modules/ajv/lib/dotjs/custom.js M node_modules/ajv/lib/dotjs/dependencies.js M node_modules/ajv/lib/dotjs/enum.js M node_modules/ajv/lib/dotjs/format.js M node_modules/ajv/lib/dotjs/items.js M node_modules/ajv/lib/dotjs/multipleOf.js M node_modules/ajv/lib/dotjs/not.js M node_modules/ajv/lib/dotjs/oneOf.js M node_modules/ajv/lib/dotjs/pattern.js M node_modules/ajv/lib/dotjs/patternRequired.js M node_modules/ajv/lib/dotjs/properties.js M node_modules/ajv/lib/dotjs/ref.js M node_modules/ajv/lib/dotjs/required.js M node_modules/ajv/lib/dotjs/switch.js M node_modules/ajv/lib/dotjs/uniqueItems.js M node_modules/ajv/lib/dotjs/validate.js M node_modules/ajv/package.json M node_modules/ajv/scripts/compile-dots.js M node_modules/ajv/scripts/travis-gh-pages M node_modules/bl/bl.js M node_modules/bl/package.json M node_modules/bl/test/test.js M node_modules/body-parser/lib/read.js M node_modules/body-parser/package.json M node_modules/brace-expansion/index.js M node_modules/brace-expansion/package.json D node_modules/buffer-shims/index.js D node_modules/buffer-shims/package.json M node_modules/debug/.npmignore D node_modules/debug/bower.json M node_modules/debug/component.json M node_modules/debug/package.json M node_modules/debug/src/browser.js M node_modules/debug/src/debug.js M node_modules/debug/src/node.js M node_modules/dtrace-provider/libusdt/Makefile M node_modules/dtrace-provider/package.json M node_modules/express/lib/application.js M node_modules/express/lib/middleware/init.js M node_modules/express/lib/response.js M node_modules/express/package.json M node_modules/extend/.eslintrc M node_modules/extend/.jscs.json M node_modules/extend/.travis.yml M node_modules/extend/index.js M node_modules/extend/package.json D node_modules/finalhandler/node_modules/debug/.coveralls.yml D node_modules/finalhandler/node_modules/debug/.eslintrc D node_modules/finalhandler/node_modules/debug/.npmignore D node_modules/finalhandler/node_modules/debug/.travis.yml D node_modules/finalhandler/node_modules/debug/LICENSE D node_modules/finalhandler/node_modules/debug/Makefile D node_modules/finalhandler/node_modules/debug/bower.json D node_modules/finalhandler/node_modules/debug/component.json D node_modules/finalhandler/node_modules/debug/karma.conf.js D node_modules/finalhandler/node_modules/debug/node.js D node_modules/finalhandler/node_modules/debug/package.json D node_modules/finalhandler/node_modules/debug/src/browser.js D node_modules/finalhandler/node_modules/debug/src/debug.js D node_modules/finalhandler/node_modules/debug/src/index.js D node_modules/finalhandler/node_modules/debug/src/node.js M node_modules/finalhandler/package.json M node_modules/form-data/lib/form_data.js M node_modules/form-data/package.json M node_modules/getpass/package.json M node_modules/hosted-git-info/index.js M node_modules/hosted-git-info/package.json M node_modules/hot-shots/lib/statsd.js M node_modules/hot-shots/package.json M node_modules/js-yaml/dist/js-yaml.js M node_modules/js-yaml/dist/js-yaml.min.js M node_modules/js-yaml/lib/js-yaml/dumper.js M node_modules/js-yaml/package.json A node_modules/kad/node_modules/ms/index.js A node_modules/kad/node_modules/ms/package.json M node_modules/kad/package.json M node_modules/minimatch/package.json M node_modules/ms/index.js M node_modules/ms/package.json M node_modules/nan/nan.h A node_modules/nan/nan_json.h M node_modules/nan/package.json M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/binding.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/callbacks.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/common.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/config.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/connection.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/consumer.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/errors.o.d M node_mo
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to dea5624
Ppchelko has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357738 ) Change subject: Update trending-edits to dea5624 .. Update trending-edits to dea5624 List of changes: 4b1cd09 Include reverts from bots b6cabae BECOME MODERN!! Use const/let xxx Update node module dependencies Change-Id: I889d7794829faf87627e22001fe9b7a0a09c64f3 --- M node_modules/ajv/dist/ajv.bundle.js M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/lib/compile/formats.js M node_modules/ajv/lib/dot/custom.jst M node_modules/ajv/lib/dot/validate.jst M node_modules/ajv/lib/dotjs/anyOf.js M node_modules/ajv/lib/dotjs/constant.js M node_modules/ajv/lib/dotjs/custom.js M node_modules/ajv/lib/dotjs/dependencies.js M node_modules/ajv/lib/dotjs/enum.js M node_modules/ajv/lib/dotjs/format.js M node_modules/ajv/lib/dotjs/items.js M node_modules/ajv/lib/dotjs/multipleOf.js M node_modules/ajv/lib/dotjs/not.js M node_modules/ajv/lib/dotjs/oneOf.js M node_modules/ajv/lib/dotjs/pattern.js M node_modules/ajv/lib/dotjs/patternRequired.js M node_modules/ajv/lib/dotjs/properties.js M node_modules/ajv/lib/dotjs/ref.js M node_modules/ajv/lib/dotjs/required.js M node_modules/ajv/lib/dotjs/switch.js M node_modules/ajv/lib/dotjs/uniqueItems.js M node_modules/ajv/lib/dotjs/validate.js M node_modules/ajv/package.json M node_modules/ajv/scripts/compile-dots.js M node_modules/ajv/scripts/travis-gh-pages M node_modules/bl/bl.js M node_modules/bl/package.json M node_modules/bl/test/test.js M node_modules/body-parser/lib/read.js M node_modules/body-parser/package.json M node_modules/brace-expansion/index.js M node_modules/brace-expansion/package.json D node_modules/buffer-shims/index.js D node_modules/buffer-shims/package.json M node_modules/debug/.npmignore D node_modules/debug/bower.json M node_modules/debug/component.json M node_modules/debug/package.json M node_modules/debug/src/browser.js M node_modules/debug/src/debug.js M node_modules/debug/src/node.js M node_modules/dtrace-provider/libusdt/Makefile M node_modules/dtrace-provider/package.json M node_modules/express/lib/application.js M node_modules/express/lib/middleware/init.js M node_modules/express/lib/response.js M node_modules/express/package.json M node_modules/extend/.eslintrc M node_modules/extend/.jscs.json M node_modules/extend/.travis.yml M node_modules/extend/index.js M node_modules/extend/package.json D node_modules/finalhandler/node_modules/debug/.coveralls.yml D node_modules/finalhandler/node_modules/debug/.eslintrc D node_modules/finalhandler/node_modules/debug/.npmignore D node_modules/finalhandler/node_modules/debug/.travis.yml D node_modules/finalhandler/node_modules/debug/LICENSE D node_modules/finalhandler/node_modules/debug/Makefile D node_modules/finalhandler/node_modules/debug/bower.json D node_modules/finalhandler/node_modules/debug/component.json D node_modules/finalhandler/node_modules/debug/karma.conf.js D node_modules/finalhandler/node_modules/debug/node.js D node_modules/finalhandler/node_modules/debug/package.json D node_modules/finalhandler/node_modules/debug/src/browser.js D node_modules/finalhandler/node_modules/debug/src/debug.js D node_modules/finalhandler/node_modules/debug/src/index.js D node_modules/finalhandler/node_modules/debug/src/node.js M node_modules/finalhandler/package.json M node_modules/form-data/lib/form_data.js M node_modules/form-data/package.json M node_modules/getpass/package.json M node_modules/hosted-git-info/index.js M node_modules/hosted-git-info/package.json M node_modules/hot-shots/lib/statsd.js M node_modules/hot-shots/package.json M node_modules/js-yaml/dist/js-yaml.js M node_modules/js-yaml/dist/js-yaml.min.js M node_modules/js-yaml/lib/js-yaml/dumper.js M node_modules/js-yaml/package.json A node_modules/kad/node_modules/ms/index.js A node_modules/kad/node_modules/ms/package.json M node_modules/kad/package.json M node_modules/minimatch/package.json M node_modules/ms/index.js M node_modules/ms/package.json M node_modules/nan/nan.h A node_modules/nan/nan_json.h M node_modules/nan/package.json M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/binding.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/callbacks.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/common.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/config.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/connection.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/consumer.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/errors.o.d M node_modules/no
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Relaunch related pages A/B test to 98% of users
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357666 ) Change subject: Relaunch related pages A/B test to 98% of users .. Relaunch related pages A/B test to 98% of users Bug: T167310 Change-Id: If254a39738fcf00f3c778863220236d2ac3fee8a --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2a49e37..3826536 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16954,6 +16954,8 @@ 'wgRelatedArticlesEnabledSamplingRate' => [ 'default' => 1, + // T167310 + 'enwiki' => 0.98, ], 'wmgUseRelatedSites' => [ -- To view, visit https://gerrit.wikimedia.org/r/357666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If254a39738fcf00f3c778863220236d2ac3fee8a Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Catrope Gerrit-Reviewer: Florianschmidtwelzow 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...RelatedArticles[wmf/1.30.0-wmf.4]: Session id should not change on every page view
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357667 )
Change subject: Session id should not change on every page view
..
Session id should not change on every page view
Bug: T167236
Change-Id: I7a04c5c3f959ce0e7dc50e2bc2fd64d139b78cdb
(cherry picked from commit eb5a86908a49fb319fcf2d0bf4b4a1d2a5c414f0)
---
M resources/ext.relatedArticles.readMore.eventLogging/index.js
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.relatedArticles.readMore.eventLogging/index.js
b/resources/ext.relatedArticles.readMore.eventLogging/index.js
index d687592..afe721b 100644
--- a/resources/ext.relatedArticles.readMore.eventLogging/index.js
+++ b/resources/ext.relatedArticles.readMore.eventLogging/index.js
@@ -26,10 +26,8 @@
{
pageId: mw.config.get( 'wgArticleId' ),
skin: ( skin === 'minerva' ) ? skin + '-' +
mw.config.get( 'wgMFMode' ) : skin,
- // We cannot depend on the uniqueness of
mw.user.generateRandomSessionId(),
- // thus append the timestamp. See mw.user documentation
for more info.
- userSessionToken: mw.user.generateRandomSessionId() +
- ( new Date() ).getTime().toString()
+ // This should persist for a given user across their
session.
+ userSessionToken: mw.user.sessionId()
}
);
--
To view, visit https://gerrit.wikimedia.org/r/357667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a04c5c3f959ce0e7dc50e2bc2fd64d139b78cdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace toast bell PNG with optimized SVG
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357509 )
Change subject: Replace toast bell PNG with optimized SVG
..
Replace toast bell PNG with optimized SVG
Note that the new icon will be visible only on browsers
that support SVG.
Bug: T142532
Change-Id: Idfffb167960fc4ff0fe93d724e1164c0965c
---
D resources/mobile.startup/images/error.png
A resources/mobile.startup/images/error.svg
M resources/mobile.startup/toast.less
3 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
Jdlrobson: Looks good to me, but someone else must approve
diff --git a/resources/mobile.startup/images/error.png
b/resources/mobile.startup/images/error.png
deleted file mode 100644
index b2d26f0..000
--- a/resources/mobile.startup/images/error.png
+++ /dev/null
Binary files differ
diff --git a/resources/mobile.startup/images/error.svg
b/resources/mobile.startup/images/error.svg
new file mode 100644
index 000..1317ec6
--- /dev/null
+++ b/resources/mobile.startup/images/error.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/resources/mobile.startup/toast.less
b/resources/mobile.startup/toast.less
index 204fa50..d0aa91c 100644
--- a/resources/mobile.startup/toast.less
+++ b/resources/mobile.startup/toast.less
@@ -65,7 +65,11 @@
//
// Styleguide 3.2.
&.mw-notification-type-error {
- .background-image( 'images/error.png' );
+ // FIXME: Use RL to serve this file. Styling icon with the
class mw-notification-type-error
+ // allows extensions ot use mw.notify( msg, 'error' ) and have
those styled as errors.
+ // see
https://github.com/search?l=JavaScript&q=org%3Awikimedia+mw.notify&type=Code
+ .background-image( 'images/error.svg' );
+ .background-size( 24px, 24px );
background-position: 16px 50%;
background-repeat: no-repeat;
padding-left: 5%;
--
To view, visit https://gerrit.wikimedia.org/r/357509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfffb167960fc4ff0fe93d724e1164c0965c
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace ReferencesDrawer error PNG with optimized SVG
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357660 )
Change subject: Replace ReferencesDrawer error PNG with optimized SVG
..
Replace ReferencesDrawer error PNG with optimized SVG
Bug: T142532
Change-Id: I9f96be5638656c5ac7da4f5ff82b9e75f56e877c
---
M extension.json
M resources/mobile.references/ReferencesDrawer.hogan
M resources/mobile.references/ReferencesDrawer.js
D resources/mobile.references/images/error.png
M resources/mobile.references/references.less
A resources/mobile.startup.images/error.svg
M resources/mobile.startup/toast.less
7 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 8f3dc6c..45c49d1 100644
--- a/extension.json
+++ b/extension.json
@@ -454,6 +454,13 @@
"BackToTopOverlay.hogan":
"resources/mobile.backtotop/BackToTopOverlay.hogan"
}
},
+ "mobile.startup.images": {
+ "class": "ResourceLoaderImageModule",
+ "selector": ".mw-ui-icon-{name}:before",
+ "images": {
+ "error":
"resources/mobile.startup.images/error.svg"
+ }
+ },
"mobile.startup": {
"targets": [
"mobile",
@@ -463,6 +470,7 @@
"mobile.pagelist.styles",
"mobile.pagesummary.styles",
"mediawiki.notify",
+ "mobile.startup.images",
"mobile.overlay.images",
"mobile.ajax.styles",
"mediawiki.language",
diff --git a/resources/mobile.references/ReferencesDrawer.hogan
b/resources/mobile.references/ReferencesDrawer.hogan
index d4d3bd3..cc6275e 100644
--- a/resources/mobile.references/ReferencesDrawer.hogan
+++ b/resources/mobile.references/ReferencesDrawer.hogan
@@ -2,8 +2,8 @@
{{{citation}}}
{{{cancelButton}}}
-{{#error}}{{/error}}
+{{#error}}{{/error}}
{{title}}
{{#text}}{{{text}}}{{/text}}
{{^text}}{{{spinner}}}{{/text}}
-{{#error}}{{/error}}
\ No newline at end of file
+{{#error}}{{/error}}
diff --git a/resources/mobile.references/ReferencesDrawer.js
b/resources/mobile.references/ReferencesDrawer.js
index 5e0e6c8..1629d2c 100644
--- a/resources/mobile.references/ReferencesDrawer.js
+++ b/resources/mobile.references/ReferencesDrawer.js
@@ -32,7 +32,12 @@
additionalClassNames: 'text',
hasText: true,
label: mw.msg(
'mobile-frontend-references-citation' )
- } ).toHtmlString()
+ } ).toHtmlString(),
+ errorClassName: new Icon( {
+ name: 'error',
+ hasText: true,
+ isSmall: true
+ } ).getClassName()
} ),
events: {
'click sup a': 'showNestedReference'
diff --git a/resources/mobile.references/images/error.png
b/resources/mobile.references/images/error.png
deleted file mode 100644
index 0476228..000
--- a/resources/mobile.references/images/error.png
+++ /dev/null
Binary files differ
diff --git a/resources/mobile.references/references.less
b/resources/mobile.references/references.less
index ce50f3e..05aa953 100644
--- a/resources/mobile.references/references.less
+++ b/resources/mobile.references/references.less
@@ -24,12 +24,6 @@
color: #5880c0;
}
- .error {
- .background-image( 'images/error.png' );
- padding-left: 20px;
- background-repeat: no-repeat;
- }
-
.cite {
padding-bottom: 20px;
diff --git a/resources/mobile.startup.images/error.svg
b/resources/mobile.startup.images/error.svg
new file mode 100644
index 000..1317ec6
--- /dev/null
+++ b/resources/mobile.startup.images/error.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/resources/mobile.startup/toast.less
b/resources/mobile.startup/toast.less
index d0aa91c..01d8985 100644
--- a/resources/mobile.startup/toast.less
+++ b/resources/mobile.startup/toast.less
@@ -65,7 +65,8 @@
//
// Styleguide 3.2.
&.mw-notification-type-error {
- // FIXME: Use RL to serve this file. Styling icon with the
class mw-notification-type-error
+ // FIXME: Use `mobile.startup.images` to serve this file.
+ // Styling icon with the class mw-notification-type-error
// allows extensions
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Adding release note about counting page moves as edits
Kaldari has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357522 )
Change subject: Adding release note about counting page moves as edits
..
Adding release note about counting page moves as edits
Bug: T163966
Change-Id: I084a1acb5af0b5226fb24c56434b36ecd0008eab
---
M RELEASE-NOTES-1.30
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index fa5c280..343c296 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -97,6 +97,8 @@
As a result of the new uniform handling, '-{' may need to be escaped
(for example, as '-{') where it occurs inside template arguments
or wikilinks.
+* (T163966) Page moves are now counted as edits for the purposes of
+ autopromotion, i.e., they increment the user_editcount field in the database.
== Compatibility ==
MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
--
To view, visit https://gerrit.wikimedia.org/r/357522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I084a1acb5af0b5226fb24c56434b36ecd0008eab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Add debug logging for DB connection errors
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357737 )
Change subject: Add debug logging for DB connection errors
..
Add debug logging for DB connection errors
Bug: T167354
Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
---
M LoginNotify_body.php
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/37/357737/1
diff --git a/LoginNotify_body.php b/LoginNotify_body.php
index 523c1d3..6828422 100644
--- a/LoginNotify_body.php
+++ b/LoginNotify_body.php
@@ -9,6 +9,7 @@
use MediaWiki\Logger\LoggerFactory;
use Psr\Log\LoggerInterface;
use Psr\Log\LoggerAwareInterface;
+use Wikimedia\Rdbms\DBConnectionError;
/**
* Handle sending notifications on login from unknown source.
@@ -210,8 +211,15 @@
if ( $count > 10 ||
$localInfo['editCount'] < 1 ) {
break;
}
- $lb = wfGetLB( $wiki );
- $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ try {
+ $lb = wfGetLB( $wiki );
+ $dbrLocal = $lb->getConnection(
DB_SLAVE, [], $wiki );
+ } catch ( DBConnectionError $ex ) {
+ // FIXME: sometimes, we get
garbage wiki names (T167354)
+ wfDebugLog( 'AdHocDebug',
"Couldn't connect to database $wiki, info: "
+ . json_encode( $info )
);
+ continue;
+ }
if ( !$this->hasCheckUserTables(
$dbrLocal ) ) {
// Skip this wiki, no checkuser
table.
--
To view, visit https://gerrit.wikimedia.org/r/357737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d000b0ea80dd3f682c19a43ee89077ee9d407b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: WIP: Retrofit TitleSearchTask
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357736 )
Change subject: WIP: Retrofit TitleSearchTask
..
WIP: Retrofit TitleSearchTask
Bug: T152401
Change-Id: I98438c20384b81fe3eee83005f5459597f3e2603
---
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
M app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
A app/src/main/java/org/wikipedia/search/PrefixSearchClient.java
A app/src/main/java/org/wikipedia/search/PrefixSearchResponse.java
M app/src/main/java/org/wikipedia/search/SearchResult.java
M app/src/main/java/org/wikipedia/search/SearchResults.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
D app/src/main/java/org/wikipedia/search/TitleSearchTask.java
A app/src/test/res/raw/prefix_search_results.json
A app/src/test/res/raw/prefix_search_results_empty.json
11 files changed, 577 insertions(+), 242 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/36/357736/1
diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
index a8823b9..2bf60a9 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
@@ -26,6 +26,7 @@
@SuppressWarnings("unused") @Nullable private Thumbnail thumbnail;
@SuppressWarnings("unused") @Nullable private Terms terms;
@SuppressWarnings("unused") @SerializedName("imageinfo") @Nullable private
List imageInfo;
+@Nullable private String redirectFrom;
@NonNull public String title() {
return title;
@@ -64,6 +65,18 @@
return imageInfo != null ? imageInfo.get(0) : null;
}
+@Nullable public String redirectFrom() {
+return redirectFrom;
+}
+
+public void redirectFrom(@Nullable String from) {
+redirectFrom = from;
+}
+
+public void appendTitleFragment(@Nullable String fragment) {
+title += fragment;
+}
+
public static class Revision {
@SuppressWarnings("unused,NullableProblems")
@SerializedName("contentformat") @NonNull private String contentFormat;
@SuppressWarnings("unused,NullableProblems")
@SerializedName("contentmodel") @NonNull private String contentModel;
diff --git
a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
index 477cab7..44702ee 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
@@ -139,6 +139,19 @@
@SuppressWarnings("unused") private int index;
@SuppressWarnings("unused") @Nullable private String from;
@SuppressWarnings("unused") @Nullable private String to;
+@SuppressWarnings("unused") @SerializedName("tofragment") @Nullable
private String toFragment;
+
+@Nullable public String to() {
+return to;
+}
+
+@Nullable public String from() {
+return from;
+}
+
+@Nullable public String toFragment() {
+return toFragment;
+}
}
private static class ListUsersResponse {
diff --git a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
index a289dc8..028678a 100644
--- a/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
+++ b/app/src/main/java/org/wikipedia/search/FullTextSearchClient.java
@@ -23,6 +23,7 @@
}
@NonNull private final WikiCachedService cachedService = new
MwCachedService<>(Service.class);
+@Nullable private Call call;
public Call request(@NonNull WikiSite wiki, @NonNull
String searchTerm,
@Nullable String cont, @Nullable
String gsrOffset,
@@ -37,7 +38,7 @@
@Nullable String
gsrOffset,
int limit, @NonNull final
Callback cb) {
-Call call = service.request(moreLike(searchTerm),
limit, limit, cont, gsrOffset);
+call = service.request(moreLike(searchTerm), limit, limit, cont,
gsrOffset);
call.enqueue(new retrofit2.Callback() {
@Override
public void onResponse(@NonNull Call call,
@@ -74,6 +75,13 @@
return call;
}
+void cancel() {
+if (call != null) {
+call.cancel();
+call = null;
+}
+}
+
protected interface Service {
String QUERY_PREFIX =
"w/api.php?format=json&formatversion=2&action=query"
+
"&prop=pageterms|pageimages|pageprops&ppprop=mainpage|disambiguation"
diff --git
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: commentary for ex-cache_maps hosts
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357734 )
Change subject: site.pp: commentary for ex-cache_maps hosts
..
site.pp: commentary for ex-cache_maps hosts
Bug: T164608
Change-Id: I8327956056f4ad78ca5dc5e55dbb425e37119fa0
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 308a65c..74caf85 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -253,6 +253,7 @@
}
node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
+# ex-cache_maps, not true spares, earmarked for experimentation...
role(spare::system)
}
@@ -277,6 +278,7 @@
}
node /^cp20(0[39]|15|21)\.codfw\.wmnet$/ {
+# ex-cache_maps, not true spares, earmarked for experimentation...
role(spare::system)
}
@@ -286,6 +288,7 @@
}
node /^cp300[3-6]\.esams\.wmnet$/ {
+# ex-cache_maps, to be decommed
role(spare::system)
}
@@ -328,6 +331,7 @@
}
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
+# ex-cache_maps, to be decommed
role(spare::system)
}
--
To view, visit https://gerrit.wikimedia.org/r/357734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8327956056f4ad78ca5dc5e55dbb425e37119fa0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
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]: site.pp: commentary for ex-cache_maps hosts
BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357734 )
Change subject: site.pp: commentary for ex-cache_maps hosts
..
site.pp: commentary for ex-cache_maps hosts
Bug: T164608
Change-Id: I8327956056f4ad78ca5dc5e55dbb425e37119fa0
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/357734/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 308a65c..74caf85 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -253,6 +253,7 @@
}
node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
+# ex-cache_maps, not true spares, earmarked for experimentation...
role(spare::system)
}
@@ -277,6 +278,7 @@
}
node /^cp20(0[39]|15|21)\.codfw\.wmnet$/ {
+# ex-cache_maps, not true spares, earmarked for experimentation...
role(spare::system)
}
@@ -286,6 +288,7 @@
}
node /^cp300[3-6]\.esams\.wmnet$/ {
+# ex-cache_maps, to be decommed
role(spare::system)
}
@@ -328,6 +331,7 @@
}
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
+# ex-cache_maps, to be decommed
role(spare::system)
}
--
To view, visit https://gerrit.wikimedia.org/r/357734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8327956056f4ad78ca5dc5e55dbb425e37119fa0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki: use compile_redirects as a function
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357733 ) Change subject: mediawiki: use compile_redirects as a function .. mediawiki: use compile_redirects as a function Switch compile_redirects to be used as a parser function instead of a CLI script. Noop functional change, just avoids the presence of both source and compiled content in the tree. Change-Id: If3200618eaa08fbc7795e03debca51665e7f0cfb --- D modules/mediawiki/files/apache/sites/redirects.conf D modules/mediawiki/files/apache/sites/redirects/compile_redirects.rb D modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py M modules/mediawiki/manifests/web/prod_sites.pp 4 files changed, 1 insertion(+), 1,387 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/357733/1 diff --git a/modules/mediawiki/files/apache/sites/redirects.conf b/modules/mediawiki/files/apache/sites/redirects.conf deleted file mode 100644 index fc08c02..000 --- a/modules/mediawiki/files/apache/sites/redirects.conf +++ /dev/null @@ -1,1344 +0,0 @@ -# This file is generated automatically by Puppet -# Do not edit it manually! - - - ServerName redirector - - ServerAlias wikijunior.com - ServerAlias *.wikijunior.com - ServerAlias wikijunior.org - ServerAlias *.wikijunior.org - ServerAlias wikijunior.net - ServerAlias *.wikijunior.net - ServerAlias wikinews.de - ServerAlias *.wikinews.de - ServerAlias wicipediacymraeg.org - ServerAlias *.wicipediacymraeg.org - ServerAlias wikipedia.org.il - ServerAlias *.wikipedia.org.il - ServerAlias wikipedia.co.il - ServerAlias *.wikipedia.co.il - ServerAlias vikimedija.org - ServerAlias *.vikimedija.org - ServerAlias wikipedia.bg - ServerAlias *.wikipedia.bg - ServerAlias wikipedia.is - ServerAlias *.wikipedia.is - ServerAlias wikipedia.co.za - ServerAlias *.wikipedia.co.za - ServerAlias wikibooks.cz - ServerAlias *.wikibooks.cz - ServerAlias wikicitaty.cz - ServerAlias *.wikicitaty.cz - ServerAlias wikidruhy.cz - ServerAlias *.wikidruhy.cz - ServerAlias wikiquote.cz - ServerAlias *.wikiquote.cz - ServerAlias wikisource.cz - ServerAlias *.wikisource.cz - ServerAlias wikispecies.cz - ServerAlias *.wikispecies.cz - ServerAlias wikiversity.cz - ServerAlias *.wikiversity.cz - ServerAlias wikiverzita.cz - ServerAlias *.wikiverzita.cz - ServerAlias wikizpravy.cz - ServerAlias *.wikizpravy.cz - ServerAlias wikizdroje.cz - ServerAlias *.wikizdroje.cz - ServerAlias wiktionary.cz - ServerAlias *.wiktionary.cz - ServerAlias wikislovnik.cz - ServerAlias *.wikislovnik.cz - ServerAlias wikiknihy.cz - ServerAlias *.wikiknihy.cz - ServerAlias wikisource.pl - ServerAlias *.wikisource.pl - ServerAlias wikipedie.cz - ServerAlias *.wikipedie.cz - ServerAlias wikipedia.cz - ServerAlias *.wikipedia.cz - ServerAlias wikimedia.ee - ServerAlias *.wikimedia.ee - ServerAlias wikipedia.ee - ServerAlias *.wikipedia.ee - ServerAlias wikimedia.jp.net - ServerAlias *.wikimedia.jp.net - ServerAlias wikimedia.lt - ServerAlias *.wikimedia.lt - ServerAlias wikipedia.lt - ServerAlias *.wikipedia.lt - ServerAlias en-wp.com - ServerAlias *.en-wp.com - ServerAlias en-wp.org - ServerAlias *.en-wp.org - ServerAlias *.wikipedia.com - ServerAlias *.wikipedia.net - ServerAlias *.wikipedia.info - ServerAlias www.*.wikipedia.com - ServerAlias www.*.wikipedia.net - ServerAlias www.*.wikipedia.info - ServerAlias *.wiki-pedia.org - ServerAlias wiikipedia.com - ServerAlias *.wiikipedia.com - ServerAlias wikiepdia.com - ServerAlias *.wikiepdia.com - ServerAlias wikiepdia.org - ServerAlias *.wikiepdia.org - ServerAlias wikiipedia.org - ServerAlias *.wikiipedia.org - ServerAlias wikpedia.org - ServerAlias *.wikpedia.org - ServerAlias *.wiktionary.com - ServerAlias wiktionary.eu - ServerAlias *.wiktionary.eu - ServerAlias *.wikibook.org - ServerAlias *.wikibook.com - ServerAlias *.wikibooks.com - ServerAlias *.wikisource.com - ServerAlias *.wikiquote.com - ServerAlias *.wikiquote.net - ServerAlias *.wikinews.com - ServerAlias wikispecies.com - ServerAlias *.wikispecies.com - ServerAlias wikispecies.org - ServerAlias *.wikispecies.org - ServerAlias wikispecies.net - ServerAlias *.wikispecies.net - ServerAlias *.wikiversity.com - ServerAlias *.wikiversity.info - ServerAlias *.wikivoyage.com - ServerAlias *.
[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Fixed exception when returntoquery is not defined.
Cicalese has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357732 )
Change subject: Fixed exception when returntoquery is not defined.
..
Fixed exception when returntoquery is not defined.
Change-Id: I7aa5fb94d8f34499ed52784d1c76c280cd98ab4f
---
M PluggableAuthPrimaryAuthenticationProvider.php
M extension.json
2 files changed, 13 insertions(+), 3 deletions(-)
Approvals:
Cicalese: Verified; Looks good to me, approved
diff --git a/PluggableAuthPrimaryAuthenticationProvider.php
b/PluggableAuthPrimaryAuthenticationProvider.php
index e676204..97f72f9 100644
--- a/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/PluggableAuthPrimaryAuthenticationProvider.php
@@ -40,10 +40,20 @@
$url = Title::newFromText( 'Special:PluggableAuthLogin'
)->getFullURL();
$this->manager->setAuthenticationSessionData(
PluggableAuthLogin::RETURNTOURL_SESSION_KEY,
$request->returnToUrl );
+ if ( isset( $_GET['returnto'] ) ) {
+ $returnto = $_GET['returnto'];
+ } else {
+ $returnto = '';
+ }
$this->manager->setAuthenticationSessionData(
- PluggableAuthLogin::RETURNTOPAGE_SESSION_KEY,
$_GET['returnto']);
+ PluggableAuthLogin::RETURNTOPAGE_SESSION_KEY, $returnto
);
+ if ( isset( $_GET['returntoquery'] ) ) {
+ $returntoquery = $_GET['returntoquery'];
+ } else {
+ $returntoquery = '';
+ }
$this->manager->setAuthenticationSessionData(
- PluggableAuthLogin::RETURNTOQUERY_SESSION_KEY,
$_GET['returntoquery'] );
+ PluggableAuthLogin::RETURNTOQUERY_SESSION_KEY,
$returntoquery );
return AuthenticationResponse::newRedirect( [
new PluggableAuthContinueAuthenticationRequest()
diff --git a/extension.json b/extension.json
index 1f4f9e3..e593e35 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PluggableAuth",
- "version": "4.1",
+ "version": "4.2",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]"
],
--
To view, visit https://gerrit.wikimedia.org/r/357732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa5fb94d8f34499ed52784d1c76c280cd98ab4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese
Gerrit-Reviewer: Cicalese
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...PluggableAuth[master]: Fixed exception when returntoquery is not defined.
Cicalese has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357732 )
Change subject: Fixed exception when returntoquery is not defined.
..
Fixed exception when returntoquery is not defined.
Change-Id: I7aa5fb94d8f34499ed52784d1c76c280cd98ab4f
---
M PluggableAuthPrimaryAuthenticationProvider.php
M extension.json
2 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth
refs/changes/32/357732/1
diff --git a/PluggableAuthPrimaryAuthenticationProvider.php
b/PluggableAuthPrimaryAuthenticationProvider.php
index e676204..97f72f9 100644
--- a/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/PluggableAuthPrimaryAuthenticationProvider.php
@@ -40,10 +40,20 @@
$url = Title::newFromText( 'Special:PluggableAuthLogin'
)->getFullURL();
$this->manager->setAuthenticationSessionData(
PluggableAuthLogin::RETURNTOURL_SESSION_KEY,
$request->returnToUrl );
+ if ( isset( $_GET['returnto'] ) ) {
+ $returnto = $_GET['returnto'];
+ } else {
+ $returnto = '';
+ }
$this->manager->setAuthenticationSessionData(
- PluggableAuthLogin::RETURNTOPAGE_SESSION_KEY,
$_GET['returnto']);
+ PluggableAuthLogin::RETURNTOPAGE_SESSION_KEY, $returnto
);
+ if ( isset( $_GET['returntoquery'] ) ) {
+ $returntoquery = $_GET['returntoquery'];
+ } else {
+ $returntoquery = '';
+ }
$this->manager->setAuthenticationSessionData(
- PluggableAuthLogin::RETURNTOQUERY_SESSION_KEY,
$_GET['returntoquery'] );
+ PluggableAuthLogin::RETURNTOQUERY_SESSION_KEY,
$returntoquery );
return AuthenticationResponse::newRedirect( [
new PluggableAuthContinueAuthenticationRequest()
diff --git a/extension.json b/extension.json
index 1f4f9e3..e593e35 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PluggableAuth",
- "version": "4.1",
+ "version": "4.2",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]"
],
--
To view, visit https://gerrit.wikimedia.org/r/357732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa5fb94d8f34499ed52784d1c76c280cd98ab4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Specify iconWhenInvisible for score node
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357731 ) Change subject: Specify iconWhenInvisible for score node .. Specify iconWhenInvisible for score node Bug: T166526 Change-Id: Idaeb4f2a342c938a25970ec5cef1789f86a2f06f --- M modules/ve-score/ve.ce.MWScoreNode.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/31/357731/1 diff --git a/modules/ve-score/ve.ce.MWScoreNode.js b/modules/ve-score/ve.ce.MWScoreNode.js index ebaf702..ed51eef 100644 --- a/modules/ve-score/ve.ce.MWScoreNode.js +++ b/modules/ve-score/ve.ce.MWScoreNode.js @@ -30,6 +30,8 @@ ve.ce.MWScoreNode.static.primaryCommandName = 'score'; +ve.ce.MWScoreNode.static.iconWhenInvisible = 'score'; + /* Methods */ /** -- To view, visit https://gerrit.wikimedia.org/r/357731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaeb4f2a342c938a25970ec5cef1789f86a2f06f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Specify iconWhenInvisible for math/chem nodes
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357730 ) Change subject: Specify iconWhenInvisible for math/chem nodes .. Specify iconWhenInvisible for math/chem nodes Bug: T166526 Change-Id: I42703d15fa7e491d85d01899c706dbca4e5816b6 --- M modules/ve-math/ve.ce.MWChemNode.js M modules/ve-math/ve.ce.MWMathNode.js 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/30/357730/1 diff --git a/modules/ve-math/ve.ce.MWChemNode.js b/modules/ve-math/ve.ce.MWChemNode.js index e78a48c..9edfedd 100644 --- a/modules/ve-math/ve.ce.MWChemNode.js +++ b/modules/ve-math/ve.ce.MWChemNode.js @@ -30,6 +30,8 @@ ve.ce.MWChemNode.static.primaryCommandName = 'chemDialog'; +ve.ce.MWChemNode.static.iconWhenInvisible = 'chem'; + /* Registration */ ve.ce.nodeFactory.register( ve.ce.MWChemNode ); diff --git a/modules/ve-math/ve.ce.MWMathNode.js b/modules/ve-math/ve.ce.MWMathNode.js index 2bbe294..ac859e0 100644 --- a/modules/ve-math/ve.ce.MWMathNode.js +++ b/modules/ve-math/ve.ce.MWMathNode.js @@ -30,6 +30,8 @@ ve.ce.MWMathNode.static.primaryCommandName = 'mathDialog'; +ve.ce.MWMathNode.static.iconWhenInvisible = 'math'; + /* Registration */ ve.ce.nodeFactory.register( ve.ce.MWMathNode ); -- To view, visit https://gerrit.wikimedia.org/r/357730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42703d15fa7e491d85d01899c706dbca4e5816b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_maps: remove other misc refs
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357729 )
Change subject: cache_maps: remove other misc refs
..
cache_maps: remove other misc refs
Bug: T164608
Change-Id: I4f70fcaaf0e59af750cc35eb0e210749c03c0be2
---
M modules/debdeploy/templates/debdeploy.erb
M modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
M modules/role/manifests/graphite/alerts/reqstats.pp
M modules/role/manifests/prometheus/ops.pp
4 files changed, 7 insertions(+), 35 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/debdeploy/templates/debdeploy.erb
b/modules/debdeploy/templates/debdeploy.erb
index c5a50f9..a120c49 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -143,15 +143,14 @@
mw-canary-single = debdeploy-appserver:single_canary
openldap = debdeploy-openldap-corp:standard, debdeploy-openldap-corp:canary,
debdeploy-openldap-labs:standard
openldap-canary = debdeploy-openldap-corp:canary
-cp-eqiad = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard,
debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard
-cp-codfw = debdeploy-cp-codfw-text:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-codfw-maps:standard
-cp-esams = debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-misc:standard,
debdeploy-cp-esams-maps:standard
-cp-ulsfo = debdeploy-cp-ulsfo-text:standard,
debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-ulsfo-misc:standard,
debdeploy-cp-ulsfo-maps:standard
-cp-maps = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-codfw-maps:standard,
debdeploy-cp-esams-maps:standard, debdeploy-cp-ulsfo-maps:standard
+cp-eqiad = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-text:standard,
debdeploy-cp-eqiad-upload:standard
+cp-codfw = debdeploy-cp-codfw-text:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-codfw-misc:standard
+cp-esams = debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-misc:standard
+cp-ulsfo = debdeploy-cp-ulsfo-text:standard,
debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-ulsfo-misc:standard
cp-misc = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard
cp-text = debdeploy-cp-eqiad-text:standard, debdeploy-cp-codfw-text:standard,
debdeploy-cp-esams-text:standard
cp-upload = debdeploy-cp-eqiad-upload:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-upload:standard
-cp = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard,
debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard,
debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard,
debdeploy-cp-codfw-maps:standard, debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-maps:standard,
debdeploy-cp-ulsfo-text:standard, debdeploy-cp-ulsfo-upload:standard,
debdeploy-cp-ulsfo-maps:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard
+cp = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-text:standard,
debdeploy-cp-eqiad-upload:standard, debdeploy-cp-codfw-text:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-ulsfo-text:standard,
debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard
cp-canary = debdeploy-cp:canary
redis-eqiad = debdeploy-redis-eqiad:standard, debdeploy-redis-eqiad:canary
redis-codfw = debdeploy-redis-codfw:standard
diff --git
a/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
b/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
index 281abc6..86c880f 100644
--- a/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
+++ b/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
@@ -446,16 +446,11 @@
},
{
"selected": false,
-"text": "maps",
-"value": "maps"
- },
- {
-"selected": false,
"text": "misc",
"value": "misc"
}
],
-"query": "text,upload,maps,misc",
+"query": "text,upload,misc",
"refresh": 1,
"refresh_on_load": false,
"regex": "",
@@ -549,4 +544,4 @@
"timezone": "utc",
"title": "Varnish: Aggregate Client Status Codes",
"version": 23
-}
\ No newline at end of file
+}
diff --git a/modules/role/manifests/graphite/alerts/reqstats.pp
b/modules/role/manifests/graphite/alerts/reqstats.pp
index c9e8e3f..9ddec16 100644
--- a/modules/role/manifests/graphite/alerts/reqst
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_maps: remove other misc refs
BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357729 )
Change subject: cache_maps: remove other misc refs
..
cache_maps: remove other misc refs
Change-Id: I4f70fcaaf0e59af750cc35eb0e210749c03c0be2
---
M modules/debdeploy/templates/debdeploy.erb
M modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
M modules/role/manifests/graphite/alerts/reqstats.pp
M modules/role/manifests/prometheus/ops.pp
4 files changed, 7 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/357729/1
diff --git a/modules/debdeploy/templates/debdeploy.erb
b/modules/debdeploy/templates/debdeploy.erb
index c5a50f9..a120c49 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -143,15 +143,14 @@
mw-canary-single = debdeploy-appserver:single_canary
openldap = debdeploy-openldap-corp:standard, debdeploy-openldap-corp:canary,
debdeploy-openldap-labs:standard
openldap-canary = debdeploy-openldap-corp:canary
-cp-eqiad = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard,
debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard
-cp-codfw = debdeploy-cp-codfw-text:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-codfw-maps:standard
-cp-esams = debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-misc:standard,
debdeploy-cp-esams-maps:standard
-cp-ulsfo = debdeploy-cp-ulsfo-text:standard,
debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-ulsfo-misc:standard,
debdeploy-cp-ulsfo-maps:standard
-cp-maps = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-codfw-maps:standard,
debdeploy-cp-esams-maps:standard, debdeploy-cp-ulsfo-maps:standard
+cp-eqiad = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-text:standard,
debdeploy-cp-eqiad-upload:standard
+cp-codfw = debdeploy-cp-codfw-text:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-codfw-misc:standard
+cp-esams = debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-misc:standard
+cp-ulsfo = debdeploy-cp-ulsfo-text:standard,
debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-ulsfo-misc:standard
cp-misc = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard
cp-text = debdeploy-cp-eqiad-text:standard, debdeploy-cp-codfw-text:standard,
debdeploy-cp-esams-text:standard
cp-upload = debdeploy-cp-eqiad-upload:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-upload:standard
-cp = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard,
debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard,
debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard,
debdeploy-cp-codfw-maps:standard, debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-esams-maps:standard,
debdeploy-cp-ulsfo-text:standard, debdeploy-cp-ulsfo-upload:standard,
debdeploy-cp-ulsfo-maps:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard
+cp = debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-text:standard,
debdeploy-cp-eqiad-upload:standard, debdeploy-cp-codfw-text:standard,
debdeploy-cp-codfw-upload:standard, debdeploy-cp-esams-text:standard,
debdeploy-cp-esams-upload:standard, debdeploy-cp-ulsfo-text:standard,
debdeploy-cp-ulsfo-upload:standard, debdeploy-cp-codfw-misc:standard,
debdeploy-cp-esams-misc:standard, debdeploy-cp-ulsfo-misc:standard
cp-canary = debdeploy-cp:canary
redis-eqiad = debdeploy-redis-eqiad:standard, debdeploy-redis-eqiad:canary
redis-codfw = debdeploy-redis-codfw:standard
diff --git
a/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
b/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
index 281abc6..86c880f 100644
--- a/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
+++ b/modules/grafana/files/dashboards/varnish-aggregate-client-status-codes
@@ -446,16 +446,11 @@
},
{
"selected": false,
-"text": "maps",
-"value": "maps"
- },
- {
-"selected": false,
"text": "misc",
"value": "misc"
}
],
-"query": "text,upload,maps,misc",
+"query": "text,upload,misc",
"refresh": 1,
"refresh_on_load": false,
"regex": "",
@@ -549,4 +544,4 @@
"timezone": "utc",
"title": "Varnish: Aggregate Client Status Codes",
"version": 23
-}
\ No newline at end of file
+}
diff --git a/modules/role/manifests/graphite/alerts/reqstats.pp
b/modules/role/manifests/graphite/alerts/reqstats.pp
index c9e8e3f..9ddec16 100644
--- a/modules/role/manifests/graphite/alerts/reqstats.pp
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add all redirects of template "Category redirect" for enwiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357639 )
Change subject: Add all redirects of template "Category redirect" for enwiki,
eswiki, ptwiki, trwiki, ukwiki.
..
Add all redirects of template "Category redirect" for enwiki, eswiki, ptwiki,
trwiki, ukwiki.
https://en.wikipedia.org/w/index.php?title=Special:WhatLinksHere/Template:Category_redirect&hidetrans=1&hidelinks=1
https://es.wikipedia.org/w/index.php?title=Especial:LoQueEnlazaAqu%C3%AD/Plantilla:Categor%C3%ADa_redirigida&hidetrans=1&hidelinks=1
https://pt.wikipedia.org/w/index.php?title=Especial:P%C3%A1ginas_afluentes/Template:redirecionamento%20de%20categoria&hidetrans=1&hidelinks=1
https://tr.wikipedia.org/w/index.php?title=%C3%96zel:SayfayaBa%C4%9Flant%C4%B1lar/%C5%9Eablon:Kategori_y%C3%B6nlendirme&hidetrans=1&hidelinks=1
https://uk.wikipedia.org/w/index.php?title=%D0%A1%D0%BF%D0%B5%D1%86%D1%96%D0%B0%D0%BB%D1%8C%D0%BD%D0%B0:%D0%9F%D0%BE%D1%81%D0%B8%D0%BB%D0%B0%D0%BD%D0%BD%D1%8F_%D1%81%D1%8E%D0%B4%D0%B8/%D0%A8%D0%B0%D0%B1%D0%BB%D0%BE%D0%BD:Categoryredirect&hidetrans=1&hidelinks=1
Change-Id: Iff34b1006216235c345c3fa27fde094fde08d52a
---
M pywikibot/families/wikipedia_family.py
1 file changed, 27 insertions(+), 7 deletions(-)
Approvals:
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/wikipedia_family.py
b/pywikibot/families/wikipedia_family.py
index 1326269..c17422e 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -80,8 +80,20 @@
'arz': (u'تحويل تصنيف',),
'cs': (u'Zastaralá kategorie',),
'da': (u'Kategoriomdirigering',),
-'en': (u'Category redirect',),
-'es': (u'Categoría redirigida',),
+'en': ('Category redirect',
+ 'Categoryredirect',
+ 'Catredirect',
+ 'Cat redirect',
+ 'Cat redir',
+ 'Cat red',
+ 'Catred',
+ 'Cat move',
+ 'Category Redirect',
+ 'Category move',
+ 'Catr',),
+'es': (u'Categoría redirigida',
+ 'Category redirect',
+ 'Catred',),
'eu': (u'Kategoria redirect',),
'fa': (u'رده بهتر',
u'انتقال رده',),
@@ -107,9 +119,11 @@
u'Kategori-omdirigering',),
'pl': (u'Przekierowanie kategorii',
u'Category redirect',),
-'pt': (u'Redirecionamento de categoria',
- u'Redircat',
- u'Redirect-categoria',),
+'pt': ('Redirecionamento de categoria',
+ 'Redirecionamento de categorias',
+ 'Redirect-categoria',
+ 'Redircat',
+ 'Category redirect',),
'ro': (u'Redirect categorie',
u'Redirecționare categorie',
u'Redirect category',
@@ -143,8 +157,14 @@
u'Omdirigering kategori',),
'tl': (u'Category redirect',),
'tr': (u'Kategori yönlendirme',
- u'Kat redir',),
-'uk': (u'Categoryredirect',),
+ u'Kategori taşıma',
+ 'Kat redir',
+ 'Redirect category',
+ 'Seecat',),
+'uk': ('Categoryredirect',
+ 'Category redirect',
+ 'Catredirect',
+ 'Redirect category',),
'vi': (u'Đổi hướng thể loại',
u'Thể loại đổi hướng',
u'Chuyển hướng thể loại',
--
To view, visit https://gerrit.wikimedia.org/r/357639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff34b1006216235c345c3fa27fde094fde08d52a
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XXN
Gerrit-Reviewer: Framawiki
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Mpaa
Gerrit-Reviewer: XXN
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]: group1 wikis to 1.30.0-wmf.2
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357727 )
Change subject: group1 wikis to 1.30.0-wmf.2
..
group1 wikis to 1.30.0-wmf.2
Change-Id: Ida464ee226fc1213ae38a81c03ce1203b73eff1e
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index 8c3c714..0042959 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.2",
-"aawikibooks": "php-1.30.0-wmf.4",
-"aawiktionary": "php-1.30.0-wmf.4",
+"aawikibooks": "php-1.30.0-wmf.2",
+"aawiktionary": "php-1.30.0-wmf.2",
"abwiki": "php-1.30.0-wmf.2",
-"abwiktionary": "php-1.30.0-wmf.4",
+"abwiktionary": "php-1.30.0-wmf.2",
"acewiki": "php-1.30.0-wmf.2",
-"advisorywiki": "php-1.30.0-wmf.4",
+"advisorywiki": "php-1.30.0-wmf.2",
"adywiki": "php-1.30.0-wmf.2",
"afwiki": "php-1.30.0-wmf.2",
-"afwikibooks": "php-1.30.0-wmf.4",
-"afwikiquote": "php-1.30.0-wmf.4",
-"afwiktionary": "php-1.30.0-wmf.4",
+"afwikibooks": "php-1.30.0-wmf.2",
+"afwikiquote": "php-1.30.0-wmf.2",
+"afwiktionary": "php-1.30.0-wmf.2",
"akwiki": "php-1.30.0-wmf.2",
-"akwikibooks": "php-1.30.0-wmf.4",
-"akwiktionary": "php-1.30.0-wmf.4",
+"akwikibooks": "php-1.30.0-wmf.2",
+"akwiktionary": "php-1.30.0-wmf.2",
"alswiki": "php-1.30.0-wmf.2",
-"alswikibooks": "php-1.30.0-wmf.4",
-"alswikiquote": "php-1.30.0-wmf.4",
-"alswiktionary": "php-1.30.0-wmf.4",
+"alswikibooks": "php-1.30.0-wmf.2",
+"alswikiquote": "php-1.30.0-wmf.2",
+"alswiktionary": "php-1.30.0-wmf.2",
"amwiki": "php-1.30.0-wmf.2",
-"amwikiquote": "php-1.30.0-wmf.4",
-"amwiktionary": "php-1.30.0-wmf.4",
+"amwikiquote": "php-1.30.0-wmf.2",
+"amwiktionary": "php-1.30.0-wmf.2",
"angwiki": "php-1.30.0-wmf.2",
-"angwikibooks": "php-1.30.0-wmf.4",
-"angwikiquote": "php-1.30.0-wmf.4",
-"angwikisource": "php-1.30.0-wmf.4",
-"angwiktionary": "php-1.30.0-wmf.4",
+"angwikibooks": "php-1.30.0-wmf.2",
+"angwikiquote": "php-1.30.0-wmf.2",
+"angwikisource": "php-1.30.0-wmf.2",
+"angwiktionary": "php-1.30.0-wmf.2",
"anwiki": "php-1.30.0-wmf.2",
-"anwiktionary": "php-1.30.0-wmf.4",
+"anwiktionary": "php-1.30.0-wmf.2",
"arbcom_cswiki": "php-1.30.0-wmf.2",
"arbcom_dewiki": "php-1.30.0-wmf.2",
"arbcom_enwiki": "php-1.30.0-wmf.2",
@@ -35,723 +35,723 @@
"arbcom_nlwiki": "php-1.30.0-wmf.2",
"arcwiki": "php-1.30.0-wmf.2",
"arwiki": "php-1.30.0-wmf.2",
-"arwikibooks": "php-1.30.0-wmf.4",
-"arwikimedia": "php-1.30.0-wmf.4",
-"arwikinews": "php-1.30.0-wmf.4",
-"arwikiquote": "php-1.30.0-wmf.4",
-"arwikisource": "php-1.30.0-wmf.4",
-"arwikiversity": "php-1.30.0-wmf.4",
-"arwiktionary": "php-1.30.0-wmf.4",
+"arwikibooks": "php-1.30.0-wmf.2",
+"arwikimedia": "php-1.30.0-wmf.2",
+"arwikinews": "php-1.30.0-wmf.2",
+"arwikiquote": "php-1.30.0-wmf.2",
+"arwikisource": "php-1.30.0-wmf.2",
+"arwikiversity": "php-1.30.0-wmf.2",
+"arwiktionary": "php-1.30.0-wmf.2",
"arzwiki": "php-1.30.0-wmf.2",
"astwiki": "php-1.30.0-wmf.2",
-"astwikibooks": "php-1.30.0-wmf.4",
-"astwikiquote": "php-1.30.0-wmf.4",
-"astwiktionary": "php-1.30.0-wmf.4",
+"astwikibooks": "php-1.30.0-wmf.2",
+"astwikiquote": "php-1.30.0-wmf.2",
+"astwiktionary": "php-1.30.0-wmf.2",
"aswiki": "php-1.30.0-wmf.2",
-"aswikibooks": "php-1.30.0-wmf.4",
-"aswikisource": "php-1.30.0-wmf.4",
-"aswiktionary": "php-1.30.0-wmf.4",
-"auditcomwiki": "php-1.30.0-wmf.4",
+"aswikibooks": "php-1.30.0-wmf.2",
+"aswikisource": "php-1.30.0-wmf.2",
+"aswiktionary": "php-1.30.0-wmf.2",
+"auditcomwiki": "php-1.30.0-wmf.2",
"avwiki": "php-1.30.0-wmf.2",
-"avwiktionary": "php-1.30.0-wmf.4",
+"avwiktionary": "php-1.30.0-wmf.2",
"aywiki": "php-1.30.0-wmf.2",
-"aywikibooks": "php-1.30.0-wmf.4",
-"aywiktionary": "php-1.30.0-wmf.4",
+"aywikibooks": "php-1.30.0-wmf.2",
+"aywiktionary": "php-1.30.0-wmf.2",
"azbwiki": "php-1.30.0-wmf.2",
"azwiki": "php-1.30.0-wmf.2",
-"azwikibooks": "php-1.30.0-wmf.4",
-"azwikiquote": "php-1.30.0-wmf.4",
-"azwikisource": "php-1.30.0-wmf.4",
-"azwiktionary": "php-1.30.0-wmf.4",
+"azwikibooks": "php-1.30.0-wmf.2",
+"azwikiquote": "php-1.30.0-wmf.2",
+"azwikisource": "php-1.30.0-wmf.2",
+"azwiktionary": "php-1.30.0-wmf.2",
"barwiki": "php-1.30.0-wmf.2",
"bat_smgwiki": "php-1.30.0-wmf.2",
"bawiki": "php-1.30.0-wmf.2",
-"bawikibooks": "php-1.30.0-wmf.4",
+"bawikibooks": "php-1.30.0-wmf.2",
"bclwiki": "php-1.30.0-wmf.2",
-"bdwikimedia": "php-1.30.0-wmf.4",
+
[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: Use 'hiero' icon when invisible
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357728 ) Change subject: Use 'hiero' icon when invisible .. Use 'hiero' icon when invisible Bug: T166526 Change-Id: I1a3833683b8d868ddd69ec982de5aa38dddc5953 --- M modules/ve-wikihiero/ve.ce.MWHieroNode.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/wikihiero refs/changes/28/357728/1 diff --git a/modules/ve-wikihiero/ve.ce.MWHieroNode.js b/modules/ve-wikihiero/ve.ce.MWHieroNode.js index bdd804c..84a2300 100644 --- a/modules/ve-wikihiero/ve.ce.MWHieroNode.js +++ b/modules/ve-wikihiero/ve.ce.MWHieroNode.js @@ -28,6 +28,8 @@ ve.ce.MWHieroNode.static.primaryCommandName = 'hiero'; +ve.ce.MWHieroNode.static.iconWhenInvisible = 'hiero'; + /* Registration */ ve.ce.nodeFactory.register( ve.ce.MWHieroNode ); -- To view, visit https://gerrit.wikimedia.org/r/357728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a3833683b8d868ddd69ec982de5aa38dddc5953 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/wikihiero Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.2
20after4 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357727 )
Change subject: group1 wikis to 1.30.0-wmf.2
..
group1 wikis to 1.30.0-wmf.2
Change-Id: Ida464ee226fc1213ae38a81c03ce1203b73eff1e
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/27/357727/1
diff --git a/wikiversions.json b/wikiversions.json
index 8c3c714..0042959 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.2",
-"aawikibooks": "php-1.30.0-wmf.4",
-"aawiktionary": "php-1.30.0-wmf.4",
+"aawikibooks": "php-1.30.0-wmf.2",
+"aawiktionary": "php-1.30.0-wmf.2",
"abwiki": "php-1.30.0-wmf.2",
-"abwiktionary": "php-1.30.0-wmf.4",
+"abwiktionary": "php-1.30.0-wmf.2",
"acewiki": "php-1.30.0-wmf.2",
-"advisorywiki": "php-1.30.0-wmf.4",
+"advisorywiki": "php-1.30.0-wmf.2",
"adywiki": "php-1.30.0-wmf.2",
"afwiki": "php-1.30.0-wmf.2",
-"afwikibooks": "php-1.30.0-wmf.4",
-"afwikiquote": "php-1.30.0-wmf.4",
-"afwiktionary": "php-1.30.0-wmf.4",
+"afwikibooks": "php-1.30.0-wmf.2",
+"afwikiquote": "php-1.30.0-wmf.2",
+"afwiktionary": "php-1.30.0-wmf.2",
"akwiki": "php-1.30.0-wmf.2",
-"akwikibooks": "php-1.30.0-wmf.4",
-"akwiktionary": "php-1.30.0-wmf.4",
+"akwikibooks": "php-1.30.0-wmf.2",
+"akwiktionary": "php-1.30.0-wmf.2",
"alswiki": "php-1.30.0-wmf.2",
-"alswikibooks": "php-1.30.0-wmf.4",
-"alswikiquote": "php-1.30.0-wmf.4",
-"alswiktionary": "php-1.30.0-wmf.4",
+"alswikibooks": "php-1.30.0-wmf.2",
+"alswikiquote": "php-1.30.0-wmf.2",
+"alswiktionary": "php-1.30.0-wmf.2",
"amwiki": "php-1.30.0-wmf.2",
-"amwikiquote": "php-1.30.0-wmf.4",
-"amwiktionary": "php-1.30.0-wmf.4",
+"amwikiquote": "php-1.30.0-wmf.2",
+"amwiktionary": "php-1.30.0-wmf.2",
"angwiki": "php-1.30.0-wmf.2",
-"angwikibooks": "php-1.30.0-wmf.4",
-"angwikiquote": "php-1.30.0-wmf.4",
-"angwikisource": "php-1.30.0-wmf.4",
-"angwiktionary": "php-1.30.0-wmf.4",
+"angwikibooks": "php-1.30.0-wmf.2",
+"angwikiquote": "php-1.30.0-wmf.2",
+"angwikisource": "php-1.30.0-wmf.2",
+"angwiktionary": "php-1.30.0-wmf.2",
"anwiki": "php-1.30.0-wmf.2",
-"anwiktionary": "php-1.30.0-wmf.4",
+"anwiktionary": "php-1.30.0-wmf.2",
"arbcom_cswiki": "php-1.30.0-wmf.2",
"arbcom_dewiki": "php-1.30.0-wmf.2",
"arbcom_enwiki": "php-1.30.0-wmf.2",
@@ -35,723 +35,723 @@
"arbcom_nlwiki": "php-1.30.0-wmf.2",
"arcwiki": "php-1.30.0-wmf.2",
"arwiki": "php-1.30.0-wmf.2",
-"arwikibooks": "php-1.30.0-wmf.4",
-"arwikimedia": "php-1.30.0-wmf.4",
-"arwikinews": "php-1.30.0-wmf.4",
-"arwikiquote": "php-1.30.0-wmf.4",
-"arwikisource": "php-1.30.0-wmf.4",
-"arwikiversity": "php-1.30.0-wmf.4",
-"arwiktionary": "php-1.30.0-wmf.4",
+"arwikibooks": "php-1.30.0-wmf.2",
+"arwikimedia": "php-1.30.0-wmf.2",
+"arwikinews": "php-1.30.0-wmf.2",
+"arwikiquote": "php-1.30.0-wmf.2",
+"arwikisource": "php-1.30.0-wmf.2",
+"arwikiversity": "php-1.30.0-wmf.2",
+"arwiktionary": "php-1.30.0-wmf.2",
"arzwiki": "php-1.30.0-wmf.2",
"astwiki": "php-1.30.0-wmf.2",
-"astwikibooks": "php-1.30.0-wmf.4",
-"astwikiquote": "php-1.30.0-wmf.4",
-"astwiktionary": "php-1.30.0-wmf.4",
+"astwikibooks": "php-1.30.0-wmf.2",
+"astwikiquote": "php-1.30.0-wmf.2",
+"astwiktionary": "php-1.30.0-wmf.2",
"aswiki": "php-1.30.0-wmf.2",
-"aswikibooks": "php-1.30.0-wmf.4",
-"aswikisource": "php-1.30.0-wmf.4",
-"aswiktionary": "php-1.30.0-wmf.4",
-"auditcomwiki": "php-1.30.0-wmf.4",
+"aswikibooks": "php-1.30.0-wmf.2",
+"aswikisource": "php-1.30.0-wmf.2",
+"aswiktionary": "php-1.30.0-wmf.2",
+"auditcomwiki": "php-1.30.0-wmf.2",
"avwiki": "php-1.30.0-wmf.2",
-"avwiktionary": "php-1.30.0-wmf.4",
+"avwiktionary": "php-1.30.0-wmf.2",
"aywiki": "php-1.30.0-wmf.2",
-"aywikibooks": "php-1.30.0-wmf.4",
-"aywiktionary": "php-1.30.0-wmf.4",
+"aywikibooks": "php-1.30.0-wmf.2",
+"aywiktionary": "php-1.30.0-wmf.2",
"azbwiki": "php-1.30.0-wmf.2",
"azwiki": "php-1.30.0-wmf.2",
-"azwikibooks": "php-1.30.0-wmf.4",
-"azwikiquote": "php-1.30.0-wmf.4",
-"azwikisource": "php-1.30.0-wmf.4",
-"azwiktionary": "php-1.30.0-wmf.4",
+"azwikibooks": "php-1.30.0-wmf.2",
+"azwikiquote": "php-1.30.0-wmf.2",
+"azwikisource": "php-1.30.0-wmf.2",
+"azwiktionary": "php-1.30.0-wmf.2",
"barwiki": "php-1.30.0-wmf.2",
"bat_smgwiki": "php-1.30.0-wmf.2",
"bawiki": "php-1.30.0-wmf.2",
-"bawikibooks": "php-1.30.0-wmf.4",
+"bawikibooks": "php-1.30.0-wmf.2",
"bclwiki": "php-1.30.0-wmf.2",
-"bdwikimedia": "php-1.30
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Give extensions a fallback icon when invisible
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357726 ) Change subject: Give extensions a fallback icon when invisible .. Give extensions a fallback icon when invisible Bug: T166526 Change-Id: I5eafbef3b751a83cef353c8a9f09d90820fa9409 --- M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/26/357726/1 diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js index f0acccf..c0e4fd8 100644 --- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js +++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js @@ -46,6 +46,8 @@ */ ve.ce.MWExtensionNode.static.rendersEmpty = false; +ve.ce.MWExtensionNode.static.iconWhenInvisible = 'alienextension'; + /* Methods */ /** -- To view, visit https://gerrit.wikimedia.org/r/357726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5eafbef3b751a83cef353c8a9f09d90820fa9409 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_maps: remove ipsec defs on kafka nodes
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357725 )
Change subject: cache_maps: remove ipsec defs on kafka nodes
..
cache_maps: remove ipsec defs on kafka nodes
Bug: T164608
Change-Id: Ic03feb53326be861f4938520bfecd89f50ce8767
---
M modules/role/manifests/ipsec.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/ipsec.pp b/modules/role/manifests/ipsec.pp
index a9e1e18..69b2954 100644
--- a/modules/role/manifests/ipsec.pp
+++ b/modules/role/manifests/ipsec.pp
@@ -44,12 +44,10 @@
$text= hiera('cache::text::nodes')
$misc= hiera('cache::misc::nodes')
$upload = hiera('cache::upload::nodes')
-$maps= hiera('cache::maps::nodes')
$targets = array_concat(
$text['esams'], $text['ulsfo'], $text['codfw'],
$misc['esams'], $misc['ulsfo'], $misc['codfw'],
-$upload['esams'], $upload['ulsfo'], $upload['codfw'],
-$maps['esams'], $maps['ulsfo'], $maps['codfw']
+$upload['esams'], $upload['ulsfo'], $upload['codfw']
)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic03feb53326be861f4938520bfecd89f50ce8767
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_maps: remove ipsec defs on kafka nodes
BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357725 )
Change subject: cache_maps: remove ipsec defs on kafka nodes
..
cache_maps: remove ipsec defs on kafka nodes
Bug: T164608
Change-Id: Ic03feb53326be861f4938520bfecd89f50ce8767
---
M modules/role/manifests/ipsec.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/357725/1
diff --git a/modules/role/manifests/ipsec.pp b/modules/role/manifests/ipsec.pp
index a9e1e18..69b2954 100644
--- a/modules/role/manifests/ipsec.pp
+++ b/modules/role/manifests/ipsec.pp
@@ -44,12 +44,10 @@
$text= hiera('cache::text::nodes')
$misc= hiera('cache::misc::nodes')
$upload = hiera('cache::upload::nodes')
-$maps= hiera('cache::maps::nodes')
$targets = array_concat(
$text['esams'], $text['ulsfo'], $text['codfw'],
$misc['esams'], $misc['ulsfo'], $misc['codfw'],
-$upload['esams'], $upload['ulsfo'], $upload['codfw'],
-$maps['esams'], $maps['ulsfo'], $maps['codfw']
+$upload['esams'], $upload['ulsfo'], $upload['codfw']
)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic03feb53326be861f4938520bfecd89f50ce8767
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove old maps reverse dns
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357634 )
Change subject: remove old maps reverse dns
..
remove old maps reverse dns
Bug: T164608
Change-Id: Idb13045071193e6653be395b69d84f7dabc47598
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/26.35.198.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
8 files changed, 0 insertions(+), 10 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index f0d03e3..bc2f980 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -212,7 +212,6 @@
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.codfw.wikimedia.org.
-d.0.0.0 1H IN PTR maps-lb.codfw.wikimedia.org.
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index f5308e1..ef75d6e 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -260,7 +260,6 @@
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.eqiad.wikimedia.org.
-d.0.0.0 1H IN PTR maps-lb.eqiad.wikimedia.org.
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/153.80.208.in-addr.arpa
b/templates/153.80.208.in-addr.arpa
index 7ec5f74..94f2c14 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -146,8 +146,6 @@
240 1H IN PTR upload-lb.codfw.wikimedia.org.
-244 1H IN PTR maps-lb.codfw.wikimedia.org.
-
248 1H IN PTR misc-web-lb.codfw.wikimedia.org.
250 1H IN PTR git-ssh.codfw.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index f8cdab0..44cf7d1 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -166,8 +166,6 @@
240 1H IN PTR upload-lb.eqiad.wikimedia.org.
-244 1H IN PTR maps-lb.eqiad.wikimedia.org.
-
250 1H IN PTR git-ssh.eqiad.wikimedia.org.
251 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
diff --git a/templates/174.198.91.in-addr.arpa
b/templates/174.198.91.in-addr.arpa
index 504559f..f7e7732 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -44,7 +44,6 @@
; - 91.198.174.208/28 (208-223) LVS high-traffic2 (Multimedia & Misc)
208 1H IN PTR upload-lb.esams.wikimedia.org.
-209 1H IN PTR maps-lb.esams.wikimedia.org.
216 1H IN PTR dns-rec-lb.esams.wikimedia.org. ; not actually public!
217 1H IN PTR misc-web-lb.esams.wikimedia.org.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 072fab9..0ef5700 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -96,7 +96,6 @@
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.esams.wikimedia.org.
-d.0.0.0 1H IN PTR maps-lb.esams.wikimedia.org.
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 7c9a2d7..090bd06 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -33,7 +33,6 @@
; - 198.35.26.112/28 (112-127) LVS high-traffic2 (Multimedia & Misc)
112 1H IN PTR upload-lb.ulsfo.wikimedia.org.
-113 1H IN PTR maps-lb.ulsfo.wikimedia.org.
120 1H IN PTR misc-web-lb.ulsfo.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index aa79cbc..2ba2ae7 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -145,7 +145,6 @@
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.ulsfo.wikimedia.org.
-d.0.0.0 1H IN PTR maps-lb.ulsfo.wikimedia.org.
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
--
To view, visit https://gerrit.wikimedia.org/r/357634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb13045071193e6653be395b69d84f7dabc47598
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
__
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove maps geoip definition
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357632 )
Change subject: remove maps geoip definition
..
remove maps geoip definition
Bug: T164608
Change-Id: Ie0485a0d7b00a86975ad4f5dfaee33f7bedc61ad
---
M geo-resources
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/geo-resources b/geo-resources
index 5707291..38abf4c 100644
--- a/geo-resources
+++ b/geo-resources
@@ -18,16 +18,6 @@
ulsfo => { addrs_v4 => 198.35.26.112, addrs_v6 =>
2620:0:863:ed1a::2:b }
}
}
-maps-addrs => {
-map => generic-map
-service_types => up
-dcmap => {
-eqiad => { addrs_v4 => 208.80.154.244, addrs_v6 =>
2620:0:861:ed1a::2:d }
-codfw => { addrs_v4 => 208.80.153.244, addrs_v6 =>
2620:0:860:ed1a::2:d }
-esams => { addrs_v4 => 91.198.174.209, addrs_v6 =>
2620:0:862:ed1a::2:d }
-ulsfo => { addrs_v4 => 198.35.26.113, addrs_v6 =>
2620:0:863:ed1a::2:d }
-}
-}
misc-addrs => {
map => generic-map
service_types => up
--
To view, visit https://gerrit.wikimedia.org/r/357632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0485a0d7b00a86975ad4f5dfaee33f7bedc61ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
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]: imageharvest.py: fix bs4 import in python3
Mpaa has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357724 ) Change subject: imageharvest.py: fix bs4 import in python3 .. imageharvest.py: fix bs4 import in python3 Change-Id: I1e9212ea0f972a66b36c288a5e50e1cbe903a1e5 --- M scripts/imageharvest.py 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/24/357724/1 diff --git a/scripts/imageharvest.py b/scripts/imageharvest.py index 300676d..57081b1 100644 --- a/scripts/imageharvest.py +++ b/scripts/imageharvest.py @@ -25,9 +25,13 @@ __version__ = '$Id$' # -import os -import BeautifulSoup +try: +from bs4 import BeautifulSoup +except ImportError as e: +BeautifulSoup = e + +import os import pywikibot -- To view, visit https://gerrit.wikimedia.org/r/357724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e9212ea0f972a66b36c288a5e50e1cbe903a1e5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs_service_ips: remove old maps IPs
BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357635 ) Change subject: lvs_service_ips: remove old maps IPs .. lvs_service_ips: remove old maps IPs Bug: T164608 Change-Id: I9ac743cbb74975c82a2e109b9dcd01613ec4a796 --- M hieradata/common/lvs/configuration.yaml 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index 5c93476..f4bc84d 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -15,24 +15,16 @@ upload: &ip_block002 codfw: uploadlb: 208.80.153.240 - mapslb: 208.80.153.244 uploadlb6: 2620:0:860:ed1a::2:b - mapslb6: 2620:0:860:ed1a::2:d eqiad: uploadlb: 208.80.154.240 - mapslb: 208.80.154.244 uploadlb6: 2620:0:861:ed1a::2:b - mapslb6: 2620:0:861:ed1a::2:d esams: uploadlb: 91.198.174.208 - mapslb: 91.198.174.209 uploadlb6: 2620:0:862:ed1a::2:b - mapslb6: 2620:0:862:ed1a::2:d ulsfo: uploadlb: 198.35.26.112 - mapslb: 198.35.26.113 uploadlb6: 2620:0:863:ed1a::2:b - mapslb6: 2620:0:863:ed1a::2:d apaches: &ip_block007 eqiad: 10.2.2.1 codfw: 10.2.1.1 -- To view, visit https://gerrit.wikimedia.org/r/357635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ac743cbb74975c82a2e109b9dcd01613ec4a796 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack Gerrit-Reviewer: BBlack 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]: Adding logrotate template to set mail::mx exim log retention...
Herron has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357723 )
Change subject: Adding logrotate template to set mail::mx exim log retention to
60 days
..
Adding logrotate template to set mail::mx exim log retention to 60 days
Change-Id: I58b4df9fd13f6773fd4d2ac49c7b08b0a947e67a
---
M modules/role/manifests/mail/mx.pp
A modules/role/templates/exim/logrotate/exim4-base.mx.erb
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/357723/1
diff --git a/modules/role/manifests/mail/mx.pp
b/modules/role/manifests/mail/mx.pp
index d7394c8..1cb8e93 100644
--- a/modules/role/manifests/mail/mx.pp
+++ b/modules/role/manifests/mail/mx.pp
@@ -100,4 +100,10 @@
weekday => 0,
command => "/usr/bin/mail -s '${subject}' ${recipient} < ${alias_file}
>/dev/null 2>&1",
}
+
+# Customize logrotate settings to support longer retention (T167333)
+logrotate::conf { 'exim4-base':
+ensure => 'present',
+content => template('role/exim/logrotate/exim4-base.mx.erb'),
+}
}
diff --git a/modules/role/templates/exim/logrotate/exim4-base.mx.erb
b/modules/role/templates/exim/logrotate/exim4-base.mx.erb
new file mode 100644
index 000..53eb30d
--- /dev/null
+++ b/modules/role/templates/exim/logrotate/exim4-base.mx.erb
@@ -0,0 +1,9 @@
+/var/log/exim4/mainlog /var/log/exim4/rejectlog {
+ daily
+ missingok
+ rotate 60
+ compress
+ delaycompress
+ notifempty
+ create 640 Debian-exim adm
+}
--
To view, visit https://gerrit.wikimedia.org/r/357723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58b4df9fd13f6773fd4d2ac49c7b08b0a947e67a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.4]: Split off styles for PHP DateInputWidget to separate module
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357694 )
Change subject: Split off styles for PHP DateInputWidget to separate module
..
Split off styles for PHP DateInputWidget to separate module
This lets us load them with addModuleStyles() (without generating a warning).
Bug: T167343
Change-Id: I88f0716c6a5ac702cc07e8015cfe25d81538a536
---
M includes/specials/SpecialContributions.php
M resources/Resources.php
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
A resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
4 files changed, 64 insertions(+), 46 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 4da1c85..e2fa8a3 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -40,7 +40,7 @@
$out->addModuleStyles( [
'mediawiki.special',
'mediawiki.special.changeslist',
- 'mediawiki.widgets.DateInputWidget',
+ 'mediawiki.widgets.DateInputWidget.styles',
] );
$out->addModules( 'mediawiki.special.contributions' );
$this->addHelpLink( 'Help:User contributions' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 46aafd5..7c0e4af 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2338,6 +2338,15 @@
'oojs-ui-widgets',
'oojs-ui.styles.icons-movement',
'moment',
+ 'mediawiki.widgets.DateInputWidget.styles',
+ ],
+ 'targets' => [ 'desktop', 'mobile' ],
+ ],
+ 'mediawiki.widgets.DateInputWidget.styles' => [
+ 'skinStyles' => [
+ 'default' => [
+
'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less',
+ ],
],
'targets' => [ 'desktop', 'mobile' ],
],
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 3ecdea8..47f8045 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -1,15 +1,9 @@
/*!
- * MediaWiki Widgets – DateInputWidget styles.
+ * MediaWiki Widgets – JS DateInputWidget styles.
*
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-
-.oo-ui-box-sizing( @type: border-box ) {
- -webkit-box-sizing: @type;
- -moz-box-sizing: @type;
- box-sizing: @type;
-}
.oo-ui-unselectable() {
-webkit-touch-callout: none;
@@ -19,47 +13,9 @@
user-select: none;
}
-.oo-ui-inline-spacing( @spacing, @cancelled-spacing: 0 ) {
- margin-right: @spacing;
-
- &:last-child {
- margin-right: @cancelled-spacing;
- }
-}
-
@indicator-size: unit( 12 / 16 / 0.8, em );
.mw-widget-dateInputWidget {
- &.oo-ui-textInputWidget {
- display: inline-block;
- position: relative;
- width: 21em;
- margin-top: 0.25em;
- .oo-ui-inline-spacing( 0.5em );
- margin-bottom: 0.25em;
- margin-left: 0;
- }
-
- &-handle,
- &.oo-ui-textInputWidget input {
- background-color: #fff;
- display: inline-block;
- position: relative;
- .oo-ui-box-sizing( border-box );
- width: 100%;
- cursor: pointer;
- padding: 0.5em 1em;
- border: 1px solid #a2a9b1;
- border-radius: 2px;
- outline: 0;
- line-height: 1.275;
- /**
-* Ensures non-infused and infused widget have the same height.
-* Equal to line height + top padding + bottom padding
-*/
- height: 2.275em;
- }
-
&-handle {
.oo-ui-unselectable();
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
new file mode 100644
index 000..18cf723
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
@@ -0,0 +1,53 @@
+/*!
+ * MediaWiki Widgets – PHP DateInputWidget styles.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: scap: fix rubocop warnings
Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357720 )
Change subject: scap: fix rubocop warnings
..
scap: fix rubocop warnings
Change-Id: Icd78ded7cf027312f2725f260bd9fce11c69449b
---
M modules/scap/lib/puppet/provider/scap_source/default.rb
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/357720/1
diff --git a/modules/scap/lib/puppet/provider/scap_source/default.rb
b/modules/scap/lib/puppet/provider/scap_source/default.rb
index cdfbfdf..80f36f7 100644
--- a/modules/scap/lib/puppet/provider/scap_source/default.rb
+++ b/modules/scap/lib/puppet/provider/scap_source/default.rb
@@ -78,8 +78,8 @@
end
def checkout(name, path)
-umask = 002
-file_mode = 02775
+umask = 0o002
+file_mode = 0o02775
unless Dir.exists?(path)
FileUtils.makedirs path, :mode => file_mode
FileUtils.chown_R resource[:owner], resource[:group], path
@@ -100,7 +100,7 @@
],
:uid => uid,
:gid => gid,
-:failonfail => true,
+:failonfail => true
)
}
end
@@ -128,7 +128,7 @@
# Create the parent directory
unless Dir.exists?(deploy_root)
Puppet.debug("Creating #{deploy_root}")
- FileUtils.makedirs deploy_root, :mode => 0755
+ FileUtils.makedirs deploy_root, :mode => 0o0755
FileUtils.chown_R resource[:owner], resource[:group], deploy_root
end
@@ -136,7 +136,6 @@
Puppet.debug("Checking out #{repo} into #{target_path}")
checkout repo, target_path
Puppet.debug("Repository checked out in #{target_path}")
-# rubocop:disable GuardClause
if resource[:scap_repository]
target = File.join(target_path, 'scap')
checkout resource[:scap_repository], target
--
To view, visit https://gerrit.wikimedia.org/r/357720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd78ded7cf027312f2725f260bd9fce11c69449b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rubocop: update rubocop_todo for rubocop 0.48
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357722 ) Change subject: rubocop: update rubocop_todo for rubocop 0.48 .. rubocop: update rubocop_todo for rubocop 0.48 - Rename Style/MethodCallParentheses to Style/MethodCallWithoutArgsParentheses - Rename Style/TrailingComma to Style/TrailingCommaInLiteral - Disable Style/SymbolArray (wait until Ruby >= 2.0) - Disable Style/IndentHeredoc (wait until Ruby >= 2.3) - Disable Style/GuardClause (noisy, bad advice) Change-Id: I81a1564f97b43c4bc9d3dfef82f133c3390d3e89 --- M .rubocop_todo.yml 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/357722/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 739037d..1fe0781 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -152,7 +152,7 @@ # Offense count: 15 # Cop supports --auto-correct. -Style/MethodCallParentheses: +Style/MethodCallWithoutArgsParentheses: Exclude: - 'modules/base/lib/facter/physicalcorecount.rb' - 'modules/base/spec/defines/service_unit_spec.rb' @@ -335,5 +335,18 @@ # Offense count: 117 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles. -Style/TrailingComma: +Style/TrailingCommaInLiteral: + Enabled: false + +# should be fixed with %i[] in Ruby >= 2.0 (>= jessie) +Style/SymbolArray: + Enabled: false + +# we can't depend on ActiveRecord etc., but we can use squiggly heredocs (<<~) +# when we move to Ruby >= 2.3 (>= stretch) +Style/IndentHeredoc: + Enabled: false + +# bad advice +Style/GuardClause: Enabled: false -- To view, visit https://gerrit.wikimedia.org/r/357722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81a1564f97b43c4bc9d3dfef82f133c3390d3e89 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: hiera_lookup: fix rubocop warnings
Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357719 )
Change subject: hiera_lookup: fix rubocop warnings
..
hiera_lookup: fix rubocop warnings
Change-Id: If1a3a4d57ba220a4fa720c1b69ca0722e836b027
---
M .rubocop_todo.yml
M utils/hiera_lookup
2 files changed, 6 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/357719/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 257f6bb..739037d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -73,12 +73,6 @@
- 'modules/ganeti/lib/facter/ganeti.rb'
- 'modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb'
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/DefWithParentheses:
- Exclude:
-- 'utils/hiera_lookup'
-
# Offense count: 16
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -169,7 +163,6 @@
- 'modules/wmflib/spec/functions/role_spec.rb'
- 'modules/wmflib/spec/hiera/proxy_backend_spec.rb'
- 'modules/wmflib/spec/hiera/role_backend_spec.rb'
-- 'utils/hiera_lookup'
# Offense count: 1
# Cop supports --auto-correct.
@@ -192,7 +185,6 @@
Style/Not:
Exclude:
- 'modules/wmflib/lib/hiera/backend/proxy_backend.rb'
-- 'utils/hiera_lookup'
# Offense count: 3
# Cop supports --auto-correct.
@@ -257,7 +249,6 @@
- 'modules/trebuchet/lib/puppet/provider/package/trebuchet.rb'
- 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb'
- 'modules/wmflib/lib/hiera/backend/role_backend.rb'
-- 'utils/hiera_lookup'
# Offense count: 7
# Cop supports --auto-correct.
diff --git a/utils/hiera_lookup b/utils/hiera_lookup
index dff65ef..f92ae3f 100755
--- a/utils/hiera_lookup
+++ b/utils/hiera_lookup
@@ -46,8 +46,8 @@
abort("Hiera not found - try 'apt-get install ruby-hiera' or 'gem install
hiera'.")
end
-# Get the scope from the command line arguments
-def get_scope()
+# Determine the scope from the command line arguments
+def determine_scope
# Transform the CL arguments in a dictionary in the form "::option" =>
argument
scope = Hash[ARGV.map { |kv| "::#{kv.sub('--', '')}".split('=') }]
abort(usage "Error: --fqdn=FQDN is required.") unless scope['::fqdn']
@@ -87,7 +87,7 @@
class << self
alias_method :old_datadir, :datadir
def datadir(backend, scope)
-old_datadir(backend, scope).gsub(/^.*(?=\/hieradata)/, $DIR)
+old_datadir(backend, scope).gsub(%r{^.*(?=\/hieradata)}, $DIR)
end
end
end
@@ -104,18 +104,18 @@
$DIR = ENV['PUPPETDIR'] || File.expand_path('../..', __FILE__)
$LOAD_PATH << File.join($DIR, 'modules/wmflib/lib')
-scope = get_scope()
+scope = determine_scope
cfg = File.join($DIR,
"modules/puppetmaster/files/#{scope['::realm']}.hiera.yaml")
if !File.exist?(cfg)
Kernel.abort("Hiera cfg file not found for realm '#{scope['::realm']}':
#{cfg}")
end
-key = ARGV.pop()
+key = ARGV.pop
abort(usage "\nError: KEY is required") if key.match('^--')
hiera = Hiera.new(:config => cfg)
-if not verbose || scope.include?('::debug')
+if !verbose || scope.include?('::debug')
Hiera.logger = "noop"
end
--
To view, visit https://gerrit.wikimedia.org/r/357719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1a3a4d57ba220a4fa720c1b69ca0722e836b027
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rubocop: add smokeping.fcgi to exclusion list
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357721 ) Change subject: rubocop: add smokeping.fcgi to exclusion list .. rubocop: add smokeping.fcgi to exclusion list Not a Ruby script, misdetected. Change-Id: Ife7efc07ee24446c360c501f7832799ec2e9272c --- M .rubocop.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/357721/1 diff --git a/.rubocop.yml b/.rubocop.yml index d1b0821..a46209b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,8 @@ AllCops: StyleGuideCopsOnly: true Exclude: +# not a Ruby script +- 'modules/smokeping/files/smokeping.fcgi' # third party modules - 'modules/mysql/**/*' - 'modules/rsync/**/*' -- To view, visit https://gerrit.wikimedia.org/r/357721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife7efc07ee24446c360c501f7832799ec2e9272c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: fix rubocop warnings
Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357718 )
Change subject: puppetmaster: fix rubocop warnings
..
puppetmaster: fix rubocop warnings
Change-Id: Ie02dbb115854bc3132a7015370c63350cfb5e43c
---
M .rubocop_todo.yml
M modules/puppetmaster/files/puppet_ecdsacert.rb
M modules/puppetmaster/lib/puppet/reports/logstash.rb
M modules/puppetmaster/lib/puppet/reports/servermon.rb
4 files changed, 45 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/357718/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d5fcec5..257f6bb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -21,12 +21,6 @@
- 'modules/wmflib/lib/puppet/parser/functions/require_package.rb'
# Offense count: 2
-Lint/RescueException:
- Exclude:
-- 'modules/puppetmaster/lib/puppet/reports/logstash.rb'
-- 'modules/puppetmaster/lib/puppet/reports/servermon.rb'
-
-# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
Lint/UnusedMethodArgument:
@@ -47,12 +41,6 @@
# Configuration parameters: AllowURI, URISchemes.
Metrics/LineLength:
Max: 159
-
-# Offense count: 1
-Style/AsciiComments:
- Exclude:
-- 'modules/puppetmaster/lib/puppet/reports/logstash.rb'
-- 'modules/puppetmaster/lib/puppet/reports/servermon.rb'
# Offense count: 58
# Cop supports --auto-correct.
@@ -75,7 +63,6 @@
Style/ColonMethodCall:
Exclude:
- 'modules/base/lib/facter/physicalcorecount.rb'
-- 'modules/puppetmaster/lib/puppet/reports/logstash.rb'
# Offense count: 3
# Cop supports --auto-correct.
@@ -254,8 +241,6 @@
Style/RedundantSelf:
Exclude:
- 'modules/puppet_statsd/lib/puppet/reports/statsd.rb'
-- 'modules/puppetmaster/lib/puppet/reports/logstash.rb'
-- 'modules/puppetmaster/lib/puppet/reports/servermon.rb'
- 'modules/wmflib/lib/hiera/backend/proxy_backend.rb'
# Offense count: 23
@@ -301,7 +286,6 @@
- 'modules/base/lib/facter/physicalcorecount.rb'
- 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb'
- 'modules/puppet_statsd/lib/puppet/reports/statsd.rb'
-- 'modules/puppetmaster/lib/puppet/reports/logstash.rb'
- 'modules/strongswan/spec/functions/ipresolve_spec.rb'
- 'modules/wmflib/lib/hiera/backend/mwyaml_backend.rb'
- 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb'
diff --git a/modules/puppetmaster/files/puppet_ecdsacert.rb
b/modules/puppetmaster/files/puppet_ecdsacert.rb
index dbed479..93f100c 100755
--- a/modules/puppetmaster/files/puppet_ecdsacert.rb
+++ b/modules/puppetmaster/files/puppet_ecdsacert.rb
@@ -38,7 +38,7 @@
format("%s %-5s (puppet-ecdsacert): %s\n", date_format, severity, msg)
end
-# Ecdsa certificates generator class
+# ECDSA certificates generator class
# Generates the cert, the CSR, and sends the signing request to the
puppetmaster
class PuppetECDSAGen
class << self; attr_accessor :confkeys; end
@@ -143,10 +143,12 @@
req.body = File.read csr_path
Log.info "Submitting CSR for signing to #{@config[:puppetca]}"
resp, _ = https.request(req)
-fail(PuppetECDSAGenError,
- format('Signing request to %s failed with code %s: %s',
-@config[:puppetca], resp.code, resp.body)
-) unless resp.code == '200'
+unless resp.code == '200'
+ fail(PuppetECDSAGenError,
+ format('Signing request to %s failed with code %s: %s',
+ @config[:puppetca], resp.code, resp.body)
+ )
+end
Log.info "CSR request succeeded"
end
diff --git a/modules/puppetmaster/lib/puppet/reports/logstash.rb
b/modules/puppetmaster/lib/puppet/reports/logstash.rb
index 43ca5ab..c56dd0d 100644
--- a/modules/puppetmaster/lib/puppet/reports/logstash.rb
+++ b/modules/puppetmaster/lib/puppet/reports/logstash.rb
@@ -3,7 +3,7 @@
# Based on https://github.com/logstash/puppet-logstash-reporter
#
# Copyright 2013 EvenUp Inc.
-# Copyright © 2014 Bryan Davis and Wikimedia Foundation.
+# Copyright 2014 Bryan Davis and Wikimedia Foundation.
# License http://www.apache.org/licenses/LICENSE-2.0
require 'puppet'
@@ -18,36 +18,38 @@
config_file = File.join([File.dirname(Puppet.settings[:config]),
'logstash.yaml'])
begin
CONFIG = YAML.load_file(config_file)
+# rubocop:disable Lint/RescueException
rescue Exception => e
raise(Puppet::ParseError, "Failed to load logstash report config file
#{config_file}: #{e.message}")
end
+# rubocop:enable Lint/RescueException
SERVER_NAME = Socket.gethostbyname(Socket.gethostname).first
def process
# Convert Puppet::Transaction::Report object to a logstash event
event = {
-'@timestamp'=> self.logs.last.time.utc.iso8601,
+'@timestamp'=> logs.last.time.utc.iso860
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix whitespace-related Rubocop warnings across the tree
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357715 ) Change subject: Fix whitespace-related Rubocop warnings across the tree .. Fix whitespace-related Rubocop warnings across the tree Fix: - Extra empty line detected at block body beginning. - Extra blank line detected. - Inconsistent indentation detected. - Operator => should be surrounded by a single space. ...across all Ruby files in the tree. Noop. Change-Id: I8bff4a836f98ce82a4f855333ce77d44287279ea --- M Rakefile M modules/aptrepo/spec/classes/aptrepo_spec.rb M modules/aptrepo/spec/classes/distribution_spec.rb M modules/bacula/spec/defines/fileset_spec.rb M modules/base/Rakefile M modules/base/files/monitoring/check_puppetrun M modules/base/lib/facter/initsystem.rb M modules/base/lib/puppet/parser/functions/pick_initscript.rb M modules/base/spec/defines/expose_puppet_certs_spec.rb M modules/base/spec/defines/service_unit_spec.rb M modules/base/spec/spec_helper.rb M modules/conftool/files/pooler_loop.rb M modules/elasticsearch/spec/classes/elasticsearch_rspec.rb M modules/elasticsearch/spec/classes/https_rspec.rb M modules/elasticsearch/spec/classes/ship_logs_to_logstash_rspec.rb M modules/etcd/lib/puppet/type/etcd_role.rb M modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb M modules/git/spec/defines/user_spec.rb M modules/graphite/spec/functions/configparser_format_spec.rb M modules/graphite/spec/spec_helper.rb M modules/install_server/spec/classes/install_server_dhcp_server_spec.rb M modules/install_server/spec/classes/install_server_preseed_server_spec.rb M modules/install_server/spec/classes/install_server_tftp_server_spec.rb M modules/install_server/spec/classes/install_server_web_server_spec.rb M modules/mirrors/spec/classes/mirrors_debian_spec.rb M modules/mirrors/spec/classes/mirrors_spec.rb M modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb M modules/nrpe/spec/defines/check_spec.rb M modules/osm/spec/defines/osm_planet_sync_spec.rb M modules/postgresql/spec/classes/postgresql_ganglia.rb M modules/postgresql/spec/classes/postgresql_slave_spec.rb M modules/puppet_statsd/lib/puppet/reports/statsd.rb M modules/puppetmaster/files/puppet_ecdsacert.rb M modules/scap/spec/types/scap_source_spec.rb M modules/service/spec/defines/service_node_spec.rb M modules/strongswan/Rakefile M modules/tilerator/spec/classes/ui_spec.rb M modules/wdqs/spec/classes/monitor_blazegraph_spec.rb M modules/wdqs/spec/classes/wdqs_service_spec.rb M modules/wdqs/spec/classes/wdqs_spec.rb M modules/wmflib/lib/hiera/backend/nuyaml_backend.rb M modules/wmflib/lib/hiera/mwcache.rb M modules/wmflib/lib/puppet/parser/functions/ensure_mounted.rb M modules/wmflib/lib/puppet/parser/functions/htpasswd.rb M modules/wmflib/lib/puppet/parser/functions/ipresolve.rb M modules/wmflib/lib/puppet/parser/functions/shell_exports.rb M modules/wmflib/spec/functions/conftool_spec.rb M modules/wmflib/spec/functions/ensure_mounted_spec.rb M modules/wmflib/spec/functions/ipresolve_spec.rb M modules/wmflib/spec/functions/os_version_spec.rb M modules/wmflib/spec/functions/role_spec.rb M modules/wmflib/spec/hiera/proxy_backend_spec.rb M modules/wmflib/spec/hiera/role_backend_spec.rb M utils/expanderb.rb M utils/hiera_lookup 55 files changed, 15 insertions(+), 90 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/15/357715/1 diff --git a/Rakefile b/Rakefile index 3319dc2..880c896 100644 --- a/Rakefile +++ b/Rakefile @@ -76,7 +76,6 @@ 'syntax:hiera', 'syntax:templates', ] - end RuboCop::RakeTask.new(:rubocop) @@ -93,7 +92,6 @@ config.pattern = git_changed_in_head ['.pp'] end - task :default => [:help] desc 'Run all build/tests commands (CI entry point)' @@ -104,7 +102,6 @@ desc 'Run all linting commands against HEAD' task lint_head: [:typos, :rubocop, :"syntax:head", :puppetlint_head] - desc 'Show the help' task :help do @@ -121,8 +118,8 @@ # Show our tasks list. system "rake -T" -puts "---" -puts " +puts "---" +puts " Examples: Validate syntax for all puppet manifests: @@ -134,7 +131,6 @@ Run puppet-lint style checker: rake puppetlint " - end desc "Build documentation" @@ -170,7 +166,6 @@ desc "Run spec tests found in modules" task :spec do - # Hold a list of modules not passing tests. failed_modules = [] ignored_modules = ['mysql', 'osm', 'puppetdbquery', 'stdlib', 'wdqs'] diff --git a/modules/aptrepo/spec/classes/aptrepo_spec.rb b/modules/aptrepo/spec/classes/aptrepo_spec.rb index 443403b..a95f735 100644 --- a/modules/aptrepo/spec/classes/aptrepo_spec.rb +++ b/modules/aptrepo/spec/classes/aptrepo_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe 'aptrepo', :type => :class do -
[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_puppetrun: fix rubocop warnings
Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357716 )
Change subject: check_puppetrun: fix rubocop warnings
..
check_puppetrun: fix rubocop warnings
Change-Id: Ief274d54ed1277946605debd00e09a79cd7a4ce6
---
M .rubocop_todo.yml
M modules/base/files/monitoring/check_puppetrun
2 files changed, 7 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/357716/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 96445cb..6d800ad 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -37,7 +37,6 @@
# Offense count: 10
Lint/UselessAssignment:
Exclude:
-- 'modules/base/files/monitoring/check_puppetrun'
- 'modules/ganeti/lib/facter/ganeti.rb'
- 'modules/puppet_statsd/lib/puppet/reports/statsd.rb'
- 'modules/service/Rakefile'
@@ -205,7 +204,6 @@
# Cop supports --auto-correct.
Style/Not:
Exclude:
-- 'modules/base/files/monitoring/check_puppetrun'
- 'modules/wmflib/lib/hiera/backend/proxy_backend.rb'
- 'modules/wmflib/lib/puppet/parser/functions/role.rb'
- 'utils/hiera_lookup'
@@ -365,8 +363,3 @@
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
Style/TrailingComma:
Enabled: false
-
-# Offense count: 1
-Style/UnlessElse:
- Exclude:
-- 'modules/base/files/monitoring/check_puppetrun'
diff --git a/modules/base/files/monitoring/check_puppetrun
b/modules/base/files/monitoring/check_puppetrun
index 455f99e..c4917a3 100755
--- a/modules/base/files/monitoring/check_puppetrun
+++ b/modules/base/files/monitoring/check_puppetrun
@@ -18,7 +18,6 @@
summaryfile = "/var/lib/puppet/state/last_run_summary.yaml"
reportfile = "/var/lib/puppet/state/last_run_report.yaml"
enabled = true
-running = false
lastrun = 0
failcount = 0
warn = 0
@@ -58,7 +57,7 @@
opt.parse!
-if warn == 0 || crit == 0
+if warn.zero? || crit.zero?
puts "Please specify a warning and critical level"
exit 3
end
@@ -68,14 +67,10 @@
disabled_message = YAML.load_file(adminlockfile)["disabled_message"]
end
-if File.exists?(runlockfile)
- running = true
-end
-
if File.exists?(summaryfile)
begin
summary = YAML.load_file(summaryfile)
-if not enabled
+if !enabled
summary["time"]["last_disabled_check"] = Time.now.to_i
File.open(summaryfile, 'w') { |f| f.write(YAML.dump summary) }
end
@@ -87,10 +82,10 @@
# machines that outright failed to run like on missing dependencies
# are treated as huge failures. The yaml file will be valid but
# it wont have anything but last_run in it
-unless summary.include?("events")
-failcount = :failed
-else
+if summary.include?("events")
failcount = summary["events"]["failure"]
+else
+failcount = :failed
end
rescue
failcount = :failed_to_parse_summary_file
@@ -102,7 +97,7 @@
def time_ago(s)
units = {86400 => 'day', 3600 => 'hour', 60 => 'minute', 1 => 'second'}
- if s == 0
+ if s.zero?
return "0 seconds"
end
units.sort.reverse.each do |len, unit|
@@ -134,7 +129,7 @@
exit 0
end
-if not enabled
+if !enabled
puts "WARNING: Puppet is currently disabled, message: #{disabled_message},
last run #{human_time_since_last_run} ago with #{failcount} failures"
exit 1
end
--
To view, visit https://gerrit.wikimedia.org/r/357716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief274d54ed1277946605debd00e09a79cd7a4ce6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: fix rubocop warnings
Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357717 )
Change subject: wmflib: fix rubocop warnings
..
wmflib: fix rubocop warnings
Change-Id: I92c180e8453345024b180f336c7157c29d19c9bb
---
M .rubocop_todo.yml
M modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
M modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
M modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
M modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
M modules/wmflib/lib/puppet/parser/functions/os_version.rb
M modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb
M modules/wmflib/lib/puppet/parser/functions/role.rb
8 files changed, 24 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/357717/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6d800ad..d5fcec5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -205,7 +205,6 @@
Style/Not:
Exclude:
- 'modules/wmflib/lib/hiera/backend/proxy_backend.rb'
-- 'modules/wmflib/lib/puppet/parser/functions/role.rb'
- 'utils/hiera_lookup'
# Offense count: 3
diff --git a/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
b/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
index af76bf6..382396d 100644
--- a/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
@@ -39,8 +39,10 @@
EOS
) do |arguments|
-raise(Puppet::ParseError, "cron_splay(): Wrong number of arguments " +
- "given (#{arguments.size} for 3)") if arguments.size != 3
+unless arguments.size == 3
+ raise(Puppet::ParseError, "cron_splay(): Wrong number of arguments " +
+"given (#{arguments.size} for 3)")
+end
hosts = arguments[0]
period = arguments[1]
diff --git a/modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
b/modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
index c779625..8f0597f 100644
--- a/modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb
@@ -18,8 +18,10 @@
EOS
) do |arguments|
-raise(Puppet::ParseError, "hash_deselect_re(): Wrong number of arguments "
+
- "given (#{arguments.size} for 2)") if arguments.size != 2
+unless arguments.size == 2
+ raise(Puppet::ParseError, "hash_deselect_re(): Wrong number of arguments
" +
+"given (#{arguments.size} for 2)")
+end
pattern = Regexp.new(arguments[0])
in_hash = arguments[1]
diff --git a/modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
b/modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
index b5aa204..517fc65 100644
--- a/modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb
@@ -18,8 +18,10 @@
EOS
) do |arguments|
-raise(Puppet::ParseError, "hash_select_re(): Wrong number of arguments " +
- "given (#{arguments.size} for 2)") if arguments.size != 2
+unless arguments.size == 2
+ raise(Puppet::ParseError, "hash_select_re(): Wrong number of arguments "
+
+ "given (#{arguments.size} for 2)")
+end
pattern = Regexp.new(arguments[0])
in_hash = arguments[1]
diff --git a/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
b/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
index 8cf810e..7438d92 100644
--- a/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb
@@ -70,9 +70,9 @@
1000.times do |x|
ctx = ::Digest::MD5.new
ctx << (((x & 1) == 1) ? password : pd[0, DIGEST_LENGTH])
- (ctx << @salt) unless (x % 3) == 0
- (ctx << password) unless (x % 7) == 0
- ctx << (((x & 1) == 0) ? password : pd[0, DIGEST_LENGTH])
+ (ctx << @salt) unless (x % 3).zero?
+ (ctx << password) unless (x % 7).zero?
+ ctx << (((x & 1).zero?) ? password : pd[0, DIGEST_LENGTH])
pd = ctx.digest
end
diff --git a/modules/wmflib/lib/puppet/parser/functions/os_version.rb
b/modules/wmflib/lib/puppet/parser/functions/os_version.rb
index 3ea4a54..f7235a9 100644
--- a/modules/wmflib/lib/puppet/parser/functions/os_version.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/os_version.rb
@@ -92,10 +92,12 @@
# emit a warning if the release given to compare with is not supported
min_version = min_supported_versions[other_id]
+ # rubocop:disable Style/NumericPredicate
if Puppet::Util::Package.versioncmp(other_release, min_version) < 0 ||
(Puppet::Util::Package.versioncmp(other_release, min_version) == 0 &&
(operator == '<=' || operator == '<'))
message = "os_version(): obsolete distribution check in #{clause}"
+ # rubocop:enable Style/NumericPredicate
if defined?
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove deleted repo
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357708 ) Change subject: Remove deleted repo .. Remove deleted repo Change-Id: I8eac44ecace03e748268acd71b933f1a73799bf2 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Nemo bis: Looks good to me, but someone else must approve Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5fab8dd..e0bf4d7 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1779,8 +1779,6 @@ OO Js UI Ajax Login -# OOUI Playground # Missing message doc 2015-01-15 - Open Badges aliasfile = OpenBadges/OpenBadges.alias.php -- To view, visit https://gerrit.wikimedia.org/r/357708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8eac44ecace03e748268acd71b933f1a73799bf2 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps->upload: delete maps-specific things
BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/352834 ) Change subject: maps->upload: delete maps-specific things .. maps->upload: delete maps-specific things If previous commit is a success, we can then merge this to clean up the old cache_maps cluster from puppet and turn the cache_maps machines into spares (for now). Bug: T164608 Change-Id: Ic6f1863540b9e14a62b0199767560a3b92c41f78 --- M conftool-data/node/codfw.yaml M conftool-data/node/eqiad.yaml M conftool-data/node/esams.yaml M conftool-data/node/ulsfo.yaml M conftool-data/service/cache.yaml M hieradata/common.yaml D hieradata/common/cache/maps.yaml M hieradata/common/monitoring.yaml D hieradata/role/codfw/cache/maps.yaml D hieradata/role/common/cache/maps.yaml D hieradata/role/eqiad/cache/maps.yaml D hieradata/role/esams/cache/maps.yaml D hieradata/role/ulsfo/cache/maps.yaml M manifests/site.pp M modules/prometheus/manifests/cluster_config.pp D modules/role/manifests/cache/maps.pp D modules/varnish/files/tests/maps/01-basic-caching.vtc D modules/varnish/files/tests/maps/02-test-forbidden-methods.vtc D modules/varnish/files/tests/maps/03-test-beacon-endpoints.vtc D modules/varnish/files/tests/maps/04-honor-cache-control.vtc D modules/varnish/files/tests/maps/05-purging.vtc D modules/varnish/files/tests/maps/06-do-gzip.vtc D modules/varnish/files/tests/maps/07-frontend-tls-redirect.vtc D modules/varnish/files/tests/maps/08-keep-alive-on-purge.vtc D modules/varnish/files/tests/maps/09-custom-error-page-unreachable-backend.vtc D modules/varnish/files/tests/maps/10-WMF-Last-Access.vtc D modules/varnish/files/tests/maps/11-custom-synth-errorpage.vtc D modules/varnish/files/tests/maps/12-no-cookies.vtc D modules/varnish/templates/maps-backend.inc.vcl.erb D modules/varnish/templates/maps-frontend.inc.vcl.erb 30 files changed, 6 insertions(+), 614 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml index 4361083..0532309 100644 --- a/conftool-data/node/codfw.yaml +++ b/conftool-data/node/codfw.yaml @@ -210,11 +210,6 @@ cp2022.codfw.wmnet: [varnish-fe, varnish-be, nginx] cp2024.codfw.wmnet: [varnish-fe, varnish-be, nginx] cp2026.codfw.wmnet: [varnish-fe, varnish-be, nginx] - cache_maps: -cp2003.codfw.wmnet: [varnish-fe, varnish-be, nginx] -cp2009.codfw.wmnet: [varnish-fe, varnish-be, nginx] -cp2015.codfw.wmnet: [varnish-fe, varnish-be, nginx] -cp2021.codfw.wmnet: [varnish-fe, varnish-be, nginx] cache_misc: cp2006.codfw.wmnet: [varnish-fe, varnish-be, nginx] cp2012.codfw.wmnet: [varnish-fe, varnish-be, nginx] diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml index 32a2205..6a435dc 100644 --- a/conftool-data/node/eqiad.yaml +++ b/conftool-data/node/eqiad.yaml @@ -164,11 +164,6 @@ cp1073.eqiad.wmnet: [varnish-fe, varnish-be, nginx] cp1074.eqiad.wmnet: [varnish-fe, varnish-be, nginx] cp1099.eqiad.wmnet: [varnish-fe, varnish-be, nginx] - cache_maps: -cp1046.eqiad.wmnet: [varnish-fe, varnish-be, nginx] -cp1047.eqiad.wmnet: [varnish-fe, varnish-be, nginx] -cp1059.eqiad.wmnet: [varnish-fe, varnish-be, nginx] -cp1060.eqiad.wmnet: [varnish-fe, varnish-be, nginx] pdf: ocg1001.eqiad.wmnet: [ocg] ocg1002.eqiad.wmnet: [ocg] diff --git a/conftool-data/node/esams.yaml b/conftool-data/node/esams.yaml index fe12273..fc118ba 100644 --- a/conftool-data/node/esams.yaml +++ b/conftool-data/node/esams.yaml @@ -21,11 +21,6 @@ cp3047.esams.wmnet: [varnish-fe, varnish-be, nginx] cp3048.esams.wmnet: [varnish-fe, varnish-be, nginx] cp3049.esams.wmnet: [varnish-fe, varnish-be, nginx] - cache_maps: -cp3003.esams.wmnet: [varnish-fe, varnish-be, nginx] -cp3004.esams.wmnet: [varnish-fe, varnish-be, nginx] -cp3005.esams.wmnet: [varnish-fe, varnish-be, nginx] -cp3006.esams.wmnet: [varnish-fe, varnish-be, nginx] cache_misc: cp3007.esams.wmnet: [varnish-fe, varnish-be, nginx] cp3008.esams.wmnet: [varnish-fe, varnish-be, nginx] diff --git a/conftool-data/node/ulsfo.yaml b/conftool-data/node/ulsfo.yaml index 73cc2ec..b71998f 100644 --- a/conftool-data/node/ulsfo.yaml +++ b/conftool-data/node/ulsfo.yaml @@ -13,11 +13,6 @@ cp4013.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] cp4014.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] cp4015.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] - cache_maps: -cp4011.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] -cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] -cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] -cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] cache_misc: cp4001.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] cp4002.ulsfo.wmnet: [varnish-fe, varnish-be, nginx] diff --git a/conftool-data/service/cache.yaml b/conftool-data/servi
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Keep wgUsejQueryThree disabled by default.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357664 ) Change subject: Keep wgUsejQueryThree disabled by default. .. Keep wgUsejQueryThree disabled by default. The process of discovering and resolving T165816 blockers took a bit longer, so we'll continue this into the 1.30 development cycle. However, this should not be enabled in 1.29. Follows-up bf69459d50. Change-Id: I7da79f0479198903b50dfa9269a78726605f60d8 --- M RELEASE-NOTES-1.29 M includes/DefaultSettings.php 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 363244d..913d9f2 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -79,7 +79,6 @@ * Updated monolog from v1.18.2 to 1.22.1. * Updated wikimedia/composer-merge-plugin from v1.3.1 to v1.4.0. * Updated OOjs from v1.1.10 to v2.0.0. -* Updated jQuery from v1.11.3 to v3.2.1 (including jQuery Migrate v3.0.0). New external libraries * Added wikimedia/timestamp v1.0.0. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index bf9b870..96563fa 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3681,7 +3681,7 @@ * * @deprecated since 1.29 */ -$wgUsejQueryThree = true; +$wgUsejQueryThree = false; /** * Whether or not to assign configuration variables to the global window object. -- To view, visit https://gerrit.wikimedia.org/r/357664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7da79f0479198903b50dfa9269a78726605f60d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_29 Gerrit-Owner: Krinkle Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove deleted repo
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357708 ) Change subject: Remove deleted repo .. Remove deleted repo Change-Id: I8eac44ecace03e748268acd71b933f1a73799bf2 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/08/357708/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5fab8dd..e0bf4d7 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1779,8 +1779,6 @@ OO Js UI Ajax Login -# OOUI Playground # Missing message doc 2015-01-15 - Open Badges aliasfile = OpenBadges/OpenBadges.alias.php -- To view, visit https://gerrit.wikimedia.org/r/357708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8eac44ecace03e748268acd71b933f1a73799bf2 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split off styles for PHP DateInputWidget to separate module
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357668 )
Change subject: Split off styles for PHP DateInputWidget to separate module
..
Split off styles for PHP DateInputWidget to separate module
This lets us load them with addModuleStyles() (without generating a warning).
Bug: T167343
Change-Id: I88f0716c6a5ac702cc07e8015cfe25d81538a536
---
M includes/specials/SpecialContributions.php
M resources/Resources.php
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
A resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
4 files changed, 64 insertions(+), 46 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 4da1c85..e2fa8a3 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -40,7 +40,7 @@
$out->addModuleStyles( [
'mediawiki.special',
'mediawiki.special.changeslist',
- 'mediawiki.widgets.DateInputWidget',
+ 'mediawiki.widgets.DateInputWidget.styles',
] );
$out->addModules( 'mediawiki.special.contributions' );
$this->addHelpLink( 'Help:User contributions' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 46aafd5..7c0e4af 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2338,6 +2338,15 @@
'oojs-ui-widgets',
'oojs-ui.styles.icons-movement',
'moment',
+ 'mediawiki.widgets.DateInputWidget.styles',
+ ],
+ 'targets' => [ 'desktop', 'mobile' ],
+ ],
+ 'mediawiki.widgets.DateInputWidget.styles' => [
+ 'skinStyles' => [
+ 'default' => [
+
'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less',
+ ],
],
'targets' => [ 'desktop', 'mobile' ],
],
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 3ecdea8..47f8045 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -1,15 +1,9 @@
/*!
- * MediaWiki Widgets – DateInputWidget styles.
+ * MediaWiki Widgets – JS DateInputWidget styles.
*
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-
-.oo-ui-box-sizing( @type: border-box ) {
- -webkit-box-sizing: @type;
- -moz-box-sizing: @type;
- box-sizing: @type;
-}
.oo-ui-unselectable() {
-webkit-touch-callout: none;
@@ -19,47 +13,9 @@
user-select: none;
}
-.oo-ui-inline-spacing( @spacing, @cancelled-spacing: 0 ) {
- margin-right: @spacing;
-
- &:last-child {
- margin-right: @cancelled-spacing;
- }
-}
-
@indicator-size: unit( 12 / 16 / 0.8, em );
.mw-widget-dateInputWidget {
- &.oo-ui-textInputWidget {
- display: inline-block;
- position: relative;
- width: 21em;
- margin-top: 0.25em;
- .oo-ui-inline-spacing( 0.5em );
- margin-bottom: 0.25em;
- margin-left: 0;
- }
-
- &-handle,
- &.oo-ui-textInputWidget input {
- background-color: #fff;
- display: inline-block;
- position: relative;
- .oo-ui-box-sizing( border-box );
- width: 100%;
- cursor: pointer;
- padding: 0.5em 1em;
- border: 1px solid #a2a9b1;
- border-radius: 2px;
- outline: 0;
- line-height: 1.275;
- /**
-* Ensures non-infused and infused widget have the same height.
-* Equal to line height + top padding + bottom padding
-*/
- height: 2.275em;
- }
-
&-handle {
.oo-ui-unselectable();
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
new file mode 100644
index 000..18cf723
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
@@ -0,0 +1,53 @@
+/*!
+ * MediaWiki Widgets – PHP DateInputWidget styles.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.oo-ui-box-sizing( @type: border-box ) {
+ -web
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.4
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357704 )
Change subject: group1 wikis to 1.30.0-wmf.4
..
group1 wikis to 1.30.0-wmf.4
Change-Id: Ifcdb0d0c22e8a14c3f93fb55cc914b3f3edf8f5a
---
M php
M wikiversions.json
2 files changed, 600 insertions(+), 600 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/php b/php
index 7627347..1ac8ed9 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.2
\ No newline at end of file
+php-1.30.0-wmf.4
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 0042959..8c3c714 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.2",
-"aawikibooks": "php-1.30.0-wmf.2",
-"aawiktionary": "php-1.30.0-wmf.2",
+"aawikibooks": "php-1.30.0-wmf.4",
+"aawiktionary": "php-1.30.0-wmf.4",
"abwiki": "php-1.30.0-wmf.2",
-"abwiktionary": "php-1.30.0-wmf.2",
+"abwiktionary": "php-1.30.0-wmf.4",
"acewiki": "php-1.30.0-wmf.2",
-"advisorywiki": "php-1.30.0-wmf.2",
+"advisorywiki": "php-1.30.0-wmf.4",
"adywiki": "php-1.30.0-wmf.2",
"afwiki": "php-1.30.0-wmf.2",
-"afwikibooks": "php-1.30.0-wmf.2",
-"afwikiquote": "php-1.30.0-wmf.2",
-"afwiktionary": "php-1.30.0-wmf.2",
+"afwikibooks": "php-1.30.0-wmf.4",
+"afwikiquote": "php-1.30.0-wmf.4",
+"afwiktionary": "php-1.30.0-wmf.4",
"akwiki": "php-1.30.0-wmf.2",
-"akwikibooks": "php-1.30.0-wmf.2",
-"akwiktionary": "php-1.30.0-wmf.2",
+"akwikibooks": "php-1.30.0-wmf.4",
+"akwiktionary": "php-1.30.0-wmf.4",
"alswiki": "php-1.30.0-wmf.2",
-"alswikibooks": "php-1.30.0-wmf.2",
-"alswikiquote": "php-1.30.0-wmf.2",
-"alswiktionary": "php-1.30.0-wmf.2",
+"alswikibooks": "php-1.30.0-wmf.4",
+"alswikiquote": "php-1.30.0-wmf.4",
+"alswiktionary": "php-1.30.0-wmf.4",
"amwiki": "php-1.30.0-wmf.2",
-"amwikiquote": "php-1.30.0-wmf.2",
-"amwiktionary": "php-1.30.0-wmf.2",
+"amwikiquote": "php-1.30.0-wmf.4",
+"amwiktionary": "php-1.30.0-wmf.4",
"angwiki": "php-1.30.0-wmf.2",
-"angwikibooks": "php-1.30.0-wmf.2",
-"angwikiquote": "php-1.30.0-wmf.2",
-"angwikisource": "php-1.30.0-wmf.2",
-"angwiktionary": "php-1.30.0-wmf.2",
+"angwikibooks": "php-1.30.0-wmf.4",
+"angwikiquote": "php-1.30.0-wmf.4",
+"angwikisource": "php-1.30.0-wmf.4",
+"angwiktionary": "php-1.30.0-wmf.4",
"anwiki": "php-1.30.0-wmf.2",
-"anwiktionary": "php-1.30.0-wmf.2",
+"anwiktionary": "php-1.30.0-wmf.4",
"arbcom_cswiki": "php-1.30.0-wmf.2",
"arbcom_dewiki": "php-1.30.0-wmf.2",
"arbcom_enwiki": "php-1.30.0-wmf.2",
@@ -35,723 +35,723 @@
"arbcom_nlwiki": "php-1.30.0-wmf.2",
"arcwiki": "php-1.30.0-wmf.2",
"arwiki": "php-1.30.0-wmf.2",
-"arwikibooks": "php-1.30.0-wmf.2",
-"arwikimedia": "php-1.30.0-wmf.2",
-"arwikinews": "php-1.30.0-wmf.2",
-"arwikiquote": "php-1.30.0-wmf.2",
-"arwikisource": "php-1.30.0-wmf.2",
-"arwikiversity": "php-1.30.0-wmf.2",
-"arwiktionary": "php-1.30.0-wmf.2",
+"arwikibooks": "php-1.30.0-wmf.4",
+"arwikimedia": "php-1.30.0-wmf.4",
+"arwikinews": "php-1.30.0-wmf.4",
+"arwikiquote": "php-1.30.0-wmf.4",
+"arwikisource": "php-1.30.0-wmf.4",
+"arwikiversity": "php-1.30.0-wmf.4",
+"arwiktionary": "php-1.30.0-wmf.4",
"arzwiki": "php-1.30.0-wmf.2",
"astwiki": "php-1.30.0-wmf.2",
-"astwikibooks": "php-1.30.0-wmf.2",
-"astwikiquote": "php-1.30.0-wmf.2",
-"astwiktionary": "php-1.30.0-wmf.2",
+"astwikibooks": "php-1.30.0-wmf.4",
+"astwikiquote": "php-1.30.0-wmf.4",
+"astwiktionary": "php-1.30.0-wmf.4",
"aswiki": "php-1.30.0-wmf.2",
-"aswikibooks": "php-1.30.0-wmf.2",
-"aswikisource": "php-1.30.0-wmf.2",
-"aswiktionary": "php-1.30.0-wmf.2",
-"auditcomwiki": "php-1.30.0-wmf.2",
+"aswikibooks": "php-1.30.0-wmf.4",
+"aswikisource": "php-1.30.0-wmf.4",
+"aswiktionary": "php-1.30.0-wmf.4",
+"auditcomwiki": "php-1.30.0-wmf.4",
"avwiki": "php-1.30.0-wmf.2",
-"avwiktionary": "php-1.30.0-wmf.2",
+"avwiktionary": "php-1.30.0-wmf.4",
"aywiki": "php-1.30.0-wmf.2",
-"aywikibooks": "php-1.30.0-wmf.2",
-"aywiktionary": "php-1.30.0-wmf.2",
+"aywikibooks": "php-1.30.0-wmf.4",
+"aywiktionary": "php-1.30.0-wmf.4",
"azbwiki": "php-1.30.0-wmf.2",
"azwiki": "php-1.30.0-wmf.2",
-"azwikibooks": "php-1.30.0-wmf.2",
-"azwikiquote": "php-1.30.0-wmf.2",
-"azwikisource": "php-1.30.0-wmf.2",
-"azwiktionary": "php-1.30.0-wmf.2",
+"azwikibooks": "php-1.30.0-wmf.4",
+"azwikiquote": "php-1.30.0-wmf.4",
+"azwikisource": "php-1.30.0-wmf.4",
+"azwiktionary": "php-1.30.0-wmf.4",
"barwiki": "php-1.30.0-wmf.2",
"bat_smgwiki": "php-1.30.0-wmf.2",
"ba
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.4
20after4 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357704 )
Change subject: group1 wikis to 1.30.0-wmf.4
..
group1 wikis to 1.30.0-wmf.4
Change-Id: Ifcdb0d0c22e8a14c3f93fb55cc914b3f3edf8f5a
---
M php
M wikiversions.json
2 files changed, 600 insertions(+), 600 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/04/357704/1
diff --git a/php b/php
index 7627347..1ac8ed9 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.2
\ No newline at end of file
+php-1.30.0-wmf.4
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 0042959..8c3c714 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
{
"aawiki": "php-1.30.0-wmf.2",
-"aawikibooks": "php-1.30.0-wmf.2",
-"aawiktionary": "php-1.30.0-wmf.2",
+"aawikibooks": "php-1.30.0-wmf.4",
+"aawiktionary": "php-1.30.0-wmf.4",
"abwiki": "php-1.30.0-wmf.2",
-"abwiktionary": "php-1.30.0-wmf.2",
+"abwiktionary": "php-1.30.0-wmf.4",
"acewiki": "php-1.30.0-wmf.2",
-"advisorywiki": "php-1.30.0-wmf.2",
+"advisorywiki": "php-1.30.0-wmf.4",
"adywiki": "php-1.30.0-wmf.2",
"afwiki": "php-1.30.0-wmf.2",
-"afwikibooks": "php-1.30.0-wmf.2",
-"afwikiquote": "php-1.30.0-wmf.2",
-"afwiktionary": "php-1.30.0-wmf.2",
+"afwikibooks": "php-1.30.0-wmf.4",
+"afwikiquote": "php-1.30.0-wmf.4",
+"afwiktionary": "php-1.30.0-wmf.4",
"akwiki": "php-1.30.0-wmf.2",
-"akwikibooks": "php-1.30.0-wmf.2",
-"akwiktionary": "php-1.30.0-wmf.2",
+"akwikibooks": "php-1.30.0-wmf.4",
+"akwiktionary": "php-1.30.0-wmf.4",
"alswiki": "php-1.30.0-wmf.2",
-"alswikibooks": "php-1.30.0-wmf.2",
-"alswikiquote": "php-1.30.0-wmf.2",
-"alswiktionary": "php-1.30.0-wmf.2",
+"alswikibooks": "php-1.30.0-wmf.4",
+"alswikiquote": "php-1.30.0-wmf.4",
+"alswiktionary": "php-1.30.0-wmf.4",
"amwiki": "php-1.30.0-wmf.2",
-"amwikiquote": "php-1.30.0-wmf.2",
-"amwiktionary": "php-1.30.0-wmf.2",
+"amwikiquote": "php-1.30.0-wmf.4",
+"amwiktionary": "php-1.30.0-wmf.4",
"angwiki": "php-1.30.0-wmf.2",
-"angwikibooks": "php-1.30.0-wmf.2",
-"angwikiquote": "php-1.30.0-wmf.2",
-"angwikisource": "php-1.30.0-wmf.2",
-"angwiktionary": "php-1.30.0-wmf.2",
+"angwikibooks": "php-1.30.0-wmf.4",
+"angwikiquote": "php-1.30.0-wmf.4",
+"angwikisource": "php-1.30.0-wmf.4",
+"angwiktionary": "php-1.30.0-wmf.4",
"anwiki": "php-1.30.0-wmf.2",
-"anwiktionary": "php-1.30.0-wmf.2",
+"anwiktionary": "php-1.30.0-wmf.4",
"arbcom_cswiki": "php-1.30.0-wmf.2",
"arbcom_dewiki": "php-1.30.0-wmf.2",
"arbcom_enwiki": "php-1.30.0-wmf.2",
@@ -35,723 +35,723 @@
"arbcom_nlwiki": "php-1.30.0-wmf.2",
"arcwiki": "php-1.30.0-wmf.2",
"arwiki": "php-1.30.0-wmf.2",
-"arwikibooks": "php-1.30.0-wmf.2",
-"arwikimedia": "php-1.30.0-wmf.2",
-"arwikinews": "php-1.30.0-wmf.2",
-"arwikiquote": "php-1.30.0-wmf.2",
-"arwikisource": "php-1.30.0-wmf.2",
-"arwikiversity": "php-1.30.0-wmf.2",
-"arwiktionary": "php-1.30.0-wmf.2",
+"arwikibooks": "php-1.30.0-wmf.4",
+"arwikimedia": "php-1.30.0-wmf.4",
+"arwikinews": "php-1.30.0-wmf.4",
+"arwikiquote": "php-1.30.0-wmf.4",
+"arwikisource": "php-1.30.0-wmf.4",
+"arwikiversity": "php-1.30.0-wmf.4",
+"arwiktionary": "php-1.30.0-wmf.4",
"arzwiki": "php-1.30.0-wmf.2",
"astwiki": "php-1.30.0-wmf.2",
-"astwikibooks": "php-1.30.0-wmf.2",
-"astwikiquote": "php-1.30.0-wmf.2",
-"astwiktionary": "php-1.30.0-wmf.2",
+"astwikibooks": "php-1.30.0-wmf.4",
+"astwikiquote": "php-1.30.0-wmf.4",
+"astwiktionary": "php-1.30.0-wmf.4",
"aswiki": "php-1.30.0-wmf.2",
-"aswikibooks": "php-1.30.0-wmf.2",
-"aswikisource": "php-1.30.0-wmf.2",
-"aswiktionary": "php-1.30.0-wmf.2",
-"auditcomwiki": "php-1.30.0-wmf.2",
+"aswikibooks": "php-1.30.0-wmf.4",
+"aswikisource": "php-1.30.0-wmf.4",
+"aswiktionary": "php-1.30.0-wmf.4",
+"auditcomwiki": "php-1.30.0-wmf.4",
"avwiki": "php-1.30.0-wmf.2",
-"avwiktionary": "php-1.30.0-wmf.2",
+"avwiktionary": "php-1.30.0-wmf.4",
"aywiki": "php-1.30.0-wmf.2",
-"aywikibooks": "php-1.30.0-wmf.2",
-"aywiktionary": "php-1.30.0-wmf.2",
+"aywikibooks": "php-1.30.0-wmf.4",
+"aywiktionary": "php-1.30.0-wmf.4",
"azbwiki": "php-1.30.0-wmf.2",
"azwiki": "php-1.30.0-wmf.2",
-"azwikibooks": "php-1.30.0-wmf.2",
-"azwikiquote": "php-1.30.0-wmf.2",
-"azwikisource": "php-1.30.0-wmf.2",
-"azwiktionary": "php-1.30.0-wmf.2",
+"azwikibooks": "php-1.30.0-wmf.4",
+"azwikiquote": "php-1.30.0-wmf.4",
+"azwikisource": "php-1.30.0-wmf.4",
+"azwiktionary": "php-1.30.0-wmf.4",
"barwiki": "php-1.30.0-wmf.2",
"bat_smgwiki": "php-1.30.0-wmf.
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Allow special character items to be marked as source mode only
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357385 )
Change subject: Allow special character items to be marked as source mode only
..
Allow special character items to be marked as source mode only
Anything with the property "source": true will only be shown in
source mode, and will be styled accordingly (smaller monospace font).
Also introduces the "string" property so that simple insertions
can be tagged as source-only.
e.g.
{
"": ""
}
->
{
"": {
"string": "",
"source": true
}
}
Bug: T154113
Change-Id: Idbd9eb30f24386fcd3de3095126259c1419413a1
---
M src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
M src/ui/pages/ve.ui.SpecialCharacterPage.js
M src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
3 files changed, 23 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
b/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
index 28daa25..85bcb2f 100644
--- a/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
+++ b/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
@@ -124,7 +124,8 @@
this.pages.push(
new ve.ui.SpecialCharacterPage( category, {
label: category,
- characters: this.characters[ category ]
+ characters: this.characters[ category ],
+ source: this.surface.getMode() === 'source'
} )
);
}
@@ -146,13 +147,12 @@
* @param {jQuery.Event} e Mouse click event
*/
ve.ui.SpecialCharacterDialog.prototype.onListClick = function ( e ) {
- var
- character = $( e.target ).data( 'character' ),
+ var character = $( e.target ).data( 'character' ),
fragment = this.surface.getModel().getFragment();
if ( character ) {
- if ( typeof character === 'string' ) {
- fragment.insertContent( character, true
).collapseToEnd().select();
+ if ( typeof character === 'string' || character.string ) {
+ fragment.insertContent( character.string || character,
true ).collapseToEnd().select();
} else if ( character.action.type === 'replace' ) {
fragment.insertContent( character.action.options.peri,
true ).collapseToEnd().select();
} else if ( character.action.type === 'encapsulate' ) {
diff --git a/src/ui/pages/ve.ui.SpecialCharacterPage.js
b/src/ui/pages/ve.ui.SpecialCharacterPage.js
index 4d38a68..a11bc0d 100644
--- a/src/ui/pages/ve.ui.SpecialCharacterPage.js
+++ b/src/ui/pages/ve.ui.SpecialCharacterPage.js
@@ -16,7 +16,8 @@
* @param {Object} [config] Configuration options
*/
ve.ui.SpecialCharacterPage = function VeUiSpecialCharacterPage( name, config )
{
- var character, characterNode, characters, $characters, charactersNode;
+ var character, characterNode, characters, $characters, charactersNode,
+ source = config.source;
// Parent constructor
ve.ui.SpecialCharacterPage.super.apply( this, arguments );
@@ -31,11 +32,17 @@
// The body of this loop is executed a few thousand times when opening
// ve.ui.SpecialCharacterDialog, avoid jQuery wrappers.
for ( character in characters ) {
+ if ( !source && characters[ character ].source ) {
+ continue;
+ }
characterNode = document.createElement( 'div' );
characterNode.className =
've-ui-specialCharacterPage-character';
if ( characters[ character ].titleMsg ) {
characterNode.setAttribute( 'title', ve.msg(
characters[ character ].titleMsg ) );
}
+ if ( characters[ character ].source ) {
+ characterNode.classList.add(
've-ui-specialCharacterPage-character-source' );
+ }
characterNode.textContent = character;
$.data( characterNode, 'character', characters[ character ] );
charactersNode.appendChild( characterNode );
diff --git a/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
b/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
index 4fc1531..d75e773 100644
--- a/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
@@ -44,6 +44,7 @@
height: 1.8em;
text-align: center;
display: inline-block;
+ vertical-align: top;
margin: 0 3px 3px 0;
border: 1px solid #e6e6e6;
-webkit-transition: border-color 200ms;
@@ -54,3 +55,12 @@
.ve-ui-specialCharacterPage-character:hover {
border-color: #ccc;
}
+
+.ve-ui-specialCharacterPage-c
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: POC: Fallback for badly configured mobile skins
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357701 )
Change subject: POC: Fallback for badly configured mobile skins
..
POC: Fallback for badly configured mobile skins
Change-Id: I4dbbd8e79944e9ad66595f4b023f2ff289dd8acb
---
M extension.json
M i18n/en.json
M includes/MobileFrontend.hooks.php
A includes/MobileSkinFallback.php
A includes/MobileSkinFallbackTemplate.php
5 files changed, 33 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/01/357701/1
diff --git a/extension.json b/extension.json
index 47cd8d3..672f376 100644
--- a/extension.json
+++ b/extension.json
@@ -50,6 +50,8 @@
"MobileFrontendAlias": "MobileFrontend.alias.php"
},
"AutoloadClasses": {
+ "MobileSkinFallback": "includes/MobileSkinFallback.php",
+ "MobileSkinFallbackTemplate":
"includes/MobileSkinFallbackTemplate.php",
"ExtMobileFrontend": "includes/MobileFrontend.body.php",
"MinervaHooks": "includes/Minerva.hooks.php",
"MobileFrontendHooks": "includes/MobileFrontend.hooks.php",
@@ -1845,7 +1847,7 @@
"MinervaCustomLogos": [],
"MobileFrontendLogo": false,
"MFEnableBeta": false,
- "MFDefaultSkinClass": "SkinMinerva",
+ "MFDefaultSkinClass": "SkinMinervaz",
"MinervaApplyKnownTemplateHacks": false,
"MinervaPageActions": [
"edit",
diff --git a/i18n/en.json b/i18n/en.json
index 52eda71..c68e407 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -37,6 +37,7 @@
"Yuvaraj Pandian"
]
},
+ "mobile-frontend-fallback-skin-information-message": "Your chosen
mobile skin '''$1''' is not available. Please ensure the skin is installed and
configured correctly as the mobile skin.\n\n$2 like so:",
"abusefilter-edit-builder-vars-user-mobile": "Whether or not a user is
editing through the mobile interface",
"mobile-frontend-account-create-captcha-placeholder": "Enter
confirmation code",
"mobile-frontend-categories-heading": "Categories",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 41e5b3e..b36579f 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -54,11 +54,7 @@
if ( class_exists( $skinName ) ) {
$skin = new $skinName( $context );
} else {
- $skin = new SkinFallback( $context );
- LoggerFactory::getInstance( 'mobile' )->error(
- 'wgMFDefaultSkinClass is not setup correctly. '.
- 'It should point to the class name of a valid
skin e.g. SkinMinerva'
- );
+ $skin = new MobileSkinFallback( $context );
}
return $skin;
}
diff --git a/includes/MobileSkinFallback.php b/includes/MobileSkinFallback.php
new file mode 100644
index 000..764d639
--- /dev/null
+++ b/includes/MobileSkinFallback.php
@@ -0,0 +1,9 @@
+getSkin()->getContext()->getConfig()->get( 'MFDefaultSkinClass' );
+ $possibleSkins = $this->findInstalledSkins();
+
+ $code = [];
+ foreach ( $possibleSkins as $name ) {
+ array_push( $code, "\$wgMFDefaultSkinClass =
\"$name\";" );
+ }
+
+ return wfMessage(
'mobile-frontend-fallback-skin-information-message',
+ $chosenSkinName, implode( "\n\n", $code ) )->parse();
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/357701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dbbd8e79944e9ad66595f4b023f2ff289dd8acb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SkinFallbackTemplate methods protected not private
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357700 )
Change subject: SkinFallbackTemplate methods protected not private
..
SkinFallbackTemplate methods protected not private
Allow reuse in MobileFrontend.
See: I4dbbd8e79944e9ad66595f4b023f2ff289dd8acb
Change-Id: I5d7344526dfef44985a6950db52cca08b1f308cd
---
M includes/skins/SkinFallbackTemplate.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/00/357700/1
diff --git a/includes/skins/SkinFallbackTemplate.php
b/includes/skins/SkinFallbackTemplate.php
index ee8d841..490eb86 100644
--- a/includes/skins/SkinFallbackTemplate.php
+++ b/includes/skins/SkinFallbackTemplate.php
@@ -16,7 +16,7 @@
/**
* @return array
*/
- private function findInstalledSkins() {
+ protected function findInstalledSkins() {
$styleDirectory = $this->config->get( 'StyleDirectory' );
// Get all subdirectories which might contains skins
$possibleSkins = scandir( $styleDirectory );
@@ -39,7 +39,7 @@
*
* @return string
*/
- private function buildHelpfulInformationMessage() {
+ protected function buildHelpfulInformationMessage() {
$defaultSkin = $this->config->get( 'DefaultSkin' );
$installedSkins = $this->findInstalledSkins();
$enabledSkins =
SkinFactory::getDefaultInstance()->getSkinNames();
--
To view, visit https://gerrit.wikimedia.org/r/357700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d7344526dfef44985a6950db52cca08b1f308cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Always use braces after if
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357692 )
Change subject: Always use braces after if
..
Always use braces after if
Makes if blocks more readable
Change-Id: I1d5943c0de5a11cdedc21fc28ae64a15b6887b9e
---
M api/ApiQueryLQTThreads.php
M api/ApiThreadAction.php
M classes/Dispatch.php
M classes/HistoricalThread.php
M classes/Hooks.php
M classes/NewMessagesController.php
M classes/Thread.php
M classes/ThreadRevision.php
M classes/View.php
M pages/NewUserMessagesView.php
M pages/SpecialMoveThread.php
M pages/TalkpageView.php
M pages/ThreadPermalinkView.php
13 files changed, 107 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/92/357692/1
diff --git a/api/ApiQueryLQTThreads.php b/api/ApiQueryLQTThreads.php
index be0614d..14bf7d0 100644
--- a/api/ApiQueryLQTThreads.php
+++ b/api/ApiQueryLQTThreads.php
@@ -232,12 +232,15 @@
$rendercount = $params['renderthreadcount'];
$options = array();
- if ( isset( $params['rendermaxthreadcount'] ) )
+ if ( isset( $params['rendermaxthreadcount'] ) ) {
$options['maxCount'] = $params['rendermaxthreadcount'];
- if ( isset( $params['rendermaxdepth'] ) )
+ }
+ if ( isset( $params['rendermaxdepth'] ) ) {
$options['maxDepth'] = $params['rendermaxdepth'];
- if ( isset( $params['renderstartrepliesat'] ) )
+ }
+ if ( isset( $params['renderstartrepliesat'] ) ) {
$options['startAt' ] = $params['renderstartrepliesat'];
+ }
$view->showThread( $thread, $renderpos, $rendercount, $options
);
diff --git a/api/ApiThreadAction.php b/api/ApiThreadAction.php
index 3f66907..109da28 100644
--- a/api/ApiThreadAction.php
+++ b/api/ApiThreadAction.php
@@ -827,7 +827,9 @@
$ts = $params['sortkey'];
- if ( $ts == 'now' ) $ts = wfTimestampNow();
+ if ( $ts == 'now' ) {
+ $ts = wfTimestampNow();
+ }
$ts = wfTimestamp( TS_MW, $ts );
diff --git a/classes/Dispatch.php b/classes/Dispatch.php
index 3555240..faeef52 100644
--- a/classes/Dispatch.php
+++ b/classes/Dispatch.php
@@ -229,7 +229,9 @@
}
public static function onSkinTemplateNavigation( $skinTemplate, &$links
) {
- if ( !self::$primaryView ) return true;
+ if ( !self::$primaryView ) {
+ return true;
+ }
self::$primaryView->customizeNavigation( $skinTemplate, $links
);
diff --git a/classes/HistoricalThread.php b/classes/HistoricalThread.php
index 2922a99..6d25622 100644
--- a/classes/HistoricalThread.php
+++ b/classes/HistoricalThread.php
@@ -49,10 +49,11 @@
'hthread_revision' => $rev
),
__METHOD__ );
- if ( $line )
+ if ( $line ) {
return HistoricalThread::fromTextRepresentation(
$line->hthread_contents );
- else
+ } else {
return null;
+ }
}
function isHistorical() {
diff --git a/classes/Hooks.php b/classes/Hooks.php
index c8b09cf..0b43ca9 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -132,8 +132,9 @@
$watch_messages = NewMessages::watchedThreadsForUser( $wgUser );
$wn = count( $watch_messages );
- if ( $tn == 0 && $wn == 0 )
+ if ( $tn == 0 && $wn == 0 ) {
return true;
+ }
$wgOut->addModules( 'ext.liquidThreads' );
$messages_title = SpecialPage::getTitleFor( 'NewMessages' );
@@ -899,8 +900,9 @@
* @return bool
*/
public static function onGetUserPermissionsErrors( $title, $user,
$action, &$result ) {
- if ( $title->getNamespace() != NS_LQT_THREAD || $action !=
'read' )
+ if ( $title->getNamespace() != NS_LQT_THREAD || $action !=
'read' ) {
return true;
+ }
$thread = Threads::withRoot( new Article( $title, 0 ) );
@@ -965,7 +967,9 @@
'Strip' => 'base'
) );
foreach ( $data as $pageid => $page ) {
- if ( $page == 'page' ) continue;
+ if ( $page == 'page' ) {
+ continue;
+ }
if ( isset( $page['title'] )
&& LqtDispatch::isLqtPage(
Title::newFromText( $page['title'] )
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.4]: Split off styles for PHP DateInputWidget to separate module
20after4 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357694 )
Change subject: Split off styles for PHP DateInputWidget to separate module
..
Split off styles for PHP DateInputWidget to separate module
This lets us load them with addModuleStyles() (without generating a warning).
Bug: T167343
Change-Id: I88f0716c6a5ac702cc07e8015cfe25d81538a536
---
M includes/specials/SpecialContributions.php
M resources/Resources.php
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
A resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
4 files changed, 64 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/94/357694/1
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 4da1c85..e2fa8a3 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -40,7 +40,7 @@
$out->addModuleStyles( [
'mediawiki.special',
'mediawiki.special.changeslist',
- 'mediawiki.widgets.DateInputWidget',
+ 'mediawiki.widgets.DateInputWidget.styles',
] );
$out->addModules( 'mediawiki.special.contributions' );
$this->addHelpLink( 'Help:User contributions' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 46aafd5..7c0e4af 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2338,6 +2338,15 @@
'oojs-ui-widgets',
'oojs-ui.styles.icons-movement',
'moment',
+ 'mediawiki.widgets.DateInputWidget.styles',
+ ],
+ 'targets' => [ 'desktop', 'mobile' ],
+ ],
+ 'mediawiki.widgets.DateInputWidget.styles' => [
+ 'skinStyles' => [
+ 'default' => [
+
'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less',
+ ],
],
'targets' => [ 'desktop', 'mobile' ],
],
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 3ecdea8..47f8045 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -1,15 +1,9 @@
/*!
- * MediaWiki Widgets – DateInputWidget styles.
+ * MediaWiki Widgets – JS DateInputWidget styles.
*
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-
-.oo-ui-box-sizing( @type: border-box ) {
- -webkit-box-sizing: @type;
- -moz-box-sizing: @type;
- box-sizing: @type;
-}
.oo-ui-unselectable() {
-webkit-touch-callout: none;
@@ -19,47 +13,9 @@
user-select: none;
}
-.oo-ui-inline-spacing( @spacing, @cancelled-spacing: 0 ) {
- margin-right: @spacing;
-
- &:last-child {
- margin-right: @cancelled-spacing;
- }
-}
-
@indicator-size: unit( 12 / 16 / 0.8, em );
.mw-widget-dateInputWidget {
- &.oo-ui-textInputWidget {
- display: inline-block;
- position: relative;
- width: 21em;
- margin-top: 0.25em;
- .oo-ui-inline-spacing( 0.5em );
- margin-bottom: 0.25em;
- margin-left: 0;
- }
-
- &-handle,
- &.oo-ui-textInputWidget input {
- background-color: #fff;
- display: inline-block;
- position: relative;
- .oo-ui-box-sizing( border-box );
- width: 100%;
- cursor: pointer;
- padding: 0.5em 1em;
- border: 1px solid #a2a9b1;
- border-radius: 2px;
- outline: 0;
- line-height: 1.275;
- /**
-* Ensures non-infused and infused widget have the same height.
-* Equal to line height + top padding + bottom padding
-*/
- height: 2.275em;
- }
-
&-handle {
.oo-ui-unselectable();
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
new file mode 100644
index 000..18cf723
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
@@ -0,0 +1,53 @@
+/*!
+ * MediaWiki Widgets – PHP DateInputWidget styles.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.oo-ui-box-sizing( @type: border-box ) {
+ -webkit
[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: add Goran Milovanovic to analytics-privatedata-users
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357650 ) Change subject: admins: add Goran Milovanovic to analytics-privatedata-users .. admins: add Goran Milovanovic to analytics-privatedata-users Add existing user goransm to the analytics-privatedata-users group. Reasoning as per ticket: to be able run HiveQL against wmf.webrequests and similar (e.g. pageviews) from the stat100* machines." NDA with Legal has been confirmed. Bug: T167116 Change-Id: Id8de19ca091b31337d4be4c801ba59a971f146e4 --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: RobH: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index e5c3cbd..407caac 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -241,7 +241,8 @@ bmansurov, atgomez, amire80, kartik, pcoombe, foks, mpany, jsamra, jdlrobson, chelsyx, ovasileva, mtizzoni, panisson, paolotti, ciro, psinger, flemmerich, mkroetzsch, akrausetud, filippo, nschaaf, pmiazga, faidon, - piccardi, fdans, eevans, anomie, demon, ladsgroup, musikanimal, joewalsh, kaldari] + piccardi, fdans, eevans, anomie, demon, ladsgroup, musikanimal, joewalsh, + kaldari, goransm] analytics-admins: gid: 732 description: Admin access to analytics cluster. -- To view, visit https://gerrit.wikimedia.org/r/357650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8de19ca091b31337d4be4c801ba59a971f146e4 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: GoranSMilovanovic Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: RobH 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]: Keystone paste: typo fix
Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357678 )
Change subject: Keystone paste: typo fix
..
Keystone paste: typo fix
Change-Id: I808f7134fe32a9bf96fe9f2af77b68d0d81735f2
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index 3bf3de1..df0f996 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -50,8 +50,8 @@
notify => Service['uwsgi-keystone-admin',
'uwsgi-keystone-public'],
require => Package['keystone'],
mode=> '0444';
-'/etc/keystone/keystone-api.ini':
-source =>
"puppet:///modules/openstack/${openstack_version}/keystone/keystone-api.ini",
+'/etc/keystone/keystone-paste.ini':
+source =>
"puppet:///modules/openstack/${openstack_version}/keystone/keystone-paste.ini",
mode=> '0644',
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/357678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I808f7134fe32a9bf96fe9f2af77b68d0d81735f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-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] mediawiki...MobileFrontend[wmf/1.30.0-wmf.4]: Do not use ResourceModuleSkinStyles to define skinStyles for...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357643 )
Change subject: Do not use ResourceModuleSkinStyles to define skinStyles for
other skins than 'minerva'
..
Do not use ResourceModuleSkinStyles to define skinStyles for other skins than
'minerva'
ResourceModuleSkinStyles must only contain customizations for the
skin that is defining it: in this case, 'minerva'. For other skins,
just use 'skinStyles' in module definition. Otherwise their own
customizations get overridden (or our customizations get overridden
by theirs, depending on the loading order).
MobileFrontend owns both of the wrongly customized modules
(mobile.special.history.styles and mobile.special.mobilemenu.styles).
Both have no need to be skinStyles.
* The mobile.special.mobilemenu.styles is an abandoned experiment in
Vector and the default stylesheet is Minerva specific.
* mobile.special.history.styles is not overriden by any skin so can
be registered as a stylesheet
Bug: T167216
Change-Id: I39d15b9e8a1068e3ed8c6da23fbf8d7ad29ea632
(cherry picked from commit 89517bf8f821207e035d46610fb293ee3b3c6fd3)
---
M extension.json
D resources/mobile.special.mobilemenu.styles/vector.less
2 files changed, 9 insertions(+), 26 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
Jdlrobson: Looks good to me, but someone else must approve
diff --git a/extension.json b/extension.json
index 7c8f826..bf89146 100644
--- a/extension.json
+++ b/extension.json
@@ -1172,12 +1172,6 @@
},
"mobile.special.mobilemenu.styles": {
"targets": "mobile",
- "styles": [
-
"resources/mobile.special.mobilemenu.styles/mobilemenu.less"
- ],
- "skinStyles": {
- "vector":
"resources/mobile.special.mobilemenu.styles/mobilemenu.less"
- },
"position": "top"
},
"mobile.special.mobileoptions.styles": {
@@ -1267,6 +1261,9 @@
},
"mobile.special.history.styles": {
"targets": "mobile",
+ "styles": [
+
"resources/mobile.special.history.styles/default.less"
+ ],
"position": "top"
},
"mobile.special.uploads.scripts": {
@@ -1600,19 +1597,17 @@
"localBasePath": "",
"remoteExtPath": "MobileFrontend"
},
+ "@note1": "ResourceModuleSkinStyles must only contain customizations
for 'minerva'.",
+ "@note2": "For other skins, just use 'skinStyles' in module
definition.",
+ "@note3": "Otherwise their own customizations are overridden.
(T167216)",
"ResourceModuleSkinStyles": {
- "default": {
- "mobile.special.history.styles": [
-
"resources/mobile.special.history.styles/default.less"
- ]
- },
"minerva": {
+ "mobile.special.mobilemenu.styles": [
+
"resources/mobile.special.mobilemenu.styles/mobilemenu.less"
+ ],
"mediawiki.notification": [
"resources/mobile.startup/toast.less"
]
- },
- "vector": {
- "mobile.special.mobilemenu.styles":
"skinStyles/mobile.special.mobilemenu.styles/vector.less"
}
},
"Hooks": {
diff --git a/resources/mobile.special.mobilemenu.styles/vector.less
b/resources/mobile.special.mobilemenu.styles/vector.less
deleted file mode 100644
index 6b0ad5f..000
--- a/resources/mobile.special.mobilemenu.styles/vector.less
+++ /dev/null
@@ -1,12 +0,0 @@
-// For Vector skin
-#footer,
-#mw-head,
-#content {
- display: none;
-}
-
-.ns-special.page-Special_MobileMenu {
- div#mw-panel {
- width: 100%;
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/357643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39d15b9e8a1068e3ed8c6da23fbf8d7ad29ea632
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystone paste: typo fix
Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357678 )
Change subject: Keystone paste: typo fix
..
Keystone paste: typo fix
Change-Id: I808f7134fe32a9bf96fe9f2af77b68d0d81735f2
---
M modules/openstack/manifests/keystone/service.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/357678/1
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index 3bf3de1..df0f996 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -50,8 +50,8 @@
notify => Service['uwsgi-keystone-admin',
'uwsgi-keystone-public'],
require => Package['keystone'],
mode=> '0444';
-'/etc/keystone/keystone-api.ini':
-source =>
"puppet:///modules/openstack/${openstack_version}/keystone/keystone-api.ini",
+'/etc/keystone/keystone-paste.ini':
+source =>
"puppet:///modules/openstack/${openstack_version}/keystone/keystone-paste.ini",
mode=> '0644',
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/357678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I808f7134fe32a9bf96fe9f2af77b68d0d81735f2
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]: Keystone: add keystone-paste.ini upstream files.
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357672 ) Change subject: Keystone: add keystone-paste.ini upstream files. .. Keystone: add keystone-paste.ini upstream files. A subsequent patch is going to change these; this patch is just to get the standard upstream files in place so the change is obvious. Bug: T165211 Change-Id: I4cb78e7880c2c85d3d2097d193882482ad989bc5 --- A modules/openstack/files/liberty/keystone/keystone-paste.ini A modules/openstack/files/mitaka/keystone/keystone-paste.ini M modules/openstack/manifests/keystone/service.pp 3 files changed, 213 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/files/liberty/keystone/keystone-paste.ini b/modules/openstack/files/liberty/keystone/keystone-paste.ini new file mode 100644 index 000..70db382 --- /dev/null +++ b/modules/openstack/files/liberty/keystone/keystone-paste.ini @@ -0,0 +1,103 @@ +# Keystone PasteDeploy configuration file. + +[filter:debug] +use = egg:keystone#debug + +[filter:request_id] +use = egg:keystone#request_id + +[filter:build_auth_context] +use = egg:keystone#build_auth_context + +[filter:token_auth] +use = egg:keystone#token_auth + +[filter:admin_token_auth] +use = egg:keystone#admin_token_auth + +[filter:json_body] +use = egg:keystone#json_body + +[filter:user_crud_extension] +use = egg:keystone#user_crud_extension + +[filter:crud_extension] +use = egg:keystone#crud_extension + +[filter:ec2_extension] +use = egg:keystone#ec2_extension + +[filter:ec2_extension_v3] +use = egg:keystone#ec2_extension_v3 + +[filter:federation_extension] +use = egg:keystone#federation_extension + +[filter:oauth1_extension] +use = egg:keystone#oauth1_extension + +[filter:s3_extension] +use = egg:keystone#s3_extension + +[filter:endpoint_filter_extension] +use = egg:keystone#endpoint_filter_extension + +[filter:simple_cert_extension] +use = egg:keystone#simple_cert_extension + +[filter:revoke_extension] +use = egg:keystone#revoke_extension + +[filter:url_normalize] +use = egg:keystone#url_normalize + +[filter:sizelimit] +use = egg:keystone#sizelimit + +[app:public_service] +use = egg:keystone#public_service + +[app:service_v3] +use = egg:keystone#service_v3 + +[app:admin_service] +use = egg:keystone#admin_service + +[pipeline:public_api] +# The last item in this pipeline must be public_service or an equivalent +# application. It cannot be a filter. +pipeline = sizelimit url_normalize request_id build_auth_context token_auth admin_token_auth json_body ec2_extension user_crud_extension public_service + +[pipeline:admin_api] +# The last item in this pipeline must be admin_service or an equivalent +# application. It cannot be a filter. +pipeline = sizelimit url_normalize request_id build_auth_context token_auth admin_token_auth json_body ec2_extension s3_extension crud_extension admin_service + +[pipeline:api_v3] +# The last item in this pipeline must be service_v3 or an equivalent +# application. It cannot be a filter. +pipeline = sizelimit url_normalize request_id build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension revoke_extension federation_extension oauth1_extension endpoint_filter_extension service_v3 + +[app:public_version_service] +use = egg:keystone#public_version_service + +[app:admin_version_service] +use = egg:keystone#admin_version_service + +[pipeline:public_version_api] +pipeline = sizelimit url_normalize public_version_service + +[pipeline:admin_version_api] +pipeline = sizelimit url_normalize admin_version_service + +[composite:main] +use = egg:Paste#urlmap +/v2.0 = public_api +/v3 = api_v3 +/ = public_version_api + +[composite:admin] +use = egg:Paste#urlmap +/v2.0 = admin_api +/v3 = api_v3 +/ = admin_version_api diff --git a/modules/openstack/files/mitaka/keystone/keystone-paste.ini b/modules/openstack/files/mitaka/keystone/keystone-paste.ini new file mode 100644 index 000..70db382 --- /dev/null +++ b/modules/openstack/files/mitaka/keystone/keystone-paste.ini @@ -0,0 +1,103 @@ +# Keystone PasteDeploy configuration file. + +[filter:debug] +use = egg:keystone#debug + +[filter:request_id] +use = egg:keystone#request_id + +[filter:build_auth_context] +use = egg:keystone#build_auth_context + +[filter:token_auth] +use = egg:keystone#token_auth + +[filter:admin_token_auth] +use = egg:keystone#admin_token_auth + +[filter:json_body] +use = egg:keystone#json_body + +[filter:user_crud_extension] +use = egg:keystone#user_crud_extension + +[filter:crud_extension] +use = egg:keystone#crud_extension + +[filter:ec2_extension] +use = egg:keystone#ec2_extension + +[filter:ec2_extension_v3] +use = egg:keystone#ec2_extension_v3 + +[filter:federation_extension] +use = egg:keystone#federation_extension + +[filter:oauth1_extension] +use = egg:keystone#oauth1_extension + +[fi
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Add first implementation of the Citoid service
Sophivorus has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357676 )
Change subject: Add first implementation of the Citoid service
..
Add first implementation of the Citoid service
Also:
* Hide all non-filled, optional and deprecated parameters by default
* Fix fallback to English when messages on the preferred language aren't
available
* Minor style fixes
Bug T148226
Change-Id: I599bb765c3df222e9912b4d4aca2a23d35e80130
---
M i18n/en.json
M i18n/es.json
M i18n/qqq.json
M proveit.css
M proveit.js
5 files changed, 158 insertions(+), 34 deletions(-)
Approvals:
Sophivorus: Verified; Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 2d86961..85804a7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -19,5 +19,11 @@
"proveit-no-references": "No references found",
"proveit-filter-fields": "Filter fields",
"proveit-filter-references": "Filter references",
- "proveit-today-button": "Today"
+ "proveit-show-all-button": "Show all fields",
+ "proveit-today-button": "Today",
+ "proveit-citoid-label": "Reference identifier",
+ "proveit-citoid-tooltip": "Enter a URL, DOI, ISBN or PMC/PMID to try to
extract the details automatically through the Citoid service",
+ "proveit-citoid-placeholder": "URL, DOI, ISBN or PMC/PMID",
+ "proveit-citoid-loading": "Loading...",
+ "proveit-citoid-error": "Error"
}
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
index 732a87e..53e1ecc 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -20,5 +20,11 @@
"proveit-no-references": "No se encontraron referencias",
"proveit-filter-fields": "Filtrar campos",
"proveit-filter-references": "Filtrar referencias",
- "proveit-today-button": "Hoy"
+ "proveit-show-all-button": "Mostrar todos los campos",
+ "proveit-today-button": "Hoy",
+ "proveit-citoid-label": "Identificador de la referencia",
+ "proveit-citoid-tooltip": "Ingresa una URL, DOI, ISBN or PMC/PMID para
intentar extraer los detalles automáticamente a través del servicio Citoid",
+ "proveit-citoid-placeholder": "URL, DOI, ISBN o PMC/PMID",
+ "proveit-citoid-loading": "Cargando...",
+ "proveit-citoid-error": "Error"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index bc7cf7b..3631389 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,5 +22,11 @@
"proveit-no-references": "Text for when no references are found",
"proveit-filter-fields": "Placeholder for the input field to filter
parameters",
"proveit-filter-references": "Placeholder for the input field to filter
references",
- "proveit-today-button": "Text for the button that inserts the current
date\n{{Identical|Today}}"
+ "proveit-show-all-button": "Text for the button that shows all
parameter fields",
+ "proveit-today-button": "Text for the button that inserts the current
date\n{{Identical|Today}}",
+ "proveit-citoid-label": "Reference identifier",
+ "proveit-citoid-tooltip": "Tooltip for the field that when filled with
a reference identifier, triggers the Citoid service to automatically fill in
the reference details",
+ "proveit-citoid-placeholder": "Placeholder for the field that triggers
the Citoid service",
+ "proveit-citoid-loading": "Status text while Citoid service is loading
the reference details",
+ "proveit-citoid-error": "Generic error message when something went
wrong with the Citoid service"
}
diff --git a/proveit.css b/proveit.css
index 9b8e338..acf6e5a 100755
--- a/proveit.css
+++ b/proveit.css
@@ -134,6 +134,7 @@
border: 1px solid #ddd;
border-radius: 0;
box-sizing: border-box;
+ display: block;
font: inherit;
outline: none;
padding: .4em;
@@ -145,7 +146,7 @@
resize: vertical;
}
-#proveit-reference-form button {
+#proveit-reference-form .today-button {
background: none;
border: none;
cursor: pointer;
@@ -155,8 +156,14 @@
right: 0;
}
-#proveit-reference-form button:hover {
+#proveit-reference-form .today-button:hover {
text-decoration: underline;
+}
+
+#proveit-reference-form .citoid-message {
+ padding: .4em;
+ position: absolute;
+ right: 0;
}
#proveit-footer {
@@ -174,24 +181,40 @@
}
#proveit-footer input {
+ border: 1px solid #ddd;
+ box-sizing: border-box;
+ float: left;
font: inherit;
- padding: .6em;
+ padding: 9px;
pointer-events: all;
width: 150px;
- float: left;
}
#proveit-footer button {
- border: 1px solid #ccc;
+ background: #ddd;
+ border: none;
cursor: pointer;
font: inherit;
- margin: 0 .2em;
- padding: .6em;
+ margin-right: 5px;
+ padding: 10px;
pointer-events: all;
}
#pr
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Always use braces after if
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357677 )
Change subject: Always use braces after if
..
Always use braces after if
Makes if blocks more readable
Change-Id: I9883d46de2a71efdc02ccad19f67ae7c93854611
---
M CentralNoticePageLogPager.php
M maintenance/CleanCNTranslateMetadata.php
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/77/357677/1
diff --git a/CentralNoticePageLogPager.php b/CentralNoticePageLogPager.php
index 2d46dd7..8a2ddb9 100644
--- a/CentralNoticePageLogPager.php
+++ b/CentralNoticePageLogPager.php
@@ -80,7 +80,9 @@
// Split the title into banner, message, and language
$titlePieces = explode( "/", $row->rc_title, 2 );
$titleBase = $titlePieces[0];
- if ( array_key_exists( 1, $titlePieces ) ) $language =
$titlePieces[1];
+ if ( array_key_exists( 1, $titlePieces ) ) {
+ $language = $titlePieces[1];
+ }
$pattern = '/Centralnotice-([^-]*)-(.*)/';
preg_match( $pattern, $titleBase, $matches );
$banner = $matches[1];
diff --git a/maintenance/CleanCNTranslateMetadata.php
b/maintenance/CleanCNTranslateMetadata.php
index 11479b2..2cd538f 100644
--- a/maintenance/CleanCNTranslateMetadata.php
+++ b/maintenance/CleanCNTranslateMetadata.php
@@ -56,7 +56,9 @@
);
foreach ( $res as $row ) {
- if ( (int)$row->count === 1 ) continue;
+ if ( (int)$row->count === 1 ) {
+ continue;
+ }
$db->delete(
'revtag',
--
To view, visit https://gerrit.wikimedia.org/r/357677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9883d46de2a71efdc02ccad19f67ae7c93854611
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Add first implementation of the Citoid service
Sophivorus has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357676 )
Change subject: Add first implementation of the Citoid service
..
Add first implementation of the Citoid service
Also:
* Hide all non-filled, optional and deprecated parameters by default
* Fix fallback to English when messages on the preferred language aren't
available
* Minor style fixes
Bug T148226
Change-Id: I599bb765c3df222e9912b4d4aca2a23d35e80130
---
M i18n/en.json
M i18n/es.json
M i18n/qqq.json
M proveit.css
M proveit.js
5 files changed, 158 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt
refs/changes/76/357676/1
diff --git a/i18n/en.json b/i18n/en.json
index 2d86961..85804a7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -19,5 +19,11 @@
"proveit-no-references": "No references found",
"proveit-filter-fields": "Filter fields",
"proveit-filter-references": "Filter references",
- "proveit-today-button": "Today"
+ "proveit-show-all-button": "Show all fields",
+ "proveit-today-button": "Today",
+ "proveit-citoid-label": "Reference identifier",
+ "proveit-citoid-tooltip": "Enter a URL, DOI, ISBN or PMC/PMID to try to
extract the details automatically through the Citoid service",
+ "proveit-citoid-placeholder": "URL, DOI, ISBN or PMC/PMID",
+ "proveit-citoid-loading": "Loading...",
+ "proveit-citoid-error": "Error"
}
\ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
index 732a87e..53e1ecc 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -20,5 +20,11 @@
"proveit-no-references": "No se encontraron referencias",
"proveit-filter-fields": "Filtrar campos",
"proveit-filter-references": "Filtrar referencias",
- "proveit-today-button": "Hoy"
+ "proveit-show-all-button": "Mostrar todos los campos",
+ "proveit-today-button": "Hoy",
+ "proveit-citoid-label": "Identificador de la referencia",
+ "proveit-citoid-tooltip": "Ingresa una URL, DOI, ISBN or PMC/PMID para
intentar extraer los detalles automáticamente a través del servicio Citoid",
+ "proveit-citoid-placeholder": "URL, DOI, ISBN o PMC/PMID",
+ "proveit-citoid-loading": "Cargando...",
+ "proveit-citoid-error": "Error"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index bc7cf7b..3631389 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,5 +22,11 @@
"proveit-no-references": "Text for when no references are found",
"proveit-filter-fields": "Placeholder for the input field to filter
parameters",
"proveit-filter-references": "Placeholder for the input field to filter
references",
- "proveit-today-button": "Text for the button that inserts the current
date\n{{Identical|Today}}"
+ "proveit-show-all-button": "Text for the button that shows all
parameter fields",
+ "proveit-today-button": "Text for the button that inserts the current
date\n{{Identical|Today}}",
+ "proveit-citoid-label": "Reference identifier",
+ "proveit-citoid-tooltip": "Tooltip for the field that when filled with
a reference identifier, triggers the Citoid service to automatically fill in
the reference details",
+ "proveit-citoid-placeholder": "Placeholder for the field that triggers
the Citoid service",
+ "proveit-citoid-loading": "Status text while Citoid service is loading
the reference details",
+ "proveit-citoid-error": "Generic error message when something went
wrong with the Citoid service"
}
diff --git a/proveit.css b/proveit.css
index 9b8e338..acf6e5a 100755
--- a/proveit.css
+++ b/proveit.css
@@ -134,6 +134,7 @@
border: 1px solid #ddd;
border-radius: 0;
box-sizing: border-box;
+ display: block;
font: inherit;
outline: none;
padding: .4em;
@@ -145,7 +146,7 @@
resize: vertical;
}
-#proveit-reference-form button {
+#proveit-reference-form .today-button {
background: none;
border: none;
cursor: pointer;
@@ -155,8 +156,14 @@
right: 0;
}
-#proveit-reference-form button:hover {
+#proveit-reference-form .today-button:hover {
text-decoration: underline;
+}
+
+#proveit-reference-form .citoid-message {
+ padding: .4em;
+ position: absolute;
+ right: 0;
}
#proveit-footer {
@@ -174,24 +181,40 @@
}
#proveit-footer input {
+ border: 1px solid #ddd;
+ box-sizing: border-box;
+ float: left;
font: inherit;
- padding: .6em;
+ padding: 9px;
pointer-events: all;
width: 150px;
- float: left;
}
#proveit-footer button {
- border: 1px solid #ccc;
+ background: #ddd;
+ border: none;
cursor: pointer;
font: inherit;
- margin: 0 .2em;
- padding: .6em;
+ margin-right: 5px;
+ padding: 10px;
point
