[MediaWiki-commits] [Gerrit] udp2log: move icinga checks from ./files/ to module - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/290871 Change subject: udp2log: move icinga checks from ./files/ to module .. udp2log: move icinga checks from ./files/ to module Change-Id: I13fce27aab45010befb7013e067659412e26aacf --- R modules/udp2log/files/check_udp2log_log_age R modules/udp2log/files/check_udp2log_procs M modules/udp2log/manifests/monitoring.pp 3 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/290871/1 diff --git a/files/icinga/check_udp2log_log_age b/modules/udp2log/files/check_udp2log_log_age similarity index 100% rename from files/icinga/check_udp2log_log_age rename to modules/udp2log/files/check_udp2log_log_age diff --git a/files/icinga/check_udp2log_procs b/modules/udp2log/files/check_udp2log_procs similarity index 100% rename from files/icinga/check_udp2log_procs rename to modules/udp2log/files/check_udp2log_procs diff --git a/modules/udp2log/manifests/monitoring.pp b/modules/udp2log/manifests/monitoring.pp index 4f03156..8c6ef87 100644 --- a/modules/udp2log/manifests/monitoring.pp +++ b/modules/udp2log/manifests/monitoring.pp @@ -12,7 +12,7 @@ mode => '0555', owner => 'root', group => 'root', -source => 'puppet:///files/icinga/check_udp2log_log_age', +source => 'puppet:///modules/udp2log/check_udp2log_log_age', } file { 'check_udp2log_procs': @@ -20,7 +20,7 @@ mode => '0555', owner => 'root', group => 'root', -source => 'puppet:///files/icinga/check_udp2log_procs', +source => 'puppet://modules/udp2log/check_udp2log_procs', } file { 'rolematcher.py': -- To view, visit https://gerrit.wikimedia.org/r/290871 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I13fce27aab45010befb7013e067659412e26aacf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix invalid JSON in repoconfig.commit - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Fix invalid JSON in repoconfig.commit .. Fix invalid JSON in repoconfig.commit Change-Id: Id23e2f0df3853c9df5c0dae86cd5fe1a408a95f9 --- M repoconfig.commit.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/repoconfig.commit.json b/repoconfig.commit.json index e634111..099c457 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -44,7 +44,7 @@ }, "int-dcatap": { "group": "int-dcatap", - "no-export-languages": "ady,aeb,bbc,be-x-old,crh,dk,en,fiu-vro,gan,gom,got,hif,iu,kbd,kk,kk-cn,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,test,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-hk,zh-min-nan,zh-mo,zh-my,zh-sg,zh-tw,zh-yue", "repos": { + "no-export-languages": "ady,aeb,bbc,be-x-old,crh,dk,en,fiu-vro,gan,gom,got,hif,iu,kbd,kk,kk-cn,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,test,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-hk,zh-min-nan,zh-mo,zh-my,zh-sg,zh-tw,zh-yue", "repos": { "int-dcatap": { "type": "wmgerrit", -- To view, visit https://gerrit.wikimedia.org/r/290870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id23e2f0df3853c9df5c0dae86cd5fe1a408a95f9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: NikerabbitGerrit-Reviewer: Nikerabbit 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 invalid JSON in repoconfig.commit - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/290870 Change subject: Fix invalid JSON in repoconfig.commit .. Fix invalid JSON in repoconfig.commit Change-Id: Id23e2f0df3853c9df5c0dae86cd5fe1a408a95f9 --- M repoconfig.commit.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/70/290870/1 diff --git a/repoconfig.commit.json b/repoconfig.commit.json index e634111..099c457 100644 --- a/repoconfig.commit.json +++ b/repoconfig.commit.json @@ -44,7 +44,7 @@ }, "int-dcatap": { "group": "int-dcatap", - "no-export-languages": "ady,aeb,bbc,be-x-old,crh,dk,en,fiu-vro,gan,gom,got,hif,iu,kbd,kk,kk-cn,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,test,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-hk,zh-min-nan,zh-mo,zh-my,zh-sg,zh-tw,zh-yue", "repos": { + "no-export-languages": "ady,aeb,bbc,be-x-old,crh,dk,en,fiu-vro,gan,gom,got,hif,iu,kbd,kk,kk-cn,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,test,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-hk,zh-min-nan,zh-mo,zh-my,zh-sg,zh-tw,zh-yue", "repos": { "int-dcatap": { "type": "wmgerrit", -- To view, visit https://gerrit.wikimedia.org/r/290870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id23e2f0df3853c9df5c0dae86cd5fe1a408a95f9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] grafana: add wmf branding - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: grafana: add wmf branding .. grafana: add wmf branding Replace the logo in the top right corner with the WMF logo, because I'm vain like that. Change-Id: Ibb9560131c205f28fb374b5345a6a4585d599eb2 --- A files/misc/wikimedia-logo.svg M manifests/role/grafana.pp 2 files changed, 24 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/files/misc/wikimedia-logo.svg b/files/misc/wikimedia-logo.svg new file mode 100644 index 000..e7ef65e --- /dev/null +++ b/files/misc/wikimedia-logo.svg @@ -0,0 +1,17 @@ + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> + +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; version="1.1" + id="Wikimedia logo" + viewBox="-599 -599 1198 1198" width="1024" height="1024"> + + + + + + + + + + + diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp index c28483b..9c347f8 100644 --- a/manifests/role/grafana.pp +++ b/manifests/role/grafana.pp @@ -121,6 +121,13 @@ notify => Service['grafana-server'], } +file { '/usr/share/grafana/public/img/grafana_icon.svg': +source => 'puppet:///files/misc/wikimedia-logo.svg', +owner => 'root', +group => 'root', +mode=> '0444', +require => Package['grafana'], +} # We disable account creation, because accounts are created # automagically based on the X-WEBAUTH-USER, which is either set -- To view, visit https://gerrit.wikimedia.org/r/290869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb9560131c205f28fb374b5345a6a4585d599eb2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livnehGerrit-Reviewer: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] grafana: disable automatic update checking and external snap... - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: grafana: disable automatic update checking and external snapshots .. grafana: disable automatic update checking and external snapshots Automatic update checks default to enabled (grr). Ditto the possibility of posting snapshots to raintank.io. So disable both, explicitly. Change-Id: I7f322b9638b3f1245af2dcc85f3d0a218295d801 --- M manifests/role/grafana.pp 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp index 7560ce1..c28483b 100644 --- a/manifests/role/grafana.pp +++ b/manifests/role/grafana.pp @@ -78,10 +78,17 @@ cookie_secure => true, }, -# Don't send anonymous usage stats to stats.grafana.org. # We don't like it when software phones home. +# Don't send anonymous usage stats to stats.grafana.org, +# and don't check for updates automatically. 'analytics' => { reporting_enabled => false, +check_for_updates => false, +}, + +# Also, don't allow publishing to raintank.io. +'snapshots' => { +external_enabled => false, }, }, } -- To view, visit https://gerrit.wikimedia.org/r/290868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f322b9638b3f1245af2dcc85f3d0a218295d801 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livnehGerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] grafana: add wmf branding - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/290869 Change subject: grafana: add wmf branding .. grafana: add wmf branding Replace the logo in the top right corner with the WMF logo, because I'm vain like that. Change-Id: Ibb9560131c205f28fb374b5345a6a4585d599eb2 --- A files/misc/wikimedia-logo.svg M manifests/role/grafana.pp 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/69/290869/1 diff --git a/files/misc/wikimedia-logo.svg b/files/misc/wikimedia-logo.svg new file mode 100644 index 000..e7ef65e --- /dev/null +++ b/files/misc/wikimedia-logo.svg @@ -0,0 +1,17 @@ + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> + +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; version="1.1" + id="Wikimedia logo" + viewBox="-599 -599 1198 1198" width="1024" height="1024"> + + + + + + + + + + + diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp index c28483b..9c347f8 100644 --- a/manifests/role/grafana.pp +++ b/manifests/role/grafana.pp @@ -121,6 +121,13 @@ notify => Service['grafana-server'], } +file { '/usr/share/grafana/public/img/grafana_icon.svg': +source => 'puppet:///files/misc/wikimedia-logo.svg', +owner => 'root', +group => 'root', +mode=> '0444', +require => Package['grafana'], +} # We disable account creation, because accounts are created # automagically based on the X-WEBAUTH-USER, which is either set -- To view, visit https://gerrit.wikimedia.org/r/290869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb9560131c205f28fb374b5345a6a4585d599eb2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] grafana: disable automatic update checking and external snap... - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/290868 Change subject: grafana: disable automatic update checking and external snapshots .. grafana: disable automatic update checking and external snapshots Automatic update checks default to enabled (grr). Ditto the possibility of posting snapshots to raintank.io. So disable both, explicitly. Change-Id: I7f322b9638b3f1245af2dcc85f3d0a218295d801 --- M manifests/role/grafana.pp 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/290868/1 diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp index 7560ce1..c5434ff 100644 --- a/manifests/role/grafana.pp +++ b/manifests/role/grafana.pp @@ -78,10 +78,17 @@ cookie_secure => true, }, -# Don't send anonymous usage stats to stats.grafana.org. # We don't like it when software phones home. -'analytics' => { +# Don't send anonymous usage stats to stats.grafana.org, +# and don't check for updates automatically. +'analytics' => { reporting_enabled => false, +check_for_updates => false, +}, + +# Also, don't allow publishing to raintank.io. +'snapshots' => { +external_enabled => false, }, }, } -- To view, visit https://gerrit.wikimedia.org/r/290868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f322b9638b3f1245af2dcc85f3d0a218295d801 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Merge 'user.groups' into 'user' module - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: resourceloader: Merge 'user.groups' into 'user' module .. resourceloader: Merge 'user.groups' into 'user' module This is with T92459 in mind to simplify the process of splitting the 'user' module for the styles-only queue. Consequences: * Cached HTML isn't relevant in practice since there is no caching for logged-in users and this module is only for logged-in users. Even then, cached HTML will work and may happen as browsers re-use HTML responses when revisiting a privately cached page (after 304 Not Modified). Note that OutputPage (via isKnownEmpty) only actually tries to load 'user.groups' if the wiki has 'MediaWiki:Group-*.{js,css}' pages for the current user's groups. - Old style queue request will continue to ask for user.groups which is now a FileModule with no styles (simply concats the empty string to the bundle) - Old load() request will resolve with an empty function. * The are no known dependants of 'user.groups'. If there are, they will work by proxy of it now being an empty module that just ensures 'user' is loaded. * The security origin of 'user.groups' was USER_SITEWIDE. The origin of 'user' is lower (USER_INDIVIDUAL). Pages that are restricted to USER_SITEWIDE previously received user.groups, but won't anymore. This should be fine as OutputPage::reduceAllowedModules() is mainly used to either allow everything or restrict all the way down to CORE. The only exception is disallowUserJs() if $wgAllowSiteCSSOnRestrictedPages is enabled (T73621) but that edge case was made for Common.css, not Group-*.css. Change-Id: I74cd2368ebd2989c5e1c22bea491a80beb0319dc --- M autoload.php M includes/OutputPage.php D includes/resourceloader/ResourceLoaderUserGroupsModule.php M includes/resourceloader/ResourceLoaderUserModule.php M resources/Resources.php 5 files changed, 30 insertions(+), 89 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index f635bc1..b7e3419 100644 --- a/autoload.php +++ b/autoload.php @@ -1154,7 +1154,6 @@ 'ResourceLoaderUploadDialogModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUploadDialogModule.php', 'ResourceLoaderUserCSSPrefsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php', 'ResourceLoaderUserDefaultsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserDefaultsModule.php', - 'ResourceLoaderUserGroupsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserGroupsModule.php', 'ResourceLoaderUserModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserModule.php', 'ResourceLoaderUserOptionsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserOptionsModule.php', 'ResourceLoaderUserTokensModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserTokensModule.php', diff --git a/includes/OutputPage.php b/includes/OutputPage.php index d8600c1..6f62ae6 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3101,12 +3101,6 @@ $links[] = $this->makeResourceLoaderLink( 'user', ResourceLoaderModule::TYPE_COMBINED ); } - // Group JS is only enabled if site JS is enabled. - $links[] = $this->makeResourceLoaderLink( - 'user.groups', - ResourceLoaderModule::TYPE_COMBINED - ); - return self::getHtmlFromLoaderLinks( $links ); } @@ -3672,7 +3666,6 @@ // Per-site custom styles $moduleStyles[] = 'site'; $moduleStyles[] = 'noscript'; - $moduleStyles[] = 'user.groups'; // Per-user custom styles if ( $this->getConfig()->get( 'AllowUserCss' ) && $this->getTitle()->isCssSubpage() diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php deleted file mode 100644 index b225185..000 --- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php +++ /dev/null @@ -1,70 +0,0 @@ -http://www.gnu.org/copyleft/gpl.html - * - * @file - */ - -/** - * Module for user customizations - */ -class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule { - - protected $origin = self::ORIGIN_USER_SITEWIDE; - protected $targets = [ 'desktop', 'mobile' ]; - - /** -* @param ResourceLoaderContext $context -* @return array -*/ - protected function getPages( ResourceLoaderContext $context ) { - $useSiteJs = $this->getConfig()->get( 'UseSiteJs' ); - $useSiteCss = $this->getConfig()->get( 'UseSiteCss' ); - if ( !$useSiteJs && !$useSiteCss ) { - return [];
[MediaWiki-commits] [Gerrit] Convert mwgrep to use regexp by default - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: Convert mwgrep to use regexp by default .. Convert mwgrep to use regexp by default This makes mwgrep more powerful by supporting regular expressions instead of plain text matching for the source query. This does make it a bit more expensive, but the usage is low enough this should be acceptable. By removing the old functionality this also allows removing the mwgrep.groovy file. Change-Id: If7e97ca3b78ad05d160d6a52e988b07592d0d426 --- M modules/role/manifests/elasticsearch/server.pp M modules/scap/files/mwgrep 2 files changed, 16 insertions(+), 19 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/role/manifests/elasticsearch/server.pp b/modules/role/manifests/elasticsearch/server.pp index 55dc101..1d61a11 100644 --- a/modules/role/manifests/elasticsearch/server.pp +++ b/modules/role/manifests/elasticsearch/server.pp @@ -66,19 +66,10 @@ include ::elasticsearch::nagios::check file { '/etc/elasticsearch/scripts': -ensure => directory, -owner => 'root', -group => 'root', -mode=> '0755', -require => Package['elasticsearch'], +ensure => absent, } file { '/etc/elasticsearch/scripts/mwgrep.groovy': -ensure => file, -owner => 'root', -group => 'root', -content => '_source["text"].contains(query)', -mode=> '0444', -require => Package['elasticsearch'], +ensure => absent } } diff --git a/modules/scap/files/mwgrep b/modules/scap/files/mwgrep index 91f0b95..2861cb1 100755 --- a/modules/scap/files/mwgrep +++ b/modules/scap/files/mwgrep @@ -2,12 +2,12 @@ # -*- coding: utf-8 -*- """ usage: mwgrep [-h] [--max-results N] [--timeout N] [--user | --module] -[--title TITLE] term +[--title TITLE] regex Grep for Lua or CSS and JS code fragments on (per default) MediaWiki wiki pages positional arguments: -term text to search for +regexregex to search for optional arguments: -h, --help show this help message and exit @@ -18,7 +18,9 @@ --title TITLErestrict search to pages with this title mwgrep will grep the MediaWiki namespace across Wikimedia wikis. specify - --user to search the user namespace instead. + --user to search the user namespace instead. See the lucene documentation + for org.apache.lucene.util.automaton.RegExp for supported syntax. The current + lucene version is available from `curl search.svc.eqiad.wmnet:9200`. """ import sys @@ -95,11 +97,15 @@ filters = [ {'term': {'namespace': str(args.ns)}}, -{'script': { - 'file': 'mwgrep', - 'lang': 'groovy', - 'params': { 'query': args.term } - }}, +{'source_regex': { +'regex': args.term, +'field': 'source_text', +'ngram_field': 'source_text.trigram', +'max_inspect': 1, +'max_determinized_states': 2, +'case_sensitive': True, +'locale': 'en', +}}, ] if args.ns == NS_USER or args.ns == NS_MEDIAWIKI: -- To view, visit https://gerrit.wikimedia.org/r/283107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7e97ca3b78ad05d160d6a52e988b07592d0d426 Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: EBernhardsonGerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CommonSettings: cleanup temp cache file if rename fails - change (operations/mediawiki-config)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/290867 Change subject: CommonSettings: cleanup temp cache file if rename fails .. CommonSettings: cleanup temp cache file if rename fails This failure will only happen if there is a permissions issue, but if that happens on live server leaving the temp file on disk could lead to resource exhaustion. Bug: T136258 Change-Id: I3c5fd0995470e9242df333d2d7a7b188a33dc4f8 --- M wmf-config/CommonSettings.php 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/67/290867/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 23180a7..32df79a 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -186,7 +186,10 @@ @mkdir( '/tmp/mw-cache-' . $wmgVersionNumber ); $tmpFile = tempnam( '/tmp/', "conf-$wmgVersionNumber-$wgDBname" ); if ( $tmpFile && file_put_contents( $tmpFile, serialize( $globals ) ) ) { - rename( $tmpFile, $filename ); + if ( !rename( $tmpFile, $filename ) ) { + // T136258: Rename failed, cleanup temp file + unlink( $tmpFile ); + }; } } -- To view, visit https://gerrit.wikimedia.org/r/290867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c5fd0995470e9242df333d2d7a7b188a33dc4f8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BryanDavis___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] registry: Add Yandex MT for bn, gu, kn, pa, si and ta languages - change (mediawiki...cxserver)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/290866 Change subject: registry: Add Yandex MT for bn, gu, kn, pa, si and ta languages .. registry: Add Yandex MT for bn, gu, kn, pa, si and ta languages MT is non-default for language pairs where 1 or more translations done so far. Bug: T136177 Bug: T136178 Bug: T136179 Bug: T136180 Bug: T136181 Bug: T136182 Change-Id: I8c00ae9132d1d90863f7f3f3dac51daf62838005 --- M registry.wikimedia.yaml 1 file changed, 907 insertions(+), 73 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/66/290866/1 diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml index c1b4aac..499a067 100644 --- a/registry.wikimedia.yaml +++ b/registry.wikimedia.yaml @@ -683,6 +683,7 @@ - ar - ba - be + - bn - bg - bs - ca @@ -698,6 +699,7 @@ - fr - ga - gl + - gu - he - hi - hr @@ -709,6 +711,7 @@ - ja - ka - kk + - kn - ko - ky - la @@ -720,16 +723,19 @@ - ms - mt - 'no' + - pa - pl - pt - ro - ru + - si - sk - sl + - sq - sr - sv - - sq - sw + - ta - tg - th - tl @@ -745,6 +751,7 @@ - af - ba - be + - bn - bg - bs - ca @@ -760,6 +767,7 @@ - fr - ga - gl + - gu - he - hi - hr @@ -771,6 +779,7 @@ - ja - ka - kk + - kn - ko - ky - la @@ -782,21 +791,23 @@ - ms - mt - 'no' + - pa - pl - pt - ro - ru + - si - sk - sl + - sq - sr - sv - - sq - sw + - ta - tg - th - tl - tr - - uk - tt - udm - uk @@ -809,6 +820,7 @@ - ar - ba - be + - bn - bg - bs - ca @@ -824,6 +836,7 @@ - fr - ga - gl + - gu - he - hi - hr @@ -835,6 +848,7 @@ - ja - ka - kk + - kn - ko - ky - la @@ -846,16 +860,19 @@ - ms - mt - 'no' + - pa - pl - pt - ro - ru + - si - sk - sl + - sq - sr - sv - - sq - sw + - ta - tg - th - tl @@ -871,6 +888,7 @@ - af - ar - be + - bn - bg - bs - ca @@ -886,6 +904,7 @@ - fr - ga - gl + - gu - he - hi - hr @@ -897,6 +916,7 @@ - ja - ka - kk + - kn - ko - ky - la @@ -908,16 +928,19 @@ - ms - mt - 'no' + - pa - pl - pt - ro - ru + - si - sk - sl - - sr - sq + - sr - sv - sw + - ta - tg - th - tl @@ -934,6 +957,7 @@ - ar - ba - be + - bn - bg - bs - ca @@ -949,6 +973,7 @@ - fr - ga - gl + - gu - he - hi - hr @@ -960,6 +985,7 @@ - ja - ka - kk + - kn - ko - ky - la @@ -971,16 +997,19 @@ - ms - mt - 'no' + - pa - pl - pt - ro - ru + - si - sk - sl - - sr - sq + - sr - sv - sw + - ta - tg - th - tl @@ -996,6 +1025,7 @@ - af - ar - ba + - bn - bg - bs - ca @@ -1011,6 +1041,7 @@ - fr - ga - gl + - gu - he - hi - hr @@ -1022,6 +1053,7 @@ - ja - ka - kk + - kn - ko - ky - la @@ -1033,16 +1065,87 @@ - ms - mt - 'no' + - pa - pl - pt - ro - ru + - si - sk - sl - - sr - sq + - sr - sv - sw + - ta + - tg + - th + - tl + - tr + - tt + - udm + - uk + - ur + - uz + - vi + - zh +bn: + - af + - ar + - ba + - be + - bg + - bs + - ca + - cs + - cy + - da + - el + - es + - et + - eu + - fa + - fi + - fr + - ga + - gl + - gu + - he + - hi + - hr + - ht + - hu + - hy + - id + - is + - ja + - ka + - kk + - kn + - ko + - ky + - la + - lt + - lv + - mg + - mk + - mn + - ms + - mt + -
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I9b204996e9ed598fdc8239ab00061a403c1c8458 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smalyshev: Looks good to me, approved Cindy-the-browser-test-bot: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/Gemfile b/Gemfile index 8402319..24e4c4e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org; -gem "mediawiki_selenium", "~> 1.7" +gem "mediawiki_selenium", "~> 1.7", ">= 1.7.1" gem "mimemagic", "~> 0.3.0" gem "parallel_tests", "~> 1.7.0" gem "rake", "~> 10.4", ">= 10.4.2" -- To view, visit https://gerrit.wikimedia.org/r/290837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b204996e9ed598fdc8239ab00061a403c1c8458 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Cindy-the-browser-test-bot Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Gehel Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable moving of the pointers by clicking on the revisions. - change (mediawiki...RevisionSlider)
WMDE-leszek has submitted this change and it was merged. Change subject: Enable moving of the pointers by clicking on the revisions. .. Enable moving of the pointers by clicking on the revisions. Bug: T134993 Change-Id: I6b467d8b89bdccc2d6e01fbd94ac5890a07d20b4 --- M modules/ext.RevisionSlider.PointerView.js M modules/ext.RevisionSlider.SliderView.js 2 files changed, 111 insertions(+), 53 deletions(-) Approvals: WMDE-leszek: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.RevisionSlider.PointerView.js b/modules/ext.RevisionSlider.PointerView.js index d229340..ffc106c 100644 --- a/modules/ext.RevisionSlider.PointerView.js +++ b/modules/ext.RevisionSlider.PointerView.js @@ -49,19 +49,19 @@ }, animateTo: function ( posInPx, duration ) { - this.getElement().animate( { left: posInPx }, duration ); + return this.getElement().animate( { left: posInPx }, duration ); }, slideToPosition: function ( slider, duration ) { var relativePos = this.pointer.getPosition() - slider.getFirstVisibleRevisionIndex(); - this.animateTo( relativePos * slider.getView().revisionWidth + 4, duration ); // +4 to align triangle and revision + return this.animateTo( relativePos * slider.getView().revisionWidth + 4, duration ); // +4 to align triangle and revision }, slideToSide: function ( slider, posBeforeSlider, duration ) { if ( posBeforeSlider ) { - this.animateTo( this.offset - slider.getView().revisionWidth + 20, duration ); // +20 otherwise pointer is in arrow + return this.animateTo( this.offset - slider.getView().revisionWidth + 20, duration ); // +20 otherwise pointer is in arrow } else { - this.animateTo( ( slider.getRevisionsPerWindow() + 1 ) * slider.getView().revisionWidth - this.offset, duration ); + return this.animateTo( ( slider.getRevisionsPerWindow() + 1 ) * slider.getView().revisionWidth - this.offset, duration ); } }, @@ -70,9 +70,9 @@ posBeforeSlider = this.pointer.getPosition() < firstVisibleRev, isVisible = !posBeforeSlider && this.pointer.getPosition() <= firstVisibleRev + slider.getRevisionsPerWindow(); if ( isVisible ) { - this.slideToPosition( slider, duration ); + return this.slideToPosition( slider, duration ); } else { - this.slideToSide( slider, posBeforeSlider, duration ); + return this.slideToSide( slider, posBeforeSlider, duration ); } } } ); diff --git a/modules/ext.RevisionSlider.SliderView.js b/modules/ext.RevisionSlider.SliderView.js index 53546be..61d7181 100644 --- a/modules/ext.RevisionSlider.SliderView.js +++ b/modules/ext.RevisionSlider.SliderView.js @@ -1,6 +1,7 @@ ( function ( mw, $ ) { var SliderView = function ( slider ) { this.slider = slider; + this.diffPage = new mw.libs.revisionSlider.DiffPage( this.slider.getRevisions() ); }; $.extend( SliderView.prototype, { @@ -12,6 +13,11 @@ * @type {jQuery} */ $element: null, + + /** +* @type {DiffPage} +*/ + diffPage: null, /** * @type {Slider} @@ -30,7 +36,6 @@ render: function ( $container ) { var containerWidth = this.calculateSliderContainerWidth(), - diffPage = new mw.libs.revisionSlider.DiffPage( this.slider.getRevisions() ), $revisions = this.slider.getRevisions().getView().render( this.revisionWidth ), $slider = $( '' ), self = this; @@ -80,24 +85,49 @@ self.resetPointerStylesBasedOnPosition(); self.resetRevisionStylesBasedOnPointerPosition( $revisions ); - revId1 = $revisions - .find( 'div.revision[data-pos=\'' + self.pointerOne.getPosition() + '\']' ) - .data( 'revid' ); - revId2 = $revisions - .find( 'div.revision[data-pos=\'' +
[MediaWiki-commits] [Gerrit] Avoid master queries/writes in listUnattached() - change (mediawiki...CentralAuth)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/290865 Change subject: Avoid master queries/writes in listUnattached() .. Avoid master queries/writes in listUnattached() * These were triggering at places like SpecialCentralAuth/. If the central user is an IP, just return an empty array. * Remove the master check in lazyImportLocalNames() and rely on the IGNORE options in importLocalNames(). This avoids adding rows for arbitrary names passed in by the user. * Use getConnectionRef() to simplify some code a bit. Bug: T92357 Change-Id: I72c6ec012eb282254059ea4045e6bdf3e12c1b3e --- M includes/CentralAuthUser.php 1 file changed, 29 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/65/290865/1 diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php index 1e8264a..5b6f3cf 100644 --- a/includes/CentralAuthUser.php +++ b/includes/CentralAuthUser.php @@ -1969,9 +1969,13 @@ * an alert or management system to show which accounts have still * to be dealt with. * -* @return array of database name strings +* @return string[] of database name strings */ public function listUnattached() { + if ( IP::isIPAddress( $this->mName ) ) { + return []; // don't bother with master queries + } + $unattached = $this->doListUnattached(); if ( empty( $unattached ) ) { if ( $this->lazyImportLocalNames() ) { @@ -2065,12 +2069,7 @@ return false; } - // Confirm against the master for sanity... - $known = (bool)CentralAuthUtils::getCentralDB()->selectField( - 'globalnames', '1', [ 'gn_name' => $this->mName ], __METHOD__ - ); - - return $known ? false : $this->importLocalNames(); + return $this->importLocalNames(); } /** @@ -2080,38 +2079,41 @@ * @return Bool whether any results were found */ function importLocalNames() { - $rows = array(); + $rows = []; foreach ( self::getWikiList() as $wikiID ) { - $lb = wfGetLB( $wikiID ); - $dbr = $lb->getConnection( DB_SLAVE, array(), $wikiID ); + $dbr = wfGetLB( $wikiID )->getConnectionRef( DB_SLAVE, array(), $wikiID ); $id = $dbr->selectField( "`$wikiID`.`user`", 'user_id', array( 'user_name' => $this->mName ), - __METHOD__ ); + __METHOD__ + ); if ( $id ) { - $rows[] = array( - 'ln_wiki' => $wikiID, - 'ln_name' => $this->mName ); + $rows[] = [ 'ln_wiki' => $wikiID, 'ln_name' => $this->mName ]; } - $lb->reuseConnection( $dbr ); } - $dbw = CentralAuthUtils::getCentralDB(); - $dbw->startAtomic( __METHOD__ ); - $dbw->insert( 'globalnames', - array( 'gn_name' => $this->mName ), - __METHOD__, - array( 'IGNORE' ) ); - if ( $rows ) { - $dbw->insert( 'localnames', - $rows, + if ( $rows || $this->exists() ) { + $dbw = CentralAuthUtils::getCentralDB(); + $dbw->startAtomic( __METHOD__ ); + $dbw->insert( + 'globalnames', + array( 'gn_name' => $this->mName ), __METHOD__, - array( 'IGNORE' ) ); + array( 'IGNORE' ) + ); + if ( $rows ) { + $dbw->insert( + 'localnames', + $rows, + __METHOD__, + array( 'IGNORE' ) + ); + } + $dbw->endAtomic( __METHOD__ ); } - $dbw->endAtomic( __METHOD__ ); - return !empty( $rows ); + return (bool)$rows; } /** -- To view, visit https://gerrit.wikimedia.org/r/290865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType:
[MediaWiki-commits] [Gerrit] syslog: move role class to autoloader layout - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: syslog: move role class to autoloader layout .. syslog: move role class to autoloader layout moves syslog::centralserver to module/role no-op on lithium: http://puppet-compiler.wmflabs.org/2926/ Change-Id: Ibdff558784257506d51a69337c06b19b0422fab1 --- R modules/role/manifests/syslog/centralserver.pp 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/syslog.pp b/modules/role/manifests/syslog/centralserver.pp similarity index 100% rename from manifests/role/syslog.pp rename to modules/role/manifests/syslog/centralserver.pp -- To view, visit https://gerrit.wikimedia.org/r/286164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdff558784257506d51a69337c06b19b0422fab1 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] snapshot: follow-up to move role classes - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: snapshot: follow-up to move role classes .. snapshot: follow-up to move role classes - adjust hiera file after role got renamed - remove "mediadirlists" class that has been disabled meanwhile and doesnt exist anymore since I63acf524160852 Change-Id: I8ce9d139d11d48716d523d3d18aa2417451897b1 --- R hieradata/role/common/snapshot/producer.yaml M modules/role/manifests/snapshot/cron/primary.pp 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/common/snapshot.yaml b/hieradata/role/common/snapshot/producer.yaml similarity index 100% rename from hieradata/role/common/snapshot.yaml rename to hieradata/role/common/snapshot/producer.yaml diff --git a/modules/role/manifests/snapshot/cron/primary.pp b/modules/role/manifests/snapshot/cron/primary.pp index bf52a40..8d9d26a 100644 --- a/modules/role/manifests/snapshot/cron/primary.pp +++ b/modules/role/manifests/snapshot/cron/primary.pp @@ -25,10 +25,6 @@ enable => true, user => 'datasets', } -class { 'snapshot::cron::mediadirlists': -enable => true, -user => 'datasets', -} class { 'snapshot::cron::mediaperprojectlists': enable => true, user => 'datasets', -- To view, visit https://gerrit.wikimedia.org/r/290864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ce9d139d11d48716d523d3d18aa2417451897b1 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] snapshot: follow-up to move role classes - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/290864 Change subject: snapshot: follow-up to move role classes .. snapshot: follow-up to move role classes - adjust hiera file after role got renamed - remove "mediadirlists" class that has been disabled meanwhile and doesnt exist anymore Change-Id: I8ce9d139d11d48716d523d3d18aa2417451897b1 --- R hieradata/role/common/snapshot/producer.yaml M modules/role/manifests/snapshot/cron/primary.pp 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/64/290864/1 diff --git a/hieradata/role/common/snapshot.yaml b/hieradata/role/common/snapshot/producer.yaml similarity index 100% rename from hieradata/role/common/snapshot.yaml rename to hieradata/role/common/snapshot/producer.yaml diff --git a/modules/role/manifests/snapshot/cron/primary.pp b/modules/role/manifests/snapshot/cron/primary.pp index bf52a40..b105264 100644 --- a/modules/role/manifests/snapshot/cron/primary.pp +++ b/modules/role/manifests/snapshot/cron/primary.pp @@ -29,10 +29,6 @@ enable => true, user => 'datasets', } -class { 'snapshot::cron::mediaperprojectlists': -enable => true, -user => 'datasets', -} class { 'snapshot::cron::cirrussearch': enable => true, user => 'datasets', -- To view, visit https://gerrit.wikimedia.org/r/290864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ce9d139d11d48716d523d3d18aa2417451897b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] snapshot: one file per role class, move to modules/role - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: snapshot: one file per role class, move to modules/role .. snapshot: one file per role class, move to modules/role Splits the role class file into one file per role class. Moves it into module/role/ structure. Fixes autoloader layout warnings. Renames "role snapshot" to "role snapshot::producer". The only difference on the hosts are the motd/role name. http://puppet-compiler.wmflabs.org/2925/ Change-Id: I657d4de5731ea7d956c4b3afdda68c0d06b29693 --- D manifests/role/snapshot.pp M manifests/site.pp A modules/role/manifests/snapshot/common.pp A modules/role/manifests/snapshot/cron/primary.pp A modules/role/manifests/snapshot/cron/secondary.pp A modules/role/manifests/snapshot/dumps/hugewikis.pp A modules/role/manifests/snapshot/dumps/monitor.pp A modules/role/manifests/snapshot/dumps/regularwikis.pp A modules/role/manifests/snapshot/producer.pp 9 files changed, 131 insertions(+), 122 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/snapshot.pp b/manifests/role/snapshot.pp deleted file mode 100644 index 6e35fd1..000 --- a/manifests/role/snapshot.pp +++ /dev/null @@ -1,119 +0,0 @@ -class role::snapshot::common { -include ::dataset::user -include base::firewall - -# Allow SSH from deployment hosts -ferm::rule { 'deployment-ssh': -rule => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;', -} -} - -class role::snapshot { -include role::snapshot::common - -include ::snapshot -include ::snapshot::dumps - -system::role { 'role::snapshot': -description => 'producer of XML dumps', -} -} - -class role::snapshot::dumps::monitor { -include role::snapshot::common - -include ::snapshot -include ::snapshot::dumps::monitor - -system::role { 'role::snapshot::dumps::monitor': -description => 'monitor of XML dumps', -} -} - -class role::snapshot::cron::primary { -include role::snapshot::common - -class { 'snapshot::cron::wikidatadumps::json': -enable => true, -user => 'datasets', -} -class { 'snapshot::cron::wikidatadumps::ttl': -enable => true, -user => 'datasets', -} -class { 'snapshot::cron::centralauthdump': -enable => true, -user => 'datasets', -} -class { 'snapshot::cron::pagetitles': -enable => true, -user => 'datasets', -} -class { 'snapshot::addschanges': -enable => true, -user => 'datasets', -} -class { 'snapshot::cron::dumplists': -enable => true, -user => 'datasets', -} -class { 'snapshot::cron::mediaperprojectlists': -enable => true, -user => 'datasets', -} -class { 'snapshot::cron::cirrussearch': -enable => true, -user => 'datasets', -} -} - -class role::snapshot::cron::secondary { -include role::snapshot::common - -class { 'snapshot::cron::wikidatadumps::json': -enable => false, -user => 'datasets', -} -class { 'snapshot::cron::wikidatadumps::ttl': -enable => false, -user => 'datasets', -} -class { 'snapshot::cron::centralauthdump': -enable => false, -user => 'datasets', -} -class { 'snapshot::cron::pagetitles': -enable => false, -user => 'datasets', -} -class { 'snapshot::addschanges': -enable => false, -user => 'datasets', -} -class { 'snapshot::cron::dumplists': -enable => false, -user => 'datasets', -} -class { 'snapshot::cron::mediadirlists': -enable => false, -user => 'datasets', -} -class { 'snapshot::cron::cirrussearch': -enable => false, -user => 'datasets', -} -} - -class role::snapshot::dumps::hugewikis { -include role::snapshot::common -class { 'snapshot::dumps::cron::huge': -user => 'datasets', -} -} - -class role::snapshot::dumps::regularwikis { -include role::snapshot::common -class { 'snapshot::dumps::cron::rest': -user => 'datasets', -} -} diff --git a/manifests/site.pp b/manifests/site.pp index a6f2b59..c036b0c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2723,7 +2723,7 @@ # NOTE: New snapshot hosts must also be manually added # to hiera common.yaml dataset_clients_snapshots. -role snapshot, snapshot::cron +role snapshot::producer, snapshot::cron include standard } @@ -2731,7 +2731,7 @@ # NOTE: New snapshot hosts must also be manually added # to hiera common.yaml dataset_clients_snapshots. -role snapshot, snapshot::cron, snapshot::dumps::monitor +role snapshot::producer, snapshot::cron, snapshot::dumps::monitor include standard } @@ -2739,7 +2739,7 @@ # NOTE: New
[MediaWiki-commits] [Gerrit] Updated baseconfig files to add properties required by media... - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Updated baseconfig files to add properties required by mediawiki-title .. Updated baseconfig files to add properties required by mediawiki-title * In preparation for later patches. Change-Id: I4da79fff085d1860c1a3e916b436f3b7ce6e9d82 --- M lib/config/baseconfig/be-taraskwiki.json M lib/config/baseconfig/cawiki.json M lib/config/baseconfig/cswiki.json M lib/config/baseconfig/dewiki.json M lib/config/baseconfig/enwiki.json M lib/config/baseconfig/eswiki.json M lib/config/baseconfig/fawiki.json M lib/config/baseconfig/fiwiki.json M lib/config/baseconfig/iswiki.json M lib/config/baseconfig/kaawiki.json M lib/config/baseconfig/lnwiki.json M lib/config/baseconfig/nlwiki.json M lib/config/baseconfig/srwiki.json M lib/config/baseconfig/trwiki.json M lib/config/baseconfig/zhwiki.json 15 files changed, 15 insertions(+), 0 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/config/baseconfig/be-taraskwiki.json b/lib/config/baseconfig/be-taraskwiki.json index 5622041..eca9442 100644 --- a/lib/config/baseconfig/be-taraskwiki.json +++ b/lib/config/baseconfig/be-taraskwiki.json @@ -1448,6 +1448,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([абвгґджзеёжзійклмнопрстуўфхцчшыьэюяćčłńśšŭźža-z]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/cawiki.json b/lib/config/baseconfig/cawiki.json index a00cbbd..aaa6989 100644 --- a/lib/config/baseconfig/cawiki.json +++ b/lib/config/baseconfig/cawiki.json @@ -1325,6 +1325,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^((?:[a-zàèéíòóúç·ïü]|'(?!'))+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/cswiki.json b/lib/config/baseconfig/cswiki.json index 73e28c2..6b7d264 100644 --- a/lib/config/baseconfig/cswiki.json +++ b/lib/config/baseconfig/cswiki.json @@ -1462,6 +1462,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([a-záčďéěíňóřšťúůýž]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/dewiki.json b/lib/config/baseconfig/dewiki.json index 001c755..fce3645 100644 --- a/lib/config/baseconfig/dewiki.json +++ b/lib/config/baseconfig/dewiki.json @@ -1528,6 +1528,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([äöüßa-z]+)(.*)$/sDu", + "legaltitlechars": " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/enwiki.json b/lib/config/baseconfig/enwiki.json index e2dfec9..ea7858d 100644 --- a/lib/config/baseconfig/enwiki.json +++ b/lib/config/baseconfig/enwiki.json @@ -1310,6 +1310,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([a-z]+)(.*)$/sD", + "legaltitlechars": " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/eswiki.json b/lib/config/baseconfig/eswiki.json index c62330c..f92fe2d 100644 --- a/lib/config/baseconfig/eswiki.json +++ b/lib/config/baseconfig/eswiki.json @@ -1599,6 +1599,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([a-záéíóúñ]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/fawiki.json b/lib/config/baseconfig/fawiki.json index 54ce599..bfd6c3e 100644 --- a/lib/config/baseconfig/fawiki.json +++ b/lib/config/baseconfig/fawiki.json @@ -1597,6 +1597,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([ابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/fiwiki.json b/lib/config/baseconfig/fiwiki.json index 0928ff6..ce41629 100644 --- a/lib/config/baseconfig/fiwiki.json +++
[MediaWiki-commits] [Gerrit] foreachwikiindblist: Fix sudo guard and cleanup script - change (operations/puppet)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/290863 Change subject: foreachwikiindblist: Fix sudo guard and cleanup script .. foreachwikiindblist: Fix sudo guard and cleanup script * Change the sudo guard condition in foreachwikiindblist to match the guard used in mwscript. * Use $MEDIAWIKI_WEB_USER var from /etc/profile.d/mediawiki.sh * Move from template to file resource. * Reduce duplication by building command incrementally. * Use php5 explicitly to match mwscript (hhvm has poor cli performance). Bug: T136258 Change-Id: Ifb0e55e8e2831faed1f7dabd08cfef8c64c66ae6 --- A modules/scap/files/foreachwikiindblist M modules/scap/manifests/scripts.pp D modules/scap/templates/foreachwikiindblist.erb 3 files changed, 25 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/290863/1 diff --git a/modules/scap/files/foreachwikiindblist b/modules/scap/files/foreachwikiindblist new file mode 100755 index 000..9ac2a0d --- /dev/null +++ b/modules/scap/files/foreachwikiindblist @@ -0,0 +1,24 @@ +#!/bin/bash +# Run a maintenance against multiple wikis. +# +# This script belongs in /usr/local/bin/ and should be in PATH. +# Managed by Puppet. See modules/scap/files/foreachwikiindblist + +. /etc/profile.d/mediawiki.sh +DBLIST=$(/usr/local/bin/expanddblist "$1") +CMD=$2 +shift +shift + +RUNNER=php5 +if [ "$(whoami)" != "$MEDIAWIKI_WEB_USER" ] ; then + RUNNER="sudo -u $MEDIAWIKI_WEB_USER $RUNNER" +fi +RUNNER="$RUNNER -ddisplay_errors=On $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php" + +for x in $DBLIST; do + echo - + echo $x + echo - + $RUNNER $CMD --wiki=$x "${@}" | sed -u "s/^/$x: /" +done diff --git a/modules/scap/manifests/scripts.pp b/modules/scap/manifests/scripts.pp index 464dccc..3323041 100644 --- a/modules/scap/manifests/scripts.pp +++ b/modules/scap/manifests/scripts.pp @@ -37,7 +37,7 @@ owner => 'root', group => 'root', mode=> '0555', -content => template('scap/foreachwikiindblist.erb'), +source => 'puppet:///modules/scap/foreachwikiindblist', } file { '/usr/local/bin/expanddblist': owner => 'root', diff --git a/modules/scap/templates/foreachwikiindblist.erb b/modules/scap/templates/foreachwikiindblist.erb deleted file mode 100755 index 50d1824..000 --- a/modules/scap/templates/foreachwikiindblist.erb +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -. /etc/profile.d/mediawiki.sh -DBLIST=$(/usr/local/bin/expanddblist "$1") -CMD=$2 -shift -shift - -for x in $DBLIST; do - echo - - echo $x - echo - - if groups | grep -Ewq 'sudo|wikidev|root'; then - sudo -u <%= scope.lookupvar('mediawiki::users::web') -%> php -ddisplay_errors=On $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed -u "s/^/$x: /" - else - php -ddisplay_errors=On $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed -u "s/^/$x: /" - fi -done -- To view, visit https://gerrit.wikimedia.org/r/290863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb0e55e8e2831faed1f7dabd08cfef8c64c66ae6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct module name for stats in executeActionWithErrorH... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Use correct module name for stats in executeActionWithErrorHandling() .. Use correct module name for stats in executeActionWithErrorHandling() Change-Id: I7d300525c32877d6fcc940962c93b932dc4c9181 (cherry picked from commit 542640f4e2ece03a61ba9e956f235f793ac3fc56) --- M includes/api/ApiMain.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 60f2832..7f9b98b 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -471,7 +471,8 @@ $this->logRequest( $runTime ); if ( $this->mModule->isWriteMode() && $this->getRequest()->wasPosted() ) { $this->getStats()->timing( - 'api.' . $this->getModuleName() . '.executeTiming', 1000 * $runTime ); + 'api.' . $this->mModule->getModuleName() . '.executeTiming', 1000 * $runTime + ); } } catch ( Exception $e ) { $this->handleException( $e ); -- To view, visit https://gerrit.wikimedia.org/r/290836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d300525c32877d6fcc940962c93b932dc4c9181 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.28.0-wmf.3 Gerrit-Owner: KrinkleGerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Anomie 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 i18n messages for new Support and Safety group - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged. Change subject: Add i18n messages for new Support and Safety group .. Add i18n messages for new Support and Safety group Bug: T136046 Change-Id: I4c991fac09f78cf104553080497645eb8cd6a0d6 (cherry picked from commit f6baa894bbac7d468dd9dae1e9a1f9be7ab88dc8) --- M i18n/wikimedia/en.json M i18n/wikimedia/qqq.json 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Dereckson: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json index 90629a3..5d3def8 100644 --- a/i18n/wikimedia/en.json +++ b/i18n/wikimedia/en.json @@ -182,6 +182,9 @@ "group-wmf-researcher": "WMF researchers", "group-wmf-researcher-member": "{{GENDER:$1|WMF researcher}}", "grouppage-wmf-researcher": "m:WMF Researcher", + "group-wmf-supportsafety": "WMF Support and Safety", + "group-wmf-supportsafety-member": "{{GENDER:$1|WMF Support and Safety}}", + "grouppage-wmf-supportsafety": "{{ns:project}}:WMF Support and Safety", "search-interwiki-custom": "wiktionary:From Wiktionary\nwikibooks:From Wikibooks\nwikinews:From Wikinews\nwikiquote:From Wikiquote\nwikisource:From Wikisource\nwikiversity:From Wikiversity\nwikivoyage:From Wikivoyage", "shared-repo-name-shared": "Wikimedia Commons", "wikimedia-copyright": "Text is available under the https://creativecommons.org/licenses/by-sa/3.0/\;>Creative Commons Attribution-ShareAlike License;\nadditional terms may apply.\nSee https://wikimediafoundation.org/wiki/Terms_of_Use\;>Terms of Use for details.", diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json index 31894fe..c8b7ca8 100644 --- a/i18n/wikimedia/qqq.json +++ b/i18n/wikimedia/qqq.json @@ -208,6 +208,9 @@ "group-wmf-researcher": "{{doc-group|wmf-researcher}}", "group-wmf-researcher-member": "{{doc-group|wmf-researcher|member}}", "grouppage-wmf-researcher": "{{optional}}\n{{doc-group|wmf-researcher|page}}\n{{Global grouppage}}", + "group-wmf-supportsafety": "{{doc-group|wmf-supportsafety}}", + "group-wmf-supportsafety-member": "{{doc-group|wmf-supportsafety|member}}", + "grouppage-wmf-supportsafety": "{{optional}}\n{{doc-group|wmf-supportsafety|page}}\n{{Global grouppage}}", "search-interwiki-custom": "Friendly sister project site names in search results, one project name per line, in an : format. For example, possible settings for the English Wikipedia are:\n\nwiktionary:Word definitions from Wiktionary\nwikibooks:In Wikibooks\nwikinews:In Wikinews\nwikiquote:Quotes from Wikiquote\nwikisource:From Wikisource\nwikiversity:From Wikiversity\nwikivoyage:In Wikivoyage", "shared-repo-name-shared": "{{optional}}\n\nA specific version of {{msg-mw|shared-repo}}; see [[MediaWiki:Shared-repo/qqq]] for more information.\n\n{{Identical|Wikimedia Commons}}", "wikimedia-copyright": "{{Identical/Wikimedia-licensing}}\nThis message is displayed in the site footer. It is the default licensing policy for most Wikimedia sites. Replace Terms_of_Use in the URL with Special:MyLanguage/Terms_of_Use/, for example, Special:MyLanguage/Terms_of_Use/fr for French.", -- To view, visit https://gerrit.wikimedia.org/r/290862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c991fac09f78cf104553080497645eb8cd6a0d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: wmf/1.28.0-wmf.3 Gerrit-Owner: DerecksonGerrit-Reviewer: Dereckson Gerrit-Reviewer: Foks Gerrit-Reviewer: Siebrand 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 mediawiki_api gem to 1.7.1 - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged. Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Ied73b999f410b5b67350ca68032910a262105f3a --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Physikerwelt: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile b/Gemfile index eba618a..130a3aa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.5' gem 'rubocop', '~> 0.33.0', require: false -- To view, visit https://gerrit.wikimedia.org/r/290843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied73b999f410b5b67350ca68032910a262105f3a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Physikerwelt Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add i18n messages for new Support and Safety group - change (mediawiki...WikimediaMessages)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/290862 Change subject: Add i18n messages for new Support and Safety group .. Add i18n messages for new Support and Safety group Bug: T136046 Change-Id: I4c991fac09f78cf104553080497645eb8cd6a0d6 (cherry picked from commit f6baa894bbac7d468dd9dae1e9a1f9be7ab88dc8) --- M i18n/wikimedia/en.json M i18n/wikimedia/qqq.json 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages refs/changes/62/290862/1 diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json index 90629a3..5d3def8 100644 --- a/i18n/wikimedia/en.json +++ b/i18n/wikimedia/en.json @@ -182,6 +182,9 @@ "group-wmf-researcher": "WMF researchers", "group-wmf-researcher-member": "{{GENDER:$1|WMF researcher}}", "grouppage-wmf-researcher": "m:WMF Researcher", + "group-wmf-supportsafety": "WMF Support and Safety", + "group-wmf-supportsafety-member": "{{GENDER:$1|WMF Support and Safety}}", + "grouppage-wmf-supportsafety": "{{ns:project}}:WMF Support and Safety", "search-interwiki-custom": "wiktionary:From Wiktionary\nwikibooks:From Wikibooks\nwikinews:From Wikinews\nwikiquote:From Wikiquote\nwikisource:From Wikisource\nwikiversity:From Wikiversity\nwikivoyage:From Wikivoyage", "shared-repo-name-shared": "Wikimedia Commons", "wikimedia-copyright": "Text is available under the https://creativecommons.org/licenses/by-sa/3.0/\;>Creative Commons Attribution-ShareAlike License;\nadditional terms may apply.\nSee https://wikimediafoundation.org/wiki/Terms_of_Use\;>Terms of Use for details.", diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json index 31894fe..c8b7ca8 100644 --- a/i18n/wikimedia/qqq.json +++ b/i18n/wikimedia/qqq.json @@ -208,6 +208,9 @@ "group-wmf-researcher": "{{doc-group|wmf-researcher}}", "group-wmf-researcher-member": "{{doc-group|wmf-researcher|member}}", "grouppage-wmf-researcher": "{{optional}}\n{{doc-group|wmf-researcher|page}}\n{{Global grouppage}}", + "group-wmf-supportsafety": "{{doc-group|wmf-supportsafety}}", + "group-wmf-supportsafety-member": "{{doc-group|wmf-supportsafety|member}}", + "grouppage-wmf-supportsafety": "{{optional}}\n{{doc-group|wmf-supportsafety|page}}\n{{Global grouppage}}", "search-interwiki-custom": "Friendly sister project site names in search results, one project name per line, in an : format. For example, possible settings for the English Wikipedia are:\n\nwiktionary:Word definitions from Wiktionary\nwikibooks:In Wikibooks\nwikinews:In Wikinews\nwikiquote:Quotes from Wikiquote\nwikisource:From Wikisource\nwikiversity:From Wikiversity\nwikivoyage:In Wikivoyage", "shared-repo-name-shared": "{{optional}}\n\nA specific version of {{msg-mw|shared-repo}}; see [[MediaWiki:Shared-repo/qqq]] for more information.\n\n{{Identical|Wikimedia Commons}}", "wikimedia-copyright": "{{Identical/Wikimedia-licensing}}\nThis message is displayed in the site footer. It is the default licensing policy for most Wikimedia sites. Replace Terms_of_Use in the URL with Special:MyLanguage/Terms_of_Use/, for example, Special:MyLanguage/Terms_of_Use/fr for French.", -- To view, visit https://gerrit.wikimedia.org/r/290862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c991fac09f78cf104553080497645eb8cd6a0d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: wmf/1.28.0-wmf.3 Gerrit-Owner: DerecksonGerrit-Reviewer: Foks ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update tilerator to 645403d - change (maps...deploy)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/290861 Change subject: Update tilerator to 645403d .. Update tilerator to 645403d List of changes: 645403d moved job stuff into tilerator-jobprocessor repo xxx Update node module dependencies Change-Id: I04d0890c678231f6da213942e3f93ecbe8794d1f --- M node_modules/body-parser/node_modules/debug/node_modules/ms/package.json M node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/package.json M node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json M node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json M node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json M node_modules/express/node_modules/finalhandler/node_modules/unpipe/package.json M node_modules/express/node_modules/on-finished/node_modules/ee-first/package.json M node_modules/express/node_modules/type-is/node_modules/media-typer/package.json M node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json M node_modules/jade/node_modules/uglify-js/node_modules/yargs/node_modules/decamelize/package.json M node_modules/kartotherian-autogen/package.json M node_modules/kartotherian-cassandra/CassandraStore.js M node_modules/kartotherian-cassandra/node_modules/multistream/package.json M node_modules/kartotherian-cassandra/package.json R node_modules/kartotherian-core/node_modules/xmldoc/node_modules/sax/LICENSE R node_modules/kartotherian-core/node_modules/xmldoc/node_modules/sax/LICENSE-W3C.html A node_modules/kartotherian-core/node_modules/xmldoc/node_modules/sax/lib/sax.js C node_modules/kartotherian-core/node_modules/xmldoc/node_modules/sax/package.json M node_modules/kartotherian-core/node_modules/xmldoc/package.json M node_modules/kartotherian-core/package.json M node_modules/kartotherian-demultiplexer/package.json M node_modules/kartotherian-layermixer/package.json M node_modules/kartotherian-overzoom/package.json M node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/package.json M node_modules/kartotherian-postgres/package.json M node_modules/kartotherian-server/package.json M node_modules/kartotherian-substantial/package.json M node_modules/kue-ui/node_modules/express/node_modules/connect/node_modules/errorhandler/node_modules/accepts/node_modules/mime-types/package.json M node_modules/kue-ui/node_modules/express/node_modules/connect/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/package.json M node_modules/kue-ui/node_modules/express/node_modules/mkdirp/package.json M node_modules/kue-ui/package.json M node_modules/kue/node_modules/stylus/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rc/node_modules/minimist/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/hawk/node_modules/boom/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/hawk/node_modules/hoek/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/hawk/node_modules/sntp/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/node_modules/once/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/tar-pack/node_modules/fstream-ignore/node_modules/minimatch/package.json M node_modules/mapnik/node_modules/node-pre-gyp/node_modules/tar-pack/node_modules/once/package.json M node_modules/numeral/package.json M node_modules/osm-bright-source/node_modules/postgis-vt-util/package.json M node_modules/osm-bright-source/package.json M node_modules/osm-bright-style/node_modules/osm-bright-fonts/package.json M node_modules/osm-bright-style/package.json M
[MediaWiki-commits] [Gerrit] let chromium use jessie installer - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: let chromium use jessie installer .. let chromium use jessie installer Change-Id: I32e989006821d8a782bbc219eb7c893eae0daa30 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 67930fa..9499037 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -330,6 +330,8 @@ host chromium { hardware ethernet 78:2b:cb:08:aa:48; fixed-address chromium.wikimedia.org; +option pxelinux.pathprefix "jessie-installer/"; +filename "jessie-installer/debian-installer/amd64/pxelinux.0"; } host conf1001 { -- To view, visit https://gerrit.wikimedia.org/r/290347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32e989006821d8a782bbc219eb7c893eae0daa30 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] filter out new metrics - change (operations/puppet)
Eevans has uploaded a new change for review. https://gerrit.wikimedia.org/r/290860 Change subject: filter out new metrics .. filter out new metrics Over in https://github.com/wikimedia/cassandra-metrics-collector/pull/14, o.a.c.metrics.{Client,Keyspace} was added to the set of collected metrics. This changeset preemptively filters these metrics to enforce the status quo when the change lands in production. Change-Id: If609adc2a0493feda5dd0f5c7633c59af47ab6fb --- M hieradata/regex.yaml M hieradata/role/common/cassandra.yaml 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/60/290860/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 035ae54..5b9a6f6 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -153,6 +153,8 @@ - .*\.meanRate$ - .*\.min$ - .*\.stddev$ + - .*\.metrics\.Keyspace\..*$ + - .*\.metrics\.Client\..*$ restbase::logging_name: restbase-test cassandra::start_rpc: 'true' cassandra::target_version: '2.2' @@ -236,6 +238,8 @@ - .*\.meanRate$ - .*\.min$ - .*\.stddev$ + - .*\.metrics\.Keyspace\..*$ + - .*\.metrics\.Client\..*$ restbase::logging_name: restbase-test cassandra::start_rpc: 'true' cassandra::target_version: '2.2' diff --git a/hieradata/role/common/cassandra.yaml b/hieradata/role/common/cassandra.yaml index f8eb317..12f771b 100644 --- a/hieradata/role/common/cassandra.yaml +++ b/hieradata/role/common/cassandra.yaml @@ -114,6 +114,8 @@ - .*\.min$ - .*\.stddev$ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\..*$ +- .*\.metrics\.Keyspace\..*$ +- .*\.metrics\.Client\..*$ cassandra::dc: "%{::site}" # NOTE: this is cassandra's logical cluster name, not related to cassandra's datacenters (eqiad/codfw) -- To view, visit https://gerrit.wikimedia.org/r/290860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If609adc2a0493feda5dd0f5c7633c59af47ab6fb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix state truncation warnings - change (wikimedia...tools)
jenkins-bot has submitted this change and it was merged. Change subject: Fix state truncation warnings .. Fix state truncation warnings The column for the final export table was varchar(24) while the column for the staging table was varchar(64). This widens the final to match. Were we deliberately truncating for the sake of the bulk sender import? Change-Id: I0ef987d5f33af4b783f6e5486b4ad73fb1c54ea1 --- M silverpop_export/update_table.sql 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/silverpop_export/update_table.sql b/silverpop_export/update_table.sql index 9791ee3..4416ebb 100755 --- a/silverpop_export/update_table.sql +++ b/silverpop_export/update_table.sql @@ -346,7 +346,7 @@ -- Address information city varchar(128), country varchar(2), - state varchar(24), + state varchar(64), postal_code varchar(128), INDEX rspex_contact_id (contact_id), -- To view, visit https://gerrit.wikimedia.org/r/289593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ef987d5f33af4b783f6e5486b4ad73fb1c54ea1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: Awight Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logging: move files/misc/demux.py to modules/udp2log - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: logging: move files/misc/demux.py to modules/udp2log .. logging: move files/misc/demux.py to modules/udp2log This is just to move things out of the global ./files/ into module structure. Change-Id: I271ffe1998644756ef6c15e78a55eb17f8fec4c8 --- M manifests/role/logging.pp R modules/udp2log/files/demux.py 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp index 4f7420d..ad58ade 100644 --- a/manifests/role/logging.pp +++ b/manifests/role/logging.pp @@ -42,7 +42,7 @@ mode => '0544', owner => 'root', group => 'root', -source => 'puppet:///files/misc/demux.py', +source => 'puppet:///modules/udp2log/demux.py', } $error_processor_host = $::realm ? { diff --git a/files/misc/demux.py b/modules/udp2log/files/demux.py similarity index 100% rename from files/misc/demux.py rename to modules/udp2log/files/demux.py -- To view, visit https://gerrit.wikimedia.org/r/289353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I271ffe1998644756ef6c15e78a55eb17f8fec4c8 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up some warnings - change (wikimedia...tools)
jenkins-bot has submitted this change and it was merged. Change subject: Clean up some warnings .. Clean up some warnings Reverts the 'delete old table' cleanup, now that the table's gone. Uses ON DUPLICATE KEY UPDATE no-op to suppress duplicate key warnings generated by INSERT IGNORE. We should check the timing to see if the trick makes the inserts take longer. Change-Id: I08955c7f477ffe96f4b17ce55a98ed280c86a748 --- M silverpop_export/update_table.sql 1 file changed, 10 insertions(+), 8 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/silverpop_export/update_table.sql b/silverpop_export/update_table.sql index 5019eef..9791ee3 100755 --- a/silverpop_export/update_table.sql +++ b/silverpop_export/update_table.sql @@ -12,9 +12,6 @@ DROP TABLE IF EXISTS silverpop_export_dedupe_email; DROP TABLE IF EXISTS silverpop_export_stat; --- Clean up from previous schema. -DROP TABLE IF EXISTS silverpop_deleted; - CREATE TABLE IF NOT EXISTS silverpop_export_staging( id int unsigned PRIMARY KEY, -- This is actually civicrm_email.id @@ -80,9 +77,11 @@ -- recieve_date and total_amount descending should always insert -- the latest donation first, with the larger prevailing for an -- email with multiple simultaneous donations. All the rest for --- that email will be ignored due to the unique constraint. +-- that email will be ignored due to the unique constraint. We +-- use 'ON DUPLICATE KEY UPDATE' instead of 'INSERT IGNORE' as +-- the latter throws warnings. -- (12 minutes) -INSERT IGNORE INTO silverpop_export_latest +INSERT INTO silverpop_export_latest SELECT e.email, ex.original_currency, @@ -101,7 +100,8 @@ ct.contribution_status_id = 1 -- 'Completed' ORDER BY ct.receive_date DESC, -ct.total_amount DESC; +ct.total_amount DESC +ON DUPLICATE KEY UPDATE latest_currency = silverpop_export_latest.latest_currency; -- Populate data from contribution tracking, because that's fairly -- reliable. Do this before deduplication so we can attempt to make @@ -306,9 +306,11 @@ CONSTRAINT sx_email_u UNIQUE (email) ) COLLATE 'utf8_unicode_ci' AUTO_INCREMENT=1; -INSERT IGNORE INTO silverpop_excluded (email) +-- Same no-op update trick as with silverpop_export_latest +INSERT INTO silverpop_excluded (email) SELECT email -FROM log_civicrm.log_civicrm_email e; +FROM log_civicrm.log_civicrm_email e +ON DUPLICATE KEY UPDATE email = silverpop_excluded.email; DELETE silverpop_excluded FROM silverpop_excluded -- To view, visit https://gerrit.wikimedia.org/r/289592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08955c7f477ffe96f4b17ce55a98ed280c86a748 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: Awight Gerrit-Reviewer: Springle 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 route for featured article of the day - change (mediawiki...mobileapps)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/290859 Change subject: Add route for featured article of the day .. Add route for featured article of the day Currently only for enwiki only. Code adopted from the iOS app. Added a dateUtil library since this is probably useful for other feed endpoints as well. You can specify 'today' to get the current day or skip it. Bug: T132764 Change-Id: I8aa1db44d1ffdf8d618241c3c177af4036ffba11 --- A lib/dateUtil.js M lib/mobile-util.js A routes/featured.js M spec.yaml A test/features/featured/pagecontent.js 5 files changed, 303 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps refs/changes/59/290859/1 diff --git a/lib/dateUtil.js b/lib/dateUtil.js new file mode 100644 index 000..9640e24 --- /dev/null +++ b/lib/dateUtil.js @@ -0,0 +1,58 @@ +'use strict'; + +var sUtil = require('../lib/util'); + +const monthNames = ["January", "February", "March", "April", "May", "June", +"July", "August", "September", "October", "November", "December" +]; + +/** + * Returns a String formatted in English date format. + * + * Example: "May 16, 2016" + * + * @param {Date} date date to be used + * @return {String} formatted date string + */ +function formatDateEnglish(date) { +const year = date.getFullYear().toString(); +const month = monthNames[date.getMonth()]; +const day = date.getDate().toString(); +return `${month} ${day}, ${year}`; +} + +/** + * Returns a Date object with the desired date as specified in the request. + * The expected format is "/mm/dd". If no date or "today" is specified then return 'undefined'. + * + * Example: "May 16, 2016" + * + * @param {Date} date date to be used + * @return {String} formatted date string + */ +function getRequestedDate(req) { +const = req.params.; +const mm = req.params.mm; +const dd = req.params.dd; +let date; + +if ( && !== 'today') { +if (!mm || !dd) { +throw new sUtil.HTTPError({ +status: 404, +type: 'invalid_parameters', +title: 'If specifying a date you need to specify a full date, at least for now', +detail: 'Specify a date in the URI like /mm/dd' +}); +} +date = new Date(Date.UTC(, mm - 1, dd)); // month is 0-based +} else { +date = new Date(Date.now()); +} +return date; +} + +module.exports = { +formatDateEnglish: formatDateEnglish, +getRequestedDate: getRequestedDate +}; diff --git a/lib/mobile-util.js b/lib/mobile-util.js index c1676d3..a88c00f 100644 --- a/lib/mobile-util.js +++ b/lib/mobile-util.js @@ -37,6 +37,16 @@ } /** + * Sets the ETag header on the response object to a specified value. + * + * @param {Object} response the HTTPResponse object on which to set the header + * @param {Object} value to set the ETag to + */ +function setETagToValue(response, value) { +response.set('etag', '' + value); +} + +/** * Sets the ETag header on the response object. First, the request object is * checked for the X-Restbase-ETag header. If present, that is used as the ETag * header. Otherwise, a new ETag is created, comprised of the revision ID and @@ -56,11 +66,12 @@ if (!tid) { tid = uuid.now().toString(); } -response.set('etag', '' + revision + '/' + tid); +setETagToValue(response, revision + '/' + tid); } module.exports = { filterEmpty: filterEmpty, defaultVal: defaultVal, +setETagToValue: setETagToValue, setETag: setETag }; diff --git a/routes/featured.js b/routes/featured.js new file mode 100644 index 000..4d4985f --- /dev/null +++ b/routes/featured.js @@ -0,0 +1,128 @@ +/** + * Featured article of the day + */ + +'use strict'; + +var preq = require('preq'); +var mwapi = require('../lib/mwapi'); +var dateUtil = require('../lib/dateUtil'); +var mUtil = require('../lib/mobile-util'); +var sUtil = require('../lib/util'); +var util = require('util'); + +/** + * The main router object + */ +var router = sUtil.router(); + +/** + * The main application object reported when this module is require()d + */ +var app; + +// -- functions dealing with the backend request: + +/** + * Builds the request to get the Featured article of a given date. + * + * @param {Object} app the application object + * @param {Object} req the request object + * @param {Date} date for which day the featured article is requested + * @return {Promise} a promise resolving as an JSON object containing the response + */ +function requestFeaturedArticle(app, req, date) { +let formattedDateString = dateUtil.formatDateEnglish(date); +return mwapi.apiGet(app, req, { +"action": "query", +"format": "json", +"formatversion": 2, +"exchars": 100, +"explaintext": false, +"titles":
[MediaWiki-commits] [Gerrit] Log number of rows exported - change (wikimedia...tools)
jenkins-bot has submitted this change and it was merged. Change subject: Log number of rows exported .. Log number of rows exported Change-Id: I60a4d943596c8890906f4f57b1073bdefc6a3a3d --- M silverpop_export/export.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/silverpop_export/export.py b/silverpop_export/export.py index e4cbd9d..e707efe 100644 --- a/silverpop_export/export.py +++ b/silverpop_export/export.py @@ -52,6 +52,7 @@ # Make sure we've got the table headers try: first = gen.next() +num_rows = 1 # Get the order of keys and sort them alphabetically so it doesn't come # out as complete soup @@ -61,12 +62,14 @@ for row in gen: w.writerow(order_keyed_row(keys, row)) +num_rows += 1 + except StopIteration: pass output.flush() output.close() - +log.info("Wrote %d rows" % num_rows) def export_data(output_path=None): db = DbConnection(**config.silverpop_db) -- To view, visit https://gerrit.wikimedia.org/r/289714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60a4d943596c8890906f4f57b1073bdefc6a3a3d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fire IP velocity filter early - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Fire IP velocity filter early .. Fire IP velocity filter early Run the first time we see them, let them get one attempt on that credit, and then fire again on every subsequent attempt. Change-Id: Ibccebdccf4f6758dc7c9f07d467eaeb74a619edd --- M DonationInterface.php M extras/custom_filters/filters/ip_velocity/ip_velocity.body.php 2 files changed, 38 insertions(+), 2 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/DonationInterface.php b/DonationInterface.php index 0373e3f..aba8dec 100644 --- a/DonationInterface.php +++ b/DonationInterface.php @@ -930,6 +930,7 @@ $wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Referrer::onFilter' ); $wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Source::onFilter' ); $wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Functions::onInitialFilter' ); +$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_IP_Velocity::onInitialFilter' ); // And these are run when we're about ready to charge the credit card. // Any test that costs us money should go here. It's ok to run simple diff --git a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php index 9188ede..e99a532 100644 --- a/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php +++ b/extras/custom_filters/filters/ip_velocity/ip_velocity.body.php @@ -38,6 +38,7 @@ $this->cfo->addRiskScore( 0, 'IPWhitelist' ); return true; } + // TODO: this blacklist business should happen elsewhere, and on every hit. if ( DataValidator::ip_is_listed( $user_ip, $this->gateway_adapter->getGlobal( 'IPBlacklist' ) ) ) { $this->gateway_adapter->debugarray[] = "IP present in blacklist."; $this->cfo->addRiskScore( $this->gateway_adapter->getGlobal( 'IPVelocityFailScore' ), 'IPBlacklist' ); @@ -154,16 +155,50 @@ $new_velocity_records[] = $nowstamp; return $new_velocity_records; } - + + /** +* This is called when we're actually talking to the processor. +* We don't call on the first attempt in this session, since +* onInitialFilter already struck once. +* @param GatewayType $gateway_adapter +* @param Gateway_Extras_CustomFilters $custom_filter_object +* @return bool +*/ static function onFilter( $gateway_adapter, $custom_filter_object ) { if ( !$gateway_adapter->getGlobal( 'EnableIPVelocityFilter' ) ){ + return true; + } + if ( + $gateway_adapter->getRequest()->getSessionData( 'initialIPVelocity' ) && + !$gateway_adapter->getRequest()->getSessionData( 'numAttempt' ) + ) { + // We're on the first attempt, already counted in onInitialFilter return true; } $gateway_adapter->debugarray[] = 'IP Velocity onFilter hook!'; return self::singleton( $gateway_adapter, $custom_filter_object )->filter(); } - + + /** +* Run the filter if we haven't for this session, and set a flag +* @param GatewayType $gateway_adapter +* @param Gateway_Extras_CustomFilters $custom_filter_object +* @return bool +*/ + static function onInitialFilter( $gateway_adapter, $custom_filter_object ) { + if ( !$gateway_adapter->getGlobal( 'EnableIPVelocityFilter' ) ){ + return true; + } + if ( $gateway_adapter->getRequest()->getSessionData( 'initialIPVelocity' ) ) { + return true; + } + + $gateway_adapter->getRequest()->setSessionData( 'initialIPVelocity', true ); + $gateway_adapter->debugarray[] = 'IP Velocity onFilter hook!'; + return self::singleton( $gateway_adapter, $custom_filter_object )->filter(); + } + static function onPostProcess( GatewayType $gateway_adapter ) { if ( !$gateway_adapter->getGlobal( 'EnableIPVelocityFilter' ) ){ return true; -- To view, visit https://gerrit.wikimedia.org/r/289809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibccebdccf4f6758dc7c9f07d467eaeb74a619edd Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: AndyRussG Gerrit-Reviewer: Awight
[MediaWiki-commits] [Gerrit] install_server: move mirrors stuff to own role - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: install_server: move mirrors stuff to own role .. install_server: move mirrors stuff to own role Move the mirrors things to a separate role, like the comment said to do. no-op on carbon: http://puppet-compiler.wmflabs.org/2921/ Bug:T132757 Change-Id: I9beae993d59618ea080314ca67e7457683eff984 --- M manifests/role/installserver.pp A modules/role/manifests/installserver/mirrors.pp 2 files changed, 16 insertions(+), 14 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp index 88bd6a4..2e3679e 100644 --- a/manifests/role/installserver.pp +++ b/manifests/role/installserver.pp @@ -30,22 +30,9 @@ include base::firewall include role::backup::host +include role::installserver::mirrors include install_server::apt_repository include install_server::preseed_server - -# mirrors stuff. these should be moved to their own role class eventually -include mirrors::serve -include mirrors::ubuntu -nrpe::monitor_service {'check_ubuntu_mirror': -description => 'Ubuntu mirror in sync with upstream', -nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror /srv/mirrors/ubuntu', -} - -include mirrors::debian -nrpe::monitor_service {'check_debian_mirror': -description => 'Debian mirror in sync with upstream', -nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror /srv/mirrors/debian', -} include mirrors::tails diff --git a/modules/role/manifests/installserver/mirrors.pp b/modules/role/manifests/installserver/mirrors.pp new file mode 100644 index 000..9bffa00 --- /dev/null +++ b/modules/role/manifests/installserver/mirrors.pp @@ -0,0 +1,15 @@ +class role::installserver::mirrors { + +include mirrors::serve +include mirrors::ubuntu +nrpe::monitor_service {'check_ubuntu_mirror': +description => 'Ubuntu mirror in sync with upstream', +nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror /srv/mirrors/ubuntu', +} + +include mirrors::debian +nrpe::monitor_service {'check_debian_mirror': +description => 'Debian mirror in sync with upstream', +nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror /srv/mirrors/debian', +} +} -- To view, visit https://gerrit.wikimedia.org/r/284809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9beae993d59618ea080314ca67e7457683eff984 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon Liambotis 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 mediawiki_api gem to 1.7.1 - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290845 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Ifdfc37c43acac9129cf839d4c7eecac24955997d --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/45/290845/1 diff --git a/Gemfile b/Gemfile index cd8b19f..b599272 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.35.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifdfc37c43acac9129cf839d4c7eecac24955997d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...RelatedArticles)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290850 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I343b2775516416144e7b38840ec5b2985a9aa016 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles refs/changes/50/290850/1 diff --git a/Gemfile b/Gemfile index a565b95..1b0c840 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I343b2775516416144e7b38840ec5b2985a9aa016 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedArticles Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...MobileFrontend)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290844 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I65a811fe082e5628b71ed8bd95d052e5957dda7d --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/44/290844/1 diff --git a/Gemfile b/Gemfile index eb513ca..3f8ebe7 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ gem 'chunky_png', '~> 1.3.4' gem 'jsduck', '~> 5.3.4' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'page-object', '1.1.0' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65a811fe082e5628b71ed8bd95d052e5957dda7d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...WikiLove)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290857 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I806e495ee95b39c6f553666ac494af3f48ca5e8b --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove refs/changes/57/290857/1 diff --git a/Gemfile b/Gemfile index c897362..5f55110 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '0.33.0', require: false -- To view, visit https://gerrit.wikimedia.org/r/290857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I806e495ee95b39c6f553666ac494af3f48ca5e8b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLove Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...UniversalLanguageSelector)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290853 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I69497c6c23572fa844f1de245e918006af16920c --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/53/290853/1 diff --git a/Gemfile b/Gemfile index b87770d..265852f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.2' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rubocop', '~> 0.35.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69497c6c23572fa844f1de245e918006af16920c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...TwnMainPage)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290852 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Id6985455e298999d87f043724c8f8efbbd55598c --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/52/290852/1 diff --git a/Gemfile b/Gemfile index b87770d..265852f 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.2' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rubocop', '~> 0.35.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6985455e298999d87f043724c8f8efbbd55598c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...PageTriage)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290846 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Ie29353a1223a3ed4f15a714fbdff3bedf1869303 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage refs/changes/46/290846/1 diff --git a/Gemfile b/Gemfile index cd8b19f..b599272 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.35.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie29353a1223a3ed4f15a714fbdff3bedf1869303 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Gather)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290841 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I11a9e39e28c2d23aaf219eea6e90fc056b680b1b --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/41/290841/1 diff --git a/Gemfile b/Gemfile index d5867fa..e8d8160 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'page-object', '1.1.0' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.34.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11a9e39e28c2d23aaf219eea6e90fc056b680b1b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Wikidata)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290856 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I07934ded15619930706e78150d9c89d38c3073bf --- M extensions/Wikibase/Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/56/290856/1 diff --git a/extensions/Wikibase/Gemfile b/extensions/Wikibase/Gemfile index 2f651b6..6f2e999 100644 --- a/extensions/Wikibase/Gemfile +++ b/extensions/Wikibase/Gemfile @@ -5,7 +5,7 @@ gem 'activesupport', '~> 4.2', '>= 4.2.6' gem 'mediawiki_api-wikidata', '~> 0.2.0' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'parallel_tests', '~> 2.5' gem 'rake', '~> 11.1', '>= 11.1.2' gem 'require_all', '~> 1.3', '>= 1.3.3' -- To view, visit https://gerrit.wikimedia.org/r/290856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07934ded15619930706e78150d9c89d38c3073bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Translate)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290851 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I218553f279aa82864e3635119c5d992655142c44 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/51/290851/1 diff --git a/Gemfile b/Gemfile index db5597d..ae4f910 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.2' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rubocop', '~> 0.34.2', require: false -- To view, visit https://gerrit.wikimedia.org/r/290851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I218553f279aa82864e3635119c5d992655142c44 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...ZeroPortal)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290858 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: If572b53fd6650e155647d6f289095a9593bdf8ab --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal refs/changes/58/290858/1 diff --git a/Gemfile b/Gemfile index f8e9a13..5b68a5c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org; -gem "mediawiki_selenium", "~> 1.6.5" +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem "rake", "~> 10.4", ">= 10.4.2" gem "rubocop", "~> 0.28.0", require: false -- To view, visit https://gerrit.wikimedia.org/r/290858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If572b53fd6650e155647d6f289095a9593bdf8ab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroPortal Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...VisualEditor)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290854 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Iffc3e0aad539316bfcd71f3831ab8eda02916761 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/54/290854/1 diff --git a/Gemfile b/Gemfile index 615703b..4d94084 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'commons_upload', '~> 0.0.4' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.32.1', require: false gem 'screenshot', '~> 0.0.7' -- To view, visit https://gerrit.wikimedia.org/r/290854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffc3e0aad539316bfcd71f3831ab8eda02916761 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Wikibase)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290855 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I95c767305eecc8d6b6a2c17c6ad33552286f40d6 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/55/290855/1 diff --git a/Gemfile b/Gemfile index 2f651b6..6f2e999 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'activesupport', '~> 4.2', '>= 4.2.6' gem 'mediawiki_api-wikidata', '~> 0.2.0' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'parallel_tests', '~> 2.5' gem 'rake', '~> 11.1', '>= 11.1.2' gem 'require_all', '~> 1.3', '>= 1.3.3' -- To view, visit https://gerrit.wikimedia.org/r/290855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95c767305eecc8d6b6a2c17c6ad33552286f40d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...QuickSurveys)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290849 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I745d5d41ab3791f7de9594fb6ffa03c0f3efae74 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/49/290849/1 diff --git a/Gemfile b/Gemfile index d7bb800..242f608 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.34.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I745d5d41ab3791f7de9594fb6ffa03c0f3efae74 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...PdfHandler)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290847 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I94e8ec91aa211af94730ad5e5e3fd9abf22751f7 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PdfHandler refs/changes/47/290847/1 diff --git a/Gemfile b/Gemfile index cd8b19f..b599272 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.35.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94e8ec91aa211af94730ad5e5e3fd9abf22751f7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PdfHandler Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Popups)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290848 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I1f4055590849939c4dfa7ff5babd5d768397defb --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/48/290848/1 diff --git a/Gemfile b/Gemfile index 53577ea..f5ffd86 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ gem 'chunky_png', '~> 1.3.4' gem 'jsduck', '~> 5.3.4' -gem 'mediawiki_selenium', '~> 1.6.5' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f4055590849939c4dfa7ff5babd5d768397defb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...GettingStarted)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290842 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I373e5c09e5452f85ad08872c322f9c0c6f1455c0 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted refs/changes/42/290842/1 diff --git a/Gemfile b/Gemfile index 77acd54..93fbcaf 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.34.2', require: false -- To view, visit https://gerrit.wikimedia.org/r/290842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I373e5c09e5452f85ad08872c322f9c0c6f1455c0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GettingStarted Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...ContentTranslation)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290838 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Idd454801073432cf1de4ece217014098aafc2077 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/38/290838/1 diff --git a/Gemfile b/Gemfile index e482715..d08d5e5 100755 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' gem 'commons_upload', '~> 0.0.4' -gem 'mediawiki_selenium', '~> 1.6.2' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rubocop', '~> 0.34.2', require: false gem 'screenshot', '~> 0.0.6' -- To view, visit https://gerrit.wikimedia.org/r/290838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd454801073432cf1de4ece217014098aafc2077 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Math)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290843 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: Ied73b999f410b5b67350ca68032910a262105f3a --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/43/290843/1 diff --git a/Gemfile b/Gemfile index eba618a..130a3aa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.5' gem 'rubocop', '~> 0.33.0', require: false -- To view, visit https://gerrit.wikimedia.org/r/290843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied73b999f410b5b67350ca68032910a262105f3a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Echo)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290839 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: If9bd10840d6e88ff39c47205ed605b631e65e79c --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/39/290839/1 diff --git a/Gemfile b/Gemfile index b906d9a..1230cb2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' gem 'csscss', '~> 1.3.3' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.34.2', require: false -- To view, visit https://gerrit.wikimedia.org/r/290839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9bd10840d6e88ff39c47205ed605b631e65e79c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...Flow)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290840 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I21e4cb3b826ecd27f04add331f8386675b53d520 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/40/290840/1 diff --git a/Gemfile b/Gemfile index 136f3b8..625bf46 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org; gem "csscss", "~> 1.3.3" -gem "mediawiki_selenium", "~> 1.7" +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem "rubocop", "~> 0.32.1", require: false -- To view, visit https://gerrit.wikimedia.org/r/290840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21e4cb3b826ecd27f04add331f8386675b53d520 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...CirrusSearch)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290837 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I9b204996e9ed598fdc8239ab00061a403c1c8458 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/37/290837/1 diff --git a/Gemfile b/Gemfile index 8402319..7932a4f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org; -gem "mediawiki_selenium", "~> 1.7" +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem "mimemagic", "~> 0.3.0" gem "parallel_tests", "~> 1.7.0" gem "rake", "~> 10.4", ">= 10.4.2" -- To view, visit https://gerrit.wikimedia.org/r/290837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b204996e9ed598fdc8239ab00061a403c1c8458 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct module name for stats in executeActionWithErrorH... - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/290836 Change subject: Use correct module name for stats in executeActionWithErrorHandling() .. Use correct module name for stats in executeActionWithErrorHandling() Change-Id: I7d300525c32877d6fcc940962c93b932dc4c9181 (cherry picked from commit 542640f4e2ece03a61ba9e956f235f793ac3fc56) --- M includes/api/ApiMain.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/290836/1 diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 60f2832..7f9b98b 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -471,7 +471,8 @@ $this->logRequest( $runTime ); if ( $this->mModule->isWriteMode() && $this->getRequest()->wasPosted() ) { $this->getStats()->timing( - 'api.' . $this->getModuleName() . '.executeTiming', 1000 * $runTime ); + 'api.' . $this->mModule->getModuleName() . '.executeTiming', 1000 * $runTime + ); } } catch ( Exception $e ) { $this->handleException( $e ); -- To view, visit https://gerrit.wikimedia.org/r/290836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d300525c32877d6fcc940962c93b932dc4c9181 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.28.0-wmf.3 Gerrit-Owner: KrinkleGerrit-Reviewer: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable instance restbase2005-b - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: enable instance restbase2005-b .. enable instance restbase2005-b Bug: T134016 Change-Id: Ic324709bc912322d1dd208a992a67bfe491b5ad4 --- M hieradata/hosts/restbase2005.yaml 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/hosts/restbase2005.yaml b/hieradata/hosts/restbase2005.yaml index a6634bc..0ece254 100644 --- a/hieradata/hosts/restbase2005.yaml +++ b/hieradata/hosts/restbase2005.yaml @@ -5,11 +5,11 @@ listen_address: 10.192.48.46 rpc_address: 10.192.48.46 rpc_interface: eth0 -# b: -#jmx_port: 7190 -#listen_address: 10.192.48.47 -#rpc_address: 10.192.48.47 -#rpc_interface: eth0 + b: +jmx_port: 7190 +listen_address: 10.192.48.47 +rpc_address: 10.192.48.47 +rpc_interface: eth0 # c: #jmx_port: 7191 #listen_address: 10.192.48.48 -- To view, visit https://gerrit.wikimedia.org/r/290792 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic324709bc912322d1dd208a992a67bfe491b5ad4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: EevansGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add refinery-source jars for v0.0.30 to artifacts - change (analytics/refinery)
Maven-release-user has uploaded a new change for review. https://gerrit.wikimedia.org/r/290835 Change subject: Add refinery-source jars for v0.0.30 to artifacts .. Add refinery-source jars for v0.0.30 to artifacts Change-Id: I85dac0fdc2df3f8c875953493a04247ea513fa0c --- M artifacts/refinery-camus.jar M artifacts/refinery-cassandra.jar M artifacts/refinery-core.jar M artifacts/refinery-hive.jar M artifacts/refinery-job.jar 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/35/290835/1 diff --git a/artifacts/refinery-camus.jar b/artifacts/refinery-camus.jar index 2757561..770430f 12 --- a/artifacts/refinery-camus.jar +++ b/artifacts/refinery-camus.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-camus-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-camus-0.0.30.jar \ No newline at end of file diff --git a/artifacts/refinery-cassandra.jar b/artifacts/refinery-cassandra.jar index 7ae1835..1a0d376 12 --- a/artifacts/refinery-cassandra.jar +++ b/artifacts/refinery-cassandra.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-cassandra-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-cassandra-0.0.30.jar \ No newline at end of file diff --git a/artifacts/refinery-core.jar b/artifacts/refinery-core.jar index 55b1f2b..b1535d4 12 --- a/artifacts/refinery-core.jar +++ b/artifacts/refinery-core.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-core-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-core-0.0.30.jar \ No newline at end of file diff --git a/artifacts/refinery-hive.jar b/artifacts/refinery-hive.jar index b283b03..a840b2e 12 --- a/artifacts/refinery-hive.jar +++ b/artifacts/refinery-hive.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-hive-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-hive-0.0.30.jar \ No newline at end of file diff --git a/artifacts/refinery-job.jar b/artifacts/refinery-job.jar index b4f44c3..658c885 12 --- a/artifacts/refinery-job.jar +++ b/artifacts/refinery-job.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-job-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-job-0.0.30.jar \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/290835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85dac0fdc2df3f8c875953493a04247ea513fa0c Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: Maven-release-user___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...ArticleFeedbackv5)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290832 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I5936b0ff2d42949ce61ad68972fc24f0497dfa7e --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/32/290832/1 diff --git a/Gemfile b/Gemfile index 94c4b18..837f6fe 100755 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,5 @@ source "https://rubygems.org; -gem "mediawiki_selenium" +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem "rubocop", require: false -- To view, visit https://gerrit.wikimedia.org/r/290832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5936b0ff2d42949ce61ad68972fc24f0497dfa7e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...CentralNotice)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290834 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I773c73d5a7fb672267f11f04916259ea79529f3b --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/34/290834/1 diff --git a/Gemfile b/Gemfile index d7bb800..242f608 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.34.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I773c73d5a7fb672267f11f04916259ea79529f3b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mediawiki_api gem to 1.7.1 - change (mediawiki...CentralAuth)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290833 Change subject: Update mediawiki_api gem to 1.7.1 .. Update mediawiki_api gem to 1.7.1 Required for selenium test compatibility with AuthManager Bug: T135884 Change-Id: I55b2b17aa7ebf4aeb7bebe76ab024dc27a1ee228 --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/33/290833/1 diff --git a/Gemfile b/Gemfile index c2290f9..a721c42 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.34.1', require: false -- To view, visit https://gerrit.wikimedia.org/r/290833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55b2b17aa7ebf4aeb7bebe76ab024dc27a1ee228 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo - change (analytics/refinery)
Madhuvishy has submitted this change and it was merged. Change subject: Fix typo .. Fix typo Change-Id: I3918b905827a45198056e2445e76f2f1d81104e4 --- M bin/update-refinery-source-jars 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Madhuvishy: Verified; Looks good to me, approved diff --git a/bin/update-refinery-source-jars b/bin/update-refinery-source-jars index 24305df..74699b5 100755 --- a/bin/update-refinery-source-jars +++ b/bin/update-refinery-source-jars @@ -81,7 +81,7 @@ wait ADD_COMMAND="git add ./artifacts/refinery-*.jar ./artifacts/org/wikimedia/analytics/refinery/refinery-*-${VERSION}.jar" -COMMIT COMMAND="git commit -m 'Add refinery-source jars for v${VERSION} to artifacts'" +COMMIT_COMMAND="git commit -m 'Add refinery-source jars for v${VERSION} to artifacts'" # If this is a dry run, just print the git commands to run and exit if [ "${MODE}" = "dry-run" ] ; then -- To view, visit https://gerrit.wikimedia.org/r/290831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3918b905827a45198056e2445e76f2f1d81104e4 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: MadhuvishyGerrit-Reviewer: Madhuvishy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo - change (analytics/refinery)
Madhuvishy has uploaded a new change for review. https://gerrit.wikimedia.org/r/290831 Change subject: Fix typo .. Fix typo Change-Id: I3918b905827a45198056e2445e76f2f1d81104e4 --- M bin/update-refinery-source-jars 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/31/290831/1 diff --git a/bin/update-refinery-source-jars b/bin/update-refinery-source-jars index 24305df..74699b5 100755 --- a/bin/update-refinery-source-jars +++ b/bin/update-refinery-source-jars @@ -81,7 +81,7 @@ wait ADD_COMMAND="git add ./artifacts/refinery-*.jar ./artifacts/org/wikimedia/analytics/refinery/refinery-*-${VERSION}.jar" -COMMIT COMMAND="git commit -m 'Add refinery-source jars for v${VERSION} to artifacts'" +COMMIT_COMMAND="git commit -m 'Add refinery-source jars for v${VERSION} to artifacts'" # If this is a dry run, just print the git commands to run and exit if [ "${MODE}" = "dry-run" ] ; then -- To view, visit https://gerrit.wikimedia.org/r/290831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3918b905827a45198056e2445e76f2f1d81104e4 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Comment and DRY for functions filter - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/290830 Change subject: Comment and DRY for functions filter .. Comment and DRY for functions filter Change-Id: I3d91932b8032ee5dc8d5b1cfe60bbca737e9d666 --- M extras/custom_filters/filters/functions/functions.body.php 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/30/290830/1 diff --git a/extras/custom_filters/filters/functions/functions.body.php b/extras/custom_filters/filters/functions/functions.body.php index 0711983..a25c9ca 100644 --- a/extras/custom_filters/filters/functions/functions.body.php +++ b/extras/custom_filters/filters/functions/functions.body.php @@ -24,17 +24,20 @@ } /** -* @param $filterListGlobal +* @param string $filterListGlobal Run filters listed in a DonationInterface +* global variable with name * @return bool */ public function filter( $filterListGlobal ) { + $functions = $this->gateway_adapter->getGlobal( $filterListGlobal ); - if ( !$this->gateway_adapter->getGlobal( 'EnableFunctionsFilter' ) || - !count( $this->gateway_adapter->getGlobal( $filterListGlobal ) ) ){ + if ( + !$this->gateway_adapter->getGlobal( 'EnableFunctionsFilter' ) || + !count( $functions ) + ) { return true; } - $functions = $this->gateway_adapter->getGlobal( $filterListGlobal ); foreach ( $functions as $function_name => $risk_score_modifier ) { //run the function specified, if it exists. if ( method_exists( $this->gateway_adapter, $function_name ) ) { -- To view, visit https://gerrit.wikimedia.org/r/290830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d91932b8032ee5dc8d5b1cfe60bbca737e9d666 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct module name for stats in executeActionWithErrorH... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Use correct module name for stats in executeActionWithErrorHandling() .. Use correct module name for stats in executeActionWithErrorHandling() Change-Id: I7d300525c32877d6fcc940962c93b932dc4c9181 --- M includes/api/ApiMain.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 60f2832..7f9b98b 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -471,7 +471,8 @@ $this->logRequest( $runTime ); if ( $this->mModule->isWriteMode() && $this->getRequest()->wasPosted() ) { $this->getStats()->timing( - 'api.' . $this->getModuleName() . '.executeTiming', 1000 * $runTime ); + 'api.' . $this->mModule->getModuleName() . '.executeTiming', 1000 * $runTime + ); } } catch ( Exception $e ) { $this->handleException( $e ); -- To view, visit https://gerrit.wikimedia.org/r/290738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d300525c32877d6fcc940962c93b932dc4c9181 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron SchulzGerrit-Reviewer: Anomie Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] kafka: bump submodule for lint fixes - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: kafka: bump submodule for lint fixes .. kafka: bump submodule for lint fixes For I7acf023af335f99acd8 not many left globally but in these submodules they keep popping up. Change-Id: Ia317f4d1e12b23c9f8550294ee05080017fe2d13 --- M modules/kafka 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/kafka b/modules/kafka index a3cf43d..0be8774 16 --- a/modules/kafka +++ b/modules/kafka -Subproject commit a3cf43dbb897c05bc7d1b88721d3fcb1239092df +Subproject commit 0be877447057ee8f84f11f1d13e5b37495418790 -- To view, visit https://gerrit.wikimedia.org/r/290827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia317f4d1e12b23c9f8550294ee05080017fe2d13 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename hook functions - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/290829 Change subject: Rename hook functions .. Rename hook functions onInitialFilter for the ones that only run at the start of the request Change-Id: I59bded2d37c77290385c62a417b4e3549d3839d5 --- M DonationInterface.php M extras/custom_filters/filters/referrer/referrer.body.php M extras/custom_filters/filters/source/source.body.php 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/29/290829/1 diff --git a/DonationInterface.php b/DonationInterface.php index 0373e3f..4f8b6b1 100644 --- a/DonationInterface.php +++ b/DonationInterface.php @@ -927,8 +927,8 @@ $wgHooks['GatewayValidate'][] = array( 'Gateway_Extras_CustomFilters::onValidate' ); // These filters are run on each request after collecting the data -$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Referrer::onFilter' ); -$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Source::onFilter' ); +$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Referrer::onInitialFilter' ); +$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Source::onInitialFilter' ); $wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Functions::onInitialFilter' ); // And these are run when we're about ready to charge the credit card. diff --git a/extras/custom_filters/filters/referrer/referrer.body.php b/extras/custom_filters/filters/referrer/referrer.body.php index c30425c..0e094b0 100644 --- a/extras/custom_filters/filters/referrer/referrer.body.php +++ b/extras/custom_filters/filters/referrer/referrer.body.php @@ -51,7 +51,7 @@ return TRUE; } - static function onFilter( + public static function onInitialFilter( GatewayType $gateway_adapter, Gateway_Extras_CustomFilters $custom_filter_object ) { diff --git a/extras/custom_filters/filters/source/source.body.php b/extras/custom_filters/filters/source/source.body.php index 56feeec..046babb 100644 --- a/extras/custom_filters/filters/source/source.body.php +++ b/extras/custom_filters/filters/source/source.body.php @@ -50,7 +50,7 @@ return TRUE; } - static function onFilter( + public static function onInitialFilter( GatewayType $gateway_adapter, Gateway_Extras_CustomFilters $custom_filter_object ) { -- To view, visit https://gerrit.wikimedia.org/r/290829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59bded2d37c77290385c62a417b4e3549d3839d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] basic merge command - change (wikimedia...crm)
Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/290828 Change subject: basic merge command .. basic merge command Change-Id: I2f00b8313d228b3fb0053b570f152f03eae9314c --- A sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/28/290828/1 diff --git a/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc b/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc new file mode 100644 index 000..ff22e5b --- /dev/null +++ b/sites/all/modules/wmf_civicrm/scripts/civicrm_merge.drush.inc @@ -0,0 +1,47 @@ + 'Merge CiviCRM contacts in batches', +'options' => array( + 'batch' => "Batch size", +), +); + +return $items; +} + +/** + * Implementation of hook_drush_help() + */ +function civicrm_merge_drush_help( $section ) { +switch ( $section ) { +case 'drush:civicrm_merge': +return dt( 'Merge a bunch of CiviCRM contacts' ); +} +} + +/** + * Merge a bactch of contacts using the default rule. + * + * @throws \CiviCRM_API3_Exception + */ +function drush_civicrm_merge() { +module_invoke( 'civicrm', 'initialize' ); +$start = variable_get('civicrm_merge_batch', 1); +$batch_size = (integer) drush_get_option( 'batch', variable_get( 'wmf_civicrm_merge_batch_size', 100)); +$result = civicrm_api3('Job', 'process_batch_merge', array( + 'rgid' => 4, + 'criteria' => array( +'contact' => array('id' => array('BETWEEN' => array($start, $start + $batch_size))), + ), +)); +variable_set('civicrm_merge_batch', $start + $batch_size); +drush_print("Processed id range $start to " . $start + $batch_size . ' +Merged ' . count($result['values']['merged']) . ". Skipped " . count($result['values']['skipped'])); +} -- To view, visit https://gerrit.wikimedia.org/r/290828 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f00b8313d228b3fb0053b570f152f03eae9314c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Eileen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] kafka: bump submodule for lint fixes - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/290827 Change subject: kafka: bump submodule for lint fixes .. kafka: bump submodule for lint fixes For I7acf023af335f99acd8 not many left globally but in these submodules they keep popping up. Change-Id: Ia317f4d1e12b23c9f8550294ee05080017fe2d13 --- M modules/kafka 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/290827/1 diff --git a/modules/kafka b/modules/kafka index a3cf43d..0be8774 16 --- a/modules/kafka +++ b/modules/kafka -Subproject commit a3cf43dbb897c05bc7d1b88721d3fcb1239092df +Subproject commit 0be877447057ee8f84f11f1d13e5b37495418790 -- To view, visit https://gerrit.wikimedia.org/r/290827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia317f4d1e12b23c9f8550294ee05080017fe2d13 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] kafka: fix lint warnings - change (operations...kafka)
Dzahn has submitted this change and it was merged. Change subject: kafka: fix lint warnings .. kafka: fix lint warnings Change-Id: I7acf023af335f99acd8bddd9c7ed528439909e1d --- M manifests/server/jmxtrans.pp M manifests/server/monitoring.pp 2 files changed, 9 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/server/jmxtrans.pp b/manifests/server/jmxtrans.pp index fc539c9..da5645b 100644 --- a/manifests/server/jmxtrans.pp +++ b/manifests/server/jmxtrans.pp @@ -46,11 +46,11 @@ # query for metrics from Kafka's JVM jmxtrans::metrics::jvm { $jmx: -ganglia => $ganglia, -graphite => $graphite, -statsd => $statsd, -outfile => $outfile, -group_prefix => $group_prefix, +ganglia => $ganglia, +graphite => $graphite, +statsd => $statsd, +outfile => $outfile, +group_prefix => $group_prefix, } # DRY up some often used JMX attributes. diff --git a/manifests/server/monitoring.pp b/manifests/server/monitoring.pp index 352093f..4983893 100644 --- a/manifests/server/monitoring.pp +++ b/manifests/server/monitoring.pp @@ -55,6 +55,10 @@ # Alert if any Kafka Broker replica lag is too high monitoring::graphite_threshold { 'kafka-broker-Replica-MaxLag': +# This check is too noisy because of +# https://phabricator.wikimedia.org/T121407. +# TODO: Re-enable after 0.9 upgrade. +ensure => 'absent', description => 'Kafka Broker Replica Max Lag', metric => "${group_prefix}kafka.${graphite_broker_key}.kafka.server.ReplicaFetcherManager.MaxLag.Value", # As of 2014-02 replag could catch up at more than 1000 msgs / sec, @@ -69,10 +73,6 @@ percentage => 50, require => Class['::kafka::server::jmxtrans'], group => $nagios_servicegroup, -# This check is too noisy because of -# https://phabricator.wikimedia.org/T121407. -# TODO: Re-enable after 0.9 upgrade. -ensure => 'absent', } # monitor disk statistics -- To view, visit https://gerrit.wikimedia.org/r/289980 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7acf023af335f99acd8bddd9c7ed528439909e1d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/kafka Gerrit-Branch: master Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: Mschon Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Persist risk score array in session - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Persist risk score array in session .. Persist risk score array in session Allows combining scores from different custom filters that fire on different requests. For each custom filter, the latest score is the one that contributes to the total. We send an antifraud message when the score changes - the consumer knows how to combine them. Change-Id: Ie628b22d37dc602edf199c0750b4ce4f606899d3 --- M extras/custom_filters/custom_filters.body.php M gateway_common/gateway.adapter.php 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/extras/custom_filters/custom_filters.body.php b/extras/custom_filters/custom_filters.body.php index c584d61..146043e 100644 --- a/extras/custom_filters/custom_filters.body.php +++ b/extras/custom_filters/custom_filters.body.php @@ -31,6 +31,10 @@ parent::__construct( $gateway_adapter ); //gateway_adapter is set in there. // load user action ranges and risk score $this->action_ranges = $this->gateway_adapter->getGlobal( 'CustomFiltersActionRanges' ); + $this->risk_score = $this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' ); + if ( !$this->risk_score ) { + $this->risk_score = array(); + } $this->risk_score['initial'] = $this->gateway_adapter->getGlobal( 'CustomFiltersRiskScore' ); } @@ -120,7 +124,12 @@ ); $log_message = '"' . addslashes( json_encode( $utm ) ) . '"'; $this->fraud_logger->info( '"utm" ' . $log_message ); - $this->sendAntifraudMessage( $localAction, $this->getRiskScore(), $this->risk_score ); + + $storedScores = $this->gateway_adapter->getRequest()->getSessionData( 'risk_scores' ); + if ( $storedScores != $this->risk_score ) { + $this->gateway_adapter->getRequest()->setSessionData( 'risk_scores', $this->risk_score ); + $this->sendAntifraudMessage( $localAction, $this->getRiskScore(), $this->risk_score ); + } return TRUE; } diff --git a/gateway_common/gateway.adapter.php b/gateway_common/gateway.adapter.php index 9c431de..d473e8d 100644 --- a/gateway_common/gateway.adapter.php +++ b/gateway_common/gateway.adapter.php @@ -2904,6 +2904,7 @@ 'numAttempt', 'order_status', //for post-payment activities 'sequence', + 'risk_scores', ); $preservedData = array(); $msg = ''; -- To view, visit https://gerrit.wikimedia.org/r/289804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie628b22d37dc602edf199c0750b4ce4f606899d3 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: AndyRussG Gerrit-Reviewer: Awight Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Ejegg Gerrit-Reviewer: Ssmith Gerrit-Reviewer: XenoRyet 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 GatewayInitialFilter hook - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Add GatewayInitialFilter hook .. Add GatewayInitialFilter hook Allows some fraud filtering right after GatewayReady If a custom filter is run multiple times during a single request, the last run's score will count as its contribution towards the overall gateway score. Change-Id: I2572a26e4c341fa5c03ed582360b939a12768280 --- M DonationInterface.php M extras/custom_filters/custom_filters.body.php M extras/custom_filters/filters/functions/functions.body.php M gateway_common/GatewayType.php M gateway_common/gateway.adapter.php M tests/Adapter/Worldpay/WorldpayTest.php 6 files changed, 63 insertions(+), 22 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/DonationInterface.php b/DonationInterface.php index 072baea..aebd38e 100644 --- a/DonationInterface.php +++ b/DonationInterface.php @@ -657,7 +657,14 @@ $wgDonationInterfaceCustomFiltersSrcRules = array(); //Functions Filter globals +//These functions fire when we trigger the antifraud hook. +//Anything that needs access to API call results goes here. +//FIXME: you need to copy all the initial functions here because +//individual function scores don't persist like filter scores. $wgDonationInterfaceCustomFiltersFunctions = array(); +//These functions fire on GatewayReady, so all they can see is the +//request and the session. +$wgDonationInterfaceCustomFiltersInitialFunctions = array(); //IP velocity filter globals $wgDonationInterfaceMemcacheHost = 'localhost'; @@ -889,13 +896,21 @@ $wgSpecialPages['WorldpayGatewayResult'] = 'WorldpayGatewayResult'; $wgDonationInterfaceGatewayAdapters[] = 'WorldpayAdapter'; -//Custom Filters hooks $wgHooks['GatewayReady'][] = array( 'BannerHistoryLogIdProcessor::onGatewayReady' ); +// Custom Filters hooks +$wgHooks['GatewayReady'][] = array( 'Gateway_Extras_CustomFilters::onGatewayReady' ); $wgHooks['GatewayValidate'][] = array( 'Gateway_Extras_CustomFilters::onValidate' ); -$wgHooks['GatewayCustomFilter'][] = array( 'Gateway_Extras_CustomFilters_Referrer::onFilter' ); -$wgHooks['GatewayCustomFilter'][] = array( 'Gateway_Extras_CustomFilters_Source::onFilter' ); +// These filters are run on each request after collecting the data +$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Referrer::onFilter' ); +$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Source::onFilter' ); +$wgHooks['GatewayInitialFilter'][] = array( 'Gateway_Extras_CustomFilters_Functions::onInitialFilter' ); + +// And these are run when we're about ready to charge the credit card. +// Any test that costs us money should go here. It's ok to run simple +// filters in both places - their score in the later run will replace +// the first score. $wgHooks['GatewayCustomFilter'][] = array( 'Gateway_Extras_CustomFilters_Functions::onFilter' ); $wgHooks['GatewayCustomFilter'][] = array( 'Gateway_Extras_CustomFilters_MinFraud::onFilter' ); $wgHooks['GatewayCustomFilter'][] = array( 'Gateway_Extras_CustomFilters_IP_Velocity::onFilter' ); diff --git a/extras/custom_filters/custom_filters.body.php b/extras/custom_filters/custom_filters.body.php index 4e86dd8..c584d61 100644 --- a/extras/custom_filters/custom_filters.body.php +++ b/extras/custom_filters/custom_filters.body.php @@ -71,8 +71,6 @@ $log_message = "\"$source added a score of $score\""; $this->fraud_logger->info( '"addRiskScore" ' . $log_message ); $this->risk_score[$source] = $score; - - $this->gateway_adapter->addRiskScore( $score ); } @@ -100,13 +98,16 @@ /** * Run the transaction through the custom filters */ - public function validate() { + public function validate( $hook ) { // expose a hook for custom filters - WmfFramework::runHooks( 'GatewayCustomFilter', array( $this->gateway_adapter, $this ) ); + WmfFramework::runHooks( $hook, array( $this->gateway_adapter, $this ) ); + $score = $this->getRiskScore(); + $this->gateway_adapter->setRiskScore( $score ); $localAction = $this->determineAction(); $this->gateway_adapter->setValidationAction( $localAction ); - $log_message = '"' . $localAction . "\"\t\"" . $this->getRiskScore() . "\""; + $log_message = '"' . $localAction . "\"\t\"" . $score . "\""; + $this->fraud_logger->info( '"Filtered" ' . $log_message ); $log_message = '"' . addslashes( json_encode( $this->risk_score ) ) . '"'; @@ -129,7 +130,15 @@ return true; } $gateway_adapter->debugarray[] = 'custom filters onValidate hook!'; - return self::singleton( $gateway_adapter
[MediaWiki-commits] [Gerrit] Add dry run mode to update jars script - change (analytics/refinery)
Madhuvishy has submitted this change and it was merged. Change subject: Add dry run mode to update jars script .. Add dry run mode to update jars script Change-Id: Ief34defc1f48f6ec1e64f6aa2c66e1c7577998f2 --- M bin/update-refinery-source-jars 1 file changed, 35 insertions(+), 15 deletions(-) Approvals: Madhuvishy: Verified; Looks good to me, approved diff --git a/bin/update-refinery-source-jars b/bin/update-refinery-source-jars index 92a7f3e..24305df 100755 --- a/bin/update-refinery-source-jars +++ b/bin/update-refinery-source-jars @@ -12,15 +12,17 @@ VERSION= BRANCH="master" GERRIT_USER= -MODE="review" +MODE="dry-run" + +SCRIPT_NAME=$(basename $0) function HELP { - echo "Usage: ./bin/update-refinery-source-jars -v -u [-b -m ]" + echo "Usage: ${SCRIPT_NAME} -v -u [-b -m ]" echo "Always run this script from refinery root" echo "-v -- Refinery source version for which jars are to be updated. Eg. 0.0.26. Required" echo "-u -- Gerrit user making the jar update commit. Required" echo "-b -- Git branch in refinery to which the jar update commit should be pushed to. Default is master" - echo "-m -- Mode for sending updates to git remote. Values can be review or push. Defaut is review" + echo "-m -- Mode for sending updates to git remote. Values can be review, push, or dry-run. Default is dry-run" echo "-h -- Display help text" } @@ -49,7 +51,7 @@ ;; \?) #unrecognized option - show help echo "Option -$OPTARG not recognized." - echo "See ./bin/update-refinery-source-jars -h for help" + echo "See ${SCRIPT_NAME} -h for help" exit 1 ;; esac @@ -57,32 +59,50 @@ if [ -z "${VERSION}" ] || [ -z "${GERRIT_USER}" ] ; then echo "Missing required parameters for VERSION(-v) or GERRIT_USER(-u)" - echo "See ./bin/update-refinery-source-jars -h for help" + echo "See ${SCRIPT_NAME} -h for help" exit 1 fi -if [ "${MODE}" != "push" ] && [ "${MODE}" != "review" ] ; then - echo "Value for mode parameter (-m) can only be push or review" - echo "See ./bin/update-refinery-source-jars -h for help" +if [ "${MODE}" != "push" ] && [ "${MODE}" != "review" ] && [ "${MODE}" != "dry-run"]; then + echo "Value for mode parameter (-m) can only be push, review or dry-run" + echo "See ${SCRIPT_NAME} -h for help" exit 1 fi archiva_base_uri="https://archiva.wikimedia.org/repository/releases/org/wikimedia/analytics/refinery; +# This list is hardcoded now. TODO: Make this configurable for j in camus core job cassandra hive; do (wget "${archiva_base_uri}/$j/refinery-$j/$VERSION/refinery-$j-$VERSION.jar" \ --O ./artifacts/org/wikimedia/analytics/refinery/refinery-$j-$VERSION.jar \ -&& ln -sfv org/wikimedia/analytics/refinery/refinery-$j-$VERSION.jar ./artifacts/refinery-$j.jar) & +-O ./artifacts/org/wikimedia/analytics/refinery/refinery-$j-${VERSION}.jar \ +&& ln -sfv org/wikimedia/analytics/refinery/refinery-$j-${VERSION}.jar ./artifacts/refinery-$j.jar) & done wait -git-fat init -gitdir=$(git rev-parse --git-dir); scp -p -P 29418 ${GERRIT_USER}@gerrit.wikimedia.org:hooks/commit-msg ${gitdir}/hooks/ -git add ./artifacts/refinery-*.jar ./artifacts/org/wikimedia/analytics/refinery/refinery-*-$VERSION.jar -git commit -m "Add refinery-source jars for v${VERSION} to artifacts" +ADD_COMMAND="git add ./artifacts/refinery-*.jar ./artifacts/org/wikimedia/analytics/refinery/refinery-*-${VERSION}.jar" +COMMIT COMMAND="git commit -m 'Add refinery-source jars for v${VERSION} to artifacts'" + +# If this is a dry run, just print the git commands to run and exit +if [ "${MODE}" = "dry-run" ] ; then + echo "Run the following commands to commit the new jars" + echo $ADD_COMMAND + echo $COMMIT_COMMAND + exit 0 +fi + +# Set up git fat and gerrit commit message hook +git fat init +gitdir=$(git rev-parse --git-dir) +scp -p -P 29418 ${GERRIT_USER}@gerrit.wikimedia.org:hooks/commit-msg ${gitdir}/hooks/ + +# Run the git add and commit commands +eval $ADD_COMMAND +eval $COMMIT_COMMAND + +# Push to the remote git branch if on push mode, else submit for gerrit review if [ "${MODE}" = "push" ] ; then - git push origin ${BRANCH} + git push origin ${BRANCH} elif [ "${MODE}" = "review" ] ; then git push origin HEAD:refs/for/${BRANCH} fi -- To view, visit https://gerrit.wikimedia.org/r/290826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief34defc1f48f6ec1e64f6aa2c66e1c7577998f2 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: MadhuvishyGerrit-Reviewer: Madhuvishy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add dry run mode to update jars script - change (analytics/refinery)
Madhuvishy has uploaded a new change for review. https://gerrit.wikimedia.org/r/290826 Change subject: Add dry run mode to update jars script .. Add dry run mode to update jars script Change-Id: Ief34defc1f48f6ec1e64f6aa2c66e1c7577998f2 --- M bin/update-refinery-source-jars 1 file changed, 35 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/26/290826/1 diff --git a/bin/update-refinery-source-jars b/bin/update-refinery-source-jars index 92a7f3e..24305df 100755 --- a/bin/update-refinery-source-jars +++ b/bin/update-refinery-source-jars @@ -12,15 +12,17 @@ VERSION= BRANCH="master" GERRIT_USER= -MODE="review" +MODE="dry-run" + +SCRIPT_NAME=$(basename $0) function HELP { - echo "Usage: ./bin/update-refinery-source-jars -v -u [-b -m ]" + echo "Usage: ${SCRIPT_NAME} -v -u [-b -m ]" echo "Always run this script from refinery root" echo "-v -- Refinery source version for which jars are to be updated. Eg. 0.0.26. Required" echo "-u -- Gerrit user making the jar update commit. Required" echo "-b -- Git branch in refinery to which the jar update commit should be pushed to. Default is master" - echo "-m -- Mode for sending updates to git remote. Values can be review or push. Defaut is review" + echo "-m -- Mode for sending updates to git remote. Values can be review, push, or dry-run. Default is dry-run" echo "-h -- Display help text" } @@ -49,7 +51,7 @@ ;; \?) #unrecognized option - show help echo "Option -$OPTARG not recognized." - echo "See ./bin/update-refinery-source-jars -h for help" + echo "See ${SCRIPT_NAME} -h for help" exit 1 ;; esac @@ -57,32 +59,50 @@ if [ -z "${VERSION}" ] || [ -z "${GERRIT_USER}" ] ; then echo "Missing required parameters for VERSION(-v) or GERRIT_USER(-u)" - echo "See ./bin/update-refinery-source-jars -h for help" + echo "See ${SCRIPT_NAME} -h for help" exit 1 fi -if [ "${MODE}" != "push" ] && [ "${MODE}" != "review" ] ; then - echo "Value for mode parameter (-m) can only be push or review" - echo "See ./bin/update-refinery-source-jars -h for help" +if [ "${MODE}" != "push" ] && [ "${MODE}" != "review" ] && [ "${MODE}" != "dry-run"]; then + echo "Value for mode parameter (-m) can only be push, review or dry-run" + echo "See ${SCRIPT_NAME} -h for help" exit 1 fi archiva_base_uri="https://archiva.wikimedia.org/repository/releases/org/wikimedia/analytics/refinery; +# This list is hardcoded now. TODO: Make this configurable for j in camus core job cassandra hive; do (wget "${archiva_base_uri}/$j/refinery-$j/$VERSION/refinery-$j-$VERSION.jar" \ --O ./artifacts/org/wikimedia/analytics/refinery/refinery-$j-$VERSION.jar \ -&& ln -sfv org/wikimedia/analytics/refinery/refinery-$j-$VERSION.jar ./artifacts/refinery-$j.jar) & +-O ./artifacts/org/wikimedia/analytics/refinery/refinery-$j-${VERSION}.jar \ +&& ln -sfv org/wikimedia/analytics/refinery/refinery-$j-${VERSION}.jar ./artifacts/refinery-$j.jar) & done wait -git-fat init -gitdir=$(git rev-parse --git-dir); scp -p -P 29418 ${GERRIT_USER}@gerrit.wikimedia.org:hooks/commit-msg ${gitdir}/hooks/ -git add ./artifacts/refinery-*.jar ./artifacts/org/wikimedia/analytics/refinery/refinery-*-$VERSION.jar -git commit -m "Add refinery-source jars for v${VERSION} to artifacts" +ADD_COMMAND="git add ./artifacts/refinery-*.jar ./artifacts/org/wikimedia/analytics/refinery/refinery-*-${VERSION}.jar" +COMMIT COMMAND="git commit -m 'Add refinery-source jars for v${VERSION} to artifacts'" + +# If this is a dry run, just print the git commands to run and exit +if [ "${MODE}" = "dry-run" ] ; then + echo "Run the following commands to commit the new jars" + echo $ADD_COMMAND + echo $COMMIT_COMMAND + exit 0 +fi + +# Set up git fat and gerrit commit message hook +git fat init +gitdir=$(git rev-parse --git-dir) +scp -p -P 29418 ${GERRIT_USER}@gerrit.wikimedia.org:hooks/commit-msg ${gitdir}/hooks/ + +# Run the git add and commit commands +eval $ADD_COMMAND +eval $COMMIT_COMMAND + +# Push to the remote git branch if on push mode, else submit for gerrit review if [ "${MODE}" = "push" ] ; then - git push origin ${BRANCH} + git push origin ${BRANCH} elif [ "${MODE}" = "review" ] ; then git push origin HEAD:refs/for/${BRANCH} fi -- To view, visit https://gerrit.wikimedia.org/r/290826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief34defc1f48f6ec1e64f6aa2c66e1c7577998f2 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zookeeper: bump submodule - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: zookeeper: bump submodule .. zookeeper: bump submodule update for lint fixes Iecad5e53293cbf6 Change-Id: Iaf5b7bdfd9c6854cbd0c7ff1b1d63a305ac8706b --- M modules/zookeeper 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/zookeeper b/modules/zookeeper index 6e3a24b..a46a24a 16 --- a/modules/zookeeper +++ b/modules/zookeeper -Subproject commit 6e3a24b08327f61bb09a9924e76e51c09180b3d9 +Subproject commit a46a24ac94a0caca9d301c146ad310b7178fb220 -- To view, visit https://gerrit.wikimedia.org/r/290823 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf5b7bdfd9c6854cbd0c7ff1b1d63a305ac8706b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add in-process caching to ChoiceDataProvider - change (mediawiki...CentralNotice)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/290825 Change subject: Add in-process caching to ChoiceDataProvider .. Add in-process caching to ChoiceDataProvider ChoiceDataProvider::getChoices accounts for about 7% of load.php execution time. (Based on Wikimedia-wide sampling from Xenon over 24 hours). Three different callers ask to query the same data from the database. Reverse flame-graph: https://performance.wikimedia.org/xenon/svgs/daily/2016-05-24.load.reversed.svgz * ChoiceDataProvider::getChoices() - CNChoiceDataResourceLoaderModule()::getFromDb() - CNChoiceDataResourceLoaderModule::getChoices() - CNChoiceDataResourceLoaderModule::getDependencies() - ResourceLoader/StartupModule - CNChoiceDataResourceLoaderModule::getModifiedHash() - ResourceLoader/Module::getVersionHash() - ResourceLoader/StartupModule - ResourceLoader::makeModuleResponse() - CNChoiceDataResourceLoaderModule::getScript() - ResourceLoader::makeModuleResponse() The web response for modules=startup computes it twice (once for dependencies, and again for the version hash). The web response for modules=ext.centralNotice.choiceData also computes it twice (once for the script body, and again for the version header). Change-Id: Iff0ea19248c9458dd109f05d620616516ee3ada6 --- M includes/ChoiceDataProvider.php 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/25/290825/1 diff --git a/includes/ChoiceDataProvider.php b/includes/ChoiceDataProvider.php index b68a87f..809135d 100644 --- a/includes/ChoiceDataProvider.php +++ b/includes/ChoiceDataProvider.php @@ -5,6 +5,8 @@ * given project and language combination. */ class ChoiceDataProvider { + /** @var HashBagOStuff */ + private static $cache; protected $project; protected $language; @@ -14,7 +16,6 @@ * @param string $language The language to get choices for */ public function __construct( $project, $language ) { - $this->project = $project; $this->language = $language; } @@ -29,6 +30,20 @@ * are provided. */ public function getChoices() { + if ( !self::$cache ) { + self::$cache = new HashBagOStuff( [ 'maxKeys' => 10 ] ); + } + $cache = self::$cache; + return $cache->getWithSetCallback( + $cache->makeKey( $this->project, $this->language ), + $cache::TTL_PROC_SHORT, + function () { + return $this->fetchChoices(); + } + ); + } + + private function fetchChoices() { // For speed, we'll do our own queries instead of using methods in // Campaign and Banner. -- To view, visit https://gerrit.wikimedia.org/r/290825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff0ea19248c9458dd109f05d620616516ee3ada6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor clean up in CNChoiceDataResourceLoaderModule - change (mediawiki...CentralNotice)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/290824 Change subject: Minor clean up in CNChoiceDataResourceLoaderModule .. Minor clean up in CNChoiceDataResourceLoaderModule * Remove a few spurious line breaks. * Use ! operator instead of count(). * Return inline empty array and move $dependencies lower down. Change-Id: Ia398d275502d91bc221d6dbd80f7d7af58225e56 --- M includes/CNChoiceDataResourceLoaderModule.php 1 file changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/24/290824/1 diff --git a/includes/CNChoiceDataResourceLoaderModule.php b/includes/CNChoiceDataResourceLoaderModule.php index 440bdda..422fd7d 100644 --- a/includes/CNChoiceDataResourceLoaderModule.php +++ b/includes/CNChoiceDataResourceLoaderModule.php @@ -47,9 +47,7 @@ * @param string $language */ protected function getFromDb( $project, $language ) { - $choicesProvider = new ChoiceDataProvider( $project, $language ); - return $choicesProvider->getChoices(); } @@ -109,9 +107,7 @@ public function getScript( ResourceLoaderContext $context ) { $choices = $this->getChoices( $context ); - - if ( count( $choices ) === 0 ) { - + if ( !$choices ) { // If there are no choices, this module will have no dependencies, // but other modules that create mw.centralNotice may be brought // in elsewhere. Let's the check for its existence here, too, for @@ -146,18 +142,15 @@ return array(); } - - $dependencies = array(); - // Get the choices (possible campaigns and banners) for this user $choices = $this->getChoices( $context ); - - // If there are no choices, no dependencies - if ( count( $choices ) === 0 ) { - return $dependencies; + if ( !$choices ) { + // If there are no choices, no dependencies + return array(); } // Run through the choices to get all needed mixin RL modules + $dependencies = array(); foreach ( $choices as $choice ) { foreach ( $choice['mixins'] as $mixinName => $mixinParams ) { -- To view, visit https://gerrit.wikimedia.org/r/290824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia398d275502d91bc221d6dbd80f7d7af58225e56 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zookeeper: bump submodule - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/290823 Change subject: zookeeper: bump submodule .. zookeeper: bump submodule update for lint fixes Iecad5e53293cbf6 Change-Id: Iaf5b7bdfd9c6854cbd0c7ff1b1d63a305ac8706b --- M modules/zookeeper 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/23/290823/1 diff --git a/modules/zookeeper b/modules/zookeeper index 6e3a24b..a46a24a 16 --- a/modules/zookeeper +++ b/modules/zookeeper -Subproject commit 6e3a24b08327f61bb09a9924e76e51c09180b3d9 +Subproject commit a46a24ac94a0caca9d301c146ad310b7178fb220 -- To view, visit https://gerrit.wikimedia.org/r/290823 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf5b7bdfd9c6854cbd0c7ff1b1d63a305ac8706b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zookeeper: fix lint warnings - change (operations...zookeeper)
Dzahn has submitted this change and it was merged. Change subject: zookeeper: fix lint warnings .. zookeeper: fix lint warnings Change-Id: Iecad5e53293cbf6e40ee22ddac89d09a78bca9b5 --- M manifests/jmxtrans.pp M manifests/server.pp M tests/server.pp M tests/zookeeper.pp 4 files changed, 16 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/jmxtrans.pp b/manifests/jmxtrans.pp index 3d82d35..cc3cafb 100644 --- a/manifests/jmxtrans.pp +++ b/manifests/jmxtrans.pp @@ -35,8 +35,8 @@ # query for metrics from zookeeper's JVM jmxtrans::metrics::jvm { $jmx: -outfile => $outfile, -ganglia => $ganglia, -graphite => $graphite, +outfile => $outfile, +ganglia => $ganglia, +graphite => $graphite, } -} \ No newline at end of file +} diff --git a/manifests/server.pp b/manifests/server.pp index 0db023c..680eb2a 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -50,8 +50,8 @@ content => $myid, } file { "${::zookeeper::data_dir}/myid": -ensure => 'link', -target => '/etc/zookeeper/conf/myid', +ensure => 'link', +target => '/etc/zookeeper/conf/myid', } service { 'zookeeper': diff --git a/tests/server.pp b/tests/server.pp index 67808d1..4f7c3d2 100644 --- a/tests/server.pp +++ b/tests/server.pp @@ -1,7 +1,11 @@ $fqdn = 'zoo1.domain.org' class { 'zookeeper': -hosts=> { 'zoo1.domain.org' => 1, 'zoo2.domain.org' => 2, 'zoo3.domain.org' => 3 }, +hosts=> { +'zoo1.domain.org' => 1, +'zoo2.domain.org' => 2, +'zoo3.domain.org' => 3 +}, data_dir => '/var/lib/zookeeper', } diff --git a/tests/zookeeper.pp b/tests/zookeeper.pp index fee4b07..a2b4abc 100644 --- a/tests/zookeeper.pp +++ b/tests/zookeeper.pp @@ -1,6 +1,10 @@ $fqdn = 'zoo1.domain.org' class { 'zookeeper': -hosts=> { 'zoo1.domain.org' => 1, 'zoo2.domain.org' => 2, 'zoo3.domain.org' => 3 }, +hosts=> { +'zoo1.domain.org' => 1, +'zoo2.domain.org' => 2, +'zoo3.domain.org' => 3 +}, data_dir => '/var/lib/zookeeper', } -- To view, visit https://gerrit.wikimedia.org/r/289979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecad5e53293cbf6e40ee22ddac89d09a78bca9b5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/zookeeper Gerrit-Branch: master Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: Mschon Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop Gather from testing infrastructure - change (integration/config)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/290822 Change subject: Drop Gather from testing infrastructure .. Drop Gather from testing infrastructure Not running in production anymore. Bug: T136176 Change-Id: I828a467c6507bdb6313dccec3edee37d290b899d --- M jjb/mediawiki.yaml M zuul/layout.yaml M zuul/parameter_functions.py 3 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/22/290822/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 6d51216..c3d2442 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -402,7 +402,6 @@ Elastica EventLogging Flow - Gather GeoData GlobalCssJs GuidedTour diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 58724fc..dd5649f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3102,19 +3102,6 @@ - jsonlint - jshint - - name: mediawiki/extensions/Gather -template: - - name: composer-test - - name: extension-gate - - name: extension-qunit-generic - - name: rake - - name: extension-unittests-generic - - name: npm - - name: extension-selenium -check: - - jsonlint - - jshint - - name: mediawiki/extensions/GettingStarted template: - name: extension-unittests-generic diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index d64bc34..6f356d1 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -70,8 +70,6 @@ 'DonationInterface': ['ContributionTracking'], 'EducationProgram': ['cldr'], 'FlaggedRevs': ['Scribunto'], -'Gather': ['PageImages', 'TextExtracts', 'MobileFrontend', 'Echo', - 'VisualEditor'], 'GettingStarted': ['CentralAuth', 'EventLogging', 'GuidedTour'], 'GoogleLogin': ['GoogleAPIClient'], 'Graph': ['CodeEditor', 'JsonConfig', 'VisualEditor'], -- To view, visit https://gerrit.wikimedia.org/r/290822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I828a467c6507bdb6313dccec3edee37d290b899d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Jdlrobson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix various AuthManager style regressions - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Fix various AuthManager style regressions .. Fix various AuthManager style regressions Bug: T135775 Bug: T135779 Change-Id: Ia30db7a77e943c170810493cc20d5dcf06fe5970 --- M includes/MobileFrontend.hooks.php M resources/skins.minerva.special.userlogin.styles/userlogin.less 2 files changed, 11 insertions(+), 7 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index 0529358..322c909 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -3,6 +3,8 @@ * MobileFrontend.hooks.php */ +use MediaWiki\Auth\AuthManager; + /** * Hook handlers for MobileFrontend extension * @@ -614,7 +616,6 @@ $isMobileView = $mobileContext->shouldDisplayMobileView(); $context = $special->getContext(); $out = $context->getOutput(); - $secureLogin = $context->getConfig()->get( 'SecureLogin' ); $request = $special->getContext()->getRequest(); $skin = $out->getSkin()->getSkinName(); @@ -630,7 +631,7 @@ // Add default warning message to Special:UserLogin and Special:UserCreate // if no warning message set. if ( - $name === 'Userlogin' && + ( $name === 'Userlogin' || $name === 'CreateAccount' ) && !$request->getVal( 'warning', null ) && !$context->getUser()->isLoggedIn() ) { @@ -641,7 +642,7 @@ if ( $isMobileView ) { if ( $name === 'Search' ) { $out->addModuleStyles( 'skins.minerva.special.search.styles' ); - } elseif ( $name === 'Userlogin' ) { + } elseif ( $name === 'Userlogin' || $name === 'CreateAccount' ) { $out->addModuleStyles( 'skins.minerva.special.userlogin.styles' ); $out->addModules( 'mobile.special.userlogin.scripts' ); } @@ -1382,7 +1383,10 @@ $mfLogo = $context->getMFConfig()->get( 'MobileFrontendLogo' ); // do nothing in desktop mode - if ( $context->shouldDisplayMobileView() && $mfLogo ) { + if ( + $context->shouldDisplayMobileView() && $mfLogo + && in_array( $action, [ AuthManager::ACTION_LOGIN, AuthManager::ACTION_CREATE ], true ) + ) { $logoHtml = Html::rawElement( 'div', [ 'class' => 'watermark' ], Html::element( 'img', [ 'src' => $mfLogo, 'alt' => '' ] ) ); $formDescriptor = [ @@ -1403,7 +1407,7 @@ $wgDisableAuthManager, $wgAuthManagerAutoConfig; // modify login/registration form - if ( class_exists( \MediaWiki\Auth\AuthManager::class ) && !$wgDisableAuthManager ) { + if ( class_exists( AuthManager::class ) && !$wgDisableAuthManager ) { Hooks::register( 'AuthChangeFormFields', 'MobileFrontendHooks::onAuthChangeFormFields' ); } else { Hooks::register( 'UserLoginForm', 'MobileFrontendHooks::onUserLoginForm' ); diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less b/resources/skins.minerva.special.userlogin.styles/userlogin.less index 080d988..8f8137a 100644 --- a/resources/skins.minerva.special.userlogin.styles/userlogin.less +++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less @@ -137,9 +137,9 @@ #userloginForm { // tips are not useful - .prefsectiontip, + .prefsectiontip, .htmlform-tip, // hide help link - #mw-userlogin-help, + #mw-userlogin-help, .mw-userlogin-help, // benefits are obvious through the workflows #wpReason, // real name in account creation is not so important on mobile -- To view, visit https://gerrit.wikimedia.org/r/290782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia30db7a77e943c170810493cc20d5dcf06fe5970 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] gitignore: Add composer.lock - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: gitignore: Add composer.lock .. gitignore: Add composer.lock When running 'composer install && composer test' (to lint the PHP files), this file is left behind. While it may be uncommon to do that locally, the file is created even when just running 'composer install', which MediaWiki-Vagrant does automatically for all extensions that contain a composer.json file. As such, there is always a warning in my git prompt about an untracked file. Change-Id: Idda7dfd49d5e68acff9d8b4d9fa624b2701c --- M .gitignore 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 7bbb100..1eeda6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.kate-swp .*.swp +composer.lock /nbproject/private/ -node_modules/ -vendor/ +/node_modules +/vendor -- To view, visit https://gerrit.wikimedia.org/r/290819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idda7dfd49d5e68acff9d8b4d9fa624b2701c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow video.js to overflow thumbinner - change (mediawiki...TimedMediaHandler)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/290821 Change subject: Allow video.js to overflow thumbinner .. Allow video.js to overflow thumbinner Alternative to the reverted I1953683 This uses JS to reset the overflow, and use an alternate method to apply a block formatting context. Bug: T132306 Change-Id: I690b13906cfec4baf82d80888f629388952189e8 --- M resources/ext.tmh.player.js M resources/ext.tmh.player.styles.less 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/21/290821/1 diff --git a/resources/ext.tmh.player.js b/resources/ext.tmh.player.js index 5bab05b..1bdaf9b 100755 --- a/resources/ext.tmh.player.js +++ b/resources/ext.tmh.player.js @@ -111,6 +111,7 @@ $source.attr( 'res', $source.data( 'height' ) ); $source.attr( 'label', $source.data( 'shorttitle' ) ); } ); + $videoplayer.parent( '.thumbinner' ).addClass( 'overflow' ); // Launch the player videojs( videoplayer, playerConfig ).ready( function () { diff --git a/resources/ext.tmh.player.styles.less b/resources/ext.tmh.player.styles.less index 4e6d293..0d1dd61 100644 --- a/resources/ext.tmh.player.styles.less +++ b/resources/ext.tmh.player.styles.less @@ -12,6 +12,13 @@ } } +div.thumbinner.overflow { + /* We want to overflow, but we need to make sure we still +* create a new block formatting context */ + overflow: initial; + display: table-cell; +} + /* * Make video-js behave like standard elements * The thumbinner check works around a width interaction for -- To view, visit https://gerrit.wikimedia.org/r/290821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I690b13906cfec4baf82d80888f629388952189e8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: TheDJ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn off textcat subtest of search satisfaction - change (mediawiki...WikimediaEvents)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/290820 Change subject: Turn off textcat subtest of search satisfaction .. Turn off textcat subtest of search satisfaction This test has been completed, so is safe to turn off. This is a partial revert of Ia855716b9. By only partialy reverting it should be easier to add back new tests in the future with less review. Two jshint overrides had to be added for things that are currently unused but will be used again in the near future. Bug: T134319 Change-Id: I6542ff7b35a64aef9bc2d6cbf20e56e187697cd6 --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 8 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/20/290820/1 diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index d62ef12..385559a 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -101,8 +101,7 @@ function initialize( session ) { var sessionId = session.get( 'sessionId' ), - // increase enwiki sample size for textcat subtest - sampleSize = mw.config.get( 'wgDBname' ) === 'enwiki' ? 100 : 200, + sampleSize = 200, /** * Determines whether the user is part of the population size. * @@ -125,7 +124,7 @@ * @return {string} * @private */ - chooseBucket = function ( buckets ) { + chooseBucket = function ( buckets ) { // jshint ignore:line var rand = mw.user.generateRandomSessionId(), // take the first 52 bits of the rand value to match js // integer precision @@ -151,15 +150,6 @@ // have a search session id, generate one. if ( !session.set( 'sessionId', randomToken() ) ) { return false; - } - - // Assign 50% of enwiki users to subTest - if ( mw.config.get( 'wgDBname' ) === 'enwiki' && oneIn( 2 ) ) { - session.set( 'subTest', chooseBucket( [ - 'textcat1:a', - 'textcat1:b', - 'textcat1:c' - ] ) ); } } @@ -203,7 +193,7 @@ }; this.refresh = function ( type ) { - if ( ttl.hasOwnProperty( type ) ) { + if ( ttl.hasOwnProperty( type ) && mw.storage.get( key( type ) ) !== null ) { mw.storage.set( key( type + 'EndTime' ), now + ttl[ type ] ); } }; @@ -423,17 +413,7 @@ * @param {SessionState} session */ function setupSearchTest( session ) { - var textCatExtra = [], - logEvent = genLogEventFn( 'fulltext', session ); - - // specific to textcat subtest - if ( mw.config.get( 'wgCirrusSearchAltLanguage' ) ) { - textCatExtra = mw.config.get( 'wgCirrusSearchAltLanguage' ); - } - if ( mw.config.get( 'wgCirrusSearchAltLanguageNumResults' ) ) { - textCatExtra.push( mw.config.get( 'wgCirrusSearchAltLanguageNumResults' ) ); - } - textCatExtra = textCatExtra.join( ',' ); + var logEvent = genLogEventFn( 'fulltext', session ); if ( isSearchResultPage ) { // When a new search is performed reset the session lifetime. @@ -449,16 +429,14 @@ // test event, duplicated by visitPage event when // the user arrives. logEvent( 'click', { - position: $( evt.target ).data( 'serp-pos' ), - extraParams: textCatExtra + position: $( evt.target ).data( 'serp-pos' ) } ); } ); logEvent(
[MediaWiki-commits] [Gerrit] gitignore: Add composer.lock - change (mediawiki...CentralAuth)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/290819 Change subject: gitignore: Add composer.lock .. gitignore: Add composer.lock When running 'composer install && composer test' (to lint the PHP files), this file is left behind. While it may be uncommon to do that locally, the file is created even when just running 'composer install', which MediaWiki-Vagrant does automatically for all extensions that contain a composer.json file. As such, there is always a warning in my git prompt for CentralNotice containing an untracked file. Change-Id: Idda7dfd49d5e68acff9d8b4d9fa624b2701c --- M .gitignore 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/19/290819/1 diff --git a/.gitignore b/.gitignore index 7bbb100..1eeda6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.kate-swp .*.swp +composer.lock /nbproject/private/ -node_modules/ -vendor/ +/node_modules +/vendor -- To view, visit https://gerrit.wikimedia.org/r/290819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idda7dfd49d5e68acff9d8b4d9fa624b2701c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release patch version 1.7.1 - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Release patch version 1.7.1 .. Release patch version 1.7.1 Change-Id: I7a598ce0c15833a10bd0ca23432df0291e4d502a --- M RELEASES.md M lib/mediawiki_selenium/version.rb 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASES.md b/RELEASES.md index 623b8a0..c10a087 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,5 +1,10 @@ ## Release notes +### 1.7.1 2016-05-26 + +* Bump mediawiki_api dependency to 0.6. MediaWiki API changed, the new version is needed going + forward. + ### 1.7.0 2016-04-25 * Provide Rake task to serve as a CI entrypoint diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 3fa446f..2ea2b3e 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -1,3 +1,3 @@ module MediawikiSelenium - VERSION = '1.7.0' + VERSION = '1.7.1' end -- To view, visit https://gerrit.wikimedia.org/r/290817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a598ce0c15833a10bd0ca23432df0291e4d502a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: ZfilipinGerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Hashar Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release patch version 1.7.1 - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/290817 Change subject: Release patch version 1.7.1 .. Release patch version 1.7.1 Change-Id: I7a598ce0c15833a10bd0ca23432df0291e4d502a --- M RELEASES.md M lib/mediawiki_selenium/version.rb 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/17/290817/1 diff --git a/RELEASES.md b/RELEASES.md index 623b8a0..c10a087 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,5 +1,10 @@ ## Release notes +### 1.7.1 2016-05-26 + +* Bump mediawiki_api dependency to 0.6. MediaWiki API changed, the new version is needed going + forward. + ### 1.7.0 2016-04-25 * Provide Rake task to serve as a CI entrypoint diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 3fa446f..2ea2b3e 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -1,3 +1,3 @@ module MediawikiSelenium - VERSION = '1.7.0' + VERSION = '1.7.1' end -- To view, visit https://gerrit.wikimedia.org/r/290817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a598ce0c15833a10bd0ca23432df0291e4d502a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore Userlogin error/warning URL parameter - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Restore Userlogin error/warning URL parameter .. Restore Userlogin error/warning URL parameter I accidentally removed this when rewriting for AuthManager. Also change an ID into a CSS class for now since HTMLInfoField does not support IDs. Bug: T135775 Change-Id: I5663a02c9809dd573087a4a528702c949b938970 --- M includes/specialpage/LoginSignupSpecialPage.php 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: Anomie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index 0e4252c..bd6b08f 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -825,7 +825,7 @@ array $requests, array $fieldInfo, array &$formDescriptor, $action ) { $coreFieldDescriptors = $this->getFieldDefinitions( $this->fakeTemplate ); - $specialFields = array_merge( [ 'extraInput', 'linkcontainer' ], + $specialFields = array_merge( [ 'extraInput', 'linkcontainer', 'entryError' ], array_keys( $this->fakeTemplate->getExtraInputDefinitions() ) ); // keep the ordering from getCoreFieldDescriptors() where there is no explicit weight @@ -1027,8 +1027,8 @@ 'linkcontainer' => [ // help link 'type' => 'info', - 'cssclass' => 'mw-form-related-link-container', - 'id' => 'mw-userlogin-help', + 'cssclass' => 'mw-form-related-link-container mw-userlogin-help', + // 'id' => 'mw-userlogin-help', // FIXME HTMLInfoField ignores this 'raw' => true, 'default' => Html::element( 'a', [ 'href' => Skin::makeInternalOrExternalUrl( wfMessage( 'helplogin-url' ) @@ -1055,6 +1055,17 @@ // 'required' => true, ]; + if ( $this->mEntryError ) { + $fieldDefinitions['entryError'] = [ + 'type' => 'info', + 'default' => Html::rawElement( 'div', [ 'class' => $this->mEntryErrorType . 'box', ], + $this->mEntryError ), + 'raw' => true, + 'rawrow' => true, + 'weight' => -100, + ]; + } + if ( !$this->showExtraInformation() ) { unset( $fieldDefinitions['linkcontainer'] ); } -- To view, visit https://gerrit.wikimedia.org/r/290750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5663a02c9809dd573087a4a528702c949b938970 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Anomie Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump mediawiki_api dependency to 0.6 - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Bump mediawiki_api dependency to 0.6 .. Bump mediawiki_api dependency to 0.6 MediaWiki API changed, the new version is needed going forward. Change-Id: I83c5847e864a8aa8e65e274ee8ae5f372c6762f5 --- M mediawiki_selenium.gemspec 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki_selenium.gemspec b/mediawiki_selenium.gemspec index 61add12..09692ea 100644 --- a/mediawiki_selenium.gemspec +++ b/mediawiki_selenium.gemspec @@ -30,7 +30,7 @@ spec.add_runtime_dependency 'cucumber', '~> 1.3', '>= 1.3.20' spec.add_runtime_dependency 'headless', '~> 2.0', '>= 2.1.0' spec.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1' - spec.add_runtime_dependency 'mediawiki_api', '~> 0.5', '>= 0.5.0' + spec.add_runtime_dependency 'mediawiki_api', '~> 0.6', '>= 0.6.0' spec.add_runtime_dependency 'page-object', '~> 1.0' spec.add_runtime_dependency 'rest-client', '~> 1.6', '>= 1.6.7' spec.add_runtime_dependency 'rspec-core', '~> 2.14', '>= 2.14.4' -- To view, visit https://gerrit.wikimedia.org/r/290813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83c5847e864a8aa8e65e274ee8ae5f372c6762f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: ZfilipinGerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Hashar Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add refinery-source jars for v0.0.27 to artifacts - change (analytics/refinery)
Madhuvishy has uploaded a new change for review. https://gerrit.wikimedia.org/r/290816 Change subject: Add refinery-source jars for v0.0.27 to artifacts .. Add refinery-source jars for v0.0.27 to artifacts Change-Id: Id45bec51cb7d00d3531318da80689f7b586bd4cc --- M artifacts/refinery-camus.jar M artifacts/refinery-cassandra.jar M artifacts/refinery-core.jar M artifacts/refinery-hive.jar M artifacts/refinery-job.jar 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/16/290816/1 diff --git a/artifacts/refinery-camus.jar b/artifacts/refinery-camus.jar index 2757561..96325cf 12 --- a/artifacts/refinery-camus.jar +++ b/artifacts/refinery-camus.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-camus-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-camus-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-cassandra.jar b/artifacts/refinery-cassandra.jar index 7ae1835..a149bd3 12 --- a/artifacts/refinery-cassandra.jar +++ b/artifacts/refinery-cassandra.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-cassandra-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-cassandra-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-core.jar b/artifacts/refinery-core.jar index 55b1f2b..b692219 12 --- a/artifacts/refinery-core.jar +++ b/artifacts/refinery-core.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-core-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-core-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-hive.jar b/artifacts/refinery-hive.jar index b283b03..113b12d 12 --- a/artifacts/refinery-hive.jar +++ b/artifacts/refinery-hive.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-hive-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-hive-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-job.jar b/artifacts/refinery-job.jar index b4f44c3..362b9c6 12 --- a/artifacts/refinery-job.jar +++ b/artifacts/refinery-job.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-job-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-job-0.0.27.jar \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/290816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id45bec51cb7d00d3531318da80689f7b586bd4cc Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: master Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: replace deprecated method - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/290815 Change subject: Hygiene: replace deprecated method .. Hygiene: replace deprecated method Change-Id: I9c2ead8a2d4488627feaf69ff25a4b2e6050b42f --- M app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/15/290815/1 diff --git a/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java b/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java index 1963b4f..36301d5 100644 --- a/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java +++ b/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java @@ -43,7 +43,7 @@ @Override public void log(@NonNull Throwable throwable) { -ExceptionHandler.saveException(throwable, crashListener); +ExceptionHandler.saveException(throwable, Thread.currentThread(), crashListener); } private class CrashListener extends HockeyAppCrashListener { -- To view, visit https://gerrit.wikimedia.org/r/290815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c2ead8a2d4488627feaf69ff25a4b2e6050b42f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata back to 1.28.0-wmf.3 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: wikidata back to 1.28.0-wmf.3 .. wikidata back to 1.28.0-wmf.3 Change-Id: Id7de04808f82f429b85defe0cff06fec0e911a69 --- M wikiversions.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: 20after4: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wikiversions.json b/wikiversions.json index 7a8c0fb..061b689 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -842,7 +842,7 @@ "wawikibooks": "php-1.28.0-wmf.3", "wawiktionary": "php-1.28.0-wmf.3", "wg_enwiki": "php-1.28.0-wmf.2", -"wikidatawiki": "php-1.28.0-wmf.2", +"wikidatawiki": "php-1.28.0-wmf.3", "wikimania2005wiki": "php-1.28.0-wmf.3", "wikimania2006wiki": "php-1.28.0-wmf.3", "wikimania2007wiki": "php-1.28.0-wmf.3", -- To view, visit https://gerrit.wikimedia.org/r/290814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7de04808f82f429b85defe0cff06fec0e911a69 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4Gerrit-Reviewer: 20after4 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata back to 1.28.0-wmf.3 - change (operations/mediawiki-config)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/290814 Change subject: wikidata back to 1.28.0-wmf.3 .. wikidata back to 1.28.0-wmf.3 Change-Id: Id7de04808f82f429b85defe0cff06fec0e911a69 --- M wikiversions.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/14/290814/1 diff --git a/wikiversions.json b/wikiversions.json index 7a8c0fb..061b689 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -842,7 +842,7 @@ "wawikibooks": "php-1.28.0-wmf.3", "wawiktionary": "php-1.28.0-wmf.3", "wg_enwiki": "php-1.28.0-wmf.2", -"wikidatawiki": "php-1.28.0-wmf.2", +"wikidatawiki": "php-1.28.0-wmf.3", "wikimania2005wiki": "php-1.28.0-wmf.3", "wikimania2006wiki": "php-1.28.0-wmf.3", "wikimania2007wiki": "php-1.28.0-wmf.3", -- To view, visit https://gerrit.wikimedia.org/r/290814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7de04808f82f429b85defe0cff06fec0e911a69 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump mediawiki_api dependency to 0.6 - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/290813 Change subject: Bump mediawiki_api dependency to 0.6 .. Bump mediawiki_api dependency to 0.6 MediaWiki API changed, the new version is needed going forward. Change-Id: I83c5847e864a8aa8e65e274ee8ae5f372c6762f5 --- M mediawiki_selenium.gemspec 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/13/290813/1 diff --git a/mediawiki_selenium.gemspec b/mediawiki_selenium.gemspec index 61add12..09692ea 100644 --- a/mediawiki_selenium.gemspec +++ b/mediawiki_selenium.gemspec @@ -30,7 +30,7 @@ spec.add_runtime_dependency 'cucumber', '~> 1.3', '>= 1.3.20' spec.add_runtime_dependency 'headless', '~> 2.0', '>= 2.1.0' spec.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1' - spec.add_runtime_dependency 'mediawiki_api', '~> 0.5', '>= 0.5.0' + spec.add_runtime_dependency 'mediawiki_api', '~> 0.6', '>= 0.6.0' spec.add_runtime_dependency 'page-object', '~> 1.0' spec.add_runtime_dependency 'rest-client', '~> 1.6', '>= 1.6.7' spec.add_runtime_dependency 'rspec-core', '~> 2.14', '>= 2.14.4' -- To view, visit https://gerrit.wikimedia.org/r/290813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83c5847e864a8aa8e65e274ee8ae5f372c6762f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated baseconfig files to add properties required by media... - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/290812 Change subject: Updated baseconfig files to add properties required by mediawiki-title .. Updated baseconfig files to add properties required by mediawiki-title * In preparation for later patches. Change-Id: I4da79fff085d1860c1a3e916b436f3b7ce6e9d82 --- M lib/config/baseconfig/be-taraskwiki.json M lib/config/baseconfig/cawiki.json M lib/config/baseconfig/cswiki.json M lib/config/baseconfig/dewiki.json M lib/config/baseconfig/enwiki.json M lib/config/baseconfig/eswiki.json M lib/config/baseconfig/fawiki.json M lib/config/baseconfig/fiwiki.json M lib/config/baseconfig/iswiki.json M lib/config/baseconfig/kaawiki.json M lib/config/baseconfig/lnwiki.json M lib/config/baseconfig/nlwiki.json M lib/config/baseconfig/srwiki.json M lib/config/baseconfig/trwiki.json M lib/config/baseconfig/zhwiki.json 15 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/12/290812/1 diff --git a/lib/config/baseconfig/be-taraskwiki.json b/lib/config/baseconfig/be-taraskwiki.json index 5622041..eca9442 100644 --- a/lib/config/baseconfig/be-taraskwiki.json +++ b/lib/config/baseconfig/be-taraskwiki.json @@ -1448,6 +1448,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([абвгґджзеёжзійклмнопрстуўфхцчшыьэюяćčłńśšŭźža-z]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/cawiki.json b/lib/config/baseconfig/cawiki.json index a00cbbd..aaa6989 100644 --- a/lib/config/baseconfig/cawiki.json +++ b/lib/config/baseconfig/cawiki.json @@ -1325,6 +1325,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^((?:[a-zàèéíòóúç·ïü]|'(?!'))+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/cswiki.json b/lib/config/baseconfig/cswiki.json index 73e28c2..6b7d264 100644 --- a/lib/config/baseconfig/cswiki.json +++ b/lib/config/baseconfig/cswiki.json @@ -1462,6 +1462,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([a-záčďéěíňóřšťúůýž]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/dewiki.json b/lib/config/baseconfig/dewiki.json index 001c755..fce3645 100644 --- a/lib/config/baseconfig/dewiki.json +++ b/lib/config/baseconfig/dewiki.json @@ -1528,6 +1528,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([äöüßa-z]+)(.*)$/sDu", + "legaltitlechars": " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/enwiki.json b/lib/config/baseconfig/enwiki.json index e2dfec9..ea7858d 100644 --- a/lib/config/baseconfig/enwiki.json +++ b/lib/config/baseconfig/enwiki.json @@ -1310,6 +1310,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([a-z]+)(.*)$/sD", + "legaltitlechars": " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/eswiki.json b/lib/config/baseconfig/eswiki.json index c62330c..f92fe2d 100644 --- a/lib/config/baseconfig/eswiki.json +++ b/lib/config/baseconfig/eswiki.json @@ -1599,6 +1599,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([a-záéíóúñ]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/fawiki.json b/lib/config/baseconfig/fawiki.json index 54ce599..bfd6c3e 100644 --- a/lib/config/baseconfig/fawiki.json +++ b/lib/config/baseconfig/fawiki.json @@ -1597,6 +1597,7 @@ "langconversion": "", "titleconversion": "", "linktrail": "/^([ابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة]+)(.*)$/sDu", + "legaltitlechars": " %!\"$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF+", "git-hash": "cc3c45654bdb4e20497e487dcf7c15837538a736", "case": "first-letter", "rights": "", diff --git a/lib/config/baseconfig/fiwiki.json b/lib/config/baseconfig/fiwiki.json index 0928ff6..ce41629
[MediaWiki-commits] [Gerrit] Add refinery-source jars for v0.0.27 to artifacts - change (analytics/refinery)
Maven-release-user has uploaded a new change for review. https://gerrit.wikimedia.org/r/290811 Change subject: Add refinery-source jars for v0.0.27 to artifacts .. Add refinery-source jars for v0.0.27 to artifacts Change-Id: I2c41a3a8a3bfd7eb92c4e4fe6d58d26769a75b6d --- M artifacts/refinery-camus.jar M artifacts/refinery-cassandra.jar M artifacts/refinery-core.jar M artifacts/refinery-hive.jar M artifacts/refinery-job.jar 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/11/290811/1 diff --git a/artifacts/refinery-camus.jar b/artifacts/refinery-camus.jar index 2757561..96325cf 12 --- a/artifacts/refinery-camus.jar +++ b/artifacts/refinery-camus.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-camus-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-camus-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-cassandra.jar b/artifacts/refinery-cassandra.jar index 7ae1835..a149bd3 12 --- a/artifacts/refinery-cassandra.jar +++ b/artifacts/refinery-cassandra.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-cassandra-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-cassandra-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-core.jar b/artifacts/refinery-core.jar index 55b1f2b..b692219 12 --- a/artifacts/refinery-core.jar +++ b/artifacts/refinery-core.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-core-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-core-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-hive.jar b/artifacts/refinery-hive.jar index b283b03..113b12d 12 --- a/artifacts/refinery-hive.jar +++ b/artifacts/refinery-hive.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-hive-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-hive-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-job.jar b/artifacts/refinery-job.jar index b4f44c3..362b9c6 12 --- a/artifacts/refinery-job.jar +++ b/artifacts/refinery-job.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-job-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-job-0.0.27.jar \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/290811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c41a3a8a3bfd7eb92c4e4fe6d58d26769a75b6d Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: Maven-release-user___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add refinery-source jars for v0.0.27 to artifacts - change (analytics/refinery)
Maven-release-user has uploaded a new change for review. https://gerrit.wikimedia.org/r/290810 Change subject: Add refinery-source jars for v0.0.27 to artifacts .. Add refinery-source jars for v0.0.27 to artifacts Change-Id: I998d9aef85e210d1a46adc19de2b60cf5573fddf --- M artifacts/refinery-camus.jar M artifacts/refinery-cassandra.jar M artifacts/refinery-core.jar M artifacts/refinery-hive.jar M artifacts/refinery-job.jar 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/10/290810/1 diff --git a/artifacts/refinery-camus.jar b/artifacts/refinery-camus.jar index 2757561..96325cf 12 --- a/artifacts/refinery-camus.jar +++ b/artifacts/refinery-camus.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-camus-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-camus-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-cassandra.jar b/artifacts/refinery-cassandra.jar index 7ae1835..a149bd3 12 --- a/artifacts/refinery-cassandra.jar +++ b/artifacts/refinery-cassandra.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-cassandra-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-cassandra-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-core.jar b/artifacts/refinery-core.jar index 55b1f2b..b692219 12 --- a/artifacts/refinery-core.jar +++ b/artifacts/refinery-core.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-core-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-core-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-hive.jar b/artifacts/refinery-hive.jar index b283b03..113b12d 12 --- a/artifacts/refinery-hive.jar +++ b/artifacts/refinery-hive.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-hive-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-hive-0.0.27.jar \ No newline at end of file diff --git a/artifacts/refinery-job.jar b/artifacts/refinery-job.jar index b4f44c3..362b9c6 12 --- a/artifacts/refinery-job.jar +++ b/artifacts/refinery-job.jar @@ -1 +1 @@ -org/wikimedia/analytics/refinery/refinery-job-0.0.31.jar \ No newline at end of file +org/wikimedia/analytics/refinery/refinery-job-0.0.27.jar \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/290810 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I998d9aef85e210d1a46adc19de2b60cf5573fddf Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: jenkins-test Gerrit-Owner: Maven-release-user___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable AuthManager by default - change (mediawiki/core)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/290809 Change subject: Enable AuthManager by default .. Enable AuthManager by default Second attempt, after fixing T135884. Bug: T135498 Change-Id: I756a82267cb9c44ec35146fbb4599b183747c741 --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/290809/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index d6db388..6ebbf32 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4451,7 +4451,7 @@ * @since 1.27 * @deprecated since 1.27, for use during development only */ -$wgDisableAuthManager = true; +$wgDisableAuthManager = false; /** * Configure AuthManager -- To view, visit https://gerrit.wikimedia.org/r/290809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I756a82267cb9c44ec35146fbb4599b183747c741 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Save sql to generate triggers against latest CiviCRM (4.7.8) - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged. Change subject: Save sql to generate triggers against latest CiviCRM (4.7.8) .. Save sql to generate triggers against latest CiviCRM (4.7.8) Bug: T134211 T133806 Change-Id: I59a0a183a011688f7567db1559edba422b957afa --- A sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql 1 file changed, 7,146 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/290635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59a0a183a011688f7567db1559edba422b957afa Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: EileenGerrit-Reviewer: Awight Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits