[MediaWiki-commits] [Gerrit] Prevent PHP notices and broken time displays - change (mediawiki...cldr)
jenkins-bot has submitted this change and it was merged. Change subject: Prevent PHP notices and broken time displays .. Prevent PHP notices and broken time displays Bug: 73111 Change-Id: I69c22e8b61e65fe2ec881f6401e4eb9e809900dd --- M TimeUnits.body.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/TimeUnits.body.php b/TimeUnits.body.php index 1cbe531..df7f2a6 100644 --- a/TimeUnits.body.php +++ b/TimeUnits.body.php @@ -169,6 +169,11 @@ $timeUnitKey = {$unit}-{$tense}-other; } + // Not all languages have translations for everything + if ( !isset( $timeUnits[$timeUnitKey] ) ) { + return true; + } + // Select the appropriate template for the timestamp. $timeUnit = $timeUnits[$timeUnitKey]; // Replace the placeholder with the number. -- To view, visit https://gerrit.wikimedia.org/r/171805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69c22e8b61e65fe2ec881f6401e4eb9e809900dd Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/cldr Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Let users type their username for 1 s during registration be... - change (mediawiki/core)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/171806 Change subject: Let users type their username for 1 s during registration before barking .. Let users type their username for 1 s during registration before barking 250 ms are not enough to finish typing your username and the warnings on the username not being available are fully relevant only when you're done typing, while being actively harmful if you're still typing an actually valid name. We should wait as much as possible, as long as most users are given the warning before submitting the form. Bug: 71744 Change-Id: I646d76d2b29b8049c4464f156320d32ea4bd207a --- M resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/06/171806/1 diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js index 68d3f61..a32a790 100644 --- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js +++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js @@ -135,6 +135,6 @@ } ); } - $input.on( events, $.debounce( 250, updateUsernameStatus ) ); + $input.on( events, $.debounce( 1000, updateUsernameStatus ) ); } ); }( mediaWiki, jQuery ) ); -- To view, visit https://gerrit.wikimedia.org/r/171806 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I646d76d2b29b8049c4464f156320d32ea4bd207a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move 10% of anons to HHVM - change (operations/mediawiki-config)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/171807 Change subject: Move 10% of anons to HHVM .. Move 10% of anons to HHVM Change-Id: I3f7d1ab9525912a80e5cdca42dc9f160bc3bc823 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/07/171807/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 48125ee..a0fcf42 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2650,7 +2650,7 @@ // lowered without careful coordination with ops. $wgNavigationTimingSamplingFactor = 1000; - $wgPercentHHVM = 5; + $wgPercentHHVM = 10; } if ( $wmgUseUniversalLanguageSelector ) { -- To view, visit https://gerrit.wikimedia.org/r/171807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f7d1ab9525912a80e5cdca42dc9f160bc3bc823 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Let users type their username for 1 s during registration be... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Let users type their username for 1 s during registration before barking .. Let users type their username for 1 s during registration before barking 250 ms are not enough to finish typing your username and the warnings on the username not being available are fully relevant only when you're done typing, while being actively harmful if you're still typing an actually valid name. We should wait as much as possible, as long as most users are given the warning before submitting the form. Bug: 71744 Change-Id: I646d76d2b29b8049c4464f156320d32ea4bd207a --- M resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js index 68d3f61..a32a790 100644 --- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js +++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js @@ -135,6 +135,6 @@ } ); } - $input.on( events, $.debounce( 250, updateUsernameStatus ) ); + $input.on( events, $.debounce( 1000, updateUsernameStatus ) ); } ); }( mediaWiki, jQuery ) ); -- To view, visit https://gerrit.wikimedia.org/r/171806 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I646d76d2b29b8049c4464f156320d32ea4bd207a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Spage sp...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix bug with echo when first argument is null or false (v 3.... - change (mediawiki...PhpTags)
Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/171808 Change subject: fix bug with echo when first argument is null or false (v 3.10.1) .. fix bug with echo when first argument is null or false (v 3.10.1) Change-Id: Iaa3a54594fe91d9d418280ba03365bf09824be86 --- M PhpTags.body.php M tests/parser/PhpTagsTests.txt M tests/phpunit/includes/RuntimeTest.php 3 files changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags refs/changes/08/171808/1 diff --git a/PhpTags.body.php b/PhpTags.body.php index c1cc3ac..3137436 100644 --- a/PhpTags.body.php +++ b/PhpTags.body.php @@ -88,7 +88,7 @@ } self::$time += $parser-mOutput-getTimeSinceStart( 'cpu' ) - $time; - if( true === isset( $result[0] ) ) { + if( $result ) { $return = self::insertGeneral( $parser, $parser-recursiveTagParse( implode($result), $frame ) diff --git a/tests/parser/PhpTagsTests.txt b/tests/parser/PhpTagsTests.txt index 92b8629..09771b2 100644 --- a/tests/parser/PhpTagsTests.txt +++ b/tests/parser/PhpTagsTests.txt @@ -57,4 +57,20 @@ !! result pbar /p -!! end \ No newline at end of file +!! end + +!! test +echo null true false +!! input +phptag echo null, true, false; /phptag +!! result +p1 +/p +!! end + +!! test +echo nothing +!! input +phptag ; /phptag +!! result +!! end diff --git a/tests/phpunit/includes/RuntimeTest.php b/tests/phpunit/includes/RuntimeTest.php index 740e51c..5180a61 100644 --- a/tests/phpunit/includes/RuntimeTest.php +++ b/tests/phpunit/includes/RuntimeTest.php @@ -3,6 +3,30 @@ class RuntimeTest extends \PHPUnit_Framework_TestCase { + public function testRun_echo_null_1() { + $this-assertEquals( + Runtime::runSource('echo null;'), + array( null ) + ); + } + public function testRun_echo_true_1() { + $this-assertEquals( + Runtime::runSource('echo true;'), + array( true ) + ); + } + public function testRun_echo_false_1() { + $this-assertEquals( + Runtime::runSource('echo false;'), + array( false ) + ); + } + public function testRun_no_echo_1() { + $this-assertEquals( + Runtime::runSource(';'), + array() + ); + } public function testRun_echo_apostrophe_1() { $this-assertEquals( Runtime::runSource('echo Hello!;'), -- To view, visit https://gerrit.wikimedia.org/r/171808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa3a54594fe91d9d418280ba03365bf09824be86 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhpTags Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix bug with echo when first argument is null or false (v 3.... - change (mediawiki...PhpTags)
jenkins-bot has submitted this change and it was merged. Change subject: fix bug with echo when first argument is null or false (v 3.10.1) .. fix bug with echo when first argument is null or false (v 3.10.1) Change-Id: Iaa3a54594fe91d9d418280ba03365bf09824be86 --- M PhpTags.body.php M PhpTags.php M tests/parser/PhpTagsTests.txt M tests/phpunit/includes/RuntimeTest.php 4 files changed, 43 insertions(+), 3 deletions(-) Approvals: Pastakhov: Looks good to me, approved jenkins-bot: Verified diff --git a/PhpTags.body.php b/PhpTags.body.php index c1cc3ac..3137436 100644 --- a/PhpTags.body.php +++ b/PhpTags.body.php @@ -88,7 +88,7 @@ } self::$time += $parser-mOutput-getTimeSinceStart( 'cpu' ) - $time; - if( true === isset( $result[0] ) ) { + if( $result ) { $return = self::insertGeneral( $parser, $parser-recursiveTagParse( implode($result), $frame ) diff --git a/PhpTags.php b/PhpTags.php index f90132d..8b595f5 100644 --- a/PhpTags.php +++ b/PhpTags.php @@ -17,7 +17,7 @@ const PHPTAGS_MAJOR_VERSION = 3; const PHPTAGS_MINOR_VERSION = 10; -const PHPTAGS_RELEASE_VERSION = 0; +const PHPTAGS_RELEASE_VERSION = 1; define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION . '.' . PHPTAGS_RELEASE_VERSION ); const PHPTAGS_HOOK_RELEASE = 5; diff --git a/tests/parser/PhpTagsTests.txt b/tests/parser/PhpTagsTests.txt index 92b8629..09771b2 100644 --- a/tests/parser/PhpTagsTests.txt +++ b/tests/parser/PhpTagsTests.txt @@ -57,4 +57,20 @@ !! result pbar /p -!! end \ No newline at end of file +!! end + +!! test +echo null true false +!! input +phptag echo null, true, false; /phptag +!! result +p1 +/p +!! end + +!! test +echo nothing +!! input +phptag ; /phptag +!! result +!! end diff --git a/tests/phpunit/includes/RuntimeTest.php b/tests/phpunit/includes/RuntimeTest.php index 740e51c..5180a61 100644 --- a/tests/phpunit/includes/RuntimeTest.php +++ b/tests/phpunit/includes/RuntimeTest.php @@ -3,6 +3,30 @@ class RuntimeTest extends \PHPUnit_Framework_TestCase { + public function testRun_echo_null_1() { + $this-assertEquals( + Runtime::runSource('echo null;'), + array( null ) + ); + } + public function testRun_echo_true_1() { + $this-assertEquals( + Runtime::runSource('echo true;'), + array( true ) + ); + } + public function testRun_echo_false_1() { + $this-assertEquals( + Runtime::runSource('echo false;'), + array( false ) + ); + } + public function testRun_no_echo_1() { + $this-assertEquals( + Runtime::runSource(';'), + array() + ); + } public function testRun_echo_apostrophe_1() { $this-assertEquals( Runtime::runSource('echo Hello!;'), -- To view, visit https://gerrit.wikimedia.org/r/171808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa3a54594fe91d9d418280ba03365bf09824be86 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PhpTags Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru Gerrit-Reviewer: Pastakhov pastak...@yandex.ru Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move 10% of anons to HHVM - change (operations/mediawiki-config)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Move 10% of anons to HHVM .. Move 10% of anons to HHVM Change-Id: I3f7d1ab9525912a80e5cdca42dc9f160bc3bc823 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 48125ee..a0fcf42 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2650,7 +2650,7 @@ // lowered without careful coordination with ops. $wgNavigationTimingSamplingFactor = 1000; - $wgPercentHHVM = 5; + $wgPercentHHVM = 10; } if ( $wmgUseUniversalLanguageSelector ) { -- To view, visit https://gerrit.wikimedia.org/r/171807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f7d1ab9525912a80e5cdca42dc9f160bc3bc823 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jobs for ext/PhpTagsWidgets - change (integration/config)
Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/171809 Change subject: Add jobs for ext/PhpTagsWidgets .. Add jobs for ext/PhpTagsWidgets Change-Id: Ic9538438a66cbda7bd7de5dcc8ea6dd806abde88 --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/09/171809/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index eaa3c0d..9083751 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -734,6 +734,8 @@ dependencies: 'PhpTags' - PhpTagsMaps - PhpTagsSMW + - PhpTagsWidgets: +dependencies: 'PhpTags,PhpTagsFunctions,PhpTagsWiki' - PhpTagsWiki: dependencies: 'PhpTags,PhpTagsFunctions' - PictureGame diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e0e59e6..ea86055 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5093,6 +5093,10 @@ template: - name: extension-unittests + - name: mediawiki/extensions/PhpTagsWidgets +template: + - name: extension-unittests + - name: mediawiki/extensions/PhpTagsWiki template: - name: extension-unittests -- To view, visit https://gerrit.wikimedia.org/r/171809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9538438a66cbda7bd7de5dcc8ea6dd806abde88 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Pastakhov pastak...@yandex.ru ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated scripts - change (analytics/zero-sms)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/171810 Change subject: Updated scripts .. Updated scripts Change-Id: I101466924217d19b4def63a4a4ae8b5e3c915a7a --- M scripts/api.py M scripts/log2dfs.py M scripts/logprocessor.py M scripts/run-hivezero.sh M scripts/smslogs.py M scripts/weblogs.py M scripts/weblogs2.py M scripts/zero-counts.hql 8 files changed, 141 insertions(+), 134 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/zero-sms refs/changes/10/171810/1 diff --git a/scripts/api.py b/scripts/api.py index 4037aeb..ed0bf6c 100644 --- a/scripts/api.py +++ b/scripts/api.py @@ -86,6 +86,7 @@ def __init__(self, url, headers=None, session=None, log=None): +self._loginOnDemand = False self.session = session if session else requests.session() self.log = log if log else ConsoleLog() self.url = url @@ -143,6 +144,9 @@ else: request_kw['params'] = kwargs +if self._loginOnDemand and action != 'login': +self.login(self._loginOnDemand[0], self._loginOnDemand[1]) + data = parseJson(self.request(method, forceSSL=forceSSL, **request_kw)) # Handle success and failure @@ -152,13 +156,23 @@ self.log(2, data['warnings']) return data -def login(self, user, password): +def login(self, user, password, onDemand=False): + +:param user: +:param password: +:param onDemand: if True, will postpone login until an actual API request is made +:return: + +if onDemand: +self._loginOnDemand = (user, password) +return self.tokens = {} res = self('login', lgname=user, lgpassword=password)['login'] if res['result'] == 'NeedToken': res = self('login', lgname=user, lgpassword=password, lgtoken=res['token'])['login'] if res['result'] != 'Success': raise ApiError('Login failed', res) +self._loginOnDemand = False def query(self, **kwargs): diff --git a/scripts/log2dfs.py b/scripts/log2dfs.py index 30aa8d5..9f888ec 100644 --- a/scripts/log2dfs.py +++ b/scripts/log2dfs.py @@ -221,7 +221,7 @@ safePrint(u'URL parsing failed: %s\n%s' % (uri, line)) continue if m.group(1).lower() == u'https' and u'https=' not in x_analytics: -x_analytics += u'https=1' +x_analytics += u';https=1' uri_host = m.group(2) if uri_host.endswith(':80'): uri_host = uri_host[:-3] diff --git a/scripts/logprocessor.py b/scripts/logprocessor.py index 0e425b1..f74f128 100644 --- a/scripts/logprocessor.py +++ b/scripts/logprocessor.py @@ -188,7 +188,7 @@ self._wiki = api.wikimedia('zero', 'wikimedia', 'https') if self.proxy: self._wiki.session.proxies = {'http': 'http://%s:%d' % (self.proxy, self.proxyPort)} -self._wiki.login(self.settings.apiUsername, self.settings.apiPassword) +self._wiki.login(self.settings.apiUsername, self.settings.apiPassword, onDemand=True) return self._wiki # noinspection PyMethodMayBeStatic @@ -217,12 +217,11 @@ def __init__(self, settingsFile, pathSuffix): super(LogProcessor, self).__init__(settingsFile, pathSuffix) -if not self.settings.pathLogs or not self.settings.pathCache or not self.settings.pathGraphs: +if not self.settings.pathLogs or not self.settings.pathCache: raise ValueError('One of the paths is not set, check %s' % settingsFile) self.pathLogs = self.normalizePath(self.settings.pathLogs) self.pathCache = self.normalizePath(self.settings.pathCache) -self.pathGraphs = self.normalizePath(self.settings.pathGraphs) def defaultSettings(self, suffix): s = super(LogProcessor, self).defaultSettings(suffix) @@ -231,5 +230,4 @@ suffix = os.sep + suffix if suffix else '' s.pathLogs = 'logs' + suffix s.pathCache = 'cache' + suffix -s.pathGraphs = 'graphs' + suffix return s diff --git a/scripts/run-hivezero.sh b/scripts/run-hivezero.sh index d1f799b..2c8f95c 100755 --- a/scripts/run-hivezero.sh +++ b/scripts/run-hivezero.sh @@ -1,16 +1,63 @@ #!/bin/bash -#$1 $2 $3 $4 $5 %6 $7 -# ./run-clone.sh wmf_raw.webrequest 515-05 2014 10 11 0 23 +# $1 $2 $3 $4 %5 $6 +# ./run-hivezero.sh wmf_raw.webrequest 2014 10 1 31 +# ./run-hivezero.sh webreq_archive 2014 10 1 31 overwrite -if [[ -z $7 ]]; then - last=$6 +set -e + +if [[ -z $5 ]]; then + last=$4 else - last=$7 + last=$5 fi -for ((hour = $6; hour = $last; hour++)); do -
[MediaWiki-commits] [Gerrit] admin: revoke temporarily Yuvi's root - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/171811 Change subject: admin: revoke temporarily Yuvi's root .. admin: revoke temporarily Yuvi's root Change-Id: I785af5a3c089f3707bb169c458c6bce26891f211 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/11/171811/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index e0b7751..a531437 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -9,7 +9,7 @@ ops: gid: 700 description: include everywhere ops folks -members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, yuvipanda, +members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, dzahn, akosiaris, springle, mark, gage, ariel, cmjohnson, otto, robh, tstarling, ori] privs: ['ALL = (ALL) NOPASSWD: ALL'] parsoid-roots: @@ -224,7 +224,7 @@ labmon-roots: gid: 734 description: Full root access to labmon nodes -members: [yuvipanda] +members: [] privs: ['ALL = NOPASSWD: ALL'] citoid-roots: gid: 735 -- To view, visit https://gerrit.wikimedia.org/r/171811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I785af5a3c089f3707bb169c458c6bce26891f211 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin: revoke temporarily Yuvi's root - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: admin: revoke temporarily Yuvi's root .. admin: revoke temporarily Yuvi's root Change-Id: I785af5a3c089f3707bb169c458c6bce26891f211 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Looks good to me, but someone else must approve Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index e0b7751..a531437 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -9,7 +9,7 @@ ops: gid: 700 description: include everywhere ops folks -members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, yuvipanda, +members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, dzahn, akosiaris, springle, mark, gage, ariel, cmjohnson, otto, robh, tstarling, ori] privs: ['ALL = (ALL) NOPASSWD: ALL'] parsoid-roots: @@ -224,7 +224,7 @@ labmon-roots: gid: 734 description: Full root access to labmon nodes -members: [yuvipanda] +members: [] privs: ['ALL = NOPASSWD: ALL'] citoid-roots: gid: 735 -- To view, visit https://gerrit.wikimedia.org/r/171811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I785af5a3c089f3707bb169c458c6bce26891f211 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove obsolete MakeGlobalVariablesScriptHandler - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove obsolete MakeGlobalVariablesScriptHandler .. Remove obsolete MakeGlobalVariablesScriptHandler This is quite old and obsolete. In production, the parser cache has been invalidated numerous times since and there is no use case for this code now. Change-Id: Idce26ec3dea691bb8ed8aea206cb519eb6303235 --- M repo/Wikibase.hooks.php M repo/Wikibase.php D repo/includes/Hook/MakeGlobalVariablesScriptHandler.php D repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php M repo/tests/phpunit/includes/RepoHooksTest.php 5 files changed, 0 insertions(+), 394 deletions(-) Approvals: Daniel Kinzler: Checked; Looks good to me, approved Thiemo Mättig (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php index 677e8d4..ccae95b 100644 --- a/repo/Wikibase.hooks.php +++ b/repo/Wikibase.hooks.php @@ -32,7 +32,6 @@ use User; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParsingException; -use Wikibase\Hook\MakeGlobalVariablesScriptHandler; use Wikibase\Hook\OutputPageJsConfigHookHandler; use Wikibase\Repo\Content\EntityHandler; use Wikibase\Repo\View\EntityViewPlaceholderExpander; @@ -1140,44 +1139,6 @@ $isExperimental = defined( 'WB_EXPERIMENTAL_FEATURES' ) WB_EXPERIMENTAL_FEATURES; $hookHandler-handle( $out, $isExperimental ); - - return true; - } - - /** -* Provides fallback for output page js config vars that are stored in parser cache. -* -* In some cases, e.g. stale parser cache contents, variables including wbEntity might be -* missing, so we add them here as a fallback. This hook is called after -* OutputPage::setRevisionId is called. Revision id is needed to retrieve the correct entity. -* -* @param array $vars -* @param OutputPage $out -* -* @return bool -*/ - public static function onMakeGlobalVariablesScript( $vars, $out ) { - $entityNamespaceLookup = WikibaseRepo::getDefaultInstance()-getEntityNamespaceLookup(); - - if ( !$entityNamespaceLookup-isEntityNamespace( $out-getTitle()-getNamespace() ) ) { - return true; - } - - $wikibaseRepo = WikibaseRepo::getDefaultInstance(); - $languageCode = $out-getContext()-getLanguage()-getCode(); - - $fallbackChainFactory = $wikibaseRepo-getLanguageFallbackChainFactory(); - $fallbackChain = $fallbackChainFactory-newFromContextForPageView( $out-getContext() ); - - $languageCodes = Utils::getLanguageCodes() + array( $languageCode = $fallbackChain ); - - $hookHandler = new MakeGlobalVariablesScriptHandler( - $wikibaseRepo-getEntityContentFactory(), - $wikibaseRepo-getParserOutputJsConfigBuilder( $languageCode ), - $languageCodes - ); - - $hookHandler-handle( $out ); return true; } diff --git a/repo/Wikibase.php b/repo/Wikibase.php index c7e41d2..baafa23 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -211,7 +211,6 @@ $wgHooks['ContentModelCanBeUsedOn'][] = 'Wikibase\RepoHooks::onContentModelCanBeUsedOn'; $wgHooks['OutputPageBeforeHTML'][] = 'Wikibase\RepoHooks::onOutputPageBeforeHTML'; $wgHooks['OutputPageBeforeHTML'][] = 'Wikibase\RepoHooks::onOutputPageBeforeHtmlRegisterConfig'; - $wgHooks['MakeGlobalVariablesScript'][] = 'Wikibase\RepoHooks::onMakeGlobalVariablesScript'; $wgHooks['ContentHandlerForModelID'][] = 'Wikibase\RepoHooks::onContentHandlerForModelID'; $wgHooks['APIQuerySiteInfoStatisticsInfo'][]= 'Wikibase\RepoHooks::onAPIQuerySiteInfoStatisticsInfo'; $wgHooks['ImportHandleRevisionXMLTag'][]= 'Wikibase\RepoHooks::onImportHandleRevisionXMLTag'; diff --git a/repo/includes/Hook/MakeGlobalVariablesScriptHandler.php b/repo/includes/Hook/MakeGlobalVariablesScriptHandler.php deleted file mode 100644 index a67a178..000 --- a/repo/includes/Hook/MakeGlobalVariablesScriptHandler.php +++ /dev/null @@ -1,137 +0,0 @@ -?php - -namespace Wikibase\Hook; - -use OutputPage; -use Wikibase\DataModel\Entity\Entity; -use Wikibase\EntityContent; -use Wikibase\Lib\Serializers\SerializationOptions; -use Wikibase\ParserOutputJsConfigBuilder; -use Wikibase\Repo\Content\EntityContentFactory; - -/** - * @since 0.5 - * - * @licence GNU GPL v2+ - * @author Katie Filbert aude.w...@gmail.com - */ -class MakeGlobalVariablesScriptHandler { - - /** -* @var
[MediaWiki-commits] [Gerrit] sitelinklistview._updateAutoInput: Check if last sitelinkvie... - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/171812 Change subject: sitelinklistview._updateAutoInput: Check if last sitelinkview exists .. sitelinklistview._updateAutoInput: Check if last sitelinkview exists Change-Id: I2a1e0a4a08f1a41671e61c9c481ac6f06746f025 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/12/171812/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js index 1b2eec1..704a861 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js @@ -333,9 +333,13 @@ secondToLastInvalidPending = secondToLast !secondToLast.isValid() !secondToLast.option( 'value' ); - if( lastSitelinkview.isEmpty() ( multipleEmpty || secondToLastInvalidPending ) ) { + if( + lastSitelinkview +lastSitelinkview.isEmpty() +( multipleEmpty || secondToLastInvalidPending ) + ) { listview.removeItem( $lastSitelinkview ); - } else if( lastSitelinkview.isValid() !this.isFull() ) { + } else if( !lastSitelinkview || lastSitelinkview.isValid() !this.isFull() ) { this.enterNewItem(); } }, -- To view, visit https://gerrit.wikimedia.org/r/171812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a1e0a4a08f1a41671e61c9c481ac6f06746f025 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inject entity info into ParserOutputJsConfigBuilder - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Inject entity info into ParserOutputJsConfigBuilder .. Inject entity info into ParserOutputJsConfigBuilder Change-Id: If5a5eeff3b9029134ae2b31b743dedb1622f51b0 --- M repo/includes/EntityParserOutputGenerator.php M repo/includes/ParserOutputJsConfigBuilder.php M repo/includes/content/EntityContent.php M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php 5 files changed, 115 insertions(+), 143 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/EntityParserOutputGenerator.php b/repo/includes/EntityParserOutputGenerator.php index 2cecb92..447484b 100644 --- a/repo/includes/EntityParserOutputGenerator.php +++ b/repo/includes/EntityParserOutputGenerator.php @@ -3,10 +3,12 @@ namespace Wikibase; use ParserOutput; +use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\PropertyDataTypeLookup; use Wikibase\DataModel\SiteLinkList; use Wikibase\Lib\Serializers\SerializationOptions; +use Wikibase\Lib\Store\EntityInfoBuilderFactory; use Wikibase\Lib\Store\EntityTitleLookup; /** @@ -47,18 +49,39 @@ */ private $dataTypeLookup; + /** +* @var EntityInfoBuilderFactory +*/ + private $entityInfoBuilderFactory; + + /** +* @var string +*/ + private $languageCode; + + /** +* @var ReferencedEntitiesFinder +*/ + private $referencedEntitiesFinder; + public function __construct( EntityView $entityView, ParserOutputJsConfigBuilder $configBuilder, SerializationOptions $serializationOptions, EntityTitleLookup $entityTitleLookup, - PropertyDataTypeLookup $dataTypeLookup + PropertyDataTypeLookup $dataTypeLookup, + EntityInfoBuilderFactory $entityInfoBuilderFactory, + $languageCode ) { $this-entityView = $entityView; $this-configBuilder = $configBuilder; $this-serializationOptions = $serializationOptions; $this-entityTitleLookup = $entityTitleLookup; $this-dataTypeLookup = $dataTypeLookup; + $this-entityInfoBuilderFactory = $entityInfoBuilderFactory; + $this-languageCode = $languageCode; + + $this-referencedEntitiesFinder = new ReferencedEntitiesFinder(); } /** @@ -76,12 +99,20 @@ $pout = new ParserOutput(); $entity = $entityRevision-getEntity(); + $snaks = $entity-getAllSnaks(); - $isExperimental = defined( 'WB_EXPERIMENTAL_FEATURES' ) WB_EXPERIMENTAL_FEATURES; - $configVars = $this-configBuilder-build( $entity, $this-serializationOptions, $isExperimental ); + $referencedEntityIds = $this-referencedEntitiesFinder-findSnakLinks( $snaks ); + $entityInfo = $this-getEntityInfo( $referencedEntityIds ); + + $configVars = $this-configBuilder-build( + $entity, + $entityInfo, + $this-serializationOptions + ); + $pout-addJsConfigVars( $configVars ); - $this-addSnaksToParserOutput( $pout, $entity-getAllSnaks() ); + $this-addSnaksToParserOutput( $pout, $referencedEntityIds, $snaks ); if ( $entity instanceof Item ) { $this-addBadgesToParserOutput( $pout, $entity-getSiteLinkList() ); @@ -105,11 +136,7 @@ return $pout; } - private function addSnaksToParserOutput( ParserOutput $pout, array $snaks ) { - // treat referenced entities as page links -- - $entitiesFinder = new ReferencedEntitiesFinder(); - $usedEntityIds = $entitiesFinder-findSnakLinks( $snaks ); - + private function addSnaksToParserOutput( ParserOutput $pout, array $usedEntityIds, array $snaks ) { foreach ( $usedEntityIds as $entityId ) { $pout-addLink( $this-entityTitleLookup-getTitleForId( $entityId ) ); } @@ -137,6 +164,37 @@ } } + /** +* Fetches some basic entity information required for the entity view in JavaScript from a +* set of entity IDs. +* @since 0.4 +* +* @param EntityId[] $entityIds +* @return array obtained from EntityInfoBuilder::getEntityInfo +*/ + private function getEntityInfo( array $entityIds ) { + wfProfileIn( __METHOD__ ); + + // TODO: apply language fallback! +
[MediaWiki-commits] [Gerrit] Introduce EntityInfoTermLookup. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review. https://gerrit.wikimedia.org/r/171813 Change subject: Introduce EntityInfoTermLookup. .. Introduce EntityInfoTermLookup. This provides a term lookup based on data pre-fetched by EntityInfoBuilder. Bug: 72307 Change-Id: I954197e733166941b4d38e273512c04a2aea4557 --- A lib/includes/store/EntityInfoTermLookup.php M lib/includes/store/TermLookup.php A lib/tests/phpunit/store/EntityInfoTermLookupTest.php M lib/tests/phpunit/store/EntityTermLookupTest.php 4 files changed, 281 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/13/171813/1 diff --git a/lib/includes/store/EntityInfoTermLookup.php b/lib/includes/store/EntityInfoTermLookup.php new file mode 100644 index 000..6c4648a --- /dev/null +++ b/lib/includes/store/EntityInfoTermLookup.php @@ -0,0 +1,145 @@ +?php + +namespace Wikibase\Lib\Store; + +use OutOfBoundsException; +use Wikibase\DataModel\Entity\EntityId; + +/** + * TermLookup based on plain array data structures. + * This allows term lookups to be performed directly on prefetched data, + * such as the data structured generated by EntityInfoBuilder. + * + * @see EntityInfoBuilder + * + * @since 0.5 + * + * @licence GNU GPL v2+ + * @author Daniel Kinzler + */ +class EntityInfoTermLookup implements TermLookup { + + /** +* @var array +*/ + private $entityRecords; + + /** +* @param array $entityRecords A array of entity records, as returned +* by EntityInfoBuilder::getEntityInfo. +*/ + function __construct( array $entityRecords ) { + $this-entityRecords = $entityRecords; + } + + /** +* @param EntityId $entityId +* @param $field +* @param $languageCode +* +* @return string|null +* @throws OutOfBoundsException +*/ + private function getValue( EntityId $entityId, $field, $languageCode ) { + $id = $entityId-getSerialization(); + + if ( !isset( $this-entityRecords[$id] ) ) { + throw new OutOfBoundsException( 'No terms known for entity ' . $id ); + } + + if ( !isset( $this-entityRecords[$id][$field] ) ) { + throw new OutOfBoundsException( 'No ' . $field . ' known for entity ' . $id ); + } + + if ( !isset( $this-entityRecords[$id][$field][$languageCode] ) ) { + throw new OutOfBoundsException( 'No ' . $field . ' known in ' . $languageCode . ' for entity ' . $id ); + } + + $value = $this-entityRecords[$id][$field][$languageCode]; + + if ( is_array( $value ) ) { + // $value may be a record with language and value fields. + $value = $value['value']; + } + + return $value; + } + + /** +* @param EntityId $entityId +* @param $field +* +* @return string[] +*/ + private function getValuesByLanguage( EntityId $entityId, $field ) { + $id = $entityId-getSerialization(); + + if ( !isset( $this-entityRecords[$id] ) ) { + return array(); + } + + if ( !isset( $this-entityRecords[$id][$field] ) ) { + return array(); + } + + $values = array(); + + foreach ( $this-entityRecords[$id][$field] as $languageCode = $value ) { + if ( is_array( $value ) ) { + // $value may be a record with language and value fields. + $value = $value['value']; + } + + $values[$languageCode] = $value; + } + + return $values; + } + + /** +* Gets the label of an Entity with the specified EntityId and language code. +* +* @param EntityId $entityId +* @param string $languageCode +* +* @return string +*/ + public function getLabel( EntityId $entityId, $languageCode ) { + return $this-getValue( $entityId, 'labels', $languageCode ); + } + + /** +* Gets all labels of an Entity with the specified EntityId. +* +* @param EntityId $entityId +* +* @return string[] +*/ + public function getLabels( EntityId $entityId ) { + return $this-getValuesByLanguage( $entityId, 'labels' ); + } + + /** +* Gets the description of an Entity with the specified EntityId and language code. +* +* @param EntityId $entityId +* @param string $languageCode +* +* @return string +*/ + public
[MediaWiki-commits] [Gerrit] Center the CTA drawer icon - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Center the CTA drawer icon .. Center the CTA drawer icon Bug: 73059 Change-Id: I6130975d9873ba3077b7bdc1e1fd8d3788726462 --- M less/drawer.less 1 file changed, 7 insertions(+), 13 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/less/drawer.less b/less/drawer.less index c4fdd70..3309bc1 100644 --- a/less/drawer.less +++ b/less/drawer.less @@ -43,20 +43,14 @@ margin-bottom: 1em; } - .drawer-cta { - .cancel { - display: block; - margin: auto; + .cancel { + display: block; + margin: auto; - // FIXME: Remove when mw-ui-icon in stable - .icon { - height: 32px; - background-position: 50% 8px; - } - - :before { - background-position: 50% 8px; - } + // FIXME: Remove when mw-ui-icon in stable + .icon { + height: 32px; + background-position: 50% 8px; } } -- To view, visit https://gerrit.wikimedia.org/r/171782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6130975d9873ba3077b7bdc1e1fd8d3788726462 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug 73024 - replace getHash() with getFileSHA1Sum() - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bug 73024 - replace getHash() with getFileSHA1Sum() .. Bug 73024 - replace getHash() with getFileSHA1Sum() Instance of 'FilePage' has no 'getHash' member. Use FilePage.getFileSHA1Sum(). Bug: 73024 Change-Id: Id4e13e57f46c9dd088bea0b80eea374fab959f2f --- M scripts/checkimages.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 8179fff..005d526 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -940,7 +940,7 @@ commons_site = pywikibot.Site('commons', 'commons') regexOnCommons = r\[\[:File:%s\]\] is also on '''Commons''': \[\[commons:File:.*?\]\](?: \(same name\)|)$ \ % re.escape(self.imageName) -hash_found = self.image.getHash() +hash_found = self.image.getFileSHA1Sum() if not hash_found: return # Image deleted, no hash found. Skip the image. @@ -1002,7 +1002,7 @@ duplicateRegex = r'\[\[:File:%s\]\] has the following duplicates' \ % re.escape(self.convert_to_url(self.imageName)) imagePage = pywikibot.FilePage(self.site, self.imageName) -hash_found = imagePage.getHash() +hash_found = imagePage.getFileSHA1Sum() duplicates = self.site.getFilesFromAnHash(hash_found) if not duplicates: -- To view, visit https://gerrit.wikimedia.org/r/171730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4e13e57f46c9dd088bea0b80eea374fab959f2f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa mpaa.w...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Intersect generators - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Intersect generators .. Intersect generators It used in pagegenerators.py to intersect generators listed in command line. Yield items only if they are yielded by all specified generators. Threads (via ThreadedGenerator) are used in order to run generators in parallel, so that items can be yielded before generators are exhausted. Threads are stopped when they are either exhausted or Ctrl-C is pressed. Quitting before all generators are finished is attempted if there is no more chance of finding an item in all queues. Refactored ThreadList in tool.py and added method ThrreadList.stop_all(). Change-Id: I53eb1f747f46e18a3dd220feef1e496fd36853e2 --- M pywikibot/pagegenerators.py M pywikibot/tools.py M tests/pagegenerators_tests.py M tests/thread_tests.py 4 files changed, 200 insertions(+), 13 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 3e77643..319089e 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -26,9 +26,14 @@ import itertools import re import time + import pywikibot from pywikibot import date, config, i18n -from pywikibot.tools import deprecated_args, DequeGenerator +from pywikibot.tools import ( +deprecated_args, +DequeGenerator, +intersect_generators, +) from pywikibot.comms import http import pywikibot.data.wikidataquery as wdquery @@ -36,11 +41,14 @@ basestring = (str, ) unicode = str +_logger = pagegenerators + # ported from version 1 for backwards-compatibility # most of these functions just wrap a Site or Page method that returns # a generator parameterHelp = u\ + -cat Work on all pages which are in a specific category. Argument can also be given as -cat:categoryname or as -cat:categoryname|fromtitle (using # instead of | @@ -199,6 +207,7 @@ Case insensitive regular expressions will be used and dot matches any character, including a newline. +-intersectWork on the intersection of all the provided generators. docuReplacements = {'params;': parameterHelp} @@ -233,6 +242,7 @@ self.step = None self.limit = None self.articlefilter_list = [] +self.intersect = False self._site = site @property @@ -273,10 +283,18 @@ return None elif len(self.gens) == 1: gensList = self.gens[0] +dupfiltergen = gensList +if self.intersect: +pywikibot.input(u'Only one generator. ' +u'Param -intersect has no meaning or effect.') else: -gensList = CombinedPageGenerator(self.gens) - -dupfiltergen = DuplicateFilterPageGenerator(gensList) +if self.intersect: +gensList = intersect_generators(self.gens) +# By definition no duplicates are possible. +dupfiltergen = gensList +else: +gensList = CombinedPageGenerator(self.gens) +dupfiltergen = DuplicateFilterPageGenerator(gensList) if self.articlefilter_list: return RegexBodyFilterPageGenerator( @@ -572,6 +590,9 @@ query = pywikibot.input( u'Mysql query string:') gen = MySQLPageGenerator(query, site=self.site) +elif arg.startswith('-intersect'): +self.intersect = True +return True if gen: self.gens.append(gen) diff --git a/pywikibot/tools.py b/pywikibot/tools.py index c891c83..ad890eb 100644 --- a/pywikibot/tools.py +++ b/pywikibot/tools.py @@ -13,7 +13,7 @@ import time import inspect import re -from collections import Mapping, deque +import collections from distutils.version import Version if sys.version_info[0] 2: @@ -256,17 +256,20 @@ +_logger = threadlist + def __init__(self, limit=128, *args): +Constructor. self.limit = limit -list.__init__(self, *args) -for item in list(self): +super(ThreadList, self).__init__(*args) +for item in self: if not isinstance(threading.Thread, item): raise TypeError(Cannot add '%s' to ThreadList % type(item)) def active_count(self): Return the number of alive threads, and delete all non-alive ones. count = 0 -for item in list(self): +for item in self[:]: if item.isAlive(): count += 1 else: @@ -274,12 +277,92 @@ return count def append(self, thd): +Add a thread to the pool and start it. if not isinstance(thd, threading.Thread): raise TypeError(Cannot append '%s'
[MediaWiki-commits] [Gerrit] Updated scripts - change (analytics/zero-sms)
Yurik has submitted this change and it was merged. Change subject: Updated scripts .. Updated scripts Change-Id: I101466924217d19b4def63a4a4ae8b5e3c915a7a --- M scripts/api.py M scripts/log2dfs.py M scripts/logprocessor.py M scripts/run-hivezero.sh M scripts/smslogs.py M scripts/weblogs.py M scripts/weblogs2.py M scripts/zero-counts.hql 8 files changed, 141 insertions(+), 134 deletions(-) Approvals: Yurik: Verified; Looks good to me, approved diff --git a/scripts/api.py b/scripts/api.py index 4037aeb..ed0bf6c 100644 --- a/scripts/api.py +++ b/scripts/api.py @@ -86,6 +86,7 @@ def __init__(self, url, headers=None, session=None, log=None): +self._loginOnDemand = False self.session = session if session else requests.session() self.log = log if log else ConsoleLog() self.url = url @@ -143,6 +144,9 @@ else: request_kw['params'] = kwargs +if self._loginOnDemand and action != 'login': +self.login(self._loginOnDemand[0], self._loginOnDemand[1]) + data = parseJson(self.request(method, forceSSL=forceSSL, **request_kw)) # Handle success and failure @@ -152,13 +156,23 @@ self.log(2, data['warnings']) return data -def login(self, user, password): +def login(self, user, password, onDemand=False): + +:param user: +:param password: +:param onDemand: if True, will postpone login until an actual API request is made +:return: + +if onDemand: +self._loginOnDemand = (user, password) +return self.tokens = {} res = self('login', lgname=user, lgpassword=password)['login'] if res['result'] == 'NeedToken': res = self('login', lgname=user, lgpassword=password, lgtoken=res['token'])['login'] if res['result'] != 'Success': raise ApiError('Login failed', res) +self._loginOnDemand = False def query(self, **kwargs): diff --git a/scripts/log2dfs.py b/scripts/log2dfs.py index 30aa8d5..9f888ec 100644 --- a/scripts/log2dfs.py +++ b/scripts/log2dfs.py @@ -221,7 +221,7 @@ safePrint(u'URL parsing failed: %s\n%s' % (uri, line)) continue if m.group(1).lower() == u'https' and u'https=' not in x_analytics: -x_analytics += u'https=1' +x_analytics += u';https=1' uri_host = m.group(2) if uri_host.endswith(':80'): uri_host = uri_host[:-3] diff --git a/scripts/logprocessor.py b/scripts/logprocessor.py index 0e425b1..f74f128 100644 --- a/scripts/logprocessor.py +++ b/scripts/logprocessor.py @@ -188,7 +188,7 @@ self._wiki = api.wikimedia('zero', 'wikimedia', 'https') if self.proxy: self._wiki.session.proxies = {'http': 'http://%s:%d' % (self.proxy, self.proxyPort)} -self._wiki.login(self.settings.apiUsername, self.settings.apiPassword) +self._wiki.login(self.settings.apiUsername, self.settings.apiPassword, onDemand=True) return self._wiki # noinspection PyMethodMayBeStatic @@ -217,12 +217,11 @@ def __init__(self, settingsFile, pathSuffix): super(LogProcessor, self).__init__(settingsFile, pathSuffix) -if not self.settings.pathLogs or not self.settings.pathCache or not self.settings.pathGraphs: +if not self.settings.pathLogs or not self.settings.pathCache: raise ValueError('One of the paths is not set, check %s' % settingsFile) self.pathLogs = self.normalizePath(self.settings.pathLogs) self.pathCache = self.normalizePath(self.settings.pathCache) -self.pathGraphs = self.normalizePath(self.settings.pathGraphs) def defaultSettings(self, suffix): s = super(LogProcessor, self).defaultSettings(suffix) @@ -231,5 +230,4 @@ suffix = os.sep + suffix if suffix else '' s.pathLogs = 'logs' + suffix s.pathCache = 'cache' + suffix -s.pathGraphs = 'graphs' + suffix return s diff --git a/scripts/run-hivezero.sh b/scripts/run-hivezero.sh index d1f799b..2c8f95c 100755 --- a/scripts/run-hivezero.sh +++ b/scripts/run-hivezero.sh @@ -1,16 +1,63 @@ #!/bin/bash -#$1 $2 $3 $4 $5 %6 $7 -# ./run-clone.sh wmf_raw.webrequest 515-05 2014 10 11 0 23 +# $1 $2 $3 $4 %5 $6 +# ./run-hivezero.sh wmf_raw.webrequest 2014 10 1 31 +# ./run-hivezero.sh webreq_archive 2014 10 1 31 overwrite -if [[ -z $7 ]]; then - last=$6 +set -e + +if [[ -z $5 ]]; then + last=$4 else - last=$7 + last=$5 fi -for ((hour = $6; hour = $last; hour++)); do - printf -v t tmp_%04d_%02d_%02d_%02d $3 $4 $5 $hour -
[MediaWiki-commits] [Gerrit] sitelinklistview._updateAutoInput: Check if last sitelinkvie... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: sitelinklistview._updateAutoInput: Check if last sitelinkview exists .. sitelinklistview._updateAutoInput: Check if last sitelinkview exists Change-Id: I2a1e0a4a08f1a41671e61c9c481ac6f06746f025 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js index 1b2eec1..704a861 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js @@ -333,9 +333,13 @@ secondToLastInvalidPending = secondToLast !secondToLast.isValid() !secondToLast.option( 'value' ); - if( lastSitelinkview.isEmpty() ( multipleEmpty || secondToLastInvalidPending ) ) { + if( + lastSitelinkview +lastSitelinkview.isEmpty() +( multipleEmpty || secondToLastInvalidPending ) + ) { listview.removeItem( $lastSitelinkview ); - } else if( lastSitelinkview.isValid() !this.isFull() ) { + } else if( !lastSitelinkview || lastSitelinkview.isValid() !this.isFull() ) { this.enterNewItem(); } }, -- To view, visit https://gerrit.wikimedia.org/r/171812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a1e0a4a08f1a41671e61c9c481ac6f06746f025 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Identify which page is no redirect - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/171814 Change subject: Identify which page is no redirect .. Identify which page is no redirect One hypothesis why the site tests tells that images are redirects although it only queried non-redirects is that between iterating through it and checking it changes to a redirect page. This prints the checked page if it is a redirect in an attempt to verify that hypothesis. Bug: 73120 Change-Id: I970099e8aaa9d558909ae9e1a8091aaf6f092829 --- M tests/site_tests.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/14/171814/1 diff --git a/tests/site_tests.py b/tests/site_tests.py index df22137..2c06344 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -696,6 +696,8 @@ imagepage = self.imagepage for using in mysite.imageusage(imagepage, filterredir=False, total=5): self.assertIsInstance(using, pywikibot.Page) +if using.isRedirectPage(): +print(using) self.assertFalse(using.isRedirectPage()) -- To view, visit https://gerrit.wikimedia.org/r/171814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I970099e8aaa9d558909ae9e1a8091aaf6f092829 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Align text and icons on the grey area - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Align text and icons on the grey area .. Align text and icons on the grey area Due to differences in line-height, author and license text were missaligned. Some adjusment has been done also about icon position. The end result can be viewed at http://i.imgur.com/x7KEjDE.png Change-Id: Ie369d7ab6f1230b1b795ce2b63cdba1401d052dd --- M resources/mmv/ui/mmv.ui.metadataPanel.less 1 file changed, 10 insertions(+), 4 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.less b/resources/mmv/ui/mmv.ui.metadataPanel.less index e3495c0..e0cf138 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanel.less +++ b/resources/mmv/ui/mmv.ui.metadataPanel.less @@ -37,6 +37,10 @@ } } +.mw-mmv-source-author { + line-height: 1.8em; +} + .mw-mmv-title { font-size: 1.2em; max-width: 60%; @@ -48,7 +52,7 @@ margin-top: -@metadatabar-below-fold-pushup-height; border-top: @fold-separator-border-width solid #ddd; background-color: #f5f5f5; - padding-top: 4px; + padding-top: 2px; .jq-fullscreened { // Make sure content fits into the screen. This assumes no paddings. @@ -66,7 +70,8 @@ height: 16px; width: 16px; content: ' '; - margin-right: 5px; + margin-right: 7px; + margin-bottom: 2px; background-size: contain; background-position: center center; background-repeat: no-repeat; @@ -114,7 +119,8 @@ height: 16px; width: 16px; content: ' '; - margin-right: 10px; + margin-right: 7px; + margin-bottom: 2px; background-size: contain; background-position: right center; background-repeat: no-repeat; @@ -139,7 +145,7 @@ /* @embed */ background-image: url(img/uploader-ltr.svg); width: 18px; - margin-right: 8px; + margin-right: 5px; } .mw-mmv-location-li:before { -- To view, visit https://gerrit.wikimedia.org/r/171571 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie369d7ab6f1230b1b795ce2b63cdba1401d052dd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Pginer pgi...@wikimedia.org Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle TemplateParser::parsePage() returning an empty array - change (mediawiki...CommonsMetadata)
jenkins-bot has submitted this change and it was merged. Change subject: Handle TemplateParser::parsePage() returning an empty array .. Handle TemplateParser::parsePage() returning an empty array Bug: 73107 Change-Id: I0361a6bd8f6103559a5cfc91fb99b706a39223df --- M DataCollector.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/DataCollector.php b/DataCollector.php index 018954b..1e8042f 100644 --- a/DataCollector.php +++ b/DataCollector.php @@ -109,8 +109,12 @@ * - no-source - failed to detect the source of the image or a custom attribution text */ public function verifyAttributionMetadata( $descriptionText ) { - $problems = array(); $templateData = $this-templateParser-parsePage( $descriptionText ); + if ( !$templateData ) { + return array( 'no-license', 'no-description', 'no-author', 'no-source' ); + } + + $problems = array(); $licenseData = $this-selectLicense( $templateData[TemplateParser::LICENSES_KEY] ); $informationData = $this-selectInformationTemplate( $templateData[TemplateParser::INFORMATION_FIELDS_KEY] ); -- To view, visit https://gerrit.wikimedia.org/r/171789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0361a6bd8f6103559a5cfc91fb99b706a39223df Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CommonsMetadata Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Site: Only store complete mapping - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/171815 Change subject: [FIX] Site: Only store complete mapping .. [FIX] Site: Only store complete mapping If the site is interrupted while loading the namespaces the stored namespaces might be invalid/incomplete. This bufferes the namespaces and only stores it after the mapping has been build. Bug: 73122 Change-Id: I64418dca1b66418dfb893b83f8d141b372bd2380 --- M pywikibot/site.py 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/15/171815/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index 8cf9f60..b167707 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2011,7 +2011,7 @@ return self.getmagicwords(pagenamee) def _build_namespaces(self): -self._namespaces = SelfCallDict() +_namespaces = SelfCallDict() # In MW 1.14, API siprop 'namespaces' added 'canonical', # and Image became File with Image as an alias. @@ -2034,12 +2034,14 @@ namespace = Namespace(ns, canonical_name, custom_name, use_image_name=not is_mw114, **nsdata) -self._namespaces[ns] = namespace +_namespaces[ns] = namespace for item in self.siteinfo.get('namespacealiases'): ns = int(item['id']) -if item['*'] not in self._namespaces[ns]: -self._namespaces[ns].aliases.append(item['*']) +if item['*'] not in _namespaces[ns]: +_namespaces[ns].aliases.append(item['*']) + +self._namespaces = _namespaces @need_version(1.14) @deprecated(has_extension) -- To view, visit https://gerrit.wikimedia.org/r/171815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64418dca1b66418dfb893b83f8d141b372bd2380 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Site: Only store complete mapping - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Site: Only store complete mapping .. [FIX] Site: Only store complete mapping If the site is interrupted while loading the namespaces the stored namespaces might be invalid/incomplete. This buffers the namespaces and only stores it after the mapping has been build. Bug: 73122 Change-Id: I64418dca1b66418dfb893b83f8d141b372bd2380 --- M pywikibot/site.py 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 8cf9f60..b167707 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2011,7 +2011,7 @@ return self.getmagicwords(pagenamee) def _build_namespaces(self): -self._namespaces = SelfCallDict() +_namespaces = SelfCallDict() # In MW 1.14, API siprop 'namespaces' added 'canonical', # and Image became File with Image as an alias. @@ -2034,12 +2034,14 @@ namespace = Namespace(ns, canonical_name, custom_name, use_image_name=not is_mw114, **nsdata) -self._namespaces[ns] = namespace +_namespaces[ns] = namespace for item in self.siteinfo.get('namespacealiases'): ns = int(item['id']) -if item['*'] not in self._namespaces[ns]: -self._namespaces[ns].aliases.append(item['*']) +if item['*'] not in _namespaces[ns]: +_namespaces[ns].aliases.append(item['*']) + +self._namespaces = _namespaces @need_version(1.14) @deprecated(has_extension) -- To view, visit https://gerrit.wikimedia.org/r/171815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64418dca1b66418dfb893b83f8d141b372bd2380 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [HierarchyBuilder] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/171816 Change subject: [HierarchyBuilder] Register extension .. [HierarchyBuilder] Register extension Change-Id: Iee6e44c7fd1ac11946a4bd21bc9dc58776fc1ef3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/16/171816/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index c55e902..b502b0a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1087,6 +1087,8 @@ Hide Prefix +Hierarchy Builder + Host Stats aliasfile = HostStats/HostStats.alias.php ignored = hoststats -- To view, visit https://gerrit.wikimedia.org/r/171816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee6e44c7fd1ac11946a4bd21bc9dc58776fc1ef3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [HierarchyBuilder] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [HierarchyBuilder] Register extension .. [HierarchyBuilder] Register extension Change-Id: Iee6e44c7fd1ac11946a4bd21bc9dc58776fc1ef3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index c55e902..b502b0a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1087,6 +1087,8 @@ Hide Prefix +Hierarchy Builder + Host Stats aliasfile = HostStats/HostStats.alias.php ignored = hoststats -- To view, visit https://gerrit.wikimedia.org/r/171816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee6e44c7fd1ac11946a4bd21bc9dc58776fc1ef3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] openstreetmap: Split expired tile list files - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: openstreetmap: Split expired tile list files .. openstreetmap: Split expired tile list files Use creation date to split up expired tile list files and introduce another cron to remove old files after 5 days Change-Id: I6cd096e8bc3f0aea19f3238b91289849ba13d352 --- M modules/osm/manifests/planet_sync.pp 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/osm/manifests/planet_sync.pp b/modules/osm/manifests/planet_sync.pp index 07a3bec..add6ff5 100644 --- a/modules/osm/manifests/planet_sync.pp +++ b/modules/osm/manifests/planet_sync.pp @@ -44,7 +44,7 @@ content = template('osm/osmosis_configuration.txt.erb'), } -$sync_planet_cmd = inline_template(%- data=@memoryfree.split(' '); multi={'MB' = 1, 'GB' = 1000}[data[1]]-%/usr/bin/osmosis --read-replication-interval workingDirectory=%= @osmosis_dir % --simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C %= data[0].to_i/10*multi % --number-processes %= @processorcount % -e15 -o %= @expire_dir %/expire.list --append -) +$sync_planet_cmd = inline_template(%- data=@memoryfree.split(' '); multi={'MB' = 1, 'GB' = 1000}[data[1]]-%/usr/bin/osmosis --read-replication-interval workingDirectory=%= @osmosis_dir % --simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C %= data[0].to_i/10*multi % --number-processes %= @processorcount % -e15 -o %= @expire_dir %/expire.list.$(date \+%Y%m%d%H%M\) --append -) cron { planet_sync-${name}: environment = JAVACMD_OPTIONS='-Dhttp.proxyHost=webproxy.eqiad.wmnet -Dhttp.proxyPort=8080', command = $sync_planet_cmd /tmp/osmosis.log 21, @@ -52,4 +52,10 @@ hour= $hour, minute = $minute, } +cron { expire_old_planet_syncs-${name}: +command = /usr/bin/find $expire_dir -mtime +5 -exec rm {} \;, +user= 'postgres', +hour= $hour, +minute = $minute, +} } -- To view, visit https://gerrit.wikimedia.org/r/171211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cd096e8bc3f0aea19f3238b91289849ba13d352 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Identify which page is no redirect - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Identify which page is no redirect .. Identify which page is no redirect One hypothesis why the site tests tells that images are redirects although it only queried non-redirects is that between iterating through it and checking it changes to a redirect page. This prints the checked page if it is a redirect in an attempt to verify that hypothesis. Bug: 73120 Change-Id: I970099e8aaa9d558909ae9e1a8091aaf6f092829 --- M tests/site_tests.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index df22137..30c2644 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -696,6 +696,9 @@ imagepage = self.imagepage for using in mysite.imageusage(imagepage, filterredir=False, total=5): self.assertIsInstance(using, pywikibot.Page) +if using.isRedirectPage(): +print('{0} is a redirect, although just non-redirects were ' + 'searched. See also bug 73120'.format(using)) self.assertFalse(using.isRedirectPage()) -- To view, visit https://gerrit.wikimedia.org/r/171814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I970099e8aaa9d558909ae9e1a8091aaf6f092829 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Enforce requireSpacesInsideParentheses - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Enforce requireSpacesInsideParentheses .. Hygiene: Enforce requireSpacesInsideParentheses Change-Id: Ibf1b3fcd8890287372def25b518b06036559e05e --- M javascripts/Overlay.js M javascripts/application.js M javascripts/mainmenu.js M javascripts/modules/editor/AbuseFilterPanel.js M javascripts/modules/issues/issues.js M javascripts/modules/nearby/Nearby.js M javascripts/modules/nearby/NearbyApi.js M javascripts/modules/notifications/notifications.js M javascripts/modules/search/SearchApi.js M javascripts/modules/search/SearchOverlay.js M javascripts/modules/search/search.js M javascripts/modules/toggling/toggle.js M javascripts/modules/uploads/PhotoUploaderButton.js M javascripts/modules/uploads/UploadTutorial.js M javascripts/modules/watchstar/Watchstar.js M javascripts/modules/wikigrok/WikiGrokDialog.js M javascripts/modules/wikigrok/WikiGrokDialogB.js M javascripts/settings.js M javascripts/specials/uploads.js 19 files changed, 32 insertions(+), 30 deletions(-) Approvals: Jhernandez: Looks good to me, approved Florianschmidtwelzow: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js index 1e12625..69ba0d7 100644 --- a/javascripts/Overlay.js +++ b/javascripts/Overlay.js @@ -186,7 +186,7 @@ this.$el.removeClass( 'visible' ); // give time for animations to finish - setTimeout(function () { + setTimeout( function () { self.$el.detach(); }, 1000 ); @@ -236,7 +236,7 @@ } // FIXME: implement a solution from https://devforums.apple.com/message/1050636#1050636 if ( $window.height() keyboardHeight ) { - self._resizeContent($window.height() - keyboardHeight); + self._resizeContent( $window.height() - keyboardHeight ); } }, 0 ); } ) diff --git a/javascripts/application.js b/javascripts/application.js index 7ebf064..84315e5 100644 --- a/javascripts/application.js +++ b/javascripts/application.js @@ -312,7 +312,7 @@ sessionId = ''; while ( sessionId.length 32 ) { // http://stackoverflow.com/a/8084248/365238 - sessionId += Math.random().toString(36).slice(2, 32 + 2 - sessionId.length); + sessionId += Math.random().toString( 36 ).slice( 2, 32 + 2 - sessionId.length ); } localStorage.setItem( 'sessionId', sessionId ); } diff --git a/javascripts/mainmenu.js b/javascripts/mainmenu.js index 8958b14..25399c2 100644 --- a/javascripts/mainmenu.js +++ b/javascripts/mainmenu.js @@ -39,7 +39,7 @@ } ); // close navigation if content tapped - $( '#mw-mf-page-center' ).on( 'click', function (ev) { + $( '#mw-mf-page-center' ).on( 'click', function ( ev ) { if ( isOpen() ) { closeNavigationDrawers(); ev.preventDefault(); @@ -56,4 +56,4 @@ M.on( 'header-loaded', initialize ); -}( mw.mobileFrontend, jQuery )); +}( mw.mobileFrontend, jQuery ) ); diff --git a/javascripts/modules/editor/AbuseFilterPanel.js b/javascripts/modules/editor/AbuseFilterPanel.js index a00860b..acf191a 100644 --- a/javascripts/modules/editor/AbuseFilterPanel.js +++ b/javascripts/modules/editor/AbuseFilterPanel.js @@ -11,7 +11,7 @@ */ AbuseFilterPanel = View.extend( { defaults: { - readMoreMsg: mw.msg( 'mobile-frontend-editor-abusefilter-read-more') + readMoreMsg: mw.msg( 'mobile-frontend-editor-abusefilter-read-more' ) }, template: mw.template.get( 'mobile.abusefilter', 'Panel.hogan' ), className: 'panel hidden', diff --git a/javascripts/modules/issues/issues.js b/javascripts/modules/issues/issues.js index 262eaa3..ee550c4 100644 --- a/javascripts/modules/issues/issues.js +++ b/javascripts/modules/issues/issues.js @@ -1,6 +1,6 @@ ( function ( M, $ ) { - var module = (function () { + var module = ( function () { var Icon = M.require( 'Icon' ), inBeta = M.isBetaGroupMember(), @@ -94,4 +94,4 @@ M.define( 'cleanuptemplates',
[MediaWiki-commits] [Gerrit] [SemanticDependency] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/171817 Change subject: [SemanticDependency] Register extension .. [SemanticDependency] Register extension [TruGlass] Add skin without message doc Change-Id: I445472331979f4df4e99a72c15ed41af081c199f --- M groups/MediaWiki/mediawiki-extensions.txt M groups/MediaWiki/mediawiki-skins.txt 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/17/171817/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b502b0a..11bd60c 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1772,6 +1772,8 @@ Semantic Compound Queries magicfile = SemanticCompoundQueries/SemanticCompoundQueries.i18n.magic.php +Semantic Dependency + Semantic Drilldown aliasfile = SemanticDrilldown/languages/SD_Aliases.php diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 7131e6b..8d09f95 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -43,5 +43,8 @@ Splash ignored = site-banner, global-links-menu, content-footer +# No message documentation +# Truglass + Vector optional = skinname-vector, vector.css, vector.js -- To view, visit https://gerrit.wikimedia.org/r/171817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I445472331979f4df4e99a72c15ed41af081c199f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [SemanticDependency] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [SemanticDependency] Register extension .. [SemanticDependency] Register extension [TruGlass] Add skin without message doc Change-Id: I445472331979f4df4e99a72c15ed41af081c199f --- M groups/MediaWiki/mediawiki-extensions.txt M groups/MediaWiki/mediawiki-skins.txt 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b502b0a..11bd60c 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1772,6 +1772,8 @@ Semantic Compound Queries magicfile = SemanticCompoundQueries/SemanticCompoundQueries.i18n.magic.php +Semantic Dependency + Semantic Drilldown aliasfile = SemanticDrilldown/languages/SD_Aliases.php diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 7131e6b..8d09f95 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -43,5 +43,8 @@ Splash ignored = site-banner, global-links-menu, content-footer +# No message documentation +# Truglass + Vector optional = skinname-vector, vector.css, vector.js -- To view, visit https://gerrit.wikimedia.org/r/171817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I445472331979f4df4e99a72c15ed41af081c199f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Enforce requireSpacesInsideParentheses in JS - change (mediawiki...MobileFrontend)
Jhernandez has uploaded a new change for review. https://gerrit.wikimedia.org/r/171818 Change subject: Tools: Enforce requireSpacesInsideParentheses in JS .. Tools: Enforce requireSpacesInsideParentheses in JS Add jscs rule to enforce spaces inside parens. Change-Id: I0665ae3b3f79438729d1765dcb8a4350cce737ae --- M .jscsrc 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/18/171818/1 diff --git a/.jscsrc b/.jscsrc index b5e995c..53661aa 100644 --- a/.jscsrc +++ b/.jscsrc @@ -9,5 +9,6 @@ checkRedundantParams: true }, validateIndentation: \t, + requireSpacesInsideParentheses: all, excludeFiles: [javascripts/externals/**/*.js, javascripts/README.md] } -- To view, visit https://gerrit.wikimedia.org/r/171818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0665ae3b3f79438729d1765dcb8a4350cce737ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Condition match: comment says 10k, code 1k - change (mediawiki...AbuseFilter)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/171819 Change subject: Condition match: comment says 10k, code 1k .. Condition match: comment says 10k, code 1k Change-Id: Ia8cf3510a19315cd6b9610d972703a46c8eea9ef --- M AbuseFilter.class.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/19/171819/1 diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php index bb94e6d..bfd4db2 100644 --- a/AbuseFilter.class.php +++ b/AbuseFilter.class.php @@ -1585,7 +1585,7 @@ $storage_period = self::$statsStoragePeriod; if ( !$total || $total 1 ) { - // This is for if the total doesn't exist, or has gone past 1000. + // This is for if the total doesn't exist, or has gone past 10,000. // Recreate all the keys at the same time, so they expire together. $wgMemc-set( $total_key, 0, $storage_period ); $wgMemc-set( $overflow_key, 0, $storage_period ); -- To view, visit https://gerrit.wikimedia.org/r/171819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8cf3510a19315cd6b9610d972703a46c8eea9ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistently document function parameter $group - change (mediawiki...AbuseFilter)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/171820 Change subject: Consistently document function parameter $group .. Consistently document function parameter $group Followup to 0c174aec. Change-Id: Idbe7eee4288b5c09d3b9f373cb4eb22da659fc16 --- M AbuseFilter.class.php 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/20/171820/1 diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php index bb94e6d..3e45b0a 100644 --- a/AbuseFilter.class.php +++ b/AbuseFilter.class.php @@ -429,7 +429,7 @@ * Returns an associative array of filters which were tripped * * @param $vars array -* @param $group string The filter group to check against. +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * * @return array */ @@ -848,7 +848,7 @@ /** * @param $vars AbuseFilterVariableHolder * @param $title Title -* @param $group string +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * @return Status */ public static function filterAction( $vars, $title, $group = 'default' ) { @@ -930,7 +930,7 @@ * @param $log_template * @param $action * @param $vars AbuseFilterVariableHolder -* @param string $group +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * @return mixed */ public static function addLogEntries( $actions_taken, $log_template, $action, $vars, $group = 'default' ) { @@ -1537,7 +1537,7 @@ } /** -* @param $group +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * @return String */ public static function getGlobalRulesKey( $group ) { @@ -1566,7 +1566,7 @@ /** * Update statistics, and disable filters which are over-blocking. * @param $filters -* @param $group +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) */ public static function recordStats( $filters, $group = 'default' ) { global $wgAbuseFilterConditionLimit, $wgMemc; @@ -1607,7 +1607,7 @@ } /** -* @param $group +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * @param $filters * @param $total */ @@ -1658,7 +1658,7 @@ /** * @param array $emergencyValue -* @param string $group +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * @return mixed */ public static function getEmergencyValue( array $emergencyValue, $group ) { @@ -2244,7 +2244,7 @@ /** * Gives either the user-specified name for a group, * or spits the input back out -* @param $group String: Internal name of the filter group +* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups) * @return String A name for that filter group, or the input. */ static function nameGroup($group) { -- To view, visit https://gerrit.wikimedia.org/r/171820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbe7eee4288b5c09d3b9f373cb4eb22da659fc16 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FEAT] Use namespaces attribute as property - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/171821 Change subject: [FEAT] Use namespaces attribute as property .. [FEAT] Use namespaces attribute as property With ce164aa7d14f3ca7baf437e0523d7e2627fbe1f3 the namespaces attribute became a property which is used in this change. Change-Id: I11b1564f48a26f0f15cd5ba6f69f66e35e25c723 --- M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/site.py M pywikibot/textlib.py M scripts/solve_disambiguation.py M tests/page_tests.py M tests/site_tests.py M tests/wikibase_tests.py 8 files changed, 18 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/21/171821/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index 5228395..9a5f9bf 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4159,8 +4159,8 @@ raise pywikibot.InvalidTitle(The link does not contain a page title) -if hasattr(self._site.namespaces()[self._namespace], 'case'): -case = self._site.namespaces()[self._namespace].case +if hasattr(self._site.namespaces[self._namespace], 'case'): +case = self._site.namespaces[self._namespace].case else: case = self._site.case() @@ -4241,8 +4241,8 @@ ns_id = self.namespace -ns = self.site.namespaces()[ns_id] -ns_names = list(self.site.namespaces()[ns_id]) +ns = self.site.namespaces[ns_id] +ns_names = list(ns) if onsite is None: namespace = ns.canonical_name @@ -4254,7 +4254,7 @@ if onsite_ns is None: raise pywikibot.Error( u'No corresponding namespace found for namespace %s on %s.' -% (self.site.namespaces()[ns_id], onsite)) +% (self.site.namespaces[ns_id], onsite)) else: namespace = onsite_ns.custom_name diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 319089e..ecc0b57 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -318,7 +318,7 @@ # Link.parse() when categoryname contains :; # Part before : might be interpreted as an interwiki prefix prefix = categoryname.split(:, 1)[0] # whole word if : not present -if prefix not in self.site.namespaces()[14]: +if prefix not in self.site.namespaces[14]: categoryname = u'{0}:{1}'.format(self.site.namespace(14), categoryname) cat = pywikibot.Category(pywikibot.Link(categoryname, diff --git a/pywikibot/site.py b/pywikibot/site.py index b167707..cd6fae8 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -636,10 +636,7 @@ def ns_index(self, namespace): Given a namespace name, return its int index, or None if invalid. -for ns in self.namespaces(): -if namespace.lower() in [name.lower() - for name in self.namespaces()[ns]]: -return ns +return Namespace.lookup_name(namespace, namespaces=self.namespaces) # for backwards-compatibility getNamespaceIndex = redirect_func(ns_index, old_name='getNamespaceIndex', @@ -2170,8 +2167,8 @@ if all: -return self.namespaces()[num] -return self.namespaces()[num][0] +return self.namespaces[num] +return self.namespaces[num][0] @deprecated(version()) def live_version(self, force=False): diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index cd23724..33003b4 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -890,7 +890,7 @@ category, separator, sortKey = category.strip('[]').partition('|') sortKey = sortKey if separator else None prefix = category.split(:, 1)[0] # whole word if no : is present -if prefix not in insite.namespaces()[14]: +if prefix not in insite.namespaces[14]: category = u'{0}:{1}'.format(insite.namespace(14), category) category = pywikibot.Category(pywikibot.Link(category, insite, diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index c3edae1..b32e0ef 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -983,7 +983,7 @@ ignore_title[self.mysite.family.name][self.mylang] += [ u'%s:' % ns for namespace in self.mysite.namespaces() -for ns in self.mysite.namespaces()[namespace] +for ns in self.mysite.namespaces[namespace] ] for disambPage in self.generator: diff --git a/tests/page_tests.py b/tests/page_tests.py index
[MediaWiki-commits] [Gerrit] Tools: Complain about spaces missing inside parentheses - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Tools: Complain about spaces missing inside parentheses .. Tools: Complain about spaces missing inside parentheses Change-Id: I9a0f81ffe57292d6fc5d80391cc093488e46d697 --- M .jscsrc 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/.jscsrc b/.jscsrc index b5e995c..cf70bee 100644 --- a/.jscsrc +++ b/.jscsrc @@ -3,6 +3,7 @@ requireMultipleVarDecl: onevar, requireBlocksOnNewline: true, disallowDanglingUnderscores: null, + requireSpacesInsideParentheses: all, validateJSDoc: { checkParamNames: true, requireParamTypes: true, -- To view, visit https://gerrit.wikimedia.org/r/171738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a0f81ffe57292d6fc5d80391cc093488e46d697 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change Site.ns_index() return type from int to Namespace - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Change Site.ns_index() return type from int to Namespace .. Change Site.ns_index() return type from int to Namespace Adds Namespace operators mod, add, sub to support existing use of returned value in algorithms. Change-Id: Iffe4d65ac4bd9ed7f76ec22922baae18a8428ebb --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 19 insertions(+), 6 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 5228395..01fbf23 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2709,7 +2709,7 @@ elif self.site.property_namespace.id == ns: self._namespace = self.site.property_namespace else: -raise ValueError('%r: Namespace %d is not valid' +raise ValueError('%r: Namespace %r is not valid' % (self.site, ns)) # .site forces a parse of the Link title to determine site diff --git a/pywikibot/site.py b/pywikibot/site.py index 8cf9f60..126ba80 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -317,6 +317,15 @@ Compare whether two namespace objects are not equal. return not self.__eq__(other) +def __mod__(self, other): +return self.id.__mod__(other) + +def __sub__(self, other): +return -(other) + self.id + +def __add__(self, other): +return other + self.id + def _cmpkey(self): Return the ID as a comparison key. return self.id @@ -635,11 +644,15 @@ return self._iw_sites[prefix][1] def ns_index(self, namespace): -Given a namespace name, return its int index, or None if invalid. -for ns in self.namespaces(): -if namespace.lower() in [name.lower() - for name in self.namespaces()[ns]]: -return ns + +Return the Namespace for a given namespace name. + +@param namespace: name +@type namespace: unicode +@return: The matching Namespace object on this Site +@rtype: Namespace, or None if invalid + +return Namespace.lookup_name(namespace, self.namespaces) # for backwards-compatibility getNamespaceIndex = redirect_func(ns_index, old_name='getNamespaceIndex', -- To view, visit https://gerrit.wikimedia.org/r/170714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffe4d65ac4bd9ed7f76ec22922baae18a8428ebb Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BounceHandler] Deployed to the WMF cluster - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [BounceHandler] Deployed to the WMF cluster .. [BounceHandler] Deployed to the WMF cluster https://git.wikimedia.org/commitdiff/operations%2Fmediawiki-config/ba288f70064dee6e4cf40fc46e77d66d245be772 Change-Id: Id211c55f31923929abed2c71101b488e6cae4498 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 7111ec0..c86c82c 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -14,6 +14,7 @@ - ext-antibot - ext-apisandbox - ext-betafeatures + - ext-bouncehandler # 2014-11-05 Change-Id: I64c09d17146bf9a3cee582fcea0e19aed6f4ce3d - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-charinsert - ext-checkuser -- To view, visit https://gerrit.wikimedia.org/r/171822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id211c55f31923929abed2c71101b488e6cae4498 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BounceHandler] Deployed to the WMF cluster - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/171822 Change subject: [BounceHandler] Deployed to the WMF cluster .. [BounceHandler] Deployed to the WMF cluster https://git.wikimedia.org/commitdiff/operations%2Fmediawiki-config/ba288f70064dee6e4cf40fc46e77d66d245be772 Change-Id: Id211c55f31923929abed2c71101b488e6cae4498 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/22/171822/1 diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 7111ec0..c86c82c 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -14,6 +14,7 @@ - ext-antibot - ext-apisandbox - ext-betafeatures + - ext-bouncehandler # 2014-11-05 Change-Id: I64c09d17146bf9a3cee582fcea0e19aed6f4ce3d - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-charinsert - ext-checkuser -- To view, visit https://gerrit.wikimedia.org/r/171822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id211c55f31923929abed2c71101b488e6cae4498 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show the modal overlay as soon as openWindow is called - change (oojs/ui)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/171823 Change subject: Show the modal overlay as soon as openWindow is called .. Show the modal overlay as soon as openWindow is called Dialogs can take a while to load, especially with iframes, so show the overlay as soon as open is called so the user gets instant visual feedback that their action registered. Change-Id: I8046a454657a7e40dc0c5f07304b3da5d42a1001 --- M src/Window.js M src/WindowManager.js M src/styles/WindowManager.less M src/themes/apex/windows.less M src/themes/mediawiki/windows.less 5 files changed, 36 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/171823/1 diff --git a/src/Window.js b/src/Window.js index 6c487f0..2c5796d 100644 --- a/src/Window.js +++ b/src/Window.js @@ -37,7 +37,6 @@ * @param {Object} [config] Configuration options * @cfg {string} [size] Symbolic name of dialog size, `small`, `medium`, `large` or `full`; omit to * use #static-size - * @fires initialize */ OO.ui.Window = function OoUiWindow( config ) { // Configuration initialization @@ -419,7 +418,7 @@ * instead of display. * * @param {boolean} [show] Make window visible, omit to toggle visibility - * @fires visible + * @fires toggle * @chainable */ OO.ui.Window.prototype.toggle = function ( show ) { @@ -680,7 +679,7 @@ this.getTeardownProcess( data ).execute().done( function () { // Force redraw by asking the browser to measure the elements' widths - win.$element.removeClass( 'oo-ui-window-setup' ).width(); + win.$element.removeClass( 'oo-ui-window-load oo-ui-window-setup' ).width(); win.$content.removeClass( 'oo-ui-window-content-setup' ).width(); win.$element.hide(); win.visible = false; @@ -693,10 +692,9 @@ /** * Load the frame contents. * - * Once the iframe's stylesheets are loaded, the `load` event will be emitted and the returned - * promise will be resolved. Calling while loading will return a promise but not trigger a new - * loading cycle. Calling after loading is complete will return a promise that's already been - * resolved. + * Once the iframe's stylesheets are loaded the returned promise will be resolved. Calling while + * loading will return a promise but not trigger a new loading cycle. Calling after loading is + * complete will return a promise that's already been resolved. * * Sounds simple right? Read on... * @@ -725,12 +723,13 @@ * All this stylesheet injection and polling magic is in #transplantStyles. * * @return {jQuery.Promise} Promise resolved when loading is complete - * @fires load */ OO.ui.Window.prototype.load = function () { var sub, doc, loading, win = this; + this.$element.addClass( 'oo-ui-window-load' ); + // Non-isolated windows are already loaded if ( !this.loading !this.isolated ) { this.loading = $.Deferred().resolve(); diff --git a/src/WindowManager.js b/src/WindowManager.js index 2d655ea..387e372 100644 --- a/src/WindowManager.js +++ b/src/WindowManager.js @@ -391,13 +391,10 @@ // Window opening if ( opening.state() !== 'rejected' ) { - // Begin loading the window if it's not loading or loaded already - may take noticable time - // and we want to do this in parallel with any other preparatory actions - if ( !win.isLoading() !win.isLoaded() ) { - // Finish initializing the window (must be done after manager is attached to DOM) + if ( !win.getManager() ) { win.setManager( this ); - preparing.push( win.load() ); } + preparing.push( win.load() ); if ( this.closing ) { // If a window is currently closing, wait for it to complete diff --git a/src/styles/WindowManager.less b/src/styles/WindowManager.less index 5a78c7f..1263689 100644 --- a/src/styles/WindowManager.less +++ b/src/styles/WindowManager.less @@ -7,7 +7,7 @@ height: 0; overflow: hidden; - .oo-ui-window-setup { + .oo-ui-window-load { width: auto; height: auto; top: 0; @@ -15,22 +15,30 @@ bottom: 0; left: 0; padding: 1em; + } -.oo-ui-window-frame { - position: absolute; - right: 0; - left: 0; - margin: auto; - overflow: hidden; - max-width: 100%; -
[MediaWiki-commits] [Gerrit] Applied key handling to referenceview edit toolbar - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/171824 Change subject: Applied key handling to referenceview edit toolbar .. Applied key handling to referenceview edit toolbar Change-Id: Icb827b212629b9d16a6f936e9b76579c4d7e798b --- M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/24/171824/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js index 5b7620d..055a7b1 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js @@ -779,6 +779,17 @@ } $referenceview.edittoolbar( options ); + + $referenceview.on( 'keydown.edittoolbar', function( event ) { + if( referenceview.option( 'disabled' ) ) { + return; + } + if( event.keyCode === $.ui.keyCode.ESCAPE ) { + referenceview.stopEditing( true ); + } else if( event.keyCode === $.ui.keyCode.ENTER ) { + referenceview.stopEditing( false ); + } + } ); }, referenceviewchange: function( event ) { var $referenceview = $( event.target ), -- To view, visit https://gerrit.wikimedia.org/r/171824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb827b212629b9d16a6f936e9b76579c4d7e798b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused Family.content_id - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused Family.content_id .. Remove unused Family.content_id content_id is used in compat, for non-API access to mediawiki, which is functionality that exists in core. If core ever needs to support pre-1.13 editing, this and many other parts of compat will need to be extensively mined for implementation details like this. We know where to find this. It doesnt need to be in core Family. Change-Id: Ib3111eba7c16782a68646f34b540062486e17e6e --- M pywikibot/families/wowwiki_family.py M pywikibot/family.py 2 files changed, 0 insertions(+), 7 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index 6aa1ebf..fbf820e 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -49,8 +49,6 @@ 'zh': 'zh.wow.wikia.com' } -self.content_id = article - self.disambiguationTemplates['en'] = ['disambig', 'disambig/quest', 'disambig/quest2', 'disambig/achievement2'] diff --git a/pywikibot/family.py b/pywikibot/family.py index b3941ff..2a659e0 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -259,11 +259,6 @@ 'zea': u'[a-zäöüïëéèà]*', } -# Wikimedia wikis all use bodyContent as the id of the div -# element that contains the actual page content; change this for -# wikis that use something else (e.g., mozilla family) -self.content_id = bodyContent - # A dictionary where keys are family codes that can be used in # inter-family interwiki links. Do not use it directly but # get_known_families() instead. -- To view, visit https://gerrit.wikimedia.org/r/170683 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3111eba7c16782a68646f34b540062486e17e6e Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Nullzero nullzero.f...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only load notifications and user module where necessary - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Only load notifications and user module where necessary .. Only load notifications and user module where necessary Move logic to getContextSpecificModules for notifications User module should only be loaded when logged in Change-Id: I9508827f1e1d56b0d7a630aa626c05554b186f09 --- M includes/skins/SkinMinerva.php 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index a68c8d5..8347569 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -860,6 +860,13 @@ $campaign = $req-getVal( 'campaign' ); if ( $user-isLoggedIn() ) { + // enable the user module + $modules[] = 'mobile.usermodule'; + + if ( $this-useEcho() ) { + $modules['notifications'] = array( 'mobile.notifications' ); + } + if ( $this-isCurrentPageEditable() ) { if ( $action === 'signup-edit' || $campaign === 'leftNavSignup' ) { $modules[] = 'mobile.newusers'; @@ -883,14 +890,10 @@ 'mobile.head', 'mobile.startup', 'mobile.site', - 'mobile.usermodule', // FIXME: separate mobile.stable into more meaningful groupings 'mobile.stable', ); - if ( $this-useEcho() $this-getUser()-isLoggedIn() ) { - $modules['notifications'] = array( 'mobile.notifications' ); - } if ( $this-isAllowedPageAction( 'watch' ) ) { $modules['watch'] = array(); } -- To view, visit https://gerrit.wikimedia.org/r/171158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9508827f1e1d56b0d7a630aa626c05554b186f09 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adapt to new JavaScript datamodel and serialization - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Adapt to new JavaScript datamodel and serialization .. Adapt to new JavaScript datamodel and serialization Needs * https://github.com/wmde/WikibaseDataModelJavascript/pull/16 * https://github.com/wmde/WikibaseSerializationJavaScript/pull/6 Bug: 72757 Change-Id: Iafc2ed96df9f4a36b87ea9217eddc653fd3c4b9c --- M composer.json M lib/resources/entityChangers/AliasesChanger.js M lib/resources/entityChangers/ClaimsChanger.js M lib/resources/entityChangers/EntityChangersFactory.js M lib/resources/entityChangers/ReferencesChanger.js M lib/resources/entityChangers/resources.php M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js M lib/resources/jquery.wikibase/snakview/resources.php M lib/resources/jquery.wikibase/snakview/snakview.js M lib/resources/jquery.wikibase/snakview/snakview.variations.Value.js M lib/resources/wikibase.store/resources.php M lib/resources/wikibase.store/store.ApiEntityStore.js M lib/resources/wikibase.store/store.FetchedContentUnserializer.js M lib/resources/wikibase.store/store.MwConfigEntityStore.js M lib/resources/wikibase.utilities/wikibase.utilities.ui.js M lib/tests/qunit/entityChangers/AliasesChanger.tests.js M lib/tests/qunit/entityChangers/ClaimsChanger.tests.js M lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js M lib/tests/qunit/entityChangers/LabelsChanger.tests.js M lib/tests/qunit/entityChangers/ReferencesChanger.tests.js M lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js M lib/tests/qunit/entityChangers/resources.php M lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js A lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimgrouplistview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js M lib/tests/qunit/jquery.wikibase/resources.php M lib/tests/qunit/wikibase.store/store.MwConfigEntityStore.tests.js M repo/resources/Resources.php M repo/resources/wikibase.EntityInitializer.js M repo/resources/wikibase.ui.entityViewInit.js 40 files changed, 785 insertions(+), 265 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, but someone else must approve Henning Snater: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 4d0c0b2..1f70d8d 100644 --- a/composer.json +++ b/composer.json @@ -36,10 +36,10 @@ data-values/value-view: ~0.8.0, wikibase/data-model: ~2.0, - wikibase/data-model-javascript: ~0.3.0, + wikibase/data-model-javascript: ~1.0, wikibase/data-model-serialization: ~1.2, wikibase/internal-serialization: ~1.3, - wikibase/serialization-javascript: ~1.1.1, + wikibase/serialization-javascript: ~2.0, diff/diff: ~1.0, wikibase/easyrdf_lite: ~0.8.1 diff --git a/lib/resources/entityChangers/AliasesChanger.js b/lib/resources/entityChangers/AliasesChanger.js index 8a0466a..ac32909 100644 --- a/lib/resources/entityChangers/AliasesChanger.js +++ b/lib/resources/entityChangers/AliasesChanger.js @@ -38,7 +38,7 @@ _api: null, /** -* @param {Object[]} aliases +* @param {string[]} aliases * @param {string} language * @return {jQuery.Promise} * No resolved parameters. @@ -47,21 +47,23 @@ */ setAliases: function( aliases, language ) { var deferred = $.Deferred(), - self = this; + self = this, + initialAliases = this._getInitialAliases( language ); this._api.setAliases( this._entity.getId(), this._revisionStore.getAliasesRevision(), - this._getNewAliases( aliases, language ), - this._getRemovedAliases( aliases, language ), + this._getNewAliases( aliases, initialAliases ), + this._getRemovedAliases( aliases, initialAliases ), language ) .done( function( response ) {
[MediaWiki-commits] [Gerrit] Applied key handling to referenceview edit toolbar - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Applied key handling to referenceview edit toolbar .. Applied key handling to referenceview edit toolbar Change-Id: Icb827b212629b9d16a6f936e9b76579c4d7e798b --- M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js index 5b7620d..055a7b1 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js @@ -779,6 +779,17 @@ } $referenceview.edittoolbar( options ); + + $referenceview.on( 'keydown.edittoolbar', function( event ) { + if( referenceview.option( 'disabled' ) ) { + return; + } + if( event.keyCode === $.ui.keyCode.ESCAPE ) { + referenceview.stopEditing( true ); + } else if( event.keyCode === $.ui.keyCode.ENTER ) { + referenceview.stopEditing( false ); + } + } ); }, referenceviewchange: function( event ) { var $referenceview = $( event.target ), -- To view, visit https://gerrit.wikimedia.org/r/171824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb827b212629b9d16a6f936e9b76579c4d7e798b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Kill unnecessary mobile.beta.common - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Kill unnecessary mobile.beta.common .. Hygiene: Kill unnecessary mobile.beta.common Shift dependencies to mobile.beta Change-Id: I4a616b9217302fa46058325c3c7271126743cfa7 --- M includes/Resources.php 1 file changed, 4 insertions(+), 12 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, but someone else must approve Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index cb779da..f377e3e 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -436,19 +436,9 @@ ), ), - 'mobile.beta.common' = $wgMFResourceFileModuleBoilerplate + array( - 'dependencies' = array( - 'mobile.stable.common', - 'mobile.loggingSchemas', - 'mobile.templates', - ), - ), - 'mobile.talk' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( - 'mobile.stable', - 'mobile.beta.common', - 'mobile.overlays', + 'mobile.beta', ), 'styles' = array( 'less/modules/talk.less', @@ -475,11 +465,13 @@ 'mobile.beta' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.stable', - 'mobile.beta.common', 'mobile.overlays', 'mobile.references.beta', 'mobile.wikigrok', 'mobile.preferredLanguages', + 'mobile.stable.common', + 'mobile.loggingSchemas', + 'mobile.templates', ), 'position' = 'bottom', ), -- To view, visit https://gerrit.wikimedia.org/r/171170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a616b9217302fa46058325c3c7271126743cfa7 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add statementview tests - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add statementview tests .. Add statementview tests Change-Id: I00ec7eadc4bd185a6f083485a28fc9b1ea478332 --- M lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.tests.js M lib/tests/qunit/jquery.wikibase/resources.php 2 files changed, 75 insertions(+), 4 deletions(-) Approvals: Henning Snater: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.tests.js b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.tests.js index 45e32ec..1928dd4 100644 --- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.tests.js +++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.tests.js @@ -2,7 +2,7 @@ * @licence GNU GPL v2+ * @author Adrian Lang adrian.l...@wikimedia.de */ -( function( $, QUnit ) { +( function( $, wb, QUnit, sinon ) { 'use strict'; /** @@ -12,7 +12,9 @@ */ var createStatementview = function( options, $node ) { options = $.extend( { - entityStore: 'i am an entity store', + entityStore: { + get: function () { return $.Deferred().resolve().promise(); } + }, valueViewBuilder: 'i am a valueview builder', claimsChanger: 'I am a ClaimsChanger', entityChangersFactory: { @@ -45,7 +47,7 @@ } } ) ); -QUnit.test( 'Create destroy', function( assert ) { +QUnit.test( 'Create destroy without value', function( assert ) { var $statementview = createStatementview(), statementview = $statementview.data( 'statementview' ); @@ -62,4 +64,71 @@ ); } ); -}( jQuery, QUnit ) ); +QUnit.test( 'Create destroy with value', function( assert ) { + var $statementview = createStatementview( { + value: new wb.datamodel.Statement( new wb.datamodel.Claim( + new wb.datamodel.PropertyNoValueSnak( 'P1' ), + null, + 'guid' + ), + new wb.datamodel.ReferenceList( [ new wb.datamodel.Reference() ] ) + ) + } ), + statementview = $statementview.data( 'statementview' ); + + assert.ok( + statementview !== 'undefined', + 'Created widget.' + ); + + statementview.destroy(); + + assert.ok( + $statementview.data( 'statementview' ) === undefined, + 'Destroyed widget.' + ); +} ); + +QUnit.test( 'isValid', function( assert ) { + var $statementview = createStatementview( { + value: new wb.datamodel.Statement( new wb.datamodel.Claim( + new wb.datamodel.PropertyNoValueSnak( 'P1' ), + null, + 'guid' + ), + new wb.datamodel.ReferenceList( [ new wb.datamodel.Reference() ] ) + ) + } ), + statementview = $statementview.data( 'statementview' ); + + assert.ok( statementview.isValid(), 'isValid should return true' ); +} ); + +QUnit.test( 'remove', function( assert ) { + var referencesChanger = { + removeReference: sinon.spy( function() { return $.Deferred().resolve().promise(); } ) + }, + reference = new wb.datamodel.Reference(), + $statementview = createStatementview( { + value: new wb.datamodel.Statement( new wb.datamodel.Claim( + new wb.datamodel.PropertyNoValueSnak( 'P1' ), + null, + 'guid' + ), + new wb.datamodel.ReferenceList( [ reference ] ) + ), + entityChangersFactory: { + getReferencesChanger: function() { + return referencesChanger; + } + } + } ), + statementview = $statementview.data( 'statementview' ); + + statementview.remove( + $statementview.find( ':wikibase-referenceview' ).data( 'referenceview' ) + ); + sinon.assert.calledWith( referencesChanger.removeReference, 'guid', reference ); +} ); + +}( jQuery, wikibase, QUnit, sinon ) ); diff --git a/lib/tests/qunit/jquery.wikibase/resources.php b/lib/tests/qunit/jquery.wikibase/resources.php index ef6c107..be81ed8 100644 --- a/lib/tests/qunit/jquery.wikibase/resources.php +++
[MediaWiki-commits] [Gerrit] Hygiene: Fix the language sorter mess - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Fix the language sorter mess .. Hygiene: Fix the language sorter mess Only half the code is being run in beta and that code doesn't work without the profiler. This feature sets a langMap in localStorage when you interact with items in the language overlay I've also clarified when stuff should go in scripts for mobile.beta Change-Id: I9b791963b2f6e800c455ddbbeb5e4f869565b5e9 --- M includes/Resources.php R javascripts/modules/preferredLanguages/preferred.js R javascripts/modules/preferredLanguages/profiler.js R tests/qunit/modules/preferredLanguages/test_preferred.js 4 files changed, 14 insertions(+), 6 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 15cd2bc..cb779da 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -462,6 +462,16 @@ ), ), + 'mobile.preferredLanguages' = $wgMFResourceFileModuleBoilerplate + array( + 'dependencies' = array( + 'mobile.startup', + ), + 'scripts' = array( + 'javascripts/modules/preferredLanguages/profiler.js', + 'javascripts/modules/preferredLanguages/preferred.js', + ), + ), + 'mobile.beta' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.stable', @@ -469,9 +479,7 @@ 'mobile.overlays', 'mobile.references.beta', 'mobile.wikigrok', - ), - 'scripts' = array( - 'javascripts/modules/languages/preferred.js', + 'mobile.preferredLanguages', ), 'position' = 'bottom', ), @@ -575,9 +583,6 @@ 'mobile.alpha' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.beta', - ), - 'scripts' = array( - 'javascripts/modules/mf-translator.js', ), ), diff --git a/javascripts/modules/languages/preferred.js b/javascripts/modules/preferredLanguages/preferred.js similarity index 85% rename from javascripts/modules/languages/preferred.js rename to javascripts/modules/preferredLanguages/preferred.js index a74e639..04f2c1e 100644 --- a/javascripts/modules/languages/preferred.js +++ b/javascripts/modules/preferredLanguages/preferred.js @@ -1,3 +1,4 @@ +// When set orders LanguageOverlay list of languages by most frequently chosen ( function ( M, $ ) { var langMap = M.settings.getUserSetting( 'langMap' ); langMap = langMap ? $.parseJSON( langMap ) : {}; diff --git a/javascripts/modules/mf-translator.js b/javascripts/modules/preferredLanguages/profiler.js similarity index 85% rename from javascripts/modules/mf-translator.js rename to javascripts/modules/preferredLanguages/profiler.js index e653503..519e7c8 100644 --- a/javascripts/modules/mf-translator.js +++ b/javascripts/modules/preferredLanguages/profiler.js @@ -1,3 +1,5 @@ +// Watches users use of the language overlay and profiles the languages +// that user clicks on. Stores this locally under the key langMap ( function ( M ) { var supported = M.supportsLocalStorage, diff --git a/tests/qunit/modules/test_mf-translator.js b/tests/qunit/modules/preferredLanguages/test_preferred.js similarity index 100% rename from tests/qunit/modules/test_mf-translator.js rename to tests/qunit/modules/preferredLanguages/test_preferred.js -- To view, visit https://gerrit.wikimedia.org/r/171169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b791963b2f6e800c455ddbbeb5e4f869565b5e9 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial commit of VIKI. - change (mediawiki...VIKI)
Jason.ji has submitted this change and it was merged. Change subject: Initial commit of VIKI. .. Initial commit of VIKI. Change-Id: Iaf7537d23d1f2fa429d99d29d778e956ac095b22 --- A ApiGetContentNamespaces.php A VIKI.css A VIKI.i18n.magic.php A VIKI.js A VIKI.php A VikiJS.class.php A contextmenu.js A d3.v3.js A d3.v3.min.js A docs/config.json A i18n/en.json A i18n/qqq.json A info.png A internet.png A plus.png A spin.min.js A vex-theme-default.css A vex-theme-os.css A vex.combined.min.js A vex.css 20 files changed, 13,691 insertions(+), 0 deletions(-) Approvals: Jason.ji: Verified; Looks good to me, approved Siebrand: Looks good to me, but someone else must approve -- To view, visit https://gerrit.wikimedia.org/r/168623 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf7537d23d1f2fa429d99d29d778e956ac095b22 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VIKI Gerrit-Branch: master Gerrit-Owner: Jason.ji j...@mitre.org Gerrit-Reviewer: Cicalese cical...@mitre.org Gerrit-Reviewer: Jason.ji j...@mitre.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial commit of VikiSemanticTitle. - change (mediawiki...VikiSemanticTitle)
Jason.ji has submitted this change and it was merged. Change subject: Initial commit of VikiSemanticTitle. .. Initial commit of VikiSemanticTitle. Change-Id: I707a0ffd2643bc3738769449e4a82292b6ca7e24 --- A ApiGetDisplayTitle.php A VikiSemanticTitle.js A VikiSemanticTitle.php A docs/config.json A i18n/en.json A i18n/qqq.json 6 files changed, 352 insertions(+), 0 deletions(-) Approvals: Jason.ji: Verified; Looks good to me, approved diff --git a/ApiGetDisplayTitle.php b/ApiGetDisplayTitle.php new file mode 100644 index 000..37937c0 --- /dev/null +++ b/ApiGetDisplayTitle.php @@ -0,0 +1,115 @@ +?php +/* + * Copyright (c) 2014 The MITRE Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +class ApiGetDisplayTitle extends ApiBase { + + public function __construct( $main, $action ) { + parent::__construct( $main, $action ); + } + + public function execute() { + global $wgSemanticTitleProperties; + + $pageTitle = $this-getMain()-getVal( 'pageTitle' ); + $displayName = $pageTitle; + + // Get namespace for this page title via MW API + + $api = new ApiMain( + new DerivativeRequest( + $this-getRequest(), + array( + 'action' = 'query', + 'prop' = 'info', + 'titles' = $pageTitle + ) + ), + false + ); + + $api-execute(); + $data = $api-getResultData(); + + $key = array_shift( array_keys( $data[query][pages] ) ); + $namespace = $data[query][pages][$key][ns]; + + // If the namespace is in $wgSemanticTitleProperties, extract the title property. + + if ( array_key_exists( $namespace, $wgSemanticTitleProperties ) ) { + + $displayNameProperty = $wgSemanticTitleProperties[$namespace]; + + $api = new ApiMain( + new DerivativeRequest( + $this-getRequest(), + array( + 'action' = 'askargs', + 'conditions' = $pageTitle, + 'printouts' = $displayNameProperty + ) + ), + false + ); + + $api-execute(); + $data = $api-getResultData(); + + $displayName = $data[query][results][$pageTitle][printouts][$displayNameProperty][0]; + if ( $displayName == null ) + $displayName = $pageTitle; + + } + + $this-getResult()-addValue( null, $this-getModuleName(), + array( 'pageTitle' = $pageTitle, + 'result' = $displayName ) + ); + + return true; + } + + public function getDescription() { + return 'Returns the semantic display title for a given page name,' . + ' or empty string if it does not use content free page naming.'; + } + public function getAllowedParams() { + return array( + 'pageTitle' = array( + ApiBase::PARAM_TYPE = 'string', + ApiBase::PARAM_REQUIRED = true + ) + ); + } + public function getParamDescription() { + return
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2014/11/07 - change (mediawiki...Wikidata)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/171825 Change subject: New Wikidata Build - 2014/11/07 .. New Wikidata Build - 2014/11/07 Change-Id: Ic84e4a6dc402c9bb40ab0d82da81e67625e0035d --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/fy.json M extensions/Wikibase/client/i18n/hu.json A extensions/Wikibase/client/includes/AffectedPagesFinder.php M extensions/Wikibase/client/includes/ChangeHandler.php A extensions/Wikibase/client/includes/DataAccess/PropertyIdResolver.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php R extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php R extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php D extensions/Wikibase/client/includes/ReferencedPagesFinder.php A extensions/Wikibase/client/includes/Usage/NullUsageTracker.php A extensions/Wikibase/client/includes/Usage/SiteLinkUsageLookup.php M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTracker.php M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdate.php M extensions/Wikibase/client/includes/WikibaseClient.php A extensions/Wikibase/client/includes/hooks/DataUpdateHookHandlers.php M extensions/Wikibase/client/includes/store/ClientStore.php A extensions/Wikibase/client/includes/store/TitleFactory.php A extensions/Wikibase/client/includes/store/UsageUpdater.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/resources/Resources.php M extensions/Wikibase/client/tests/phpunit/MockClientStore.php R extensions/Wikibase/client/tests/phpunit/includes/AffectedPagesFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php A extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php A extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php D extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php A extensions/Wikibase/client/tests/phpunit/includes/UsageUpdaterTest.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php A extensions/Wikibase/client/tests/phpunit/includes/hooks/DataUpdateHookHandlersTest.php A extensions/Wikibase/client/tests/phpunit/includes/store/TitleFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/options.wiki M extensions/Wikibase/lib/i18n/el.json M extensions/Wikibase/lib/i18n/en.json A extensions/Wikibase/lib/i18n/fy.json M extensions/Wikibase/lib/i18n/hu.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/includes/ChangeNotificationJob.php D extensions/Wikibase/lib/includes/store/ItemUsageIndex.php M extensions/Wikibase/lib/resources/Resources.php M extensions/Wikibase/lib/resources/api/resources.php M extensions/Wikibase/lib/resources/entityChangers/AliasesChanger.js M extensions/Wikibase/lib/resources/entityChangers/ClaimsChanger.js M extensions/Wikibase/lib/resources/entityChangers/EntityChangersFactory.js M extensions/Wikibase/lib/resources/entityChangers/ReferencesChanger.js M extensions/Wikibase/lib/resources/entityChangers/resources.php M extensions/Wikibase/lib/resources/experts/resources.php M extensions/Wikibase/lib/resources/formatters/resources.php M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js M
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2014/11/07 - change (mediawiki...Wikidata)
Tobias Gritschacher has submitted this change and it was merged. Change subject: New Wikidata Build - 2014/11/07 .. New Wikidata Build - 2014/11/07 Change-Id: Ic84e4a6dc402c9bb40ab0d82da81e67625e0035d --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/fy.json M extensions/Wikibase/client/i18n/hu.json A extensions/Wikibase/client/includes/AffectedPagesFinder.php M extensions/Wikibase/client/includes/ChangeHandler.php A extensions/Wikibase/client/includes/DataAccess/PropertyIdResolver.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php R extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php R extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php D extensions/Wikibase/client/includes/ReferencedPagesFinder.php A extensions/Wikibase/client/includes/Usage/NullUsageTracker.php A extensions/Wikibase/client/includes/Usage/SiteLinkUsageLookup.php M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTracker.php M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdate.php M extensions/Wikibase/client/includes/WikibaseClient.php A extensions/Wikibase/client/includes/hooks/DataUpdateHookHandlers.php M extensions/Wikibase/client/includes/store/ClientStore.php A extensions/Wikibase/client/includes/store/TitleFactory.php A extensions/Wikibase/client/includes/store/UsageUpdater.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/resources/Resources.php M extensions/Wikibase/client/tests/phpunit/MockClientStore.php R extensions/Wikibase/client/tests/phpunit/includes/AffectedPagesFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php A extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php A extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php D extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php A extensions/Wikibase/client/tests/phpunit/includes/UsageUpdaterTest.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php A extensions/Wikibase/client/tests/phpunit/includes/hooks/DataUpdateHookHandlersTest.php A extensions/Wikibase/client/tests/phpunit/includes/store/TitleFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/options.wiki M extensions/Wikibase/lib/i18n/el.json M extensions/Wikibase/lib/i18n/en.json A extensions/Wikibase/lib/i18n/fy.json M extensions/Wikibase/lib/i18n/hu.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/includes/ChangeNotificationJob.php D extensions/Wikibase/lib/includes/store/ItemUsageIndex.php M extensions/Wikibase/lib/resources/Resources.php M extensions/Wikibase/lib/resources/api/resources.php M extensions/Wikibase/lib/resources/entityChangers/AliasesChanger.js M extensions/Wikibase/lib/resources/entityChangers/ClaimsChanger.js M extensions/Wikibase/lib/resources/entityChangers/EntityChangersFactory.js M extensions/Wikibase/lib/resources/entityChangers/ReferencesChanger.js M extensions/Wikibase/lib/resources/entityChangers/resources.php M extensions/Wikibase/lib/resources/experts/resources.php M extensions/Wikibase/lib/resources/formatters/resources.php M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js M
[MediaWiki-commits] [Gerrit] Remove unused newEntityIdLabelFormatter method in client fac... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/170067 Change subject: Remove unused newEntityIdLabelFormatter method in client factory .. Remove unused newEntityIdLabelFormatter method in client factory Change-Id: I075dbb5a58e905e72c084276417094cb8ce734d0 --- M client/includes/WikibaseClient.php M client/tests/phpunit/includes/WikibaseClientTest.php 2 files changed, 0 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/67/170067/1 diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index ce14e96..1c06568 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -33,7 +33,6 @@ use Wikibase\LangLinkHandler; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\Changes\EntityChangeFactory; -use Wikibase\Lib\EntityIdLabelFormatter; use Wikibase\Lib\EntityRetrievingDataTypeLookup; use Wikibase\Lib\OutputFormatSnakFormatterFactory; use Wikibase\Lib\OutputFormatValueFormatterFactory; @@ -190,23 +189,6 @@ } return $this-entityIdParser; - } - - /** -* @since 0.4 -* -* @param string $languageCode -* -* @return EntityIdLabelFormatter -*/ - public function newEntityIdLabelFormatter( $languageCode ) { - $options = new FormatterOptions( array( - EntityIdLabelFormatter::OPT_LANG = $languageCode - ) ); - - $labelFormatter = new EntityIdLabelFormatter( $options, $this-getEntityLookup() ); - - return $labelFormatter; } /** diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php b/client/tests/phpunit/includes/WikibaseClientTest.php index f677e16..735878a 100644 --- a/client/tests/phpunit/includes/WikibaseClientTest.php +++ b/client/tests/phpunit/includes/WikibaseClientTest.php @@ -35,11 +35,6 @@ $this-assertInstanceOf( 'Wikibase\DataModel\Entity\EntityIdParser', $returnValue ); } - public function testEntityIdLabelFormatterReturnType() { - $returnValue = $this-getDefaultInstance()-newEntityIdLabelFormatter( 'en' ); - $this-assertInstanceOf( 'Wikibase\Lib\EntityIdLabelFormatter', $returnValue ); - } - public function testGetPropertyDataTypeLookupReturnType() { $returnValue = $this-getDefaultInstance()-getPropertyDataTypeLookup(); $this-assertInstanceOf( 'Wikibase\DataModel\Entity\PropertyDataTypeLookup', $returnValue ); -- To view, visit https://gerrit.wikimedia.org/r/170067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I075dbb5a58e905e72c084276417094cb8ce734d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preload pywikibot library in pwb shell - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Preload pywikibot library in pwb shell .. Preload pywikibot library in pwb shell The pwb shell script has not pre-loaded the pywikibot library, or injected any other python objects into the shell environment. This is useful, when the user needs to set up their own environment. However the more common case is the user wants to be able to use pywikibot command line arguments, and pre-load the pywikibot library. Change-Id: I976a4b19d7a3eebb13a37dccce6bbe6454294c78 --- M scripts/shell.py M tests/script_tests.py 2 files changed, 27 insertions(+), 4 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/shell.py b/scripts/shell.py index 0f7337f..baa82cc 100644 --- a/scripts/shell.py +++ b/scripts/shell.py @@ -4,7 +4,13 @@ Spawns an interactive Python shell. Usage: -python pwb.py shell +python pwb.py shell [args] + +If no arguments are given, the pywikibot library will not be loaded. + +The following parameters are supported: + +params; # (C) Pywikibot team, 2014 @@ -14,6 +20,23 @@ __version__ = '$Id$' # -if __name__ == __main__: + +def main(*args): +Script entry point. +env = None +if args: +import pywikibot +pywikibot.handle_args(*args) +env = locals() + import code -code.interact(Welcome to the Pywikibot interactive shell!) +code.interact(Welcome to the Pywikibot interactive shell!, local=env) + + +if __name__ == __main__: +import sys +args = [] +if set(sys.argv) - set(['shell', 'shell.py']): +args = sys.argv +del sys +main(*args) diff --git a/tests/script_tests.py b/tests/script_tests.py index dcd3f3e..d575a66 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -348,7 +348,7 @@ else: test_name = 'test_' + script_name + '_help' dct[test_name] = test_execution(script_name, ['-help']) -if script_name in ['shell', 'version', +if script_name in ['version', 'data_ingestion', # bug 68611 'replicate_wiki', # bug 68664 'script_wui', # Failing on travis-ci -- To view, visit https://gerrit.wikimedia.org/r/159835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I976a4b19d7a3eebb13a37dccce6bbe6454294c78 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: Xqt i...@gno.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Shell: Use args as one parameter - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/171826 Change subject: [FIX] Shell: Use args as one parameter .. [FIX] Shell: Use args as one parameter Change-Id: If96eb33fb24e0e9c23e4bf9f20a65a48da5fc159 --- M scripts/shell.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/26/171826/1 diff --git a/scripts/shell.py b/scripts/shell.py index baa82cc..0a0add6 100644 --- a/scripts/shell.py +++ b/scripts/shell.py @@ -26,7 +26,7 @@ env = None if args: import pywikibot -pywikibot.handle_args(*args) +pywikibot.handle_args(args) env = locals() import code -- To view, visit https://gerrit.wikimedia.org/r/171826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If96eb33fb24e0e9c23e4bf9f20a65a48da5fc159 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide cohort details when filtering results no results. - change (analytics/wikimetrics)
jenkins-bot has submitted this change and it was merged. Change subject: Hide cohort details when filtering results no results. .. Hide cohort details when filtering results no results. Bug: 73040 Change-Id: I04e8f28b210134bbc328634f4f165316ef66d2d3 --- M wikimetrics/static/js/cohortList.js M wikimetrics/templates/cohorts.html 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Milimetric: Looks good to me, approved jenkins-bot: Verified diff --git a/wikimetrics/static/js/cohortList.js b/wikimetrics/static/js/cohortList.js index b65cf4b..0be7df6 100644 --- a/wikimetrics/static/js/cohortList.js +++ b/wikimetrics/static/js/cohortList.js @@ -143,6 +143,10 @@ return this.cohorts(); }, viewModel); +viewModel.shouldShowCohort = ko.computed(function(){ +return !!(this.filteredCohorts().length); +}, viewModel); + // fetch this user's cohorts $.get('/cohorts/list/?include_invalid=true') .done(site.handleWith(function(data){ diff --git a/wikimetrics/templates/cohorts.html b/wikimetrics/templates/cohorts.html index ba0e8bd..e82469a 100644 --- a/wikimetrics/templates/cohorts.html +++ b/wikimetrics/templates/cohorts.html @@ -16,7 +16,7 @@ a data-bind=text: name, attr: {href: '#' + id}, click: $root.view data-toggle=tab/a /li /ul -div class=tab-content data-bind=foreach: cohorts +div class=tab-content data-bind=foreach: cohorts, visible: shouldShowCohort div class=tab-pane small data-bind=attr: {id: id} div class=well well-large style=height:280px h2span data-bind=text: name/span -- To view, visit https://gerrit.wikimedia.org/r/171489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04e8f28b210134bbc328634f4f165316ef66d2d3 Gerrit-PatchSet: 2 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Shell: Use args as one parameter - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Shell: Use args as one parameter .. [FIX] Shell: Use args as one parameter Change-Id: If96eb33fb24e0e9c23e4bf9f20a65a48da5fc159 --- M scripts/shell.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/shell.py b/scripts/shell.py index baa82cc..0a0add6 100644 --- a/scripts/shell.py +++ b/scripts/shell.py @@ -26,7 +26,7 @@ env = None if args: import pywikibot -pywikibot.handle_args(*args) +pywikibot.handle_args(args) env = locals() import code -- To view, visit https://gerrit.wikimedia.org/r/171826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If96eb33fb24e0e9c23e4bf9f20a65a48da5fc159 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add notice regarding lockwiki removal - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/171827 Change subject: Add notice regarding lockwiki removal .. Add notice regarding lockwiki removal lockwiki family was removed in 1f72dd4. Add a notice when someone attempts to use it, if they havent created their own family file. Change-Id: I25831ac62ee14457ca206ccb31c1f51575faa229 --- M pywikibot/family.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/27/171827/1 diff --git a/pywikibot/family.py b/pywikibot/family.py index 2a659e0..f2f13e3 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -864,6 +864,12 @@ myfamily = AutoFamily(fam, family_file) Family._families[fam] = myfamily return Family._families[fam] +elif fam == 'lockwiki': +raise UnknownFamily( +Family 'lockwiki' has been removed as it not a public wiki.\n +You may install your own family file for this wiki, and a +old family file may be found at:\n + http://git.wikimedia.org/commitdiff/pywikibot%2Fcore.git/dfdc0c9150fa8e09829bb9d236;) try: # Ignore warnings due to dots in family names. -- To view, visit https://gerrit.wikimedia.org/r/171827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25831ac62ee14457ca206ccb31c1f51575faa229 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add notice regarding lockwiki removal - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add notice regarding lockwiki removal .. Add notice regarding lockwiki removal lockwiki family was removed in 1f72dd4. Add a notice when someone attempts to use it, if they havent created their own family file. Change-Id: I25831ac62ee14457ca206ccb31c1f51575faa229 --- M pywikibot/family.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 2a659e0..f2f13e3 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -864,6 +864,12 @@ myfamily = AutoFamily(fam, family_file) Family._families[fam] = myfamily return Family._families[fam] +elif fam == 'lockwiki': +raise UnknownFamily( +Family 'lockwiki' has been removed as it not a public wiki.\n +You may install your own family file for this wiki, and a +old family file may be found at:\n + http://git.wikimedia.org/commitdiff/pywikibot%2Fcore.git/dfdc0c9150fa8e09829bb9d236;) try: # Ignore warnings due to dots in family names. -- To view, visit https://gerrit.wikimedia.org/r/171827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25831ac62ee14457ca206ccb31c1f51575faa229 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add researchers to researchers group as given by Dario in RT... - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/171828 Change subject: Add researchers to researchers group as given by Dario in RT 7105 .. Add researchers to researchers group as given by Dario in RT 7105 Change-Id: I46f4242817bc7286880d960f4f81e1118ec277e5 --- M modules/admin/data/data.yaml 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/171828/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 566688f..d665838 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -85,7 +85,11 @@ researchers: gid: 714 description: users with access to research db -members: [dartar, jzerebecki, dduvall, nettrom, declerambaul, halfak] +members: [awight, catrope, dartar, declerambaul, deskana, dduvall, + ellery, ezachte, gage, gilles, haithams, halfak, handrade, + ironholds, jforrester, jkatz, jmorgan, jzerebecki, kaldari, + kleduc, leila, maryana, mattflaschen, milimetric, nettrom, + nuria, ori, otto, qchris, springle, tnegrin, yurik, yuvipanda] ldap-admins: gid: 715 description: ldap admins -- To view, visit https://gerrit.wikimedia.org/r/171828 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46f4242817bc7286880d960f4f81e1118ec277e5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add researchers to researchers group as given by Dario in RT... - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Add researchers to researchers group as given by Dario in RT 7105 .. Add researchers to researchers group as given by Dario in RT 7105 Change-Id: I46f4242817bc7286880d960f4f81e1118ec277e5 --- M modules/admin/data/data.yaml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index a531437..a109f2d 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -85,7 +85,11 @@ researchers: gid: 714 description: users with access to research db -members: [dartar, jzerebecki, dduvall, nettrom, declerambaul, halfak] +members: [awight, catrope, dartar, declerambaul, deskana, dduvall, + ellery, ezachte, gage, gilles, haithams, halfak, handrade, + ironholds, jforrester, jkatz, jmorgan, jzerebecki, kaldari, + kleduc, leila, maryana, mattflaschen, milimetric, nettrom, + nuria, ori, otto, qchris, springle, tnegrin, yurik, yuvipanda] ldap-admins: gid: 715 description: ldap admins -- To view, visit https://gerrit.wikimedia.org/r/171828 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46f4242817bc7286880d960f4f81e1118ec277e5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused global in wfLogProfilingData - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/171829 Change subject: Remove unused global in wfLogProfilingData .. Remove unused global in wfLogProfilingData Change-Id: I873efb8967cd17c89de5b32fcde6c738eefa03e6 --- M includes/GlobalFunctions.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/29/171829/1 diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index bb80770..eab8031 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1161,7 +1161,7 @@ * @todo document */ function wfLogProfilingData() { - global $wgRequestTime, $wgDebugLogFile, $wgDebugLogGroups, $wgDebugRawPage; + global $wgRequestTime, $wgDebugLogGroups, $wgDebugRawPage; global $wgProfileLimit, $wgUser, $wgRequest; StatCounter::singleton()-flush(); -- To view, visit https://gerrit.wikimedia.org/r/171829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I873efb8967cd17c89de5b32fcde6c738eefa03e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused newEntityIdLabelFormatter method in client fac... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused newEntityIdLabelFormatter method in client factory .. Remove unused newEntityIdLabelFormatter method in client factory Change-Id: I075dbb5a58e905e72c084276417094cb8ce734d0 --- M client/includes/WikibaseClient.php M client/tests/phpunit/includes/WikibaseClientTest.php 2 files changed, 0 insertions(+), 23 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index ce14e96..1c06568 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -33,7 +33,6 @@ use Wikibase\LangLinkHandler; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\Changes\EntityChangeFactory; -use Wikibase\Lib\EntityIdLabelFormatter; use Wikibase\Lib\EntityRetrievingDataTypeLookup; use Wikibase\Lib\OutputFormatSnakFormatterFactory; use Wikibase\Lib\OutputFormatValueFormatterFactory; @@ -190,23 +189,6 @@ } return $this-entityIdParser; - } - - /** -* @since 0.4 -* -* @param string $languageCode -* -* @return EntityIdLabelFormatter -*/ - public function newEntityIdLabelFormatter( $languageCode ) { - $options = new FormatterOptions( array( - EntityIdLabelFormatter::OPT_LANG = $languageCode - ) ); - - $labelFormatter = new EntityIdLabelFormatter( $options, $this-getEntityLookup() ); - - return $labelFormatter; } /** diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php b/client/tests/phpunit/includes/WikibaseClientTest.php index f677e16..735878a 100644 --- a/client/tests/phpunit/includes/WikibaseClientTest.php +++ b/client/tests/phpunit/includes/WikibaseClientTest.php @@ -35,11 +35,6 @@ $this-assertInstanceOf( 'Wikibase\DataModel\Entity\EntityIdParser', $returnValue ); } - public function testEntityIdLabelFormatterReturnType() { - $returnValue = $this-getDefaultInstance()-newEntityIdLabelFormatter( 'en' ); - $this-assertInstanceOf( 'Wikibase\Lib\EntityIdLabelFormatter', $returnValue ); - } - public function testGetPropertyDataTypeLookupReturnType() { $returnValue = $this-getDefaultInstance()-getPropertyDataTypeLookup(); $this-assertInstanceOf( 'Wikibase\DataModel\Entity\PropertyDataTypeLookup', $returnValue ); -- To view, visit https://gerrit.wikimedia.org/r/170067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I075dbb5a58e905e72c084276417094cb8ce734d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused globals in the web api - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused globals in the web api .. Remove unused globals in the web api Change-Id: I9ae428ed9f14f95c649953f62d729a9a9be7869b --- M includes/api/ApiHelp.php M includes/api/ApiParamInfo.php 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index b33b087..5d46a07 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -32,8 +32,6 @@ */ class ApiHelp extends ApiBase { public function execute() { - global $wgContLang; - $params = $this-extractRequestParams(); $modules = array(); diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php index b1c092e..17773a7 100644 --- a/includes/api/ApiParamInfo.php +++ b/includes/api/ApiParamInfo.php @@ -37,8 +37,6 @@ } public function execute() { - global $wgContLang; - // Get parameters $params = $this-extractRequestParams(); -- To view, visit https://gerrit.wikimedia.org/r/170074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ae428ed9f14f95c649953f62d729a9a9be7869b Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable cache for RepeatingGenerator tests - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/171830 Change subject: Disable cache for RepeatingGenerator tests .. Disable cache for RepeatingGenerator tests This test re-issues the same API request, but expects different results each time. Bug: 71121 Change-Id: I0c9e45e03088c11864757556b6376df43595964f --- M tests/pagegenerators_tests.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/30/171830/1 diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index a816031..a7e2038 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -148,8 +148,6 @@ family = 'wikipedia' code = 'en' -cached = True - def test_RepeatingGenerator(self): # site.recentchanges() includes external edits (from wikidata), # so total=4 is not too high -- To view, visit https://gerrit.wikimedia.org/r/171830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c9e45e03088c11864757556b6376df43595964f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clarify thresholds and emergency control flow - change (mediawiki...AbuseFilter)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/171831 Change subject: Clarify thresholds and emergency control flow .. Clarify thresholds and emergency control flow * Add some code comments. * Call recordStats() and checkEmergencyDisable() from filterAction() rather than from functions whose names are totally unrelated from what they're doing. Partly follows up on 0c174aec. Change-Id: Ibfd39bef64b2b5a0a7a131552c4eec740bf65a54 --- M AbuseFilter.class.php 1 file changed, 29 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/31/171831/1 diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php index bb94e6d..66754e1 100644 --- a/AbuseFilter.class.php +++ b/AbuseFilter.class.php @@ -490,9 +490,6 @@ } } - // Update statistics, and disable filters which are over-blocking. - self::recordStats( $filter_matched, $group ); - wfProfileOut( __METHOD__ ); return $filter_matched; @@ -873,7 +870,11 @@ $dbr = wfGetDB( DB_SLAVE ); + // Check filters $filter_matched = self::checkAllFilters( $vars, $group ); + + // Update statistics, and disable filters which are over-blocking. + self::recordStats( $filter_matched, $group ); $matched_filters = array_keys( array_filter( $filter_matched ) ); @@ -904,7 +905,17 @@ $log_template['afl_user_text'] = $vars-getVar( 'accountname' )-toString(); } + // Update logs and match statistics, act on emergency self::addLogEntries( $actions_taken, $log_template, $action, $vars, $group ); + + global $wgMemc; + + // Increment trigger counter + $wgMemc-incr( self::filterMatchesKey() ); + + // Check for emergency disabling. + $total = $wgMemc-get( AbuseFilter::filterUsedKey( $group ) ); + self::checkEmergencyDisable( $group, $logged_local_filters, $total ); wfProfileOut( __METHOD__ . '-block' ); } @@ -985,11 +996,6 @@ $var_dump = stored-text:$var_dump; // To distinguish from stuff stored directly wfProfileIn( __METHOD__ . '-hitstats' ); - - global $wgMemc; - - // Increment trigger counter - $wgMemc-incr( self::filterMatchesKey() ); $local_log_ids = array(); global $wgAbuseFilterNotifications, $wgAbuseFilterNotificationsPrivate; @@ -1082,10 +1088,6 @@ $vars-setVar( 'global_log_ids', $global_log_ids ); $vars-setVar( 'local_log_ids', $local_log_ids ); - - // Check for emergency disabling. - $total = $wgMemc-get( AbuseFilter::filterUsedKey( $group ) ); - self::checkEmergencyDisable( $group, $logged_local_filters, $total ); wfProfileOut( __METHOD__ . '-hitstats' ); @@ -1565,7 +1567,7 @@ /** * Update statistics, and disable filters which are over-blocking. -* @param $filters +* @param array $filters filters which were matched by the checked actions * @param $group */ public static function recordStats( $filters, $group = 'default' ) { @@ -1573,13 +1575,11 @@ wfProfileIn( __METHOD__ ); - // Figure out if we've triggered overflows and blocks. - $overflow_triggered = ( self::$condCount $wgAbuseFilterConditionLimit ); - // Store some keys... $overflow_key = self::filterLimitReachedKey(); $total_key = self::filterUsedKey( $group ); + // Get the total number of times filters in this group have been checked $total = $wgMemc-get( $total_key ); $storage_period = self::$statsStoragePeriod; @@ -1600,7 +1600,7 @@ $wgMemc-incr( $total_key ); // Increment overflow counter, if our condition limit overflowed - if ( $overflow_triggered ) { + if ( self::$condCount $wgAbuseFilterConditionLimit ) { $wgMemc-incr( $overflow_key ); } wfProfileOut( __METHOD__ ); @@ -1616,7 +1616,8 @@ $wgAbuseFilterEmergencyDisableAge, $wgMemc; foreach ( $filters as $filter ) { - // determine emergency disable values for this action + // Determine the configured emergency disable values for + // the filter's group, assumed to be what we were passed.
[MediaWiki-commits] [Gerrit] Remove unused global in wfLogProfilingData - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused global in wfLogProfilingData .. Remove unused global in wfLogProfilingData Change-Id: I873efb8967cd17c89de5b32fcde6c738eefa03e6 --- M includes/GlobalFunctions.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index bb80770..eab8031 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1161,7 +1161,7 @@ * @todo document */ function wfLogProfilingData() { - global $wgRequestTime, $wgDebugLogFile, $wgDebugLogGroups, $wgDebugRawPage; + global $wgRequestTime, $wgDebugLogGroups, $wgDebugRawPage; global $wgProfileLimit, $wgUser, $wgRequest; StatCounter::singleton()-flush(); -- To view, visit https://gerrit.wikimedia.org/r/171829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I873efb8967cd17c89de5b32fcde6c738eefa03e6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update Chrome to version 38. - change (integration/config)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/171832 Change subject: update Chrome to version 38. .. update Chrome to version 38. tested with VE build https://integration.wikimedia.org/ci/view/BrowserTests/view/-All/job/browsertests-VisualEditor-en.wikipedia.beta.wmflabs.org-linux-chrome-sauce/318/ Bug 69399 Change-Id: If1eb249ccdd5fe311a02d00034c38f4680c02f67 --- M jjb/macro-browsertests.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/32/171832/1 diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml index 619998a..a1518de 100644 --- a/jjb/macro-browsertests.yaml +++ b/jjb/macro-browsertests.yaml @@ -27,8 +27,7 @@ # case $BROWSER in 'chrome') -# Until upstream problem of bug 69399 is resolved we have to use 28 -export VERSION=28 +export VERSION=38 ;; 'firefox') export VERSION=32 -- To view, visit https://gerrit.wikimedia.org/r/171832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1eb249ccdd5fe311a02d00034c38f4680c02f67 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed a couple of issues with emails - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged. Change subject: Fixed a couple of issues with emails .. Fixed a couple of issues with emails 1) The email greeting was in content language and not in the user language 2) Real name parameter was missing in email greeting * Fixed profiling in Mailer.class.php Change-Id: If871ce67d81fb9df84264b6135da945242994d10 --- M i18n/core/de.json M i18n/core/en.json M i18n/core/qqq.json M includes/Mailer.class.php 4 files changed, 18 insertions(+), 11 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved Raimond Spekking: Looks good to me, but someone else must approve diff --git a/i18n/core/de.json b/i18n/core/de.json index bb6f35b..f4cf68f 100644 --- a/i18n/core/de.json +++ b/i18n/core/de.json @@ -25,7 +25,7 @@ bs-two-units-ago: vor $1 und $2, bs-one-unit-ago: vor $1, bs-now: jetzt, - bs-email-greeting-receiver: {{GENDER:$1|Hallo Herr $1|Hallo Frau $1|Hallo $1}},, + bs-email-greeting-receiver: {{GENDER:$1|Hallo Herr $2|Hallo Frau $2|Hallo $2}},, bs-email-greeting-no-receiver: Hallo,, bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte antworte nicht auf diese E-Mail!, bs-userpagesettings-legend: Benutzereinstellungen, diff --git a/i18n/core/en.json b/i18n/core/en.json index 8287ee6..ea95f5d 100644 --- a/i18n/core/en.json +++ b/i18n/core/en.json @@ -25,7 +25,7 @@ bs-two-units-ago: $1 and $2 ago, bs-one-unit-ago: $1 ago, bs-now: now, - bs-email-greeting-receiver: {{GENDER:$1|Hello Mr $1|Hello Mrs $1|Hello $1}},, + bs-email-greeting-receiver: {{GENDER:$1|Hello Mr $2|Hello Mrs $2|Hello $2}},, bs-email-greeting-no-receiver: Hello,, bs-email-footer: This message was generated automatically. Please do not reply to this email., bs-userpagesettings-legend: User settings, diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json index 5e6ed1c..07aa245 100644 --- a/i18n/core/qqq.json +++ b/i18n/core/qqq.json @@ -29,8 +29,8 @@ bs-two-units-ago: Text shown when indicating how long ago an event was.\n\nUses {{msg-mw|Bs-years-duration}}, {{msg-mw|Bs-months-duration}}, {{msg-mw|Bs-weeks-duration}}, {{msg-mw|Bs-days-duration}}, {{msg-mw|Bs-hours-duration}}, {{msg-mw|Bs-mins-duration}}, {{msg-mw|Bs-secs-duration}} for parameters\n\nParameters:\n* $1 - a duration, e.g. {{msg-mw|Bs-weeks-duration}}\n* $2 - a duration one unit smaller than $1, e.g. {{msg-mw|Bs-days-duration}}, bs-one-unit-ago: Text shown when indicating how long ago an event was\n\nParameters:\n* $1 - a duration; any one of the following messages:\n** {{msg-mw|Bs-years-duration}}\n** {{msg-mw|Bs-months-duration}}\n** {{msg-mw|Bs-weeks-duration}}\n** {{msg-mw|Bs-days-duration}}\n** {{msg-mw|Bs-hours-duration}}\n** {{msg-mw|Bs-mins-duration}}\n** {{msg-mw|Bs-secs-duration}}\n{{Identical|Ago}}, bs-now: Text shown for \now\ when indicating how long ago an event was.\n{{Identical|Now}}, - bs-email-greeting-receiver: Used in plain text mails as first line in body to greet the receiver, $1 is the current user name for GENDER distinction (depends on sex setting)\n\nParameters:\n* $1 - name of the receiver, - bs-email-greeting-no-receiver: Used in plain text mails as first line in body to greet the reveiver\n{{Identical|Hello}}, + bs-email-greeting-receiver: Used in emails as first line in body to greet the receiver.\n\nParameters:\n* $1 is the username of the receiver - use for GENDER distinction \n*$2 is real name of the receiver, if the receiver has not set a real name it is the username, + bs-email-greeting-no-receiver: Used in emails as first line in body to greet the reveiver\n{{Identical|Hello}}, bs-email-footer: Used in plain text mails as last line, bs-userpagesettings-legend: Label for section with links to special user related settings, bs-userpreferences-link-text: Label for link to user preferences on user page, diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php index a27b883..3881ee8 100644 --- a/includes/Mailer.class.php +++ b/includes/Mailer.class.php @@ -128,14 +128,20 @@ foreach ( $aEmailTo as $aReceiver ) { //Prepare message if ( $aReceiver['greeting'] ) { - $sGreeting = wfMessage( 'bs-email-greeting-receiver', $aReceiver['greeting'] )-text() . ( $this-bSendHTML ) - ? br /br / - : \n\n; + $oUser = User::newFromName( $aReceiver['greeting'] ); + $sRealname = $oUser-getRealName(); + if ( empty( $sRealname ) ) { + $sRealname = $aReceiver['greeting']; +
[MediaWiki-commits] [Gerrit] Fixed issue with email language - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: Fixed issue with email language .. Fixed issue with email language Emails were sent in content languge and not in user language. So now the emails are sent per user and not combined for all. * Improved code Change-Id: I2afe945a9958930c5fae76a64c1844de8038f4c3 --- M ResponsibleEditors/ResponsibleEditors.class.php 1 file changed, 68 insertions(+), 70 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/ResponsibleEditors/ResponsibleEditors.class.php b/ResponsibleEditors/ResponsibleEditors.class.php index 2fed95f..51667a0 100644 --- a/ResponsibleEditors/ResponsibleEditors.class.php +++ b/ResponsibleEditors/ResponsibleEditors.class.php @@ -874,80 +874,78 @@ * @param string $sAction */ public static function notifyResponsibleEditors($aResponsibleEditorIds, $oUser, $aTitles, $sAction) { - if (empty($aResponsibleEditorIds)) return true; + if ( empty( $aResponsibleEditorIds ) ) return true; - $aResponsibleEditors = array(); - foreach ($aResponsibleEditorIds as $iUserId) { - $oREUser = User::newFromId($iUserId); + foreach ( $aResponsibleEditorIds as $iUserId ) { + $oREUser = User::newFromId( $iUserId ); if ( $iUserId == $oUser-getId() ) continue; - if ( BsConfig::getVarForUser( MW::ResponsibleEditors::E.ucfirst( $sAction ), $oREUser ) === true ) { - $aResponsibleEditors[] = $oREUser; + if ( BsConfig::getVarForUser( MW::ResponsibleEditors::E.ucfirst( $sAction ), $oREUser ) === false ) { + continue; } + + $sUserRealName = BsCore::getInstance()-getUserDisplayName( $oUser ); + $sUsername = $oUser-getName(); + $sArticleName = $aTitles[0]-getText(); + $sArticleLink = $aTitles[0]-getFullURL(); + $sLanguageCode = $oREUser-getOption( 'language' ); + + switch( $sAction ) { + case 'change': + $sSubject = wfMessage( + 'bs-responsibleeditors-mail-subject-re-article-changed', + $sArticleName, + $sUsername, + $sUserRealName + )-inLanguage( $sLanguageCode )-text(); + $sMessage = wfMessage( + 'bs-responsibleeditors-mail-text-re-article-changed', + $sArticleName, + $sUsername, + $sUserRealName, + $sArticleLink + )-inLanguage( $sLanguageCode )-text(); + break; + case 'delete': + $sSubject = wfMessage( + 'bs-responsibleeditors-mail-subject-re-article-deleted', + $sArticleName, + $sUsername, + $sUserRealName + )-inLanguage( $sLanguageCode )-text(); + $sMessage = wfMessage( + 'bs-responsibleeditors-mail-text-re-article-deleted', + $sArticleName, + $sUsername, + $sUserRealName, + $sArticleLink + )-inLanguage( $sLanguageCode )-text(); + break; + case 'move': + $sSubject = wfMessage( + 'bs-responsibleeditors-mail-subject-re-article-moved', + $sArticleName, + $sUsername, + $sUserRealName + )-inLanguage( $sLanguageCode )-text(); + $sMessage = wfMessage( + 'bs-responsibleeditors-mail-text-re-article-moved', +
[MediaWiki-commits] [Gerrit] [LiquidThreads] [WikiLove] Ignore empty API messages - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/171833 Change subject: [LiquidThreads] [WikiLove] Ignore empty API messages .. [LiquidThreads] [WikiLove] Ignore empty API messages Spotted by Liuxinyu970226 https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-threadaction-param-operand/en Change-Id: Iad0715c28d4f86c252f3ca88b738e8da3a2379d2 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/33/171833/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 11bd60c..706758d 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1193,6 +1193,7 @@ magicfile = LiquidThreads/i18n/LiquidThreads.magic.php descmsg = lqt-desc ignored = lqt_header_warning_before_big +ignored = apihelp-threadaction-param-operand List Signup aliasfile = ListSignup/ListSignup.alias.php @@ -2255,6 +2256,7 @@ Wiki Love optional = wikilove-commons-url, wikilove-commons-link, wikilove-what-is-this-link, wikilove-terms-url +ignored = apihelp-wikiloveimagelog-param-image, apihelp-wikiloveimagelog-param-success Wiki Loves Monuments -- To view, visit https://gerrit.wikimedia.org/r/171833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad0715c28d4f86c252f3ca88b738e8da3a2379d2 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed the message prefixes from 'vikijs' to 'viki' in resp... - change (mediawiki...VIKI)
Jason.ji has uploaded a new change for review. https://gerrit.wikimedia.org/r/171834 Change subject: Changed the message prefixes from 'vikijs' to 'viki' in response to a commenter. .. Changed the message prefixes from 'vikijs' to 'viki' in response to a commenter. Change-Id: If5def54b829c4c54ace385b1f401a5fc1002f9b3 --- M VIKI.php M i18n/en.json M i18n/qqq.json 3 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VIKI refs/changes/34/171834/1 diff --git a/VIKI.php b/VIKI.php index a9535d4..3e5dbc6 100644 --- a/VIKI.php +++ b/VIKI.php @@ -31,7 +31,7 @@ * refreshLinks.php after setting this flag. */ -define( 'VIKIJS_VERSION', '1.0' ); +define( 'VIKIJS_VERSION', '1.0.1' ); if ( !defined( 'MEDIAWIKI' ) ) { die( 'bError:/b This file is part of a MediaWiki extension and cannot be run standalone.' ); @@ -56,7 +56,7 @@ 'version' = VIKIJS_VERSION, 'author' = array('[http://www.mediawiki.org/wiki/User:Jji Jason Ji]', '[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]'), - 'descriptionmsg' = 'vikijs-desc', + 'descriptionmsg' = 'viki-desc', 'path' = __FILE__, 'url' = 'http://www.mediawiki.org/wiki/Extension:VIKI' ); @@ -85,14 +85,14 @@ 'mediawiki.jqueryMsg', ), 'messages' = array( - 'vikijs-error-title', - 'vikijs-error-missing-pageTitle', - 'vikijs-timeout-content-namespace', - 'vikijs-error-content-namespace', - 'vikijs-error-visit-node', - 'vikijs-error-external-links', - 'vikijs-error-intrawiki-out', - 'vikijs-error-intrawiki-in' + 'viki-error-title', + 'viki-error-missing-pageTitle', + 'viki-timeout-content-namespace', + 'viki-error-content-namespace', + 'viki-error-visit-node', + 'viki-error-external-links', + 'viki-error-intrawiki-out', + 'viki-error-intrawiki-in' ) ); diff --git a/i18n/en.json b/i18n/en.json index a2f6191..7cd 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2,13 +2,13 @@ @metadata: { authors: [] }, - vikijs-desc: Draws a network graph of links between wiki pages or web pages, - vikijs-error-title: Error:, - vikijs-error-missing-pageTitle: You must supply at least one page title., - vikijs-timeout-content-namespace: Timeout for content namespace fetch for wiki: $1. Defaulting to main namespace., - vikijs-error-content-namespace: Error fetching content namespace for wiki: $1. Defaulting to main namespace., - vikijs-error-visit-node : Error while attempting to visit node: $1., - vikijs-error-external-links : Error fetching external links for page: $1., - vikijs-error-intrawiki-out: Error fetching intrawiki outgoing links for page: $1., - vikijs-error-intrawiki-in: Error fetching intrawiki backlinks for page: $1. + viki-desc: Draws a network graph of links between wiki pages or web pages, + viki-error-title: Error:, + viki-error-missing-pageTitle: You must supply at least one page title., + viki-timeout-content-namespace: Timeout for content namespace fetch for wiki: $1. Defaulting to main namespace., + viki-error-content-namespace: Error fetching content namespace for wiki: $1. Defaulting to main namespace., + viki-error-visit-node : Error while attempting to visit node: $1., + viki-error-external-links : Error fetching external links for page: $1., + viki-error-intrawiki-out: Error fetching intrawiki outgoing links for page: $1., + viki-error-intrawiki-in: Error fetching intrawiki backlinks for page: $1. } diff --git a/i18n/qqq.json b/i18n/qqq.json index 94d5347..d3e2072 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -5,13 +5,13 @@ Jason Ji ] }, - vikijs-desc: {{desc|name=VIKI|url=http://www.mediawiki.org/wiki/Extension/VIKI}};, - vikijs-error-title : Title for the error div, - vikijs-error-missing-pageTitle: Error message when no pageTitles are supplied to the parser function, - vikijs-timeout-content-namespace: Error message for when a content namespace fetch has timed out, - vikijs-error-content-namespace: Error message for a failed content namespace fetch, - vikijs-error-visit-node : Error message for a failure to visit a node, - vikijs-error-external-links : Error message for a failure to fetch external links for a page, - vikijs-error-intrawiki-out: Error message for a failure to fetch intra-wiki links out for a page, - vikijs-error-intrawiki-in: Error message for a failure to fetch intra-wiki links in for a page + viki-desc: {{desc|name=VIKI|url=http://www.mediawiki.org/wiki/Extension/VIKI}};, +
[MediaWiki-commits] [Gerrit] Added meaningful id for testing purpose - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: Added meaningful id for testing purpose .. Added meaningful id for testing purpose The created checkboxes just had a number as id. * Changed initialization from document ready to loading time of ext.bluespice * Added missing semicolon Change-Id: Ia1e22dc6c556a0d63e432d28a8bfe26a984ac5c4 --- M Checklist/Checklist.class.php M Checklist/resources/bluespice.checklist.js 2 files changed, 7 insertions(+), 10 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/Checklist/Checklist.class.php b/Checklist/Checklist.class.php index dfe20de..8d73373 100644 --- a/Checklist/Checklist.class.php +++ b/Checklist/Checklist.class.php @@ -330,7 +330,7 @@ $sSelectColor = ''; if (isset($args['type']) $args['type'] == 'list' ) { $sOut[] = select {color} ; - $sOut[] = id='.$this-getNewCheckboxId().' ; + $sOut[] = id='bs-cb-.$this-getNewCheckboxId().' ; $sOut[] = onchange='BsChecklist.change(this);' ; $sOut[] = ; @@ -359,7 +359,7 @@ $sOut[] = /select; } else { $sOut[] = input type='checkbox' ; - $sOut[] = id='.$this-getNewCheckboxId().' ; + $sOut[] = id='bs-cb-.$this-getNewCheckboxId().' ; $sOut[] = onclick='BsChecklist.click(this);' ; if (isset ($args['value'] ) $args['value'] == 'checked') { $sOut[] = checked='checked' ; diff --git a/Checklist/resources/bluespice.checklist.js b/Checklist/resources/bluespice.checklist.js index 7bd7ee2..bfe2b19 100644 --- a/Checklist/resources/bluespice.checklist.js +++ b/Checklist/resources/bluespice.checklist.js @@ -2,9 +2,8 @@ * Js for ArticleInfo extension * * @author Patric Wirth wi...@hallowelt.biz - * @packageBluespice_Extensions - * @subpackage ArticleInfo + * @subpackage Checklist * @copyright Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All rights reserved. * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or later * @filesource @@ -113,8 +112,8 @@ innerText += 'option '; if ( optionColor ) innerText += 'style=color:'+optionColor+'; '; if ( optionValue == valueText ) { - if ( optionColor ) selectedColor = 'style=color:'+optionColor+'; ' - innerText += 'selected=selected' + if ( optionColor ) selectedColor = 'style=color:'+optionColor+'; '; + innerText += 'selected=selected'; } innerText += ''+optionValue+'/option'; } @@ -158,9 +157,9 @@ BsChecklist.makeSelectbox(listname, value)); return node; } -} +}; -$(document).ready(function() { +mw.loader.using( 'ext.bluespice', function() { BsChecklist.init(); }); @@ -237,8 +236,6 @@ $(document).on('BsVisualEditorActionsInit', function(event, plugin, buttons, commands, menus) { var t = plugin; var ed = t.getEditor(); - - menus.push({ menuId: 'bsChecklist', -- To view, visit https://gerrit.wikimedia.org/r/171278 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1e22dc6c556a0d63e432d28a8bfe26a984ac5c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [LiquidThreads] [WikiLove] Ignore empty API messages - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [LiquidThreads] [WikiLove] Ignore empty API messages .. [LiquidThreads] [WikiLove] Ignore empty API messages Spotted by Liuxinyu970226 https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-threadaction-param-operand/en Change-Id: Iad0715c28d4f86c252f3ca88b738e8da3a2379d2 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 11bd60c..706758d 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1193,6 +1193,7 @@ magicfile = LiquidThreads/i18n/LiquidThreads.magic.php descmsg = lqt-desc ignored = lqt_header_warning_before_big +ignored = apihelp-threadaction-param-operand List Signup aliasfile = ListSignup/ListSignup.alias.php @@ -2255,6 +2256,7 @@ Wiki Love optional = wikilove-commons-url, wikilove-commons-link, wikilove-what-is-this-link, wikilove-terms-url +ignored = apihelp-wikiloveimagelog-param-image, apihelp-wikiloveimagelog-param-success Wiki Loves Monuments -- To view, visit https://gerrit.wikimedia.org/r/171833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad0715c28d4f86c252f3ca88b738e8da3a2379d2 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed the message prefixes from 'vikijs' to 'viki' in resp... - change (mediawiki...VIKI)
Jason.ji has submitted this change and it was merged. Change subject: Changed the message prefixes from 'vikijs' to 'viki' in response to a commenter. .. Changed the message prefixes from 'vikijs' to 'viki' in response to a commenter. Change-Id: If5def54b829c4c54ace385b1f401a5fc1002f9b3 --- M VIKI.php M i18n/en.json M i18n/qqq.json 3 files changed, 28 insertions(+), 28 deletions(-) Approvals: Jason.ji: Verified; Looks good to me, approved diff --git a/VIKI.php b/VIKI.php index a9535d4..3e5dbc6 100644 --- a/VIKI.php +++ b/VIKI.php @@ -31,7 +31,7 @@ * refreshLinks.php after setting this flag. */ -define( 'VIKIJS_VERSION', '1.0' ); +define( 'VIKIJS_VERSION', '1.0.1' ); if ( !defined( 'MEDIAWIKI' ) ) { die( 'bError:/b This file is part of a MediaWiki extension and cannot be run standalone.' ); @@ -56,7 +56,7 @@ 'version' = VIKIJS_VERSION, 'author' = array('[http://www.mediawiki.org/wiki/User:Jji Jason Ji]', '[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]'), - 'descriptionmsg' = 'vikijs-desc', + 'descriptionmsg' = 'viki-desc', 'path' = __FILE__, 'url' = 'http://www.mediawiki.org/wiki/Extension:VIKI' ); @@ -85,14 +85,14 @@ 'mediawiki.jqueryMsg', ), 'messages' = array( - 'vikijs-error-title', - 'vikijs-error-missing-pageTitle', - 'vikijs-timeout-content-namespace', - 'vikijs-error-content-namespace', - 'vikijs-error-visit-node', - 'vikijs-error-external-links', - 'vikijs-error-intrawiki-out', - 'vikijs-error-intrawiki-in' + 'viki-error-title', + 'viki-error-missing-pageTitle', + 'viki-timeout-content-namespace', + 'viki-error-content-namespace', + 'viki-error-visit-node', + 'viki-error-external-links', + 'viki-error-intrawiki-out', + 'viki-error-intrawiki-in' ) ); diff --git a/i18n/en.json b/i18n/en.json index a2f6191..7cd 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2,13 +2,13 @@ @metadata: { authors: [] }, - vikijs-desc: Draws a network graph of links between wiki pages or web pages, - vikijs-error-title: Error:, - vikijs-error-missing-pageTitle: You must supply at least one page title., - vikijs-timeout-content-namespace: Timeout for content namespace fetch for wiki: $1. Defaulting to main namespace., - vikijs-error-content-namespace: Error fetching content namespace for wiki: $1. Defaulting to main namespace., - vikijs-error-visit-node : Error while attempting to visit node: $1., - vikijs-error-external-links : Error fetching external links for page: $1., - vikijs-error-intrawiki-out: Error fetching intrawiki outgoing links for page: $1., - vikijs-error-intrawiki-in: Error fetching intrawiki backlinks for page: $1. + viki-desc: Draws a network graph of links between wiki pages or web pages, + viki-error-title: Error:, + viki-error-missing-pageTitle: You must supply at least one page title., + viki-timeout-content-namespace: Timeout for content namespace fetch for wiki: $1. Defaulting to main namespace., + viki-error-content-namespace: Error fetching content namespace for wiki: $1. Defaulting to main namespace., + viki-error-visit-node : Error while attempting to visit node: $1., + viki-error-external-links : Error fetching external links for page: $1., + viki-error-intrawiki-out: Error fetching intrawiki outgoing links for page: $1., + viki-error-intrawiki-in: Error fetching intrawiki backlinks for page: $1. } diff --git a/i18n/qqq.json b/i18n/qqq.json index 94d5347..d3e2072 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -5,13 +5,13 @@ Jason Ji ] }, - vikijs-desc: {{desc|name=VIKI|url=http://www.mediawiki.org/wiki/Extension/VIKI}};, - vikijs-error-title : Title for the error div, - vikijs-error-missing-pageTitle: Error message when no pageTitles are supplied to the parser function, - vikijs-timeout-content-namespace: Error message for when a content namespace fetch has timed out, - vikijs-error-content-namespace: Error message for a failed content namespace fetch, - vikijs-error-visit-node : Error message for a failure to visit a node, - vikijs-error-external-links : Error message for a failure to fetch external links for a page, - vikijs-error-intrawiki-out: Error message for a failure to fetch intra-wiki links out for a page, - vikijs-error-intrawiki-in: Error message for a failure to fetch intra-wiki links in for a page + viki-desc: {{desc|name=VIKI|url=http://www.mediawiki.org/wiki/Extension/VIKI}};, + viki-error-title : Title for the error div, +
[MediaWiki-commits] [Gerrit] Disable cache for RepeatingGenerator tests - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Disable cache for RepeatingGenerator tests .. Disable cache for RepeatingGenerator tests This test re-issues the same API request, but expects different results each time. Bug: 71121 Change-Id: I0c9e45e03088c11864757556b6376df43595964f --- M tests/pagegenerators_tests.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index a816031..a7e2038 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -148,8 +148,6 @@ family = 'wikipedia' code = 'en' -cached = True - def test_RepeatingGenerator(self): # site.recentchanges() includes external edits (from wikidata), # so total=4 is not too high -- To view, visit https://gerrit.wikimedia.org/r/171830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c9e45e03088c11864757556b6376df43595964f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Nullzero nullzero.f...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support pre's in tables - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/171835 Change subject: Support pre's in tables .. Support pre's in tables Bug: 73100 Change-Id: I971420047026c91ed92a19a52d2fd3b6fbeac24a --- M modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/35/171835/1 diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js index d29c51b..2e548bc 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js @@ -28,7 +28,7 @@ ve.dm.MWPreformattedNode.static.name = 'mwPreformatted'; -ve.dm.MWPreformattedNode.static.suggestedParentNodeTypes = [ 'document' ]; +ve.dm.MWPreformattedNode.static.suggestedParentNodeTypes = [ 'document', 'tableCell' ]; /* Registration */ -- To view, visit https://gerrit.wikimedia.org/r/171835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I971420047026c91ed92a19a52d2fd3b6fbeac24a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] update Ruby gems for se-webdriver 2.44 - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/171836 Change subject: [BrowserTest] update Ruby gems for se-webdriver 2.44 .. [BrowserTest] update Ruby gems for se-webdriver 2.44 Change-Id: I5ba443b68d831f4a8763b2f57463b56a17c90c2c --- M Gemfile.lock 1 file changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/36/171836/1 diff --git a/Gemfile.lock b/Gemfile.lock index d83e76f..d00a8e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,20 +5,20 @@ astrolabe (1.3.0) parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) -childprocess (0.5.3) +childprocess (0.5.5) ffi (~ 1.0, = 1.0.11) -chunky_png (1.3.1) +chunky_png (1.3.3) cucumber (1.3.17) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) multi_test (= 0.1.1) -data_magic (0.19) +data_magic (0.20) faker (= 1.1.2) - yml_reader (= 0.3) + yml_reader (= 0.4) diff-lcs (1.2.5) -domain_name (0.5.21) +domain_name (0.5.22) unf (= 0.0.5, 1.0.0) faker (1.4.3) i18n (~ 0.5) @@ -27,7 +27,7 @@ faraday-cookie_jar (0.0.6) faraday (= 0.7.4) http-cookie (~ 1.0.0) -ffi (1.9.3) +ffi (1.9.6) gherkin (2.12.2) multi_json (~ 1.3) headless (1.0.2) @@ -35,10 +35,10 @@ domain_name (~ 0.5) i18n (0.6.11) json (1.8.1) -mediawiki_api (0.2.1) +mediawiki_api (0.3.0) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.3.2) +mediawiki_selenium (0.4.0) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -47,18 +47,18 @@ rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.3) +mime-types (2.4.3) multi_json (1.10.1) multi_test (0.1.1) multipart-post (2.0.0) -netrc (0.7.7) +netrc (0.8.0) page-object (1.0.2) page_navigation (= 0.9) selenium-webdriver (= 2.42.0) watir-webdriver (= 0.6.9) page_navigation (0.9) data_magic (= 0.14) -parser (2.2.0.pre.4) +parser (2.2.0.pre.7) ast (= 1.1, 3.0) slop (~ 3.4, = 3.4.5) powerpack (0.0.9) @@ -74,15 +74,15 @@ rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) rspec-mocks (2.99.2) -rubocop (0.26.1) +rubocop (0.27.0) astrolabe (~ 1.3) - parser (= 2.2.0.pre.4, 3.0) + parser (= 2.2.0.pre.6, 3.0) powerpack (~ 0.0.6) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -ruby-progressbar (1.6.0) +ruby-progressbar (1.7.0) rubyzip (1.1.6) -selenium-webdriver (2.43.0) +selenium-webdriver (2.44.0) childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) @@ -92,10 +92,10 @@ unf (0.1.4) unf_ext unf_ext (0.0.6) -watir-webdriver (0.6.10) +watir-webdriver (0.6.11) selenium-webdriver (= 2.18.0) websocket (1.2.1) -yml_reader (0.3) +yml_reader (0.4) PLATFORMS ruby -- To view, visit https://gerrit.wikimedia.org/r/171836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ba443b68d831f4a8763b2f57463b56a17c90c2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Getter for last request in Ext.data.proxy.Server - change (mediawiki...BlueSpiceFoundation)
Smuggli has submitted this change and it was merged. Change subject: Getter for last request in Ext.data.proxy.Server .. Getter for last request in Ext.data.proxy.Server Added override for Ext.data.proxy.Server to allow access to last Ext.data.request object. Change-Id: I9722a3e335d33aec4659cfaf885ee82bb349fbc0 --- M resources/bluespice.extjs/bluespice.extjs.js 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Smuggli: Verified; Looks good to me, approved diff --git a/resources/bluespice.extjs/bluespice.extjs.js b/resources/bluespice.extjs/bluespice.extjs.js index 43ac5bc..b6d6e9a 100755 --- a/resources/bluespice.extjs/bluespice.extjs.js +++ b/resources/bluespice.extjs/bluespice.extjs.js @@ -25,6 +25,17 @@ }); }); + Ext.override(Ext.data.proxy.Server, { + buildRequest: function(){ + this._lastRequest = this.callParent( arguments ); + return this._lastRequest; + }, + _lastRequest: null, + getLastRequest: function() { + return this._lastRequest; + } + }); + //Be nice to older browsers //HINT: http://stackoverflow.com/questions/2581302/globally-disable-ext-js-animations if( Ext.isIE9m ) { @@ -45,7 +56,7 @@ var obj = this.callParent(arguments); obj.flex = 0; return obj; - }, + } }); /* -- To view, visit https://gerrit.wikimedia.org/r/171252 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9722a3e335d33aec4659cfaf885ee82bb349fbc0 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Update RubyGems to get the latest version of S... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] Update RubyGems to get the latest version of Selenium .. [BrowserTest] Update RubyGems to get the latest version of Selenium Change-Id: I5ba443b68d831f4a8763b2f57463b56a17c90c2c --- M Gemfile.lock 1 file changed, 17 insertions(+), 17 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile.lock b/Gemfile.lock index d83e76f..d00a8e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,20 +5,20 @@ astrolabe (1.3.0) parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) -childprocess (0.5.3) +childprocess (0.5.5) ffi (~ 1.0, = 1.0.11) -chunky_png (1.3.1) +chunky_png (1.3.3) cucumber (1.3.17) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) multi_test (= 0.1.1) -data_magic (0.19) +data_magic (0.20) faker (= 1.1.2) - yml_reader (= 0.3) + yml_reader (= 0.4) diff-lcs (1.2.5) -domain_name (0.5.21) +domain_name (0.5.22) unf (= 0.0.5, 1.0.0) faker (1.4.3) i18n (~ 0.5) @@ -27,7 +27,7 @@ faraday-cookie_jar (0.0.6) faraday (= 0.7.4) http-cookie (~ 1.0.0) -ffi (1.9.3) +ffi (1.9.6) gherkin (2.12.2) multi_json (~ 1.3) headless (1.0.2) @@ -35,10 +35,10 @@ domain_name (~ 0.5) i18n (0.6.11) json (1.8.1) -mediawiki_api (0.2.1) +mediawiki_api (0.3.0) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.3.2) +mediawiki_selenium (0.4.0) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -47,18 +47,18 @@ rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.3) +mime-types (2.4.3) multi_json (1.10.1) multi_test (0.1.1) multipart-post (2.0.0) -netrc (0.7.7) +netrc (0.8.0) page-object (1.0.2) page_navigation (= 0.9) selenium-webdriver (= 2.42.0) watir-webdriver (= 0.6.9) page_navigation (0.9) data_magic (= 0.14) -parser (2.2.0.pre.4) +parser (2.2.0.pre.7) ast (= 1.1, 3.0) slop (~ 3.4, = 3.4.5) powerpack (0.0.9) @@ -74,15 +74,15 @@ rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) rspec-mocks (2.99.2) -rubocop (0.26.1) +rubocop (0.27.0) astrolabe (~ 1.3) - parser (= 2.2.0.pre.4, 3.0) + parser (= 2.2.0.pre.6, 3.0) powerpack (~ 0.0.6) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -ruby-progressbar (1.6.0) +ruby-progressbar (1.7.0) rubyzip (1.1.6) -selenium-webdriver (2.43.0) +selenium-webdriver (2.44.0) childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) @@ -92,10 +92,10 @@ unf (0.1.4) unf_ext unf_ext (0.0.6) -watir-webdriver (0.6.10) +watir-webdriver (0.6.11) selenium-webdriver (= 2.18.0) websocket (1.2.1) -yml_reader (0.3) +yml_reader (0.4) PLATFORMS ruby -- To view, visit https://gerrit.wikimedia.org/r/171836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ba443b68d831f4a8763b2f57463b56a17c90c2c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 09a518d..d51e171 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 09a518d..d51e171 .. Syncronize VisualEditor: 09a518d..d51e171 Change-Id: I3bda359524e701be665988865a185ca744cbf7e9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 09a518d..d51e171 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 09a518db711279e0a915c41c90607d3932ee00d6 +Subproject commit d51e17126899a536c09257063d035848aaddd800 -- To view, visit https://gerrit.wikimedia.org/r/171837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bda359524e701be665988865a185ca744cbf7e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 09a518d..d51e171 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/171837 Change subject: Syncronize VisualEditor: 09a518d..d51e171 .. Syncronize VisualEditor: 09a518d..d51e171 Change-Id: I3bda359524e701be665988865a185ca744cbf7e9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/37/171837/1 diff --git a/VisualEditor b/VisualEditor index 09a518d..d51e171 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 09a518db711279e0a915c41c90607d3932ee00d6 +Subproject commit d51e17126899a536c09257063d035848aaddd800 -- To view, visit https://gerrit.wikimedia.org/r/171837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3bda359524e701be665988865a185ca744cbf7e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: update Ruby gems - change (mediawiki...Math)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/171838 Change subject: QA: update Ruby gems .. QA: update Ruby gems Change-Id: Iea3356aef3ea4267a513031a2e6218b7cd3eddff --- M Gemfile.lock 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/38/171838/1 diff --git a/Gemfile.lock b/Gemfile.lock index 6fbad9f..fbddb2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,19 +5,19 @@ astrolabe (1.3.0) parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) -childprocess (0.5.3) +childprocess (0.5.5) ffi (~ 1.0, = 1.0.11) -cucumber (1.3.16) +cucumber (1.3.17) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) multi_test (= 0.1.1) -data_magic (0.19) +data_magic (0.20) faker (= 1.1.2) - yml_reader (= 0.3) + yml_reader (= 0.4) diff-lcs (1.2.5) -domain_name (0.5.20) +domain_name (0.5.22) unf (= 0.0.5, 1.0.0) faker (1.4.3) i18n (~ 0.5) @@ -26,7 +26,7 @@ faraday-cookie_jar (0.0.6) faraday (= 0.7.4) http-cookie (~ 1.0.0) -ffi (1.9.3) +ffi (1.9.6) gherkin (2.12.2) multi_json (~ 1.3) headless (1.0.2) @@ -34,10 +34,10 @@ domain_name (~ 0.5) i18n (0.6.11) json (1.8.1) -mediawiki_api (0.2.1) +mediawiki_api (0.3.0) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.3.2) +mediawiki_selenium (0.4.0) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -46,18 +46,18 @@ rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.3) +mime-types (2.4.3) multi_json (1.10.1) multi_test (0.1.1) multipart-post (2.0.0) -netrc (0.7.7) +netrc (0.8.0) page-object (1.0.2) page_navigation (= 0.9) selenium-webdriver (= 2.42.0) watir-webdriver (= 0.6.9) page_navigation (0.9) data_magic (= 0.14) -parser (2.2.0.pre.4) +parser (2.2.0.pre.7) ast (= 1.1, 3.0) slop (~ 3.4, = 3.4.5) powerpack (0.0.9) @@ -67,28 +67,28 @@ netrc (~ 0.7) rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) -rubocop (0.26.1) +rubocop (0.27.0) astrolabe (~ 1.3) - parser (= 2.2.0.pre.4, 3.0) + parser (= 2.2.0.pre.6, 3.0) powerpack (~ 0.0.6) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -ruby-progressbar (1.6.0) +ruby-progressbar (1.7.0) rubyzip (1.1.6) -selenium-webdriver (2.42.0) - childprocess (= 0.5.0) +selenium-webdriver (2.44.0) + childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) - websocket (~ 1.0.4) + websocket (~ 1.0) slop (3.6.0) syntax (1.2.0) unf (0.1.4) unf_ext unf_ext (0.0.6) -watir-webdriver (0.6.10) +watir-webdriver (0.6.11) selenium-webdriver (= 2.18.0) -websocket (1.0.7) -yml_reader (0.3) +websocket (1.2.1) +yml_reader (0.4) PLATFORMS ruby -- To view, visit https://gerrit.wikimedia.org/r/171838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea3356aef3ea4267a513031a2e6218b7cd3eddff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: update Ruby gems - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged. Change subject: QA: update Ruby gems .. QA: update Ruby gems Change-Id: Iea3356aef3ea4267a513031a2e6218b7cd3eddff --- M Gemfile.lock 1 file changed, 20 insertions(+), 20 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile.lock b/Gemfile.lock index 6fbad9f..fbddb2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,19 +5,19 @@ astrolabe (1.3.0) parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) -childprocess (0.5.3) +childprocess (0.5.5) ffi (~ 1.0, = 1.0.11) -cucumber (1.3.16) +cucumber (1.3.17) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) multi_test (= 0.1.1) -data_magic (0.19) +data_magic (0.20) faker (= 1.1.2) - yml_reader (= 0.3) + yml_reader (= 0.4) diff-lcs (1.2.5) -domain_name (0.5.20) +domain_name (0.5.22) unf (= 0.0.5, 1.0.0) faker (1.4.3) i18n (~ 0.5) @@ -26,7 +26,7 @@ faraday-cookie_jar (0.0.6) faraday (= 0.7.4) http-cookie (~ 1.0.0) -ffi (1.9.3) +ffi (1.9.6) gherkin (2.12.2) multi_json (~ 1.3) headless (1.0.2) @@ -34,10 +34,10 @@ domain_name (~ 0.5) i18n (0.6.11) json (1.8.1) -mediawiki_api (0.2.1) +mediawiki_api (0.3.0) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.3.2) +mediawiki_selenium (0.4.0) cucumber (~ 1.3, = 1.3.10) headless (~ 1.0, = 1.0.1) json (~ 1.8, = 1.8.1) @@ -46,18 +46,18 @@ rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.3) +mime-types (2.4.3) multi_json (1.10.1) multi_test (0.1.1) multipart-post (2.0.0) -netrc (0.7.7) +netrc (0.8.0) page-object (1.0.2) page_navigation (= 0.9) selenium-webdriver (= 2.42.0) watir-webdriver (= 0.6.9) page_navigation (0.9) data_magic (= 0.14) -parser (2.2.0.pre.4) +parser (2.2.0.pre.7) ast (= 1.1, 3.0) slop (~ 3.4, = 3.4.5) powerpack (0.0.9) @@ -67,28 +67,28 @@ netrc (~ 0.7) rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) -rubocop (0.26.1) +rubocop (0.27.0) astrolabe (~ 1.3) - parser (= 2.2.0.pre.4, 3.0) + parser (= 2.2.0.pre.6, 3.0) powerpack (~ 0.0.6) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -ruby-progressbar (1.6.0) +ruby-progressbar (1.7.0) rubyzip (1.1.6) -selenium-webdriver (2.42.0) - childprocess (= 0.5.0) +selenium-webdriver (2.44.0) + childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) - websocket (~ 1.0.4) + websocket (~ 1.0) slop (3.6.0) syntax (1.2.0) unf (0.1.4) unf_ext unf_ext (0.0.6) -watir-webdriver (0.6.10) +watir-webdriver (0.6.11) selenium-webdriver (= 2.18.0) -websocket (1.0.7) -yml_reader (0.3) +websocket (1.2.1) +yml_reader (0.4) PLATFORMS ruby -- To view, visit https://gerrit.wikimedia.org/r/171838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea3356aef3ea4267a513031a2e6218b7cd3eddff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: TheDJ hartman.w...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish/text: really retry on zend requests failing on HHVM - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/171839 Change subject: varnish/text: really retry on zend requests failing on HHVM .. varnish/text: really retry on zend requests failing on HHVM Change-Id: I5150858c6f2b93a0bd24c840fdaebe7af74d3cc8 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M templates/varnish/text-backend.inc.vcl.erb 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/171839/1 diff --git a/templates/varnish/text-backend.inc.vcl.erb b/templates/varnish/text-backend.inc.vcl.erb index d40865c..d0d0bac 100644 --- a/templates/varnish/text-backend.inc.vcl.erb +++ b/templates/varnish/text-backend.inc.vcl.erb @@ -93,6 +93,10 @@ } % if vcl_config.fetch(cluster_tier, 1) == 1 -% + /* If a request to HHVM has got a 503 response, retry it, on Zend this time */ + if (req.http.X-Use-HHVM == 1 req.restarts == 0 beresp.status == 503 ){ + return(restart); + } call hhvm_add_vary; % end -% -- To view, visit https://gerrit.wikimedia.org/r/171839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5150858c6f2b93a0bd24c840fdaebe7af74d3cc8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WTS: Minor tweaks to error messages in serializer - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/171840 Change subject: WTS: Minor tweaks to error messages in serializer .. WTS: Minor tweaks to error messages in serializer Change-Id: I892dc919115f3af4c362a13e169289d35c7b9694 --- M lib/mediawiki.WikitextSerializer.js 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/40/171840/1 diff --git a/lib/mediawiki.WikitextSerializer.js b/lib/mediawiki.WikitextSerializer.js index 361f8e8..a9a1e46 100644 --- a/lib/mediawiki.WikitextSerializer.js +++ b/lib/mediawiki.WikitextSerializer.js @@ -610,10 +610,10 @@ src = state.serializer._buildTemplateWT(node, state, dataMW.parts ); } else if (dp.src) { - self.env.log(error, No data-mw for + node.outerHTML); + self.env.log(error, data-mw missing in: + node.outerHTML); src = dp.src; } else { - throw new Error(Can't serialize transclusion without parts or src!); + throw new Error(Cannot serialize transclusion without data-mw.parts or data-parsoid.src.); } } else if (/(?:^|\s)mw:Param(?=$|\s)/.test(typeOf)) { src = dp.src; @@ -622,10 +622,10 @@ if (dataMW.name) { src = state.serializer._buildExtensionWT(state, node, dataMW); } else if (dp.src) { - self.env.log(error, No data-mw for + node.outerHTML ); + self.env.log(error, data-mw missing in: + node.outerHTML ); src = dp.src; } else { - throw new Error(Can't serialize extension without name or src!); + throw new Error(Cannot serialize extension without data-mw.name or data-parsoid.src.); } } else { throw new Error(Should never reach here); -- To view, visit https://gerrit.wikimedia.org/r/171840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I892dc919115f3af4c362a13e169289d35c7b9694 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use wb.datamodel.MultiTerm in aliasesview/AliasesChanger - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/171841 Change subject: Use wb.datamodel.MultiTerm in aliasesview/AliasesChanger .. Use wb.datamodel.MultiTerm in aliasesview/AliasesChanger Change-Id: I9d5ca6941d25f300cf8834c5a548e791247f0506 --- M lib/resources/entityChangers/AliasesChanger.js M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js M lib/resources/jquery.wikibase/resources.php M lib/tests/qunit/entityChangers/AliasesChanger.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js M lib/tests/qunit/jquery.wikibase/resources.php 13 files changed, 139 insertions(+), 187 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/41/171841/1 diff --git a/lib/resources/entityChangers/AliasesChanger.js b/lib/resources/entityChangers/AliasesChanger.js index ac32909..40a5550 100644 --- a/lib/resources/entityChangers/AliasesChanger.js +++ b/lib/resources/entityChangers/AliasesChanger.js @@ -38,32 +38,29 @@ _api: null, /** -* @param {string[]} aliases -* @param {string} language +* @param {wikibase.datamodel.MultiTerm} aliases * @return {jQuery.Promise} * No resolved parameters. * Rejected parameters: * - {wikibase.RepoApiError} */ - setAliases: function( aliases, language ) { + setAliases: function( aliases ) { var deferred = $.Deferred(), self = this, + language = aliases.getLanguageCode(), initialAliases = this._getInitialAliases( language ); this._api.setAliases( this._entity.getId(), this._revisionStore.getAliasesRevision(), - this._getNewAliases( aliases, initialAliases ), - this._getRemovedAliases( aliases, initialAliases ), + this._getNewAliasesTexts( aliases, initialAliases ), + this._getRemovedAliasesTexts( aliases, initialAliases ), language ) .done( function( response ) { self._revisionStore.setAliasesRevision( response.entity.lastrevid ); - self._entity.getFingerprint().setAliases( - language, - new wb.datamodel.MultiTerm( language, aliases ) - ); + self._entity.getFingerprint().setAliases( language, aliases ); deferred.resolve(); } ) @@ -76,24 +73,26 @@ /** * @param {string} language -* @return {string[]} +* @return {wikibase.datamodel.MultiTerm} */ _getInitialAliases: function( language ) { - var aliases = this._entity.getFingerprint().getAliasesFor( language ); - return aliases ? aliases.getTexts() : []; + return this._entity.getFingerprint().getAliasesFor( language ) + || new wb.datamodel.MultiTerm( language, [] ); }, /** -* @param {string[]} currentAliases -* @param {string[]} initialAliases +* @param {wikibase.datamodel.MultiTerm} currentAliases +* @param {wikibase.datamodel.MultiTerm} initialAliases * @return {string[]} */ - _getNewAliases: function( currentAliases, initialAliases ) { - var newAliases = []; + _getNewAliasesTexts: function( currentAliases, initialAliases ) { + var currentTexts = currentAliases.getTexts(), + initialTexts = initialAliases.getTexts(), + newAliases = []; - for( var i = 0; i currentAliases.length; i++ ) { - if( $.inArray( currentAliases[i], initialAliases ) === -1 ) { - newAliases.push( currentAliases[i] ); + for( var i = 0; i currentTexts.length; i++ ) { + if( $.inArray( currentTexts[i], initialTexts ) === -1 ) { + newAliases.push( currentTexts[i] ); } } @@ -101,16 +100,18 @@ }, /** -* @param {string[]}
[MediaWiki-commits] [Gerrit] Make fileChangedOk a little more sane - change (mediawiki...UploadWizard)
MarkTraceur has uploaded a new change for review. https://gerrit.wikimedia.org/r/171842 Change subject: Make fileChangedOk a little more sane .. Make fileChangedOk a little more sane It no longer uses this.upload, which is a nice start... Change-Id: I0cc3754f27f867a618af33bdcefe780d35c1ed89 --- M resources/mw.UploadWizard.js M resources/mw.UploadWizardUpload.js M resources/mw.UploadWizardUploadInterface.js 3 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/42/171842/1 diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js index b148cef..611e690 100644 --- a/resources/mw.UploadWizard.js +++ b/resources/mw.UploadWizard.js @@ -415,7 +415,7 @@ upload.checkFile( upload.ui.getFilename(), files, - function () { upload.ui.fileChangedOk(); }, + function () { upload.fileChangedOk(); }, function ( code, info ) { upload.ui.fileChangedError( code, info ); } ); diff --git a/resources/mw.UploadWizardUpload.js b/resources/mw.UploadWizardUpload.js index eb6d756..c518c16 100644 --- a/resources/mw.UploadWizardUpload.js +++ b/resources/mw.UploadWizardUpload.js @@ -1151,5 +1151,12 @@ this.details.attach(); }; + /** +* Notification that the file input has changed and it's fine...set info. +*/ + UWUP.fileChangedOk = function () { + this.ui.fileChangedOk( this.imageinfo, this.file, this.fromURL ); + }; + mw.UploadWizardUpload = UploadWizardUpload; } )( mediaWiki, jQuery, OO ); diff --git a/resources/mw.UploadWizardUploadInterface.js b/resources/mw.UploadWizardUploadInterface.js index b502765..4323b6b 100644 --- a/resources/mw.UploadWizardUploadInterface.js +++ b/resources/mw.UploadWizardUploadInterface.js @@ -335,20 +335,23 @@ * Run this when the value of the file input has changed and we know it's acceptable -- this * will update interface to show as much info as possible, including preview. * n.b. in older browsers we only will know the filename +* @param {Object} imageinfo +* @param {File} file +* @param {boolean} fromURL */ - UIP.fileChangedOk = function () { + UIP.fileChangedOk = function ( imageinfo, file, fromURL ) { var ui = this, statusItems = []; this.updateFilename(); // set the status string - e.g. 256 Kb, 100 x 200 - if ( this.upload.imageinfo this.upload.imageinfo.width this.upload.imageinfo.height ) { - statusItems.push( this.upload.imageinfo.width + '\u00d7' + this.upload.imageinfo.height ); + if ( imageinfo imageinfo.width imageinfo.height ) { + statusItems.push( imageinfo.width + '\u00d7' + imageinfo.height ); } - if ( this.upload.file !this.upload.fromURL ) { - statusItems.push( mw.units.bytes( this.upload.file.size ) ); + if ( file !fromURL ) { + statusItems.push( mw.units.bytes( file.size ) ); } this.clearStatus(); -- To view, visit https://gerrit.wikimedia.org/r/171842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cc3754f27f867a618af33bdcefe780d35c1ed89 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] push to origin master explicitly - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/171843 Change subject: push to origin master explicitly .. push to origin master explicitly Git has started to throw warnings when the remote and branch are implicit. Change-Id: I8b38c8db4010bed265674115980d340318e59a88 --- M bin/repocommit 1 file changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/43/171843/1 diff --git a/bin/repocommit b/bin/repocommit index 08cda9f..9ee01d4 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -15,12 +15,21 @@ COMMITMSG=Localisation updates from https://translatewiki.net.; + gitCommit() { local dir=$1 cd $dir git add . git commit -m $COMMITMSG - git push + +# Check if $2 is set. If not, push to origin master + if [[ -z $2 ]] + then + git push origin master + else + git push origin $2 +fi + cd .. } @@ -45,7 +54,6 @@ GITPROJECTS=\ eol \ europeana \ -etherpad-lite \ freecol \ fuel \ huggle \ @@ -54,12 +62,10 @@ kiwix \ mantis \ mathjax \ -mifos \ nfcring-control \ osm \ vicuna \ waymarked-trails-site \ -wikia \ WikipediaMobile \ WikipediaMobileJ2ME \ WikisourceMobile \ @@ -104,6 +110,10 @@ done svn commit --message $COMMITMSG cd .. + +elif [ $PROJECT = etherpad-lite ] +then +gitCommit $PROJECT develop elif [ $PROJECT = fudforum ] then @@ -176,6 +186,10 @@ mergeL10n-bot +elif [ $PROJECT = mifos ] +then +gitCommit $PROJECT develop + elif [ $PROJECT = nocc ] then cd $PROJECT @@ -200,6 +214,10 @@ svn commit --message $COMMITMSG cd .. +elif [ $PROJECT = wikiblame ] +then +gitCommit $PROJECT dev + else echo `basename $0`: Unknown project exit 1 -- To view, visit https://gerrit.wikimedia.org/r/171843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b38c8db4010bed265674115980d340318e59a88 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert admin: revoke temporarily Yuvi's root - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/171844 Change subject: Revert admin: revoke temporarily Yuvi's root .. Revert admin: revoke temporarily Yuvi's root This reverts commit d10ffd0a9f7a9b06f26acf1912df73321fe948cf. Change-Id: I52681f5ec5401964e4493ee5616471b2eb5c236a --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/44/171844/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index a531437..e0b7751 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -9,7 +9,7 @@ ops: gid: 700 description: include everywhere ops folks -members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, +members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, yuvipanda, dzahn, akosiaris, springle, mark, gage, ariel, cmjohnson, otto, robh, tstarling, ori] privs: ['ALL = (ALL) NOPASSWD: ALL'] parsoid-roots: @@ -224,7 +224,7 @@ labmon-roots: gid: 734 description: Full root access to labmon nodes -members: [] +members: [yuvipanda] privs: ['ALL = NOPASSWD: ALL'] citoid-roots: gid: 735 -- To view, visit https://gerrit.wikimedia.org/r/171844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52681f5ec5401964e4493ee5616471b2eb5c236a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert admin: revoke temporarily Yuvi's root - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Revert admin: revoke temporarily Yuvi's root .. Revert admin: revoke temporarily Yuvi's root This reverts commit d10ffd0a9f7a9b06f26acf1912df73321fe948cf. Change-Id: I52681f5ec5401964e4493ee5616471b2eb5c236a --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index a109f2d..7b031d4 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -9,7 +9,7 @@ ops: gid: 700 description: include everywhere ops folks -members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, +members: [filippo, jgreen, bblack, andrew, faidon, rush, marc, oblivian, laner, yuvipanda, dzahn, akosiaris, springle, mark, gage, ariel, cmjohnson, otto, robh, tstarling, ori] privs: ['ALL = (ALL) NOPASSWD: ALL'] parsoid-roots: @@ -228,7 +228,7 @@ labmon-roots: gid: 734 description: Full root access to labmon nodes -members: [] +members: [yuvipanda] privs: ['ALL = NOPASSWD: ALL'] citoid-roots: gid: 735 -- To view, visit https://gerrit.wikimedia.org/r/171844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52681f5ec5401964e4493ee5616471b2eb5c236a Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove usage of deprecated Entity methods - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/171845 Change subject: Remove usage of deprecated Entity methods .. Remove usage of deprecated Entity methods Two issues remain in this code: * Code only works with items and properties (this is now explicit, while before it would just break for entities with statements). This is the issue described in https://lists.wikimedia.org/pipermail/wikidata-tech/2014-June/000489.html And can be fixed as follows https://lists.wikimedia.org/pipermail/wikidata-tech/2014-August/000546.html * The deprecated Claims class is still used. This forces transformation from StatementList to Claims to StatementList, which is a waste of resources. Change-Id: I37843beca7de1a629c3da392644a8abe21866473 --- M repo/includes/ChangeOp/ChangeOpClaimRemove.php 1 file changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/171845/1 diff --git a/repo/includes/ChangeOp/ChangeOpClaimRemove.php b/repo/includes/ChangeOp/ChangeOpClaimRemove.php index 6084a14..ddc2d53 100644 --- a/repo/includes/ChangeOp/ChangeOpClaimRemove.php +++ b/repo/includes/ChangeOp/ChangeOpClaimRemove.php @@ -6,7 +6,11 @@ use ValueValidators\Result; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; +use Wikibase\DataModel\Entity\Item; +use Wikibase\DataModel\Entity\Property; +use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\Snak; +use Wikibase\DataModel\Statement\StatementList; use Wikibase\Summary; /** @@ -53,11 +57,14 @@ * @see ChangeOp::apply() */ public function apply( Entity $entity, Summary $summary = null ) { - $claims = new Claims( $entity-getClaims() ); - - $this-removeClaim( $claims, $summary ); - - $entity-setClaims( $claims ); + if ( $entity instanceof Item || $entity instanceof Property ) { + $claims = new Claims( $entity-getStatements() ); + $this-removeClaim( $claims, $summary ); + $entity-setStatements( new StatementList( $claims ) ); + } + else { + throw new InvalidArgumentException( 'This code only works with items and properties' ); + } return true; } -- To view, visit https://gerrit.wikimedia.org/r/171845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37843beca7de1a629c3da392644a8abe21866473 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add batch lookup for user groups on Special:ListUsers - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/171846 Change subject: Add batch lookup for user groups on Special:ListUsers .. Add batch lookup for user groups on Special:ListUsers At the moment for each user on the list a new user object is created and than the getGroups method is called, which fully init the user object, which is done in 3 queries (user table, user_properties and user_groups). Removed the user object with one query for all the userids and cache the result. Also added the group page to the LinkBatch, because now the necessary pages can be determined easily. Change-Id: I4a945f83ad28edf5cc040139943cf743cb3d133c --- M includes/specials/SpecialListusers.php 1 file changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/46/171846/1 diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php index dad9074..37e60c8 100644 --- a/includes/specials/SpecialListusers.php +++ b/includes/specials/SpecialListusers.php @@ -176,7 +176,7 @@ $lang = $this-getLanguage(); $groups = ''; - $groups_list = self::getGroups( $row-user_id ); + $groups_list = self::getGroups( $row-user_id, $this-userGroupCache ); if ( !$this-including count( $groups_list ) 0 ) { $list = array(); @@ -218,11 +218,38 @@ function doBatchLookups() { $batch = new LinkBatch(); + $userIds = array(); # Give some pointers to make user links foreach ( $this-mResult as $row ) { $batch-add( NS_USER, $row-user_name ); $batch-add( NS_USER_TALK, $row-user_name ); + $userIds[] = $row-user_id; } + + // Lookup groups for all the users + $dbr = wfGetDB( DB_SLAVE ); + $groupRes = $dbr-select( + 'user_groups', + array( 'ug_user', 'ug_group' ), + array( 'ug_user' = $userIds ), + __METHOD__ + ); + $cache = array(); + $groups = array(); + foreach ( $groupRes as $row ) { + $cache[$row-ug_user][] = $row-ug_group; + $groups[$row-ug_group] = true; + } + $this-userGroupCache = $cache; + + // Add page of groups to link batch + foreach( $groups as $group = $unused ) { + $groupPage = User::getGroupPage( $group ); + if ( $groupPage ) { + $batch-addObj( $groupPage ); + } + } + $batch-execute(); $this-mResult-rewind(); } @@ -331,11 +358,17 @@ * Get a list of groups the specified user belongs to * * @param int $uid User id +* @param array|null $cache * @return array */ - protected static function getGroups( $uid ) { - $user = User::newFromId( $uid ); - $groups = array_diff( $user-getEffectiveGroups(), User::getImplicitGroups() ); + protected static function getGroups( $uid, $cache = null ) { + if ( $cache === null ) { + $user = User::newFromId( $uid ); + $effectiveGroups = $user-getEffectiveGroups(); + } else { + $effectiveGroups = isset( $cache[$uid] ) ? $cache[$uid] : array(); + } + $groups = array_diff( $effectiveGroups, User::getImplicitGroups() ); return $groups; } -- To view, visit https://gerrit.wikimedia.org/r/171846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a945f83ad28edf5cc040139943cf743cb3d133c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updates for Blockly repo changes - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/171847 Change subject: Updates for Blockly repo changes .. Updates for Blockly repo changes Per Niel Fraser: We underwent an unplanned code repo migration for engineering reasons that broke lots of stuff. But we are back, and the move gave us the opportunity to make a bunch of improvements. As part of maturing, Blockly has split into two projects: * https://github.com/google/blockly This is the core library that is being used by hundreds of organizations to build Blockly-based applications. * https://github.com/google/blockly-games This is the suite of educational applications for teaching programming to children. Change-Id: Ice33c6041042b0b32f6c4668f57f9e386e5dd2e2 --- M REPOCONF M REPOCONF.siebrand M bin/repocommit M bin/repocreate M bin/repoupdate M groups/Blockly/Blockly.yaml 6 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/47/171847/1 diff --git a/REPOCONF b/REPOCONF index e294525..c258226 100644 --- a/REPOCONF +++ b/REPOCONF @@ -6,7 +6,8 @@ REPO_MWEXTGIT=https://gerrit.wikimedia.org/r/p/mediawiki/extensions REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins -REPO_BLOCKLY=http://blockly.googlecode.com/svn/trunk/ +REPO_BLOCKLY=git://github.com/google/blockly.git +REPO_BLOCKLYGAMES=git://github.com/google/blockly-games.git REPO_EOL=git://github.com/EOL/eol.git REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git REPO_ETHERPADLITE_BRANCH=develop diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand index 97a4e94..e01333f 100644 --- a/REPOCONF.siebrand +++ b/REPOCONF.siebrand @@ -6,7 +6,8 @@ REPO_MWEXTGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/extensions REPO_MWSKINGIT=ssh://l10n-...@gerrit.wikimedia.org:29418/mediawiki/skins -REPO_BLOCKLY=https://blockly.googlecode.com/svn/trunk/ +REPO_BLOCKLY=g...@github.com:google/blockly.git +REPO_BLOCKLYGAMES=g...@github.com:google/blockly-games.git REPO_EOL=g...@github.com:EOL/eol.git REPO_ETHERPADLITE=g...@github.com:ether/etherpad-lite.git REPO_ETHERPADLITE_BRANCH=develop diff --git a/bin/repocommit b/bin/repocommit index 9ee01d4..42b56f1 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -52,6 +52,7 @@ # TODO: Move to separate file? GITPROJECTS=\ +blockly \ eol \ europeana \ freecol \ @@ -76,6 +77,11 @@ then gitCommit $PROJECT + if [ $PROJECT = blockly ] + then + gitCommit blockly-games + fi + if [ $PROJECT = osm ] then gitCommit potlatch2 @@ -99,17 +105,6 @@ exit 0 fi done - -if [ $PROJECT = blockly ] -then - cd $PROJECT - svn add -q --force * - for i in `find . -name *.json` - do - svn propset -q svn:mime-type text/plain $i - done - svn commit --message $COMMITMSG - cd .. elif [ $PROJECT = etherpad-lite ] then diff --git a/bin/repocreate b/bin/repocreate index a7461f6..2fdb4c7 100755 --- a/bin/repocreate +++ b/bin/repocreate @@ -34,7 +34,9 @@ if [ $PROJECT = blockly ] then checkVar 'REPO_BLOCKLY' - svn checkout $REPO_BLOCKLY $PROJECT + git clone $REPO_BLOCKLY $PROJECT + checkVar 'REPO_BLOCKLYGAMES' + git clone $REPO_BLOCKLYGAMES blockly-games elif [ $PROJECT = eol ] then diff --git a/bin/repoupdate b/bin/repoupdate index 45f7487..3405000 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -103,7 +103,8 @@ if [ $PROJECT = blockly ] then - svn up -q $PROJECT + gitupdate $PROJECT + gitupdate blockly-games elif [ $PROJECT = etherpad-lite ] then diff --git a/groups/Blockly/Blockly.yaml b/groups/Blockly/Blockly.yaml index 5e6d0a1..e909d01 100644 --- a/groups/Blockly/Blockly.yaml +++ b/groups/Blockly/Blockly.yaml @@ -23,14 +23,6 @@ --- BASIC: - id: out-blockly-apps - label: Blockly Apps - -FILES: - sourcePattern: %GROUPROOT%/blockly/apps/json/%CODE%.json - -BASIC: id: out-blockly-core label: Blockly Core @@ -102,3 +94,11 @@ - VARIABLES_SET_HELPURL ignored: - COLOUR_RANDOM_HELPURL + +--- +BASIC: + id: out-blockly-games + label: Blockly Games + +FILES: + sourcePattern: %GROUPROOT%/blockly-games/json/%CODE%.json -- To view, visit https://gerrit.wikimedia.org/r/171847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice33c6041042b0b32f6c4668f57f9e386e5dd2e2 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added suggestions placeholder to $.wikibase.entitysearch - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Added suggestions placeholder to $.wikibase.entitysearch .. Added suggestions placeholder to $.wikibase.entitysearch Change-Id: I340de9cc0556def5ab99b718084fe5395126ca31 --- M composer.json M repo/resources/Resources.php A repo/resources/jquery.wikibase/jquery.wikibase.entitysearch.js R repo/resources/jquery.wikibase/themes/default/jquery.wikibase.entitysearch.css M repo/resources/wikibase.ui.entitysearch.js 5 files changed, 156 insertions(+), 42 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 1f70d8d..19562d0 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ data-values/data-types: ~0.4.0, data-values/serialization: ~1.0, data-values/javascript: ~0.6.0, - data-values/value-view: ~0.8.0, + data-values/value-view: ~0.8.1, wikibase/data-model: ~2.0, wikibase/data-model-javascript: ~1.0, diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index d93cba0..4c950c8 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -24,6 +24,21 @@ ); $modules = array( + + 'jquery.wikibase.entitysearch' = $moduleTemplate + array( + 'scripts' = array( + 'jquery.wikibase/jquery.wikibase.entitysearch.js', + ), + 'styles' = array( + 'jquery.wikibase/themes/default/jquery.wikibase.entitysearch.css', + ), + 'dependencies' = array( + 'jquery.event.special.eachchange', + 'jquery.ui.ooMenu', + 'jquery.wikibase.entityselector', + ), + ), + 'wikibase.ui.entityViewInit' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ui.entityViewInit.js' // should probably be adjusted for more modularity @@ -82,11 +97,11 @@ 'scripts' = array( 'wikibase.ui.entitysearch.js', ), - 'styles' = array( - 'themes/default/wikibase.ui.entitysearch.css', - ), 'dependencies' = array( 'jquery.event.special.eachchange', + 'jquery.spinner', + 'jquery.ui.ooMenu', + 'jquery.wikibase.entitysearch', 'jquery.wikibase.entityselector', ), 'messages' = array( diff --git a/repo/resources/jquery.wikibase/jquery.wikibase.entitysearch.js b/repo/resources/jquery.wikibase/jquery.wikibase.entitysearch.js new file mode 100644 index 000..c18c727 --- /dev/null +++ b/repo/resources/jquery.wikibase/jquery.wikibase.entitysearch.js @@ -0,0 +1,130 @@ +/** + * @license GNU GPL v2+ + * @author H. Snater mediaw...@snater.com + */ +( function( $ ) { + 'use strict'; + + var PARENT = $.wikibase.entityselector; + +/** + * Entity selector widget enhanced to be used as global search element. + * @extends jQuery.wikibase.entityselector + * + * @option {jQuery.ui.ooMenu.CustomItem} [suggestionsPlaceholder] + * Suggestions list item to be displayed while suggestions are retrieved. + */ +$.widget( 'wikibase.entitysearch', PARENT, { + + /** +* @see jQuery.wikibase.entityselector.options +*/ + options: { + suggestionsPlaceholder: null + }, + + /** +* @see jQuery.wikibase.entityselector._create +*/ + _create: function() { + var self = this; + + PARENT.prototype._create.call( this ); + + this.element + .on( 'eachchange.' + this.widgetName, function() { + var menu = self.options.menu; + if( + self.options.suggestionsPlaceholder +( !menu.option( 'items' ).length || !menu.element.is( ':visible' ) ) + ) { + self.options.suggestionsPlaceholder.setVisibility( true ); + self._updateMenu( [] ); + } + } ); + }, + + /** +*@see jQuery.wikibase.entityselector._createMenuItemFromSuggestion +*/ + _createMenuItemFromSuggestion: function( suggestion ) { + var $label = this._createLabelFromSuggestion(
[MediaWiki-commits] [Gerrit] logstash: Use conditional instead of deprecated grep filter - change (operations/puppet)
Gage has submitted this change and it was merged. Change subject: logstash: Use conditional instead of deprecated grep filter .. logstash: Use conditional instead of deprecated grep filter From startup logging: The 'grep' plugin is no longer necessary now that you can do if/elsif/else in logstash configs. This plugin will be removed in the future. If you need to drop events, please use the drop filter. If you need to take action based on a match, use an 'if' block and the mutate filter. See the following URL for details on how to use if/elsif/else in your logstash configs: http://logstash.net/docs/1.4.2-modified/configuration; Replace the deprecated grep filter with a conditional regex match and a drop filter. Change-Id: I20c08a6c6c4c7ea391b04377c78badf3551893d7 --- M files/logstash/filter-gelf.conf 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Gage: Looks good to me, approved jenkins-bot: Verified diff --git a/files/logstash/filter-gelf.conf b/files/logstash/filter-gelf.conf index 0dcf485..31e3215 100644 --- a/files/logstash/filter-gelf.conf +++ b/files/logstash/filter-gelf.conf @@ -18,10 +18,10 @@ if [type] == Hadoop { # Drop anything at level INFO to save space - grep { -match = { message = INFO } -remove_tag = [ es ] + if [message] =~ INFO { +drop {} } + mutate { replace = [ channel, %{SourceSimpleClassName} ] } -- To view, visit https://gerrit.wikimedia.org/r/171790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20c08a6c6c4c7ea391b04377c78badf3551893d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Gage jger...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unneeded fields from query in Special:ListUsers - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/171848 Change subject: Remove unneeded fields from query in Special:ListUsers .. Remove unneeded fields from query in Special:ListUsers Since r72864 the fields numgroup and singlegroups are unused. Change-Id: Ifc2f6c77ec54a9c9e72c4a7a4b8a9c8f9f90013a --- M includes/specials/SpecialListusers.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/48/171848/1 diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php index dad9074..de37395 100644 --- a/includes/specials/SpecialListusers.php +++ b/includes/specials/SpecialListusers.php @@ -132,8 +132,6 @@ 'user_name' = $this-creationSort ? 'MAX(user_name)' : 'user_name', 'user_id' = $this-creationSort ? 'user_id' : 'MAX(user_id)', 'edits' = 'MAX(user_editcount)', - 'numgroups' = 'COUNT(ug_group)', - 'singlegroup' = 'MAX(ug_group)', // the usergroup if there is only one 'creation' = 'MIN(user_registration)', 'ipb_deleted' = 'MAX(ipb_deleted)' // block/hide status ), -- To view, visit https://gerrit.wikimedia.org/r/171848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc2f6c77ec54a9c9e72c4a7a4b8a9c8f9f90013a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eventlogging: fix lint errors - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: eventlogging: fix lint errors .. eventlogging: fix lint errors fixing some operations-puppet-puppetlint-lenient FAILURE i see when submitting unrelated stuff to jenkins Change-Id: I3121cba0279855c68336e803914e9e91dd860fae 02:45:24 ./manifests/role/eventlogging.pp:146 ERROR two-space soft tabs not used (2sp_soft_tabs) 02:45:24 ./manifests/role/eventlogging.pp:147 ERROR two-space soft tabs not used (2sp_soft_tabs) 02:45:24 ./manifests/role/eventlogging.pp:148 ERROR two-space soft tabs not used (2sp_soft_tabs) 02:45:26 ./manifests/role/eventlogging.pp:149 ERROR two-space soft tabs not used (2sp_soft_tabs) 02:45:26 ./manifests/role/eventlogging.pp:150 ERROR two-space soft tabs not used (2sp_soft_tabs) --- M manifests/role/eventlogging.pp 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp index b3a1c93..16d825c 100644 --- a/manifests/role/eventlogging.pp +++ b/manifests/role/eventlogging.pp @@ -143,11 +143,11 @@ } eventlogging::service::consumer { 'kafka': - input = tcp://${processor}:8600, - output = kafka://${kafka_cluster}?brokers=${kafka_brokers}topic=${kafka_topic}, - # We are not currently using this data in Kafka or Hadoop, and Kafka is about - # to undergo some production failover testing. Disabling this for now. - ensure = 'absent', +input = tcp://${processor}:8600, +output = kafka://${kafka_cluster}?brokers=${kafka_brokers}topic=${kafka_topic}, +# We are not currently using this data in Kafka or Hadoop, and Kafka is about +# to undergo some production failover testing. Disabling this for now. +ensure = 'absent', } -- To view, visit https://gerrit.wikimedia.org/r/171799 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3121cba0279855c68336e803914e9e91dd860fae Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add @group Database to ApiXmlFormatTest - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/171849 Change subject: Add @group Database to ApiXmlFormatTest .. Add @group Database to ApiXmlFormatTest Change-Id: Id57690a49e01af0ed0b9ae7580cf0c4505488aab --- M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/49/171849/1 diff --git a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php index 77a01a7..6071a25 100644 --- a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php +++ b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php @@ -19,12 +19,13 @@ * @group Wikibase * @group WikibaseAPI * @group WikibaseRepo + * @group Database * @group medium * * @licence GNU GPL v2+ * @author Katie Filbert aude.w...@gmail.com */ -class ApiXmlFormatTest extends \PHPUnit_Framework_TestCase { +class ApiXmlFormatTest extends \MediaWikiTestCase { /** * @var EntityRevision -- To view, visit https://gerrit.wikimedia.org/r/171849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id57690a49e01af0ed0b9ae7580cf0c4505488aab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits