[MediaWiki-commits] [Gerrit] translatewiki[master]: atj is now in mw core
Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345092 ) Change subject: atj is now in mw core .. atj is now in mw core Change-Id: Ib24faac1d45c4e3c39da63cd234bd615363d1215 --- M LanguageSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/92/345092/1 diff --git a/LanguageSettings.php b/LanguageSettings.php index 2cae999..66d21a4 100644 --- a/LanguageSettings.php +++ b/LanguageSettings.php @@ -5,7 +5,6 @@ $wgExtraLanguageNames['ahr'] = 'अहिराणी'; # # Ahirani / Amir 2012-02-25 $wgExtraLanguageNames['akz'] = 'Albaamo innaaɬiilka'; # Alabama / Siebrand 2008-09-15 $wgExtraLanguageNames['aro'] = 'Araona'; # Araona / Siebrand 2010-08-25 -$wgExtraLanguageNames['atj'] = 'Atikamekw'; # Atikamekw / Nikerabbit 2016-06-09 $wgExtraLanguageNames['awa'] = 'अवधी'; # Awadhi / Siebrand 2014-12-28 $wgExtraLanguageNames['ban'] = 'ᬩᬲᬩᬮᬶ'; # Balinese / Siebrand 2012-11-25 $wgExtraLanguageNames['bew'] = 'Bahasa Betawi'; # Betawi / Siebrand 2008-07-13 -- To view, visit https://gerrit.wikimedia.org/r/345092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib24faac1d45c4e3c39da63cd234bd615363d1215 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] mediawiki...Wikibase[master]: [WIP] Introduce DispatchingEntityDiffVisualizer and EntityDi...
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345091 ) Change subject: [WIP] Introduce DispatchingEntityDiffVisualizer and EntityDiffVisualizerFactory .. [WIP] Introduce DispatchingEntityDiffVisualizer and EntityDiffVisualizerFactory Things to be done: - CI tests - Move codes related to items to its dedicated place Bug: T160656 Change-Id: Ia84a0f65fff9dda5e58f867ad1d9e4d6855470af --- M lib/includes/EntityTypeDefinitions.php M repo/includes/Actions/EditEntityAction.php A repo/includes/Diff/DispatchingEntityDiffVisualizer.php M repo/includes/Diff/EntityContentDiffView.php A repo/includes/Diff/EntityDiffVisualizerFactory.php M repo/includes/WikibaseRepo.php 6 files changed, 226 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/91/345091/1 diff --git a/lib/includes/EntityTypeDefinitions.php b/lib/includes/EntityTypeDefinitions.php index 12e3453..dc14647 100644 --- a/lib/includes/EntityTypeDefinitions.php +++ b/lib/includes/EntityTypeDefinitions.php @@ -173,4 +173,13 @@ return $this->getMapForDefinitionField( 'rdf-builder-factory-callback' ); } + /** +* @return callable[] An array mapping entity type identifiers +* to callables instantiating EntityDiffVisualizer objects +* Not guaranteed to contain all entity types. +*/ + public function getEntityDiffVisualizerCallbacks() { + return $this->getMapForDefinitionField( 'entity-diff-visualizer-callback' ); + } + } diff --git a/repo/includes/Actions/EditEntityAction.php b/repo/includes/Actions/EditEntityAction.php index ef9d402..cdff93d 100644 --- a/repo/includes/Actions/EditEntityAction.php +++ b/repo/includes/Actions/EditEntityAction.php @@ -27,6 +27,7 @@ use Wikibase\Repo\Diff\ClaimDifferenceVisualizer; use Wikibase\Repo\Diff\DifferencesSnakVisualizer; use Wikibase\Repo\Diff\BasicEntityDiffVisualizer; +use Wikibase\Repo\Diff\DispatchingEntityDiffVisualizer; use Wikibase\Repo\WikibaseRepo; /** @@ -82,7 +83,9 @@ $snakDetailsFormatter = $formatterFactory->getSnakFormatter( SnakFormatter::FORMAT_HTML_DIFF, $options ); $snakBreadCrumbFormatter = $formatterFactory->getSnakFormatter( SnakFormatter::FORMAT_HTML, $options ); - $this->entityDiffVisualizer = new BasicEntityDiffVisualizer( + $entityDiffVisualizerFactory = $wikibaseRepo->getEntityDiffVisualizerFactory(); + $this->entityDiffVisualizer = new DispatchingEntityDiffVisualizer( + $entityDiffVisualizerFactory, $this->getContext(), new ClaimDiffer( new OrderedListDiffer( new ComparableComparer() ) ), new ClaimDifferenceVisualizer( diff --git a/repo/includes/Diff/DispatchingEntityDiffVisualizer.php b/repo/includes/Diff/DispatchingEntityDiffVisualizer.php new file mode 100644 index 000..c97b58d --- /dev/null +++ b/repo/includes/Diff/DispatchingEntityDiffVisualizer.php @@ -0,0 +1,112 @@ + + */ +class DispatchingEntityDiffVisualizer implements EntityDiffVisualizer { + + /** +* @var EntityDiffVisualizerFactory +*/ + private $diffVisualizerFactory; + + /** +* @var IContextSource +*/ + private $context; + + /** +* @var ClaimDiffer +*/ + private $claimDiffer; + + /** +* @var ClaimDifferenceVisualizer +*/ + private $claimDiffVisualizer; + + /** +* @var SiteLookup +*/ + private $siteLookup; + + /** +* @var EntityIdFormatter +*/ + private $entityIdFormatter; + + /** +* @var BasicEntityDiffVisualizer|null +*/ + private $basicEntityDiffVisualizer; + + /** +* @param EntityDiffVisualizerFactory $diffVisualizerFactory +* @param IContextSource $contextSource +* @param ClaimDiffer $claimDiffer +* @param ClaimDifferenceVisualizer $claimDiffView +* @param SiteLookup $siteLookup +* @param EntityIdFormatter $entityIdFormatter +*/ + public function __construct( + EntityDiffVisualizerFactory $diffVisualizerFactory, + IContextSource $contextSource, + ClaimDiffer $claimDiffer, + ClaimDifferenceVisualizer $claimDiffView, + SiteLookup $siteLookup, + EntityIdFormatter $entityIdFormatter + ) { + $this->diffVisualizerFactory = $diffVisualizerFactory; + $this->context = $contextSource; + $this->claimDiffer = $claimDiffer; + $this->claimDiffVisualizer = $claimDiffView; + $this->siteLookup = $siteLookup; + $this->entityIdFormatter = $entityIdFormatter; +
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Configurable working files directory, run_dir
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345089 ) Change subject: Configurable working files directory, run_dir .. Configurable working files directory, run_dir Change-Id: Ib34b5cd3753ddf52832cd80d71dc7da0f98c298c --- M process-control.example.yaml M processcontrol/lock.py M tests/data/global_defaults.yaml 3 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/89/345089/1 diff --git a/process-control.example.yaml b/process-control.example.yaml index ce742db..15b41ea 100644 --- a/process-control.example.yaml +++ b/process-control.example.yaml @@ -33,3 +33,11 @@ #/var/log/process-control/jobname/jobname-20170401-235959.log # output_directory: /var/log/process-control + +# Path for working files such as locks. +# +# TODO: The deb install should create this directory and do something about +# permissions. +#run_dir: /var/run/process-control +# +run_dir: /tmp diff --git a/processcontrol/lock.py b/processcontrol/lock.py index 0ea66ed..906c0cc 100644 --- a/processcontrol/lock.py +++ b/processcontrol/lock.py @@ -7,12 +7,17 @@ import os import sys + +from processcontrol import config + + lockfile = None -def begin(filename=None, failopen=False, job_tag=None): -if not filename: -filename = "/tmp/{name}.lock".format(name=job_tag) +# TODO: Decide whether we want to failopen? +def begin(failopen=False, job_tag=None): +run_dir = config.GlobalConfiguration().get("run_dir") +filename = "{run_dir}/{name}.lock".format(run_dir=run_dir, name=job_tag) if os.path.exists(filename): print("Lockfile found!", file=sys.stderr) diff --git a/tests/data/global_defaults.yaml b/tests/data/global_defaults.yaml index 4330a53..079dfae 100644 --- a/tests/data/global_defaults.yaml +++ b/tests/data/global_defaults.yaml @@ -28,3 +28,5 @@ #/var/log/process-control/jobname-20170401-235959.log # output_directory: /tmp + +run_dir: /tmp -- To view, visit https://gerrit.wikimedia.org/r/345089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib34b5cd3753ddf52832cd80d71dc7da0f98c298c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Store job slug
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345088 ) Change subject: Store job slug .. Store job slug Change-Id: Idd712c33f1f32a64ada876cc988425a39613005e --- M processcontrol/job_wrapper.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/88/345088/1 diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py index ff8f11f..4d3892e 100644 --- a/processcontrol/job_wrapper.py +++ b/processcontrol/job_wrapper.py @@ -15,7 +15,7 @@ def load(job_name): job_directory = config.GlobalConfiguration().get("job_directory") job_path = "{job_dir}/{job_name}.yaml".format(job_dir=job_directory, job_name=job_name) -return JobWrapper(config_path=job_path) +return JobWrapper(config_path=job_path, slug=job_name) def list(): @@ -28,12 +28,13 @@ class JobWrapper(object): -def __init__(self, config_path=None): +def __init__(self, config_path=None, slug=None): self.global_config = config.GlobalConfiguration() self.config_path = config_path self.config = config.JobConfiguration(self.global_config, self.config_path) self.name = self.config.get("name") +self.slug = slug self.start_time = datetime.datetime.utcnow() self.mailer = mailer.Mailer(self.config) self.timeout = self.config.get("timeout") -- To view, visit https://gerrit.wikimedia.org/r/345088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd712c33f1f32a64ada876cc988425a39613005e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Wikibugs realname should use HTTPS over HTTP
MtDu has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345087 ) Change subject: Wikibugs realname should use HTTPS over HTTP .. Wikibugs realname should use HTTPS over HTTP Bug: T161421 Change-Id: I1567e05fceb4b302cda1685f806e3d28366ffbdd --- M redis2irc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/87/345087/1 diff --git a/redis2irc.py b/redis2irc.py index 01d73ce..c617a4a 100644 --- a/redis2irc.py +++ b/redis2irc.py @@ -150,7 +150,7 @@ port=6667, password=conf.get('IRC_PASSWORD'), realname='wikibugs2', -userinfo=('Wikibugs v2.1, http://tools.wmflabs.org/wikibugs/ ,' + +userinfo=('Wikibugs v2.1, https://tools.wmflabs.org/wikibugs/ ,' + 'running on ' + current_host), includes=[ 'irc3.plugins.core', -- To view, visit https://gerrit.wikimedia.org/r/345087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1567e05fceb4b302cda1685f806e3d28366ffbdd Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: MtDu___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Ping sending nick when reporting !log errors
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343925 ) Change subject: Ping sending nick when reporting !log errors .. Ping sending nick when reporting !log errors Add a "$NICK: " prefix to in channel error messages which are responding to a !log message. Inspired by this exchange in #wikimedia-labs: !log moving ... Unknown project "moving" ^ ab wah wah stashbot error !log tools moving ... Logged the message ... stashbot should really ping the logging user for those errors ab: yeah a pingback on username seems best Change-Id: Ibfb791d4f75d56750833d9eb49ab60079ea167cf --- M stashbot/sal.py 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: Andrew Bogott: Looks good to me, but someone else must approve EddieGP: Looks good to me, but someone else must approve BryanDavis: Looks good to me, approved jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/stashbot/sal.py b/stashbot/sal.py index dbbae35..2346e5f 100644 --- a/stashbot/sal.py +++ b/stashbot/sal.py @@ -59,7 +59,8 @@ '!log message on unexpected channel %s', channel) if respond_to_channel: self.irc.respond( -conn, event, 'Not expecting to hear !log here') +conn, event, +'%s: Not expecting to hear !log here' % bang['nick']) return if not self._check_sal_acl(channel, event.source): @@ -81,7 +82,8 @@ if bang['message'] == '': if respond_to_channel: self.irc.respond( -conn, event, 'Message missing. Nothing logged.') +conn, event, +'%s: Message missing. Nothing logged.' % bang['nick']) return if bang['nick'] == 'logmsgbot': @@ -95,13 +97,19 @@ if respond_to_channel: self.irc.respond( conn, event, -'Unknown project "%s"' % bang['project'] +'%s: Unknown project "%s"' % ( +bang['nick'], +bang['project'] +) ) tool = 'tools.%s' % bang['project'] if tool in self._get_projects(): self.irc.respond( conn, event, -'Did you mean to say "%s" instead?' % tool +'%s: Did you mean to say "%s" instead?' % ( +bang['nick'], +tool +) ) return @@ -135,8 +143,10 @@ if respond_to_channel: self.irc.respond( conn, event, -'Failed to log message to wiki. ' -'Somebody should check the error logs.' +( +'%s: Failed to log message to wiki. ' +'Somebody should check the error logs.' +) % bang['nick'] ) if 'twitter' in channel_conf: -- To view, visit https://gerrit.wikimedia.org/r/343925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfb791d4f75d56750833d9eb49ab60079ea167cf Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/stashbot Gerrit-Branch: master Gerrit-Owner: BryanDavisGerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dzahn Gerrit-Reviewer: EddieGP Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove parsoid-tests.wikimedia.org
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345086 ) Change subject: remove parsoid-tests.wikimedia.org .. remove parsoid-tests.wikimedia.org Change-Id: Id17004387b18c98d7a0fe383b4df0915891c64a2 --- M templates/wikimedia.org 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/86/345086/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 63f62ba..e995e47 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -479,7 +479,6 @@ grafana-admin 600 IN DYNA geoip!misc-addrs grafana-labs 600 IN DYNA geoip!misc-addrs grafana-labs-admin 600 IN DYNA geoip!misc-addrs -parsoid-tests600 IN DYNA geoip!misc-addrs parsoid-rt-tests 600 IN DYNA geoip!misc-addrs parsoid-vd-tests 600 IN DYNA geoip!misc-addrs performance 600 IN DYNA geoip!misc-addrs -- To view, visit https://gerrit.wikimedia.org/r/345086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id17004387b18c98d7a0fe383b4df0915891c64a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: yubiauth: convert to profile/role structure (WIP)
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345085 ) Change subject: yubiauth: convert to profile/role structure (WIP) .. yubiauth: convert to profile/role structure (WIP) Change-Id: I3278b31b73e1aad6adc9c165f4eb99a2bba3a4c1 --- R hieradata/role/common/yubiauth_server.yaml M manifests/site.pp R modules/profile/manifests/yubiauth/server.pp A modules/role/manifests/yubiauth_server.pp 4 files changed, 21 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/345085/1 diff --git a/hieradata/role/common/yubiauth/server.yaml b/hieradata/role/common/yubiauth_server.yaml similarity index 100% rename from hieradata/role/common/yubiauth/server.yaml rename to hieradata/role/common/yubiauth_server.yaml diff --git a/manifests/site.pp b/manifests/site.pp index c08c595..00fa1d6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -140,11 +140,11 @@ } node 'auth1001.eqiad.wmnet' { -role(yubiauth::server) +role('yubiauth_server') } node 'auth2001.codfw.wmnet' { -role(yubiauth::server) +role('yubiauth_server') } node 'baham.wikimedia.org' { diff --git a/modules/role/manifests/yubiauth/server.pp b/modules/profile/manifests/yubiauth/server.pp similarity index 83% rename from modules/role/manifests/yubiauth/server.pp rename to modules/profile/manifests/yubiauth/server.pp index ee2bd29..335ffb3 100644 --- a/modules/role/manifests/yubiauth/server.pp +++ b/modules/profile/manifests/yubiauth/server.pp @@ -1,20 +1,21 @@ -# = Class: role::yubiauth +# = Class: profile::yubiauth::server # # This class configures a Yubi 2FA authentication server # -class role::yubiauth::server { -include ::standard -include ::base::firewall -include ::role::backup::host +class profile::yubiauth::server ( +$auth_servers = hiera('yubiauth_servers') +$auth_server_primary = hiera('yubiauth_server_primary') +) { -include yubiauth::yhsm_daemon -include yubiauth::yhsm_yubikey_ksm +$auth_servers_ferm = join($auth_servers, ' ') + +include ::base::firewall + +class {'::yubiauth::yhsm_daemon': } + +class {'::yubiauth::yhsm_yubikey_ksm': } backup::set { 'yubiauth-aeads' : } - -$auth_servers = hiera('yubiauth_servers') -$auth_servers_ferm = join($auth_servers, ' ') -$auth_server_primary = hiera('yubiauth_server_primary') if ($::fqdn == $auth_server_primary) { @@ -36,7 +37,7 @@ } } -system::role { 'role::yubiauth': +system::role { 'profile::yubiauth::server': ensure => 'present', description => 'Yubi 2FA authentication server', } diff --git a/modules/role/manifests/yubiauth_server.pp b/modules/role/manifests/yubiauth_server.pp new file mode 100644 index 000..a6d347b --- /dev/null +++ b/modules/role/manifests/yubiauth_server.pp @@ -0,0 +1,6 @@ +class role::yubiauth_server { + +include ::standard +include ::role::backup::host +include ::profile::yubiauth::server +} -- To view, visit https://gerrit.wikimedia.org/r/345085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3278b31b73e1aad6adc9c165f4eb99a2bba3a4c1 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] mediawiki...Wikibase[master]: collapsibleFooter: Move client-side state cookies to localSt...
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345084 ) Change subject: collapsibleFooter: Move client-side state cookies to localStorage .. collapsibleFooter: Move client-side state cookies to localStorage Matches Ie9a4612de55e6aaf1 in mediawiki-core. The old cookies will automatically expire. Bug: T110353 Change-Id: I07bde283e458cb7326a2c66d8d670bc29030131b --- M client/resources/Resources.php M client/resources/wikibase.client.action.edit.collapsibleFooter.js 2 files changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/84/345084/1 diff --git a/client/resources/Resources.php b/client/resources/Resources.php index deb1daf..472069c 100644 --- a/client/resources/Resources.php +++ b/client/resources/Resources.php @@ -110,7 +110,7 @@ 'scripts' => 'wikibase.client.action.edit.collapsibleFooter.js', 'dependencies' => [ 'jquery.makeCollapsible', - 'mediawiki.cookie', + 'mediawiki.storage', 'mediawiki.icon', ], ] diff --git a/client/resources/wikibase.client.action.edit.collapsibleFooter.js b/client/resources/wikibase.client.action.edit.collapsibleFooter.js index fe25cd5..51c8d62 100644 --- a/client/resources/wikibase.client.action.edit.collapsibleFooter.js +++ b/client/resources/wikibase.client.action.edit.collapsibleFooter.js @@ -1,4 +1,4 @@ -// Copied from mediawiki.action.edit.collapsibleFooter +// Copied from mediawiki-core's mediawiki.action.edit.collapsibleFooter.js ( function ( mw ) { 'use strict'; @@ -9,13 +9,15 @@ { listSel: '.wikibase-entity-usage ul', togglerSel: '.wikibase-entityusage-explanation', - cookieName: 'wikibase-entity-usage-list' + storeKey: 'mwedit-state-wikibaseEntityUsage' } ]; - handleOne = function ( $list, $toggler, cookieName ) { - // Collapsed by default - var isCollapsed = mw.cookie.get( cookieName ) !== 'expanded'; + handleOne = function ( $list, $toggler, storeKey ) { + var collapsedVal = '0', + expandedVal = '1', + // Default to collapsed if not set + isCollapsed = mw.storage.get( storeKey ) !== expandedVal; // Style the toggler with an arrow icon and add a tabIndex and a role for accessibility $toggler.addClass( 'mw-editfooter-toggler' ).prop( 'tabIndex', 0 ).attr( 'role', 'button' ); @@ -32,12 +34,12 @@ $list.on( 'beforeExpand.mw-collapsible', function () { $toggler.removeClass( 'mw-icon-arrow-collapsed' ).addClass( 'mw-icon-arrow-expanded' ); - mw.cookie.set( cookieName, 'expanded' ); + mw.storage.set( storeKey, expandedVal ); } ); $list.on( 'beforeCollapse.mw-collapsible', function () { $toggler.removeClass( 'mw-icon-arrow-expanded' ).addClass( 'mw-icon-arrow-collapsed' ); - mw.cookie.set( cookieName, 'collapsed' ); + mw.storage.set( storeKey, collapsedVal ); } ); }; @@ -48,7 +50,7 @@ handleOne( $editForm.find( collapsibleLists[ i ].listSel ), $editForm.find( collapsibleLists[ i ].togglerSel ), - collapsibleLists[ i ].cookieName + collapsibleLists[ i ].storeKey ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/345084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07bde283e458cb7326a2c66d8d670bc29030131b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase 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] mediawiki...Cargo[master]: Fix for queries with non-ASCII characters in table and field...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345083 ) Change subject: Fix for queries with non-ASCII characters in table and field names .. Fix for queries with non-ASCII characters in table and field names Change-Id: I15d1b6b064918ba8c4637e41b9ca84951bd22faf --- M CargoSQLQuery.php 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php index 153e8f0..59df73c 100644 --- a/CargoSQLQuery.php +++ b/CargoSQLQuery.php @@ -440,7 +440,10 @@ $fieldName = null; $description = new CargoFieldDescription(); - $fieldPattern = '/^([-\w$]+)([.]([-\w$]+))?$/'; + // We use \p{L} instead of \w here in order to handle + // accented and other non-ASCII characters in table + // and field names. + $fieldPattern = '/^([-_\p{L}$]+)([.]([-_\p{L}$]+))?$/u'; $fieldPatternFound = preg_match( $fieldPattern, $origFieldName, $fieldPatternMatches ); $stringPatternFound = false; $hasFunctionCall = false; @@ -467,7 +470,7 @@ if ( ! $stringPatternFound ) { $noQuotesOrigFieldName = CargoUtils::removeQuotedStrings( $origFieldName ); - $functionCallPattern = '/\w\s*\(/'; + $functionCallPattern = '/\p{L}\s*\(/'; $hasFunctionCall = preg_match( $functionCallPattern, $noQuotesOrigFieldName ); } } -- To view, visit https://gerrit.wikimedia.org/r/345083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15d1b6b064918ba8c4637e41b9ca84951bd22faf Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron KorenGerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for queries with non-ASCII characters in table and field...
Yaron Koren has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345083 ) Change subject: Fix for queries with non-ASCII characters in table and field names .. Fix for queries with non-ASCII characters in table and field names Change-Id: I15d1b6b064918ba8c4637e41b9ca84951bd22faf --- M CargoSQLQuery.php 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/83/345083/2 diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php index 153e8f0..59df73c 100644 --- a/CargoSQLQuery.php +++ b/CargoSQLQuery.php @@ -440,7 +440,10 @@ $fieldName = null; $description = new CargoFieldDescription(); - $fieldPattern = '/^([-\w$]+)([.]([-\w$]+))?$/'; + // We use \p{L} instead of \w here in order to handle + // accented and other non-ASCII characters in table + // and field names. + $fieldPattern = '/^([-_\p{L}$]+)([.]([-_\p{L}$]+))?$/u'; $fieldPatternFound = preg_match( $fieldPattern, $origFieldName, $fieldPatternMatches ); $stringPatternFound = false; $hasFunctionCall = false; @@ -467,7 +470,7 @@ if ( ! $stringPatternFound ) { $noQuotesOrigFieldName = CargoUtils::removeQuotedStrings( $origFieldName ); - $functionCallPattern = '/\w\s*\(/'; + $functionCallPattern = '/\p{L}\s*\(/'; $hasFunctionCall = preg_match( $functionCallPattern, $noQuotesOrigFieldName ); } } -- To view, visit https://gerrit.wikimedia.org/r/345083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I15d1b6b064918ba8c4637e41b9ca84951bd22faf Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Yaron KorenGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: WIP still output when killed
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345082 ) Change subject: WIP still output when killed .. WIP still output when killed Really should fix that exit_code issue now Also, test will need threading. Fun! Change-Id: Iae9fcfa9634d482e1df786b3878d53e00a9f2006 --- M processcontrol/job_wrapper.py 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/82/345082/1 diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py index d84b83e..248420b 100644 --- a/processcontrol/job_wrapper.py +++ b/processcontrol/job_wrapper.py @@ -3,6 +3,7 @@ import glob import os import shlex +import signal import subprocess import sys import threading @@ -56,6 +57,8 @@ lock.begin(job_tag=self.name) command = shlex.split(self.config.get("command")) +signal.signal(signal.SIGTERM, self.handle_sigterm) +signal.signal(signal.SIGINT, self.handle_sigterm) self.process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=self.environment) timer = threading.Timer(self.timeout, self.fail_timeout) @@ -149,3 +152,7 @@ return {"status": "running", "pid": pid} return None + +def handle_sigterm(self, signum, frame): +self.process.kill() +print("Job {name} killed".format(name=self.name), file=sys.stderr) -- To view, visit https://gerrit.wikimedia.org/r/345082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae9fcfa9634d482e1df786b3878d53e00a9f2006 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control 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] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget: Remove redirect subtitle if...
Hello Krinkle, jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/345081 to review the following change. Change subject: ve.init.mw.DesktopArticleTarget: Remove redirect subtitle if we cancel editing .. ve.init.mw.DesktopArticleTarget: Remove redirect subtitle if we cancel editing To reproduce: start editing a page, turn it into a redirect, cancel editing and go back to view mode. The "Redirect page" subtitle under the page title should disappear. Note that #redirectsub is correctly spelled all lowercase, unlike #contentSub. This reverts commit 0e1bc7309b1150ab698651056968d7add8b140b0 and fixes the code instead. Change-Id: Ibacd73122dfec63268a77794bc77c4b88876d3ee --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/81/345081/1 diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index 54b400b..ba75832 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -1360,6 +1360,7 @@ // Remove any VE-added redirectMsg if ( $( '.mw-body-content > .ve-redirect-header' ).length ) { $( '.mw-body-content > .ve-redirect-header' ).remove(); + $( '#contentSub #redirectSub, #contentSub #redirectSub + br' ).remove(); } // Restore any previous redirectMsg/redirectsub -- To view, visit https://gerrit.wikimedia.org/r/345081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibacd73122dfec63268a77794bc77c4b88876d3ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-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] mediawiki/core[master]: build: Make Travis CI 'Postgres' build non-voting
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345079 ) Change subject: build: Make Travis CI 'Postgres' build non-voting .. build: Make Travis CI 'Postgres' build non-voting This will make it easier to detect regressions by not making all builds marked as fail, but only if one of the other three fails. Mute the known failure from Postgres by adding it to an allow_failures section. It'll still run every commit, but is non-voting. To be re-enabled once T75174 is fixed. Bug: T75176 Change-Id: I2ea415edd308f2a012ef240d562c0073f15b9118 --- M .travis.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 5e2c7a0..baf7f03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,11 @@ php: hhvm-3.12 - env: dbtype=mysql dbuser=root php: 7 + allow_failures: +# Postgres support for unit tests is still buggy +# https://phabricator.wikimedia.org/T75174 +- env: dbtype=postgres dbuser=travis + php: 5.5 services: - mysql -- To view, visit https://gerrit.wikimedia.org/r/345079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ea415edd308f2a012ef240d562c0073f15b9118 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Addshore Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Hashar Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: DraggableGroupElement: Make draggable conditional
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345080 ) Change subject: DraggableGroupElement: Make draggable conditional .. DraggableGroupElement: Make draggable conditional Allow users of this mixin to turn off draggability, or start the widget with dragging off without making the mixin and the group items' mixins conditional themselves. Change-Id: I1facc746305fec12f9b752d882fa3aef77abf812 --- M src/mixins/DraggableElement.js M src/mixins/DraggableGroupElement.js M src/styles/elements/DraggableElement.less 3 files changed, 81 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/80/345080/1 diff --git a/src/mixins/DraggableElement.js b/src/mixins/DraggableElement.js index b442f0c..1798da3 100644 --- a/src/mixins/DraggableElement.js +++ b/src/mixins/DraggableElement.js @@ -10,6 +10,9 @@ * @constructor * @param {Object} [config] Configuration options * @cfg {jQuery} [$handle] The part of the element which can be used for dragging, defaults to the whole element + * @cfg {boolean} [draggable] The items are draggable. This can change with #toggleDraggable + * but the draggable state should be called from the DraggableGroupElement, which updates + * the whole group */ OO.ui.mixin.DraggableElement = function OoUiMixinDraggableElement( config ) { config = config || {}; @@ -18,6 +21,7 @@ this.index = null; this.$handle = config.$handle || this.$element; this.wasHandleUsed = null; + this.draggable = config.draggable === undefined ? true : !!config.draggable; // Initialize and events this.$element.addClass( 'oo-ui-draggableElement' ) @@ -68,12 +72,42 @@ /* Methods */ /** + * Change the draggable state of this widget. + * This allows users to temporarily halt the dragging operations. + * + * @param {boolean} isDraggable Widget supports draggable operations + * @fires draggable + */ +OO.ui.mixin.DraggableElement.prototype.toggleDraggable = function ( isDraggable ) { + isDraggable = isDraggable === undefined? !this.draggable : isDraggable; + + if ( this.draggable !== isDraggable ) { + this.draggable = isDraggable; + + this.$element.toggleClass( 'oo-ui-draggableElement-undraggable', !this.draggable ); + } +}; + +/** + * Check the draggable state of this widget + * + * @return {boolean} Widget supports draggable operations + */ +OO.ui.mixin.DraggableElement.prototype.isDraggable = function () { + return this.draggable; +}; + +/** * Respond to mousedown event. * * @private * @param {jQuery.Event} e Drag event */ OO.ui.mixin.DraggableElement.prototype.onDragMouseDown = function ( e ) { + if ( !this.isDraggable() ) { + return; + } + this.wasHandleUsed = // Optimization: if the handle is the whole element this is always true this.$handle[ 0 ] === this.$element[ 0 ] || @@ -93,7 +127,7 @@ var element = this, dataTransfer = e.originalEvent.dataTransfer; - if ( !this.wasHandleUsed ) { + if ( !this.wasHandleUsed || !this.isDraggable() ) { return false; } diff --git a/src/mixins/DraggableGroupElement.js b/src/mixins/DraggableGroupElement.js index b595e38..3079b09 100644 --- a/src/mixins/DraggableGroupElement.js +++ b/src/mixins/DraggableGroupElement.js @@ -13,6 +13,7 @@ * should match the layout of the items. Items displayed in a single row * or in several rows should use horizontal orientation. The vertical orientation should only be * used when the items are displayed in a single column. Defaults to 'vertical' + * @cfg {boolean} [draggable] The items are draggable. This can change with #toggleDraggable */ OO.ui.mixin.DraggableGroupElement = function OoUiMixinDraggableGroupElement( config ) { // Configuration initialization @@ -27,6 +28,7 @@ this.itemKeys = {}; this.dir = null; this.itemsOrder = null; + this.draggable = config.draggable === undefined ? true : !!config.draggable; // Events this.aggregate( { @@ -65,14 +67,53 @@ */ /** - * And item has been dropped at a new position. + * An item has been dropped at a new position. * * @event reorder * @param {OO.ui.mixin.DraggableElement} item Reordered item * @param {number} [newIndex] New index for the item */ +/** + * Draggable state of this widget has changed. + * + * @event draggable + * @param {boolean} [draggable] Widget is draggable + */ + /* Methods */ + +/** + * Change the draggable state of this widget. + * This allows users to temporarily halt the dragging operations. + * + * @param {boolean} isDraggable Widget supports draggable operations + * @fires draggable + */ +OO.ui.mixin.DraggableGroupElement.prototype.toggleDraggable = function ( isDraggable ) { +
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget: Remove unused code
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345073 ) Change subject: ve.init.mw.DesktopArticleTarget: Remove unused code .. ve.init.mw.DesktopArticleTarget: Remove unused code As it happens, #redirectsub is correctly spelled all lowercase, unlike #contentSub. This line does nothing. We remove #redirectsub correctly elsewhere; I don't think this was ever meant to be here. Follows-up 96421b283cab2. Change-Id: I3e4c6eb2ff94f363b488477b3ddd248e571e723a --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index ba75832..54b400b 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -1360,7 +1360,6 @@ // Remove any VE-added redirectMsg if ( $( '.mw-body-content > .ve-redirect-header' ).length ) { $( '.mw-body-content > .ve-redirect-header' ).remove(); - $( '#contentSub #redirectSub, #contentSub #redirectSub + br' ).remove(); } // Restore any previous redirectMsg/redirectsub -- To view, visit https://gerrit.wikimedia.org/r/345073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e4c6eb2ff94f363b488477b3ddd248e571e723a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-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] mediawiki/core[master]: build: Make Travis CI 'Postgres' build non-voting
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345079 ) Change subject: build: Make Travis CI 'Postgres' build non-voting .. build: Make Travis CI 'Postgres' build non-voting This will make it easier to detect regressions by not making all builds marked as fail, but only if one of the other three fails. Mute the known failure from Postgres by adding it to an allow_failures section. It'll still run every commit, but is non-voting. To be re-enabled once T75174 is fixed. Bug: T75176 Change-Id: I2ea415edd308f2a012ef240d562c0073f15b9118 --- M .travis.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/79/345079/1 diff --git a/.travis.yml b/.travis.yml index 5e2c7a0..baf7f03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,11 @@ php: hhvm-3.12 - env: dbtype=mysql dbuser=root php: 7 + allow_failures: +# Postgres support for unit tests is still buggy +# https://phabricator.wikimedia.org/T75174 +- env: dbtype=postgres dbuser=travis + php: 5.5 services: - mysql -- To view, visit https://gerrit.wikimedia.org/r/345079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ea415edd308f2a012ef240d562c0073f15b9118 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] mediawiki...NavigationTiming[master]: ext.NavigationTiming: Restore unsampled Save Timing
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345051 ) Change subject: ext.NavigationTiming: Restore unsampled Save Timing .. ext.NavigationTiming: Restore unsampled Save Timing Follows-up 8957895a6, which wrongly assumed that Save Timing should be in the same sampling condition as Navigation Timing. Restore the same logic as prior to 8957895a6: onLoadComplete: -> inSample -> do Navigation Timing -> Save Timing With the only difference that we still compute inSample before onLoadComplete happens, so that we can start preloading the schema modules earlier. Inside onLoadComplete() simply give Save Timing its own using() call instead of re-using the same variable. RL will still naturally de-duplicate and re-use the existing deferred internally (if not resolved already). If we're in the sampling, load both modules to avoid having to potentially make 2 requests instead of 1. On postEdit, we'll either no-op if the module is already loaded, or we'll on-demand load just Save Timing if needed. Bug: T161368 Change-Id: I45583feaa33936f129ca96a56341463faed8b2a8 --- M modules/ext.navigationTiming.js 1 file changed, 15 insertions(+), 13 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js index 64dcfbd..74155dd 100644 --- a/modules/ext.navigationTiming.js +++ b/modules/ext.navigationTiming.js @@ -9,7 +9,7 @@ 'use strict'; var timing, navigation, mediaWikiLoadEnd, hiddenProp, visibilityEvent, - loadEL, + loadEL, isInSample, visibilityChanged = false, TYPE_NAVIGATE = 0; @@ -259,24 +259,26 @@ } } - // Only perform actual instrumentation when page load is in the sampling + // Only load EventLogging when page load is in the sampling // Use a conditional block instead of early return since module.exports // must happen unconditionally for unit tests. - if ( inSample() ) { + isInSample = inSample(); + if ( isInSample ) { // Preload EventLogging and schema modules loadEL = mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); - - // Ensure we run after loadEventEnd. - onLoadComplete( function () { - if ( !visibilityChanged ) { - loadEL.done( emitNavigationTiming ); - } - mw.hook( 'postEdit' ).add( function () { - loadEL.done( emitSaveTiming ); - } ); - } ); } + // Ensure we run after loadEventEnd. + onLoadComplete( function () { + if ( isInSample && !visibilityChanged ) { + loadEL.done( emitNavigationTiming ); + } + mw.hook( 'postEdit' ).add( function () { + mw.loader.using( 'schema.SaveTiming' ) + .done( emitSaveTiming ); + } ); + } ); + if ( typeof QUnit !== 'undefined' ) { /** * For testing only. Subject to change any time. -- To view, visit https://gerrit.wikimedia.org/r/345051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45583feaa33936f129ca96a56341463faed8b2a8 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/NavigationTiming Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Gilles 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] mediawiki...NavigationTiming[wmf/1.29.0-wmf.17]: ext.NavigationTiming: Restore unsampled Save Timing
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345078 ) Change subject: ext.NavigationTiming: Restore unsampled Save Timing .. ext.NavigationTiming: Restore unsampled Save Timing Follows-up 8957895a6, which wrongly assumed that Save Timing should be in the same sampling condition as Navigation Timing. Restore the same logic as prior to 8957895a6: onLoadComplete: -> inSample -> do Navigation Timing -> Save Timing With the only difference that we still compute inSample before onLoadComplete happens, so that we can start preloading the schema modules earlier. Inside onLoadComplete() simply give Save Timing its own using() call instead of re-using the same variable. RL will still naturally de-duplicate and re-use the existing deferred internally (if not resolved already). If we're in the sampling, load both modules to avoid having to potentially make 2 requests instead of 1. On postEdit, we'll either no-op if the module is already loaded, or we'll on-demand load just Save Timing if needed. Bug: T161368 Change-Id: I45583feaa33936f129ca96a56341463faed8b2a8 --- M modules/ext.navigationTiming.js 1 file changed, 15 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming refs/changes/78/345078/1 diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js index 64dcfbd..74155dd 100644 --- a/modules/ext.navigationTiming.js +++ b/modules/ext.navigationTiming.js @@ -9,7 +9,7 @@ 'use strict'; var timing, navigation, mediaWikiLoadEnd, hiddenProp, visibilityEvent, - loadEL, + loadEL, isInSample, visibilityChanged = false, TYPE_NAVIGATE = 0; @@ -259,24 +259,26 @@ } } - // Only perform actual instrumentation when page load is in the sampling + // Only load EventLogging when page load is in the sampling // Use a conditional block instead of early return since module.exports // must happen unconditionally for unit tests. - if ( inSample() ) { + isInSample = inSample(); + if ( isInSample ) { // Preload EventLogging and schema modules loadEL = mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); - - // Ensure we run after loadEventEnd. - onLoadComplete( function () { - if ( !visibilityChanged ) { - loadEL.done( emitNavigationTiming ); - } - mw.hook( 'postEdit' ).add( function () { - loadEL.done( emitSaveTiming ); - } ); - } ); } + // Ensure we run after loadEventEnd. + onLoadComplete( function () { + if ( isInSample && !visibilityChanged ) { + loadEL.done( emitNavigationTiming ); + } + mw.hook( 'postEdit' ).add( function () { + mw.loader.using( 'schema.SaveTiming' ) + .done( emitSaveTiming ); + } ); + } ); + if ( typeof QUnit !== 'undefined' ) { /** * For testing only. Subject to change any time. -- To view, visit https://gerrit.wikimedia.org/r/345078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45583feaa33936f129ca96a56341463faed8b2a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NavigationTiming Gerrit-Branch: wmf/1.29.0-wmf.17 Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: add new language "dty" (Doteli)
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345077 ) Change subject: add new language "dty" (Doteli) .. add new language "dty" (Doteli) Bug: T161529 Change-Id: I5d4a50f7d9c5a49acba960cd991b698af1c92946 --- M templates/helpers/langs.tmpl 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/77/345077/1 diff --git a/templates/helpers/langs.tmpl b/templates/helpers/langs.tmpl index 2e368bf..8f9ee9e 100644 --- a/templates/helpers/langs.tmpl +++ b/templates/helpers/langs.tmpl @@ -61,6 +61,7 @@ 'diq', 'dk', 'dsb', +'dty', 'dv', 'dz', 'ee', -- To view, visit https://gerrit.wikimedia.org/r/345077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d4a50f7d9c5a49acba960cd991b698af1c92946 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove $wgProxyList
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345074 ) Change subject: Remove $wgProxyList .. Remove $wgProxyList Per discussion with Tim on #mediawiki-core, this list is going to be very out of date, and blocking for a decade isn't helpful Change-Id: I0c2de4595a474d4927845366735d464413debdef --- M wmf-config/CommonSettings.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Tim Starling: Looks good to me, but someone else must approve Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5a15327..94e1288 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1243,8 +1243,6 @@ $wgHTTPTimeout = 10; } -$wgProxyList = "$wmfConfigDir/../private/mwblocker.log"; - $wgBrowserBlackList[] = '/^Lynx/'; $wgHiddenPrefs[] = 'prefershttps'; // T91352, T102245 -- To view, visit https://gerrit.wikimedia.org/r/345074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c2de4595a474d4927845366735d464413debdef Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: ReedyGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Reedy Gerrit-Reviewer: Tim Starling Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: remove production IPs for ms-fe100[1-4]
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345076 ) Change subject: remove production IPs for ms-fe100[1-4] .. remove production IPs for ms-fe100[1-4] Bug: T160986 Change-Id: Ibb11957cbb39fc909485ad34ab692547ef502fba --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/76/345076/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 4d30f3c..676f16c 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -352,8 +352,6 @@ 164 1H IN PTR strontium.eqiad.wmnet. 165 1H IN PTR dbproxy1001.eqiad.wmnet. 166 1H IN PTR dbproxy1002.eqiad.wmnet. -167 1H IN PTR ms-fe1001.eqiad.wmnet. -168 1H IN PTR ms-fe1002.eqiad.wmnet. 173 1H IN PTR ms-be1001.eqiad.wmnet. 174 1H IN PTR ms-be1002.eqiad.wmnet. 175 1H IN PTR ms-be1003.eqiad.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 25eb60c..d84adc4 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -514,10 +514,6 @@ ms-be1026 1H IN A10.64.48.159 ms-be1027 1H IN A10.64.48.160 ms-fe 1H IN A10.2.2.27 ;LVS address for ms-fe100* -ms-fe1001 1H IN A10.64.0.167 -ms-fe1002 1H IN A10.64.0.168 -ms-fe1003 1H IN A10.64.32.152 -ms-fe1004 1H IN A10.64.32.92 ms-fe1005 1H IN A10.64.0.38 ms-fe1006 1H IN A10.64.0.39 ms-fe1007 1H IN A10.64.32.220 -- To view, visit https://gerrit.wikimedia.org/r/345076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb11957cbb39fc909485ad34ab692547ef502fba Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: decom ms-fe100[1-4], remove from DHCP and puppet
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345075 ) Change subject: decom ms-fe100[1-4], remove from DHCP and puppet .. decom ms-fe100[1-4], remove from DHCP and puppet Bug: T160986 Change-Id: I4149c74a16c8fe850a42631d6eb9d6e5e256e1d5 --- M manifests/site.pp M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 2 files changed, 0 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/345075/1 diff --git a/manifests/site.pp b/manifests/site.pp index c08c595..741be41 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1945,10 +1945,6 @@ include ::standard } -node /^ms-fe100[1-4]\.eqiad\.wmnet$/ { -role(spare::system) -} - node /^ms-fe1005\.eqiad\.wmnet$/ { role(swift::proxy, swift::stats_reporter) include ::lvs::realserver 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 3399303..2b15a43 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -3676,34 +3676,6 @@ fixed-address ms-be3004.esams.wmnet; } -host ms-fe1001 { -hardware ethernet d4:be:d9:ec:df:a7; -fixed-address ms-fe1001.eqiad.wmnet; -option pxelinux.pathprefix "trusty-installer/"; -filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0"; -} - -host ms-fe1002 { -hardware ethernet d4:be:d9:ec:d2:27; -fixed-address ms-fe1002.eqiad.wmnet; -option pxelinux.pathprefix "trusty-installer/"; -filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0"; -} - -host ms-fe1003 { -hardware ethernet d4:be:d9:ec:e0:49; -fixed-address ms-fe1003.eqiad.wmnet; -option pxelinux.pathprefix "trusty-installer/"; -filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0"; -} - -host ms-fe1004 { -hardware ethernet d4:be:d9:ec:e0:52; -fixed-address ms-fe1004.eqiad.wmnet; -option pxelinux.pathprefix "trusty-installer/"; -filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0"; -} - host ms-fe1005 { hardware ethernet F4:E9:D4:AE:F4:E0; fixed-address ms-fe1005.eqiad.wmnet; -- To view, visit https://gerrit.wikimedia.org/r/345075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4149c74a16c8fe850a42631d6eb9d6e5e256e1d5 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] operations/mediawiki-config[master]: Remove $wgProxyList
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345074 ) Change subject: Remove $wgProxyList .. Remove $wgProxyList Per discussion with Tim on #mediawiki-core, this list is going to be very out of date, and blocking for a decade isn't helpful Change-Id: I0c2de4595a474d4927845366735d464413debdef --- M wmf-config/CommonSettings.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/345074/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5cc2092..cb86f63 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1243,8 +1243,6 @@ $wgHTTPTimeout = 10; } -$wgProxyList = "$wmfConfigDir/../private/mwblocker.log"; - $wgBrowserBlackList[] = '/^Lynx/'; $wgHiddenPrefs[] = 'prefershttps'; // T91352, T102245 -- To view, visit https://gerrit.wikimedia.org/r/345074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c2de4595a474d4927845366735d464413debdef Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget: Remove unused code
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345073 ) Change subject: ve.init.mw.DesktopArticleTarget: Remove unused code .. ve.init.mw.DesktopArticleTarget: Remove unused code As it happens, #redirectsub is correctly spelled all lowercase, unlike #contentSub. This line does nothing. We remove #redirectsub correctly elsewhere; I don't think this was ever meant to be here. Change-Id: I3e4c6eb2ff94f363b488477b3ddd248e571e723a --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/73/345073/1 diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index ba75832..54b400b 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -1360,7 +1360,6 @@ // Remove any VE-added redirectMsg if ( $( '.mw-body-content > .ve-redirect-header' ).length ) { $( '.mw-body-content > .ve-redirect-header' ).remove(); - $( '#contentSub #redirectSub, #contentSub #redirectSub + br' ).remove(); } // Restore any previous redirectMsg/redirectsub -- To view, visit https://gerrit.wikimedia.org/r/345073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e4c6eb2ff94f363b488477b3ddd248e571e723a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ViewFiles[master]: Stop using removed SyntaxHighlight_GeSHi methods
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345072 ) Change subject: Stop using removed SyntaxHighlight_GeSHi methods .. Stop using removed SyntaxHighlight_GeSHi methods Tidy up some layout Bug: T161573 Change-Id: I2cd7558e17437d03f24a75804b7a532264ce29e2 --- M SpecialViewFiles.php M i18n/en.json 2 files changed, 9 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ViewFiles refs/changes/72/345072/1 diff --git a/SpecialViewFiles.php b/SpecialViewFiles.php index 7478619..887d978 100644 --- a/SpecialViewFiles.php +++ b/SpecialViewFiles.php @@ -7,23 +7,19 @@ function execute( $par ) { global $wgViewFilesIntro, $wgViewFilesBegin, $wgViewFilesEnd, - $wgViewFilesFileLangList, $wgViewFilesFilePathList, - $wgViewFilesRobotPolicy; + $wgViewFilesFileLangList, $wgViewFilesFilePathList, + $wgViewFilesRobotPolicy; $this->setHeaders(); $viewOutput = $this->getOutput(); $viewOutput->setRobotPolicy( $wgViewFilesRobotPolicy ); // Bail if SyntaxHighlight isn't installed - if ( !class_exists( 'SyntaxHighlight_GeSHi' ) - || !class_exists( 'GeSHi' ) - ) { + if ( !class_exists( 'SyntaxHighlight_GeSHi' ) ) { $viewOutput->addWikiMsg( 'viewfiles-no-geshi' ); - $viewOutput->addWikiText( "\n" . '' . "\n" - . 'require_once("$IP/extensions/SyntaxHighlight_GeSHi/' - . 'SyntaxHighlight_GeSHi.php");' . "\n" - . 'require_once("$IP/extensions/SyntaxHighlight_GeSHi/' - . 'geshi/geshi.php");' . "\n" . '' ); + $viewOutput->addWikiText( "\n\n" + . "wfLoadExtension( 'SyntaxHighlight_GeSHi' )\n" + ); return; } @@ -45,20 +41,14 @@ if ( isset ( $wgViewFilesFileLangList[$filename] ) ) { $lang = $wgViewFilesFileLangList[$filename]; } else { - // If this particular filename has no selected format, then - // go with what Geshi suggests, given the extension - $geshi = new GeSHi; - $lang = $geshi->get_language_name_from_extension( - pathinfo( $filename, PATHINFO_EXTENSION ) ); + $lang = pathinfo( $filename, PATHINFO_EXTENSION ); } $langOutput = str_replace( '$1', $lang, $wgViewFilesBegin ); // Read and display the file, if it exists if ( !file_exists( $pathFilename ) ) { - $output .= $this->msg( 'filenotfound', - $filename )->text() . "\n"; + $output .= $this->msg( 'filenotfound', $filename )->text() . "\n"; } else { $output .= $langOutput; - $handle = fopen( $pathFilename, "r" ); $contents = file_get_contents( $pathFilename ); if ( $contents ) { $output .= $contents; diff --git a/i18n/en.json b/i18n/en.json index d56f60d..9fb6bef 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -7,5 +7,5 @@ "viewfiles": "View files", "viewfiles-desc": "Adds a [[Special:ViewFiles|special page]] to view the current contents of a limited set of files", "viewfiles-no-files-available": "No files have been made available for viewing.", - "viewfiles-no-geshi": "Error: You need to download and install the [https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi GeSHi SyntaxHighlight extension].\nBe sure to add both these lines to your LocalSettings.php file:" + "viewfiles-no-geshi": "Error: You need to download and install the [https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi GeSHi SyntaxHighlight extension].\nBe sure to add this line to your LocalSettings.php file:" } -- To view, visit https://gerrit.wikimedia.org/r/345072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cd7558e17437d03f24a75804b7a532264ce29e2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ViewFiles Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Fix crontab CLI params
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345071 ) Change subject: Fix crontab CLI params .. Fix crontab CLI params Change-Id: I06307b498a051ec3998ca43e197953358fc9edac --- M processcontrol/crontab.py M tests/test_crontab.py 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/71/345071/1 diff --git a/processcontrol/crontab.py b/processcontrol/crontab.py index b099e11..3e43987 100644 --- a/processcontrol/crontab.py +++ b/processcontrol/crontab.py @@ -36,11 +36,11 @@ def __str__(self): if not self.enabled: -return "# Skipping disabled job {path}\n".format(path=self.job.config_path) +return "# Skipping disabled job {name}\n".format(name=self.job.slug) -command = "{runner} {conf}".format( +command = "{runner} {name}".format( runner=self.job.global_config.get("runner_path"), -conf=self.job.config_path) +name=self.job.slug) template = self.job.global_config.get("cron_template") diff --git a/tests/test_crontab.py b/tests/test_crontab.py index 40cb3b5..6cc5b2d 100644 --- a/tests/test_crontab.py +++ b/tests/test_crontab.py @@ -36,12 +36,12 @@ tab = tab.replace(job_dir, "X") tab = tab.replace(runner_path, "Y") -expected = """# Skipping disabled job X/disabled.yaml +expected = """# Skipping disabled job disabled # Generated from X/schedule_2.yaml -*/10 * * * * jenkins Y X/schedule_2.yaml +*/10 * * * * jenkins Y schedule_2 # Generated from X/schedule_good.yaml -*/5 * * * * jenkins Y X/schedule_good.yaml -# Skipping disabled job X/unscheduled.yaml +*/5 * * * * jenkins Y schedule_good +# Skipping disabled job unscheduled """ assert expected == tab -- To view, visit https://gerrit.wikimedia.org/r/345071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06307b498a051ec3998ca43e197953358fc9edac Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix Illegal string offset 'ltr' in ResourceLoaderEchoImageMo...
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345070 ) Change subject: Fix Illegal string offset 'ltr' in ResourceLoaderEchoImageModule.php .. Fix Illegal string offset 'ltr' in ResourceLoaderEchoImageModule.php Make $paths an array. Bug: T161420 Change-Id: I709808bfb0e620f7808175dc272fd57e88b663f5 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/70/345070/1 -- To view, visit https://gerrit.wikimedia.org/r/345070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I709808bfb0e620f7808175dc272fd57e88b663f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Fixup some parameter documentation
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345069 ) Change subject: Fixup some parameter documentation .. Fixup some parameter documentation Remove some return documentation as they don't return (yay hooks) Wrap a long line Change-Id: Iefd41c666a25779223fbd7fdb19bf8cf56dd9452 --- M SyntaxHighlight_GeSHi.class.php 1 file changed, 18 insertions(+), 6 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php index 46567e8..31299b0 100644 --- a/SyntaxHighlight_GeSHi.class.php +++ b/SyntaxHighlight_GeSHi.class.php @@ -89,7 +89,6 @@ * Register parser hook * * @param $parser Parser -* @return bool */ public static function onParserFirstCallInit( Parser &$parser ) { foreach ( array( 'source', 'syntaxhighlight' ) as $tag ) { @@ -104,6 +103,7 @@ * @param array $args * @param Parser $parser * @return string +* @throws MWException */ public static function parserHook( $text, $args = array(), $parser ) { global $wgUseTidy; @@ -235,7 +235,11 @@ $status->value = htmlspecialchars( trim( $code ), ENT_NOQUOTES ); } else { $pre = Html::element( 'pre', array(), $code ); - $status->value = Html::rawElement( 'div', array( 'class' => self::HIGHLIGHT_CSS_CLASS ), $pre ); + $status->value = Html::rawElement( + 'div', + array( 'class' => self::HIGHLIGHT_CSS_CLASS ), + $pre + ); } return $status; } @@ -448,6 +452,7 @@ * @param string $mime * @param string $format * @since MW 1.24 +* @return bool */ public static function onApiFormatHighlight( IContextSource $context, $text, $mime, $format ) { if ( !isset( self::$mimeLexers[$mime] ) ) { @@ -500,8 +505,7 @@ * Conditionally register resource loader modules that depends on the * VisualEditor MediaWiki extension. * -* @param $resourceLoader -* @return true +* @param ResourceLoader $resourceLoader */ public static function onResourceLoaderRegisterModules( &$resourceLoader ) { if ( ! ExtensionRegistry::getInstance()->isLoaded( 'VisualEditor' ) ) { @@ -540,13 +544,21 @@ ] ); } - /** Backward-compatibility shim for extensions. */ + /** +* Backward-compatibility shim for extensions. +* @deprecated since MW 1.25 +*/ public static function prepare( $text, $lang ) { wfDeprecated( __METHOD__ ); return new GeSHi( self::highlight( $text, $lang )->getValue() ); } - /** Backward-compatibility shim for extensions. */ + /** +* Backward-compatibility shim for extensions. +* @deprecated since MW 1.25 +* @param GeSHi $geshi +* @return string +*/ public static function buildHeadItem( $geshi ) { wfDeprecated( __METHOD__ ); $geshi->parse_code(); -- To view, visit https://gerrit.wikimedia.org/r/345069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefd41c666a25779223fbd7fdb19bf8cf56dd9452 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: ReedyGerrit-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] mediawiki...WikibaseLexeme[master]: Fix interface violations in Lexeme(De)Serializer
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344972 ) Change subject: Fix interface violations in Lexeme(De)Serializer .. Fix interface violations in Lexeme(De)Serializer These individual (de)serializers are package private and not supposed to be exposed. This causes actual type warnings in my PHPStorm. Change-Id: I853933acb3094526946ee602c927388c683e8d8b --- M src/DataModel/Serialization/LexemeDeserializer.php M src/DataModel/Serialization/LexemeSerializer.php 2 files changed, 15 insertions(+), 25 deletions(-) Approvals: Ladsgroup: Looks good to me, approved Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/src/DataModel/Serialization/LexemeDeserializer.php b/src/DataModel/Serialization/LexemeDeserializer.php index 0d064f3..ab4a8a6 100644 --- a/src/DataModel/Serialization/LexemeDeserializer.php +++ b/src/DataModel/Serialization/LexemeDeserializer.php @@ -2,11 +2,9 @@ namespace Wikibase\Lexeme\DataModel\Serialization; +use Deserializers\Deserializer; use Deserializers\Exceptions\DeserializationException; use Deserializers\TypedObjectDeserializer; -use Wikibase\DataModel\Deserializers\EntityIdDeserializer; -use Wikibase\DataModel\Deserializers\StatementListDeserializer; -use Wikibase\DataModel\Deserializers\TermListDeserializer; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Statement\StatementList; use Wikibase\DataModel\Term\TermList; @@ -20,37 +18,34 @@ class LexemeDeserializer extends TypedObjectDeserializer { /** -* @var EntityIdDeserializer +* @var Deserializer */ private $entityIdDeserializer; /** -* @var TermListDeserializer +* @var Deserializer */ private $termListDeserializer; /** -* @var StatementListDeserializer +* @var Deserializer */ private $statementListDeserializer; - /** -* @param TermListDeserializer $termListDeserializer -* @param StatementListDeserializer $statementListDeserializer -*/ public function __construct( - EntityIdDeserializer $entityIdDeserializer, - TermListDeserializer $termListDeserializer, - StatementListDeserializer $statementListDeserializer + Deserializer $entityIdDeserializer, + Deserializer $termListDeserializer, + Deserializer $statementListDeserializer ) { parent::__construct( 'lexeme', 'type' ); + + $this->entityIdDeserializer = $entityIdDeserializer; $this->termListDeserializer = $termListDeserializer; $this->statementListDeserializer = $statementListDeserializer; - $this->entityIdDeserializer = $entityIdDeserializer; } /** -* @param mixed $serialization +* @param array $serialization * * @throws DeserializationException * @return Lexeme diff --git a/src/DataModel/Serialization/LexemeSerializer.php b/src/DataModel/Serialization/LexemeSerializer.php index 82873c5..cb3e87b 100644 --- a/src/DataModel/Serialization/LexemeSerializer.php +++ b/src/DataModel/Serialization/LexemeSerializer.php @@ -5,8 +5,7 @@ use Serializers\DispatchableSerializer; use Serializers\Exceptions\SerializationException; use Serializers\Exceptions\UnsupportedObjectException; -use Wikibase\DataModel\Serializers\StatementListSerializer; -use Wikibase\DataModel\Serializers\TermListSerializer; +use Serializers\Serializer; use Wikibase\Lexeme\DataModel\Lexeme; /** @@ -16,22 +15,18 @@ class LexemeSerializer implements DispatchableSerializer { /** -* @var TermListSerializer +* @var Serializer */ private $termListSerializer; /** -* @var StatementListSerializer +* @var Serializer */ private $statementListSerializer; - /** -* @param TermListSerializer $termListSerializer -* @param StatementListSerializer $statementListSerializer -*/ public function __construct( - TermListSerializer $termListSerializer, - StatementListSerializer $statementListSerializer + Serializer $termListSerializer, + Serializer $statementListSerializer ) { $this->termListSerializer = $termListSerializer; $this->statementListSerializer = $statementListSerializer; -- To view, visit https://gerrit.wikimedia.org/r/344972 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I853933acb3094526946ee602c927388c683e8d8b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseLexeme Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)
[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Fixup some parameter documentation
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345069 ) Change subject: Fixup some parameter documentation .. Fixup some parameter documentation Remove some return documentation as they don't return (yay hooks) Wrap a long line Change-Id: Iefd41c666a25779223fbd7fdb19bf8cf56dd9452 --- M SyntaxHighlight_GeSHi.class.php 1 file changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/69/345069/1 diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php index 46567e8..31299b0 100644 --- a/SyntaxHighlight_GeSHi.class.php +++ b/SyntaxHighlight_GeSHi.class.php @@ -89,7 +89,6 @@ * Register parser hook * * @param $parser Parser -* @return bool */ public static function onParserFirstCallInit( Parser &$parser ) { foreach ( array( 'source', 'syntaxhighlight' ) as $tag ) { @@ -104,6 +103,7 @@ * @param array $args * @param Parser $parser * @return string +* @throws MWException */ public static function parserHook( $text, $args = array(), $parser ) { global $wgUseTidy; @@ -235,7 +235,11 @@ $status->value = htmlspecialchars( trim( $code ), ENT_NOQUOTES ); } else { $pre = Html::element( 'pre', array(), $code ); - $status->value = Html::rawElement( 'div', array( 'class' => self::HIGHLIGHT_CSS_CLASS ), $pre ); + $status->value = Html::rawElement( + 'div', + array( 'class' => self::HIGHLIGHT_CSS_CLASS ), + $pre + ); } return $status; } @@ -448,6 +452,7 @@ * @param string $mime * @param string $format * @since MW 1.24 +* @return bool */ public static function onApiFormatHighlight( IContextSource $context, $text, $mime, $format ) { if ( !isset( self::$mimeLexers[$mime] ) ) { @@ -500,8 +505,7 @@ * Conditionally register resource loader modules that depends on the * VisualEditor MediaWiki extension. * -* @param $resourceLoader -* @return true +* @param ResourceLoader $resourceLoader */ public static function onResourceLoaderRegisterModules( &$resourceLoader ) { if ( ! ExtensionRegistry::getInstance()->isLoaded( 'VisualEditor' ) ) { @@ -540,13 +544,21 @@ ] ); } - /** Backward-compatibility shim for extensions. */ + /** +* Backward-compatibility shim for extensions. +* @deprecated since MW 1.25 +*/ public static function prepare( $text, $lang ) { wfDeprecated( __METHOD__ ); return new GeSHi( self::highlight( $text, $lang )->getValue() ); } - /** Backward-compatibility shim for extensions. */ + /** +* Backward-compatibility shim for extensions. +* @deprecated since MW 1.25 +* @param GeSHi $geshi +* @return string +*/ public static function buildHeadItem( $geshi ) { wfDeprecated( __METHOD__ ); $geshi->parse_code(); -- To view, visit https://gerrit.wikimedia.org/r/345069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd41c666a25779223fbd7fdb19bf8cf56dd9452 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] performance/docroot[master]: build: Switch from JSHint/JSCS to ESLint
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345068 ) Change subject: build: Switch from JSHint/JSCS to ESLint .. build: Switch from JSHint/JSCS to ESLint Change-Id: I8fd9ec82db5b9316162bd09180805cef2d376796 --- R .eslintignore A .eslintrc.json D .jscsrc D .jshintrc M package.json M public_html/src/coal.js 6 files changed, 14 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/performance/docroot refs/changes/68/345068/1 diff --git a/.jshintignore b/.eslintignore similarity index 100% rename from .jshintignore rename to .eslintignore diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 000..7046bdf --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,7 @@ +{ +"extends": "wikimedia", +"ecmaVersion": 5, +"env": { +"browser": true +} +} diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index e5c31a3..000 --- a/.jscsrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "preset": "wikimedia", - "requireCamelCaseOrUpperCaseIdentifiers": null, - "excludeFiles": [ - "lib/**", - "node_modules/**", - "public_html/lib/**" - ] -} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index f3656d0..000 --- a/.jshintrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - // Enforcing - "bitwise": true, - "eqeqeq": true, - "freeze": true, - "latedef": true, - "noarg": true, - "nonew": true, - "undef": true, - "unused": true, - - // Environment - "browser": true, - - "globals": { - } -} diff --git a/package.json b/package.json index b175f11..3906874 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "scripts": { -"test": "jshint . && jscs ." +"test": "eslint ." }, "devDependencies": { -"jscs": "1.13.1", -"jshint": "2.8.0" +"eslint": "^3.18.0", +"eslint-config-wikimedia": "0.3.0" } } diff --git a/public_html/src/coal.js b/public_html/src/coal.js index 46d9d43..8b8b0cc 100644 --- a/public_html/src/coal.js +++ b/public_html/src/coal.js @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/*global d3, MG */ +/* global d3, MG */ ( function () { 'use strict'; @@ -40,7 +40,7 @@ .attr( 'id', identity ); charts.each( function ( metric ) { - var points = d3.values( data.points[metric] ).map( function ( value, idx ) { + var points = d3.values( data.points[ metric ] ).map( function ( value, idx ) { var epochSeconds = data.start + idx * data.step; return { date: new Date( 1000 * epochSeconds ), value: value }; } ); @@ -53,9 +53,11 @@ width: 680, height: 200, left: 60, + /* eslint-disable camelcase */ min_y_from_data: true, show_tooltips: false, show_rollover_text: true + /* eslint-enable camelcase */ } ); } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/345068 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fd9ec82db5b9316162bd09180805cef2d376796 Gerrit-PatchSet: 1 Gerrit-Project: performance/docroot 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] mediawiki...WikimediaEvents[wmf/1.29.0-wmf.17]: Turn off cirrus sistersearch AB test
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345065 ) Change subject: Turn off cirrus sistersearch AB test .. Turn off cirrus sistersearch AB test Test has run to completion, turning off. This reverts commit c471eba5e62b43092a7158e3e70a930a4d2a0a6e. Bug: T160006 Change-Id: I9214b3313aa8e96077a5d4674587a4f4e69f178d (cherry picked from commit f39ab32dd6678c15f44b1835a17bdf6f36349f55) --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 3 insertions(+), 76 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index c486838..8e2a099 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -113,54 +113,13 @@ function initialize( session ) { var sessionId = session.get( 'sessionId' ), - // List of valid sub-test buckets - validBuckets = [ - 'recall_sidebar_results', - 'no_sidebar' - ], - // Sampling to use when choosing which users should participate in test + // No sub-tests currently running + validBuckets = [], sampleSize = ( function () { var dbName = mw.config.get( 'wgDBname' ), // Currently unused, but provides a place // to handle wiki-specific sampling subTests = { - arwiki: { - // 1 in 25 users search sessions will be recorded - // by event logging - test: 25, - // 1 in 8 (of the 1 in 25) will be reserved for - // dashboarding. The other 7 in 8 are split equally - // into buckets. - subTest: 8 - }, - cawiki: { - test: 6, - subTest: 34 - }, - dewiki: { - test: 108, - subTest: 2 - }, - fawiki: { - test: 8, - subTest: 25 - }, - frwiki: { - test: 70, - subTest: 3 - }, - itwiki: { - test: 42, - subTest: 5 - }, - plwiki: { - test: 35, - subTest: 6 - }, - ruwiki: { - test: 71, - subTest: 3 - } }; if ( subTests[ dbName ] ) { @@ -222,8 +181,6 @@ return; } - // 1 in sampleSize.subTest reserved for dashboarding, the rest split -
[MediaWiki-commits] [Gerrit] performance/docroot[master]: index: Remove use of Google Fonts
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345067 ) Change subject: index: Remove use of Google Fonts .. index: Remove use of Google Fonts * Remove non-standard nav.navbar-default wrapper that causes minor layout issuese with Bootstrap. * Adjust font-weight for h2 to match the different font. Change-Id: I1b58c3b7ad32a4dbd8507348cebb69322fb946e2 --- M public_html/index.html 1 file changed, 11 insertions(+), 16 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/public_html/index.html b/public_html/index.html index 597105c..2c335d9 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -2,18 +2,15 @@ Metrics — Wikimedia Performance -
[MediaWiki-commits] [Gerrit] performance/docroot[master]: index: Remove use of Google Fonts
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345067 ) Change subject: index: Remove use of Google Fonts .. index: Remove use of Google Fonts Also remove non-standard nav.navbar-default wrapper that causes minor layout issuese with Bootstrap. Change-Id: I1b58c3b7ad32a4dbd8507348cebb69322fb946e2 --- M public_html/index.html 1 file changed, 11 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/performance/docroot refs/changes/67/345067/1 diff --git a/public_html/index.html b/public_html/index.html index 597105c..2c335d9 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -2,18 +2,15 @@ Metrics — Wikimedia Performance -
[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: create shell account for Paul Norman
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345066 ) Change subject: admin: create shell account for Paul Norman .. admin: create shell account for Paul Norman For Paul Normal create a shell account for: access to the maps production servers purpose: debugging maps problems when they occur expiry date and contact per comments on T161274#3134834 UID per existing LDAP user: uidNumber: 16082 uid: pnorman cn: Pnorman NDA confirmed by legal. Access sponsored by gehel. Bug: T161274 Change-Id: Iff1f766e5ca86db03d33dc39286fe4f291783757 --- M modules/admin/data/data.yaml 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/345066/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index c8b9707..214fcff 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2471,6 +2471,17 @@ - ssh-rsa B3NzaC1yc2EDAQABAAABAQC6jc1W0mqEnurNhtYXF9YQpCX3H4h1pQA9jgZXKGTPUczQJ2rRVZKWXxuPfbg0OwZFzVKhTtSi0HO2v0Dy4gOtrDMpxfX51HnsB/Sm+ifngkj5AgSiAylT7P4PNm7F804m7iJF277DDx/+R9JAL59NT0C9nTZ6oKghL37TQr/PdHBRhjZjRzMOjuplwoFh+I9ZtLGQJpqTENKWqqYwxwMdjog/fRf3+tkvB7kxwmZHRiVPBl8BS64JkNmKXX+xQCtR0YMYH8HkfE4GarSnDXSqmhwS6Zx8TY7oVPy0d5H8cZaA2RyoYWzEH4K2rbvllLoZCnto5Elb6ic0BVP7P8Fn goran@goranNET uid: 16664 email: goran.milovanovic_...@wikimedia.de + pnorman: +ensure: present +gid: 500 +name: pnorman +realname: Paul Norman +ssh_keys: + - ssh-rsa B3NzaC1yc2EDAQABAAACAQCy7wnX7ck41mKRzXvt5n/2UVEDkK1T9L5iyDFAWgDAbjgWqjBgnfHVq88lX1d/WOUNjNzF1WnRWn1vk6gKk3eoNlIbEcIvfLGYB+e6yGsE9KZWyvcpWcIBhhe9YH4d7nY34ScUIH42bZkXh2iGu5VpQVm8G5Wf9iqSwKFHSAy+Bl3jclaHSPfUmGxTbjC2e20Xns8BvybEW4dBjb79/eHNR1K/9f5JHeLM9ZE3wKVYC07kSnsYCGVWWr2zqyjpmBl2hQe/0C0pvx2AoTzEYK58BZZUkui3aIihSDiDMxDujNypUtePyoCq14t8dLSkIfOh0kRKAVmC/6oVwzSFbvZ7yjyU5ApsUK1DqCmFw/yz9M/nRuAs3qkXwFC1XUyjNBiVBEbWKDGxBx08TjZPKSvbtQD3DaU7RvXJUh3hsDcrgfky6ZlfV9y1bRp7heHVAShVWrsTwoQt/PF6uZ2ud71Ri51bV9qlHdT/BmF+UJ86LSPzTHSKt57GEXguVVPCGgfjFm+WugW4SOC+Bx/IEQC7+hfgXZjr6CQt+zCOExBS6IpknDBIzuvdbrNKG1auBn6nJKCAURRR3q71tCGlihjV39u5ZEmGqacsIYDA1SSTGqUGq5MuaVoVuS0rBPwFjO1enhqDT6wl9qBVuHUDlis9XQ2wOyLT3yqG0sGYxpNF0w== pnorman@pippin +uid: 16082 +email: penor...@mac.com +expiry_date: 2017-05-31 +expiry_contact: h...@wikimedia.org ldap_only_users: abartov: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/345066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff1f766e5ca86db03d33dc39286fe4f291783757 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] wikimedia...process-control[master]: Test for environment parameter
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344501 ) Change subject: Test for environment parameter .. Test for environment parameter Change-Id: I7739f28ca9fd3b11754a5eae0c10ee59a034d384 --- A tests/data/env.yaml M tests/test_job_wrapper.py 2 files changed, 28 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/tests/data/env.yaml b/tests/data/env.yaml new file mode 100644 index 000..bdc5ef3 --- /dev/null +++ b/tests/data/env.yaml @@ -0,0 +1,5 @@ +name: Env dumper +command: /usr/bin/env +environment: +foo1: bar +foo2: rebar diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py index f95480c..ef290d5 100644 --- a/tests/test_job_wrapper.py +++ b/tests/test_job_wrapper.py @@ -79,7 +79,6 @@ run_job("which_out.yaml") log_files = sorted(glob.glob(path_glob)) -assert len(log_files) == 1 path = log_files[-1] contents = open(path, "r").read() lines = contents.split("\n") @@ -88,3 +87,26 @@ assert lines[4] == "/bin/bash" os.unlink(path) + + +def test_environment(): +path_glob = "/tmp/Env dumper/Env dumper*.log" + +run_job("env.yaml") + +log_files = sorted(glob.glob(path_glob)) +path = log_files[-1] +contents = open(path, "r").read() +lines = contents.split("\n") +print(lines) + +assert len(lines) == 7 + +dumped_env = sorted(lines[4:6]) +expected = [ +"foo1=bar", +"foo2=rebar", +] +assert expected == dumped_env + +os.unlink(path) -- To view, visit https://gerrit.wikimedia.org/r/344501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7739f28ca9fd3b11754a5eae0c10ee59a034d384 Gerrit-PatchSet: 3 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: AwightGerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Fixes suggested by thcipriani
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343965 ) Change subject: Fixes suggested by thcipriani .. Fixes suggested by thcipriani Change-Id: I03592650c63907ffa4e14a1a136372bff3038f79 --- M processcontrol/lock.py 1 file changed, 9 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/processcontrol/lock.py b/processcontrol/lock.py index 6c91863..6af0bb5 100644 --- a/processcontrol/lock.py +++ b/processcontrol/lock.py @@ -5,7 +5,6 @@ ''' from __future__ import print_function import os -import os.path import sys lockfile = None @@ -17,13 +16,13 @@ if os.path.exists(filename): print("Lockfile found!", file=sys.stderr) -f = open(filename, "r") -pid = None -try: -pid = int(f.read()) -except ValueError: -pass -f.close() +with open(filename, "r") as f: +pid = None +try: +pid = int(f.read()) +except ValueError: +pass + if not pid: print("Invalid lockfile contents.", file=sys.stderr) else: @@ -37,9 +36,8 @@ print("Removing old lockfile.", file=sys.stderr) os.unlink(filename) -f = open(filename, "w") -f.write(str(os.getpid())) -f.close() +with open(filename, "w") as f: +f.write(str(os.getpid())) global lockfile lockfile = filename -- To view, visit https://gerrit.wikimedia.org/r/343965 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03592650c63907ffa4e14a1a136372bff3038f79 Gerrit-PatchSet: 4 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: AwightGerrit-Reviewer: Awight Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Move arrow button logic to own class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344636 ) Change subject: Move arrow button logic to own class .. Move arrow button logic to own class Change-Id: I56e52d8b11f8557d759dc495512d9754e8f441f6 --- M extension.json A modules/ext.RevisionSlider.SliderArrowView.js M modules/ext.RevisionSlider.SliderView.js 3 files changed, 154 insertions(+), 121 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index f570988..57ce856 100644 --- a/extension.json +++ b/extension.json @@ -131,7 +131,8 @@ }, "ext.RevisionSlider.SliderView": { "scripts": [ - "modules/ext.RevisionSlider.SliderView.js" + "modules/ext.RevisionSlider.SliderView.js", + "modules/ext.RevisionSlider.SliderArrowView.js" ], "dependencies": [ "jquery.ui.draggable", diff --git a/modules/ext.RevisionSlider.SliderArrowView.js b/modules/ext.RevisionSlider.SliderArrowView.js new file mode 100644 index 000..17f0fe7 --- /dev/null +++ b/modules/ext.RevisionSlider.SliderArrowView.js @@ -0,0 +1,149 @@ +( function ( mw, $ ) { + /** +* Module containing presentation logic for the arrow buttons +* +* @param {SliderView} sliderView +* @constructor +*/ + var SliderArrowView = function ( sliderView ) { + this.sliderView = sliderView; + }; + + $.extend( SliderArrowView.prototype, { + /** +* @type {SliderView} +*/ + sliderView: null, + + /** +* Renders the backwards arrow button, returns it +* and renders and adds the popup for it. +* +* @return {OO.ui.ButtonWidget} +*/ + renderBackwardArrow: function() { + var backwardArrowButton, + backwardArrowPopup; + + backwardArrowButton = new OO.ui.ButtonWidget( { + icon: 'previous', + width: 20, + height: 140, + framed: true, + classes: [ 'mw-revslider-arrow', 'mw-revslider-arrow-backwards' ] + } ); + + backwardArrowPopup = new OO.ui.PopupWidget( { + $content: $( '' ).text( mw.msg( 'revisionslider-arrow-tooltip-older' ) ), + $floatableContainer: backwardArrowButton.$element, + padded: true, + width: 200, + classes: [ 'mw-revslider-tooltip', 'mw-revslider-arrow-tooltip' ] + } ); + + backwardArrowButton.connect( this, { + click: [ 'arrowClickHandler', backwardArrowButton ] + } ); + + backwardArrowButton.$element + .attr( 'data-dir', -1 ) + .mouseover( { button: backwardArrowButton, popup: backwardArrowPopup }, this.showPopup ) + .mouseout( { popup: backwardArrowPopup }, this.hidePopup ) + .focusin( { button: backwardArrowButton }, this.arrowFocusHandler ); + + $( 'body' ).append( backwardArrowPopup.$element ); + + return backwardArrowButton; + }, + + /** +* Renders the forwards arrow button, returns it +* and renders and adds the popup for it. +* +* @return {OO.ui.ButtonWidget} +*/ + renderForwardArrow: function() { + var forwardArrowButton, + forwardArrowPopup; + + forwardArrowButton = new OO.ui.ButtonWidget( { + icon: 'next', + width: 20, + height: 140, + framed: true, + classes: [ 'mw-revslider-arrow', 'mw-revslider-arrow-forwards' ] + } ); + + forwardArrowPopup = new OO.ui.PopupWidget( { + $content: $( '' ).text( mw.msg( 'revisionslider-arrow-tooltip-newer' ) ), + $floatableContainer: forwardArrowButton.$element, + padded: true, + width: 200, +
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Move helper button logic to own class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344635 ) Change subject: Move helper button logic to own class .. Move helper button logic to own class Change-Id: I8fdfeb3344974b3cee7ce07bcf2ceea9308fffe6 --- M extension.json A modules/ext.RevisionSlider.HelpButtonView.js M modules/ext.RevisionSlider.SliderView.js 3 files changed, 49 insertions(+), 36 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 805fbc5..f570988 100644 --- a/extension.json +++ b/extension.json @@ -220,7 +220,8 @@ }, "ext.RevisionSlider.HelpDialog": { "scripts": [ - "modules/ext.RevisionSlider.HelpDialog.js" + "modules/ext.RevisionSlider.HelpDialog.js", + "modules/ext.RevisionSlider.HelpButtonView.js" ], "dependencies": [ "oojs-ui", diff --git a/modules/ext.RevisionSlider.HelpButtonView.js b/modules/ext.RevisionSlider.HelpButtonView.js new file mode 100644 index 000..6d86bdd --- /dev/null +++ b/modules/ext.RevisionSlider.HelpButtonView.js @@ -0,0 +1,46 @@ +( function ( mw, $ ) { + /** +* Module containing presentation logic for the helper button +*/ + var HelpButtonView = { + + /** +* Renders the help button and renders and adds the popup for it. +* +* @return {jQuery} the help button object +*/ + render: function() { + var helpButton, helpPopup; + + helpButton = new OO.ui.ButtonWidget( { + icon: 'help', + framed: false, + classes: [ 'mw-revslider-show-help' ] + } ); + helpPopup = new OO.ui.PopupWidget( { + $content: $( '' ).text( mw.msg( 'revisionslider-show-help-tooltip' ) ), + $floatableContainer: helpButton.$element, + padded: true, + width: 200, + classes: [ 'mw-revslider-tooltip', 'mw-revslider-help-tooltip' ] + } ); + helpButton.$element + .click( function() { + mw.libs.revisionSlider.HelpDialog.show(); + } ) + .mouseover( function() { + helpPopup.toggle( true ); + } ) + .mouseout( function() { + helpPopup.toggle( false ); + } ); + + $( 'body' ).append( helpPopup.$element ); + + return helpButton.$element; + } + }; + + mw.libs.revisionSlider = mw.libs.revisionSlider || {}; + mw.libs.revisionSlider.HelpButtonView = HelpButtonView; +}( mediaWiki, jQuery ) ); diff --git a/modules/ext.RevisionSlider.SliderView.js b/modules/ext.RevisionSlider.SliderView.js index cab8df7..2c25f5d 100644 --- a/modules/ext.RevisionSlider.SliderView.js +++ b/modules/ext.RevisionSlider.SliderView.js @@ -105,7 +105,7 @@ this.backwardArrowButton.$element, this.renderRevisionsContainer( containerWidth, $revisions ), this.forwardArrowButton.$element, - this.renderHelpButton().$element, + mw.libs.revisionSlider.HelpButtonView.render(), $( '' ).css( { clear: 'both' } ), this.renderPointerContainer( containerWidth ), this.pointerOlder.getLine().render(), this.pointerNewer.getLine().render() @@ -291,40 +291,6 @@ getNewestVisibleRevisonLeftPos: function() { return $( '.mw-revslider-revisions-container' ).width() - this.revisionWidth; - }, - - /** -* Renders the help button and renders and adds the popup for it. -* -* @return {jQuery} the help button object -*/ - renderHelpButton: function() { - var helpButton, helpPopup; - - helpButton = new OO.ui.ButtonWidget( { - icon: 'help', - framed: false, -
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.29.0-wmf.17]: Turn off cirrus sistersearch AB test
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345065 ) Change subject: Turn off cirrus sistersearch AB test .. Turn off cirrus sistersearch AB test Test has run to completion, turning off. This reverts commit c471eba5e62b43092a7158e3e70a930a4d2a0a6e. Bug: T160006 Change-Id: I9214b3313aa8e96077a5d4674587a4f4e69f178d (cherry picked from commit f39ab32dd6678c15f44b1835a17bdf6f36349f55) --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 3 insertions(+), 76 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/65/345065/1 diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index c486838..8e2a099 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -113,54 +113,13 @@ function initialize( session ) { var sessionId = session.get( 'sessionId' ), - // List of valid sub-test buckets - validBuckets = [ - 'recall_sidebar_results', - 'no_sidebar' - ], - // Sampling to use when choosing which users should participate in test + // No sub-tests currently running + validBuckets = [], sampleSize = ( function () { var dbName = mw.config.get( 'wgDBname' ), // Currently unused, but provides a place // to handle wiki-specific sampling subTests = { - arwiki: { - // 1 in 25 users search sessions will be recorded - // by event logging - test: 25, - // 1 in 8 (of the 1 in 25) will be reserved for - // dashboarding. The other 7 in 8 are split equally - // into buckets. - subTest: 8 - }, - cawiki: { - test: 6, - subTest: 34 - }, - dewiki: { - test: 108, - subTest: 2 - }, - fawiki: { - test: 8, - subTest: 25 - }, - frwiki: { - test: 70, - subTest: 3 - }, - itwiki: { - test: 42, - subTest: 5 - }, - plwiki: { - test: 35, - subTest: 6 - }, - ruwiki: { - test: 71, - subTest: 3 - } }; if ( subTests[ dbName ] ) { @@ -222,8 +181,6 @@ return; } - // 1 in sampleSize.subTest reserved for dashboarding,
[MediaWiki-commits] [Gerrit] mediawiki...FileImporter[master]: Alter extension key to use i18n for SpecialPage link
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343854 ) Change subject: Alter extension key to use i18n for SpecialPage link .. Alter extension key to use i18n for SpecialPage link The change of the SpecialPage key will lead to the usage of the corresponding l18n message key for the link on SpecialPage:SpecialPages. The name of the SpecialPage key is not that important, so so decided on changing the key rather than introducing a new message. The SpecialPage message key was used since this is the text of the title on the SpecialPage, is already translated and fits best for the link title. Also fixed array syntax to short. Change-Id: I8a44d38bfbaa5fcee447d5b53203d77549cc553d --- M FileImporter.alias.php M extension.json M src/SpecialImportFile.php 3 files changed, 6 insertions(+), 6 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/FileImporter.alias.php b/FileImporter.alias.php index 457ea72..85e4bb6 100644 --- a/FileImporter.alias.php +++ b/FileImporter.alias.php @@ -7,9 +7,9 @@ */ // @codingStandardsIgnoreFile -$specialPageAliases = array(); +$specialPageAliases = []; /** English (English) */ -$specialPageAliases['en'] = array( - 'ImportFile' => array( 'ImportFile' ), -); +$specialPageAliases['en'] = [ + 'FileImporter-SpecialPage' => [ 'ImportFile' ], +]; diff --git a/extension.json b/extension.json index 91f92ac..ced2df2 100644 --- a/extension.json +++ b/extension.json @@ -19,7 +19,7 @@ "FileImporterAlias": "FileImporter.alias.php" }, "SpecialPages": { - "ImportFile": "FileImporter\\SpecialImportFile" + "FileImporter-SpecialPage": "FileImporter\\SpecialImportFile" }, "AutoloadClasses": { "FileImporter\\Generic\\Exceptions\\HttpRequestException": "src/Generic/Exceptions/HttpRequestException.php", diff --git a/src/SpecialImportFile.php b/src/SpecialImportFile.php index e26cbdb..67fb93a 100644 --- a/src/SpecialImportFile.php +++ b/src/SpecialImportFile.php @@ -20,7 +20,7 @@ class SpecialImportFile extends SpecialPage { public function __construct() { - parent::__construct( 'ImportFile' ); + parent::__construct( 'FileImporter-SpecialPage' ); } public function getGroupName() { -- To view, visit https://gerrit.wikimedia.org/r/343854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a44d38bfbaa5fcee447d5b53203d77549cc553d Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/FileImporter Gerrit-Branch: master Gerrit-Owner: WMDE-FischGerrit-Reviewer: Addshore Gerrit-Reviewer: Andrew-WMDE Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: WMDE-Fisch Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Renamed firstVisibleRevision to oldestVisibleRevison
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344987 ) Change subject: Renamed firstVisibleRevision to oldestVisibleRevison .. Renamed firstVisibleRevision to oldestVisibleRevison The meaning of first in this context was totally unclear and not very usefull. It turns out, that the "first" revision is always the oldest and the last is always the newest revision. Change-Id: I009438777908a5f4a8833f8f5cb7d3041057741c --- M modules/ext.RevisionSlider.DiffPage.js M modules/ext.RevisionSlider.PointerView.js M modules/ext.RevisionSlider.Slider.js M modules/ext.RevisionSlider.SliderView.js M tests/qunit/RevisionSlider.Slider.test.js 5 files changed, 29 insertions(+), 29 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.RevisionSlider.DiffPage.js b/modules/ext.RevisionSlider.DiffPage.js index cf34c65..279362f 100644 --- a/modules/ext.RevisionSlider.DiffPage.js +++ b/modules/ext.RevisionSlider.DiffPage.js @@ -144,7 +144,7 @@ revid2: revId2, pointerOlderPos: sliderView.pointerOlder.getPosition(), pointerNewerPos: sliderView.pointerNewer.getPosition(), - sliderPos: sliderView.slider.getFirstVisibleRevisionIndex() + sliderPos: sliderView.slider.getOldestVisibleRevisionIndex() }; }, diff --git a/modules/ext.RevisionSlider.PointerView.js b/modules/ext.RevisionSlider.PointerView.js index e23405a..9d3a6e7 100644 --- a/modules/ext.RevisionSlider.PointerView.js +++ b/modules/ext.RevisionSlider.PointerView.js @@ -99,7 +99,7 @@ * @return {jQuery} */ slideToPosition: function ( slider, duration ) { - var relativePos = this.pointer.getPosition() - slider.getFirstVisibleRevisionIndex(); + var relativePos = this.pointer.getPosition() - slider.getOldestVisibleRevisionIndex(); return this.animateTo( ( relativePos - 1 ) * slider.getView().revisionWidth, duration ); }, @@ -127,7 +127,7 @@ * @return {jQuery} */ slideToSideOrPosition: function ( slider, duration ) { - var firstVisibleRev = slider.getFirstVisibleRevisionIndex(), + var firstVisibleRev = slider.getOldestVisibleRevisionIndex(), posBeforeSlider = this.pointer.getPosition() < firstVisibleRev, isVisible = !posBeforeSlider && this.pointer.getPosition() <= firstVisibleRev + slider.getRevisionsPerWindow(); if ( isVisible ) { diff --git a/modules/ext.RevisionSlider.Slider.js b/modules/ext.RevisionSlider.Slider.js index 954508c..5bf7818 100644 --- a/modules/ext.RevisionSlider.Slider.js +++ b/modules/ext.RevisionSlider.Slider.js @@ -19,7 +19,7 @@ /** * @type {number} */ - firstVisibleRevisionIndex: 0, + oldestVisibleRevisionIndex: 0, /** * @type {number} @@ -62,35 +62,35 @@ }, /** -* Returns the index of the first revision that is visible in the current window +* Returns the index of the oldest revision that is visible in the current window * * @return {number} */ - getFirstVisibleRevisionIndex: function () { - return this.firstVisibleRevisionIndex; + getOldestVisibleRevisionIndex: function () { + return this.oldestVisibleRevisionIndex; }, /** -* Returns the index of the last revision that is visible in the current window +* Returns the index of the newest revision that is visible in the current window * * @return {number} */ - getLastVisibleRevisionIndex: function () { - return this.firstVisibleRevisionIndex + this.revisionsPerWindow - 1; + getNewestVisibleRevisionIndex: function () { + return this.oldestVisibleRevisionIndex + this.revisionsPerWindow - 1; }, /** * @return {boolean} */ isAtStart: function () { - return this.getFirstVisibleRevisionIndex() === 0 || this.revisions.getLength() <= this.revisionsPerWindow; + return this.getOldestVisibleRevisionIndex() === 0 || this.revisions.getLength() <= this.revisionsPerWindow; }, /**
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Turn off cirrus sistersearch AB test
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344973 ) Change subject: Turn off cirrus sistersearch AB test .. Turn off cirrus sistersearch AB test Test has run to completion, turning off. This reverts commit c471eba5e62b43092a7158e3e70a930a4d2a0a6e. Bug: T160006 Change-Id: I9214b3313aa8e96077a5d4674587a4f4e69f178d --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 3 insertions(+), 76 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index c486838..8e2a099 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -113,54 +113,13 @@ function initialize( session ) { var sessionId = session.get( 'sessionId' ), - // List of valid sub-test buckets - validBuckets = [ - 'recall_sidebar_results', - 'no_sidebar' - ], - // Sampling to use when choosing which users should participate in test + // No sub-tests currently running + validBuckets = [], sampleSize = ( function () { var dbName = mw.config.get( 'wgDBname' ), // Currently unused, but provides a place // to handle wiki-specific sampling subTests = { - arwiki: { - // 1 in 25 users search sessions will be recorded - // by event logging - test: 25, - // 1 in 8 (of the 1 in 25) will be reserved for - // dashboarding. The other 7 in 8 are split equally - // into buckets. - subTest: 8 - }, - cawiki: { - test: 6, - subTest: 34 - }, - dewiki: { - test: 108, - subTest: 2 - }, - fawiki: { - test: 8, - subTest: 25 - }, - frwiki: { - test: 70, - subTest: 3 - }, - itwiki: { - test: 42, - subTest: 5 - }, - plwiki: { - test: 35, - subTest: 6 - }, - ruwiki: { - test: 71, - subTest: 3 - } }; if ( subTests[ dbName ] ) { @@ -222,8 +181,6 @@ return; } - // 1 in sampleSize.subTest reserved for dashboarding, the rest split - // evenly into buckets.
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: sync-gh-pages: Add .nojekyll file
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345064 ) Change subject: sync-gh-pages: Add .nojekyll file .. sync-gh-pages: Add .nojekyll file As of December 2016, GitHub Pages is powered by Jekyll 3.0 which ignores 'node_modules' and 'vendor' by default, regardless of .gitignore. Disable these default settings by creating a '.nojekyll' file. This makes sure https://wikimedia.github.io/VisualEditor/tests/ will continue to work. Change-Id: I31a36488a6b60dc5fd33a207d35ede73bf2cd86e --- M bin/sync-gh-pages.sh 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/bin/sync-gh-pages.sh b/bin/sync-gh-pages.sh index 371235f..382ec2f 100755 --- a/bin/sync-gh-pages.sh +++ b/bin/sync-gh-pages.sh @@ -41,7 +41,13 @@ ' echo "$html" > index.html -git add index.html +# Disable Jekyll default settings for GitHub Pages +# as otherwise node_modules/qunitjs will not be published. +# https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/ +# https://www.bennadel.com/blog/3181-including-node-modules.htm +touch .nojekyll + +git add index.html .nojekyll git add -f node_modules/qunitjs dist/ git commit -m "Create gh-pages branch" -- To view, visit https://gerrit.wikimedia.org/r/345064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31a36488a6b60dc5fd33a207d35ede73bf2cd86e Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Jforrester 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] VisualEditor/VisualEditor[master]: sync-gh-pages: Add .nojekyll file
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345064 ) Change subject: sync-gh-pages: Add .nojekyll file .. sync-gh-pages: Add .nojekyll file As of December 2016, GitHub Pages is powered by Jekyll 3.0 which ignores 'node_modules' and 'vendor' by default, regardless of .gitignore. Disable these default settings by creating a '.nojekyll' file. This makes sure https://wikimedia.github.io/VisualEditor/tests/ will continue to work. Change-Id: I31a36488a6b60dc5fd33a207d35ede73bf2cd86e --- M bin/sync-gh-pages.sh 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/64/345064/1 diff --git a/bin/sync-gh-pages.sh b/bin/sync-gh-pages.sh index 371235f..382ec2f 100755 --- a/bin/sync-gh-pages.sh +++ b/bin/sync-gh-pages.sh @@ -41,7 +41,13 @@ ' echo "$html" > index.html -git add index.html +# Disable Jekyll default settings for GitHub Pages +# as otherwise node_modules/qunitjs will not be published. +# https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/ +# https://www.bennadel.com/blog/3181-including-node-modules.htm +touch .nojekyll + +git add index.html .nojekyll git add -f node_modules/qunitjs dist/ git commit -m "Create gh-pages branch" -- To view, visit https://gerrit.wikimedia.org/r/345064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31a36488a6b60dc5fd33a207d35ede73bf2cd86e Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor 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] wikimedia...process-control[master]: update README
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345063 ) Change subject: update README .. update README Change-Id: I7c41c91ae4eb644c6a34414fceca4fdbbd51877c --- M README.md 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/63/345063/1 diff --git a/README.md b/README.md index 4ad5e7c..8eed1fc 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,13 @@ Running === -To run a job, point at its description file: -run-job job-desc.yaml +Jobs can be run by name, +run-job job-a-thon +which will look for a job configuration in `/var/lib/process-control/job-a-thon.yaml`. + +Some actions are shoehorned in, and can be accessed like: +run-job --list-jobs + run-job --kill-job job-a-thon Failure detection == @@ -66,10 +71,7 @@ * Syslog actions, at least when tweezing new crontabs. * Log invocations. * Prevent future job runs when unrecoverable failure conditions are detected. -* Should we support commandline flags? * Fine-tuning of failure detection. -* Script to kill jobs. -* Script to run a job one-off. * Job group tags. * Slow-start and monitoring. * Optional backoff. -- To view, visit https://gerrit.wikimedia.org/r/345063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c41c91ae4eb644c6a34414fceca4fdbbd51877c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Only show full coverage message if item isn't ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344660 ) Change subject: RCFilters UI: Only show full coverage message if item isn't highlighted .. RCFilters UI: Only show full coverage message if item isn't highlighted Bug: T161273 Change-Id: If62bbab3e12fc3d9e83f9452723a9b2d6b75854a --- M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js index a066d9e..221d2a5 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js @@ -172,7 +172,9 @@ messageKey = details.message; affectingItems = details.names; - } else if ( this.isIncluded() ) { + } else if ( this.isIncluded() && !this.isHighlighted() ) { + // We only show the 'no effect' full-coverage message + // if the item is also not highlighted. See T161273 superset = this.getSuperset(); // For this message we need to collect the affecting superset affectingItems = this.getGroupModel().getSelectedItems( this ) @@ -184,7 +186,7 @@ } ); messageKey = 'rcfilters-state-message-subset'; - } else if ( this.isFullyCovered() ) { + } else if ( this.isFullyCovered() && !this.isHighlighted() ) { affectingItems = this.getGroupModel().getSelectedItems( this ) .map( function ( item ) { return mw.msg( 'quotation-marks', item.getLabel() ); -- To view, visit https://gerrit.wikimedia.org/r/344660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If62bbab3e12fc3d9e83f9452723a9b2d6b75854a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MooeypooGerrit-Reviewer: Catrope Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Disable double-click & enter on focusable nodes when model i...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344978 ) Change subject: Disable double-click & enter on focusable nodes when model is not editable .. Disable double-click & enter on focusable nodes when model is not editable Bug: T161547 Change-Id: I7525d9e9fb1916b9846fd8da6861abc09f7080a1 --- M src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js M src/ce/ve.ce.FocusableNode.js 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js b/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js index a0ff3c3..fa8a64d 100644 --- a/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js +++ b/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js @@ -58,7 +58,9 @@ focusedNode = surface.getFocusedNode(); if ( focusedNode ) { - focusedNode.executeCommand(); + if ( focusedNode.getModel().isEditable() ) { + focusedNode.executeCommand(); + } return true; } diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js index ad32496..bd91fba 100644 --- a/src/ce/ve.ce.FocusableNode.js +++ b/src/ce/ve.ce.FocusableNode.js @@ -435,7 +435,9 @@ if ( !this.isInContentEditable() ) { return; } - this.executeCommand(); + if ( this.getModel().isEditable() ) { + this.executeCommand(); + } }; /** -- To view, visit https://gerrit.wikimedia.org/r/344978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7525d9e9fb1916b9846fd8da6861abc09f7080a1 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/extra[master]: Fix typo in token_count_router
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344959 ) Change subject: Fix typo in token_count_router .. Fix typo in token_count_router conditions was improperly set to contitions. Change-Id: I45721800a38117e7d1088c7ec725649d9206763a --- M src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java b/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java index 4d3b171..f4f0fb0 100644 --- a/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java +++ b/src/main/java/org/wikimedia/search/extra/tokencount/TokenCountRouterQueryBuilder.java @@ -41,7 +41,7 @@ static final ParseField FIELD = new ParseField("field"); static final ParseField ANALYZER = new ParseField("analyzer"); static final ParseField DISCOUNT_OVERLAPS = new ParseField("discount_overlaps"); -static final ParseField CONDITIONS = new ParseField("contitions"); +static final ParseField CONDITIONS = new ParseField("conditions", "contitions"); static final ParseField FALLBACK = new ParseField(("fallback")); static final ParseField QUERY = new ParseField("query"); -- To view, visit https://gerrit.wikimedia.org/r/344959 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45721800a38117e7d1088c7ec725649d9206763a Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: DCausseGerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: --kill-job
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345062 ) Change subject: --kill-job .. --kill-job Change-Id: Ia181aa495eabf34242293cb60904594ee3766b5c --- M bin/run-job M processcontrol/job_wrapper.py M processcontrol/lock.py 3 files changed, 31 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/62/345062/1 diff --git a/bin/run-job b/bin/run-job index 2ea0512..974c4f2 100755 --- a/bin/run-job +++ b/bin/run-job @@ -1,15 +1,40 @@ #!/usr/bin/python +from __future__ import print_function import argparse +import subprocess import sys from processcontrol import job_wrapper + + +def list_jobs(): + for job_name in job_wrapper.list(): + job = job_wrapper.load(job_name) + print("{job} - {human_name}".format(job=job_name, human_name=job.name)) + status = job.status() + if status is not None: + print(status) + + +def kill_job(job_name): + job = job_wrapper.load(job_name) + status = job.status() + if status is None: + print("Nothing to kill.") + else: + pid = status["pid"] + print("Killing job {name}, pid {pid}".format(name=job_name, pid=pid)) + exit_code = subprocess.call(["kill", str(pid)]) + if exit_code != 0: + print("Failed to kill!", file=sys.stderr) if __name__ == "__main__": parser = argparse.ArgumentParser(description="Run and maintain process-control jobs.") parser.add_argument("-j", "--job", help="Run a given job.", type=str) parser.add_argument("--list-jobs", help="Print a summary of available jobs.", action='store_true') + parser.add_argument("--kill-job", help="Kill a job by name", type=str) args = parser.parse_args() if args.job: @@ -17,9 +42,7 @@ job.run() if args.list_jobs: - for job_name in job_wrapper.list(): - job = job_wrapper.load(job_name) - print("{job} - {human_name}".format(job=job_name, human_name=job.name)) - status = job.status() - if status is not None: - print(status) + list_jobs() + + if args.kill_job: + kill_job(args.kill_job) diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py index c99fcaf..d84b83e 100644 --- a/processcontrol/job_wrapper.py +++ b/processcontrol/job_wrapper.py @@ -144,7 +144,7 @@ lock_path = "/tmp/{name}.lock".format(name=self.slug) if os.path.exists(lock_path): with open(lock_path, "r") as f: -pid = f.read().strip() +pid = int(f.read().strip()) # TODO: encapsulate return {"status": "running", "pid": pid} diff --git a/processcontrol/lock.py b/processcontrol/lock.py index 6c91863..bbca472 100644 --- a/processcontrol/lock.py +++ b/processcontrol/lock.py @@ -39,6 +39,7 @@ f = open(filename, "w") f.write(str(os.getpid())) +os.chmod(filename, 0o644) f.close() global lockfile -- To view, visit https://gerrit.wikimedia.org/r/345062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia181aa495eabf34242293cb60904594ee3766b5c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NavigationTiming[master]: ext.NavigationTiming: Restore unsampled Save Timing
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345051 ) Change subject: ext.NavigationTiming: Restore unsampled Save Timing .. ext.NavigationTiming: Restore unsampled Save Timing Follows-up 8957895a6, which wrongly assumed that Save Timing should be in the same sampling condition as Navigation Timing. Restore the same logic as prior to 8957895a6: onLoadComplete: -> inSample -> do Navigation Timing -> Save Timing With the only difference that we still compute inSample before onLoadComplete happens, so that we can call using() to start preloading the schema modules. Inside onLoadComplete() simply make the same using() call again for use in both branches, instead of re-using the same variable. RL will still naturally de-duplicate and re-use the existing deferred internally (if not resolved already). Full diff compared to the parent 8957895a6: + isInSample = inSample(); + if ( isInSample ) { + // Preload + mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); + } + onLoadComplete( function () { + var load = mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); - if ( inSample() && !visibilityChanged ) { + if ( isInSample && !visibilityChanged ) { -emitNavigationTiming(); +load.done( emitNavigationTiming ); } - mw.hook( 'postEdit' ).add( emitSaveTiming ); + mw.hook( 'postEdit' ).add( function () { +load.done( emitSaveTiming ); + } ); } ); Change-Id: I45583feaa33936f129ca96a56341463faed8b2a8 --- M modules/ext.navigationTiming.js 1 file changed, 15 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming refs/changes/51/345051/1 diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js index 64dcfbd..dc90700 100644 --- a/modules/ext.navigationTiming.js +++ b/modules/ext.navigationTiming.js @@ -9,7 +9,7 @@ 'use strict'; var timing, navigation, mediaWikiLoadEnd, hiddenProp, visibilityEvent, - loadEL, + isInSample, visibilityChanged = false, TYPE_NAVIGATE = 0; @@ -262,21 +262,23 @@ // Only perform actual instrumentation when page load is in the sampling // Use a conditional block instead of early return since module.exports // must happen unconditionally for unit tests. - if ( inSample() ) { + isInSample = inSample(); + if ( isInSample ) { // Preload EventLogging and schema modules - loadEL = mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); - - // Ensure we run after loadEventEnd. - onLoadComplete( function () { - if ( !visibilityChanged ) { - loadEL.done( emitNavigationTiming ); - } - mw.hook( 'postEdit' ).add( function () { - loadEL.done( emitSaveTiming ); - } ); - } ); + mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); } + // Ensure we run after loadEventEnd. + onLoadComplete( function () { + var load = mw.loader.using( [ 'schema.NavigationTiming', 'schema.SaveTiming' ] ); + if ( isInSample && !visibilityChanged ) { + load.done( emitNavigationTiming ); + } + mw.hook( 'postEdit' ).add( function () { + load.done( emitSaveTiming ); + } ); + } ); + if ( typeof QUnit !== 'undefined' ) { /** * For testing only. Subject to change any time. -- To view, visit https://gerrit.wikimedia.org/r/345051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45583feaa33936f129ca96a56341463faed8b2a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NavigationTiming 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] operations/switchdc[master]: Add task to update Tendril
Volans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345045 ) Change subject: Add task to update Tendril .. Add task to update Tendril Bug: T160178 Change-Id: Ia48e0ec2d94cc38abb36a74b34ca59159c2e10ad --- M switchdc/lib/mysql.py A switchdc/stages/t08_tendril.py 2 files changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/switchdc refs/changes/45/345045/1 diff --git a/switchdc/lib/mysql.py b/switchdc/lib/mysql.py index 13f2a77..290d560 100644 --- a/switchdc/lib/mysql.py +++ b/switchdc/lib/mysql.py @@ -2,6 +2,8 @@ from switchdc.lib.remote import Remote from switchdc.log import logger +CORE_SHARDS = ('s1', 's2', 's3', 's4', 's5', 's6', 's7', 'x1', 'es2', 'es3') + class MysqlError(SwitchdcError): """Custom exception class for errors of this module.""" @@ -72,9 +74,7 @@ dc_from -- the name of the datacenter from where to get the master positions dc_to -- the name of the datacenter where to check that they are in sync """ -shards = ('s1', 's2', 's3', 's4', 's5', 's6', 's7', 'x1', 'es2', 'es3') - -for shard in shards: +for shard in CORE_SHARDS: gtid = '' remote_from = get_db_remote(dc_from, group='core', role='master', shard=shard) remote_from.sync(get_query_command('SELECT @@GLOBAL.gtid_binlog_pos')) diff --git a/switchdc/stages/t08_tendril.py b/switchdc/stages/t08_tendril.py new file mode 100644 index 000..42ce209 --- /dev/null +++ b/switchdc/stages/t08_tendril.py @@ -0,0 +1,25 @@ +from switchdc import SwitchdcError +from switchdc.lib import mysql +from switchdc.lib.remote import Remote + +__title__ = "Update Tendril configuration for the new masters" + + +def execute(dc_from, dc_to): + +tendril = Remote() +tendril.select('R:Class = Role::Mariadb::Tendril') + +commands = [] +for shard in mysql.CORE_SHARDS: +remote = mysql.get_db_remote(dc_to, group='core', role='master', shard=shard) +if len(remote.hosts) > 1: +raise SwitchdcError("Expected to find only one host for core DB of shard {shard} in {dc}".format( +shard=shard, dc=dc_to)) +master = remote.hosts[0] + +commands.append(mysql.get_query_command( +("UPDATE shards SET master_id = (SELECT id FROM servers WHERE host = '{master}') WHERE" + "name = '{shard}'").format(master=master, shard=shard))) + +tendril.sync(*commands) -- To view, visit https://gerrit.wikimedia.org/r/345045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia48e0ec2d94cc38abb36a74b34ca59159c2e10ad Gerrit-PatchSet: 1 Gerrit-Project: operations/switchdc Gerrit-Branch: master Gerrit-Owner: Volans___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Nova scheduler: Use relative cpu percentages when scheduling.
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344689 ) Change subject: Nova scheduler: Use relative cpu percentages when scheduling. .. Nova scheduler: Use relative cpu percentages when scheduling. This change implements the settings suggested in https://01.org/sites/default/files/utilization_based_scheduing_in_openstack_compute_nova-revision002.pdf It also moves all scheduling-related settings into one section and includes a lot of new explanation. Bug: T161006 Change-Id: Idb3937170a0c94688332b14b7a1a5070fdd650ec --- M modules/openstack/templates/liberty/nova/nova.conf.erb M modules/openstack/templates/mitaka/nova/nova.conf.erb 2 files changed, 105 insertions(+), 25 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Rush: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/openstack/templates/liberty/nova/nova.conf.erb b/modules/openstack/templates/liberty/nova/nova.conf.erb index 2cfda10..c138870 100644 --- a/modules/openstack/templates/liberty/nova/nova.conf.erb +++ b/modules/openstack/templates/liberty/nova/nova.conf.erb @@ -8,11 +8,7 @@ root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf instance_name_template=i-%08x daemonize=1 -scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler -wmf_scheduler_hosts_pool=<%= @novaconfig["scheduler_pool"].join(",") %> -scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter -compute_monitors=ComputeDriverCPUMonitor # Turn off ec2 APIs enabled_apis=osapi_compute, metadata @@ -96,14 +92,6 @@ instance_usage_audit_period = hour notify_on_state_change = vm_and_task_state -# Overprovision settings - -# Running OOM on a compute host produces weird spontaneous shutdowns. -# avoid overcommitting as long as we can afford it. -ram_allocation_ratio=1.0 - -# Since our images are copy-on-write we can support some overcommitting here. -disk_allocation_ratio=1.5 # Deprecated, remove in Kilo: @@ -112,6 +100,58 @@ # Should be: #default_availability_zone = <%= @novaconfig["zone"] %> +# Scheduling things = + +# On the compute nodes, gather up metrics so we can weigh +# candidate hosts by performance (specifically, CPU usage). +compute_monitors=virt_driver + +# For the scheduler, first filter based on available resources. +# The filter is binary, either a node has the necessary resources +# or it doesn't and is fully excluded. +scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler + +# For the RAM filter: Only allow scheduling on hosts that have +# enough RAM to support a fully active instance. No overprovisioning +# here because RAM overruns lead to spontaneous instance shutdown. +ram_allocation_ratio=1.0 + +# For the disk filter: Allow some overprovisioning. Our instances are +# copy-on-write, and most users don't come anywhere close to filling +# up their allocated space (in many cases that space isn't even partitioned.) +disk_allocation_ratio=1.5 + +# A WMF custom filter: only schedule on nodes that are in the +# 'scheduler_pool' list. This lets us pool and depool nodes +# via puppet, as needed. +wmf_scheduler_hosts_pool=<%= @novaconfig["scheduler_pool"].join(",") %> + +# Here's the complete list of filters that we use. Most are fine with default +# settings. +scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter + +# Now that we have a list of candidate compute nodes (any of which is +# technically able to run the new VM), we compare those candidates +# to pick the best one. +# +# The 'MetricsWeigher' will compare metrics for available nodes and +# recommend the best choice. Which metrics to use in comparison +# are determined below, in the 'metrics' config section. +scheduler_weight_classes=nova.scheduler.weights.metrics.MetricsWeigher + +# For now, the MetricsWeigher will recommend only one, very best +# candidate +scheduler_host_subset_size = 1 + + +[METRICS] +# For scheduling purposes, just pick the compute node with the least busy +# CPU numbers. This could be a much more complicated formula using many +# different metrics, but in combination with the filters this seems to be +# a pretty good first approximation. +weight_setting = cpu.percent=-1.0 + + [database] # http://docs.sqlalchemy.org/en/latest/core/pooling.html connection=mysql://<%= @novaconfig["db_user"] %>:<%= @novaconfig["db_pass"] %>@<%= @novaconfig["db_host"] %>/<%= @novaconfig["db_name"] %> diff --git
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Show job status in --list-jobs
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345022 ) Change subject: Show job status in --list-jobs .. Show job status in --list-jobs Change-Id: Ie99758202547130b711769a24186c30b67cb9729 --- M bin/run-job M process-control.example.yaml M processcontrol/job_wrapper.py M tests/data/global_defaults.yaml 4 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/22/345022/1 diff --git a/bin/run-job b/bin/run-job index 746d288..2ea0512 100755 --- a/bin/run-job +++ b/bin/run-job @@ -20,3 +20,6 @@ for job_name in job_wrapper.list(): job = job_wrapper.load(job_name) print("{job} - {human_name}".format(job=job_name, human_name=job.name)) + status = job.status() + if status is not None: + print(status) diff --git a/process-control.example.yaml b/process-control.example.yaml index ce742db..15b41ea 100644 --- a/process-control.example.yaml +++ b/process-control.example.yaml @@ -33,3 +33,11 @@ #/var/log/process-control/jobname/jobname-20170401-235959.log # output_directory: /var/log/process-control + +# Path for working files such as locks. +# +# TODO: The deb install should create this directory and do something about +# permissions. +#run_dir: /var/run/process-control +# +run_dir: /tmp diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py index ff8f11f..2731bc2 100644 --- a/processcontrol/job_wrapper.py +++ b/processcontrol/job_wrapper.py @@ -15,7 +15,7 @@ def load(job_name): job_directory = config.GlobalConfiguration().get("job_directory") job_path = "{job_dir}/{job_name}.yaml".format(job_dir=job_directory, job_name=job_name) -return JobWrapper(config_path=job_path) +return JobWrapper(config_path=job_path, slug=job_name) def list(): @@ -28,12 +28,13 @@ class JobWrapper(object): -def __init__(self, config_path=None): +def __init__(self, config_path=None, slug=None): self.global_config = config.GlobalConfiguration() self.config_path = config_path self.config = config.JobConfiguration(self.global_config, self.config_path) self.name = self.config.get("name") +self.slug = slug self.start_time = datetime.datetime.utcnow() self.mailer = mailer.Mailer(self.config) self.timeout = self.config.get("timeout") @@ -130,3 +131,21 @@ print(header, file=out) out.write(stderr_data.decode("utf-8")) + +def status(self): +"""Check for any running instances of this job, in this process or another. + +Returns a crappy dict, or None if no process is found. + +Do not use this function to gate the workflow, explicitly assert the +lock instead.""" + +# FIXME: DRY +lock_path = "/tmp/{name}.lock".format(name=self.slug) +if os.path.exists(lock_path): +with open(lock_path, "r") as f: +pid = f.read().strip() +# TODO: encapsulate +return { "status": "running", "pid": pid } + +return None diff --git a/tests/data/global_defaults.yaml b/tests/data/global_defaults.yaml index 4330a53..079dfae 100644 --- a/tests/data/global_defaults.yaml +++ b/tests/data/global_defaults.yaml @@ -28,3 +28,5 @@ #/var/log/process-control/jobname-20170401-235959.log # output_directory: /tmp + +run_dir: /tmp -- To view, visit https://gerrit.wikimedia.org/r/345022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie99758202547130b711769a24186c30b67cb9729 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Adds hunspell-ko to ores:base
Halfak has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345016 ) Change subject: Adds hunspell-ko to ores:base .. Adds hunspell-ko to ores:base Change-Id: I88f1a58bc9feae0f4cb51c00cf8e596accc94794 --- M modules/ores/manifests/base.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/16/345016/1 diff --git a/modules/ores/manifests/base.pp b/modules/ores/manifests/base.pp index 35a9bc9..a71d429 100644 --- a/modules/ores/manifests/base.pp +++ b/modules/ores/manifests/base.pp @@ -19,6 +19,7 @@ # Spellcheck packages for supported languages require_package('aspell-ar', 'aspell-id', 'aspell-pl', 'aspell-sv', 'aspell-ro', +'hunspell-ko', 'hunspell-vi', 'myspell-cs', 'myspell-de-at', 'myspell-de-ch', 'myspell-de-de', -- To view, visit https://gerrit.wikimedia.org/r/345016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88f1a58bc9feae0f4cb51c00cf8e596accc94794 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Halfak___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: hidemyself/hidebyothers: Use rc_user_text since there is an ...
Mattflaschen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345014 ) Change subject: hidemyself/hidebyothers: Use rc_user_text since there is an index .. hidemyself/hidebyothers: Use rc_user_text since there is an index hidebyothers was extremely slow (on large data sets) due to the lack of an index on rc_user. To fix this, changed to use rc_user_text. hidemyself seems to be fine (assuming normal usage patterns), but to avoid edge cases and ensure full coverage, it's been changed as well. I'll inquire about adding an index for this. Bug: T161557 Change-Id: I61efe11de12e8ab6c01e8d913cdeda471132a6ee --- M includes/specialpage/ChangesListSpecialPage.php 1 file changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/14/345014/1 diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 8e9629d..1832233 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -177,11 +177,7 @@ &$query_options, &$join_conds ) { $user = $ctx->getUser(); - if ( $user->getId() ) { - $conds[] = 'rc_user != ' . $dbr->addQuotes( $user->getId() ); - } else { - $conds[] = 'rc_user_text != ' . $dbr->addQuotes( $user->getName() ); - } + $conds[] = 'rc_user_text != ' . $dbr->addQuotes( $user->getName() ); }, 'cssClassSuffix' => 'self', 'isRowApplicableCallable' => function ( $ctx, $rc ) { @@ -197,11 +193,7 @@ &$query_options, &$join_conds ) { $user = $ctx->getUser(); - if ( $user->getId() ) { - $conds[] = 'rc_user = ' . $dbr->addQuotes( $user->getId() ); - } else { - $conds[] = 'rc_user_text = ' . $dbr->addQuotes( $user->getName() ); - } + $conds[] = 'rc_user_text = ' . $dbr->addQuotes( $user->getName() ); }, 'cssClassSuffix' => 'others', 'isRowApplicableCallable' => function ( $ctx, $rc ) { -- To view, visit https://gerrit.wikimedia.org/r/345014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61efe11de12e8ab6c01e8d913cdeda471132a6ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mattflaschen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Catch errors in more cases inside MediaWiki::triggerJobs()
Aaron Schulz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345015 ) Change subject: Catch errors in more cases inside MediaWiki::triggerJobs() .. Catch errors in more cases inside MediaWiki::triggerJobs() This catches things like "DB is read-only" when doing pop()/ack() from the job table with sqlite. Also spun off some code to new trigger*Jobs() methods for readability. Bug: T88312 Change-Id: I2a09248e40867684d48e6739da5e4a90581fa6ce --- M includes/MediaWiki.php 1 file changed, 36 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/15/345015/1 diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 521c02c..ef0563e 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -21,6 +21,7 @@ */ use MediaWiki\Logger\LoggerFactory; +use Psr\Log\LoggerInterface; use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\ChronologyProtector; use Wikimedia\Rdbms\LBFactory; @@ -942,24 +943,45 @@ $n = intval( $jobRunRate ); } - $runJobsLogger = LoggerFactory::getInstance( 'runJobs' ); + $logger = LoggerFactory::getInstance( 'runJobs' ); - // Fall back to running the job(s) while the user waits if needed - if ( !$this->config->get( 'RunJobsAsync' ) ) { - $runner = new JobRunner( $runJobsLogger ); - $runner->run( [ 'maxJobs' => $n ] ); - return; - } - - // Do not send request if there are probably no jobs try { - $group = JobQueueGroup::singleton(); - if ( !$group->queuesHaveJobs( JobQueueGroup::TYPE_DEFAULT ) ) { - return; + if ( $this->config->get( 'RunJobsAsync' ) ) { + // Send an HTTP request to the job RPC entry point if possible + $invokedWithSuccess = $this->triggerAsyncJobs( $n, $logger ); + if ( !$invokedWithSuccess ) { + // Fall back to blocking on running the job(s) + $logger->warning( "Jobs switched to blocking; Special:RunJobs disabled" ); + $this->triggerSyncJobs( $n, $logger ); + } + } else { + $this->triggerSyncJobs( $n, $logger ); } } catch ( JobQueueError $e ) { + // Do not make the site unavailable (T88312) MWExceptionHandler::logException( $e ); - return; // do not make the site unavailable + } + } + + /** +* @param integer $n Number of jobs to try to run +* @param LoggerInterface $runJobsLogger +*/ + private function triggerSyncJobs( $n, LoggerInterface $runJobsLogger ) { + $runner = new JobRunner( $runJobsLogger ); + $runner->run( [ 'maxJobs' => $n ] ); + } + + /** +* @param integer $n Number of jobs to try to run +* @param LoggerInterface $runJobsLogger +* @return bool Success +*/ + private function triggerAsyncJobs( $n, LoggerInterface $runJobsLogger ) { + // Do not send request if there are probably no jobs + $group = JobQueueGroup::singleton(); + if ( !$group->queuesHaveJobs( JobQueueGroup::TYPE_DEFAULT ) ) { + return true; } $query = [ 'title' => 'Special:RunJobs', @@ -1026,12 +1048,6 @@ $runJobsLogger->error( "Failed to start cron API (socket error $errno): $errstr" ); } - // Fall back to running the job(s) while the user waits if needed - if ( !$invokedWithSuccess ) { - $runJobsLogger->warning( "Jobs switched to blocking; Special:RunJobs disabled" ); - - $runner = new JobRunner( $runJobsLogger ); - $runner->run( [ 'maxJobs' => $n ] ); - } + return $invokedWithSuccess; } } -- To view, visit https://gerrit.wikimedia.org/r/345015 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a09248e40867684d48e6739da5e4a90581fa6ce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: --list-jobs action
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345008 ) Change subject: --list-jobs action .. --list-jobs action Change-Id: I0f1b8594d6660e59c69b4cacbd38c82ffbecd018 --- M bin/run-job 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/08/345008/1 diff --git a/bin/run-job b/bin/run-job index af768b6..746d288 100755 --- a/bin/run-job +++ b/bin/run-job @@ -8,8 +8,15 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description="Run and maintain process-control jobs.") - parser.add_argument("-j", "--job", help="Run a given job", type=str) + parser.add_argument("-j", "--job", help="Run a given job.", type=str) + parser.add_argument("--list-jobs", help="Print a summary of available jobs.", action='store_true') args = parser.parse_args() - wrapper = job_wrapper.load(args.job) - wrapper.run() + if args.job: + job = job_wrapper.load(args.job) + job.run() + + if args.list_jobs: + for job_name in job_wrapper.list(): + job = job_wrapper.load(job_name) + print("{job} - {human_name}".format(job=job_name, human_name=job.name)) -- To view, visit https://gerrit.wikimedia.org/r/345008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f1b8594d6660e59c69b4cacbd38c82ffbecd018 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Makefile for lulz
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345006 ) Change subject: Makefile for lulz .. Makefile for lulz Change-Id: I1ef204525c452f9b2991031eeb3019d6dbf20587 --- A Makefile 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/06/345006/1 diff --git a/Makefile b/Makefile new file mode 100644 index 000..fb7bc49 --- /dev/null +++ b/Makefile @@ -0,0 +1,19 @@ +.PHONY: \ + coverage \ + deb + +# Note that this target is run during deb packaging. +.DEFAULT: noop + +noop: + @echo Nothing to do! + +coverage: + nosetests --with-coverage --cover-package=processcontrol --cover-html + @echo Results are in cover/index.html + +deb: + @echo Note that this is not how we build our production .deb + # FIXME: fragile + cd ..; tar cjf process-control_0.0.1~rc1.orig.tar.bz2 process-control; cd process-control + debuild -us -uc -- To view, visit https://gerrit.wikimedia.org/r/345006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ef204525c452f9b2991031eeb3019d6dbf20587 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rcfilters: Avoid $.type()
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344994 ) Change subject: rcfilters: Avoid $.type() .. rcfilters: Avoid $.type() Followup to I9a0c5e40b813e075ec33eea882b625dc43a15df6 Replace $.type() with typeof or Array.isArray Change-Id: I4f0f717c345ab1279b626b158b0ed6ada056bbc1 --- M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 14eabe2..7405bae 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -321,8 +321,8 @@ * @param {array|object|string} filters */ mw.rcfilters.Controller.prototype.trackHighlight = function ( action, filters ) { - filters = $.type( filters ) === 'string' ? { name: filters } : filters; - filters = $.type( filters ) === 'object' ? [ filters ] : filters; + filters = typeof filters === 'string' ? { name: filters } : filters; + filters = !Array.isArray( filters ) ? [ filters ] : filters; mw.track( 'event.ChangesListHighlights', { -- To view, visit https://gerrit.wikimedia.org/r/344994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f0f717c345ab1279b626b158b0ed6ada056bbc1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: SbissonGerrit-Reviewer: Jack Phoenix 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] operations/puppet[production]: nfs-manage-binds: Pass mounts as keyword arg
Madhuvishy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345005 ) Change subject: nfs-manage-binds: Pass mounts as keyword arg .. nfs-manage-binds: Pass mounts as keyword arg Change-Id: I23782e60e6c60390781ad12251a45c09614fba9e --- M modules/labstore/files/nfs-manage-binds 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Madhuvishy: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/labstore/files/nfs-manage-binds b/modules/labstore/files/nfs-manage-binds index 35965a3..50d71ee 100644 --- a/modules/labstore/files/nfs-manage-binds +++ b/modules/labstore/files/nfs-manage-binds @@ -181,7 +181,7 @@ srv_device = device_paths.get(project, device_path_default) srv = os.path.join(srv_device, 'shared', project) exp = os.path.join('/exp/project', project) -create_binding(srv, exp, force=args.f, mounts) +create_binding(srv, exp, force=args.f, mounts=mounts) if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/345005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23782e60e6c60390781ad12251a45c09614fba9e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MadhuvishyGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Add LexemeForms class and render it in LexemeFormsView
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344409 ) Change subject: Add LexemeForms class and render it in LexemeFormsView .. Add LexemeForms class and render it in LexemeFormsView Bug: T160522 Change-Id: I80aa83f791a82928ec8c07d9de8980b4bf1c289f --- M extension.json M resources/lexeme.css M src/Actions/ViewLexemeAction.php A src/DataModel/LexemeForm.php M src/View/LexemeFormsView.php M src/View/LexemeView.php M tests/browser/features/forms.feature M tests/browser/features/step_definitions/forms_steps.rb M tests/browser/features/support/pages/lexeme_page.rb M tests/phpunit/mediawiki/View/LexemeFormsViewTest.php 10 files changed, 105 insertions(+), 10 deletions(-) Approvals: Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 7de5c99..0035d83 100644 --- a/extension.json +++ b/extension.json @@ -55,8 +55,7 @@ "wikibase.lexeme.lexemeview": { "dependencies": [ "jquery.wikibase.lexemeview", - "wikibase.lexeme.getDeserializer", - "wikibase.lexeme.styles" + "wikibase.lexeme.getDeserializer" ] }, "wikibase.lexeme.datamodel.Lexeme": { diff --git a/resources/lexeme.css b/resources/lexeme.css index fb69c32..531efe9 100644 --- a/resources/lexeme.css +++ b/resources/lexeme.css @@ -12,3 +12,8 @@ border-right: 0; width: 60%; } + +.wikibase-lexeme-form-representation { + clear: left; + margin-left: 10px; /* same as .wb-section-heading */ +} diff --git a/src/Actions/ViewLexemeAction.php b/src/Actions/ViewLexemeAction.php index 752ad1c..e771e8d 100644 --- a/src/Actions/ViewLexemeAction.php +++ b/src/Actions/ViewLexemeAction.php @@ -14,6 +14,10 @@ public function show() { parent::show(); + + // Basic styles that should also be loaded if JavaScript is disabled + $this->getOutput()->addModuleStyles( 'wikibase.lexeme.styles' ); + $this->getOutput()->addJsConfigVars( 'wbUserSpecifiedLanguages', [] ); $this->getOutput()->addModules( 'wikibase.lexeme.lexemeview' ); } diff --git a/src/DataModel/LexemeForm.php b/src/DataModel/LexemeForm.php new file mode 100644 index 000..d9d8dce --- /dev/null +++ b/src/DataModel/LexemeForm.php @@ -0,0 +1,30 @@ +representation = $representation; + } + + /** +* @return string +*/ + public function getRepresentation() { + return $this->representation; + } + +} diff --git a/src/View/LexemeFormsView.php b/src/View/LexemeFormsView.php index f9a445e..7eb5a45 100644 --- a/src/View/LexemeFormsView.php +++ b/src/View/LexemeFormsView.php @@ -2,6 +2,7 @@ namespace Wikibase\Lexeme\View; +use Wikibase\Lexeme\DataModel\LexemeForm; use Wikibase\View\LocalizedTextProvider; /** @@ -20,14 +21,37 @@ } /** +* @param LexemeForm[] $forms +* * @return string HTML */ - public function getHtml() { - return '' + public function getHtml( array $forms ) { + $html = '' . '' . htmlspecialchars( $this->textProvider->get( 'wikibase-lexeme-view-forms' ) ) . '' . ''; + + $html .= ''; + foreach ( $forms as $form ) { + $html .= $this->getFormHtml( $form ); + } + $html .= ''; + + return $html; + } + + /** +* @param LexemeForm $form +* +* @return string HTML +*/ + private function getFormHtml( LexemeForm $form ) { + $representation = $form->getRepresentation(); + + return '' + . htmlspecialchars( $representation ) + . ''; } } diff --git a/src/View/LexemeView.php b/src/View/LexemeView.php index 4026a75..c580dea 100644 --- a/src/View/LexemeView.php +++ b/src/View/LexemeView.php @@ -12,6 +12,7 @@ use Wikibase\DataModel\Term\Term; use Wikibase\DataModel\Term\TermList; use Wikibase\Lexeme\DataModel\Lexeme; +use Wikibase\Lexeme\DataModel\LexemeForm; use Wikibase\View\EntityTermsView; use Wikibase\View\EntityView; use Wikibase\View\HtmlTermRenderer; @@ -93,10 +94,17 @@ /** @var Lexeme $entity */ Assert::parameterType( Lexeme::class, $entity, '$entity' ); + // TODO: This obviously is a dummy that must be removed + $forms = [ + new LexemeForm( 'A' ), + new LexemeForm( 'B' ), + new LexemeForm( 'C' ), +
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Styling fixes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344939 ) Change subject: Styling fixes .. Styling fixes * Move CSS out of mediawiki.css which is for wikitext highlighting rules. * Account for wikieditor-ui adding wrappers even when disabled. Change-Id: I0fca693a6771ee1d790800c9afd5c7091fda20c1 --- M resources/ext.CodeMirror.js M resources/ext.CodeMirror.less M resources/mode/mediawiki/mediawiki.css 3 files changed, 22 insertions(+), 16 deletions(-) Approvals: jenkins-bot: Verified Kaldari: Looks good to me, approved diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index fcd9311..c062b84 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -415,8 +415,8 @@ return false; } } ); - // We don't know when button will be added, wait until the document is ready for update it - $( document ).ready( function () { updateToolbarButton(); } ); + // We don't know when button will be added, wait until the document is ready to update it + $( function () { updateToolbarButton(); } ); } ); } } ); diff --git a/resources/ext.CodeMirror.less b/resources/ext.CodeMirror.less index e04a974..db3e59b 100644 --- a/resources/ext.CodeMirror.less +++ b/resources/ext.CodeMirror.less @@ -1,5 +1,25 @@ @import 'mediawiki.mixins'; +.CodeMirror { + line-height: 1.5em; + padding: 0.1em; +} + +.mw-codeMirror-classicToolbar { + border: 1px solid #a2a9b1; + + // If WikiEditor is installed but disabled, the classic toolbar + // will still get wrapped in wikiEditor-ui + .wikiEditor-ui-text & { + border: 0; + } +} + +.CodeMirror pre, +.CodeMirror-lines { + padding: 0; +} + .mw-editbutton-codemirror-on { .background-image-svg( 'images/old-cm-on.svg', 'images/old-cm-on.png' ); } diff --git a/resources/mode/mediawiki/mediawiki.css b/resources/mode/mediawiki/mediawiki.css index 3bc070c..74783e9 100644 --- a/resources/mode/mediawiki/mediawiki.css +++ b/resources/mode/mediawiki/mediawiki.css @@ -1,17 +1,3 @@ -.CodeMirror { - line-height: 1.5em; - padding: 0.1em; -} - -.mw-codeMirror-classicToolbar { - border: 1px solid #a2a9b1; -} - -.CodeMirror pre, -.CodeMirror-lines { - padding: 0; -} - /* stylelint-disable block-opening-brace-newline-before, block-opening-brace-newline-after, block-closing-brace-space-after, declaration-block-single-line-max-declarations, declaration-block-semicolon-newline-after, selector-list-comma-newline-after */ -- To view, visit https://gerrit.wikimedia.org/r/344939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0fca693a6771ee1d790800c9afd5c7091fda20c1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Adding Reportcard to readme
Nuria has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345003 ) Change subject: Adding Reportcard to readme .. Adding Reportcard to readme Change-Id: I619c2468f7aec94b57e4581037d4a80e5390df33 --- M README.md 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Nuria: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 3b99fec..5115b47 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,13 @@ The only thing to look for is that piwik site is #8 and that has to be passed at build time ### Vital Signs ### -gulp --layout metrics-by-project --config Config:VitalSigns --piwik piwik.wikimedia.org,8 +gulp --layout metrics-by-project --config Dashiki:VitalSigns --piwik piwik.wikimedia.org,8 ### Browser Reports ### -gulp --layout tabs --config Config:SimpleRequestBreakdowns --piwik piwik.wikimedia.org,8 +gulp --layout tabs --config Dashiki:SimpleRequestBreakdowns --piwik piwik.wikimedia.org,8 ### Standard Metrics ### -gulp --layout tabs --config Config:StandardMetrics --piwik piwik.wikimedia.org,8 +gulp --layout tabs --config Dashiki:StandardMetrics --piwik piwik.wikimedia.org,8 + +### ReportCard ### +gulp --layout tabs --config Dashiki:ReportCard --piwik piwik.wikimedia.org,8 -- To view, visit https://gerrit.wikimedia.org/r/345003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I619c2468f7aec94b57e4581037d4a80e5390df33 Gerrit-PatchSet: 1 Gerrit-Project: analytics/analytics.wikimedia.org Gerrit-Branch: master Gerrit-Owner: NuriaGerrit-Reviewer: Milimetric Gerrit-Reviewer: Nuria ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Updating Readme
Nuria has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344671 ) Change subject: Updating Readme .. Updating Readme After deployment of dashiki extension paths to config files have changed Change-Id: I15d0d66a132994833287a39a9e8d91affce55d12 --- M README.md 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Nuria: Verified; Looks good to me, approved diff --git a/README.md b/README.md index db16f30..3b99fec 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ The only thing to look for is that piwik site is #8 and that has to be passed at build time ### Vital Signs ### -gulp --layout metrics-by-project --config VitalSigns --piwik piwik.wikimedia.org,8 +gulp --layout metrics-by-project --config Config:VitalSigns --piwik piwik.wikimedia.org,8 ### Browser Reports ### -gulp --layout tabs --config SimpleRequestBreakdowns --piwik piwik.wikimedia.org,8 +gulp --layout tabs --config Config:SimpleRequestBreakdowns --piwik piwik.wikimedia.org,8 ### Standard Metrics ### -gulp --layout tabs --config StandardMetrics --piwik piwik.wikimedia.org,8 +gulp --layout tabs --config Config:StandardMetrics --piwik piwik.wikimedia.org,8 -- To view, visit https://gerrit.wikimedia.org/r/344671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15d0d66a132994833287a39a9e8d91affce55d12 Gerrit-PatchSet: 1 Gerrit-Project: analytics/analytics.wikimedia.org Gerrit-Branch: master Gerrit-Owner: NuriaGerrit-Reviewer: Milimetric Gerrit-Reviewer: Nuria ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Moving reportcard to analytics.wikimedia.org
Nuria has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345004 ) Change subject: Moving reportcard to analytics.wikimedia.org .. Moving reportcard to analytics.wikimedia.org Still a placeholder showing some editor data. Changes need to be made so we can source data from new AQS endpoints Bug: T130117 Change-Id: Icd4cc6bc714e49dc81dcdbe6d903a7ecd24058a8 --- A dashboards/reportcard/dygraphs-timeseries-f2b1af5.js A dashboards/reportcard/filter-timeseries-f2b1af5.js A dashboards/reportcard/fonts/s/lato/v11/1YwB1sO8YE1Lyjf12WNiUA.woff2 A dashboards/reportcard/fonts/s/lato/v11/AcvTq8Q0lyKKNxRlL28RnxJtnKITppOI_IvcXXDNrsc.woff2 A dashboards/reportcard/fonts/s/lato/v11/H2DMvhDLycM56KNuAtbJYA.woff2 A dashboards/reportcard/fonts/s/lato/v11/HkF_qI1x_noxlxhrhMQYEFtXRa8TVwTICgirnJhmVJw.woff2 A dashboards/reportcard/fonts/s/lato/v11/ObQr5XYcoH0WBoUxiaYK3_Y6323mHUZFJMgTvxaG2iE.woff2 A dashboards/reportcard/fonts/s/lato/v11/PLygLKRVCQnA5fhu3qk5fQ.woff2 A dashboards/reportcard/fonts/s/lato/v11/UyBMtLsHKBKXelqf4x7VRQ.woff2 A dashboards/reportcard/fonts/s/lato/v11/YMOYVM-eg6Qs9YzV9OSqZfesZW2xOQ-xsNqO47m55DA.woff2 A dashboards/reportcard/hierarchy-f2b1af5.js A dashboards/reportcard/index.html A dashboards/reportcard/out-of-service-f2b1af5.js A dashboards/reportcard/scripts.js A dashboards/reportcard/stacked-bars-f2b1af5.js A dashboards/reportcard/styles.css A dashboards/reportcard/sunburst-f2b1af5.js A dashboards/reportcard/table-timeseries-f2b1af5.js A dashboards/reportcard/themes/default/assets/fonts/icons.eot A dashboards/reportcard/themes/default/assets/fonts/icons.svg A dashboards/reportcard/themes/default/assets/fonts/icons.ttf A dashboards/reportcard/themes/default/assets/fonts/icons.woff A dashboards/reportcard/themes/default/assets/fonts/icons.woff2 A dashboards/reportcard/themes/default/assets/images/flags.png M index.html 25 files changed, 997 insertions(+), 1 deletion(-) Approvals: Nuria: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/345004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd4cc6bc714e49dc81dcdbe6d903a7ecd24058a8 Gerrit-PatchSet: 1 Gerrit-Project: analytics/analytics.wikimedia.org Gerrit-Branch: master Gerrit-Owner: NuriaGerrit-Reviewer: Fdans Gerrit-Reviewer: Mforns Gerrit-Reviewer: Milimetric Gerrit-Reviewer: Nuria ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs-manage-binds: Pass mounts as keyword arg
Madhuvishy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345005 ) Change subject: nfs-manage-binds: Pass mounts as keyword arg .. nfs-manage-binds: Pass mounts as keyword arg Change-Id: I23782e60e6c60390781ad12251a45c09614fba9e --- M modules/labstore/files/nfs-manage-binds 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/345005/1 diff --git a/modules/labstore/files/nfs-manage-binds b/modules/labstore/files/nfs-manage-binds index 35965a3..50d71ee 100644 --- a/modules/labstore/files/nfs-manage-binds +++ b/modules/labstore/files/nfs-manage-binds @@ -181,7 +181,7 @@ srv_device = device_paths.get(project, device_path_default) srv = os.path.join(srv_device, 'shared', project) exp = os.path.join('/exp/project', project) -create_binding(srv, exp, force=args.f, mounts) +create_binding(srv, exp, force=args.f, mounts=mounts) if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/345005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23782e60e6c60390781ad12251a45c09614fba9e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs: Enable mounting /data/project from nfs on project twl
Madhuvishy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344993 ) Change subject: nfs: Enable mounting /data/project from nfs on project twl .. nfs: Enable mounting /data/project from nfs on project twl Bug: T159407 Change-Id: Ifb756041a0d5faffd6848774399bc615da315850 --- M modules/labstore/files/nfs-mounts.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Madhuvishy: Verified; Looks good to me, approved diff --git a/modules/labstore/files/nfs-mounts.yaml b/modules/labstore/files/nfs-mounts.yaml index 1910909..ef88c2b 100644 --- a/modules/labstore/files/nfs-mounts.yaml +++ b/modules/labstore/files/nfs-mounts.yaml @@ -136,6 +136,10 @@ home: true project: true scratch: true + twl: +gid: 52777 +mounts: + project: true utrs: gid: 50318 mounts: -- To view, visit https://gerrit.wikimedia.org/r/344993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb756041a0d5faffd6848774399bc615da315850 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MadhuvishyGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Moving reportcard to analytics.wikimedia.org
Nuria has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345004 ) Change subject: Moving reportcard to analytics.wikimedia.org .. Moving reportcard to analytics.wikimedia.org Still a placeholder showing some editor data. Changes need to be made so we can source data from new AQS endpoints Bug: T130117 Change-Id: Icd4cc6bc714e49dc81dcdbe6d903a7ecd24058a8 --- A dashboards/reportcard/dygraphs-timeseries-f2b1af5.js A dashboards/reportcard/filter-timeseries-f2b1af5.js A dashboards/reportcard/fonts/s/lato/v11/1YwB1sO8YE1Lyjf12WNiUA.woff2 A dashboards/reportcard/fonts/s/lato/v11/AcvTq8Q0lyKKNxRlL28RnxJtnKITppOI_IvcXXDNrsc.woff2 A dashboards/reportcard/fonts/s/lato/v11/H2DMvhDLycM56KNuAtbJYA.woff2 A dashboards/reportcard/fonts/s/lato/v11/HkF_qI1x_noxlxhrhMQYEFtXRa8TVwTICgirnJhmVJw.woff2 A dashboards/reportcard/fonts/s/lato/v11/ObQr5XYcoH0WBoUxiaYK3_Y6323mHUZFJMgTvxaG2iE.woff2 A dashboards/reportcard/fonts/s/lato/v11/PLygLKRVCQnA5fhu3qk5fQ.woff2 A dashboards/reportcard/fonts/s/lato/v11/UyBMtLsHKBKXelqf4x7VRQ.woff2 A dashboards/reportcard/fonts/s/lato/v11/YMOYVM-eg6Qs9YzV9OSqZfesZW2xOQ-xsNqO47m55DA.woff2 A dashboards/reportcard/hierarchy-f2b1af5.js A dashboards/reportcard/index.html A dashboards/reportcard/out-of-service-f2b1af5.js A dashboards/reportcard/scripts.js A dashboards/reportcard/stacked-bars-f2b1af5.js A dashboards/reportcard/styles.css A dashboards/reportcard/sunburst-f2b1af5.js A dashboards/reportcard/table-timeseries-f2b1af5.js A dashboards/reportcard/themes/default/assets/fonts/icons.eot A dashboards/reportcard/themes/default/assets/fonts/icons.svg A dashboards/reportcard/themes/default/assets/fonts/icons.ttf A dashboards/reportcard/themes/default/assets/fonts/icons.woff A dashboards/reportcard/themes/default/assets/fonts/icons.woff2 A dashboards/reportcard/themes/default/assets/images/flags.png M index.html 25 files changed, 997 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/analytics.wikimedia.org refs/changes/04/345004/1 -- To view, visit https://gerrit.wikimedia.org/r/345004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd4cc6bc714e49dc81dcdbe6d903a7ecd24058a8 Gerrit-PatchSet: 1 Gerrit-Project: analytics/analytics.wikimedia.org Gerrit-Branch: master Gerrit-Owner: Nuria___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Remove unused interfaces
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344977 ) Change subject: Remove unused interfaces .. Remove unused interfaces These do not provide an actual benefit. Instead we can simply type hint against Lexeme. All code that will ever work with these aspects of a Lexeme is in the same code base anyway. So these interfaces are not needed for dependency inversion. It is also very unlikely we will ever reuse any of these Lexeme specific aspects in an other entity type. Let's remove this for now to make working on this code easier, and possibly add it later when we really need it. Change-Id: Ibe1defaa693220e4882774076afe1175c08f2237 --- M src/ChangeOp/ChangeOpLanguage.php M src/ChangeOp/ChangeOpLemma.php M src/ChangeOp/ChangeOpLexicalCategory.php M src/DataModel/Lexeme.php D src/DataModel/Providers/LanguageProvider.php D src/DataModel/Providers/LemmasProvider.php D src/DataModel/Providers/LexicalCategoryProvider.php M src/DataModel/Services/Diff/LexemeDiff.php 8 files changed, 8 insertions(+), 86 deletions(-) Approvals: Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/src/ChangeOp/ChangeOpLanguage.php b/src/ChangeOp/ChangeOpLanguage.php index 69045dc..60c6cdf 100644 --- a/src/ChangeOp/ChangeOpLanguage.php +++ b/src/ChangeOp/ChangeOpLanguage.php @@ -8,7 +8,6 @@ use Wikibase\DataModel\Entity\EntityDocument; use Wikibase\DataModel\Entity\ItemId; use Wikibase\Lexeme\DataModel\Lexeme; -use Wikibase\Lexeme\DataModel\Providers\LanguageProvider; use Wikibase\Lexeme\Validators\LexemeValidatorFactory; use Wikibase\Summary; use Wikimedia\Assert\Assert; @@ -46,11 +45,10 @@ * @param EntityDocument $entity * * @return Result -* * @throws InvalidArgumentException */ public function validate( EntityDocument $entity ) { - Assert::parameterType( LanguageProvider::class, $entity, '$entity' ); + Assert::parameterType( Lexeme::class, $entity, '$entity' ); $languageValidator = $this->lexemeValidatorFactory->getLanguageValidator(); diff --git a/src/ChangeOp/ChangeOpLemma.php b/src/ChangeOp/ChangeOpLemma.php index 1b33b26..b0e2b70 100644 --- a/src/ChangeOp/ChangeOpLemma.php +++ b/src/ChangeOp/ChangeOpLemma.php @@ -6,7 +6,7 @@ use ValueValidators\Result; use Wikibase\ChangeOp\ChangeOpBase; use Wikibase\DataModel\Entity\EntityDocument; -use Wikibase\Lexeme\DataModel\Providers\LemmasProvider; +use Wikibase\Lexeme\DataModel\Lexeme; use Wikibase\Lexeme\Validators\LexemeValidatorFactory; use Wikibase\Summary; use Wikimedia\Assert\Assert; @@ -51,11 +51,10 @@ * @param EntityDocument $entity * * @return Result -* * @throws InvalidArgumentException */ public function validate( EntityDocument $entity ) { - Assert::parameterType( LemmasProvider::class, $entity, '$entity' ); + Assert::parameterType( Lexeme::class, $entity, '$entity' ); $languageValidator = $this->lexemeValidatorFactory->getLanguageCodeValidator(); $termValidator = $this->lexemeValidatorFactory->getLemmaTermValidator(); @@ -80,9 +79,9 @@ // NOTE: This part is very likely to change completely once a decision // about the lemma representation has been made. - Assert::parameterType( LemmasProvider::class, $entity, '$entity' ); + Assert::parameterType( Lexeme::class, $entity, '$entity' ); - /** @var LemmasProvider $entity */ + /** @var Lexeme $entity */ $lemmas = $entity->getLemmas(); $hasLemma = $lemmas->hasTermForLanguage( $this->language ); diff --git a/src/ChangeOp/ChangeOpLexicalCategory.php b/src/ChangeOp/ChangeOpLexicalCategory.php index 5c08764..256ddec 100644 --- a/src/ChangeOp/ChangeOpLexicalCategory.php +++ b/src/ChangeOp/ChangeOpLexicalCategory.php @@ -8,7 +8,6 @@ use Wikibase\DataModel\Entity\EntityDocument; use Wikibase\DataModel\Entity\ItemId; use Wikibase\Lexeme\DataModel\Lexeme; -use Wikibase\Lexeme\DataModel\Providers\LexicalCategoryProvider; use Wikibase\Lexeme\Validators\LexemeValidatorFactory; use Wikibase\Summary; use Wikimedia\Assert\Assert; @@ -46,11 +45,10 @@ * @param EntityDocument $entity * * @return Result -* * @throws InvalidArgumentException */ public function validate( EntityDocument $entity ) { - Assert::parameterType( LexicalCategoryProvider::class, $entity, '$entity' ); + Assert::parameterType( Lexeme::class, $entity, '$entity' ); $lexicalCategoryValidator = $this->lexemeValidatorFactory->getLexicalCategoryValidator(); diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php index
[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Adding Reportcard to readme
Nuria has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345003 ) Change subject: Adding Reportcard to readme .. Adding Reportcard to readme Change-Id: I619c2468f7aec94b57e4581037d4a80e5390df33 --- M README.md 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/analytics.wikimedia.org refs/changes/03/345003/1 diff --git a/README.md b/README.md index 3b99fec..5115b47 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,13 @@ The only thing to look for is that piwik site is #8 and that has to be passed at build time ### Vital Signs ### -gulp --layout metrics-by-project --config Config:VitalSigns --piwik piwik.wikimedia.org,8 +gulp --layout metrics-by-project --config Dashiki:VitalSigns --piwik piwik.wikimedia.org,8 ### Browser Reports ### -gulp --layout tabs --config Config:SimpleRequestBreakdowns --piwik piwik.wikimedia.org,8 +gulp --layout tabs --config Dashiki:SimpleRequestBreakdowns --piwik piwik.wikimedia.org,8 ### Standard Metrics ### -gulp --layout tabs --config Config:StandardMetrics --piwik piwik.wikimedia.org,8 +gulp --layout tabs --config Dashiki:StandardMetrics --piwik piwik.wikimedia.org,8 + +### ReportCard ### +gulp --layout tabs --config Dashiki:ReportCard --piwik piwik.wikimedia.org,8 -- To view, visit https://gerrit.wikimedia.org/r/345003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I619c2468f7aec94b57e4581037d4a80e5390df33 Gerrit-PatchSet: 1 Gerrit-Project: analytics/analytics.wikimedia.org Gerrit-Branch: master Gerrit-Owner: Nuria___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Update: [Wikipedia Android] mark wikidata description guide ...
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345002 ) Change subject: Update: [Wikipedia Android] mark wikidata description guide url optional .. Update: [Wikipedia Android] mark wikidata description guide url optional Also, use MANGLER for commmon prefix. Bug: T156405 Change-Id: I0c4fad73105047fa8d2042e6599eba636d14018f --- M groups/Wikimedia/WikimediaMobile-android.yaml 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/02/345002/1 diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml b/groups/Wikimedia/WikimediaMobile-android.yaml index c946a67..398144e 100644 --- a/groups/Wikimedia/WikimediaMobile-android.yaml +++ b/groups/Wikimedia/WikimediaMobile-android.yaml @@ -52,8 +52,9 @@ TAGS: ignored: -- wikipedia-android-strings-intent_share_search_label -- wikipedia-android-strings-zero_webpage_url +- intent_share_search_label +- zero_webpage_url optional: -- wikipedia-android-strings-privacy_policy_url -- wikipedia-android-strings-terms_of_use_url +- privacy_policy_url +- terms_of_use_url +- wikidata_description_guide_url -- To view, visit https://gerrit.wikimedia.org/r/345002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c4fad73105047fa8d2042e6599eba636d14018f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: Sniedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add note to keep scap server lists in sync with Linter mw-co...
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345001 ) Change subject: Add note to keep scap server lists in sync with Linter mw-config .. Add note to keep scap server lists in sync with Linter mw-config Change-Id: Ic715f4da7411dcf0a0e234596fa9ca481b251300 --- A scap/README 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/01/345001/1 diff --git a/scap/README b/scap/README new file mode 100644 index 000..f825982 --- /dev/null +++ b/scap/README @@ -0,0 +1,6 @@ +This directory has the scap config for deploying Parsoid to Wikimedia sites. + +Changes to the `targets` and `target-canary` files should be kept in sync with +the $wgLinterSubmitterWhitelist variable in the operations/mediawiki-config +repository. + -- To view, visit https://gerrit.wikimedia.org/r/345001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic715f4da7411dcf0a0e234596fa9ca481b251300 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: WIP: Mobile specific skin changes are defined inside a hook
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/345000 ) Change subject: WIP: Mobile specific skin changes are defined inside a hook .. WIP: Mobile specific skin changes are defined inside a hook Features that are currently in development in mobile web beta are now limited to mobile and will not appear on desktop mode. Change-Id: I634bea4b9969e228457b13e01b45a679fa25ed3b --- M extension.json M includes/MobileFrontend.hooks.php M includes/skins/SkinMinerva.php 3 files changed, 47 insertions(+), 41 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/00/345000/1 diff --git a/extension.json b/extension.json index 2826e34..86cbe27 100644 --- a/extension.json +++ b/extension.json @@ -1595,6 +1595,12 @@ } }, "Hooks": { + "BeforePageDisplayMobile": [ + "MobileFrontendHooks::onBeforePageDisplayMobile" + ], + "DataAfterContent": [ + "MobileFrontendHooks::onDataAfterContent" + ], "APIGetAllowedParams": [ "ApiParseExtender::onAPIGetAllowedParams" ], diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index 3b70a02..efa95be 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -848,6 +848,44 @@ return true; } + public function onDataAfterContent() { + if ( class_exists( 'MobileContext' ) ) { + // FIXME: Remove when header v2 is in stable. + $tpl->set( 'headerV2', $mobileContext->getConfigVariable( 'MinervaUseHeaderV2' ) ); + + // add category button if needed + $buttons = $tpl->data['secondary_actions']; + $categoryBtn = [ + 'attributes' => [ + 'href' => '#/categories', + // add hidden class (the overlay works only, when JS is enabled (class will + // be removed in categories/init.js) + 'class' => 'category-button hidden', + ], + 'label' => $this->msg( 'categories' )->text() + ]; + $buttons['categories'] = $categoryBtn; + $tpl->set( 'secondary_actions', $buttons ); + } + + return true; + } + + public function onBeforePageDisplayMobile( OutputPage $out, Skin $sk ) { + $mobileContext = MobileContext::singleton(); + $shouldShowCategoriesButton = $mobileContext->getConfigVariable( + 'MinervaShowCategoriesButton' ) && $sk->hasCategoryLinks(); + + if ( $mobileContext->getConfigVariable( 'MinervaEnableFontChanger' ) ) { + $modules[] = 'skins.minerva.fontchanger'; + } + + if ( $mobileContext->getConfigVariable( 'MinervaEnableBackToTop' ) ) { + $modules[] = 'skins.minerva.backtotop'; + } + $modules[] = [ 'skins.minerva.toggling' ]; + $out->addModules( $modules ); + } /** * AfterBuildFeedLinks hook handler. Remove all feed links in mobile view. * diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index bc0e744..757cb67 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -21,8 +21,6 @@ public $useHeadElement = true; /** @var string $mode Describes 'stability' of the skin - beta, stable */ protected $mode = 'stable'; - /** @var MobileContext $mobileContext Safes an instance of MobileContext */ - protected $mobileContext; /** @var bool whether the page is the user's page, i.e. User:Username */ public $isUserPage = false; /** @var ContentHandler Content handler of page; only access through getContentHandler */ @@ -38,7 +36,8 @@ * @return Config */ public function getMFConfig() { - return $this->mobileContext->getMFConfig(); + // FIXME: Rename service to Minerva.Config when Minerva is a separate + return MediaWikiServices::getInstance()->getService( 'MobileFrontend.Config' ); } /** @@ -78,9 +77,6 @@ // Set the links for page secondary actions $tpl->set( 'secondary_actions', $this->getSecondaryActions( $tpl ) ); - - // FIXME: Remove when header v2 is in stable. - $tpl->set( 'headerV2', $this->mobileContext->getConfigVariable( 'MinervaUseHeaderV2' )
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Improve Thumbor nginx timeout settings
Gilles has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344999 ) Change subject: Improve Thumbor nginx timeout settings .. Improve Thumbor nginx timeout settings Bug: T150746 Change-Id: If5e6aae044322aa9871e64a4b93b011abcd16453 --- M modules/thumbor/templates/nginx.conf.erb 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/344999/1 diff --git a/modules/thumbor/templates/nginx.conf.erb b/modules/thumbor/templates/nginx.conf.erb index 39f671d..85551f2 100644 --- a/modules/thumbor/templates/nginx.conf.erb +++ b/modules/thumbor/templates/nginx.conf.erb @@ -9,16 +9,18 @@ server { listen <%= @listen_port %>; -# Thumbor subprocesses have a timeout of 60s -# Set by SUBPROCESS_TIMEOUT in the Thumbor configuration -keepalive_timeout 180; - location / { +# We want swift to rotate between thumbor instances, not stick to one. This disables +# keep-alive client connections. +keepalive_timeout 0; proxy_redirect off; proxy_buffering off; -# fallback to the next upstream at most once, and no longer than 30s -proxy_next_upstream_timeout 30; +# fallback to the next upstream at most once, and no longer than the same as proxy_read_timeout +proxy_next_upstream_timeout 180; proxy_next_upstream_tries 1; +# Maximum pause between read operations. Thumbor stays silent while it processes +# images, which means that this should be higher than the Thumbor processing total time limit +proxy_read_timeout 180; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -- To view, visit https://gerrit.wikimedia.org/r/344999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5e6aae044322aa9871e64a4b93b011abcd16453 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gilles___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: misc-varnish/parsoid-tests: remove parsoid-tests backend
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343948 ) Change subject: misc-varnish/parsoid-tests: remove parsoid-tests backend .. misc-varnish/parsoid-tests: remove parsoid-tests backend "parsoid-tests" has been replaced by "parsoid-rt-tests" and "parsoid-vd-tests" in previous commits by subbu. Once he confirms everything is working we can remove the old generic backend/vhost to clean up. Change-Id: I29d283ea09ff6ce58d5d39cc7437f4070740f438 --- M modules/parsoid/templates/parsoid-testing.nginx.conf.erb M modules/role/manifests/cache/misc.pp 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Subramanya Sastry: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/parsoid/templates/parsoid-testing.nginx.conf.erb b/modules/parsoid/templates/parsoid-testing.nginx.conf.erb index ec05869..018d368 100644 --- a/modules/parsoid/templates/parsoid-testing.nginx.conf.erb +++ b/modules/parsoid/templates/parsoid-testing.nginx.conf.erb @@ -1,5 +1,4 @@ server { -server_name parsoid-tests.wikimedia.org; server_name parsoid-rt-tests.wikimedia.org; listen 8001; ## listen for ipv4; this line is default and implied diff --git a/modules/role/manifests/cache/misc.pp b/modules/role/manifests/cache/misc.pp index 2bb708a..e4fb1d0 100644 --- a/modules/role/manifests/cache/misc.pp +++ b/modules/role/manifests/cache/misc.pp @@ -214,7 +214,6 @@ 'metrics.wikimedia.org' => { 'director' => 'thorium' }, 'noc.wikimedia.org' => { 'director' => 'noc' }, 'ores.wikimedia.org' => { 'director' => 'ores' }, -'parsoid-tests.wikimedia.org'=> { 'director' => 'ruthenium' }, 'parsoid-rt-tests.wikimedia.org' => { 'director' => 'ruthenium' }, 'parsoid-vd-tests.wikimedia.org' => { 'director' => 'ruthenium' }, 'people.wikimedia.org' => { -- To view, visit https://gerrit.wikimedia.org/r/343948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29d283ea09ff6ce58d5d39cc7437f4070740f438 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: BBlack Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Ema Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Linter: whitelist parsoid canaries too
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344998 ) Change subject: Linter: whitelist parsoid canaries too .. Linter: whitelist parsoid canaries too Currently all Linter API requests from the four canaries were being dropped. Bug: T160573 Change-Id: Icb77dae288b92d83eb2f34244236446b1335ca2e --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Arlolra: Looks good to me, but someone else must approve diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3d0ceb1..ff10d9c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14114,6 +14114,8 @@ 'wgLinterSubmitterWhitelist' => [ 'default' => [ + '10.64.32.78' => true, # wtp1001.eqiad.wmnet + '10.64.32.73' => true, # wtp1002.eqiad.wmnet '10.64.32.74' => true, # wtp1003.eqiad.wmnet '10.64.32.75' => true, # wtp1004.eqiad.wmnet '10.64.32.84' => true, # wtp1005.eqiad.wmnet @@ -14136,6 +14138,8 @@ '10.64.0.217' => true, # wtp1022.eqiad.wmnet '10.64.0.218' => true, # wtp1023.eqiad.wmnet '10.64.0.219' => true, # wtp1024.eqiad.wmnet + '10.192.16.43' => true, # wtp2001.codfw.wmnet + '10.192.16.44' => true, # wtp2002.codfw.wmnet '10.192.16.45' => true, # wtp2003.codfw.wmnet '10.192.16.46' => true, # wtp2004.codfw.wmnet '10.192.16.47' => true, # wtp2005.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/344998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb77dae288b92d83eb2f34244236446b1335ca2e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: LegoktmGerrit-Reviewer: Arlolra Gerrit-Reviewer: Florianschmidtwelzow Gerrit-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] operations/mediawiki-config[master]: Linter: whitelist parsoid canaries too
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344998 ) Change subject: Linter: whitelist parsoid canaries too .. Linter: whitelist parsoid canaries too Currently all Linter API requests from the four canaries were being dropped. Bug: T160573 Change-Id: Icb77dae288b92d83eb2f34244236446b1335ca2e --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/344998/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3d0ceb1..ff10d9c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14114,6 +14114,8 @@ 'wgLinterSubmitterWhitelist' => [ 'default' => [ + '10.64.32.78' => true, # wtp1001.eqiad.wmnet + '10.64.32.73' => true, # wtp1002.eqiad.wmnet '10.64.32.74' => true, # wtp1003.eqiad.wmnet '10.64.32.75' => true, # wtp1004.eqiad.wmnet '10.64.32.84' => true, # wtp1005.eqiad.wmnet @@ -14136,6 +14138,8 @@ '10.64.0.217' => true, # wtp1022.eqiad.wmnet '10.64.0.218' => true, # wtp1023.eqiad.wmnet '10.64.0.219' => true, # wtp1024.eqiad.wmnet + '10.192.16.43' => true, # wtp2001.codfw.wmnet + '10.192.16.44' => true, # wtp2002.codfw.wmnet '10.192.16.45' => true, # wtp2003.codfw.wmnet '10.192.16.46' => true, # wtp2004.codfw.wmnet '10.192.16.47' => true, # wtp2005.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/344998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb77dae288b92d83eb2f34244236446b1335ca2e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: [EXPERIMENTAL] Adjust to use MenuTagMultiselectWi...
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344997 ) Change subject: RCFilters: [EXPERIMENTAL] Adjust to use MenuTagMultiselectWidget .. RCFilters: [EXPERIMENTAL] Adjust to use MenuTagMultiselectWidget The new widget in OOUI is more stable and easier to manage. However, the usage of menu - while theoretically supposed to answer a bunch of small issues - may actually show to expose a bunch of other worse issues. We should just use the PopupTagMultiselectWidget and fix OOUI's menu upstream to be more robust and answer our needs. NOTE: To run this, you have to use an ooui build with the patch https://gerrit.wikimedia.org/r/#/c/344669/ Change-Id: I42be0691304b1e93b4e9c02eba2e3a724a5ffd67 Depends-On: Ic216769f48e4677da5b7274f491aa08a95aa8076 --- M resources/Resources.php A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderSectionWidget.less A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.less A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagItemWidget.less A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterFloatingMenuSelectWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderSectionWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js 13 files changed, 1,280 insertions(+), 140 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/97/344997/1 diff --git a/resources/Resources.php b/resources/Resources.php index 631386a..23c248e 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1753,11 +1753,25 @@ 'mediawiki.rcfilters.filters.ui' => [ 'scripts' => [ 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js', - 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js', - 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js', - 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js', - 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js', - 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js', + + + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js', + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js', + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js', + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js', + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderSectionWidget.js', + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterFloatingMenuSelectWidget.js', + + + + // 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js', + // 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js', + // 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js', + // 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js', + // 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js', + + + 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js', 'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js', @@ -1771,12 +1785,28 @@ 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less', 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less', - 'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less', -
[MediaWiki-commits] [Gerrit] operations/puppet[production]: service::node: Do not use the proxy by default
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344996 ) Change subject: service::node: Do not use the proxy by default .. service::node: Do not use the proxy by default The basic assumption and starting point for services in production should be that they do not need access to resources outside of the WMF production environment. Consequently, we shouldn't activate it by default, but only if a service explicitly needs it. This commit effectively affects only Graphoid, as it is the only service that uses service::node's configuration file compilation feature, and it doesn't need the proxy, so remove the no_proxy_list configuration variable from its manifest. Bug: T97530 Change-Id: If50030e4014bb30e30e96d438eba062a4bbfe0a5 --- M modules/graphoid/manifests/init.pp M modules/service/manifests/node.pp M modules/service/templates/node/config.yaml.erb 3 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/344996/1 diff --git a/modules/graphoid/manifests/init.pp b/modules/graphoid/manifests/init.pp index 46cd6a4..81f4af8 100644 --- a/modules/graphoid/manifests/init.pp +++ b/modules/graphoid/manifests/init.pp @@ -42,9 +42,6 @@ timeout=> $timeout, headers=> $headers, errorHeaders => $error_headers, -no_proxy_list => inline_template( -'<%= @allowed_domains.values.flatten.sort.join(",") %>' -), }, has_spec=> true, healthcheck_url => '', diff --git a/modules/service/manifests/node.pp b/modules/service/manifests/node.pp index fb466fc..c91fa7a 100644 --- a/modules/service/manifests/node.pp +++ b/modules/service/manifests/node.pp @@ -69,6 +69,10 @@ # [*starter_script*] # The script used for starting the service. Default: src/server.js # +# [*use_proxy*] +# Whether the service needs to use the proxy to access external resources. +# Default: false +# # [*local_logging*] # Whether to store log entries on the target node as well. Default: true # @@ -158,6 +162,7 @@ $starter_module = './src/app.js', $entrypoint = '', $starter_script = 'src/server.js', +$use_proxy = false, $local_logging = true, $logging_name= $title, $statsd_prefix = $title, diff --git a/modules/service/templates/node/config.yaml.erb b/modules/service/templates/node/config.yaml.erb index 7bddd9c..bb9ad50 100644 --- a/modules/service/templates/node/config.yaml.erb +++ b/modules/service/templates/node/config.yaml.erb @@ -68,7 +68,7 @@ # to restrict to a particular domain, use: # cors: restricted.domain.org # URL of the outbound proxy to use (complete with protocol) - proxy: <%= cvars['proxy'] %> + <%= @use_proxy ? '' : '# ' -%>proxy: <%= cvars['proxy'] %> # the template used for contacting the MW API mwapi_req: method: post -- To view, visit https://gerrit.wikimedia.org/r/344996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If50030e4014bb30e30e96d438eba062a4bbfe0a5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Element: Add special case for document root in getClosestScr...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343549 ) Change subject: Element: Add special case for document root in getClosestScrollableContainer .. Element: Add special case for document root in getClosestScrollableContainer Also documentation improvements, and correction for unattached elements. Bug: T160852 Change-Id: Ifceac7e11ba0db2635f55d554f266fb13dc71807 --- M src/Element.js 1 file changed, 17 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/src/Element.js b/src/Element.js index 3b9085d..2c10495 100644 --- a/src/Element.js +++ b/src/Element.js @@ -584,17 +584,18 @@ }() ); /** - * Get scrollable object parent + * Get the root scrollable element of given element's document. * - * documentElement can't be used to get or set the scrollTop - * property on Blink. Changing and testing its value lets us - * use 'body' or 'documentElement' based on what is working. + * On Blink-based browsers (Chrome etc.), `document.documentElement` can't be used to get or set + * the scrollTop property; instead we have to use `document.body`. Changing and testing the value + * lets us use 'body' or 'documentElement' based on what is working. * * https://code.google.com/p/chromium/issues/detail?id=303131 * * @static - * @param {HTMLElement} el Element to find scrollable parent for - * @return {HTMLElement} Scrollable parent + * @param {HTMLElement} el Element to find root scrollable parent for + * @return {HTMLElement} Scrollable parent, `document.body` or `document.documentElement` + * depending on browser */ OO.ui.Element.static.getRootScrollableElement = function ( el ) { var scrollTop, body; @@ -618,8 +619,8 @@ /** * Get closest scrollable container. * - * Traverses up until either a scrollable element or the root is reached, in which case the window - * will be returned. + * Traverses up until either a scrollable element or the root is reached, in which case the root + * scrollable element will be returned (see #getRootScrollableElement). * * @static * @param {HTMLElement} el Element to find scrollable container for @@ -635,6 +636,12 @@ if ( dimension === 'x' || dimension === 'y' ) { props = [ 'overflow-' + dimension ]; + } + + // Special case for the document root (which doesn't really have any scrollable container, since + // it is the ultimate scrollable container, but this is probably saner than null or exception) + if ( $( el ).is( 'html, body' ) ) { + return this.getRootScrollableElement( el ); } while ( $parent.length ) { @@ -655,7 +662,8 @@ } $parent = $parent.parent(); } - return this.getDocument( el ).body; + // The element is unattached... return something mostly sane + return this.getRootScrollableElement( el ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/343549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifceac7e11ba0db2635f55d554f266fb13dc71807 Gerrit-PatchSet: 3 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Catrope Gerrit-Reviewer: Krinkle Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Use https endpoint for iDEAL availability
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344684 ) Change subject: Use https endpoint for iDEAL availability .. Use https endpoint for iDEAL availability Bug: T161153 Change-Id: I500e4188bb27261f7bf6e697cc567fa810dd34d9 --- M SmashPig.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Awight: Looks good to me, approved diff --git a/SmashPig.yaml b/SmashPig.yaml index e68beb3..1688b5e 100644 --- a/SmashPig.yaml +++ b/SmashPig.yaml @@ -468,7 +468,7 @@ duration: 900 key-base: SMASHPIG_INGENICO_IDEAL_BANK_LIST availability-parameters: -url: http://availability.ideal.nl/api/api/GetIssuers +url: https://availability.ideal.nl/api/api/GetIssuers # percentage availability below which issuers are omitted threshold: 50 -- To view, visit https://gerrit.wikimedia.org/r/344684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I500e4188bb27261f7bf6e697cc567fa810dd34d9 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/SmashPig Gerrit-Branch: master Gerrit-Owner: EjeggGerrit-Reviewer: Awight Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Improve RDF test helpers.
Daniel Kinzler has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344995 ) Change subject: Improve RDF test helpers. .. Improve RDF test helpers. This patch allows all RDF tests to match against a set of files, instead of a single file. The idea is to modularize test data. See the follow-up changes for the intended use. Change-Id: I3b6ffe8bce3fa98951bea0e51954d63126d39be7 --- M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php M repo/tests/phpunit/includes/Rdf/FullStatementRdfBuilderTest.php M repo/tests/phpunit/includes/Rdf/NTriplesRdfTestHelper.php M repo/tests/phpunit/includes/Rdf/RdfBuilderTest.php M repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php M repo/tests/phpunit/includes/Rdf/SiteLinksRdfBuilderTest.php M repo/tests/phpunit/includes/Rdf/SnakRdfBuilderTest.php M repo/tests/phpunit/includes/Rdf/TermsRdfBuilderTest.php M repo/tests/phpunit/includes/Rdf/TruthyStatementRdfBuilderTest.php M repo/tests/phpunit/maintenance/AddUnitsTest.php 10 files changed, 273 insertions(+), 192 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/95/344995/1 diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php index c6fcca3..83797e3 100644 --- a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php +++ b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php @@ -47,7 +47,12 @@ protected function setUp() { parent::setUp(); - $this->helper = new NTriplesRdfTestHelper(); + $this->helper = new NTriplesRdfTestHelper( + new RdfBuilderTestData( + __DIR__ . '/../../data/rdf/entities', + __DIR__ . '/../../data/rdf/RdfDumpGenerator' + ) + ); } /** @@ -79,10 +84,7 @@ } private function getTestData() { - return new RdfBuilderTestData( - __DIR__ . '/../../data/rdf/entities', - __DIR__ . '/../../data/rdf/RdfDumpGenerator' - ); + return $this->helper->getTestData(); } /** @@ -194,8 +196,7 @@ ob_start(); $dumper->generateDump( $pager ); $actual = ob_get_clean(); - $expected = $this->getTestData()->getNTriples( $dumpname ); - $this->helper->assertNTriplesEquals( $expected, $actual ); + $this->helper->assertNTriplesEqualsDataset( $dumpname, $actual ); } public function loadDataProvider() { @@ -211,11 +212,10 @@ */ public function testReferenceDedup( array $ids, $dumpname ) { $entities = array(); - $rdfTest = new RdfBuilderTest(); foreach ( $ids as $id ) { $id = $id->getSerialization(); - $entities[$id] = $rdfTest->getEntityData( $id ); + $entities[$id] = $this->getTestData()->getEntity( $id ); } $dumper = $this->newDumpGenerator( $entities ); @@ -226,8 +226,7 @@ ob_start(); $dumper->generateDump( $pager ); $actual = ob_get_clean(); - $expected = $this->getTestData()->getNTriples( $dumpname ); - $this->helper->assertNTriplesEquals( $expected, $actual ); + $this->helper->assertNTriplesEqualsDataset( $dumpname, $actual ); } } diff --git a/repo/tests/phpunit/includes/Rdf/FullStatementRdfBuilderTest.php b/repo/tests/phpunit/includes/Rdf/FullStatementRdfBuilderTest.php index 6054627..ccec8a5 100644 --- a/repo/tests/phpunit/includes/Rdf/FullStatementRdfBuilderTest.php +++ b/repo/tests/phpunit/includes/Rdf/FullStatementRdfBuilderTest.php @@ -30,15 +30,17 @@ */ private $helper; - /** -* @var RdfBuilderTestData|null -*/ - private $testData = null; + public function __construct() { + parent::__construct(); - protected function setUp() { - parent::setUp(); + $this->helper = new NTriplesRdfTestHelper( + new RdfBuilderTestData( + __DIR__ . '/../../data/rdf/entities', + __DIR__ . '/../../data/rdf/FullStatementRdfBuilder' + ) + ); - $this->helper = new NTriplesRdfTestHelper(); + $this->helper->setAllBlanksEqual( true ); } /** @@ -47,14 +49,7 @@ * @return RdfBuilderTestData */ private function getTestData() { - if ( $this->testData === null ) { - $this->testData = new RdfBuilderTestData( -
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid $.type()
Sbisson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344994 ) Change subject: Avoid $.type() .. Avoid $.type() Followup to I9a0c5e40b813e075ec33eea882b625dc43a15df6 Replace $.type() with typeof or Array.isArray Change-Id: I4f0f717c345ab1279b626b158b0ed6ada056bbc1 --- M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/94/344994/1 diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 14eabe2..7405bae 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -321,8 +321,8 @@ * @param {array|object|string} filters */ mw.rcfilters.Controller.prototype.trackHighlight = function ( action, filters ) { - filters = $.type( filters ) === 'string' ? { name: filters } : filters; - filters = $.type( filters ) === 'object' ? [ filters ] : filters; + filters = typeof filters === 'string' ? { name: filters } : filters; + filters = !Array.isArray( filters ) ? [ filters ] : filters; mw.track( 'event.ChangesListHighlights', { -- To view, visit https://gerrit.wikimedia.org/r/344994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f0f717c345ab1279b626b158b0ed6ada056bbc1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Sbisson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: add goransm to researchers, analytics-wmde, analytics-u...
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344992 ) Change subject: admin: add goransm to researchers,analytics-wmde,analytics-users .. admin: add goransm to researchers,analytics-wmde,analytics-users Data Need: Data Analyst, WMDE: various Data Science related tasks (e.g. access to datasets, data modeling, and similar) Bug: T160980 Change-Id: I83ccea2239f6aacaaf0c90d6d9e7c4b0ce1646df --- M modules/admin/data/data.yaml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 7390ae7..c8b9707 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -118,7 +118,7 @@ jminor, etonkovidova, sbisson, addshore, matmarex, elukey, nikerabbit, nschaaf, dstrine, joewalsh, mpany, jsamra, jdittrich, chelsyx, ovasileva, mtizzoni, panisson, paolotti, ciro, debt, - samwalton9, zareen, fdans, samtar, mlitn, shrlak, niharika29] + samwalton9, zareen, fdans, samtar, mlitn, shrlak, niharika29, goransm] ldap-admins: gid: 715 description: ldap admins @@ -220,7 +220,7 @@ description: Gives generic client access to the Analytics (Hadoop) cluster. This will grant shell access on Hadoop client nodes (stat1002) and on Hadoop NameNodes. -members: [debt] +members: [debt, goransm] analytics-privatedata-users: gid: 731 description: Gives access to the Analytics (Hadoop) cluster as well as private data within. @@ -549,7 +549,7 @@ analytics-wmde-users: description: Group of WMDE analytics users gid: 784 -members: [addshore] +members: [addshore, goransm] privileges: ['ALL = (analytics-wmde) NOPASSWD: ALL'] eventbus-admins: gid: 785 -- To view, visit https://gerrit.wikimedia.org/r/344992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83ccea2239f6aacaaf0c90d6d9e7c4b0ce1646df Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: GoranSMilovanovic Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: Ottomata Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs: Enable mounting /data/project from nfs on project twl
Madhuvishy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344993 ) Change subject: nfs: Enable mounting /data/project from nfs on project twl .. nfs: Enable mounting /data/project from nfs on project twl Bug: T159407 Change-Id: Ifb756041a0d5faffd6848774399bc615da315850 --- M modules/labstore/files/nfs-mounts.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/344993/1 diff --git a/modules/labstore/files/nfs-mounts.yaml b/modules/labstore/files/nfs-mounts.yaml index 1910909..ef88c2b 100644 --- a/modules/labstore/files/nfs-mounts.yaml +++ b/modules/labstore/files/nfs-mounts.yaml @@ -136,6 +136,10 @@ home: true project: true scratch: true + twl: +gid: 52777 +mounts: + project: true utrs: gid: 50318 mounts: -- To view, visit https://gerrit.wikimedia.org/r/344993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb756041a0d5faffd6848774399bc615da315850 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: add goransm to researchers, analytics-wmde, analytics-u...
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344992 ) Change subject: admin: add goransm to researchers,analytics-wmde,analytics-users .. admin: add goransm to researchers,analytics-wmde,analytics-users Data Need: Data Analyst, WMDE: various Data Science related tasks (e.g. access to datasets, data modeling, and similar) Bug: T160980 Change-Id: I83ccea2239f6aacaaf0c90d6d9e7c4b0ce1646df --- M modules/admin/data/data.yaml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/344992/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 42b7626..5c1b0de 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -117,7 +117,7 @@ jminor, etonkovidova, sbisson, addshore, matmarex, elukey, nikerabbit, nschaaf, dstrine, joewalsh, mpany, jsamra, jdittrich, chelsyx, ovasileva, mtizzoni, panisson, paolotti, ciro, debt, - samwalton9, zareen, fdans, samtar, mlitn, shrlak, niharika29] + samwalton9, zareen, fdans, samtar, mlitn, shrlak, niharika29, goransm] ldap-admins: gid: 715 description: ldap admins @@ -219,7 +219,7 @@ description: Gives generic client access to the Analytics (Hadoop) cluster. This will grant shell access on Hadoop client nodes (stat1002) and on Hadoop NameNodes. -members: [debt] +members: [debt, goransm] analytics-privatedata-users: gid: 731 description: Gives access to the Analytics (Hadoop) cluster as well as private data within. @@ -548,7 +548,7 @@ analytics-wmde-users: description: Group of WMDE analytics users gid: 784 -members: [addshore] +members: [addshore, goransm] privileges: ['ALL = (analytics-wmde) NOPASSWD: ALL'] eventbus-admins: gid: 785 -- To view, visit https://gerrit.wikimedia.org/r/344992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83ccea2239f6aacaaf0c90d6d9e7c4b0ce1646df 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] operations/puppet[production]: nfs: Add functionality to create home and project dirs for n...
Madhuvishy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344982 ) Change subject: nfs: Add functionality to create home and project dirs for new projects in misc .. nfs: Add functionality to create home and project dirs for new projects in misc Bug: T158883 Change-Id: I63396c8a55394ef33f9c2bb99b93bf298e83f4e2 --- M modules/labstore/files/nfs-manage-binds 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Madhuvishy: Verified; Looks good to me, approved Rush: Looks good to me, but someone else must approve diff --git a/modules/labstore/files/nfs-manage-binds b/modules/labstore/files/nfs-manage-binds index 0caa4d4..35965a3 100644 --- a/modules/labstore/files/nfs-manage-binds +++ b/modules/labstore/files/nfs-manage-binds @@ -56,7 +56,7 @@ logging.error("bind mount %s %s failed" % (src, dst)) -def create_binding(target, export, force=False): +def create_binding(target, export, force=False, mounts=[]): """ manage bind state on disk (with possible inline creations) :param target: str :param export: str @@ -67,7 +67,10 @@ if force: ensure_dir(target) - +if 'home' in mounts: +ensure_dir('%s/home' % target) +if 'project' in mounts: +ensure_dir('%s/project' % target) if os.path.exists(target): bind_mount(target, export) else: @@ -170,10 +173,15 @@ } for project in sorted(config['private']): +# Find which mounts should be made available for project +# This is useful to create home and project dirs for new projects +mount_config = config['private'][project].get('mounts', {}) +mounts = [mount for mount in mount_config.keys() if mount_config[mount]] + srv_device = device_paths.get(project, device_path_default) srv = os.path.join(srv_device, 'shared', project) exp = os.path.join('/exp/project', project) -create_binding(srv, exp, force=args.f) +create_binding(srv, exp, force=args.f, mounts) if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/344982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63396c8a55394ef33f9c2bb99b93bf298e83f4e2 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MadhuvishyGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Mark express checkout refunds with correct gateway
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344727 ) Change subject: Mark express checkout refunds with correct gateway .. Mark express checkout refunds with correct gateway Looks like the Invoice ID is the surest thing we have to distinguish them. The note field can be filled in at the payment console, so it's not to be trusted. Bug: T161121 Change-Id: Id23f49c49e9c6a685eddaafd6828448d8f68ebef --- M audit/paypal/TrrFile.py M audit/paypal/tests/test_trr_file.py 2 files changed, 98 insertions(+), 11 deletions(-) Approvals: XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/audit/paypal/TrrFile.py b/audit/paypal/TrrFile.py index a884681..25eab2c 100644 --- a/audit/paypal/TrrFile.py +++ b/audit/paypal/TrrFile.py @@ -115,13 +115,6 @@ 'country': row[addr_prefix + 'Country'], } -# FIXME: This is weasly, see that we're also sending the raw payment -# source value as payment_method. -if row['Payment Source'] == 'Express Checkout': -out['gateway'] = 'paypal_ec' -else: -out['gateway'] = 'paypal' - if row['Fee Amount']: out['fee'] = float(row['Fee Amount']) / 100.0 @@ -190,6 +183,8 @@ queue = 'refund' +out['gateway'] = self.determine_gateway(row, queue) + if not queue: log.info("-Unknown\t{id}\t{date}\t(Type {type})".format(id=out['gateway_txn_id'], date=out['date'], type=event_type)) return @@ -211,6 +206,19 @@ log.info("+Sending\t{id}\t{date}\t{type}".format(id=out['gateway_txn_id'], date=row['Transaction Initiation Date'], type=queue)) self.send(queue, out) +def determine_gateway(self, row, queue): +# FIXME: This is weasly, see that we're also sending the raw payment +# source value as payment_method. +if row['Payment Source'] == 'Express Checkout': +return 'paypal_ec' + +# FIXME: tenuous logic here +# For refunds, only paypal_ec sets the invoice ID +if queue == 'refund' and row['Invoice ID']: +return 'paypal_ec' + +return 'paypal' + def send(self, queue_name, msg): if not self.redis: self.redis = queue.redis_wrap.Redis() diff --git a/audit/paypal/tests/test_trr_file.py b/audit/paypal/tests/test_trr_file.py index 0249477..fc2ed56 100644 --- a/audit/paypal/tests/test_trr_file.py +++ b/audit/paypal/tests/test_trr_file.py @@ -33,7 +33,7 @@ "Payer's Account ID": "pranks...@anonymous.net", "Payer Address Status": "N", "Item Name": "Generous benificence", -"Item ID": "GIMME", +"Item ID": "DONATE", "Option 1 Name": "", "Option 1 Value": "", "Option 2 Name": "", @@ -78,8 +78,41 @@ "Transaction Debit or Credit": "DR", "Fee Debit or Credit": "CR", "Fee Amount": "55", -"Transaction Note": "r", -"Payer's Account ID": "pranks...@anonymous.net" +"Transaction Note": "refund", +}) +return row + + +def get_ec_refund_row(): + +row = get_base_row() +row.update({ +"Invoice ID": "4123422", +"PayPal Reference ID": "3GJH3GJ3334214812", +"PayPal Reference ID Type": "TXN", +"Transaction Event Code": "T1107", +"Transaction Debit or Credit": "DR", +"Fee Debit or Credit": "CR", +"Transaction Note": "refund", +"Custom Field": "4123422", +"Item ID": "", +}) +return row + + +def get_ec_recurring_refund_row(): + +row = get_base_row() +row.update({ +"Invoice ID": "4123422", +"PayPal Reference ID": "3GJH3GJ3334214812", +"PayPal Reference ID Type": "TXN", +"Transaction Event Code": "T1107", +"Transaction Debit or Credit": "DR", +"Fee Debit or Credit": "CR", +"Transaction Note": "refund", +"Custom Field": "", +"Item ID": "", }) return row @@ -138,7 +171,53 @@ # Did we send it? args = MockRedis().send.call_args assert args[0][0] == 'refund' -expected = {'last_name': 'Man', 'thankyou_date': 0, 'city': '', 'payment_method': '', 'gateway_status': 'S', 'currency': 'USD', 'postal_code': '', 'date': 1474743301, 'gateway_refund_id': 'AS7D98AS7D9A8S7D9AS', 'gateway': 'paypal', 'state_province': '', 'gross': 10.0, 'first_name': 'Banana', 'fee': 0.55, 'gateway_txn_id': 'AS7D98AS7D9A8S7D9AS', 'gross_currency': 'USD', 'country': '', 'payment_submethod': '', 'note': 'r', 'supplemental_address_1': '', 'settled_date': 1474743301, 'gateway_parent_id': '3GJH3GJ3334214812', 'type': 'refund', 'email': 'pranks...@anonymous.net', 'street_address': '', 'contribution_tracking_id': '1234567', 'order_id': '1234567'} +expected = {'last_name': 'Man', 'thankyou_date': 0, 'city': '', 'payment_method':
[MediaWiki-commits] [Gerrit] translatewiki[master]: Add the Guambiano language
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344984 ) Change subject: Add the Guambiano language .. Add the Guambiano language Requested at https://translatewiki.net/wiki/Thread:Support/Add_new_language_to_translate Change-Id: I09add6a49bf1eabdecc3d45616a1703e33e7cc87 --- M LanguageSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/LanguageSettings.php b/LanguageSettings.php index ebdf897..2cae999 100644 --- a/LanguageSettings.php +++ b/LanguageSettings.php @@ -29,6 +29,7 @@ $wgExtraLanguageNames['gcf'] = 'Guadeloupean Creole French'; # Guadeloupean Creole French / Siebrand 2009-09-21 $wgExtraLanguageNames['gor'] = 'Hulontalo'; # Gorontalo / Siebrand 2014-12-28 $wgExtraLanguageNames['guc'] = 'Wayúu'; # Wayuu / Siebrand 2009-12-12 +$wgExtraLanguageNames['gum'] = 'Namtrik'; # Guambiano / Amir 2017-03-27 $wgExtraLanguageNames['gur'] = 'Gurenɛ'; # Farefare / Siebrand 2011-01-27 $wgExtraLanguageNames['hif-deva'] = 'फ़ीजी हिन्दी'; # Fiji Hindi (Devangari script) / Siebrand 2010-08-26 $wgExtraLanguageNames['hne'] = 'छत्तीसगढ़ी'; # Amir 2011-12-01 -- To view, visit https://gerrit.wikimedia.org/r/344984 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09add6a49bf1eabdecc3d45616a1703e33e7cc87 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add array typehint to 2 DatabaseUpdater methods
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341307 ) Change subject: Add array typehint to 2 DatabaseUpdater methods .. Add array typehint to 2 DatabaseUpdater methods Change-Id: I29abd4525b46e9b47cf3933e5fcb791fd6ea3fb5 --- M includes/installer/DatabaseUpdater.php M includes/installer/OracleUpdater.php 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index f8ab1f2..98d354c 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -392,7 +392,7 @@ * Writes the schema updates desired to a file for the DB Admin to run. * @param array $schemaUpdate */ - private function writeSchemaUpdateFile( $schemaUpdate = [] ) { + private function writeSchemaUpdateFile( array $schemaUpdate = [] ) { $updates = $this->updatesSkipped; $this->updatesSkipped = []; @@ -425,7 +425,7 @@ * * @param array $what What updates to perform */ - public function doUpdates( $what = [ 'core', 'extensions', 'stats' ] ) { + public function doUpdates( array $what = [ 'core', 'extensions', 'stats' ] ) { $this->db->setSchemaVars( $this->getSchemaVars() ); $what = array_flip( $what ); diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index 79ae175..e262eda 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -285,7 +285,7 @@ * * @param array $what */ - public function doUpdates( $what = [ 'core', 'extensions', 'purge', 'stats' ] ) { + public function doUpdates( array $what = [ 'core', 'extensions', 'purge', 'stats' ] ) { parent::doUpdates( $what ); $this->db->query( 'BEGIN fill_wiki_info; END;' ); -- To view, visit https://gerrit.wikimedia.org/r/341307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29abd4525b46e9b47cf3933e5fcb791fd6ea3fb5 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: AddshoreGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Fix dictionary comparison
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344725 ) Change subject: Fix dictionary comparison .. Fix dictionary comparison Oops! sorted(dict) was just leaving us with the keys Also, fix date parsing to take timezone into account and get correct unix timestamp. Change-Id: I9827b9fcdd62549583dd54031589306542c1f39b --- M audit/paypal/ppreport.py M audit/paypal/tests/test_trr_file.py 2 files changed, 15 insertions(+), 7 deletions(-) Approvals: XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/audit/paypal/ppreport.py b/audit/paypal/ppreport.py index a04c159..7fa405a 100644 --- a/audit/paypal/ppreport.py +++ b/audit/paypal/ppreport.py @@ -1,4 +1,6 @@ +import datetime import dateutil.parser +import dateutil.tz import io from failmail.mailer import FailMailer @@ -52,4 +54,7 @@ def parse_date(date_string): date_object = dateutil.parser.parse(date_string) -return date_object.strftime('%s') +utc = dateutil.tz.gettz('UTC') +date_utc = date_object.astimezone(utc) +epoch = datetime.datetime(1970, 1, 1, tzinfo=utc) +return int((date_utc - epoch).total_seconds()) diff --git a/audit/paypal/tests/test_trr_file.py b/audit/paypal/tests/test_trr_file.py index 2cf3c3e..0249477 100644 --- a/audit/paypal/tests/test_trr_file.py +++ b/audit/paypal/tests/test_trr_file.py @@ -3,6 +3,9 @@ import audit.paypal.TrrFile +# weird thing we have to do to get better assert_equals feedback +nose.tools.assert_equals.im_class.maxDiff = None + def get_base_row(): @@ -135,9 +138,9 @@ # Did we send it? args = MockRedis().send.call_args assert args[0][0] == 'refund' -expected = sorted({'last_name': 'Man', 'thankyou_date': 0, 'city': '', 'payment_method': '', 'gateway_status': 'S', 'currency': 'USD', 'postal_code': '', 'date': '1474736101', 'gateway_refund_id': 'AS7D98AS7D9A8S7D9AS', 'gateway': 'paypal', 'state_province': '', 'gross': 10.0, 'first_name': 'Banana', 'fee': 0.55, 'gateway_txn_id': 'AS7D98AS7D9A8S7D9AS', 'gross_currency': 'USD', 'country': '', 'payment_submethod': '', 'note': 'r', 'supplemental_address_1': '', 'settled_date': '1474736101', 'gateway_parent_id': '3GJH3GJ3334214812', 'type': 'refund', 'email': 'pranks...@anonymous.net', 'street_address': '', 'contribution_tracking_id': '1234567', 'order_id': '1234567'}) -actual = sorted(args[0][1]) -assert actual == expected +expected = {'last_name': 'Man', 'thankyou_date': 0, 'city': '', 'payment_method': '', 'gateway_status': 'S', 'currency': 'USD', 'postal_code': '', 'date': 1474743301, 'gateway_refund_id': 'AS7D98AS7D9A8S7D9AS', 'gateway': 'paypal', 'state_province': '', 'gross': 10.0, 'first_name': 'Banana', 'fee': 0.55, 'gateway_txn_id': 'AS7D98AS7D9A8S7D9AS', 'gross_currency': 'USD', 'country': '', 'payment_submethod': '', 'note': 'r', 'supplemental_address_1': '', 'settled_date': 1474743301, 'gateway_parent_id': '3GJH3GJ3334214812', 'type': 'refund', 'email': 'pranks...@anonymous.net', 'street_address': '', 'contribution_tracking_id': '1234567', 'order_id': '1234567'} +actual = args[0][1] +nose.tools.assert_equals(expected, actual) @patch("queue.redis_wrap.Redis") @@ -175,6 +178,6 @@ # Did we send it? args = MockRedis().send.call_args assert args[0][0] == 'recurring' -expected = sorted({'last_name': 'Man', 'txn_type': 'subscr_payment', 'thankyou_date': 0, 'city': '', 'payment_method': '', 'gateway_status': 'S', 'currency': 'USD', 'postal_code': '', 'date': '1474736101', 'subscr_id': '3GJH3GJ3334214812', 'gateway': 'paypal', 'state_province': '', 'gross': 0.1, 'first_name': 'Banana', 'fee': 0.55, 'gateway_txn_id': 'AS7D98AS7D9A8S7D9AS', 'country': '', 'payment_submethod': '', 'note': '', 'supplemental_address_1': '', 'settled_date': '1474736101', 'email': 'pranks...@anonymous.net', 'street_address': '', 'contribution_tracking_id': '1234567', 'order_id': '1234567'}) -actual = sorted(args[0][1]) -assert actual == expected +expected = {'last_name': 'Man', 'txn_type': 'subscr_payment', 'thankyou_date': 0, 'city': '', 'payment_method': '', 'gateway_status': 'S', 'currency': 'USD', 'postal_code': '', 'date': 1474743301, 'subscr_id': '3GJH3GJ3334214812', 'gateway': 'paypal', 'state_province': '', 'gross': 0.1, 'first_name': 'Banana', 'fee': 0.55, 'gateway_txn_id': 'AS7D98AS7D9A8S7D9AS', 'country': '', 'payment_submethod': '', 'note': '', 'supplemental_address_1': '', 'settled_date': 1474743301, 'email': 'pranks...@anonymous.net', 'street_address': '', 'contribution_tracking_id': '1234567', 'order_id': '1234567'} +actual = args[0][1] +nose.tools.assert_equals(expected, actual) -- To view, visit https://gerrit.wikimedia.org/r/344725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9827b9fcdd62549583dd54031589306542c1f39b
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Prune old druid request logs
Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344990 ) Change subject: Prune old druid request logs .. Prune old druid request logs There may be a way to prune request logs using log4j, but until it is documented, we don't know how! Using a cron to do so. Bug: T155491 Change-Id: I7b870029e902606f4865ac607b1e0213e91b72bd --- M modules/druid/manifests/init.pp 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/druid/manifests/init.pp b/modules/druid/manifests/init.pp index 85d4867..8f901da 100644 --- a/modules/druid/manifests/init.pp +++ b/modules/druid/manifests/init.pp @@ -266,7 +266,7 @@ content => template('druid/runtime.properties.erb'), } -# Indexing logs are not pruned by Druid. Install a cron job to do so. +# Indexing and request logs are not pruned by Druid. Install cron jobs to do so. $indexer_log_retention_days = 62 cron { 'prune_old_druid_indexer_logs': command => "/usr/bin/find ${runtime_properties['druid.indexer.logs.directory']} -mtime +${indexer_log_retention_days} -exec /bin/rm {} \\;", @@ -274,4 +274,18 @@ minute => 0, user=> 'druid', } +# Request logs are in /var/log/druid, along with daemon logs. Since daemon logs are managed +# by log4j, we don't want to accidentally prune them with this cron job. There are two +# formats of request log fine names, e.g. 2016-07-22T00:00:00.000Z and 2016-09-13.log. +# This cron job will prune both by grepping on a matching pattern and piping to xargs rm, +# instead of using -exec rm. +# NOTE: There should be a way to manage Druid request logs via log4j, just like daemons, +# but it is apparently undocumented. +$request_log_retention_days = 62 +cron { 'prune_old_druid_request_logs': +command => "/usr/bin/find /var/log/druid -mtime +${request_log_retention_days} | /bin/grep -E '2.*(Z|.log)$' | /usr/bin/xargs /bin/rm", +hour=> 0, +minute => 0, +user=> 'druid', +} } -- To view, visit https://gerrit.wikimedia.org/r/344990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b870029e902606f4865ac607b1e0213e91b72bd Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: OttomataGerrit-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] operations/puppet[production]: Prune old druid request logs
Ottomata has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344990 ) Change subject: Prune old druid request logs .. Prune old druid request logs There may be a way to prune request logs using log4j, but until it is documented, we don't know how! Using a cron to do so. Bug: T155491 Change-Id: I7b870029e902606f4865ac607b1e0213e91b72bd --- M modules/druid/manifests/init.pp 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/344990/1 diff --git a/modules/druid/manifests/init.pp b/modules/druid/manifests/init.pp index 85d4867..9bfbc31 100644 --- a/modules/druid/manifests/init.pp +++ b/modules/druid/manifests/init.pp @@ -266,7 +266,7 @@ content => template('druid/runtime.properties.erb'), } -# Indexing logs are not pruned by Druid. Install a cron job to do so. +# Indexing and request logs are not pruned by Druid. Install cron jobs to do so. $indexer_log_retention_days = 62 cron { 'prune_old_druid_indexer_logs': command => "/usr/bin/find ${runtime_properties['druid.indexer.logs.directory']} -mtime +${indexer_log_retention_days} -exec /bin/rm {} \\;", @@ -274,4 +274,18 @@ minute => 0, user=> 'druid', } +# Request logs are in /var/log/druid, along with daemon logs. Since daemon logs are managed +# by log4j, we don't want to accidentally prune them with this cron job. There are two +# formats of request log fine names, e.g. 2016-07-22T00:00:00.000Z and 2016-09-13.log. +# This cron job will prune both by grepping on a matching pattern and piping to xargs rm, +# instead of using -exec rm. +# NOTE: There should be a way to manage Druid request logs via log4j, just like daemons, +# but it is apparently undocumented. +$request_log_retention_days = 62 +cron { 'prune_old_druid_request_logs': +command => "/usr/bin/find /var/log/druid -mtime +${request_log_retention_days} | /bin/grep -E '2.*(Z|.log)$' | /usr/bin/xargs rm", +hour=> 0, +minute => 0, +user=> 'druid', +} } -- To view, visit https://gerrit.wikimedia.org/r/344990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b870029e902606f4865ac607b1e0213e91b72bd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [cleanup] Remove expired rules
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344991 ) Change subject: [cleanup] Remove expired rules .. [cleanup] Remove expired rules Bug: T161530 Change-Id: I0ad4d2529a5b03e4156673042d68faa8bbc58041 --- M wmf-config/throttle.php 1 file changed, 0 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/344991/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 09a1477..4e0518b 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -28,26 +28,6 @@ # ]; ## Add throttling definitions below. -$wmgThrottlingExceptions[] = [ // T161402 - BordeauxJS (CUBale) - 'from' => '2017-03-25T13:00:00+00:00', - 'to' => '2017-03-25T19:00:00+00:00', - 'IP' => '37.58.139.53', - 'dbname' => [ 'frwiki', 'enwiki', 'commonswiki', 'wikidatawiki' ], - 'value' => 50, -]; - -$wmgThrottlingExceptions[] = [ // T160619 - Odia Wikipedia's 100 Women Editathon: - 'from' => '2017-03-18T07:00+05:30', - 'to' => '2017-03-19T20:00+05:30', - 'IP' => [ - '111.93.176.73', - '117.247.70.19', - '103.72.63.6', - ], - 'dbname' => [ 'orwiki', 'hiwiki', 'enwiki', 'commonswiki' ], - 'value' => 70, // 25-30 expected participants -]; - $wmgThrottlingExceptions[] = [ // T157504 'from' => '2017-01-09T00:00:00 UTC', 'to' => '2017-06-31T23:59:59 UTC', @@ -57,23 +37,6 @@ ], 'dbname' => [ 'itwikiversity' ], 'value' => 200, -]; - -// https://pt.wikipedia.org/wiki/Wikip%C3%A9dia:Edit-a-thon/Atividades_em_portugu%C3%AAs/Neuroci%C3%AAncia_e_Matem%C3%A1tica_III -$wmgThrottlingExceptions[] = [ // Requested on IRC - 'from' => '2017-03-13T17:00 +0:00', - 'to' => '2017-03-13T20:00 +0:00', - 'IP' => '143.107.45.11', - 'dbname' => [ 'ptwiki', 'commonswiki' ], - 'value' => 30 // 20 expected -]; - -$wmgThrottlingExceptions[] = [ // T160427 - 'from' => '2017-03-25T09:00 -5:00', - 'to' => '2017-03-25T17:00 -5:00', - 'range' => '129.21.0.0/16', - 'dbname' => 'enwiki', - 'value' => 120 // 100 expected ]; ## Add throttling definitions above. -- To view, visit https://gerrit.wikimedia.org/r/344991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ad4d2529a5b03e4156673042d68faa8bbc58041 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add a tracking category when a template loop is detected
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/343281 ) Change subject: Add a tracking category when a template loop is detected .. Add a tracking category when a template loop is detected Bug: T160743 Change-Id: Ib888634af281fc2347eaa389db4141782a98c15c --- M includes/TrackingCategories.php M includes/parser/Parser.php M languages/i18n/en.json M languages/i18n/qqq.json 4 files changed, 6 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/TrackingCategories.php b/includes/TrackingCategories.php index 825860a..a9ebd76 100644 --- a/includes/TrackingCategories.php +++ b/includes/TrackingCategories.php @@ -45,6 +45,7 @@ 'expansion-depth-exceeded-category', 'restricted-displaytitle-ignored', 'deprecated-self-close-category', + 'template-loop-category', ]; /** diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 8db1fe3..47d9a62 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -3257,6 +3257,7 @@ $text = '' . wfMessage( 'parser-template-loop-warning', $titleText )->inContentLanguage()->text() . ''; + $this->addTrackingCategory( 'template-loop-category' ); wfDebug( __METHOD__ . ": template loop broken at '$titleText'\n" ); } } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 2ef4f3a..7584a0a 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -792,6 +792,8 @@ "post-expand-template-argument-warning": "Warning: This page contains at least one template argument that has a too large expansion size.\nThese arguments have been omitted.", "post-expand-template-argument-category": "Pages containing omitted template arguments", "parser-template-loop-warning": "Template loop detected: [[$1]]", + "template-loop-category": "Pages with template loops", + "template-loop-category-desc": "The page contains a template loop, ie. a template which calls itself recursively.", "parser-template-recursion-depth-warning": "Template recursion depth limit exceeded ($1)", "language-converter-depth-warning": "Language converter depth limit exceeded ($1)", "node-count-exceeded-category": "Pages where node count is exceeded", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index c3a871f..a67e90f 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -979,6 +979,8 @@ "post-expand-template-argument-warning": "Used as warning in parser limitation.\n\nSee also:\n* {{msg-mw|Post-expand-template-argument-category}}", "post-expand-template-argument-category": "This message is used as a category name for a [[mw:Special:MyLanguage/Help:Tracking categories|tracking category]] where pages are placed automatically if they contain omitted template arguments.\n\nSee also:\n* {{msg-mw|Post-expand-template-argument-category-desc}}\n* {{msg-mw|Post-expand-template-argument-warning}}", "parser-template-loop-warning": "Parameters:\n* $1 - page title", + "template-loop-category": "This message is used as a category name for a [[mw:Special:MyLanguage/Help:Tracking categories|tracking category]] where pages with template loops will be listed.", + "template-loop-category-desc": "Pages with template loops category description. Shown on [[Special:TrackingCategories]].\n\nSee also:\n* {{msg-mw|Template-loop-category}}", "parser-template-recursion-depth-warning": "Parameters:\n* $1 - limit value of recursion depth", "language-converter-depth-warning": "Error message shown when a page uses too deeply nested language conversion syntax. Parameters:\n* $1 - the value of the depth limit", "node-count-exceeded-category": "This message is used as a category name for a [[mw:Help:Tracking categories|tracking category]] where pages are placed automatically if the node-count of the preprocessor exceeds the limit.\n\nSee also:\n* {{msg-mw|Node-count-exceeded-warning}}", -- To view, visit https://gerrit.wikimedia.org/r/343281 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib888634af281fc2347eaa389db4141782a98c15c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Reedy
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: [WIP] Banner sequence campaign mixin
AndyRussG has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344988 ) Change subject: [WIP] Banner sequence campaign mixin .. [WIP] Banner sequence campaign mixin Change-Id: I6cfb31b07c56097fd3d0007a3f051d7511ed5017 --- M README M extension.json M i18n/en.json M i18n/qqq.json M resources/infrastructure/campaignManager.js A resources/subscribing/ext.centralNotice.bannerSequence.js 6 files changed, 230 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/88/344988/1 diff --git a/README b/README index e02bee5..ca93123 100644 --- a/README +++ b/README @@ -201,6 +201,7 @@ - legacySupport - impressionDiet - largeBannerLimit + - bannerSequence * $wgNoticeTabifyPages: Declare all pages that should be tabified as CN pages diff --git a/extension.json b/extension.json index 79cee50..37d1ace 100644 --- a/extension.json +++ b/extension.json @@ -222,7 +222,11 @@ "centralnotice-large-banner-limit-randomize", "centralnotice-large-banner-limit-randomize-help", "centralnotice-large-banner-limit-identifier", - "centralnotice-large-banner-limit-identifier-help" + "centralnotice-large-banner-limit-identifier-help", + "centralnotice-banner-sequence", + "centralnotice-banner-sequence-help", + "centralnotice-banner-sequence-bucket-seq", + "centralnotice-banner-sequence-bucket-add-step" ] }, "ext.centralNotice.startUp": { @@ -325,6 +329,17 @@ "scripts": "subscribing/ext.centralNotice.legacySupport.js", "dependencies": [ "ext.centralNotice.display" + ], + "targets": [ + "desktop", + "mobile" + ] + }, + "ext.centralNotice.bannerSequence": { + "scripts": "subscribing/ext.centralNotice.bannerSequence.js", + "dependencies": [ + "ext.centralNotice.display", + "ext.centralNotice.kvStore" ], "targets": [ "desktop", @@ -563,6 +578,17 @@ "defaultValue": "centralnotice-frbanner-seen-fullscreen" } } + }, + "bannerSequence": { + "module": "ext.centralNotice.bannerSequence", + "nameMsg": "centralnotice-banner-sequence", + "helpMsg": "centralnotice-banner-sequence-help", + "customAdminUIControls": true, + "parameters": { + "sequence": { + "type": "json" + } + } } }, "NoticeTabifyPages": { diff --git a/i18n/en.json b/i18n/en.json index 1a842fd..879784c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -291,5 +291,9 @@ "centralnotice-large-banner-limit-randomize": "Randomize bucket transition", "centralnotice-large-banner-limit-randomize-help": "Normal bucket transition is A to C, B to D. When checked, readers will randomly move to buckets C or D.", "centralnotice-large-banner-limit-identifier": "Identifier for client-side storage", - "centralnotice-large-banner-limit-identifier-help": "Large banner display is suppressed across campaigns with the same identifier. Default value 'centralnotice-frbanner-seen-fullscreen' may be used to migrate legacy cookies." + "centralnotice-large-banner-limit-identifier-help": "Large banner display is suppressed across campaigns with the same identifier. Default value 'centralnotice-frbanner-seen-fullscreen' may be used to migrate legacy cookies.", + "centralnotice-banner-sequence": "Banner sequence", + "centralnotice-banner-sequence-help": "Set multiple banners to display in specific order.", + "centralnotice-banner-sequence-bucket-seq": "Sequence for bucket $1", + "centralnotice-banner-sequence-bucket-add-step": "Add a step" } diff --git a/i18n/qqq.json b/i18n/qqq.json index a6ac33a..7dd351f 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -315,5 +315,9 @@
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Allow eliminators and autoreviewers to move a file on ptwiki
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344989 ) Change subject: Allow eliminators and autoreviewers to move a file on ptwiki .. Allow eliminators and autoreviewers to move a file on ptwiki Bug: T161532 Change-Id: Icfd2d8539c3c1df37f084164c464e01610a0d0c9 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/89/344989/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3d0ceb1..3d212fd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8889,7 +8889,11 @@ 'ptwiki' => [ 'autoconfirmed' => [ 'patrol' => true, 'abusefilter-log-detail' => true ], 'bot' => [ 'autoreviewer' => true, ], - 'autoreviewer' => [ 'autopatrol' => true, 'autoreviewer' => true ], + 'autoreviewer' => [ + 'autopatrol' => true, + 'autoreviewer' => true, + 'movefile' => true, // T161532 + ], 'eliminator' => [ 'browsearchive' => true, 'delete' => true, @@ -8899,7 +8903,8 @@ 'deletedtext' => true, 'autopatrol' => true, 'suppressredirect' => true, - 'autoreviewer' => true + 'autoreviewer' => true, + 'movefile' => true, // T161532 ], 'rollbacker' => [ 'rollback' => true, -- To view, visit https://gerrit.wikimedia.org/r/344989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfd2d8539c3c1df37f084164c464e01610a0d0c9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: create shell account for Goran S. Milovanovic
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344735 ) Change subject: admins: create shell account for Goran S. Milovanovic .. admins: create shell account for Goran S. Milovanovic Goran is a: Data Analyst, WMDE This is for: various Data Science related tasks (e.g. access to datasets, data modeling, and similar) ssh-key and email address per comments on linked ticket. NDA has been confirmed by legal on ticket as well. UID from existing LDAP user: [terbium:~] $ ldaplist -l passwd goransm uidNumber: 16664 Bug: T160980 Change-Id: I3e77bb4814ff05bcb0348be5a361204b1d85279b --- M modules/admin/data/data.yaml 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 43415dd..7390ae7 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2462,6 +2462,15 @@ email: shreyaslakhta...@gmail.com expiry_date: 2017-06-30 expiry_contact: rstall...@wikimedia.org + goransm: +ensure: present +gid: 500 +name: goransm +realname: Goran S. Milovanovic +ssh_keys: + - ssh-rsa B3NzaC1yc2EDAQABAAABAQC6jc1W0mqEnurNhtYXF9YQpCX3H4h1pQA9jgZXKGTPUczQJ2rRVZKWXxuPfbg0OwZFzVKhTtSi0HO2v0Dy4gOtrDMpxfX51HnsB/Sm+ifngkj5AgSiAylT7P4PNm7F804m7iJF277DDx/+R9JAL59NT0C9nTZ6oKghL37TQr/PdHBRhjZjRzMOjuplwoFh+I9ZtLGQJpqTENKWqqYwxwMdjog/fRf3+tkvB7kxwmZHRiVPBl8BS64JkNmKXX+xQCtR0YMYH8HkfE4GarSnDXSqmhwS6Zx8TY7oVPy0d5H8cZaA2RyoYWzEH4K2rbvllLoZCnto5Elb6ic0BVP7P8Fn goran@goranNET +uid: 16664 +email: goran.milovanovic_...@wikimedia.de ldap_only_users: abartov: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/344735 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e77bb4814ff05bcb0348be5a361204b1d85279b Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: GoranSMilovanovic Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits